fix coreutils issue, finalize badrcptto patch.

4 files changed, 19 insertions, 16 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 447fbc0310af..1833bb2fb2ab 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/qmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.42 2003/09/20 23:58:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.43 2003/09/24 04:06:14 robbat2 Exp $
+
+  23 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
+  fix coreutils issue, finalize badrcptto patch.
 
   20 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild,
   files/1.03-r12/dot_qmail, files/1.03-r12/rc:
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index 238204eb4df6..c7758658d76a 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -2,10 +2,9 @@ MD5 f2193d3a327e5328b066c43a85be6b16 qmail-1.03-r11.ebuild 11396
 MD5 9f63e83d10743897e07c25c28a6c57f3 qmail-1.03-r9.ebuild 9963
 MD5 a44e4287eb93476321e39985a7217b65 qmail-1.03-r10.ebuild 11152
 MD5 2e824ec277afa32dfbc8a5b796ecb15d qmail-1.03-r8.ebuild 8115
-MD5 477a762f0016b40ab90f982cd1bfb208 qmail-1.03-r12.ebuild 12897
-MD5 89d6bc18f38089193e2a7eb9b8361d82 ChangeLog 10151
+MD5 2494d3577575290d78f7ab5f8ade3e50 qmail-1.03-r12.ebuild 12591
+MD5 954962b289db93ff4f3b934fe5fdfa9e ChangeLog 10277
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
-MD5 7430fb40cf83664e7f0cdc9a80050c25 tmp/badrcptto-morebadrcptto-accdias.diff.bz2 4788
 MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
 MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
 MD5 734ea9dfff4513984d2d69123ce54fb8 files/gencert.sh 224
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r12 b/net-mail/qmail/files/digest-qmail-1.03-r12
index 97f25fad0f94..ff1a46d50976 100644
--- a/net-mail/qmail/files/digest-qmail-1.03-r12
+++ b/net-mail/qmail/files/digest-qmail-1.03-r12
@@ -14,3 +14,4 @@ MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
 MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
 MD5 83bf5c4a4aade3c6c15faa9665ccfb71 qregex-starttls-2way-auth.patch 63825
 MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
+MD5 fc00be3edc2827f1c93112d7d5147122 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index 0b59e176d98e..53f6cc12e199 100644
--- a/net-mail/qmail/qmail-1.03-r12.ebuild
+++ b/net-mail/qmail/qmail-1.03-r12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.11 2003/09/20 23:58:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.12 2003/09/24 04:06:14 robbat2 Exp $
 
-inherit eutils
+inherit eutils fixheadtails
 
 IUSE="ssl"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -24,7 +24,8 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
 	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
 	http://www.ckdhr.com/ckd/qmail-103.patch
 	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth.patch
-	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt"
+	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
+	mirror://gentoo/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2"
 
 SLOT="0"
 LICENSE="as-is"
@@ -128,22 +129,22 @@ src_unpack() {
 	# gentoo bug #18064
 	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-relay-reject.gentoo.patch
 
-	#TODO REDIFF
+	#TODO TEST HEAVILY AS THIS PATCH WAS CUSTOM FIXED
 	# provide badrcptto support
 	# as per bug #17283
 	# patch re-diffed from original at http://sys.pro.br/files/badrcptto-morebadrcptto-accdias.diff.bz2
-	# presently this breaks qmail so it is disabled
-	#epatch ${FILESDIR}/${PV}-${PR}/badrcptto-morebadrcptto-accdias-gentoo
+	epatch ${DISTDIR}/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
 
 	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc
-	use ssl && echo -n ' -DTLS' >>${S}/conf-cc
+	if use ssl; then
+		einfo "Enabling SSL/TLS functionality"
+		echo -n ' -DTLS' >>${S}/conf-cc
+	fi
 	echo -n "${CC} ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
 
 	# fix coreutils messup
-	sed -re 's/(head|tail) (-[[:alpha:]][[:alnum:]]+)+ -([[:digit:]]+)/\1 \2 -n\3/g' -i ${S}/Makefile
-	sed -re 's/(head|tail) -([[:digit:]]+)/\1 -n\2/g' -i ${S}/Makefile
-
+	ht_fix_file ${S}/Makefile
 
 }
 
@@ -194,8 +195,7 @@ src_install() {
 	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
 	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
 	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast
-	#doins qmail-newbrt
+	maildirwatch qail elq pinq config-fast qmail-newbrt
 
 	into /usr
 	einfo "Installing manpages"