From ed848edffd180870a25f7acf60d89faad754db17 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Fri, 24 Apr 2015 07:43:22 +0000
Subject: [PATCH] Merged trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10905 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  4 +---
 chapter06/attr.xml      |  2 +-
 packages.ent            | 12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c82825e3f..daa8fc217 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,8 +42,7 @@
         <listitem>
           <para>[krejzi] - Added a fix for security issue
           in Glibc (CVE-2015-1781). Thanks to Ken Moffat
-          for bringing it up and Bruce Dubbs for providing
-          the fix in form of a sed.</para>
+          for identifying the problem and the fix.</para>
         </listitem>
         <listitem>
           <para>[krejzi] - Fixed Ncurses and Perl build
@@ -57,7 +56,6 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
       <para>2015-04-21</para>
       <itemizedlist>
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index 37a0fc8dc..d6de46b88 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -47,7 +47,7 @@
 <screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
 
     <para>Prevent installation of manual pages that were already installed by
-    Man-Pages package:</para>
+    the <xref linkend="man-pages"/> package:</para>
 
 <screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man2||" man/Makefile</userinput></screen>
 
diff --git a/packages.ent b/packages.ent
index 3ac30417d..c054c4ecd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -202,14 +202,14 @@
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
 <!ENTITY gcc-md5 "d5525b1127d07d215960e6051c5da35e">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
-<!ENTITY gcc-ch5p1-du "2.4 GB">
-<!ENTITY gcc-ch5p1-sbu "8.0 SBU">
+<!ENTITY gcc-ch5p1-du "2.5 GB">
+<!ENTITY gcc-ch5p1-sbu "7.6 SBU">
 <!ENTITY gcc-ch5p2-du "2.8 GB">
-<!ENTITY gcc-ch5p2-sbu "10.2 SBU">
-<!ENTITY gcc-ch6-du "2.6 GB ">
-<!ENTITY gcc-ch6-sbu "92 SBU (with tests)">
+<!ENTITY gcc-ch5p2-sbu "9.5 SBU">
+<!ENTITY gcc-ch6-du "3.2 GB ">
+<!ENTITY gcc-ch6-sbu "75.7 SBU (with tests)">
 
-<!ENTITY libstdcpp-ch5-du "838 MB">
+<!ENTITY libstdcpp-ch5-du "842 MB">
 <!ENTITY libstdcpp-ch5-sbu "0.4 SBU">
 
 <!ENTITY gdbm-version "1.11">