gentoo resync : 15.12.2017

12 files changed, 9 insertions, 437 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 15210bb62d77..710b38b4db02 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,12 +1,5 @@
 AUX DB_CONFIG.fast.example 746 BLAKE2B daae97e8183c6e7315163873b2911aa544004b63b41a79c11c7c015fdfcf9347e43dbb4765a41cace57b4095c90f68812570b2a7e6350abafee44d1581cb4a0e SHA512 07199416b7c91864a1dd5ad45642367c4f79ee8b694214305289c47afb5b53420f0fb81cf7c8b117400c903535e88a2dd47bda28d57e969aeeec669debf6dc9e
 AUX openldap-2.2.14-perlthreadsfix.patch 614 BLAKE2B b29f2c956403a909d1d0382804f7fa0a60c5f1d61dc06103d6b3dea79be1132a3a7ef7881b835d0a79cb4b586a0086b11849f0fbfacd53cf1f8c2cce47cbf057 SHA512 e2579de72194c63e445108a39a85635622c1a629cec9d276df84ce9d770dbe7e2df2057663bac192558af3dee60fa2f0ae92f4cc34145c300fe141ae7f3f13b3
-AUX openldap-2.2.6-ntlm.patch 5011 BLAKE2B 23da83df2a10c0545924c2dc28ffd011770171e80ae11c6114bce4ab3d8ca86cf5c477986abcc090984b61c76cd7171f69a1c8634abaaf3bfb99fb6fa2f16e24 SHA512 8140dba85c56f269c953b0b23b2ca7eecb42f8e5167f4d0f08511dc8c06c30bcb42c3e38ed3b77d5622780a94c0aa9eb65bb8e45af50075acab97e7f466a1a9d
-AUX openldap-2.3.21-ppolicy.patch 402 BLAKE2B 784994a62779cf5deb43a6c5528dd1b6c8d8b2b81643834914c46e818e2530bd79626b1e22e69964f049432010d399a52de8018894f2533e1dda08082d4fdd73 SHA512 19d2fb2755f62d3b77851983645f6656f10078e983ac09c8de7b50ba2ce52f2c8e5379f066cf1b6e91921b8ca5c54852bacd1563f20e5004babe94db66e7d88e
-AUX openldap-2.3.24-contrib-smbk5pwd.patch 1631 BLAKE2B 3538e9eee7b70fb96cf4b50a96e0c111c8a36f7a34c8e98b7dbda253986e81a1e3791a871176d12c698551637f516ae0e8b7596f2f1ffa0bc998328af3b3a702 SHA512 7aaab44cdf84233bfd78555db3af7c5a435cb3f37cb8f243b57b32391381835ce1efff7604f80cdf58fee429f6ecedc486f88addec15b6d32ef78f526c6c8826
-AUX openldap-2.3.34-slapd-conf 2067 BLAKE2B f396880f15a47d2f37ea66be2b70218f96340becde58c09756ea52e5fbdaae218234d071e8cdb65e4870dc428d4897209dc50ce551e2e32c80b580ae4cc026fe SHA512 fa1c6051c8285cd8f91dd236289a7492efd30fe172d269b35a4941945623f87fd4ff0c8b47dae36e55e395e4d931cf680ab15c5f44fd7279be686678661971aa
-AUX openldap-2.3.37-libldap_r.patch 862 BLAKE2B b01f3cc0d3efde2402c331681993df779cd4b3b38328a2a71c79b7ae81c34c4fb0d48c78a686836cc44571124da441c195efd8174a3620a9d644a66da9152b96 SHA512 b49260b4a1583e1084f695e55e80aa90b301c9d56cd9cc04f0a78c0beb2e7d645e4b2163cae2be940f3918802b5d766e30f8550fd7fe723f365829c415fe364c
-AUX openldap-2.3.43-fix-hang.patch 645 BLAKE2B ddf95ac107212afca7c40fc5f96f0fc702fea5fc3136269e4a5f3856d9657d8bd51372a75419306601067543a5104430ded016ba355842a91adb580097671fbb SHA512 3cc7f46bd69634844c5fdf893120928e2d8b6c93011aebfb01786608bbb40351fab3f5e346857ab95724d5199b4b0270d56d56c7f1a43be07951f26fb82b018e
-AUX openldap-2.3.XY-gcc44.patch 1169 BLAKE2B 4e37a01511e2c04878cce5fb046c19b69b159590ef6f7bd88d227c4f54b9f31121a423c8954c1f33b5aa889b66a945e8d1ba4def45dc3224fa82576f99b1233f SHA512 9e7b726b384390dbf85c50cd344b6a614d09823293f1af2642cfb50c25f4f39254ae0b19cd0da0b30e6fbd270f61646487e1643406438bd2ec6b37883b03f9f2
 AUX openldap-2.4.11-libldap_r.patch 515 BLAKE2B 404e53c216e5e623ac74c7afdbf40899a624f4087db62233d020d6a03430cf05d3592a6da9d14450e5903698ada089f8363e708289f91a9dc65b0dc8ddadcd36 SHA512 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357
 AUX openldap-2.4.15-ppolicy.patch 418 BLAKE2B 3bfc05201056fb652ea92427dfb8f37cc60848f9adbf8720b348990b699613038a766e731b16eee4bdecf13a9ab2f28f47209400e96e89f110345fc741b36362 SHA512 59db36c9b4d16e7ccf4b318af2a8d0c6e29cda7e567641b3bcc6069bb7d610a8ac8b56e16ca72165b3e50841abb1ef693b9e2958f16997ac637554f3a67b7146
 AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 BLAKE2B c333f01a251b1b2c1d9856caa893148200250d5dd1b8f8d1c32655bf8fe2e9ff1ac0960081a1e2f8f61c89315c543fb897e03c43a92dbdfea787a649b49115fc SHA512 6e4d3d04344433967ae099471e2af9d706e77206fc5e8d84d63681c5b975110f9abbee5d29be0a51e4cf8bc8ee157d8f386d99ffcebd059ef1be660530aaa096
