Bug #292598: Update the vda patch for quota bug.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

3 files changed, 367 insertions, 12 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 102b20c370a1..ded0eb6f0aaf 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.202 2010/02/05 22:15:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.203 2010/02/25 22:18:02 robbat2 Exp $
+
+*postfix-2.6.5-r1 (25 Feb 2010)
+
+  25 Feb 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +postfix-2.6.5-r1.ebuild:
+  Bug #292598: Update the vda patch for quota bug.
 
   05 Feb 2010; Ulrich Mueller <ulm@gentoo.org> postfix-2.5.5.ebuild,
   postfix-2.5.7.ebuild, postfix-2.5.9.ebuild, postfix-2.6.5.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 6c23224d1d03..9ebdc96653b7 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix.rc6.2.5 1415 RMD160 9d9b7240b1bfb7bcf53d6914dfc5aea2b150572e SHA1 ba08faaa70311605d2b869519ce876c71ce47a5d SHA256 11f79d4a84acfe0c34ebba11b6d1afde9c6dffcf44e8aba8dc895d4fcd0adcac
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
@@ -11,17 +8,12 @@ DIST postfix-2.5.5.tar.gz 3157877 RMD160 2118fa61710bdb266d4fb8b7a0f60cf0f633c80
 DIST postfix-2.5.7.tar.gz 3159263 RMD160 5fa24140e4888fa32f4e01d4021ae37a60b523dd SHA1 1a7620b703a24cd7eef56daddff605cace184a60 SHA256 b758684dadbf01fcfe964400151788cf54cb1f4b90d2e8ede87f81f9fbc635c4
 DIST postfix-2.5.9.tar.gz 3160370 RMD160 1eac2a7512c605e666f38ad3c4ae4f868d5ef0dd SHA1 19a7a6712d59b79b818b839faf6aa4b72a5cd9e4 SHA256 afabcd385d0505a772b7ea72d1087e83b84ebcb554c08f130771c0e761a84f99
 DIST postfix-2.6.2-vda-ng.patch.gz 12661 RMD160 e5e1ad8447cc4d8476e8826b4784069ff0b6e6fe SHA1 3274de41ffc64c1b20028793b4b37383f1847b99 SHA256 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
+DIST postfix-2.6.5-vda-ng.patch.gz 12435 RMD160 c7ac9fbc5c4c5e36dfce17f87fd3c5cae45d75ea SHA1 350ade3fa1baa6033a956e033a5541267f42a618 SHA256 e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797
 DIST postfix-2.6.5.tar.gz 3325444 RMD160 f9b308457b9d3dcc05eb30c47b8267450a552a23 SHA1 98b04c719869b4bd61bec8749e2d57a219eb69a7 SHA256 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102
 EBUILD postfix-2.5.5.ebuild 11995 RMD160 bd4b6b3d5b22803ed127755ae78516689748e16e SHA1 fdeb2d0a8444af67c18911d175f8381aead92a64 SHA256 7cd418fb1d2474846148deff9b88900ecdb6573442a39fdc73bb43b36d6380a6
 EBUILD postfix-2.5.7.ebuild 11995 RMD160 227e022c165e0083c2bff6977c200303b6020587 SHA1 9c8d66bab451c1f3f5af64b498be2fc5b7269042 SHA256 5997eb87cf37f4e6bf398316eb37fdf036e63ba578eb516511dbaffaefc82cbf
 EBUILD postfix-2.5.9.ebuild 12006 RMD160 25f0930506fd9b311aa611c0e8a2a8c8ea692135 SHA1 d4774dcf21d7a1f2e111bf9fb917a05126aadf03 SHA256 7e3194eb351af86ebe34d6cf758425258e87baa9536b4eb30b0c970e431a34f2
+EBUILD postfix-2.6.5-r1.ebuild 11142 RMD160 0f9adbc3f4b803e558af83af493f7afa6b20cbc1 SHA1 90e25d3208bd51ac1155705eacaaf49f8f72b0da SHA256 80066ed986a5d1ccee722d37465d7405ca222707e3c966e9e7cec7008d2c33e5
 EBUILD postfix-2.6.5.ebuild 11124 RMD160 86e2d5f69e85e3791a713718cae326af2384fd7b SHA1 930029f2a1746effea73ec5350ca722ba341b72c SHA256 544a81857b8ba688765c5f97575dcf0e27d33772b8c3fdcb67368f4bbfb4a5bd
