Add support for maildir++, ESMTP SIZE, localtime (commented out) from bug #26506. Add more cleanups and a fix for a possible local glitch in pkg_config.

4 files changed, 41 insertions, 29 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 69734fb63652..d7f812f87210 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2003/08/12 08:16:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.36 2003/08/13 02:45:40 robbat2 Exp $
+
+  12 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
+  Add support for maildir++, ESMTP SIZE, localtime (commented out) from bug
+  #26506. Add more cleanups and a fix for a possible local glitch in pkg_config.
 
   12 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
   Temporarily remove the bad-rcpt-noisy-patch patch as it is breaking some
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index 4cb5f8ff36a8..af2a8368ba9c 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -2,14 +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 dc6084e8f02262c3097164c6895e2929 qmail-1.03-r12.ebuild 12523
-MD5 9d8e9fa00b22e4487b892074d3694706 ChangeLog 8295
+MD5 16317489075472d528bccb28bd7f4a39 qmail-1.03-r12.ebuild 12472
+MD5 3d55f5cbd30b42c07a2191315d858f3f ChangeLog 8529
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
-MD5 7430fb40cf83664e7f0cdc9a80050c25 tmp/badrcptto-morebadrcptto-accdias.diff.bz2 4788
-MD5 1c4518f780d231bde9745cdd0fa313b2 tmp/qmail-limit-bounce-size.patch.txt 1753
-MD5 d566e8bd99b33efee0194e855b8d6995 tmp/qmail-date-localtime.patch.txt 2603
-MD5 ada6695a0138163b46bef433b643ac86 tmp/badrcptto-morebadrcptto-accdias.diff 16965
-MD5 7553829a93411cdaffce31a29323697f tmp/qmail-maildir++.patch 43510
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
 MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
 MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r12 b/net-mail/qmail/files/digest-qmail-1.03-r12
index 68a91d8f4690..3eecf944067f 100644
--- a/net-mail/qmail/files/digest-qmail-1.03-r12
+++ b/net-mail/qmail/files/digest-qmail-1.03-r12
@@ -10,4 +10,6 @@ MD5 3dc69265a561c7d82ba3e43e89828722 qmail-tls.patch.tbz2 14076
 MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
 MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
 MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
-MD5 432064e12c65d8f0deda580a2320b513 bad-rcpt-noisy-patch.txt 10474
+MD5 7553829a93411cdaffce31a29323697f qmail-maildir++.patch 43510
+MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
+MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index 4219bfe53e60..100b0d521a67 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.3 2003/08/12 08:16:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.4 2003/08/13 02:45:40 robbat2 Exp $
 
 inherit eutils
 
@@ -20,7 +20,10 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
 	mirror://gentoo/qmail-tls.patch.tbz2
 	mirror://qmail/qmail-1.03-qmtpc.patch
 	http://qmail.goof.com/qmail-smtpd-relay-reject
-	mirror://gentoo/qmail-local-tabs.patch"
+	mirror://gentoo/qmail-local-tabs.patch
+  	http://www.shupp.org/patches/qmail-maildir++.patch
+  	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-date-localtime.patch.txt
+  	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt"
 
 SLOT="0"
 LICENSE="as-is"
@@ -111,30 +114,37 @@ src_unpack() {
 	# provide badrcptto support
 	# as per bug #17283
 	# patch re-diffed from original at http://www.iecc.com/bad-rcpt-noisy-patch.txt
+	# presently this breaks qmail so it is disabled
 	#epatch ${FILESDIR}/${PV}-${PR}/bad-rcpt-noisy-patch
 
-	cd ${S}
+	# Apply patch to make qmail-local and qmail-pop3d compatible with the
+	# maildir++ quota system that is used by vpopmail and courier-imap
+	epatch ${DISTDIR}/qmail-maildir++.patch
 
-	if [ `use ssl` ]; then
-		echo "${CC} ${CFLAGS} -DTLS" > conf-cc
-	else
-		echo "${CC} ${CFLAGS}" > conf-cc
-	fi
+	# 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
+
+	# 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
+	# bouncing it because it exceeded your databytes setting
+	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
 
-	echo "${CC} ${LDFLAGS}" > conf-ld
-	echo "500" > conf-spawn
+	echo -n "${CC} ${CFLAGS}" >>${S}/conf-cc	
+	use ssl && echo -n '-DTLS' >>${S}/conf-cc
+	echo -n "${CC} ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "500" > ${S}/conf-spawn
 
 }
 
 src_compile() {
-	cd ${S}
 	emake it man || die
 }
 
 src_install() {
-
-	cd ${S}
-
+	
 	einfo "Setting up directory hierarchy ..."
 
 	diropts -m 755 -o root -g qmail
@@ -160,27 +170,25 @@ src_install() {
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
 	dodoc ${WORKDIR}/tls-patch.txt 
 
-	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
-	doins qmail-queue qmail-queue
+	insopts -o qmailq -g qmail -m 4711
+	doins qmail-queue 
         
 	insopts -o root -g qmail -m 700
-	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
         
 	insopts -o root -g qmail -m 711
-	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
  
 	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
 	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
 	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 qmail-newbrt
+	maildirwatch qail elq pinq config-fast 
+	#doins qmail-newbrt
 
 	into /usr
 	einfo "Installing manpages"
@@ -304,6 +312,9 @@ pkg_postinst() {
 
 pkg_config() {
 
+	# avoid some weird locale problems
+	export LC_ALL="C"
+
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
 			export qhost=`hostname --fqdn`