stable 2.1.3

5 files changed, 58 insertions, 82 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 35d5751b7a33..8c51bbf4df33 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.15 2004/07/17 21:37:51 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.16 2004/08/15 23:51:22 langthang Exp $
+
+  15 Aug 2004; Tuan Van <langthang@gentoo.org> postfix-2.1.3.ebuild:
+  stable on x86.
 
   16 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> postfix-2.0.19-r4.ebuild:
   Stable on alpha, requested in bug #56088.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 0bb20b0af570..a644b1163f18 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,48 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aae5827513ab2409a128bc6eba3d15cf ChangeLog 25804
-MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
-MD5 027297ac3ac33bb8d1264de5a8d63b18 postfix-1.1.11.20020917-r1.ebuild 4559
-MD5 1500b5e39b34095feae698e12ed31559 postfix-1.1.11.20020917.ebuild 4543
-MD5 342c65cb8c9a9f695632b7c31b48efc7 postfix-2.0.11.ebuild 5887
-MD5 17e728ea0c2bc977a8ee7c96a9650da4 postfix-2.0.16-r1.ebuild 6663
+MD5 ada6d2c39b4282dc07beaefb61b753df postfix-2.1.3.ebuild 7194
 MD5 7eeba195836ed8cf5ba8496b7efb1355 postfix-2.0.18.ebuild 6664
-MD5 30e7081167c25d6676a36269ef267f9b postfix-2.0.19-r1.ebuild 5974
 MD5 77eb50bf3e6553a05a20d268f18b3647 postfix-2.0.19-r2.ebuild 6183
-MD5 4d990dab16b401d2089652fd65ba5fe1 postfix-2.0.19-r3.ebuild 6435
+MD5 027297ac3ac33bb8d1264de5a8d63b18 postfix-1.1.11.20020917-r1.ebuild 4559
+MD5 17e728ea0c2bc977a8ee7c96a9650da4 postfix-2.0.16-r1.ebuild 6663
+MD5 5234b870293b81f57c41d8934ff58278 postfix-2.0.19-r4.ebuild 6670
 MD5 a37e17b30106fd73993b70a6ec3db9af postfix-2.0.19.ebuild 6715
+MD5 30e7081167c25d6676a36269ef267f9b postfix-2.0.19-r1.ebuild 5974
+MD5 1a05f3e8e412268b76a78dd535a897e2 ChangeLog 25891
 MD5 2386a353b9c43ced5e3ff8b0fd494feb postfix-2.1.1.ebuild 6598
-MD5 5234b870293b81f57c41d8934ff58278 postfix-2.0.19-r4.ebuild 6670
+MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 MD5 4577956f452db4899d32fe1a0798761e postfix-2.0.20.ebuild 7760
-MD5 9ddd3bb6c92d1ade7fd405a717b0d73b postfix-2.1.3.ebuild 8017
-MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 342c65cb8c9a9f695632b7c31b48efc7 postfix-2.0.11.ebuild 5887
+MD5 4d990dab16b401d2089652fd65ba5fe1 postfix-2.0.19-r3.ebuild 6435
+MD5 1500b5e39b34095feae698e12ed31559 postfix-1.1.11.20020917.ebuild 4543
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
+MD5 ae2c43ff532a05c6093dfd42ed09dfd1 files/postfix.rc6 578
+MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
+MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
+MD5 4bf6a7f45a3ec6467b1943ac5cc42c64 files/main.cf 18378
 MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
-MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
 MD5 86074a74de686c68c34e40b36c1188b6 files/digest-postfix-2.0.18 445
 MD5 20fa9d533a75c392127160b6b83d4229 files/digest-postfix-2.0.19 445
+MD5 c35adee0f3563828e6d678ea7c632b37 files/digest-postfix-2.0.20 511
+MD5 633bf9c94eddcb2e52413ec466048017 files/smtpd.conf 132
+MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
+MD5 e91728e4c6af081ddfd1b656375612e8 files/master.cf 4423
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 bbaf5265ce09b79fded4d429f420ea23 files/digest-postfix-2.1.1 422
+MD5 7923292c13473118323ceff84e770a1d files/digest-postfix-2.1.3 357
+MD5 78c16ededccb206774194bfe05475a99 files/mailer.conf 1547
+MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
+MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
 MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r1 511
 MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r2 511
 MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r3 511
-MD5 78c16ededccb206774194bfe05475a99 files/mailer.conf 1547
-MD5 4bf6a7f45a3ec6467b1943ac5cc42c64 files/main.cf 18378
-MD5 e91728e4c6af081ddfd1b656375612e8 files/master.cf 4423
-MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
-MD5 ae2c43ff532a05c6093dfd42ed09dfd1 files/postfix.rc6 578
-MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
-MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
-MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
-MD5 633bf9c94eddcb2e52413ec466048017 files/smtpd.conf 132
-MD5 bbaf5265ce09b79fded4d429f420ea23 files/digest-postfix-2.1.1 422
 MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r4 511
-MD5 c35adee0f3563828e6d678ea7c632b37 files/digest-postfix-2.0.20 511
-MD5 6ac317373767878798a03d4bf6a078c9 files/digest-postfix-2.1.3 553
 MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+e/EmdTrptrqvGERAongAJ4wbxXiBKZgGtKoyqNW/CB8plFHegCbBCIm
