Sync with lfs-svn, fix ticket 3454

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

5 files changed, 40 insertions, 15 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f7bcce78e..38c873d3d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,32 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-12-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merge LFS SVN-20131222 book.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Linux-3.12.6. Fixes
+          <ulink url="&lfs-ticket-root;3452">#3452</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Tzdata-2013i. Fixes
+          <ulink url="&lfs-ticket-root;3451">#3451</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Libpipeline-1.2.6. Fixes
+          <ulink url="&lfs-ticket-root;3449">#3449</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Fix the coreutils-i18n patch, which introduced a
+          regression in cut. Fixes
+          <ulink url="&lfs-ticket-root;3448">#3448</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-12-21</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 336d8f8e8..ff5f2e8ce 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -287,8 +287,7 @@ ZONEINFO=/usr/share/zoneinfo
 mkdir -pv $ZONEINFO/{posix,right}
 
 for tz in etcetera southamerica northamerica europe africa antarctica  \
-          asia australasia backward pacificnew solar87 solar88 solar89 \
-          systemv; do
+          asia australasia backward pacificnew systemv; do
     zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz}
     zic -L /dev/null   -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz}
     zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz}
diff --git a/chapter07/locale.xml b/chapter07/locale.xml
index 2f661fb5a..ccdb92dff 100644
--- a/chapter07/locale.xml
+++ b/chapter07/locale.xml
@@ -122,7 +122,7 @@ EOF</userinput></screen>
   Systemd <command>localectl</command> utility. To use <command>localectl</command>
   for the example above, run:</para>
 
-<screen><userinput>localectl set-locale LANG="<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;"</replaceable></userinput></screen>
+<screen role="nodump"><userinput>localectl set-locale LANG="<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>"</userinput></screen>
 
   <para>You can also specify other language specific environment variables such
   as <envar>LANG</envar>, <envar>LC_CTYPE</envar>, <envar>LC_NUMERIC</envar> or
@@ -130,7 +130,7 @@ EOF</userinput></screen>
   seperate them with a space. An example where <envar>LANG</envar> is set as
   en_US.UTF-8 but <envar>LC_CTYPE</envar> is set as just en_US is:</para>
 
-<screen><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
+<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
 
   <note><para>Please note that <command>localectl</command> command can
   be used  only on a system booted with Systemd.</para></note>
diff --git a/packages.ent b/packages.ent
index 9247f0a5f..0b17454f2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -374,10 +374,10 @@
 <!ENTITY libcap-ch6-du "1.3 MB">
 <!ENTITY libcap-ch6-sbu "0.1 SBU">
 
-<!ENTITY libpipeline-version "1.2.5">
+<!ENTITY libpipeline-version "1.2.6">
 <!ENTITY libpipeline-size "761 KB">
 <!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "8d159fbd72368526559799f38dd9b4c6">
+<!ENTITY libpipeline-md5 "6d1d51a5dc102af41e0d269d2a31e6f9">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "7.4 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
@@ -395,12 +395,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "12">
-<!ENTITY linux-patch-version "5">
+<!ENTITY linux-patch-version "6">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "74,597 KB">
+<!ENTITY linux-size "74,606 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "5b5330f657f562f7bef6da100a7133b1">
+<!ENTITY linux-md5 "ab2fcc368e20d804e77970196154fb9e">
 <!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,
@@ -586,10 +586,10 @@
 <!ENTITY systemd-ch6-du  "29 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
 
-<!ENTITY tzdata-version "2013h">
-<!ENTITY tzdata-size "222 KB">
+<!ENTITY tzdata-version "2013i">
+<!ENTITY tzdata-size "214 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "d310abe42cbe87e76ceb69e2c7003c92">
+<!ENTITY tzdata-md5 "8bc69eb75bea496ebe1d5a9ab576702d">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index ddf13bbb8..dd23ba19f 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,9 +14,9 @@
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
-<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "2bca6d512abd69f0f133359839980495">
-<!ENTITY coreutils-i18n-patch-size "137 KB">
+<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-2.patch">
+<!ENTITY coreutils-i18n-patch-md5 "0f3b9f85e256140a4eaa5865a9c81f3f">
+<!ENTITY coreutils-i18n-patch-size "138 KB">
 
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">