Version bump. Drop s390 - bug #399329

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 124 insertions, 25 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index fbc41a4b568f..eb6666c4f485 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.326 2012/01/16 12:08:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.327 2012/01/18 22:19:50 eras Exp $
+
+*postfix-2.9.0_rc1 (18 Jan 2012)
+
+  18 Jan 2012; Eray Aslan <eras@gentoo.org> -postfix-2.9_pre20120115.ebuild,
+  +postfix-2.9.0_rc1.ebuild, +files/postfix-2.9.0_rc1_no-berkdb.patch:
+  Version bump. Drop s390 - bug #399329
 
   15 Jan 2012; Raúl Porcel <armin76@gentoo.org> postfix-2.8.7.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #395289
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index bd9445af845b..422a9e50af17 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX postfix-2.9.0_rc1_no-berkdb.patch 2729 RMD160 2e80e5c446b58afe8cda35991ac3af5f3db3f7eb SHA1 8c6d8695bf347769f957a79f3320fcff8d844315 SHA256 c21e9582346c913b3033ec6d3567d0b0bd3576ad64052fed48a5cf78d7ad92fc
 AUX postfix.rc6.2.5 1424 RMD160 c0026032a5a807c19431b1381df48dab14469796 SHA1 3aae6fdb80488398442237b2a8a581e4da448e0d SHA256 f5ab48b469db3f62a5e5ccc15e5cfa6e0ace97d2c2bc66af334d105b0dfa7d31
 AUX postfix.rc6.2.6 1996 RMD160 a7936897d1b8249e3fc0da2426afcbbe25bbe0ce SHA1 34e7d5899649b932808551f4d08517b4c1dcceca SHA256 2beed4cf54d6634620bd44ce6337912a7dfaeada1fd03c04f37f777628a5c9bf
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
@@ -14,7 +15,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9-20120115.tar.gz 3760369 RMD160 cc5beafdb6f338e20f187217e8887f193c344c78 SHA1 6c308bdbfebbe664b8f9fbf0fe857b8a3d82866b SHA256 634742998f5e8d6402b1717afdfd6aa3bc908a7db93afc47a0f14aea644f644f
+DIST postfix-2.9.0-RC1.tar.gz 3765216 RMD160 6c43e76cca56e87f412b3f78d28bab95b4a1f3b0 SHA1 cc787e276a5a276a357f0ac8d9c8d33efb1c2c3a SHA256 b51ab128e07bc17a5258c9764369dc038014b52bc9ee1287a86367a45007230f
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
@@ -30,23 +31,23 @@ EBUILD postfix-2.8.4.ebuild 8438 RMD160 cdf05986adb042588e332017a430d1c9c10bc527
 EBUILD postfix-2.8.5.ebuild 8447 RMD160 d783620f452d45b164b81c3f32fea5488dd703d1 SHA1 55cb7e91a94f1765e13ee8e130f991cc31561fab SHA256 01dcded08cbdb7317ea6fb7d75005d6f49c3faa32209f746bc63710dff77d7cf
 EBUILD postfix-2.8.6.ebuild 8435 RMD160 d794ccd5fae24cbef65034aedb5f8919ca216483 SHA1 3a0e9b1920bc6fab81287057f1f15bf00a5376a2 SHA256 6c25ce81553164eb797f83b4b170e0b8dd4049ee984653b043e27605ca32ce3a
 EBUILD postfix-2.8.7.ebuild 8427 RMD160 c5760fb0e0c943aebaa86af2ddaf0cff819e6b2f SHA1 46987dcf88be669d43d1859c836ce88f327bd407 SHA256 b04ac78d4dc3743246c4c680ea8e4b10a1b32aac485d5719fd0eba86dabe04cb
