From e67d9960224e8bf8638ab8496bd3038222405f75 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Thu, 8 Feb 2024 13:56:10 +0100 Subject: [PATCH 1/4] Typo in expect Thanks to rhubarbpieguy for the report Fix #5436 --- chapter08/expect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/expect.xml b/chapter08/expect.xml index 5c21e390f..76795782d 100644 --- a/chapter08/expect.xml +++ b/chapter08/expect.xml @@ -63,7 +63,7 @@ other virtual kernel file systems) mounted correctly. Then reenter the chroot environment following . This issue needs to be resolved before continuing, or the test suites - requring Expect (for example the test suites of Bash, Binutils, GCC, + requiring Expect (for example the test suites of Bash, Binutils, GCC, GDBM, and of course Expect itself) will fail catastrophically, and other subtle breakages may also happen. From fe99d50d949255dbb5a9f28d9fcbaa05b4bc55a2 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 10 Feb 2024 18:49:55 +0800 Subject: [PATCH 2/4] systemd: Fix a bug breaking systemd-verify an instantiated unit It's breaking Git test suite (and maybe other things). --- chapter01/changelog.xml | 10 ++++++++++ chapter01/whatsnew.xml | 12 ++++++++---- chapter03/patches.xml | 4 +--- chapter08/systemd.xml | 7 ++++--- patches.ent | 3 +++ 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index fa7fc12c4..0a646f658 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. --> + + 2024-02-10 + + + [xry111] - Fix a bug in systemd breaking running + systemd-analyze on an instantiated systemd unit. + + + + 2024-02-02 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 5faf938b7..f7b9ed05c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -294,10 +294,6 @@ &bash-upstream-fixes-patch; - - setuptools-&setuptools-version; - - &pkgconf-upstream-fix-patch; @@ -306,6 +302,14 @@ &readline-fixes-patch; + + setuptools-&setuptools-version; + + + + &systemd-upstream-patch; + + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index f05fbd604..c48e2ce0e 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -142,15 +142,13 @@ - Now fix a security vulnerability in the DNSSEC verification of - systemd-resolved: + systemd-resolved and a bug breaking running + systemd-analyze verify on an instantiated systemd + unit: -sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \ - -i src/resolve/resolved-dns-transaction.c +patch -Np1 -i ../&systemd-upstream-patch; Prepare systemd for compilation: diff --git a/patches.ent b/patches.ent index a6e3a306e..b10f24414 100644 --- a/patches.ent +++ b/patches.ent @@ -38,3 +38,6 @@ + + + From b1998a2375cac0e9ecf56c663adde5263a2eb9a5 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sat, 10 Feb 2024 12:28:12 +0100 Subject: [PATCH 3/4] Use http://cdn.docbook.org to run on other distros Upstream documentation has been changed a few years ago to point to https rather than http, but for example ubuntu-2023.10 still has only http in its catalog file. So use http here, and change the catalog file in blfs to have both http and https... --- stylesheets/lfs-xsl/lfs-l10n.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylesheets/lfs-xsl/lfs-l10n.xml b/stylesheets/lfs-xsl/lfs-l10n.xml index 783bb1118..b47ee7f76 100644 --- a/stylesheets/lfs-xsl/lfs-l10n.xml +++ b/stylesheets/lfs-xsl/lfs-l10n.xml @@ -1,5 +1,5 @@ - + From 96026a103a050853137c244a66145e7006092f17 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 12 Feb 2024 11:05:36 -0600 Subject: [PATCH 4/4] Package updates. Update to shadow-4.14.4. Update to setuptools-69.1.0 (Python module). Update to python-3.12.2. Update to pkgconf-2.1.1. Update to MarkupSafe-2.1.5 (Python module). Update to man-pages-6.06. Update to expat-2.6.0. Update to linux-6.7.4. --- chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 16 ++++++-------- chapter03/patches.xml | 4 ++-- chapter08/pkgconf.xml | 5 ----- packages.ent | 48 ++++++++++++++++++++--------------------- patches.ent | 4 ---- 6 files changed, 70 insertions(+), 45 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0a646f658..f7bd0c405 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,44 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-02-12 + + + [bdubbs] - Update to shadow-4.14.4. Fixes + #5437. + + + [bdubbs] - Update to setuptools-69.1.0 (Python module). Fixes + #5439. + + + [bdubbs] - Update to python-3.12.2. Fixes + #5434. + + + [bdubbs] - Update to pkgconf-2.1.1. Fixes + #5432. + + + [bdubbs] - Update to MarkupSafe-2.1.5 (Python module). Fixes + #5431. + + + [bdubbs] - Update to man-pages-6.06. Fixes + #5438. + + + [bdubbs] - Update to expat-2.6.0. Fixes + #5435. + + + [bdubbs] - Update to linux-6.7.4. Fixes + #5433. + + + + 2024-02-10 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index f7b9ed05c..d1cc11706 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -71,9 +71,9 @@ - + @@ -176,9 +176,9 @@ Man-DB-&man-db-version; - + MarkupSafe-&markupsafe-version; @@ -224,9 +224,9 @@ - Setuptools-&setuptools-version; - --> + Shadow-&shadow-version; @@ -294,10 +294,6 @@ &bash-upstream-fixes-patch; - - &pkgconf-upstream-fix-patch; - - &readline-fixes-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index c48e2ce0e..067dc9aea 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -117,7 +117,7 @@ --> - + Readline Upstream Fix Patch - &readline-fixes-patch-size;: diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml index 139e0c810..3e7e737fa 100644 --- a/chapter08/pkgconf.xml +++ b/chapter08/pkgconf.xml @@ -44,11 +44,6 @@ Installation of Pkgconf - - Fix a regression in pkgconf-2.1.0 breaking BLFS packages: - - patch -Np1 -i ../&pkgconf-upstream-fix-patch; - Prepare Pkgconf for compilation: ./configure --prefix=/usr \ diff --git a/packages.ent b/packages.ent index 6d319968a..ccff2c3f2 100644 --- a/packages.ent +++ b/packages.ent @@ -156,10 +156,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - + - + - + - + - - + + @@ -631,18 +631,18 @@ - + - + - - + + - + diff --git a/patches.ent b/patches.ent index b10f24414..17966e30c 100644 --- a/patches.ent +++ b/patches.ent @@ -26,10 +26,6 @@ - - - -