[pkg-kolab] r1195 - in libkolab-perl/branches/2.2.1/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-02-10 21:51:53 +0000 (Tue, 10 Feb 2009)
New Revision: 1195

Added:
   libkolab-perl/branches/2.2.1/debian/patches/90-slapd-conf-optional.diff
Modified:
   libkolab-perl/branches/2.2.1/debian/changelog
   libkolab-perl/branches/2.2.1/debian/patches/series
Log:
patch for issue3321: slapd.replicas.template and slapd.access.template can be absent
reorganized changelog


Modified: libkolab-perl/branches/2.2.1/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2.1/debian/changelog	2009-02-10 21:42:51 UTC (rev 1194)
+++ libkolab-perl/branches/2.2.1/debian/changelog	2009-02-10 21:51:53 UTC (rev 1195)
@@ -1,26 +1,28 @@
 libkolab-perl (1:2.2.1-20081212-1) UNRELEASED; urgency=low
 
   * New beta release 2.2.1-beta-1
-  * Integrated patch: 50-sync-ldap-backend
-  * Moved patch: 30-bootstrap from kolabd
-    - updated
-  * Moved patch: 40-disable-amavis from kolabd
+    + Integrated patch: 50-sync-ldap-backend
+    + Moved patch: 30-bootstrap from kolabd
+      - updated
+    + Moved patch: 40-disable-amavis from kolabd
+    + kolabconf package integrated:
+      - added versioned conflicts 
+      - removed 10-kolabconf-perl-path.diff
+      - imported 30-invoke-rc.diff (now 10-invoke-rc)
+      - removed 85-slapd-syncrepl-24.diff, integrated upstream
+      - removed 95-runonchange.diff, integrated upstream
+    + added conflict with previous kolabd as binaries are now here
   * debian/rules:
-    - remove empty manpages
-    - makefile parameters 
-  * kolabconf package integrated:
-   - added versioned conflicts 
-   - removed 10-kolabconf-perl-path.diff
-   - imported 30-invoke-rc.diff (now 10-invoke-rc)
-   - removed 85-slapd-syncrepl-24.diff, integrated upstream
-   - removed 95-runonchange.diff, integrated upstream
-  * added conflict with previous kolabd as binaries are now here
+    + remove empty manpages
+    + makefile parameters 
   * created manpages for bin/* and sbin/*
-  * 70-manpages.diff: add POD manpages to bin/* and sbin/*
-  * 71-install-sbin-manpages.diff: install sbin/* manpages
+    + 70-manpages.diff: add POD manpages to bin/* and sbin/*
+    + 71-install-sbin-manpages.diff: install sbin/* manpages
+  * 90-slapd-conf-optional: slapd.replicas.template and slapd.access.template
+    can be absent
   * debian/copyright: refers to versionned license version
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 03 Feb 2009 12:24:52 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 10 Feb 2009 22:48:06 +0100
 
 libkolab-perl (1:2.2.0-4) UNRELEASED; urgency=low
 

Added: libkolab-perl/branches/2.2.1/debian/patches/90-slapd-conf-optional.diff
===================================================================
--- libkolab-perl/branches/2.2.1/debian/patches/90-slapd-conf-optional.diff	                        (rev 0)
+++ libkolab-perl/branches/2.2.1/debian/patches/90-slapd-conf-optional.diff	2009-02-10 21:51:53 UTC (rev 1195)
@@ -0,0 +1,32 @@
+Goal: slapd.replicas.template and slapd.access.template can be absent
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: https://www.intevation.de/roundup/kolab/issue3321
+
+Index: b/lib/Kolab/Conf.pm
+===================================================================
+--- a/lib/Kolab/Conf.pm
++++ b/lib/Kolab/Conf.pm
+@@ -484,6 +484,10 @@
+     my $templatedir = $Kolab::config{"templatedir"};
+ 
+     my $keytemplate = "$templatedir/slapd.access.template";
++    if( ! -f $keytemplate ) {
++        Kolab::log('T', "No LDAP access file `$keytemplate', skipping", KOLAB_DEBUG);
++        return;
++    }
+     my $cfg = $templates{$keytemplate};
+     my $oldcfg = $cfg . '.old';
+ 
+@@ -578,6 +582,10 @@
+     my $templatedir = $Kolab::config{"templatedir"};
+ 
+     my $keytemplate = "$templatedir/slapd.replicas.template";
++    if( ! -f $keytemplate ) {
++        Kolab::log('T', "No LDAP replicas `$keytemplate', skipping", KOLAB_DEBUG);
++        return;
++    }
+     my $cfg = $templates{$keytemplate};
+     my $oldcfg = $cfg . '.old';
+ 

Modified: libkolab-perl/branches/2.2.1/debian/patches/series
===================================================================
--- libkolab-perl/branches/2.2.1/debian/patches/series	2009-02-10 21:42:51 UTC (rev 1194)
+++ libkolab-perl/branches/2.2.1/debian/patches/series	2009-02-10 21:51:53 UTC (rev 1195)
@@ -3,3 +3,4 @@
 40-disable-amavis.diff
 70-manpages.diff
 71-install-sbin-manpages.diff
+90-slapd-conf-optional.diff