Merge latest changes from trunk to systemd branch

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

15 files changed, 167 insertions, 57 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d2892ba28..568004e2b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,67 @@
 -->
 
     <listitem>
+      <para>2013-02-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to File-5.13.  Fixes
+          <ulink url="&lfs-ticket-root;3292">#3292</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-02-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Remove the obsolete resizecons program from kbd, again.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-02-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to IPRoute2-3.8.0.  Fixes
+          <ulink url="&lfs-ticket-root;3291">#3291</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-3.8.  Fixes
+          <ulink url="&lfs-ticket-root;3290">#3290</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update file name for adjusting CD-ROM
+          rules mode in section 7.5.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-02-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Coreutils-8.21.  Fixes
+          <ulink url="&lfs-ticket-root;3286">#3286</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Texinfo-5.0.  Fixes
+          <ulink url="&lfs-ticket-root;3289">#3284</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Linux-3.7.9.  Fixes
+          <ulink url="&lfs-ticket-root;3287">#3281</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-02-15</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b17f7e5b5..983e10b3c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -190,9 +190,9 @@
     <listitem>
       <para>TCL &tcl-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Texinfo &texinfo-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Tzdata &tzdata-version;</para>
     </listitem>
@@ -243,11 +243,11 @@
     <listitem>
       <para>&coreutils-i18n-patch;</para>
     </listitem>
-
+<!--
     <listitem>
       <para>&coreutils-test-patch;</para>
     </listitem>
-
+-->
     <listitem>
       <para>D-Bus-&dbus-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index ef7dda783..83faa250c 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -50,6 +50,7 @@
       </listitem>
     </varlistentry>
 
+<!--
     <varlistentry>
       <term>Coreutils Test Fixes Patch - <token>&coreutils-test-patch-size;</token>:</term>
       <listitem>
@@ -57,6 +58,7 @@
         <para>MD5 sum: <literal>&coreutils-test-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 
     <varlistentry>
       <term>Flex Regression Tests Patch - <token>&flex-bison-patch-size;</token>:</term>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index b7f97a386..bf8076d1b 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -105,6 +105,11 @@ done</userinput></screen>
 
 <screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
 
+    <para>Do not build the .info files.  They are not needed here and 
+    are broken with the current version of <command>makeinfo</command>.</para>
+
+<screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6c936debc..6e7631741 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -97,6 +97,11 @@ mv -v gmp-&gmp-version; gmp
 tar -zxf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
+    <para>Again, do not build the .info files.  They are not needed here and
+    are broken with the current version of <command>makeinfo</command>.</para>
+
+    <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
+
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../gcc-build
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index e276f9544..74d8384b8 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
-
+<!--
     <para>Fix a couple of test failures:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&coreutils-test-patch;</userinput></screen>
-
+-->
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
     fixes this non-compliance and other internationalization-related bugs:</para>
@@ -87,7 +87,7 @@
     <para>Now the test suite is ready to be run. First, run the tests that are
     meant to be run as user <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody SUBDIRS= check-root</userinput></screen>
+<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
 
     <para>We're going to run the remainder of the tests as the
     <systemitem class="username">nobody</systemitem> user. Certain tests,
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f15144dae..1ecbf524c 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -48,6 +48,13 @@
 
 <screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
 
+    <para>Again, do not build the .info files. They are broken with the current
+    version of <command>makeinfo</command>.</para>
+
+    <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
+
+
+
     <para>As in <xref linkend="ch-tools-gcc-pass2"/>, apply the following
     <command>sed</command> to force the build to use the
     <option>-fomit-frame-pointer</option> compiler flag in order to ensure
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 315c3230c..dcc790c4a 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -49,12 +49,7 @@
     by echoing either <quote>A4</quote> or <quote>letter</quote> to the
     <filename>/etc/papersize</filename> file.</para>
 
-    <para>First, fix a bug in a Makefile, that prevents a symlink to a PDF from
-being created correctly:</para>
-
-<screen><userinput remap="pre">sed -i -e '163 s/$(DESTDIR)//' contrib/mom/Makefile.sub</userinput></screen>
-
-    <para>Now, prepare Groff for compilation:</para>
+    <para>Prepare Groff for compilation:</para>
 
 <screen><userinput remap="configure">PAGE=<replaceable>&lt;paper_size&gt;</replaceable> ./configure --prefix=/usr</userinput></screen>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index e773724aa..59e5862dd 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -119,10 +119,11 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install
+<screen><userinput remap="install">make install</userinput></screen>
+<!-- The html file generation is broken as of texinfo-5.0
 make -C doc html
 make -C doc install-html docdir=/usr/share/doc/inetutils-&inetutils-version;</userinput></screen>
