Updates for TLS and IPV6

3 files changed, 258 insertions, 2 deletions

diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index cf27014f17ba..99ebcc85586a 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,10 +1,10 @@
 MD5 82ba4d66f539a469d378ace55799f833 postfix-2.0.10-r1.ebuild 6158
 MD5 8557c9a72d5399a6e224cc9774a77615 postfix-2.0.13.ebuild 6366
-MD5 5347e71e426364db7fbce2f2ad890432 postfix-2.0.13-r1.ebuild 6380
+MD5 44225c70a38a6180fbb8297ef5779de8 postfix-2.0.13-r1.ebuild 6387
 MD5 656396a2cf9d1d2c05cd6b55dc9e988d postfix-2.0.9.ebuild 6242
 MD5 0adbbef42d28091a11b3b675345dae91 postfix-1.1.11.20020917-r1.ebuild 4942
 MD5 356407d3452ad6a17e6c196d26e60dbd postfix-2.0.12-r1.ebuild 6015
-MD5 186fbd0e398b3e96fc6ef82dc5414775 ChangeLog 16218
+MD5 a1396ee76bfedc6a080a4a7ced0ae779 ChangeLog 16372
 MD5 e985b31db1aba339c55f8d3faca839b7 postfix-2.0.11.ebuild 6007
 MD5 c79b19f95cb38b8802966d7efb54bc60 postfix-1.1.11.20020917.ebuild 4924
 MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
