Index: general.ent
===================================================================
--- general.ent	(revision 55681b7b406e5225b0265379557a866117c28e84)
+++ general.ent	(revision fae66a0e127e11a7301f9fe4027e18f3aa7c332c)
@@ -60,5 +60,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20120217">
+<!ENTITY blfs-bootscripts-version     "20120305">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
@@ -116,5 +116,5 @@
 <!ENTITY consolekit-version           "0.4.5">
 <!ENTITY cracklib-version             "2.8.18">
-<!ENTITY cyrus-sasl-version           "2.1.23">
+<!ENTITY cyrus-sasl-version           "2.1.25">
 <!ENTITY iptables-version             "1.4.12">
 <!ENTITY gnupg-version                "1.4.11">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 55681b7b406e5225b0265379557a866117c28e84)
+++ introduction/welcome/changelog.xml	(revision fae66a0e127e11a7301f9fe4027e18f3aa7c332c)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to cyrus-sasl-2.1.25. Thanks to
+          Armin K. for creating the patches.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to Alsa-1.0.25. Thanks to
           Armin K. for creating the patch.</para>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 55681b7b406e5225b0265379557a866117c28e84)
+++ postlfs/security/cyrus-sasl.xml	(revision fae66a0e127e11a7301f9fe4027e18f3aa7c332c)
@@ -7,8 +7,8 @@
   <!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        "2eb0e48106f0e9cd8001e654f267ecbc">
-  <!ENTITY cyrus-sasl-size          "1.6 MB">
-  <!ENTITY cyrus-sasl-buildsize     "17 MB">
-  <!ENTITY cyrus-sasl-time          "0.3 SBU">
+  <!ENTITY cyrus-sasl-md5sum        "341cffe829a4d71f2a6503d669d5a946">
+  <!ENTITY cyrus-sasl-size          "5.0 MB">
+  <!ENTITY cyrus-sasl-buildsize     "20 MB">
+  <!ENTITY cyrus-sasl-time          "0.5 SBU">
 ]>
 
@@ -38,4 +38,6 @@
     and the connection.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -60,20 +62,28 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-bdb5-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Cyrus SASL Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="openssl"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="db"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="linux-pam"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
+    <xref linkend="mitkrb"/>,
     <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <xref linkend="db"/>,
     <xref linkend="sqlite"/>,
-    <!-- <xref linkend="gdbm"/>,
-    <xref linkend="courier"/>,  -->
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, and
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
@@ -90,8 +100,5 @@
     running the following commands:</para>
 
-<screen><userinput>sed -i.bak 's/#elif WITH_DES/#elif defined(WITH_DES)/' \
-    plugins/digestmd5.c &amp;&amp;
-sed -i 's#DB_VERSION_MAJOR == 4.*#(&amp;) || DB_VERSION_MAJOR == 5#' \
-    {sasldb/db_berkeley.c,utils/dbconverter-2.c} &amp;&amp;
+<screen><userinput>patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-bdb5-1.patch &amp;&amp;
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
@@ -113,6 +120,5 @@
 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 &amp;&amp;
-install -v -m711 -d /var/run/saslauthd</userinput></screen>
+install -v -m700 -d /var/lib/sasl</userinput></screen>
 
   </sect2>
@@ -120,10 +126,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>sed -i.bak ... plugins/digestmd5.c</command>: This fixes
-    a build problem caused by using newer compilers.</para>
-
-    <para><command>sed -i 's#DB_VERSION_MAJOR ...</command>: This fixes
-    compiling against version 5 of <xref linkend="db"/>.</para>
 
     <para><parameter>--with-dbpath=/var/lib/sasl/sasldb2</parameter>: This
@@ -149,11 +149,19 @@
     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 ...
-    -m711 /var/run/saslauthd</command>:
-    These directories must exist when starting <command>saslauthd</command> or
+    <para><command>install -v -m700 -d /var/lib/sasl</command>:
+    This directoriy 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>
@@ -184,8 +192,14 @@
       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>
+      <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>
 
     </sect3>
@@ -206,8 +220,7 @@
 
       <note>
-        <para>You'll need to modify the init script and replace the
-        <option><replaceable>&lt;authmech&gt;</replaceable></option> parameter
-        to the <option>-a</option> switch with your desired authentication
-        mechanism.</para>
+        <para>You'll need to modify /etc/sysconfig/cyrus-sasl and replace the
+        <option><replaceable>AUTHMECH</replaceable></option> parameter
+        with your desired authentication mechanism.</para>
       </note>
 
@@ -225,8 +238,7 @@
 
       <seglistitem>
-        <seg>saslauthd, sasldblistusers2, and saslpasswd2</seg>
-        <seg>libjavasasl.so, libsasl2.so, and numerous SASL plugins and
-        Java classes</seg>
-        <seg>/usr/include/sasl, /usr/lib/java/classes/sasl, /usr/lib/sasl2,
+        <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>
       </seglistitem>
@@ -237,4 +249,14 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pluginviewer">
+        <term><command>pluginviewer</command></term>
+        <listitem>
+          <para>is used to list loadable SASL plugins and their properties.</para>
+          <indexterm zone="cyrus-sasl pluginviewer">
+            <primary sortas="b-pluginviewer">pluginviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="saslauthd">
@@ -271,4 +293,14 @@
       </varlistentry>
 
+      <varlistentry id="testsaslauthd">
+        <term><command>testsaslauthd</command></term>
+        <listitem>
+          <para>is a test utility for the SASL authentication server.</para>
+          <indexterm zone="cyrus-sasl testsaslauthd">
+            <primary sortas="b-testsaslauthd">testsaslauthd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libsasl2">
         <term><filename class='libraryfile'>libsasl2.so</filename></term>
