Version bump. Add ldapdb USE flag - bug #320893

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

13 files changed, 537 insertions, 22 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index d6bbefaa840d..409c4745f184 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.232 2011/11/06 20:44:41 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.233 2011/11/30 15:49:28 eras Exp $
+
+*cyrus-sasl-2.1.25 (30 Nov 2011)
+
+  30 Nov 2011; Eray Aslan <eras@gentoo.org> +cyrus-sasl-2.1.25.ebuild,
+  +files/cyrus-sasl-2.1.25-as_needed.patch,
+  +files/cyrus-sasl-2.1.25-autotools_fixes.patch,
+  +files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch,
+  +files/cyrus-sasl-2.1.25-fix_heimdal.patch,
+  +files/cyrus-sasl-2.1.25-gssapi.patch,
+  +files/cyrus-sasl-2.1.25-lib_before_plugin.patch,
+  +files/cyrus-sasl-2.1.25-missing_header.patch,
+  +files/cyrus-sasl-2.1.25-saslauthd_libtool.patch,
+  +files/cyrus-sasl-2.1.25-sasldb_al.patch:
+  Version bump. Add ldapdb USE flag - bug #320893
 
 *cyrus-sasl-2.1.23-r6 (06 Nov 2011)
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 94e89000204e..ca6db0285a5f 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -23,6 +23,15 @@ AUX cyrus-sasl-2.1.23+db-5.0.patch 1009 RMD160 35ecdbbc216f24982436fd0ff7d5c0701
 AUX cyrus-sasl-2.1.23-authd-fix.patch 829 RMD160 93161e6f36a3718bf92186a2d16967fa79ed4ad3 SHA1 7355bfc5ee53c69385ddd8da9710a17d4257bba3 SHA256 8732176e4a493b6b1548dc4799bf6866b9c324f5ecaafc9d9beffe0ac423d43d
 AUX cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch 782 RMD160 930990ff787097cbf9622b6fe6adc4c336fec3b1 SHA1 9077cad924c696e267563576326186725c13cc20 SHA256 672fce3a1b0a45f7e91e8ed8aaad953b70118f74cf10bfb966aa65d052017b0f
 AUX cyrus-sasl-2.1.23-rimap-loop.patch 783 RMD160 782c5ce77301810082c691c92a93e801a4aeb9ea SHA1 8d59617754aa100ff1e1af4c15429c75e60f63ac SHA256 1d07d64b79960f026bbf271222a985bbe39ad465dab157f0cd5fbffde5622a5d
