[Pkg-openldap-devel] r895 - openldap/trunk/debian/patches

[Steve Langasek]

Author: vorlon
Date: 2007-12-15 10:43:07 +0000 (Sat, 15 Dec 2007)
New Revision: 895

Modified:
   openldap/trunk/debian/patches/libldap-makefile_in
Log:
refresh Debian patches for new upstream version

Modified: openldap/trunk/debian/patches/libldap-makefile_in
===================================================================
--- openldap/trunk/debian/patches/libldap-makefile_in	2007-12-15 10:39:44 UTC (rev 894)
+++ openldap/trunk/debian/patches/libldap-makefile_in	2007-12-15 10:43:07 UTC (rev 895)
@@ -1,51 +1,49 @@
-Part of this patch adds the necessary makefile logic for the NTLM code.
-The rest explicitly links libldap_r against the threading libraries to
-prevent unversioned references to pthread symbols.
+Add the necessary makefile logic for the NTLM code.
 
-The threading part only is ITS#4982.
-
-diff -urNad openldap2.3-2.3.11~/libraries/libldap/Makefile.in openldap2.3-2.3.11/libraries/libldap/Makefile.in
---- openldap2.3-2.3.11~/libraries/libldap/Makefile.in	2005-12-01 13:48:50.000000000 +0100
-+++ openldap2.3-2.3.11/libraries/libldap/Makefile.in	2005-12-02 10:04:11.513209500 +0100
-@@ -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 \
-@@ -31,7 +31,7 @@
+Index: trunk/libraries/libldap/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap/Makefile.in
++++ trunk/libraries/libldap/Makefile.in
+@@ -26,7 +26,7 @@
+ 	request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.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
+ 
  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 \
-diff -urNad openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in openldap2.3-2.3.11/libraries/libldap_r/Makefile.in
---- openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in	2005-12-01 13:48:50.000000000 +0100
-+++ openldap2.3-2.3.11/libraries/libldap_r/Makefile.in	2005-12-02 10:05:17.637342000 +0100
-@@ -22,7 +22,7 @@
- 	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 \
-@@ -38,7 +38,7 @@
- 	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 \
+@@ -37,7 +37,7 @@
+ 	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.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
+ 
+ LDAP_INCDIR= ../../include       
+ LDAP_LIBDIR= ../../libraries
+Index: trunk/libraries/libldap_r/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -28,7 +28,7 @@
+ 	request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.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
+ SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
+ 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+ 	thr_pth.c thr_stub.c thr_debug.c
+@@ -44,7 +44,7 @@
+ 	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.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
+ 
+ LDAP_INCDIR= ../../include       
+ LDAP_LIBDIR= ../../libraries
 @@ -56,7 +56,7 @@
  XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
  XXXLIBS = $(LTHREAD_LIBS)