From 79df62689dba842c77b2ae538dbfc25a2e76652f Mon Sep 17 00:00:00 2001
From: Larry Lawrence <larry@linuxfromscratch.org>
Date: Sat, 5 Apr 2003 15:17:18 +0000
Subject: [PATCH] update to exim-4.14

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@823 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 server/mail/exim/exim-config.xml       |  2 +-
 server/mail/exim/exim.ent              |  8 ++++----
 server/mail/qpopper/qpopper-config.xml | 12 ++++--------
 server/mail/qpopper/qpopper-inst.xml   |  6 ++----
 server/mail/qpopper/qpopper-intro.xml  |  6 ++----
 server/mail/qpopper/qpopper.ent        |  4 ++--
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/server/mail/exim/exim-config.xml b/server/mail/exim/exim-config.xml
index c1d497ccb1..f58a6a0f6e 100644
--- a/server/mail/exim/exim-config.xml
+++ b/server/mail/exim/exim-config.xml
@@ -2,7 +2,7 @@
 <title>Configuring exim</title>
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/exim.conf, /etc/aliases</userinput></para>
+<para><userinput>/etc/exim.conf</userinput>, <userinput>/etc/aliases</userinput></para>
 </sect3>
 
 <sect3><title>Configuration of exim</title>
diff --git a/server/mail/exim/exim.ent b/server/mail/exim/exim.ent
index abc2bfa6a5..33e334e425 100644
--- a/server/mail/exim/exim.ent
+++ b/server/mail/exim/exim.ent
@@ -4,8 +4,8 @@
 <!ENTITY exim-desc SYSTEM "exim-desc.xml">
 <!ENTITY exim-exp SYSTEM "exim-exp.xml">
 <!ENTITY exim-config SYSTEM "exim-config.xml">
-<!ENTITY exim-buildsize "8.2 MB">
-<!ENTITY exim-version "4.12">
-<!ENTITY exim-download-http "N/A">
+<!ENTITY exim-buildsize "8.7 MB">
+<!ENTITY exim-version "4.14">
+<!ENTITY exim-download-http "">
 <!ENTITY exim-download-ftp "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-<!ENTITY exim-size "1.1 MB">
+<!ENTITY exim-size "1.2 MB">
diff --git a/server/mail/qpopper/qpopper-config.xml b/server/mail/qpopper/qpopper-config.xml
index 15ea644354..3a96ffb4fa 100644
--- a/server/mail/qpopper/qpopper-config.xml
+++ b/server/mail/qpopper/qpopper-config.xml
@@ -11,15 +11,13 @@
 <para>If you use inetd, the following command will add the qpopper
 entry to /etc/inetd.conf:</para>
 
-<para><screen><userinput>
-echo "pop stream tcp nowait root /usr/sbin/popper popper" >> \
+<para><screen><userinput>echo "pop stream tcp nowait root /usr/sbin/popper popper" >> \
 /etc/inetd.conf &amp;&amp;
 echo "pop 110/tcp" &gt;&gt; /etc/services &amp;&amp;
 killall inetd || inetd &amp;&amp;
 echo "local0.notice;local0.debug        /var/log/POP.log" >> \
 /etc/syslog.conf &amp;&amp;
-killall -HUP  syslogd
-</userinput></screen></para>
+killall -HUP  syslogd</userinput></screen></para>
 
 <para>Issue a killall -HUP inetd to reread the changed inetd.conf
 file.</para>
@@ -27,8 +25,7 @@ file.</para>
 <para>If you use xinetd, the following command will add the qpopper
 entry to /etc/xinetd.conf:</para>
 
-<para><screen><userinput>
-cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
      service pop
      {
           port        = 110
@@ -40,8 +37,7 @@ cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
           server      = /usr/sbin/popper
          server_args = popper
      }
-EOF
-</userinput></screen></para>
+EOF</userinput></screen></para>
 <para>Issue a killall -HUP xinetd to reread the changed xinetd.conf
 file.</para>
 
diff --git a/server/mail/qpopper/qpopper-inst.xml b/server/mail/qpopper/qpopper-inst.xml
index ab8b668bb6..30b0b3b919 100644
--- a/server/mail/qpopper/qpopper-inst.xml
+++ b/server/mail/qpopper/qpopper-inst.xml
@@ -2,11 +2,9 @@
 <title>Installation of qpopper</title>
 
 <para>Install qpopper with the following commands:</para>
-<para><screen><userinput>
-./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/server/mail/qpopper/qpopper-intro.xml b/server/mail/qpopper/qpopper-intro.xml
index 1765315bad..97d01e9a71 100644
--- a/server/mail/qpopper/qpopper-intro.xml
+++ b/server/mail/qpopper/qpopper-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Introduction to qpopper</title>
 
-<screen>
+<screen>Download location (HTTP):       <ulink url="&qpopper-download-http;"/>
 Download location (FTP):        <ulink url="&qpopper-download-ftp;"/>
 Version used:                   &qpopper-version;
 Package size:                   &qpopper-size;
@@ -11,8 +11,6 @@ Estimated Disk space required:  &qpopper-buildsize;</screen>
 
 
 <screen>qpopper depends on: 
-<xref linkend="sendmail"/></screen>
-
-<note><para>Other MTA's may be used instead of Sendmail.</para></note>
+<xref linkend="sendmail"/> or <xref linkend="postfix"/> or <xref linkend="qmail"/></screen>
 
 </sect2>
diff --git a/server/mail/qpopper/qpopper.ent b/server/mail/qpopper/qpopper.ent
index 8b6471599e..eb56015fb6 100644
--- a/server/mail/qpopper/qpopper.ent
+++ b/server/mail/qpopper/qpopper.ent
@@ -5,6 +5,6 @@
 <!ENTITY qpopper-config SYSTEM "qpopper-config.xml">
 <!ENTITY qpopper-buildsize "6.7 MB">
 <!ENTITY qpopper-version "4.0.4">
-<!ENTITY qpopper-download-ftp
-"ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.0.4.tar.gz">
+<!ENTITY qpopper-download-http "">
+<!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.0.4.tar.gz">
 <!ENTITY qpopper-size "2.3 MB">