more tweaks to r12

3 files changed, 16 insertions, 22 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 88171b53a623..e8533228f3ea 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.38 2003/09/01 05:22:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.39 2003/09/01 19:38:09 robbat2 Exp $
+
+  01 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
+  more tweaks to r12
 
   31 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild,
   files/1.03-r12/config-sanity-check, files/1.03-r12/maildir-quota-fix.patch,
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index ecea1edfc9a2..a1ee37c6fcf3 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -2,13 +2,9 @@ MD5 4bf70f21528928c670477f76bd375237 qmail-1.03-r11.ebuild 11431
 MD5 3bdf6864e9399d20c8d786be23d7d34f qmail-1.03-r9.ebuild 9990
 MD5 d1d239c08fb007430de3a84e0a5de524 qmail-1.03-r10.ebuild 11180
 MD5 173fcf74cb0fb3fd6df5a3c842cd6d41 qmail-1.03-r8.ebuild 8142
-MD5 6b8d1aa7a3cb59c69f549f3b40c45da4 qmail-1.03-r12.ebuild 12516
-MD5 9350cb5446a5619db9de0aa16bcaed82 ChangeLog 9542
+MD5 3b4b49aa100bc952404f479fbb3e58ba qmail-1.03-r12.ebuild 12673
+MD5 4410eabfaab1eb8e4c458e61ef5276bf ChangeLog 9640
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
-MD5 4b3a503909d45ef0cec8f1ff35188e8a tmp/qmail-ej-cocktail-11.tar.gz 28451
-MD5 addfbd0553d012d3a593099ac3abee0c tmp/todo.list 836
-MD5 2c63ede6cf122713247a305c3df0afc3 tmp/qmail-1.03-r12.ebuild.misc 11509
-MD5 2fff2be833f7ada4261e8a91f9ebd80e tmp/qmail-1.03-r12.ebuild 12841
 MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
 MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
 MD5 734ea9dfff4513984d2d69123ce54fb8 files/gencert.sh 224
@@ -19,17 +15,6 @@ MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
 MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
 MD5 16e191692e083dab3de54f7e39709871 files/digest-qmail-1.03-r12 1050
 MD5 76d218a258e2ec859ab80c377351afce files/tcp.qmtp.sample 370
-MD5 41ba814330adf6abc36d172c2d5598af tmp/qmail-ej-cocktail-11/cocktail.patch 65556
-MD5 7e1ef252edf2a9eb69be859d01ab0b5a tmp/qmail-ej-cocktail-11/README.badrcptto 1968
-MD5 119df66efc22a10fcfc67ab53b58de84 tmp/qmail-ej-cocktail-11/README 1536
-MD5 b1a3fcd28ed415f92d775ac6fbe54dda tmp/qmail-ej-cocktail-11/README.starttls 5803
-MD5 90f806b1a4defa5c2357554aeaa3b5e4 tmp/qmail-ej-cocktail-11/README.big-concurrency 2011
-MD5 2b9f411f840b3167577bf046c3fd60b3 tmp/qmail-ej-cocktail-11/README.smtp-auth 6814
-MD5 d49deb1d5e82e9ae7872034e6d512fdb tmp/qmail-ej-cocktail-11/README.smtpd-log-badmailfrom 174
-MD5 5d529201441bc359e188cdb5b42de6ec tmp/qmail-ej-cocktail-11/README.newline 2062
-MD5 ab8d1e26e632ac0b9870c15ff4d1130b tmp/qmail-ej-cocktail-11/README.large-dns 103
-MD5 ff24ea2c17d8b78d15a83fda567c7c50 tmp/qmail-ej-cocktail-11/README.date-localtime 250
-MD5 b1cd5d4708b50f8a5ba1d2c8fef65306 tmp/qmail-ej-cocktail-11/README.nullenvsender-recipcount 507
 MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
 MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
 MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index 94e778fbbf5c..585aacef5cdb 100644
--- a/net-mail/qmail/qmail-1.03-r12.ebuild
+++ b/net-mail/qmail/qmail-1.03-r12.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2003/09/01 05:22:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.7 2003/09/01 19:38:09 robbat2 Exp $
 
 inherit eutils
 
@@ -102,6 +102,7 @@ src_unpack() {
 	# make the qmail 'sendmail' binary behave like sendmail's for -f
 	epatch ${DISTDIR}/sendmail-flagf.patch
 
+	#TODO REDIFF
 	# Reject some bad relaying attempts
 	# gentoo bug #18064 
 	#epatch ${DISTDIR}/qmail-smtpd-relay-reject
@@ -115,8 +116,9 @@ src_unpack() {
 	# Apply patch for local timestamps.
 	# This will make the emails headers be written in localtime rather than GMT
 	# If you really want, uncomment it yourself, as mail really should be in GMT
-	#epatch ${DISTDIR}/qmail-date-localtime.patch.txt
+	epatch ${DISTDIR}/qmail-date-localtime.patch.txt
 
+	#TODO REDIFF
 	# Apply patch to add ESMTP SIZE support to qmail-smtpd
 	# This helps your server to be able to reject excessively large messages
 	# "up front", rather than waiting the whole message to arrive and then
@@ -126,8 +128,9 @@ src_unpack() {
 	
 	# Apply patch to trim large bouncing messages down greatly reduces traffic
 	# when multiple bounces occur (As in with spam)
-	#epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
+	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
 	
+	#TODO REDIFF
 	# provide badrcptto support
 	# as per bug #17283
 	# patch re-diffed from original at http://sys.pro.br/files/badrcptto-morebadrcptto-accdias.diff.bz2
@@ -257,6 +260,9 @@ src_install() {
 		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
 		insinto /etc
 		[ -f ${FILESDIR}/tcp.${i}.sample ] && newins ${FILESDIR}/tcp.${i}.sample /etc/tcp.${i}
+		for i in smtp qmtp qmqp pop3; do
+			[ -f ${D}/etc/tcp.${i} ] && tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp < ${D}/etc/tcp.${i}
+		done
 	done
 	
 	einfo "Installing the qmail startup file ..."
@@ -342,7 +348,7 @@ pkg_config() {
 	done
 
 	for i in smtp qmtp qmqp pop3; do
-		[ -f ${ROOT}/etc/tcp.${i}.cdb ] && tcprules ${ROOT}/etc/tcp.${i}.cdb ${ROOT}/etc/.tcp.${i}.tmp < ${ROOT}/etc/tcp.${i}
+		[ -f ${ROOT}/etc/tcp.${i} ] && tcprules ${ROOT}/etc/tcp.${i}.cdb ${ROOT}/etc/.tcp.${i}.tmp < ${ROOT}/etc/tcp.${i}
 	done
 
 	if use ssl && [ ! -f ${ROOT}/var/qmail/control/servercert.pem ]; then