version bump, fix bug #53324, workaround #45764

5 files changed, 308 insertions, 23 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 8d89808a8b23..234879ef14aa 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.10 2004/06/30 21:07:57 merlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.11 2004/07/02 18:01:01 langthang Exp $
+
+*postfix-2.1.3 (02 Jul 2004)
+
+  02 Jul 2004; <langthang@gentoo.org> metadata.xml, +postfix-2.1.3.ebuild:
+  Version bump, fix bug #53324, workaround bug #45764, add myself to 
+  metadata.xml
 
   30 Jun 2004; Cory Visi <merlin@gentoo.org> files/postfix-2.0.9-get-FQDN.patch:
   Update files/postfix-2.0.9-get-FQDN.patch for better logging, Bug 51504,
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 56ed0340d35d..be1f129d9eda 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,34 +1,36 @@
-MD5 5c58b1b47025f16aa6d043a84f4e1759 ChangeLog 25308
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b0cc073bb81fa3a90c018aacb6956b8a postfix-1.1.11.20020917-r1.ebuild 4555
-MD5 447574cc6b931bf04baf228b2cff3b59 postfix-1.1.11.20020917.ebuild 4534
-MD5 22e4554dad37b9beb643ada3d2519973 postfix-2.0.11.ebuild 5883
-MD5 17e728ea0c2bc977a8ee7c96a9650da4 postfix-2.0.16-r1.ebuild 6663
+MD5 949bcd461253590704ff70d19be3ba53 postfix-2.1.3.ebuild 7915
 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 b0cc073bb81fa3a90c018aacb6956b8a postfix-1.1.11.20020917-r1.ebuild 4555
+MD5 17e728ea0c2bc977a8ee7c96a9650da4 postfix-2.0.16-r1.ebuild 6663
+MD5 95cc748542f2bdec136801aed1515f08 postfix-2.0.19-r4.ebuild 6671
 MD5 a37e17b30106fd73993b70a6ec3db9af postfix-2.0.19.ebuild 6715
+MD5 30e7081167c25d6676a36269ef267f9b postfix-2.0.19-r1.ebuild 5974
+MD5 4df54ad9989b6d9cf007e9361ec6eb3c ChangeLog 25499
 MD5 2386a353b9c43ced5e3ff8b0fd494feb postfix-2.1.1.ebuild 6598
-MD5 95cc748542f2bdec136801aed1515f08 postfix-2.0.19-r4.ebuild 6671
-MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
+MD5 22e4554dad37b9beb643ada3d2519973 postfix-2.0.11.ebuild 5883
+MD5 4d990dab16b401d2089652fd65ba5fe1 postfix-2.0.19-r3.ebuild 6435
+MD5 447574cc6b931bf04baf228b2cff3b59 postfix-1.1.11.20020917.ebuild 4534
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
+MD5 caa45c1c2711fe687d0896d8b6400e78 files/postfix.rc6 585
+MD5 0de0aeb149204f1dc5ead666107694ce files/smtp.pass 137
+MD5 4ac27d1fe53badbee2546d5044ca3d27 files/smtp.sasl 127
+MD5 0acffde07d4dd4906e5f1cdb7dc9a646 files/main.cf 18374
 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 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 9c449133a0e15d870ee37e71653b64c8 files/smtpd.conf 128
+MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
+MD5 8bb2393cb308f752dcb6aa654e98034a files/master.cf 4419
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
 MD5 bbaf5265ce09b79fded4d429f420ea23 files/digest-postfix-2.1.1 422
+MD5 6ac317373767878798a03d4bf6a078c9 files/digest-postfix-2.1.3 553
 MD5 f1af44e37cedb6d624cb8a366c642f2f files/mailer.conf 1544
-MD5 0acffde07d4dd4906e5f1cdb7dc9a646 files/main.cf 18374
-MD5 8bb2393cb308f752dcb6aa654e98034a files/master.cf 4419
-MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
-MD5 caa45c1c2711fe687d0896d8b6400e78 files/postfix.rc6 585
 MD5 d404cff3d69da12b544c6eaa5f20f7d2 files/smtp.pam 250
-MD5 0de0aeb149204f1dc5ead666107694ce files/smtp.pass 137
-MD5 4ac27d1fe53badbee2546d5044ca3d27 files/smtp.sasl 127
-MD5 9c449133a0e15d870ee37e71653b64c8 files/smtpd.conf 128
+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 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r4 511
 MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/mail-mta/postfix/files/digest-postfix-2.1.3 b/mail-mta/postfix/files/digest-postfix-2.1.3
new file mode 100644
index 000000000000..ce5b7baaf1bc
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.1.3
@@ -0,0 +1,8 @@
+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 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
+MD5 e013ff8d4aa49e17d7ee85419481cfc7 tls+ipv6-1.25-pf-2.1.3.patch.gz 256591
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 51f94e3fbe0e..72d13b3fbb02 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>langthang@gentoo.org</email>
+		<name>Tuan Van</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-mta/postfix/postfix-2.1.3.ebuild b/mail-mta/postfix/postfix-2.1.3.ebuild
new file mode 100644
index 000000000000..c29f18b80f66
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.1.3.ebuild
@@ -0,0 +1,265 @@
+# 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 $
+
+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"
+IPV6_P="ipv6-${IPV6}-pf-2.1.3"
+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/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
+	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 )
+	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"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
+
+PROVIDE="virtual/mta virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!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
+	# 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
+		fi
+	fi
+}
+
+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"
+		else
+			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
+		fi
+	elif use ipv6; then
+		epatch "${WORKDIR}/${IPV6_P}.patch"
+	fi
+
+	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"
+
+	# 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"
+}
+
+src_compile() {
+	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	if use pam ; then
+		mylibs="${mylibs} -lpam"
+	fi
+	if use ldap ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+	if use mysql ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+	if use postgres ; then
+		if best_version '=dev-db/postgresql-7.3*' ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+	if use ssl ; then
+		mycc="${mycc} -DUSE_SSL"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+	if use sasl ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+
+	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		daemon_directory="/usr/lib/postfix" \
+		program_directory="/usr/lib/postfix" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	# Fix spool removal on upgrade.
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# mailwrapper stuff
+	if use mailwrapper
+	then
+		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
+		insinto /etc/mail
+		doins "${FILESDIR}/mailer.conf"
+	fi
+
+
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Install qshape tool.
+	dobin auxiliary/qshape/qshape.pl
+
+	# Set proper permissions on required files/directories.
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
+	if use mbox
+	then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
+		"alias_maps=hash:/etc/mail/aliases" \
+		"alias_database=hash:/etc/mail/aliases" \
+		"local_destination_concurrency_limit=2" \
+		"default_destination_concurrency_limit=2" \
+		${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/postfix.rc6" postfix
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	if use pam ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/smtp.pam" smtp
+	fi
+	if use ssl ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	echo
+	ewarn "If you upgraded from postfix-1.x, you must revisit"
+	ewarn "your configuration files.  See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged $PN without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}