aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Trepl <thomas@linuxfromscratch.org>2023-09-25 14:47:48 +0200
committerThomas Trepl <thomas@linuxfromscratch.org>2023-09-25 14:47:48 +0200
commit3cd2eae9eb3bc42c89e262c1f83cc9705ac17391 (patch)
tree41f7633b6b1ff233973fc3eadc376115fb00546d
parent96f7f5ed58947bee58cae884d299df0a324d5034 (diff)
parentc873f0a1b3dadc40f74eec1e50fab046c6479afd (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--patches.ent6
2 files changed, 13 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ca85137f6..448611067 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,16 @@
-->
<listitem>
+ <para>2023-09-24</para>
+ <itemizedlist>
+ <listitem>
+ <para>[xry111] - Update Glibc upstream fixes patch to plug a
+ memory leak introduced by the security fix.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2023-09-17</para>
<itemizedlist>
<listitem>
diff --git a/patches.ent b/patches.ent
index 6634d1f2f..3677f3e66 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,9 +14,9 @@
<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
<!ENTITY glibc-fhs-patch-size "2.8 KB">
-<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
-<!ENTITY glibc-upstream-fixes-patch-md5 "2e347e291804b62a18a43a8cdc79e01e">
-<!ENTITY glibc-upstream-fixes-patch-size "24 KB">
+<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-2.patch">
+<!ENTITY glibc-upstream-fixes-patch-md5 "a5a06adb7f61dcc901f35d810ac8a1c0">
+<!ENTITY glibc-upstream-fixes-patch-size "28 KB">
<!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">
<!ENTITY grub-upstream-fixes-patch-md5 "da388905710bb4cbfbc7bd7346ff9174">