Author: krejzi
Date: Sun Jul 14 08:40:03 2013
New Revision: 11405

Log:
Merge trunk and systemd branch, part 1.

Modified:
   branches/systemd/general.ent
   branches/systemd/general/genlib/libidn.xml
   branches/systemd/general/graphlib/aalib.xml
   branches/systemd/general/graphlib/librsvg.xml
   branches/systemd/general/prog/vala.xml
   branches/systemd/gnome/core/gsettings-desktop-schemas.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/multimedia/libdriv/libmad.xml
   branches/systemd/networking/netlibs/glib-networking.xml
   branches/systemd/networking/netlibs/libsoup.xml
   branches/systemd/postlfs/security/cracklib.xml
   branches/systemd/postlfs/security/nss.xml
   branches/systemd/x/installing/x7lib.xml
   branches/systemd/x/lib/webkitgtk2.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Sun Jul 14 08:33:46 2013        (r11404)
+++ branches/systemd/general.ent        Sun Jul 14 08:40:03 2013        (r11405)
@@ -244,7 +244,7 @@
 <!ENTITY libgusb-version              "0.1.6">
 <!ENTITY libical-version              "1.0">
 <!ENTITY libidl-version               "0.8.14">
-<!ENTITY libidn-version               "1.26">
+<!ENTITY libidn-version               "1.27">
 <!ENTITY libksba-version              "1.3.0">
 <!ENTITY libsigc-version              "2.2.11">
 <!ENTITY libtasn1-version             "3.3">
@@ -295,7 +295,8 @@
 <!ENTITY libjpeg-turbo-version        "1.3.0">
 <!ENTITY libmng-version               "1.0.10">
 <!ENTITY libpng-version               "1.6.2">
-<!ENTITY librsvg-version              "2.36.4">
+<!ENTITY librsvg-version              "2.37.0">   <!-- Required version in 
order to use
+                                                       svg pixbuf loader. -->
 <!ENTITY libtiff-version              "4.0.3">
 <!ENTITY libwebp-version              "0.3.0">
 <!ENTITY openjpeg-version             "1.5.1">
@@ -395,7 +396,8 @@
 <!ENTITY subversion-version           "1.8.0">
 <!ENTITY tcl-version                  "8.6.0">
 <!ENTITY tk-version                   "8.6.0">
-<!ENTITY vala-version                 "0.18.1">
+<!ENTITY vala-major-version           "0.20">
+<!ENTITY vala-version                 "&vala-major-version;.1">
 <!ENTITY yasm-version                 "1.2.0">
 
 <!ENTITY cmake-major-version          "2.8">
@@ -468,14 +470,14 @@
 <!-- Chapter 17 -->
 <!ENTITY curl-version                 "7.31.0">
 <!ENTITY geoclue-version              "0.12.0">
-<!ENTITY glib-networking-version      "2.34.2">
+<!ENTITY glib-networking-version      "2.36.2">
 <!ENTITY libevent-version             "2.0.21">
 <!ENTITY libnice-version              "0.1.3">
 <!ENTITY libnl-version                "3.2.22">
 <!ENTITY libpcap-version              "1.4.0">
 <!ENTITY libproxy-version             "0.4.7">
 <!ENTITY librest-version              "0.7.90">
-<!ENTITY libsoup-version              "2.40.3">
+<!ENTITY libsoup-version              "2.42.2">
 <!ENTITY libtirpc-version             "0.2.3">
 <!ENTITY neon-version                 "0.29.6">
 <!ENTITY serf-version                 "1.2.1">
@@ -579,7 +581,7 @@
 <!ENTITY shared-mime-info-version     "1.1">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
-<!ENTITY webkitgtk2-version           "2.0.2">    <!-- Even minors only -->
+<!ENTITY webkitgtk2-version           "2.0.3">    <!-- Even minors only -->
 <!ENTITY xulrunner-version            "21.0">
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
@@ -634,7 +636,7 @@
 <!ENTITY yelp-xsl-version             "3.6.1">
 <!ENTITY libgnome-keyring-version     "3.6.0">
 <!ENTITY libsecret-version            "0.14">
