Updated qregex-starttls-2way-auth patch (Bug 88746), added a sample .qmail-log file (Bug 90631), fixed bug 92742.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 73 insertions, 62 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index a811836fefbf..a308a21815f8 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2005/05/19 19:03:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.40 2005/06/05 15:21:17 hansmi Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> +files/dot_qmail-log,
+  qmail-1.03-r16.ebuild:
+  Updated qregex-starttls-2way-auth patch (Bug 88746), added a sample .qmail-log
+  file (Bug 90631), fixed bug 92742.
 
   19 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   -files/1.03-r10/99qmail, -files/1.03-r10/defaultdelivery,
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 56baffa95042..01d12632b015 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,74 +1,65 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 63cb34216499b197d4db4ca881e90a36 qmail-1.03-r16.ebuild 21193
-MD5 01792682d66cb4b8376f0ed90ae831af qmail-1.03-r15.ebuild 18027
-MD5 3e93e40f32b6d5298aee06b4c37760b1 ChangeLog 28683
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 dc4e5b1d5e732c24a9026922aa8de645 ChangeLog 28903
+MD5 3a59517e6fec441ff7f7a8c62398d768 qmail-1.03-r16.ebuild 21224
+MD5 01792682d66cb4b8376f0ed90ae831af qmail-1.03-r15.ebuild 18027
+MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
+MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
+MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
+MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
+MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
+MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
 MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
-MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
-MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
+MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
+MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
+MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
+MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
 MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839
+MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
+MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
+MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
 MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
-MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
-MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
 MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
-MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
+MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935
+MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
 MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321
 MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328
+MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
 MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
-MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
-MD5 982627e4cebbd4b71f2d22d43c51367a files/digest-qmail-1.03-r16 2011
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
-MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
-MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
-MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
-MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
-MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
-MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935
-MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
+MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
+MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
 MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320
 MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425
-MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
-MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328
-MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
-MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
-MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
+MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
+MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
+MD5 21dfc3d5cb23e70aa3cc03940d58e6c3 files/digest-qmail-1.03-r16 2012
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
 MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151
-MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
 MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
-MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
-MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
+MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
+MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 a8bfc3cf2c69e8e46b07a357a8572e5e files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch 498
+MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
+MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
+MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
 MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375
 MD5 a91645f4af61ce981e01ef84bc2ae7b6 files/1.03-r14/qmail-qmailqueue-docs.patch 1085
-MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
+MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
 MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
-MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
-MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947
-MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
-MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
 MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 2241
+MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
 MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
-MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
 MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930
 MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555
 MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479
 MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662
 MD5 8d015331a1c3f0ad22f40bb6837569ca files/1.03-r16/qmail-logmail.patch 269
-MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
 MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614
+MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
 MD5 b968f9de39ff3cac7e6abbd8705af5f2 files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch 1206
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCnzDUI1lqEGTUzyQRAhw+AJ0RfwOqeMFoaMcGuqmhaiqU1JtyyACdEF9a
-JQMEx+0/42biACbIu+QQLx0=
-=yeLW
------END PGP SIGNATURE-----
+MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
+MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947
+MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
+MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
+MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r16 b/mail-mta/qmail/files/digest-qmail-1.03-r16
index a5f6e09868fb..95482a176471 100644
--- a/mail-mta/qmail/files/digest-qmail-1.03-r16
+++ b/mail-mta/qmail/files/digest-qmail-1.03-r16
@@ -12,7 +12,7 @@ MD5 413be7bb5b407c2964c3275c4d596947 qmail-maildir++.patch 43512
 MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
 MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
 MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
-MD5 bd4ac5850a50d0c002cb1a13b1885b60 qregex-starttls-2way-auth-20041230.patch 97384
+MD5 7179268db349cf3e40b4a45e4a83f81d qregex-starttls-2way-auth-20050523.patch 100009
 MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
 MD5 750183fbd36b0fe7bf3e2edf9ec9ca2f qmail-gentoo-1.03-r16-badrcptto-morebadrcptto-accdias.diff.bz2 4736
 MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
diff --git a/mail-mta/qmail/files/dot_qmail-log b/mail-mta/qmail/files/dot_qmail-log
new file mode 100644
index 000000000000..25725e42d50b
--- /dev/null
+++ b/mail-mta/qmail/files/dot_qmail-log
@@ -0,0 +1,9 @@
+# Be sure to read those links before enabling anything in here:
+#   http://cr.yp.to/qmail/faq/admin.html#copies
+#   http://www.cyber-sentry.com/index.php?id=35
+#
+# Copy all mails to ~alias/.maildir/
+#./maildir/
+#
+# Pipe all mails trough logmail.sh
+#|/usr/local/bin/logmail.sh
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index c44a612a00b3..1fe442c43632 100644
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.17 2005/05/01 12:46:05 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.18 2005/06/05 15:21:17 hansmi Exp $
 
-inherit toolchain-funcs eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
-IUSE="ssl noauthcram notlsbeforeauth selinux logmail"
+IUSE="ssl noauthcram notlsbeforeauth selinux logmail mailwrapper"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
 HOMEPAGE="http://www.qmail.org/
 	http://members.elysium.pl/brush/qmail-smtpd-auth/
@@ -23,7 +23,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 	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
 	http://www.ckdhr.com/ckd/qmail-103.patch
-	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth-20041230.patch
+	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth-20050523.patch
 	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
 	mirror://gentoo/qmail-gentoo-1.03-r16-badrcptto-morebadrcptto-accdias.diff.bz2
 	http://www.dataloss.nl/software/patches/qmail-popupnofd2close.patch
@@ -39,7 +39,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 	mirror://gentoo/qmail-1.03-r16-logrelay.diff
 	http://www.finnie.org/software/qmail-bounce-encap/qmail-bounce-encap-20040210.patch
 	"
-# broken stuffs
+# broken stuff
 #http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
 
 LICENSE="as-is"
@@ -83,12 +83,7 @@ src_unpack() {
 	# this patch merges a few others already
 	EPATCH_SINGLE_MSG="Adding SMTP AUTH (2 way), Qregex and STARTTLS support" \
 	EPATCH_OPTS="${EPATCH_OPTS} -F 3" \
-	epatch ${DISTDIR}/qregex-starttls-2way-auth-20041230.patch
-	#epatch ${DISTDIR}/qregex-starttls-2way-auth.patch
-	# bug #30570
-	#EPATCH_SINGLE_MSG="Fixing a memory leak in Qregex support" \
-	# TODO hansmi, 2005-01-06: no longer required
-	#epatch ${FILESDIR}/${MY_PVR}/qmail-1.03-qregex-memleak-fix.patch
+	epatch ${DISTDIR}/qregex-starttls-2way-auth-20050523.patch
 
 	# Fixes a problem when utilizing "morercpthosts"
 	# TODO hansmi, 2005-01-06: no longer required
@@ -295,6 +290,9 @@ src_unpack() {
 		einfo "Enabling CRAM_MD5 support"
 	fi
 
+	# Bug 92742
+	append-ldflags -Wl,-z,now
+
 	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
 
@@ -593,6 +591,14 @@ pkg_config() {
 
 	buildtcprules
 
+	if use logmail; then
+		qmaillog=/var/qmail/alias/.qmail-log
+		if [[ ! -f ${qmaillog} ]]; then
+			einfo "Setting up sample file for logging (${qmaillog})"
+			cp ${FILESDIR}/dot_qmail-log ${qmaillog}
+		fi
+	fi
+
 	if use ssl; then
 		${ROOT}etc/cron.hourly/qmail-genrsacert.sh
 		einfo "Creating a self-signed ssl-certificate:"