-
+-->
     <para>Move some programs so they are available if <filename
     class='directory'>/usr</filename> is not accessable:</para>
 
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index b912ca4db..b10288014 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -53,6 +53,9 @@
 sed -i /ARPD/d Makefile
 sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
+    <para>Remove a compiler flag that causes the compilation to fail:</para>
+<screen><userinput remap="pre">sed -i 's/-Werror//' Makefile</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make DESTDIR=</userinput></screen>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index b16af7fa8..8178475d4 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -54,6 +54,14 @@
 
 <screen><userinput remap="pre">sed -i -e '326 s/if/while/' src/loadkeys.analyze.l</userinput></screen>
 
+    <para>Remove the redundant <command>resizecons</command> program (it requires
+    the defunct svgalib to provide the video mode files - for normal use
+    <command>setfont</command> sizes the console appropriately) together with its
+    manpage.</para>
+
+<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure &amp;&amp;
+sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;</userinput></screen>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd --disable-vlock</userinput></screen>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 67a9f6b72..3bac8536c 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -100,8 +100,8 @@ done</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>info, infokey, install-info, makeinfo, pdftexi2dvi, texi2dvi, texi2pdf, and
-        texindex</seg>
+        <seg>info, infokey, install-info, makeinfo, pdftexi2dvi, 
+        pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
         <seg>/usr/share/texinfo</seg>
       </seglistitem>
     </segmentedlist>
@@ -168,6 +168,27 @@ done</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pod2texi">
+        <term><command>pod2texi</command></term>
+        <listitem>
+          <para>Converts Pod to Texinfo format</para>
+          <indexterm zone="ch-system-texinfo pod2texi">
+            <primary sortas="b-pod2texi">pod2texi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="texi2any">
+        <term><command>texi2any</command></term>
+        <listitem>
+          <para>Translate Texinfo source documentation to 
+          various other formats</para>
+          <indexterm zone="ch-system-texinfo texi2any">
+            <primary sortas="b-texiany">texi2any</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="texi2dvi">
         <term><command>texi2dvi</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index b45ea4dd1..06fc61edd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20130216">
-<!ENTITY releasedate "February 16, 2013">
+<!ENTITY version "SVN-2013026">
+<!ENTITY releasedate "February 26, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 10a2f1e06..5f69b33b2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -84,15 +84,15 @@
 <!ENTITY check-ch5-du "6.9 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.20">
-<!ENTITY coreutils-size "5,150 KB">
+<!ENTITY coreutils-version "8.21">
+<!ENTITY coreutils-size "5,248 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "3d69af8f561fce512538a9fe85f147ff">
+<!ENTITY coreutils-md5 "065ba41828644eca5dd8163446de5d64">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
-<!ENTITY coreutils-ch5-du "126 MB">
-<!ENTITY coreutils-ch5-sbu "0.7 SBU">
-<!ENTITY coreutils-ch6-du "154 MB">
-<!ENTITY coreutils-ch6-sbu "4.0 SBU">
+<!ENTITY coreutils-ch5-du "133 MB">
+<!ENTITY coreutils-ch5-sbu "0.8 SBU">
+<!ENTITY coreutils-ch6-du "116 MB">
+<!ENTITY coreutils-ch6-sbu "3.4 SBU">
 
 <!ENTITY dbus-version "1.6.8">
 <!ENTITY dbus-size "1,884 KB">
@@ -148,10 +148,10 @@
 <!ENTITY expect-ch5-du "4.4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.11">
-<!ENTITY file-size "596 KB">
+<!ENTITY file-version "5.13">
+<!ENTITY file-size "627 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "16a407bd66d6c7a832f3a5c0d609c27b">
+<!ENTITY file-md5 "d60c1364ba956eff7d21f8250808fc6d">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "12.4 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -232,10 +232,10 @@
 <!ENTITY glibc-ch6-du "852 MB">
 <!ENTITY glibc-ch6-sbu "17.6 SBU">
 
-<!ENTITY gmp-version "5.1.0">
-<!ENTITY gmp-size "1,764 KB">
+<!ENTITY gmp-version "5.1.1">
+<!ENTITY gmp-size "1,771 KB">
 <!ENTITY gmp-url "ftp://ftp.gmplib.org/pub/gmp-&gmp-version;/gmp-&gmp-version;.tar.xz">
-<!ENTITY gmp-md5 "69fd511e435f81a0334f14f00c7d77b3">
+<!ENTITY gmp-md5 "485b1296e6287fa381e6015b19767989">
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch5-du "39 MB">
 <!ENTITY gmp-ch5-sbu "1.5 SBU">
