Cleanup

Package-Manager: portage-2.0.51.22-r1

3 files changed, 7 insertions, 35 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index df835ee54bcb..4934013b293f 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,14 +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.44 2005/06/12 19:53:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.45 2005/06/12 20:03:54 hansmi Exp $
 
   12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild,
-  +files/qmail-1.03-env-servercert.patch:
-  Fixed bug 95637, added patch from bug 94257.
-
-  12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
-  files/qmail-genrsacert.sh:
-  The cronjob now also generated the Diffie-Hellman Parameters.
+  +files/qmail-1.03-env-servercert.patch, files/qmail-genrsacert.sh::
+  Fixed bug 95637, added patch from bug 94257. Cleaned the ebuild. The cronjob
+  now also generated the Diffie-Hellman Parameters.
 
   08 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   files/qmail-genrsacert.sh:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 0b3ae9f79d50..eb398b33aa4a 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,6 +1,6 @@
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 25babfa34ab78f13408ed946b39be550 ChangeLog 29459
-MD5 eae6b800d79e145c2cc20fbbabe579c3 qmail-1.03-r16.ebuild 21301
+MD5 59f95e1d2810a459e72bc6dfbf95f57b ChangeLog 29423
+MD5 a5781aaf90007c85c078f133c49fd2ea qmail-1.03-r16.ebuild 20235
 MD5 21fc9651e8bb292a5fbaa4fd0bdf5ac1 qmail-1.03-r15.ebuild 18081
 MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index ed8a81551f92..f3c4e7d5be9f 100644
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -1,6 +1,6 @@
 # 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.19 2005/06/12 19:53:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.20 2005/06/12 20:03:54 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -39,8 +39,6 @@ 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 stuff
-#http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
 
 LICENSE="as-is"
 SLOT="0"
@@ -65,7 +63,6 @@ RDEPEND="!virtual/mta
 PROVIDE="virtual/mta
 	 virtual/mda"
 
-#MY_PVR=${PVR}
 MY_PVR=${PV}-r14
 
 TCPRULES_DIR=/etc/tcprules.d
@@ -85,10 +82,6 @@ src_unpack() {
 	EPATCH_OPTS="${EPATCH_OPTS} -F 3" \
 	epatch ${DISTDIR}/qregex-starttls-2way-auth-20050523.patch
 
-	# Fixes a problem when utilizing "morercpthosts"
-	# TODO hansmi, 2005-01-06: no longer required
-	#epatch ${FILESDIR}/${MY_PVR}/smtp-auth-close3.patch
-
 	# patch so an alternate queue processor can be used
 	# i.e. - qmail-scanner
 	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
@@ -143,15 +136,6 @@ src_unpack() {
 	# when multiple bounces occur (As in with spam)
 	epatch ${DISTDIR}/qmail-limit-bounce-size.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
-	#
-	# hansmi, 2005-01-05: no longer needed as this patch is now included
-	# in qregex-starttls-2way-auth
-	#epatch ${FILESDIR}/${MY_PVR}/qmail-smtpd-esmtp-size-gentoo.patch
-
 	#TODO TEST
 	# Reject some bad relaying attempts
 	# gentoo bug #18064
@@ -249,10 +233,6 @@ src_unpack() {
 	EPATCH_OPTS="${EPATCH_OPTS} -F 3" \
 	epatch ${DISTDIR}/qmail-bounce-encap-20040210.patch
 
-	# Fixes bug 40521
-	# TODO Should be fixed with new TLS-patch
-	#epatch ${FILESDIR}/${PVR}/starttls-recordio.patch
-
 	# Add double-bounce-trim-patch from bug 67810
 	EPATCH_SINGLE_MSG="Adding double-bounce-trim-patch" \
 	epatch ${FILESDIR}/${PVR}/double-bounce-trim.patch
@@ -301,11 +281,6 @@ src_unpack() {
 
 	# fix coreutils messup
 	ht_fix_file ${S}/Makefile
-
-	# fix bug #74124
-	# TODO hansmi, 2005-01-06: should not be required anymore
-	#EPATCH_SINGLE_MSG="fixing stderr logging for checkpassword to enable qmail-queue to continue logging" \
-	#epatch ${FILESDIR}/${PVR}/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch
 }
 
 src_compile() {