Index: general.ent
===================================================================
--- general.ent	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ general.ent	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 9th, &year;">
+<!ENTITY releasedate  "May 12th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -43,4 +43,5 @@
 <!ENTITY sourceforge-repo2    "http://sourceforge.net">
 <!ENTITY gentoo-ftp-repo      "ftp://mirror.ovh.net/gentoo-distfiles/distfiles">
+<!ENTITY jaist-ftp-repo       "ftp://ftp.jaist.ac.jp/pub//sourceforge">
 <!ENTITY trinity-repo-ftp     "ftp://anduin.&lfs-domainname;/trinity">
 <!ENTITY trinity-repo-http    "http://anduin.&lfs-domainname;/sources/trinity">
@@ -68,5 +69,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20130505">
+<!ENTITY blfs-bootscripts-version     "20130512">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
@@ -148,8 +149,8 @@
 <!ENTITY consolekit-version           "0.4.6">
 <!ENTITY cracklib-version             "2.8.22">
-<!ENTITY cyrus-sasl-version           "2.1.25">
+<!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg-version                "1.4.13">
-<!ENTITY gnupg2-version               "2.0.19">
-<!ENTITY gnutls-version               "3.1.10">
+<!ENTITY gnupg2-version               "2.0.20">
+<!ENTITY gnutls-version               "3.1.11">
 <!ENTITY gpgme-version                "1.4.0">
 <!ENTITY iptables-version             "1.4.18">
@@ -267,5 +268,5 @@
 <!ENTITY qca-version                  "2.0.3">
 <!ENTITY qjson-version                "0.8.1">
-<!ENTITY sbc-version                  "1.0">
+<!ENTITY sbc-version                  "1.1">
 <!ENTITY slib-version                 "3b3">
 <!ENTITY talloc-version               "2.0.8">
@@ -378,5 +379,5 @@
 <!ENTITY gc-version                   "7.2d">
 <!ENTITY gdb-version                  "7.6">
-<!ENTITY git-version                  "1.8.2.2">
+<!ENTITY git-version                  "1.8.2.3">
 <!ENTITY guile-version                "2.0.9">
 <!ENTITY icedtea-version              "2.3.3">
@@ -473,5 +474,5 @@
 <!ENTITY libnice-version              "0.1.3">
 <!ENTITY libnl-version                "3.2.21">
-<!ENTITY libpcap-version              "1.3.0">
+<!ENTITY libpcap-version              "1.4.0">
 <!ENTITY libproxy-version             "0.4.7">
 <!ENTITY librest-version              "0.7.90">
@@ -514,5 +515,5 @@
 <!ENTITY openldap-version             "2.4.35">
 <!ENTITY virtuoso-version             "6.1.6">
-<!ENTITY soprano-version              "2.9.1">
+<!ENTITY soprano-version              "2.9.2">
 <!ENTITY xinetd-version               "2.3.15">
 
@@ -588,5 +589,5 @@
 
 <!-- Chapter 26 -->
-<!ENTITY fluxbox-version              "1.3.2">
+<!ENTITY fluxbox-version              "1.3.5">
 <!ENTITY icewm-version                "1.3.7">
 <!ENTITY openbox-version              "3.5.0">
@@ -874,6 +875,6 @@
 <!-- Chapter 40 -->
 <!ENTITY dvb-apps-version             "2012-06-10">
-<!ENTITY ffmpeg-version               "1.2">
-<!ENTITY mplayer-version              "1.1">
+<!ENTITY ffmpeg-version               "1.2.1">
+<!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.7">
 <!ENTITY transcode-version            "1.1.7">
Index: general/genlib/sbc.xml
===================================================================
--- general/genlib/sbc.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ general/genlib/sbc.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -7,6 +7,6 @@
   <!ENTITY sbc-download-http "http://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
   <!ENTITY sbc-download-ftp  "ftp://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