+AUX cyrus-sasl-2.1.25-as_needed.patch 1083 RMD160 4f34faa35edc56ec7fa1a633910783771f94d6c9 SHA1 53d74861066548994c226c2bab18b5eb458bed7b SHA256 5143036f20fdc1ff0b44b73b6d245392edc2f786d74730fc0f8f75d7b40ea5c6
+AUX cyrus-sasl-2.1.25-autotools_fixes.patch 3926 RMD160 acfabca571aa6b1e11a43aa5c554e7871a2d69cc SHA1 f38fd73e69f0a4814ef284dbdca879ea5c1d468e SHA256 390aef512c359ae3eee9d1c781ab9586b71b98e4b8961594de0872b09acfbea2
+AUX cyrus-sasl-2.1.25-avoid_pic_overwrite.patch 1076 RMD160 92c643a3525a6a700a7e4292e2291414d2b080cc SHA1 40189113b15a04ace16805b413b73d0a097556ea SHA256 80cb9cf22b0507b503ff0cf6c5946a44eb5c3808e0a77e66d56d5a53e5e76fa7
+AUX cyrus-sasl-2.1.25-fix_heimdal.patch 601 RMD160 fc1f23e054b3b77124b7b52734dee828e9e663d7 SHA1 11c1553122ec6c146d0712ccd4c93b450c56fb4e SHA256 6285b2a9c0b9ab2590a4225ac1eb8d01678e6b0559141c274d4451def65b5283
+AUX cyrus-sasl-2.1.25-gssapi.patch 747 RMD160 7d3b222f8af73b121031a5a1d9faf8cc2e365e4d SHA1 a44cb88119447a5a4a3fc636dddffe1ac6c7b842 SHA256 0fc1bab93c3f5e2ead98f1ba480be776640f2e74b1908d8f8fa1936908e8dbec
+AUX cyrus-sasl-2.1.25-lib_before_plugin.patch 776 RMD160 82b3beff62b0d0906373317871cd8d35001eaa2b SHA1 5bb0c541e2a985cf58eab6105b456ca05ba21532 SHA256 278418f8942450bbbfb86672cc88e5d745736d59e601b1435273719069790640
+AUX cyrus-sasl-2.1.25-missing_header.patch 292 RMD160 56af3d258d88c57d32633b631dfbf8263844f700 SHA1 87140ffd2df25bcaf44709be40bcccfc1abcd143 SHA256 a83296e782a6137b0f687491314af7a82a37296729af42ca11d1f3667f7320b3
+AUX cyrus-sasl-2.1.25-saslauthd_libtool.patch 280 RMD160 c6a7904ff86453f621fb8c08f46a7e173551fb11 SHA1 9ea91b135d50ab752bf857576dab263dc9115f1d SHA256 76ba2532083630a05ed0e3a5f2976eef6ec62e0fc1782bfee6147aee749e2ce8
+AUX cyrus-sasl-2.1.25-sasldb_al.patch 555 RMD160 7ca64bbc0998f81661b5eedd2e319c9086f6e1d1 SHA1 b91ef007fa622870e13291409da55ff6ef0187b0 SHA256 3885246eda016e7a6d273305b2a011770465e8324d1774ef0d021e3def3008d5
 AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1 8ddb577ffe968d4ff3cda27402ce21988c55519a SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe
 AUX pwcheck.rc6 518 RMD160 fdb7e3310803e82232932b2d69d9c1d50844a360 SHA1 90e2051951a1f7375ddd241c7912a99436462e25 SHA256 3e4999ec0671b21845b12229b48b21a24d7ee73fe27d6b1432f2f26482a0371d
 AUX saslauthd-2.1.21.conf 926 RMD160 fab448738564cb27562a08363a9de84b1141bcc0 SHA1 3220aa01bc5aa3ed4163f3120790f581682fe2e3 SHA256 31e1676f845540dafa9c09799b110234a6362bcd056feaa1ae096e277c9d216e
@@ -30,28 +39,30 @@ AUX saslauthd.pam-include 160 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 SH
 AUX saslauthd2.rc6 525 RMD160 b21261a0c3670d66314269775ec8ff06e9437d88 SHA1 1dfb2736a8a12181a1948870b1063577f6863b2d SHA256 329fb67382e307ab6d37aa789667b04a91ba3f69e9c1023b0902adafed065ee9
 DIST cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz 7462 RMD160 5931936a5271241a85fe6c7bc0ae3ebba9bd4534 SHA1 0e4e843823301ac16dec18d089010b7b33d548af SHA256 9514a7436b11184cfd7e8a9ccd3590ce9f89cf2dc272ffbbdeeab16f9ae4fe6f
 DIST cyrus-sasl-2.1.23.tar.gz 1613642 RMD160 b2cd9734fa8b4bad82663517f019f9b92d9d3519 SHA1 5df33a6788d6cd8329b109eff777c6cfae1a21bd SHA256 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136
