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

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-07-23 08:32:17 +0000 (Sun, 23 Jul 2006)
New Revision: 696

Added:
   openldap/trunk-2.3/debian/patches/wrong-database-location
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/patches/series
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * Fix a regression. Directory is /var/lib/ldap and not /var/openldap-data.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-07-22 11:50:44 UTC (rev 695)
+++ openldap/trunk-2.3/debian/changelog	2006-07-23 08:32:17 UTC (rev 696)
@@ -9,8 +9,11 @@
     - fix for password length
   * Added commented out rootdn parameter in slapd.conf. (Closes: #303245)
   * Make the scripts output a bit more consistent.
+  * Fix a regression in the slapd packages. Data directory is /var/lib/ldap
+    and not /var/openldap-data, also adjust the manpages to reflect these
+    change. Thanks to Peter Marschall. (Closes: #368891)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 22 Jul 2006 13:38:36 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 23 Jul 2006 10:31:00 +0200
 
 openldap2.3 (2.3.24-2) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-07-22 11:50:44 UTC (rev 695)
+++ openldap/trunk-2.3/debian/patches/series	2006-07-23 08:32:17 UTC (rev 696)
@@ -22,3 +22,4 @@
 import-ldif-width-ppolicy-clear-text-fix -p0
 syncrepl-dont-replicate-fix -p0
 accesslog-purge-bug -p0
+wrong-database-location -p0

Added: openldap/trunk-2.3/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk-2.3/debian/patches/wrong-database-location	2006-07-22 11:50:44 UTC (rev 695)
+++ openldap/trunk-2.3/debian/patches/wrong-database-location	2006-07-23 08:32:17 UTC (rev 696)
@@ -0,0 +1,68 @@
+Index: doc/man/man5/slapd-bdb.5
+===================================================================
+--- doc/man/man5/slapd-bdb.5.orig
++++ doc/man/man5/slapd-bdb.5
+@@ -96,7 +96,7 @@
+ associated indexes live.
+ A separate directory must be specified for each database.
+ The default is
+-.BR LOCALSTATEDIR/openldap-data .
++.BR LOCALSTATEDIR/lib/ldap .
+ .TP
+ .B dirtyread
+ Allow reads of modified but not yet committed data.
+Index: doc/man/man5/slapd-ldbm.5
+===================================================================
+--- doc/man/man5/slapd-ldbm.5.orig
++++ doc/man/man5/slapd-ldbm.5
+@@ -84,7 +84,7 @@
+ associated indexes live.
+ A separate directory must be specified for each database.
+ The default is
+-.BR LOCALSTATEDIR/openldap-data .
++.BR LOCALSTATEDIR/lib/ldap .
+ .TP
+ .B
+ index {<attrlist>|default} [pres,eq,approx,sub,<special>]
+Index: doc/man/man5/slapd.conf.5
+===================================================================
+--- doc/man/man5/slapd.conf.5.orig
++++ doc/man/man5/slapd.conf.5
+@@ -1863,7 +1863,7 @@
+ # The database directory MUST exist prior to
+ # running slapd AND should only be accessible
+ # by the slapd/tools. Mode 0700 recommended.
+-directory LOCALSTATEDIR/openldap-data
++directory LOCALSTATEDIR/lib/ldap
+ # 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 @@
+ 	/* location of the default slapd config file */
+ #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+ #define SLAPD_DEFAULT_CONFIGDIR		LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
+-#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
++#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "ldap"
+ #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 @@
+ 
+ install-db-config: FORCE
+ 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+-	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
++	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/ldap
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+-		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
++		$(DESTDIR)$(localstatedir)/lib/ldap/DB_CONFIG.example
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+ 		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
+ 

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-07-22 11:50:44 UTC (rev 695)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-07-23 08:32:17 UTC (rev 696)
@@ -419,10 +419,8 @@
 
 	if upgrade_supported_from_backend "$backend"; then
     		# If no directory was given use the compiled in value
-      		# TODO: This should be somewhere in /var - needs tweaking of 
-      		# configure.options
     		if [ -z "$directory" ]; then
-      			directory=/usr/share/ldap/openldap-data
+      			directory=/var/lib/ldap
 		fi
 		echo "$backend"
 		echo "$suffix"