Upstream OpenLDAP nixes bdb6 functionality. Read comment 15 on the bug 525110.

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

4 files changed, 15 insertions, 45 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 602b8b241dd4..bb1aab01143e 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.482 2014/10/27 06:03:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.483 2014/10/27 19:15:09 robbat2 Exp $
+
+*openldap-2.4.40-r2 (27 Oct 2014)
+
+  27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> +openldap-2.4.40-r2.ebuild,
+  -files/openldap-2.4.40-db-6.patch, -openldap-2.4.40-r1.ebuild:
+  Upstream OpenLDAP nixes bdb6 functionality. Read comment 15 on the bug 525110.
 
   27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org>
   +files/openldap-2.4.40-mdb-unbundle.patch:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index c61368c9b732..99b7085512f9 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -21,7 +21,6 @@ AUX openldap-2.4.31-gcc47.patch 480 SHA256 6a0bef52a8681e30c4be7c11df88f5c73d2ab
 AUX openldap-2.4.33-gnutls.patch 1863 SHA256 e8d493246c2e652135f130c1dedbeb9760bed5f61d73c6662ba7f816ead59e52 SHA512 1b3830cf96b2c470e723dd966330e1b0a69c11aa7b10b5af04f2ab907e7e9ffd038589af7a472a374f47b5d08638b06ad04e0ff9a9180a9b5fc89884d3437df4 WHIRLPOOL 331798cf7ef9270ad57ca81ad1c32c223f8cd3932cec7fb235e3328acabedf68f952ace2903c45277617ebc0f498c919e62eadf638fb5d817717b324635531cd
 AUX openldap-2.4.35-contrib-samba4.patch 1400 SHA256 64ca91d3edae25d392f39a7f538e269b26de4e09923f872014e84ec388bda911 SHA512 332c4b2daa3eba165cfdcd479b1012e139d60095aaa628f8f5750fffb722d39395935bd7d7e56272e98fd234ab0be1c6568a71feeda5d88ba24b91b385defdad WHIRLPOOL c472dc75bbc1261b84ce0bfe8dd0a749200d7540647733ca13c0b1ccd8330739278f83eea3c91b3b29e5982eb6c9f9fb920ffdd9a6faaf4c0e66a97a1d16db55
 AUX openldap-2.4.35-contrib-smbk5pwd.patch 1626 SHA256 377b9204f51bb751d7311de3ee789386496372db2964ed2a929733099c23688a SHA512 c045c7605d25bab9eef8c12752f4952e3e6358124764ded91f5f98210686bc371f32ac20c56a63de80410f882f20e0889eec95474f1ee9d4c5bb4ed303ec8da0 WHIRLPOOL 64feead042fe22ec8bd36a23a11ea1af513702de2ab063324f0e49802635ca53b9f2f662159c8784877f6342d0a15cb231710be2ea69031c3df7459cd150cc47
-AUX openldap-2.4.40-db-6.patch 1012 SHA256 9ed45a48a0853956bb41ba65e6c8728ae1925f661e96897c8f5abc250f99d56a SHA512 b50d44c0a8d4ece3149cb0a2bee15c1335a119d5ba69199ce3e94782e5a3bfae0cf568bdfa87c4c82911405584341fe4ffd1b7a7eb91c90070f82c2be152d247 WHIRLPOOL 7a7334623690e23d82b590867608ee7b47933034df859380805805116e0bb2853a092ca7136c1faa4ed39c2f115507646e394b7b4020a34c3b0b09b6bcbdb64a
 AUX openldap-2.4.40-mdb-unbundle.patch 3589 SHA256 43be88ef0810608232b2490e7f06f66272d17059c581f76d4de79c415365dd97 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec WHIRLPOOL 0eadd603e016506d3365f81c802561a0201122b989033935a5a6b4737db75ff6c1517bcca1c7c127b54bfd7c1ea2db0c11f65228ea6c4cbacf2f783af98dfddb
 AUX openldap-2.4.40-slapd-conf 2059 SHA256 306602d38cbbdc2203e9f838348cbe9b264738cf86bbebc60272658b92a1eff9 SHA512 7ce8a8262db74d86449a3d31b96b2efa9e8dae2f9992a1c3a6d6899fb65531eaf917f410d8728852cb74338d7ba3c8c3b52d2f6cdcbba4cb3b97f6c733099fa2 WHIRLPOOL 979a2802501ec22dd93032eb3bc1a3df322558013cd8038736bac436b33fdb666df5d93fbfcc4d99762c10aa9e1a1edef496fa364d2b4f0019b5dd702174b6f4
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b WHIRLPOOL 624f11c996825bb248dd7c33f64afd3a4e8b9edbbe79c6fdffc7f2d8e57c5d8ac4c651eae7763dbc0a06144b916131b70e599771034bcb6bd8c586a9bf6a8209
@@ -61,7 +60,7 @@ EBUILD openldap-2.4.35.ebuild 22183 SHA256 c85606e0e461306d3da36f2ebacffea27edfd
 EBUILD openldap-2.4.38-r1.ebuild 22526 SHA256 82c788d06106e4e5dad38f900469e077db5ffcd514628adaa106b11a801aa174 SHA512 0847b7fd3d9c473501e08fe3af0562476eb2325c4749c2f7f7ae63f55d0c8aa940d2ca1e3667ff45bafcabe32a23175bf9e99a37b5fad1f2c612c42e20d54b1d WHIRLPOOL 735b128508f135849fea5c9c4310c2faed5e612b8b662f3f44ff89d05d87edf68a86d4c00c22470e6d634876b910e629b741ee9c8d8f3607bc77a565f7f77deb
 EBUILD openldap-2.4.38-r2.ebuild 23988 SHA256 4d35a67fd87f7b25ab939b17d2a7efe314f19cc937ab148d36dd1cfe12a82fe4 SHA512 46e72b3e2a02281d6dd96e80e9519a62fc3951f8c68cc24a5eb4c291f89ac52155c158e7f0dd9d714d7f64f6e46cb9e5ecd61ad367c09be23339c5f8323f028f WHIRLPOOL 22f6fd3d6cc418ab16caf96109f4aee3cd872aec377f57656ad5c97df6b69199ac8ab9c587e45c7f928c164ed8e869bd96094c39c9702177920d63b774e6abaa
 EBUILD openldap-2.4.39.ebuild 23993 SHA256 60c0d2a86303f67cb7d4e8bac0398a48f309439e7628ddc1e99b71e27cb613be SHA512 291722e8516f9db02b35b721e57f5b2a299a9cab032d3a99ca776dbba025873cb8dde7bf711a39283ffd65952952dbd7996a930857baac3c1ad7c7ccb5dfa0dd WHIRLPOOL 219d7a3500d2fccc23496f1b9fe2adf34e46c179a691fc60e2ef37af11778981e5e89369fd5ffcff23aed7a99df56d7c4d7b62ac42a740e3a3a3daf405628fc2