+DIST cyrus-sasl-2.1.25.tar.gz 5209240 RMD160 c9ed9093828f7f7bb1b35c8a690cadbcd44f3862 SHA1 b6c34426012d9b5d448d5646cbecd818a5eeacbf SHA256 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
 EBUILD cyrus-sasl-2.1.23-r1.ebuild 8445 RMD160 89e638bf97ae113379337bb644a9ab25cc73b4d2 SHA1 6f440793866cb4b43d4b7fe88872c25b0067b903 SHA256 f8a62a1d6f9e9be722ab7fd16c133f99af34f704262b4af9093bc88b742505e0
 EBUILD cyrus-sasl-2.1.23-r2.ebuild 8574 RMD160 9b2b68789188a4c4f4d22537344398bde49cb773 SHA1 100ef05f3dec9d38b23d47c5478b7d9a24b3c670 SHA256 9bf44a2793be2eec0103f7afc18c918f04d3d207dbc9d1c64da3984a1f078754
 EBUILD cyrus-sasl-2.1.23-r3.ebuild 8797 RMD160 cebad70f960d8af747f97edfa9691320a06afe9f SHA1 cb7100675e052769aef126cd090cbf8b523c06e7 SHA256 0298bd8d3f046c6b5a9dedf17fd1b067b2a45970d04a50c1301dfbd53d173a48
 EBUILD cyrus-sasl-2.1.23-r4.ebuild 8807 RMD160 4f98323bb919e9e430b234126c802d08ccb25985 SHA1 b7a2be292909f542f67ba14a093954aac0e574f5 SHA256 c6203849a72e8ce8ac47bce99b30deca77b12b27a9290ad5cab67b27dd8ddc6b
 EBUILD cyrus-sasl-2.1.23-r5.ebuild 8882 RMD160 af8382e41ac63a672840122a275aa4cb7b658f05 SHA1 2205fded4b4d8a2fa8c94247911729b9a10ab3cd SHA256 ad9d3754b7edd0d6cd43f964f0d79494680b4061dbf3b15d5bb311ad099f4ccb
 EBUILD cyrus-sasl-2.1.23-r6.ebuild 8949 RMD160 a5282cea890c0e6aac0d3a8ec838339e630634b6 SHA1 389810839adb2be0c4fea6ed17566d3c75e6a59b SHA256 0eb0216feeec73a76452fa4275cf0e7da4a64e6ab776c95d5a524de551ffae52
