Changeset d8c2d84 for chapter08

Timestamp:

01/24/2024 12:26:42 PM (6 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64

Children:

648f145

Parents:

9f894d5 (diff), 5bef8f2 (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:

Merge remote-tracking branch 'origin/trunk' into xry111/arm64

Location:

chapter08

Files:

• coreutils.xml (modified) (1 diff)
• gcc.xml (modified) (1 diff)
• ncurses.xml (modified) (5 diffs)
• pkgconf.xml (modified) (1 diff)

chapter08/coreutils.xml

@@ -54 +54 @@
     </note>
 
-    <!-- https://bugs.gnu.org/62403 -->
-<!--
-    <para>Fix a bug in checksum utilities causing failed checks not
-    reported correctly:</para>
-
-<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
--->
+    <!-- https://seclists.org/oss-sec/2024/q1/30 -->
+    <para>Fix a security vulnerability in the <command>split</command>
+    utility:</para>
+
+<screen><userinput remap="pre">sed -e '/n_out += n_hold/,+4 s|.*bufsize.*|//&amp;|' \
+    -i src/split.c</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 

chapter08/gcc.xml

@@ -531 +531 @@
         <term><filename class="libraryfile">libcc1</filename></term>
         <listitem>
-          <para>The C preprocessing library</para>
+          <para>A library that allows GDB to make use of GCC</para>
           <indexterm zone="ch-system-gcc libcc1">
             <primary sortas="b-libcc1">libcc1</primary>

chapter08/ncurses.xml

@@ -100 +100 @@
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
-          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+          class="libraryfile">libncursesw.so.&ncurses-release;</filename>)
           to be built instead of normal ones (e.g., <filename
-          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+          class="libraryfile">libncurses.so.&ncurses-release;</filename>).
           These wide-character libraries are usable in both multibyte and
           traditional 8-bit locales, while normal libraries work properly
@@ -128 +128 @@
 
     <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-release;</filename>
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
     <literal>DESTDIR</literal>, and replace the library file correctly using
-    <command>install</command> command:</para>
+    <command>install</command> command (the header
+    <filename>curses.h</filename> is also edited to ensure the
+    wide-character ABI to be used as what we've done in
+    <xref linkend='ch-tools-ncurses'/>):</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
-install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
-rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
+install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-release;
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i dest/usr/include/curses.h
 cp -av dest/* /</userinput></screen>
 
     <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into linking with
-    wide-character libraries by means of symlinks and linker scripts:</para>
+    non-wide-character Ncurses libraries. Trick such applications into
+    linking with wide-character libraries by means of symlinks
+    (note that the <filename class='extension'>.so</filename> links are
+    only safe with <filename>curses.h</filename> edited to always use the
+    wide-character ABI):</para>
 
 <screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    rm -vf                    /usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
+    ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so
+    ln -sfv ${lib}w.pc    /usr/lib/pkgconfig/${lib}.pc
 done</userinput></screen>
 
@@ -153 +160 @@
     buildable:</para>
 
-<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
-ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
+<screen><userinput remap="install">ln -sfv libncursesw.so /usr/lib/libcurses.so</userinput></screen>
 
     <para>If desired, install the Ncurses documentation:</para>
@@ -207 +212 @@
         </seg>
         <seg>
-           libcursesw.so (symlink and linker script to libncursesw.so),
+           libcurses.so (symlink),
+           libform.so (symlink),
            libformw.so,
+           libmenu.so (symlink),
            libmenuw.so,
+           libncurses.so (symlink),
            libncursesw.so,
            libncurses++w.so,
-           libpanelw.so, and their non-wide-character counterparts without "w"
-              in the library names.</seg>
+           libpanel.so (symlink),
+           and libpanelw.so,
+        </seg>
         <seg>
            /usr/share/tabset,
@@ -343 +352 @@
       </varlistentry>
 
-      <varlistentry id="libcursesw">
-        <term><filename class="libraryfile">libcursesw</filename></term>
-        <listitem>
-          <para>A link to <filename>libncursesw</filename></para>
-          <indexterm zone="ch-system-ncurses libcursesw">
-            <primary sortas="c-libcursesw">libcursesw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libncursesw">
         <term><filename class="libraryfile">libncursesw</filename></term>

chapter08/pkgconf.xml

@@ -46 +46 @@
 
     <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
-    <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
+    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
 
-    <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
+    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
 
     <para>Prepare Pkgconf for compilation:</para>