Keyword fixes.

9 files changed, 264 insertions, 14 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index 4a9e2cbeccee..e15308f8d1bd 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,19 @@
 # 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.110 2004/03/15 17:47:15 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.111 2004/03/17 23:50:32 g2boojum Exp $
+
+*postfix-2.0.19-r2 (17 Mar 2004)
+
+  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> postfix-2.0.16-r1.ebuild,
+  postfix-2.0.18.ebuild, postfix-2.0.19-r1.ebuild, postfix-2.0.19-r2.ebuild,
+  postfix-2.0.19.ebuild, files/mailer.conf:
+  Lots of keyword fixes for bad sasl depends.
+
+*postfix-2.0.19-r2 (17 Mar 2004)
+
+  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> postfix-2.0.19-r2.ebuild,
+  files/mailer.conf:
+  New revision that uses mailwrapper.
 
 *postfix-2.0.19-r1 (15 Mar 2004)
 
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index b27e7b92023e..a67013116824 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,9 +1,10 @@
-MD5 4e059c5173e02efc54dcff19980d507f postfix-2.0.18.ebuild 6805
+MD5 27fe74a078816742b6413fbfabadb4d8 postfix-2.0.18.ebuild 6793
+MD5 821363ad2f13fd84df32a734c6ca5107 postfix-2.0.19-r2.ebuild 6057
 MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
-MD5 037096980d45b8e37dc508fad0050c84 postfix-2.0.16-r1.ebuild 6807
-MD5 dca12a1d60befb3278b4dc02ebf7f43a postfix-2.0.19.ebuild 6799
-MD5 b8383e8cd8f22aa37e34cc4af767889f postfix-2.0.19-r1.ebuild 5942
-MD5 d3bbff8e59e59dec056c6db025004be0 ChangeLog 22533
+MD5 9caa85e7ab35992b3eb513006ac19937 postfix-2.0.16-r1.ebuild 6793
+MD5 9bc61c7492be4434b4f745e4755ac637 postfix-2.0.19.ebuild 6792
+MD5 9df73810c99fc194ce82dd3cdd3cead0 postfix-2.0.19-r1.ebuild 5935
+MD5 4fc170bb40b905509cc9b10ec2a9e862 ChangeLog 22992
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 203fa874ac60ebfd492d00215963aac4 postfix-2.0.11.ebuild 6042
 MD5 4c4377dfe501bf2a981176f09c98fede postfix-1.1.11.20020917.ebuild 4578
@@ -19,7 +20,9 @@ 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 2ab4ae9066b82e25800818cc0beb5908 files/mailer.conf 753
 MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
 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 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/net-mail/postfix/files/digest-postfix-2.0.19-r2 b/net-mail/postfix/files/digest-postfix-2.0.19-r2
new file mode 100644
index 000000000000..64cc417361b7
--- /dev/null
+++ b/net-mail/postfix/files/digest-postfix-2.0.19-r2
@@ -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/net-mail/postfix/files/mailer.conf b/net-mail/postfix/files/mailer.conf
new file mode 100644
index 000000000000..57455276910d
--- /dev/null
+++ b/net-mail/postfix/files/mailer.conf
@@ -0,0 +1,24 @@
+#	$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
+#
+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
+#mailq		/usr/sbin/ssmtp
+#newaliases	/usr/sbin/ssmtp
+# Execute the "real" sendmail program, named /usr/sbin/sendmail
+#
+#sendmail	/usr/sbin/sendmail.sendmail
+#send-mail	/usr/sbin/sendmail.sendmail
+#mailq		/usr/sbin/sendmail.sendmail
+#newaliases	/usr/sbin/sendmail.sendmail
+#hoststat	/usr/sbin/sendmail.sendmail
+#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/net-mail/postfix/postfix-2.0.16-r1.ebuild b/net-mail/postfix/postfix-2.0.16-r1.ebuild
index 507f1b0adc19..6be0e77c9334 100644
--- a/net-mail/postfix/postfix-2.0.16-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.16-r1.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/net-mail/postfix/postfix-2.0.16-r1.ebuild,v 1.15 2004/02/24 05:10:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.16-r1.ebuild,v 1.16 2004/03/17 23:50:32 g2boojum Exp $
 
 inherit eutils ssl-cert
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc alpha ~mips ia64"
+KEYWORDS="x86 sparc ~ppc"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
 
 PROVIDE="virtual/mta virtual/mda"
diff --git a/net-mail/postfix/postfix-2.0.18.ebuild b/net-mail/postfix/postfix-2.0.18.ebuild
index 6ba33753c277..338d80785503 100644
--- a/net-mail/postfix/postfix-2.0.18.ebuild
+++ b/net-mail/postfix/postfix-2.0.18.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/net-mail/postfix/postfix-2.0.18.ebuild,v 1.3 2004/02/19 16:44:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.18.ebuild,v 1.4 2004/03/17 23:50:32 g2boojum Exp $
 
 inherit eutils ssl-cert
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~mips ~ia64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
 
 PROVIDE="virtual/mta virtual/mda"
diff --git a/net-mail/postfix/postfix-2.0.19-r1.ebuild b/net-mail/postfix/postfix-2.0.19-r1.ebuild
index 3e894570374a..6218bd1b7ae7 100644
--- a/net-mail/postfix/postfix-2.0.19-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.19-r1.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/net-mail/postfix/postfix-2.0.19-r1.ebuild,v 1.1 2004/03/15 17:47:16 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19-r1.ebuild,v 1.2 2004/03/17 23:50:32 g2boojum Exp $
 
 inherit eutils ssl-cert
 
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~mips ~ia64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl vda maildir mbox"
 
 PROVIDE="virtual/mta virtual/mda"
diff --git a/net-mail/postfix/postfix-2.0.19-r2.ebuild b/net-mail/postfix/postfix-2.0.19-r2.ebuild
new file mode 100644
index 000000000000..5ec1a68b410d
--- /dev/null
+++ b/net-mail/postfix/postfix-2.0.19-r2.ebuild
@@ -0,0 +1,203 @@
+# 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.19-r2.ebuild,v 1.1 2004/03/17 23:50:32 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"
+IUSE="ipv6 pam ldap mysql postgres ssl sasl vda 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
+	net-mail/mailwrapper"
+
+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"
+
+	# Remove the /usr/sbin/sendmail symlink
+	rm ${D}/usr/sbin/sendmail
+	# Provide another link for legacy FSH.
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+
+	insinto /etc
+	doins ${FILESDIR}/mailer.conf
+
+	# 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
+}
diff --git a/net-mail/postfix/postfix-2.0.19.ebuild b/net-mail/postfix/postfix-2.0.19.ebuild
index 6925b66850e3..b037b2fc71c3 100644
--- a/net-mail/postfix/postfix-2.0.19.ebuild
+++ b/net-mail/postfix/postfix-2.0.19.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/net-mail/postfix/postfix-2.0.19.ebuild,v 1.1 2004/03/15 17:47:16 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19.ebuild,v 1.2 2004/03/17 23:50:32 g2boojum Exp $
 
 inherit eutils ssl-cert
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~mips ~ia64"
+KEYWORDS="x86 ~sparc ~ppc ~alpha"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
 
 PROVIDE="virtual/mta virtual/mda"