Fixed bug 71418.

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 804d5138cbda1d4a71881ff7d647d5fbf4afde56..0dd68fb7fdb8d583da49b82205134c24444c50b8 100644 (file)
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,17 +1,15 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.18 2005/01/03 20:55:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.19 2005/01/03 21:31:33 hansmi Exp $
 
   03 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r12.ebuild,
   qmail-1.03-r13.ebuild, qmail-1.03-r14.ebuild, qmail-1.03-r15.ebuild,
-  qmail-1.03-r16.ebuild, +files/1.03-r16/starttls-recordio.patch:
+  qmail-1.03-r16.ebuild, +files/1.03-r16/starttls-recordio.patch,
+  files/conf-smtpd:
   Added bounce-encap-patch from bug 38849. Fixed a problem with recordio and
-  tls, bug 40521. Integrated mailwrapper, bug 48885. Fixed bug 51967 and
-  changed all needed #!/bin/sh to #!/bin/bash in the scripts.
-
-  03 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild,
-  qmail-1.03-r16.ebuild:
-  Fixed bug 68173.
+  tls, bug 40521. Integrated mailwrapper, bug 48885. Fixed bug 51967 (changed
+  all needed #!/bin/sh to #!/bin/bash in the scripts). Fixed bug 71418
+  (fixcrio). Fixed bug 68173 (crash on ia64).
 
 *qmail-1.03-r16 (02 Jan 2005)
 
@@ -69,7 +67,7 @@
   qmail-1.03-r11.ebuild, qmail-1.03-r9.ebuild:
   Fix use invocation
 
-  05 Jun 2004; Bryan Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\98stergaard <kloeri@gentoo.org> qmail-1.03-r15.ebuild:
+  05 Jun 2004; Bryan Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\82Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\98stergaard <kloeri@gentoo.org> qmail-1.03-r15.ebuild:
   Stable on alpha.
 
   28 May 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:

diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 655daa5223ef41407c44de0dd1dcec8b9c67e470..786471da819404bf56cf7c535b53c4a8b058d7e1 100644 (file)
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -2,7 +2,7 @@ MD5 326c3d12fa42f7d77ec25d0034c6386c qmail-1.03-r11.ebuild 11387
 MD5 b29fd46e11237b9ee8c69b705a91b1bf qmail-1.03-r8.ebuild 8060
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d18a1222087e80a39b2588e0f12e6e13 qmail-1.03-r10.ebuild 11111
-MD5 c40ef2120074e7931a689ba568d107d4 ChangeLog 20391
+MD5 2030c60ffebf9ed3559ad3d3502bbaec ChangeLog 20477
 MD5 5eacc23899acc4cd889111456359ae64 qmail-1.03-r16.ebuild 19348
 MD5 48561c5b6846d4b381dfdd498b1955f4 qmail-1.03-r9.ebuild 9887
 MD5 680b7751a954606dfe22cc1b413011df qmail-1.03-r12.ebuild 13703
@@ -28,7 +28,7 @@ MD5 7f17bb21b4ada140e73809d6478a5544 files/config-sanity-check 1223
 MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
 MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
 MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
-MD5 5c22397958f313d4cc62239e3e90c188 files/conf-smtpd 1702
+MD5 cb04143679bed2dbe504bcc922b78efc files/conf-smtpd 1875
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
 MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
 MD5 8a0617c35da5f6703ad17a74ca617a7e files/run-qmailqmtpdlog 316

diff --git a/mail-mta/qmail/files/conf-smtpd b/mail-mta/qmail/files/conf-smtpd
index ee1db67c1dfd8decb88c08928e1e8bd832a14577..7d6fd2e29f6e274633fa4c37ecdfd71258ec5135 100644 (file)
--- a/mail-mta/qmail/files/conf-smtpd
+++ b/mail-mta/qmail/files/conf-smtpd
@@ -1,5 +1,5 @@
 # Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd,v 1.3 2005/01/03 21:31:33 hansmi Exp $
 
 # Stuff to run before tcpserver
 #QMAIL_TCPSERVER_PRE=""
@@ -11,6 +11,11 @@
 # this turns off the IDENT grab attempt on connecting
 TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
 
+# fixcrio inserts missing CRs at the ends of lines. See:
+# http://cr.yp.to/ucspi-tcp/fixcrio.html
+# http://cr.yp.to/docs/smtplf.html
+#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} fixcrio"
+
 # You might want to use rblsmtpd with this, but you need to fill in a RBL server here first
 # see http://cr.yp.to/ucspi-tcp/rblsmtpd.html for more details
 #QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} rblsmtpd -r RBL-SERVER"