-  <!ENTITY sbc-md5sum        "aa2bc39c4a09aade064efea4bbbc4b2d">
-  <!ENTITY sbc-size          "344 KB">
+  <!ENTITY sbc-md5sum        "ecadadbfd4b1dfe7b98f446c69126b23">
+  <!ENTITY sbc-size          "240 KB">
   <!ENTITY sbc-buildsize     "3.0 MB">
   <!ENTITY sbc-time          "0.1 SBU">
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ general/prog/git.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -7,5 +7,5 @@
   <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "f7407df37facf579dcaa979266cc3c59">
+  <!ENTITY git-md5sum        "03ebfd403a8cf355da0e3f15e53b8925">
   <!ENTITY git-size          "4.3 MB">
   <!ENTITY git-buildsize     "225 MB">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ introduction/welcome/changelog.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -45,4 +45,40 @@
 -->
     <listitem>
+      <para>May 12th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Cyrus SASL 2.1.26.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - FFmpeg 1.2.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Fluxbox 1.3.5. Thanks to Igor &#381;ivkovi&#263; for the patch.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Git 1.8.2.3.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - GnuPG 2.0.20.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - GnuTLS 3.1.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libpcap 1.4.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - MPlayer 1.1.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - SBC 1.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Soprano 2.9.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 9th, 2013</para>
       <itemizedlist>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ kde/add/kdepim.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -58,12 +58,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdepim-&kde-version;-boost_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
     
     <bridgehead renderas="sect3">Kdepim Dependencies</bridgehead>
@@ -100,6 +92,5 @@
     the following commands:</para>
     
-<screen><userinput>patch -Np1 -i ../kdepim-&kde-version;-boost_fix-1.patch &amp;&amp;
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ multimedia/libdriv/alsa-lib.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -73,4 +73,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">ALSA Library Dependencies</bridgehead>
 
@@ -112,5 +122,6 @@
     </para>
 
-<screen><userinput>./configure &amp;&amp;
+<screen><userinput>patch -Np1 -i ../alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch &amp;&amp;
+./configure &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ multimedia/videoutils/ffmpeg.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -8,5 +8,5 @@
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "c871d20559cb64c015b5cf0858812a56">
+  <!ENTITY ffmpeg-md5sum        "5071a26cc149f380908ce79ec2a677ef">
   <!ENTITY ffmpeg-size          "5.7 MB">
   <!ENTITY ffmpeg-buildsize     "100 MB">
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ multimedia/videoutils/mplayer.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -9,5 +9,5 @@
   <!ENTITY mplayer-download-ftp
     "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
-  <!ENTITY mplayer-md5sum        "ac7bf1cfedc1c5c24bfc83107eefb1d9">
+  <!ENTITY mplayer-md5sum        "39dd55f30eb5403f219a606e79a6648a">
   <!ENTITY mplayer-size          "11 MB">
   <!ENTITY mplayer-buildsize     "183 MB (120 MB using system-installed FFMpeg)">
@@ -49,5 +49,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netlibs/libpcap.xml
===================================================================
--- networking/netlibs/libpcap.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ networking/netlibs/libpcap.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -7,7 +7,7 @@
   <!ENTITY libpcap-download-http "http://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
   <!ENTITY libpcap-download-ftp  " ">
-  <!ENTITY libpcap-md5sum        "f78455a92622b7a3c05c58b6ad1cec7e">
-  <!ENTITY libpcap-size          "596 KB">
-  <!ENTITY libpcap-buildsize     "8 MB">
+  <!ENTITY libpcap-md5sum        "56e88a5aabdd1e04414985ac24f7e76c">
+  <!ENTITY libpcap-size          "608 KB">
+  <!ENTITY libpcap-buildsize     "10 MB">
   <!ENTITY libpcap-time          "0.1 SBU">
 ]>
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,6 +78,6 @@
       Software distribution for the
       <ulink url="http://www.endace.com/">DAG</ulink>,