-<!ENTITY gsettings-desktop-schemas-version "3.6.1">
+<!ENTITY gsettings-desktop-schemas-version "3.8.2">
 <!ENTITY dconf-version                "0.14.1">
 <!ENTITY GConf-version                "3.2.6">
 <!ENTITY gcr-version                  "3.6.2">

Modified: branches/systemd/general/genlib/libidn.xml
==============================================================================
--- branches/systemd/general/genlib/libidn.xml  Sun Jul 14 08:33:46 2013        
(r11404)
+++ branches/systemd/general/genlib/libidn.xml  Sun Jul 14 08:40:03 2013        
(r11405)
@@ -6,9 +6,9 @@
 
   <!ENTITY libidn-download-http 
"http://ftp.gnu.org/gnu/libidn/libidn-&libidn-version;.tar.gz";>
   <!ENTITY libidn-download-ftp  
"ftp://ftp.gnu.org/gnu/libidn/libidn-&libidn-version;.tar.gz";>
-  <!ENTITY libidn-md5sum        "7533d14fbbb6c026a1a9eaa2179ccb69">
+  <!ENTITY libidn-md5sum        "3a0803551893d3d09efd472ff71c8028">
   <!ENTITY libidn-size          "3.3 MB">
-  <!ENTITY libidn-buildsize     "24 MB">
+  <!ENTITY libidn-buildsize     "22 MB">
   <!ENTITY libidn-time          "0.3 SBU">
 ]>
 

Modified: branches/systemd/general/graphlib/aalib.xml
==============================================================================
--- branches/systemd/general/graphlib/aalib.xml Sun Jul 14 08:33:46 2013        
(r11404)
+++ branches/systemd/general/graphlib/aalib.xml Sun Jul 14 08:40:03 2013        
(r11405)
@@ -5,7 +5,7 @@
   %general-entities;
 
   <!ENTITY aalib-download-http 
"&sourceforge-repo;/aa-project/aalib-&aalib-version;.tar.gz">
-  <!ENTITY aalib-download-ftp 
"ftp://ftp.ratmir.tver.ru/pub/FreeBsd/ports/distfiles/aalib-&aalib-version;.tar.gz";>
+  <!ENTITY aalib-download-ftp " ">
   <!ENTITY aalib-md5sum "9801095c42bba12edebd1902bcf0a990">
   <!ENTITY aalib-size "388 KB">
   <!ENTITY aalib-buildsize "6.5 MB">

Modified: branches/systemd/general/graphlib/librsvg.xml
==============================================================================
--- branches/systemd/general/graphlib/librsvg.xml       Sun Jul 14 08:33:46 
2013        (r11404)
+++ branches/systemd/general/graphlib/librsvg.xml       Sun Jul 14 08:40:03 
2013        (r11405)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY librsvg-download-http 
"&gnome-download-http;/librsvg/2.36/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-download-ftp  
"&gnome-download-ftp;/librsvg/2.36/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "3c94524c8ccf668e30b236f409239f54">
+  <!ENTITY librsvg-download-http 
"&gnome-download-http;/librsvg/2.37/librsvg-&librsvg-version;.tar.xz">
+  <!ENTITY librsvg-download-ftp  
"&gnome-download-ftp;/librsvg/2.37/librsvg-&librsvg-version;.tar.xz">
+  <!ENTITY librsvg-md5sum        "3de91824870bf6758f37ab54bae2ac40">
   <!ENTITY librsvg-size          "504 KB">
-  <!ENTITY librsvg-buildsize     "13 MB">
+  <!ENTITY librsvg-buildsize     "15 MB">
   <!ENTITY librsvg-time          "0.2 SBU">
 ]>
 
