Merge lfs svn, dbus 1.8.6 update, fix md5sums repored by spiky.

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

chapter01/changelog.xml

@@ -35,6 +35,44 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-07-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merged LFS SVN-20140702.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to D-Bus 1.8.6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added command explanations for new switches on
+          GCC Pass 1. Fixes
+          <ulink url="&lfs-ticket-root;3625">#3625</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-06-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Install Vim documentation to /usr/share/doc
+          instead of creating a symlink there. Fixes
+          <ulink url="&lfs-ticket-root;3617">#3617</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed DESTDIR and MANDIR from IPRoute2
+          page - they are no longer needed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-06-29</para>
       <itemizedlist>

chapter05/gcc-pass1.xml

@@ -193,14 +193,15 @@ cd ../gcc-build</userinput></screen>
         <term><parameter>--disable-decimal-float, --disable-threads,
         --disable-libatomic, --disable-libgomp, --disable-libitm,
         --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
-        --disable-libssp, --disable-libstdc++-v3</parameter></term>
+        --disable-libssp, --disable-libvtv, --disable-libcilkrts,
+        --disable-libstdc++-v3</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
           extension, threading, libatomic, libgomp, libitm, libmudflap,
-          libquadmath, libsanitizer, libssp and the C++ standard library
-          respectively. These features will fail to compile when building a
-          cross-compiler and are not necessary for the task of cross-compiling
-          the temporary libc.</para>
+          libquadmath, libsanitizer, libssp, libvtv, libcilkrts
+          and the C++ standard library respectively. These features will fail
+          to compile when building a cross-compiler and are not necessary for
+          the task of cross-compiling the temporary libc.</para>
         </listitem>
       </varlistentry>
 

chapter06/binutils.xml

@@ -77,9 +77,9 @@ cd ../binutils-build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr  \
-                          --enable-shared \
-                          --disable-werror</userinput></screen>
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr   \
+                           --enable-shared \
+                           --disable-werror</userinput></screen>
 
     <para>Compile the package:</para>
 

chapter06/iproute2.xml

@@ -60,21 +60,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make DESTDIR=</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>DESTDIR=</parameter></term>
-        <listitem>
-          <para>This ensures that the IPRoute2 binaries will install into
-          the correct directory. By default, <parameter>DESTDIR</parameter> is
-          set to <filename class="directory">/usr</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="make">make</userinput></screen>
 
     <para>This package comes with a test suite, but due to assumptions it makes,
     it is not possible to reliably run these tests from within the chroot
@@ -87,9 +73,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=              \
-     MANDIR=/usr/share/man \
-     DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
+<screen><userinput remap="install">make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>
 

chapter06/vim.xml

@@ -83,7 +83,24 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
+        <listitem>
+          <para>Tells Vim to install its documentation into
+          <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
+          instead of 
+          <filename class="directory">/usr/share/&vim-docdir;/doc</filename>,
+          for better consistency with the documentation location for other
+          packages.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
@@ -96,14 +113,6 @@ for L in  /usr/share/man/{,*/}man1/vim.1; do
     ln -sv vim.1 $(dirname $L)/vi.1
 done</userinput></screen>
 
-    <para>By default, Vim's documentation is installed in <filename
-    class="directory">/usr/share/vim</filename>. The following symlink
-    allows the documentation to be accessed via <filename
-    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-    it consistent with the location of documentation for other packages:</para>
-
-<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
-
     <para>If an X Window System is going to be installed on the LFS
     system, it may be necessary to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some

general.ent

@@ -1,6 +1,6 @@
-<!ENTITY version         "20140629-systemd">
+<!ENTITY version         "20140706-systemd">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "June 29, 2014">
+<!ENTITY releasedate     "July 6, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -19,9 +19,9 @@
 <!ENTITY attr-size "336 KB">
 <!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.src.tar.gz">
 <!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
-<!ENTITY attr-home " ">
-<!ENTITY attr-ch6-du "3.5 MB">
-<!ENTITY attr-ch6-sbu "0.1 SBU">
+<!ENTITY attr-home "&gnu-software;attr/">
+<!ENTITY attr-ch6-du "17.1 MB">
+<!ENTITY attr-ch6-sbu "4.5 SBU">
 
 <!ENTITY autoconf-version "2.69">
 <!ENTITY autoconf-size "1,186 KB">
@@ -110,10 +110,10 @@
 <!ENTITY coreutils-ch6-du "116 MB">
 <!ENTITY coreutils-ch6-sbu "3.4 SBU">
 
