[pkg-kolab] r1593 - in kolabd/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-11-25 22:04:54 +0000 (Fri, 25 Nov 2011)
New Revision: 1593

Added:
   kolabd/trunk/debian/patches/92-slapd-template.diff
Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/series
Log:
New 92-slapd-template.diff: Drop nested conditions (not supported)

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2011-11-25 21:47:03 UTC (rev 1592)
+++ kolabd/trunk/debian/changelog	2011-11-25 22:04:54 UTC (rev 1593)
@@ -31,6 +31,7 @@
     to start
   * Downgrade kolab-cyrus-admin, kolab-cyrus-imapd, kolab-cyrus-pop3d to
     recommends
+  * New 92-slapd-template.diff: Drop nested conditions (not supported)
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 19 Nov 2011 13:08:21 +0100
 

Added: kolabd/trunk/debian/patches/92-slapd-template.diff
===================================================================
--- kolabd/trunk/debian/patches/92-slapd-template.diff	                        (rev 0)
+++ kolabd/trunk/debian/patches/92-slapd-template.diff	2011-11-25 22:04:54 UTC (rev 1593)
@@ -0,0 +1,19 @@
+Drop nested conditions that fails with current Kolab::Conf
+
+Index: kolabd/kolabd/templates/slapd.conf.template
+===================================================================
+--- kolabd.orig/kolabd/templates/slapd.conf.template	2011-02-17 14:45:15.000000000 +0100
++++ kolabd/kolabd/templates/slapd.conf.template	2011-02-17 14:45:26.000000000 +0100
+@@ -52,12 +52,8 @@
+ # or dynamically build.  When build dynamically the module must be loaded.
+ # As the slapd that comes with the openpkg version of kolab is statically
+ # build it is not necessary to load the module.
+-@@@if ldapserver_modulepath@@@
+ moduleload syncprov
+ @@@else@@@
+-# moduleload syncprov
+-@@@endif@@@
+-@@@else@@@
+ replica-pidfile	@@@ldapserverslurpd_pidfile@@@
+ replogfile      @@@ldapserver_replogfile@@@
+ replicationinterval 5

Modified: kolabd/trunk/debian/patches/series
===================================================================
--- kolabd/trunk/debian/patches/series	2011-11-25 21:47:03 UTC (rev 1592)
+++ kolabd/trunk/debian/patches/series	2011-11-25 22:04:54 UTC (rev 1593)
@@ -1,6 +1,7 @@
 01-distconf.diff
 91-postfix-template.diff
 92-cyrus-template.diff
+92-slapd-template.diff
 93-amavisd-template.diff
 94-cyrus-template.diff
 100-no-rootDSE.diff