@@ -82,8 +82,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk2"/> and
-      <xref linkend="gtk3"/>
+      <xref linkend="gtk2"/> (For the Theming Engine) and
+      <xref linkend="gtk3"/> (For the <command>rsvg-view-3</command>
     </para>
 
     <bridgehead renderas="sect4">Optional (Required if building 
GNOME)</bridgehead>
@@ -94,7 +94,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="docbook-utils"/> and
       <xref linkend="gtk-doc"/>
     </para>
 
@@ -111,11 +110,14 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make -k check</command>.
+      Some tests are known to fail for unknown reasons.
     </para>
 
     <para>
@@ -128,6 +130,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <option>--enable-vala</option>: This switch enables
+      building of the Vala bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
@@ -138,7 +146,7 @@
 
     <para>
       <option>--disable-gtk-theme</option>: Use this switch if you have not
-      installed <application>GTK+</application> 2.
+      installed <application>GTK+ 2</application>.
     </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";

Modified: branches/systemd/general/prog/vala.xml
==============================================================================
--- branches/systemd/general/prog/vala.xml      Sun Jul 14 08:33:46 2013        
(r11404)
+++ branches/systemd/general/prog/vala.xml      Sun Jul 14 08:40:03 2013        
(r11405)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY vala-download-http 
"&gnome-download-http;/vala/0.18/vala-&vala-version;.tar.xz">
-  <!ENTITY vala-download-ftp  
"&gnome-download-ftp;/vala/0.18/vala-&vala-version;.tar.xz">
-  <!ENTITY vala-md5sum        "0d684cbddd3a7655fe54c030e4183dbd">
-  <!ENTITY vala-size          "2.5 MB">
-  <!ENTITY vala-buildsize     "100 MB">
-  <!ENTITY vala-time          "1.0 SBU">
+  <!ENTITY vala-download-http 
"&gnome-download-http;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
+  <!ENTITY vala-download-ftp  
"&gnome-download-ftp;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
+  <!ENTITY vala-md5sum        "f285a90af17c400e5a4bcecb2b9c318a">
+  <!ENTITY vala-size          "2.6 MB">
+  <!ENTITY vala-buildsize     "120 MB">
+  <!ENTITY vala-time          "1.2 SBU">
 ]>
 
 <sect1 id="vala" xreflabel="Vala-&vala-version;">
@@ -123,19 +123,21 @@
 
       <seglistitem>
         <seg>
-          vala, vala-0.18, valac, valac-0.18, vala-gen-introspect,
-          vala-gen-introspect-0.18, vapicheck, vapicheck-0.18,
-          vapigen and vapigen-0.18
+          vala, vala-&vala-major-version;, valac,
+          valac-&vala-major-version;, vala-gen-introspect,
+          vala-gen-introspect-&vala-major-version;,
+          vapicheck, vapicheck-&vala-major-version;,
+          vapigen and vapigen-&vala-major-version;
         </seg>
         <seg>
-          libvala-0.18.so
+          libvala-&vala-major-version;.so
         </seg>
         <seg>
-          /usr/include/vala-0.18,
-          /usr/lib/vala-0.18,
-          /usr/share/devhelp/books/vala-0.18,
+          /usr/include/vala-&vala-major-version;,
+          /usr/lib/vala-&vala-major-version;,
+          /usr/share/devhelp/books/vala-&vala-major-version;,
           /usr/share/vala and
-          /usr/share/vala-0.18
+          /usr/share/vala-&vala-major-version;
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -197,13 +199,13 @@
       </varlistentry>
 
       <varlistentry id="libvala">
-        <term><filename class="libraryfile">libvala-0.18.so</filename></term>
+        <term><filename 
class="libraryfile">libvala-&vala-major-version;.so</filename></term>
         <listitem>
           <para>
             contains the <application>Vala</application> API functions.
           </para>
           <indexterm zone="vala libvala">