-MISC ChangeLog 38940 RMD160 4e38759803f2ba44dd20a6b4e4372926e5a88759 SHA1 efe0ce2439edb5d40961d15f367ef0f328533ce9 SHA256 a23230c778c4f67aeb714088ba9025ca0d6236226083ae59f8b02a4d5b209831
-MISC metadata.xml 707 RMD160 d1c8a74ccb59cba03b368c20a2ba552433b6bcc9 SHA1 b4aab11da0b0134b8ff09c5a7ce62118a3aeeac1 SHA256 730550801b9f8672610c1764da2fb1ed1e3e61c8d8535e735afbcccc93637272
+EBUILD cyrus-sasl-2.1.25.ebuild 6369 RMD160 6315758872d639a14320ebc93f7729e55306d672 SHA1 d506798f9c5fb8373f064e3cc92a0933603fad9c SHA256 b37bc81a814df806f90a22050f1cb7c09f377b63e4aed87a483543859c03d4a2
+MISC ChangeLog 39528 RMD160 e72d1b3dbe2fec2deb1b034b099afe832f2af4da SHA1 4b82da8dc1e592fdde8e4baa2b6858da7442b789 SHA256 621ec1960da836a752daabd30fa3b0fbd691d3f5c6693301b7e62799da5c3160
+MISC metadata.xml 727 RMD160 c94e4a8f524c7d59bf22d538ee9f795ce41e33b6 SHA1 197a872854c2e307c7e19f9fa2f22492a7781b22 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOtvG/AAoJEHfx8XVYajsfEpIP/jHzb0UsboXwkLTYM5/w4ERo
-JMnNG7CrQ8neSQ/Z2T7kNxq0fZ5tw3v3Pso+Ig2NYJBKFSYHjUpD9jGyk4/T5bjP
-8lPwPfaE2mpZXoa3nrvqpFl3DUmpfuL3uFj49uDN3leVM8DvpuDAqN6ffui6crWk
-x/r5g6MdFzTuWrcke4do6lxF17NV27FNAUWhVmeV7ZCglaKbBrbZO2xy+xB4GFZy
-pB3JilzZSr5SJte9WecqRJ0VBu0pyJ3ip0xbfguzWseiifimK2dGGd9vQEzIM1ya
-khnmhywcBO20FBEPFFv6c+VAQRWbvwTvZ1IHr5f+DbtPqdB0ycFIWYrTYkgAfUbK
-KixosrqC4cMl0uNbA2f+yGa8+5ZoFpqu4q6R6g/oQqJl2WHxyzZT9poULvsNbjVt
-LEsPsDmOGFK7lSNVc8VLPRgcxj3eNIdYLfhQzBsU7mqOHcU59sigPXD4uuYq3LzO
-dvQViz8lMximr81gpHf0gNTGzMy2YzdM4M+JjThDAR6+f1fwUD7oFMh/6gi2S7/3
-vT6hvU4iYK5mBmzKlQtRVetzXr25dkjKltLDg+wzlFufGYUIjiqZDiaD7LyFS8n8
-gA+jgAXCySqalltOdsZYZMI/JPJknsrV87fRuxZXnvdfYX3zh6jsw59nlnsjbRqK
-YtBApF63JBfFKAGjhA4T
-=MPS9
+iQIcBAEBCAAGBQJO1lCOAAoJEHfx8XVYajsfRn8P/0XMMKfpCu+PabNZLu85fD3C
+l6/daUwTL/3eQL27H7CZVhnvAX7QGFFXqmb4YdFD4xy1D5OS1MIZsmmZh0kX2lEs
+ymZWl08VfZCjaU7gOCWTflyx0jqVLDjTT6+6vSkHVVMmg84NkPT+t2Pi3/vaxJbn
+WJqkkXt/IOkmu8KZ2LVkgyynSRYNEeK8298FOcOKi0XGFjtsipLpHdwVuwOrQjte
+1JK0yot+X58RNmpyU/SsWVFS8c/M/4sHMmlhtnvExrO0/EKNlm7tdvl85ZHihiJ/
+USECU3Jx+N1+FzoChTh/y8X20KStnL0dUmW8oB1ZCgxV3n6XIxuq9ILol8O1GImU
+llO7EMI23BPPL+Ldp/Hj+8AAgUWGqUF8NGKd4QK3r11e5QN3BW5TEj/wD15yAerX
+xpgI9s8elojJQBlm8/+ZeJJ5oyXRIL7ACOSGh4qtAH+TDWRnsH/TU3EDi9vqL2Iv
+hSFyH5gqw+sRFATkgzatCQB66GG3p7fSaDY5iR6xXAbG4aduzpRi2b7D8p7f5oUX
+D0zEXCzylXa9PokHYcfFD53k5Iv6J5tycpF9Xs123bxhaPZVA5LP6vF+n/xp1pjv
+q7+pvRGLnSGzIaG9F/PoNwqY0TdZjsJYgEWKQxPLsfBctylN69DaWwEdec9mc1di
+4JBZPxL5dllfpFI7QTST
+=oYij
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
new file mode 100644
index 000000000000..54ea4a73af04
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild,v 1.1 2011/11/30 15:49:28 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
+
+SASLAUTHD_CONF_VER="2.1.21"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
+HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-3.2 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	kerberos? ( virtual/krb5 )
+	openldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sasldb_al.patch
+	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
+	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
+	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
+	epatch "${FILESDIR}"/${P}-as_needed.patch
+	epatch "${FILESDIR}"/${P}-missing_header.patch
+	epatch "${FILESDIR}"/${P}-gssapi.patch
+	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
+	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
+#	epatch "${FILESDIR}"/${P}-fix_dovecot_authentication.patch
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+	# Java support.
+	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myconf
+
+	# Add authdaemond support (bug #56523).
+	if use authdaemond ; then
+		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+	fi
+
+	# Fix for bug #59634.
+	if ! use ssl ; then
+		myconf="${myconf} --without-des"
+	fi
+
+	if use mysql || use postgres ; then
+		myconf="${myconf} --enable-sql"
+	else
+		myconf="${myconf} --disable-sql"
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
+	else
+		einfo "Building without SASLdb support"
+		myconf="${myconf} --with-dblib=none"
+	fi
+
+	# Use /dev/urandom instead of /dev/random (bug #46038).
+	if use urandom ; then
+		myconf="${myconf} --with-devrandom=/dev/urandom"
+	fi
+
+	econf \
+		--enable-login \
+		--enable-ntlm \
+		--enable-auth-sasldb \
+		--disable-cmulocal \
+		--disable-krb4 \
+		--enable-otp \
+		--without-sqlite \
+		--with-saslauthd=/var/lib/sasl2 \
+		--with-pwcheck=/var/lib/sasl2 \
+		--with-configdir=/etc/sasl2 \
+		--with-plugindir=/usr/$(get_libdir)/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		$(use_with ssl openssl) \
+		$(use_with pam) \
+		$(use_with openldap ldap) \
+		$(use_enable ldapdb) \
+		$(use_enable sample) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable java) \
+		$(use_with java javahome ${JAVA_HOME}) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+		$(use_enable srp) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	cd "${S}"
+	if use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+
+	# Add testsaslauthd (bug #58768).
+	cd "${S}/saslauthd"
+	emake testsaslauthd
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/sasl2 /etc/sasl2
+
+	if use sample ; then
+		docinto sample
+		dodoc sample/*.c
+		exeinto /usr/share/doc/${P}/sample
+		doexe sample/client sample/server
+	fi
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	if use java ; then
+		java-pkg_dojar ${PN}.jar
+		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+		# hackish, don't wanna dig through makefile
+		rm -Rf "${D}/usr/$(get_libdir)/java"
+		docinto "java"
+		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+		dodir "/usr/share/doc/${PF}/java/Test"
+		insinto "/usr/share/doc/${PF}/java/Test"
+		doins "${S}"/java/Test/*.java
+	fi
+
+	docinto ""
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*.html
+
+	docinto "saslauthd"
+	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+
+	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+
+	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
+
+	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
new file mode 100644
index 000000000000..67b48b4a4993
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
@@ -0,0 +1,27 @@
+Author: Matthias Klose <doko@ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- a/saslauthd/Makefile.am
++++ b/saslauthd/Makefile.am
+@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
+ saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
+ saslauthd_LDADD	= @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+-		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
++		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- a/sasldb/Makefile.am
++++ b/sasldb/Makefile.am
+@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
+ 
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ 
+ # Prevent make dist stupidity
+ libsasldb_a_SOURCES =
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
new file mode 100644
index 000000000000..5837921d4f7f
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
@@ -0,0 +1,114 @@
+--- a/configure.in
++++ b/configure.in
+@@ -44,6 +44,8 @@ dnl
+ AC_INIT(lib/saslint.h)
+ AC_PREREQ([2.54])
+ 
++AC_CONFIG_MACRO_DIR([cmulocal] [config])
++
+ dnl use ./config.cache as the default cache file.
+ dnl we require a cache file to successfully configure our build.
+ if test $cache_file = "/dev/null"; then
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,6 +43,8 @@ AUTOMAKE_OPTIONS = 1.7
+ #
+ ################################################################
+ 
++ACLOCAL_AMFLAGS = -I cmulocal -I config
++
+ if SASLAUTHD
+ SAD = saslauthd
+ else
+--- a/saslauthd/configure.in
++++ b/saslauthd/configure.in
+@@ -1,7 +1,8 @@
+ AC_INIT(mechanisms.h)
+ AC_PREREQ([2.54])
+ 
+-AC_CONFIG_AUX_DIR(config)
++AC_CONFIG_MACRO_DIR([../cmulocal] [../config])
++AC_CONFIG_AUX_DIR([config])
+ AC_CANONICAL_HOST
+ 
+ dnl Should we enable SASLAUTHd at all?
+@@ -164,30 +165,30 @@ AC_SUBST(LTLIBOBJS)
+ 
+ dnl Checks for which function macros exist
+ AC_MSG_CHECKING(whether $CC implements __func__)
+-AC_CACHE_VAL(have_func,
++AC_CACHE_VAL(_cv_have_func,
+ [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __func__);],
+-have_func=yes,
+-have_func=no)])
+-AC_MSG_RESULT($have_func)
+-if test "$have_func" = yes; then
++_cv_have_func=yes,
++_cv_have_func=no)])
++AC_MSG_RESULT($_cv_have_func)
++if test "$_cv_have_func" = yes; then
+        AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__])
+ else
+        AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__)
+-       AC_CACHE_VAL(have_pretty_function,
++       AC_CACHE_VAL(_cv_have_pretty_function,
+        [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __PRETTY_FUNCTION__);],
+-       have_pretty_function=yes,
+-       have_pretty_function=no)])
+-       AC_MSG_RESULT($have_pretty_function)
+-       if test "$have_pretty_function" = yes; then
++       _cv_have_pretty_function=yes,
++       _cv_have_pretty_function=no)])
++       AC_MSG_RESULT($_cv_have_pretty_function)
++       if test "$_cv_have_pretty_function" = yes; then
+                AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__])
+        else
+                AC_MSG_CHECKING(whether $CC implements __FUNCTION__)
+-               AC_CACHE_VAL(have_function,
++               AC_CACHE_VAL(_cv_have_function,
+                [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __FUNCTION__);],
+-               have_function=yes,
+-               have_function=no)])
+-               AC_MSG_RESULT($have_function)
+-               if test "$have_function" = yes; then
++               _cv_have_function=yes,
++               _cv_have_function=no)])
++               AC_MSG_RESULT($_cv_have_function)
++               if test "$_cv_have_function" = yes; then
+                        AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__])
+                fi
+        fi
+--- a/saslauthd/Makefile.am
++++ b/saslauthd/Makefile.am
+@@ -1,4 +1,6 @@
+ AUTOMAKE_OPTIONS = 1.7
++ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config
++
+ sbin_PROGRAMS	= saslauthd testsaslauthd
+ EXTRA_PROGRAMS  = saslcache
+ 
+--- a/config/kerberos_v4.m4
++++ b/config/kerberos_v4.m4
+@@ -89,18 +89,18 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [
+     dnl if we were ambitious, we would look more aggressively for the
+     dnl krb4 install
+     if test -d ${krb4}; then
+-       AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
++       AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [
+          for krbhloc in include/kerberosIV include/kerberos include
+          do
+            if test -f ${krb4}/${krbhloc}/krb.h ; then
+-             cyrus_krbinclude=${krb4}/${krbhloc}
++             cyrus_cv_krbinclude=${krb4}/${krbhloc}
+              break
+            fi
+          done
+          ])
+ 
+-       if test -n "${cyrus_krbinclude}"; then
+-         CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
++       if test -n "${cyrus_cv_krbinclude}"; then
++         CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
+        fi
+        LDFLAGS="$LDFLAGS -L$krb4/lib"
+     fi
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
new file mode 100644
index 000000000000..2e5b1750d00d
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
@@ -0,0 +1,27 @@
+Author: Fabian Fagerholm <fabbe@debian.org>
+Description: This patch makes sure the non-PIC version of libsasldb.a, which
+is created out of non-PIC objects, is not going to overwrite the PIC version,
+which is created out of PIC objects. The PIC version is placed in .libs, and
+the non-PIC version in the current directory.  This ensures that both non-PIC
+and PIC versions are available in the correct locations.
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -78,7 +78,7 @@ endif
+ 
+ libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
+ 	@echo adding static plugins and dependencies
+-	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
++	$(AR) cru $@ $(SASL_STATIC_OBJS)
+ 	@for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+ 	if test ! -f $$i; then continue; fi; . $$i; \
+ 	for j in $$dependency_libs foo; do \
+--- a/sasldb/Makefile.am
++++ b/sasldb/Makefile.am
+@@ -63,6 +63,6 @@ libsasldb_a_SOURCES =
+ EXTRA_libsasldb_a_SOURCES =
+ 
+ libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+-	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
++	$(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
+ 
+ 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
new file mode 100644
index 000000000000..abf0df2568c6
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
@@ -0,0 +1,27 @@
+Fix compiling against heimdal
+
+--- sample/server.c	2010-12-01 14:52:55.000000000 +0000
++++ sample/server.c	2011-11-30 14:54:42.000000000 +0000
+@@ -85,8 +85,10 @@
+ 
+ #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
+ #include <gssapi/gssapi.h>
++#ifndef KRB5_HEIMDAL
+ #include <gssapi/gssapi_ext.h>
+ #endif
++#endif
+ 
+ #include "common.h"
+ 
+--- plugins/gssapi.c	2011-05-11 19:25:55.000000000 +0000
++++ plugins/gssapi.c	2011-11-30 14:54:33.000000000 +0000
+@@ -50,6 +50,9 @@
+ #else
+ #include <gssapi/gssapi.h>
+ #endif
++#ifdef KRB5_HEIMDAL
++#include <gssapi/gssapi_krb5.h>
++#endif
+ 
+ #ifdef WIN32
+ #  include <winsock2.h>
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch
new file mode 100644
index 000000000000..3fe193c8144f
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch
@@ -0,0 +1,27 @@
+Fix segfault in gssapi.
+
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
+@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
+     }
+     
+     if (output_token->value && output) {
+-	unsigned char * p = (unsigned char *) text->encode_buf;
++	int len;
+ 	
+ 	ret = _plug_buf_alloc(text->utils,
+ 			      &(text->encode_buf),
+@@ -384,11 +384,8 @@ sasl_gss_encode(void *context, const str
+ 	    return ret;
+ 	}
+ 	
+-	p[0] = (output_token->length>>24) & 0xFF;
+-	p[1] = (output_token->length>>16) & 0xFF;
+-	p[2] = (output_token->length>>8) & 0xFF;
+-	p[3] = output_token->length & 0xFF;
+-
++	len = htonl(output_token->length);
++	memcpy(text->encode_buf, &len, 4);
+ 	memcpy(text->encode_buf + 4, output_token->value, output_token->length);
+     }
+     
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch
new file mode 100644
index 000000000000..6c79bb0fb406
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch
@@ -0,0 +1,24 @@
+Fixes parallel make
+http://git.cyrusimap.org/cyrus-sasl/commit/?id=5611d43e27098f659f84155271cf42f46aab1caf
+
+From 5611d43e27098f659f84155271cf42f46aab1caf Mon Sep 17 00:00:00 2001
+From: Alexey Melnikov <alexey.melnikov@isode.com>
+Date: Thu, 22 Sep 2011 14:41:12 +0000
+Subject: lib should be built before plugins (Patch from marcandre.lureau@redhat.com)
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index d6005fb..b35164e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,7 +69,7 @@ else
+ INSTALLOSX = 
+ endif
+ 
+-SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
++SUBDIRS=include sasldb lib plugins utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
+ EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT
+ 
+ dist-hook:
+--
+cgit v0.9.0.2
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
new file mode 100644
index 000000000000..597d45a76795
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
@@ -0,0 +1,10 @@
+--- pwcheck/pwcheck_getspnam.c	1999-08-26 19:22:44.000000000 +0300
++++ pwcheck/pwcheck_getspnam.c	2011-11-30 13:22:24.601023316 +0200
+@@ -24,6 +24,7 @@
+ ******************************************************************/
+ 
+ #include <shadow.h>
++#include <string.h>
+ 
+ extern char *crypt();
+ 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
new file mode 100644
index 000000000000..da1a49f1dd66
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
@@ -0,0 +1,12 @@
+Author: Fabian Fagerholm <fabbe@debian.org>
+Description: Enable libtool use.
+--- a/saslauthd/configure.in
++++ b/saslauthd/configure.in
+@@ -25,6 +25,7 @@ AC_PROG_AWK
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
new file mode 100644
index 000000000000..8eff5a8bdd12
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
@@ -0,0 +1,14 @@
+Author: Fabian Fagerholm <fabbe@debian.org>
+Description: Fix linking with libsasldb.a when saslauthd is built with sasldb
+support.
+--- a/saslauthd/configure.in
++++ b/saslauthd/configure.in
+@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then
+   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
+   SASL_DB_PATH_CHECK()
+   SASL_DB_CHECK()
+-  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
+ fi
+ 
+ AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index ee7ecfb9116a..4b23cb6023af 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 <herd>net-mail</herd>
 <use>
-  <flag name='authdaemond'>Adds Courier-IMAP authdaemond's unix socket
+  <flag name='authdaemond'>Add Courier-IMAP authdaemond unix socket
     support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
     </flag>
-  <flag name='ntlm_unsupported_patch'>Adds NTLM <pkg>net-fs/samba</pkg>
+  <flag name='ntlm_unsupported_patch'>Add NTLM <pkg>net-fs/samba</pkg>
     NOT supported patch</flag>
-  <flag name='openldap'>Adds ldap support for saslauthd and enable ldapdb
-  plugin</flag>
-  <flag name='sample'>Adds sample client and server</flag>
+  <flag name='openldap'>Add ldap support for saslauthd</flag>
+  <flag name='ldapdb'>Enable ldapdb plugin</flag>
+  <flag name='sample'>Enable sample client and server</flag>
   <flag name='srp'>Enable SRP authentication</flag>
   <flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
 </use>