Add the Verisign patch from Wietse.

4 files changed, 229 insertions, 3 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index bf9f3c9622e2..2a54f2e87569 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.90 2003/09/24 22:23:47 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.91 2003/09/25 18:27:46 max Exp $
+
+*postfix-2.0.16-r1 (25 Sep 2003)
+
+  25 Sep 2003; Max Kalika <max@gentoo.org> postfix-2.0.16-r1.ebuild:
+  Add the Verisign patch from Wietse.
 
   24 Sep 2003; Max Kalika <max@gentoo.org> postfix-2.0.16.ebuild:
   Die if postfix-install or postconf fail.
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index ea4243ba87d7..cc3953848050 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -3,10 +3,11 @@ MD5 fb2a0d195963e2dad30eba4238352499 postfix-2.0.13.ebuild 6368
 MD5 4896326c3dc6885664ff4ce74614c274 postfix-2.0.13-r1.ebuild 6345
 MD5 f7902206b1ea1c3894f86f798f2eb0bd postfix-2.0.9.ebuild 6241
 MD5 ef533edc3256c24f6ef2a04444b71404 postfix-1.1.11.20020917-r1.ebuild 4598
+MD5 7fed10e4677baf70b8424174479d4036 postfix-2.0.16-r1.ebuild 6571
 MD5 de51d2542b3a6d669a2f523b63e6e1d2 postfix-2.0.12-r1.ebuild 6027
 MD5 a0bed4adcd5039175b633ec641660e04 postfix-2.0.14.ebuild 6379
 MD5 53caf99049103faa8331297d7f0784e1 postfix-2.0.15-r1.ebuild 6384
-MD5 5f94c5d9f6140d285b6b19df565282fa ChangeLog 18996
+MD5 5ebb1bd89b99739cee0914089e0a5c3e ChangeLog 19138
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 726c579a53fe643d16970462cb2b6e47 postfix-2.0.16.ebuild 6476
 MD5 9486f47c362cb65c1ad4760647a7b3a5 postfix-2.0.11.ebuild 6031
@@ -22,7 +23,7 @@ MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
 MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
 MD5 c0419702f95f1ae3461d57ef00cf9dc4 files/digest-postfix-2.0.13 296
 MD5 b16da80a639afb1445a78346a3469d17 files/digest-postfix-2.0.14 296
-MD5 ba472480c7c234f53d09be9bf0fe878a files/digest-postfix-2.0.16 374
+MD5 3d5c9c532a5e2e9fbdb7baa7064b3d91 files/digest-postfix-2.0.16 374
 MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
 MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
 MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
@@ -36,6 +37,7 @@ MD5 499f6d9f2295ba6e359ce568842d050c files/digest-postfix-2.0.10-r1 295
 MD5 6264e15636614de0cce39a66de79db5f files/digest-postfix-2.0.12-r1 295
 MD5 fbf57b537c7f42a7bf96f073ee3d22bf files/digest-postfix-2.0.13-r1 297
 MD5 e38041c4e48c3b1f858b60a7cc200844 files/digest-postfix-2.0.15-r1 296
+MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
 MD5 7dea3c30c3550cbbcdf4aac0b6d8dffa files/smtpd-2.0.conf 138
 MD5 2451d1fd691c1e31e2d979e4c25f8d7e files/postfix-2.0.14/main.cf.diff 2382
 MD5 cada6258fd7febc632fd333523fa00d5 files/postfix-2.0.0/master.cf.diff 883
diff --git a/net-mail/postfix/files/digest-postfix-2.0.16-r1 b/net-mail/postfix/files/digest-postfix-2.0.16-r1
new file mode 100644
index 000000000000..f430e5510bb2
--- /dev/null
+++ b/net-mail/postfix/files/digest-postfix-2.0.16-r1
@@ -0,0 +1,6 @@
+MD5 ac13776442ba7708e683bc1bfbadab2f postfix-2.0.16.tar.gz 1353520
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 b39c08eabe807db4af5bcb1cafc9761e pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz 234105
+MD5 8e0b85c6c131d367dc5b0d0d95e7e2c1 ipv6-1.18a-pf-2.0.16.patch.gz 45398
+MD5 d029e85aba3f7610ca3437aefa9c1e60 tls+ipv6-1.18a-pf-2.0.16.patch.gz 253429
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/net-mail/postfix/postfix-2.0.16-r1.ebuild b/net-mail/postfix/postfix-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..03aea790da0d
--- /dev/null
+++ b/net-mail/postfix/postfix-2.0.16-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.16-r1.ebuild,v 1.1 2003/09/25 18:27:46 max Exp $
+
+inherit eutils
+
+TLS_P="pfixtls-0.8.16-2.0.16-0.9.7b"
+IPV6="1.18a"
+IPV6_P="ipv6-${IPV6}-pf-2.0.16"
+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
+	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-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 )
+	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir 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
+	!virtual/mta"
+
+pkg_setup() {
+	# Prevent mangling the smtpd.conf file
+	if [ ! -L ${ROOT}/usr/lib/sasl2/smtpd.conf ] ; then
+		if [ -f ${ROOT}/usr/lib/sasl2/smtpd.conf ] ; then
+			ebegin "Protecting your smtpd.conf file"
+			if [ ! -d ${ROOT}/etc/sasl2 ] ; then
+				mkdir -p ${ROOT}/etc/sasl2
+			fi
+
+			# This shouldn't be necessary, but apparently
+			# without it things can still get messy.
+			if [ -L ${ROOT}/etc/sasl2/smtpd.conf ] ; then
+				rm ${ROOT}/etc/sasl2/smtpd.conf
+			fi
+
+			# If both files exist, make sure that we preserve
+			# a copy of each with the ._cfg system
+			if [ -f ${ROOT}/etc/sasl2/smtpd.conf ] ; then
+				mv ${ROOT}/etc/sasl2/smtpd.conf \
+					${ROOT}/etc/sasl2/._cfg0000_smtpd.conf
+			fi
+			mv ${ROOT}/usr/lib/sasl2/smtpd.conf ${ROOT}/etc/sasl2
+			eend
+		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 postgres`" ] ; then
+		epatch "${DISTDIR}/${PGSQL_P}.patch"
+	fi
+
+	# Verisign name services fixes.
+	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"
+
+	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
+		mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		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\\\""
+	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
+
+	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" \
+		sample_directory="/usr/share/doc/${PF}/sample" \
+		manpage_directory="/usr/share/man" \
+		mail_owner="postfix" \
+		setgid_group="postdrop" || die "postfix-install failed"
+
+	# Install an rmail for UUCP, closing bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# 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 maildir`" ] ; then
+		mypostconf="home_mailbox=.maildir/"
+	elif [ "`use mbox`" ] ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	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
+		einfo "Generating self-signed test certificate."
+		(yes "" | "${FILESDIR}/gentestcrt.sh") &>/dev/null
+		(cat server.key && echo && cat server.crt) > server.pem
+		insinto /etc/ssl/postfix
+		doins server.{key,crt,pem}
+		fowners mail:root /etc/ssl/postfix/server.{key,crt,pem}
+		fperms 0400 /etc/ssl/postfix/server.{key,crt,pem}
+	fi
+	if [ "`use sasl`" ] ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+		dodir /usr/lib/sasl2
+		dosym /etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf
+	fi
+
+	keepdir /var/spool/postfix
+}
+
+pkg_postinst() {
+	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
+}