From 063a4a0e647a76278d437018b7950e326c27e03e Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Fri, 23 Jan 2015 20:54:26 +0000
Subject: Merged trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10816 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml   | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml    |  4 ++--
 chapter05/gettext.xml     |  1 +
 chapter06/grub.xml        | 24 ++++++++++++++++++----
 general.ent               |  6 +++---
 packages.ent              | 30 +++++++++++++--------------
 prologue/architecture.xml |  2 +-
 prologue/hostreqs.xml     | 28 ++++++++++++++-----------
 8 files changed, 110 insertions(+), 37 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 94ff1a2f6..ca47a3fb6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,58 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2015-01-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to XML-Parser-2.44. Fixes 
+          <ulink url="&lfs-ticket-root;3733">#3733</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.77. Fixes 
+          <ulink url="&lfs-ticket-root;3732">#3732</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.18.2. Fixes 
+          <ulink url="&lfs-ticket-root;3731">#3731</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-01-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.22. Fixes 
+          <ulink url="&lfs-ticket-root;3729">#3729</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.15. Fixes 
+          <ulink url="&lfs-ticket-root;3727">#3727</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-01-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.76. Fixes 
+          <ulink url="&lfs-ticket-root;3728">#3728</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix URL for CLFS. Fixes 
+          <ulink url="&lfs-ticket-root;3727">#3727</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update copyright year.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Make version-check script more robust.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-12-25</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 72440d888..5350aa8da 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -34,9 +34,9 @@
     <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake &automake-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bash &bash-version;</para>
     </listitem>
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 58170e1f6..c88c0f468 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -76,6 +76,7 @@ EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make -C gnulib-lib
+make -C intl pluralx.c
 make -C src msgfmt
 make -C src msgmerge
 make -C src xgettext</userinput></screen>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 545508dcb..cd730a3d5 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -49,10 +49,26 @@
             --disable-efiemu       \
             --disable-werror</userinput></screen>
 
-    <para>The --disable-werror option allows the build to complete with
-    warnings introduced by more recent flex versions.  The other --disable
-    switches minimize what is built by disabling features and testing programs
-    not needed for LFS.</para>
+    <variablelist>
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--disable-werror</parameter></term>
+        <listitem>
+          <para>This allows the build to complete with warnings introduced
+          by more recent Flex versions.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-grub-emu-usb --disable-efiemu</parameter></term>
+        <listitem>
+          <para>These options minimize what is built by disabling features and
+          testing programs not needed for LFS.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Compile the package:</para>
 
diff --git a/general.ent b/general.ent
index eaac65d0d..3f48a8c8b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "20141228-systemd">
+<!ENTITY version         "20150123-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "December 28, 2014">
-<!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
+<!ENTITY releasedate     "January 23, 2015">
+<!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
diff --git a/packages.ent b/packages.ent
index d0887aa0a..e3277eae4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -30,11 +30,11 @@
 <!ENTITY autoconf-ch6-du "17.2 MB">
 <!ENTITY autoconf-ch6-sbu "4.3 SBU">
 
-<!ENTITY automake-version "1.14.1">
-<!ENTITY am-minor-version "1.14">
-<!ENTITY automake-size "1,456 KB">
+<!ENTITY automake-version "1.15">
+<!ENTITY am-minor-version "1.15">
+<!ENTITY automake-size "1,462 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "7fc29854c520f56b07aa232a0f880292">
+<!ENTITY automake-md5 "9a1ddb0e053474d9d1105cfe39b0c48d">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "107 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 12 SBU with tests)">
@@ -159,10 +159,10 @@
 <!ENTITY expect-ch5-du "4.3 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.21">
-<!ENTITY file-size "715 KB">
+<!ENTITY file-version "5.22">
+<!ENTITY file-size "716 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "549fe96e09041eabece9de2bb28ef923">
+<!ENTITY file-md5 "8fb13e5259fe447e02c4a37bc7225add">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "11.8 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -375,12 +375,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "18">
-<!ENTITY linux-patch-version "1">
+<!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 "79,040 KB">
+<!ENTITY linux-size "79,045 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "79c9b73a01e1dce0a4c28828496ef02c">
+<!ENTITY linux-md5 "7b28d5543cf3647d2483830af19f3770">
 <!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.75">
-<!ENTITY man-pages-size "1,264 KB">
+<!ENTITY man-pages-version "3.77">
+<!ENTITY man-pages-size "1,278 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "2497a812b5bd0160169a8042181005aa">
+<!ENTITY man-pages-md5 "758625f4a4813b438337d3837a9d2c87">
 <!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">
@@ -587,10 +587,10 @@
 <!ENTITY vim-ch6-du "109 MB">
 <!ENTITY vim-ch6-sbu "1.3 SBU">
 
-<!ENTITY xml-parser-version "2.43">
+<!ENTITY xml-parser-version "2.44">
 <!ENTITY xml-parser-size "232 KB">
 <!ENTITY xml-parser-url "http://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
-<!ENTITY xml-parser-md5 "2c9ca46832d8e7578bcda99eba3a47f1">
+<!ENTITY xml-parser-md5 "af4813fe3952362451201ced6fbce379">
 <!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
 <!ENTITY xml-parser-ch6-du "2.0 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
diff --git a/prologue/architecture.xml b/prologue/architecture.xml
index af08bc054..84bcc3bb7 100644
--- a/prologue/architecture.xml
+++ b/prologue/architecture.xml
@@ -41,7 +41,7 @@ data that exceeds 4GB, the advantages of a 64-bit system are substantial.</para>
 32-bit system and once for a 64-bit system. This is not directly supported in
 LFS because it would interfere with the educational objective of providing the
 instructions needed for a straightforward base Linux system.  You can refer to
-the <ulink url="http://trac.cross-lfs.org/">Cross Linux From Scratch</ulink>
+the <ulink url="http://trac.clfs.org/">Cross Linux From Scratch</ulink>
 project for this advanced topic.</para>
 
 <para>There is one last comment about 64-bit systems. There are some older
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 1ce491d66..3733ae5ad 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -163,18 +163,28 @@ bash --version | head -n1 | cut -d" " -f2-4
 echo "/bin/sh -&gt; `readlink -f /bin/sh`"
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
-if [ -e /usr/bin/yacc ];
-  then echo "/usr/bin/yacc -&gt; `readlink -f /usr/bin/yacc`";
-  else echo "yacc not found"; fi
+
+if [ -h /usr/bin/yacc ]; then
+  echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`";
+elif [ -x /usr/bin/yacc ]; then
+  echo yacc is `/usr/bin/yacc --version | head -n1`
+else
+  echo "yacc not found" 
+fi
 
 bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
 diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
-if [ -e /usr/bin/awk ];
-  then echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`";
-  else echo "awk not found"; fi
+
+if [ -h /usr/bin/awk ]; then
+  echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`";
+elif [ -x /usr/bin/awk ]; then
+  echo yacc is `/usr/bin/awk --version | head -n1`
+else 
+  echo "awk not found" 
+fi
 
 gcc --version | head -n1
 g++ --version | head -n1
@@ -195,12 +205,6 @@ if [ -x dummy ]
   then echo "g++ compilation OK";
   else echo "g++ compilation failed"; fi
 rm -f dummy.c dummy</literal>
-<!--
-for lib in lib{gmp,mpfr,mpc}.la; do
-  echo $lib: $(if find /usr/lib* -name $lib|
-               grep -q $lib;then :;else echo not;fi) found
-done
-unset lib</literal>-->
 EOF
 
 bash version-check.sh</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf