Import trunk.

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

appendices/dependencies.xml

@@ -2295,7 +2295,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg><ulink url="https://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink></seg>
         </seglistitem>
       </segmentedlist>
 

chapter01/changelog.xml

@@ -35,6 +35,98 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-11-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Move the page concerning /etc/shells
+          from BLFS to LFS Chapter 7. Fixes 
+          <ulink url="&lfs-ticket-root;3705">#3705</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-11-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.17.2. Fixes 
+          <ulink url="&lfs-ticket-root;3704">#3704</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-3.17.0. Fixes 
+          <ulink url="&lfs-ticket-root;3703">#3703</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-10-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-4.9.2. Fixes 
+          <ulink url="&lfs-ticket-root;3702">#3702</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-10-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libtool-2.4.3. Fixes 
+          <ulink url="&lfs-ticket-root;3699">#3699</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-10-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libpipeline-1.4.0. Fixes 
+          <ulink url="&lfs-ticket-root;3698">#3698</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-10-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2014i. Fixes 
+          <ulink url="&lfs-ticket-root;3696">#3696</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.25.2. Fixes 
+          <ulink url="&lfs-ticket-root;3697">#3697</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-10-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove reference to GMT in Chapter 5
+          tcl page. Fixes 
+          <ulink url="&lfs-ticket-root;3692">#3692</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.17.1. Fixes 
+          <ulink url="&lfs-ticket-root;3693">#3693</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.3. Fixes 
+          <ulink url="&lfs-ticket-root;3694">#3694</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.75. Fixes 
+          <ulink url="&lfs-ticket-root;3695">#3695</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-10-11</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -65,6 +65,10 @@
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
     <!--<listitem>
+      <para>Eudev &eudev-version;</para>
+    </listitem>-->
+    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -85,15 +89,15 @@
     <!--<listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
@@ -124,9 +128,9 @@
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
@@ -142,9 +146,9 @@
     <listitem>
       <para>Libpipeline &libpipeline-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Libtool &libtool-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Linux &linux-version;</para>
     </listitem>
@@ -208,9 +212,9 @@
     <listitem>
       <para>Tzdata &tzdata-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
     </listitem>-->
@@ -260,6 +264,10 @@
       <para>bash-4.3-upstream_fixes-3.patch</para>
     </listitem>
 
+    <listitem>
+      <para>gcc-4.9.1-upstream_fixes-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>readline-6.3-upstream_fixes-2.patch</para>
     </listitem>

chapter03/patches.xml

@@ -83,7 +83,7 @@
       </listitem>
     </varlistentry>
 -->
-
+<!--
     <varlistentry>
       <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -91,7 +91,7 @@
         <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>

chapter05/gcc-pass1.xml

@@ -104,11 +104,11 @@ done</userinput></screen>
     command:</para>
 
 <screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
-
+<!--
     <para>Also fix a problem identified upstream:</para>
 
 <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
-
+-->
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 

chapter05/gcc-pass2.xml

@@ -94,11 +94,11 @@ tar -xf ../gmp-&gmp-version;.tar.xz
 mv -v gmp-&gmp-extracted-version; gmp
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
-
+<!--
     <para>As in the first build of GCC, fix a problem identified upstream:</para>
 
 <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
-
+-->
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../gcc-build

chapter05/tcl.xml

@@ -67,7 +67,7 @@
     conditions that are not fully understood. Therefore, test suite failures
     here are not surprising, and are not considered critical. The
     <parameter>TZ=UTC</parameter> parameter sets the time zone to Coordinated
-    Universal Time (UTC), also known as Greenwich Mean Time (GMT), but only
+    Universal Time (UTC), but only
     for the duration of the test suite run. This ensures that the clock tests
     are exercised correctly. Details on the <envar>TZ</envar> environment
     variable are provided in <xref linkend="chapter-bootscripts"/>.</para>

chapter06/autoconf.xml

@@ -55,7 +55,8 @@
 
     <para>This takes a long time, about 4.7 SBUs. In addition, 6 tests are skipped
     that use Automake. For full test coverage, Autoconf can be re-tested
-    after Automake has been installed.</para>
+    after Automake has been installed.  In addition, one test fails due to
+    changes in libtool-2.4.3 and later.</para>
 
     <para>Install the package:</para>
 

chapter06/coreutils.xml

@@ -71,6 +71,15 @@ touch Makefile.in</userinput></screen>
     <variablelist>
       <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
