[gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: openldap-2.4.17-contrib-smbk5pwd.patch openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch slapd-initd

[Robin H. Johnson (robbat2)]

robbat2     09/07/28 21:28:25

  Modified:             openldap-2.4.17-contrib-smbk5pwd.patch slapd-initd
  Added:                openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch
  Log:
  Bug #219371: Install C++ libraries and headers as needed. Bug #233633: Fix compile with USE="samba gnutls". Bug #273699: Fix slapd init ordering. Bug #261186: Build plugins with libtool instead of directly. Bug #279461: Update smbk5pwd building.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch?r1=1.1&r2=1.2

Index: openldap-2.4.17-contrib-smbk5pwd.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- openldap-2.4.17-contrib-smbk5pwd.patch	28 Jul 2009 02:11:25 -0000	1.1
+++ openldap-2.4.17-contrib-smbk5pwd.patch	28 Jul 2009 21:28:25 -0000	1.2
@@ -6,7 +6,7 @@ diff -Nuar --exclude 'openldap-2.4*' --e
  # <http://www.OpenLDAP.org/license.html>.
  
 +#libexecdir=/usr/lib/openldap
-+moduledir=$(libexecdir)/openldap
++moduledir=$(libexecdir)
  LIBTOOL=../../../libtool
 -OPT=-g -O2
 +#OPT=
@@ -56,6 +56,6 @@ diff -Nuar --exclude 'openldap-2.4*' --e
 -	mkdir -p $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --mode=install cp smbk5pwd.la $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --finish $(PREFIX)/lib
-+	mkdir -p $(moduledir)
-+	$(LIBTOOL) --mode=install cp smbk5pwd.la $(moduledir)
-+	$(LIBTOOL) --finish $(libexecdir)
++	mkdir -p $(DESTDIR)$(moduledir)
++	$(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir)
++	$(LIBTOOL) --finish $(DESTDIR)$(libexecdir)



1.3                  net-nds/openldap/files/slapd-initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/slapd-initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/slapd-initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/slapd-initd?r1=1.2&r2=1.3

Index: slapd-initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- slapd-initd	14 Oct 2008 10:29:44 -0000	1.2
+++ slapd-initd	28 Jul 2009 21:28:25 -0000	1.3
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.2 2008/10/14 10:29:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.3 2009/07/28 21:28:25 robbat2 Exp $
 
 depend() {
 	need net
+	before dbus hald avahi-daemon
 }
 
 start() {



1.1                  net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch?rev=1.1&content-type=text/plain

Index: openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch
===================================================================
If GnuTLS is used, the lmpasswd module for USE=samba does not compile.
Forward-port an old Debian patch that upstream never applied.

Signed-off-by: Robin H. Johnson <robbat2@g.o>
Signed-off-by: Steffen Hau <steffen@×××××××.de>
X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633
X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997
X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341

--- openldap-2.4.17.orig/libraries/liblutil/passwd.c	2009-07-27 18:59:19.635995474 -0700
+++ openldap-2.4.17/libraries/liblutil/passwd.c	2009-07-27 19:01:13.588069010 -0700
@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8];
 typedef PK11Context *des_context[1];
 #define DES_ENCRYPT CKA_ENCRYPT
 
+#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
+#	include <gcrypt.h>
+static int gcrypt_init = 0;
+
+typedef const void* des_key;
+typedef unsigned char des_cblock[8];
+typedef des_cblock des_data_block;
+typedef int des_key_schedule; /* unused */
+typedef des_key_schedule des_context; /* unused */
+#define des_failed(encrypted) 0
+#define des_finish(key, schedule) 
+
+#define des_set_key_unchecked( key, key_sched ) \
+  gcry_cipher_setkey( hd, key, 8 )
+
+#define des_ecb_encrypt( input, output, key_sched, enc ) \
+  gcry_cipher_encrypt( hd, *output, 8, *input, 8 )
+
+#define des_set_odd_parity( key ) do {} while(0)
+
 #endif
 
 #endif /* SLAPD_LMHASH */
@@ -651,7 +671,7 @@ static int chk_md5(
 
 #ifdef SLAPD_LMHASH
 
-#if defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS_GNUTLS_H)
 
 /*
  * abstract away setting the parity.
@@ -841,6 +861,19 @@ static int chk_lanman(
 	des_data_block StdText = "KGS!@#$%";
 	des_data_block PasswordHash1, PasswordHash2;
 	char PasswordHash[33], storedPasswordHash[33];
+
+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
+	gcry_cipher_hd_t hd;
+
+	if ( !gcrypt_init ) {
+	  gcry_check_version( GCRYPT_VERSION );
+	  gcrypt_init = 1;
+	}
+
+	schedule = schedule; /* unused - avoid warning */
+
+	gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
 	
 	for( i=0; i<cred->bv_len; i++) {
 		if(cred->bv_val[i] == '\0') {
@@ -883,6 +916,10 @@ static int chk_lanman(
 	strncpy( storedPasswordHash, passwd->bv_val, 32 );
 	storedPasswordHash[32] = '\0';
 	ldap_pvt_str2lower( storedPasswordHash );
+
+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
+	gcry_cipher_close( hd );
+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
 	
 	return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
 }
@@ -1138,6 +1175,19 @@ static int hash_lanman(
 	des_data_block PasswordHash1, PasswordHash2;
 	char PasswordHash[33];
 	
+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
+	gcry_cipher_hd_t hd;
+
+	if ( !gcrypt_init ) {
+	  gcry_check_version( GCRYPT_VERSION );
+	  gcrypt_init = 1;
+	}
+
+	schedule = schedule; /* unused - avoid warning */
+
+	gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+
 	for( i=0; i<passwd->bv_len; i++) {
 		if(passwd->bv_val[i] == '\0') {
 			return LUTIL_PASSWD_ERR;	/* NUL character in password */
@@ -1168,6 +1218,10 @@ static int hash_lanman(
 	
 	hash->bv_val = PasswordHash;
 	hash->bv_len = 32;
+
+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
+	gcry_cipher_close( hd );
+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
 	
 	return pw_string( scheme, hash );
 }