Whoops, forgot files

4 files changed, 333 insertions, 2 deletions

diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index 778938b5eadc..0639c80abf5d 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -4,8 +4,8 @@ MD5 8992f1dbec662fd41b275d178d548d25 postfix-2.0.13-r1.ebuild 6361
 MD5 656396a2cf9d1d2c05cd6b55dc9e988d postfix-2.0.9.ebuild 6242
 MD5 0adbbef42d28091a11b3b675345dae91 postfix-1.1.11.20020917-r1.ebuild 4942
 MD5 c1939447e7af5681008b1bb8e1cf7a95 postfix-2.0.12-r1.ebuild 6027
-MD5 e23e846db2cf5697c712df3e87a88bc9 postfix-2.0.14.ebuild 6394
-MD5 e27c1eb7e50ea5ddd1d58529cdb31ea0 ChangeLog 17248
+MD5 592d571e8670cba0851ae59acc817c7b postfix-2.0.14.ebuild 6396
+MD5 661e23ab0231378a180faaf49dd5ecb9 ChangeLog 17249
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 9d4e7c0493fcfc6f5009c8dccb81c3d7 postfix-2.0.11.ebuild 6030
 MD5 c79b19f95cb38b8802966d7efb54bc60 postfix-1.1.11.20020917.ebuild 4924
@@ -30,5 +30,6 @@ 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 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
 MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/net-mail/postfix/files/digest-postfix-2.0.14 b/net-mail/postfix/files/digest-postfix-2.0.14
new file mode 100644
index 000000000000..d039f4208e17
--- /dev/null
+++ b/net-mail/postfix/files/digest-postfix-2.0.14
@@ -0,0 +1,4 @@
+MD5 d0f1d1382958f3ce918d4d690be22229 postfix-2.0.14.tar.gz 1351520
+MD5 0f2faa625053b92ba579232bea97cac5 pfixtls-0.8.15-2.0.14-0.9.7b.tar.gz 233924
+MD5 5dbafae86744c1893d1d3c52b3cdbcb7 ipv6-1.17-pf-2.0.14.patch.gz 42085
+MD5 aba3c1d230f1591e7f7f8c426ce6b2fc tls+ipv6-1.17-pf-2.0.14.patch.gz 116182
diff --git a/net-mail/postfix/files/postfix-2.0.14/main.cf.diff b/net-mail/postfix/files/postfix-2.0.14/main.cf.diff
new file mode 100644
index 000000000000..a1f950660b10
--- /dev/null
+++ b/net-mail/postfix/files/postfix-2.0.14/main.cf.diff
@@ -0,0 +1,75 @@
+--- ../sample/main.cf	2002-12-23 21:22:16.000000000 +0100
++++ main.cf	2002-12-23 21:48:47.000000000 +0100
+@@ -365,6 +365,7 @@
+ #alias_maps = hash:/etc/aliases
+ #alias_maps = hash:/etc/aliases, nis:mail.aliases
+ #alias_maps = netinfo:/aliases
++alias_maps = hash:/etc/mail/aliases
+ 
+ # The alias_database parameter specifies the alias database(s) that
+ # are built with "newaliases" or "sendmail -bi".  This is a separate
+@@ -375,6 +376,7 @@
+ #alias_database = dbm:/etc/mail/aliases
+ #alias_database = hash:/etc/aliases
+ #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
++alias_database = hash:/etc/mail/aliases
+ 
+ # ADDRESS EXTENSIONS (e.g., user+foo)
+ #
+@@ -396,6 +398,7 @@
+ #
+ #home_mailbox = Mailbox
+ #home_mailbox = Maildir/
++home_mailbox = .maildir/
+  
+ # The mail_spool_directory parameter specifies the directory where
+ # UNIX-style mailboxes are kept. The default setting depends on the
+@@ -548,6 +551,8 @@
+ 
+ #local_destination_concurrency_limit = 2
+ #default_destination_concurrency_limit = 20
++local_destination_concurrency_limit = 2
++default_destination_concurrency_limit = 20
+ 
+ # DEBUGGING CONTROL
+ #
+@@ -590,32 +595,32 @@
+ # sendmail_path: The full pathname of the Postfix sendmail command.
+ # This is the Sendmail-compatible mail posting interface.
+ # 
+-sendmail_path =
++sendmail_path = /usr/sbin/sendmail
+ 
+ # newaliases_path: The full pathname of the Postfix newaliases command.
+ # This is the Sendmail-compatible command to build alias databases.
+ #
+-newaliases_path =
++newaliases_path = /usr/bin/newaliases
+ 
+ # mailq_path: The full pathname of the Postfix mailq command.  This
+ # is the Sendmail-compatible mail queue listing command.
+ # 
+-mailq_path =
++mailq_path = /usr/bin/mailq
+ 
+ # setgid_group: The group for mail submission and queue management
+ # commands.  This must be a group name with a numerical group ID that
+ # is not shared with other accounts, not even with the Postfix account.
+ #
+-setgid_group =
++setgid_group = postdrop
+ 
+ # manpage_directory: The location of the Postfix on-line manual pages.
+ #
+-manpage_directory =
++manpage_directory = /usr/share/man
+ 
+ # sample_directory: The location of the Postfix sample configuration files.
+ #
+-sample_directory =
++sample_directory = /etc/postfix/sample
+ 
+ # readme_directory: The location of the Postfix README files.
+ #
+-readme_directory =
++readme_directory = /usr/share/doc/POSTFIX
diff --git a/net-mail/postfix/postfix-2.0.14.ebuild b/net-mail/postfix/postfix-2.0.14.ebuild
new file mode 100644
index 000000000000..aa701b445795
--- /dev/null
+++ b/net-mail/postfix/postfix-2.0.14.ebuild
@@ -0,0 +1,251 @@
+# 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.14.ebuild,v 1.1 2003/09/02 03:16:27 lostlogic Exp $
+
+IUSE="ssl mysql sasl ldap ipv6 maildir mbox postgres"
+
+inherit eutils
+TLS_P="pfixtls-0.8.15-${PV}-0.9.7b"
+IPV6="1.17"
+IPV6_P="ipv6-${IPV6}-pf-${PV}"
+IPV6_TLS_P="tls+ipv6-${IPV6}-pf-${PV}"
+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.14/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
+		insinto /etc/sasl2
+		doins ${FILESDIR}/smtpd-2.0.conf smtpd.conf
+		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
+}