Author: cjg
Date: Sun Sep  7 22:23:44 2014
New Revision: 14228

Log:
Merged updates from trunk.

Modified:
   branches/systemd/general.ent
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/lxde/desktop/menu-cache.xml
   branches/systemd/networking/netlibs/libpcap.xml
   branches/systemd/packages.ent
   branches/systemd/postlfs/security/p11-kit.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Sun Sep  7 13:37:24 2014        (r14227)
+++ branches/systemd/general.ent        Sun Sep  7 22:23:44 2014        (r14228)
@@ -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 systemd 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 "systemd">              <!-- svn|[release #] -->
 <!ENTITY lfs-version  "systemd">              <!-- x.y|development] -->

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sun Sep  7 13:37:24 
2014        (r14227)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Sep  7 22:23:44 
2014        (r14228)
@@ -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] - libpcap-1.6.2: fix build with bluez-5.2. Fixes
+          <ulink url="&blfs-ticket-root;5468">#5468</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update p11-kit-0.20.5. Fixes
+          <ulink url="&blfs-ticket-root;5478">#5478</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 6th, 2014</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/lxde/desktop/menu-cache.xml
==============================================================================
--- branches/systemd/lxde/desktop/menu-cache.xml        Sun Sep  7 13:37:24 
2014        (r14227)
+++ branches/systemd/lxde/desktop/menu-cache.xml        Sun Sep  7 22:23:44 
2014        (r14228)
@@ -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">
 ]>
 

Modified: branches/systemd/networking/netlibs/libpcap.xml
==============================================================================
--- branches/systemd/networking/netlibs/libpcap.xml     Sun Sep  7 13:37:24 
2014        (r14227)
+++ branches/systemd/networking/netlibs/libpcap.xml     Sun Sep  7 22:23:44 
2014        (r14228)
@@ -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>
@@ -97,7 +108,8 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-bluetooth &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>
@@ -121,10 +133,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <parameter>--disable-bluetooth</parameter>: This switch disables 
Bluetooth support
-      because it doesn't build with latest <application>BlueZ</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>
 
     <para>
       <option>--disable-dbus</option>: Use this switch if you wish to disable

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sun Sep  7 13:37:24 2014        (r14227)
+++ branches/systemd/packages.ent       Sun Sep  7 22:23:44 2014        (r14228)
@@ -27,7 +27,7 @@
 <!ENTITY nss-version                  
"3.&nss-minor-version;.&nss-micro-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;">
@@ -548,7 +548,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">

Modified: branches/systemd/postlfs/security/p11-kit.xml
==============================================================================
--- branches/systemd/postlfs/security/p11-kit.xml       Sun Sep  7 13:37:24 
2014        (r14227)
+++ branches/systemd/postlfs/security/p11-kit.xml       Sun Sep  7 22:23:44 
2014        (r14228)
@@ -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 @@
         <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>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to