@@ -28,11 +21,10 @@ AUX slapd-initd-2.4.40-r2 1726 BLAKE2B 998248677dfec0d71e89cde7233596ec95f017392
 AUX slapd.service 284 BLAKE2B 27e3863a8b0e854e5b6b1efce50da624acbfe0d2416af1eedfbc225b5e8307f79441bb4b9afddc7736857a8fd289db65e04e297e314cad48996ab6e3ecca43f6 SHA512 450c93b320101e1c28681cad6694c24332fbe424ac98283b621a2f6e1eb01e9e2dbd80a4142e6e8d01d95c55018b44e847d4f4c55f11d7e0e0a11ae1827daa82
 AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220a91e4d9bf99fab4af9c590834f9aaed57d80eadd2fdf75e49f55739ef6027d11f012f8da3a711707c27 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b
 AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec
-AUX slurpd-initd 386 BLAKE2B fc2fb17fcbe0ba9f20e7609a9b158921ec45eacef6fc88e44db8b0f18f10c80da66fd88e002a55a1db514dcedc7a95d511bce22ed68b14487e14813af44b15b4 SHA512 f6f5ede73eb1290673f1d4c9605d8806c759d68568610660eaa1cdcacf2926c728387b5e70885acdec0eea0e15a734c730af49550c4ffc8f121fffc3d9b7ed8c
-DIST openldap-2.4.44.tgz 5658830 SHA256 d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400 SHA512 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136 WHIRLPOOL 37399793d681a6489c369d663772970c62a4e1e370d4dc306bcb6fa3b9cb680139c9d940d9218aaac4618f50a63bc391b10f2aec0a134f84094ce4f7378c88ff
-DIST openldap-2.4.45.tgz 5672845 SHA256 cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab WHIRLPOOL b5855bfe2b2c3856a98fb8b07ab94e51ef995ff80d4f39f0e7edae64f9774f0af9987db3673e25f98df8a5856a3f8839f28f1aa9184c92862a4df22540b3ab49
-DIST rfc2307bis.schema-20140524 12262 SHA256 6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e WHIRLPOOL 40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de
-EBUILD openldap-2.4.44-r1.ebuild 27260 BLAKE2B f5c9ed0d0106ab0bd7f61e15cb53dd4f22a82ba6c4a027984c0fb43592148bca1dc93f474c49359bcd6d27965361ac10ca609d4346049dc518d9f87087fd6e0a SHA512 45439b1a701b03a4b323967961f7e2b83dc25463832294416999a8818f43cd51d88f7f643a707bf50acddd059d41824f75d452084ec97531f10adf62f8fdfc68
-EBUILD openldap-2.4.44.ebuild 26591 BLAKE2B cfccaf97580dee14eadb7f02319a7c5c7affe2b60b6396b6ee5f02fd4979a12dd3218f0ff5a29c4f0dba21f6556547d9e62f92ffeb560eeab149a3a6a70947f1 SHA512 046485ddd52bd62a17f152bdf8818a0518dca0cee5068a48a6b0a8c473b4f8b0bf4293f14eb53da334b97cead180b7b61cc43304441b9045d155a602615a4758
-EBUILD openldap-2.4.45.ebuild 28137 BLAKE2B 158baca33f077e747d6bcfe69e35ce84951f6c766444add66fedb2c8d792bba56a55148773940f5bd04bebfa41e38380b0ef6801e020999b6c1748276c6e848c SHA512 8a3b38f3b3710fbb96a2a0200ff08a53cc534e1ad5faf2c59c2ed97e6c61b09d6815ca74f2971827d0309a82efdd6fa5c25e0dcf3be0c8f36e2d47e7aa9f3588
+DIST openldap-2.4.44.tgz 5658830 BLAKE2B 0d9101bbc159f78f23ffc5db78943dd602610650cda166a2920c4acba502c04d4a96968b9e7f146fe1dd87b677d5da6513500b57ec42b92f9991d577b3a4ed46 SHA512 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136
+DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
+DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
+EBUILD openldap-2.4.44-r1.ebuild 27234 BLAKE2B 2344ef9c45146155e4aa81609b26a047a4a6f327ec06df506e4b29026648aac91cbad7e46a86f3683b6d947ab38f709553712f56cc0bcc5e0396e793eb556680 SHA512 a0b9ed30a1392a72e5ba0733ece46a2dfbe93937a1d59d28687f7963173287d87baf58830d24d54e1342734b1796955c8db5df1ff9c1988921ee83ef77a15614
+EBUILD openldap-2.4.44.ebuild 26565 BLAKE2B a2d9e9a6f3949a7fd10c58afbafe927500d1202a628b4ac9944fb05ecb6350881c388644755df6829709e0c2b37175a56811f88fe93ddea207440a4c7c415de8 SHA512 790e70619e39a79fd409b30a05b035b24a2951fe36e15df3d6d0ece1adc47d3268ce2499c9132c6b582f1bac04001461fdd3ea3ba0f8a76875c1355542fd3e9c
+EBUILD openldap-2.4.45.ebuild 28111 BLAKE2B 4844d2b3ad3d2a081b740f84560a6b210500d77ab781821c3e81e8cb1b5e7d4250a23cf9b02f27dc4fa2217b2c7790f19b0f992fbf43a576933b9228403de011 SHA512 95234ffcb21a9d0e9c3f67babcf8c7cfa1bcc18215392fe6cb1af0ed32a75d5abaceda8582e442d212b389f94fb45345933ce20bfbace1498e2ad91b9f6ea37d
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/files/openldap-2.2.6-ntlm.patch b/net-nds/openldap/files/openldap-2.2.6-ntlm.patch
deleted file mode 100644
index 1e52f99f1988..000000000000
--- a/net-nds/openldap/files/openldap-2.2.6-ntlm.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-This is a patch against OpenLDAP 2.2.6. Apply with -p0
-
-
---- include/ldap.h.orig	2004-01-01 13:16:28.000000000 -0500
-+++ include/ldap.h	2004-07-14 11:58:49.000000000 -0400
-@@ -1753,5 +1753,26 @@
- 	LDAPControl **cctrls ));
- 
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST	((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE	((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+	LDAP		*ld,
-+	LDAP_CONST char	*dn,
-+	ber_tag_t	tag,
-+	struct berval	*cred,
-+	LDAPControl	**sctrls,
-+	LDAPControl	**cctrls,
-+	int		*msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+	LDAP		*ld,
-+	LDAPMessage	*res,
-+	struct berval	*challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
---- libraries/libldap/Makefile.in.orig	2004-01-01 13:16:29.000000000 -0500
-+++ libraries/libldap/Makefile.in	2004-07-14 13:37:23.000000000 -0400
-@@ -20,7 +20,7 @@
- SRCS	= bind.c open.c result.c error.c compare.c search.c \
- 	controls.c messages.c references.c extended.c cyrus.c \
- 	modify.c add.c modrdn.c delete.c abandon.c \
--	sasl.c sbind.c kbind.c unbind.c cancel.c  \
-+	sasl.c ntlm.c sbind.c kbind.c unbind.c cancel.c  \
- 	filter.c free.c sort.c passwd.c whoami.c \
- 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
- 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
-@@ -29,7 +29,7 @@
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
- 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
- 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
--	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \
-+	sasl.lo ntlm.lo sbind.lo kbind.lo unbind.lo cancel.lo \
- 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
- 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
- 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
---- /dev/null	2004-06-30 15:04:37.000000000 -0400
-+++ libraries/libldap/ntlm.c	2004-07-14 13:44:18.000000000 -0400
-@@ -0,0 +1,137 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+	LDAP		*ld,
-+	LDAP_CONST char	*dn,
-+	ber_tag_t	tag,
-+	struct berval	*cred,
-+	LDAPControl	**sctrls,
-+	LDAPControl	**cctrls,
-+	int		*msgidp )
-+{
-+	BerElement	*ber;
-+	int rc;
-+	ber_int_t id;
-+
-+	Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+	assert( ld != NULL );
-+	assert( LDAP_VALID( ld ) );
-+	assert( msgidp != NULL );
-+
-+	if( msgidp == NULL ) {
-+		ld->ld_errno = LDAP_PARAM_ERROR;
-+		return ld->ld_errno;
-+	}
-+
-+	/* create a message to send */
-+	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+		ld->ld_errno = LDAP_NO_MEMORY;
-+		return ld->ld_errno;
-+	}
-+
-+	assert( LBER_VALID( ber ) );
-+
-+	LDAP_NEXT_MSGID( ld, id );
-+	rc = ber_printf( ber, "{it{istON}" /*}*/,
-+			 id, LDAP_REQ_BIND,
-+			 ld->ld_version, dn, tag,
-+			 cred );
-+
-+	/* Put Server Controls */
-+	if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+		ber_free( ber, 1 );
-+		return ld->ld_errno;
-+	}
-+
-+	if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+		ld->ld_errno = LDAP_ENCODING_ERROR;
-+		ber_free( ber, 1 );
-+		return ld->ld_errno;
-+	}
-+
-+	/* send the message */
-+	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+	if(*msgidp < 0)
-+		return ld->ld_errno;
-+
-+	return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+	LDAP		*ld,
-+	LDAPMessage	*res,
-+	struct berval	*challenge)
-+{
-+	ber_int_t	errcode;
-+	ber_tag_t	tag;
-+	BerElement	*ber;
-+	ber_len_t	len;
-+
-+	Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+	assert( ld != NULL );
-+	assert( LDAP_VALID( ld ) );
-+	assert( res != NULL );
-+
-+	if ( ld == NULL || res == NULL ) {
-+		return LDAP_PARAM_ERROR;
-+	}
-+
-+	if( res->lm_msgtype != LDAP_RES_BIND ) {
-+		ld->ld_errno = LDAP_PARAM_ERROR;
-+		return ld->ld_errno;
-+	}
-+
-+	if ( ld->ld_error ) {
-+		LDAP_FREE( ld->ld_error );
-+		ld->ld_error = NULL;
-+	}
-+	if ( ld->ld_matched ) {
-+		LDAP_FREE( ld->ld_matched );
-+		ld->ld_matched = NULL;
-+	}
-+
-+	/* parse results */
-+
-+	ber = ber_dup( res->lm_ber );
-+
-+	if( ber == NULL ) {
-+		ld->ld_errno = LDAP_NO_MEMORY;
-+		return ld->ld_errno;
-+	}
-+
-+	tag = ber_scanf( ber, "{ioa" /*}*/,
-+			 &errcode, challenge, &ld->ld_error );
-+	ber_free( ber, 0 );
-+
-+	if( tag == LBER_ERROR ) {
-+		ld->ld_errno = LDAP_DECODING_ERROR;
-+		return ld->ld_errno;
-+	}
-+
-+	ld->ld_errno = errcode;
-+
-+	return( ld->ld_errno );
-+}
diff --git a/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch b/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch
deleted file mode 100644
index 06bbee86f1c9..000000000000
--- a/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- clients.orig/tools/common.c	2006-05-05 00:24:01.000000000 -0700
-+++ clients/tools/common.c	2006-05-05 00:24:13.000000000 -0700
-@@ -904,8 +904,8 @@
- tool_bind( LDAP *ld )
- {
- #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
--	if ( ppolicy ) {
- 		LDAPControl *ctrls[2], c;
-+	if ( ppolicy ) {
- 		c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
- 		c.ldctl_value.bv_val = NULL;
- 		c.ldctl_value.bv_len = 0;
-
diff --git a/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch
deleted file mode 100644
index 091ff26a17b0..000000000000
--- a/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- contrib/slapd-modules/smbk5pwd/Makefile.ORIG	2006-05-17 13:11:57.194660019 +0300
-+++ contrib/slapd-modules/smbk5pwd/Makefile	2006-05-17 13:11:14.503082288 +0300
-@@ -9,29 +9,39 @@
- # top-level directory of the distribution or, alternatively, at
- # <http://www.OpenLDAP.org/license.html>.
- 
-+#libexecdir=/usr/lib/openldap
-+moduledir=$(libexecdir)/openldap
- LIBTOOL=../../../libtool
--OPT=-g -O2
-+#OPT=
- CC=gcc
- 
- # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
--DEFS=-DDO_KRB5 -DDO_SAMBA
-+#DEFS=
- 
--HEIMDAL_INC=-I/usr/heimdal/include
-+#KRB5_INC=
- SSL_INC=
- LDAP_INC=-I../../../include -I../../../servers/slapd
--INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
-+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC)
- 
--HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
-+KRB5_LIB=-lkrb5 -lkadm5srv
- SSL_LIB=-lcrypto
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
--
-+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber
-+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS)))
-+	LIBS=$(LDAP_LIB) $(SSL_LIB)
-+else
-+	LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB)
-+endif
-+	
- all:	smbk5pwd.la
- 
- 
- smbk5pwd.lo:	smbk5pwd.c
--	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
- 
- smbk5pwd.la:	smbk5pwd.lo
--	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
--	-rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
-+	-rpath $(moduledir) -module -o $@ $? $(LIBS)
-+
-+install-mod:
-+	$(LIBTOOL) --mode=install ../../../build/shtool install -c \
-+	-m 755 smbk5pwd.la $(DESTDIR)$(moduledir)
diff --git a/net-nds/openldap/files/openldap-2.3.34-slapd-conf b/net-nds/openldap/files/openldap-2.3.34-slapd-conf
deleted file mode 100644
index ad767cfdeb7c..000000000000
--- a/net-nds/openldap/files/openldap-2.3.34-slapd-conf
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# See slapd.conf(5) for details on configuration options.
-# This file should NOT be world readable.
-#
-include		/etc/openldap/schema/core.schema
-
-# Define global ACLs to disable default read access.
-
-# Do not enable referrals until AFTER you have a working directory
-# service AND an understanding of referrals.
-#referral	ldap://root.openldap.org
-
-pidfile		/var/run/openldap/slapd.pid
-argsfile	/var/run/openldap/slapd.args
-
-# Load dynamic backend modules:
-###INSERTDYNAMICMODULESHERE###
-
-# Sample security restrictions
-#	Require integrity protection (prevent hijacking)
-#	Require 112-bit (3DES or better) encryption for updates
-#	Require 63-bit encryption for simple bind
-# security ssf=1 update_ssf=112 simple_bind=64
-
-# Sample access control policy:
-#	Root DSE: allow anyone to read it
-#	Subschema (sub)entry DSE: allow anyone to read it
-#	Other DSEs:
-#		Allow self write access
-#		Allow authenticated users read access
-#		Allow anonymous users to authenticate
-#	Directives needed to implement policy:
-# access to dn.base="" by * read
-# access to dn.base="cn=Subschema" by * read
-# access to *
-#	by self write
-#	by users read
-#	by anonymous auth
-#
-# if no access controls are present, the default policy
-# allows anyone and everyone to read anything but restricts
-# updates to rootdn.  (e.g., "access to * by * read")
-#
-# rootdn can always read and write EVERYTHING!
-
-#######################################################################
-# BDB database definitions
-#######################################################################
-
-database	hdb
-suffix		"dc=my-domain,dc=com"
-#         <kbyte> <min>
-checkpoint	32	30 
-rootdn		"cn=Manager,dc=my-domain,dc=com"
-# Cleartext passwords, especially for the rootdn, should
-# be avoid.  See slappasswd(8) and slapd.conf(5) for details.
-# Use of strong authentication encouraged.
-rootpw		secret
-# The database directory MUST exist prior to running slapd AND 
-# should only be accessible by the slapd and slap tools.
-# Mode 700 recommended.
-directory	/var/lib/openldap-data
-# Indices to maintain
-index	objectClass	eq
diff --git a/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch b/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch
deleted file mode 100644
index d015bda2abbe..000000000000
--- a/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libraries/libldap_r/Makefile.in.old	2007-01-02 22:43:50.000000000 +0100
-+++ libraries/libldap_r/Makefile.in	2007-08-22 13:32:20.000000000 +0200
-@@ -56,7 +56,7 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
--UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
- 
- .links : Makefile
- 	@for i in $(XXSRCS); do \
---- servers/slapd/slapi/Makefile.in.old	2007-01-02 22:44:10.000000000 +0100
-+++ servers/slapd/slapi/Makefile.in	2007-08-22 14:58:51.000000000 +0200
-@@ -37,6 +37,7 @@
- XLIBS = $(LIBRARY)
- XXLIBS = 
- NT_LINK_LIBS = $(AC_LIBS)
-+UNIX_LINK_LIBS = ../../../libraries/libldap_r/libldap_r.la $(LTHREAD_LIBS)
- 
- XINCPATH = -I$(srcdir)/.. -I$(srcdir)
- XDEFS = $(MODULES_CPPFLAGS)
diff --git a/net-nds/openldap/files/openldap-2.3.43-fix-hang.patch b/net-nds/openldap/files/openldap-2.3.43-fix-hang.patch
deleted file mode 100644
index 7e1f4457bd94..000000000000
--- a/net-nds/openldap/files/openldap-2.3.43-fix-hang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit a3f40e5601c0c522f2bda418374fb415bdcbd75c
-Author: Quanah Gibson-Mount <quanah@openldap.org>
-Date:   Thu Mar 24 02:25:49 2011 +0000
-
-    sl_busy is used as a boolean so just set it, don't increment it
-
-diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
-index 2a7a48e..df6d096 100644
---- a/servers/slapd/daemon.c
-+++ b/servers/slapd/daemon.c
-@@ -2098,7 +2098,7 @@ slap_listener_activate(
- 	Debug( LDAP_DEBUG_TRACE, "slap_listener_activate(%d): %s\n",
- 		sl->sl_sd, sl->sl_busy ? "busy" : "", 0 );
- 
--	sl->sl_busy++;
-+	sl->sl_busy = 1;
- 
- 	rc = ldap_pvt_thread_pool_submit( &connection_pool,
- 		slap_listener_thread, (void *) sl );
diff --git a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch b/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch
deleted file mode 100644
index 0213d81dc85c..000000000000
--- a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- include/ldap_pvt_thread.h	2009-04-03 08:51:30.000000000 -0400
-+++ include/ldap_pvt_thread.h	2009-04-03 08:56:36.000000000 -0400
-@@ -57,12 +57,12 @@
- 
- #ifndef LDAP_PVT_THREAD_H_DONE
- #define	LDAP_PVT_THREAD_SET_STACK_SIZE
--#ifndef LDAP_PVT_THREAD_STACK_SIZE
--	/* LARGE stack. Will be twice as large on 64 bit machine. */
--#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
- /* May be explicitly defined to zero to disable it */
--#elif LDAP_PVT_THREAD_STACK_SIZE == 0
-+#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0
- #undef LDAP_PVT_THREAD_SET_STACK_SIZE
-+#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
-+	/* LARGE stack. Will be twice as large on 64 bit machine. */
-+#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
- #endif
- #endif /* !LDAP_PVT_THREAD_H_DONE */
- 
---- libraries/libldap/os-ip.c	2009-04-03 08:51:30.000000000 -0400
-+++ libraries/libldap/os-ip.c	2009-04-03 08:54:47.000000000 -0400
-@@ -652,7 +652,7 @@
- 		char *herr;
- #ifdef NI_MAXHOST
- 		char hbuf[NI_MAXHOST];
--#elif defined( MAXHOSTNAMELEN
-+#elif defined( MAXHOSTNAMELEN )
- 		char hbuf[MAXHOSTNAMELEN];
- #else
- 		char hbuf[256];
diff --git a/net-nds/openldap/files/slurpd-initd b/net-nds/openldap/files/slurpd-initd
deleted file mode 100644
index bb1b50dbb122..000000000000
--- a/net-nds/openldap/files/slurpd-initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting slurpd"
-	start-stop-daemon --start --quiet \
-	--exec /usr/lib/openldap/slurpd 
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping slurpd"
-	start-stop-daemon --stop --quiet \
-	--exec /usr/lib/openldap/slurpd 
-	eend $?
-}
diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index b4e5a2c3c69c..d8a585339a5c 100644
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
@@ -269,7 +269,7 @@ openldap_upgrade_howto() {
 	d="$(date -u +%s)"
 	l="/root/ldapdump.${d}"
 	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 1. /etc/init.d/slapd stop"
 	eerror " 2. slapcat -l ${i}"
 	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
 	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index a782cf0ca6cb..a9d3fd556cbe 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -268,7 +268,7 @@ openldap_upgrade_howto() {
 	d="$(date -u +%s)"
 	l="/root/ldapdump.${d}"
 	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 1. /etc/init.d/slapd stop"
 	eerror " 2. slapcat -l ${i}"
 	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
 	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 6b11f7e0475a..83ca893c0e1a 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -269,7 +269,7 @@ openldap_upgrade_howto() {
 	d="$(date -u +%s)"
 	l="/root/ldapdump.${d}"
 	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 1. /etc/init.d/slapd stop"
 	eerror " 2. slapcat -l ${i}"
 	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
 	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"