diff --git a/net-mail/postfix/files/digest-postfix-2.0.13-r1 b/net-mail/postfix/files/digest-postfix-2.0.13-r1
new file mode 100644
index 000000000000..889f9d24a611
--- /dev/null
+++ b/net-mail/postfix/files/digest-postfix-2.0.13-r1
@@ -0,0 +1,4 @@
+MD5 f4f2b4b930a7a32b1df475d87143269f postfix-2.0.13.tar.gz 1350854
+MD5 298f55e2d896a0240f5913a3b611e623 pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz 233962
+MD5 ffdb090f8b826fb8217429a6d7ce555e ipv6-1.15-pf-2.0.13.patch.gz 36474
+MD5 b3a9ec333c88a315d540b2ca76ef7666 tls+ipv6-1.15a-pf-2.0.13.patch.gz 105381
diff --git a/net-mail/postfix/postfix-2.0.13-r1.ebuild b/net-mail/postfix/postfix-2.0.13-r1.ebuild
new file mode 100644
index 000000000000..d08053b0ebe2
--- /dev/null
+++ b/net-mail/postfix/postfix-2.0.13-r1.ebuild
@@ -0,0 +1,252 @@
+# 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.13-r1.ebuild,v 1.1 2003/07/14 22:36:38 lostlogic Exp $
+
+IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
+
+inherit eutils
+
+TLS_P="pfixtls-0.8.15-2.0.13-0.9.7b"
+IPV6="1.15"
+IPV6_P="ipv6-${IPV6}-pf-2.0.13"
+IPV6_TLS_P="tls+ipv6-${IPV6}a-pf-2.0.13"
+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
+	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 )"
+
+SLOT="0"
+LICENSE="IPL-1"
+KEYWORDS="~x86 ~sparc ~ppc"
+
+PROVIDE="virtual/mta
+	virtual/mda"
+
+DEPEND=">=sys-libs/db-3.2
+	>=sys-apps/sed-4
+	>=dev-libs/libpcre-3.4
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( dev-libs/cyrus-sasl )
+	postgres? ( >=dev-db/postgresql-7.1 )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta"
+
+is_postfix_installed() {
+	if [ -d /etc/postfix ] ; then
+		return 1
+	fi
+
+	return 0
+}
+
+pkg_setup() {
+	if ! grep -q ^postdrop: /etc/group ; then
+		groupadd postdrop || die "problem adding group postdrop"
+	fi
+
+	if ! grep -q ^mail:.*postfix /etc/group ; then
+		usermod -G mail postfix || die "problem adding user postfix to group mail"
+	fi
+	
+	# 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 ${P}.tar.gz
+	cd ${S}
+
+	if [ "`use ssl`" ]; then
+		if [ "`use ipv6`" ]; then
+			epatch ${DISTDIR}/${IPV6_TLS_P}.patch.gz
+		else
+			unpack ${TLS_P}.tar.gz
+			epatch ${WORKDIR}/${P}/${TLS_P}/pfixtls.diff
+		fi
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	elif [ "`use ipv6`" ]; then
+		epatch ${DISTDIR}/${IPV6_P}.patch.gz
+	fi
+
+	if [ "`use postgres`" ]; then
+		epatch ${FILESDIR}/${PGSQL_P}.patch.bz2
+		CCARGS="${CCARGS} -DHAS_PGSQL -I/usr/include/postgresql"
+                AUXLIBS="${AUXLIBS} -lpq"
+	fi
+
+	cd ${S}/conf
+	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf
+
+	if [ "`use sasl`" ] ; then
+		# sasl 2
+		if [ -f /usr/include/sasl/sasl.h ]; then
+			AUXLIBS="${AUXLIBS} -lsasl2"
+			CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
+		# sasl 1
+		elif [ -f /usr/include/sasl.h ]; then
+			AUXLIBS="${AUXLIBS} -lsasl"
+			CCARGS="${CCARGS} -DUSE_SASL_AUTH"
+		fi
+	fi
+
+	cd ${S}/src/global
+	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h
+
+	if [ "`use mysql`" ] ; then
+		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
+		AUXLIBS="${AUXLIBS} -lmysqlclient -lm -lz"
+	fi
+
+	if [ "`use ldap`" ] ; then
+		CCARGS="${CCARGS} -DHAS_LDAP"
+		AUXLIBS="${AUXLIBS} -lldap -llber"
+	fi
+
+	if [ "`use pam`" ] ; then
+		AUXLIBS="${AUXLIBS} -lpam"
+	fi
+
+	CCARGS="${CCARGS} -DHAS_PCRE"
+	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
+
+	DEBUG=""
+
+	cd ${S}
+	make makefiles CC="${CC}" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
+		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
+		|| die "creating makefiles failed"
+
+	# Postfix do not get the FQDN if no hostname is configured
+	epatch ${FILESDIR}/${PN}-2.0.9-get-FQDN.patch
+}
+
+src_compile() {
+	#this is a bug fix for gcc-2.95.3-r5 (bug 16547)
+	export CC=gcc
+	emake || die "compile problem"
+}
+
+src_install () {
+	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
+	keepdir /var/spool/postfix/tmp
+
+	cd ${S}/bin
+	dosbin post* sendmail
+	fowners root:postdrop /usr/sbin/{postdrop,postqueue}
+	fperms 2755 /usr/sbin/{postdrop,postqueue}
+
+	dosym /usr/sbin/sendmail /usr/bin/mailq
+	dosym /usr/sbin/sendmail /usr/bin/newaliases
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	cd ${S}/libexec
+	exeinto /usr/lib/postfix
+	doexe *
+
+	cd ${S}/man
+	doman man*/*
+
+	cd ${S}
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	cd README_FILES
+	find . -type l |xargs rm
+	dodoc *
+
+	cd ${S}
+	dohtml html/*
+
+	cd ${S}/conf
+	insinto /etc/postfix/sample
+	doins access aliases canonical pcre_table regexp_table \
+		relocated transport virtual *.cf
+
+	exeinto /etc/postfix
+	doexe postfix-script post-install postfix-files
+
+	insinto /etc/postfix
+	doins ${S}/conf/{main,master}.cf ${FILESDIR}/saslpass
+	cd ${D}/etc/postfix
+	epatch ${FILESDIR}/postfix-2.0.0/main.cf.diff
+	sed -i -e "s|/usr/share/doc/POSTFIX|/usr/share/doc/${PF}|" main.cf
+	chmod 644 main.cf
+	rm -f main.cf~
+	fperms 600 /etc/postfix/saslpass
+
+	exeinto /etc/init.d ; doexe ${FILESDIR}/postfix
+	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
+
+	insinto /etc/sasl2
+	doins ${FILESDIR}/smtpd.conf
+	if [ "`use sasl`" ] ; then
+		dodir /usr/lib/sasl2
+		dosym ../../../etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf
+	fi
+
+	cd ${D}/etc/postfix
+	if [ "`use maildir`" ]; then
+		sed -i -e "s:^#\(home_mailbox = \)Maildir/:\1.maildir/:" main.cf
+	elif [ "`use mbox`" ]; then
+		sed -i -e "s:^#\(mail_spool_directory = /var/spool/mail\):\1:" main.cf
+	fi
+
+	#install an rmail for UUCP, closing bug #19127
+	cd ${S}/auxiliary/rmail
+	dobin rmail
+
+	if [ "`use postgres`" ]; then
+		cd ${S}/README_FILES
+		dodoc PGSQL_README
+		cd ${S}
+	fi
+}
+
+pkg_postinst() {
+	install -d -m 0755 ${ROOT}/var/spool/postfix
+
+	ewarn "If you upgraded from <postfix-2, you must revisit your configuration files."
+	ewarn "See /usr/share/doc/${PF}/RELEASE_NOTES for a list of changes."
+
+	if [ ! -e /etc/mail/aliases.db ] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs and then run"
+		ewarn "/usr/bin/newaliases. Postfix will not work correctly without it."
+	fi
+}