+        <listitem>
+          <para>This environment variable allows the package to be 
+          built as the root user.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--enable-no-install-program=kill,uptime</parameter></term>
         <listitem>
@@ -112,6 +121,9 @@ touch Makefile.in</userinput></screen>
 <screen><userinput remap="test">su nobody -s /bin/bash \
           -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
+    <para>The stty-pairs test is known to fail on a virtual console, but
+    passes if run in a X terminal.</para>
+
     <para>Remove the temporary group:</para>
 
 <screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>

chapter06/gcc.xml

@@ -40,7 +40,7 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
+<!--
     <para>As in Chapter 5, fix a problem identified upstream:</para>
 
 <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
@@ -50,7 +50,7 @@
     programs to fail:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
-
+-->
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 

chapter06/gmp.xml

@@ -67,7 +67,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--docdir=/usr/share/doc-gmp&gmp-version;</parameter></term>
+        <term><parameter>--docdir=/usr/share/doc/gmp&gmp-version;</parameter></term>
         <listitem>
           <para>This variable specifies the correct place for the
           documentation.</para>

chapter06/libtool.xml

@@ -54,6 +54,9 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>Five tests are known to fail in the LFS build envronment,
+    but all tests pass if rechecked after Chapter 6 is complete.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>

chapter06/util-linux.xml

@@ -54,16 +54,27 @@
 
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
-
+<!--
     <para>First, fix one of the regression tests:</para>
 
 <screen><userinput remap="pre">sed -e 's/2^64/(2^64/' -e 's/E &lt;/E) &lt;=/' -e 's/ne /eq /' \
     -i tests/ts/ipcs/limits2</userinput></screen>
-
+-->
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-            --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime     \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
+            --disable-chfn-chsh  \
+            --disable-login      \
+            --disable-su         \
+            --disable-setpriv    \
+            --disable-runuser    \
+            --disable-pylibmount \
+            --without-python</userinput></screen>
+
+    <para>The --disable and --without options prevent warnings about
+    building components that require packages not in LFS or are 
+    inconsistent with programs installed by other packages.</para>
 
     <para>Compile the package:</para>
 

chapter07/chapter07.xml

@@ -19,6 +19,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-custom.xml"/>
 
 </chapter>

chapter07/etcshells.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-config-shells" xreflabel="Creating the /etc/shells File">
+  <?dbhtml filename="etcshells.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2007-04-04 14:42:53 -0500 (Wed, 04 Apr 2007) $</date>
+  </sect1info>
+
+  <title>Creating the /etc/shells File</title>
+
+  <indexterm zone="ch-config-shells">
+    <primary sortas="e-etc-shells">/etc/shells</primary>
+  </indexterm>
+
+  <para>The <filename>shells</filename> file contains a list of
+  login shells on the system. Applications use this file to determine
+  whether a shell is valid. For each shell a single line should be
+  present, consisting of the shell's path, relative to the root of the
+  directory structure (/).</para>
+
+  <para>For example, this file is consulted by <command>chsh</command>
+  to determine whether an unprivileged user may change the login shell for her
+  own account. If the command name is not listed, the user will be denied of
+  change.</para>
+
+  <para>It is a requirement for applications such as
+  <application>GDM</application> which does not populate the
+  face browser if it can't find <filename>/etc/shells</filename>, or
+  FTP daemons which traditionally disallow access to users
+  with shells not included in this file.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/shells &lt;&lt; "EOF"
+<literal># Begin /etc/shells
+
+/bin/sh
+/bin/bash
+
+# End /etc/shells</literal>
+EOF</userinput></screen>
+
+</sect1>

general.ent

@@ -1,6 +1,6 @@
-<!ENTITY version         "20141025-systemd">
+<!ENTITY version         "20141104-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "October 25, 2014">
+<!ENTITY releasedate     "November 4, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -197,10 +197,10 @@
 <!ENTITY gawk-ch6-du "34 MB">
 <!ENTITY gawk-ch6-sbu "0.3 SBU">
 
-<!ENTITY gcc-version "4.9.1">
-<!ENTITY gcc-size "87,749 KB">
+<!ENTITY gcc-version "4.9.2">
+<!ENTITY gcc-size "87,832 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "fddf71348546af523353bd43d34919c1">
+<!ENTITY gcc-md5 "4df8ee253b7f3863ad0b86359cd39c43">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "2.0 GB">
 <!ENTITY gcc-ch5p1-sbu "7.4 SBU">