-EBUILD postfix-2.9_pre20120115.ebuild 9846 RMD160 6db5f6da159bc08e65211a1ff1729f5ca311ba8a SHA1 8dfe3d2e55aefbba6df14868f1b16d39cff00ff1 SHA256 b50cb4e70eae54c90b64c5054272ab1c294773715b98e2be25f7eb4fdcf78ac2
-MISC ChangeLog 75590 RMD160 2814b5cc00cfb70af49a312695013da327e487ea SHA1 aff5096410308e48ef9ec4a90ae62a6bfadc6ae0 SHA256 96ba953033926a47b7341bae067f128bb8a02e1920a7417fbd56d5e0c97b0a9b
-MISC metadata.xml 501 RMD160 faf5708865464f36ec686bb58b2474e2a5a1fb53 SHA1 f5d83c47e3edc4a6c337d4bb905eb4917dc0d417 SHA256 7a46203782ad8363c75a53faa35a434e20f879a7f23f624388ce248ea8bb55a0
+EBUILD postfix-2.9.0_rc1.ebuild 10085 RMD160 7a87283e830c8aa2437ba252fa33ae144132cd56 SHA1 265ca5b6d47c667a5fc709fea389ba791e805e0b SHA256 a011acc233f085d16dcdb1f9ca3cc665a3f8ff0f9c0bb4d7d15bd0a4e283f02a
+MISC ChangeLog 75813 RMD160 d8e591bb4849590a80bbac49080a1a24b7568730 SHA1 d4824561a9d4dc10b3e7828be48b38000643ed1d SHA256 d4ab251a1d0f8da08d4497f8bcf0c91b1ffd51dfed3afd084114a29ac995daca
+MISC metadata.xml 610 RMD160 095d8cd529350f58c64d6d2eb40e8534d3dddfae SHA1 d53048933e7490f3f342ccf8972c191ee8030ccd SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPFBNoAAoJEHfx8XVYajsfm/AP/1Hpod/Kpjy7BbVDgTAaUhhZ
-+yB2khWKHdcKMR1+wy9adsbyQlO98TRtUKVyH2ohBCQzlCooC6rGSvSJr+JhXrgT
-28s0jBF8jd0b8HXtsuFUFUTdEkZBrWU8hzKZV5zdqX3iwdj7p8WNh3FLMYXO82tI
-fFf6VKVpKIGuGNn49AfBMdrQmB3v4OyXGNQnEan/D6SiCQrQYXoY5sjspkXSerXY
-bnszLYGB5wYshXXozb1g3qjMcZnL0qAX+kRQ1MB6q10eHiF7jaBRI5Ki/VPApeoY
-7wMyVNwY7lXq9sqNQxcEu3jtloOgu0wCADyvmOPvO/MEUVx9KKyncDwtq3E4KAwe
-hJhhMv16sAP7/+i1XlRWvpto6WGriIP33Z/1unyBWBidcj7cc7xDii4QHmx4KcYW
-bFjs9PKrsmImk9vgVg85RxPnPmdUG9RVLwb/mxziJJA3XLuLuhAwElWUMc2mrfyD
-pXzrP+M7zG+7RfgTDM2YAMX7s0pEg7twK12fd/HKpiy9/uoT8oGVJqivoXXOSlpP
-r8iAwwpWF47EZkKL3xdKYg9+dKY3vGN4GeDFQ49YeRMx9exc1NYyKtktxAlm5y1P
-O4+WClgCsx3TCIO3VPP2EWzNsiJJnqpRgS6EkvwSeSKEFoZwcSBHT6QXZh+oc2Mx
-uScK2DxT1x6aON6v7Ygg
-=e1DS
+iQIcBAEBCAAGBQJPF0WVAAoJEHfx8XVYajsf+ggP/jtstu2MDG1Xg63m+O2o1eUG
+XAhJHj4DKNYWxQamPmL3a8or0yvpHs+8sHIc7ROQXDT4rAdBDfTnxojj7gnr7AwG
+7fpBdaStOPEFuiiHDd+A7lBb2vd9URb80YYvxhTbejVtG+Vi/8VjJlbTcdTQCZQP
+Qk/PwE299ANH8A3cdn5b4IUcT8GCTeJa9M+bmrSqR1bqeV03dpXwxYkTFvxFqlM8
+or6bxAALU9SEpz47mnNb8dUbL8zTzULye/H5uaEIJAJUl07OjPQCzuK1cRpnr5AN
+aUoEFdIyHBHVgs0IFGBqfh5xZBPfd80aJpofIffq6ULUMjolWmInKtoeA3o+JgD9
+pgVGlDhdkScGkmbmLoPnwJb5GPn9sUk+sg7bjqX5GKCPrhYv66dO2C7EdB0XPLzg
+ONm9AM80bKUWkkTzrKqjLCW8njnvOhXAoML7edvp0BC8kHxNj0B5p9C6+bQbnQwO
+uoOYDZAdVsZQwwl57xCscwLb7KG+EwSESNL6leYstfi04llv1QcHoxjGG9FspJm5
+C8UHaaG0ZBIMzIMsF0fk1flhi+Rp3wOp49HGORJ2kcpUbuAPWvzupo14cgml/HA6
+NHnQhisa5w7JxQwQBMjIA94lKTiEl+TZgza8qZujJatUlsWlbVLLASgA6q5IMZ9j
+rbUO7uHVXzL3LG1b6DNW
+=ajCK
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch b/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch
new file mode 100644
index 000000000000..3f9eef7e5161
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch
@@ -0,0 +1,81 @@
+When building without berkeley db support, don't die when db.h is not found.
+
+--- a/makedefs
++++ b/makedefs
+@@ -273,18 +273,17 @@ case "$SYSTEM.$RELEASE" in
+ 		# Postfix no longer needs DB 1.85 compatibility
+ 		if [ -f /usr/include/db.h ]
+ 		then
+-		    : we are all set
++		    SYSLIBS="-ldb"
+ 		elif [ -f /usr/include/db/db.h ]
+ 		then
+ 		    CCARGS="$CCARGS -I/usr/include/db"
++		    SYSLIBS="-ldb"
+ 		else
+ 		    # No, we're not going to try db1 db2 db3 etc.
+ 		    # On a properly installed system, Postfix builds
+ 		    # by including <db.h> and by linking with -ldb
+ 		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
++		    echo "Building without Berkeley DB support." 1>&2
+ 		fi
+ 		# GDBM locks the DBM .pag file after open. This breaks postmap.
+ 		# if [ -f /usr/include/gdbm-ndbm.h ]
+@@ -296,7 +295,6 @@ case "$SYSTEM.$RELEASE" in
+ 		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
+ 		#     GDBM_LIBS=gdbm
+ 		# fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv $GDBM_LIBS
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+@@ -352,19 +350,17 @@ EOF
+     Linux.3*)	SYSTYPE=LINUX3
+ 		if [ -f /usr/include/db.h ]
+ 		then
+-		    : we are all set
++		    SYSLIBS="-ldb"
+ 		elif [ -f /usr/include/db/db.h ]
+ 		then
+ 		    CCARGS="$CCARGS -I/usr/include/db"
++		    SYSLIBS="-ldb"
+ 		else
+ 		    # On a properly installed system, Postfix builds
+ 		    # by including <db.h> and by linking with -ldb
+ 		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
++		    echo "Building without Berkeley DB support." 1>&2
+ 		fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+@@ -381,20 +377,18 @@ EOF
+ 		# Postfix no longer needs DB 1.85 compatibility
+ 		if [ -f /usr/include/db.h ]
+ 		then
+-		    : we are all set
++		    SYSLIBS="-ldb"
+ 		elif [ -f /usr/include/db/db.h ]
+ 		then
+ 		    CCARGS="$CCARGS -I/usr/include/db"
++		    SYSLIBS="-ldb"
+ 		else
+ 		    # No, we're not going to try db1 db2 db3 etc.
+ 		    # On a properly installed system, Postfix builds
+ 		    # by including <db.h> and by linking with -ldb
+ 		    echo "No <db.h> include file found." 1>&2
+-		    echo "Install the appropriate db*-devel package first." 1>&2
+-		    echo "See the RELEASE_NOTES file for more information." 1>&2
+-		    exit 1
++		    echo "Building without Berkeley DB support." 1>&2
+ 		fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 27c279ec075f..93688f4e0a2d 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -7,6 +7,8 @@
 			version 1 (server only) SASL implementation</flag>
 		<flag name='ldap-bind'>Adds support for binding to LDAP backend
 			using <pkg>dev-libs/cyrus-sasl</pkg></flag>
