Changeset 6c46cbb

Timestamp:

09/25/2023 10:30:11 PM (8 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

d3aa932

Parents:

85589aaa (diff), 3cd2eae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/coreutils.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -42 +42 @@
 
     <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>

chapter06/coreutils.xml

@@ -64 +64 @@
       </varlistentry>
 
-      <varlistentry>
-        <term><envar>gl_cv_macro_MB_CUR_MAX_good=y</envar></term>
-        <listitem>
-          <para>This is needed to work around an issue in the gnulib copy
-          shipped by the package which would break cross compilation.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 

patches.ent

@@ -15 +15 @@
 <!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">