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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-06-28 16:09:46 +0000 (Sat, 28 Jun 2008)
New Revision: 1152

Modified:
   openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
   openldap/trunk/debian/patches/wrong-database-location
Log:
quilt refresh

Modified: openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
===================================================================
--- openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2008-06-28 16:09:29 UTC (rev 1151)
+++ openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2008-06-28 16:09:46 UTC (rev 1152)
@@ -17,7 +17,7 @@
 ===================================================================
 --- trunk.orig/libraries/libldap/os-ip.c
 +++ trunk/libraries/libldap/os-ip.c
-@@ -471,17 +471,8 @@
+@@ -477,17 +477,8 @@
  	hints.ai_socktype = socktype;
  	snprintf(serv, sizeof serv, "%d", port );
  

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2008-06-28 16:09:29 UTC (rev 1151)
+++ openldap/trunk/debian/patches/wrong-database-location	2008-06-28 16:09:46 UTC (rev 1152)
@@ -3,6 +3,8 @@
 
 Debian-specific.
 
+Index: doc/man/man5/slapd-bdb.5
+===================================================================
 --- doc/man/man5/slapd-bdb.5.orig
 +++ doc/man/man5/slapd-bdb.5
 @@ -116,7 +116,7 @@
@@ -14,9 +16,11 @@
  .TP
  .B dirtyread
  Allow reads of modified but not yet committed data.
+Index: doc/man/man5/slapd.conf.5
+===================================================================
 --- doc/man/man5/slapd.conf.5.orig
 +++ doc/man/man5/slapd.conf.5
-@@ -1811,7 +1811,7 @@
+@@ -1765,7 +1765,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.
@@ -25,6 +29,8 @@
  # Indices to maintain
  index     objectClass  eq
  index     cn,sn,mail   pres,eq,approx,sub
+Index: include/ldap_defaults.h
+===================================================================
 --- include/ldap_defaults.h.orig
 +++ include/ldap_defaults.h
 @@ -47,7 +47,7 @@
@@ -36,6 +42,8 @@
  #define SLAPD_DEFAULT_DB_MODE		0600
  #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
  	/* default max deref depth for aliases */
+Index: servers/slapd/Makefile.in
+===================================================================
 --- servers/slapd/Makefile.in.orig
 +++ servers/slapd/Makefile.in
 @@ -430,9 +430,9 @@
@@ -50,9 +58,11 @@
  	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
  		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
  
+Index: doc/man/man5/slapd-config.5
+===================================================================
 --- doc/man/man5/slapd-config.5.orig
 +++ doc/man/man5/slapd-config.5
-@@ -1840,7 +1840,7 @@
+@@ -1855,7 +1855,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.