From 91c4a2e796e2d847495637b22881c0d6963e7ae3 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sun, 29 Jun 2014 16:00:44 +0000
Subject: [PATCH] Merge what's new from lfs trunk. Updated to D-Bus 1.8.4.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10602 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/whatsnew.xml | 10 ++++++++--
 packages.ent           |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 10f7d0a32..e95cbff10 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -54,9 +54,9 @@
     <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>D-Bus-&dbus-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>-->
@@ -257,9 +257,15 @@
 
   <itemizedlist>
     <title>Removed:</title>
+    <listitem>
+      <para>bash-4.2-fixes-12.patch</para>
+    </listitem>
     <listitem>
       <para>perl-5.18.2-libc-1.patch</para>
     </listitem>
+    <listitem>
+      <para>readline-6.2-fixes-2.patch</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>
diff --git a/packages.ent b/packages.ent
index 09f9bde4a..cd55b5725 100644
--- a/packages.ent
+++ b/packages.ent
@@ -110,10 +110,10 @@
 <!ENTITY coreutils-ch6-du "116 MB">
 <!ENTITY coreutils-ch6-sbu "3.4 SBU">
 
-<!ENTITY dbus-version "1.8.0">
+<!ENTITY dbus-version "1.8.4">
 <!ENTITY dbus-size "1,820 KB">
 <!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "059fbe84e39fc99c67a14f15b1f39dff">
+<!ENTITY dbus-md5 "4717cb8ab5b80978fcadf2b4f2f72e1b">
 <!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">