-MISC ChangeLog 56330 RMD160 c17ad3ce2dc04bc72b972337d781979d2b68ae75 SHA1 6d303731ef149f2aac5fc7bf7c06c100f9bb6839 SHA256 5bf2c944b9bf586c7567854ccd2a2c166511dfc2767cde03ed6277f5b8b543ea
+MISC ChangeLog 56500 RMD160 e14776b6d9b387ee8438ae85923c92d02060dd79 SHA1 1cb26650a626e13e947463e536623e70637435d0 SHA256 1ca204bb5b1efb14c5c94ec3fcd0e94bda185a061b545fa17d5b5fbdd78fb3cb
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktsmH4ACgkQOeoy/oIi7uwWkQCeKKNnIAdsj1FwFss5EyKbdZZL
-UC0An2yhyNsBdrWte+zL0hINoYCfku2K
-=zIcM
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.6.5-r1.ebuild b/mail-mta/postfix/postfix-2.6.5-r1.ebuild
new file mode 100644
index 000000000000..a89d452e1e70
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.6.5-r1.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.5-r1.ebuild,v 1.1 2010/02/25 22:18:02 robbat2 Exp $
+
+# NOTE: this ebuild is a regular ebuild without mailer-config support!
+# Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
+# to turn this ebuild to a mailer-config enabled ebuild.
+
+# regular ebuild
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+# mailer-config support
+#inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# regular ebuild
+IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
+# mailer-config support
+#IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.6.5"
+VDA_P="${PN}-${VDA_PV}-vda-ng"
+RC_VER="2.5"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch.gz ) "
+
+LICENSE="IBM"
+SLOT="0"
+
+# regular ebuild
+PROVIDE="virtual/mta virtual/mda"
+# mailer-config support
+#PROVIDE="${PROVIDE} virtual/mda"
+
+DEPEND=">=sys-libs/db-3.2
+		>=dev-libs/libpcre-3.4
+		cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
+		ldap? ( >=net-nds/openldap-1.2 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( virtual/postgresql-base )
+		sasl? (  >=dev-libs/cyrus-sasl-2 )
+		ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+# regular ebuild
+RDEPEND="${DEPEND}
+		>=net-mail/mailbase-0.00
+		!virtual/mta
+		!net-mail/mailwrapper
+		selinux? ( sec-policy/selinux-postfix )"
+
+# mailer-config support
+#RDEPEND="${DEPEND}
+#		>=net-mail/mailbase-0.00
+#		selinux? ( sec-policy/selinux-postfix )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+group_user_check() {
+	einfo "Checking for postfix group ..."
+	enewgroup postfix 207
+	einfo "Checking for postdrop group ..."
+	enewgroup postdrop 208
+	einfo "Checking for postfix user ..."
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+pkg_setup() {
+	# Do not upgrade live from Postfix <2.5
+	if [[ -f /var/lib/init.d/started/postfix ]] ; then
+		if has_version '<mail-mta/postfix-2.5.0' ; then
+			if [[ "${FORCE_UPGRADE}" ]] ; then
+				echo
+				ewarn "You are upgrading from an incompatible version and you have"
+				ewarn "FORCE_UPGRADE set, will build this package while Postfix is running."
+				ewarn "You MUST stop Postfix BEFORE installing this version to your system."
+				echo
+			else
+				echo
+				eerror "You are upgrading from an incompatible version."
+				eerror "You MUST stop Postfix BEFORE installing this version to your system."
+				eerror "If you want minimal downtime, emerge postfix with:"
+				eerror "    FORCE_UPGRADE=1 emerge --buildpkgonly postfix"
+				eerror "    /etc/init.d/postfix stop"
+				eerror "    emerge --usepkgonly postfix"
+				eerror "Then run etc-update or dispatch-conf and merge the configuration files."
+				eerror "Then restart Postfix with: /etc/init.d/postfix start"
+				die "Upgrade from an incompatible version!"
+				echo
+			fi
+		else
+			echo
+			ewarn "It's 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 continueing."
+	ewarn "Bugs should be filed at \"http://bugs.gentoo.org/\" and"
+	ewarn "assigned to \"net-mail@gentoo.org\"."
+	echo
+
+	# 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, some of the empty queue"
+		ewarn "directories get deleted while unmerging the older version (see bug #45764)."
+		ewarn "Please run '/etc/postfix/post-install upgrade-source' to recreate them."
+		echo
+	fi
+
+	# TLS non-prod warning
+	if use ssl ; then
+		echo
+		ewarn "You have \"ssl\" in your USE flags, TLS will be enabled."
+		ewarn "This service is incompatible with the previous TLS patch."
+		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
+		echo
+	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
+
+	# SASL non-prod warning
+	if use sasl ; then
+		echo
+		elog "Postfix 2.3 and newer supports two SASL implementations."
+		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
+		elog "Visit http://www.postfix.org/SASL_README.html for more info."
+		echo
+	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}"
+	if use vda ; then
+		epatch "${WORKDIR}/${VDA_P}.patch"
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_compile() {
+	# 1) Added -Wl,-z,now wrt bug #62674
+	# 2) Remove -ldl as it is not necessary, solves bug #106446
+	# 3) -Wl,-z,now replaced by $(bindnow-flags)
+	# 4) Then bindnow-flags has been simply dropped according to
+	# http://www.mail-archive.com/gentoo-dev@lists.gentoo.org/msg23679.html
+	# 5) Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -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 $(mysql_config --include)"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+
+	if use postgres ; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+	fi
+
+	if use ssl ; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use sasl ; then
+		if use dovecot-sasl ; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	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
+
+	if use cdb ; then
+		mycc="${mycc} -DHAS_CDB"
+		CDB_LIBS=""
+
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			CDB_LIBS="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+			done
+		fi
+
+		mylibs="${mylibs} ${CDB_LIBS}"
+	fi
+
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/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\\\""
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	local my_cc=$(tc-getCC)
+	einfo "CC=${my_cc:=gcc}"
+
+	# Workaround for bug #76512
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	make DEBUG="" 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}" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
+	fperms 0750 /var/lib/postfix
+	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 "${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 ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed"
+
+	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	pamd_mimic_system smtp auth account
+
+	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"
+
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \
+		daemon_directory=${ROOT}/usr/$(get_libdir)/postfix
+	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 [[ -e /etc/mailer.conf ]] ; then
+		einfo
+		einfo "mailwrapper support is discontinued."
+		einfo "You may want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}