From 2086c34e6b1ce41f07e2d9586a44c0a8d184e90f Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sun, 6 Mar 2016 15:53:28 +0000
Subject: [PATCH] Update to Exim-4.86.2 and tag

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17073 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 introduction/welcome/changelog.xml | 10 ++++++++++
 packages.ent                       |  2 +-
 server/mail/exim.xml               | 24 ++++++++++++++++--------
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/general.ent b/general.ent
index cea7dde9ed..5721e791e7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "03">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 3rd &year;">
+<!ENTITY releasedate  "March 6th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index c3286e2910..ec1a3e63f7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>March 6th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to Exim-4.86.2. Fixes
+          <ulink url="&blfs-ticket-root;7493">#7493</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 3rd, 2016</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 42d0382f2e..9e3632ac94 100644
--- a/packages.ent
+++ b/packages.ent
@@ -428,7 +428,7 @@
 <!ENTITY dovecot-micro                "21">
 <!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
 
-<!ENTITY exim-version                 "4.86">
+<!ENTITY exim-version                 "4.86.2">
 <!ENTITY postfix-version              "3.0.3">
 <!ENTITY sendmail-version             "8.15.2">
 
diff --git a/server/mail/exim.xml b/server/mail/exim.xml
index ad77972c1d..ac71daa0a6 100644
--- a/server/mail/exim.xml
+++ b/server/mail/exim.xml
@@ -8,12 +8,12 @@
        unless you decided to take care of and monitor it.
   <!ENTITY exim-download-http   "http://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2"> -->
 
-  <!ENTITY exim-download-http   "http://mirrors-uk.go-parts.com/eximftp/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-download-http   "http://mirrors-usa.go-parts.com/eximftp/exim/exim4/exim-&exim-version;.tar.bz2">
   <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
   <!-- if above don't work, please use one of the official mirrors at
        http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "797f248ef3e0c0e2f178e915f88fc4e9">
-  <!ENTITY exim-size            "1.8 MB">
+  <!ENTITY exim-md5sum          "1443a4a88d6b78ad9b6a681c51437b55">
+  <!ENTITY exim-size            "1.7 MB">
   <!ENTITY exim-buildsize       "17 MB">
   <!ENTITY exim-time            "0.2 SBU">
 
@@ -43,7 +43,7 @@
     Transport Agent written by the University of Cambridge, released
     under the GNU Public License.</para>
 
-    &lfs78_checked;
+    &lfs79_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -133,11 +133,12 @@ make</userinput></screen>
 
 <!-- dev note: make INSTALL_ARG=-no_chown DESTDIR=<DESTDIR> install -->
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 doc/exim.8 /usr/share/man/man8 &amp;&amp;
-install -v -d -m755 /usr/share/doc/exim-&exim-version; &amp;&amp;
+<screen role="root"><userinput>make install                                      &amp;&amp;
+install -v -m644 doc/exim.8 /usr/share/man/man8   &amp;&amp;
+install -v -d -m755 /usr/share/doc/exim-&exim-version;    &amp;&amp;
 install -v -m644 doc/* /usr/share/doc/exim-&exim-version; &amp;&amp;
-ln -sfv exim /usr/sbin/sendmail</userinput></screen>
+ln -sfv exim /usr/sbin/sendmail                   &amp;&amp;
+install -v -m750 -o exim -g exim /var/spool/exim</userinput></screen>
 
   </sect2>
 
@@ -182,6 +183,13 @@ ln -sfv exim /usr/sbin/sendmail</userinput></screen>
     <application>Exim</application> will accept most
     <application>Sendmail</application> command-line options.</para>
 
+    <para><command>install -v -m750 -o exim -g exim /var/spool/exim</command>:
+    Since /var/spool is owned by root and this version of <command>exim</command>
+    drops <systemitem class="username">root</systemitem> privileges early, to
+    run as user <systemitem class="username">exim</systemitem>, it cannot create
+    the <filename class="directory">/var/spool/exim</filename> directory. As a
+    work around, it is created manually.</para>
+
   </sect2>
 
   <sect2 role="commands">