From 52e175b758f1156313c4ec9c82e61ef44a751922 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Tue, 1 Dec 2015 18:27:03 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20Update=20to=20dhcpcd-6.9.4.=20?=
 =?UTF-8?q?=E2=80=A2=20Update=20to=20openldap-2.4.43.=20=E2=80=A2=20Update?=
 =?UTF-8?q?=20to=20cups-2.1.1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16703 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml | 14 +++++++++++++-
 networking/connect/dhcpcd.xml      |  4 ++--
 packages.ent                       |  6 +++---
 pst/printing/cups.xml              | 10 ++++++----
 server/other/openldap.xml          |  7 ++++---
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 22c0e839c5..b51b8f3f4a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -48,7 +48,19 @@
       <para>December 1st, 2015</para>
       <itemizedlist>
        <listitem>
-         <para>[bdubbs] - Update to lmdb-0.9.7.  Fixes 
+         <para>[fernando] - Update to cups-2.1.1. Fixes
+         <ulink url="&blfs-ticket-root;7197">#7197</ulink>.</para>
+        </listitem>
+       <listitem>
+         <para>[fernando] - Update to openldap-2.4.43. Fixes
+         <ulink url="&blfs-ticket-root;7196">#7196</ulink>.</para>
+        </listitem>
+       <listitem>
+         <para>[fernando] - Update to dhcpcd-6.9.4. Fixes
+         <ulink url="&blfs-ticket-root;7194">#7194</ulink>.</para>
+        </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to lmdb-0.9.7.  Fixes
          <ulink url="&blfs-ticket-root;7195">#7195</ulink>.</para>
         </listitem>
        <listitem>
diff --git a/networking/connect/dhcpcd.xml b/networking/connect/dhcpcd.xml
index 618c1a25e4..272659770e 100644
--- a/networking/connect/dhcpcd.xml
+++ b/networking/connect/dhcpcd.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY dhcpcd-download-http "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.xz">
   <!ENTITY dhcpcd-download-ftp  "ftp://roy.marples.name/pub/dhcpcd/dhcpcd-&dhcpcd-version;.tar.xz">
-  <!ENTITY dhcpcd-md5sum        "8357d023c4687d27bc6ea7964236b2a6">
+  <!ENTITY dhcpcd-md5sum        "02f5043a415cd4b6d089631a0cd95f5b">
   <!ENTITY dhcpcd-size          "176 KB">
   <!ENTITY dhcpcd-buildsize     "2.6 MB">
   <!ENTITY dhcpcd-time          "less than 0.1 SBU">
@@ -255,7 +255,7 @@ EOF</userinput></screen>
       <seglistitem>
         <seg>dhcpcd</seg>
         <seg>/lib/dhcpcd/dev/udev.so</seg>
-        <seg>/lib/dhcpcd</seg>
+        <seg>/{,/var}lib/dhcpcd</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/packages.ent b/packages.ent
index c6d7f00109..2501e4610d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -350,7 +350,7 @@
 <!-- Part IV -->
 <!-- Chapter 14 -->
 <!ENTITY ppp-version                  "2.4.5">
-<!ENTITY dhcpcd-version               "6.9.3">
+<!ENTITY dhcpcd-version               "6.9.4">
 <!ENTITY dhcp-version                 "4.3.3">
 
 <!-- Chapter 15 -->
@@ -431,7 +431,7 @@
 <!ENTITY sqlite-version               "3.9.2">
 
 <!-- Chapter 23 -->
-<!ENTITY openldap-version             "2.4.42">
+<!ENTITY openldap-version             "2.4.43">
 <!ENTITY soprano-version              "2.9.4">
 <!ENTITY unbound-version              "1.5.6">
 <!ENTITY virtuoso-version             "6.1.8">
@@ -765,7 +765,7 @@
 
 <!-- Part XII -->
 <!-- Chapter 50 -->
-<!ENTITY cups-version                 "2.1.0">
+<!ENTITY cups-version                 "2.1.1">
 <!ENTITY cups-filters-version         "1.2.0">
 <!ENTITY gs-version                   "9.18">
 <!ENTITY gutenprint-version           "5.2.10">
diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml
index 23a0580071..e0b5eb0fca 100644
--- a/pst/printing/cups.xml
+++ b/pst/printing/cups.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "c4e57a66298bfdba66bb3d5bedd317a4">
+  <!ENTITY cups-md5sum        "9a231a4409140b167946f8147d638ffb">
   <!ENTITY cups-size          "8.5 MB">
-  <!ENTITY cups-buildsize     "115 MB (with tests)">
+  <!ENTITY cups-buildsize     "72 MB (116 MB with tests)">
   <!ENTITY cups-time          "0.5 SBU (5.0 SBU for tests)">
 ]>
 
@@ -450,8 +450,10 @@ EOF</userinput></screen>
           libcupsppdc.so, and libcups.so
         </seg>
         <seg>
-          /{etc,usr/{include,lib,share},var/{cache,log,run,spool}}/cups and
-          /usr/share/doc/cups-&cups-version;
+          /etc/cups,
+          /usr/{include,lib,share}/cups,
+          /usr/share/doc/cups-&cups-version;, and
+          /var/{cache,log,run,spool}/cups
         </seg>
       </seglistitem>
     </segmentedlist>
diff --git a/server/other/openldap.xml b/server/other/openldap.xml
index a24b31b14b..5afcc554ac 100644
--- a/server/other/openldap.xml
+++ b/server/other/openldap.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY openldap-download-http " ">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "47c8e2f283647a6105b8b0325257e922">
+  <!ENTITY openldap-md5sum        "49ca65e27891fcf977d78c10f073c705">
   <!ENTITY openldap-size          "5.4 MB">
   <!ENTITY openldap-buildsize     "53 MB (client), 103 MB (server)">
-  <!ENTITY openldap-time          "0.6 SBU (client), 1.2 SBU (server)">
+  <!ENTITY openldap-time          "0.7 SBU (client), 1.3 SBU (server)">
 ]>
 
 <sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
@@ -488,7 +488,8 @@ result: 0 Success
           and several under /usr/lib/openldap
         </seg>
         <seg>
-          /{etc,{usr,var}/lib}/openldap and
+          /etc/openldap,
+          /{usr,var}/lib/openldap, and
           /usr/share/doc/openldap-&openldap-version;
         </seg>
       </seglistitem>