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

[rra at alioth.debian.org]

Author: rra
Date: 2008-05-26 18:37:45 +0000 (Mon, 26 May 2008)
New Revision: 1137

Modified:
   openldap/trunk/debian/patches/gnutls-ciphers
   openldap/trunk/debian/patches/index-files-created-as-root
   openldap/trunk/debian/patches/libldap-symbol-versions
   openldap/trunk/debian/patches/sasl-default-path
   openldap/trunk/debian/patches/wrong-database-location
Log:
Unfuzzy patches.


Modified: openldap/trunk/debian/patches/gnutls-ciphers
===================================================================
--- openldap/trunk/debian/patches/gnutls-ciphers	2008-05-26 18:17:52 UTC (rev 1136)
+++ openldap/trunk/debian/patches/gnutls-ciphers	2008-05-26 18:37:45 UTC (rev 1137)
@@ -5,10 +5,8 @@
 
 Addresses ITS#5341.
 
-Index: trunk/libraries/libldap/tls.c
-===================================================================
---- trunk.orig/libraries/libldap/tls.c
-+++ trunk/libraries/libldap/tls.c
+--- openldap.orig/libraries/libldap/tls.c
++++ openldap/libraries/libldap/tls.c
 @@ -300,6 +300,7 @@
  		for (i=0; i<n_ciphers; i++) {
  			if ( !strncasecmp( ciphers[i].name, ptr, len )) {
@@ -17,7 +15,7 @@
  				break;
  			}
  		}
-@@ -330,6 +331,7 @@
+@@ -331,6 +332,7 @@
  			 * only appear once in each list.
  			 */
  			if ( !strncasecmp( ciphers[i].name, ptr, len )) {

Modified: openldap/trunk/debian/patches/index-files-created-as-root
===================================================================
--- openldap/trunk/debian/patches/index-files-created-as-root	2008-05-26 18:17:52 UTC (rev 1136)
+++ openldap/trunk/debian/patches/index-files-created-as-root	2008-05-26 18:37:45 UTC (rev 1137)
@@ -13,7 +13,7 @@
 
 --- doc/man/man8/slapindex.8.orig
 +++ doc/man/man8/slapindex.8
-@@ -129,6 +129,10 @@
+@@ -131,6 +131,10 @@
  should not be running (at least, not in read-write
  mode) when you do this to ensure consistency of the database.
  .LP

Modified: openldap/trunk/debian/patches/libldap-symbol-versions
===================================================================
--- openldap/trunk/debian/patches/libldap-symbol-versions	2008-05-26 18:17:52 UTC (rev 1136)
+++ openldap/trunk/debian/patches/libldap-symbol-versions	2008-05-26 18:37:45 UTC (rev 1137)
@@ -100,7 +100,7 @@
 +rm -f conftest*])])
 --- openldap.orig/configure.in
 +++ openldap/configure.in
-@@ -1858,6 +1858,13 @@
+@@ -1863,6 +1863,13 @@
  fi
  AC_SUBST(LTSTATIC)dnl
  

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2008-05-26 18:17:52 UTC (rev 1136)
+++ openldap/trunk/debian/patches/sasl-default-path	2008-05-26 18:37:45 UTC (rev 1137)
@@ -14,7 +14,7 @@
  #endif /* _LDAP_CONFIG_H */
 --- servers/slapd/sasl.c.orig
 +++ servers/slapd/sasl.c
-@@ -1181,12 +1181,38 @@
+@@ -1071,12 +1071,38 @@
  };
  #endif
  

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2008-05-26 18:17:52 UTC (rev 1136)
+++ openldap/trunk/debian/patches/wrong-database-location	2008-05-26 18:37:45 UTC (rev 1137)
@@ -5,7 +5,7 @@
 
 --- doc/man/man5/slapd-bdb.5.orig
 +++ doc/man/man5/slapd-bdb.5
-@@ -97,7 +97,7 @@
+@@ -116,7 +116,7 @@
  associated indexes live.
  A separate directory must be specified for each database.
  The default is