From 208415b81b2909fbec563340e303cd4b6d5a0c5f Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 1 Jun 2025 12:26:06 +0800 Subject: [PATCH 1/6] reboot: Remove references to files we no longer create And note /etc/resolv.conf is optional for the systemd revision. --- chapter11/reboot.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml index 5a8cfd51e..497445346 100644 --- a/chapter11/reboot.xml +++ b/chapter11/reboot.xml @@ -88,17 +88,14 @@ - /etc/bashrc - /etc/dircolors /etc/fstab /etc/hosts /etc/inputrc /etc/profile - /etc/resolv.conf + /etc/resolv.conf + (optional) /etc/vimrc - /root/.bash_profile - /root/.bashrc - /etc/sysconfig/ifconfig.eth0 + /etc/sysconfig/ifconfig.eth0 From 455724dc3478ad19a1e735a132a865d54edc942c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 1 Jun 2025 12:54:01 +0800 Subject: [PATCH 2/6] patches: Fix a typo --- chapter03/patches.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 435fa6acd..94b36acb5 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -53,7 +53,7 @@ - Coreutils Upstream Fixe Patch - &coreutils-upstream-patch-size;: + Coreutils Upstream Fix Patch - &coreutils-upstream-patch-size;: Download: MD5 sum: &coreutils-upstream-patch-md5; From 1b223fbe4352235dcc42489fa64fbfddf528b5ca Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 1 Jun 2025 21:49:48 +0800 Subject: [PATCH 3/6] python: Also add --without-static-libpython to the temporary installation Without it, in the final system /usr/lib/python3.13/config-3.13-$triple/libpython3.13.a is a remnant from chapter 7 instead of being absent, defeating our will to save space. --- chapter07/python.xml | 14 +++++++++++--- chapter08/python.xml | 8 -------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/chapter07/python.xml b/chapter07/python.xml index 872cf4a36..a75d5ad6f 100644 --- a/chapter07/python.xml +++ b/chapter07/python.xml @@ -52,9 +52,10 @@ Prepare Python for compilation: -./configure --prefix=/usr \ - --enable-shared \ - --without-ensurepip +./configure --prefix=/usr \ + --enable-shared \ + --without-ensurepip \ + --without-static-libpython The meaning of the configure option: @@ -74,6 +75,13 @@ + + --without-static-libpython + + This switch prevents building a large, but unneeded, static + library. + + Compile the package: diff --git a/chapter08/python.xml b/chapter08/python.xml index 0cbce0b0c..63a7e24cd 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -77,14 +77,6 @@ - - --without-static-libpython - - This switch prevents building a large, but unneeded, static - library. - - - Compile the package: From c24d5641af09d926b73e62e1384d4ba78cca137a Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 3 Jun 2025 17:03:08 +0800 Subject: [PATCH 4/6] ncurses: Fix the shared lib file name referenced in text --- chapter08/ncurses.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml index 84970f306..e2f7415eb 100644 --- a/chapter08/ncurses.xml +++ b/chapter08/ncurses.xml @@ -127,7 +127,7 @@ make will spawn new shell processes during "make install". --> The installation of this package will overwrite - libncursesw.so.&ncurses-version; + libncursesw.so.&ncurses-base-version; in-place. It may crash the shell process which is using code and data from the library file. Install the package with DESTDIR, and replace the library file correctly using From e481799cdf54f02b27631b968408d41efd9cc0a5 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 4 Jun 2025 13:56:37 -0500 Subject: [PATCH 5/6] Package updates. Update to ncurses-6.5-20250531. Update to readline-8.3-rc2. Update to bash-5.3-rc2. Update to Python-3.13.4. --- chapter01/changelog.xml | 22 ++++++++++++++++++++++ chapter01/whatsnew.xml | 6 ------ chapter03/patches.xml | 5 +++-- chapter06/bash.xml | 4 ++-- chapter08/coreutils.xml | 2 +- chapter08/python.xml | 4 ++-- packages.ent | 26 +++++++++++++------------- patches.ent | 5 +++-- 8 files changed, 46 insertions(+), 28 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7e38d65d4..dd2a99418 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,28 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2025-06-04 + + + [bdubbs] - Update to ncurses-6.5-20250531. Fixes + #5737. + + + [bdubbs] - Update to readline-8.3-rc2. Fixes + #5738. + + + [bdubbs] - Update to bash-5.3-rc2. Fixes + #5738. + + + [bdubbs] - Update to Python-3.13.4. Fixes + #6739. + + + + 2025-06-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index a1f05eea8..7b03c7f02 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -296,18 +296,12 @@ Packaging-&packaging-version; - - bash-5.3-rc1-cross_compile_fix-1.patch - coreutils-9.7-upstream_fix-1.patch perl-5.40.2-upstream_fix-1.patch - - Python-3.13.3-security_fixes-1.patch - diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 435fa6acd..1b5a38121 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -25,7 +25,6 @@ MD5 sum: &autoconf-fixes-patch-md5; ---> Bash Cross Compile Fix Patch - &bash-crosscompile-fix-patch-size;: @@ -34,7 +33,7 @@ MD5 sum: &bash-crosscompile-fix-patch-md5; - +--> SysVinit Consolidated Patch - &sysvinit-consolidated-patch-size;: diff --git a/chapter06/bash.xml b/chapter06/bash.xml index ae33f9466..8e6a2396e 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -42,11 +42,11 @@ Installation of Bash - + Prepare Bash for compilation: ./configure --prefix=/usr \ diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index abf5f7819..1f6f14ecd 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -41,7 +41,7 @@ Installation of Coreutils - First apply a security patch identified upstream: + First, apply a patch for a security problem identified upstream: patch -Np1 -i ../&coreutils-upstream-patch; diff --git a/chapter08/python.xml b/chapter08/python.xml index 0cbce0b0c..7c5e710ed 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -42,11 +42,11 @@ Installation of Python 3 - + Prepare Python for compilation: ./configure --prefix=/usr \ diff --git a/packages.ent b/packages.ent index dffe24262..e5f65b299 100644 --- a/packages.ent +++ b/packages.ent @@ -47,10 +47,10 @@ - - + + - + @@ -519,11 +519,11 @@ - + - + @@ -605,25 +605,25 @@ - + - + - + - - + + - + - + - + diff --git a/patches.ent b/patches.ent index dc666134a..7c0a42133 100644 --- a/patches.ent +++ b/patches.ent @@ -1,12 +1,11 @@ - +