Merge lp:~james-page/ubuntu/maverick/openldap/openldap-fix-658227 into lp:ubuntu/maverick/openldap

[James Page]

Amendments to slapd installation to trigger ldap dump and reload when upgrading to 2.4.23+

Tested by configuring an openldap install on Lucid using the server guide through to populating the ldap database with test data.

As PPA's are disabled automatically by do-release-update, the lucid instance was then updated to point at maverick sources and ppa:james-page/junk was included as an additional source (again using maverick).

slapd was then upgraded and the data within the directory verified using the following command:

 ldapsearch -xLLL -b "dc=example,dc=com" uid=john sn givenName cn

Note that I had to change slapd.templates as the slapd.scripts-common function used to dump databases depended on a missing entry.

[Mathias Gug (mathiaz)]

Uploaded to maverick-proposed.

I've revised the package revision to follow the Ubuntu Security guidelines at https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update%20the%20packaging.

I've modified the package version comparison to include the revision: 2.4.23-0ubuntu3.1.

I've updated the target release to maverick-proposed since maverick is now released. All SRU will be uploaded to maverick-proposed from now on (security updates being uploaded to maverick-security directly).

I've removed the slapd.templates change: it doesn't have a direct impact on the bug and SRU should have a *minimal* working patch.

[James Page (james-page)]

Points 1,2 and 3 noted for future reference.

Point 4 - removal of slapd.templates change; I originally tested without making this change; however the upgrade failed on line 320 of slapd.scripts-common when db_get slapd/move_old_database was executed. Re-testing with the change to slapd.templates resulted in a successful upgrade.

[Nathan Stratton Treadway (nathanst)]

For what it's worth, I got the impression that the slapd/move_old_database template was incorrectly removed along with all the many templates related to the automatic creation of the default database (when that functionality was removed from the package).

http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/maverick/openldap/maverick/revision/18/debian/slapd.templates#debian/slapd.templates

It hasn't been an issue until now because the code hasn't needed to check the slapd/move_old_database value since 2.4.14 (the last time database_format_changed would return "true").

Nathan

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-06 17:34:21 +0000
+++ debian/changelog	2010-10-14 09:13:43 +0000
@@ -1,3 +1,10 @@
+openldap (2.4.23-0ubuntu4) maverick; urgency=low
+
+  * Fixed install/upgrade process to dump/restore databases due 
+    to uplift to libdb4.8-dev (LP: #658227)   
+
+ -- James Page <[e-mail]>  Tue, 12 Oct 2010 09:02:48 +0100
+
 openldap (2.4.23-0ubuntu3) maverick; urgency=low
 
   * debian/rules: move dh_apparmor before dh_installinit

=== modified file 'debian/slapd.scripts-common'
--- debian/slapd.scripts-common	2010-04-12 16:16:47 +0000
+++ debian/slapd.scripts-common	2010-10-14 09:13:43 +0000
@@ -46,7 +46,7 @@
 # Return success if yes.
 # Usage: if database_format_changed; then
 
-	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.14; then
+	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.23; then
 		return 0
 	else
 		return 1

=== modified file 'debian/slapd.templates'
--- debian/slapd.templates	2009-08-11 14:48:56 +0000
+++ debian/slapd.templates	2010-10-14 09:13:43 +0000
@@ -36,6 +36,13 @@
 Default: false
 _Description: Do you want the database to be removed when slapd is purged?
 
+Template: slapd/move_old_database
+Type: booleam
+Default: true
+_Description: Do you want to backup the old database when slapd is upgraded?
+ If you disable this option upgrades which change the underlying BDB
+ format may fail.
+
 Template: slapd/allow_ldap_v2
 Type: boolean
 Default: false