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

matthijs at alioth.debian.org matthijs at alioth.debian.org
Mon Jul 12 10:09:46 UTC 2010 

tags 513270 pending
thanks

Author: matthijs
Date: 2010-07-12 10:09:37 +0000 (Mon, 12 Jul 2010)
New Revision: 1285

Added:
   openldap/trunk/debian/patches/ldap-conf-tls-cacertdir
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/add-autogen-sh
   openldap/trunk/debian/patches/autogroup-makefile
   openldap/trunk/debian/patches/do-not-second-guess-sonames
   openldap/trunk/debian/patches/evolution-ntlm
   openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
   openldap/trunk/debian/patches/index-files-created-as-root
   openldap/trunk/debian/patches/issue-6534-patch
   openldap/trunk/debian/patches/ldapi-socket-place
   openldap/trunk/debian/patches/libldap-symbol-versions
   openldap/trunk/debian/patches/man-slapd
   openldap/trunk/debian/patches/manpage-tlscyphersuite-additions
   openldap/trunk/debian/patches/sasl-default-path
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/patches/slapi-errorlog-file
   openldap/trunk/debian/patches/smbk5pwd-makefile
   openldap/trunk/debian/patches/wrong-database-location
Log:
 * Refreshed all quilt patches
 * Add documentation patch


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/changelog	2010-07-12 10:09:37 UTC (rev 1285)
@@ -2,12 +2,13 @@
 
   * New upstream version
   * Change to build dependency libdb4.8-dev instead of libdb4.7-dev
