Changeset 1dd25fd

Timestamp:

04/30/2024 10:30:19 PM (4 weeks ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

17695e52

Parents:

8df847c9 (diff), 7210854 (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)
• chapter01/whatsnew.xml (modified) (2 diffs)
• chapter03/patches.xml (modified) (1 diff)
• chapter08/glibc.xml (modified) (1 diff)
• chapter08/ncurses.xml (modified) (5 diffs)
• chapter08/sysklogd.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

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

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

chapter03/patches.xml

@@ -77 +77 @@
       </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>MD5 sum: <literal>&glibc-upstream-fixes-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></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>

chapter08/glibc.xml

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

chapter08/ncurses.xml

@@ -51 +51 @@
             --with-cxx-shared       \
             --enable-pc-files       \
-            --enable-widec          \
             --with-pkg-config-libdir=/usr/lib/pkgconfig</userinput></screen>
 
+      <!--  - -enable-widec this is now the default -->
     <variablelist>
       <title>The meaning of the new configure options:</title>
@@ -95 +95 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry>
-        <term><parameter>--enable-widec</parameter></term>
+        <term><parameter>- -enable-widec</parameter></term>
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
@@ -109 +109 @@
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>
 
@@ -128 +128 @@
 
     <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-release;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
@@ -138 +138 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
-install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib
-rm -v  dest/usr/lib/libncursesw.so.&ncurses-release;
+install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
 sed -e 's/^#if.*XOPEN.*$/#if 1/' \
     -i dest/usr/include/curses.h

chapter08/sysklogd.xml

@@ -56 +56 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make BINDIR=/sbin install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
   </sect2>

packages.ent

@@ -442 +442 @@
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "8">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-patch-version "8">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "139,255 KB">
+<!ENTITY linux-size "139,243 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "8ff592792d0b75149d64de7b86899eb1">
+<!ENTITY linux-md5 "d802ace782a45e14cc4a8efee7510dfd">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
@@ -537 +537 @@
 <!ENTITY mpfr-fin-sbu "0.3 SBU">
 
-<!ENTITY ncurses-release "6.4">
-<!ENTITY ncurses-version "&ncurses-release;-20230520">
+<!ENTITY ncurses-version "6.5">
 <!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 "&anduin-sources;/ncurses-&ncurses-version;.tar.xz">
-<!ENTITY ncurses-md5 "c5367e829b6d9f3f97b280bb3e6bfbc3">
+<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz">
+<!ENTITY ncurses-md5 "ac2d2629296f04c8537ca706b6977687">
 <!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">

patches.ent

@@ -18 +18 @@
 <!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 glibc-upstream-patch "glibc-&glibc-version;-upstream_fix-1.patch">
+<!ENTITY glibc-upstream-patch-md5 "49fb369a89bdbf52c71f0a084e97ad68">
+<!ENTITY glibc-upstream-patch-size "8.0 KB">
+
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">