[pkg-kolab] r1515 - in libkolab-perl/trunk/debian: . patches

Mathieu Parent sathieu at alioth.debian.org
Mon Sep 13 20:39:21 UTC 2010


Author: sathieu
Date: 2010-09-13 20:39:14 +0000 (Mon, 13 Sep 2010)
New Revision: 1515

Added:
   libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff
Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/series
Log:
Fix "kolabd: kolab_bootstrap no longer works with slapd (version
2.4.23)" by converting slapd.conf on the fly (Closes: #596710)



Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2010-09-13 16:17:47 UTC (rev 1514)
+++ libkolab-perl/trunk/debian/changelog	2010-09-13 20:39:14 UTC (rev 1515)
@@ -1,3 +1,10 @@
+libkolab-perl (1:2.2.4-20100624-2) unstable; urgency=low
+
+  * Fix "kolabd: kolab_bootstrap no longer works with slapd (version
+    2.4.23)" by converting slapd.conf on the fly (Closes: #596710)
+
+ -- Mathieu Parent <sathieu at debian.org>  Mon, 13 Sep 2010 21:18:17 +0200
+
 libkolab-perl (1:2.2.4-20100624-1) unstable; urgency=low
 
   * New release 2.2.4 (20100624)

Added: libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff	                        (rev 0)
+++ libkolab-perl/trunk/debian/patches/90-slapd-runtime-config.diff	2010-09-13 20:39:14 UTC (rev 1515)
@@ -0,0 +1,42 @@
+Goal: Use slapd.d "runtime configuration" for slapd
+
+Fixes  #596710 (kolabd: kolab_bootstrap no longer works with
+slapd (version 2.4.23))
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: https://issues.kolab.org/issue3000
+
+Index: libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm
+===================================================================
+--- libkolab-perl-2.2.4-20100624.orig/lib/Kolab/Conf.pm	2010-09-13 21:18:54.000000000 +0200
++++ libkolab-perl-2.2.4-20100624/lib/Kolab/Conf.pm	2010-09-13 22:38:37.000000000 +0200
+@@ -295,7 +295,7 @@
+                 $haschanged{'saslauthd'} = 1;
+             } elsif ($cfg =~ /apache/) {
+                 $haschanged{'apache'} = 1;
+-            } elsif ($cfg =~ /openldap/) {
++            } elsif ($cfg =~ /openldap/ || $cfg =~ /slapd/) {
+                 $haschanged{'slapd'} = 1;
+             } elsif ($cfg =~ /(imapd|cyrus)/) {
+                 $haschanged{'imapd'} = 1;
+@@ -854,8 +854,17 @@
+ sub reload
+ {
+     if ($haschanged{'slapd'}) {
+-        &Kolab::log('K', 'Restarting OpenLDAP...');
+-        system("invoke-rc.d slapd restart &");
++        &Kolab::log('K', 'Stopping OpenLDAP...');
++        system("invoke-rc.d slapd stop");
++        &Kolab::log('K', 'Deleting old slapd config...');
++        system("rm -rf /etc/ldap/slapd.d");
++        &Kolab::log('K', 'Converting slapd config...');
++        system("mkdir /etc/ldap/slapd.d");
++        system("slaptest -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d");
++        system("chown -R openldap /etc/ldap/slapd.d");
++        system("chgrp -R openldap /etc/ldap/slapd.d");
++        &Kolab::log('K', 'Starting OpenLDAP...');
++        system("invoke-rc.d slapd start");
+     }
+ 
+     if ($haschanged{'saslauthd'}) {

Modified: libkolab-perl/trunk/debian/patches/series
===================================================================
--- libkolab-perl/trunk/debian/patches/series	2010-09-13 16:17:47 UTC (rev 1514)
+++ libkolab-perl/trunk/debian/patches/series	2010-09-13 20:39:14 UTC (rev 1515)
@@ -3,3 +3,4 @@
 40-disable-amavis.diff
 60-fix-build.diff
 70-reload-cyrus-conf.diff
+90-slapd-runtime-config.diff




More information about the pkg-kolab-devel mailing list