-EBUILD openldap-2.4.40-r1.ebuild 26584 SHA256 8ba2015e9cb4ecbcb6a938bb467092c840923b6f347c5c74c12e969c37351ec5 SHA512 d417713ced880d526d47fee15d0cec8064b108103b48034b0db2aa1bb4002f2785b77bffe399b944bf8ce5a8435774fd8a4d1cf3933fbde22e4a99148f3e7da7 WHIRLPOOL 07d82ba9228193ba4cb7c60800fcc51e4de950369ed67bff699d6493837a450a6ce62d6b79f39407ac6e99617131b06761a6eb263bf17d2d7b3aa0262fb632ce
+EBUILD openldap-2.4.40-r2.ebuild 26172 SHA256 f1fcfc059d3539f9e2d6423d0ed94ece0c58018fb3fd216d24cb576d4d224638 SHA512 83a3f30a60d07377adf712cecc5878a7bde1ba86d04116db1433d572683d2812074ad9c2c030d994eacb37b0025b5f8836f61277728e747cdc0967f2bfd515c9 WHIRLPOOL 980584435a5838825ddf12f8b26ef53217d02750e9345ca5b9bd360d3d7ee9b009806f1ea49df84691c06e2afd0cd9e079f3ff575629a1bc0517035cec7b8f84
 EBUILD openldap-2.4.40.ebuild 26649 SHA256 00fda023cac73b0415bddc4bbdc1b310fbbc94d91fd8a01d11ba38921b87f0b0 SHA512 744649e5b44c0259386a78c2cd0c3bd236f6cdbdb4bc2e32c8dbcab91bcdab4c48df20f0722d409b89e9ea207e8951ba0bc25a1fc7ac8cff93641e4aacaf48d1 WHIRLPOOL 7e119156ffcaeca06b1920e970d2acaf4aec2cd28bfd741ce7bf0a4ec7f8905a0963b5c94b46195c2f049068e7ec91e8b92acd2c90b4c4aab06a101c621f6096
-MISC ChangeLog 84809 SHA256 30e7e20fe037384c3fcbdbb3d551aaa39bec0f02d470cbb93c1a4be9a973dea6 SHA512 30f309954d15f649af4e2cf2ff7a65a660972a2f80184f03b85dc3c3b0c4af6d8c29a19dfb1ee89d9f61da20e007e80ff02f7f80e98a3ecf7f59b572e1f30391 WHIRLPOOL b7aa4e3aea90ea29e54f089989d8bfca39454928be9c7f007246734219e1b6715b4fa6cb2d885f34542cac3500b2c7c79c3fe4805974a06decc28e75818b630d
+MISC ChangeLog 85072 SHA256 34bddd2995abfe975b414ddc8f8dced2c4da76c4b81865bed7cffcb6675b3767 SHA512 fbb819ac3ed7b62939049363870bc86427587eaba35fa0e2c9b277799861ffd599ec28a960dddd6c81e8bf00289d643ddbbde8d4962cdb9fe391091decd423a4 WHIRLPOOL 0144fbdab4384a0ac4fe6f84abd327367a5d99478cde1718187ea09d4af7c6a27964b9fab533e24df8c73bf8f45d9d0e1dbbe8c83d3001cec41224f48f4c6ff6
 MISC metadata.xml 773 SHA256 cbf6a17e91453ce562af82e2bdb3cc37c422f5b15574c2c9c401e8ef4de45476 SHA512 551553fc55a55e9b1c38670dcebe01eb746df423cd205e65c92b940b40b5035594fce7f22b7860935a552ef7515210826a973da2c429156615c0394776d53070 WHIRLPOOL 99e74da58ceb71a13cf5720c81ef83be48ef9d4b19f4a286b38c5621ed471dd4253328ec23ed276d35ec5e46e5b685c3b7508f91448e60d72db0c46984c9d3bd
