Ticket #2072: blfs-mutt-1.5.16.patch

BOOK/basicnet/mailnews/mutt.xml

@@ -6 +6 @@
 
   <!ENTITY mutt-download-http "http://downloads.sourceforge.net/mutt/mutt-&mutt-version;.tar.gz">
   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/mutt/devel/mutt-&mutt-version;.tar.gz">
-  <!ENTITY mutt-md5sum        "00e6f8f7c37d4840e5e30583ebee21ce">
-  <!ENTITY mutt-size          "3.1 MB">
-  <!ENTITY mutt-buildsize     "24.2 MB">
+  <!ENTITY mutt-md5sum        "10eff7024dbb7ce1f773d688a69ea9db">
+  <!ENTITY mutt-size          "3.4 MB">
+  <!ENTITY mutt-buildsize     "25.7 MB">
   <!ENTITY mutt-time          "0.4 SBU">
 ]>
 
@@ -25 +25 @@
   <sect2 role="package">
     <title>Introduction to Mutt</title>
 
-    <para>The <application>Mutt</application> package contains a Mail User Agent.
-    This is useful for reading, writing, replying to, saving, and deleting your email.</para>
+    <para>The <application>Mutt</application> package contains a Mail User
+    Agent. This is useful for reading, writing, replying to, saving, and
+    deleting your email.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
@@ -50 +51 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/mutt-&mutt-version;-security_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -80 +73 @@
       <!-- <xref linkend="db"/> -->
       <ulink url="http://www.gnu.org/software/gdb/gdb.html">GDB</ulink></para>
 
-    <bridgehead renderas="sect4">Optional (To Regenerate Documentation)</bridgehead>
+    <bridgehead renderas="sect4">Optional (To Regenerate HTML
+    Documentation)</bridgehead>
     <para role="optional"><xref linkend="libxslt"/>, and
-      <xref linkend="Links"/> or
-      <xref linkend="w3m"/></para>
+    <xref linkend="Links"/> or <xref linkend="w3m"/></para>
+
+    <!-- Untested PDF generation with jadetex/openjade/opensp
+    <bridgehead renderas="sect4">Optional (To Generate PDF Manual)</bridgehead>
+    <para role="optional"><xref linkend="jadetex"/></para>
+    -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mutt"/></para>
@@ -124 +122 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-pop --enable-imap &amp;&amp;
+    --with-docdir=/usr/share/doc/mutt-&mutt-version; \
+    --enable-pop --enable-imap --enable-smtp &amp;&amp;
 make</userinput></screen>
 
+    <para>If you have the necessary dependencies installed and would like
+    to rebuild the HTML documentation, issue the following commands</para>
+
+<screen><userinput>make -C doc clean &amp;&amp;
+make -C doc</userinput></screen>
+
+    <!-- Untested PDF generation
+    <para>To generate the PDF manual with <xref linkend="jadetex"/>, run
+    the following commands:</para>
+
+<screen><userinput>make -C doc manual.pdf</userinput></screen>
+    -->
+
     <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install</userinput></screen>
 
+    <!-- Untested PDF generation
+    <para>If you generated the PDF manual, install it and the source TeX
+    file as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>install -v -m644 doc/manual.{pdf,tex} \
+    /usr/share/doc/mutt-&mutt-version;</userinput></screen>
+    -->
+
   </sect2>
 
   <sect2 role="commands">
@@ -144 +164 @@
     <para><parameter>--enable-imap</parameter>: This switch enables
     IMAP support.</para>
 
+    <para><parameter>--enable-smtp</parameter>: This switch enables
+    SMTP relay support.</para>
+
     <para><parameter>--with-...</parameter>: This switch enables the various
     dependencies.</para>
 
@@ -186 +209 @@
       <para>In order to utilize <application>GnuPG</application>, use the following
       command:</para>
 
-<screen><userinput>cat /usr/share/doc/mutt/samples/gpg.rc &gt;&gt; ~/.muttrc</userinput></screen>
+<screen><userinput>cat /usr/share/doc/mutt-&mutt-version;/samples/gpg.rc &gt;&gt; ~/.muttrc</userinput></screen>
 
     </sect3>
 
@@ -201 +224 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>flea, mutt, mutt_dotlock, muttbug, pgpring, and pgpwrap</seg>
+        <seg>flea, mutt, mutt_dotlock, muttbug, pgp_ewrap, pgpring, and
+        smime_keys</seg>
         <seg>None</seg>
-        <seg>/usr/doc/mutt</seg>
+        <seg>/usr/share/doc/mutt-&mutt-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -225 +249 @@
       <varlistentry id="mutt-prog">
         <term><command>mutt</command></term>
         <listitem>
-          <para>is a Mail User Agent (MUA) which enables you to read, write and delete
-          your email.</para>
+          <para>is a Mail User Agent (MUA) which enables you to read, write
+          and delete your email.</para>
           <indexterm zone="mutt mutt-prog">
             <primary sortas="b-mutt">mutt</primary>
           </indexterm>
@@ -253 +277 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pgpewrap">
+        <term><command>pgpewrap</command></term>
+        <listitem>
+          <para>prepares a command line for the <xref linkend="gnupg"/>
+          utilities.</para>
+          <indexterm zone="mutt pgpewrap">
+            <primary sortas="c-pgpewrap">pgpewrap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pgpring">
+        <term><command>pgpring</command></term>
+        <listitem>
+          <para>is a key ring dumper for <ulink
+          url="http://www.pgp.com/">PGP</ulink>. It is not needed for
+          <xref linkend="gnupg"/>.</para>
+          <indexterm zone="mutt pgpring">
+            <primary sortas="c-pgpring">pgpring</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smime_keys">
+        <term><command>smime_keys</command></term>
+        <listitem>
+          <para>manages a keystore for S/MIME certificates.</para>
+          <indexterm zone="mutt smime_keys">
+            <primary sortas="c-smime_keys">smime_keys</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>

BOOK/general.ent

@@ -3 +3 @@
 $Date$
 -->
 
-<!ENTITY day          "07">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -335 +335 @@
 <!ENTITY mailx-version                "12.2">
 <!ENTITY procmail-version             "3.22">
 <!ENTITY fetchmail-version            "6.3.4">
-<!ENTITY mutt-version                 "1.5.11">
+<!ENTITY mutt-version                 "1.5.16">
 <!ENTITY pine-version                 "4.64">
 <!-- Commenting out slrn as tin has replaced it
 <!ENTITY slrn-version                 "0.9.8.1">

BOOK/introduction/welcome/changelog.xml

@@ -42 +42 @@
 -->
 
     <listitem>
+      <para>June 12th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Updated to Mutt-1.5.16</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 7th, 2007</para>
       <itemizedlist>
         <listitem>