postfix-2.2.2-r2 is mailer.eclass aware and pmasked

(Portage version: 2.0.51.19)

5 files changed, 336 insertions, 55 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 139bee6bb40b..73fcdaee6e3f 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.66 2005/04/27 17:36:59 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.67 2005/05/04 09:52:10 ferdy Exp $
+
+*postfix-2.2.2-r2 (04 May 2005)
+
+  04 May 2005; Fernando J. Pereda <ferdy@gentoo.org> files/mailer.conf,
+  +postfix-2.2.2-r2.ebuild:
+  postfix-2.2.2-r2 is mailer.eclass aware and pmasked
 
   27 Apr 2005; Fernando J. Pereda <ferdy@gentoo.org>
   postfix-2.1.5-r2.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 53b9c0d87b0e..d8d6d70c55d1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d2f97ac7ba19997b4e588b28009d684d postfix-2.2.1.ebuild 9296
 MD5 ac642c2fcdc34d3e9b70b2357ce57ee8 postfix-2.2.2-r1.ebuild 9957
 MD5 2372d5dbf4de3ed67393879f2338b052 postfix-2.2.1-r1.ebuild 9944
@@ -8,21 +5,16 @@ MD5 eb7d97dd738129a9917cf2f56860c134 postfix-2.2.2.ebuild 9941
 MD5 0e8eaf759b07b670badcd41403b7f658 ChangeLog 32928
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 MD5 2aa3c8bc49f3d08ab5f2ce9fc6a490a4 postfix-2.1.5-r2.ebuild 7517
+MD5 1ab05d6ece42b66b79c7e4db7294c589 postfix-2.2.2-r2.ebuild 9706
 MD5 98872da0bd186c6e0d2b884b0fa28b78 files/postfix.rc6 610
 MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
 MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
 MD5 c2fd2c8cd7f31c4c876db365a98b972e files/digest-postfix-2.1.5-r2 363
 MD5 ecc87f9acb3c2395d2d7fe1a673755aa files/digest-postfix-2.2.1-r1 135
 MD5 02b7565b5fbc0a13418b4588da048882 files/digest-postfix-2.2.2-r1 135
+MD5 02b7565b5fbc0a13418b4588da048882 files/digest-postfix-2.2.2-r2 135
 MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
 MD5 ecc87f9acb3c2395d2d7fe1a673755aa files/digest-postfix-2.2.1 135
 MD5 9419f5dcc490b61ca76278d744bd878f files/digest-postfix-2.2.2 135
-MD5 78c16ededccb206774194bfe05475a99 files/mailer.conf 1547
+MD5 32579de659a5b4535b775100b4cd18cf files/mailer.conf 414
 MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCb83WViELBEf1JB0RAvnaAJwKHR51ylIebxGEviqQzT5Rqw8vcACcCVG+
-ZQqhDj0Y7p0FXJ7lO6iHkXs=
-=2kJX
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.2-r2 b/mail-mta/postfix/files/digest-postfix-2.2.2-r2
new file mode 100644
index 000000000000..9fc1ad555441
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.2.2-r2
@@ -0,0 +1,2 @@
+MD5 1f5f54ec8a832af7faaa71607475b19b postfix-2.2.2.tar.gz 2408375
+MD5 816fb00f211de8f8d3703ecd4ccf40a5 postfix-2.2.2-vda.patch.gz 7752
diff --git a/mail-mta/postfix/files/mailer.conf b/mail-mta/postfix/files/mailer.conf
index a8f9dca4b20e..937cbfcfe263 100644
--- a/mail-mta/postfix/files/mailer.conf
+++ b/mail-mta/postfix/files/mailer.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/mailer.conf,v 1.3 2004/07/18 03:26:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/mailer.conf,v 1.4 2005/05/04 09:52:10 ferdy Exp $
 # $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
 
 # Execute the "real" sendmail program from postfix, 