-      <ulink url="http://www.infradead.org/~tgr/libnl/">
-      libnl (version 1 or 2)</ulink> and
+      <xref linkend="libnl"/>,
+      <xref linkend="libusb"/> and
       <ulink url="http://www.intel.com/">Septel</ulink> range of passive
       network monitoring cards.
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ postlfs/security/cyrus-sasl.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY cyrus-sasl-download-http "http://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-&cyrus-sasl-version;.tar.gz">
-  <!ENTITY cyrus-sasl-download-ftp  "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-&cyrus-sasl-version;.tar.gz">
-  <!ENTITY cyrus-sasl-md5sum        "341cffe829a4d71f2a6503d669d5a946">
+  <!ENTITY cyrus-sasl-download-http " ">
+  <!ENTITY cyrus-sasl-download-ftp  "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-&cyrus-sasl-version;.tar.gz">
+  <!ENTITY cyrus-sasl-md5sum        "a7f4e5e559a0e37b3ffc438c9456e425">
   <!ENTITY cyrus-sasl-size          "5.0 MB">
-  <!ENTITY cyrus-sasl-buildsize     "20 MB">
+  <!ENTITY cyrus-sasl-buildsize     "30 MB">
   <!ENTITY cyrus-sasl-time          "0.5 SBU">
 ]>
@@ -30,11 +30,13 @@
     <title>Introduction to Cyrus SASL</title>
 
-    <para>The <application>Cyrus SASL</application> package contains a Simple
-    Authentication and Security Layer, a method for adding authentication
-    support to connection-based protocols. To use SASL, a protocol includes a
-    command for identifying and authenticating a user to a server and for
-    optionally negotiating protection of subsequent protocol interactions. If
-    its use is negotiated, a security layer is inserted between the protocol
-    and the connection.</para>
+    <para>
+      The <application>Cyrus SASL</application> package contains a Simple
+      Authentication and Security Layer, a method for adding authentication
+      support to connection-based protocols. To use SASL, a protocol includes
+      a command for identifying and authenticating a user to a server and for
+      optionally negotiating protection of subsequent protocol interactions.
+      If its use is negotiated, a security layer is inserted between the
+      protocol and the connection.
+    </para>
 
     &lfs73_checked;
@@ -43,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&cyrus-sasl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cyrus-sasl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cyrus-sasl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cyrus-sasl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cyrus-sasl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cyrus-sasl-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&cyrus-sasl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cyrus-sasl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cyrus-sasl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cyrus-sasl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cyrus-sasl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cyrus-sasl-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -65,6 +79,8 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-fixes-1.patch"/></para>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-fixes-1.patch"/>
+       </para>
       </listitem>
     </itemizedlist>
@@ -73,23 +89,29 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/></para>
+    <para role="required">
+      <xref linkend="openssl"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="db"/></para>
+    <para role="recommended">
+      <xref linkend="db"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="linux-pam"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/>-->,
-    <xref linkend="mysql"/>,
-    <xref linkend="postgresql"/>,
-    <xref linkend="sqlite"/>,
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, and
-    <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
+    <para role="optional">
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="openjdk"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>,
+      <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink> and
+      <ulink url="http://dmalloc.com/">Dmalloc</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cyrus-sasl"/></para>
-
+      <ulink url="&blfs-wiki;/cyrus-sasl"/>
+    </para>
   </sect2>
 
@@ -97,8 +119,14 @@
     <title>Installation of Cyrus SASL</title>
 
-    <para>Install <application>Cyrus SASL</application> by
-    running the following commands:</para>
+    <para>
+      Install <application>Cyrus SASL</application> by
+      running the following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-fixes-1.patch &amp;&amp;
+autoreconf -fi &amp;&amp;
+pushd saslauthd
+autoreconf -fi &amp;&amp;
+popd
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
@@ -107,18 +135,22 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite. If you are planning
-    on using the GSSAPI authentication mechanism, it is recommended to test
-    it after installing the package using the sample server and client programs
-    which were built in the preceding step. Instructions for performing the
-    tests can be found at <ulink
-    url="&hints-root;/downloads/files/cyrus-sasl.txt"/>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite. If you are planning
+      on using the GSSAPI authentication mechanism, it is recommended to test
+      it after installing the package using the sample server and client
+      programs which were built in the preceding step. Instructions for
+      performing the tests can be found at
+      <ulink url="&hints-root;/downloads/files/cyrus-sasl.txt"/>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; &amp;&amp;
-install -v -m644 doc/{*.{html,txt,fig},ONEWS,TODO} \
+install -v -dm755 /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; &amp;&amp;
+install -v -m644  doc/{*.{html,txt,fig},ONEWS,TODO} \
     saslauthd/LDAP_SASLAUTHD /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; &amp;&amp;
-install -v -m700 -d /var/lib/sasl</userinput></screen>
+install -v -dm700 /var/lib/sasl</userinput></screen>
 
   </sect2>
@@ -127,43 +159,63 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--with-dbpath=/var/lib/sasl/sasldb2</parameter>: This
-    parameter forces the <command>sasldb</command> database to be created
-    in <filename class='directory'>/var/lib/sasl</filename> instead of
-    <filename class='directory'>/etc</filename>.</para>
-
-    <para><parameter>--with-saslauthd=/var/run/saslauthd</parameter>: This
-    parameter forces <command>saslauthd</command> to use the FHS compliant
-    directory <filename class='directory'>/var/run/saslauthd</filename> for
-    variable run-time data.</para>
-
-    <para><parameter>--with-dblib=gdbm</parameter>: This parameter forces
-    <application>GDBM</application> to be used instead of
-    <application>Berkeley DB</application>.</para>
-
-    <para><option>--with-ldap</option>: This parameter enables use
-    with <application>OpenLDAP</application>.</para>
-
-    <para><option>--enable-ldapdb</option>: This parameter enables the
-    LDAPDB authentication backend. There is a circular dependency with this
-    parameter. See <ulink url="&blfs-wiki;/cyrus-sasl"/> for a solution to
-    this problem.</para>
-
-    <para><option>--enable-java</option>: This option enables compiling of
-    <application>Java</application> support libraries</para>
-
-    <para><option>--enable-login</option>: This option enables unsupported
-    LOGIN authentication</para>
-
-    <para><option>--enable-ntlm</option>: This option enables unsupported
-    NTLM authentication</para>
-
-    <para><command>install -v -m644 ...</command>: These commands
-    install documentation which is not installed by the
-    <command>make install</command> command.</para>
-
-    <para><command>install -v -m700 -d /var/lib/sasl</command>:
-    This directory must exist when starting <command>saslauthd</command> or
-    using the sasldb plugin. If you're not going to be running the daemon or
-    using the plugins, you may omit the creation of this directory.</para>
+    <para>
+      <parameter>--with-dbpath=/var/lib/sasl/sasldb2</parameter>: This
+      switch forces the <command>sasldb</command> database to be created
+      in <filename class="directory">/var/lib/sasl</filename> instead of
+      <filename class="directory">/etc</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-saslauthd=/var/run/saslauthd</parameter>: This
+      switch forces <command>saslauthd</command> to use the FHS compliant
+      directory <filename class="directory">/var/run/saslauthd</filename>
+      for variable run-time data.
+    </para>
+
+    <para>
+      <parameter>--with-dblib=gdbm</parameter>: This switch forces
+      <application>GDBM</application> to be used instead of
+      <application>Berkeley DB</application>.
+    </para>
+
+    <para>
+      <option>--with-ldap</option>: This switch enables the
+      <application>OpenLDAP</application> support.
+    </para>
+
+    <para>
+      <option>--enable-ldapdb</option>: This switch enables the
+      LDAPDB authentication backend. There is a circular dependency with this
+      parameter. See <ulink url="&blfs-wiki;/cyrus-sasl"/> for a solution to
+      this problem.
+    </para>
+
+    <para>
+      <option>--enable-java</option>: This switch enables compiling of the
+      <application>Java</application> support libraries.
+    </para>
+
+    <para>
+      <option>--enable-login</option>: This option enables unsupported
+      LOGIN authentication.
+    </para>
+
+    <para>
+      <option>--enable-ntlm</option>: This option enables unsupported
+      NTLM authentication.
+    </para>
+
+    <para>
+      <command>install -v -m644 ...</command>: These commands
+      install documentation which is not installed by the
+      <command>make install</command> command.
+    </para>
+
+    <para>
+      <command>install -v -m700 -d /var/lib/sasl</command>: This directory
+      must exist when starting <command>saslauthd</command> or using the
+      sasldb plugin. If you're not going to be running the daemon or
+      using the plugins, you may omit the creation of this directory.
+    </para>
 
   </sect2>