@@ -220,10 +220,10 @@
 <!ENTITY gdbm-ch6-du "10.9 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.19.2">
-<!ENTITY gettext-size "6,467 KB">
+<!ENTITY gettext-version "0.19.3">
+<!ENTITY gettext-size "6,474 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "1e6a827f5fbd98b3d40bd16b803acc44">
+<!ENTITY gettext-md5 "092c3f460553ceb4a638ff81d36434c4">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "140 MB">
 <!ENTITY gettext-ch5-sbu "0.7 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY intltool-ch6-du "1.3 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "3.16.0">
-<!ENTITY iproute2-size "429 KB">
+<!ENTITY iproute2-version "3.17.0">
+<!ENTITY iproute2-size "430 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "6c823b40fdcfa7b8120743349a52ac18">
+<!ENTITY iproute2-md5 "b741a02c6dda5818d18011d572874493">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "8.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -357,30 +357,30 @@
 <!ENTITY libcap-ch6-du "1.4 MB">
 <!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY libpipeline-version "1.3.1">
-<!ENTITY libpipeline-size "770 KB">
+<!ENTITY libpipeline-version "1.4.0">
+<!ENTITY libpipeline-size "787 KB">
 <!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "31a34830c0f8a6d40ee373df51f04baa">
+<!ENTITY libpipeline-md5 "660f4ac9340834a231d1516746d03d28">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "7.7 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
 
-<!ENTITY libtool-version "2.4.2">
-<!ENTITY libtool-size "2,571 KB">
+<!ENTITY libtool-version "2.4.3">
+<!ENTITY libtool-size "1,696 KB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
-<!ENTITY libtool-md5 "d2f3b7d4627e69e13514a40e72a24d50">
+<!ENTITY libtool-md5 "ec4dabd3bc580dc188197d4d5eb95fe3">
 <!ENTITY libtool-home "&gnu-software;libtool/">
 <!ENTITY libtool-ch6-du "37 MB">
 <!ENTITY libtool-ch6-sbu "3.0 SBU">
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "3">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "78,451 KB">
+<!ENTITY linux-patch-version "2">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-size "78,449 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "fb30d0f29214d75cddd2faa94f73d5cf">
+<!ENTITY linux-md5 "87444e6f0906e2ec783cf0ed6aab1a56">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -421,10 +421,10 @@
 <!ENTITY man-db-ch6-du "28 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.74">
-<!ENTITY man-pages-size "1,261 KB">
+<!ENTITY man-pages-version "3.75">
+<!ENTITY man-pages-size "1,264 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "f732add6fe55c6020368bd9d0021ff09">
+<!ENTITY man-pages-md5 "2497a812b5bd0160169a8042181005aa">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "24 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -562,16 +562,16 @@
 <!ENTITY texinfo-ch6-du "99 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2014h">
-<!ENTITY tzdata-size "280 KB">
+<!ENTITY tzdata-version "2014i">
+<!ENTITY tzdata-size "283 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "ed05111948beba8a0f30956baa46b272">
+<!ENTITY tzdata-md5 "00adeb62a0897aac5ba67da838351adb">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
-<!ENTITY util-linux-version "2.25.1">
-<!ENTITY util-linux-size "3,609 KB">
+<!ENTITY util-linux-version "2.25.2">
+<!ENTITY util-linux-size "3,617 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.25/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "2ff36a8f8ede70f66c5ad0fb09e40e79">
+<!ENTITY util-linux-md5 "cab3d7be354000f629bc601238b629b3">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "104 MB">
 <!ENTITY util-linux-ch5-sbu "0.7 SBU">

patches.ent

@@ -37,9 +37,11 @@
 <!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB">
 -->
 
+<!--
 <!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
 <!ENTITY gcc-upstream-patch-md5 "015e026dff5052cd65906ee0bb8f25e8">
 <!ENTITY gcc-upstream-patch-size "8.6 KB">
+-->
 
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">

prologue/why.xml

@@ -108,18 +108,12 @@
         procedures of every package in LFS.</para>
       </listitem>
 
-      <listitem>
-        <para>D-Bus</para>
-
-        <para>D-Bus is a message bus system, a simple way for applications to
-        communicate with one another; it is required by Systemd.</para>
-      </listitem>
-
       <listitem>
         <para>D-Bus</para>
 
         <para>This package contains programs to implement a message bus system, 
-        which a simple way for applications to talk to one another.
+        which a simple way for applications to talk to one another. It is
+        required by systemd.
         </para>
       </listitem>