mutt-1.5.24.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16367 af4574ff-66df-0310-9fd7-8a98e5e911e0

general.ent

@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 1st &year;">
+<!ENTITY releasedate  "September 2nd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->

introduction/welcome/changelog.xml

@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>September 2nd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to mutt-1.5.24. Fixes
+            <ulink url="&blfs-ticket-root;6882">#6882</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
       <listitem>
         <para>September 1st, 2015</para>
         <itemizedlist>

networking/mailnews/mutt.xml

@@ -6,11 +6,11 @@
 
 <!--  <!ENTITY mutt-download-http "&sourceforge-repo;/mutt/mutt-&mutt-version;.tar.gz">-->
   <!ENTITY mutt-download-http " ">
-  <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/mutt/mutt-&mutt-version;.tar.gz">
+  <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
-  <!ENTITY mutt-md5sum        "11f5b6a3eeba1afa1257fe93c9f26bff">
+  <!ENTITY mutt-md5sum        "7f25d27f3c7c82285ac07aac35f5f0f2">
-  <!ENTITY mutt-size          "3.7 MB">
+  <!ENTITY mutt-size          "3.8 MB">
   <!ENTITY mutt-buildsize     "36 MB (plus a further 8MB for the PDF manual)">
-  <!ENTITY mutt-time          "0.7 SBU (plus a further 0.2SBU to regenerate the html if the required dependencies are present, and 0.2 SBU to build the PDF manual)">
+  <!ENTITY mutt-time          "0.3 SBU (plus a further 0.2 SBU to build the PDF manual)">
 ]>
 
 <sect1 id="mutt" xreflabel="Mutt-&mutt-version;">
@@ -34,7 +34,7 @@
     Agent. This is useful for reading, writing, replying to, saving, and
     deleting your email.</para>
 
-    &lfs77_checked; &gcc5_checked;
+    &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
@@ -58,14 +58,14 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required patch: <ulink
         url="&patch-root;/mutt-&mutt-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
 
@@ -119,9 +119,8 @@
       program and fixes two issues in the current stable version of
       <application>Mutt</application>: a segmentation fault that occurs under
       certain conditions and a compilation problem when building with recent
-      versions of <application>GCC</application>.  To find the current
+      versions of <application>GCC</application>.
-      stable release, please refer to the
+      </para>
-      <ulink url="http://www.mutt.org/">Mutt home page</ulink>.</para>
     </note>
 
     <para><application>Mutt</application> requires a group named
@@ -136,10 +135,16 @@
 
 <screen role="root"><userinput>chgrp -v mail /var/mail</userinput></screen>
 
+    <para><application>Mutt</application> will rebuild the html documentation
+    if <application>libxslt</application> is present, then use that to update
+    the text manual - even if none of the specified browsers are present. That
+    will create an empty text file, so we will save the shipped file.
+    </para>
+
     <para>Install <application>Mutt</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../mutt-&mutt-version;-upstream_fixes-1.patch &amp;&amp;
+<screen><userinput>cp -v doc/manual.txt{,.shipped} &amp;&amp;
 ./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --with-docdir=/usr/share/doc/mutt-&mutt-version; \
@@ -150,15 +155,8 @@
             --with-gdbm       \
             --without-bdb     \
             --without-tokyocabinet &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
-
+test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</userinput></screen>
-    <!-- for the moment, the html is regenerated automatically if the deps are
-    present, there is no way to stop it except by removing a dependency
-    <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> -->
 
     <para>To generate the PDF manual with <xref linkend="texlive"/>, run
     the following command:</para>
@@ -220,6 +218,10 @@ make -C doc</userinput></screen> -->
     <para><option>--with-slang</option>: Use <application>S-Lang
     </application> instead of <application>Ncurses</application>.</para>
 
+    <para><option>test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</option>:
+    if the text manual is now empty (<application>libxslt</application> is installed,
+    but without any of the specified text browsers), restore it from the copy.</para>
+
   </sect2>
 
   <sect2 role="configuration">

packages.ent

@@ -398,7 +398,7 @@
 <!ENTITY mailx-version                "12.5">
 <!ENTITY procmail-version             "3.22">
 <!ENTITY fetchmail-version            "6.3.26">
-<!ENTITY mutt-version                 "1.5.23">
+<!ENTITY mutt-version                 "1.5.24">
 <!ENTITY re-alpine-version            "2.03">
 
 <!-- Part V -->