From ddbe15d5131a6f2c26a68b5008db700fd8792a52 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 12 May 2024 21:38:34 +0800 Subject: [PATCH 1/9] changelog: Fix a typo --- chapter01/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0a83d018b..3ca65e9f2 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -56,7 +56,7 @@ #5484. - [bdubbs] - Update to jinja2-3.1.4 (Python mpdule). Fixes + [bdubbs] - Update to jinja2-3.1.4 (Python module). Fixes #5485. From 043e9bdb4611a5684ccfe9e27893ab260503b118 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 12 May 2024 09:55:19 -0500 Subject: [PATCH 2/9] Fix currency for jinja2 --- lfs-latest-git.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index 95abb7c28..52eb501b4 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -147,7 +147,7 @@ if ( $package == "Python" ) $dirpath = "https://www.python.org/downloads/sou if ( $package == "shadow" ) $dirpath = github("shadow-maint/shadow"); if ( $package == "sysvinit" ) $dirpath = github("slicer69/sysvinit"); if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/"; -if ( $package == "Jinja" ) $dirpath = "https://pypi.python.org/pypi/Jinja2/"; +if ( $package == "jinja" ) $dirpath = "https://pypi.python.org/pypi/Jinja2/"; if ( $package == "systemd" ) $dirpath = github("systemd/systemd"); //if ( $package == "tcl" ) $dirpath = "https://sourceforge.net/projects/tcl/files"; if ( $package == "tcl" ) $dirpath = "https://www.tcl.tk/software/tcltk/download.html"; @@ -263,7 +263,7 @@ if ( $package == "zstd" ) $dirpath = github("facebook/zstd"); if ( $package == "grub" ) return find_max( $lines, "/grub/", "/^.*grub-([\d\.]+).tar.xz.*$/" ); - if ( $package == "Jinja" ) + if ( $package == "jinja" ) return find_max( $lines, "/Jinja/", "/^.*Jinja2 ([\d\.]+).*$/" ); if ( $package == "lz" ) From 46e985d8af9a9c065fbab74f97d76d60f648f8d6 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 12 May 2024 10:05:27 -0500 Subject: [PATCH 3/9] Make vim md5sum consistent with the version on anduin. --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 13c328b76..6f6ab89b2 100644 --- a/packages.ent +++ b/packages.ent @@ -752,7 +752,7 @@ - + From 760d28c80946f1688cb50afea55a0bef7fc4b4e7 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 12 May 2024 10:16:12 -0500 Subject: [PATCH 4/9] e anduin for vim. The github version of the vim tarball is not always available. Keep it on anduin. --- packages.ent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.ent b/packages.ent index 6f6ab89b2..aea4ef2b0 100644 --- a/packages.ent +++ b/packages.ent @@ -750,8 +750,8 @@ - - + + From f70694dce2e14eb997ff9d63969a67bf61f72a7e Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 30 Apr 2024 12:42:03 -0500 Subject: [PATCH 5/9] PAckage updates and a security fix. Add security fix to glibc. Update to linux-6.8.8. Update to ncurses-6.5. (cherry picked from commit d0ca5ead4668649d96eb6a9ed9e0269c15dfbe01) Reapply this change which is mistakenly reverted in 340e17adc67a1d7dc050fed51e384122f425e458. --- chapter01/changelog.xml | 18 ++++++++++++++++++ chapter01/whatsnew.xml | 7 +++++-- chapter03/patches.xml | 10 +++++----- chapter08/glibc.xml | 9 ++++----- packages.ent | 11 ++++------- patches.ent | 10 +++++----- 6 files changed, 41 insertions(+), 24 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3ca65e9f2..440ecac5f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -70,6 +70,24 @@ + + 2024-05-01 + + + [bdubbs] - Add security fix to glibc. Fixes + #5481. + + + [bdubbs] - Update to linux-6.8.8. Fixes + #5480. + + + [bdubbs] - Update to ncurses-6.5. Fixes + #5483. + + + + 2024-04-16 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 8bd40c0c1..2bd18a3e4 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -194,9 +194,9 @@ - + Ninja-&ninja-version; @@ -294,6 +294,9 @@ Lz4-&lz4-version; + + glibc-2.39-upstream_fix-1.patch + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 19402ac9e..87645f532 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -76,15 +76,15 @@ MD5 sum: &gcc-upstream-fixes-patch-md5; - +--> - Glibc Upstream Fixes Patch - &glibc-upstream-fixes-patch-size;: + Glibc Upstream Fix Patch - &glibc-upstream-patch-size;: - Download: - MD5 sum: &glibc-upstream-fixes-patch-md5; + Download: + MD5 sum: &glibc-upstream-patch-md5; ---> + Glibc FHS Patch - &glibc-fhs-patch-size;: diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 6d1be66ae..1984a4444 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -49,12 +49,11 @@ store their runtime data in the FHS-compliant locations: patch -Np1 -i ../&glibc-fhs-patch; - + Now fix a security vulnerability: + +patch -Np1 -i ../&glibc-upstream-patch; + The Glibc documentation recommends building Glibc in a dedicated build directory: diff --git a/packages.ent b/packages.ent index aea4ef2b0..1645b5e4e 100644 --- a/packages.ent +++ b/packages.ent @@ -526,15 +526,12 @@ - - + - - - - + + - + diff --git a/patches.ent b/patches.ent index 7bf0177a2..ae0f5d3c2 100644 --- a/patches.ent +++ b/patches.ent @@ -21,11 +21,11 @@ - + + + + + From 99056a6d6942818e03805beb8dbecd1809814a65 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 2 May 2024 18:38:35 +0800 Subject: [PATCH 6/9] glibc: Revise glibc-2.39 upstream fix patch The glibc-2.39-upstream_fix-1.patch file contains a broken tst-iconv-iso-2022-cn-ext.c file. It causes: FAIL: iconvdata/tst-iconv-iso-2022-cn-ext Revise the patch to fix it. (cherry picked from commit 9b39be4268ba3a6b9e1015766767c02d74858f8a) Reapply this change which is mistakenly reverted in 340e17adc67a1d7dc050fed51e384122f425e458. --- patches.ent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches.ent b/patches.ent index ae0f5d3c2..447287ec7 100644 --- a/patches.ent +++ b/patches.ent @@ -22,8 +22,8 @@ - - + + From 74dfcff3747d842940fdc2d77bfd78159caf9793 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 13 May 2024 13:28:11 +0800 Subject: [PATCH 7/9] Revert "e anduin for vim." This reverts commit 760d28c80946f1688cb50afea55a0bef7fc4b4e7. As we've discussed in #5490: LFS 9.0 (released 2019) downloads vim-8.1.1846 from GitHub directly, and the URL still works today and results a tarball with the same md5 as LFS 9.0 documents. Thus GitHub download seems stable enough from vim. Also note that "vim-9.1.0405.tar.gz" on anduin is actually a vim-9.1.0330 release tarball. --- packages.ent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.ent b/packages.ent index 1645b5e4e..82b643511 100644 --- a/packages.ent +++ b/packages.ent @@ -747,8 +747,8 @@ - - + + From 6a97bf00d7ef9831e9d1648ddf66509c6ce2140e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 13 May 2024 13:30:51 +0800 Subject: [PATCH 8/9] Revert "Make vim md5sum consistent with the version on anduin." This reverts commit 46e985d8af9a9c065fbab74f97d76d60f648f8d6. --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 82b643511..2af5b17ae 100644 --- a/packages.ent +++ b/packages.ent @@ -749,7 +749,7 @@ - + From 31c839da2d25117c86aa03b8a399859520ce7e07 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 13 May 2024 13:35:48 +0800 Subject: [PATCH 9/9] packages: Document why not to use anduin for vim --- packages.ent | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages.ent b/packages.ent index 2af5b17ae..e78e6387c 100644 --- a/packages.ent +++ b/packages.ent @@ -748,6 +748,17 @@ +