From 8a9d7791787376e0f173dee527d5abe4bf76a5eb Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 1 Oct 2024 22:57:52 -0500 Subject: [PATCH 1/6] Package updates. Update to Python3-3.12.7. Update to tcl9.0.0. Update to linux-6.11.1. Update to libtool-2.5.3. Update to iproute2-6.11.0. Update to bash-5.2.37. Update to bc-7.0.3. --- chapter01/changelog.xml | 34 +++++++++++++++++++++++++++ chapter01/whatsnew.xml | 24 +++++++++---------- chapter08/expect.xml | 2 +- chapter08/python.xml | 2 +- chapter08/tcl.xml | 6 +++-- packages.ent | 52 ++++++++++++++++++++--------------------- patches.ent | 6 ++--- 7 files changed, 81 insertions(+), 45 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0dc02ab0f..bac7482bd 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,40 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-10-01 + + + [bdubbs] - Update to Python3-3.12.7. Fixes + #5571. + + + [bdubbs] - Update to tcl9.0.0. Fixes + #5570. + + + [bdubbs] - Update to linux-6.11.1. Fixes + #5556. + + + [bdubbs] - Update to libtool-2.5.3. Fixes + #5569. + + + [bdubbs] - Update to iproute2-6.11.0. Fixes + #5561. + + + [bdubbs] - Update to bash-5.2.37. Fixes + #5567. + + + [bdubbs] - Update to bc-7.0.3. Fixes + #5568. + + + + 2024-09-20 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index dd1bf7bad..97b62cae0 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -38,9 +38,9 @@ - + Bc-&bc-version; @@ -131,9 +131,9 @@ - + @@ -161,9 +161,9 @@ Libpipeline-&libpipeline-version; - + Linux-&linux-version; @@ -292,17 +292,17 @@ Added: - + + expect-5.45.4-gcc14-2.patch + Removed: - + + expect-5.45.4-gcc14-1.patch + diff --git a/chapter08/expect.xml b/chapter08/expect.xml index d7c6341f4..b1ee27f29 100644 --- a/chapter08/expect.xml +++ b/chapter08/expect.xml @@ -69,7 +69,7 @@ Now, make some changes to allow the package with gcc-14.1 or later: -patch -Np1 -i ../expect-&expect-version;-gcc14-1.patch +patch -Np1 -i ../expect-&expect-version;-gcc14-2.patch Prepare Expect for compilation: diff --git a/chapter08/python.xml b/chapter08/python.xml index 0f22ab2a9..ed3df8453 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -163,7 +163,7 @@ EOF tar --no-same-owner \ -xvf ../python-&python-version;-docs-html.tar.bz2 -cp -R --no-preserve=mode python-&python-version;-docs-html/* \ +cp -R --no-preserve=mode python-&python-minor;-docs-html/* \ /usr/share/doc/python-&python-version;/html diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml index 28eac584b..93621fc37 100644 --- a/chapter08/tcl.xml +++ b/chapter08/tcl.xml @@ -4,7 +4,7 @@ %general-entities; - + ]> @@ -75,7 +75,7 @@ cd unix Build the package: -make +make NATIVE_ZIP=$PWD/minizip sed -e "s|$SRCDIR/unix|/usr/lib|" \ -e "s|$SRCDIR|/usr/include|" \ @@ -104,6 +104,8 @@ unset SRCDIR make test + Twelve tests are known to fail in the chroot environment. + Install the package: make install diff --git a/packages.ent b/packages.ent index afe8f0fc4..056bb4851 100644 --- a/packages.ent +++ b/packages.ent @@ -47,20 +47,20 @@ - - + + - + - + - + @@ -341,10 +341,10 @@ - - + + - + @@ -413,10 +413,10 @@ - - + + - + @@ -430,13 +430,13 @@ - - + + - + - + - + - + - + - - + + @@ -697,15 +697,15 @@ - - - + + + - + - - + + diff --git a/patches.ent b/patches.ent index fbb773577..9c6cd418f 100644 --- a/patches.ent +++ b/patches.ent @@ -15,9 +15,9 @@ - - - + + + From 5607053b5ac756a4a048d3ef5f448b082a533186 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 3 Oct 2024 12:25:29 -0500 Subject: [PATCH 2/6] Revert back to tcl8.6.15. --- chapter01/changelog.xml | 9 +++++++++ chapter01/whatsnew.xml | 8 ++++---- chapter08/expect.xml | 2 +- chapter08/tcl.xml | 6 ++---- packages.ent | 12 ++++++------ 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index bac7482bd..f6ef99d3f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,15 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-10-03 + + + [bdubbs] - Revert back to tcl8.6.15. + + + + 2024-10-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 97b62cae0..2bd9ce999 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -292,17 +292,17 @@ Added: - + Removed: - + diff --git a/chapter08/expect.xml b/chapter08/expect.xml index b1ee27f29..d7c6341f4 100644 --- a/chapter08/expect.xml +++ b/chapter08/expect.xml @@ -69,7 +69,7 @@ Now, make some changes to allow the package with gcc-14.1 or later: -patch -Np1 -i ../expect-&expect-version;-gcc14-2.patch +patch -Np1 -i ../expect-&expect-version;-gcc14-1.patch Prepare Expect for compilation: diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml index 93621fc37..fa9d42dcc 100644 --- a/chapter08/tcl.xml +++ b/chapter08/tcl.xml @@ -4,7 +4,7 @@ %general-entities; - + ]> @@ -75,7 +75,7 @@ cd unix Build the package: -make NATIVE_ZIP=$PWD/minizip +make sed -e "s|$SRCDIR/unix|/usr/lib|" \ -e "s|$SRCDIR|/usr/include|" \ @@ -104,8 +104,6 @@ unset SRCDIR make test - Twelve tests are known to fail in the chroot environment. - Install the package: make install diff --git a/packages.ent b/packages.ent index 056bb4851..6909e23e9 100644 --- a/packages.ent +++ b/packages.ent @@ -697,15 +697,15 @@ - - - + + + - + - - + + From ebeebc26b272e341dd26fde14455b7be551b4f60 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 3 Oct 2024 15:39:25 -0500 Subject: [PATCH 3/6] Restore expect patch to previous version. --- patches.ent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches.ent b/patches.ent index 9c6cd418f..a0ffcc350 100644 --- a/patches.ent +++ b/patches.ent @@ -15,9 +15,9 @@ - - - + + + From fc3eddd130007eeffb5073b63fcf78fa80a589b6 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Fri, 4 Oct 2024 09:52:39 +0200 Subject: [PATCH 4/6] Fix chksum of expect-5.45.4-gcc14-1.patch --- patches.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.ent b/patches.ent index a0ffcc350..fbb773577 100644 --- a/patches.ent +++ b/patches.ent @@ -16,7 +16,7 @@ - + From ae191ad78ee2c912d9f4ee49a9f0f6a3712e5d52 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 6 Oct 2024 03:13:36 +0800 Subject: [PATCH 5/6] tcl: Remove trailing space in command It causes unnecessary trouble to translations because translating softwares do not ignore trailing space in s. --- chapter08/tcl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml index fa9d42dcc..28eac584b 100644 --- a/chapter08/tcl.xml +++ b/chapter08/tcl.xml @@ -75,7 +75,7 @@ cd unix Build the package: -make +make sed -e "s|$SRCDIR/unix|/usr/lib|" \ -e "s|$SRCDIR|/usr/include|" \ From 8d5a2a12e99ee86ccfe7cacf51f702226d9a8e81 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 6 Oct 2024 03:32:51 +0800 Subject: [PATCH 6/6] standards: Add extension names to libg{d,t}k-x11-2.0 to be consistent --- prologue/standards.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prologue/standards.xml b/prologue/standards.xml index 3cf6fbff2..88d894dad 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -178,10 +178,10 @@ LSB Desktop: - libgdk-x11-2.0 + libgdk-x11-2.0.so (but libgdk-3.so is provided by the BLFS GTK+-3 package), - libgtk-x11-2.0 + libgtk-x11-2.0.so (but libgtk-3.so and libgtk-4.so are provided by the BLFS GTK+-3 and GTK-4 packages),