failed to commit this the first time due to CVS blip.

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

3 files changed, 143 insertions, 2 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index e155a1708213..602b8b241dd4 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.481 2014/10/27 05:33:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.482 2014/10/27 06:03:53 robbat2 Exp $
+
+  27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.4.40-mdb-unbundle.patch:
+  failed to commit this the first time due to CVS blip.
 
 *openldap-2.4.40-r1 (27 Oct 2014)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 60a900197295..c61368c9b732 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -22,6 +22,7 @@ AUX openldap-2.4.33-gnutls.patch 1863 SHA256 e8d493246c2e652135f130c1dedbeb9760b
 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
 AUX slapd-confd 614 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89 SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7 WHIRLPOOL d45df7487a952f899e9098779edda82afd9fb5ca66e42bbaf4a94f9ebdda9be58a026c0358a521a2feb4cc04c1f8477fb034896054ca4575d717bec367e1e2e8
@@ -62,5 +63,5 @@ EBUILD openldap-2.4.38-r2.ebuild 23988 SHA256 4d35a67fd87f7b25ab939b17d2a7efe314
 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.ebuild 26649 SHA256 00fda023cac73b0415bddc4bbdc1b310fbbc94d91fd8a01d11ba38921b87f0b0 SHA512 744649e5b44c0259386a78c2cd0c3bd236f6cdbdb4bc2e32c8dbcab91bcdab4c48df20f0722d409b89e9ea207e8951ba0bc25a1fc7ac8cff93641e4aacaf48d1 WHIRLPOOL 7e119156ffcaeca06b1920e970d2acaf4aec2cd28bfd741ce7bf0a4ec7f8905a0963b5c94b46195c2f049068e7ec91e8b92acd2c90b4c4aab06a101c621f6096
-MISC ChangeLog 84654 SHA256 d2540b24ca25be7fcb6e924db3b8ca35144f7cc1a6c6960fe6c79bf052e849a1 SHA512 7cf240002e42aeb0a1dafadd04d9429462f9628b1f8990310be55e40815fb0903f723f7dfedcebb4d1e7488d08b96ce3aec6a28d135056a60dce558c5dbb101b WHIRLPOOL f78cd36f467ad774373cf89afb75710f126ab9e403b93422f13d772d484b46ee8e30a2c93195158806d12097aeceaf5871e27bf0d1a535ea6d345f5b6878b196
+MISC ChangeLog 84809 SHA256 30e7e20fe037384c3fcbdbb3d551aaa39bec0f02d470cbb93c1a4be9a973dea6 SHA512 30f309954d15f649af4e2cf2ff7a65a660972a2f80184f03b85dc3c3b0c4af6d8c29a19dfb1ee89d9f61da20e007e80ff02f7f80e98a3ecf7f59b572e1f30391 WHIRLPOOL b7aa4e3aea90ea29e54f089989d8bfca39454928be9c7f007246734219e1b6715b4fa6cb2d885f34542cac3500b2c7c79c3fe4805974a06decc28e75818b630d
 MISC metadata.xml 773 SHA256 cbf6a17e91453ce562af82e2bdb3cc37c422f5b15574c2c9c401e8ef4de45476 SHA512 551553fc55a55e9b1c38670dcebe01eb746df423cd205e65c92b940b40b5035594fce7f22b7860935a552ef7515210826a973da2c429156615c0394776d53070 WHIRLPOOL 99e74da58ceb71a13cf5720c81ef83be48ef9d4b19f4a286b38c5621ed471dd4253328ec23ed276d35ec5e46e5b685c3b7508f91448e60d72db0c46984c9d3bd
