From c0b11718f64080ee987f49ec32f19fa5733b5140 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 2 Sep 2012 03:32:54 +0000
Subject: Add a patch to Chapter 6 glibc to fix the test-installation.pl script
 instead of just preventing it from running

Update to systemd-189


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9981 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  16 +++++
 chapter01/whatsnew.xml  | 163 +++++++++++-------------------------------------
 chapter03/patches.xml   |   8 +++
 chapter06/glibc.xml     |   6 +-
 general.ent             |   6 +-
 packages.ent            |  12 ++--
 patches.ent             |   4 ++
 7 files changed, 76 insertions(+), 139 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 28d648dbd..19ffad1e9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,22 @@
 
 -->
 
+    <listitem>
+      <para>2012-09-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a patch to Chapter 6 glibc to fix
+          the test-installation.pl script instead of just preventing
+          it from running. Fixes
+          <ulink url="&lfs-ticket-root;3175">#3175</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to systemd-189.  Fixes
+          <ulink url="&lfs-ticket-root;3167">#3167</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-09-01</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 70b28da9d..7834a3244 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -25,12 +25,12 @@
     <!--<listitem>
     <para>None</para>
     </listitem> -->
-    <listitem>
+    <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>
     <listitem>
       <para>Automake &automake-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
@@ -40,34 +40,34 @@
     <!--<listitem>
       <para>Binutils &binutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Bison &bison-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bzip2 &bzip2-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>File &file-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Flex &flex-version;</para>
     </listitem>
     <listitem>
@@ -75,14 +75,14 @@
     </listitem>
     <listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>
     <listitem>
@@ -90,23 +90,23 @@
     </listitem>
     <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Groff &groff-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>GRUB &grub-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gzip &gzip-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>IANA-Etc &iana-etc-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Inetutils &inetutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
     <listitem>
@@ -114,29 +114,29 @@
     </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Libpipeline &libpipeline-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libtool &libtool-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Linux &linux-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>M4 &m4-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Man-DB &man-db-version;</para>
     </listitem>
     <listitem>
@@ -147,31 +147,31 @@
     </listitem>
     <listitem>
       <para>MPFR &mpfr-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Patch &patch-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Perl &perl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Procps &procps-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Psmisc &psmisc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Readline &readline-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Sed &sed-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Shadow &shadow-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Sysklogd &sysklogd-version;</para>
     </listitem>-->
@@ -181,9 +181,9 @@
     <!--<listitem>
       <para>Tar &tar-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>TCL &tcl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
     </listitem>-->
@@ -193,9 +193,9 @@
     <!--<listitem>
       <para>&udev-config;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Util-Linux &util-linux-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Vim &vim-version;</para>
     </listitem>-->
@@ -220,48 +220,9 @@
     <title>Added:</title>
 
     <listitem>
-      <para>&bash-fixes-patch;</para>
+      <para>&glibc-installation-patch;</para>
     </listitem>
 
-    <listitem>
-      <para>&binutils-build-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&coreutils-i18n-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&flex-bison-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&glibc-fix-resolv-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&kbd-fixes-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&make-fixes-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&perl-libc-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>pkg-config-&pkgconfig-version;</para>
-    </listitem>
-
-    <listitem>
-      <para>&sed-testsuite-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>tzdata &tzdata-version;</para>
-    </listitem>
 
 <!--  Added and removed in this cycle
     <listitem>
@@ -274,59 +235,7 @@
     <title>Removed:</title>
 
     <listitem>
-      <para>bash-4.2-fixes-4.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.15-i18n-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.15-uname-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>flex-2.5.35-gcc44-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-4.6.2-cross_compile-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-4.6.2-startfiles_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.14.1-fixes-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.14.1-gcc_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.14.1-cpuid-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.14.1-sort-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>mpfr-3.1.0-fixes-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>perl-5.14.2-libc-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>perl-5.14.2-security-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>shadow-4.1.5-nscd-1.patch</para>
+      <para></para>
     </listitem>
 
   </itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4f60e88b5..5953c8100 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -66,6 +66,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc test-installation.pl Patch - <token>&glibc-installation-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-installation-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-installation-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
 <!--
     <varlistentry>
       <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 87e113292..8e5a411f0 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -90,10 +90,10 @@ unset DL</userinput></screen>-->
 
     <para>When running <command>make install</command>, a script called
     <filename>test-installation.pl</filename> performs a small sanity test on
-    our newly installed Glibc. However, it contains a bug that causes it to
-    fail, so prevent it from running by issuing the following command:</para>
+    our newly installed Glibc. Use a patch to fix the bug that causes it to
+    fail:</para>
 
-<screen><userinput remap="pre">sed -i '/test-installation.pl/d' Makefile</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-installation-patch;</userinput></screen>
 
     <para>The <command>ldd</command> shell script contains Bash-specific
     syntax. Change its default program interpreter to <command>/bin/bash</command>
diff --git a/general.ent b/general.ent
index 5df6c7bad..48d39d79f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version "SVN-20120831">
-<!ENTITY releasedate "August 31, 2012">
+<!ENTITY version "SVN-20120902">
+<!ENTITY releasedate "September 2, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone "7.2">
+<!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
diff --git a/packages.ent b/packages.ent
index 832f7c5c9..826650338 100644
--- a/packages.ent
+++ b/packages.ent
@@ -524,10 +524,10 @@
 <!ENTITY texinfo-ch6-du "24 MB">
 <!ENTITY texinfo-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "188">
-<!ENTITY systemd-size    "1,324 KB">
+<!ENTITY systemd-version "189">
+<!ENTITY systemd-size    "1,344 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "d89b42699695554949d072ef46c0dfc9">
+<!ENTITY systemd-md5     "ac2eb313f5dce79622f60aac56bca66d">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
 <!ENTITY systemd-ch6-du  "17.4 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
@@ -540,10 +540,10 @@
 <!ENTITY tzdata-ch6-du "5.6 MB">
 <!ENTITY tzdata-ch6-sbu "0.1 SBU">
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-3"> 
-<!ENTITY udev-lfs-size   "20 KB">   
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;"> 
+<!ENTITY udev-lfs-size   "17 KB">   
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "ef6cd9f078c39c61ba744d08276a1210">    
+<!ENTITY udev-lfs-md5    "2840cd8c5fa91617efd36123486a7ac5">    
 <!ENTITY udev-lfs-home   " ">
 
 <!ENTITY util-linux-version "2.21.2">
diff --git a/patches.ent b/patches.ent
index 759dea37a..4b231741d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -38,6 +38,10 @@
 <!ENTITY glibc-fix-resolv-patch-md5 "d37659c643b1a2150624120238e5b295">
 <!ENTITY glibc-fix-resolv-patch-size "2.0 KB">
 
+<!ENTITY glibc-installation-patch "glibc-&glibc-version;-fix_test_installation-1.patch">
+<!ENTITY glibc-installation-patch-md5 "0a3bd5919ea226efebed62833a0985c6">
+<!ENTITY glibc-installation-patch-size "1.4 KB">
+
 
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
-- 
cgit v1.2.3-54-g00ecf