-  * Fix a FTBFS on kfreebsd-* (Closes: #579221)
   * Updated french translation thanks Christian Perrier (Closes: #579192)
   * Updated swedish translation thanks Martin Bagge (Closes: #580145)
   * Updated german translation thanks Helge Kreutzmann (Closes: #579582)
   * Updated russian translation thanks Yuri Kozlov (Closes: #585688)
   * Fix bashisms in debian/rules (Closes: #581454)
+  * Add documentation patch (Closes: #513270)
+  * Refreshed all quilt patches.
 
  -- Matthijs Mohlmann <matthijs at cacholong.nl>  Mon, 12 Jul 2010 09:33:13 +0200
 

Modified: openldap/trunk/debian/patches/add-autogen-sh
===================================================================
--- openldap/trunk/debian/patches/add-autogen-sh	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/add-autogen-sh	2010-07-12 10:09:37 UTC (rev 1285)
@@ -6,8 +6,8 @@
 
 Index: b/autogen.sh
 ===================================================================
---- /dev/null
-+++ b/autogen.sh
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/autogen.sh	2010-07-12 12:07:21.000000000 +0200
 @@ -0,0 +1,29 @@
 +#!/bin/sh
 +#

Modified: openldap/trunk/debian/patches/autogroup-makefile
===================================================================
--- openldap/trunk/debian/patches/autogroup-makefile	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/autogroup-makefile	2010-07-12 10:09:37 UTC (rev 1285)
@@ -1,7 +1,7 @@
 Index: b/contrib/slapd-modules/autogroup/Makefile
 ===================================================================
---- a/contrib/slapd-modules/autogroup/Makefile
-+++ b/contrib/slapd-modules/autogroup/Makefile
+--- a/contrib/slapd-modules/autogroup/Makefile	2010-07-12 12:05:36.000000000 +0200
++++ b/contrib/slapd-modules/autogroup/Makefile	2010-07-12 12:07:34.000000000 +0200
 @@ -1,6 +1,6 @@
 -LIBTOOL=../../../libtool
 +LIBTOOL=../../../debian/build/libtool

Modified: openldap/trunk/debian/patches/do-not-second-guess-sonames
===================================================================
--- openldap/trunk/debian/patches/do-not-second-guess-sonames	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/do-not-second-guess-sonames	2010-07-12 10:09:37 UTC (rev 1285)
@@ -8,8 +8,8 @@
 
 Index: b/libraries/libldap/cyrus.c
 ===================================================================
---- a/libraries/libldap/cyrus.c
-+++ b/libraries/libldap/cyrus.c
+--- a/libraries/libldap/cyrus.c	2010-07-12 12:05:37.000000000 +0200
++++ b/libraries/libldap/cyrus.c	2010-07-12 12:07:31.000000000 +0200
 @@ -78,28 +78,6 @@
  	/* XXX not threadsafe */
  	static int sasl_initialized = 0;
@@ -41,8 +41,8 @@
  	}
 Index: b/servers/slapd/sasl.c
 ===================================================================
---- a/servers/slapd/sasl.c
-+++ b/servers/slapd/sasl.c
+--- a/servers/slapd/sasl.c	2010-07-12 12:07:27.000000000 +0200
++++ b/servers/slapd/sasl.c	2010-07-12 12:07:31.000000000 +0200
 @@ -1146,26 +1146,6 @@
  #endif
  

Modified: openldap/trunk/debian/patches/evolution-ntlm
===================================================================
--- openldap/trunk/debian/patches/evolution-ntlm	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/evolution-ntlm	2010-07-12 10:09:37 UTC (rev 1285)
@@ -13,9 +13,9 @@
 
 Index: b/include/ldap.h
 ===================================================================
---- a/include/ldap.h
-+++ b/include/ldap.h
-@@ -2486,5 +2486,25 @@
+--- a/include/ldap.h	2010-07-12 12:05:43.000000000 +0200
++++ b/include/ldap.h	2010-07-12 12:07:19.000000000 +0200
+@@ -2487,5 +2487,25 @@
  	LDAPControl	**ctrls,
  	LDAPDerefRes	**drp ));
  
@@ -43,8 +43,8 @@
  #endif /* _LDAP_H */
 Index: b/libraries/libldap/ntlm.c
 ===================================================================
---- /dev/null
-+++ b/libraries/libldap/ntlm.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/libraries/libldap/ntlm.c	2010-07-12 12:07:19.000000000 +0200
 @@ -0,0 +1,138 @@
 +/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
 +/*
@@ -186,8 +186,8 @@
 +
 Index: b/libraries/libldap/Makefile.in
 ===================================================================
---- a/libraries/libldap/Makefile.in
-+++ b/libraries/libldap/Makefile.in
+--- a/libraries/libldap/Makefile.in	2010-07-12 12:05:43.000000000 +0200
++++ b/libraries/libldap/Makefile.in	2010-07-12 12:07:19.000000000 +0200
 @@ -27,7 +27,7 @@
  	init.c options.c print.c string.c util-int.c schema.c \
  	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
@@ -208,8 +208,8 @@
  LDAP_INCDIR= ../../include       
 Index: b/libraries/libldap_r/Makefile.in
 ===================================================================
---- a/libraries/libldap_r/Makefile.in
-+++ b/libraries/libldap_r/Makefile.in
+--- a/libraries/libldap_r/Makefile.in	2010-07-12 12:05:42.000000000 +0200
++++ b/libraries/libldap_r/Makefile.in	2010-07-12 12:07:19.000000000 +0200
 @@ -29,7 +29,7 @@
  	init.c options.c print.c string.c util-int.c schema.c \
  	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \

Modified: openldap/trunk/debian/patches/getaddrinfo-is-threadsafe
===================================================================
--- openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/getaddrinfo-is-threadsafe	2010-07-12 10:09:37 UTC (rev 1285)
@@ -15,8 +15,8 @@
 
 Index: b/libraries/libldap/os-ip.c
 ===================================================================
---- a/libraries/libldap/os-ip.c
-+++ b/libraries/libldap/os-ip.c
+--- a/libraries/libldap/os-ip.c	2010-07-12 12:05:38.000000000 +0200
++++ b/libraries/libldap/os-ip.c	2010-07-12 12:07:30.000000000 +0200
 @@ -592,17 +592,8 @@
  	hints.ai_socktype = socktype;
  	snprintf(serv, sizeof serv, "%d", port );
@@ -37,8 +37,8 @@
  			AC_GAI_STRERROR(err), 0, 0);
 Index: b/libraries/libldap/util-int.c
 ===================================================================
---- a/libraries/libldap/util-int.c
-+++ b/libraries/libldap/util-int.c
+--- a/libraries/libldap/util-int.c	2010-07-12 12:05:37.000000000 +0200
++++ b/libraries/libldap/util-int.c	2010-07-12 12:07:30.000000000 +0200
 @@ -444,13 +444,7 @@
  	int rc;
  #if defined( HAVE_GETNAMEINFO )

Modified: openldap/trunk/debian/patches/index-files-created-as-root
===================================================================
--- openldap/trunk/debian/patches/index-files-created-as-root	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/index-files-created-as-root	2010-07-12 10:09:37 UTC (rev 1285)
@@ -13,8 +13,8 @@
 
 Index: b/doc/man/man8/slapindex.8
 ===================================================================
---- a/doc/man/man8/slapindex.8
-+++ b/doc/man/man8/slapindex.8
+--- a/doc/man/man8/slapindex.8	2010-07-12 12:05:40.000000000 +0200
++++ b/doc/man/man8/slapindex.8	2010-07-12 12:07:26.000000000 +0200
 @@ -148,6 +148,10 @@
  should not be running (at least, not in read-write
  mode) when you do this to ensure consistency of the database.
@@ -28,8 +28,8 @@
  .SH EXAMPLES
 Index: b/servers/slapd/slapindex.c
 ===================================================================
---- a/servers/slapd/slapindex.c
-+++ b/servers/slapd/slapindex.c
+--- a/servers/slapd/slapindex.c	2010-07-12 12:05:39.000000000 +0200
++++ b/servers/slapd/slapindex.c	2010-07-12 12:07:26.000000000 +0200
 @@ -34,6 +34,8 @@
  int
  slapindex( int argc, char **argv )

Modified: openldap/trunk/debian/patches/issue-6534-patch
===================================================================
--- openldap/trunk/debian/patches/issue-6534-patch	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/issue-6534-patch	2010-07-12 10:09:37 UTC (rev 1285)
@@ -1,7 +1,7 @@
 Index: b/libraries/liblutil/detach.c
 ===================================================================
---- a/libraries/liblutil/detach.c
-+++ b/libraries/liblutil/detach.c
+--- a/libraries/liblutil/detach.c	2010-07-12 12:05:35.000000000 +0200
++++ b/libraries/liblutil/detach.c	2010-07-12 12:07:36.000000000 +0200
 @@ -128,7 +128,7 @@
  
  #ifdef HAVE_SETSID

Added: openldap/trunk/debian/patches/ldap-conf-tls-cacertdir
===================================================================
--- openldap/trunk/debian/patches/ldap-conf-tls-cacertdir	                        (rev 0)
+++ openldap/trunk/debian/patches/ldap-conf-tls-cacertdir	2010-07-12 10:09:37 UTC (rev 1285)
@@ -0,0 +1,31 @@
+Index: b/doc/man/man5/ldap.conf.5
+===================================================================
+--- a/doc/man/man5/ldap.conf.5	2010-07-12 12:07:32.000000000 +0200
++++ b/doc/man/man5/ldap.conf.5	2010-07-12 12:07:37.000000000 +0200
+@@ -317,7 +317,7 @@
+ .B TLS_CACERT
+ is always used before
+ .B TLS_CACERTDIR.
+-This parameter is ignored with GNUtls.
++This parameter is ignored with GNUtls. On Debian openldap is linked against GNUtls.
+ .TP
+ .B TLS_CERT <filename>
+ Specifies the file that contains the client certificate.
+@@ -368,7 +368,7 @@
+ Specifies the file to obtain random bits from when /dev/[u]random is
+ not available. Generally set to the name of the EGD/PRNGD socket.
+ The environment variable RANDFILE can also be used to specify the filename.
+-This parameter is ignored with GNUtls.
++This parameter is ignored with GNUtls. On Debian openldap is linked against GNUtls.
+ .TP
+ .B TLS_REQCERT <level>
+ Specifies what checks to perform on server certificates in a TLS session,
+@@ -401,7 +401,7 @@
+ used to verify if the server certificates have not been revoked. This
+ requires
+ .B TLS_CACERTDIR
+-parameter to be set. This parameter is ignored with GNUtls.
++parameter to be set. This parameter is ignored with GNUtls. On Debian openldap is linked against GNUtls.
+ .B <level>
+ can be specified as one of the following keywords:
+ .RS

Modified: openldap/trunk/debian/patches/ldapi-socket-place
===================================================================
--- openldap/trunk/debian/patches/ldapi-socket-place	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/ldapi-socket-place	2010-07-12 10:09:37 UTC (rev 1285)
@@ -5,8 +5,8 @@
 
 Index: b/include/ldap_defaults.h
 ===================================================================
---- a/include/ldap_defaults.h
-+++ b/include/ldap_defaults.h
+--- a/include/ldap_defaults.h	2010-07-12 12:05:41.000000000 +0200
++++ b/include/ldap_defaults.h	2010-07-12 12:07:23.000000000 +0200
 @@ -39,7 +39,7 @@
  #define LDAP_ENV_PREFIX "LDAP"
  

Modified: openldap/trunk/debian/patches/libldap-symbol-versions
===================================================================
--- openldap/trunk/debian/patches/libldap-symbol-versions	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/libldap-symbol-versions	2010-07-12 10:09:37 UTC (rev 1285)
@@ -10,8 +10,8 @@
 
 Index: b/libraries/libldap_r/Makefile.in
 ===================================================================
---- a/libraries/libldap_r/Makefile.in
-+++ b/libraries/libldap_r/Makefile.in
+--- a/libraries/libldap_r/Makefile.in	2010-07-12 12:07:19.000000000 +0200
++++ b/libraries/libldap_r/Makefile.in	2010-07-12 12:07:28.000000000 +0200
 @@ -61,6 +61,9 @@
  XXXLIBS = $(LTHREAD_LIBS)
  NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
@@ -24,8 +24,8 @@
  	@for i in $(XXSRCS); do \
 Index: b/build/top.mk
 ===================================================================
---- a/build/top.mk
-+++ b/build/top.mk
+--- a/build/top.mk	2010-07-12 12:05:38.000000000 +0200
++++ b/build/top.mk	2010-07-12 12:07:28.000000000 +0200
 @@ -104,6 +104,9 @@
  # LINK_LIBS referenced in library and module link commands.
  LINK_LIBS = $(MOD_LIBS) $(@PLAT at _LINK_LIBS)
@@ -47,8 +47,8 @@
  	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
 Index: b/build/openldap.m4
 ===================================================================
---- a/build/openldap.m4
-+++ b/build/openldap.m4
+--- a/build/openldap.m4	2010-07-12 12:05:38.000000000 +0200
++++ b/build/openldap.m4	2010-07-12 12:07:28.000000000 +0200
 @@ -1129,3 +1129,54 @@
  #endif
  	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
@@ -106,8 +106,8 @@
 +rm -f conftest*])])
 Index: b/configure.in
 ===================================================================
---- a/configure.in
-+++ b/configure.in
+--- a/configure.in	2010-07-12 12:05:38.000000000 +0200
++++ b/configure.in	2010-07-12 12:07:28.000000000 +0200
 @@ -1895,6 +1895,13 @@
  fi
  AC_SUBST(LTSTATIC)dnl
@@ -124,8 +124,8 @@
  	AC_CHECK_HEADERS(tcpd.h,[
 Index: b/libraries/libldap/libldap.map
 ===================================================================
---- /dev/null
-+++ b/libraries/libldap/libldap.map
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/libraries/libldap/libldap.map	2010-07-12 12:07:28.000000000 +0200
 @@ -0,0 +1,6 @@
 +OPENLDAP_2.4_2 {
 +  global:
@@ -135,8 +135,8 @@
 +};
 Index: b/libraries/libldap/Makefile.in
 ===================================================================
---- a/libraries/libldap/Makefile.in
-+++ b/libraries/libldap/Makefile.in
+--- a/libraries/libldap/Makefile.in	2010-07-12 12:07:19.000000000 +0200
++++ b/libraries/libldap/Makefile.in	2010-07-12 12:07:28.000000000 +0200
 @@ -52,6 +52,9 @@
  XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
  NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
@@ -149,8 +149,8 @@
  	$(LTLINK) -o $@ apitest.o $(LIBS)
 Index: b/libraries/liblber/Makefile.in
 ===================================================================
---- a/libraries/liblber/Makefile.in
-+++ b/libraries/liblber/Makefile.in
+--- a/libraries/liblber/Makefile.in	2010-07-12 12:05:38.000000000 +0200
++++ b/libraries/liblber/Makefile.in	2010-07-12 12:07:28.000000000 +0200
 @@ -38,6 +38,9 @@
  XXLIBS = 
  NT_LINK_LIBS = $(AC_LIBS)
@@ -163,8 +163,8 @@
  	$(LTLINK) -o $@ dtest.o $(LIBS)
 Index: b/libraries/liblber/liblber.map
 ===================================================================
---- /dev/null
-+++ b/libraries/liblber/liblber.map
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/libraries/liblber/liblber.map	2010-07-12 12:07:28.000000000 +0200
 @@ -0,0 +1,8 @@
 +OPENLDAP_2.4_2 {
 +  global:

Modified: openldap/trunk/debian/patches/man-slapd
===================================================================
--- openldap/trunk/debian/patches/man-slapd	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/man-slapd	2010-07-12 10:09:37 UTC (rev 1285)
@@ -6,8 +6,8 @@
 
 Index: b/doc/man/man8/slapd.8
 ===================================================================
---- a/doc/man/man8/slapd.8
-+++ b/doc/man/man8/slapd.8
+--- a/doc/man/man8/slapd.8	2010-07-12 12:05:43.000000000 +0200
++++ b/doc/man/man8/slapd.8	2010-07-12 12:07:18.000000000 +0200
 @@ -5,7 +5,7 @@
  .SH NAME
  slapd \- Stand-alone LDAP Daemon

Modified: openldap/trunk/debian/patches/manpage-tlscyphersuite-additions
===================================================================
--- openldap/trunk/debian/patches/manpage-tlscyphersuite-additions	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/manpage-tlscyphersuite-additions	2010-07-12 10:09:37 UTC (rev 1285)
@@ -1,7 +1,7 @@
 Index: b/doc/man/man5/ldap.conf.5
 ===================================================================
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
+--- a/doc/man/man5/ldap.conf.5	2010-07-12 12:05:36.000000000 +0200
++++ b/doc/man/man5/ldap.conf.5	2010-07-12 12:07:32.000000000 +0200
 @@ -333,20 +333,36 @@
  .TP
  .B TLS_CIPHER_SUITE <cipher-suite-spec>
@@ -46,8 +46,8 @@
  Specifies the file to obtain random bits from when /dev/[u]random is
 Index: b/doc/man/man5/slapd.conf.5
 ===================================================================
---- a/doc/man/man5/slapd.conf.5
-+++ b/doc/man/man5/slapd.conf.5
+--- a/doc/man/man5/slapd.conf.5	2010-07-12 12:07:24.000000000 +0200
++++ b/doc/man/man5/slapd.conf.5	2010-07-12 12:07:32.000000000 +0200
 @@ -1029,22 +1029,37 @@
  .TP
  .B TLSCipherSuite <cipher-suite-spec>

Modified: openldap/trunk/debian/patches/sasl-default-path
===================================================================
--- openldap/trunk/debian/patches/sasl-default-path	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/sasl-default-path	2010-07-12 10:09:37 UTC (rev 1285)
@@ -5,8 +5,8 @@
 
 Index: b/include/ldap_defaults.h
 ===================================================================
---- a/include/ldap_defaults.h
-+++ b/include/ldap_defaults.h
+--- a/include/ldap_defaults.h	2010-07-12 12:07:24.000000000 +0200
++++ b/include/ldap_defaults.h	2010-07-12 12:07:27.000000000 +0200
 @@ -63,4 +63,6 @@
  	/* dn of the default "monitor" subentry */
  #define SLAPD_MONITOR_DN		"cn=Monitor"
@@ -16,8 +16,8 @@
  #endif /* _LDAP_CONFIG_H */
 Index: b/servers/slapd/sasl.c
 ===================================================================
---- a/servers/slapd/sasl.c
-+++ b/servers/slapd/sasl.c
+--- a/servers/slapd/sasl.c	2010-07-12 12:05:39.000000000 +0200
++++ b/servers/slapd/sasl.c	2010-07-12 12:07:27.000000000 +0200
 @@ -1104,12 +1104,38 @@
  };
  #endif

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/series	2010-07-12 10:09:37 UTC (rev 1285)
@@ -13,3 +13,4 @@
 smbk5pwd-makefile
 autogroup-makefile
 issue-6534-patch
+ldap-conf-tls-cacertdir

Modified: openldap/trunk/debian/patches/slapi-errorlog-file
===================================================================
--- openldap/trunk/debian/patches/slapi-errorlog-file	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/slapi-errorlog-file	2010-07-12 10:09:37 UTC (rev 1285)
@@ -5,8 +5,8 @@
 
 Index: b/servers/slapd/slapi/slapi_overlay.c
 ===================================================================
---- a/servers/slapd/slapi/slapi_overlay.c
-+++ b/servers/slapd/slapi/slapi_overlay.c
+--- a/servers/slapd/slapi/slapi_overlay.c	2010-07-12 12:05:41.000000000 +0200
++++ b/servers/slapd/slapi/slapi_overlay.c	2010-07-12 12:07:22.000000000 +0200
 @@ -927,7 +927,7 @@
  		ldap_pvt_thread_mutex_init( &slapi_printmessage_mutex );
  

Modified: openldap/trunk/debian/patches/smbk5pwd-makefile
===================================================================
--- openldap/trunk/debian/patches/smbk5pwd-makefile	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/smbk5pwd-makefile	2010-07-12 10:09:37 UTC (rev 1285)
@@ -1,7 +1,7 @@
 Index: b/contrib/slapd-modules/smbk5pwd/Makefile
 ===================================================================
---- a/contrib/slapd-modules/smbk5pwd/Makefile
-+++ b/contrib/slapd-modules/smbk5pwd/Makefile
+--- a/contrib/slapd-modules/smbk5pwd/Makefile	2010-07-12 12:05:36.000000000 +0200
++++ b/contrib/slapd-modules/smbk5pwd/Makefile	2010-07-12 12:07:33.000000000 +0200
 @@ -12,30 +12,30 @@
  # top-level directory of the distribution or, alternatively, at
  # <http://www.OpenLDAP.org/license.html>.

Modified: openldap/trunk/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk/debian/patches/wrong-database-location	2010-07-12 09:43:45 UTC (rev 1284)
+++ openldap/trunk/debian/patches/wrong-database-location	2010-07-12 10:09:37 UTC (rev 1285)
@@ -5,8 +5,8 @@
 
 Index: b/doc/man/man5/slapd-bdb.5
 ===================================================================
---- a/doc/man/man5/slapd-bdb.5
-+++ b/doc/man/man5/slapd-bdb.5
+--- a/doc/man/man5/slapd-bdb.5	2010-07-12 12:05:40.000000000 +0200
++++ b/doc/man/man5/slapd-bdb.5	2010-07-12 12:07:24.000000000 +0200
 @@ -133,7 +133,7 @@
  associated indexes live.
  A separate directory must be specified for each database.
@@ -18,8 +18,8 @@
  Allow reads of modified but not yet committed data.
 Index: b/doc/man/man5/slapd.conf.5
 ===================================================================
---- a/doc/man/man5/slapd.conf.5
-+++ b/doc/man/man5/slapd.conf.5
+--- a/doc/man/man5/slapd.conf.5	2010-07-12 12:05:41.000000000 +0200
++++ b/doc/man/man5/slapd.conf.5	2010-07-12 12:07:24.000000000 +0200
 @@ -1899,7 +1899,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
@@ -31,8 +31,8 @@
  index     cn,sn,mail   pres,eq,approx,sub
 Index: b/include/ldap_defaults.h
 ===================================================================
---- a/include/ldap_defaults.h
-+++ b/include/ldap_defaults.h
+--- a/include/ldap_defaults.h	2010-07-12 12:07:23.000000000 +0200
++++ b/include/ldap_defaults.h	2010-07-12 12:07:24.000000000 +0200
 @@ -47,7 +47,7 @@
  	/* location of the default slapd config file */
  #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
@@ -44,8 +44,8 @@
  	/* default max deref depth for aliases */
 Index: b/servers/slapd/Makefile.in
 ===================================================================
---- a/servers/slapd/Makefile.in
-+++ b/servers/slapd/Makefile.in
+--- a/servers/slapd/Makefile.in	2010-07-12 12:05:40.000000000 +0200
++++ b/servers/slapd/Makefile.in	2010-07-12 12:07:24.000000000 +0200
 @@ -430,9 +430,9 @@
  
  install-db-config: FORCE
@@ -60,9 +60,9 @@
  
 Index: b/doc/man/man5/slapd-config.5
 ===================================================================
---- a/doc/man/man5/slapd-config.5
-+++ b/doc/man/man5/slapd-config.5
-@@ -1936,7 +1936,7 @@
+--- a/doc/man/man5/slapd-config.5	2010-07-12 12:05:40.000000000 +0200
++++ b/doc/man/man5/slapd-config.5	2010-07-12 12:07:24.000000000 +0200
+@@ -1943,7 +1943,7 @@
  # The database directory MUST exist prior to
  # running slapd AND should only be accessible
  # by the slapd/tools. Mode 0700 recommended.

More information about the Pkg-openldap-devel mailing list