Bump, see changelog for details

4 files changed, 211 insertions, 3 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index e23316207824..e462727d6f87 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # 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.65 2003/04/28 18:32:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.66 2003/05/22 17:48:09 lostlogic Exp $
+
+*postfix-2.0.10 (22 May 2003)
+
+  22 May 2003; Brandon Low <lostlogic@gentoo.org> postfix-2.0.10.ebuild:
+  New postfix, this is mostly just a bump, but also we now have better split out
+  TLS, IPV6 and IPV6+TLS patches, enjoy
 
 *postfix-2.0.9 (28 Apr 2003)
 
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index dc38fa662ab2..09a66fa5d7c9 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,10 +1,10 @@
 MD5 2c904f060968d879be6a209b51dec470 postfix-2.0.9-r1.ebuild 5574
-MD5 19fb00e0f3c3d59880c96568218bf54c postfix-2.0.10.ebuild 5349
+MD5 4066ec45baab8fbd5a791b0a78f68163 postfix-2.0.10.ebuild 5350
 MD5 ead334460917ae4879673b31d59f46e8 postfix-2.0.9.ebuild 5471
 MD5 76726846989c0b6a5fc643d06b804e45 postfix-1.1.11.20020917-r1.ebuild 4945
 MD5 f897c860cfc3df2435d1d403a90a36b7 postfix-2.0.8.ebuild 5320
 MD5 bdc0fccbffe6e56257af41ac5d1372b0 postfix-2.0.3.ebuild 5113
-MD5 cbee5a2cfb5ea9788a81c3a1811f54b6 ChangeLog 14054
+MD5 23ea3b79f908fb62145ce4f384b07eb2 ChangeLog 14057
 MD5 c79b19f95cb38b8802966d7efb54bc60 postfix-1.1.11.20020917.ebuild 4924
 MD5 a3eadfcfa0bf6f88ccff41e2d065745b files/postfix-2.0.8_patch.patch 552
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
diff --git a/net-mail/postfix/files/digest-postfix-2.0.10 b/net-mail/postfix/files/digest-postfix-2.0.10
new file mode 100644
index 000000000000..25b05eef4a95
--- /dev/null
+++ b/net-mail/postfix/files/digest-postfix-2.0.10
@@ -0,0 +1,2 @@
+MD5 80ebfc319640a5dec2fedf4945561b88 postfix-2.0.10.tar.gz 1348298
+MD5 f34a4b7e55a02675d04358e036f1362d pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz 226077
diff --git a/net-mail/postfix/postfix-2.0.10.ebuild b/net-mail/postfix/postfix-2.0.10.ebuild
new file mode 100644
index 000000000000..edaea8d1f40c
--- /dev/null
+++ b/net-mail/postfix/postfix-2.0.10.ebuild
@@ -0,0 +1,200 @@
+# 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.10.ebuild,v 1.1 2003/05/22 17:48:09 lostlogic Exp $
+
+inherit eutils
+
+TLS_P="pfixtls-0.8.13-2.0.9-0.9.7b"
+IPV6_P="ipv6-1.14-pf-2.0.9"
+IPV6_TLS_P="tls+ipv6-1.14-pf-2.0.9"
+IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
+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? ( http://www.ipnet6.org/postfix/download/${IPV6_P}.patch.gz )
+	ipv6? ( http://www.ipnet6.org/postfix/download/${IPV6_TLS_P}.patch.gz )"
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+PROVIDE="virtual/mta
+	 virtual/mda"
+DEPEND=">=sys-libs/db-3.2
+	>=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 )"
+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
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	if [ "`use ssl`" ]; then
+		if [ "`use ipv6`" ]; then
+			epatch ${DISTDIR}/${IPV6_TLS_P}.patch.gz || die "ipv6/tls patch died"
+		else
+			unpack ${TLS_P}.tar.gz
+			epatch ${WORKDIR}/${P}/${TLS_P}/pfixtls.diff || die "tls patch died"
+		fi
+		CCARGS="${CCARGS} -DHAS_SSL"
+		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
+	elif [ "`use ipv6`" ]; then
+		epatch ${DISTDIR}/${IPV6_P}.patch.gz || die "ipv6 patch died"
+	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 \
+		/var/spool/postfix/tmp
+	touch ${D}/var/spool/postfix/.keep
+
+	cd ${S}/bin
+	dosbin post* sendmail
+	chown root:postdrop ${D}/usr/sbin/{postdrop,postqueue}
+	chmod 2755 ${D}/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
+
+	if [ "`use sasl`" ] ; then
+		# sasl 2
+		if [ -f /usr/include/sasl/sasl.h ] ; then
+			insinto /usr/lib/sasl2
+			doins ${FILESDIR}/smtpd.conf
+		else
+			insinto /etc/sasl
+			doins ${FILESDIR}/smtpd.conf
+		fi
+	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
+}
+
+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
+}