-<!ENTITY dbus-version "1.8.4">
+<!ENTITY dbus-version "1.8.6">
 <!ENTITY dbus-size "1,820 KB">
 <!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "4717cb8ab5b80978fcadf2b4f2f72e1b">
+<!ENTITY dbus-md5 "6a08ba555d340e9dfe2d623b83c0eea8">
 <!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-ch6-du "35 MB">
 <!ENTITY dbus-ch6-sbu "less than 0.4 SBU">
@@ -251,7 +251,7 @@
 <!ENTITY gmp-version "6.0.0a">
 <!ENTITY gmp-extracted-version "6.0.0">
 <!ENTITY gmp-size "1,860 KB">
-<!ENTITY gmp-url "http://ftp.gnu.org/gnu/gmp/gmp-&gmp-version;.tar.xz">
+<!ENTITY gmp-url "&gnu;/gmp/gmp-&gmp-version;.tar.xz">
 <!ENTITY gmp-md5 "1e6da4e434553d2811437aa42c7f7c76">
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch5-du "39 MB">
@@ -337,7 +337,7 @@
 
 <!ENTITY kbd-version "2.0.1">
 <!ENTITY kbd-size "1,962 KB">
-<!ENTITY kbd-url "http://ftp.altlinux.org/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
+<!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.gz">
 <!ENTITY kbd-md5 "e9f2b7046312c11cec9e52e22f307b6a">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "20 MB">
@@ -464,7 +464,7 @@
 
 <!ENTITY ncurses-version "5.9">
 <!ENTITY ncurses-size "2,760 KB">
-<!ENTITY ncurses-url "http://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
+<!ENTITY ncurses-url "&gnu;/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-ch5-du "35 MB">
@@ -534,14 +534,22 @@
 <!ENTITY sed-ch6-du "6.7 MB">
 <!ENTITY sed-ch6-sbu "0.2 SBU">
 
-<!ENTITY shadow-version "4.1.5.1">
-<!ENTITY shadow-size "3,428 KB">
-<!ENTITY shadow-url "http://cdn.debian.net/debian/pool/main/s/shadow/shadow_&shadow-version;.orig.tar.gz">
-<!ENTITY shadow-md5 "ae66de9953f840fb3a97f6148bc39a30">
-<!-- <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org/"> -->
+<!ENTITY shadow-version "4.2.1">
+<!ENTITY shadow-size "1,558 KB">
+<!ENTITY shadow-url "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.xz">
+<!ENTITY shadow-md5 "2bfafe7d4962682d31b5eba65dba4fc8">
+<!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org/"> 
 <!ENTITY shadow-ch6-du "42 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
+<!ENTITY systemd-version "214">
+<!ENTITY systemd-size    "2,278 KB">
+<!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
+<!ENTITY systemd-md5     "eac4f9fc5bd18a0efc3fc20858baacf3">
+<!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
+<!ENTITY systemd-ch6-du  "410 MB">
+<!ENTITY systemd-ch6-sbu "4.5 SBU">
+
 <!ENTITY tar-version "1.27.1">
 <!ENTITY tar-size "1,835 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
@@ -571,14 +579,6 @@
 <!ENTITY texinfo-ch6-du "101 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY systemd-version "214">
-<!ENTITY systemd-size    "2,278 KB">
-<!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "eac4f9fc5bd18a0efc3fc20858baacf3">
-<!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "410 MB">
-<!ENTITY systemd-ch6-sbu "4.5 SBU">
-
 <!ENTITY tzdata-version "2014e">
 <!ENTITY tzdata-size "217 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">

patches.ent

@@ -57,7 +57,7 @@
 <!ENTITY readline-fixes-patch-size "3.1 KB">
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "1f87b648878a0f6f16717e17920d2198">
+<!ENTITY systemd-compat-patch-md5 "650d85acd70a3e4834f48c1c6ab0a496">
 <!ENTITY systemd-compat-patch-size "8.0 KB">
 
 <!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">

prologue/why.xml

@@ -174,7 +174,7 @@
         <para>Expat</para>
 
         <para>This package contains programs for parsing XML.  It is
-        required for systemd.
+        required for XML-Parser.
         </para>
       </listitem>
 
@@ -593,7 +593,7 @@
 
         <para>This package contains programs for compressing and decompressing
         files.  It provides the highest compression generally available
-        and is useful for decompressing packages XZ or LZMA format.</para>
+        and is useful for decompressing packages in XZ or LZMA format.</para>
       </listitem>
 
       <listitem>