Update to 2.4.45.

4 files changed, 5 insertions, 219 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index cb0ba095eee1..c56f9e3ff9aa 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.44
+DISTVERSION=		2.4.45
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -58,7 +58,7 @@ BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 PORTREVISION_CLIENT=	0
 PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	2
-OPENLDAP_SHLIB_MINOR=	10.7
+OPENLDAP_SHLIB_MINOR=	10.8
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index b538941a3a7c..84d9825ede35 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (openldap-2.4.44.tgz) = d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400
-SIZE (openldap-2.4.44.tgz) = 5658830
+TIMESTAMP = 1496558623
+SHA256 (openldap-2.4.45.tgz) = cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
+SIZE (openldap-2.4.45.tgz) = 5672845
diff --git a/net/openldap24-server/files/patch-des b/net/openldap24-server/files/patch-des
deleted file mode 100644
index b9541de33cb8..000000000000
--- a/net/openldap24-server/files/patch-des
+++ /dev/null
@@ -1,204 +0,0 @@
---- libraries/liblutil/passwd.c.orig	2014-09-19 03:48:49.000000000 +0200
-+++ libraries/liblutil/passwd.c	2014-11-05 19:57:10.807555025 +0100
-@@ -38,11 +38,11 @@
- #	include <openssl/des.h>
- 
- 
--typedef des_cblock des_key;
--typedef des_cblock des_data_block;
--typedef des_key_schedule des_context;
--#define des_failed(encrypted) 0
--#define des_finish(key, schedule) 
-+typedef DES_cblock DES_key;
-+typedef DES_cblock DES_data_block;
-+typedef DES_key_schedule DES_context;
-+#define DES_failed(encrypted) 0
-+#define DES_finish(key, schedule) 
- 
- #elif defined(HAVE_MOZNSS)
- /*
-@@ -53,9 +53,9 @@
- */
- #define PROTYPES_H 1
- #	include <nss/pk11pub.h>
--typedef PK11SymKey *des_key;
--typedef unsigned char des_data_block[8];
--typedef PK11Context *des_context[1];
-+typedef PK11SymKey *DES_key;
-+typedef unsigned char DES_data_block[8];
-+typedef PK11Context *DES_context[1];
- #define DES_ENCRYPT CKA_ENCRYPT
- 
- #endif
-@@ -664,10 +664,10 @@
-  * abstract away setting the parity.
-  */
- static void
--des_set_key_and_parity( des_key *key, unsigned char *keyData)
-+DES_set_key_and_parity( DES_key *key, unsigned char *keyData)
- {
-     memcpy(key, keyData, 8);
--    des_set_odd_parity( key );
-+    DES_set_odd_parity( key );
- }
- 
- 
-@@ -677,7 +677,7 @@
-  * implement MozNSS wrappers for the openSSL calls 
-  */
- static void
--des_set_key_and_parity( des_key *key, unsigned char *keyData)
-+DES_set_key_and_parity( DES_key *key, unsigned char *keyData)
- {
-     SECItem keyDataItem;
-     PK11SlotInfo *slot;
-@@ -699,7 +699,7 @@
- }
- 
- static void
--des_set_key_unchecked( des_key *key, des_context ctxt )
-+DES_set_key_unchecked( DES_key *key, DES_context ctxt )
- {
-     ctxt[0] = NULL;
- 
-@@ -712,37 +712,37 @@
- }
- 
- static void
--des_ecb_encrypt( des_data_block *plain, des_data_block *encrypted, 
--			des_context ctxt, int op)
-+DES_ecb_encrypt( DES_data_block *plain, DES_data_block *encrypted, 
-+			DES_context ctxt, int op)
- {
-     SECStatus rv;
-     int size;
- 
-     if (ctxt[0] == NULL) {
- 	/* need to fail here...  */
--	memset(encrypted, 0, sizeof(des_data_block));
-+	memset(encrypted, 0, sizeof(DES_data_block));
- 	return;
-     }
-     rv = PK11_CipherOp(ctxt[0], (unsigned char *)&encrypted[0], 
--			&size, sizeof(des_data_block),
--			(unsigned char *)&plain[0], sizeof(des_data_block));
-+			&size, sizeof(DES_data_block),
-+			(unsigned char *)&plain[0], sizeof(DES_data_block));
-     if (rv != SECSuccess) {
- 	/* signal failure */
--	memset(encrypted, 0, sizeof(des_data_block));
-+	memset(encrypted, 0, sizeof(DES_data_block));
- 	return;
-     }
-     return;
- }
- 
- static int
--des_failed(des_data_block *encrypted)
-+DES_failed(DES_data_block *encrypted)
- {
--   static const des_data_block zero = { 0 };
-+   static const DES_data_block zero = { 0 };
-    return memcmp(encrypted, zero, sizeof(zero)) == 0;
- }
- 
- static void
--des_finish(des_key *key, des_context ctxt)
-+DES_finish(DES_key *key, DES_context ctxt)
- {
-      if (*key) {
- 	PK11_FreeSymKey(*key);
-@@ -817,7 +817,7 @@
- 
- static void lmPasswd_to_key(
- 	const char *lmPasswd,
--	des_key *key)
-+	DES_key *key)
- {
- 	const unsigned char *lpw = (const unsigned char *) lmPasswd;
- 	unsigned char k[8];
-@@ -832,7 +832,7 @@
- 	k[6] = ((lpw[5] & 0x3F) << 2) | (lpw[6] >> 6);
- 	k[7] = ((lpw[6] & 0x7F) << 1);
- 		
--	des_set_key_and_parity( key, k );
-+	DES_set_key_and_parity( key, k );
- }	
- 
- static int chk_lanman(
-@@ -843,10 +843,10 @@
- {
- 	ber_len_t i;
- 	char UcasePassword[15];
--	des_key key;
--	des_context schedule;
--	des_data_block StdText = "KGS!@#$%";
--	des_data_block PasswordHash1, PasswordHash2;
-+	DES_key key;
-+	DES_context schedule;
-+	DES_data_block StdText = "KGS!@#$%";
-+	DES_data_block PasswordHash1, PasswordHash2;
- 	char PasswordHash[33], storedPasswordHash[33];
- 	
- 	for( i=0; i<cred->bv_len; i++) {
-@@ -864,21 +864,21 @@
- 	ldap_pvt_str2upper( UcasePassword );
- 	
- 	lmPasswd_to_key( UcasePassword, &key );
--	des_set_key_unchecked( &key, schedule );
--	des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
-+	DES_set_key_unchecked( &key, &schedule );
-+	DES_ecb_encrypt( &StdText, &PasswordHash1, &schedule , DES_ENCRYPT );
- 
--	if (des_failed(&PasswordHash1)) {
-+	if (DES_failed(&PasswordHash1)) {
- 	    return LUTIL_PASSWD_ERR;
- 	}
- 	
- 	lmPasswd_to_key( &UcasePassword[7], &key );
--	des_set_key_unchecked( &key, schedule );
--	des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
--	if (des_failed(&PasswordHash2)) {
-+	DES_set_key_unchecked( &key, &schedule );
-+	DES_ecb_encrypt( &StdText, &PasswordHash2, &schedule , DES_ENCRYPT );
-+	if (DES_failed(&PasswordHash2)) {
- 	    return LUTIL_PASSWD_ERR;
- 	}
- 
--	des_finish( &key, schedule );
-+	DES_finish( &key, schedule );
- 	
- 	sprintf( PasswordHash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", 
- 		PasswordHash1[0],PasswordHash1[1],PasswordHash1[2],PasswordHash1[3],
-@@ -1139,10 +1139,10 @@
- 
- 	ber_len_t i;
- 	char UcasePassword[15];
--	des_key key;
--	des_context schedule;
--	des_data_block StdText = "KGS!@#$%";
--	des_data_block PasswordHash1, PasswordHash2;
-+	DES_key key;
-+	DES_context schedule;
-+	DES_data_block StdText = "KGS!@#$%";
-+	DES_data_block PasswordHash1, PasswordHash2;
- 	char PasswordHash[33];
- 	
- 	for( i=0; i<passwd->bv_len; i++) {
-@@ -1160,12 +1160,12 @@
- 	ldap_pvt_str2upper( UcasePassword );
- 	
- 	lmPasswd_to_key( UcasePassword, &key );
--	des_set_key_unchecked( &key, schedule );
--	des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
-+	DES_set_key_unchecked( &key, &schedule );
-+	DES_ecb_encrypt( &StdText, &PasswordHash1, &schedule , DES_ENCRYPT );
- 	
- 	lmPasswd_to_key( &UcasePassword[7], &key );
--	des_set_key_unchecked( &key, schedule );
--	des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
-+	DES_set_key_unchecked( &key, &schedule );
-+	DES_ecb_encrypt( &StdText, &PasswordHash2, &schedule , DES_ENCRYPT );
- 	
- 	sprintf( PasswordHash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", 
- 		PasswordHash1[0],PasswordHash1[1],PasswordHash1[2],PasswordHash1[3],
diff --git a/net/openldap24-server/files/patch-libraries__libldap__tls_o.c b/net/openldap24-server/files/patch-libraries__libldap__tls_o.c
deleted file mode 100644
index 54e4eea9aa54..000000000000
--- a/net/openldap24-server/files/patch-libraries__libldap__tls_o.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libraries/libldap/tls_o.c	2009/02/10 12:27:22	1.6
-+++ libraries/libldap/tls_o.c	2009/03/02 16:43:38	1.7
-@@ -421,7 +421,7 @@
- 	xn = X509_get_subject_name(x);
- 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
- 	der_dn->bv_val = xn->bytes->data;
--	X509_free(x);
-+	/* Don't X509_free, the session is still using it */
- 	return 0;
- }
-