+		<flag name='memcached'>Adds support for using <pkg>net-misc/memcached</pkg>
+		    for lookup tables</flag>
 		<flag name='vda'>Adds support for virtual delivery agent quota
 			enforcing</flag>
 	</use>
diff --git a/mail-mta/postfix/postfix-2.9_pre20120115.ebuild b/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
index 89acc9b2bfca..1a1e17fabd28 100644
--- a/mail-mta/postfix/postfix-2.9_pre20120115.ebuild
+++ b/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20120115.ebuild,v 1.1 2012/01/16 12:08:58 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0_rc1.ebuild,v 1.1 2012/01/18 22:19:50 eras Exp $
 
 EAPI=4
 
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
 
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
 VDA_PV="2.8.5"
 VDA_P="${PN}-vda-v10-${VDA_PV}"
 RC_VER="2.6"
@@ -20,8 +20,8 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
@@ -38,6 +38,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 
 RDEPEND="${DEPEND}
 	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	selinux? ( sec-policy/selinux-postfix )
 	!mail-mta/courier
@@ -70,6 +71,10 @@ src_prepare() {
 		epatch "${DISTDIR}"/${VDA_P}.patch
 	fi
 
+	if ! use berkdb; then
+		epatch "${FILESDIR}/${P}_no-berkdb.patch"
+	fi
+
 	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
 
@@ -134,8 +139,7 @@ src_configure() {
 	fi
 
 	if ! use berkdb; then
-		sed -i -e "s|#define HAS_DB$|//#define HAS_DB|g" \
-			src/util/sys_defs.h || die
+		mycc="${mycc} -DNO_DB"
 		if use cdb; then
 			# change default hash format from Berkeley DB to cdb
 			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
@@ -311,5 +315,10 @@ pkg_postinst() {
 		elog "startup scripts in ${ROOT}etc/init.d, please consider"
 		elog "upgrading your config for postmulti support. For more info:"
 		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
+		if ! use berkdb; then
+			ewarn "\nPostfix is installed without BerkeleyDB support."
+			ewarn "Please turn on berkdb USE flag if hash or btree table"
+			ewarn "lookup support is needed.\n"
+		fi
 	fi
 }