From 8b220c27c18a4f79f136bf0a3a484089b04df8fa Mon Sep 17 00:00:00 2001
From: Larry Lawrence <larry@linuxfromscratch.org>
Date: Sat, 5 Apr 2003 14:36:07 +0000
Subject: [PATCH] apply glibc patch to qmail-1.03

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@822 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 server/mail/qmail/qmail-config.xml       | 5 ++---
 server/mail/qmail/qmail-inst.xml         | 3 ++-
 server/mail/qmail/qmail-intro.xml        | 4 ++++
 server/mail/qmail/qmail.ent              | 4 ++--
 server/mail/sendmail/sendmail-config.xml | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/mail/qmail/qmail-config.xml b/server/mail/qmail/qmail-config.xml
index 352f6483ec..9e6a3f31e6 100644
--- a/server/mail/qmail/qmail-config.xml
+++ b/server/mail/qmail/qmail-config.xml
@@ -2,7 +2,7 @@
 <title>Configuring qmail</title>
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/inetd.conf and boot scripts</userinput></para>
+<para><userinput>/etc/inetd.conf</userinput> and <userinput>boot scripts</userinput></para>
 </sect3>
 
 <sect3><title>Configuration Information</title>
@@ -92,8 +92,7 @@ ln -sf ../init.d/qmail ../rc6.d/K25qmail</userinput></screen></para>
 found in the <filename>/var/qmail/doc/INSTALL.mbox</filename>
 file.  Most MUAs can be configured to use qmail Mailbox format buy
 putting the following in ~/.profile:</para>
-<para><screen><userinput>
-MAIL=$HOME/Mailbox; export MAIL
+<para><screen><userinput>MAIL=$HOME/Mailbox; export MAIL
 </userinput></screen></para></sect3>
 
 </sect2>
diff --git a/server/mail/qmail/qmail-inst.xml b/server/mail/qmail/qmail-inst.xml
index 4612a88350..f2156a5a44 100644
--- a/server/mail/qmail/qmail-inst.xml
+++ b/server/mail/qmail/qmail-inst.xml
@@ -19,7 +19,8 @@ useradd -g qmail -d /var/qmail qmails</userinput></screen></para>
 
 <para>Install qmail by running the following commands:</para>
 
-<para><screen><userinput>make setup check &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../qmail-1.03.errno.patch &amp;&amp;
+make setup check &amp;&amp;
 ./config-fast `hostname` &amp;&amp;
 cd /var/qmail &amp;&amp;
 touch .qmail-postmaster .qmail-mailer-daemon .qmail-root &amp;&amp;
diff --git a/server/mail/qmail/qmail-intro.xml b/server/mail/qmail/qmail-intro.xml
index 6106e5cdbb..c44bf69e3c 100644
--- a/server/mail/qmail/qmail-intro.xml
+++ b/server/mail/qmail/qmail-intro.xml
@@ -6,6 +6,10 @@ Download location (FTP):        <ulink url="&qmail-download-ftp;"/>
 Version used:                   &qmail-version;
 Package size:                   &qmail-size;
 Estimated Disk space required:  &qmail-buildsize;</screen>
+<screen>
+Additional downloads:
+<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/qmail-1.03.errno.patch">qmail errno patch</ulink></screen>
+
 
 <para>The qmail package contains Dan Bernstein's Mail Transport Agent
 (MTA). qmail provides local and remote mail delivery/relaying.</para>
diff --git a/server/mail/qmail/qmail.ent b/server/mail/qmail/qmail.ent
index 71633c6b4e..a8dc5b09c9 100644
--- a/server/mail/qmail/qmail.ent
+++ b/server/mail/qmail/qmail.ent
@@ -5,6 +5,6 @@
 <!ENTITY qmail-config SYSTEM "qmail-config.xml">
 <!ENTITY qmail-buildsize "4.6 MB">
 <!ENTITY qmail-version "1.03">
-<!ENTITY qmail-download-http "">
-<!ENTITY qmail-download-ftp "ftp://koobera.math.uic.edu/www/software/qmail-1.03.tar.gz">
+<!ENTITY qmail-download-http "http://www.qmail.org/qmail-1.03.tar.gz">
+<!ENTITY qmail-download-ftp "">
 <!ENTITY qmail-size "225 KB">
diff --git a/server/mail/sendmail/sendmail-config.xml b/server/mail/sendmail/sendmail-config.xml
index d53ad2a67a..2e0a3c5ef8 100644
--- a/server/mail/sendmail/sendmail-config.xml
+++ b/server/mail/sendmail/sendmail-config.xml
@@ -2,8 +2,8 @@
 <title>Configuring sendmail</title>
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/mail/aliases.db, /etc/mail/sendmail.cf,
-/etc/mail/submit.cf</userinput> and
+<para><userinput>/etc/mail/aliases.db</userinput>,
+<userinput>/etc/mail/sendmail.cf</userinput>, <userinput>/etc/mail/submit.cf</userinput> and
 <userinput>/etc/mail/local-host-names</userinput></para>
 </sect3>