From a1f2d184e0640260e83d2aa06e7405097cb86dc1 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Sun, 7 Sep 2014 19:27:48 +0000
Subject: [PATCH] LXDM-0.5.0: move up in the page installation of bootscript.
 libpcap-1.6.2: fix build with bluez-5.2. Update p11-kit-0.20.5. Update to
 menu-cache-0.7.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14226 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 introduction/welcome/changelog.xml | 18 +++++++++++++++++
 lxde/apps/lxdm.xml                 | 32 +++++++++++++++---------------
 lxde/desktop/menu-cache.xml        |  4 ++--
 networking/netlibs/libpcap.xml     | 19 ++++++++++++++++--
 packages.ent                       |  4 ++--
 postlfs/security/p11-kit.xml       |  9 ++++-----
 7 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/general.ent b/general.ent
index dddd7ad505..d3afa741ea 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 6th, &year;">
+<!ENTITY releasedate  "September 7th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 79584bf78b..d36cc8ecc5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,24 @@
 
 -->
 
+    <listitem>
+      <para>September 7th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to menu-cache-0.7.0. Fixes
+          <ulink url="&blfs-ticket-root;5479">#5479</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update p11-kit-0.20.5. Fixes
+          <ulink url="&blfs-ticket-root;5478">#5478</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - libpcap-1.6.2: fix build with bluez-5.2. Fixes
+          <ulink url="&blfs-ticket-root;5468">#5468</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>September 6th, 2014</para>
       <itemizedlist>
diff --git a/lxde/apps/lxdm.xml b/lxde/apps/lxdm.xml
index 3b45ad1224..f218e61678 100644
--- a/lxde/apps/lxdm.xml
+++ b/lxde/apps/lxdm.xml
@@ -198,6 +198,22 @@ make</userinput></screen>
 
     </sect3>
 
+   <sect3 id="lxdm-init">
+      <title>Boot Script</title>
+
+      <para>
+        Install the <filename>/etc/rc.d/init.d/lxdm</filename> init script from
+        the <xref linkend="bootscripts"/> package.
+      </para>
+
+      <indexterm zone="lxdm lxdm-init">
+        <primary sortas="f-lxdm">lxdm</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-lxdm</userinput></screen>
+
+    </sect3>
+
     <sect3>
       <title>Configuration Information</title>
 
@@ -267,22 +283,6 @@ sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
       </para>
 
     </sect3>
-
-   <sect3 id="lxdm-init">
-      <title>Boot Script</title>
-
-      <para>
-        Install the <filename>/etc/rc.d/init.d/lxdm</filename> init script from
-        the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <indexterm zone="lxdm lxdm-init">
-        <primary sortas="f-lxdm">lxdm</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-lxdm</userinput></screen>
-
-    </sect3>
   
   </sect2>
   <!--Required section-->
diff --git a/lxde/desktop/menu-cache.xml b/lxde/desktop/menu-cache.xml
index 9c7b3e272e..fc3cd3eed7 100644
--- a/lxde/desktop/menu-cache.xml
+++ b/lxde/desktop/menu-cache.xml
@@ -7,8 +7,8 @@
   <!ENTITY menu-cache-download-http "&sourceforge-repo;/lxde/menu-cache-&menu-cache-version;.tar.xz">
   <!ENTITY menu-cache-download-ftp  " ">
   <!ENTITY menu-cache-md5sum        "2bb9b83282ae671df1d2f5b617ca1949">
-  <!ENTITY menu-cache-size          "280 KB">
-  <!ENTITY menu-cache-buildsize     "4.1 MB (additional 0.5 MB to build and install the API documentation)">
+  <!ENTITY menu-cache-size          "256 KB">
+  <!ENTITY menu-cache-buildsize     "3.2 MB (additional 0.5 MB to build and install the API documentation)">
   <!ENTITY menu-cache-time          "less than 0.1 SBU">
 ]>
 
diff --git a/networking/netlibs/libpcap.xml b/networking/netlibs/libpcap.xml
index a9c03c9b31..784ecc6e0b 100644
--- a/networking/netlibs/libpcap.xml
+++ b/networking/netlibs/libpcap.xml
@@ -70,6 +70,17 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/libpcap-&libpcap-version;-enable_bluetooth-1.patch"/>
+          (Needed for bluez-5.21)
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">libpcap Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -96,7 +107,8 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --enable-bluetooth=no &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libpcap-&libpcap-version;-enable_bluetooth-1.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -120,7 +132,10 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-bluetooth=no</parameter>: Currently, <application>libpcap-1.6.1</application> doesn't build with  <application>bluez-5.21</application>.</para>
+    <para><parameter>--enable-bluetooth=no</parameter>: Necessary, if the
+    recommended patch is not applied, because since 1.6.1 this application
+    needs a fix, in order to build with
+    <application>bluez-5.21</application>.</para>
 
   </sect2>
 
diff --git a/packages.ent b/packages.ent
index 1baa81ee76..d6837794fd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -30,7 +30,7 @@
 <!ENTITY nss-version                  "3.&nss-minor-version;">
 <!ENTITY openssh-version              "6.6p1">
 <!ENTITY openssl-version              "1.0.1i">
-<!ENTITY p11-kit-version              "0.20.4">    <!-- Even minors only -->
+<!ENTITY p11-kit-version              "0.20.5">    <!-- Even minors only -->
 <!ENTITY polkit-version               "0.112">
 <!ENTITY shadow-version               "4.2.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
@@ -553,7 +553,7 @@
 <!-- Chapter 34 -->
 <!ENTITY lxmenu-data-version          "0.1.2">
 <!ENTITY lxde-icon-theme-version      "0.5.0">
-<!ENTITY menu-cache-version           "0.6.1">
+<!ENTITY menu-cache-version           "0.7.0">
 <!ENTITY libfm-version                "1.2.2.1">
 <!ENTITY pcmanfm-version              "1.2.2">
 <!ENTITY lxpanel-version              "0.7.0">
diff --git a/postlfs/security/p11-kit.xml b/postlfs/security/p11-kit.xml
index 736f0cb84b..3c4a1c1cbb 100644
--- a/postlfs/security/p11-kit.xml
+++ b/postlfs/security/p11-kit.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY p11-kit-download-http "http://p11-glue.freedesktop.org/releases/p11-kit-&p11-kit-version;.tar.gz">
   <!ENTITY p11-kit-download-ftp  " ">
-  <!ENTITY p11-kit-md5sum        "9e94ce0f32265de8cf4a998889414b93">
-  <!ENTITY p11-kit-size          "1.2 MB">
-  <!ENTITY p11-kit-buildsize     "37 MB (additional 6 MB for tests)">
+  <!ENTITY p11-kit-md5sum        "12d3f108e46c6109cd20d378898ae381">
+  <!ENTITY p11-kit-size          "964 KB">
+  <!ENTITY p11-kit-buildsize     "37 MB (additional 5 MB for tests)">
   <!ENTITY p11-kit-time          "0.4 SBU">
 ]>
 
@@ -149,8 +149,7 @@ make</userinput></screen>
         <seg>
           /etc/pkcs11,
           /usr/include/p11-kit-1,
-          /usr/lib/p11-kit,
-          /usr/lib/pkcs11,
+          /usr/lib/{p11-kit,pkcs11},
           /usr/share/gtk-doc/html/p11-kit, and
           /usr/share/p11-kit
         </seg>