Version bump to please QA. Bug #62674.

4 files changed, 270 insertions, 5 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 74dc0edb5bc9..82e5b2cbf04c 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2004/09/22 05:01:05 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.25 2004/09/22 23:56:13 langthang Exp $
+
+*postfix-2.1.5-r1 (22 Sep 2004)
+
+  22 Sep 2004; Tuan Van <langthang@gentoo.org> +postfix-2.1.5-r1.ebuild:
+  Version bump to please QA. Bug #62674.
 
 *postfix-2.1.5 (21 Sep 2004)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d5229da370b6..cb7efd957d22 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 MD5 4733129b5caaecba725e6d5a507aa785 postfix-2.1.3.ebuild 7355
 MD5 7eeba195836ed8cf5ba8496b7efb1355 postfix-2.0.18.ebuild 6664
 MD5 10689412440cdd14260b9eee52758368 postfix-2.1.5.ebuild 7361
+MD5 3bef64d5b9331d0e8a439d61848f3bb3 postfix-2.1.5-r1.ebuild 7406
 MD5 77eb50bf3e6553a05a20d268f18b3647 postfix-2.0.19-r2.ebuild 6183
 MD5 027297ac3ac33bb8d1264de5a8d63b18 postfix-1.1.11.20020917-r1.ebuild 4559
 MD5 17e728ea0c2bc977a8ee7c96a9650da4 postfix-2.0.16-r1.ebuild 6663
@@ -11,7 +12,7 @@ MD5 5234b870293b81f57c41d8934ff58278 postfix-2.0.19-r4.ebuild 6670
 MD5 4dabf0b6e9908bcdc0d30c8d653e65e4 postfix-2.1.4.ebuild 7359
 MD5 a37e17b30106fd73993b70a6ec3db9af postfix-2.0.19.ebuild 6715
 MD5 30e7081167c25d6676a36269ef267f9b postfix-2.0.19-r1.ebuild 5974
-MD5 6f38bb32d245b639200ca0fba28ebd43 ChangeLog 26765
+MD5 3b182713feeaba13ba687327b7e65196 ChangeLog 26913
 MD5 2386a353b9c43ced5e3ff8b0fd494feb postfix-2.1.1.ebuild 6598
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 MD5 2cc01b4a47e193e7c82971bba2417224 postfix-2.0.20.ebuild 7760
@@ -28,6 +29,7 @@ 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 6ae48624e946756fb17572811abf8961 files/digest-postfix-2.1.5-r1 363
 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
@@ -46,7 +48,7 @@ MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBUQo95FrxP71izLARAvEwAKCDmUO7glXN5of981rKbsSMozCWDQCgvYfJ
-QkOgg09w1T7j8Heja5QecSY=
-=EVGm
+iD8DBQFBUhRI5FrxP71izLARAgyLAJwK1Sl4G5BGEwFUjulCUAePX7loigCgk/09
+oFg6EM5meYg1xjDbWuMBSBs=
+=sZ9V
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.1.5-r1 b/mail-mta/postfix/files/digest-postfix-2.1.5-r1
new file mode 100644
index 000000000000..6050b3d29e34
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.1.5-r1
@@ -0,0 +1,5 @@
+MD5 bcaa4aac80595d04c60c72844203a04d postfix-2.1.5.tar.gz 1971931
+MD5 868209c12cf214566130b9c8b968cfed postfix-2.1.5-trash.patch.gz 7049
+MD5 d3211ebd4d2fbbc9c78235666ed355ac pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz 239141
+MD5 c1c5a84b6c04bde0df7100cf05abb54c ipv6-1.25-pf-2.1.5.patch.gz 48228
+MD5 5b02ebf2ec104c43f805d2bcb7bb16ef tls+ipv6-1.25-pf-2.1.5.patch.gz 251571
diff --git a/mail-mta/postfix/postfix-2.1.5-r1.ebuild b/mail-mta/postfix/postfix-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..2e5d7f2bf61b
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.1.5-r1.ebuild
@@ -0,0 +1,253 @@
+# 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.5-r1.ebuild,v 1.1 2004/09/22 23:56:13 langthang Exp $
+
+inherit eutils ssl-cert
+
+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/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 )
+	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"
+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 )"
+
+pkg_setup() {
+	# put out warnings to work around bug #45764
+	if has_version '<=mail-mta/postfix-2.0.18'; 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
+	epause 5
+	fi
+
+	# logic to fix bug #53324
+	if [[ -n $(pidof master) ]] ; then
+		if has_version '<mail-mta/postfix-2.1.3' ; then
+			echo
+			eerror "You are upgrading from the incompatible version."
+			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
+			epause 10
+		fi
+	fi
+}
+
+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"
+		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() {
+	# added -Wl,-z,now wrt 62674.
+	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -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
+
+	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
+	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
+}