[lfs-patches] r2546 - trunk/openldap

krejzi at linuxfromscratch.org krejzi at linuxfromscratch.org
Thu Oct 25 12:13:08 PDT 2012


Author: krejzi
Date: 2012-10-25 13:13:03 -0600 (Thu, 25 Oct 2012)
New Revision: 2546

Added:
   trunk/openldap/openldap-2.4.33-blfs_paths-1.patch
   trunk/openldap/openldap-2.4.33-ntlm-1.patch
   trunk/openldap/openldap-2.4.33-symbol_versions-1.patch
Removed:
   trunk/openldap/openldap-2.4.30-blfs-paths-1.patch
   trunk/openldap/openldap-2.4.30-ntlm-1.patch
   trunk/openldap/openldap-2.4.30-symbol-versions-1.patch
   trunk/openldap/openldap-2.4.31-blfs-paths-1.patch
   trunk/openldap/openldap-2.4.31-ntlm-1.patch
   trunk/openldap/openldap-2.4.31-symbol-versions-1.patch
   trunk/openldap/openldap-2.4.32-blfs-paths-1.patch
   trunk/openldap/openldap-2.4.32-ntlm-1.patch
   trunk/openldap/openldap-2.4.32-symbol-versions-1.patch
Log:
Rename openldap patches.

