new snapshot with TLS, IPV6. please test.

(Portage version: 2.0.51-r14)

6 files changed, 62 insertions, 65 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 0460cc4ca7a6..cb974b5cbedc 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.42 2005/01/05 23:39:41 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.43 2005/01/22 05:40:25 langthang Exp $
+
+*postfix-2.2_beta20050119 (21 Jan 2005)
+
+  21 Jan 2005; Tuấn Văn <langthang@gentoo.org> files/postfix.rc6,
+  -postfix-2.2_beta20041230.ebuild, +postfix-2.2_beta20050119.ebuild:
+  add postgresql to postfix.rc6 use statement. Bug #70554.
+  add check for postfix, postdrop user/group. Bug #77565.
+  add workaround bug #76512.
 
 *postfix-2.2_beta20041230 (05 Jan 2005)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 39a979c6c2a6..e450e5d434de 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cc887475d17d4b98d3aa830ea5c9645d postfix-2.2_beta20041230.ebuild 9220
 MD5 a52764b04b8ba78606b93723291828f8 postfix-2.1.5-r1.ebuild 7498
-MD5 9eb520b5e91c84506b43cbe843e05eac ChangeLog 29274
+MD5 835c195ea81355a4f4c6272b615dfd91 postfix-2.2_beta20050119.ebuild 9180
+MD5 d69e93be44858a855ba26ebfc985e93c ChangeLog 29526
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
-MD5 f4fb1c0bcd39fe4ead34ade333819389 files/postfix.rc6 592
+MD5 bfbba30d4a98b4143f4eead56b4731bc files/postfix.rc6 604
 MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
 MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
-MD5 b25a7a3f2accb451451296344c05beb1 files/digest-postfix-2.2_beta20041230 158
+MD5 ccf8c8212fac0ed3637cb88d27dcc440 files/digest-postfix-2.2_beta20050119 73
 MD5 6ae48624e946756fb17572811abf8961 files/digest-postfix-2.1.5-r1 363
 MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
 MD5 78c16ededccb206774194bfe05475a99 files/mailer.conf 1547
 MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB3Hq/5FrxP71izLARAquhAKDHUl69WzjrqZ1ahlbEd2V2/nbyrACg2J9r
-owCJJtu2tfQS1dAG2sJI9Vw=
-=U6z1
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.2_beta20041230 b/mail-mta/postfix/files/digest-postfix-2.2_beta20041230
deleted file mode 100644
index ed022c9d3d66..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2_beta20041230
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 368e3e9a9dbc885339c28dcdc1e84705 postfix-2.2-20041230.tar.gz 2128258
-MD5 f6a638eebbe5f1f9e74990cef8ac57ef postfix-2.2-20041230+tls-nonprod.tar.gz 2288954
diff --git a/mail-mta/postfix/files/digest-postfix-2.2_beta20050119 b/mail-mta/postfix/files/digest-postfix-2.2_beta20050119
new file mode 100644
index 000000000000..974b9e3f385a
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.2_beta20050119
@@ -0,0 +1 @@
+MD5 63861b2e09f17a7acfe84dbf6623c2d3 postfix-2.2-20050119.tar.gz 2354298
diff --git a/mail-mta/postfix/files/postfix.rc6 b/mail-mta/postfix/files/postfix.rc6
index 42f98aa0771b..77cc392e20c8 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.3 2004/08/15 23:51:22 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6,v 1.4 2005/01/22 05:40:25 langthang Exp $
 
 opts="${opts} reload"
 
 depend() {
 	need net
-	use logger dns ypbind amavis mysql
+	use logger dns ypbind amavisd mysql postgresql
 	provide mta
 }
 
diff --git a/mail-mta/postfix/postfix-2.2_beta20041230.ebuild b/mail-mta/postfix/postfix-2.2_beta20050119.ebuild
index 17f22b10394f..311715cad070 100644
--- a/mail-mta/postfix/postfix-2.2_beta20041230.ebuild
+++ b/mail-mta/postfix/postfix-2.2_beta20050119.ebuild
@@ -1,33 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2_beta20041230.ebuild,v 1.1 2005/01/05 23:39:41 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2_beta20050119.ebuild,v 1.1 2005/01/22 05:40:25 langthang Exp $
 
-inherit eutils ssl-cert toolchain-funcs
-IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux"
+inherit eutils ssl-cert toolchain-funcs flag-o-matic fixheadtails
+IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened"
 
 MY_PV=${PV/_beta/-}
-PROD_PV=${MY_PV}
-TLS_SRC=${PN}-${MY_PV}+tls-nonprod
-PROD_SRC=${PN}-${PROD_PV}
+MY_SRC=${PN}-${MY_PV}
 #VDA_P="${PN}-2.1.5-trash"
