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

[matthijs at alioth.debian.org]

Author: matthijs
Date: 2010-04-25 11:20:49 +0000 (Sun, 25 Apr 2010)
New Revision: 1274

Removed:
   openldap/trunk/debian/patches/shutdown-issue-6322
Modified:
   openldap/trunk/debian/patches/do-not-second-guess-sonames
   openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
   openldap/trunk/debian/patches/libldap-symbol-versions
   openldap/trunk/debian/patches/sasl-default-path
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/patches/wrong-database-location
Log:
 * Remove shutdown-issue-6322, applied upstream
 * Refresh the other patches.


Modified: openldap/trunk/debian/patches/do-not-second-guess-sonames
===================================================================
--- openldap/trunk/debian/patches/do-not-second-guess-sonames	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/do-not-second-guess-sonames	2010-04-25 11:20:49 UTC (rev 1274)
@@ -43,7 +43,7 @@
 ===================================================================
 --- a/servers/slapd/sasl.c
 +++ b/servers/slapd/sasl.c
-@@ -1137,26 +1137,6 @@
+@@ -1146,26 +1146,6 @@
  #endif
  
  #ifdef HAVE_CYRUS_SASL

Modified: openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
===================================================================
--- openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2010-04-25 11:20:49 UTC (rev 1274)
@@ -39,7 +39,7 @@
 ===================================================================
 --- a/libraries/libldap/util-int.c
 +++ b/libraries/libldap/util-int.c
-@@ -224,13 +224,7 @@
+@@ -444,13 +444,7 @@
  	int rc;
  #if defined( HAVE_GETNAMEINFO )
  

Modified: openldap/trunk/debian/patches/libldap-symbol-versions
===================================================================
--- openldap/trunk/debian/patches/libldap-symbol-versions	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/libldap-symbol-versions	2010-04-25 11:20:49 UTC (rev 1274)
@@ -108,7 +108,7 @@
 ===================================================================
 --- a/configure.in
 +++ b/configure.in
-@@ -1894,6 +1894,13 @@
+@@ -1895,6 +1895,13 @@
  fi
  AC_SUBST(LTSTATIC)dnl
  

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/sasl-default-path	2010-04-25 11:20:49 UTC (rev 1274)
@@ -18,7 +18,7 @@
 ===================================================================
 --- a/servers/slapd/sasl.c
 +++ b/servers/slapd/sasl.c
-@@ -1095,12 +1095,38 @@
+@@ -1104,12 +1104,38 @@
  };
  #endif
  

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/series	2010-04-25 11:20:49 UTC (rev 1274)
@@ -9,7 +9,6 @@
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
 do-not-second-guess-sonames
-shutdown-issue-6322
 manpage-tlscyphersuite-additions
 smbk5pwd-makefile
 autogroup-makefile

Deleted: openldap/trunk/debian/patches/shutdown-issue-6322
===================================================================
--- openldap/trunk/debian/patches/shutdown-issue-6322	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/shutdown-issue-6322	2010-04-25 11:20:49 UTC (rev 1274)
@@ -1,35 +0,0 @@
-Index: b/servers/slapd/daemon.c
-===================================================================
---- a/servers/slapd/daemon.c
-+++ b/servers/slapd/daemon.c
-@@ -1720,9 +1720,12 @@
- 
- 	for ( l = 0; slap_listeners[l] != NULL; l++ ) {
- 		Listener *lr = slap_listeners[l];
-+		slap_listeners[l] = NULL;
- 
- 		if ( lr->sl_sd != AC_SOCKET_INVALID ) {
--			if ( remove ) slapd_remove( lr->sl_sd, NULL, 0, 0, 0 );
-+			int s = lr->sl_sd;
-+			lr->sl_sd = AC_SOCKET_INVALID;
-+			if ( remove ) slapd_remove( s, NULL, 0, 0, 0 );
- 
- #ifdef LDAP_PF_LOCAL
- 			if ( lr->sl_sa.sa_addr.sa_family == AF_LOCAL ) {
-@@ -1730,7 +1733,7 @@
- 			}
- #endif /* LDAP_PF_LOCAL */
- 
--			slapd_close( lr->sl_sd );
-+			slapd_close( s );
- 		}
- 
- 		if ( lr->sl_url.bv_val ) {
-@@ -1742,7 +1745,6 @@
- 		}
- 
- 		free( lr );
--		slap_listeners[l] = NULL;
- 	}
- }
- 

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2010-04-25 11:12:30 UTC (rev 1273)
+++ openldap/trunk/debian/patches/wrong-database-location	2010-04-25 11:20:49 UTC (rev 1274)
@@ -20,7 +20,7 @@
 ===================================================================
 --- a/doc/man/man5/slapd.conf.5
 +++ b/doc/man/man5/slapd.conf.5
-@@ -1881,7 +1881,7 @@
+@@ -1899,7 +1899,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.
@@ -62,7 +62,7 @@
 ===================================================================
 --- a/doc/man/man5/slapd-config.5
 +++ b/doc/man/man5/slapd-config.5
-@@ -1919,7 +1919,7 @@
+@@ -1936,7 +1936,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.