Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -56,7 +56,7 @@
           <ulink url='&lfs-ticket-root;5484'>#5484</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to jinja2-3.1.4 (Python mpdule). Fixes
+          <para>[bdubbs] - Update to jinja2-3.1.4 (Python module). Fixes
           <ulink url='&lfs-ticket-root;5485'>#5485</ulink>.</para>
         </listitem>
         <listitem>
@@ -70,6 +70,24 @@
       </itemizedlist>
     </listitem>
 
+    <listitem>
+      <para>2024-05-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add security fix to glibc. Fixes
+          <ulink url='&lfs-ticket-root;5481'>#5481</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.8.8. Fixes
+          <ulink url='&lfs-ticket-root;5480'>#5480</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ncurses-6.5. Fixes
+          <ulink url='&lfs-ticket-root;5483'>#5483</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-04-16</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -194,9 +194,9 @@
     <!--<listitem>
       <para>MPFR-&mpfr-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Ncurses-&ncurses-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Ninja-&ninja-version;</para>
     </listitem>
@@ -294,6 +294,9 @@
     <listitem>
       <para>Lz4-&lz4-version;</para>
     </listitem>
+    <listitem>
+      <para>glibc-2.39-upstream_fix-1.patch</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>

chapter03/patches.xml

@@ -76,15 +76,15 @@
         <para>MD5 sum: <literal>&gcc-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
-      <term>Glibc Upstream Fixes Patch - <token>&glibc-upstream-fixes-patch-size;</token>:</term>
+      <term>Glibc Upstream Fix Patch - <token>&glibc-upstream-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-upstream-fixes-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-upstream-fixes-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>

chapter08/glibc.xml

@@ -49,12 +49,11 @@
     store their runtime data in the FHS-compliant locations:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
-<!--
-    <para>Now fix two security vulnerabilities and a regression causing the
-    posix_memalign() function very slow in some conditions:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-fixes-patch;</userinput></screen>
+    <para>Now fix a security vulnerability:</para>
--->
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
 

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" )

packages.ent

@@ -536,15 +536,12 @@
 <!ENTITY mpfr-fin-du "44 MB">
 <!ENTITY mpfr-fin-sbu "0.3 SBU">
 
-<!ENTITY ncurses-release "6.4">
+<!ENTITY ncurses-version "6.5">
-<!ENTITY ncurses-version "&ncurses-release;-20230520">
 <!ENTITY ncurses-size "2,156 KB">
-<!-- switch back to invisible-mirror.net for 6.5 -->
+<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz">
-<!--ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz"-->
+<!ENTITY ncurses-md5 "ac2d2629296f04c8537ca706b6977687">
-<!ENTITY ncurses-url "&anduin-sources;/ncurses-&ncurses-version;.tar.xz">
-<!ENTITY ncurses-md5 "c5367e829b6d9f3f97b280bb3e6bfbc3">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
-<!ENTITY ncurses-tmp-du "51 MB">
+<!ENTITY ncurses-tmp-du "3,603 KB">
 <!ENTITY ncurses-tmp-sbu "0.3 SBU">
 <!ENTITY ncurses-fin-du "45 MB">
 <!ENTITY ncurses-fin-sbu "0.2 SBU">
@@ -761,6 +758,17 @@
 <!ENTITY vim-docdir "vim/vim91">
 <!ENTITY vim-size "17,428 KB">
 <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
+<!-- N.B. LFS 9.0 uses
+     https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz
+     and it still works after years, the md5sum of the resulted tarball
+     is unchanged as well.  Thus GitHub download seems stable enough for
+     vim and there's no need to use anduin.
+
+     BTW if we click the "Next" button enough times on
+     https://github.com/vim/vim/tags, we can eventually see the old
+     release.  The "Next" button just sets "after=" in the URL.  For
+     example, https://github.com/vim/vim/tags?after=v8.1.1847 will show
+     us v8.1.1846. -->
 <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
 <!ENTITY vim-md5 "5379f5542310ee7ffbd6aea312407042">
 <!ENTITY vim-home "https://www.vim.org">

patches.ent

@@ -21,11 +21,11 @@
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
-<!--
+
-<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-4.patch">
+<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fix-2.patch">
-<!ENTITY glibc-upstream-fixes-patch-md5 "66e843b00688c641c9bdda684db45b43">
+<!ENTITY glibc-upstream-patch-md5 "e9f8f23746755bf880772cfa59c1896c">
-<!ENTITY glibc-upstream-fixes-patch-size "36 KB">
+<!ENTITY glibc-upstream-patch-size "8.0 KB">
--->
+
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">