Bump version to 2.0.17.

4 files changed, 261 insertions, 27 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index fe6e09be87ef..5107c5cf55b9 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.103 2004/01/18 23:01:05 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.104 2004/01/20 21:27:19 max Exp $
+
+*postfix-2.0.17 (20 Jan 2004)
+
+  20 Jan 2004; Max Kalika <max@gentoo.org> postfix-2.0.17.ebuild:
+  Bump version to 2.0.17.
 
   18 Jan 2004; <tuxus@gentoo.org> postfix-2.0.16-r1.ebuild:
   Added ~mips to KEYWORDS.
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index d291a9eb896d..606c840a0cf1 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,38 +1,40 @@
-MD5 c903dd88407e2e805e25adcc6782b569 ChangeLog 21108
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
-MD5 af54dd63ae7235856a5cc25284ac40c8 postfix-1.1.11.20020917.ebuild 4574
 MD5 9a76c00dc374c58cb48acdd1a7a15c4b postfix-2.0.10-r1.ebuild 6162
-MD5 a515b7a5d1f6e1ac3d05ac9a1de560b3 postfix-2.0.11.ebuild 6033
-MD5 c156cd1b607a905125f9f1ca47177b16 postfix-2.0.12-r1.ebuild 6029
 MD5 9dbec295c346a13a09fc91a1814755cb postfix-2.0.13-r1.ebuild 6347
+MD5 2fe228e8ea41468c95d28d6f166aa0dc postfix-2.0.9.ebuild 6236
+MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
+MD5 50c37701912b43e8672854795a6f4d1c postfix-2.0.17.ebuild 6794
+MD5 cbf8f19236850c42e47b7994b5cdc258 postfix-2.0.16-r1.ebuild 6800
+MD5 c156cd1b607a905125f9f1ca47177b16 postfix-2.0.12-r1.ebuild 6029
 MD5 a5f1d33d6b5226ed81cf7be55aa8f9c9 postfix-2.0.14.ebuild 6381
 MD5 75487fe50e2b5d4cbd68b5d2a91bf0aa postfix-2.0.15-r1.ebuild 6385
-MD5 cbf8f19236850c42e47b7994b5cdc258 postfix-2.0.16-r1.ebuild 6800
-MD5 2fe228e8ea41468c95d28d6f166aa0dc postfix-2.0.9.ebuild 6236
-MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 855bd07f00effa054d2a7096801ce0ff ChangeLog 21230
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 a515b7a5d1f6e1ac3d05ac9a1de560b3 postfix-2.0.11.ebuild 6033
+MD5 af54dd63ae7235856a5cc25284ac40c8 postfix-1.1.11.20020917.ebuild 4574
+MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
-MD5 499f6d9f2295ba6e359ce568842d050c files/digest-postfix-2.0.10-r1 295
+MD5 c96b069e399dd4c8d21faddcb6274de6 files/postfix.rc6 585
+MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
+MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
+MD5 569f1c46350b2718419b72bb9c443c3f files/saslpass 135
+MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
 MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
-MD5 6264e15636614de0cce39a66de79db5f files/digest-postfix-2.0.12-r1 295
-MD5 fbf57b537c7f42a7bf96f073ee3d22bf files/digest-postfix-2.0.13-r1 297
 MD5 b16da80a639afb1445a78346a3469d17 files/digest-postfix-2.0.14 296
-MD5 e38041c4e48c3b1f858b60a7cc200844 files/digest-postfix-2.0.15-r1 296
-MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
-MD5 e126c8295dad90d20bf2d6a47086ab0e files/digest-postfix-2.0.9 220
-MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
-MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
-MD5 3004148a32063214f57f0316b9f46116 files/postfix 517
-MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
+MD5 6550bbb115dee08f8540feb21b46b0b3 files/digest-postfix-2.0.17 445
+MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
 MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
+MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 e126c8295dad90d20bf2d6a47086ab0e files/digest-postfix-2.0.9 220
 MD5 61fc23026a194c592078961b7da6455c files/postfix-pg.postfix-2.0.0.2.patch.bz2 7526
-MD5 c96b069e399dd4c8d21faddcb6274de6 files/postfix.rc6 585
-MD5 569f1c46350b2718419b72bb9c443c3f files/saslpass 135
 MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
-MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
-MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
+MD5 3004148a32063214f57f0316b9f46116 files/postfix 517
+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 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
-MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
-MD5 cada6258fd7febc632fd333523fa00d5 files/postfix-2.0.0/master.cf.diff 883
 MD5 2451d1fd691c1e31e2d979e4c25f8d7e files/postfix-2.0.14/main.cf.diff 2382
+MD5 cada6258fd7febc632fd333523fa00d5 files/postfix-2.0.0/master.cf.diff 883
+MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/net-mail/postfix/files/digest-postfix-2.0.17 b/net-mail/postfix/files/digest-postfix-2.0.17
new file mode 100644
index 000000000000..9c06cf490955
--- /dev/null
+++ b/net-mail/postfix/files/digest-postfix-2.0.17
@@ -0,0 +1,6 @@
+MD5 482e3912e4e910bd62f1a2d74bfa3b77 postfix-2.0.17.tar.gz 1353628
+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 e59b9d580bd0299bc0ed76902984c2c4 ipv6-1.20-pf-2.0.16.patch.gz 46978
+MD5 9e26a2bb0cf36d6a9739c501ec26246a tls+ipv6-1.20-pf-2.0.16.patch.gz 254580
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/net-mail/postfix/postfix-2.0.17.ebuild b/net-mail/postfix/postfix-2.0.17.ebuild
new file mode 100644
index 000000000000..9d485c2d8f20
--- /dev/null
+++ b/net-mail/postfix/postfix-2.0.17.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2004 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.17.ebuild,v 1.1 2004/01/20 21:27:19 max Exp $
+
+inherit eutils ssl-cert
+
+TLS_P="pfixtls-0.8.16-2.0.16-0.9.7b"
+IPV6="1.20"
+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 ~alpha ~mips"
+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"
+
+# Is this still necessary since gentoo sasl looks
+# in /etc/sasl2 for it's config files?
+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"
+
+	# 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\\\""
+	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"
+
+	# 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
+
+	# 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
+		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
+	eend $?
+	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
+}