-            <primary sortas="c-libvala">libvala-0.18.so</primary>
+            <primary 
sortas="c-libvala">libvala-&vala-major-version;.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: branches/systemd/gnome/core/gsettings-desktop-schemas.xml
==============================================================================
--- branches/systemd/gnome/core/gsettings-desktop-schemas.xml   Sun Jul 14 
08:33:46 2013        (r11404)
+++ branches/systemd/gnome/core/gsettings-desktop-schemas.xml   Sun Jul 14 
08:40:03 2013        (r11405)
@@ -5,12 +5,12 @@
   %general-entities;
 
   <!ENTITY gsettings-desktop-schemas-download-http
-           
"&gnome-download-http;/gsettings-desktop-schemas/3.6/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
+           
"&gnome-download-http;/gsettings-desktop-schemas/3.8/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
   <!ENTITY gsettings-desktop-schemas-download-ftp
-           
"&gnome-download-ftp;/gsettings-desktop-schemas/3.6/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
-  <!ENTITY gsettings-desktop-schemas-md5sum        
"5f7d7c88c04b1abcf59c3f27027c05c2">
-  <!ENTITY gsettings-desktop-schemas-size          "376 KB">
-  <!ENTITY gsettings-desktop-schemas-buildsize     "9.5 MB">
+           
"&gnome-download-ftp;/gsettings-desktop-schemas/3.8/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
+  <!ENTITY gsettings-desktop-schemas-md5sum        
"e084260f176b3cdc8d56a5f6af0d2c0d">
+  <!ENTITY gsettings-desktop-schemas-size          "452 KB">
+  <!ENTITY gsettings-desktop-schemas-buildsize     "12 MB">
   <!ENTITY gsettings-desktop-schemas-time          "less than 0.1 SBU">
 ]>
 
@@ -114,6 +114,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/gsettings-destdir.xml"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sun Jul 14 08:33:46 
2013        (r11404)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Jul 14 08:40:03 
2013        (r11405)
@@ -44,6 +44,52 @@
 
 -->
     <listitem>
+      <para>July 5th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - GLib Networking 2.36.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - GSettings Desktop Schemas 3.8.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - librsvg 2.37.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libsoup 2.42.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Vala 0.20.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - WebKitGTK+ 2.0.3.</para>
+        </listitem>
+        <listitem>
+          <para>[igor] - libidn-1.27.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>July 4th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - libmad: x84_64 and optimization fixes (thanks Mykyta
+            Iziumtsev).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>July 3rd, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - libXv-1.0.9 and libXi-1.7.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 2nd, 2013</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/multimedia/libdriv/libmad.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/libmad.xml      Sun Jul 14 08:33:46 
2013        (r11404)
+++ branches/systemd/multimedia/libdriv/libmad.xml      Sun Jul 14 08:40:03 
2013        (r11405)
@@ -56,6 +56,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libmad-&libmad-version;-fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libmad"/></para>
 
@@ -67,7 +75,8 @@
     <para>Install <application>libmad</application> by running the
     following commands:</para>
 
-<screen><userinput>sed -i '/-fforce-mem/d' configure &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libmad-&libmad-version;-fixes-1.patch 
&amp;&amp;
+autoconf &amp;&amp;
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -103,9 +112,6 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i '/-fforce-mem/d'</command>: This removes an obsolete
-    compilation option that causes compilation to fail under GCC 4.4.x</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 

Modified: branches/systemd/networking/netlibs/glib-networking.xml
==============================================================================
--- branches/systemd/networking/netlibs/glib-networking.xml     Sun Jul 14 
08:33:46 2013        (r11404)
+++ branches/systemd/networking/netlibs/glib-networking.xml     Sun Jul 14 
08:40:03 2013        (r11405)
@@ -5,12 +5,12 @@
   %general-entities;
 
   <!ENTITY glib-networking-download-http