-PIfEsrnTUqhc4eTU4KartZk=
-=5YHk
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.1.3 b/mail-mta/postfix/files/digest-postfix-2.1.3
index ce5b7baaf1bc..0a294e55802b 100644
--- a/mail-mta/postfix/files/digest-postfix-2.1.3
+++ b/mail-mta/postfix/files/digest-postfix-2.1.3
@@ -1,7 +1,4 @@
-MD5 286856c9597cfa244c3b6133dce12749 postfix-2.1.0.tar.gz 1992845
-MD5 8c4fe863f3c11b6e89181ff208af88b6 postfix-2.1-patch01.gz 1599
-MD5 7944f4ed461158e3bce9e71a81baf544 postfix-2.1-patch02.gz 12662
-MD5 8cabea35416f48feab17bffc465c5956 postfix-2.1-patch03.gz 4111
+MD5 1f515b0d80cd1f9db0113240bf36f248 postfix-2.1.3.tar.gz 1971632
 MD5 36f37634a71bed0a1bdae5061d4d6370 postfix-2.1.3.patch.gz 6924
 MD5 d3211ebd4d2fbbc9c78235666ed355ac pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz 239141
 MD5 cd99ff3ddf9bb88e23a7e33ae42d0772 ipv6-1.25-pf-2.1.3.patch.gz 79473
diff --git a/mail-mta/postfix/files/postfix.rc6 b/mail-mta/postfix/files/postfix.rc6
index 58000efb7134..42f98aa0771b 100644
--- a/mail-mta/postfix/files/postfix.rc6
+++ b/mail-mta/postfix/files/postfix.rc6
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6,v 1.2 2004/07/14 22:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6,v 1.3 2004/08/15 23:51:22 langthang Exp $
 
 opts="${opts} reload"
 
 depend() {
 	need net
-	use logger dns ypbind
+	use logger dns ypbind amavis mysql
 	provide mta
 }
 
diff --git a/mail-mta/postfix/postfix-2.1.3.ebuild b/mail-mta/postfix/postfix-2.1.3.ebuild
index c29f18b80f66..3046e1709ebe 100644
--- a/mail-mta/postfix/postfix-2.1.3.ebuild
+++ b/mail-mta/postfix/postfix-2.1.3.ebuild
@@ -1,13 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.3.ebuild,v 1.1 2004/07/02 18:01:01 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.3.ebuild,v 1.2 2004/08/15 23:51:22 langthang Exp $
 
 inherit eutils ssl-cert
 
-MAJOR_VER="2.1"
-PATCH_LEVEL="03"
-PATCH_LEVEL1="01"
-PATCH_LEVEL2="02"
 VDA_P="${PN}-2.1.3"
 TLS_P="pfixtls-0.8.18-2.1.3-0.9.7d"
 IPV6="1.25"
@@ -17,10 +13,7 @@ PGSQL_P="postfix-pg.postfix-2.0.0.2"
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail."
 HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_VER}.0.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL1}.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL2}.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL}.gz
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
 	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
 	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
@@ -28,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~s390"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~amd64 ~s390"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
 
 PROVIDE="virtual/mta virtual/mda"
@@ -45,36 +38,33 @@ RDEPEND="${DEPEND}
 	!mailwrapper? ( !virtual/mta )
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
 
-S=${WORKDIR}/${PN}-${MAJOR_VER}.0
-
 pkg_setup() {
 	# put out warnings to work around bug #45764
-	echo
-	ewarn "If you are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-	ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-	ewarn "\`etc/postfix/post-install upgrade-permissions\` to recreate them."
-	ewarn "Waiting 15 seconds before continuing."
-	echo
-	sleep 15
+	if has_version '<=mail-mta/postfix-2.1.4'; then
+		echo
+		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
+		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
+		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
+		echo
+	sleep 5
+	fi
+
 	# logic to fix bug #53324
-	if [[ -f $(type -p postconf) ]] ; then
-		VER=$(postconf | grep mail_version); VER=${VER/mail_version = }
-		MAJ_VER=${VER:0:3}
-		if [[ -n $(pidof master) ]] ; then
-			if [[ ${MAJ_VER} < 2.1 ]] ; then
-				echo
-				eerror "You are upgrading from the incompatible verion."
-				eerror "Please stop Postfix then emerge again."
-				die "Upgrade from incompatible version."
-			else
-				echo
-				ewarn "It is safe to upgrade your current version while it's running."
-				ewarn "If you don't want to take any chance; please hit ctrl+c now; stop"
-				ewarn "Postfix then emerge again."
-				ewarn "Waiting 30 seconds before continuing."
-				echo
-				sleep 30
-			fi
+	if [[ -n $(pidof master) ]] ; then
+		if has_version '<mail-mta/postfix-2.1.3' ; then
+			echo
+			eerror "You are upgrading from the incompatible verion."
+			eerror "Please stop Postfix then emerge again."
+			die "Upgrade from incompatible version."
+		else
+			echo
+			ewarn "It is safe to upgrade your current version while it's running."
+			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
+			ewarn "stop Postfix then emerge again."
+			ewarn "You have been warned!"
+			ewarn "Waiting 10 seconds before continuing."
+			echo
+			sleep 10
 		fi
 	fi
 }
@@ -82,10 +72,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	# Patch patchlevel
-	epatch "${WORKDIR}/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL1}"
-	epatch "${WORKDIR}/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL2}"
-	epatch "${WORKDIR}/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL}"
 	if use ssl ; then
 		if use ipv6 ; then
 			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"