Changeset ea6fdf5

Timestamp:

09/13/2023 10:30:12 PM (12 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

dc39c7b

Parents:

b0c238ac (diff), b91b12a (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:

• .gitignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• chapter08/glibc.xml (modified) (1 diff)
• chapter08/stripping.xml (modified) (2 diffs)
• git-version.sh (modified) (3 diffs)

.gitignore

@@ -1 +1 @@
 lfs-bootscripts-*.tar.xz
+lfs-*.tar.xz
 conditional.ent
 version.ent

Makefile

@@ -225 +225 @@
 all: book nochunks pdf dump-commands
 
-.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version
-
+dist:
+        $(Q)DIST=/tmp/LFS-RELEASE ./git-version.sh $(REV)
+        $(Q)rm -f lfs-$$(</tmp/LFS-RELEASE).tar.xz
+        $(Q)tar cJf lfs-$$(</tmp/LFS-RELEASE).tar.xz \
+                $(shell git ls-tree HEAD . --name-only) version.ent \
+                -C /tmp LFS-RELEASE \
+                --transform "s,^,lfs-$$(</tmp/LFS-RELEASE)/,"
+        $(Q)echo "Generated XML tarball lfs-$$(</tmp/LFS-RELEASE).tar.xz"
+
+.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version dist
+

chapter08/glibc.xml

@@ -55 +55 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-memalign-patch;</userinput></screen>
+
+    <!-- CVE-2023-4527
+         https://sourceware.org/bugzilla/show_bug.cgi?id=30842
+         https://sourceware.org/ml/libc-alpha/2023-September/151522.html -->
+    <para>Then fix a security vulnerability exploitable when the
+    <option>no-aaaa</option> option is used in
+    <filename>/etc/resolv.conf</filename>:</para>
+
+<screen><userinput remap="pre">sed \
+  -E "/__res_context_search/\
+      {N;N;s/(search \(([^,]*,){6}[^,]*)NULL/\1\&amp;alt_dns_packet_buffer/}" \
+  -i resolv/nss_dns/dns-host.c</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc

chapter08/stripping.xml

@@ -30 +30 @@
   dynamically linked binaries and shared libraries).</para>
 
-  <para>The debugging symbols from selected libraries are preserved
-  in separate files.  That debugging information is needed to run
-  regression tests with <ulink
+  <!-- TODO: Zstd is better than Zlib for both speed and size.
+             Unfortunately Valgrind does not support Zstd-compressed debug
+             info yet: https://bugs.kde.org/show_bug.cgi?id=469782 -->
+  <para>The debugging symbols from selected libraries are compressed with
+  <application>Zlib</application> and preserved in separate files.  That
+  debugging information is needed to run regression tests with <ulink
   url='&blfs-book;/general/valgrind.html'>valgrind</ulink> or <ulink
   url='&blfs-book;/general/gdb.html'>gdb</ulink> later, in BLFS.
@@ -78 +81 @@
 cd /usr/lib
 for LIB in $save_usrlib; do
-    objcopy --only-keep-debug $LIB $LIB.dbg
+    objcopy --only-keep-debug --compress-debug-sections=zlib $LIB $LIB.dbg
     cp $LIB /tmp/$LIB
     strip --strip-unneeded /tmp/$LIB

git-version.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ "$1" = sysv ]; then
@@ -14 +14 @@
 echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
 echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
+
+if [ -e LFS-RELEASE ]; then
+        exit 0
+fi
 
 if ! git status > /dev/null; then
@@ -66 +70 @@
 echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
 echo "<!ENTITY copyrightdate     \"1999-$year\">"          >> version.ent
+
+[ -z "$DIST" ] || echo $version > "$DIST"