new 2.2 version to fix bugs #105380 , #110412 , #112554, #114544 , #115741 , #115872 - thanks to Markus Ullmann

Package-Manager: portage-2.0.53

4 files changed, 138 insertions, 0 deletions

diff --git a/net-nds/openldap/files/digest-openldap-2.2.28-r4 b/net-nds/openldap/files/digest-openldap-2.2.28-r4
new file mode 100644
index 000000000000..15100a316d72
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.2.28-r4
@@ -0,0 +1,2 @@
+MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
+MD5 b51db7328430b9cbe527696da726f1fb openldap-2.2.28.tgz 2630427
diff --git a/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch b/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch
new file mode 100644
index 000000000000..2a0aae9c00d3
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch
@@ -0,0 +1,70 @@
+--- build/openldap.m4.orig	2005-12-19 01:43:17.000000000 +0100
++++ build/openldap.m4	2005-12-19 01:44:05.000000000 +0100
+@@ -1298,3 +1298,30 @@
+ 		[define if struct msghdr has msg_accrights])
+   fi
+ ])dnl
++
++AC_DEFUN([OL_AC_COMPILE_CHECK_SIZEOF],
++[changequote(<<, >>)dnl
++dnl The name to #define.
++define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
++dnl The cache variable name.
++define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
++changequote([, ])dnl
++AC_MSG_CHECKING(size of $1)
++AC_CACHE_VAL(AC_CV_NAME,
++[for ac_size in 4 8 1 2 16 32 64 $2 ; do # List sizes in rough order of prevalence.
++  AC_TRY_COMPILE([#include "confdefs.h"
++#include <sys/types.h>
++#include <stddef.h>
++$2
++], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
++  if test x$AC_CV_NAME != x ; then break; fi
++done
++])
++if test x$AC_CV_NAME = x ; then
++  AC_MSG_ERROR([cannot determine a size for $1])
++fi
++AC_MSG_RESULT($AC_CV_NAME)
++AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
++undefine([AC_TYPE_NAME])dnl
++undefine([AC_CV_NAME])dnl
++])
+--- ./configure.in.orig	2005-12-19 01:48:49.000000000 +0100
++++ ./configure.in	2005-12-19 01:50:12.000000000 +0100
+@@ -590,8 +590,8 @@
+ 
+ dnl ----------------------------------------------------------------
+ dnl Checks for system services
+-AC_CYGWIN
+-AC_MINGW32
++dnl AC_CYGWIN
++dnl AC_MINGW32
+ AC_EXEEXT
+ AC_OBJEXT
+ 
+@@ -2174,7 +2174,7 @@
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_PID_T
+-AM_TYPE_PTRDIFF_T
++AC_CHECK_TYPES([ptrdiff_t])
+ AC_TYPE_SIGNAL
+ AC_TYPE_SIZE_T
+ 
+@@ -2204,10 +2204,10 @@
+ 	AC_C_BIGENDIAN
+ fi
+ 
+-AC_COMPILE_CHECK_SIZEOF(short) 
+-AC_COMPILE_CHECK_SIZEOF(int) 
+-AC_COMPILE_CHECK_SIZEOF(long)
+-AC_COMPILE_CHECK_SIZEOF(wchar_t)
++OL_AC_COMPILE_CHECK_SIZEOF(short) 
++OL_AC_COMPILE_CHECK_SIZEOF(int) 
++OL_AC_COMPILE_CHECK_SIZEOF(long)
++OL_AC_COMPILE_CHECK_SIZEOF(wchar_t)
+ 
+ if test "$ac_cv_sizeof_int" -lt 4 ; then
+ 	AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
diff --git a/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch b/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch
new file mode 100644
index 000000000000..ceb6ece58fd2
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch
@@ -0,0 +1,54 @@
+--- libraries.orig/liblutil/passwd.c	Tue Oct 11 16:22:46 2005
++++ libraries/liblutil/passwd.c	Tue Oct 11 19:27:24 2005
+@@ -79,6 +79,10 @@
+ static char *salt_format = NULL;
+ #endif
+ 
++/* KLUDGE:
++ *  chk_fn is NULL iff name is {CLEARTEXT}
++ *     otherwise, things will break
++ */
+ struct pw_scheme {
+ 	struct berval name;
+ 	LUTIL_PASSWD_CHK_FUNC *chk_fn;
+@@ -161,7 +165,7 @@
+ 
+ #ifdef SLAPD_CLEARTEXT
+ 	/* pseudo scheme */
+-	{ {0, "{CLEARTEXT}"},		NULL, hash_clear },
++	{ BER_BVC("{CLEARTEXT}"),	NULL, hash_clear },
+ #endif
+ 
+ 	{ BER_BVNULL, NULL, NULL }
+@@ -223,9 +227,7 @@
+ 	bv.bv_val = (char *) scheme;
+ 
+ 	for( pws=pw_schemes; pws; pws=pws->next ) {
+-		if( bv.bv_len != pws->s.name.bv_len )
+-			continue;
+-		if( strncasecmp(bv.bv_val, pws->s.name.bv_val, bv.bv_len ) == 0 ) {
++		if ( ber_bvstrcasecmp(&bv, &pws->s.name ) == 0 ) {
+ 			return &(pws->s);
+ 		}
+ 	}
+@@ -317,10 +319,17 @@
+ 	}
+ 
+ #ifdef SLAPD_CLEARTEXT
++	/* Do we think there is a scheme specifier here that we
++	* didn't recognize? Assume a scheme name is at least 1 character.
++	*/
++	if (( passwd->bv_val[0] == '{' ) &&
++		( strchr( passwd->bv_val, '}' ) > passwd->bv_val+1 ))
++	{
++		return 1;
++	}
+ 	if( is_allowed_scheme("{CLEARTEXT}", schemes ) ) {
+-		return (( passwd->bv_len == cred->bv_len ) &&
+-				( passwd->bv_val[0] != '{' /*'}'*/ ))
+-			? memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
++		return ( passwd->bv_len == cred->bv_len ) ?
++			memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
+ 			: 1;
+ 	}
+ #endif
diff --git a/net-nds/openldap/files/openldap-2.2.28-tests.patch b/net-nds/openldap/files/openldap-2.2.28-tests.patch
new file mode 100644
index 000000000000..3845707b2c21
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.28-tests.patch
@@ -0,0 +1,12 @@
+--- ./Makefile.in.orig	2005-01-20 18:01:19.000000000 +0100
++++ ./Makefile.in	2005-12-15 15:02:15.000000000 +0100
+@@ -20,6 +20,9 @@
+ BUILD_HDB=@BUILD_HDB@
+ BUILD_LDBM=@BUILD_LDBM@
+ 
++LD_LIBRARY_PATH=${pwd}../libraries/libldap_r/.libs:${pwd}../libraries/liblber/.libs:${pwd}../libraries/libldap/.libs:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
++
+ test tests:
+ 	@$(MAKE) bdb
+ 	@$(MAKE) hdb