@@ -175,8 +227,10 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/saslauthd.conf</filename> (for
-      <command>saslauthd</command> LDAP configuration)
-      and <filename>/etc/sasl2/Appname.conf</filename> (where "Appname"
-      is the application defined name of the application)</para>
+      <para>
+        <filename>/etc/saslauthd.conf</filename>
+        (for <command>saslauthd</command> LDAP configuration) and
+        <filename>/etc/sasl2/Appname.conf</filename>
+        (where "Appname" is the application defined name of the application)
+      </para>
 
       <indexterm zone="cyrus-sasl cyrus-sasl-config">
@@ -189,16 +243,21 @@
       <title>Configuration Information</title>
 
-      <para>See <ulink
-      url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/sysadmin.html"/>
-      for information on what to include in the application configuration files.
-      </para><para>
-      See <ulink
-      url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/LDAP_SASLAUTHD"/>
-      for configuring <command>saslauthd</command> with
-      <application>OpenLDAP</application>.</para><para>
-      See <ulink
-      url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/gssapi.html"/>
-      for configuring <command>saslauthd</command> with
-      <application>Kerberos</application>.
+      <para>
+        See
+        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/sysadmin.html"/>
+        for information on what to include in the application configuration files.
+      </para>
+
+      <para>
+        See
+        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/LDAP_SASLAUTHD"/>
+        for configuring <command>saslauthd</command> with
+        <application>OpenLDAP</application>.
+      </para>
+
+      <para>
+        See
+        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/gssapi.html"/>
+        for configuring <command>saslauthd</command> with <application>Kerberos</application>.
       </para>
 
@@ -208,8 +267,10 @@
       <title>Init Script</title>
 
-      <para>If you need to run the <command>saslauthd</command> daemon at system
-      startup, install the <filename>/etc/rc.d/init.d/saslauthd</filename>
-      init script included in the <xref linkend="bootscripts"/>
-      package using the following command:</para>
+      <para>
+        If you need to run the <command>saslauthd</command> daemon at system
+        startup, install the <filename>/etc/rc.d/init.d/saslauthd</filename>
+        init script included in the <xref linkend="bootscripts"/>
+        package using the following command:
+      </para>
 
       <indexterm zone="cyrus-sasl cyrus-sasl-init">
@@ -220,7 +281,9 @@
 
       <note>
-        <para>You'll need to modify /etc/sysconfig/saslauthd and replace the
-        <option><replaceable>AUTHMECH</replaceable></option> parameter
-        with your desired authentication mechanism.</para>
+        <para>
+          You'll need to modify /etc/sysconfig/saslauthd and replace the
+          <option><replaceable>AUTHMECH</replaceable></option> parameter
+          with your desired authentication mechanism.
+        </para>
       </note>
 
@@ -234,12 +297,21 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>pluginviewer, saslauthd, sasldblistusers2, saslpasswd2 and testsaslauthd</seg>
-        <seg>libsasl2.so, and numerous SASL plugins</seg>
-        <seg>/usr/include/sasl, /usr/lib/sasl2,
-        /usr/share/doc/cyrus-sasl-&cyrus-sasl-version;, and /var/lib/sasl</seg>
+        <seg>
+          pluginviewer, saslauthd, sasldblistusers2, saslpasswd2 and
+          testsaslauthd
+        </seg>
+        <seg>
+          libsasl2.so
+        </seg>
+        <seg>
+          /usr/include/sasl,
+          /usr/lib/sasl2,
+          /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; and
+          /var/lib/sasl
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -253,5 +325,7 @@
         <term><command>pluginviewer</command></term>
         <listitem>
-          <para>is used to list loadable SASL plugins and their properties.</para>
+          <para>
+            is used to list loadable SASL plugins and their properties.
+          </para>
           <indexterm zone="cyrus-sasl pluginviewer">
             <primary sortas="b-pluginviewer">pluginviewer</primary>
