From 092b86ad6d79eeaaab1d95c27a8d5dbcb91ecfb6 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 2 Feb 2024 05:10:56 +0800
Subject: [PATCH] Package updates:

- Update to glibc-2.39 (#5426)
- Update to linux-6.7.3 (#5427)
---
 chapter01/changelog.xml | 14 ++++++++++++++
 chapter01/whatsnew.xml  |  8 ++------
 chapter03/patches.xml   |  4 ++--
 chapter08/glibc.xml     |  4 ++--
 packages.ent            | 12 ++++++------
 patches.ent             |  4 ++--
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5f20d6177..72e12ddf2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,20 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-02-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to glibc-2.39 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5426'>#5426</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.7.3.  Fixes
+          <ulink url='&lfs-ticket-root;5427'>#5427</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-02-01</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ceca1c108..5faf938b7 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -101,9 +101,9 @@
     <listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
     </listitem>-->
@@ -298,10 +298,6 @@
       <para>setuptools-&setuptools-version;</para>
     </listitem>
 
-    <listitem>
-      <para>&glibc-upstream-fixes-patch;</para>
-    </listitem>
-
     <listitem>
       <para>&pkgconf-upstream-fix-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 106527518..f05fbd604 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -76,7 +76,7 @@
         <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>
       <listitem>
@@ -84,7 +84,7 @@
         <para>MD5 sum: <literal>&glibc-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index ae4856581..86b830249 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -49,12 +49,12 @@
     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>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
 
diff --git a/packages.ent b/packages.ent
index 22e143878..4d607f89c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -255,10 +255,10 @@
 <!ENTITY gettext-fin-du "250 MB">
 <!ENTITY gettext-fin-sbu "1.4 SBU">
 
-<!ENTITY glibc-version "2.38">
-<!ENTITY glibc-size "18,471 KB">
+<!ENTITY glibc-version "2.39">
+<!ENTITY glibc-size "18,092 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "778cce0ea6bf7f84ca8caacf4a01f45b">
+<!ENTITY glibc-md5 "be81e87f72b5ea2c0ffe2bedfeb680c6">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-tmp-du "858 MB">
 <!ENTITY glibc-tmp-sbu "1.6 SBU">
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "7">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "3">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "138,085 KB">
+<!ENTITY linux-size "138,128 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "62b0a6c979a54569295d34ed57f47875">
+<!ENTITY linux-md5 "a542a2aea4db4cf09e932fff02c8d1d1">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
  allnoconfig + some configs we recommend for the users, rounded down to
diff --git a/patches.ent b/patches.ent
index c2f957aad..a6e3a306e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -17,11 +17,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-fixes-patch-md5 "66e843b00688c641c9bdda684db45b43">
 <!ENTITY glibc-upstream-fixes-patch-size "36 KB">
-
+-->
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">