[pkg-kolab] r962 - kolab-filter/trunk/debian kolab-filter/trunk/debian/patches kolab-freebusy/trunk/debian kolab-freebusy/trunk/debian/patches kolab-webadmin/trunk/debian kolab-webadmin/trunk/debian/patches kolabconf/trunk/debian kolabconf/trunk/debian/patches kolabd/trunk/debian kolabd/trunk/debian/patches libkolab-perl/trunk/debian libkolab-perl/trunk/debian/patches php-kolab/trunk/debian php-kolab/trunk/debian/patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Thu Oct 30 21:20:55 UTC 2008
Author: mparent-guest
Date: 2008-10-30 21:20:54 +0000 (Thu, 30 Oct 2008)
New Revision: 962
Added:
kolab-filter/trunk/debian/patches/20-config-path.diff
kolab-filter/trunk/debian/patches/30-syslog.diff
kolab-filter/trunk/debian/patches/series
kolab-freebusy/trunk/debian/patches/20-config-path.diff
kolab-freebusy/trunk/debian/patches/30-syslog.diff
kolab-freebusy/trunk/debian/patches/series
kolab-webadmin/trunk/debian/patches/10-fix-require.diff
kolab-webadmin/trunk/debian/patches/20-service_index.diff
kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff
kolab-webadmin/trunk/debian/patches/series
kolabconf/trunk/debian/patches/10-kolabconf-perl-path.diff
kolabconf/trunk/debian/patches/30-invoke-rc.diff
kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.diff
kolabconf/trunk/debian/patches/95-runonchange.diff
kolabconf/trunk/debian/patches/series
kolabd/trunk/debian/patches/10-dist_conf.diff
kolabd/trunk/debian/patches/30-bootstrap.diff
kolabd/trunk/debian/patches/40-disable-amavis.diff
kolabd/trunk/debian/patches/50-postfix-hashes.diff
kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff
kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
kolabd/trunk/debian/patches/80-kolab_globals.diff
kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff
kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff
kolabd/trunk/debian/patches/90-slapd-template.diff
kolabd/trunk/debian/patches/91-postfix-template.diff
kolabd/trunk/debian/patches/92-resmgr-template.diff
kolabd/trunk/debian/patches/93-freebusy-template.diff
kolabd/trunk/debian/patches/series
libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff
libkolab-perl/trunk/debian/patches/51-syncrepl.diff
libkolab-perl/trunk/debian/patches/series
php-kolab/trunk/debian/patches/20-horde-path.diff
php-kolab/trunk/debian/patches/series
Removed:
kolab-filter/trunk/debian/patches/00list
kolab-filter/trunk/debian/patches/20-config-path.dpatch
kolab-filter/trunk/debian/patches/30-syslog.dpatch
kolab-freebusy/trunk/debian/patches/00list
kolab-freebusy/trunk/debian/patches/20-config-path.dpatch
kolab-freebusy/trunk/debian/patches/30-syslog.dpatch
kolab-webadmin/trunk/debian/patches/00list
kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
kolab-webadmin/trunk/debian/patches/20-service_index.dpatch
kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch
kolabconf/trunk/debian/patches/00list
kolabconf/trunk/debian/patches/10-kolabconf-perl-path.dpatch
kolabconf/trunk/debian/patches/30-invoke-rc.dpatch
kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch
kolabconf/trunk/debian/patches/95-runonchange.dpatch
kolabd/trunk/debian/patches/00list
kolabd/trunk/debian/patches/10-dist_conf.dpatch
kolabd/trunk/debian/patches/30-bootstrap.dpatch
kolabd/trunk/debian/patches/40-disable-amavis.dpatch
kolabd/trunk/debian/patches/50-postfix-hashes.dpatch
kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.dpatch
kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.dpatch
kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch
kolabd/trunk/debian/patches/80-kolab_globals.dpatch
kolabd/trunk/debian/patches/85-slapd-2.4-compat.dpatch
kolabd/trunk/debian/patches/86-slapd-syncrepl-24.dpatch
kolabd/trunk/debian/patches/90-slapd-template.dpatch
kolabd/trunk/debian/patches/91-postfix-template.dpatch
kolabd/trunk/debian/patches/92-resmgr-template.dpatch
kolabd/trunk/debian/patches/93-freebusy-template.dpatch
libkolab-perl/trunk/debian/patches/00list
libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch
libkolab-perl/trunk/debian/patches/51-syncrepl.dpatch
php-kolab/trunk/debian/patches/00list
php-kolab/trunk/debian/patches/20-horde-path.dpatch
Modified:
kolab-filter/trunk/debian/changelog
kolab-filter/trunk/debian/control
kolab-filter/trunk/debian/rules
kolab-freebusy/trunk/debian/changelog
kolab-freebusy/trunk/debian/control
kolab-freebusy/trunk/debian/rules
kolab-webadmin/trunk/debian/changelog
kolab-webadmin/trunk/debian/control
kolab-webadmin/trunk/debian/rules
kolabconf/trunk/debian/changelog
kolabconf/trunk/debian/control
kolabconf/trunk/debian/rules
kolabd/trunk/debian/changelog
kolabd/trunk/debian/control
kolabd/trunk/debian/rules
libkolab-perl/trunk/debian/changelog
libkolab-perl/trunk/debian/control
libkolab-perl/trunk/debian/rules
php-kolab/trunk/debian/changelog
php-kolab/trunk/debian/control
php-kolab/trunk/debian/rules
Log:
Switch from dpatch to quilt
Modified: kolab-filter/trunk/debian/changelog
===================================================================
--- kolab-filter/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-filter/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,3 +1,9 @@
+kolab-filter (2.2.0-2) unstable; urgency=low
+
+ * switch from dpatch to quilt
+
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 21:56:34 +0100
+
kolab-filter (2.2.0-1) unstable; urgency=low
[ Mathieu Parent ]
Modified: kolab-filter/trunk/debian/control
===================================================================
--- kolab-filter/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-filter/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-filter/trunk/
Deleted: kolab-filter/trunk/debian/patches/00list
===================================================================
--- kolab-filter/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-filter/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,2 +0,0 @@
-20-config-path
-30-syslog
Copied: kolab-filter/trunk/debian/patches/20-config-path.diff (from rev 959, kolab-filter/trunk/debian/patches/20-config-path.dpatch)
===================================================================
--- kolab-filter/trunk/debian/patches/20-config-path.diff (rev 0)
+++ kolab-filter/trunk/debian/patches/20-config-path.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-config-path.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: Purpose : path of config file
+
+ at DPATCH@
+diff -urNad kolab-filter-2.2~rc1+20080204~/kolabfilter.php kolab-filter-2.2~rc1+20080204/kolabfilter.php
+--- kolab-filter-2.2~rc1+20080204~/kolabfilter.php 2007-11-30 14:47:35.000000000 +0100
++++ kolab-filter-2.2~rc1+20080204/kolabfilter.php 2008-02-17 19:56:07.000000000 +0100
+@@ -38,7 +38,7 @@
+ require_once 'Kolab/Filter/Content.php';
+
+ /* Read our configuration */
+-require_once 'config.php';
++require_once '/etc/kolab/filter/config.php';
+
+ /* Parse the mail */
+ $parser = &new Filter_Content();
+diff -urNad kolab-filter-2.2~rc1+20080204~/kolabmailboxfilter.php kolab-filter-2.2~rc1+20080204/kolabmailboxfilter.php
+--- kolab-filter-2.2~rc1+20080204~/kolabmailboxfilter.php 2007-11-30 14:47:35.000000000 +0100
++++ kolab-filter-2.2~rc1+20080204/kolabmailboxfilter.php 2008-02-17 19:56:24.000000000 +0100
+@@ -38,7 +38,7 @@
+ require_once 'Kolab/Filter/Incoming.php';
+
+ /* Read our configuration */
+-require_once 'config.php';
++require_once '/etc/kolab/filter/config.php';
+
+ /* Parse the mail */
+ $parser = &new Filter_Incoming();
Property changes on: kolab-filter/trunk/debian/patches/20-config-path.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-filter/trunk/debian/patches/20-config-path.dpatch
===================================================================
--- kolab-filter/trunk/debian/patches/20-config-path.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-filter/trunk/debian/patches/20-config-path.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-config-path.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Purpose : path of config file
-
- at DPATCH@
-diff -urNad kolab-filter-2.2~rc1+20080204~/kolabfilter.php kolab-filter-2.2~rc1+20080204/kolabfilter.php
---- kolab-filter-2.2~rc1+20080204~/kolabfilter.php 2007-11-30 14:47:35.000000000 +0100
-+++ kolab-filter-2.2~rc1+20080204/kolabfilter.php 2008-02-17 19:56:07.000000000 +0100
-@@ -38,7 +38,7 @@
- require_once 'Kolab/Filter/Content.php';
-
- /* Read our configuration */
--require_once 'config.php';
-+require_once '/etc/kolab/filter/config.php';
-
- /* Parse the mail */
- $parser = &new Filter_Content();
-diff -urNad kolab-filter-2.2~rc1+20080204~/kolabmailboxfilter.php kolab-filter-2.2~rc1+20080204/kolabmailboxfilter.php
---- kolab-filter-2.2~rc1+20080204~/kolabmailboxfilter.php 2007-11-30 14:47:35.000000000 +0100
-+++ kolab-filter-2.2~rc1+20080204/kolabmailboxfilter.php 2008-02-17 19:56:24.000000000 +0100
-@@ -38,7 +38,7 @@
- require_once 'Kolab/Filter/Incoming.php';
-
- /* Read our configuration */
--require_once 'config.php';
-+require_once '/etc/kolab/filter/config.php';
-
- /* Parse the mail */
- $parser = &new Filter_Incoming();
Copied: kolab-filter/trunk/debian/patches/30-syslog.diff (from rev 959, kolab-filter/trunk/debian/patches/30-syslog.dpatch)
===================================================================
--- kolab-filter/trunk/debian/patches/30-syslog.diff (rev 0)
+++ kolab-filter/trunk/debian/patches/30-syslog.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-syslog.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: Purpose : enable syslog
+
+ at DPATCH@
+diff -urNad kolab-filter-2.2~rc1+20080204~/config.php kolab-filter-2.2~rc1+20080204/config.php
+--- kolab-filter-2.2~rc1+20080204~/config.php 2007-12-03 18:24:33.000000000 +0100
++++ kolab-filter-2.2~rc1+20080204/config.php 2008-02-18 19:01:16.000000000 +0100
+@@ -142,8 +142,8 @@
+ */
+ $conf['log']['enabled'] = true;
+ $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+-$conf['log']['type'] = 'file';
+-$conf['log']['name'] = '/kolab/var/kolab-filter/log/filter.log';
++$conf['log']['type'] = 'syslog';
++$conf['log']['name'] = 'cons, pid';
+ $conf['log']['ident'] = 'Kolab Filter';
+ $conf['log']['params']['append'] = true;
+
Property changes on: kolab-filter/trunk/debian/patches/30-syslog.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-filter/trunk/debian/patches/30-syslog.dpatch
===================================================================
--- kolab-filter/trunk/debian/patches/30-syslog.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-filter/trunk/debian/patches/30-syslog.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30-syslog.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Purpose : enable syslog
-
- at DPATCH@
-diff -urNad kolab-filter-2.2~rc1+20080204~/config.php kolab-filter-2.2~rc1+20080204/config.php
---- kolab-filter-2.2~rc1+20080204~/config.php 2007-12-03 18:24:33.000000000 +0100
-+++ kolab-filter-2.2~rc1+20080204/config.php 2008-02-18 19:01:16.000000000 +0100
-@@ -142,8 +142,8 @@
- */
- $conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
--$conf['log']['type'] = 'file';
--$conf['log']['name'] = '/kolab/var/kolab-filter/log/filter.log';
-+$conf['log']['type'] = 'syslog';
-+$conf['log']['name'] = 'cons, pid';
- $conf['log']['ident'] = 'Kolab Filter';
- $conf['log']['params']['append'] = true;
-
Added: kolab-filter/trunk/debian/patches/series
===================================================================
--- kolab-filter/trunk/debian/patches/series (rev 0)
+++ kolab-filter/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,2 @@
+20-config-path.diff
+30-syslog.diff
Modified: kolab-filter/trunk/debian/rules
===================================================================
--- kolab-filter/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-filter/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: build-stamp
-build-stamp: patch-stamp
+build: patch
dh_testdir
touch $@
Modified: kolab-freebusy/trunk/debian/changelog
===================================================================
--- kolab-freebusy/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-freebusy/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -2,8 +2,9 @@
* set the -e flag to ensure that the script's execution is aborted when any
any executed command fails (thanks lintian)
+ * switch from dpatch to quilt
- -- Mathieu Parent <math.parent at gmail.com> Mon, 27 Oct 2008 22:17:26 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 22:06:00 +0100
kolab-freebusy (2.2.0-1) unstable; urgency=low
Modified: kolab-freebusy/trunk/debian/control
===================================================================
--- kolab-freebusy/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-freebusy/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-freebusy/trunk/
Deleted: kolab-freebusy/trunk/debian/patches/00list
===================================================================
--- kolab-freebusy/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-freebusy/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,2 +0,0 @@
-20-config-path
-30-syslog
Copied: kolab-freebusy/trunk/debian/patches/20-config-path.diff (from rev 959, kolab-freebusy/trunk/debian/patches/20-config-path.dpatch)
===================================================================
--- kolab-freebusy/trunk/debian/patches/20-config-path.diff (rev 0)
+++ kolab-freebusy/trunk/debian/patches/20-config-path.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-horde-path.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: Purpose : path of config file
+
+ at DPATCH@
+diff -urNad kolab-freebusy-2.2~rc1+20080204~/pfb.php kolab-freebusy-2.2~rc1+20080204/pfb.php
+--- kolab-freebusy-2.2~rc1+20080204~/pfb.php 2007-11-30 14:47:35.000000000 +0100
++++ kolab-freebusy-2.2~rc1+20080204/pfb.php 2008-02-17 19:45:49.000000000 +0100
+@@ -40,7 +40,7 @@
+ require_once 'Kolab/Freebusy/Page.php';
+
+ /* Load the configuration */
+-require_once 'config.php';
++require_once '/etc/kolab/freebusy/config.php';
+
+ /* Profiling */
+ $timer = &new Timer();
+diff -urNad kolab-freebusy-2.2~rc1+20080204~/freebusy.php kolab-freebusy-2.2~rc1+20080204/freebusy.php
+--- kolab-freebusy-2.2~rc1+20080204~/freebusy.php 2007-11-30 14:47:35.000000000 +0100
++++ kolab-freebusy-2.2~rc1+20080204/freebusy.php 2008-02-17 19:50:08.000000000 +0100
+@@ -37,7 +37,7 @@
+ require_once 'Kolab/Freebusy/Page.php';
+
+ /* Load the configuration */
+-require_once 'config.php';
++require_once '/etc/kolab/freebusy/config.php';
+
+ /* Profiling */
+ $timer = &new Timer();
Property changes on: kolab-freebusy/trunk/debian/patches/20-config-path.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-freebusy/trunk/debian/patches/20-config-path.dpatch
===================================================================
--- kolab-freebusy/trunk/debian/patches/20-config-path.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-freebusy/trunk/debian/patches/20-config-path.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-horde-path.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Purpose : path of config file
-
- at DPATCH@
-diff -urNad kolab-freebusy-2.2~rc1+20080204~/pfb.php kolab-freebusy-2.2~rc1+20080204/pfb.php
---- kolab-freebusy-2.2~rc1+20080204~/pfb.php 2007-11-30 14:47:35.000000000 +0100
-+++ kolab-freebusy-2.2~rc1+20080204/pfb.php 2008-02-17 19:45:49.000000000 +0100
-@@ -40,7 +40,7 @@
- require_once 'Kolab/Freebusy/Page.php';
-
- /* Load the configuration */
--require_once 'config.php';
-+require_once '/etc/kolab/freebusy/config.php';
-
- /* Profiling */
- $timer = &new Timer();
-diff -urNad kolab-freebusy-2.2~rc1+20080204~/freebusy.php kolab-freebusy-2.2~rc1+20080204/freebusy.php
---- kolab-freebusy-2.2~rc1+20080204~/freebusy.php 2007-11-30 14:47:35.000000000 +0100
-+++ kolab-freebusy-2.2~rc1+20080204/freebusy.php 2008-02-17 19:50:08.000000000 +0100
-@@ -37,7 +37,7 @@
- require_once 'Kolab/Freebusy/Page.php';
-
- /* Load the configuration */
--require_once 'config.php';
-+require_once '/etc/kolab/freebusy/config.php';
-
- /* Profiling */
- $timer = &new Timer();
Copied: kolab-freebusy/trunk/debian/patches/30-syslog.diff (from rev 959, kolab-freebusy/trunk/debian/patches/30-syslog.dpatch)
===================================================================
--- kolab-freebusy/trunk/debian/patches/30-syslog.diff (rev 0)
+++ kolab-freebusy/trunk/debian/patches/30-syslog.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-syslog.dpatch by <math.parent at gmail.com>
+##
+## DP: Purpose : enable syslog
+
+ at DPATCH@
+diff -urNad kolab-freebusy-2.2~rc1+20080204~/config.php kolab-freebusy-2.2~rc1+20080204/config.php
+--- kolab-freebusy-2.2~rc1+20080204~/config.php 2007-11-30 14:47:35.000000000 +0100
++++ kolab-freebusy-2.2~rc1+20080204/config.php 2008-02-18 18:59:48.000000000 +0100
+@@ -39,8 +39,8 @@
+ /* Horde::Log configuration */
+ $conf['log']['enabled'] = true;
+ $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+-$conf['log']['type'] = 'file';
+-$conf['log']['name'] = '/kolab/var/kolab-freebusy/log/freebusy.log';
++$conf['log']['type'] = 'syslog';
++$conf['log']['name'] = 'cons, pid';
+ $conf['log']['ident'] = 'Kolab Free/Busy';
+ $conf['log']['params']['append'] = true;
+
+
Property changes on: kolab-freebusy/trunk/debian/patches/30-syslog.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-freebusy/trunk/debian/patches/30-syslog.dpatch
===================================================================
--- kolab-freebusy/trunk/debian/patches/30-syslog.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-freebusy/trunk/debian/patches/30-syslog.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30-syslog.dpatch by <math.parent at gmail.com>
-##
-## DP: Purpose : enable syslog
-
- at DPATCH@
-diff -urNad kolab-freebusy-2.2~rc1+20080204~/config.php kolab-freebusy-2.2~rc1+20080204/config.php
---- kolab-freebusy-2.2~rc1+20080204~/config.php 2007-11-30 14:47:35.000000000 +0100
-+++ kolab-freebusy-2.2~rc1+20080204/config.php 2008-02-18 18:59:48.000000000 +0100
-@@ -39,8 +39,8 @@
- /* Horde::Log configuration */
- $conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
--$conf['log']['type'] = 'file';
--$conf['log']['name'] = '/kolab/var/kolab-freebusy/log/freebusy.log';
-+$conf['log']['type'] = 'syslog';
-+$conf['log']['name'] = 'cons, pid';
- $conf['log']['ident'] = 'Kolab Free/Busy';
- $conf['log']['params']['append'] = true;
-
-
Added: kolab-freebusy/trunk/debian/patches/series
===================================================================
--- kolab-freebusy/trunk/debian/patches/series (rev 0)
+++ kolab-freebusy/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,2 @@
+20-config-path.diff
+30-syslog.diff
Modified: kolab-freebusy/trunk/debian/rules
===================================================================
--- kolab-freebusy/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-freebusy/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: build-stamp
-build-stamp: patch-stamp
+build: patch
dh_testdir
touch $@
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,3 +1,9 @@
+kolab-webadmin (2.2.0-20080709-2) unstable; urgency=low
+
+ * switch from dpatch to quilt
+
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 22:07:00 +0100
+
kolab-webadmin (2.2.0-20080709-1) unstable; urgency=low
* New upstream version: 2.2.0
Modified: kolab-webadmin/trunk/debian/control
===================================================================
--- kolab-webadmin/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-webadmin/branches/2.2/
Deleted: kolab-webadmin/trunk/debian/patches/00list
===================================================================
--- kolab-webadmin/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,3 +0,0 @@
-10-fix-require
-20-service_index
-60-no_extra_doc
Copied: kolab-webadmin/trunk/debian/patches/10-fix-require.diff (from rev 959, kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch)
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## DP: Correction of the require paths
+
+ at DPATCH@
+diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in
+--- kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in 2008-03-06 12:46:29.000000000 +0100
++++ kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in 2008-03-17 19:52:48.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+
+ require_once('mysmarty.php');
+-require_once('@sysconfdir@/kolab/session_vars.php');
++require_once('/etc/kolab-webadmin/session_vars.php');
+ require_once('debug.php');
+
+ /* We dont have any better place to put this right now... */
Property changes on: kolab-webadmin/trunk/debian/patches/10-fix-require.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correction of the require paths
-
- at DPATCH@
-diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in
---- kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in 2008-03-06 12:46:29.000000000 +0100
-+++ kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in 2008-03-17 19:52:48.000000000 +0100
-@@ -19,7 +19,7 @@
- */
-
- require_once('mysmarty.php');
--require_once('@sysconfdir@/kolab/session_vars.php');
-+require_once('/etc/kolab-webadmin/session_vars.php');
- require_once('debug.php');
-
- /* We dont have any better place to put this right now... */
Copied: kolab-webadmin/trunk/debian/patches/20-service_index.diff (from rev 959, kolab-webadmin/trunk/debian/patches/20-service_index.dpatch)
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-service_index.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/20-service_index.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 10-service_index.dpatch by Tobias König <tokoe at kde.org>
+##
+## DP: opportunity to delete freebusy value
+
+ at DPATCH@
+--- index.php.in.orig 2006-02-02 09:08:17.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/settings/index.php.in 2006-02-02 08:56:14.000000000 +0100
+@@ -151,7 +151,9 @@ if( $_REQUEST['submithttpallowunauthfb']
+
+ if( $_REQUEST['submitfreebusypast'] ) {
+ $attrs = array();
+- $attrs['kolabFreeBusyPast'] = trim( $_REQUEST['freebusypast'] );
++ $value = trim( $_REQUEST['freebusypast'] );
++ if( $value == '' ) $value = array();
++ $attrs['kolabFreeBusyPast'] = $value;
+ if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
+ $errors[] = _("LDAP Error: failed to modify kolab configuration object: ")
+ .ldap_error($ldap->connection);
Property changes on: kolab-webadmin/trunk/debian/patches/20-service_index.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-webadmin/trunk/debian/patches/20-service_index.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-service_index.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/patches/20-service_index.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-service_index.dpatch by Tobias König <tokoe at kde.org>
-##
-## DP: opportunity to delete freebusy value
-
- at DPATCH@
---- index.php.in.orig 2006-02-02 09:08:17.000000000 +0100
-+++ kolab-webadmin-0.4.0/www/admin/settings/index.php.in 2006-02-02 08:56:14.000000000 +0100
-@@ -151,7 +151,9 @@ if( $_REQUEST['submithttpallowunauthfb']
-
- if( $_REQUEST['submitfreebusypast'] ) {
- $attrs = array();
-- $attrs['kolabFreeBusyPast'] = trim( $_REQUEST['freebusypast'] );
-+ $value = trim( $_REQUEST['freebusypast'] );
-+ if( $value == '' ) $value = array();
-+ $attrs['kolabFreeBusyPast'] = $value;
- if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
- $errors[] = _("LDAP Error: failed to modify kolab configuration object: ")
- .ldap_error($ldap->connection);
Copied: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff (from rev 959, kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch)
===================================================================
--- kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60-no_extra_doc.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Disables installation of unnecessary documentation
+
+ at DPATCH@
+diff -urNad kolab-webadmin-2.1.0-20070510~/Makefile.am kolab-webadmin-2.1.0-20070510/Makefile.am
+--- kolab-webadmin-2.1.0-20070510~/Makefile.am 2007-01-10 16:59:58.000000000 +0100
++++ kolab-webadmin-2.1.0-20070510/Makefile.am 2007-06-18 02:23:33.000000000 +0200
+@@ -187,11 +187,11 @@
+ dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
+ dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+
+-kwadocdir = $(pkgdocdir)/@PACKAGE@
+-dist_kwadoc_DATA = ChangeLog \
+- COPYING \
+- NEWS \
+- AUTHORS
++#kwadocdir = $(pkgdocdir)/@PACKAGE@
++#dist_kwadoc_DATA = ChangeLog \
++# COPYING \
++# NEWS \
++# AUTHORS
+
+ EXTRA_DIST += dist_conf/common \
+ dist_conf/debian \
+diff -urNad kolab-webadmin-2.1.99-20080314~/Makefile.in kolab-webadmin-2.1.99-20080314/Makefile.in
+--- kolab-webadmin-2.1.99-20080314~/Makefile.in 2008-05-20 19:28:39.000000000 +0200
++++ kolab-webadmin-2.1.99-20080314/Makefile.in 2008-05-20 19:38:22.000000000 +0200
+@@ -386,11 +386,11 @@
+ phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
+ phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
+ phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+-kwadocdir = $(pkgdocdir)/@PACKAGE@
+-dist_kwadoc_DATA = ChangeLog \
+- COPYING \
+- NEWS \
+- AUTHORS
++#kwadocdir = $(pkgdocdir)/@PACKAGE@
++#dist_kwadoc_DATA = ChangeLog \
++# COPYING \
++# NEWS \
++# AUTHORS
+
+ all: all-am
+
+
Property changes on: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/patches/60-no_extra_doc.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60-no_extra_doc.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Disables installation of unnecessary documentation
-
- at DPATCH@
-diff -urNad kolab-webadmin-2.1.0-20070510~/Makefile.am kolab-webadmin-2.1.0-20070510/Makefile.am
---- kolab-webadmin-2.1.0-20070510~/Makefile.am 2007-01-10 16:59:58.000000000 +0100
-+++ kolab-webadmin-2.1.0-20070510/Makefile.am 2007-06-18 02:23:33.000000000 +0200
-@@ -187,11 +187,11 @@
- dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
- dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
-
--kwadocdir = $(pkgdocdir)/@PACKAGE@
--dist_kwadoc_DATA = ChangeLog \
-- COPYING \
-- NEWS \
-- AUTHORS
-+#kwadocdir = $(pkgdocdir)/@PACKAGE@
-+#dist_kwadoc_DATA = ChangeLog \
-+# COPYING \
-+# NEWS \
-+# AUTHORS
-
- EXTRA_DIST += dist_conf/common \
- dist_conf/debian \
-diff -urNad kolab-webadmin-2.1.99-20080314~/Makefile.in kolab-webadmin-2.1.99-20080314/Makefile.in
---- kolab-webadmin-2.1.99-20080314~/Makefile.in 2008-05-20 19:28:39.000000000 +0200
-+++ kolab-webadmin-2.1.99-20080314/Makefile.in 2008-05-20 19:38:22.000000000 +0200
-@@ -386,11 +386,11 @@
- phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
- phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
- phplocalees_DATA = $(PHP_LOCALE_ES_MO)
--kwadocdir = $(pkgdocdir)/@PACKAGE@
--dist_kwadoc_DATA = ChangeLog \
-- COPYING \
-- NEWS \
-- AUTHORS
-+#kwadocdir = $(pkgdocdir)/@PACKAGE@
-+#dist_kwadoc_DATA = ChangeLog \
-+# COPYING \
-+# NEWS \
-+# AUTHORS
-
- all: all-am
-
-
Added: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series (rev 0)
+++ kolab-webadmin/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,3 @@
+10-fix-require.diff
+20-service_index.diff
+60-no_extra_doc.diff
Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ kolab-webadmin/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-config.status: configure patch-stamp
+config.status: configure patch
dh_testdir
./configure --prefix=/usr --sysconfdir=/etc --with-dist=debian
Modified: kolabconf/trunk/debian/changelog
===================================================================
--- kolabconf/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,11 +1,12 @@
kolabconf (2.2.0-2) unstable; urgency=low
- * Updated 85-slapd-syncrepl-24.dpatch to match current upstream proposed
+ * Updated 85-slapd-syncrepl-24 to match current upstream proposed
patch
* make dependencies stronger
* change imapd service path in 30-invoke-rc patch
+ * switch from dpatch to quilt
- -- Mathieu Parent <math.parent at gmail.com> Tue, 14 Oct 2008 19:54:30 +0200
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 22:08:34 +0100
kolabconf (2.2.0-1) unstable; urgency=low
Modified: kolabconf/trunk/debian/control
===================================================================
--- kolabconf/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabconf/trunk/
Deleted: kolabconf/trunk/debian/patches/00list
===================================================================
--- kolabconf/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,4 +0,0 @@
-10-kolabconf-perl-path
-30-invoke-rc
-85-slapd-syncrepl-24
-95-runonchange
Copied: kolabconf/trunk/debian/patches/10-kolabconf-perl-path.diff (from rev 959, kolabconf/trunk/debian/patches/10-kolabconf-perl-path.dpatch)
===================================================================
--- kolabconf/trunk/debian/patches/10-kolabconf-perl-path.diff (rev 0)
+++ kolabconf/trunk/debian/patches/10-kolabconf-perl-path.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,15 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 10-kolabconf-perl-path.dpatch by Mathieu Parent <mat.parent at gmaiL.com>
+##
+## DP: have the good perl path
+
+ at DPATCH@
+diff -Nwru kolabconf-2.2~rc1+20080204~/ kolabconf-2.2~rc1+20080204/
+--- kolabconf-2.2~rc1+20080204~/bin/kolabconf.in 2008-02-17 11:18:00.000000000 +0100
++++ kolabconf-2.2~rc1+20080204/bin/kolabconf.in 2008-02-17 11:22:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!perl
++#!/usr/bin/perl
+
+ ## COPYRIGHT
+ ## ---------
Property changes on: kolabconf/trunk/debian/patches/10-kolabconf-perl-path.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: kolabconf/trunk/debian/patches/10-kolabconf-perl-path.dpatch
===================================================================
--- kolabconf/trunk/debian/patches/10-kolabconf-perl-path.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/patches/10-kolabconf-perl-path.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,15 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-kolabconf-perl-path.dpatch by Mathieu Parent <mat.parent at gmaiL.com>
-##
-## DP: have the good perl path
-
- at DPATCH@
-diff -Nwru kolabconf-2.2~rc1+20080204~/ kolabconf-2.2~rc1+20080204/
---- kolabconf-2.2~rc1+20080204~/bin/kolabconf.in 2008-02-17 11:18:00.000000000 +0100
-+++ kolabconf-2.2~rc1+20080204/bin/kolabconf.in 2008-02-17 11:22:19.000000000 +0100
-@@ -1,4 +1,4 @@
--#!perl
-+#!/usr/bin/perl
-
- ## COPYRIGHT
- ## ---------
Copied: kolabconf/trunk/debian/patches/30-invoke-rc.diff (from rev 959, kolabconf/trunk/debian/patches/30-invoke-rc.dpatch)
===================================================================
--- kolabconf/trunk/debian/patches/30-invoke-rc.diff (rev 0)
+++ kolabconf/trunk/debian/patches/30-invoke-rc.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-invoke-rc.dpatch by <math.parent at gmail.com>
+##
+## DP: Debian specific invocation of services
+
+ at DPATCH@
+diff -urNad kolabconf-2.2.0~/lib/Kolab/Conf.pm kolabconf-2.2.0/lib/Kolab/Conf.pm
+--- kolabconf-2.2.0~/lib/Kolab/Conf.pm 2008-10-14 19:50:45.000000000 +0200
++++ kolabconf-2.2.0/lib/Kolab/Conf.pm 2008-10-14 19:51:43.000000000 +0200
+@@ -724,38 +724,28 @@
+ {
+ if ($haschanged{'slapd'}) {
+ &Kolab::log('K', 'Restarting OpenLDAP...');
+- system("$Kolab::config{'KOLABRC'} rc openldap restart &");
++ system("invoke-rc.d slapd restart &");
+ }
+
+ if ($haschanged{'saslauthd'}) {
+ &Kolab::log('K', 'Restarting SASLAuthd...');
+- system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
++ system("invoke-rc.d saslauthd restart");
+ }
+
+ if ($haschanged{'apache'}) {
+ &Kolab::log('K', 'Reloading Apache...');
+- system("$Kolab::config{sbindir}/apachectl graceful");
++ system("invoke-rc.d apache2 graceful");
+ }
+
+ if ($haschanged{'postfix'}) {
+ &Kolab::log('K', 'Reloading Postfix...');
+- system("$Kolab::config{sbindir}/postfix reload");
++ system("invoke-rc.d postfix reload");
+ }
+
+ if ($haschanged{'imapd'}) {
+ &Kolab::log('K', 'Restarting imapd...');
+ # Would it be enough with a reload here? /steffen
+- system("$Kolab::config{'KOLABRC'} rc imapd restart");
+- }
+-
+- if ($haschanged{'amavisd'}) {
+- &Kolab::log('K', 'Restarting amavisd...');
+- system("$Kolab::config{'KOLABRC'} rc amavisd restart");
+- }
+-
+- if ($haschanged{'clamav'}) {
+- &Kolab::log('K', 'Restarting clamav...');
+- system("$Kolab::config{'KOLABRC'} rc clamav restart");
++ system("invoke-rc.d kolab-cyrus restart");
+ }
+
+ %Kolab::Conf::haschanged = ();
Property changes on: kolabconf/trunk/debian/patches/30-invoke-rc.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabconf/trunk/debian/patches/30-invoke-rc.dpatch
===================================================================
--- kolabconf/trunk/debian/patches/30-invoke-rc.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/patches/30-invoke-rc.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30-invoke-rc.dpatch by <math.parent at gmail.com>
-##
-## DP: Debian specific invocation of services
-
- at DPATCH@
-diff -urNad kolabconf-2.2.0~/lib/Kolab/Conf.pm kolabconf-2.2.0/lib/Kolab/Conf.pm
---- kolabconf-2.2.0~/lib/Kolab/Conf.pm 2008-10-14 19:50:45.000000000 +0200
-+++ kolabconf-2.2.0/lib/Kolab/Conf.pm 2008-10-14 19:51:43.000000000 +0200
-@@ -724,38 +724,28 @@
- {
- if ($haschanged{'slapd'}) {
- &Kolab::log('K', 'Restarting OpenLDAP...');
-- system("$Kolab::config{'KOLABRC'} rc openldap restart &");
-+ system("invoke-rc.d slapd restart &");
- }
-
- if ($haschanged{'saslauthd'}) {
- &Kolab::log('K', 'Restarting SASLAuthd...');
-- system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
-+ system("invoke-rc.d saslauthd restart");
- }
-
- if ($haschanged{'apache'}) {
- &Kolab::log('K', 'Reloading Apache...');
-- system("$Kolab::config{sbindir}/apachectl graceful");
-+ system("invoke-rc.d apache2 graceful");
- }
-
- if ($haschanged{'postfix'}) {
- &Kolab::log('K', 'Reloading Postfix...');
-- system("$Kolab::config{sbindir}/postfix reload");
-+ system("invoke-rc.d postfix reload");
- }
-
- if ($haschanged{'imapd'}) {
- &Kolab::log('K', 'Restarting imapd...');
- # Would it be enough with a reload here? /steffen
-- system("$Kolab::config{'KOLABRC'} rc imapd restart");
-- }
--
-- if ($haschanged{'amavisd'}) {
-- &Kolab::log('K', 'Restarting amavisd...');
-- system("$Kolab::config{'KOLABRC'} rc amavisd restart");
-- }
--
-- if ($haschanged{'clamav'}) {
-- &Kolab::log('K', 'Restarting clamav...');
-- system("$Kolab::config{'KOLABRC'} rc clamav restart");
-+ system("invoke-rc.d kolab-cyrus restart");
- }
-
- %Kolab::Conf::haschanged = ();
Copied: kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.diff (from rev 959, kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch)
===================================================================
--- kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.diff (rev 0)
+++ kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85-slapd-syncrepl-24.dpatch by <math.parent at gmail.com>
+##
+## DP: use syncrepl instead of slurpd
+## DP: see See https://www.intevation.de/roundup/kolab/issue1755
+
+ at DPATCH@
+diff -urNad kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm
+--- kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm 2007-10-18 11:22:52.000000000 +0200
++++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm 2008-02-17 19:15:04.000000000 +0100
+@@ -524,25 +524,44 @@
+ exit(1);
+ }
+
+- if( $Kolab::config{'is_master'} eq "true" ) {
+- # Master setup
+- my @kh;
+- if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
+- @kh = @{$Kolab::config{'kolabhost'}};
+- } else {
+- @kh = ( $Kolab::config{'kolabhost'} );
+- }
+- for my $h ( @kh ) {
+- next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
+- print $repl "replica uri=ldaps://$h\n"
+- ." binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
+- ." bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
+- }
++ # directory_mode syncrepl is supported from openldap-2.3.x and beyond
++ if ($Kolab::config{'directory_mode'} eq "syncrepl" or $Kolab::config{'directory_mode'} eq "sync") {
++
++ if ( $Kolab::config{'is_master'} eq "false" ) {
++ # Output a syncrepl statement for database synchronisation
++ print $repl "syncrepl rid=0 \n"
++ ." provider=".$Kolab::config{"ldap_master_uri"}."\n"
++ ." type=refreshAndPersist\n"
++ ." searchbase=\"".$Kolab::config{'base_dn'}."\"\n"
++ ." scope=sub\n"
++ ." schemachecking=on\n"
++ ." binddn=\"".$Kolab::config{"bind_dn"}."\"\n"
++ ." credentials=\"".$Kolab::config{"bind_pw"}."\"\n"
++ ." bindmethod=simple\n";
++ }
++
+ } else {
+- # Slave setup
+- # Output an update dn statement instead
+- print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
+- print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
++
++ if( $Kolab::config{'is_master'} eq "true" ) {
++ # Master setup
++ my @kh;
++ if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
++ @kh = @{$Kolab::config{'kolabhost'}};
++ } else {
++ @kh = ( $Kolab::config{'kolabhost'} );
++ }
++ for my $h ( @kh ) {
++ next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
++ print $repl "replica uri=ldaps://$h\n"
++ ." binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
++ ." bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
++ }
++ } else {
++ # Slave setup
++ # Output an update dn statement instead
++ print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
++ print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
++ }
+ }
+
+ $repl->close;
+
Property changes on: kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch
===================================================================
--- kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,74 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 85-slapd-syncrepl-24.dpatch by <math.parent at gmail.com>
-##
-## DP: use syncrepl instead of slurpd
-## DP: see See https://www.intevation.de/roundup/kolab/issue1755
-
- at DPATCH@
-diff -urNad kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm
---- kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm 2007-10-18 11:22:52.000000000 +0200
-+++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm 2008-02-17 19:15:04.000000000 +0100
-@@ -524,25 +524,44 @@
- exit(1);
- }
-
-- if( $Kolab::config{'is_master'} eq "true" ) {
-- # Master setup
-- my @kh;
-- if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
-- @kh = @{$Kolab::config{'kolabhost'}};
-- } else {
-- @kh = ( $Kolab::config{'kolabhost'} );
-- }
-- for my $h ( @kh ) {
-- next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
-- print $repl "replica uri=ldaps://$h\n"
-- ." binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
-- ." bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
-- }
-+ # directory_mode syncrepl is supported from openldap-2.3.x and beyond
-+ if ($Kolab::config{'directory_mode'} eq "syncrepl" or $Kolab::config{'directory_mode'} eq "sync") {
-+
-+ if ( $Kolab::config{'is_master'} eq "false" ) {
-+ # Output a syncrepl statement for database synchronisation
-+ print $repl "syncrepl rid=0 \n"
-+ ." provider=".$Kolab::config{"ldap_master_uri"}."\n"
-+ ." type=refreshAndPersist\n"
-+ ." searchbase=\"".$Kolab::config{'base_dn'}."\"\n"
-+ ." scope=sub\n"
-+ ." schemachecking=on\n"
-+ ." binddn=\"".$Kolab::config{"bind_dn"}."\"\n"
-+ ." credentials=\"".$Kolab::config{"bind_pw"}."\"\n"
-+ ." bindmethod=simple\n";
-+ }
-+
- } else {
-- # Slave setup
-- # Output an update dn statement instead
-- print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
-- print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
-+
-+ if( $Kolab::config{'is_master'} eq "true" ) {
-+ # Master setup
-+ my @kh;
-+ if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
-+ @kh = @{$Kolab::config{'kolabhost'}};
-+ } else {
-+ @kh = ( $Kolab::config{'kolabhost'} );
-+ }
-+ for my $h ( @kh ) {
-+ next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
-+ print $repl "replica uri=ldaps://$h\n"
-+ ." binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
-+ ." bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
-+ }
-+ } else {
-+ # Slave setup
-+ # Output an update dn statement instead
-+ print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
-+ print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
-+ }
- }
-
- $repl->close;
-
Copied: kolabconf/trunk/debian/patches/95-runonchange.diff (from rev 959, kolabconf/trunk/debian/patches/95-runonchange.dpatch)
===================================================================
--- kolabconf/trunk/debian/patches/95-runonchange.diff (rev 0)
+++ kolabconf/trunk/debian/patches/95-runonchange.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95-runonchange.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: Fix RUNONCHANGE templace metadata
+## DP: See https://www.intevation.de/roundup/kolab/issue2550
+
+ at DPATCH@
+diff -urNad kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm
+--- kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm 2008-04-26 13:21:55.000000000 +0200
++++ kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm 2008-04-26 13:23:54.000000000 +0200
+@@ -100,6 +100,11 @@
+ );
+
+ my $oldmask = umask 077;
++ #creating the config file is changing it
++ if (! -f $cfg) {
++ $templatehaschanged{$tmpl} = 1;
++ Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG );
++ }
+ copy($cfg, $oldcfg);
+ #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
+ # To avoid warnings, the backup files must be owned by root
+@@ -243,8 +248,8 @@
+ #} elsif ($cfg =~ /example/) {
+ } else {
+ Kolab::log('T', "`$cfg' change detected ", KOLAB_DEBUG );
+- $templatehaschanged{$tmpl} = 1;
+ }
++ $templatehaschanged{$tmpl} = 1;
+
+ Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
+ }
+@@ -675,7 +680,7 @@
+ foreach $key (keys %runonchange) {
+ if (defined $templatehaschanged{$key})
+ {
+- Kolab::log('T', 'Actioning RUNONCHANGE for $key', KOLAB_DEBUG );
++ Kolab::log('T', 'Actioning RUNONCHANGE for '.$key, KOLAB_DEBUG );
+ my $cmd = $runonchange{$key};
+ system($cmd);
+ Kolab::log('T', 'Executing command', KOLAB_DEBUG );
Property changes on: kolabconf/trunk/debian/patches/95-runonchange.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabconf/trunk/debian/patches/95-runonchange.dpatch
===================================================================
--- kolabconf/trunk/debian/patches/95-runonchange.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/patches/95-runonchange.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 95-runonchange.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Fix RUNONCHANGE templace metadata
-## DP: See https://www.intevation.de/roundup/kolab/issue2550
-
- at DPATCH@
-diff -urNad kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm
---- kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm 2008-04-26 13:21:55.000000000 +0200
-+++ kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm 2008-04-26 13:23:54.000000000 +0200
-@@ -100,6 +100,11 @@
- );
-
- my $oldmask = umask 077;
-+ #creating the config file is changing it
-+ if (! -f $cfg) {
-+ $templatehaschanged{$tmpl} = 1;
-+ Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG );
-+ }
- copy($cfg, $oldcfg);
- #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
- # To avoid warnings, the backup files must be owned by root
-@@ -243,8 +248,8 @@
- #} elsif ($cfg =~ /example/) {
- } else {
- Kolab::log('T', "`$cfg' change detected ", KOLAB_DEBUG );
-- $templatehaschanged{$tmpl} = 1;
- }
-+ $templatehaschanged{$tmpl} = 1;
-
- Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
- }
-@@ -675,7 +680,7 @@
- foreach $key (keys %runonchange) {
- if (defined $templatehaschanged{$key})
- {
-- Kolab::log('T', 'Actioning RUNONCHANGE for $key', KOLAB_DEBUG );
-+ Kolab::log('T', 'Actioning RUNONCHANGE for '.$key, KOLAB_DEBUG );
- my $cmd = $runonchange{$key};
- system($cmd);
- Kolab::log('T', 'Executing command', KOLAB_DEBUG );
Added: kolabconf/trunk/debian/patches/series
===================================================================
--- kolabconf/trunk/debian/patches/series (rev 0)
+++ kolabconf/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,4 @@
+10-kolabconf-perl-path.diff
+30-invoke-rc.diff
+85-slapd-syncrepl-24.diff
+95-runonchange.diff
Modified: kolabconf/trunk/debian/rules
===================================================================
--- kolabconf/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabconf/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: build-stamp
-build-stamp: patch-stamp
+build: patch
dh_testdir
perl Makefile.PL --config /etc/kolab/kolab.globals --bin /usr/sbin
$(MAKE)
Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -5,6 +5,7 @@
* README.Debian:
- Mention which daemons to stop/start,
- Remove unneeded creation of cyrus mailboxes
+ * switch from dpatch to quilt
* debian/control
- updated versioned dependency on libkolab-perl (Closes: #498202)
- added versioned dependency on kolabconf
@@ -50,7 +51,7 @@
* debian/preinst: remove unused_conffile
/etc/kolab/templates/fbview.conf.template
- -- Mathieu Parent <math.parent at gmail.com> Mon, 27 Oct 2008 18:29:50 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 21:52:55 +0100
kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
Modified: kolabd/trunk/debian/control
===================================================================
--- kolabd/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabd/branches/2.2/
Deleted: kolabd/trunk/debian/patches/00list
===================================================================
--- kolabd/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,14 +0,0 @@
-10-dist_conf
-30-bootstrap
-40-disable-amavis
-50-postfix-hashes
-55-no-distconf_kolabsrv
-#60-kolabdcachetool-cachefiles
-70-kolab2.schema-removal.of.rfc2739.dpatch
-80-kolab_globals
-85-slapd-2.4-compat
-86-slapd-syncrepl-24
-90-slapd-template
-91-postfix-template
-92-resmgr-template
-93-freebusy-template
Copied: kolabd/trunk/debian/patches/10-dist_conf.diff (from rev 959, kolabd/trunk/debian/patches/10-dist_conf.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.diff (rev 0)
+++ kolabd/trunk/debian/patches/10-dist_conf.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,136 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 10-dist_conf.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: Fixups for Debian
+
+ at DPATCH@
+diff -urNad kolabd-2.2.0-20080709.dfsg~/dist_conf/debian kolabd-2.2.0-20080709.dfsg/dist_conf/debian
+--- kolabd-2.2.0-20080709.dfsg~/dist_conf/debian 2008-10-27 17:19:20.000000000 +0100
++++ kolabd-2.2.0-20080709.dfsg/dist_conf/debian 2008-10-27 17:19:27.000000000 +0100
+@@ -1,20 +1,21 @@
++BASHELL=/bin/bash
++PERL=${bindir}/perl
++PHP=${bindir}/php
++KOLABRC=${sbindir}/kolab
++#RPM=${bindir}/rpm
++TAR=/bin/tar
++
+ kolab_usr=kolab
+ kolab_grp=kolab
+ kolab_musr=kolab
+ kolab_mgrp=kolab
+ kolab_uid=1002
+ kolab_gid=1002
+-restricted_kolab_usr=kolab
+-restricted_kolab_grp=kolab
+ kolab_rusr=${restricted_kolab_usr}
+ kolab_rgrp=${restricted_kolab_grp}
+ kolab_susr=root
+-pki_grp=${kolab_rgrp}
+-
+-BASHELL=/bin/bash
+-PERL=${bindir}/perl
+-PHP=${bindir}/php
+-KOLABRC=${sbindir}/kolab
++restricted_kolab_usr=kolab
++restricted_kolab_grp=kolab
+
+ kolab_rcdir=${sysconfdir}/init.d
+ pkgdocdir=${datadir}/doc/kolab
+@@ -35,8 +36,6 @@
+
+ fsl_logfile=${localstatedir}/log/fsl
+
+-sysrundir=${localstatedir}/run
+-
+ clamav_confdir=${sysconfdir}/clamav
+ clamav_socket=${localstatedir}/clamav/clamd.sock
+ clamav_logfile=${localstatedir}/log/clamav/clamav.log
+@@ -57,10 +56,13 @@
+ emailserver_localstatedir=${localstatedir}/spool/postfix
+ emailserver_logfile=${localstatedir}/log/mail.log
+ emailserver_usr=root
+-emailserver_tables_usr=root
+ emailserver_musr=kolab
+ emailserver_grp=root
++#emailserver_mail_owner=
++#emailserver_setgid_grp=
++#emailserver_default_privs=
+ emailserver_master_usr=kolab
++emailserver_tables_usr=root
+
+ imap_confdir=${sysconfdir}
+ imap_confperm=0640
+@@ -74,13 +76,18 @@
+ imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
+ imap_notify_socket=${localstatedir}/run/cyrus/socket/notify
+
++
+ kolab_statedir=${localstatedir}/lib/kolab
+ kolab_logdir=${localstatedir}/log/kolab
+ kolab_pidfile=${sysrundir}/kolab.pid
+ kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
++kolab_smtpdpolicy_conffile_usr=${kolab_musr}
++kolab_smtpdpolicy_conffile_grp=${kolab_grp}
++#kolab_php_module_prefix=
+ kolab_scriptsdir=${sbindir}
+ kolab_php_smarty_prefix=smarty/libs
+ smarty_compiledir=/var/cache/kolab-webadmin/templates
++
+ # Kolab web user interface
+ kolab_wui=/admin
+
+@@ -89,15 +96,18 @@
+ ldapserver_replogfile=${ldapserver_statedir}/replog
+ ldapserver_argsfile=${sysrundir}/slapd/slapd.args
+ ldapserver_logfile=${localstatedir}/log/syslog
++#ldapserver_rundir=
+ ldapserver_pidfile=${sysrundir}/slapd/slapd.pid
+ ldapserverslurpd_pidfile=${sysrundir}/slapd/slurpd.pid
+ ldapserver_schemadir=${sysconfdir}/ldap/schema
+ ldapserver_confdir=${sysconfdir}/ldap
+ ldapserver_usr=openldap
+ ldapserver_grp=openldap
++ldapserver_rgrp=openldap
+ ldapserver_rusr=openldap
+
+ webserver_document_root=/usr/share/kolab
++#webserver_tmpdir=
+ webserver_cgidir=${webserver_document_root}/cgi-bin
+ webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
+ webserver_logdir=${localstatedir}/log/apache2
+@@ -125,17 +135,20 @@
+ sasl_smtpconffile=${sysconfdir}/postfix/sasl/smtpd.conf
+ sasl_logfile=${localstatedir}/log/saslauthd.log
+
+-resmgr_logfile=${localstatedir}/log/resmgr.log
++sysrundir=${localstatedir}/run
++
++resmgr_logdir=${localstatedir}/log
+ resmgr_confdir=${sysconfdir}/kolab
+-resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
+-resmgr_scriptsdir=/usr/share/kolab/filter
+ resmgr_conffile_usr=kolab
+ resmgr_conffile_grp=root
++#resmgr_tmpdir=
++resmgr_scriptsdir=/usr/share/kolab/filter
+ resmgr_usr=root
+ resmgr_grp=www-data
++resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
+
+ fbview_logfile=${localstatedir}/resmgr/fbview.log
+-freebusy_logfile=${localstatedir}/resmgr/freebusy.log
++freebusy_logdir=${localstatedir}/log
+ freebusy_confdir=${sysconfdir}/kolab
+ freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
+ freebusy_usr=root
+@@ -146,8 +159,6 @@
+
+ backupdir=${localstatedir}/backups/kolab
+
+-kolab_smtpdpolicy_conffile_usr=${kolab_musr}
+-kolab_smtpdpolicy_conffile_grp=${kolab_grp}
++pki_grp=${kolab_rgrp}
+
+ aliases_file=${sysconfdir}/aliases
+-
Property changes on: kolabd/trunk/debian/patches/10-dist_conf.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/10-dist_conf.dpatch
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/10-dist_conf.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,136 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-dist_conf.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Fixups for Debian
-
- at DPATCH@
-diff -urNad kolabd-2.2.0-20080709.dfsg~/dist_conf/debian kolabd-2.2.0-20080709.dfsg/dist_conf/debian
---- kolabd-2.2.0-20080709.dfsg~/dist_conf/debian 2008-10-27 17:19:20.000000000 +0100
-+++ kolabd-2.2.0-20080709.dfsg/dist_conf/debian 2008-10-27 17:19:27.000000000 +0100
-@@ -1,20 +1,21 @@
-+BASHELL=/bin/bash
-+PERL=${bindir}/perl
-+PHP=${bindir}/php
-+KOLABRC=${sbindir}/kolab
-+#RPM=${bindir}/rpm
-+TAR=/bin/tar
-+
- kolab_usr=kolab
- kolab_grp=kolab
- kolab_musr=kolab
- kolab_mgrp=kolab
- kolab_uid=1002
- kolab_gid=1002
--restricted_kolab_usr=kolab
--restricted_kolab_grp=kolab
- kolab_rusr=${restricted_kolab_usr}
- kolab_rgrp=${restricted_kolab_grp}
- kolab_susr=root
--pki_grp=${kolab_rgrp}
--
--BASHELL=/bin/bash
--PERL=${bindir}/perl
--PHP=${bindir}/php
--KOLABRC=${sbindir}/kolab
-+restricted_kolab_usr=kolab
-+restricted_kolab_grp=kolab
-
- kolab_rcdir=${sysconfdir}/init.d
- pkgdocdir=${datadir}/doc/kolab
-@@ -35,8 +36,6 @@
-
- fsl_logfile=${localstatedir}/log/fsl
-
--sysrundir=${localstatedir}/run
--
- clamav_confdir=${sysconfdir}/clamav
- clamav_socket=${localstatedir}/clamav/clamd.sock
- clamav_logfile=${localstatedir}/log/clamav/clamav.log
-@@ -57,10 +56,13 @@
- emailserver_localstatedir=${localstatedir}/spool/postfix
- emailserver_logfile=${localstatedir}/log/mail.log
- emailserver_usr=root
--emailserver_tables_usr=root
- emailserver_musr=kolab
- emailserver_grp=root
-+#emailserver_mail_owner=
-+#emailserver_setgid_grp=
-+#emailserver_default_privs=
- emailserver_master_usr=kolab
-+emailserver_tables_usr=root
-
- imap_confdir=${sysconfdir}
- imap_confperm=0640
-@@ -74,13 +76,18 @@
- imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
- imap_notify_socket=${localstatedir}/run/cyrus/socket/notify
-
-+
- kolab_statedir=${localstatedir}/lib/kolab
- kolab_logdir=${localstatedir}/log/kolab
- kolab_pidfile=${sysrundir}/kolab.pid
- kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-+kolab_smtpdpolicy_conffile_usr=${kolab_musr}
-+kolab_smtpdpolicy_conffile_grp=${kolab_grp}
-+#kolab_php_module_prefix=
- kolab_scriptsdir=${sbindir}
- kolab_php_smarty_prefix=smarty/libs
- smarty_compiledir=/var/cache/kolab-webadmin/templates
-+
- # Kolab web user interface
- kolab_wui=/admin
-
-@@ -89,15 +96,18 @@
- ldapserver_replogfile=${ldapserver_statedir}/replog
- ldapserver_argsfile=${sysrundir}/slapd/slapd.args
- ldapserver_logfile=${localstatedir}/log/syslog
-+#ldapserver_rundir=
- ldapserver_pidfile=${sysrundir}/slapd/slapd.pid
- ldapserverslurpd_pidfile=${sysrundir}/slapd/slurpd.pid
- ldapserver_schemadir=${sysconfdir}/ldap/schema
- ldapserver_confdir=${sysconfdir}/ldap
- ldapserver_usr=openldap
- ldapserver_grp=openldap
-+ldapserver_rgrp=openldap
- ldapserver_rusr=openldap
-
- webserver_document_root=/usr/share/kolab
-+#webserver_tmpdir=
- webserver_cgidir=${webserver_document_root}/cgi-bin
- webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
- webserver_logdir=${localstatedir}/log/apache2
-@@ -125,17 +135,20 @@
- sasl_smtpconffile=${sysconfdir}/postfix/sasl/smtpd.conf
- sasl_logfile=${localstatedir}/log/saslauthd.log
-
--resmgr_logfile=${localstatedir}/log/resmgr.log
-+sysrundir=${localstatedir}/run
-+
-+resmgr_logdir=${localstatedir}/log
- resmgr_confdir=${sysconfdir}/kolab
--resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
--resmgr_scriptsdir=/usr/share/kolab/filter
- resmgr_conffile_usr=kolab
- resmgr_conffile_grp=root
-+#resmgr_tmpdir=
-+resmgr_scriptsdir=/usr/share/kolab/filter
- resmgr_usr=root
- resmgr_grp=www-data
-+resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
-
- fbview_logfile=${localstatedir}/resmgr/fbview.log
--freebusy_logfile=${localstatedir}/resmgr/freebusy.log
-+freebusy_logdir=${localstatedir}/log
- freebusy_confdir=${sysconfdir}/kolab
- freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
- freebusy_usr=root
-@@ -146,8 +159,6 @@
-
- backupdir=${localstatedir}/backups/kolab
-
--kolab_smtpdpolicy_conffile_usr=${kolab_musr}
--kolab_smtpdpolicy_conffile_grp=${kolab_grp}
-+pki_grp=${kolab_rgrp}
-
- aliases_file=${sysconfdir}/aliases
--
Copied: kolabd/trunk/debian/patches/30-bootstrap.diff (from rev 959, kolabd/trunk/debian/patches/30-bootstrap.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/30-bootstrap.diff (rev 0)
+++ kolabd/trunk/debian/patches/30-bootstrap.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,132 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 30-bootstrap.dpatch by Noèl Köthe <noel at debian.org>
+##
+## DP: Fixups for Debian
+
+ at DPATCH@
+diff -urNad kolabd-2.2.0-20080709.dfsg~/kolab_bootstrap.in kolabd-2.2.0-20080709.dfsg/kolab_bootstrap.in
+--- kolabd-2.2.0-20080709.dfsg~/kolab_bootstrap.in 2008-10-27 18:26:09.000000000 +0100
++++ kolabd-2.2.0-20080709.dfsg/kolab_bootstrap.in 2008-10-27 18:28:24.000000000 +0100
+@@ -22,6 +22,7 @@
+ use Net::LDAP::Entry;
+ use Net::Netmask;
+ use File::Copy;
++use File::Path;
+ use Getopt::Std;
+ use Term::ReadKey;
+ use Time::Local;
+@@ -69,7 +70,7 @@
+ print ("Error: Found $name running on Port $port\n");
+ print ("Check your installation!\n");
+ print ("You must stop the service $name before running Kolab\n");
+- print ("You may try to execute \"@KOLABRC@ rc all stop\" initially\n");
++ print ("You may try to execute \"/etc/init.d/\$DAEMON stop\" initially\n");
+ exit 1;
+ }
+ }
+@@ -181,7 +182,7 @@
+
+ print ("Excellent all required Ports are available!\n");
+
+-system("@sbindir@/slapcat >/dev/null 2>&1");
++system("su --shell /bin/sh --command @sbindir@/slapcat @ldapserver_usr@ >/dev/null 2>&1");
+ if ($?==0) {
+ print ("\nFound existing configuration\n");
+ print "\nBootstrapping Kolab will overwrite old configuration\n";
+@@ -203,7 +204,7 @@
+ }
+ my $epochseconds = timelocal(gmtime);
+ my $backupdir="@backupdir@/backup".$epochseconds;
+- mkdir($backupdir,0700) || die "cannot mkdir : $!";
++ mkpath($backupdir,0,0700) || die "cannot mkpath : $!";
+
+ print "creating backup of LDAP repository\n";
+ system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
+@@ -375,8 +376,23 @@
+ };
+
+ my $confname = "@sasl_smtpconffile@";
++ if (! -e "/etc/postfix/sasl/") {
++ mkdir( "/etc/postfix/sasl/", 0750) || die "cannot mkdir : $!";
++ }
+ copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
+
++ # enable saslauthd by default
++ copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not read /etc/default/saslauthd.orig";
++ my $saslauthd_orig = IO::File->new("/etc/default/saslauthd.orig", "r") || die "could not read /etc/default/saslauthd.orig";
++ my $saslauthd = IO::File->new("/etc/default/saslauthd", "w") || die "could not read /etc/default/saslauthd";
++ foreach (<$saslauthd_orig>) {
++ s/^(# )?START=.*$/START=yes/g;
++ s/^MECHANISMS="pam"/MECHANISMS="ldap"/g;
++ print $saslauthd $_;
++ }
++ undef $saslauthd;
++ undef $saslauthd_orig;
++
+ getopts('b');
+
+ if ($opt_b) {
+@@ -418,6 +434,7 @@
+ undef $slpd;
+ undef $tmpl;
+ kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
++ system("adduser --quiet @ldapserver_usr@ @pki_grp@");
+
+ my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
+ $confname = "@ldapserver_confdir@/slapd.replicas";
+@@ -466,7 +483,7 @@
+ $ldap_uri = "ldap://127.0.0.1:389/";
+ # ensure that the database has correct permissions
+ system("chown @ldapserver_rusr@:@ldapserver_grp@ @ldapserver_dir@/*");
+- (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf -u @ldapserver_rusr@ -g @ldapserver_grp@") == 0 ) || die( "Could not start temporary slapd: $!" );
++ (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf -u @ldapserver_rusr@ -g @ldapserver_grp@") == 0 ) || die( "Could not start temporary slapd: $!" );
+ print ("Waiting for OpenLDAP to start\n");
+ sleep 10;
+
+@@ -632,7 +649,7 @@
+
+ if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
+ print "\nkill temporary slapd\n\n";
+- system("@KOLABRC@ rc @LDAPD@ stop");
++ system("/etc/init.d/slapd stop");
+ sleep 1; # actually race should be impossible
+ system("killall -9 slapd >/dev/null 2>&1");
+ }
+@@ -680,7 +697,7 @@
+ ##### Slave server setup
+
+ print "stop running slapd (if any)\n";
+- kolab_system("@KOLABRC@ rc @LDAPD@ stop");
++ kolab_system("/etc/init.d/slapd stop");
+
+ # Make sure that no rogue demons are running
+ tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
+@@ -800,9 +817,9 @@
+ is copied over to this slave. Please make sure that this slave is entered into the list
+ of kolabhosts on the master before proceeding.
+ EOS
+- kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
++ kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
+ kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
+- kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
++ kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
+
+ # FIXME: we should get rid of this construct because it makes the code hard to read.
+ # A if (-e @sysconfdir@/rc.conf) statement should be enough.
+@@ -869,6 +886,8 @@
+ }
+
+ kolab_system("@sbindir@/kolabconf -n");
++ #run postfix newaliases
++ kolab_system("@bindir@/newaliases");
+
+ $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
+ print $fd "fqdnhostname : $fqdn\n";
+@@ -891,6 +910,6 @@
+
+ #system("@sysconfdir@/kolab/kolab_sslcert.sh $fqdn");
+ print "kolab is now ready to run!\n";
+-print "please run '@KOLABRC@ rc all start'\n";
++print "please restart all the daemons\n";
+ print ("Use login=manager and passwd=$bind_pw when you log into\n");
+ print ("the webinterface https://$fqdn@kolab_wui@ !\n");
Property changes on: kolabd/trunk/debian/patches/30-bootstrap.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/30-bootstrap.dpatch
===================================================================
--- kolabd/trunk/debian/patches/30-bootstrap.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/30-bootstrap.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,132 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 30-bootstrap.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: Fixups for Debian
-
- at DPATCH@
-diff -urNad kolabd-2.2.0-20080709.dfsg~/kolab_bootstrap.in kolabd-2.2.0-20080709.dfsg/kolab_bootstrap.in
---- kolabd-2.2.0-20080709.dfsg~/kolab_bootstrap.in 2008-10-27 18:26:09.000000000 +0100
-+++ kolabd-2.2.0-20080709.dfsg/kolab_bootstrap.in 2008-10-27 18:28:24.000000000 +0100
-@@ -22,6 +22,7 @@
- use Net::LDAP::Entry;
- use Net::Netmask;
- use File::Copy;
-+use File::Path;
- use Getopt::Std;
- use Term::ReadKey;
- use Time::Local;
-@@ -69,7 +70,7 @@
- print ("Error: Found $name running on Port $port\n");
- print ("Check your installation!\n");
- print ("You must stop the service $name before running Kolab\n");
-- print ("You may try to execute \"@KOLABRC@ rc all stop\" initially\n");
-+ print ("You may try to execute \"/etc/init.d/\$DAEMON stop\" initially\n");
- exit 1;
- }
- }
-@@ -181,7 +182,7 @@
-
- print ("Excellent all required Ports are available!\n");
-
--system("@sbindir@/slapcat >/dev/null 2>&1");
-+system("su --shell /bin/sh --command @sbindir@/slapcat @ldapserver_usr@ >/dev/null 2>&1");
- if ($?==0) {
- print ("\nFound existing configuration\n");
- print "\nBootstrapping Kolab will overwrite old configuration\n";
-@@ -203,7 +204,7 @@
- }
- my $epochseconds = timelocal(gmtime);
- my $backupdir="@backupdir@/backup".$epochseconds;
-- mkdir($backupdir,0700) || die "cannot mkdir : $!";
-+ mkpath($backupdir,0,0700) || die "cannot mkpath : $!";
-
- print "creating backup of LDAP repository\n";
- system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
-@@ -375,8 +376,23 @@
- };
-
- my $confname = "@sasl_smtpconffile@";
-+ if (! -e "/etc/postfix/sasl/") {
-+ mkdir( "/etc/postfix/sasl/", 0750) || die "cannot mkdir : $!";
-+ }
- copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
-
-+ # enable saslauthd by default
-+ copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not read /etc/default/saslauthd.orig";
-+ my $saslauthd_orig = IO::File->new("/etc/default/saslauthd.orig", "r") || die "could not read /etc/default/saslauthd.orig";
-+ my $saslauthd = IO::File->new("/etc/default/saslauthd", "w") || die "could not read /etc/default/saslauthd";
-+ foreach (<$saslauthd_orig>) {
-+ s/^(# )?START=.*$/START=yes/g;
-+ s/^MECHANISMS="pam"/MECHANISMS="ldap"/g;
-+ print $saslauthd $_;
-+ }
-+ undef $saslauthd;
-+ undef $saslauthd_orig;
-+
- getopts('b');
-
- if ($opt_b) {
-@@ -418,6 +434,7 @@
- undef $slpd;
- undef $tmpl;
- kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
-+ system("adduser --quiet @ldapserver_usr@ @pki_grp@");
-
- my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
- $confname = "@ldapserver_confdir@/slapd.replicas";
-@@ -466,7 +483,7 @@
- $ldap_uri = "ldap://127.0.0.1:389/";
- # ensure that the database has correct permissions
- system("chown @ldapserver_rusr@:@ldapserver_grp@ @ldapserver_dir@/*");
-- (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf -u @ldapserver_rusr@ -g @ldapserver_grp@") == 0 ) || die( "Could not start temporary slapd: $!" );
-+ (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf -u @ldapserver_rusr@ -g @ldapserver_grp@") == 0 ) || die( "Could not start temporary slapd: $!" );
- print ("Waiting for OpenLDAP to start\n");
- sleep 10;
-
-@@ -632,7 +649,7 @@
-
- if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
- print "\nkill temporary slapd\n\n";
-- system("@KOLABRC@ rc @LDAPD@ stop");
-+ system("/etc/init.d/slapd stop");
- sleep 1; # actually race should be impossible
- system("killall -9 slapd >/dev/null 2>&1");
- }
-@@ -680,7 +697,7 @@
- ##### Slave server setup
-
- print "stop running slapd (if any)\n";
-- kolab_system("@KOLABRC@ rc @LDAPD@ stop");
-+ kolab_system("/etc/init.d/slapd stop");
-
- # Make sure that no rogue demons are running
- tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
-@@ -800,9 +817,9 @@
- is copied over to this slave. Please make sure that this slave is entered into the list
- of kolabhosts on the master before proceeding.
- EOS
-- kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
-+ kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
- kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
-- kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
-+ kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
-
- # FIXME: we should get rid of this construct because it makes the code hard to read.
- # A if (-e @sysconfdir@/rc.conf) statement should be enough.
-@@ -869,6 +886,8 @@
- }
-
- kolab_system("@sbindir@/kolabconf -n");
-+ #run postfix newaliases
-+ kolab_system("@bindir@/newaliases");
-
- $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
- print $fd "fqdnhostname : $fqdn\n";
-@@ -891,6 +910,6 @@
-
- #system("@sysconfdir@/kolab/kolab_sslcert.sh $fqdn");
- print "kolab is now ready to run!\n";
--print "please run '@KOLABRC@ rc all start'\n";
-+print "please restart all the daemons\n";
- print ("Use login=manager and passwd=$bind_pw when you log into\n");
- print ("the webinterface https://$fqdn@kolab_wui@ !\n");
Copied: kolabd/trunk/debian/patches/40-disable-amavis.diff (from rev 959, kolabd/trunk/debian/patches/40-disable-amavis.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/40-disable-amavis.diff (rev 0)
+++ kolabd/trunk/debian/patches/40-disable-amavis.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-disable-amavis.dpatch by <math.parent at gmail.com>
+##
+## DP: amavis is only suggested, so disable by default
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
+--- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in 2008-02-29 14:47:55.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in 2008-02-29 14:48:30.000000000 +0100
+@@ -540,7 +540,7 @@
+ 'postfix-mynetworks' => $mynetworkinterfaces,
+ #'postfix-relayhost' => "",
+ #'postfix-transport' => "",
+- 'postfix-enable-virus-scan' => "TRUE",
++ 'postfix-enable-virus-scan' => "FALSE",
+ 'cyrus-autocreatequota' => 100000,
+ 'cyrus-quotawarn' => 80,
+ 'cyrus-admins' => "manager",
Property changes on: kolabd/trunk/debian/patches/40-disable-amavis.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/40-disable-amavis.dpatch
===================================================================
--- kolabd/trunk/debian/patches/40-disable-amavis.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/40-disable-amavis.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-disable-amavis.dpatch by <math.parent at gmail.com>
-##
-## DP: amavis is only suggested, so disable by default
-
- at DPATCH@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
---- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in 2008-02-29 14:47:55.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in 2008-02-29 14:48:30.000000000 +0100
-@@ -540,7 +540,7 @@
- 'postfix-mynetworks' => $mynetworkinterfaces,
- #'postfix-relayhost' => "",
- #'postfix-transport' => "",
-- 'postfix-enable-virus-scan' => "TRUE",
-+ 'postfix-enable-virus-scan' => "FALSE",
- 'cyrus-autocreatequota' => 100000,
- 'cyrus-quotawarn' => 80,
- 'cyrus-admins' => "manager",
Copied: kolabd/trunk/debian/patches/50-postfix-hashes.diff (from rev 959, kolabd/trunk/debian/patches/50-postfix-hashes.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/50-postfix-hashes.diff (rev 0)
+++ kolabd/trunk/debian/patches/50-postfix-hashes.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,115 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-postfix-hashes.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: Postfix hashes templates
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.am kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.am
+--- kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.am 2008-04-30 14:48:47.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.am 2008-05-25 12:14:20.000000000 +0200
+@@ -39,7 +39,9 @@
+ dist_kolabconfig_DATA = $(kolabconfig_FILES)
+
+
+-kolabtemplate_FILES = templates/amavisd.conf.template \
++kolabtemplate_FILES = templates/access.template \
++ templates/amavisd.conf.template \
++ templates/canonical.template \
+ templates/clamd.conf.template \
+ templates/cyrus.conf.template \
+ templates/DB_CONFIG.slapd.template \
+@@ -61,6 +63,7 @@
+ templates/ldapvirtual.cf.template \
+ templates/kolab_smtpdpolicy.conf.template \
+ templates/php.ini.template \
++ templates/relocated.template \
+ templates/resmgr.conf.template \
+ templates/saslauthd.conf.template \
+ templates/session_vars.php.template \
+diff -urNad kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.in kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.in
+--- kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.in 2008-05-21 17:35:44.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.in 2008-05-25 12:15:38.000000000 +0200
+@@ -190,7 +190,9 @@
+
+ kolabconfigdir = $(kolabconfdir)
+ dist_kolabconfig_DATA = $(kolabconfig_FILES)
+-kolabtemplate_FILES = templates/amavisd.conf.template \
++kolabtemplate_FILES = templates/access.template \
++ templates/amavisd.conf.template \
++ templates/canonical.template \
+ templates/clamd.conf.template \
+ templates/cyrus.conf.template \
+ templates/DB_CONFIG.slapd.template \
+@@ -212,6 +214,7 @@
+ templates/ldapvirtual.cf.template \
+ templates/kolab_smtpdpolicy.conf.template \
+ templates/php.ini.template \
++ templates/relocated.template \
+ templates/resmgr.conf.template \
+ templates/saslauthd.conf.template \
+ templates/session_vars.php.template \
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/access.template.in kolabd-2.1.99+20080314.dfsg/templates/access.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/access.template.in 1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/templates/access.template.in 2008-04-03 23:34:27.000000000 +0200
+@@ -0,0 +1,14 @@
++KOLAB_META_START
++TARGET=@emailserver_confdir@/access
++PERMISSIONS=0640
++OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/access
++KOLAB_META_END
++# (c) 2008 Mathieu Parent <math.parent at gmail.com>
++# This program is Free Software under the GNU General Public License (>=v2).
++# Read the file COPYING that comes with this packages for details.
++
++# this file is automatically written by the Kolab config backend
++# manual additions are lost unless made to the template in the Kolab config
++# directory
++# The template is @sysconfdir@/kolab/templates/access.template
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/canonical.template.in kolabd-2.1.99+20080314.dfsg/templates/canonical.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/canonical.template.in 1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/templates/canonical.template.in 2008-04-03 23:34:27.000000000 +0200
+@@ -0,0 +1,14 @@
++KOLAB_META_START
++TARGET=@emailserver_confdir@/canonical
++PERMISSIONS=0640
++OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/canonical
++KOLAB_META_END
++# (c) 2008 Mathieu Parent <math.parent at gmail.com>
++# This program is Free Software under the GNU General Public License (>=v2).
++# Read the file COPYING that comes with this packages for details.
++
++# this file is automatically written by the Kolab config backend
++# manual additions are lost unless made to the template in the Kolab config
++# directory
++# The template is @sysconfdir@/kolab/templates/canonical.template
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/relocated.template.in kolabd-2.1.99+20080314.dfsg/templates/relocated.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/relocated.template.in 1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/templates/relocated.template.in 2008-04-03 23:34:27.000000000 +0200
+@@ -0,0 +1,14 @@
++KOLAB_META_START
++TARGET=@emailserver_confdir@/relocated
++PERMISSIONS=0640
++OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/relocated
++KOLAB_META_END
++# (c) 2008 Mathieu Parent <math.parent at gmail.com>
++# This program is Free Software under the GNU General Public License (>=v2).
++# Read the file COPYING that comes with this packages for details.
++
++# this file is automatically written by the Kolab config backend
++# manual additions are lost unless made to the template in the Kolab config
++# directory
++# The template is @sysconfdir@/kolab/templates/relocated.template
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/virtual.template.in kolabd-2.1.99+20080314.dfsg/templates/virtual.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/virtual.template.in 2008-04-03 23:34:07.000000000 +0200
++++ kolabd-2.1.99+20080314.dfsg/templates/virtual.template.in 2008-04-03 23:35:10.000000000 +0200
+@@ -2,6 +2,7 @@
+ TARGET=@emailserver_confdir@/virtual
+ PERMISSIONS=0640
+ OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/virtual
+ KOLAB_META_END
+ # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ # (c) 2003 Martin Konold <martin.konold at erfrakon.de>
Property changes on: kolabd/trunk/debian/patches/50-postfix-hashes.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/50-postfix-hashes.dpatch
===================================================================
--- kolabd/trunk/debian/patches/50-postfix-hashes.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/50-postfix-hashes.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,115 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-postfix-hashes.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Postfix hashes templates
-
- at DPATCH@
-diff -urNad kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.am kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.am
---- kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.am 2008-04-30 14:48:47.000000000 +0200
-+++ kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.am 2008-05-25 12:14:20.000000000 +0200
-@@ -39,7 +39,9 @@
- dist_kolabconfig_DATA = $(kolabconfig_FILES)
-
-
--kolabtemplate_FILES = templates/amavisd.conf.template \
-+kolabtemplate_FILES = templates/access.template \
-+ templates/amavisd.conf.template \
-+ templates/canonical.template \
- templates/clamd.conf.template \
- templates/cyrus.conf.template \
- templates/DB_CONFIG.slapd.template \
-@@ -61,6 +63,7 @@
- templates/ldapvirtual.cf.template \
- templates/kolab_smtpdpolicy.conf.template \
- templates/php.ini.template \
-+ templates/relocated.template \
- templates/resmgr.conf.template \
- templates/saslauthd.conf.template \
- templates/session_vars.php.template \
-diff -urNad kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.in kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.in
---- kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.in 2008-05-21 17:35:44.000000000 +0200
-+++ kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.in 2008-05-25 12:15:38.000000000 +0200
-@@ -190,7 +190,9 @@
-
- kolabconfigdir = $(kolabconfdir)
- dist_kolabconfig_DATA = $(kolabconfig_FILES)
--kolabtemplate_FILES = templates/amavisd.conf.template \
-+kolabtemplate_FILES = templates/access.template \
-+ templates/amavisd.conf.template \
-+ templates/canonical.template \
- templates/clamd.conf.template \
- templates/cyrus.conf.template \
- templates/DB_CONFIG.slapd.template \
-@@ -212,6 +214,7 @@
- templates/ldapvirtual.cf.template \
- templates/kolab_smtpdpolicy.conf.template \
- templates/php.ini.template \
-+ templates/relocated.template \
- templates/resmgr.conf.template \
- templates/saslauthd.conf.template \
- templates/session_vars.php.template \
-diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/access.template.in kolabd-2.1.99+20080314.dfsg/templates/access.template.in
---- kolabd-2.1.99+20080314.dfsg~/templates/access.template.in 1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080314.dfsg/templates/access.template.in 2008-04-03 23:34:27.000000000 +0200
-@@ -0,0 +1,14 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/access
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/access
-+KOLAB_META_END
-+# (c) 2008 Mathieu Parent <math.parent at gmail.com>
-+# This program is Free Software under the GNU General Public License (>=v2).
-+# Read the file COPYING that comes with this packages for details.
-+
-+# this file is automatically written by the Kolab config backend
-+# manual additions are lost unless made to the template in the Kolab config
-+# directory
-+# The template is @sysconfdir@/kolab/templates/access.template
-diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/canonical.template.in kolabd-2.1.99+20080314.dfsg/templates/canonical.template.in
---- kolabd-2.1.99+20080314.dfsg~/templates/canonical.template.in 1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080314.dfsg/templates/canonical.template.in 2008-04-03 23:34:27.000000000 +0200
-@@ -0,0 +1,14 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/canonical
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/canonical
-+KOLAB_META_END
-+# (c) 2008 Mathieu Parent <math.parent at gmail.com>
-+# This program is Free Software under the GNU General Public License (>=v2).
-+# Read the file COPYING that comes with this packages for details.
-+
-+# this file is automatically written by the Kolab config backend
-+# manual additions are lost unless made to the template in the Kolab config
-+# directory
-+# The template is @sysconfdir@/kolab/templates/canonical.template
-diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/relocated.template.in kolabd-2.1.99+20080314.dfsg/templates/relocated.template.in
---- kolabd-2.1.99+20080314.dfsg~/templates/relocated.template.in 1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080314.dfsg/templates/relocated.template.in 2008-04-03 23:34:27.000000000 +0200
-@@ -0,0 +1,14 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/relocated
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/relocated
-+KOLAB_META_END
-+# (c) 2008 Mathieu Parent <math.parent at gmail.com>
-+# This program is Free Software under the GNU General Public License (>=v2).
-+# Read the file COPYING that comes with this packages for details.
-+
-+# this file is automatically written by the Kolab config backend
-+# manual additions are lost unless made to the template in the Kolab config
-+# directory
-+# The template is @sysconfdir@/kolab/templates/relocated.template
-diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/virtual.template.in kolabd-2.1.99+20080314.dfsg/templates/virtual.template.in
---- kolabd-2.1.99+20080314.dfsg~/templates/virtual.template.in 2008-04-03 23:34:07.000000000 +0200
-+++ kolabd-2.1.99+20080314.dfsg/templates/virtual.template.in 2008-04-03 23:35:10.000000000 +0200
-@@ -2,6 +2,7 @@
- TARGET=@emailserver_confdir@/virtual
- PERMISSIONS=0640
- OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/virtual
- KOLAB_META_END
- # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- # (c) 2003 Martin Konold <martin.konold at erfrakon.de>
Copied: kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff (from rev 959, kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff (rev 0)
+++ kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55-no-distconf_kolabsrv.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: distconf/kolabsrv.in is not shipped in. We don't need it anyway.
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99-20080521.dfsg~/Makefile.am kolabd-2.1.99-20080521.dfsg/Makefile.am
+--- kolabd-2.1.99-20080521.dfsg~/Makefile.am 2008-05-25 12:36:30.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/Makefile.am 2008-05-25 12:37:48.000000000 +0200
+@@ -149,8 +149,8 @@
+ kolabcheckperm
+ else
+ kolabsbin_FILES = kolabd \
+- kolabcheckperm \
+- dist_conf/kolabsrv
++ kolabcheckperm
++# dist_conf/kolabsrv
+ endif
+
+ kolabsbindir = $(sbindir)/
+@@ -226,9 +226,9 @@
+ chmod 744 $(DESTDIR)$(sbindir)/kolabd
+ chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
+ chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
+-if ! OPENPKG
+- chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
+-endif
++#if ! OPENPKG
++# chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
++#endif
+ if OPENPKG
+ chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
+ chmod 744 $(DESTDIR)$(bindir)/kolab
+diff -urNad kolabd-2.1.99-20080521.dfsg~/Makefile.in kolabd-2.1.99-20080521.dfsg/Makefile.in
+--- kolabd-2.1.99-20080521.dfsg~/Makefile.in 2008-05-25 12:36:30.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/Makefile.in 2008-05-25 12:37:10.000000000 +0200
+@@ -284,7 +284,7 @@
+ kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
+ @OPENPKG_FALSE at kolabsbin_FILES = kolabd \
+ @OPENPKG_FALSE@ kolabcheckperm \
+- at OPENPKG_FALSE@ dist_conf/kolabsrv
++# @OPENPKG_FALSE@ dist_conf/kolabsrv
+
+ @OPENPKG_TRUE at kolabsbin_FILES = kolabd \
+ @OPENPKG_TRUE@ kolabcheckperm
+@@ -895,7 +895,7 @@
+ chmod 744 $(DESTDIR)$(sbindir)/kolabd
+ chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
+ chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
+- at OPENPKG_FALSE@ chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
++# @OPENPKG_FALSE@ chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
+ @OPENPKG_TRUE@ chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
+ @OPENPKG_TRUE@ chmod 744 $(DESTDIR)$(bindir)/kolab
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Property changes on: kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.dpatch
===================================================================
--- kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55-no-distconf_kolabsrv.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: distconf/kolabsrv.in is not shipped in. We don't need it anyway.
-
- at DPATCH@
-diff -urNad kolabd-2.1.99-20080521.dfsg~/Makefile.am kolabd-2.1.99-20080521.dfsg/Makefile.am
---- kolabd-2.1.99-20080521.dfsg~/Makefile.am 2008-05-25 12:36:30.000000000 +0200
-+++ kolabd-2.1.99-20080521.dfsg/Makefile.am 2008-05-25 12:37:48.000000000 +0200
-@@ -149,8 +149,8 @@
- kolabcheckperm
- else
- kolabsbin_FILES = kolabd \
-- kolabcheckperm \
-- dist_conf/kolabsrv
-+ kolabcheckperm
-+# dist_conf/kolabsrv
- endif
-
- kolabsbindir = $(sbindir)/
-@@ -226,9 +226,9 @@
- chmod 744 $(DESTDIR)$(sbindir)/kolabd
- chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
- chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
--if ! OPENPKG
-- chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
--endif
-+#if ! OPENPKG
-+# chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
-+#endif
- if OPENPKG
- chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
- chmod 744 $(DESTDIR)$(bindir)/kolab
-diff -urNad kolabd-2.1.99-20080521.dfsg~/Makefile.in kolabd-2.1.99-20080521.dfsg/Makefile.in
---- kolabd-2.1.99-20080521.dfsg~/Makefile.in 2008-05-25 12:36:30.000000000 +0200
-+++ kolabd-2.1.99-20080521.dfsg/Makefile.in 2008-05-25 12:37:10.000000000 +0200
-@@ -284,7 +284,7 @@
- kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
- @OPENPKG_FALSE at kolabsbin_FILES = kolabd \
- @OPENPKG_FALSE@ kolabcheckperm \
-- at OPENPKG_FALSE@ dist_conf/kolabsrv
-+# @OPENPKG_FALSE@ dist_conf/kolabsrv
-
- @OPENPKG_TRUE at kolabsbin_FILES = kolabd \
- @OPENPKG_TRUE@ kolabcheckperm
-@@ -895,7 +895,7 @@
- chmod 744 $(DESTDIR)$(sbindir)/kolabd
- chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
- chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
-- at OPENPKG_FALSE@ chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
-+# @OPENPKG_FALSE@ chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
- @OPENPKG_TRUE@ chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
- @OPENPKG_TRUE@ chmod 744 $(DESTDIR)$(bindir)/kolab
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
Copied: kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff (from rev 959, kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff (rev 0)
+++ kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,38 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 60-kolabdcachetool-cachefiles.dpatch by Noèl Köthe <noel at debian.org>
+##
+## DP: This is the patch to correct the path of the cachefiles
+
+ at DPATCH@
+diff -urNad kolabd-1.9.4-20060707.dfsg~/kolabdcachetool kolabd-1.9.4-20060707.dfsg/kolabdcachetool
+--- kolabd-1.9.4-20060707.dfsg~/kolabdcachetool 2006-11-08 10:08:39.000000000 +0100
++++ kolabd-1.9.4-20060707.dfsg/kolabdcachetool 2006-11-08 10:08:40.000000000 +0100
+@@ -25,13 +25,13 @@
+ usage if ($func !~ /list/i && $func !~ /del/i && $func !~ /flush/i);
+
+ if ($cache =~ /mbox/i) {
+- dbmopen(%db, '/kolab/var/kolab/mailbox-uidcache.db', 0666)
++ dbmopen(%db, '/var/lib/kolab/mailbox-uidcache.db', 0666)
+ || die "Unable to open mail uid cache";
+ } elsif ($cache =~ /gyard/i) {
+- dbmopen(%db, '/kolab/var/kolab/graveyard-uidcache.db', 0666)
++ dbmopen(%db, '/var/lib/kolab/graveyard-uidcache.db', 0666)
+ || die "Unable to open graveyard uid cache";
+
+- dbmopen(%db2, '/kolab/var/kolab/graveyard-tscache.db', 0666)
++ dbmopen(%db2, '/var/lib/kolab/graveyard-tscache.db', 0666)
+ || die "Unable to open graveyard timestamp cache";
+ } else { usage; }
+
+diff -urNad kolabd-1.9.4-20060707.dfsg~/kolabquotawarn kolabd-1.9.4-20060707.dfsg/kolabquotawarn
+--- kolabd-1.9.4-20060707.dfsg~/kolabquotawarn 2006-11-08 10:08:39.000000000 +0100
++++ kolabd-1.9.4-20060707.dfsg/kolabquotawarn 2006-11-08 10:09:43.000000000 +0100
+@@ -108,7 +108,7 @@
+ fatal_exit( "Can't open quotawarning.txt" );
+ }
+
+-dbmopen( %quotawarn_db, $prefix.'/var/kolab/quotawarn.db', 0666 )
++dbmopen( %quotawarn_db, '/var/lib/kolab/quotawarn.db', 0666 )
+ || fatal_exit ('Unable to open quotawarn db');
+
+ if( $opt_d ) {
Property changes on: kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.dpatch
===================================================================
--- kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/60-kolabdcachetool-cachefiles.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,38 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 60-kolabdcachetool-cachefiles.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: This is the patch to correct the path of the cachefiles
-
- at DPATCH@
-diff -urNad kolabd-1.9.4-20060707.dfsg~/kolabdcachetool kolabd-1.9.4-20060707.dfsg/kolabdcachetool
---- kolabd-1.9.4-20060707.dfsg~/kolabdcachetool 2006-11-08 10:08:39.000000000 +0100
-+++ kolabd-1.9.4-20060707.dfsg/kolabdcachetool 2006-11-08 10:08:40.000000000 +0100
-@@ -25,13 +25,13 @@
- usage if ($func !~ /list/i && $func !~ /del/i && $func !~ /flush/i);
-
- if ($cache =~ /mbox/i) {
-- dbmopen(%db, '/kolab/var/kolab/mailbox-uidcache.db', 0666)
-+ dbmopen(%db, '/var/lib/kolab/mailbox-uidcache.db', 0666)
- || die "Unable to open mail uid cache";
- } elsif ($cache =~ /gyard/i) {
-- dbmopen(%db, '/kolab/var/kolab/graveyard-uidcache.db', 0666)
-+ dbmopen(%db, '/var/lib/kolab/graveyard-uidcache.db', 0666)
- || die "Unable to open graveyard uid cache";
-
-- dbmopen(%db2, '/kolab/var/kolab/graveyard-tscache.db', 0666)
-+ dbmopen(%db2, '/var/lib/kolab/graveyard-tscache.db', 0666)
- || die "Unable to open graveyard timestamp cache";
- } else { usage; }
-
-diff -urNad kolabd-1.9.4-20060707.dfsg~/kolabquotawarn kolabd-1.9.4-20060707.dfsg/kolabquotawarn
---- kolabd-1.9.4-20060707.dfsg~/kolabquotawarn 2006-11-08 10:08:39.000000000 +0100
-+++ kolabd-1.9.4-20060707.dfsg/kolabquotawarn 2006-11-08 10:09:43.000000000 +0100
-@@ -108,7 +108,7 @@
- fatal_exit( "Can't open quotawarning.txt" );
- }
-
--dbmopen( %quotawarn_db, $prefix.'/var/kolab/quotawarn.db', 0666 )
-+dbmopen( %quotawarn_db, '/var/lib/kolab/quotawarn.db', 0666 )
- || fatal_exit ('Unable to open quotawarn db');
-
- if( $opt_d ) {
Copied: kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff (from rev 959, kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff (rev 0)
+++ kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,34 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 70-kolab2.schema-removal.of.rfc2739.dpatch by Noèl Köthe <noel at debian.org>
+##
+## DP: remove upstream rfc2739 schema because it is not dfsg
+## DP: see rules that install a dfsg version of it
+
+ at DPATCH@
+diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.am kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.am
+--- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.am 2007-05-08 11:39:03.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.am 2007-06-21 20:18:14.000000000 +0200
+@@ -95,8 +95,7 @@
+ EXTRA_DIST += namespace/libexec/stop
+
+ ldapschema_FILES = kolab2.schema \
+- horde.schema \
+- rfc2739.schema
++ horde.schema
+
+ ldapschemadir = $(ldapserver_confdir)/schema
+ dist_ldapschema_DATA = $(ldapschema_FILES)
+diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.in kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.in
+--- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.in 2007-05-10 12:28:35.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.in 2007-06-21 20:18:14.000000000 +0200
+@@ -301,8 +301,7 @@
+ kolabnamespacedir = $(libexecdir)/kolab
+ kolabnamespace_DATA = $(kolabnamespace_FILES)
+ ldapschema_FILES = kolab2.schema \
+- horde.schema \
+- rfc2739.schema
++ horde.schema
+
+ ldapschemadir = $(ldapserver_confdir)/schema
+ dist_ldapschema_DATA = $(ldapschema_FILES)
+
Property changes on: kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch
===================================================================
--- kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,34 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 70-kolab2.schema-removal.of.rfc2739.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: remove upstream rfc2739 schema because it is not dfsg
-## DP: see rules that install a dfsg version of it
-
- at DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.am kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.am
---- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.am 2007-05-08 11:39:03.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.am 2007-06-21 20:18:14.000000000 +0200
-@@ -95,8 +95,7 @@
- EXTRA_DIST += namespace/libexec/stop
-
- ldapschema_FILES = kolab2.schema \
-- horde.schema \
-- rfc2739.schema
-+ horde.schema
-
- ldapschemadir = $(ldapserver_confdir)/schema
- dist_ldapschema_DATA = $(ldapschema_FILES)
-diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.in kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.in
---- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.in 2007-05-10 12:28:35.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.in 2007-06-21 20:18:14.000000000 +0200
-@@ -301,8 +301,7 @@
- kolabnamespacedir = $(libexecdir)/kolab
- kolabnamespace_DATA = $(kolabnamespace_FILES)
- ldapschema_FILES = kolab2.schema \
-- horde.schema \
-- rfc2739.schema
-+ horde.schema
-
- ldapschemadir = $(ldapserver_confdir)/schema
- dist_ldapschema_DATA = $(ldapschema_FILES)
-
Copied: kolabd/trunk/debian/patches/80-kolab_globals.diff (from rev 959, kolabd/trunk/debian/patches/80-kolab_globals.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/80-kolab_globals.diff (rev 0)
+++ kolabd/trunk/debian/patches/80-kolab_globals.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,25 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
+##
+## DP: -Use Fedora Directory Server (persistent searches) LDAP backend
+## DP: -Use syslog
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99-20080521.dfsg~/kolab.globals.in kolabd-2.1.99-20080521.dfsg/kolab.globals.in
+--- kolabd-2.1.99-20080521.dfsg~/kolab.globals.in 2008-06-10 23:34:22.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/kolab.globals.in 2008-06-10 23:35:00.000000000 +0200
+@@ -7,7 +7,7 @@
+ cyrus-pop3 : FALSE
+ cyrus-pop3s : TRUE
+ cyrus-sieve : TRUE
+-directory_mode : slurpd
++directory_mode : syncrepl
+ gyard_deletion_period : 10080
+ ldap_uri : ldap://127.0.0.1:389
+ log_level : 2
+@@ -48,4 +48,4 @@
+ bind_any : TRUE
+ bind_addr : 0.0.0.0
+ calendar_id : calendar
+-syslog_facility : user
++syslog_facility : local5
Property changes on: kolabd/trunk/debian/patches/80-kolab_globals.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/80-kolab_globals.dpatch
===================================================================
--- kolabd/trunk/debian/patches/80-kolab_globals.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/80-kolab_globals.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,25 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
-##
-## DP: -Use Fedora Directory Server (persistent searches) LDAP backend
-## DP: -Use syslog
-
- at DPATCH@
-diff -urNad kolabd-2.1.99-20080521.dfsg~/kolab.globals.in kolabd-2.1.99-20080521.dfsg/kolab.globals.in
---- kolabd-2.1.99-20080521.dfsg~/kolab.globals.in 2008-06-10 23:34:22.000000000 +0200
-+++ kolabd-2.1.99-20080521.dfsg/kolab.globals.in 2008-06-10 23:35:00.000000000 +0200
-@@ -7,7 +7,7 @@
- cyrus-pop3 : FALSE
- cyrus-pop3s : TRUE
- cyrus-sieve : TRUE
--directory_mode : slurpd
-+directory_mode : syncrepl
- gyard_deletion_period : 10080
- ldap_uri : ldap://127.0.0.1:389
- log_level : 2
-@@ -48,4 +48,4 @@
- bind_any : TRUE
- bind_addr : 0.0.0.0
- calendar_id : calendar
--syslog_facility : user
-+syslog_facility : local5
Copied: kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff (from rev 959, kolabd/trunk/debian/patches/85-slapd-2.4-compat.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff (rev 0)
+++ kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85-slapd-2.4-compat.dpatch by <math.parent at gmail.com>
+##
+## DP: Purpose : be compatible with OpenLDAP 2.4
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99-20080521.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99-20080521.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.99-20080521.dfsg~/templates/slapd.conf.template.in 2008-05-25 16:36:39.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/templates/slapd.conf.template.in 2008-05-25 16:37:12.000000000 +0200
+@@ -29,7 +29,8 @@
+ replogfile @ldapserver_replogfile@
+ replicationinterval 5
+
+-schemacheck on
++#schemacheck doesn't exists in debian's slapd 2.4
++#schemacheck on
+
+ TLSCertificateFile @sysconfdir@/kolab/cert.pem
+ TLSCertificateKeyFile @sysconfdir@/kolab/key.pem
+@@ -49,9 +50,9 @@
+ checkpoint 512 5
+ idlcachesize 10000
+ idletimeout 300
+- # The idletimeout can be increased if some clients develop
+- # problems. Please report to kolab-devel at kolab.org
+- # if you encounter such a client.
++# The idletimeout can be increased if some clients develop
++# problems. Please report to kolab-devel at kolab.org
++# if you encounter such a client.
+ dirtyread
+
+ directory @ldapserver_dir@
Property changes on: kolabd/trunk/debian/patches/85-slapd-2.4-compat.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/85-slapd-2.4-compat.dpatch
===================================================================
--- kolabd/trunk/debian/patches/85-slapd-2.4-compat.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/85-slapd-2.4-compat.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 85-slapd-2.4-compat.dpatch by <math.parent at gmail.com>
-##
-## DP: Purpose : be compatible with OpenLDAP 2.4
-
- at DPATCH@
-diff -urNad kolabd-2.1.99-20080521.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99-20080521.dfsg/templates/slapd.conf.template.in
---- kolabd-2.1.99-20080521.dfsg~/templates/slapd.conf.template.in 2008-05-25 16:36:39.000000000 +0200
-+++ kolabd-2.1.99-20080521.dfsg/templates/slapd.conf.template.in 2008-05-25 16:37:12.000000000 +0200
-@@ -29,7 +29,8 @@
- replogfile @ldapserver_replogfile@
- replicationinterval 5
-
--schemacheck on
-+#schemacheck doesn't exists in debian's slapd 2.4
-+#schemacheck on
-
- TLSCertificateFile @sysconfdir@/kolab/cert.pem
- TLSCertificateKeyFile @sysconfdir@/kolab/key.pem
-@@ -49,9 +50,9 @@
- checkpoint 512 5
- idlcachesize 10000
- idletimeout 300
-- # The idletimeout can be increased if some clients develop
-- # problems. Please report to kolab-devel at kolab.org
-- # if you encounter such a client.
-+# The idletimeout can be increased if some clients develop
-+# problems. Please report to kolab-devel at kolab.org
-+# if you encounter such a client.
- dirtyread
-
- directory @ldapserver_dir@
Copied: kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff (from rev 959, kolabd/trunk/debian/patches/86-slapd-syncrepl-24.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff (rev 0)
+++ kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,84 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 86-slapd-syncrepl-24.dpatch by <math.parent at gmail.com>
+##
+## DP: Purpose : enable syncrepl instead of slurpd
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
+--- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in 2008-03-15 10:11:23.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in 2008-03-15 10:11:23.000000000 +0100
+@@ -795,14 +795,32 @@
+ chmod 0600, $kolab_config;
+ kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
+
+- print << 'EOS';
++ ######################################################
++ # code needed for slurpd, it can be removed when
++ # kolab has fully switched to syncrepl.
++ my $directory_mode = "";
++ my $kolab_globals = "@sysconfdir@/kolab/kolab.globals";
++ my $fd = IO::File->new($kolab_globals, "r")
++ || die "could not open $kolab_globals";
++ foreach (<$fd>) {
++ if (/(.*) : (.*)/) {
++ if ($1 eq "directory_mode") { $directory_mode = $2};
++ }
++ }
++
++ if ($directory_mode ne "syncrepl" and $directory_mode ne "sync") {
++ print << 'EOS';
+ Now the master server needs to be stopped briefly while the contents of the LDAP database
+ is copied over to this slave. Please make sure that this slave is entered into the list
+ of kolabhosts on the master before proceeding.
+ EOS
+- kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
+- kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
+- kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
++ kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
++ kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
++ kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
++ }
++ # slurpd support
++ ######################################################
++
+
+ # FIXME: we should get rid of this construct because it makes the code hard to read.
+ # A if (-e @sysconfdir@/rc.conf) statement should be enough.
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in 2008-03-15 10:11:23.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in 2008-03-15 10:12:16.000000000 +0100
+@@ -24,10 +24,7 @@
+ #include @ldapserver_schemadir@/horde.schema
+
+ pidfile @ldapserver_pidfile@
+-replica-pidfile @ldapserverslurpd_pidfile@
+ argsfile @ldapserver_argsfile@
+-replogfile @ldapserver_replogfile@
+-replicationinterval 5
+
+ #schemacheck doesn't exists in debian's slapd 2.4
+ #schemacheck on
+@@ -66,6 +63,23 @@
+ bindmethod=simple
+ credentials=secret
+
++#### Provide the modern syncprov/syncrepl method of ldap replication
++# This database is a synchronisation provider
++# Note that a database can be both a consumer and a provider
++moduleload syncprov
++overlay syncprov
++# Guarantee that contextCSN gets written.
++syncprov-checkpoint 1024 16
++# Save a log of last write operations
++syncprov-sessionlog 4096
++# Support delta-based syncrepl
++syncprov-reloadhint TRUE
++# Put an index on attributes used for synchronisation
++# Note that these indexes are used locally both for server and client
++# during synchronisation.
++index entryCSN eq
++index entryUUID eq
++
+ #### Using overlays to improve data consistency
+ # Ensure that we never get dangling member attributes
+ # Checked on rename and delete
Property changes on: kolabd/trunk/debian/patches/86-slapd-syncrepl-24.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/86-slapd-syncrepl-24.dpatch
===================================================================
--- kolabd/trunk/debian/patches/86-slapd-syncrepl-24.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/86-slapd-syncrepl-24.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,84 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 86-slapd-syncrepl-24.dpatch by <math.parent at gmail.com>
-##
-## DP: Purpose : enable syncrepl instead of slurpd
-
- at DPATCH@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
---- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in 2008-03-15 10:11:23.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in 2008-03-15 10:11:23.000000000 +0100
-@@ -795,14 +795,32 @@
- chmod 0600, $kolab_config;
- kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
-
-- print << 'EOS';
-+ ######################################################
-+ # code needed for slurpd, it can be removed when
-+ # kolab has fully switched to syncrepl.
-+ my $directory_mode = "";
-+ my $kolab_globals = "@sysconfdir@/kolab/kolab.globals";
-+ my $fd = IO::File->new($kolab_globals, "r")
-+ || die "could not open $kolab_globals";
-+ foreach (<$fd>) {
-+ if (/(.*) : (.*)/) {
-+ if ($1 eq "directory_mode") { $directory_mode = $2};
-+ }
-+ }
-+
-+ if ($directory_mode ne "syncrepl" and $directory_mode ne "sync") {
-+ print << 'EOS';
- Now the master server needs to be stopped briefly while the contents of the LDAP database
- is copied over to this slave. Please make sure that this slave is entered into the list
- of kolabhosts on the master before proceeding.
- EOS
-- kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
-- kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
-- kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
-+ kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
-+ kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
-+ kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
-+ }
-+ # slurpd support
-+ ######################################################
-+
-
- # FIXME: we should get rid of this construct because it makes the code hard to read.
- # A if (-e @sysconfdir@/rc.conf) statement should be enough.
-diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in
---- kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in 2008-03-15 10:11:23.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in 2008-03-15 10:12:16.000000000 +0100
-@@ -24,10 +24,7 @@
- #include @ldapserver_schemadir@/horde.schema
-
- pidfile @ldapserver_pidfile@
--replica-pidfile @ldapserverslurpd_pidfile@
- argsfile @ldapserver_argsfile@
--replogfile @ldapserver_replogfile@
--replicationinterval 5
-
- #schemacheck doesn't exists in debian's slapd 2.4
- #schemacheck on
-@@ -66,6 +63,23 @@
- bindmethod=simple
- credentials=secret
-
-+#### Provide the modern syncprov/syncrepl method of ldap replication
-+# This database is a synchronisation provider
-+# Note that a database can be both a consumer and a provider
-+moduleload syncprov
-+overlay syncprov
-+# Guarantee that contextCSN gets written.
-+syncprov-checkpoint 1024 16
-+# Save a log of last write operations
-+syncprov-sessionlog 4096
-+# Support delta-based syncrepl
-+syncprov-reloadhint TRUE
-+# Put an index on attributes used for synchronisation
-+# Note that these indexes are used locally both for server and client
-+# during synchronisation.
-+index entryCSN eq
-+index entryUUID eq
-+
- #### Using overlays to improve data consistency
- # Ensure that we never get dangling member attributes
- # Checked on rename and delete
Copied: kolabd/trunk/debian/patches/90-slapd-template.diff (from rev 959, kolabd/trunk/debian/patches/90-slapd-template.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/90-slapd-template.diff (rev 0)
+++ kolabd/trunk/debian/patches/90-slapd-template.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80-slapd-template.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: slapd.conf template fixes
+
+ at DPATCH@
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/DB_CONFIG.slapd.template.in kolabd-2.1.0-20070510.dfsg/templates/DB_CONFIG.slapd.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/DB_CONFIG.slapd.template.in 2006-09-27 18:48:30.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/DB_CONFIG.slapd.template.in 2007-06-25 01:09:00.000000000 +0200
+@@ -1,7 +1,7 @@
+ KOLAB_META_START
+ TARGET=@ldapserver_dir@/DB_CONFIG
+ PERMISSIONS=0640
+-OWNERSHIP=@kolab_musr@:@kolab_rgrp@
++OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+ KOLAB_META_END
+ # (c) 2005 Klaraelvdalens Datakonsult AB
+ # Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/slapd.conf.template.in kolabd-2.1.0-20070510.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/slapd.conf.template.in 2007-06-25 01:08:15.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/slapd.conf.template.in 2007-06-25 01:08:16.000000000 +0200
+@@ -13,6 +13,12 @@
+ # this file is automatically written by the Kolab config backend and should have the
+ # file mode 0640
+
++modulepath /usr/lib/ldap
++moduleload back_bdb
++moduleload back_monitor
++moduleload refint
++moduleload unique
++
+ # manual additions are lost unless made to the template in the Kolab config directory
+ # the template is @sysconfdir@/kolab/templates/slapd.conf.template
+
+@@ -20,8 +26,8 @@
+ include @ldapserver_schemadir@/cosine.schema
+ include @ldapserver_schemadir@/inetorgperson.schema
+ include @ldapserver_schemadir@/rfc2739.schema
+-include @ldapserver_schemadir@/kolab2.schema
+-#include @ldapserver_schemadir@/horde.schema
++include /usr/share/kolabd/schema/kolab2.schema
++include /usr/share/kolabd/schema/horde.schema
+
+ pidfile @ldapserver_pidfile@
+ replica-pidfile @ldapserverslurpd_pidfile@
Property changes on: kolabd/trunk/debian/patches/90-slapd-template.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/90-slapd-template.dpatch
===================================================================
--- kolabd/trunk/debian/patches/90-slapd-template.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/90-slapd-template.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80-slapd-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: slapd.conf template fixes
-
- at DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/DB_CONFIG.slapd.template.in kolabd-2.1.0-20070510.dfsg/templates/DB_CONFIG.slapd.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/DB_CONFIG.slapd.template.in 2006-09-27 18:48:30.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg/templates/DB_CONFIG.slapd.template.in 2007-06-25 01:09:00.000000000 +0200
-@@ -1,7 +1,7 @@
- KOLAB_META_START
- TARGET=@ldapserver_dir@/DB_CONFIG
- PERMISSIONS=0640
--OWNERSHIP=@kolab_musr@:@kolab_rgrp@
-+OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
- KOLAB_META_END
- # (c) 2005 Klaraelvdalens Datakonsult AB
- # Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/slapd.conf.template.in kolabd-2.1.0-20070510.dfsg/templates/slapd.conf.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/slapd.conf.template.in 2007-06-25 01:08:15.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg/templates/slapd.conf.template.in 2007-06-25 01:08:16.000000000 +0200
-@@ -13,6 +13,12 @@
- # this file is automatically written by the Kolab config backend and should have the
- # file mode 0640
-
-+modulepath /usr/lib/ldap
-+moduleload back_bdb
-+moduleload back_monitor
-+moduleload refint
-+moduleload unique
-+
- # manual additions are lost unless made to the template in the Kolab config directory
- # the template is @sysconfdir@/kolab/templates/slapd.conf.template
-
-@@ -20,8 +26,8 @@
- include @ldapserver_schemadir@/cosine.schema
- include @ldapserver_schemadir@/inetorgperson.schema
- include @ldapserver_schemadir@/rfc2739.schema
--include @ldapserver_schemadir@/kolab2.schema
--#include @ldapserver_schemadir@/horde.schema
-+include /usr/share/kolabd/schema/kolab2.schema
-+include /usr/share/kolabd/schema/horde.schema
-
- pidfile @ldapserver_pidfile@
- replica-pidfile @ldapserverslurpd_pidfile@
Copied: kolabd/trunk/debian/patches/91-postfix-template.diff (from rev 959, kolabd/trunk/debian/patches/91-postfix-template.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/91-postfix-template.diff (rev 0)
+++ kolabd/trunk/debian/patches/91-postfix-template.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91-postfix-template.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjustments in Postfix templates
+
+ at DPATCH@
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/main.cf.template.in kolabd-2.1.0-20070510.dfsg/templates/main.cf.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/main.cf.template.in 2007-05-09 12:25:06.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/main.cf.template.in 2007-10-19 13:37:42.000000000 +0200
+@@ -19,16 +19,6 @@
+ # we use 20 Mebibyte = 20*2^20 Byte
+ message_size_limit = 20971520
+
+-# paths
+-command_directory = @sbindir@
+-daemon_directory = @libexecdir@/postfix
+-queue_directory = @emailserver_localstatedir@
+-
+-# users
+-mail_owner= @emailserver_mail_owner@
+-setgid_group= @emailserver_setgid_grp@
+-default_privs= @emailserver_default_privs@
+-
+ # local host
+ myhostname = @@@fqdnhostname@@@
+ mydomain = @@@postfix-mydomain@@@
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/master.cf.template.in kolabd-2.1.0-20070510.dfsg/templates/master.cf.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/master.cf.template.in 2006-06-26 18:39:17.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/master.cf.template.in 2007-10-19 13:38:21.000000000 +0200
+@@ -1,6 +1,6 @@
+ KOLAB_META_START
+ TARGET=@emailserver_confdir@/master.cf
+-PERMISSIONS=0640
++PERMISSIONS=0644
+ OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+ KOLAB_META_END
+ # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in kolabd-2.1.0-20070510.dfsg/templates/transport.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in 2007-01-08 22:28:14.000000000 +0100
++++ kolabd-2.1.0-20070510.dfsg/templates/transport.template.in 2007-10-19 13:37:42.000000000 +0200
+@@ -1,6 +1,6 @@
+ KOLAB_META_START
+ TARGET=@emailserver_confdir@/transport
+-PERMISSIONS=0640
++PERMISSIONS=0644
+ OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
+ KOLAB_META_END
+ # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/virtual.template.in kolabd-2.1.0-20070510.dfsg/templates/virtual.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/virtual.template.in 2007-01-08 22:28:14.000000000 +0100
++++ kolabd-2.1.0-20070510.dfsg/templates/virtual.template.in 2007-10-19 13:37:42.000000000 +0200
+@@ -1,6 +1,6 @@
+ KOLAB_META_START
+ TARGET=@emailserver_confdir@/virtual
+-PERMISSIONS=0640
++PERMISSIONS=0644
+ OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
+ KOLAB_META_END
+ # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
Property changes on: kolabd/trunk/debian/patches/91-postfix-template.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/91-postfix-template.dpatch
===================================================================
--- kolabd/trunk/debian/patches/91-postfix-template.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/91-postfix-template.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91-postfix-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjustments in Postfix templates
-
- at DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/main.cf.template.in kolabd-2.1.0-20070510.dfsg/templates/main.cf.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/main.cf.template.in 2007-05-09 12:25:06.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg/templates/main.cf.template.in 2007-10-19 13:37:42.000000000 +0200
-@@ -19,16 +19,6 @@
- # we use 20 Mebibyte = 20*2^20 Byte
- message_size_limit = 20971520
-
--# paths
--command_directory = @sbindir@
--daemon_directory = @libexecdir@/postfix
--queue_directory = @emailserver_localstatedir@
--
--# users
--mail_owner= @emailserver_mail_owner@
--setgid_group= @emailserver_setgid_grp@
--default_privs= @emailserver_default_privs@
--
- # local host
- myhostname = @@@fqdnhostname@@@
- mydomain = @@@postfix-mydomain@@@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/master.cf.template.in kolabd-2.1.0-20070510.dfsg/templates/master.cf.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/master.cf.template.in 2006-06-26 18:39:17.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg/templates/master.cf.template.in 2007-10-19 13:38:21.000000000 +0200
-@@ -1,6 +1,6 @@
- KOLAB_META_START
- TARGET=@emailserver_confdir@/master.cf
--PERMISSIONS=0640
-+PERMISSIONS=0644
- OWNERSHIP=@emailserver_usr@:@emailserver_grp@
- KOLAB_META_END
- # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in kolabd-2.1.0-20070510.dfsg/templates/transport.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in 2007-01-08 22:28:14.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/templates/transport.template.in 2007-10-19 13:37:42.000000000 +0200
-@@ -1,6 +1,6 @@
- KOLAB_META_START
- TARGET=@emailserver_confdir@/transport
--PERMISSIONS=0640
-+PERMISSIONS=0644
- OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
- KOLAB_META_END
- # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/virtual.template.in kolabd-2.1.0-20070510.dfsg/templates/virtual.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/virtual.template.in 2007-01-08 22:28:14.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/templates/virtual.template.in 2007-10-19 13:37:42.000000000 +0200
-@@ -1,6 +1,6 @@
- KOLAB_META_START
- TARGET=@emailserver_confdir@/virtual
--PERMISSIONS=0640
-+PERMISSIONS=0644
- OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
- KOLAB_META_END
- # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
Copied: kolabd/trunk/debian/patches/92-resmgr-template.diff (from rev 959, kolabd/trunk/debian/patches/92-resmgr-template.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/92-resmgr-template.diff (rev 0)
+++ kolabd/trunk/debian/patches/92-resmgr-template.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92-resmgr-template.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjustments in resmgr template
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/resmgr.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/resmgr.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/resmgr.conf.template.in 2007-12-07 16:49:21.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/resmgr.conf.template.in 2008-02-17 23:27:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ KOLAB_META_START
+-TARGET=@resmgr_confdir@/config.php
++TARGET=/etc/kolab/filter/config.php
+ PERMISSIONS=0640
+ OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
+ KOLAB_META_END
+@@ -163,8 +163,8 @@
+ */
+ $conf['log']['enabled'] = true;
+ $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+-$conf['log']['type'] = 'file';
+-$conf['log']['name'] = '@resmgr_logdir@/filter.log';
++$conf['log']['type'] = 'syslog';
++$conf['log']['name'] = 'cons, pid';
+ $conf['log']['ident'] = 'Kolab Filter';
+ $conf['log']['params']['append'] = true;
+
+
Property changes on: kolabd/trunk/debian/patches/92-resmgr-template.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/92-resmgr-template.dpatch
===================================================================
--- kolabd/trunk/debian/patches/92-resmgr-template.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/92-resmgr-template.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 92-resmgr-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjustments in resmgr template
-
- at DPATCH@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/resmgr.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/resmgr.conf.template.in
---- kolabd-2.1.99+20080204.dfsg~/templates/resmgr.conf.template.in 2007-12-07 16:49:21.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/resmgr.conf.template.in 2008-02-17 23:27:19.000000000 +0100
-@@ -1,5 +1,5 @@
- KOLAB_META_START
--TARGET=@resmgr_confdir@/config.php
-+TARGET=/etc/kolab/filter/config.php
- PERMISSIONS=0640
- OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
- KOLAB_META_END
-@@ -163,8 +163,8 @@
- */
- $conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
--$conf['log']['type'] = 'file';
--$conf['log']['name'] = '@resmgr_logdir@/filter.log';
-+$conf['log']['type'] = 'syslog';
-+$conf['log']['name'] = 'cons, pid';
- $conf['log']['ident'] = 'Kolab Filter';
- $conf['log']['params']['append'] = true;
-
-
Copied: kolabd/trunk/debian/patches/93-freebusy-template.diff (from rev 959, kolabd/trunk/debian/patches/93-freebusy-template.dpatch)
===================================================================
--- kolabd/trunk/debian/patches/93-freebusy-template.diff (rev 0)
+++ kolabd/trunk/debian/patches/93-freebusy-template.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93-freebusy-template.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjustments in freebusy template
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/freebusy.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/freebusy.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/freebusy.conf.template.in 2007-12-07 16:49:21.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/freebusy.conf.template.in 2008-02-17 23:07:26.000000000 +0100
+@@ -1,5 +1,5 @@
+ KOLAB_META_START
+-TARGET=@freebusy_confdir@/config.php
++TARGET=/etc/kolab/freebusy/config.php
+ PERMISSIONS=0640
+ OWNERSHIP=@freebusy_usr@:@freebusy_grp@
+ KOLAB_META_END
+@@ -44,8 +44,8 @@
+ /* Horde::Log configuration */
+ $conf['log']['enabled'] = true;
+ $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+-$conf['log']['type'] = 'file';
+-$conf['log']['name'] = '@freebusy_logdir@/freebusy.log';
++$conf['log']['type'] = 'syslog';
++$conf['log']['name'] = 'cons, pid';
+ $conf['log']['ident'] = 'Kolab Free/Busy';
+ $conf['log']['params']['append'] = true;
+
Property changes on: kolabd/trunk/debian/patches/93-freebusy-template.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: kolabd/trunk/debian/patches/93-freebusy-template.dpatch
===================================================================
--- kolabd/trunk/debian/patches/93-freebusy-template.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/patches/93-freebusy-template.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 93-freebusy-template.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjustments in freebusy template
-
- at DPATCH@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/freebusy.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/freebusy.conf.template.in
---- kolabd-2.1.99+20080204.dfsg~/templates/freebusy.conf.template.in 2007-12-07 16:49:21.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/freebusy.conf.template.in 2008-02-17 23:07:26.000000000 +0100
-@@ -1,5 +1,5 @@
- KOLAB_META_START
--TARGET=@freebusy_confdir@/config.php
-+TARGET=/etc/kolab/freebusy/config.php
- PERMISSIONS=0640
- OWNERSHIP=@freebusy_usr@:@freebusy_grp@
- KOLAB_META_END
-@@ -44,8 +44,8 @@
- /* Horde::Log configuration */
- $conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
--$conf['log']['type'] = 'file';
--$conf['log']['name'] = '@freebusy_logdir@/freebusy.log';
-+$conf['log']['type'] = 'syslog';
-+$conf['log']['name'] = 'cons, pid';
- $conf['log']['ident'] = 'Kolab Free/Busy';
- $conf['log']['params']['append'] = true;
-
Added: kolabd/trunk/debian/patches/series
===================================================================
--- kolabd/trunk/debian/patches/series (rev 0)
+++ kolabd/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,14 @@
+10-dist_conf.diff
+30-bootstrap.diff
+40-disable-amavis.diff
+50-postfix-hashes.diff
+55-no-distconf_kolabsrv.diff
+#60-kolabdcachetool-cachefiles.diff
+70-kolab2.schema-removal.of.rfc2739.diff
+80-kolab_globals.diff
+85-slapd-2.4-compat.diff
+86-slapd-syncrepl-24.diff
+90-slapd-template.diff
+91-postfix-template.diff
+92-resmgr-template.diff
+93-freebusy-template.diff
Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ kolabd/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-config.status: configure patch-stamp
+config.status: configure patch
dh_testdir
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib --with-dist=debian --without-openpkg
Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ libkolab-perl/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -6,8 +6,9 @@
* renamed sync LDAP backend to syncrepl to match upstream
* debian/control: added versioned dependency on libnet-ldap-perl as needed
by the syncrepl LDAP backend
+ * switch from dpatch to quilt
- -- Mathieu Parent <math.parent at gmail.com> Sun, 19 Oct 2008 17:46:52 +0200
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 22:07:42 +0100
libkolab-perl (1:2.2.0-1) unstable; urgency=low
Modified: libkolab-perl/trunk/debian/control
===================================================================
--- libkolab-perl/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ libkolab-perl/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), quilt (>= 0.40)
Build-Depends-Indep: libnet-ldap-perl
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Deleted: libkolab-perl/trunk/debian/patches/00list
===================================================================
--- libkolab-perl/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ libkolab-perl/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,2 +0,0 @@
-50-sync-ldap-backend
-
Copied: libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff (from rev 959, libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch)
===================================================================
--- libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff (rev 0)
+++ libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,329 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-sync-ldap-backend.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: LDAP backend using content synchronization (RFC4533)
+## DP: which is not activated by default
+
+ at DPATCH@
+diff -urNad libkolab-perl-2.2.0~/lib/Kolab/LDAP/Backend/syncrepl.pm libkolab-perl-2.2.0/lib/Kolab/LDAP/Backend/syncrepl.pm
+--- libkolab-perl-2.2.0~/lib/Kolab/LDAP/Backend/syncrepl.pm 1970-01-01 01:00:00.000000000 +0100
++++ libkolab-perl-2.2.0/lib/Kolab/LDAP/Backend/syncrepl.pm 2008-08-02 01:06:03.000000000 +0200
+@@ -0,0 +1,318 @@
++package Kolab::LDAP::Backend::syncrepl;
++
++##
++## Copyright (c) 2008 Mathieu Parent <math.parent at gmail.com>
++##
++## This program is free software; you can redistribute it and/or
++## modify it under the terms of the GNU General Public License as
++## published by the Free Software Foundation; either version 2, or
++## (at your option) any later version.
++##
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++## General Public License for more details.
++##
++## You can view the GNU General Public License, online, at the GNU
++## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
++##
++use 5.008;
++use strict;
++use warnings;
++use Kolab;
++use Kolab::LDAP;
++use Net::LDAP;
++use Net::LDAP::Control;
++use Net::LDAP::Entry;
++use vars qw($ldap $cookie $disconnected);
++my $cookie = '';
++my $disconnected = 1;
++
++require Exporter;
++
++our @ISA = qw(Exporter);
++
++our %EXPORT_TAGS = (
++ 'all' => [ qw(
++ &startup
++ &run
++ ) ]
++);
++
++our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
++
++our @EXPORT = qw(
++
++);
++
++our $VERSION = '0.1';
++
++# LDAP Content Synchronization Operation -- RFC 4533
++use constant LDAP_SYNC_OID => "1.3.6.1.4.1.4203.1.9.1";
++use constant {
++ LDAP_CONTROL_SYNC => LDAP_SYNC_OID.".1",
++ LDAP_CONTROL_SYNC_STATE => LDAP_SYNC_OID.".2",
++ LDAP_CONTROL_SYNC_DONE => LDAP_SYNC_OID.".3",
++ LDAP_SYNC_INFO => LDAP_SYNC_OID.".4",
++
++ LDAP_SYNC_NONE => 0x00,
++ LDAP_SYNC_REFRESH_ONLY => 0x01,
++ LDAP_SYNC_RESERVED => 0x02,
++ LDAP_SYNC_REFRESH_AND_PERSIST => 0x03,
++
++ LDAP_SYNC_REFRESH_PRESENTS => 0,
++ LDAP_SYNC_REFRESH_DELETES => 1,
++
++ LDAP_TAG_SYNC_NEW_COOKIE => 0x80,
++ LDAP_TAG_SYNC_REFRESH_DELETE => 0xa1,
++ LDAP_TAG_SYNC_REFRESH_PRESENT => 0xa2,
++ LDAP_TAG_SYNC_ID_SET => 0xa3,
++
++ LDAP_TAG_SYNC_COOKIE => 0x04,
++ LDAP_TAG_REFRESHDELETES => 0x01,
++ LDAP_TAG_REFRESHDONE => 0x01,
++ LDAP_TAG_RELOAD_HINT => 0x01,
++
++ LDAP_SYNC_PRESENT => 0,
++ LDAP_SYNC_ADD => 1,
++ LDAP_SYNC_MODIFY => 2,
++ LDAP_SYNC_DELETE => 3,
++};
++
++use Convert::ASN1;
++use Data::Dumper;
++
++my $asn = Convert::ASN1->new;
++
++$asn->prepare(<<'LDAP_ASN') or die $asn->error;
++syncUUID ::= OCTET STRING -- (SIZE(16))
++
++syncCookie ::= OCTET STRING
++
++syncRequestValue ::= SEQUENCE {
++ mode ENUMERATED {
++ -- 0 unused
++ refreshOnly (1),
++ -- 2 reserved
++ refreshAndPersist (3)
++ }
++ cookie syncCookie OPTIONAL,
++ reloadHint BOOLEAN -- DEFAULT FALSE
++}
++
++syncStateValue ::= SEQUENCE {
++ state ENUMERATED {
++ present (0),
++ add (1),
++ modify (2),
++ delete (3)
++ }
++ entryUUID syncUUID,
++ cookie syncCookie OPTIONAL
++}
++
++syncDoneValue ::= SEQUENCE {
++ cookie syncCookie OPTIONAL,
++ refreshDeletes BOOLEAN -- DEFAULT FALSE
++}
++
++syncInfoValue ::= CHOICE {
++ newcookie [0] syncCookie,
++ refreshDelete [1] SEQUENCE {
++ refreshDeleteCookie syncCookie OPTIONAL,
++ refreshDeleteDone BOOLEAN -- DEFAULT TRUE
++ }
++ refreshPresent [2] SEQUENCE {
++ refreshDeletecookie syncCookie OPTIONAL,
++ refreshDeleteDone BOOLEAN -- DEFAULT TRUE
++ }
++ syncIdSet [3] SEQUENCE {
++ cookie syncCookie OPTIONAL,
++ refreshDeletes BOOLEAN, -- DEFAULT FALSE
++ syncUUIDs SET OF syncUUID
++ }
++}
++
++LDAP_ASN
++
++
++sub startup { 1; }
++
++sub shutdown
++{
++ Kolab::log('SYNCREPL', 'Shutting down');
++ exit(0);
++}
++
++sub abort
++{
++ Kolab::log('SYNCREPL', 'Aborting');
++ exit(1);
++}
++
++sub run {
++ # This should be called from a separate thread, as we set our
++ # own interrupt handlers here
++
++ $SIG{'INT'} = \&shutdown;
++ $SIG{'TERM'} = \&shutdown;
++
++ END {
++ alarm 0;
++ Kolab::LDAP::destroy($ldap);
++ }
++ my $mesg;
++
++ while (1) {
++ Kolab::log('SYNCREPL', 'Creating LDAP connection to LDAP server', KOLAB_DEBUG);
++
++ $ldap = Kolab::LDAP::create($Kolab::config{'user_ldap_ip'},
++ $Kolab::config{'user_ldap_port'},
++ $Kolab::config{'user_bind_dn'},
++ $Kolab::config{'user_bind_pw'},
++ 1
++ );
++ if (!$ldap) {
++ Kolab::log('SYNCREPL', 'Sleeping 5 seconds...');
++ sleep 5;
++ next;
++ }
++ $disconnected = 0;
++
++ Kolab::log('SYNCREPL', 'LDAP connection established', KOLAB_DEBUG);
++
++ Kolab::LDAP::ensureAsync($ldap);
++ Kolab::log('SYNCREPL', 'Async checked', KOLAB_DEBUG);
++
++ Kolab::log('SYNCREPL', "Cookie: $cookie", KOLAB_DEBUG);
++
++ while($ldap and not $disconnected) {
++ #sync control
++ my $asn_syncRequestValue = $asn->find('syncRequestValue');
++ my $ctrl = Net::LDAP::Control->new(type => LDAP_CONTROL_SYNC,
++ value => $asn_syncRequestValue->encode(mode => LDAP_SYNC_REFRESH_ONLY,
++ cookie => $cookie,
++ reloadHint => 0
++ ),
++ critical => 0
++ );
++ Kolab::log('SYNCREPL', 'Control created', KOLAB_DEBUG);
++
++ #search
++ my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
++ scope => 'sub',
++ control => [ $ctrl ],
++ callback => \&searchCallback, # call for each entry
++ filter => "(objectClass=*)",
++ attrs => [ '*',
++ $Kolab::config{'user_field_guid'},
++ $Kolab::config{'user_field_modified'},
++ $Kolab::config{'user_field_quota'},
++ $Kolab::config{'user_field_deleted'},
++ ],
++ );
++ Kolab::log('SYNCREPL', 'Search created', KOLAB_DEBUG);
++ $mesg->sync;
++ Kolab::log('SYNCREPL', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
++ sleep 10;
++ }
++ }
++ 1;
++}
++
++#search callback
++sub searchCallback {
++ my $mesg = shift;
++ my $entry = shift;
++ my $issearch = $mesg->isa("Net::LDAP::Search");
++ my @controls = $mesg->control;
++ if(not $issearch) {
++ Kolab::log('SYNCREPL', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
++ if ($mesg->code == 88) {
++ Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
++ return;
++ } elsif ($mesg->code) {
++ Kolab::log('SYNCREPL', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
++ &abort;
++ }
++ } elsif(@controls == 0) {
++ if ($mesg->code == 1) {
++ Kolab::log('SYNCREPL', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
++ $disconnected = 1;
++ return;
++ } elsif ($mesg->code) {
++ Kolab::log('SYNCREPL', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
++ &abort;
++ }
++ } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
++ Kolab::log('SYNCREPL', 'Received Sync State Control', KOLAB_DEBUG);
++ Kolab::log('SYNCREPL', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
++ } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
++ Kolab::log('SYNCREPL', 'Received Sync Done Control', KOLAB_DEBUG);
++ my $asn_syncDoneValue = $asn->find('syncDoneValue');
++ my $out = $asn_syncDoneValue->decode($controls[0]->value);
++ #we have a new cookie
++ if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
++ $cookie = $out->{cookie};
++ Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
++ Kolab::log('SYNCREPL', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
++ Kolab::LDAP::sync;
++ system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
++ Kolab::log('SYNCREPL', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
++ sleep 1; # we get too many bogus change notifications!
++ }
++ } else {
++ Kolab::log('SYNCREPL', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
++ }
++ return 0;
++}
++
++1;
++__END__
++
++=head1 NAME
++
++Kolab::LDAP::Backend::syncrepl - Perl extension for RFC 4533 compliant LDAP server backend
++
++=head1 ABSTRACT
++
++ Kolab::LDAP::Backend::syncrepl handles OpenLDAP backend to the kolab daemon.
++
++=head1 AUTHOR
++
++Mathieu Parent <math.parent at gmail.com>
++
++=head1 COPYRIGHT AND LICENSE
++
++Copyright (c) 2008 Mathieu Parent <math.parent at gmail.com>
++
++
++This program is free software; you can redistribute it and/or
++modify it under the terms of the GNU General Public License as
++published by the Free Software Foundation; either version 2, or
++(at your option) any later version.
++
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++General Public License for more details.
++
++You can view the GNU General Public License, online, at the GNU
++Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
++
++=head1 NOTES
++We use refreshOnly mode as refreshAndPersist mode uses LDAP Intermediate
++Response Messages [RFC4511] that are not supported by current Net::LDAP.
++
++However (quoting from RFC, page 21):
++
++ The server SHOULD transfer a new cookie frequently to avoid having to
++ transfer information already provided to the client. Even where DIT
++ changes do not cause content synchronization changes to be
++ transferred, it may be advantageous to provide a new cookie using a
++ Sync Info Message. However, the server SHOULD avoid overloading the
++ client or network with Sync Info Messages.
++
++
++
++=cut
Property changes on: libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,329 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-sync-ldap-backend.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: LDAP backend using content synchronization (RFC4533)
-## DP: which is not activated by default
-
- at DPATCH@
-diff -urNad libkolab-perl-2.2.0~/lib/Kolab/LDAP/Backend/syncrepl.pm libkolab-perl-2.2.0/lib/Kolab/LDAP/Backend/syncrepl.pm
---- libkolab-perl-2.2.0~/lib/Kolab/LDAP/Backend/syncrepl.pm 1970-01-01 01:00:00.000000000 +0100
-+++ libkolab-perl-2.2.0/lib/Kolab/LDAP/Backend/syncrepl.pm 2008-08-02 01:06:03.000000000 +0200
-@@ -0,0 +1,318 @@
-+package Kolab::LDAP::Backend::syncrepl;
-+
-+##
-+## Copyright (c) 2008 Mathieu Parent <math.parent at gmail.com>
-+##
-+## This program is free software; you can redistribute it and/or
-+## modify it under the terms of the GNU General Public License as
-+## published by the Free Software Foundation; either version 2, or
-+## (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful,
-+## but WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+## General Public License for more details.
-+##
-+## You can view the GNU General Public License, online, at the GNU
-+## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-+##
-+use 5.008;
-+use strict;
-+use warnings;
-+use Kolab;
-+use Kolab::LDAP;
-+use Net::LDAP;
-+use Net::LDAP::Control;
-+use Net::LDAP::Entry;
-+use vars qw($ldap $cookie $disconnected);
-+my $cookie = '';
-+my $disconnected = 1;
-+
-+require Exporter;
-+
-+our @ISA = qw(Exporter);
-+
-+our %EXPORT_TAGS = (
-+ 'all' => [ qw(
-+ &startup
-+ &run
-+ ) ]
-+);
-+
-+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-+
-+our @EXPORT = qw(
-+
-+);
-+
-+our $VERSION = '0.1';
-+
-+# LDAP Content Synchronization Operation -- RFC 4533
-+use constant LDAP_SYNC_OID => "1.3.6.1.4.1.4203.1.9.1";
-+use constant {
-+ LDAP_CONTROL_SYNC => LDAP_SYNC_OID.".1",
-+ LDAP_CONTROL_SYNC_STATE => LDAP_SYNC_OID.".2",
-+ LDAP_CONTROL_SYNC_DONE => LDAP_SYNC_OID.".3",
-+ LDAP_SYNC_INFO => LDAP_SYNC_OID.".4",
-+
-+ LDAP_SYNC_NONE => 0x00,
-+ LDAP_SYNC_REFRESH_ONLY => 0x01,
-+ LDAP_SYNC_RESERVED => 0x02,
-+ LDAP_SYNC_REFRESH_AND_PERSIST => 0x03,
-+
-+ LDAP_SYNC_REFRESH_PRESENTS => 0,
-+ LDAP_SYNC_REFRESH_DELETES => 1,
-+
-+ LDAP_TAG_SYNC_NEW_COOKIE => 0x80,
-+ LDAP_TAG_SYNC_REFRESH_DELETE => 0xa1,
-+ LDAP_TAG_SYNC_REFRESH_PRESENT => 0xa2,
-+ LDAP_TAG_SYNC_ID_SET => 0xa3,
-+
-+ LDAP_TAG_SYNC_COOKIE => 0x04,
-+ LDAP_TAG_REFRESHDELETES => 0x01,
-+ LDAP_TAG_REFRESHDONE => 0x01,
-+ LDAP_TAG_RELOAD_HINT => 0x01,
-+
-+ LDAP_SYNC_PRESENT => 0,
-+ LDAP_SYNC_ADD => 1,
-+ LDAP_SYNC_MODIFY => 2,
-+ LDAP_SYNC_DELETE => 3,
-+};
-+
-+use Convert::ASN1;
-+use Data::Dumper;
-+
-+my $asn = Convert::ASN1->new;
-+
-+$asn->prepare(<<'LDAP_ASN') or die $asn->error;
-+syncUUID ::= OCTET STRING -- (SIZE(16))
-+
-+syncCookie ::= OCTET STRING
-+
-+syncRequestValue ::= SEQUENCE {
-+ mode ENUMERATED {
-+ -- 0 unused
-+ refreshOnly (1),
-+ -- 2 reserved
-+ refreshAndPersist (3)
-+ }
-+ cookie syncCookie OPTIONAL,
-+ reloadHint BOOLEAN -- DEFAULT FALSE
-+}
-+
-+syncStateValue ::= SEQUENCE {
-+ state ENUMERATED {
-+ present (0),
-+ add (1),
-+ modify (2),
-+ delete (3)
-+ }
-+ entryUUID syncUUID,
-+ cookie syncCookie OPTIONAL
-+}
-+
-+syncDoneValue ::= SEQUENCE {
-+ cookie syncCookie OPTIONAL,
-+ refreshDeletes BOOLEAN -- DEFAULT FALSE
-+}
-+
-+syncInfoValue ::= CHOICE {
-+ newcookie [0] syncCookie,
-+ refreshDelete [1] SEQUENCE {
-+ refreshDeleteCookie syncCookie OPTIONAL,
-+ refreshDeleteDone BOOLEAN -- DEFAULT TRUE
-+ }
-+ refreshPresent [2] SEQUENCE {
-+ refreshDeletecookie syncCookie OPTIONAL,
-+ refreshDeleteDone BOOLEAN -- DEFAULT TRUE
-+ }
-+ syncIdSet [3] SEQUENCE {
-+ cookie syncCookie OPTIONAL,
-+ refreshDeletes BOOLEAN, -- DEFAULT FALSE
-+ syncUUIDs SET OF syncUUID
-+ }
-+}
-+
-+LDAP_ASN
-+
-+
-+sub startup { 1; }
-+
-+sub shutdown
-+{
-+ Kolab::log('SYNCREPL', 'Shutting down');
-+ exit(0);
-+}
-+
-+sub abort
-+{
-+ Kolab::log('SYNCREPL', 'Aborting');
-+ exit(1);
-+}
-+
-+sub run {
-+ # This should be called from a separate thread, as we set our
-+ # own interrupt handlers here
-+
-+ $SIG{'INT'} = \&shutdown;
-+ $SIG{'TERM'} = \&shutdown;
-+
-+ END {
-+ alarm 0;
-+ Kolab::LDAP::destroy($ldap);
-+ }
-+ my $mesg;
-+
-+ while (1) {
-+ Kolab::log('SYNCREPL', 'Creating LDAP connection to LDAP server', KOLAB_DEBUG);
-+
-+ $ldap = Kolab::LDAP::create($Kolab::config{'user_ldap_ip'},
-+ $Kolab::config{'user_ldap_port'},
-+ $Kolab::config{'user_bind_dn'},
-+ $Kolab::config{'user_bind_pw'},
-+ 1
-+ );
-+ if (!$ldap) {
-+ Kolab::log('SYNCREPL', 'Sleeping 5 seconds...');
-+ sleep 5;
-+ next;
-+ }
-+ $disconnected = 0;
-+
-+ Kolab::log('SYNCREPL', 'LDAP connection established', KOLAB_DEBUG);
-+
-+ Kolab::LDAP::ensureAsync($ldap);
-+ Kolab::log('SYNCREPL', 'Async checked', KOLAB_DEBUG);
-+
-+ Kolab::log('SYNCREPL', "Cookie: $cookie", KOLAB_DEBUG);
-+
-+ while($ldap and not $disconnected) {
-+ #sync control
-+ my $asn_syncRequestValue = $asn->find('syncRequestValue');
-+ my $ctrl = Net::LDAP::Control->new(type => LDAP_CONTROL_SYNC,
-+ value => $asn_syncRequestValue->encode(mode => LDAP_SYNC_REFRESH_ONLY,
-+ cookie => $cookie,
-+ reloadHint => 0
-+ ),
-+ critical => 0
-+ );
-+ Kolab::log('SYNCREPL', 'Control created', KOLAB_DEBUG);
-+
-+ #search
-+ my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
-+ scope => 'sub',
-+ control => [ $ctrl ],
-+ callback => \&searchCallback, # call for each entry
-+ filter => "(objectClass=*)",
-+ attrs => [ '*',
-+ $Kolab::config{'user_field_guid'},
-+ $Kolab::config{'user_field_modified'},
-+ $Kolab::config{'user_field_quota'},
-+ $Kolab::config{'user_field_deleted'},
-+ ],
-+ );
-+ Kolab::log('SYNCREPL', 'Search created', KOLAB_DEBUG);
-+ $mesg->sync;
-+ Kolab::log('SYNCREPL', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
-+ sleep 10;
-+ }
-+ }
-+ 1;
-+}
-+
-+#search callback
-+sub searchCallback {
-+ my $mesg = shift;
-+ my $entry = shift;
-+ my $issearch = $mesg->isa("Net::LDAP::Search");
-+ my @controls = $mesg->control;
-+ if(not $issearch) {
-+ Kolab::log('SYNCREPL', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
-+ if ($mesg->code == 88) {
-+ Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
-+ return;
-+ } elsif ($mesg->code) {
-+ Kolab::log('SYNCREPL', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
-+ &abort;
-+ }
-+ } elsif(@controls == 0) {
-+ if ($mesg->code == 1) {
-+ Kolab::log('SYNCREPL', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
-+ $disconnected = 1;
-+ return;
-+ } elsif ($mesg->code) {
-+ Kolab::log('SYNCREPL', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
-+ &abort;
-+ }
-+ } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
-+ Kolab::log('SYNCREPL', 'Received Sync State Control', KOLAB_DEBUG);
-+ Kolab::log('SYNCREPL', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
-+ } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
-+ Kolab::log('SYNCREPL', 'Received Sync Done Control', KOLAB_DEBUG);
-+ my $asn_syncDoneValue = $asn->find('syncDoneValue');
-+ my $out = $asn_syncDoneValue->decode($controls[0]->value);
-+ #we have a new cookie
-+ if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
-+ $cookie = $out->{cookie};
-+ Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
-+ Kolab::log('SYNCREPL', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
-+ Kolab::LDAP::sync;
-+ system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
-+ Kolab::log('SYNCREPL', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
-+ sleep 1; # we get too many bogus change notifications!
-+ }
-+ } else {
-+ Kolab::log('SYNCREPL', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
-+ }
-+ return 0;
-+}
-+
-+1;
-+__END__
-+
-+=head1 NAME
-+
-+Kolab::LDAP::Backend::syncrepl - Perl extension for RFC 4533 compliant LDAP server backend
-+
-+=head1 ABSTRACT
-+
-+ Kolab::LDAP::Backend::syncrepl handles OpenLDAP backend to the kolab daemon.
-+
-+=head1 AUTHOR
-+
-+Mathieu Parent <math.parent at gmail.com>
-+
-+=head1 COPYRIGHT AND LICENSE
-+
-+Copyright (c) 2008 Mathieu Parent <math.parent at gmail.com>
-+
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License as
-+published by the Free Software Foundation; either version 2, or
-+(at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+General Public License for more details.
-+
-+You can view the GNU General Public License, online, at the GNU
-+Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-+
-+=head1 NOTES
-+We use refreshOnly mode as refreshAndPersist mode uses LDAP Intermediate
-+Response Messages [RFC4511] that are not supported by current Net::LDAP.
-+
-+However (quoting from RFC, page 21):
-+
-+ The server SHOULD transfer a new cookie frequently to avoid having to
-+ transfer information already provided to the client. Even where DIT
-+ changes do not cause content synchronization changes to be
-+ transferred, it may be advantageous to provide a new cookie using a
-+ Sync Info Message. However, the server SHOULD avoid overloading the
-+ client or network with Sync Info Messages.
-+
-+
-+
-+=cut
Copied: libkolab-perl/trunk/debian/patches/51-syncrepl.diff (from rev 959, libkolab-perl/trunk/debian/patches/51-syncrepl.dpatch)
===================================================================
--- libkolab-perl/trunk/debian/patches/51-syncrepl.diff (rev 0)
+++ libkolab-perl/trunk/debian/patches/51-syncrepl.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,290 @@
+--- syncrepl.pm.orig 2008-10-01 18:56:40.000000000 +0000
++++ syncrepl.pm 2008-10-14 17:11:25.000000000 +0000
+@@ -21,8 +21,13 @@
+ use warnings;
+ use Kolab;
+ use Kolab::LDAP;
+-use Net::LDAP;
++use Net::LDAP qw(
++ LDAP_USER_CANCELED
++ LDAP_SYNC_REFRESH_ONLY
++ LDAP_SYNC_REFRESH_AND_PERSIST
++);
+ use Net::LDAP::Control;
++use Net::LDAP::Control::SyncRequest;
+ use Net::LDAP::Entry;
+ use vars qw($ldap $cookie $disconnected);
+ my $cookie = '';
+@@ -45,97 +50,13 @@
+
+ );
+
+-our $VERSION = '0.1';
+-
+-# LDAP Content Synchronization Operation -- RFC 4533
+-use constant LDAP_SYNC_OID => "1.3.6.1.4.1.4203.1.9.1";
+-use constant {
+- LDAP_CONTROL_SYNC => LDAP_SYNC_OID.".1",
+- LDAP_CONTROL_SYNC_STATE => LDAP_SYNC_OID.".2",
+- LDAP_CONTROL_SYNC_DONE => LDAP_SYNC_OID.".3",
+- LDAP_SYNC_INFO => LDAP_SYNC_OID.".4",
+-
+- LDAP_SYNC_NONE => 0x00,
+- LDAP_SYNC_REFRESH_ONLY => 0x01,
+- LDAP_SYNC_RESERVED => 0x02,
+- LDAP_SYNC_REFRESH_AND_PERSIST => 0x03,
+-
+- LDAP_SYNC_REFRESH_PRESENTS => 0,
+- LDAP_SYNC_REFRESH_DELETES => 1,
+-
+- LDAP_TAG_SYNC_NEW_COOKIE => 0x80,
+- LDAP_TAG_SYNC_REFRESH_DELETE => 0xa1,
+- LDAP_TAG_SYNC_REFRESH_PRESENT => 0xa2,
+- LDAP_TAG_SYNC_ID_SET => 0xa3,
+-
+- LDAP_TAG_SYNC_COOKIE => 0x04,
+- LDAP_TAG_REFRESHDELETES => 0x01,
+- LDAP_TAG_REFRESHDONE => 0x01,
+- LDAP_TAG_RELOAD_HINT => 0x01,
+-
+- LDAP_SYNC_PRESENT => 0,
+- LDAP_SYNC_ADD => 1,
+- LDAP_SYNC_MODIFY => 2,
+- LDAP_SYNC_DELETE => 3,
+-};
+-
+-use Convert::ASN1;
+-use Data::Dumper;
+-
+-my $asn = Convert::ASN1->new;
+-
+-$asn->prepare(<<'LDAP_ASN') or die $asn->error;
+-syncUUID ::= OCTET STRING -- (SIZE(16))
+-
+-syncCookie ::= OCTET STRING
+-
+-syncRequestValue ::= SEQUENCE {
+- mode ENUMERATED {
+- -- 0 unused
+- refreshOnly (1),
+- -- 2 reserved
+- refreshAndPersist (3)
+- }
+- cookie syncCookie OPTIONAL,
+- reloadHint BOOLEAN -- DEFAULT FALSE
+-}
+-
+-syncStateValue ::= SEQUENCE {
+- state ENUMERATED {
+- present (0),
+- add (1),
+- modify (2),
+- delete (3)
+- }
+- entryUUID syncUUID,
+- cookie syncCookie OPTIONAL
+-}
++our $VERSION = '0.2';
+
+-syncDoneValue ::= SEQUENCE {
+- cookie syncCookie OPTIONAL,
+- refreshDeletes BOOLEAN -- DEFAULT FALSE
++sub mode {
++ LDAP_SYNC_REFRESH_ONLY;
++ #LDAP_SYNC_REFRESH_AND_PERSIST;
+ }
+
+-syncInfoValue ::= CHOICE {
+- newcookie [0] syncCookie,
+- refreshDelete [1] SEQUENCE {
+- refreshDeleteCookie syncCookie OPTIONAL,
+- refreshDeleteDone BOOLEAN -- DEFAULT TRUE
+- }
+- refreshPresent [2] SEQUENCE {
+- refreshDeletecookie syncCookie OPTIONAL,
+- refreshDeleteDone BOOLEAN -- DEFAULT TRUE
+- }
+- syncIdSet [3] SEQUENCE {
+- cookie syncCookie OPTIONAL,
+- refreshDeletes BOOLEAN, -- DEFAULT FALSE
+- syncUUIDs SET OF syncUUID
+- }
+-}
+-
+-LDAP_ASN
+-
+-
+ sub startup { 1; }
+
+ sub shutdown
+@@ -184,22 +105,17 @@
+ Kolab::LDAP::ensureAsync($ldap);
+ Kolab::log('SYNCREPL', 'Async checked', KOLAB_DEBUG);
+
+- Kolab::log('SYNCREPL', "Cookie: $cookie", KOLAB_DEBUG);
+-
+ while($ldap and not $disconnected) {
+- #sync control
+- my $asn_syncRequestValue = $asn->find('syncRequestValue');
+- my $ctrl = Net::LDAP::Control->new(type => LDAP_CONTROL_SYNC,
+- value => $asn_syncRequestValue->encode(mode => LDAP_SYNC_REFRESH_ONLY,
+- cookie => $cookie,
+- reloadHint => 0
+- ),
+- critical => 0
+- );
+- Kolab::log('SYNCREPL', 'Control created', KOLAB_DEBUG);
+-
+- #search
+- my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
++ my $ctrl = Net::LDAP::Control::SyncRequest->new(
++ mode => Kolab::LDAP::Backend::syncrepl::mode,
++ cookie => $cookie,
++ reloadHint => 0);
++ Kolab::log('SYNCREPL', 'Control created: mode='.$ctrl->mode().
++ '; cookie='.$ctrl->cookie().
++ '; reloadHint='.$ctrl->reloadHint(), KOLAB_DEBUG);
++
++ #search
++ my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
+ scope => 'sub',
+ control => [ $ctrl ],
+ callback => \&searchCallback, # call for each entry
+@@ -210,7 +126,7 @@
+ $Kolab::config{'user_field_quota'},
+ $Kolab::config{'user_field_deleted'},
+ ],
+- );
++ );
+ Kolab::log('SYNCREPL', 'Search created', KOLAB_DEBUG);
+ $mesg->sync;
+ Kolab::log('SYNCREPL', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
+@@ -223,37 +139,53 @@
+ #search callback
+ sub searchCallback {
+ my $mesg = shift;
+- my $entry = shift;
+- my $issearch = $mesg->isa("Net::LDAP::Search");
++ my $param2 = shift; # might be entry or intermediate
+ my @controls = $mesg->control;
+- if(not $issearch) {
+- Kolab::log('SYNCREPL', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
+- if ($mesg->code == 88) {
+- Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
+- return;
+- } elsif ($mesg->code) {
+- Kolab::log('SYNCREPL', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
+- &abort;
+- }
+- } elsif(@controls == 0) {
+- if ($mesg->code == 1) {
+- Kolab::log('SYNCREPL', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
+- $disconnected = 1;
+- return;
+- } elsif ($mesg->code) {
+- Kolab::log('SYNCREPL', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
+- &abort;
+- }
+- } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
+- Kolab::log('SYNCREPL', 'Received Sync State Control', KOLAB_DEBUG);
+- Kolab::log('SYNCREPL', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
+- } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
+- Kolab::log('SYNCREPL', 'Received Sync Done Control', KOLAB_DEBUG);
+- my $asn_syncDoneValue = $asn->find('syncDoneValue');
+- my $out = $asn_syncDoneValue->decode($controls[0]->value);
++ my @sync_controls = ();
++ if($param2 && $param2->isa("Net::LDAP::Entry")) {
++ Kolab::log('SYNCREPL', 'Received Search Entry', KOLAB_DEBUG);
++ #retrieve Sync State Control
++ foreach my $ctrl (@controls) {
++ push(@sync_controls, $ctrl)
++ if $ctrl->isa('Net::LDAP::Control::SyncState');
++ }
++ if(@sync_controls>1) {
++ Kolab::log('SYNCREPL', 'Got search entry with multiple Sync State controls',
++ KOLAB_DEBUG);
++ return;
++ }
++ if(!@sync_controls) {
++ Kolab::log('SYNCREPL', 'Got search entry without Sync State control',
++ KOLAB_DEBUG);
++ return;
++ }
++ if(!$sync_controls[0]->entryUUID) {
++ Kolab::log('SYNCREPL', 'Got empty entryUUID',
++ KOLAB_DEBUG);
++ return;
++ }
++ Kolab::log('SYNCREPL', 'Search Entry has Sync State Control: '.
++ 'state='.$sync_controls[0]->state().
++ '; entryUUID='.unpack("H*",$sync_controls[0]->entryUUID()).
++ '; cookie='.(defined($sync_controls[0]->cookie()) ? $sync_controls[0]->cookie() : 'UNDEF')
++ , KOLAB_DEBUG);
++ if(defined($sync_controls[0]->cookie)) {
++ $cookie = $sync_controls[0]->cookie;
++ Kolab::log('SYNCREPL',"New cookie: $cookie", KOLAB_DEBUG);
++ }
++ Kolab::log('SYNCREPL', "Entry (".$param2->changetype."): ".$param2->dn(), KOLAB_DEBUG);
++ } elsif($param2 && $param2->isa("Net::LDAP::Reference")) {
++ Kolab::log('SYNCREPL', 'Received Search Reference', KOLAB_DEBUG);
++ return;
++ #if it not first control?
++ } elsif($controls[0] and $controls[0]->isa('Net::LDAP::Control::SyncDone')) {
++ Kolab::log('SYNCREPL', 'Received Sync Done Control: '.
++ 'cookie='.(defined($controls[0]->cookie()) ? $controls[0]->cookie() : 'UNDEF').
++ '; refreshDeletes='.$controls[0]->refreshDeletes()
++ , KOLAB_DEBUG);
+ #we have a new cookie
+- if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
+- $cookie = $out->{cookie};
++ if(defined($controls[0]->cookie()) and not $controls[0]->cookie() eq '' and not $controls[0]->cookie() eq $cookie) {
++ $cookie = $controls[0]->cookie();
+ Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
+ Kolab::log('SYNCREPL', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
+ Kolab::LDAP::sync;
+@@ -261,8 +193,44 @@
+ Kolab::log('SYNCREPL', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
+ sleep 1; # we get too many bogus change notifications!
+ }
++ } elsif($param2 && $param2->isa("Net::LDAP::Intermediate")) {
++ Kolab::log('SYNCREPL', 'Received Intermediate Message', KOLAB_DEBUG);
++ my $attrs = $param2->{asn};
++ if($attrs->{newcookie}) {
++ $cookie = $attrs->{newcookie};
++ Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
++ } elsif(my $refreshInfos = ($attrs->{refreshDelete} || $attrs->{refreshPresent})) {
++ $cookie = $refreshInfos->{cookie} if defined($refreshInfos->{cookie});
++ Kolab::log('SYNCREPL',
++ (defined($refreshInfos->{cookie}) ? 'New ' : 'Empty ').
++ "cookie from ".
++ ($attrs->{refreshDelete} ? 'refreshDelete' : 'refreshPresent').
++ " (refreshDone=".$refreshInfos->{refreshDone}."): $cookie", KOLAB_DEBUG);
++ } elsif(my $syncIdSetInfos = $attrs->{syncIdSet}) {
++ $cookie = $syncIdSetInfos->{cookie} if defined($syncIdSetInfos->{cookie});
++ Kolab::log('SYNCREPL',
++ (defined($syncIdSetInfos->{cookie}) ? 'Empty ' : 'New ').
++ "cookie from syncIdSet".
++ " (refreshDeletes=".$syncIdSetInfos->{refreshDeletes}."): $cookie", KOLAB_DEBUG);
++ foreach my $syncUUID ($syncIdSetInfos->{syncUUIDs}) {
++ Kolab::log('SYNCREPL', 'entryUUID='.
++ unpack("H*",$syncUUID), KOLAB_DEBUG);
++ }
++ }
++ } elsif($mesg->code) {
++ if ($mesg->code == 1) {
++ Kolab::log('SYNCREPL', 'Communication Error: disconnecting', KOLAB_DEBUG);
++ $disconnected = 1;
++ return 0;
++ } elsif ($mesg->code == LDAP_USER_CANCELED) {
++ Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
++ return;
++ } else {
++ Kolab::log('SYNCREPL', "searchCallback: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
++ &abort;
++ }
+ } else {
+- Kolab::log('SYNCREPL', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
++ Kolab::log('SYNCREPL', 'Received something else', KOLAB_DEBUG);
+ }
+ return 0;
+ }
Property changes on: libkolab-perl/trunk/debian/patches/51-syncrepl.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: libkolab-perl/trunk/debian/patches/51-syncrepl.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/51-syncrepl.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ libkolab-perl/trunk/debian/patches/51-syncrepl.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,290 +0,0 @@
---- syncrepl.pm.orig 2008-10-01 18:56:40.000000000 +0000
-+++ syncrepl.pm 2008-10-14 17:11:25.000000000 +0000
-@@ -21,8 +21,13 @@
- use warnings;
- use Kolab;
- use Kolab::LDAP;
--use Net::LDAP;
-+use Net::LDAP qw(
-+ LDAP_USER_CANCELED
-+ LDAP_SYNC_REFRESH_ONLY
-+ LDAP_SYNC_REFRESH_AND_PERSIST
-+);
- use Net::LDAP::Control;
-+use Net::LDAP::Control::SyncRequest;
- use Net::LDAP::Entry;
- use vars qw($ldap $cookie $disconnected);
- my $cookie = '';
-@@ -45,97 +50,13 @@
-
- );
-
--our $VERSION = '0.1';
--
--# LDAP Content Synchronization Operation -- RFC 4533
--use constant LDAP_SYNC_OID => "1.3.6.1.4.1.4203.1.9.1";
--use constant {
-- LDAP_CONTROL_SYNC => LDAP_SYNC_OID.".1",
-- LDAP_CONTROL_SYNC_STATE => LDAP_SYNC_OID.".2",
-- LDAP_CONTROL_SYNC_DONE => LDAP_SYNC_OID.".3",
-- LDAP_SYNC_INFO => LDAP_SYNC_OID.".4",
--
-- LDAP_SYNC_NONE => 0x00,
-- LDAP_SYNC_REFRESH_ONLY => 0x01,
-- LDAP_SYNC_RESERVED => 0x02,
-- LDAP_SYNC_REFRESH_AND_PERSIST => 0x03,
--
-- LDAP_SYNC_REFRESH_PRESENTS => 0,
-- LDAP_SYNC_REFRESH_DELETES => 1,
--
-- LDAP_TAG_SYNC_NEW_COOKIE => 0x80,
-- LDAP_TAG_SYNC_REFRESH_DELETE => 0xa1,
-- LDAP_TAG_SYNC_REFRESH_PRESENT => 0xa2,
-- LDAP_TAG_SYNC_ID_SET => 0xa3,
--
-- LDAP_TAG_SYNC_COOKIE => 0x04,
-- LDAP_TAG_REFRESHDELETES => 0x01,
-- LDAP_TAG_REFRESHDONE => 0x01,
-- LDAP_TAG_RELOAD_HINT => 0x01,
--
-- LDAP_SYNC_PRESENT => 0,
-- LDAP_SYNC_ADD => 1,
-- LDAP_SYNC_MODIFY => 2,
-- LDAP_SYNC_DELETE => 3,
--};
--
--use Convert::ASN1;
--use Data::Dumper;
--
--my $asn = Convert::ASN1->new;
--
--$asn->prepare(<<'LDAP_ASN') or die $asn->error;
--syncUUID ::= OCTET STRING -- (SIZE(16))
--
--syncCookie ::= OCTET STRING
--
--syncRequestValue ::= SEQUENCE {
-- mode ENUMERATED {
-- -- 0 unused
-- refreshOnly (1),
-- -- 2 reserved
-- refreshAndPersist (3)
-- }
-- cookie syncCookie OPTIONAL,
-- reloadHint BOOLEAN -- DEFAULT FALSE
--}
--
--syncStateValue ::= SEQUENCE {
-- state ENUMERATED {
-- present (0),
-- add (1),
-- modify (2),
-- delete (3)
-- }
-- entryUUID syncUUID,
-- cookie syncCookie OPTIONAL
--}
-+our $VERSION = '0.2';
-
--syncDoneValue ::= SEQUENCE {
-- cookie syncCookie OPTIONAL,
-- refreshDeletes BOOLEAN -- DEFAULT FALSE
-+sub mode {
-+ LDAP_SYNC_REFRESH_ONLY;
-+ #LDAP_SYNC_REFRESH_AND_PERSIST;
- }
-
--syncInfoValue ::= CHOICE {
-- newcookie [0] syncCookie,
-- refreshDelete [1] SEQUENCE {
-- refreshDeleteCookie syncCookie OPTIONAL,
-- refreshDeleteDone BOOLEAN -- DEFAULT TRUE
-- }
-- refreshPresent [2] SEQUENCE {
-- refreshDeletecookie syncCookie OPTIONAL,
-- refreshDeleteDone BOOLEAN -- DEFAULT TRUE
-- }
-- syncIdSet [3] SEQUENCE {
-- cookie syncCookie OPTIONAL,
-- refreshDeletes BOOLEAN, -- DEFAULT FALSE
-- syncUUIDs SET OF syncUUID
-- }
--}
--
--LDAP_ASN
--
--
- sub startup { 1; }
-
- sub shutdown
-@@ -184,22 +105,17 @@
- Kolab::LDAP::ensureAsync($ldap);
- Kolab::log('SYNCREPL', 'Async checked', KOLAB_DEBUG);
-
-- Kolab::log('SYNCREPL', "Cookie: $cookie", KOLAB_DEBUG);
--
- while($ldap and not $disconnected) {
-- #sync control
-- my $asn_syncRequestValue = $asn->find('syncRequestValue');
-- my $ctrl = Net::LDAP::Control->new(type => LDAP_CONTROL_SYNC,
-- value => $asn_syncRequestValue->encode(mode => LDAP_SYNC_REFRESH_ONLY,
-- cookie => $cookie,
-- reloadHint => 0
-- ),
-- critical => 0
-- );
-- Kolab::log('SYNCREPL', 'Control created', KOLAB_DEBUG);
--
-- #search
-- my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
-+ my $ctrl = Net::LDAP::Control::SyncRequest->new(
-+ mode => Kolab::LDAP::Backend::syncrepl::mode,
-+ cookie => $cookie,
-+ reloadHint => 0);
-+ Kolab::log('SYNCREPL', 'Control created: mode='.$ctrl->mode().
-+ '; cookie='.$ctrl->cookie().
-+ '; reloadHint='.$ctrl->reloadHint(), KOLAB_DEBUG);
-+
-+ #search
-+ my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
- scope => 'sub',
- control => [ $ctrl ],
- callback => \&searchCallback, # call for each entry
-@@ -210,7 +126,7 @@
- $Kolab::config{'user_field_quota'},
- $Kolab::config{'user_field_deleted'},
- ],
-- );
-+ );
- Kolab::log('SYNCREPL', 'Search created', KOLAB_DEBUG);
- $mesg->sync;
- Kolab::log('SYNCREPL', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
-@@ -223,37 +139,53 @@
- #search callback
- sub searchCallback {
- my $mesg = shift;
-- my $entry = shift;
-- my $issearch = $mesg->isa("Net::LDAP::Search");
-+ my $param2 = shift; # might be entry or intermediate
- my @controls = $mesg->control;
-- if(not $issearch) {
-- Kolab::log('SYNCREPL', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
-- if ($mesg->code == 88) {
-- Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
-- return;
-- } elsif ($mesg->code) {
-- Kolab::log('SYNCREPL', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
-- &abort;
-- }
-- } elsif(@controls == 0) {
-- if ($mesg->code == 1) {
-- Kolab::log('SYNCREPL', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
-- $disconnected = 1;
-- return;
-- } elsif ($mesg->code) {
-- Kolab::log('SYNCREPL', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
-- &abort;
-- }
-- } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
-- Kolab::log('SYNCREPL', 'Received Sync State Control', KOLAB_DEBUG);
-- Kolab::log('SYNCREPL', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
-- } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
-- Kolab::log('SYNCREPL', 'Received Sync Done Control', KOLAB_DEBUG);
-- my $asn_syncDoneValue = $asn->find('syncDoneValue');
-- my $out = $asn_syncDoneValue->decode($controls[0]->value);
-+ my @sync_controls = ();
-+ if($param2 && $param2->isa("Net::LDAP::Entry")) {
-+ Kolab::log('SYNCREPL', 'Received Search Entry', KOLAB_DEBUG);
-+ #retrieve Sync State Control
-+ foreach my $ctrl (@controls) {
-+ push(@sync_controls, $ctrl)
-+ if $ctrl->isa('Net::LDAP::Control::SyncState');
-+ }
-+ if(@sync_controls>1) {
-+ Kolab::log('SYNCREPL', 'Got search entry with multiple Sync State controls',
-+ KOLAB_DEBUG);
-+ return;
-+ }
-+ if(!@sync_controls) {
-+ Kolab::log('SYNCREPL', 'Got search entry without Sync State control',
-+ KOLAB_DEBUG);
-+ return;
-+ }
-+ if(!$sync_controls[0]->entryUUID) {
-+ Kolab::log('SYNCREPL', 'Got empty entryUUID',
-+ KOLAB_DEBUG);
-+ return;
-+ }
-+ Kolab::log('SYNCREPL', 'Search Entry has Sync State Control: '.
-+ 'state='.$sync_controls[0]->state().
-+ '; entryUUID='.unpack("H*",$sync_controls[0]->entryUUID()).
-+ '; cookie='.(defined($sync_controls[0]->cookie()) ? $sync_controls[0]->cookie() : 'UNDEF')
-+ , KOLAB_DEBUG);
-+ if(defined($sync_controls[0]->cookie)) {
-+ $cookie = $sync_controls[0]->cookie;
-+ Kolab::log('SYNCREPL',"New cookie: $cookie", KOLAB_DEBUG);
-+ }
-+ Kolab::log('SYNCREPL', "Entry (".$param2->changetype."): ".$param2->dn(), KOLAB_DEBUG);
-+ } elsif($param2 && $param2->isa("Net::LDAP::Reference")) {
-+ Kolab::log('SYNCREPL', 'Received Search Reference', KOLAB_DEBUG);
-+ return;
-+ #if it not first control?
-+ } elsif($controls[0] and $controls[0]->isa('Net::LDAP::Control::SyncDone')) {
-+ Kolab::log('SYNCREPL', 'Received Sync Done Control: '.
-+ 'cookie='.(defined($controls[0]->cookie()) ? $controls[0]->cookie() : 'UNDEF').
-+ '; refreshDeletes='.$controls[0]->refreshDeletes()
-+ , KOLAB_DEBUG);
- #we have a new cookie
-- if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
-- $cookie = $out->{cookie};
-+ if(defined($controls[0]->cookie()) and not $controls[0]->cookie() eq '' and not $controls[0]->cookie() eq $cookie) {
-+ $cookie = $controls[0]->cookie();
- Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
- Kolab::log('SYNCREPL', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
- Kolab::LDAP::sync;
-@@ -261,8 +193,44 @@
- Kolab::log('SYNCREPL', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
- sleep 1; # we get too many bogus change notifications!
- }
-+ } elsif($param2 && $param2->isa("Net::LDAP::Intermediate")) {
-+ Kolab::log('SYNCREPL', 'Received Intermediate Message', KOLAB_DEBUG);
-+ my $attrs = $param2->{asn};
-+ if($attrs->{newcookie}) {
-+ $cookie = $attrs->{newcookie};
-+ Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
-+ } elsif(my $refreshInfos = ($attrs->{refreshDelete} || $attrs->{refreshPresent})) {
-+ $cookie = $refreshInfos->{cookie} if defined($refreshInfos->{cookie});
-+ Kolab::log('SYNCREPL',
-+ (defined($refreshInfos->{cookie}) ? 'New ' : 'Empty ').
-+ "cookie from ".
-+ ($attrs->{refreshDelete} ? 'refreshDelete' : 'refreshPresent').
-+ " (refreshDone=".$refreshInfos->{refreshDone}."): $cookie", KOLAB_DEBUG);
-+ } elsif(my $syncIdSetInfos = $attrs->{syncIdSet}) {
-+ $cookie = $syncIdSetInfos->{cookie} if defined($syncIdSetInfos->{cookie});
-+ Kolab::log('SYNCREPL',
-+ (defined($syncIdSetInfos->{cookie}) ? 'Empty ' : 'New ').
-+ "cookie from syncIdSet".
-+ " (refreshDeletes=".$syncIdSetInfos->{refreshDeletes}."): $cookie", KOLAB_DEBUG);
-+ foreach my $syncUUID ($syncIdSetInfos->{syncUUIDs}) {
-+ Kolab::log('SYNCREPL', 'entryUUID='.
-+ unpack("H*",$syncUUID), KOLAB_DEBUG);
-+ }
-+ }
-+ } elsif($mesg->code) {
-+ if ($mesg->code == 1) {
-+ Kolab::log('SYNCREPL', 'Communication Error: disconnecting', KOLAB_DEBUG);
-+ $disconnected = 1;
-+ return 0;
-+ } elsif ($mesg->code == LDAP_USER_CANCELED) {
-+ Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
-+ return;
-+ } else {
-+ Kolab::log('SYNCREPL', "searchCallback: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
-+ &abort;
-+ }
- } else {
-- Kolab::log('SYNCREPL', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
-+ Kolab::log('SYNCREPL', 'Received something else', KOLAB_DEBUG);
- }
- return 0;
- }
Added: libkolab-perl/trunk/debian/patches/series
===================================================================
--- libkolab-perl/trunk/debian/patches/series (rev 0)
+++ libkolab-perl/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,2 @@
+50-sync-ldap-backend.diff
+
Modified: libkolab-perl/trunk/debian/rules
===================================================================
--- libkolab-perl/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ libkolab-perl/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: build-stamp
-build-stamp: patch-stamp
+build: patch
dh_testdir
perl Makefile.PL
$(MAKE)
Modified: php-kolab/trunk/debian/changelog
===================================================================
--- php-kolab/trunk/debian/changelog 2008-10-27 21:21:09 UTC (rev 961)
+++ php-kolab/trunk/debian/changelog 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,3 +1,9 @@
+php-kolab (2.2.0-20080711-2) experimental; urgency=low
+
+ * switch from dpatch to quilt
+
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 30 Oct 2008 22:06:31 +0100
+
php-kolab (2.2.0-20080711-1) experimental; urgency=low
* New upstream version: 2.2.0
Modified: php-kolab/trunk/debian/control
===================================================================
--- php-kolab/trunk/debian/control 2008-10-27 21:21:09 UTC (rev 961)
+++ php-kolab/trunk/debian/control 2008-10-30 21:20:54 UTC (rev 962)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/php-kolab/trunk/
Deleted: php-kolab/trunk/debian/patches/00list
===================================================================
--- php-kolab/trunk/debian/patches/00list 2008-10-27 21:21:09 UTC (rev 961)
+++ php-kolab/trunk/debian/patches/00list 2008-10-30 21:20:54 UTC (rev 962)
@@ -1 +0,0 @@
-20-horde-path
Copied: php-kolab/trunk/debian/patches/20-horde-path.diff (from rev 959, php-kolab/trunk/debian/patches/20-horde-path.dpatch)
===================================================================
--- php-kolab/trunk/debian/patches/20-horde-path.diff (rev 0)
+++ php-kolab/trunk/debian/patches/20-horde-path.diff 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-horde-path.dpatch by <math.parent at gmaiL.com>
+##
+## DP: Include Horde path
+
+ at DPATCH@
+diff -urNad php-kolab-2.2~rc1+20080204~/Filter/Filter.php php-kolab-2.2~rc1+20080204/Filter/Filter.php
+--- php-kolab-2.2~rc1+20080204~/Filter/Filter.php 2008-02-04 15:51:45.000000000 +0100
++++ php-kolab-2.2~rc1+20080204/Filter/Filter.php 2008-02-17 23:41:08.000000000 +0100
+@@ -36,6 +36,7 @@
+ require_once 'PEAR.php';
+
+ /* Load the required Horde libraries */
++require_once '/usr/share/horde3/lib/core.php';
+ require_once 'Horde.php';
+
+ /* Load the Filter libraries */
+diff -urNad php-kolab-2.2~rc1+20080204~/Filter/Outlook.php php-kolab-2.2~rc1+20080204/Filter/Outlook.php
+--- php-kolab-2.2~rc1+20080204~/Filter/Outlook.php 2008-02-04 15:51:45.000000000 +0100
++++ php-kolab-2.2~rc1+20080204/Filter/Outlook.php 2008-02-17 23:40:50.000000000 +0100
+@@ -33,6 +33,7 @@
+ */
+
+ require_once 'Kolab/Filter/misc.php';
++require_once '/usr/share/horde3/lib/core.php';
+ require_once 'Horde/iCalendar.php';
+ require_once 'Horde/MIME.php';
+ require_once 'Horde/MIME/Message.php';
+diff -urNad php-kolab-2.2~rc1+20080204~/Filter/Resource.php php-kolab-2.2~rc1+20080204/Filter/Resource.php
+--- php-kolab-2.2~rc1+20080204~/Filter/Resource.php 2008-02-04 15:51:45.000000000 +0100
++++ php-kolab-2.2~rc1+20080204/Filter/Resource.php 2008-02-17 23:40:33.000000000 +0100
+@@ -33,6 +33,7 @@
+ */
+
+ require_once 'Net/IMAP.php';
++require_once '/usr/share/horde3/lib/core.php';
+ require_once 'Horde/iCalendar.php';
+ require_once 'Horde/MIME.php';
+ require_once 'Horde/MIME/Message.php';
+diff -urNad php-kolab-2.2~rc1+20080204~/Freebusy/Cache.php php-kolab-2.2~rc1+20080204/Freebusy/Cache.php
+--- php-kolab-2.2~rc1+20080204~/Freebusy/Cache.php 2008-02-04 15:51:45.000000000 +0100
++++ php-kolab-2.2~rc1+20080204/Freebusy/Cache.php 2008-02-17 23:39:59.000000000 +0100
+@@ -34,6 +34,7 @@
+ */
+
+ /* We require the iCalendar library to build the free/busy list */
++require_once '/usr/share/horde3/lib/core.php';
+ require_once 'Horde/iCalendar.php';
+ require_once 'Horde/iCalendar/vfreebusy.php';
+
+diff -urNad php-kolab-2.2~rc1+20080204~/Freebusy/Page.php php-kolab-2.2~rc1+20080204/Freebusy/Page.php
+--- php-kolab-2.2~rc1+20080204~/Freebusy/Page.php 2008-02-17 23:39:06.000000000 +0100
++++ php-kolab-2.2~rc1+20080204/Freebusy/Page.php 2008-02-17 23:39:10.000000000 +0100
+@@ -36,6 +36,7 @@
+ require_once 'PEAR.php';
+
+ /* Load the required Horde libraries */
++require_once '/usr/share/horde3/lib/core.php';
+ require_once 'Horde.php';
+ require_once "Horde/String.php";
+ require_once "Horde/Util.php";
Property changes on: php-kolab/trunk/debian/patches/20-horde-path.diff
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: php-kolab/trunk/debian/patches/20-horde-path.dpatch
===================================================================
--- php-kolab/trunk/debian/patches/20-horde-path.dpatch 2008-10-27 21:21:09 UTC (rev 961)
+++ php-kolab/trunk/debian/patches/20-horde-path.dpatch 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-horde-path.dpatch by <math.parent at gmaiL.com>
-##
-## DP: Include Horde path
-
- at DPATCH@
-diff -urNad php-kolab-2.2~rc1+20080204~/Filter/Filter.php php-kolab-2.2~rc1+20080204/Filter/Filter.php
---- php-kolab-2.2~rc1+20080204~/Filter/Filter.php 2008-02-04 15:51:45.000000000 +0100
-+++ php-kolab-2.2~rc1+20080204/Filter/Filter.php 2008-02-17 23:41:08.000000000 +0100
-@@ -36,6 +36,7 @@
- require_once 'PEAR.php';
-
- /* Load the required Horde libraries */
-+require_once '/usr/share/horde3/lib/core.php';
- require_once 'Horde.php';
-
- /* Load the Filter libraries */
-diff -urNad php-kolab-2.2~rc1+20080204~/Filter/Outlook.php php-kolab-2.2~rc1+20080204/Filter/Outlook.php
---- php-kolab-2.2~rc1+20080204~/Filter/Outlook.php 2008-02-04 15:51:45.000000000 +0100
-+++ php-kolab-2.2~rc1+20080204/Filter/Outlook.php 2008-02-17 23:40:50.000000000 +0100
-@@ -33,6 +33,7 @@
- */
-
- require_once 'Kolab/Filter/misc.php';
-+require_once '/usr/share/horde3/lib/core.php';
- require_once 'Horde/iCalendar.php';
- require_once 'Horde/MIME.php';
- require_once 'Horde/MIME/Message.php';
-diff -urNad php-kolab-2.2~rc1+20080204~/Filter/Resource.php php-kolab-2.2~rc1+20080204/Filter/Resource.php
---- php-kolab-2.2~rc1+20080204~/Filter/Resource.php 2008-02-04 15:51:45.000000000 +0100
-+++ php-kolab-2.2~rc1+20080204/Filter/Resource.php 2008-02-17 23:40:33.000000000 +0100
-@@ -33,6 +33,7 @@
- */
-
- require_once 'Net/IMAP.php';
-+require_once '/usr/share/horde3/lib/core.php';
- require_once 'Horde/iCalendar.php';
- require_once 'Horde/MIME.php';
- require_once 'Horde/MIME/Message.php';
-diff -urNad php-kolab-2.2~rc1+20080204~/Freebusy/Cache.php php-kolab-2.2~rc1+20080204/Freebusy/Cache.php
---- php-kolab-2.2~rc1+20080204~/Freebusy/Cache.php 2008-02-04 15:51:45.000000000 +0100
-+++ php-kolab-2.2~rc1+20080204/Freebusy/Cache.php 2008-02-17 23:39:59.000000000 +0100
-@@ -34,6 +34,7 @@
- */
-
- /* We require the iCalendar library to build the free/busy list */
-+require_once '/usr/share/horde3/lib/core.php';
- require_once 'Horde/iCalendar.php';
- require_once 'Horde/iCalendar/vfreebusy.php';
-
-diff -urNad php-kolab-2.2~rc1+20080204~/Freebusy/Page.php php-kolab-2.2~rc1+20080204/Freebusy/Page.php
---- php-kolab-2.2~rc1+20080204~/Freebusy/Page.php 2008-02-17 23:39:06.000000000 +0100
-+++ php-kolab-2.2~rc1+20080204/Freebusy/Page.php 2008-02-17 23:39:10.000000000 +0100
-@@ -36,6 +36,7 @@
- require_once 'PEAR.php';
-
- /* Load the required Horde libraries */
-+require_once '/usr/share/horde3/lib/core.php';
- require_once 'Horde.php';
- require_once "Horde/String.php";
- require_once "Horde/Util.php";
Added: php-kolab/trunk/debian/patches/series
===================================================================
--- php-kolab/trunk/debian/patches/series (rev 0)
+++ php-kolab/trunk/debian/patches/series 2008-10-30 21:20:54 UTC (rev 962)
@@ -0,0 +1 @@
+20-horde-path.diff
Modified: php-kolab/trunk/debian/rules
===================================================================
--- php-kolab/trunk/debian/rules 2008-10-27 21:21:09 UTC (rev 961)
+++ php-kolab/trunk/debian/rules 2008-10-30 21:20:54 UTC (rev 962)
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: build-stamp
-build-stamp: patch-stamp
+build: patch
dh_testdir
touch $@
More information about the pkg-kolab-devel
mailing list