-           
"&gnome-download-http;/glib-networking/2.34/glib-networking-&glib-networking-version;.tar.xz">
+           
"&gnome-download-http;/glib-networking/2.36/glib-networking-&glib-networking-version;.tar.xz">
   <!ENTITY glib-networking-download-ftp
-           
"&gnome-download-ftp;/glib-networking/2.34/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-md5sum        "7c95f09884d563e27937ac6185b03a8d">
-  <!ENTITY glib-networking-size          "340 KB">
-  <!ENTITY glib-networking-buildsize     "8.0 MB">
+           
"&gnome-download-ftp;/glib-networking/2.36/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-md5sum        "fb9121742ed36d1723f296eea19dbb3c">
+  <!ENTITY glib-networking-size          "348 KB">
+  <!ENTITY glib-networking-buildsize     "8.5 MB">
   <!ENTITY glib-networking-time          "0.1 SBU">
 ]>
 
@@ -82,12 +82,12 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="cacerts"/> and
       <xref linkend="p11-kit"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libgcrypt"/> and
       <ulink url="http://code.google.com/p/libproxy/";>libproxy</ulink>
     </para>
 
@@ -111,7 +111,9 @@
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make -k check</command>.
+      Note that some tests fail due to recent changes in
+      <application>GnuTLS</application>.
     </para>
 
     <para>

Modified: branches/systemd/networking/netlibs/libsoup.xml
==============================================================================
--- branches/systemd/networking/netlibs/libsoup.xml     Sun Jul 14 08:33:46 
2013        (r11404)
+++ branches/systemd/networking/netlibs/libsoup.xml     Sun Jul 14 08:40:03 
2013        (r11405)
@@ -5,12 +5,12 @@
   %general-entities;
 
   <!ENTITY libsoup-download-http
-           
"&gnome-download-http;/libsoup/2.40/libsoup-&libsoup-version;.tar.xz">
+           
"&gnome-download-http;/libsoup/2.42/libsoup-&libsoup-version;.tar.xz">
   <!ENTITY libsoup-download-ftp
-           
"&gnome-download-ftp;/libsoup/2.40/libsoup-&libsoup-version;.tar.xz">
-  <!ENTITY libsoup-md5sum        "ee111c5cf9f95b4a7aa24afe13dddb98">
-  <!ENTITY libsoup-size          "696 KB">
-  <!ENTITY libsoup-buildsize     "32 MB">
+           
"&gnome-download-ftp;/libsoup/2.42/libsoup-&libsoup-version;.tar.xz">
+  <!ENTITY libsoup-md5sum        "7d19a84f9eecba53187f5c2ae13fd83e">
+  <!ENTITY libsoup-size          "716 KB">
+  <!ENTITY libsoup-buildsize     "35 MB">
   <!ENTITY libsoup-time          "0.3 SBU">
 ]>
 
@@ -78,15 +78,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib-networking"/> and
-      <xref linkend="libxml2"/>
+      <xref linkend="glib-networking"/>,
+      <xref linkend="libxml2"/> and
+      <xref linkend="sqlite"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libgnome-keyring"/> and
-      <xref linkend="sqlite"/>
+      <xref linkend="gobject-introspection"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -124,6 +123,7 @@
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
@@ -132,13 +132,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
-      <option>--without-gnome</option>: This switch prevents
-      <command>configure</command> looking for GNOME specific
-      dependencies. Use this switch if you have not installed
-      <xref linkend="libgnome-keyring"/>.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 

Modified: branches/systemd/postlfs/security/cracklib.xml
==============================================================================
--- branches/systemd/postlfs/security/cracklib.xml      Sun Jul 14 08:33:46 
2013        (r11404)
+++ branches/systemd/postlfs/security/cracklib.xml      Sun Jul 14 08:40:03 
2013        (r11405)
@@ -5,7 +5,7 @@
   %general-entities;
 
   <!ENTITY cracklib-download-http 