-#TLS_P="pfixtls-0.8.18-2.1.3-0.9.7d"
-#IPV6="1.25"
-#IPV6_P="ipv6-${IPV6}-pf-2.1.5"
-#IPV6_TLS_P="tls+${IPV6_P}"
-#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/experimental/${PROD_SRC}.tar.gz
-	ssl? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${TLS_SRC}.tar.gz )"
+SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${MY_SRC}.tar.gz"
 #	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-#	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-#	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )"
 
 LICENSE="IPL-1"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~s390 ~mips ~hppa"
-#IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox selinux"
 
 PROVIDE="virtual/mta virtual/mda"
 DEPEND=">=sys-libs/db-3.2
@@ -43,13 +32,17 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-postfix )
 	!mailwrapper? ( !virtual/mta )
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-if use ssl; then
-	BASE_SRC=${TLS_SRC}
-else
-	BASE_SRC=${PROD_SRC}
-fi
 
-S=${WORKDIR}/${BASE_SRC}
+S=${WORKDIR}/${MY_SRC}
+
+group_user_check() {
+	einfo "checking for postfix group, create if missing."
+	enewgroup postfix 207
+	einfo "checking for postdrop group, create if missing."
+	enewgroup postdrop 208
+	einfo "checking for postfix user, create if missing."
+	enewuser postfix 207 /bin/false /var/spool/postfix postfix
+}
 
 pkg_setup() {
 	# developmental realease warn
@@ -61,9 +54,9 @@ pkg_setup() {
 	ewarn "\"vda\" will be added as soon as it's available."
 	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
 	ewarn "assign to \"net-mail@gentoo.org\"."
-	einfo "Thanks for testing."
 	echo
 	epause 5
+
 	# put out warnings to work around bug #45764
 	if has_version '<=mail-mta/postfix-2.0.18'; then
 		echo
@@ -80,19 +73,30 @@ pkg_setup() {
 		ewarn "you have \"ssl\" in your USE flags"
 		ewarn "TLS will be enabled. This is a work in progress."
 		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
-		ewarn "You have been warned. Thanks for testing."
 		echo
 	epause 5
 	fi
 
+	# IPV6 non-prod warn
+	if use ipv6; then
+		echo
+		ewarn "you have \"ipv6\" in your USE flags"
+		ewarn "TLS will be enabled. This is a work in progress."
+		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
+		echo
+	fi
+
 	# VDA error
 	if use vda; then
 		eerror "VDA patch is not available yet for this snapshot"
 		eerror "If you still want to update to this snapshot"
 		eerror "please remove \"vda\" from your USE flags."
-		die "VDA support is not available!"
+		die "VDA support is not available at this time!"
 	fi
 
+	# add postfix, postdrop user/group. Bug #77565.
+	group_user_check || die "failed to check/add needed user/group"
+
 	# logic to fix bug #53324
 	if [[ $(ps h -u postfix) ]]; then
 		if has_version '<mail-mta/postfix-2.1.3' ; then
@@ -116,36 +120,22 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	#if use ssl ; then
-	#	if use ipv6 ; then
-	#		epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
-	#	else
-	#		epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
-	#		epatch "${DISTDIR}/${PN}-${MY_PV}-tls.tar.bz2" || die "patch failed"
-	#	fi
-	#elif use ipv6; then
-	#	epatch "${WORKDIR}/${IPV6_P}.patch"
-	#fi
+	ht_fix_all
 
 	#if use vda ; then
 	#	epatch "${WORKDIR}/${VDA_P}.patch"
 	#fi
 
-	# We don't need this patch anymore
-	# http://www.postfix.org/PGSQL_README.html
-	# if use postgres ; then
-	#	epatch "${DISTDIR}/${PGSQL_P}.patch"
-	# fi
-
-	# Verisign name services fixes. Do we need this anymore?
-	# epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
 	# Postfix does not get the FQDN if no hostname is configured.
 	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
 
 	# Fix install paths.
 	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
 		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
+	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
+	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
+		-i.orig src/util/sys_defs.h || die "sed failed"
+
 }
 
 src_compile() {
@@ -197,6 +187,12 @@ src_compile() {
 	local my_cc=$(tc-getCC)
 	einfo "CC=${my_cc:=gcc}"
 
+	# workaround for bug #76512
+	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
+
+	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
+	#epause 60
+
 	make CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		makefiles || die "configure problem"
 
@@ -260,8 +256,8 @@ src_install () {
 	newins "${FILESDIR}/smtp.pass" saslpass
 	fperms 600 /etc/postfix/saslpass
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
+	newinitd "${FILESDIR}/postfix.rc6" postfix || \
+		die "newinitd failed"
 
 	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
 	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
@@ -284,6 +280,10 @@ src_install () {
 }
 
 pkg_postinst() {
+
+	# add postfix, postdrop user/group. Bug #77565.
+	group_user_check || die "failed to check/add needed user/group"
+
 	ebegin "Fixing queue directories and permissions"
 	"${ROOT}/etc/postfix/post-install" upgrade-permissions
 	echo