[pkg-kolab] r1029 - in kolabd/branches/2.2.1/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Mon Dec 15 22:51:50 UTC 2008
Author: mparent-guest
Date: 2008-12-15 22:51:49 +0000 (Mon, 15 Dec 2008)
New Revision: 1029
Removed:
kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
kolabd/branches/2.2.1/debian/patches/50-postfix-hashes.diff
kolabd/branches/2.2.1/debian/patches/60-kolabdcachetool-cachefiles.diff
kolabd/branches/2.2.1/debian/patches/80-kolab_globals.diff
kolabd/branches/2.2.1/debian/patches/85-slapd-2.4-compat.diff
kolabd/branches/2.2.1/debian/patches/86-slapd-syncrepl-24.diff
Modified:
kolabd/branches/2.2.1/debian/changelog
kolabd/branches/2.2.1/debian/patches/series
Log:
integrated patches
Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/changelog 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,8 +1,15 @@
kolabd (kolabd-2.2.1-20081212-1) UNRELEASED; urgency=low
* New beta release 2.2.1-beta-1
+ * Integrated patches (wow!):
+ - 10-dist_conf
+ - 50-postfix-hashes
+ - 60-kolabdcachetool-cachefiles
+ - 80-kolab_globals
+ - 85-slapd-2.4-compat
+ - 86-slapd-syncrepl-24
- -- Mathieu Parent <math.parent at gmail.com> Mon, 15 Dec 2008 23:41:05 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 15 Dec 2008 23:49:11 +0100
kolabd (2.2.0-20080709.dfsg-2) unstable; urgency=low
Deleted: kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,137 +0,0 @@
-Goal: fix dist_conf/debian
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Already included, will be in 2.2.1
-
-Index: b/dist_conf/debian
-===================================================================
---- a/dist_conf/debian
-+++ b/dist_conf/debian
-@@ -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
--
Deleted: kolabd/branches/2.2.1/debian/patches/50-postfix-hashes.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/50-postfix-hashes.diff 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/50-postfix-hashes.diff 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,121 +0,0 @@
-Goal: Postfix hashes templates
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Already included, will be in 2.2.1
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -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 \
-@@ -60,6 +62,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 \
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -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 \
-@@ -211,6 +213,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 \
-Index: b/templates/access.template.in
-===================================================================
---- /dev/null
-+++ b/templates/access.template.in
-@@ -0,0 +1,14 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/access
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=@sbindir@/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
-Index: b/templates/canonical.template.in
-===================================================================
---- /dev/null
-+++ b/templates/canonical.template.in
-@@ -0,0 +1,14 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/canonical
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=@sbindir@/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
-Index: b/templates/relocated.template.in
-===================================================================
---- /dev/null
-+++ b/templates/relocated.template.in
-@@ -0,0 +1,14 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/relocated
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=@sbindir@/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
-Index: b/templates/virtual.template.in
-===================================================================
---- a/templates/virtual.template.in
-+++ b/templates/virtual.template.in
-@@ -2,6 +2,7 @@
- TARGET=@emailserver_confdir@/virtual
- PERMISSIONS=0640
- OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-+RUNONCHANGE=@sbindir@/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>
Deleted: kolabd/branches/2.2.1/debian/patches/60-kolabdcachetool-cachefiles.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/60-kolabdcachetool-cachefiles.diff 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/60-kolabdcachetool-cachefiles.diff 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,38 +0,0 @@
-Goal: correct the path of the cachefiles
-
-Author: Noèl Köthe <noel at debian.org>
-
-Upstream status: Already included, will be in 2.2.1
-
-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 ) {
Deleted: kolabd/branches/2.2.1/debian/patches/80-kolab_globals.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/80-kolab_globals.diff 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/80-kolab_globals.diff 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,28 +0,0 @@
-Goal: kolab.globals
-
-- Use syncrepl LDAP backend (OpenLDAP >= 2.3)
-- Use syslog
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Already included, will be in 2.2.1 (kolab/issue2446)
-
-Index: b/kolab.globals.in
-===================================================================
---- a/kolab.globals.in
-+++ b/kolab.globals.in
-@@ -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
Deleted: kolabd/branches/2.2.1/debian/patches/85-slapd-2.4-compat.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/85-slapd-2.4-compat.diff 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/85-slapd-2.4-compat.diff 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,36 +0,0 @@
-Goal: be compatible with OpenLDAP 2.4
-
-- remove schemacheck
-- indent syntax correction
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Already included, will be in 2.2.1
-
-Index: b/templates/slapd.conf.template.in
-===================================================================
---- a/templates/slapd.conf.template.in
-+++ b/templates/slapd.conf.template.in
-@@ -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@
Deleted: kolabd/branches/2.2.1/debian/patches/86-slapd-syncrepl-24.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/86-slapd-syncrepl-24.diff 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/86-slapd-syncrepl-24.diff 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,86 +0,0 @@
-Goal: enable syncrepl instead of slurpd
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Already included, will be in 2.2.1
-
-Index: b/kolab_bootstrap.in
-===================================================================
---- a/kolab_bootstrap.in
-+++ b/kolab_bootstrap.in
-@@ -812,14 +812,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.
-Index: b/templates/slapd.conf.template.in
-===================================================================
---- a/templates/slapd.conf.template.in
-+++ b/templates/slapd.conf.template.in
-@@ -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
-@@ -65,6 +62,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
Modified: kolabd/branches/2.2.1/debian/patches/series
===================================================================
--- kolabd/branches/2.2.1/debian/patches/series 2008-12-15 22:46:28 UTC (rev 1028)
+++ kolabd/branches/2.2.1/debian/patches/series 2008-12-15 22:51:49 UTC (rev 1029)
@@ -1,13 +1,7 @@
-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
More information about the pkg-kolab-devel
mailing list