[Pkg-openldap-devel] r713 - in openldap/trunk-2.3/debian: . lintian-overrides

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-08-06 12:59:46 +0000 (Sun, 06 Aug 2006)
New Revision: 713

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/lintian-overrides/ldap-utils
   openldap/trunk-2.3/debian/lintian-overrides/slapd
   openldap/trunk-2.3/debian/slapd.postinst
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * Updated lintian overrides.
 * pidfile location has changed 3 years ago, take care of it in the postinst
   when upgrading.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-08-02 21:04:37 UTC (rev 712)
+++ openldap/trunk-2.3/debian/changelog	2006-08-06 12:59:46 UTC (rev 713)
@@ -1,3 +1,11 @@
+openldap2.3 (2.3.25-2) unstable; urgency=low
+
+  * pidfile location is changed 3 years ago, when people are upgrading from
+    back then they have a broken slapd because the openldap user is not able
+    to write to /var/run. (Closes: #380687)
+
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun,  6 Aug 2006 14:55:16 +0200
+
 openldap2.3 (2.3.25-1) unstable; urgency=low
 
   [ Matthijs Mohlmann ]

Modified: openldap/trunk-2.3/debian/lintian-overrides/ldap-utils
===================================================================
--- openldap/trunk-2.3/debian/lintian-overrides/ldap-utils	2006-08-02 21:04:37 UTC (rev 712)
+++ openldap/trunk-2.3/debian/lintian-overrides/ldap-utils	2006-08-06 12:59:46 UTC (rev 713)
@@ -1,3 +1,3 @@
 # dh_shlibdeps is not smart enough to wipe additional relations. Since this
 # is not easy to fix we don't even try to do it at this time.  -- Torsten
-ldap-utils: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.24-3)
+ldap-utils: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.25-2)

Modified: openldap/trunk-2.3/debian/lintian-overrides/slapd
===================================================================
--- openldap/trunk-2.3/debian/lintian-overrides/slapd	2006-08-02 21:04:37 UTC (rev 712)
+++ openldap/trunk-2.3/debian/lintian-overrides/slapd	2006-08-06 12:59:46 UTC (rev 713)
@@ -5,7 +5,7 @@
 
 # dh_shlibdeps is not smart enough to wipe additional relations. Since this
 # is not easy to fix we don't even try to do it at this time.  -- Torsten
-slapd: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.24-3)
+slapd: package-has-a-duplicate-relation depends: libldap-2.3-0, libldap-2.3-0 (= 2.3.25-2)
 
 # The extended description is needed in slapd/backend. It explains a lot about
 # the different backends.

Modified: openldap/trunk-2.3/debian/slapd.postinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.postinst	2006-08-02 21:04:37 UTC (rev 712)
+++ openldap/trunk-2.3/debian/slapd.postinst	2006-08-06 12:59:46 UTC (rev 713)
@@ -36,8 +36,8 @@
 	fi
 	update_access_config_directives
 
-	if previous_version_older 2.3.24-2; then
-		update_path_argsfile
+	if previous_version_older 2.3.25-1; then
+		update_path_argsfile_pidfile
 
 		# Directory /var/run/slapd is suddenly gone, dpkg removes it because it's
 		# now generated from the postinst scripts. See create_ldap_directories.

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-08-02 21:04:37 UTC (rev 712)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-08-06 12:59:46 UTC (rev 713)
@@ -770,8 +770,9 @@
 	echo done. >&2
 }
 # }}}
-update_path_argsfile() {	# {{{
+update_path_argsfile_pidfile() {	# {{{
 	write_slapd_conf "$SLAPD_CONF" 's|^(argsfile\s+).*|$1/var/run/slapd/slapd.args|'
+	write_slapd_conf "$SLAPD_CONF" 's|^(pidfile\s+).*|$1/var/run/slapd/slapd.args|'
 }
 # }}}
 configure_v2_protocol_support() {					# {{{