new revision w/ mailwrapper as an optional dep

6 files changed, 290 insertions, 22 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 3391eabc5cbe..a39d42fce17a 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.2 2004/05/31 00:26:50 g2boojum Exp $
+
+*postfix-2.0.19-r3 (30 May 2004)
+
+  30 May 2004; Grant Goodyear <g2boojum@gentoo.org> files/mailer.conf,
+  postfix-2.0.19-r2.ebuild, +postfix-2.0.19-r3.ebuild:
+  Changes to make mailwrapper an optional dep.
+  Also, I removed "maildir" as a use flag, as it's our default
+  format.
 
   12 May 2004; Michael McCabe <randy@gentoo.org> postfix-2.0.19-r2.ebuild:
   Added s390 keywords
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d8f3d71d3429..77e5a2a060b1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,28 +1,31 @@
-MD5 7fea68ac6f8be386bb3ac99026b6050f postfix-2.0.18.ebuild 6791
-MD5 88c6f24164a1ec6655aa60cc244d3127 postfix-2.0.19-r2.ebuild 6186
-MD5 bb3a31f350fe0530a4d3e78b663a3deb postfix-1.1.11.20020917-r1.ebuild 4596
-MD5 1b80c2815c58410c81d76ce45dfc1d60 postfix-2.0.16-r1.ebuild 6790
-MD5 de5e64a72b9187bb1f02487e231d04e9 postfix-2.0.19.ebuild 6842
-MD5 6c37bea99f87236a8086a3015cd20fc1 postfix-2.0.19-r1.ebuild 5981
-MD5 5e28beea9d2b7ed9c698bf55c1519201 ChangeLog 23745
+MD5 f3db404cde877b7451b18a2a7d3c08de postfix-2.0.18.ebuild 6792
+MD5 548d35217f80f2985f4051993520b50e postfix-2.0.19-r2.ebuild 6192
+MD5 a9531741684242a92d837b75b9541c22 postfix-1.1.11.20020917-r1.ebuild 4597
+MD5 fe25ae6ba270db8d1dd37dcd37efcaed postfix-2.0.16-r1.ebuild 6791
+MD5 53cb194cfc1453c5e3cfcd863182e579 postfix-2.0.19.ebuild 6843
+MD5 44b3e41586b39a70bdb2fef5f235a0d7 postfix-2.0.19-r1.ebuild 5982
+MD5 b5cfff0ec0bff863ffba44db513e23fa .postfix-2.0.19-r3.ebuild.swp 20480
+MD5 06cf55200d867e41b209a368e972236c ChangeLog 23746
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 2297747ad44f8c135908328233d3b411 postfix-2.0.11.ebuild 6044
-MD5 2f2c4a703b4a6ac24269bd7e1c4ab4ae postfix-1.1.11.20020917.ebuild 4575
+MD5 6133e8521b39bdc62c26e2c7a5e51b43 postfix-2.0.11.ebuild 6045
+MD5 9b440d10578c304065579d5e3b3bf2f9 postfix-2.0.19-r3.ebuild 6240
+MD5 862070e647344d1d734ecfb60acaf0c9 postfix-1.1.11.20020917.ebuild 4576
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
-MD5 caa45c1c2711fe687d0896d8b6400e78 files/postfix.rc6 585
-MD5 0de0aeb149204f1dc5ead666107694ce files/smtp.pass 137
-MD5 4ac27d1fe53badbee2546d5044ca3d27 files/smtp.sasl 127
-MD5 0acffde07d4dd4906e5f1cdb7dc9a646 files/main.cf 18374
+MD5 eb3db18b77d6adb6d2828882bd3a7eb6 files/postfix.rc6 586
+MD5 08c982586389001b30c0159005d95368 files/smtp.pass 138
+MD5 db7156a5f84e1b8fc73f9a46b95411bb files/smtp.sasl 128
+MD5 4e28f02e9ce7ec8eda9e2ebfe72da584 files/main.cf 18375
 MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
 MD5 86074a74de686c68c34e40b36c1188b6 files/digest-postfix-2.0.18 445
 MD5 20fa9d533a75c392127160b6b83d4229 files/digest-postfix-2.0.19 445
-MD5 9c449133a0e15d870ee37e71653b64c8 files/smtpd.conf 128
+MD5 5b9ee65794700a7df9a0f8b98d9152f3 files/smtpd.conf 129
 MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
-MD5 8bb2393cb308f752dcb6aa654e98034a files/master.cf 4419
+MD5 a049d7af398f64de1dfc8d8b746c6c71 files/master.cf 4420
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
-MD5 2ab4ae9066b82e25800818cc0beb5908 files/mailer.conf 753
-MD5 d404cff3d69da12b544c6eaa5f20f7d2 files/smtp.pam 250
+MD5 6a14302cd4d520281bfa3d16f11dd75a files/mailer.conf 1543
+MD5 e89a2ce8a21052ee5923301084cc8fff files/smtp.pam 251
 MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
 MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r1 511
 MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r2 511
+MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r3 511
 MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r3 b/mail-mta/postfix/files/digest-postfix-2.0.19-r3
new file mode 100644
index 000000000000..64cc417361b7
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.0.19-r3
@@ -0,0 +1,7 @@
+MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
+MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
+MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
+MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
+MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
+MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
+MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/mailer.conf b/mail-mta/postfix/files/mailer.conf
index 57455276910d..71af9b087163 100644
--- a/mail-mta/postfix/files/mailer.conf
+++ b/mail-mta/postfix/files/mailer.conf
@@ -1,5 +1,6 @@
-#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
-#
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/mailer.conf,v 1.2 2004/05/31 00:26:50 g2boojum Exp $
+# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+
 # Execute the "real" sendmail program from postfix, 
 # named /usr/sbin/sendmail.postfix
 #
@@ -8,12 +9,38 @@ send-mail	/usr/sbin/sendmail.postfix
 mailq		/usr/sbin/sendmail.postfix
 newaliases	/usr/sbin/sendmail.postfix
 
+# Execute the "real" sendmail program from exim, 
+# named /usr/sbin/exim
+#
+#sendmail	/usr/sbin/exim
+#send-mail	/usr/sbin/exim
+#mailq		/usr/sbin/exim
+#newaliases	/usr/sbin/exim
+#rsmtp		/usr/sbin/exim
+#rmail		/usr/sbin/exim
+#mail		/usr/sbin/exim
+
+# Execute the "real" sendmail program from nullmailer
+# named /usr/sbin/sendmail.nullmailer
+#sendmail	/usr/sbin/sendmail.nullmailer
+#mailq		/usr/bin/mailq.nullmailer
+
+# Execute the "real" sendmail program from postfix, 
+# named /usr/sbin/sendmail.postfix
+#
+#sendmail	/usr/sbin/sendmail.postfix
+#send-mail	/usr/sbin/sendmail.postfix
+#mailq		/usr/sbin/sendmail.postfix
+#newaliases	/usr/sbin/sendmail.postfix
+
 # Execute the "real" sendmail program from ssmtp, 
 # named /usr/sbin/ssmtp
 #
 #sendmail	/usr/sbin/ssmtp
+#send-mail	/usr/sbin/ssmtp
 #mailq		/usr/sbin/ssmtp
 #newaliases	/usr/sbin/ssmtp
+
 # Execute the "real" sendmail program, named /usr/sbin/sendmail
 #
 #sendmail	/usr/sbin/sendmail.sendmail
@@ -22,3 +49,4 @@ newaliases	/usr/sbin/sendmail.postfix
 #newaliases	/usr/sbin/sendmail.sendmail
 #hoststat	/usr/sbin/sendmail.sendmail
 #purgestat	/usr/sbin/sendmail.sendmail
+
diff --git a/mail-mta/postfix/postfix-2.0.19-r2.ebuild b/mail-mta/postfix/postfix-2.0.19-r2.ebuild
index 80a8ac4fd2f6..82bff8c99677 100644
--- a/mail-mta/postfix/postfix-2.0.19-r2.ebuild
+++ b/mail-mta/postfix/postfix-2.0.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r2.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r2.ebuild,v 1.2 2004/05/31 00:26:50 g2boojum Exp $
 
 inherit eutils ssl-cert
 
@@ -37,7 +37,7 @@ DEPEND=">=sys-libs/db-3.2
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
-	net-mail/mailwrapper"
+	=net-mail/mailwrapper-0.1"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/mail-mta/postfix/postfix-2.0.19-r3.ebuild b/mail-mta/postfix/postfix-2.0.19-r3.ebuild
new file mode 100644
index 000000000000..f4e5f7622138
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.0.19-r3.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r3.ebuild,v 1.1 2004/05/31 00:26:50 g2boojum Exp $
+
+inherit eutils ssl-cert
+
+VDA_P="${PN}-2.0.18"
+TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
+IPV6="1.21"
+IPV6_P="ipv6-${IPV6}-pf-2.0.18"
+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
+	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.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 ~amd64 s390"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper 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
+	!mailwrapper? ( !virtual/mta )
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
+
+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 vda ; then
+		epatch "${WORKDIR}/${VDA_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"
+
+	# Fix spool removal on upgrade.
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# mailwrapper stuff
+	if use mailwrapper
+	then
+		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
+		insinto /etc/mail
+		doins "${FILESDIR}/mailer.conf"
+	fi
+
+
+	# 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 mbox
+	then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	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
+
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged $PN without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}