@@ -8,45 +8,3 @@ 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 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
-#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/mail-mta/postfix/postfix-2.2.2-r2.ebuild b/mail-mta/postfix/postfix-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..61cb67dc1762
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.2.2-r2.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.2-r2.ebuild,v 1.1 2005/05/04 09:52:10 ferdy Exp $
+
+inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer
+IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened"
+#IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened devel"
+
+MY_PV=${PV}
+MY_SRC=${PN}-${MY_PV}
+#DEV_SRC=${MY_SRC}-newdb-nonprod
+VDA_P="${PN}-2.2.2-vda"
+
+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/${MY_SRC}.tar.gz
+	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
+#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
+
+LICENSE="IPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~s390 ~mips ~hppa ~ppc64"
+
+PROVIDE="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
+	selinux? ( sec-policy/selinux-postfix )"
+
+#if use devel; then
+#	MY_SRC=${DEV_SRC}
+#fi
+
+S=${WORKDIR}/${MY_SRC}
+
+group_user_check() {
+	einfo "checking for postfix group...	create if missing."
+	enewgroup postfix 207
+	einfo "checking for postdrop group...	create if missing."
+	enewgroup postdrop 208
+	einfo "checking for postfix user...		create if missing."
+	enewuser postfix 207 /bin/false /var/spool/postfix postfix
+}
+
+pkg_setup() {
+	# do not upgrade from postfix-2.1. logic to fix bug #53324
+	if [[ -f /var/lib/init.d/started/postfix ]] ; then
+		if has_version '<mail-mta/postfix-2.2' ; then
+			if [ "${FORCE_UPGRADE}" ]; then
+				echo
+				ewarn "You are upgrading from a incompatible version and"
+				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
+				ewarn "You MUST stop postfix BEFORE install it to your system."
+				echo
+			else
+				echo
+				eerror "You are upgrading from a incompatible version."
+				eerror "You MUST stop postfix BEFORE install it to your system."
+				eerror "If you want a minimal downtime, emerge postfix with:"
+				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
+				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
+				eerror "run etc-update or dispatch-conf and merge the configuration files."
+				eerror "Next /etc/init.d/postfix start"
+				die "upgrade from an incompatible version!"
+				echo
+			fi
+
+		else
+			echo
+			ewarn "It is safe to upgrade your current version while it's running."
+			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
+			ewarn "stop Postfix then emerge again."
+			ewarn "You have been warned!"
+			ewarn "Waiting 5 seconds before continuing."
+			echo
+			epause 5
+		fi
+	fi
+
+	echo
+	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
+	ewarn "for incompatible changes before continue."
+	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
+	ewarn "assign to \"net-mail@gentoo.org\"."
+	echo
+	#epause 5
+
+	# put out warnings to work around bug #45764
+	if has_version '<=mail-mta/postfix-2.0.18'; then
+		echo
+		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
+		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
+		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
+		echo
+	#epause 5
+	fi
+
+	#TLS non-prod warn
+	if use ssl; then
+		echo
+		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
+		ewarn "This service entry is incompatible with previous TLS patch."
+		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
+		echo
+	#epause 5
+	fi
+
+	# IPV6 non-prod warn
+	if use ipv6; then
+		echo
+		ewarn "you have \"ipv6\" in your USE flags, IPV6 will be enabled."
+		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
+		echo
+	fi
+
+	# VDA error
+	#if use vda; then
+	#	eerror "VDA patch is not available yet for this snapshot"
+	#	eerror "If you still want to update to this snapshot"
+	#	eerror "please remove \"vda\" from your USE flags."
+	#	die "VDA support is not available at this time!"
+	#fi
+
+	# add postfix, postdrop user/group. Bug #77565.
+	group_user_check || die "failed to check/add needed user/group"
+
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	#ht_fix_all
+
+	if use vda ; then
+		epatch "${WORKDIR}/${VDA_P}.patch" || die "failed to patch VDA"
+	fi
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch" || die "patch failed."
+
+	# 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"
+	# Fix hardcoded ALIAS_DB_MAP. Bug #75361.
+	sed -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
+		-i.orig src/util/sys_defs.h || die "sed failed"
+
+}
+
+src_compile() {
+	cd ${S}
+	# added -Wl,-z,now wrt 62674.
+	local mycc="-DHAS_PCRE" mylibs="-Wl,-z,now -L/usr/lib -lpcre -ldl -lcrypt -lpthread"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	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_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use sasl ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	fi
+
+	if ! use nis; then
+		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" src/util/sys_defs.h || \
+			die "sed failed"
+	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_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
+
+	ebegin "Starting make makefiles..."
+
+	local my_cc=$(tc-getCC)
+	einfo "CC=${my_cc:=gcc}"
+
+	# workaround for bug #76512
+	[ "$(gcc-version)" == "3.4" ] && use hardened && replace-flags -O? -Os
+
+	#ht_fix_file ${S}/Makefile.in || die "failed to fix head/tail"
+	#epause 60
+
+	make CC="${my_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" \
+		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"
+		rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
+		mailer_install_conf
+	else
+		# Provide another link for legacy FSH.
+		dosym /usr/sbin/sendmail /usr/lib/sendmail
+	fi
+
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
+	# Install qshape tool.
+	dobin auxiliary/qshape/qshape.pl
+
+	# 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
+
+	newinitd "${FILESDIR}/postfix.rc6" postfix || \
+		die "newinitd failed"
+
+	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
+	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() {
+
+	# add postfix, postdrop user/group. Bug #77565.
+	group_user_check || die "failed to check/add needed user/group"
+
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	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
+
+	mailer_pkg_postinst
+}