[Pkg-openldap-devel] r1201 - in openldap/trunk/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-02-17 18:39:13 +0000 (Tue, 17 Feb 2009)
New Revision: 1201

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/evolution-ntlm
Log:
Update evolution-ntlm patch to apply to current Makefiles.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-02-17 18:14:59 UTC (rev 1200)
+++ openldap/trunk/debian/changelog	2009-02-17 18:39:13 UTC (rev 1201)
@@ -3,6 +3,7 @@
   * New upstream version
     - Fixes a bug with the pcache overlay not returning cached entries
       (closes: #497697)
+    - Update evolution-ntlm patch to apply to current Makefiles.
   * Build against db4.7 instead of db4.2 at last!  Closes: #421946.
 
  -- Steve Langasek <vorlon at debian.org>  Tue, 17 Feb 2009 09:41:22 -0800

Modified: openldap/trunk/debian/patches/evolution-ntlm
===================================================================
--- openldap/trunk/debian/patches/evolution-ntlm	2009-02-17 18:14:59 UTC (rev 1200)
+++ openldap/trunk/debian/patches/evolution-ntlm	2009-02-17 18:39:13 UTC (rev 1201)
@@ -15,9 +15,9 @@
 ===================================================================
 --- trunk.orig/include/ldap.h
 +++ trunk/include/ldap.h
-@@ -2359,5 +2359,25 @@
- 	int		iscritical,
- 	LDAPControl	**ctrlp ));
+@@ -2461,5 +2461,25 @@
+ 	LDAPControl	**ctrls,
+ 	LDAPDerefRes	**drp ));
  
 +/*
 + * hacks for NTLM
@@ -188,43 +188,43 @@
 ===================================================================
 --- 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 \
+@@ -27,7 +27,7 @@
  	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 \
+ 	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
+ 	assertion.c deref.c
  
  OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -38,7 +38,7 @@
- 	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+@@ -40,7 +40,7 @@
  	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 \
+ 	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
+ 	assertion.lo deref.lo
  
  LDAP_INCDIR= ../../include       
 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 \
+@@ -29,7 +29,7 @@
  	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 \
+ 	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
+ 	assertion.c deref.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 \
-@@ -45,7 +45,7 @@
- 	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+@@ -47,7 +47,7 @@
  	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 \
+ 	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
+ 	assertion.lo deref.lo
  
  LDAP_INCDIR= ../../include