Deleted: trunk/openldap/openldap-2.4.30-blfs-paths-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.30-blfs-paths-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.30-blfs-paths-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1,188 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-04-06
-Initial Package Version: 2.4.30
-Upstream Status:         BLFS Specific
-Origin:                  Self
-Description:             Patch changes various installation options, such as ldap database path,
-                         configuration file options, slapd install location, etc.
-
---- openldap.orig/doc/man/man5/slapd-bdb.5	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/doc/man/man5/slapd-bdb.5	2012-04-06 00:18:54.171136608 +0200
-@@ -131,7 +131,7 @@
- associated indexes live.
- A separate directory must be specified for each database.
- The default is
--.BR LOCALSTATEDIR/openldap\-data .
-+.BR LOCALSTATEDIR/lib/openldap .
- .TP
- .B dirtyread
- Allow reads of modified but not yet committed data.
---- openldap.orig/doc/man/man5/slapd.conf.5	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/doc/man/man5/slapd.conf.5	2012-04-06 00:18:54.174136671 +0200
-@@ -1987,7 +1987,7 @@
- # The database directory MUST exist prior to
- # running slapd AND should only be accessible
- # by the slapd/tools. Mode 0700 recommended.
--directory LOCALSTATEDIR/openldap\-data
-+directory LOCALSTATEDIR/lib/openldap
- # Indices to maintain
- index     objectClass  eq
- index     cn,sn,mail   pres,eq,approx,sub
---- openldap.orig/doc/man/man5/slapd-config.5	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/doc/man/man5/slapd-config.5	2012-04-06 00:18:54.194137078 +0200
-@@ -2029,7 +2029,7 @@
- # The database directory MUST exist prior to
- # running slapd AND should only be accessible
- # by the slapd/tools. Mode 0700 recommended.
--olcDbDirectory: LOCALSTATEDIR/openldap\-data
-+olcDbDirectory: LOCALSTATEDIR/lib/openldap
- # Indices to maintain
- olcDbIndex:     objectClass  eq
- olcDbIndex:     cn,sn,mail   pres,eq,approx,sub
---- openldap.orig/include/ldap_defaults.h	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/include/ldap_defaults.h	2012-04-06 00:18:54.200137199 +0200
-@@ -39,7 +39,7 @@
- #define LDAP_ENV_PREFIX "LDAP"
- 
- /* default ldapi:// socket */
--#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
-+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
- 
- /*
-  * SLAPD DEFINITIONS
-@@ -47,7 +47,7 @@
- 	/* location of the default slapd config file */
- #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
- #define SLAPD_DEFAULT_CONFIGDIR		LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
--#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
-+#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
- #define SLAPD_DEFAULT_DB_MODE		0600
- #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
- 	/* default max deref depth for aliases */
---- openldap.orig/libraries/liblber/Makefile.in	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/libraries/liblber/Makefile.in	2012-04-06 00:18:54.204137280 +0200
-@@ -48,6 +48,6 @@
- 
- install-local: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libdir)
--	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
- 	$(LTFINISH) $(DESTDIR)$(libdir)
- 
---- openldap.orig/libraries/libldap/Makefile.in	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/libraries/libldap/Makefile.in	2012-04-06 00:18:54.204137280 +0200
-@@ -68,7 +68,7 @@
- 
- install-local: $(CFFILES) FORCE
- 	-$(MKDIR) $(DESTDIR)$(libdir)
--	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
- 	$(LTFINISH) $(DESTDIR)$(libdir)
- 	-$(MKDIR) $(DESTDIR)$(sysconfdir)
- 	@for i in $(CFFILES); do \
---- openldap.orig/libraries/libldap_r/Makefile.in	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/libraries/libldap_r/Makefile.in	2012-04-06 00:18:54.208137362 +0200
-@@ -83,6 +83,6 @@
- 
- install-local: $(CFFILES) FORCE
- 	-$(MKDIR) $(DESTDIR)$(libdir)
--	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
- 	$(LTFINISH) $(DESTDIR)$(libdir)
- 
---- openldap.orig/servers/slapd/Makefile.in	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/servers/slapd/Makefile.in	2012-04-06 00:18:54.208137362 +0200
-@@ -370,10 +370,10 @@
- 	install-conf install-db-config install-schema install-tools
- 
- install-slapd: FORCE
--	-$(MKDIR) $(DESTDIR)$(libexecdir)
-+	-$(MKDIR) $(DESTDIR)$(sbindir)
- 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
--		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-+		slapd$(EXEEXT) $(DESTDIR)$(sbindir)
- 	@for i in $(SUBDIRS); do \
- 	    if test -d $$i && test -f $$i/Makefile ; then \
- 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
-@@ -439,9 +439,9 @@
- 
- install-db-config: FORCE
- 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
--	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
-+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
- 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
--		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
-+		$(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
- 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
- 		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
- 
-@@ -449,6 +449,6 @@
- 	-$(MKDIR) $(DESTDIR)$(sbindir)
- 	for i in $(SLAPTOOLS); do \
- 		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
--		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
-+		$(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
- 	done
- 
---- openldap.orig/servers/slapd/slapd.conf	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/servers/slapd/slapd.conf	2012-04-06 00:21:12.891992222 +0200
-@@ -10,14 +10,12 @@
- # service AND an understanding of referrals.
- #referral	ldap://root.openldap.org
- 
--pidfile		%LOCALSTATEDIR%/run/slapd.pid
--argsfile	%LOCALSTATEDIR%/run/slapd.args
-+pidfile		%LOCALSTATEDIR%/run/openldap/slapd.pid
-+argsfile	%LOCALSTATEDIR%/run/openldap/slapd.args
- 
- # Load dynamic backend modules:
--# modulepath	%MODULEDIR%
--# moduleload	back_bdb.la
--# moduleload	back_hdb.la
--# moduleload	back_ldap.la
-+modulepath	%MODULEDIR%
-+moduleload	back_bdb
- 
- # Sample security restrictions
- #	Require integrity protection (prevent hijacking)
-@@ -46,20 +44,26 @@
- #
- # rootdn can always read and write EVERYTHING!
- 
-+# Specific Backend Directives for bdb:
-+backend         bdb
-+
- #######################################################################
- # BDB database definitions
- #######################################################################
- 
- database	bdb
- suffix		"dc=my-domain,dc=com"
--rootdn		"cn=Manager,dc=my-domain,dc=com"
-+#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
-+#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	%LOCALSTATEDIR%/openldap-data
-+directory	%LOCALSTATEDIR%/lib/openldap
-+
- # Indices to maintain
- index	objectClass	eq
---- openldap.orig/servers/slapd/slapi/Makefile.in	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/servers/slapd/slapi/Makefile.in	2012-04-06 00:18:54.210137403 +0200
-@@ -46,6 +46,6 @@
- install-local: FORCE
- 	if test "$(BUILD_MOD)" = "yes"; then \
- 		$(MKDIR) $(DESTDIR)$(libdir); \
--		$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
-+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
- 	fi
- 

Deleted: trunk/openldap/openldap-2.4.30-ntlm-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.30-ntlm-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.30-ntlm-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1,219 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-04-06
-Initial Package Version: 2.4.30
-Upstream Status:         Unknown
-Origin:                  Debian
-Description:             Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
-                         actually called by evolution-data-server, checked at version 1.12.2.
-                         Without this patch, the Exchange addressbook integration uses simple binds
-                         with cleartext passwords.
-
---- openldap.orig/include/ldap.h	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/include/ldap.h	2012-04-01 00:20:00.059827789 +0200
-@@ -2517,5 +2517,25 @@
- 	LDAPControl	**ctrls,
- 	LDAPDerefRes	**drp ));
- 
-+/*
-+ * 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 */
---- openldap.orig/libraries/libldap/Makefile.in	2012-04-01 00:18:54.233419658 +0200
-+++ openldap/libraries/libldap/Makefile.in	2012-04-01 00:20:00.060827810 +0200
-@@ -27,7 +27,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- 
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
---- openldap.orig/libraries/libldap/ntlm.c	1970-01-01 01:00:00.000000000 +0100
-+++ openldap/libraries/libldap/ntlm.c	2012-04-01 00:20:00.059827789 +0200
-@@ -0,0 +1,138 @@
-+/* $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 );
-+}
-+
---- openldap.orig/libraries/libldap_r/Makefile.in	2012-04-01 00:18:54.234419703 +0200
-+++ openldap/libraries/libldap_r/Makefile.in	2012-04-01 00:20:00.060827810 +0200
-@@ -29,7 +29,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
- 	thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
-@@ -47,7 +47,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       

Deleted: trunk/openldap/openldap-2.4.30-symbol-versions-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.30-symbol-versions-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.30-symbol-versions-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1,160 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-04-06
-Initial Package Version: 2.4.30
-Upstream Status:         Unknown
-Origin:                  Debian
-Description:             This patch enables symbol versioning in ldap libraries. Without this
-                         patch some applications might generate a warning about missing symbol
-                         versions.
-
---- openldap.orig/build/openldap.m4	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/build/openldap.m4	2012-04-01 17:29:50.973881411 +0200
-@@ -1136,3 +1136,54 @@
- #endif
- 	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
- ])
-+
-+dnl ====================================================================
-+dnl check for symbol versioning support
-+AC_DEFUN([OL_SYMBOL_VERSIONING],
-+[AC_CACHE_CHECK([for .symver assembler directive],
-+	[ol_cv_asm_symver_directive],[
-+cat > conftest.s <<EOF
-+${libc_cv_dot_text}
-+_sym:
-+.symver _sym,sym at VERS
-+EOF
-+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
-+  ol_cv_asm_symver_directive=yes
-+else
-+  ol_cv_asm_symver_directive=no
-+fi
-+rm -f conftest*])
-+AC_CACHE_CHECK([for ld --version-script],
-+	[ol_cv_ld_version_script_option],[
-+if test $ol_cv_asm_symver_directive = yes; then
-+  cat > conftest.s <<EOF
-+${libc_cv_dot_text}
-+_sym:
-+.symver _sym,sym at VERS
-+EOF
-+  cat > conftest.map <<EOF
-+VERS_1 {
-+	global: sym;
-+};
-+
-+VERS_2 {
-+	global: sym;
-+} VERS_1;
-+EOF
-+  if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
-+    if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
-+                                                 -o conftest.so conftest.o
-+                                                 -Wl,--version-script,conftest.map
-+                       1>&AS_MESSAGE_LOG_FD]);
-+    then
-+      ol_cv_ld_version_script_option=yes
-+    else
-+      ol_cv_ld_version_script_option=no
-+    fi
-+  else
-+    ol_cv_ld_version_script_option=no
-+  fi
-+else
-+  ol_cv_ld_version_script_option=no
-+fi
-+rm -f conftest*])])
---- openldap.orig/build/top.mk	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/build/top.mk	2012-04-01 17:29:50.972881390 +0200
-@@ -104,6 +104,9 @@
- # LINK_LIBS referenced in library and module link commands.
- LINK_LIBS = $(MOD_LIBS) $(@PLAT at _LINK_LIBS)
- 
-+# option to pass to $(CC) to support library symbol versioning, if any
-+VERSION_OPTION = @VERSION_OPTION@
-+
- LTSTATIC = @LTSTATIC@
- 
- LTLINK   = $(LIBTOOL) --mode=link \
-@@ -113,7 +116,7 @@
- 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
- 
- LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
--	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
-+	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS)
- 
- LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
- 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
---- openldap.orig/configure.in	2012-02-29 18:37:09.000000000 +0100
-+++ openldap/configure.in	2012-04-01 17:29:50.981881580 +0200
-@@ -1907,6 +1907,13 @@
- fi
- AC_SUBST(LTSTATIC)dnl
- 
-+VERSION_OPTION=""
-+OL_SYMBOL_VERSIONING
-+if test $ol_cv_ld_version_script_option = yes ; then
-+  VERSION_OPTION="-Wl,--version-script="
-+fi
-+AC_SUBST(VERSION_OPTION)
-+
- dnl ----------------------------------------------------------------
- if test $ol_enable_wrappers != no ; then
- 	AC_CHECK_HEADERS(tcpd.h,[
---- openldap.orig/libraries/liblber/liblber.map	1970-01-01 01:00:00.000000000 +0100
-+++ openldap/libraries/liblber/liblber.map	2012-04-01 17:29:50.983881622 +0200
-@@ -0,0 +1,8 @@
-+OPENLDAP_2.4_2 {
-+  global:
-+    ber_*;
-+    der_alloc;
-+    lutil_*;
-+  local:
-+    *;
-+};
---- openldap.orig/libraries/liblber/Makefile.in	2012-04-01 17:27:12.042526978 +0200
-+++ openldap/libraries/liblber/Makefile.in	2012-04-01 17:29:50.982881601 +0200
-@@ -38,6 +38,9 @@
- XXLIBS = 
- NT_LINK_LIBS = $(AC_LIBS)
- UNIX_LINK_LIBS = $(AC_LIBS)
-+ifneq (,$(VERSION_OPTION))
-+  VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map"
-+endif
- 
- dtest:    $(XLIBS) dtest.o
- 	$(LTLINK) -o $@ dtest.o $(LIBS)
---- openldap.orig/libraries/libldap/libldap.map	1970-01-01 01:00:00.000000000 +0100
-+++ openldap/libraries/libldap/libldap.map	2012-04-01 17:29:50.981881580 +0200
-@@ -0,0 +1,7 @@
-+OPENLDAP_2.4_2 {
-+  global:
-+    ldap_*;
-+    ldif_*;
-+  local:
-+    *;
-+};
---- openldap.orig/libraries/libldap/Makefile.in	2012-04-01 17:27:12.043527000 +0200
-+++ openldap/libraries/libldap/Makefile.in	2012-04-01 17:29:50.982881601 +0200
-@@ -52,6 +52,9 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+ifneq (,$(VERSION_OPTION))
-+  VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
-+endif
- 
- apitest:	$(XLIBS) apitest.o
- 	$(LTLINK) -o $@ apitest.o $(LIBS)
---- openldap.orig/libraries/libldap_r/Makefile.in	2012-04-01 17:27:12.043527000 +0200
-+++ openldap/libraries/libldap_r/Makefile.in	2012-04-01 17:29:50.971881369 +0200
-@@ -61,6 +61,9 @@
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
-+ifneq (,$(VERSION_OPTION))
-+  VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
-+endif
- 
- .links : Makefile
- 	@for i in $(XXSRCS); do \

Deleted: trunk/openldap/openldap-2.4.31-blfs-paths-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.31-blfs-paths-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.31-blfs-paths-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1 +0,0 @@
-link openldap-2.4.30-blfs-paths-1.patch
\ No newline at end of file

Deleted: trunk/openldap/openldap-2.4.31-ntlm-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.31-ntlm-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.31-ntlm-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1 +0,0 @@
-link openldap-2.4.30-ntlm-1.patch
\ No newline at end of file

Deleted: trunk/openldap/openldap-2.4.31-symbol-versions-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.31-symbol-versions-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.31-symbol-versions-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1 +0,0 @@
-link openldap-2.4.30-symbol-versions-1.patch
\ No newline at end of file

Deleted: trunk/openldap/openldap-2.4.32-blfs-paths-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.32-blfs-paths-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.32-blfs-paths-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1 +0,0 @@
-link openldap-2.4.30-blfs-paths-1.patch
\ No newline at end of file

Deleted: trunk/openldap/openldap-2.4.32-ntlm-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.32-ntlm-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.32-ntlm-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1 +0,0 @@
-link openldap-2.4.30-ntlm-1.patch
\ No newline at end of file

Deleted: trunk/openldap/openldap-2.4.32-symbol-versions-1.patch
===================================================================
--- trunk/openldap/openldap-2.4.32-symbol-versions-1.patch	2012-10-22 02:47:18 UTC (rev 2545)
+++ trunk/openldap/openldap-2.4.32-symbol-versions-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -1 +0,0 @@
-link openldap-2.4.30-symbol-versions-1.patch
\ No newline at end of file

Copied: trunk/openldap/openldap-2.4.33-blfs_paths-1.patch (from rev 2545, trunk/openldap/openldap-2.4.30-blfs-paths-1.patch)
===================================================================
--- trunk/openldap/openldap-2.4.33-blfs_paths-1.patch	                        (rev 0)
+++ trunk/openldap/openldap-2.4.33-blfs_paths-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -0,0 +1,188 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-04-06
+Initial Package Version: 2.4.30
+Upstream Status:         BLFS Specific
+Origin:                  Self
+Description:             Patch changes various installation options, such as ldap database path,
+                         configuration file options, slapd install location, etc.
+
+--- openldap.orig/doc/man/man5/slapd-bdb.5	2012-02-29 18:37:09.000000000 +0100
++++ openldap/doc/man/man5/slapd-bdb.5	2012-04-06 00:18:54.171136608 +0200
+@@ -131,7 +131,7 @@
+ associated indexes live.
+ A separate directory must be specified for each database.
+ The default is
+-.BR LOCALSTATEDIR/openldap\-data .
++.BR LOCALSTATEDIR/lib/openldap .
+ .TP
+ .B dirtyread
+ Allow reads of modified but not yet committed data.
+--- openldap.orig/doc/man/man5/slapd.conf.5	2012-02-29 18:37:09.000000000 +0100
++++ openldap/doc/man/man5/slapd.conf.5	2012-04-06 00:18:54.174136671 +0200
+@@ -1987,7 +1987,7 @@
+ # The database directory MUST exist prior to
+ # running slapd AND should only be accessible
+ # by the slapd/tools. Mode 0700 recommended.
+-directory LOCALSTATEDIR/openldap\-data
++directory LOCALSTATEDIR/lib/openldap
+ # Indices to maintain
+ index     objectClass  eq
+ index     cn,sn,mail   pres,eq,approx,sub
+--- openldap.orig/doc/man/man5/slapd-config.5	2012-02-29 18:37:09.000000000 +0100
++++ openldap/doc/man/man5/slapd-config.5	2012-04-06 00:18:54.194137078 +0200
+@@ -2029,7 +2029,7 @@
+ # The database directory MUST exist prior to
+ # running slapd AND should only be accessible
+ # by the slapd/tools. Mode 0700 recommended.
+-olcDbDirectory: LOCALSTATEDIR/openldap\-data
++olcDbDirectory: LOCALSTATEDIR/lib/openldap
+ # Indices to maintain
+ olcDbIndex:     objectClass  eq
+ olcDbIndex:     cn,sn,mail   pres,eq,approx,sub
+--- openldap.orig/include/ldap_defaults.h	2012-02-29 18:37:09.000000000 +0100
++++ openldap/include/ldap_defaults.h	2012-04-06 00:18:54.200137199 +0200
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+ 
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+ 
+ /*
+  * SLAPD DEFINITIONS
+@@ -47,7 +47,7 @@
+ 	/* location of the default slapd config file */
+ #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+ #define SLAPD_DEFAULT_CONFIGDIR		LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
+-#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
++#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
+ #define SLAPD_DEFAULT_DB_MODE		0600
+ #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
+ 	/* default max deref depth for aliases */
+--- openldap.orig/libraries/liblber/Makefile.in	2012-02-29 18:37:09.000000000 +0100
++++ openldap/libraries/liblber/Makefile.in	2012-04-06 00:18:54.204137280 +0200
+@@ -48,6 +48,6 @@
+ 
+ install-local: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
+ 	$(LTFINISH) $(DESTDIR)$(libdir)
+ 
+--- openldap.orig/libraries/libldap/Makefile.in	2012-02-29 18:37:09.000000000 +0100
++++ openldap/libraries/libldap/Makefile.in	2012-04-06 00:18:54.204137280 +0200
+@@ -68,7 +68,7 @@
+ 
+ install-local: $(CFFILES) FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
+ 	$(LTFINISH) $(DESTDIR)$(libdir)
+ 	-$(MKDIR) $(DESTDIR)$(sysconfdir)
+ 	@for i in $(CFFILES); do \
+--- openldap.orig/libraries/libldap_r/Makefile.in	2012-02-29 18:37:09.000000000 +0100
++++ openldap/libraries/libldap_r/Makefile.in	2012-04-06 00:18:54.208137362 +0200
+@@ -83,6 +83,6 @@
+ 
+ install-local: $(CFFILES) FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
+ 	$(LTFINISH) $(DESTDIR)$(libdir)
+ 
+--- openldap.orig/servers/slapd/Makefile.in	2012-02-29 18:37:09.000000000 +0100
++++ openldap/servers/slapd/Makefile.in	2012-04-06 00:18:54.208137362 +0200
+@@ -370,10 +370,10 @@
+ 	install-conf install-db-config install-schema install-tools
+ 
+ install-slapd: FORCE
+-	-$(MKDIR) $(DESTDIR)$(libexecdir)
++	-$(MKDIR) $(DESTDIR)$(sbindir)
+ 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
+ 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
+-		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
++		slapd$(EXEEXT) $(DESTDIR)$(sbindir)
+ 	@for i in $(SUBDIRS); do \
+ 	    if test -d $$i && test -f $$i/Makefile ; then \
+ 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
+@@ -439,9 +439,9 @@
+ 
+ install-db-config: FORCE
+ 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+-	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
++	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+-		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
++		$(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+ 		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
+ 
+@@ -449,6 +449,6 @@
+ 	-$(MKDIR) $(DESTDIR)$(sbindir)
+ 	for i in $(SLAPTOOLS); do \
+ 		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+-		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
++		$(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+ 	done
+ 
+--- openldap.orig/servers/slapd/slapd.conf	2012-02-29 18:37:09.000000000 +0100
++++ openldap/servers/slapd/slapd.conf	2012-04-06 00:21:12.891992222 +0200
+@@ -10,14 +10,12 @@
+ # service AND an understanding of referrals.
+ #referral	ldap://root.openldap.org
+ 
+-pidfile		%LOCALSTATEDIR%/run/slapd.pid
+-argsfile	%LOCALSTATEDIR%/run/slapd.args
++pidfile		%LOCALSTATEDIR%/run/openldap/slapd.pid
++argsfile	%LOCALSTATEDIR%/run/openldap/slapd.args
+ 
+ # Load dynamic backend modules:
+-# modulepath	%MODULEDIR%
+-# moduleload	back_bdb.la
+-# moduleload	back_hdb.la
+-# moduleload	back_ldap.la
++modulepath	%MODULEDIR%
++moduleload	back_bdb
+ 
+ # Sample security restrictions
+ #	Require integrity protection (prevent hijacking)
+@@ -46,20 +44,26 @@
+ #
+ # rootdn can always read and write EVERYTHING!
+ 
++# Specific Backend Directives for bdb:
++backend         bdb
++
+ #######################################################################
+ # BDB database definitions
+ #######################################################################
+ 
+ database	bdb
+ suffix		"dc=my-domain,dc=com"
+-rootdn		"cn=Manager,dc=my-domain,dc=com"
++#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
++#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	%LOCALSTATEDIR%/openldap-data
++directory	%LOCALSTATEDIR%/lib/openldap
++
+ # Indices to maintain
+ index	objectClass	eq
+--- openldap.orig/servers/slapd/slapi/Makefile.in	2012-02-29 18:37:09.000000000 +0100
++++ openldap/servers/slapd/slapi/Makefile.in	2012-04-06 00:18:54.210137403 +0200
+@@ -46,6 +46,6 @@
+ install-local: FORCE
+ 	if test "$(BUILD_MOD)" = "yes"; then \
+ 		$(MKDIR) $(DESTDIR)$(libdir); \
+-		$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
++		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
+ 	fi
+ 

Copied: trunk/openldap/openldap-2.4.33-ntlm-1.patch (from rev 2545, trunk/openldap/openldap-2.4.30-ntlm-1.patch)
===================================================================
--- trunk/openldap/openldap-2.4.33-ntlm-1.patch	                        (rev 0)
+++ trunk/openldap/openldap-2.4.33-ntlm-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -0,0 +1,219 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-04-06
+Initial Package Version: 2.4.30
+Upstream Status:         Unknown
+Origin:                  Debian
+Description:             Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
+                         actually called by evolution-data-server, checked at version 1.12.2.
+                         Without this patch, the Exchange addressbook integration uses simple binds
+                         with cleartext passwords.
+
+--- openldap.orig/include/ldap.h	2012-02-29 18:37:09.000000000 +0100
++++ openldap/include/ldap.h	2012-04-01 00:20:00.059827789 +0200
+@@ -2517,5 +2517,25 @@
+ 	LDAPControl	**ctrls,
+ 	LDAPDerefRes	**drp ));
+ 
++/*
++ * 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 */
+--- openldap.orig/libraries/libldap/Makefile.in	2012-04-01 00:18:54.233419658 +0200
++++ openldap/libraries/libldap/Makefile.in	2012-04-01 00:20:00.060827810 +0200
+@@ -27,7 +27,7 @@
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ 	tls2.c tls_o.c tls_g.c tls_m.c \
+-	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ 	assertion.c deref.c ldif.c fetch.c
+ 
+ OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+-	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ 	assertion.lo deref.lo ldif.lo fetch.lo
+ 
+ LDAP_INCDIR= ../../include       
+--- openldap.orig/libraries/libldap/ntlm.c	1970-01-01 01:00:00.000000000 +0100
++++ openldap/libraries/libldap/ntlm.c	2012-04-01 00:20:00.059827789 +0200
+@@ -0,0 +1,138 @@
++/* $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 );
++}
++
+--- openldap.orig/libraries/libldap_r/Makefile.in	2012-04-01 00:18:54.234419703 +0200
++++ openldap/libraries/libldap_r/Makefile.in	2012-04-01 00:20:00.060827810 +0200
+@@ -29,7 +29,7 @@
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ 	tls2.c tls_o.c tls_g.c tls_m.c \
+-	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ 	assertion.c deref.c ldif.c fetch.c
+ SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
+ 	thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+-	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ 	assertion.lo deref.lo ldif.lo fetch.lo
+ 
+ LDAP_INCDIR= ../../include       

Copied: trunk/openldap/openldap-2.4.33-symbol_versions-1.patch (from rev 2545, trunk/openldap/openldap-2.4.30-symbol-versions-1.patch)
===================================================================
--- trunk/openldap/openldap-2.4.33-symbol_versions-1.patch	                        (rev 0)
+++ trunk/openldap/openldap-2.4.33-symbol_versions-1.patch	2012-10-25 19:13:03 UTC (rev 2546)
@@ -0,0 +1,160 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-04-06
+Initial Package Version: 2.4.30
+Upstream Status:         Unknown
+Origin:                  Debian
+Description:             This patch enables symbol versioning in ldap libraries. Without this
+                         patch some applications might generate a warning about missing symbol
+                         versions.
+
+--- openldap.orig/build/openldap.m4	2012-02-29 18:37:09.000000000 +0100
++++ openldap/build/openldap.m4	2012-04-01 17:29:50.973881411 +0200
+@@ -1136,3 +1136,54 @@
+ #endif
+ 	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
+ ])
++
++dnl ====================================================================
++dnl check for symbol versioning support
++AC_DEFUN([OL_SYMBOL_VERSIONING],
++[AC_CACHE_CHECK([for .symver assembler directive],
++	[ol_cv_asm_symver_directive],[
++cat > conftest.s <<EOF
++${libc_cv_dot_text}
++_sym:
++.symver _sym,sym at VERS
++EOF
++if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
++  ol_cv_asm_symver_directive=yes
++else
++  ol_cv_asm_symver_directive=no
++fi
++rm -f conftest*])
++AC_CACHE_CHECK([for ld --version-script],
++	[ol_cv_ld_version_script_option],[
++if test $ol_cv_asm_symver_directive = yes; then
++  cat > conftest.s <<EOF
++${libc_cv_dot_text}
++_sym:
++.symver _sym,sym at VERS
++EOF
++  cat > conftest.map <<EOF
++VERS_1 {
++	global: sym;
++};
++
++VERS_2 {
++	global: sym;
++} VERS_1;
++EOF
++  if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
++    if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
++                                                 -o conftest.so conftest.o
++                                                 -Wl,--version-script,conftest.map
++                       1>&AS_MESSAGE_LOG_FD]);
++    then
++      ol_cv_ld_version_script_option=yes
++    else
++      ol_cv_ld_version_script_option=no
++    fi
++  else
++    ol_cv_ld_version_script_option=no
++  fi
++else
++  ol_cv_ld_version_script_option=no
++fi
++rm -f conftest*])])
+--- openldap.orig/build/top.mk	2012-02-29 18:37:09.000000000 +0100
++++ openldap/build/top.mk	2012-04-01 17:29:50.972881390 +0200
+@@ -104,6 +104,9 @@
+ # LINK_LIBS referenced in library and module link commands.
+ LINK_LIBS = $(MOD_LIBS) $(@PLAT at _LINK_LIBS)
+ 
++# option to pass to $(CC) to support library symbol versioning, if any
++VERSION_OPTION = @VERSION_OPTION@
++
+ LTSTATIC = @LTSTATIC@
+ 
+ LTLINK   = $(LIBTOOL) --mode=link \
+@@ -113,7 +116,7 @@
+ 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
+ 
+ LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
+-	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
++	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS)
+ 
+ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
+ 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
+--- openldap.orig/configure.in	2012-02-29 18:37:09.000000000 +0100
++++ openldap/configure.in	2012-04-01 17:29:50.981881580 +0200
+@@ -1907,6 +1907,13 @@
+ fi
+ AC_SUBST(LTSTATIC)dnl
+ 
++VERSION_OPTION=""
++OL_SYMBOL_VERSIONING
++if test $ol_cv_ld_version_script_option = yes ; then
++  VERSION_OPTION="-Wl,--version-script="
++fi
++AC_SUBST(VERSION_OPTION)
++
+ dnl ----------------------------------------------------------------
+ if test $ol_enable_wrappers != no ; then
+ 	AC_CHECK_HEADERS(tcpd.h,[
+--- openldap.orig/libraries/liblber/liblber.map	1970-01-01 01:00:00.000000000 +0100
++++ openldap/libraries/liblber/liblber.map	2012-04-01 17:29:50.983881622 +0200
+@@ -0,0 +1,8 @@
++OPENLDAP_2.4_2 {
++  global:
++    ber_*;
++    der_alloc;
++    lutil_*;
++  local:
++    *;
++};
+--- openldap.orig/libraries/liblber/Makefile.in	2012-04-01 17:27:12.042526978 +0200
++++ openldap/libraries/liblber/Makefile.in	2012-04-01 17:29:50.982881601 +0200
+@@ -38,6 +38,9 @@
+ XXLIBS = 
+ NT_LINK_LIBS = $(AC_LIBS)
+ UNIX_LINK_LIBS = $(AC_LIBS)
++ifneq (,$(VERSION_OPTION))
++  VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map"
++endif
+ 
+ dtest:    $(XLIBS) dtest.o
+ 	$(LTLINK) -o $@ dtest.o $(LIBS)
+--- openldap.orig/libraries/libldap/libldap.map	1970-01-01 01:00:00.000000000 +0100
++++ openldap/libraries/libldap/libldap.map	2012-04-01 17:29:50.981881580 +0200
+@@ -0,0 +1,7 @@
++OPENLDAP_2.4_2 {
++  global:
++    ldap_*;
++    ldif_*;
++  local:
++    *;
++};
+--- openldap.orig/libraries/libldap/Makefile.in	2012-04-01 17:27:12.043527000 +0200
++++ openldap/libraries/libldap/Makefile.in	2012-04-01 17:29:50.982881601 +0200
+@@ -52,6 +52,9 @@
+ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
++ifneq (,$(VERSION_OPTION))
++  VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
++endif
+ 
+ apitest:	$(XLIBS) apitest.o
+ 	$(LTLINK) -o $@ apitest.o $(LIBS)
+--- openldap.orig/libraries/libldap_r/Makefile.in	2012-04-01 17:27:12.043527000 +0200
++++ openldap/libraries/libldap_r/Makefile.in	2012-04-01 17:29:50.971881369 +0200
+@@ -61,6 +61,9 @@
+ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
++ifneq (,$(VERSION_OPTION))
++  VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
++endif
+ 
+ .links : Makefile
+ 	@for i in $(XXSRCS); do \




More information about the patches mailing list