@@ -260,10 +260,10 @@
 <!ENTITY grep-ch6-du "30 MB">
 <!ENTITY grep-ch6-sbu "0.4 SBU">
 
-<!ENTITY groff-version "1.22.1">
-<!ENTITY groff-size "3,920 KB">
+<!ENTITY groff-version "1.22.2">
+<!ENTITY groff-size "3,926 KB">
 <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
-<!ENTITY groff-md5 "875c9c628b8b78a0c325000a43ebb964">
+<!ENTITY groff-md5 "9f4cd592a5efc7e36481d8d8d8af6d16">
 <!ENTITY groff-home "&gnu-software;groff/">
 <!ENTITY groff-ch6-du "83 MB">
 <!ENTITY groff-ch6-sbu "0.5 SBU">
@@ -310,10 +310,10 @@
 <!ENTITY intltool-ch6-du "1.4 MB">
 <!ENTITY intltool-ch6-sbu "0.1 SBU">
 
-<!ENTITY iproute2-version "3.7.0">
-<!ENTITY iproute2-size "391 KB">
+<!ENTITY iproute2-version "3.8.0">
+<!ENTITY iproute2-size "398 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "b07241b267036de9a79ca5b69acf8593">
+<!ENTITY iproute2-md5 "951622fd770428116dc165acba375414">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
@@ -375,13 +375,13 @@
 <!ENTITY libtool-ch6-sbu "3.0 SBU">
 
 <!ENTITY linux-major-version "3">
-<!ENTITY linux-minor-version "7">
-<!ENTITY linux-patch-version "5">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
-<!ENTITY linux-size "68,437 KB">
+<!ENTITY linux-minor-version "8">
+<!--<!ENTITY linux-patch-version "9">-->
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
+<!ENTITY linux-size "69,326 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "ae355001775bc841132fe0fea2f354d4">
+<!ENTITY linux-md5 "1c738edfc54e7c65faeb90c436104e2f">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "540 - 800 MB">
 <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
@@ -419,10 +419,10 @@
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.46">
-<!ENTITY man-pages-size "1,092 KB">
+<!ENTITY man-pages-version "3.47">
+<!ENTITY man-pages-size "1,108 KB">
 <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "eba99dc469e526c3de2e91fe0a0ddc43">
+<!ENTITY man-pages-md5 "2046259794d3003f4dc4dbe4b688ba2f">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "22 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -562,15 +562,15 @@
 <!ENTITY tcl-ch5-du "33 MB">
 <!ENTITY tcl-ch5-sbu "0.4 SBU">
 
-<!ENTITY texinfo-version "4.13a">
-<!ENTITY texinfo-size "2,687 KB">
-<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.gz">
-<!ENTITY texinfo-md5 "71ba711519209b5fb583fed2b3d86fcb">
+<!ENTITY texinfo-version "5.0">
+<!ENTITY texinfo-size "3,000 KB">
+<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
+<!ENTITY texinfo-md5 "ef2fad34c71ddc95b20c7d6a08c0d7a6">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
-<!ENTITY texinfo-ch5-du "24 MB">
-<!ENTITY texinfo-ch5-sbu "0.2 SBU">
-<!ENTITY texinfo-ch6-du "24 MB">
-<!ENTITY texinfo-ch6-sbu "0.2 SBU">
+<!ENTITY texinfo-ch5-du "94 MB">
+<!ENTITY texinfo-ch5-sbu "0.3 SBU">
+<!ENTITY texinfo-ch6-du "101 MB">
+<!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
 <!ENTITY tzdata-version "2012j">
 <!ENTITY tzdata-size "209 KB">
diff --git a/patches.ent b/patches.ent
index 5601e86c9..003e8152e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -15,12 +15,14 @@
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "065f4a2340085105a68d8c3aa6ac60d3">
-<!ENTITY coreutils-i18n-patch-size "124 KB">
+<!ENTITY coreutils-i18n-patch-md5 "ada0ea6e1c00c4b7e0d634f49827943e">
+<!ENTITY coreutils-i18n-patch-size "132 KB">
 
+<!--
 <!ENTITY coreutils-test-patch "coreutils-&coreutils-version;-test_fixes-1.patch">
 <!ENTITY coreutils-test-patch-md5 "69639d7e09e3cfc66f151879e6d5d23d">
 <!ENTITY coreutils-test-patch-size "1.5 KB">
+-->
 
 <!ENTITY flex-bison-patch "flex-&flex-version;-bison-2.6.1-1.patch">
 <!ENTITY flex-bison-patch-md5 "d5b001ef9bdbbe32e2f27576d97d8ff0">