@@ -263,5 +337,7 @@
         <term><command>saslauthd</command></term>
         <listitem>
-          <para>is the SASL authentication server.</para>
+          <para>
+            is the SASL authentication server.
+          </para>
           <indexterm zone="cyrus-sasl saslauthd">
             <primary sortas="b-saslauthd">saslauthd</primary>
@@ -273,6 +349,8 @@
         <term><command>sasldblistusers2</command></term>
         <listitem>
-          <para>is used to list the users in the SASL password database
-          <filename>sasldb2</filename>.</para>
+          <para>
+            is used to list the users in the SASL password database
+            <filename>sasldb2</filename>.
+          </para>
           <indexterm zone="cyrus-sasl sasldblistusers2">
             <primary sortas="b-sasldblistusers2">sasldblistusers2</primary>
@@ -284,7 +362,9 @@
         <term><command>saslpasswd2</command></term>
         <listitem>
-          <para>is used to set and delete a user's SASL password and
-          mechanism specific secrets in the SASL password database
-          <filename>sasldb2</filename>.</para>
+          <para>
+            is used to set and delete a user's SASL password and
+            mechanism specific secrets in the SASL password
+            database <filename>sasldb2</filename>.
+          </para>
           <indexterm zone="cyrus-sasl saslpasswd2">
             <primary sortas="b-saslpasswd2">saslpasswd2</primary>
@@ -296,5 +376,7 @@
         <term><command>testsaslauthd</command></term>
         <listitem>
-          <para>is a test utility for the SASL authentication server.</para>
+          <para>
+            is a test utility for the SASL authentication server.
+          </para>
           <indexterm zone="cyrus-sasl testsaslauthd">
             <primary sortas="b-testsaslauthd">testsaslauthd</primary>
@@ -304,8 +386,10 @@
 
       <varlistentry id="libsasl2">
-        <term><filename class='libraryfile'>libsasl2.so</filename></term>
-        <listitem>
-          <para>is a general purpose authentication library for server and
-          client applications.</para>
+        <term><filename class="libraryfile">libsasl2.so</filename></term>
+        <listitem>
+          <para>
+            is a general purpose authentication library for server
+            and client applications.
+          </para>
           <indexterm zone="cyrus-sasl libsasl2">
             <primary sortas="c-libsasl2">libsasl2.so</primary>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ postlfs/security/gnupg2.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -7,8 +7,8 @@
   <!ENTITY gnupg2-download-http " ">
   <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "6a8589381ca1b0c1a921e9955f42b016">
-  <!ENTITY gnupg2-size          "4.0 MB">
-  <!ENTITY gnupg2-buildsize     "67 MB">
-  <!ENTITY gnupg2-time          "1.2 SBU">
+  <!ENTITY gnupg2-md5sum        "9d18ee71bb0b10d40d1c8a393bdd7a89">
+  <!ENTITY gnupg2-size          "4.1 MB">
+  <!ENTITY gnupg2-buildsize     "90 MB">
+  <!ENTITY gnupg2-time          "0.9 SBU">
 ]>
 
@@ -39,5 +39,5 @@
     OpenPGP-only version.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -106,8 +106,8 @@
             --libexecdir=/usr/lib/gnupg2 \
             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-make</userinput></screen><!-- &amp;&amp;
-
-makeinfo - -html - -no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
-makeinfo - -plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
+make &amp;&amp;
+
+makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
+makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
 
     <para>If you have <xref linkend="texlive"/>
@@ -115,5 +115,5 @@
     issue the following commands:</para>
 
-<screen><userinput>make -C doc pdf ps html</userinput></screen> -->
+<screen><userinput>make -C doc pdf ps html</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -124,5 +124,5 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen><!-- &amp;&amp;
+<screen role="root"><userinput>make install &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
@@ -139,5 +139,5 @@
                  /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
 install -v -m644 doc/gnupg.{pdf,dvi,ps} \