"&sourceforge-repo;/cracklib/cracklib-&cracklib-version;.tar.gz">
-  <!ENTITY cracklib-download-ftp  
"&gentoo-ftp-repo;/cracklib-&cracklib-version;.tar.gz">
+  <!ENTITY cracklib-download-ftp  " ">
   <!ENTITY cracklib-md5sum        "463177b5c29c7a598c991e12a4898e06">
   <!ENTITY cracklib-size          "620 KB">
   <!ENTITY cracklib-buildsize     "5.2 MB">

Modified: branches/systemd/postlfs/security/nss.xml
==============================================================================
--- branches/systemd/postlfs/security/nss.xml   Sun Jul 14 08:33:46 2013        
(r11404)
+++ branches/systemd/postlfs/security/nss.xml   Sun Jul 14 08:40:03 2013        
(r11405)
@@ -84,7 +84,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/nss-&nss-version;-standalone-1.patch"/>
+          <ulink url="&patch-root;/nss-&nss-version;-standalone-2.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -119,7 +119,7 @@
       Install <application>NSS</application> by running the following commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch 
&amp;&amp;
+<screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-2.patch 
&amp;&amp;
 cd nss &amp;&amp;
 make BUILD_OPT=1                      \
   NSPR_INCLUDE_DIR=/usr/include/nspr  \

Modified: branches/systemd/x/installing/x7lib.xml
==============================================================================
--- branches/systemd/x/installing/x7lib.xml     Sun Jul 14 08:33:46 2013        
(r11404)
+++ branches/systemd/x/installing/x7lib.xml     Sun Jul 14 08:40:03 2013        
(r11405)
@@ -67,8 +67,8 @@
   <!ENTITY libXft-version                  "2.3.1">
   <!ENTITY libXft-md5sum                   "78d64dece560c9e8699199f3faa521c0">
 
-  <!ENTITY libXi-version                   "1.7.1">
-  <!ENTITY libXi-md5sum                    "24d71afed1b86c60d4eb361628d7f47b">
+  <!ENTITY libXi-version                   "1.7.2">
+  <!ENTITY libXi-md5sum                    "f4df3532b1af1dcc905d804f55b30b4a">
 
   <!ENTITY libXinerama-version             "1.1.3">
   <!ENTITY libXinerama-md5sum              "9336dc46ae3bf5f81c247f7131461efd">
@@ -82,8 +82,8 @@
   <!ENTITY libXtst-version                 "1.2.2">
   <!ENTITY libXtst-md5sum                  "25c6b366ac3dc7a12c5d79816ce96a59">
 
-  <!ENTITY libXv-version                   "1.0.8">
-  <!ENTITY libXv-md5sum                    "224dadca53d9c88f8a2b8945babcea70">
+  <!ENTITY libXv-version                   "1.0.9">
+  <!ENTITY libXv-md5sum                    "3f642e1d868a2289769b983cf346e7bb">
 
   <!ENTITY libXvMC-version                 "1.0.8">
   <!ENTITY libXvMC-md5sum                  "2e4014e9d55c430e307999a6b3dd256d">

Modified: branches/systemd/x/lib/webkitgtk2.xml
==============================================================================
--- branches/systemd/x/lib/webkitgtk2.xml       Sun Jul 14 08:33:46 2013        
(r11404)
+++ branches/systemd/x/lib/webkitgtk2.xml       Sun Jul 14 08:40:03 2013        
(r11405)
@@ -6,7 +6,7 @@
 
   <!ENTITY webkitgtk2-download-http 
"http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz";>
   <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "a4024f4b33d829ec1034179e94f9cab6">
+  <!ENTITY webkitgtk2-md5sum        "9eca9eec4595b66b72a1ac7ceaef08ba">
   <!ENTITY webkitgtk2-size          "9.4 MB">
   <!ENTITY webkitgtk2-buildsize     "900 MB">
   <!ENTITY webkitgtk2-time          "60 SBU">
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to