diff --git a/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch b/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch
new file mode 100644
index 000000000000..9265a01701ab
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch
@@ -0,0 +1,136 @@
+--- ./build/top.mk.orig	2014-10-24 14:34:59.260827298 +0200
++++ ./build/top.mk	2014-10-24 14:35:25.281168893 +0200
+@@ -160,6 +160,7 @@
+ LTHREAD_LIBS = @LTHREAD_LIBS@
+ 
+ BDB_LIBS = @BDB_LIBS@
++MDB_LIBS = @MDB_LIBS@
+ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
+ 
+ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
+--- ./build/openldap.m4.orig	2014-10-24 10:52:02.837221734 +0200
++++ ./build/openldap.m4	2014-10-24 11:31:02.748087966 +0200
+@@ -563,6 +563,38 @@
+ 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+ 
++dnl --------------------------------------------------------------------
++dnl Check for version compatility with back-mdb
++AC_DEFUN([OL_MDB_COMPAT],
++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[
++	AC_EGREP_CPP(__mdb_version_compat,[
++#include <lmdb.h>
++
++/* require 0.9.14 or later */
++#if MDB_VERSION_FULL >= 0x00000009000E
++	__mdb_version_compat
++#endif
++	], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
++])
++
++dnl
++dnl --------------------------------------------------------------------
++dnl Find any MDB
++AC_DEFUN([OL_MDB],
++[ol_cv_mdb=no
++AC_CHECK_HEADERS(lmdb.h)
++if test $ac_cv_header_lmdb_h = yes; then
++	OL_MDB_COMPAT
++
++	if test $ol_cv_mdb_compat != yes ; then
++		AC_MSG_ERROR([LMDB version incompatible with MDB backends])
++	fi
++
++	ol_cv_lib_mdb=-llmdb
++	ol_cv_mdb=yes
++fi
++])
++
+ dnl
+ dnl ====================================================================
+ dnl Check POSIX Thread version 
+--- ./servers/slapd/back-mdb/Makefile.in.orig	2014-10-24 10:31:30.860931076 +0200
++++ ./servers/slapd/back-mdb/Makefile.in	2014-10-24 14:33:33.803705424 +0200
+@@ -25,11 +25,10 @@
+ 	extended.lo operational.lo \
+ 	attr.lo index.lo key.lo filterindex.lo \
+ 	dn2entry.lo dn2id.lo id2entry.lo idl.lo \
+-	nextid.lo monitor.lo mdb.lo midl.lo
++	nextid.lo monitor.lo
+ 
+ LDAP_INCDIR= ../../../include       
+ LDAP_LIBDIR= ../../../libraries
+-MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb
+ 
+ BUILD_OPT = "--enable-mdb"
+ BUILD_MOD = @BUILD_MDB@
+@@ -44,7 +43,7 @@
+ 
+ LIBBASE = back_mdb
+ 
+-XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR)
++XINCPATH = -I.. -I$(srcdir)/..
+ XDEFS = $(MODULES_CPPFLAGS)
+ 
+ all-local-lib:	../.backend
+@@ -52,11 +51,5 @@
+ ../.backend: lib$(LIBBASE).a
+ 	@touch $@
+ 
+-mdb.lo:	$(MDB_SUBDIR)/mdb.c
+-	$(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c
+-
+-midl.lo:	$(MDB_SUBDIR)/midl.c
+-	$(LTCOMPILE_MOD) $(MDB_SUBDIR)/midl.c
+-
+ veryclean-local-lib: FORCE
+ 	$(RM) $(XXHEADERS) $(XXSRCS) .links
+--- ./configure.in.orig	2014-10-24 10:46:53.289139847 +0200
++++ ./configure.in	2014-10-24 10:51:34.372846374 +0200
+@@ -519,6 +519,7 @@
+ dnl Initialize vars
+ LDAP_LIBS=
+ BDB_LIBS=
++MDB_LIBS=
+ SLAPD_NDB_LIBS=
+ SLAPD_NDB_INCS=
+ LTHREAD_LIBS=
+@@ -1905,6 +1906,30 @@
+ fi
+ 
+ dnl ----------------------------------------------------------------
++ol_link_mdb=no 
++
++if test $ol_enable_mdb != no; then
++	OL_MDB
++
++	if test $ol_cv_mdb = no ; then
++		AC_MSG_ERROR(MDB: LMDB not available)
++	fi
++
++	AC_DEFINE(HAVE_MDB,1,
++		[define this if LMDB is available])
++
++	dnl $ol_cv_lib_mdb should be yes or -llmdb
++	dnl (it could be no, but that would be an error
++	if test $ol_cv_lib_mdb != yes ; then
++		MDB_LIBS="$MDB_LIBS $ol_cv_lib_mdb"
++	fi
++
++	SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)"
++
++	ol_link_mdb=yes 
++fi
++
++dnl ----------------------------------------------------------------
+ 
+ if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then
+ 	BUILD_LIBS_DYNAMIC=shared
+@@ -3133,6 +3158,7 @@
+ AC_SUBST(LDAP_LIBS)
+ AC_SUBST(SLAPD_LIBS)
+ AC_SUBST(BDB_LIBS)
++AC_SUBST(MDB_LIBS)
+ AC_SUBST(SLAPD_NDB_LIBS)
+ AC_SUBST(SLAPD_NDB_INCS)
+ AC_SUBST(LTHREAD_LIBS)