-                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen> -->
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
 
   </sect2>
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ postlfs/security/gnutls.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -7,5 +7,5 @@
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "9e73aa5c3ef3b7358159a31302e25aa7">
+  <!ENTITY gnutls-md5sum        "b1c8f431f7c258a1e76cdba05cc1dd88">
   <!ENTITY gnutls-size          "4.9 MB">
   <!ENTITY gnutls-buildsize     "130 MB">
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ server/databases/postgresql.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -94,5 +94,7 @@
     following commands: </para>
 
-<screen><userinput>./configure --prefix=/usr          \
+<screen><userinput>sed -e "s@DEFAULT_PGSOCKET_DIR  \"/tmp\"@DEFAULT_PGSOCKET_DIR  \"/run/postgresql\"@" \
+    -i src/include/pg_config_manual.h &amp;&amp;
+./configure --prefix=/usr          \
             --enable-thread-safety \
             --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
@@ -118,9 +120,10 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m700 -d /srv/pgsql/data &amp;&amp;
+<screen role="root"><userinput>install -v -dm700 /srv/pgsql/data &amp;&amp;
+install -v -dm755 /run/postgresql &amp;&amp;
 groupadd -g 41 postgres &amp;&amp;
 useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
         -u 41 postgres &amp;&amp;
-chown -v postgres /srv/pgsql/data &amp;&amp;
+chown -Rv postgres:postgres /srv/pgsql /run/postgresql &amp;&amp;
 su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</userinput></screen>
 
@@ -149,4 +152,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -e ...</command>: This sed changes server socket location
+      from <filename class="directory">/tmp</filename> to
+      <filename class="directory">/run/postgresql</filename>.
+    </para>
 
     <para><parameter>--docdir=/usr/share/doc/postgresql-&postgresql-version;</parameter>:
Index: server/other/soprano.xml
===================================================================
--- server/other/soprano.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ server/other/soprano.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -7,5 +7,5 @@
   <!ENTITY soprano-download-http "&sourceforge-repo;/soprano/soprano-&soprano-version;.tar.bz2">
   <!ENTITY soprano-download-ftp  " ">
-  <!ENTITY soprano-md5sum        "c7beb1bda475f363fa0afb58edc541fe">
+  <!ENTITY soprano-md5sum        "60ce910cf3c8e4655c614b45d73f2b2a">
   <!ENTITY soprano-size          "1.9 MB">
   <!ENTITY soprano-buildsize     "31 MB">
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 44b8f10888a3bde834ef18f9d27ba29346d9c675)
+++ x/wm/fluxbox.xml	(revision faf325d25b23bda9f7215af43a31e06f2356f030)
@@ -6,9 +6,10 @@
 
   <!ENTITY fluxbox-download-http "&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-download-ftp  "&gentoo-ftp-repo;/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-md5sum        "f95b0bdb9ee41bfac124bd0fc601f248">
-  <!ENTITY fluxbox-size          "776 KB">
-  <!ENTITY fluxbox-buildsize     "135 MB">
-  <!ENTITY fluxbox-time          "1.1 SBU">
+  <!ENTITY fluxbox-download-ftp
+           "&jaist-ftp-repo;/f/fl/fluxbox/fluxbox/&fluxbox-version;/fluxbox-&fluxbox-version;.tar.bz2">
+  <!ENTITY fluxbox-md5sum        "9d9e183424a0934e20417ff20775a570">
+  <!ENTITY fluxbox-size          "787 KB">
+  <!ENTITY fluxbox-buildsize     "150 MB">
+  <!ENTITY fluxbox-time          "0.9 SBU">
 ]>
 
@@ -63,5 +64,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="imlib2"/> Image display library</para>
+    <para role="optional">
+      <xref linkend="fribidi"/>,
+      <xref linkend="imlib2"/> (if you wish to use other image formats in addition to XPM) and
+      <ulink url="http://xorg.freedesktop.org/releases/individual/app/">xmessage</ulink> (runtime only)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -79,17 +84,9 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>This package does not have a working testsuite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--enable-imlib2</option>:
-    Use this option if you wish to use other image formats in addition to xpm.</para>
 
   </sect2>
