From 0ab908d94490f34f3a5ecf3b25cf93739e5f61d0 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 28 May 2022 20:37:42 +0800 Subject: [PATCH 1/9] check: remove reference to libcheck.a --- chapter08/check.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/check.xml b/chapter08/check.xml index 1e7e4ec17..cb6b3590d 100644 --- a/chapter08/check.xml +++ b/chapter08/check.xml @@ -92,7 +92,7 @@ - libcheck.{a,so} + libcheck.so Contains functions that allow Check to be called from a test program From 0d7dbaf24c714f272193aec650e42dd18783b867 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 28 May 2022 21:04:22 +0800 Subject: [PATCH 2/9] openssl: reword upgrading note for versioning scheme change --- chapter08/openssl.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml index cece1904f..044c715a4 100644 --- a/chapter08/openssl.xml +++ b/chapter08/openssl.xml @@ -81,12 +81,15 @@ make MANSUFFIX=ssl install You should update OpenSSL when a new version which fixes vulnerabilities - is announced. The releases run in series, with a letter for each release - after the initial release (e.g. 1.1.1, 1.1.1a, 1.1.1b, etc). Because LFS - installs only the shared libraries, there is no need to recompile packages - which link to libcrypto.so or + is announced. Since OpenSSL 3.0.0, the OpenSSL versioning scheme + follows the MAJOR.MINOR.PATCH format. API/ABI compatibility + are guaranteed for the same MAJOR version number. Because LFS + installs only the shared libraries, there is no need to recompile + packages which link to + libcrypto.so or libssl.so - when upgrading in the same series. + when upgrading to a version with MAJOR version number + unchanged. From b4008bb22c0acee98eeff5f6f94feb6f5750af2e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 29 May 2022 12:19:56 +0800 Subject: [PATCH 3/9] update to systemd-251 (#5064) --- chapter01/changelog.xml | 10 ++++++++++ chapter01/whatsnew.xml | 10 ++++++++-- chapter03/patches.xml | 16 ---------------- chapter08/systemd.xml | 14 +++----------- packages.ent | 10 +++++----- patches.ent | 8 -------- 6 files changed, 26 insertions(+), 42 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c526bd946..9fc3edcc7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,16 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2022-05-29 + + + [xry111] - Update to systemd-251. Fixes + #5064. + + + + 2022-05-16 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 045de4c9d..88db30bb9 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -230,9 +230,9 @@ - + SysVinit-&sysvinit-version; @@ -298,6 +298,12 @@ perl-5.34.0-upstream_fixes-1.patch + + systemd-250-kernel_5.17_fixes-1.patch + + + systemd-250-upstream_fixes-1.patch + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index bed7d4735..1df01b443 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -135,22 +135,6 @@ - - Systemd Upstream Fixes Patch - &systemd-upstream-fixes-patch-size;: - - Download: - MD5 sum: &systemd-upstream-fixes-patch-md5; - - - - - Systemd Kernel Fixes Patch - &systemd-kernel-fixes-patch-size;: - - Download: - MD5 sum: &systemd-kernel-fixes-patch-md5; - - - Xz Upstream Fix Patch - &xz-upstream-fix-patch-size;: diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 43e1cea6c..f207e74c2 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -40,16 +40,6 @@ Installation of systemd - First, apply a patch to fix a security vulnerability and regressions - with hostnames and idle units: - -patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch - - Now, apply a patch to fix a problem with the linux kernel's headers in - version 5.17 and later: - -patch -Np1 -i ../systemd-&systemd-version;-kernel_5.17_fixes-1.patch - Remove two unneeded groups, render and sgx, from the default udev @@ -185,7 +175,9 @@ meson --prefix=/usr \ Install the man pages: -tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man + +tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man Remove a useless directory: diff --git a/packages.ent b/packages.ent index 52ebc6b64..3dd50b28b 100644 --- a/packages.ent +++ b/packages.ent @@ -640,20 +640,20 @@ - + - + - + - + - + diff --git a/patches.ent b/patches.ent index 2bd68296b..6c5acb77c 100644 --- a/patches.ent +++ b/patches.ent @@ -85,14 +85,6 @@ - - - - - - - - From f435668903be3c74b1a56317a62ed8cf0986e06c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 29 May 2022 10:13:54 +0800 Subject: [PATCH 4/9] systemd: remove unnecessary options -Dblkid is automatically detected, and other three options are meson defaults. --- chapter08/systemd.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index f207e74c2..76587bcca 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -54,16 +54,12 @@ cd build meson --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ --buildtype=release \ - -Dblkid=true \ -Ddefault-dnssec=no \ -Dfirstboot=false \ -Dinstall-tests=false \ -Dldconfig=false \ -Dsysusers=false \ - -Db_lto=false \ -Drpmmacrosdir=no \ -Dhomed=false \ -Duserdb=false \ From 77e340bc4ac898fa3f737ee8e8f0a0e6093d3c6c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 29 May 2022 10:34:42 +0800 Subject: [PATCH 5/9] systemd: use a better way to disable /usr/lib/pam.d --- chapter08/systemd.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 76587bcca..c5ffc9630 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -65,6 +65,7 @@ meson --prefix=/usr \ -Duserdb=false \ -Dman=false \ -Dmode=release \ + -Dpamconfdir=no \ -Ddocdir=/usr/share/doc/systemd-&systemd-version; \ .. @@ -159,6 +160,13 @@ meson --prefix=/usr \ + + -Dpamconfdir=no + + Prevent the installation of a PAM configuration file not + functional on LFS. + + Compile the package: @@ -175,10 +183,6 @@ meson --prefix=/usr \ component in the path. --> tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man - Remove a useless directory: - -rm -rf /usr/lib/pam.d - Create the /etc/machine-id file needed by systemd-journald: From 4ad57d43318cb48203a4ab712b13374ea2bdfab2 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 29 May 2022 12:23:45 +0800 Subject: [PATCH 6/9] update to ninja-1.11.0 (#5062) --- chapter01/changelog.xml | 4 ++++ chapter01/whatsnew.xml | 4 ++-- packages.ent | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 9fc3edcc7..ab7c503a7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,10 @@ 2022-05-29 + + [xry111] - Update to ninja-1.11.0. Fixes + #5062. + [xry111] - Update to systemd-251. Fixes #5064. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 88db30bb9..cf5a5bb88 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -194,9 +194,9 @@ - + Openssl-&openssl-version; diff --git a/packages.ent b/packages.ent index 3dd50b28b..623ab10c0 100644 --- a/packages.ent +++ b/packages.ent @@ -524,10 +524,10 @@ - - + + - + From e6e8f00474953435a7f3ac9a17dab2a329885c34 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 29 May 2022 12:25:23 +0800 Subject: [PATCH 7/9] update to vim-8.2.5014 (#4500) --- chapter01/changelog.xml | 4 ++++ packages.ent | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ab7c503a7..97c24a7b6 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,10 @@ 2022-05-29 + + [xry111] - Update to vim-8.2.5014 (security fixes). + Addresses #4500. + [xry111] - Update to ninja-1.11.0. Fixes #5062. diff --git a/packages.ent b/packages.ent index 623ab10c0..6ea16f56a 100644 --- a/packages.ent +++ b/packages.ent @@ -720,13 +720,13 @@ - + - + - + From f99a7eb572b1dc142c80fdfd55332235e2a6df79 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 29 May 2022 14:12:11 +0800 Subject: [PATCH 8/9] systemd: disable systemd-sysupdate --- chapter08/systemd.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index c5ffc9630..0f11da410 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -192,6 +192,12 @@ meson --prefix=/usr \ systemctl preset-all + Disable a service for upgrading binary distros. It's useless for + a basic Linux system built from source, and it will report an error if + it's enabled but not configured: + +systemctl disable systemd-sysupdate +