diff --git a/net-nds/openldap/files/openldap-2.4.40-db-6.patch b/net-nds/openldap/files/openldap-2.4.40-db-6.patch
deleted file mode 100644
index 77c3759224f2..000000000000
--- a/net-nds/openldap/files/openldap-2.4.40-db-6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Re-allow building with >= BerkeleyDB-6.0.20.
-
-If you do build/link against this version, please note that the licenses
-PROHIBIT distribution of the binaries. We will enforce RESTRICT=bindist for
-this.
-
-X-Gentoo-Bug: 525110
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=525110
-
-diff -ur openldap-2.4.40/build/openldap.m4 openldap-2.4.40.fix/build/openldap.m4
---- openldap-2.4.40/build/openldap.m4	2014-09-19 05:48:49.000000000 +0400
-+++ openldap-2.4.40.fix/build/openldap.m4	2014-10-16 15:51:38.223985217 +0400
-@@ -553,13 +553,10 @@
- 
- #define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
- 
--/* require 4.4 or later, but less than 6.0.20 */
--#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
-+/* require 4.4 or later */
-+#if DB_VERSION_FULL >= 0x040400
- 	__db_version_compat
- #endif
--#if DB_VERSION_FULL >= 0x060014
--#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
--#endif
- 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
- ])
- 
diff --git a/net-nds/openldap/openldap-2.4.40-r1.ebuild b/net-nds/openldap/openldap-2.4.40-r2.ebuild
index 0158726ba4ae..d0e8ce2202ce 100644
--- a/net-nds/openldap/openldap-2.4.40-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.40-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r1.ebuild,v 1.1 2014/10/27 05:33:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.1 2014/10/27 19:15:09 robbat2 Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
-IUSE_BACKEND="+berkdb +bindist"
+IUSE_BACKEND="+berkdb"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs"
 IUSE_CONTRIB="smbkrb5passwd kerberos"
@@ -31,10 +31,11 @@ IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CON
 
 REQUIRED_USE="cxx? ( sasl )"
 # This is only actually applicable if linking against db-6
-RESTRICT="!minimal? ( !bindist? ( berkdb? ( bindist ) ) )"
 
 # always list newer first
-BDB_SLOTS='6.1 6.0 5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
 
 # openssl is needed to generate lanman-passwords required by samba
 RDEPEND="icu? ( dev-libs/icu:= )
@@ -53,7 +54,7 @@ RDEPEND="icu? ( dev-libs/icu:= )
 		samba? ( dev-libs/openssl )
 		berkdb? ( 
 			>=sys-libs/db-4.4
-			bindist? ( <sys-libs/db-6 ) 
+			<sys-libs/db-6
 			)
 		smbkrb5passwd? (
 			dev-libs/openssl
@@ -199,8 +200,6 @@ openldap_find_versiontags() {
 		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
 			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
 		if use berkdb; then
-			# If USE=bindist, then >=DB-6 is not permitted
-			use bindist && BDB_SLOTS=${BDB_SLOTS/6.0} && BDB_SLOTS=${BDB_SLOTS/6.1}
 			# find which one would be used
 			for bdb_slot in $BDB_SLOTS ; do
 				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
@@ -328,10 +327,6 @@ src_prepare() {
 	# bug #421463
 	#epatch "${FILESDIR}"/${PN}-2.4.33-gnutls.patch # merged upstream
 
-	# bug #525110: allow compiling with db-6 against
-	# but RESTRICT=bindist now applies
-	use bindist || epatch "${FILESDIR}"/${PN}-2.4.40-db-6.patch
-
 	# unbundle lmdb
 	epatch "${FILESDIR}"/${P}-mdb-unbundle.patch
 	rm -rf "${S}"/libraries/liblmdb
@@ -406,8 +401,6 @@ multilib_src_configure() {
 		if use berkdb ; then
 			einfo "Using Berkeley DB for local backend"
 			myconf+=( --enable-bdb --enable-hdb )
-			# >=db-6 is probibited for bindist
-			use bindist && BDB_SLOTS=${BDB_SLOTS/6.0} && BDB_SLOTS=${BDB_SLOTS/6.1}
 			DBINCLUDE=$(db_includedir $BDB_SLOTS)
 			einfo "Using $DBINCLUDE for sys-libs/db version"
 			# We need to include the slotted db.h dir for FreeBSD