[pkg-kolab] r744 - kolab-filter/branches kolab-filter/branches/2.2 kolab-filter/branches/2.2/debian kolab-filter/branches/2.2/debian/patches kolab-freebusy/branches kolab-freebusy/branches/2.2 kolab-freebusy/branches/2.2/debian kolab-freebusy/branches/2.2/debian/patches kolabconf/branches kolabconf/branches/2.2 kolabconf/branches/2.2/debian kolabconf/branches/2.2/debian/patches php-kolab/branches php-kolab/branches/2.2 php-kolab/branches/2.2/debian php-kolab/branches/2.2/debian/patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Fri Feb 29 14:51:46 UTC 2008
Author: mparent-guest
Date: 2008-02-29 14:51:45 +0000 (Fri, 29 Feb 2008)
New Revision: 744
Added:
kolab-filter/branches/2.2/
kolab-filter/branches/2.2/debian/
kolab-filter/branches/2.2/debian/changelog
kolab-filter/branches/2.2/debian/compat
kolab-filter/branches/2.2/debian/control
kolab-filter/branches/2.2/debian/copyright
kolab-filter/branches/2.2/debian/patches/
kolab-filter/branches/2.2/debian/patches/00list
kolab-filter/branches/2.2/debian/patches/20-config-path.dpatch
kolab-filter/branches/2.2/debian/patches/30-syslog.dpatch
kolab-filter/branches/2.2/debian/rules
kolab-freebusy/branches/2.2/
kolab-freebusy/branches/2.2/debian/
kolab-freebusy/branches/2.2/debian/apache.conf
kolab-freebusy/branches/2.2/debian/changelog
kolab-freebusy/branches/2.2/debian/compat
kolab-freebusy/branches/2.2/debian/control
kolab-freebusy/branches/2.2/debian/copyright
kolab-freebusy/branches/2.2/debian/links
kolab-freebusy/branches/2.2/debian/patches/
kolab-freebusy/branches/2.2/debian/patches/00list
kolab-freebusy/branches/2.2/debian/patches/20-config-path.dpatch
kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch
kolab-freebusy/branches/2.2/debian/postinst
kolab-freebusy/branches/2.2/debian/postrm
kolab-freebusy/branches/2.2/debian/prerm
kolab-freebusy/branches/2.2/debian/rules
kolabconf/branches/2.2/
kolabconf/branches/2.2/debian/
kolabconf/branches/2.2/debian/changelog
kolabconf/branches/2.2/debian/compat
kolabconf/branches/2.2/debian/control
kolabconf/branches/2.2/debian/copyright
kolabconf/branches/2.2/debian/patches/
kolabconf/branches/2.2/debian/patches/00list
kolabconf/branches/2.2/debian/patches/10-kolabconf-perl-path.dpatch
kolabconf/branches/2.2/debian/patches/30-invoke-rc.dpatch
kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
kolabconf/branches/2.2/debian/patches/85-slapd-syncrepl-24.dpatch
kolabconf/branches/2.2/debian/rules
kolabconf/branches/2.2/debian/svn-deblayout
kolabconf/branches/2.2/debian/undocumented.1
kolabconf/branches/2.2/debian/watch
php-kolab/branches/2.2/
php-kolab/branches/2.2/debian/
php-kolab/branches/2.2/debian/changelog
php-kolab/branches/2.2/debian/compat
php-kolab/branches/2.2/debian/control
php-kolab/branches/2.2/debian/copyright
php-kolab/branches/2.2/debian/patches/
php-kolab/branches/2.2/debian/patches/00list
php-kolab/branches/2.2/debian/patches/20-horde-path.dpatch
php-kolab/branches/2.2/debian/rules
Log:
Commit of new packages
Added: kolab-filter/branches/2.2/debian/changelog
===================================================================
--- kolab-filter/branches/2.2/debian/changelog (rev 0)
+++ kolab-filter/branches/2.2/debian/changelog 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,8 @@
+kolab-filter (2.2~rc1+20080204-1) unstable; urgency=low
+
+ * Initial release, reorganisation of kolab-resources-handler
+ * patch 20-config-path : use /etc/kolab/filter_config.php as config
+ * patch 30-syslog.dpatch : use syslog
+
+ -- Mathieu PARENT <math.parent at gmail.com> Thu, 14 Feb 2008 20:10:36 +0100
+
Added: kolab-filter/branches/2.2/debian/compat
===================================================================
--- kolab-filter/branches/2.2/debian/compat (rev 0)
+++ kolab-filter/branches/2.2/debian/compat 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+5
Added: kolab-filter/branches/2.2/debian/control
===================================================================
--- kolab-filter/branches/2.2/debian/control (rev 0)
+++ kolab-filter/branches/2.2/debian/control 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,22 @@
+Source: kolab-filter
+Section: unknown
+Priority: extra
+Maintainer: Mathieu PARENT <mathieu at localhost.localdomain>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: kolab-filter
+Architecture: any
+Depends: php-kolab, libapache2-mod-php5
+Description: Filter scripts for Kolab
+ Kolab is a secure, scalable, and reliable groupware server. It consists
+ of a number of well-known and proven components for the standard tasks
+ such as e-mail, directory service, and web service. Kolab adds
+ intelligent interaction between the components, a web administration
+ interface, management of free/busy lists, etc. Various clients can
+ access Kolab, among them Kontact (KDE), Outlook (Windows), and Horde
+ (web).
+ .
+ This package contains the filter web scripts.
+ .
+ Web site: http://www.kolab.org/
Added: kolab-filter/branches/2.2/debian/copyright
===================================================================
--- kolab-filter/branches/2.2/debian/copyright (rev 0)
+++ kolab-filter/branches/2.2/debian/copyright 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,59 @@
+This package was debianized by Mathieu PARENT <mathieu at localhost.localdomain> on
+Thu, 14 Feb 2008 20:10:36 +0100.
+
+It was downloaded from ftp://ftp.belnet.be/packages/kolab/server/beta/kolab-server-2.2-rc-1/sources/
+
+Copyright Holder:
+
+Kolab-Conf/Conf.pm
+Kolab-LDAP-Backend-slurpd/slurpd.pm
+## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+## Portions based on work by the following people:
+##
+## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+## (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
+## (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+
+
+Kolab-Cyrus/Cyrus.pm
+Kolab-DirServ/DirServ.pm
+Kolab/Kolab.pm
+Kolab-LDAP-Backend/Backend.pm
+Kolab-LDAP-Backend-dirservd/dirservd.pm
+Kolab-Mailer/Mailer.pm
+Kolab-Util/Util.pm
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+
+
+Kolab-LDAP/LDAP.pm
+## Copyright (c) 2005 Klaraelvdalens Datakonsult AB
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+## Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+
+
+License:
+
+ This package 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 of the License, or
+ (at your option) any later version.
+
+ This package 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 should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
Added: kolab-filter/branches/2.2/debian/patches/00list
===================================================================
--- kolab-filter/branches/2.2/debian/patches/00list (rev 0)
+++ kolab-filter/branches/2.2/debian/patches/00list 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,2 @@
+20-config-path
+30-syslog
Added: kolab-filter/branches/2.2/debian/patches/20-config-path.dpatch
===================================================================
--- kolab-filter/branches/2.2/debian/patches/20-config-path.dpatch (rev 0)
+++ kolab-filter/branches/2.2/debian/patches/20-config-path.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-config-path.dpatch by <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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/branches/2.2/debian/patches/20-config-path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolab-filter/branches/2.2/debian/patches/30-syslog.dpatch
===================================================================
--- kolab-filter/branches/2.2/debian/patches/30-syslog.dpatch (rev 0)
+++ kolab-filter/branches/2.2/debian/patches/30-syslog.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-syslog.dpatch by <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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/branches/2.2/debian/patches/30-syslog.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolab-filter/branches/2.2/debian/rules
===================================================================
--- kolab-filter/branches/2.2/debian/rules (rev 0)
+++ kolab-filter/branches/2.2/debian/rules 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,69 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+configure: configure-stamp patch-stamp
+configure-stamp:
+ dh_testdir
+ # nothing to configure
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure
+ dh_testdir
+
+ #nothing to compile
+
+ touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ #nothing to clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ #here is the important stuff
+ install -D -m 644 config.php $(CURDIR)/debian/kolab-filter/etc/kolab/filter_config.php
+ install -D -m 644 kolabfilter.php $(CURDIR)/debian/kolab-filter/usr/share/kolab/filter/kolabfilter.php
+ install -D -m 644 kolabmailboxfilter.php $(CURDIR)/debian/kolab-filter/usr/share/kolab/filter/kolabmailboxfilter.php
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: kolab-filter/branches/2.2/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: kolab-freebusy/branches/2.2/debian/apache.conf
===================================================================
--- kolab-freebusy/branches/2.2/debian/apache.conf (rev 0)
+++ kolab-freebusy/branches/2.2/debian/apache.conf 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,59 @@
+NameVirtualHost *:443
+<VirtualHost *:443>
+
+# FreeBusy list handling
+RewriteEngine On
+RewriteLog "/var/log/apache2/kolab_rewrite.log"
+RewriteLogLevel 0
+RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/kolab/freebusy/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/kolab/freebusy/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/kolab/freebusy/freebusy.php?uid=$1&extended=1
+RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0
+RewriteRule ^/freebusy/(.+)\.pfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1
+RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0&extended=1
+RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1&extended=1
+
+SSLEngine on
+SSLCertificateFile /etc/kolab/cert.pem
+SSLCertificateKeyFile /etc/kolab/key.pem
+
+<Files ~ "\.(cgi|shtml|phtml|php4|php3?)$">
+ SSLOptions +StdEnvVars
+</Files>
+
+Alias /freebusy /usr/share/kolab/freebusy
+
+<Location /freebusy>
+ SSLRequireSSL
+</Location>
+
+# Options for freebusy
+<Directory /usr/share/kolab/freebusy>
+ #Dav On
+ #Script PUT /freebusy/freebusy.php
+ AllowOverride None
+ Options None
+ # Disallow for everyone as default
+ Order allow,deny
+ <Limit GET PUT LOCK UNLOCK PROPFIND HEAD OPTIONS>
+ Allow from all
+ </Limit>
+ #DavMinTimeout 600
+</Directory>
+
+# Change servername
+#ServerName kolabserver.example.com:443
+
+# Contact email address for problems
+#ServerAdmin root at example.com
+
+# Special logs
+ErrorLog /var/log/apache2/kolab_error.log
+TransferLog /var/log/apache2/kolab_access.log
+CustomLog /var/log/apache2/kolab_ssl.log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+
+# Pull in kolab-webadmin configuration
+Include /etc/kolab/kolab-webadmin-apache*.conf
+
+</VirtualHost>
Added: kolab-freebusy/branches/2.2/debian/changelog
===================================================================
--- kolab-freebusy/branches/2.2/debian/changelog (rev 0)
+++ kolab-freebusy/branches/2.2/debian/changelog 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,9 @@
+kolab-freebusy (2.2~rc1+20080204-1) unstable; urgency=low
+
+ * Initial release, reorganisation of kolab-resources-handler
+ * patch 20-config-path : use /etc/kolab/freebusy_config.php as config
+ * patch 30-syslog.dpatch : use syslog
+ * apache.conf, postins, postrm and prerm taken from kolab-resources-handler
+
+ -- Mathieu PARENT <math.parent at gmail.com> Thu, 14 Feb 2008 20:10:36 +0100
+
Added: kolab-freebusy/branches/2.2/debian/compat
===================================================================
--- kolab-freebusy/branches/2.2/debian/compat (rev 0)
+++ kolab-freebusy/branches/2.2/debian/compat 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+5
Added: kolab-freebusy/branches/2.2/debian/control
===================================================================
--- kolab-freebusy/branches/2.2/debian/control (rev 0)
+++ kolab-freebusy/branches/2.2/debian/control 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,22 @@
+Source: kolab-freebusy
+Section: unknown
+Priority: extra
+Maintainer: Mathieu PARENT <mathieu at localhost.localdomain>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: kolab-freebusy
+Architecture: any
+Depends: php-kolab, libapache2-mod-php5
+Description: Freebusy scripts for Kolab
+ Kolab is a secure, scalable, and reliable groupware server. It consists
+ of a number of well-known and proven components for the standard tasks
+ such as e-mail, directory service, and web service. Kolab adds
+ intelligent interaction between the components, a web administration
+ interface, management of free/busy lists, etc. Various clients can
+ access Kolab, among them Kontact (KDE), Outlook (Windows), and Horde
+ (web).
+ .
+ This package contains the freebusy web scripts.
+ .
+ Web site: http://www.kolab.org/
Added: kolab-freebusy/branches/2.2/debian/copyright
===================================================================
--- kolab-freebusy/branches/2.2/debian/copyright (rev 0)
+++ kolab-freebusy/branches/2.2/debian/copyright 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,59 @@
+This package was debianized by Mathieu PARENT <mathieu at localhost.localdomain> on
+Thu, 14 Feb 2008 20:10:36 +0100.
+
+It was downloaded from ftp://ftp.belnet.be/packages/kolab/server/beta/kolab-server-2.2-rc-1/sources/
+
+Copyright Holder:
+
+Kolab-Conf/Conf.pm
+Kolab-LDAP-Backend-slurpd/slurpd.pm
+## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+## Portions based on work by the following people:
+##
+## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+## (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
+## (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+
+
+Kolab-Cyrus/Cyrus.pm
+Kolab-DirServ/DirServ.pm
+Kolab/Kolab.pm
+Kolab-LDAP-Backend/Backend.pm
+Kolab-LDAP-Backend-dirservd/dirservd.pm
+Kolab-Mailer/Mailer.pm
+Kolab-Util/Util.pm
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+
+
+Kolab-LDAP/LDAP.pm
+## Copyright (c) 2005 Klaraelvdalens Datakonsult AB
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+## Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+
+
+License:
+
+ This package 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 of the License, or
+ (at your option) any later version.
+
+ This package 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 should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
Added: kolab-freebusy/branches/2.2/debian/links
===================================================================
--- kolab-freebusy/branches/2.2/debian/links (rev 0)
+++ kolab-freebusy/branches/2.2/debian/links 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+etc/kolab/apache.conf etc/apache2/sites-available/kolab
Added: kolab-freebusy/branches/2.2/debian/patches/00list
===================================================================
--- kolab-freebusy/branches/2.2/debian/patches/00list (rev 0)
+++ kolab-freebusy/branches/2.2/debian/patches/00list 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,2 @@
+20-config-path
+30-syslog
Added: kolab-freebusy/branches/2.2/debian/patches/20-config-path.dpatch
===================================================================
--- kolab-freebusy/branches/2.2/debian/patches/20-config-path.dpatch (rev 0)
+++ kolab-freebusy/branches/2.2/debian/patches/20-config-path.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-horde-path.dpatch by <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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/branches/2.2/debian/patches/20-config-path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch
===================================================================
--- kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch (rev 0)
+++ kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-syslog.dpatch by <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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;
+
+@@ -134,4 +134,4 @@
+ // ini_set('display_errors', 1);
+ //
+ // Both setting will disrupt header delivery (which should not cause a
+-// problem).
+\ No newline at end of file
++// problem).
Property changes on: kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolab-freebusy/branches/2.2/debian/postinst
===================================================================
--- kolab-freebusy/branches/2.2/debian/postinst (rev 0)
+++ kolab-freebusy/branches/2.2/debian/postinst 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+set -e
+
+fixperms() {
+ chmod 640 /etc/kolab/freebusy_config.php
+ chown root:www-data /etc/kolab/freebusy_config.php
+
+ chmod 750 /var/lib/kolab/freebusy-cache/
+ chown www-data:root /var/lib/kolab/freebusy-cache/
+}
+
+configure_apache() {
+ for mod in rewrite ssl ldap; do
+ a2enmod $mod >/dev/null
+ done
+
+ if [ -e /etc/apache2/mods-available/php5.load ]; then
+ a2enmod php5 >/dev/null
+ fi
+
+ a2ensite kolab >/dev/null
+
+ if command -v invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d apache2 force-reload || :
+ else
+ [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
+ fi
+}
+
+if [ "$1" = configure ]; then
+ fixperms
+ configure_apache
+fi
+
+#DEBHELPER#
Added: kolab-freebusy/branches/2.2/debian/postrm
===================================================================
--- kolab-freebusy/branches/2.2/debian/postrm (rev 0)
+++ kolab-freebusy/branches/2.2/debian/postrm 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = purge ]; then
+ rm -f /var/lib/kolab/freebusy-cache/*
+fi
+
+#DEBHELPER#
Added: kolab-freebusy/branches/2.2/debian/prerm
===================================================================
--- kolab-freebusy/branches/2.2/debian/prerm (rev 0)
+++ kolab-freebusy/branches/2.2/debian/prerm 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+a2dissite kolab >/dev/null
+
+#DEBHELPER#
Added: kolab-freebusy/branches/2.2/debian/rules
===================================================================
--- kolab-freebusy/branches/2.2/debian/rules (rev 0)
+++ kolab-freebusy/branches/2.2/debian/rules 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+configure: configure-stamp patch-stamp
+configure-stamp:
+ dh_testdir
+ # nothing to configure
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure
+ dh_testdir
+
+ #nothing to compile
+
+ touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ #nothing to clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ #here is the important stuff
+ mkdir -p $(CURDIR)/debian/kolab-freebusy/var/lib/kolab/freebusy-cache/
+ install -D -m 644 config.php $(CURDIR)/debian/kolab-freebusy/etc/kolab/freebusy_config.php
+ install -D -m 644 freebusy.php $(CURDIR)/debian/kolab-freebusy/usr/share/kolab/freebusy/freebusy.php
+ install -D -m 644 pfb.php $(CURDIR)/debian/kolab-freebusy/usr/share/kolab/freebusy/pfb.php
+ install -D -m 644 debian/apache.conf debian/kolab-freebusy/etc/kolab/apache.conf
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: kolab-freebusy/branches/2.2/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: kolabconf/branches/2.2/debian/changelog
===================================================================
--- kolabconf/branches/2.2/debian/changelog (rev 0)
+++ kolabconf/branches/2.2/debian/changelog 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,10 @@
+kolabconf (2.2~rc1+20080204-1) UNRELEASED; urgency=low
+
+ * kolabconf sorted out of kolabd
+ * patch 10-kolabconf-perl-path
+ * patch 30-invoke-rc coming from kolabd
+ * patch 80-kolab-syslog-facility
+ * patch 85-slapd-syncrepl-24
+
+ -- Mathieu Parent <math.parent at gmail.com> Wed, 12 Feb 2008 23:57:11 +0100
+
Added: kolabconf/branches/2.2/debian/compat
===================================================================
--- kolabconf/branches/2.2/debian/compat (rev 0)
+++ kolabconf/branches/2.2/debian/compat 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+4
Added: kolabconf/branches/2.2/debian/control
===================================================================
--- kolabconf/branches/2.2/debian/control (rev 0)
+++ kolabconf/branches/2.2/debian/control 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,28 @@
+Source: kolabconf
+Section: mail
+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>
+Build-Depends: debhelper (>= 4), dpatch
+Standards-Version: 3.7.3
+Homepage: http://www.kolab.org/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabconf/
+XS-Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolabconf/
+
+Package: kolabconf
+Architecture: all
+Depends: ${perl:Depends},
+ libkolab-perl (>= 5.8.7-20080204)
+Description: groupware server (configuration)
+ Kolab is a secure, scalable, and reliable groupware server. It consists
+ of a number of well-known and proven components for the standard tasks
+ such as e-mail, directory service, and web service. Kolab adds
+ intelligent interaction between the components, a web administration
+ interface, management of free/busy lists, etc. Various clients can
+ access Kolab, among them Kontact (KDE), Outlook (Windows), and Horde
+ (web).
+ .
+ This package contains the central mechanism to the configuration concept
+ of the Kolab server. It rewrites the Kolab configuration templates
+ into the final configuration files and handles the necessary magic
+ associated to that process.
Added: kolabconf/branches/2.2/debian/copyright
===================================================================
--- kolabconf/branches/2.2/debian/copyright (rev 0)
+++ kolabconf/branches/2.2/debian/copyright 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,147 @@
+This package was debianized by Steffen Joeris <steffen.joeris at skolelinux.de> on
+Fri, 16 Dec 2005 14:32:36 +0100.
+
+It was downloaded from http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/
+
+Copyright Holder(s):
+ Copyright (c) 2003,2004,2005 Code Fusion cc
+ List of files:
+kolab
+kolabconf
+kolabd
+namespace/libexec/listusers
+namespace/libexec/adduser
+namespace/libexec/deluser
+namespace/libexec/newconfig
+namespace/libexec/services
+namespace/libexec/showlog
+namespace/libexec/showuser
+namespace/libexec/start
+namespace/libexec/stop
+
+ Copyright (c) 2004,2005 Klaraelvdalens Datakonsult AB
+ List of files:
+kolab_ca.sh
+kolabconf
+kolabd
+kolab_smtpdpolicy
+templates/DB_CONFIG.slapd.template
+templates/ldap.conf.template
+templates/slapd.replicas.template
+
+ Copyright (c) 2003,2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ List of files:
+kolab
+kolab2.schema
+kolab_bootstrap
+kolabconf
+kolabd
+kolabpasswd
+kolab_sslcert.sh
+templates/main.cf.template
+templates/cyrus.conf.template
+templates/httpd.conf.template
+templates/imapd.conf.template
+templates/imapd.group.template
+templates/master.cf.template
+templates/php.ini.template
+templates/proftpd.conf.template
+templates/saslauthd.conf.template
+templates/session_vars.php.template
+templates/slapd.conf.template
+templates/transport.template
+templates/virtual.template
+workaround.sh
+
+ Copyright (c) 2003,2004,2005 Martin Konold <martin.konold at erfrakon.de>
+ List of files:
+kolab
+kolab2.schema
+kolab_bootstrap
+kolabconf
+kolabconf
+kolabd
+kolabd
+kolabpasswd
+kolab_sslcert.sh
+templates/main.cf.template
+templates/cyrus.conf.template
+templates/httpd.conf.template
+templates/httpd.local.template
+templates/imapd.conf.template
+templates/imapd.group.template
+templates/master.cf.template
+templates/php.ini.template;
+templates/proftpd.conf.template
+templates/saslauthd.conf.template
+templates/session_vars.php.template
+templates/slapd.conf.template
+templates/transport.template
+templates/virtual.template
+workaround.sh
+
+ Copyright (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+ List of files:
+kolab
+kolab2.schema
+kolab_bootstrap
+kolabconf
+kolabconf
+kolabd
+kolabd
+templates/main.cf.template
+templates/cyrus.conf.template
+templates/httpd.conf.template
+templates/imapd.conf.template
+templates/master.cf.template
+templates/proftpd.conf.template
+templates/saslauthd.conf.template
+templates/slapd.conf.template
+
+ Copyright (c) 2004 Erfrakon
+ List of files:
+kolabpasswd
+
+License:
+
+ This package 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 of the License, or
+ (at your option) any later version.
+
+ This package 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.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The following file have a special copyright notice:
+
+namespace/kolab
+
+## Derived with acknowledgement from: openpkg -- OpenPKG Tool Chain
+##
+## Copyright (c) 2004-2005 Code Fusion cc. <http://www.codefusion.co.za>
+## Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2004 Ralf S. Engelschall <rse at engelschall.com>
+## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
Added: kolabconf/branches/2.2/debian/patches/00list
===================================================================
--- kolabconf/branches/2.2/debian/patches/00list (rev 0)
+++ kolabconf/branches/2.2/debian/patches/00list 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,4 @@
+10-kolabconf-perl-path
+30-invoke-rc
+80-kolab-syslog-facility
+85-slapd-syncrepl-24
Added: kolabconf/branches/2.2/debian/patches/10-kolabconf-perl-path.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/10-kolabconf-perl-path.dpatch (rev 0)
+++ kolabconf/branches/2.2/debian/patches/10-kolabconf-perl-path.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -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
+ ## ---------
Added: kolabconf/branches/2.2/debian/patches/30-invoke-rc.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/30-invoke-rc.dpatch (rev 0)
+++ kolabconf/branches/2.2/debian/patches/30-invoke-rc.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-invoke-rc.dpatch by <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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 2008-02-17 21:22:21.000000000 +0100
++++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm 2008-02-17 21:26:05.000000000 +0100
+@@ -724,22 +724,22 @@
+ {
+ 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'}) {
+@@ -748,16 +748,6 @@
+ 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");
+- }
+-
+ %Kolab::Conf::haschanged = ();
+
+ &Kolab::log('K', 'Reload finished');
Property changes on: kolabconf/branches/2.2/debian/patches/30-invoke-rc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch (rev 0)
+++ kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
+##
+## DP: Make the used syslog facility configureable
+
+ at DPATCH@
+diff -Nwru kolabd-1.9.4dfsg/kolabconf kolabd-1.9.4dfsg.patched/kolabconf
+--- kolabd-1.9.4dfsg/bin/kolabconf.in 2005-04-28 02:16:59.000000000 +0200
++++ kolabd-1.9.4dfsg.patched/bin/kolabconf.in 2006-05-26 15:32:13.000000000 +0200
+@@ -37,7 +37,7 @@
+ use Kolab::LDAP;
+ use vars qw($opt_d $opt_n $opt_h);
+
+-openlog('kolabconf', 'cons, pid', 'user');
++openlog('kolabconf', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
+
+ getopts('dnh');
+ if ($opt_h) {
+
Added: kolabconf/branches/2.2/debian/patches/85-slapd-syncrepl-24.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/85-slapd-syncrepl-24.dpatch (rev 0)
+++ kolabconf/branches/2.2/debian/patches/85-slapd-syncrepl-24.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,47 @@
+#! /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
+@@ -526,23 +526,22 @@
+
+ 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";
+- }
++ # The master is already configured to be synchronisation provider in slapd.conf
++ # Note that both masters and slaves are synchronisation providers.
+ } 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";
++ # 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";
++
+ }
+
+ $repl->close;
Property changes on: kolabconf/branches/2.2/debian/patches/85-slapd-syncrepl-24.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kolabconf/branches/2.2/debian/rules
===================================================================
--- kolabconf/branches/2.2/debian/rules (rev 0)
+++ kolabconf/branches/2.2/debian/rules 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+config.status: patch-stamp
+ dh_testdir
+ perl Makefile.PL --config /etc/kolab/kolab.globals
+ #./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib --with-dist=debian --without-openpkg
+
+build: build-stamp
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ [ ! -f Makefile ] || $(MAKE) distclean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ install -D -m 755 bin/kolabconf debian/kolabconf/usr/sbin/kolabconf
+ mkdir -p debian/kolabconf/usr/share/perl5/Kolab/
+ install -D -m 755 lib/Kolab/Conf.pm debian/kolabconf/usr/share/perl5/Kolab/Conf.pm
+
+ # Man pages
+ mkdir -p debian/kolabconf/usr/share/man/man1
+ for x in `find debian/kolabconf/usr/bin debian/kolabconf/usr/sbin -type f`; do \
+ sed "s/undocumented/`basename $$x`/g" debian/undocumented.1 >debian/kolabconf/usr/share/man/man1/`basename $$x`.1; \
+ done
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i ChangeLog
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installman -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i -X /etc/
+ dh_perl -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: kolabconf/branches/2.2/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: kolabconf/branches/2.2/debian/svn-deblayout
===================================================================
--- kolabconf/branches/2.2/debian/svn-deblayout (rev 0)
+++ kolabconf/branches/2.2/debian/svn-deblayout 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+origDir=../upstream
Added: kolabconf/branches/2.2/debian/undocumented.1
===================================================================
--- kolabconf/branches/2.2/debian/undocumented.1 (rev 0)
+++ kolabconf/branches/2.2/debian/undocumented.1 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,9 @@
+.TH undocumented 1 2006-08-23 Kolab
+.SH NAME
+undocumented \- Kolab groupware suite
+.SH SYNOPSIS
+\fBundocumented\fR
+.SH DESCRIPTION
+This program belongs to the Kolab groupware suite, but it does not have
+a useful manual page of its own. Please see the documentation under
+\fI/usr/share/doc/kolabd/\fR for more information.
Added: kolabconf/branches/2.2/debian/watch
===================================================================
--- kolabconf/branches/2.2/debian/watch (rev 0)
+++ kolabconf/branches/2.2/debian/watch 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\.dfsg$// \
+ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolabconf-([\d.-]+).src.rpm
Added: php-kolab/branches/2.2/debian/changelog
===================================================================
--- php-kolab/branches/2.2/debian/changelog (rev 0)
+++ php-kolab/branches/2.2/debian/changelog 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,8 @@
+php-kolab (2.2~rc1+20080204-1) unstable; urgency=low
+
+ * Initial release, reorganisation of kolab-resources-handler
+ * patch 20-horde-path, to allow including of Horde libs
+ * depends on horde3 > 3.2
+
+ -- Mathieu PARENT <mathieu at localhost.localdomain> Thu, 14 Feb 2008 20:10:36 +0100
+
Added: php-kolab/branches/2.2/debian/compat
===================================================================
--- php-kolab/branches/2.2/debian/compat (rev 0)
+++ php-kolab/branches/2.2/debian/compat 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+5
Added: php-kolab/branches/2.2/debian/control
===================================================================
--- php-kolab/branches/2.2/debian/control (rev 0)
+++ php-kolab/branches/2.2/debian/control 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,23 @@
+Source: php-kolab
+Section: unknown
+Priority: extra
+Maintainer: Mathieu PARENT <mathieu at localhost.localdomain>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: php-kolab
+Architecture: any
+Depends: php-pear, php-net-lmtp, php-net-smtp, php-net-socket, horde3 (>= 3.2~rc2), php-net-imap, php5-ldap, php5-cli
+Description: PHP modules for Kolab
+ Kolab is a secure, scalable, and reliable groupware server. It consists
+ of a number of well-known and proven components for the standard tasks
+ such as e-mail, directory service, and web service. Kolab adds
+ intelligent interaction between the components, a web administration
+ interface, management of free/busy lists, etc. Various clients can
+ access Kolab, among them Kontact (KDE), Outlook (Windows), and Horde
+ (web).
+ .
+ This package contains PHP modules that support the internal Kolab
+ server functionality. It is not intended for other purposes.
+ .
+ Web site: http://www.kolab.org/
Added: php-kolab/branches/2.2/debian/copyright
===================================================================
--- php-kolab/branches/2.2/debian/copyright (rev 0)
+++ php-kolab/branches/2.2/debian/copyright 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,59 @@
+This package was debianized by Mathieu PARENT <mathieu at localhost.localdomain> on
+Thu, 14 Feb 2008 20:10:36 +0100.
+
+It was downloaded from ftp://ftp.belnet.be/packages/kolab/server/beta/kolab-server-2.2-rc-1/sources/
+
+Copyright Holder:
+
+Kolab-Conf/Conf.pm
+Kolab-LDAP-Backend-slurpd/slurpd.pm
+## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+## Portions based on work by the following people:
+##
+## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+## (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
+## (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+
+
+Kolab-Cyrus/Cyrus.pm
+Kolab-DirServ/DirServ.pm
+Kolab/Kolab.pm
+Kolab-LDAP-Backend/Backend.pm
+Kolab-LDAP-Backend-dirservd/dirservd.pm
+Kolab-Mailer/Mailer.pm
+Kolab-Util/Util.pm
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+
+
+Kolab-LDAP/LDAP.pm
+## Copyright (c) 2005 Klaraelvdalens Datakonsult AB
+## Copyright (c) 2003 Code Fusion cc
+##
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+## Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+
+
+License:
+
+ This package 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 of the License, or
+ (at your option) any later version.
+
+ This package 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 should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
Added: php-kolab/branches/2.2/debian/patches/00list
===================================================================
--- php-kolab/branches/2.2/debian/patches/00list (rev 0)
+++ php-kolab/branches/2.2/debian/patches/00list 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1 @@
+20-horde-path
Added: php-kolab/branches/2.2/debian/patches/20-horde-path.dpatch
===================================================================
--- php-kolab/branches/2.2/debian/patches/20-horde-path.dpatch (rev 0)
+++ php-kolab/branches/2.2/debian/patches/20-horde-path.dpatch 2008-02-29 14:51:45 UTC (rev 744)
@@ -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/branches/2.2/debian/patches/20-horde-path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: php-kolab/branches/2.2/debian/rules
===================================================================
--- php-kolab/branches/2.2/debian/rules (rev 0)
+++ php-kolab/branches/2.2/debian/rules 2008-02-29 14:51:45 UTC (rev 744)
@@ -0,0 +1,70 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+configure: configure-stamp patch-stamp
+configure-stamp:
+ dh_testdir
+ # nothing to configure
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure
+ dh_testdir
+
+ #nothing to compile
+
+ touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ #nothing to clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ #here is the important stuff
+ mkdir -p $(CURDIR)/debian/php-kolab/usr/share/php/Kolab
+ for i in Filter/*.php ; do install -D -m 644 $$i $(CURDIR)/debian/php-kolab/usr/share/php/Kolab/$$i ; done
+ for i in Freebusy/*.php ; do install -D -m 644 $$i $(CURDIR)/debian/php-kolab/usr/share/php/Kolab/$$i ; done
+ for i in Webadmin/*.php ; do install -D -m 644 $$i $(CURDIR)/debian/php-kolab/usr/share/php/Kolab/$$i ; done
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: php-kolab/branches/2.2/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-kolab-devel
mailing list