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

[matthijs at alioth.debian.org]

Author: matthijs
Date: 2011-03-27 11:08:00 +0000 (Sun, 27 Mar 2011)
New Revision: 1351

Removed:
   openldap/trunk/debian/patches/issue-6534-patch
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/evolution-ntlm
   openldap/trunk/debian/patches/man-slapd
   openldap/trunk/debian/patches/series
Log:
 * Refresh patches.
 * Remove patches applied upstream.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-03-27 11:00:20 UTC (rev 1350)
+++ openldap/trunk/debian/changelog	2011-03-27 11:08:00 UTC (rev 1351)
@@ -3,6 +3,7 @@
   * New upstream version
   * Refresh all patches
   * Remove manpage-tlscyphersuite-additions, applied upstream
+  * Remove issue-6534-patch, applied upstream
   * Add Slovak translation, thanks Slavko <linux at slavino.sk> (Closes: #608699)
   * Add debian specific patch for ldap.conf. Add TLS_CACERT option and set it
     by default to /etc/ssl/certs/ca-certificates.crt (Closes: #555409, #616703)
@@ -10,7 +11,7 @@
   * Add slapschema, just hardlink it (Closes: #601569)
   * Update patch service-operational-before-detach (Closes: #616164)
 
- -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sun, 27 Mar 2011 13:00:02 +0200
+ -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sun, 27 Mar 2011 13:07:17 +0200
 
 openldap (2.4.23-7) unstable; urgency=low
 

Modified: openldap/trunk/debian/patches/evolution-ntlm
===================================================================
--- openldap/trunk/debian/patches/evolution-ntlm	2011-03-27 11:00:20 UTC (rev 1350)
+++ openldap/trunk/debian/patches/evolution-ntlm	2011-03-27 11:08:00 UTC (rev 1351)
@@ -188,7 +188,7 @@
  	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
+ 	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 @@
@@ -197,7 +197,7 @@
  	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
+ 	assertion.lo deref.lo ldif.lo fetch.lo
  
  LDAP_INCDIR= ../../include       
 --- a/libraries/libldap_r/Makefile.in
@@ -208,7 +208,7 @@
  	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
+ 	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 @@
@@ -217,6 +217,6 @@
  	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
+ 	assertion.lo deref.lo ldif.lo fetch.lo
  
  LDAP_INCDIR= ../../include       

Deleted: openldap/trunk/debian/patches/issue-6534-patch
===================================================================
--- openldap/trunk/debian/patches/issue-6534-patch	2011-03-27 11:00:20 UTC (rev 1350)
+++ openldap/trunk/debian/patches/issue-6534-patch	2011-03-27 11:08:00 UTC (rev 1351)
@@ -1,11 +0,0 @@
---- a/libraries/liblutil/detach.c
-+++ b/libraries/liblutil/detach.c
-@@ -128,7 +128,7 @@
- 
- #ifdef HAVE_SETSID
- 		(void) setsid();
--#elif TIOCNOTTY
-+#elif defined(TIOCNOTTY)
- 		if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
- 			(void) ioctl( sd, TIOCNOTTY, NULL );
- 			(void) close( sd );

Modified: openldap/trunk/debian/patches/man-slapd
===================================================================
--- openldap/trunk/debian/patches/man-slapd	2011-03-27 11:00:20 UTC (rev 1350)
+++ openldap/trunk/debian/patches/man-slapd	2011-03-27 11:08:00 UTC (rev 1351)
@@ -31,7 +31,7 @@
  If \fIdebug-level\fP is \fB?\fP, a list of installed debug-levels is printed,
  and slapd exits.
  
-@@ -301,7 +300,7 @@
+@@ -317,7 +316,7 @@
  .LP
  .nf
  .ft tt
@@ -40,7 +40,7 @@
  .ft
  .fi
  .LP
-@@ -312,7 +311,7 @@
+@@ -328,7 +327,7 @@
  .LP
  .nf
  .ft tt
@@ -49,7 +49,7 @@
  .ft
  .fi
  .LP
-@@ -320,7 +319,7 @@
+@@ -336,7 +335,7 @@
  .LP
  .nf
  .ft tt

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2011-03-27 11:00:20 UTC (rev 1350)
+++ openldap/trunk/debian/patches/series	2011-03-27 11:08:00 UTC (rev 1351)
@@ -11,7 +11,6 @@
 do-not-second-guess-sonames
 smbk5pwd-makefile
 autogroup-makefile
-issue-6534-patch
 ldap-conf-tls-cacertdir
 service-operational-before-detach
 add-tlscacert-option-to-ldap-conf