Changeset f30e3ce9 for chapter06

Timestamp:

03/06/2015 01:43:40 PM (9 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

0bf53444

Parents:

f202da3b

Message:

Merged trunk.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd@10866 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• coreutils.xml (modified) (1 diff)
• e2fsprogs.xml (modified) (1 diff)
• glibc.xml (modified) (2 diffs)
• grep.xml (modified) (1 diff)
• util-linux.xml (modified) (4 diffs)

chapter06/coreutils.xml

@@ -54 +54 @@
     error:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; &amp;&amp;
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; 
 touch Makefile.in</userinput></screen>
 

chapter06/e2fsprogs.xml

@@ -44 +44 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <para>First, fix a potential security issue identified upstream:</para>
+
+<screen><userinput remap="pre">sed -e '/int.*old_desc_blocks/s/int/blk64_t/' \
+    -e '/if (old_desc_blocks/s/super->s_first_meta_bg/desc_blocks/' \
+    -i lib/ext2fs/closefs.c</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in

chapter06/glibc.xml

@@ -68 +68 @@
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
+
+    <para>Fix a regression in the package that affects 32-bit architectures:</para>
+
+<screen><userinput remap="pre">sed -e '/ia32/s/^/1:/' \
+    -e '/SSE2/s/^1://' \
+    -i  sysdeps/i386/i686/multiarch/mempcpy_chk.S</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc outside of the source
@@ -150 +156 @@
       <listitem>
         <para>Other tests known to fail on some architectures are
-        malloc/tst-malloc-usable and  nptl/tst-cleanupx4. </para>
+        malloc/tst-malloc-usable and nptl/tst-cleanupx4. </para>
       </listitem>
 

chapter06/grep.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
+
+    <para>First fix a potential security issue identified upstream:</para>
+
+<screen><userinput remap="configure">sed -i -e '/tp++/a  if (ep &lt;= tp) break;' src/kwset.c</userinput></screen>
 
     <para>Prepare Grep for compilation:</para>

chapter06/util-linux.xml

@@ -127 +127 @@
         swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
         umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
-        wipefs, and x86_64</seg>
-        <seg>libblkid.{a,so}, libmount.{a,so}, and libuuid.{a,so}</seg>
+        wipefs, x86_64, and zramctl</seg>
+        <seg>libblkid.{a,so}, libfdisk.{a,so}, libmount.{a,so}, 
+        libsmartcols.{a,so}, and libuuid.{a,so}</seg>
         <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
         /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, 
@@ -1150 +1151 @@
       </varlistentry>
 
+      <varlistentry id="zramctl">
+        <term><command>zramctl</command></term>
+        <listitem>
+          <para>A program to set up and control zram (compressed ram disk) 
+          devices</para>
+          <indexterm zone="ch-system-util-linux zramctl">
+            <primary sortas="b-zramctl">zramctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libblkid">
         <term><filename class="libraryfile">libblkid</filename></term>
@@ -1161 +1173 @@
       </varlistentry>
 
+      <varlistentry id="libfdisk">
+        <term><filename class="libraryfile">libfdisk</filename></term>
+        <listitem>
+          <para>Contains routines for manipulating partition tables</para>
+          <indexterm zone="ch-system-util-linux libfdisk">
+            <primary sortas="c-libfdisk">libfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libmount">
         <term><filename class="libraryfile">libmount</filename></term>
@@ -1172 +1194 @@
       </varlistentry>
 
+      <varlistentry id="libsmartcols">
+        <term><filename class="libraryfile">libsmartcols</filename></term>
+        <listitem>
+          <para>Contains routines for aiding screen output in tabular form</para>
+          <indexterm zone="ch-system-util-linux libsmartcols">
+            <primary sortas="c-libsmartcols">libsmartcols</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libuuid">
         <term><filename class="libraryfile">libuuid</filename></term>