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

Mathieu Parent sathieu at alioth.debian.org
Sat Nov 19 12:10:40 UTC 2011


Author: sathieu
Date: 2011-11-19 12:10:39 +0000 (Sat, 19 Nov 2011)
New Revision: 1558

Removed:
   kolabd/trunk/debian/patches/10-dist_conf.diff
   kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
   kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
   kolabd/trunk/debian/patches/90-slapd-template.diff
   kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff
   kolabd/trunk/debian/patches/96-imap-user-group.diff
   kolabd/trunk/debian/rfc2739.schema
Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/91-postfix-template.diff
   kolabd/trunk/debian/patches/92-cyrus-template.diff
   kolabd/trunk/debian/patches/93-amavisd-template.diff
   kolabd/trunk/debian/patches/94-cyrus-template.diff
   kolabd/trunk/debian/patches/series
   kolabd/trunk/debian/rules
Log:
New upstream release (2.3.2-20110531)

- removed 10-dist_conf.diff: merged upstream
- removed 55-no-distconf_kolabsrv.diff: not needed anymore
- removed 70-kolab2.schema-removal.of.rfc2739.diff: merged upstream
- removed 90-slapd-template.diff: merged upstream
- updated 91-postfix-template.diff: templates not preprocessed
- updated 92-cyrus-template.diff: FIXME
- updated 93-amavisd-template.diff: templates not preprocessed
- updated 94-cyrus-template.diff: templates not preprocessed
- removed 95-resmgr-issue1383-issue2499.diff: merged upsteam
- removed 96-imap-user-group.diff: merged upsteam
- session_vars.php.template.in was removed from tarball (d/rules)
- rfc2739.schema was removed (d/rules, d/rfc2739.schema)
- horde.schema was removed (d/rules)



Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/changelog	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,12 +1,26 @@
-kolabd (2.2.4-20100624-5) unstable; urgency=low
+kolabd (2.3.2-20110531-1) UNRELEASED; urgency=low
 
+  * New upstream release (2.3.2-20110531)
+    - removed 10-dist_conf.diff: merged upstream
+    - removed 55-no-distconf_kolabsrv.diff: not needed anymore
+    - removed 70-kolab2.schema-removal.of.rfc2739.diff: merged upstream
+    - removed 90-slapd-template.diff: merged upstream
+    - updated 91-postfix-template.diff: templates not preprocessed
+    - updated 92-cyrus-template.diff: FIXME
+    - updated 93-amavisd-template.diff: templates not preprocessed
+    - updated 94-cyrus-template.diff: templates not preprocessed
+    - removed 95-resmgr-issue1383-issue2499.diff: merged upsteam
+    - removed 96-imap-user-group.diff: merged upsteam
+    - session_vars.php.template.in was removed from tarball (d/rules)
+    - rfc2739.schema was removed (d/rules, d/rfc2739.schema)
+    - horde.schema was removed (d/rules)
   * NEWS: Document horde.schema removal causing "Problem Upgrading Older Kolab
     Server to Newest Slapd" (Closes: #599491). The problem is not fixed but
     only documented: manual steps are needed.
   * Drop old Breaks/Replaces on kolab-freebusy, kolab-resource-handlers (no more
     in oldstable=lenny)
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 06 Apr 2011 19:16:43 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 19 Nov 2011 13:08:21 +0100
 
 kolabd (2.2.4-20100624-4) unstable; urgency=low
 

Deleted: kolabd/trunk/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/10-dist_conf.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,330 +0,0 @@
-Goal: Correct dist_conf/debian
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Can be commited upstream
-
-Index: b/dist_conf/common
-===================================================================
---- a/dist_conf/common
-+++ b/dist_conf/common
-@@ -1,160 +1,160 @@
- do_subst = sed \
--	-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
--	-e 's,[@]bindir[@],$(bindir),g' \
--	-e 's,[@]sbindir[@],$(sbindir),g' \
--	-e 's,[@]prefix[@],$(prefix),g' \
--	-e 's,[@]libdir[@],$(libdir),g' \
--	-e 's,[@]datadir[@],$(datadir),g' \
--	-e 's,[@]libexecdir[@],$(libexecdir),g' \
--	-e 's,[@]localstatedir[@],$(localstatedir),g' \
--	-e 's,[@]phpini_dir[@],$(phpini_dir),g' \
--	-e 's,[@]phplibdir[@],$(phplibdir),g' \
--	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
--	-e 's,[@]phppeardir[@],$(phppeardir),g' \
--	-e 's,[@]BASH[@],$(BASHELL),g' \
--	-e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
--	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
--	-e 's,[@]LDAPD[@],$(LDAPD),g' \
--	-e 's,[@]PERL[@],$(PERL),g' \
--	-e 's,[@]PHP[@],$(PHP),g' \
--	-e 's,[@]RPM[@],$(RPM),g' \
--	-e 's,[@]TAR[@],$(TAR),g' \
--	-e 's,[@]VERSION[@],$(VERSION),g' \
--	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
--	-e 's,[@]aliases_file[@],$(aliases_file),g' \
--	-e 's,[@]syslog_facility[@],$(syslog_facility),g' \
--	-e 's,[@]directory_mode[@],$(directory_mode),g' \
--	-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
--	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
--	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
--	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
--	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
--	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
--	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
--	-e 's,[@]backupdir[@],$(backupdir),g' \
--	-e 's,[@]backupfiles[@],$(backupfiles),g' \
--	-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
--	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
--	-e 's,[@]clamav_grp[@],$(clamav_grp),g' \
--	-e 's,[@]clamav_logdir[@],$(clamav_logdir),g' \
--	-e 's,[@]clamav_logfile[@],$(clamav_logfile),g' \
--	-e 's,[@]clamav_pidfile[@],$(clamav_pidfile),g' \
--	-e 's,[@]clamav_rusr[@],$(clamav_rusr),g' \
--	-e 's,[@]clamav_socket[@],$(clamav_socket),g' \
--	-e 's,[@]clamav_usr[@],$(clamav_usr),g' \
--	-e 's,[@]emailserver_confdir[@],$(emailserver_confdir),g' \
--	-e 's,[@]emailserver_default_privs[@],$(emailserver_default_privs),g' \
--	-e 's,[@]emailserver_grp[@],$(emailserver_grp),g' \
--	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
--	-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
--	-e 's,[@]emailserver_mail_owner[@],$(emailserver_mail_owner),g' \
--	-e 's,[@]emailserver_master_usr[@],$(emailserver_master_usr),g' \
--	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
--	-e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
--	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
--	-e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
--	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
--	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
--	-e 's,[@]freebusy_confdir[@],$(freebusy_confdir),g' \
--	-e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \
--	-e 's,[@]freebusy_grp[@],$(freebusy_grp),g' \
--	-e 's,[@]freebusy_logdir[@],$(freebusy_logdir),g' \
--	-e 's,[@]freebusy_usr[@],$(freebusy_usr),g' \
--	-e 's,[@]freebusy_log_type[@],$(freebusy_log_type),g' \
--	-e 's,[@]freebusy_log_name[@],$(freebusy_log_name),g' \
--	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
--	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
--	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
--	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
--	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
--	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \
--	-e 's,[@]imap_confperm[@],$(imap_confperm),g' \
--	-e 's,[@]imap_grp[@],$(imap_grp),g' \
--	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
--	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
--	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
--	-e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \
--	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
--	-e 's,[@]imap_spool[@],$(imap_spool),g' \
--	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
--	-e 's,[@]imap_usr[@],$(imap_usr),g' \
--	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
--	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
--	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
--	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
--	-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
--	-e 's,[@]kolab_php_module_prefix[@],$(kolab_php_module_prefix),g' \
--	-e 's,[@]kolab_php_smarty_prefix[@],$(kolab_php_smarty_prefix),g' \
--	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
--	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
--	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
--	-e 's,[@]kolab_pkgs[@],$(kolab_pkgs),g' \
--	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
--	-e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
--	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
--	-e 's,[@]kolab_smtpdpolicy_conffile_grp[@],$(kolab_smtpdpolicy_conffile_grp),g' \
--	-e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \
--	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
--	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
--	-e 's,[@]kolab_wui[@],$(kolab_wui),g' \
--	-e 's,[@]kolab_quotawarning[@],$(kolab_quotawarning),g' \
--	-e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
--	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
--	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
--	-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
--	-e 's,[@]ldapserver_grp[@],$(ldapserver_grp),g' \
--	-e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
--	-e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
--	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
--	-e 's,[@]ldapserver_rgrp[@],$(ldapserver_rgrp),g' \
--	-e 's,[@]ldapserver_rusr[@],$(ldapserver_rusr),g' \
--	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
--	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
--	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
--	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
--	-e 's,[@]pear_horde_pkgs[@],$(pear_horde_pkgs),g' \
--	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
--	-e 's,[@]pki_grp[@],$(pki_grp),g' \
--	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
--	-e 's,[@]resmgr_conffile_grp[@],$(resmgr_conffile_grp),g' \
--	-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
--	-e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
--	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
--	-e 's,[@]resmgr_localedir[@],$(resmgr_localedir),g' \
--	-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
--	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
--	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
--	-e 's,[@]resmgr_log_type[@],$(resmgr_log_type),g' \
--	-e 's,[@]resmgr_log_name[@],$(resmgr_log_name),g' \
--	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
--	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
--	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
--	-e 's,[@]smarty_compiledir[@],$(smarty_compiledir),g' \
--	-e 's,[@]spamassassin_confdir[@],$(spamassassin_confdir),g' \
--	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
--	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
--	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
--	-e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
--	-e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
--	-e 's,[@]webserver_logdir[@],$(webserver_logdir),g' \
--	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
--	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
--	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
--	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
--	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
--	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
--	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
--	-e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
--	-e 's,[@]webserver_tmpdir[@],$(webserver_tmpdir),g' \
--	-e 's,[@]webserver_usr[@],$(webserver_usr),g' \
--	-e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g' \
--	-e 's,[@]horde_cookie_path[@],$(horde_cookie_path),g' \
--	-e 's,[@]horde_confdir[@],$(horde_confdir),g' \
--	-e 's,[@]dimp_confdir[@],$(dimp_confdir),g' \
--	-e 's,[@]imp_confdir[@],$(imp_confdir),g' \
--	-e 's,[@]ingo_confdir[@],$(ingo_confdir),g' \
--	-e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g' \
--	-e 's,[@]mimp_confdir[@],$(mimp_confdir),g' \
--	-e 's,[@]mnemo_confdir[@],$(mnemo_confdir),g' \
--	-e 's,[@]nag_confdir[@],$(nag_confdir),g' \
--	-e 's,[@]turba_confdir[@],$(turba_confdir),g'
-+	-e 's=[@]sysconfdir[@]=$(sysconfdir)=g' \
-+	-e 's=[@]bindir[@]=$(bindir)=g' \
-+	-e 's=[@]sbindir[@]=$(sbindir)=g' \
-+	-e 's=[@]prefix[@]=$(prefix)=g' \
-+	-e 's=[@]libdir[@]=$(libdir)=g' \
-+	-e 's=[@]datadir[@]=$(datadir)=g' \
-+	-e 's=[@]libexecdir[@]=$(libexecdir)=g' \
-+	-e 's=[@]localstatedir[@]=$(localstatedir)=g' \
-+	-e 's=[@]phpini_dir[@]=$(phpini_dir)=g' \
-+	-e 's=[@]phplibdir[@]=$(phplibdir)=g' \
-+	-e 's=[@]phplibdir2[@]=$(phplibdir2)=g' \
-+	-e 's=[@]phppeardir[@]=$(phppeardir)=g' \
-+	-e 's=[@]BASH[@]=$(BASHELL)=g' \
-+	-e 's=[@]CHKCONFIG[@]=$(CHKCONFIG)=g' \
-+	-e 's=[@]KOLABRC[@]=$(KOLABRC)=g' \
-+	-e 's=[@]LDAPD[@]=$(LDAPD)=g' \
-+	-e 's=[@]PERL[@]=$(PERL)=g' \
-+	-e 's=[@]PHP[@]=$(PHP)=g' \
-+	-e 's=[@]RPM[@]=$(RPM)=g' \
-+	-e 's=[@]TAR[@]=$(TAR)=g' \
-+	-e 's=[@]VERSION[@]=$(VERSION)=g' \
-+	-e 's=[@]WITHOPENPKG[@]=$(WITHOPENPKG)=g' \
-+	-e 's=[@]aliases_file[@]=$(aliases_file)=g' \
-+	-e 's=[@]syslog_facility[@]=$(syslog_facility)=g' \
-+	-e 's=[@]directory_mode[@]=$(directory_mode)=g' \
-+	-e 's=[@]amavisd_conffile[@]=$(amavisd_conffile)=g' \
-+	-e 's=[@]amavisd_grp[@]=$(amavisd_grp)=g' \
-+	-e 's=[@]amavisd_home[@]=$(amavisd_home)=g' \
-+	-e 's=[@]amavisd_logfile[@]=$(amavisd_logfile)=g' \
-+	-e 's=[@]amavisd_rusr[@]=$(amavisd_rusr)=g' \
-+	-e 's=[@]amavisd_templatedir[@]=$(amavisd_templatedir)=g' \
-+	-e 's=[@]amavisd_usr[@]=$(amavisd_usr)=g' \
-+	-e 's=[@]backupdir[@]=$(backupdir)=g' \
-+	-e 's=[@]backupfiles[@]=$(backupfiles)=g' \
-+	-e 's=[@]clamav_confdir[@]=$(clamav_confdir)=g' \
-+	-e 's=[@]clamav_datadir[@]=$(clamav_datadir)=g' \
-+	-e 's=[@]clamav_grp[@]=$(clamav_grp)=g' \
-+	-e 's=[@]clamav_logdir[@]=$(clamav_logdir)=g' \
-+	-e 's=[@]clamav_logfile[@]=$(clamav_logfile)=g' \
-+	-e 's=[@]clamav_pidfile[@]=$(clamav_pidfile)=g' \
-+	-e 's=[@]clamav_rusr[@]=$(clamav_rusr)=g' \
-+	-e 's=[@]clamav_socket[@]=$(clamav_socket)=g' \
-+	-e 's=[@]clamav_usr[@]=$(clamav_usr)=g' \
-+	-e 's=[@]emailserver_confdir[@]=$(emailserver_confdir)=g' \
-+	-e 's=[@]emailserver_default_privs[@]=$(emailserver_default_privs)=g' \
-+	-e 's=[@]emailserver_grp[@]=$(emailserver_grp)=g' \
-+	-e 's=[@]emailserver_localstatedir[@]=$(emailserver_localstatedir)=g' \
-+	-e 's=[@]emailserver_logfile[@]=$(emailserver_logfile)=g' \
-+	-e 's=[@]emailserver_mail_owner[@]=$(emailserver_mail_owner)=g' \
-+	-e 's=[@]emailserver_master_usr[@]=$(emailserver_master_usr)=g' \
-+	-e 's=[@]emailserver_musr[@]=$(emailserver_musr)=g' \
-+	-e 's=[@]emailserver_setgid_grp[@]=$(emailserver_setgid_grp)=g' \
-+	-e 's=[@]emailserver_socket[@]=$(emailserver_socket)=g' \
-+	-e 's=[@]emailserver_tables_usr[@]=$(emailserver_tables_usr)=g' \
-+	-e 's=[@]emailserver_usr[@]=$(emailserver_usr)=g' \
-+	-e 's=[@]fbview_logfile[@]=$(fbview_logfile)=g' \
-+	-e 's=[@]freebusy_confdir[@]=$(freebusy_confdir)=g' \
-+	-e 's=[@]freebusy_cachedir[@]=$(freebusy_cachedir)=g' \
-+	-e 's=[@]freebusy_grp[@]=$(freebusy_grp)=g' \
-+	-e 's=[@]freebusy_logdir[@]=$(freebusy_logdir)=g' \
-+	-e 's=[@]freebusy_usr[@]=$(freebusy_usr)=g' \
-+	-e 's=[@]freebusy_log_type[@]=$(freebusy_log_type)=g' \
-+	-e 's=[@]freebusy_log_name[@]=$(freebusy_log_name)=g' \
-+	-e 's=[@]freshclam_logfile[@]=$(freshclam_logfile)=g' \
-+	-e 's=[@]freshclam_pidfile[@]=$(freshclam_pidfile)=g' \
-+	-e 's=[@]fsl_logfile[@]=$(fsl_logfile)=g' \
-+	-e 's=[@]graveyard_tscache[@]=$(graveyard_tscache)=g' \
-+	-e 's=[@]graveyard_uidcache[@]=$(graveyard_uidcache)=g' \
-+	-e 's=[@]imap_confdir[@]=$(imap_confdir)=g' \
-+	-e 's=[@]imap_confperm[@]=$(imap_confperm)=g' \
-+	-e 's=[@]imap_grp[@]=$(imap_grp)=g' \
-+	-e 's=[@]imap_lmtp[@]=$(imap_lmtp)=g' \
-+	-e 's=[@]imap_masterlogfile[@]=$(imap_masterlogfile)=g' \
-+	-e 's=[@]imap_misclogfile[@]=$(imap_misclogfile)=g' \
-+	-e 's=[@]imap_notify_socket[@]=$(imap_notify_socket)=g' \
-+	-e 's=[@]imap_sievedir[@]=$(imap_sievedir)=g' \
-+	-e 's=[@]imap_spool[@]=$(imap_spool)=g' \
-+	-e 's=[@]imap_statedir[@]=$(imap_statedir)=g' \
-+	-e 's=[@]imap_usr[@]=$(imap_usr)=g' \
-+	-e 's=[@]kolab_gid[@]=$(kolab_gid)=g' \
-+	-e 's=[@]kolab_grp[@]=$(kolab_grp)=g' \
-+	-e 's=[@]kolab_mailboxuiddb[@]=$(kolab_mailboxuiddb)=g' \
-+	-e 's=[@]kolab_mgrp[@]=$(kolab_mgrp)=g' \
-+	-e 's=[@]kolab_musr[@]=$(kolab_musr)=g' \
-+	-e 's=[@]kolab_php_module_prefix[@]=$(kolab_php_module_prefix)=g' \
-+	-e 's=[@]kolab_php_smarty_prefix[@]=$(kolab_php_smarty_prefix)=g' \
-+	-e 's=[@]kolab_pidfile[@]=$(kolab_pidfile)=g' \
-+	-e 's=[@]kolab_rcdir[@]=$(kolab_rcdir)=g' \
-+	-e 's=[@]kolab_rgrp[@]=$(kolab_rgrp)=g' \
-+	-e 's=[@]kolab_pkgs[@]=$(kolab_pkgs)=g' \
-+	-e 's=[@]kolab_rusr[@]=$(kolab_rusr)=g' \
-+	-e 's=[@]kolab_scriptsdir[@]=$(kolab_scriptsdir)=g' \
-+	-e 's=[@]kolab_statedir[@]=$(kolab_statedir)=g' \
-+	-e 's=[@]kolab_smtpdpolicy_conffile_grp[@]=$(kolab_smtpdpolicy_conffile_grp)=g' \
-+	-e 's=[@]kolab_smtpdpolicy_conffile_usr[@]=$(kolab_smtpdpolicy_conffile_usr)=g' \
-+	-e 's=[@]kolab_susr[@]=$(kolab_susr)=g' \
-+	-e 's=[@]kolab_usr[@]=$(kolab_usr)=g' \
-+	-e 's=[@]kolab_wui[@]=$(kolab_wui)=g' \
-+	-e 's=[@]kolab_quotawarning[@]=$(kolab_quotawarning)=g' \
-+	-e 's=[@]kolabconf_script[@]=$(kolabconf_script)=g' \
-+	-e 's=[@]ldapserver_argsfile[@]=$(ldapserver_argsfile)=g' \
-+	-e 's=[@]ldapserver_confdir[@]=$(ldapserver_confdir)=g' \
-+	-e 's=[@]ldapserver_dir[@]=$(ldapserver_dir)=g' \
-+	-e 's=[@]ldapserver_grp[@]=$(ldapserver_grp)=g' \
-+	-e 's=[@]ldapserver_logfile[@]=$(ldapserver_logfile)=g' \
-+	-e 's=[@]ldapserver_pidfile[@]=$(ldapserver_pidfile)=g' \
-+	-e 's=[@]ldapserver_replogfile[@]=$(ldapserver_replogfile)=g' \
-+	-e 's=[@]ldapserver_rgrp[@]=$(ldapserver_rgrp)=g' \
-+	-e 's=[@]ldapserver_rusr[@]=$(ldapserver_rusr)=g' \
-+	-e 's=[@]ldapserver_schemadir[@]=$(ldapserver_schemadir)=g' \
-+	-e 's=[@]ldapserverslurpd_pidfile[@]=$(ldapserverslurpd_pidfile)=g' \
-+	-e 's=[@]ldapserver_statedir[@]=$(ldapserver_statedir)=g' \
-+	-e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \
-+	-e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \
-+	-e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \
-+	-e 's=[@]pki_grp[@]=$(pki_grp)=g' \
-+	-e 's=[@]resmgr_confdir[@]=$(resmgr_confdir)=g' \
-+	-e 's=[@]resmgr_conffile_grp[@]=$(resmgr_conffile_grp)=g' \
-+	-e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
-+	-e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
-+	-e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
-+	-e 's=[@]resmgr_localedir[@]=$(resmgr_localedir)=g' \
-+	-e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
-+	-e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \
-+	-e 's=[@]resmgr_usr[@]=$(resmgr_usr)=g' \
-+	-e 's=[@]resmgr_log_type[@]=$(resmgr_log_type)=g' \
-+	-e 's=[@]resmgr_log_name[@]=$(resmgr_log_name)=g' \
-+	-e 's=[@]sasl_authdconffile[@]=$(sasl_authdconffile)=g' \
-+	-e 's=[@]sasl_logfile[@]=$(sasl_logfile)=g' \
-+	-e 's=[@]sasl_smtpconffile[@]=$(sasl_smtpconffile)=g' \
-+	-e 's=[@]smarty_compiledir[@]=$(smarty_compiledir)=g' \
-+	-e 's=[@]spamassassin_confdir[@]=$(spamassassin_confdir)=g' \
-+	-e 's=[@]webserver_acceptlock[@]=$(webserver_acceptlock)=g' \
-+	-e 's=[@]webserver_accesslogfile[@]=$(webserver_accesslogfile)=g' \
-+	-e 's=[@]webserver_cgidir[@]=$(webserver_cgidir)=g' \
-+	-e 's=[@]webserver_confdir[@]=$(webserver_confdir)=g' \
-+	-e 's=[@]webserver_document_root[@]=$(webserver_document_root)=g' \
-+	-e 's=[@]webserver_logdir[@]=$(webserver_logdir)=g' \
-+	-e 's=[@]webserver_errorlogfile[@]=$(webserver_errorlogfile)=g' \
-+	-e 's=[@]webserver_grp[@]=$(webserver_grp)=g' \
-+	-e 's=[@]webserver_musr[@]=$(webserver_musr)=g' \
-+	-e 's=[@]webserver_pidfile[@]=$(webserver_pidfile)=g' \
-+	-e 's=[@]webserver_runtime_status[@]=$(webserver_runtime_status)=g' \
-+	-e 's=[@]webserver_sessions[@]=$(webserver_sessions)=g' \
-+	-e 's=[@]webserver_sslmutex[@]=$(webserver_sslmutex)=g' \
-+	-e 's=[@]webserver_sslscache[@]=$(webserver_sslscache)=g' \
-+	-e 's=[@]webserver_tmpdir[@]=$(webserver_tmpdir)=g' \
-+	-e 's=[@]webserver_usr[@]=$(webserver_usr)=g' \
-+	-e 's=[@]webserver_web_prefix[@]=$(webserver_web_prefix)=g' \
-+	-e 's=[@]horde_cookie_path[@]=$(horde_cookie_path)=g' \
-+	-e 's=[@]horde_confdir[@]=$(horde_confdir)=g' \
-+	-e 's=[@]dimp_confdir[@]=$(dimp_confdir)=g' \
-+	-e 's=[@]imp_confdir[@]=$(imp_confdir)=g' \
-+	-e 's=[@]ingo_confdir[@]=$(ingo_confdir)=g' \
-+	-e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g' \
-+	-e 's=[@]mimp_confdir[@]=$(mimp_confdir)=g' \
-+	-e 's=[@]mnemo_confdir[@]=$(mnemo_confdir)=g' \
-+	-e 's=[@]nag_confdir[@]=$(nag_confdir)=g' \
-+	-e 's=[@]turba_confdir[@]=$(turba_confdir)=g'

Deleted: kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
===================================================================
--- kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,58 +0,0 @@
-Goal: kolabsrv is missing, don't install it
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Specific to kolab 2.2.0 (this file was missing in the tarballs)
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -127,9 +127,9 @@
- kolabdocdir = $(pkgdocdir)/@PACKAGE@
- kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
- 
--if ! OPENPKG
--kolabsbin_FILES = dist_conf/kolabsrv
--endif	
-+#if ! OPENPKG
-+#kolabsbin_FILES = dist_conf/kolabsrv
-+#endif	
- 
- kolabsbindir = $(sbindir)/
- kolabsbin_DATA = $(kolabsbin_FILES)
-@@ -199,9 +199,9 @@
- 	chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
- 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
- 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
--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
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -268,7 +268,7 @@
- 
- kolabdocdir = $(pkgdocdir)/@PACKAGE@
- kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
-- at OPENPKG_FALSE@kolabsbin_FILES = dist_conf/kolabsrv
-+#@OPENPKG_FALSE at kolabsbin_FILES = dist_conf/kolabsrv
- kolabsbindir = $(sbindir)/
- kolabsbin_DATA = $(kolabsbin_FILES)
- kolabbindir = $(bindir)
-@@ -871,7 +871,7 @@
- 	chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
- 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
- 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
-- 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.

Deleted: kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
===================================================================
--- kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,37 +0,0 @@
-Goal: remove upstream rfc2739 schema
-
-Upstream rfc2739 schema is not dfsg.
-See debian/rules that install a dfsg version of it
-
-Author: Noèl Köthe <noel at debian.org>
-
-Upstream status: Specific to Debian
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -82,8 +82,7 @@
- 
- 
- ldapschema_FILES =  kolab2.schema \
--	horde.schema \
--	rfc2739.schema
-+	horde.schema
- 
- ldapschemadir = $(ldapserver_confdir)/schema
- dist_ldapschema_DATA = $(ldapschema_FILES)
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -230,8 +230,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)

Deleted: kolabd/trunk/debian/patches/90-slapd-template.diff
===================================================================
--- kolabd/trunk/debian/patches/90-slapd-template.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/90-slapd-template.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,48 +0,0 @@
-Goal: slapd.conf template fixes
-
-- DB_CONFIG ownership
-- load modules
-
-Author: Peter Eisentraut <petere at debian.org>
-
-Upstream status: Specific to Debian, parts can be included
-
-Index: b/templates/DB_CONFIG.slapd.template.in
-===================================================================
---- a/templates/DB_CONFIG.slapd.template.in
-+++ b/templates/DB_CONFIG.slapd.template.in
-@@ -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>
-Index: b/templates/slapd.conf.template.in
-===================================================================
---- a/templates/slapd.conf.template.in
-+++ b/templates/slapd.conf.template.in
-@@ -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
- 
-@@ -31,7 +37,7 @@
- # or dynamically build.  When build dynamically the module must be loaded.
- # As the slapd that comes with the openpkg version of kolab is statically
- # build it is not necessary to load the module.
--# moduleload syncprov
-+moduleload syncprov
- @@@else@@@
- replica-pidfile	@ldapserverslurpd_pidfile@
- replogfile      @ldapserver_replogfile@

Modified: kolabd/trunk/debian/patches/91-postfix-template.diff
===================================================================
--- kolabd/trunk/debian/patches/91-postfix-template.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/91-postfix-template.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -4,60 +4,60 @@
 
 Upstream status: Specific to Debian, parts can be included
 
-Index: b/templates/main.cf.template.in
+Index: b/templates/main.cf.template
 ===================================================================
---- a/templates/main.cf.template.in
-+++ b/templates/main.cf.template.in
+--- a/templates/main.cf.template
++++ b/templates/main.cf.template
 @@ -22,16 +22,6 @@
  message_size_limit = 20971520
  @@@endif@@@
  
 -#   paths
--command_directory = @sbindir@
--daemon_directory = @libexecdir@/postfix
--queue_directory = @emailserver_localstatedir@
+-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@
+-mail_owner= @@@emailserver_mail_owner@@@
+-setgid_group= @@@emailserver_setgid_grp@@@
+-default_privs= @@@emailserver_default_privs@@@
 -
  #   local host
  myhostname = @@@fqdnhostname@@@
  mydomain = @@@postfix-mydomain@@@
-Index: b/templates/master.cf.template.in
+Index: b/templates/master.cf.template
 ===================================================================
---- a/templates/master.cf.template.in
-+++ b/templates/master.cf.template.in
+--- a/templates/master.cf.template
++++ b/templates/master.cf.template
 @@ -1,6 +1,6 @@
  KOLAB_META_START
- TARGET=@emailserver_confdir@/master.cf
+ TARGET=@@@emailserver_confdir@@@/master.cf
 -PERMISSIONS=0640
 +PERMISSIONS=0644
- OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+ OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
+ RUNONCHANGE=@@@KOLABRC@@@ rc postfix reload
  KOLAB_META_END
- # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
-Index: b/templates/transport.template.in
+Index: b/templates/transport.template
 ===================================================================
---- a/templates/transport.template.in
-+++ b/templates/transport.template.in
+--- a/templates/transport.template
++++ b/templates/transport.template
 @@ -1,6 +1,6 @@
  KOLAB_META_START
- TARGET=@emailserver_confdir@/transport
+ TARGET=@@@emailserver_confdir@@@/transport
 -PERMISSIONS=0640
 +PERMISSIONS=0644
- OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
- RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/transport
+ OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
+ RUNONCHANGE=@@@sbindir@@@/postmap -o @@@emailserver_confdir@@@/transport
  KOLAB_META_END
-Index: b/templates/virtual.template.in
+Index: b/templates/virtual.template
 ===================================================================
---- a/templates/virtual.template.in
-+++ b/templates/virtual.template.in
+--- a/templates/virtual.template
++++ b/templates/virtual.template
 @@ -1,6 +1,6 @@
  KOLAB_META_START
- TARGET=@emailserver_confdir@/virtual
+ TARGET=@@@emailserver_confdir@@@/virtual
 -PERMISSIONS=0640
 +PERMISSIONS=0644
- OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
- RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/virtual
+ OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
+ RUNONCHANGE=@@@sbindir@@@/postmap -o @@@emailserver_confdir@@@/virtual
  KOLAB_META_END

Modified: kolabd/trunk/debian/patches/92-cyrus-template.diff
===================================================================
--- kolabd/trunk/debian/patches/92-cyrus-template.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/92-cyrus-template.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -2,11 +2,13 @@
  Goal: Make imapd.conf template consistent with kolab-cyrus-imapd package.
 Author: Peter Eisentraut <petere at debian.org>
 Last-Update: <2010-06-17>
---- kolabd-2.2.3-20091217.orig/templates/imapd.conf.template.in
-+++ kolabd-2.2.3-20091217/templates/imapd.conf.template.in
-@@ -3,88 +3,358 @@ TARGET=@imap_confdir@/imapd.conf
- PERMISSIONS=0640
- OWNERSHIP=@imap_usr@:@imap_grp@
+Index: kolabd-2.3.2-20110531/templates/imapd.conf.template
+===================================================================
+--- kolabd-2.3.2-20110531.orig/templates/imapd.conf.template	2010-11-25 10:42:40.000000000 +0100
++++ kolabd-2.3.2-20110531/templates/imapd.conf.template	2011-11-19 11:43:03.000000000 +0100
+@@ -4,93 +4,325 @@
+ OWNERSHIP=@@@imap_usr@@@:@@@imap_grp@@@
+ RUNONCHANGE=@@@KOLABRC@@@ rc imapd restart
  KOLAB_META_END
 -# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 -# (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
@@ -14,20 +16,17 @@
 -# 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/imapd.conf.template
+-@@@warning@@@
 -
--
 -#   Warning: Do not use a trailing slash in paths!
--configdirectory:        @imap_statedir@
--partition-default:      @imap_spool@
+-configdirectory:        @@@imap_statedir@@@
+-partition-default:      @@@imap_spool@@@
 -
 -allowusermoves:         0
 -admins:                 @@@cyrus-admins|join( )@@@
 -sasl_pwcheck_method:    saslauthd
 -sasl_mech_list: 	plain
--sendmail:               @sbindir@/sendmail
+-sendmail:               @@@sbindir@@@/sendmail
 -allowanonymouslogin:    no
 -allowplaintext:         yes
 -servername:             @@@fqdnhostname@@@
@@ -36,17 +35,80 @@
 -quotawarn:              @@@cyrus-quotawarn@@@
 -lmtp_over_quota_perm_failure: 1
 -timeout:                30
--sievedir:		@imap_sievedir@
--lmtpsocket: 		@emailserver_socket@
+-sievedir:		@@@imap_sievedir@@@
+-lmtpsocket: 		@@@emailserver_socket@@@
 -
 -allowapop:              no
+-
+-#tls_ca_file: 		@@@sysconfdir@@@/kolab/ca/cacert.pem
+-tls_cert_file: 		@@@sysconfdir@@@/kolab/cert.pem
+-tls_key_file: 		@@@sysconfdir@@@/kolab/key.pem
+-
+-altnamespace:           0
+-unixhierarchysep:       yes
+-lmtp_downcase_rcpt:	yes
+-username_tolower:       1
+-
+-hashimapspool:          yes
+-#the fulldirhash optimization requires the rehash utility and the compile time switch --enable-fulldirhash
+-#fulldirhash:           yes
+-
+-##virtdomains:            userid
+-
+-loginrealms:		@@@postfix-mydestination|join( )@@@
+-
+-# support for lookup of mailbox name from local LDAP server
+-ldap_uri:               @@@user_ldap_uri@@@
+-ldap_base:              @@@base_dn@@@ 
+-ldap_bind_dn:           @@@php_dn@@@
+-ldap_password:          @@@php_pw@@@
+-ldap_time_limit:        15
+-
+-virtdomains:            ldap
+-
+-## Murder slave setup
+-#mupdate_server:         XXX
+-#mupdate_port:           3905
+-#mupdate_authname:       manager
+-#mupdate_password:       xxx
+-
+-# add support for posting to shared folders
+-postuser: kolab
+-userprefix: user
+-sharedprefix: shared
+-
+-# add support for sieve based notifications
+-notifysocket: @@@imap_notify_socket@@@
+-sievenotifier: mailto
+-mailnotifier: mailto
+-
+-# the sieve extensions that should be enabled on the server
+-sieve_extensions: fileinto reject vacation imapflags notify include envelope body relational regex subaddress copy
+-
+-# Uncomment to use berkeley db backend instead of skiplist:
+-#annotation_db: berkeley
+-#mboxlist_db: berkeley
+-
+-# Don't discard emails with identical message-id header (enabled by default):
+-duplicatesuppression: 0
+-
+-# The interval (in seconds) for polling the mailbox for changes while running the IDLE command.
+-# This option is used when  idled  can not be contacted or when polling is used exclusively.
+-# The minimum value is 1.  A value of 0 will disable polling (and disable IDLE if polling is
+-# the only method available).
+-imapidlepoll: 5
 +# Debian Cyrus imapd.conf
-+# $Id: imapd.conf 565 2006-08-14 16:51:28Z sven $
 +# See imapd.conf(5) for more information and more options
-+
+ 
+-# Load definitions for vendor annotations
+-annotation_definitions: @@@imap_confdir@@@/imapd.annotation_definitions
 +# Configuration directory
 +configdirectory: /var/lib/cyrus
 +
++# Directories for proc and lock files
++proc_path: /run/cyrus/proc
++mboxname_lockpath: /run/cyrus/lock
++
 +# Which partition to use for default mailboxes
 +defaultpartition: default
 +partition-default: /var/spool/cyrus/mail
@@ -57,7 +119,7 @@
 +
 +# Alternate namespace
 +# If enabled, activate the alternate namespace as documented in
-+# /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html, where an user's
++# /usr/share/doc/cyrus-doc-2.4/html/altnamespace.html, where an user's
 +# subfolders are in the same level as the INBOX
 +# See also userprefix and sharedprefix on imapd.conf(5)
 +altnamespace: no
@@ -67,7 +129,7 @@
 +# slash "/" to delimit levels of the hierarchy. This is done by converting
 +# internally all dots to "^", and all "/" to dots. So the "rabbit.holes"
 +# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes"
-+unixhierarchysep: yes
++unixhierarchysep: no
 +
 +# Rejecting illegal characters in headers
 +# Headers of RFC2882 messages must not have characters with the 8th bit
@@ -84,7 +146,7 @@
 +#munge8bit: no
 +
 +# Forcing recipient user to lowercase
-+# Cyrus 2.2 is case-sensitive.  If all your mail users are in lowercase, it is
++# Cyrus IMAPD is case-sensitive.  If all your mail users are in lowercase, it is
 +# probably a very good idea to set lmtp_downcase_rcpt to true.  This is set by 
 +# default, per RFC2821. This was not set by default in debian versions up to
 +# and including 2.2.12-4.
@@ -92,7 +154,7 @@
 +
 +# Uncomment the following and add the space-separated users who 
 +# have admin rights for all services.
-+admins: @@@cyrus-admins@@@
++#admins: cyrus
 +
 +# Space-separated list of users that have lmtp "admin" status (i.e. that
 +# can deliver email through TCP/IP lmtp). If specified, this parameter
@@ -123,15 +185,12 @@
 +allowanonymouslogin: no
 +
 +# Minimum time between POP mail fetches in minutes
-+# kolab note: this is disabled to get no errors at the client
-+# in a groupware environment a client will connect more than
-+# once in a minute
-+#popminpoll: 1
++popminpoll: 1
 +
 +# If nonzero, normal users may create their own IMAP accounts by creating
 +# the mailbox INBOX.  The user's quota is set to the value if it is positive,
 +# otherwise the user has unlimited quota.
-+autocreatequota: @@@cyrus-autocreatequota@@@
++autocreatequota: 0
 +
 +# umask used by Cyrus programs
 +umask: 077
@@ -145,30 +204,19 @@
 +# If enabled, cyrdeliver will look for Sieve scripts in user's home
 +# directories: ~user/.sieve.
 +sieveusehomedir: false
- 
--#tls_ca_file: 		@sysconfdir@/kolab/server.pem
--tls_cert_file: 		@sysconfdir@/kolab/cert.pem
--tls_key_file: 		@sysconfdir@/kolab/key.pem
++
 +# If sieveusehomedir is false, this directory is searched for Sieve scripts.
 +sievedir: /var/spool/sieve
- 
--altnamespace:           0
--unixhierarchysep:       yes
--lmtp_downcase_rcpt:	yes
--username_tolower:       1
++
 +# notifyd(8) method to use for "MAIL" notifications.  If not set, "MAIL"
 +# notifications are disabled.  Valid methods are: null, log, zephyr
-+mailnotifier: mailto
- 
--hashimapspool:          yes
--#the fulldirhash optimization requires the rehash utility and the compile time switch --enable-fulldirhash
--#fulldirhash:           yes
++#mailnotifier: zephyr
++
 +# notifyd(8) method to use for "SIEVE" notifications.  If not set, "SIEVE"
 +# notifications are disabled.  This method is only used when no method is
 +# specified in the script.  Valid methods are null, log, zephyr, mailto
-+sievenotifier: mailto
- 
--##virtdomains:            userid
++#sievenotifier: zephyr
++
 +# DRAC (pop-before-smtp, imap-before-smtp) support
 +# Set dracinterval to the time in minutes to call DRAC while a user is
 +# connected to the imap/pop services. Set to 0 to disable DRAC (default)
@@ -188,7 +236,7 @@
 +# (you need to uncomment this if you are not using an auxprop-based SASL
 +# mechanism.  saslauthd users, that means you!). And pay attention to
 +# sasl_minimum_layer and allowapop below, too.
-+sasl_mech_list: PLAIN
++#sasl_mech_list: PLAIN
 +
 +# Allow use of the POP3 APOP authentication command.
 +# Note that this command requires that the plaintext passwords are 
@@ -213,7 +261,7 @@
 +# NOTE: To support multiple virtual domains on the same interface/IP,
 +# you need to list them all as loginreals. If you don't list them here,
 +# (most of) your users probably won't be able to log in.
-+loginrealms: @@@postfix-mydomain@@@ @@@postfix-mydestination|join( )@@@
++#loginrealms: example.com
 +
 +# Enable virtual domain support.  If enabled, the user's domain will
 +# be determined by splitting a fully qualified userid at the last '@'
@@ -222,8 +270,7 @@
 +# a reverse lookup on the IP address of the incoming network
 +# interface, otherwise the user is assumed to be in the default
 +# domain (if set).
-+# Kolab uses ldap for virtual domains
-+virtdomains: ldap
++#virtdomains: userid
 +
 +# The default domain for virtual domain support
 +# If the domain of a user can't be taken from its login and it can't
@@ -242,7 +289,7 @@
 +#
 +# Do note that, since sasl will be run as user cyrus, you may have a lot of
 +# trouble to set this up right.
-+sasl_pwcheck_method: saslauthd
++sasl_pwcheck_method: auxprop
 +
 +# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop
 +# by default, all plugins are tried (which is probably NOT what you want).
@@ -258,10 +305,10 @@
 +
 +# File containing the global certificate used for ALL services (imap, pop3,
 +# lmtp, sieve)
-+tls_cert_file: @sysconfdir@/kolab/cert.pem
++#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
 +
 +# File containing the private key belonging to the global server certificate.
-+tls_key_file: @sysconfdir@/kolab/key.pem
++#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
 +
 +# File containing the certificate used for imap. If not specified, the global
 +# certificate is used.  A value of "disabled" will disable SSL/TLS for imap.
@@ -300,7 +347,7 @@
 +#sieve_tls_key_file: /etc/ssl/private/cyrus-sieve.key
 +
 +# File containing one or more Certificate Authority (CA) certificates.
-+#tls_ca_file: @sysconfdir@/kolab/server.pem
++#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
 +
 +# Path to directory with certificates of CAs.
 +tls_ca_path: /etc/ssl/certs
@@ -351,14 +398,6 @@
 +# Unix domain socket that lmtpd listens on.
 +lmtpsocket: /var/run/cyrus/socket/lmtp
 +
-+# The idle backend to use for IDLE command.
-+# Options: poll (default), idled, no
-+# poll doesn't need the idled daemon and is supposed to be more robust.
-+# however it doesn't update as quickly as the idled backend does. "no"
-+# turns off IDLE support. If set to "idled", you will also need to enable
-+# the "idled" entry in cyrus.conf.
-+idlemethod: poll
-+
 +# Unix domain socket that idled listens on.
 +idlesocket: /var/run/cyrus/socket/idle
 +
@@ -371,7 +410,7 @@
 +##
 +## DEBUGGING
 +##
-+# Debugging hook. See /usr/share/doc/kolab-cyrus-common/README.Debian.debug
++# Debugging hook. See /usr/share/doc/cyrus-common-2.4/README.Debian.debug
 +# Keep the hook disabled when it is not in use
 +#
 +# gdb Back-traces
@@ -382,61 +421,3 @@
 +#
 +# library traces
 +#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
-+
-+##
-+## Kolab-specific additions
-+##
- 
--loginrealms:		@@@postfix-mydestination|join( )@@@
-+servername: @@@fqdnhostname@@@
-+quotawarn: @@@cyrus-quotawarn@@@
-+lmtp_over_quota_perm_failure: 1
- 
- # support for lookup of mailbox name from local LDAP server
--ldap_uri:               @@@user_ldap_uri@@@
--ldap_base:              @@@base_dn@@@ 
--ldap_bind_dn:           @@@php_dn@@@
--ldap_password:          @@@php_pw@@@
--ldap_time_limit:        15
--
--virtdomains:            ldap
--
--## Murder slave setup
--#mupdate_server:         XXX
--#mupdate_port:           3905
--#mupdate_authname:       manager
--#mupdate_password:       xxx
-+ldap_uri:		@@@user_ldap_uri@@@
-+ldap_base:		@@@base_dn@@@
-+ldap_bind_dn:		@@@php_dn@@@
-+ldap_password:		@@@php_pw@@@
-+ldap_time_limit:	15
- 
- # add support for posting to shared folders
- postuser: kolab
- userprefix: user
- sharedprefix: shared
- 
--# add support for sieve based notifications
--notifysocket: @imap_notify_socket@
--sievenotifier: mailto
--mailnotifier: mailto
--
--# the sieve extensions that should be enabled on the server
--sieve_extensions: fileinto reject vacation imapflags notify include envelope body relational regex subaddress copy
--
--# Uncomment to use berkeley db backend instead of skiplist:
--#annotation_db: berkeley
--#mboxlist_db: berkeley
--
- # Don't discard emails with identical message-id header (enabled by default):
- duplicatesuppression: 0
- 
-@@ -93,6 +363,3 @@ duplicatesuppression: 0
- # The minimum value is 1.  A value of 0 will disable polling (and disable IDLE if polling is
- # the only method available).
- imapidlepoll: 5
--
--# Load definitions for vendor annotations
--annotation_definitions: @imap_confdir@/imapd.annotation_definitions
-

Modified: kolabd/trunk/debian/patches/93-amavisd-template.diff
===================================================================
--- kolabd/trunk/debian/patches/93-amavisd-template.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/93-amavisd-template.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -4,18 +4,20 @@
 Author: Mathieu Parent <math.parent at gmail.com>
 Bug-Debian: http://bugs.debian.org/499094
 Last-Update: <2008-11-12>
---- kolabd-2.2.3-20091217.orig/templates/amavisd.conf.template.in
-+++ kolabd-2.2.3-20091217/templates/amavisd.conf.template.in
+Index: kolabd-2.3.2-20110531/templates/amavisd.conf.template
+===================================================================
+--- kolabd-2.3.2-20110531.orig/templates/amavisd.conf.template	2010-11-25 10:42:40.000000000 +0100
++++ kolabd-2.3.2-20110531/templates/amavisd.conf.template	2011-11-19 11:51:29.000000000 +0100
 @@ -1,1523 +1,19 @@
  KOLAB_META_START
--TARGET=@amavisd_conffile@
+-TARGET=@@@amavisd_conffile@@@
 +TARGET=/etc/amavis/conf.d/40-kolab
  PERMISSIONS=0640
--OWNERSHIP=@amavisd_usr@:@amavisd_grp@
+-OWNERSHIP=@@@amavisd_usr@@@:@@@amavisd_grp@@@
 +OWNERSHIP=root:root
+ RUNONCHANGE=@@@KOLABRC@@@ rc amavisd restart
  KOLAB_META_END
- # this file is automatically written by the Kolab config backend
- # manual additions are lost unless made to the template in the Kolab config directory
+ @@@warning@@@
  
  use strict;
  
@@ -77,7 +79,7 @@
 -
 -# $MYHOME serves as a quick default for some other configuration settings.
 -# More refined control is available with each individual setting further down.
--$MYHOME = '@amavisd_home@';
+-$MYHOME = '@@@amavisd_home@@@';
 -
 -# $mydomain serves as a quick default for some other configuration settings.
 -# More refined control is available with each individual setting further down.
@@ -89,14 +91,14 @@
 -
 -# Set the user and group to which the daemon will change if started as root
 -# (otherwise just keeps the UID unchanged, and these settings have no effect):
--$daemon_user  = q{@amavisd_rusr@};	# (no default;  customary: vscan or amavis)
--$daemon_group = q{@amavisd_grp@};	# (no default;  customary: vscan or amavis)
+-$daemon_user  = q{@@@amavisd_rusr@@@};	# (no default;  customary: vscan or amavis)
+-$daemon_group = q{@@@amavisd_grp@@@};	# (no default;  customary: vscan or amavis)
 -
 -# Runtime working directory (cwd), and a place where
 -# temporary directories for unpacking mail are created.
 -# (no trailing slash, may be a scratch file system)
 -$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is)
--#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir @amavisd_home@ clean?
+-#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir @@@amavisd_home@@@ clean?
 -
 -# $helpers_home sets environment variable HOME, and is passed as option
 -# 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
@@ -128,19 +130,19 @@
 -# SENDMAIL MILTER, using amavis-milter.c helper program:
 -#$forward_method = undef;  # no explicit forwarding, sendmail does it by itself
 -# milter; option -odd is needed to avoid deadlocks
--#$notify_method = 'pipe:flags=q argv=@sbindir@/sendmail -Ac -i -odd -f ${sender} -- ${recipient}';
+-#$notify_method = 'pipe:flags=q argv=@@@sbindir@@@/sendmail -Ac -i -odd -f ${sender} -- ${recipient}';
 -# just a thought: can we use use -Am instead of -odd ?
 -
 -# SENDMAIL (old non-milter setup, as relay):
--#$forward_method = 'pipe:flags=q argv=@sbindir@/sendmail -C at sysconfdir@/sendmail.orig.cf -i -f ${sender} -- ${recipient}';
+-#$forward_method = 'pipe:flags=q argv=@@@sbindir@@@/sendmail -C@@@sysconfdir@@@/sendmail.orig.cf -i -f ${sender} -- ${recipient}';
 -#$notify_method = $forward_method;
 -
 -# SENDMAIL (old non-milter setup, amavis.c calls local delivery agent):
 -#$forward_method = undef;  # no explicit forwarding, amavis.c will call LDA
--#$notify_method = 'pipe:flags=q argv=@sbindir@/sendmail -Ac -i -f ${sender} -- ${recipient}';
+-#$notify_method = 'pipe:flags=q argv=@@@sbindir@@@/sendmail -Ac -i -f ${sender} -- ${recipient}';
 -
 -# EXIM v3 (not recommended with v4 or later, which can use SMTP setup instead):
--#$forward_method = 'pipe:flags=q argv=@sbindir@/exim -oMr scanned-ok -i -f ${sender} -- ${recipient}';
+-#$forward_method = 'pipe:flags=q argv=@@@sbindir@@@/exim -oMr scanned-ok -i -f ${sender} -- ${recipient}';
 -#$notify_method = $forward_method;
 -
 -# prefer to collect mail for forwarding as BSMTP files?
@@ -207,7 +209,7 @@
 -# directly, or read from a file, one domain per line; comments and empty lines
 -# are ignored, a dot before a domain name implies its subdomains:
 -#
--#read_hash(\%local_domains, '@amavisd_home@/local_domains');
+-#read_hash(\%local_domains, '@@@amavisd_home@@@/local_domains');
 -
 -#or alternatively(B), using a list of regular expressions:
 -# $local_domains_re = new_RE( qr'[@.]example\.com$'i );
@@ -295,7 +297,7 @@
 -#$SYSLOG_LEVEL = 'user.info';     # (facility.priority, default 'mail.info')
 -
 -# Log file (if not using syslog)
--$LOGFILE = "@amavisd_logfile@"; # (defaults to empty, no log)
+-$LOGFILE = "@@@amavisd_logfile@@@"; # (defaults to empty, no log)
 -
 -#NOTE: levels are not strictly observed and are somewhat arbitrary
 -# 0: startup/exit/failure messages, viruses detected
@@ -343,18 +345,18 @@
 -# or later; second argument is ignored otherwise. See PerlIO::encoding,
 -# Encode::PerlIO and perluniintro man pages.
 -#
--# $notify_sender_templ      = read_text('@amavisd_home@/notify_sender.txt');
--# $notify_virus_sender_templ= read_text('@amavisd_home@/notify_virus_sender.txt');
--# $notify_virus_admin_templ = read_text('@amavisd_home@/notify_virus_admin.txt');
--# $notify_virus_recips_templ= read_text('@amavisd_home@/notify_virus_recips.txt');
--# $notify_spam_sender_templ = read_text('@amavisd_home@/notify_spam_sender.txt');
--# $notify_spam_admin_templ  = read_text('@amavisd_home@/notify_spam_admin.txt');
+-# $notify_sender_templ      = read_text('@@@amavisd_home@@@/notify_sender.txt');
+-# $notify_virus_sender_templ= read_text('@@@amavisd_home@@@/notify_virus_sender.txt');
+-# $notify_virus_admin_templ = read_text('@@@amavisd_home@@@/notify_virus_admin.txt');
+-# $notify_virus_recips_templ= read_text('@@@amavisd_home@@@/notify_virus_recips.txt');
+-# $notify_spam_sender_templ = read_text('@@@amavisd_home@@@/notify_spam_sender.txt');
+-# $notify_spam_admin_templ  = read_text('@@@amavisd_home@@@/notify_spam_admin.txt');
 -
 -# If notification template files are collectively available in some directory,
 -# use read_l10n_templates which calls read_text for each known template.
 -#
--read_l10n_templates('@amavisd_templatedir@/en_US');
--#read_l10n_templates('@amavisd_templatedir@/de');
+-read_l10n_templates('@@@amavisd_templatedir@@@/en_US');
+-#read_l10n_templates('@@@amavisd_templatedir@@@/de');
 -
 -
 -# Here is an overall picture (sequence of events) of how pieces fit together
@@ -469,7 +471,7 @@
 -#   qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i,
 -#   qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i,
 -#   qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i,
--#   qr'@mm|@MM',    # mass mailing viruses as labeled by f-prot and @bindir@/uvscan
+-#   qr'@mm|@MM',    # mass mailing viruses as labeled by f-prot and @@@bindir@@@/uvscan
 -#   qr'Worm'i,      # worms as labeled by ClamAV, Kaspersky, etc
 -#   [qr'^(EICAR|Joke\.|Junk\.)'i         => 0],
 -#   [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i  => 0],
@@ -549,7 +551,7 @@
 -#   or a directory (no trailing slash)
 -#   (the default value is undef, meaning no quarantine)
 -#
--$QUARANTINEDIR = '@amavisd_home@/virusmails';
+-$QUARANTINEDIR = '@@@amavisd_home@@@/virusmails';
 -
 -#$virus_quarantine_method = "local:virus-%i-%n";    # default
 -#$spam_quarantine_method  = "local:spam-%b-%i-%n";  # default
@@ -981,7 +983,7 @@
 -# a hash lookup table can be read from a file,
 -# one address per line, comments and empty lines are permitted:
 -#
--# read_hash(\%whitelist_sender, '@amavisd_home@/whitelist_sender');
+-# read_hash(\%whitelist_sender, '@@@amavisd_home@@@/whitelist_sender');
 -
 -# ... or set directly:
 -
@@ -1032,7 +1034,7 @@
 -#$per_recip_whitelist_sender_lookup_tables = {
 -# 'user at my.example.com' => [qw( friend at example.org .other.example.org )],
 -# '.my1.example.com'    => [qw( !foe.other.example,org .other.example,org )],
--# '.my2.example.com'    => read_hash('@amavisd_home@/my2-wl.dat'),
+-# '.my2.example.com'    => read_hash('@@@amavisd_home@@@/my2-wl.dat'),
 -# 'abuse@' => { 'postmaster@'=>1,
 -#               'cert-advisory-owner at cert.org'=>1, 'owner-alert at iss.net'=>1 },
 -#};
@@ -1088,7 +1090,7 @@
 -# NOTE: if $daemon_chroot_dir is nonempty, the directories will be
 -#       relative to the chroot directory specified;
 -
--$path = '@sbindir@:@bindir@:/usr/sbin:/sbin:/usr/bin:/bin';
+-$path = '@@@sbindir@@@:@@@bindir@@@:/usr/sbin:/sbin:/usr/bin:/bin';
 -
 -# Specify one string or a search list of strings (first match wins).
 -# The string (or: each string in a list) may be an absolute path,
@@ -1207,7 +1209,7 @@
 -#   comment out its entry or use undef or '' as its program name/path
 -#   (second parameter). An example where this is almost a must: disable
 -#   Sophos 'sweep' if you have its daemonized version Sophie or SAVI-Perl
--#   (same for Trophie/vscan, and clamd/@bindir@/clamscan), or if another unrelated
+-#   (same for Trophie/vscan, and clamd/@@@bindir@@@/clamscan), or if another unrelated
 -#   program happens to have a name matching one of the entries ('sweep'
 -#   again comes to mind);
 -#
@@ -1233,7 +1235,7 @@
 -
 - ### http://www.clamav.net/
 - ['Clam Antivirus-clamd',
--   \&ask_daemon, ["CONTSCAN {}\n", "@clamav_socket@"],
+-   \&ask_daemon, ["CONTSCAN {}\n", "@@@clamav_socket@@@"],
 -   qr/\bOK$/, qr/\bFOUND$/,
 -   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
 - # NOTE: run clamd under the same user as amavisd;  match the socket
@@ -1290,12 +1292,12 @@
 -    "-f=$TEMPBASE {}", [0,8,16,24], [2,3,4,5,6, 18,19,20,21,22],
 -    qr/infected: ([^\r\n]+)/ ],
 -    # change the startup-script in /etc/init.d/kavd to:
--    #   DPARMS="-* -Y -dl -f=@amavisd_home@ @amavisd_home@"
--    #   (or perhaps:   DPARMS="-I0 -Y -* @localstatedir@/amavis" )
--    # adjusting @localstatedir@/amavis above to match your $TEMPBASE.
--    # The '-f=@amavisd_home@' is needed if not running it as root, so it
+-    #   DPARMS="-* -Y -dl -f=@@@amavisd_home@@@ @@@amavisd_home@@@"
+-    #   (or perhaps:   DPARMS="-I0 -Y -* @@@localstatedir@@@/amavis" )
+-    # adjusting @@@localstatedir@@@/amavis above to match your $TEMPBASE.
+-    # The '-f=@@@amavisd_home@@@' is needed if not running it as root, so it
 -    # can find, read, and write its pid file, etc., see 'man kavdaemon'.
--    # defUnix.prf: there must be an entry "*@localstatedir@/amavis" (or whatever
+-    # defUnix.prf: there must be an entry "*@@@localstatedir@@@/amavis" (or whatever
 -    #   directory $TEMPBASE specifies) in the 'Names=' section.
 -    # cd /opt/AVP/DaemonClients; configure; cd Sample; make
 -    # cp AvpDaemonClient /opt/AVP/
@@ -1398,7 +1400,7 @@
 -# # (btw, assigning stdin to /dev/null causes RAV to fail)
 -
 -  ### http://www.nai.com/
--  ['NAI McAfee AntiVirus (@bindir@/uvscan)', '@bindir@/uvscan',
+-  ['NAI McAfee AntiVirus (@@@bindir@@@/uvscan)', '@@@bindir@@@/uvscan',
 -    '--secure -rv --mime --summary --noboot - {}', [0], [13],
 -    qr/(?x) Found (?:
 -        \ the\ (.+)\ (?:virus|trojan)  |
@@ -1457,7 +1459,7 @@
 - at av_scanners_backup = (
 -
 -  ### http://www.clamav.net/
--  ['Clam Antivirus - @bindir@/clamscan', '@bindir@/clamscan',
+-  ['Clam Antivirus - @@@bindir@@@/clamscan', '@@@bindir@@@/clamscan',
 -    '--stdout --no-summary -r {}', [0], [1],
 -    qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
 -
@@ -1538,5 +1540,4 @@
 -
 -
 -#-------------
--1;  # insure a defined return
-+1;
+ 1;  # insure a defined return

Modified: kolabd/trunk/debian/patches/94-cyrus-template.diff
===================================================================
--- kolabd/trunk/debian/patches/94-cyrus-template.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/94-cyrus-template.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -7,13 +7,11 @@
 
 Upstream status: Parts can be commited
 
-Index: kolabd-2.2.4-20100624/templates/cyrus.conf.template.in
-===================================================================
---- kolabd-2.2.4-20100624.orig/templates/cyrus.conf.template.in	2010-09-23 12:25:28.000000000 +0200
-+++ kolabd-2.2.4-20100624/templates/cyrus.conf.template.in	2010-09-23 12:27:51.000000000 +0200
-@@ -3,66 +3,107 @@
- PERMISSIONS=0640
- OWNERSHIP=@imap_usr@:@imap_grp@
+--- a/templates/cyrus.conf.template
++++ b/templates/cyrus.conf.template
+@@ -4,64 +4,107 @@ PERMISSIONS=0640
+ OWNERSHIP=@@@imap_usr@@@:@@@imap_grp@@@
+ RUNONCHANGE=@@@KOLABRC@@@ rc imapd reload
  KOLAB_META_END
 -# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 -# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
@@ -21,9 +19,7 @@
 -# 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
--
+-@@@warning@@@
 +# Debian defaults for Cyrus IMAP server/cluster implementation
 +# see cyrus.conf(5) for more information
 +#
@@ -35,19 +31,19 @@
 -  recover	cmd="ctl_cyrusdb -r"
 +	# do not delete this entry!
 +	recover		cmd="/usr/sbin/ctl_cyrusdb -r"
- 
--  # this is only necessary if using idled for IMAP IDLE
--  #idled		cmd="idled"
++
 +	# this is only necessary if idlemethod is set to "idled" in imapd.conf
 +	#idled		cmd="idled"
  
--  # Initial mupdate syncronisation
--  #mupdatepush   cmd="ctl_mboxlist -m"
+-  # this is only necessary if using idled for IMAP IDLE
+-  #idled		cmd="idled"
 +	# this is useful on backend nodes of a Murder cluster
 +	# it causes the backend to syncronize its mailbox list with
 +	# the mupdate master upon startup
 +	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
-+
+ 
+-  # Initial mupdate syncronisation
+-  #mupdatepush   cmd="ctl_mboxlist -m"
 +	# this is recommended if using duplicate delivery suppression
 +	delprune	cmd="/usr/sbin/cyr_expire -E 3"
 +	# this is recommended if caching TLS sessions
@@ -63,23 +59,23 @@
 +	# --- Normal cyrus spool, or Murder backends ---
 +	# add or remove based on preferences
  @@@if cyrus-imap@@@
--  imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:143" prefork=0
-+	imap		cmd="imapd -C @imap_confdir@/imapd.conf -U 30" listen="@@@bind_addr@@@:imap" prefork=0 maxchild=100
+-  imap cmd="imapd -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:143" prefork=0
++	imap		cmd="imapd -C @@@imap_confdir@@@/imapd.conf -U 30" listen="@@@bind_addr@@@:imap" prefork=0 maxchild=100
  @@@else@@@
--  imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="@@@local_addr@@@:143" prefork=0
-+	imap		cmd="imapd -C @imap_confdir@/imapd.conf -U 30" listen="@@@local_addr@@@:imap" prefork=0 maxchild=100
+-  imap cmd="imapd -C @@@imap_confdir@@@/imapd.conf" listen="@@@local_addr@@@:143" prefork=0
++	imap		cmd="imapd -C @@@imap_confdir@@@/imapd.conf -U 30" listen="@@@local_addr@@@:imap" prefork=0 maxchild=100
  @@@endif@@@
  @@@if cyrus-imaps@@@
--  imaps cmd="imapd -s -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:993" prefork=0
-+	imaps		cmd="imapd -s -C @imap_confdir@/imapd.conf -U 30" listen="@@@bind_addr@@@:imaps" prefork=0 maxchild=100
+-  imaps cmd="imapd -s -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:993" prefork=0
++	imaps		cmd="imapd -s -C @@@imap_confdir@@@/imapd.conf -U 30" listen="@@@bind_addr@@@:imaps" prefork=0 maxchild=100
  @@@endif@@@
  @@@if cyrus-pop3@@@
--  pop3 cmd="pop3d -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:110" prefork=0
-+	pop3		cmd="pop3d -C @imap_confdir@/imapd.conf -U 30" listen="@@@bind_addr@@@:pop3" prefork=0 maxchild=50
+-  pop3 cmd="pop3d -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:110" prefork=0
++	pop3		cmd="pop3d -C @@@imap_confdir@@@/imapd.conf -U 30" listen="@@@bind_addr@@@:pop3" prefork=0 maxchild=50
  @@@endif@@@
  @@@if cyrus-pop3s@@@
--  pop3s cmd="pop3d -s -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:995" prefork=0
-+	pop3s		cmd="pop3d -s -C @imap_confdir@/imapd.conf -U 30" listen="@@@bind_addr@@@:pop3s" prefork=0 maxchild=50
+-  pop3s cmd="pop3d -s -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:995" prefork=0
++	pop3s		cmd="pop3d -s -C @@@imap_confdir@@@/imapd.conf -U 30" listen="@@@bind_addr@@@:pop3s" prefork=0 maxchild=50
  @@@endif@@@
 +	#nntp		cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
 +	#nntps		cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100
@@ -87,32 +83,29 @@
 +	# At least one form of LMTP is required for delivery
 +	# (you must keep the Unix socket name in sync with imap.conf)
 +	lmtp		cmd="lmtpd -a" listen="@@@local_addr@@@:2003" prefork=0 maxchild=20
-+	lmtpunix	cmd="lmtpd" listen="@emailserver_socket@" prefork=0 maxchild=20
++	lmtpunix	cmd="lmtpd" listen="@@@emailserver_socket@@@" prefork=0 maxchild=20
 +	# ----------------------------------------------
 +
 +	# useful if you need to give users remote access to sieve
 +	# by default, we limit this to localhost in Debian
  @@@if cyrus-sieve@@@
--  sieve cmd="timsieved -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:2000" prefork=0
-+  	sieve		cmd="timsieved -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:sieve" prefork=0 maxchild=100
+-  sieve cmd="timsieved -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:2000" prefork=0
++  	sieve		cmd="timsieved -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:sieve" prefork=0 maxchild=100
  @@@endif@@@
  
 -#@@@if is-master@@@
 -#  mupdate       cmd="mupdate -m" listen=3905 prefork=1
 -#@@@endif@@@
--
--  # LMTP is required for delivery
--  lmtpunix	cmd="lmtpd" listen="@emailserver_socket@" prefork=0
--  lmtp          cmd="lmtpd -a" listen="@@@local_addr@@@:2003"
 +	# this one is needed for the notification services
-+	notify		cmd="notifyd" listen="@imap_notify_socket@" proto="udp" prefork=1
- 
--  # this is only necessary if using notifications
--  notifyd	cmd="notifyd" listen="@imap_notify_socket@" proto="udp" prefork=1
++	notify		cmd="notifyd" listen="@@@imap_notify_socket@@@" proto="udp" prefork=1
++
 +	# --- Murder frontends -------------------------
 +	# enable these and disable the matching services above,
 +	# except for sieve (which deals automatically with Murder)
-+
+ 
+-  # LMTP is required for delivery
+-  lmtpunix	cmd="lmtpd" listen="@@@emailserver_socket@@@" prefork=0
+-  lmtp          cmd="lmtpd -a" listen="@@@local_addr@@@:2003"
 +	# mupdate database service - must prefork at least 1
 +	#@@@if is-master@@@
 +	# (mupdate master, only one in the entire cluster)
@@ -121,7 +114,9 @@
 +	# (mupdate slaves)
 +	#mupdate       cmd="mupdate" listen=3905 prefork=1
 +	#@@@endif@@@
-+
+ 
+-  # this is only necessary if using notifications
+-  notifyd	cmd="notifyd" listen="@@@imap_notify_socket@@@" proto="udp" prefork=1
 +	# proxies that will connect to the backends
 +	#imap		cmd="proxyd" listen="imap" prefork=0 maxchild=100
 +	#imaps		cmd="proxyd -s" listen="imaps" prefork=0 maxchild=100

Deleted: kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff
===================================================================
--- kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,44 +0,0 @@
-Goal: kolab/issue1382 and kolab/issue2499
-
-Prepare kolabd for kolab/issue1382 (resmgr accepts concurrent overlapping
-invitations) and kolab/issue2499 (Notification messages by the resource
-manager sould be localized)
-
-Author: Gunnar Wrobel  <p at rdus.de>
-
-Upstream status: Already commit on TRUNK
-
-Index: b/templates/resmgr.conf.template.in
-===================================================================
---- a/templates/resmgr.conf.template.in
-+++ b/templates/resmgr.conf.template.in
-@@ -184,6 +184,17 @@
- //$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
- //$conf['kolab']['filter']['locale'] = 'de_DE';
- 
-+/* Uncomment if the resource manager should generate translated messages. */
-+//$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
-+//$conf['kolab']['filter']['locale'] = 'de_DE';
-+
-+/* Use locking for the resource manager? */
-+$conf['kolab']['filter']['simple_locks'] = true;
-+/* Timeout for the locks */
-+$conf['kolab']['filter']['simple_locks_timeout'] = 60;
-+/* Directory for storing the locks */
-+$conf['kolab']['filter']['simple_locks_dir'] = '@resmgr_locksdir@';
-+
- /* PHP error logging */
- $conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
- 
-Index: b/dist_conf/common
-===================================================================
---- a/dist_conf/common
-+++ b/dist_conf/common
-@@ -120,6 +120,7 @@
- 	-e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
- 	-e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
- 	-e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
-+	-e 's=[@]resmgr_locksdir[@]=$(resmgr_locksdir)=g' \
- 	-e 's=[@]resmgr_localedir[@]=$(resmgr_localedir)=g' \
- 	-e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
- 	-e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \

Deleted: kolabd/trunk/debian/patches/96-imap-user-group.diff
===================================================================
--- kolabd/trunk/debian/patches/96-imap-user-group.diff	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/96-imap-user-group.diff	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,24 +0,0 @@
-Goal: Change cyrus user and group in templates
-
-Correct permissions on /etc/imapd.group and other cyrus files
-(http://bugs.debian.org/581757)
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Already committed on TRUNK
-
-Index: kolabd-2.2.3-20091217/dist_conf/debian
-===================================================================
---- kolabd-2.2.3-20091217.orig/dist_conf/debian	2010-06-17 20:51:45.000000000 +0200
-+++ kolabd-2.2.3-20091217/dist_conf/debian	2010-06-17 20:52:02.000000000 +0200
-@@ -69,8 +69,8 @@
- 
- imap_confdir=${sysconfdir}
- imap_confperm=0640
--imap_usr=root
--imap_grp=root
-+imap_usr=cyrus
-+imap_grp=mail
- imap_masterlogfile=${localstatedir}/log/mail.log
- imap_misclogfile=${localstatedir}/log/mail.log
- imap_statedir=${localstatedir}/lib/cyrus

Modified: kolabd/trunk/debian/patches/series
===================================================================
--- kolabd/trunk/debian/patches/series	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/patches/series	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,10 +1,4 @@
-10-dist_conf.diff
-55-no-distconf_kolabsrv.diff
-70-kolab2.schema-removal.of.rfc2739.diff
-90-slapd-template.diff
 91-postfix-template.diff
 92-cyrus-template.diff
 93-amavisd-template.diff
 94-cyrus-template.diff
-95-resmgr-issue1383-issue2499.diff
-96-imap-user-group.diff

Deleted: kolabd/trunk/debian/rfc2739.schema
===================================================================
--- kolabd/trunk/debian/rfc2739.schema	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/rfc2739.schema	2011-11-19 12:10:39 UTC (rev 1558)
@@ -1,146 +0,0 @@
-# (c) 2004 Martin Konold <martin.konold at erfrakon.de>
-
-# This schema is derived from RFC 2739 and may act as a substitute
-# when used with OpenLDAP as the original schema from RFC 2739 
-# is syntactically not accepted by OpenLDAP 2.2.14
-#
-
-# The version of this file as distributed in the Kolab upstream packages
-# contains text claiming copyright by the Internet Society and including
-# the IETF RFC license, which does not meet Debian's Free Software
-# Guidelines.  However, apart from short and obvious comments, the text of
-# this file is purely a functional interface specification, which is not
-# subject to that license and is not copyrightable under US law.
-#
-# The license statement is retained below so as not to remove credit, but
-# as best as we can determine, it is not applicable to the contents of
-# this file.
-
-# Copyright (C) The Internet Society (2000).  All Rights Reserved.
-#
-#  This document and translations of it may be copied and furnished to
-#  others, and derivative works that comment on or otherwise explain it
-#  or assist in its implementation may be prepared, copied, published
-#  and distributed, in whole or in part, without restriction of any
-#  kind, provided that the above copyright notice and this paragraph are
-#  included on all such copies and derivative works.  However, this
-#  document itself may not be modified in any way, such as by removing
-#  the copyright notice or references to the Internet Society or other
-#  Internet organizations, except as needed for the purpose of
-#  developing Internet standards in which case the procedures for
-#  copyrights defined in the Internet Standards process must be
-#  followed, or as required to translate it into languages other than
-#  English.
-#
-#  The limited permissions granted above are perpetual and will not be
-#  revoked by the Internet Society or its successors or assigns.
-#
-#  This document and the information contained herein is provided on an
-#  "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
-#  TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-#  BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-#  HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-#  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-# slapd.conf then looks like
-#  include /kolab/etc/openldap/schema/core.schema
-#  include /kolab/etc/openldap/schema/cosine.schema
-#  include /kolab/local/etc/openldap/schema/inetorgperson.schema
-#  include /kolab/local/etc/openldap/schema/rfc2739.schema
-#  include /kolab/local/etc/openldap/schema/kolab2.schema
-
-#
-################################
-# rfc 2739 calendar attributes #
-################################
-
-# contains the URI to a snapshot of the user's entire
-# default calendar
-attributetype ( 1.2.840.113556.1.4.478
-  NAME 'calCalURI'
-  DESC 'RFC2739: URI of entire default calendar'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# contains the URI to the user's default
-# busy time data
-attributetype (1.2.840.113556.1.4.479
-  NAME 'calFBURL'
-  DESC 'RFC2739: URI to the users default freebusy data'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# contains a URI that can be used to communicate with 
-# the user's calendar
-attributetype (1.2.840.113556.1.4.480
-  NAME 'calCAPURI'
-  DESC 'RFC2739: URI used to communicate with the users calendar'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# contains a URI that points to the location to which event
-# requests should be sent for that user
-attributetype (1.2.840.113556.1.4.481
-  NAME 'calCalAdrURI'
-  DESC 'RFC2739: URI for event equests destination'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# multi-valued property containing URIs to snapshots of 
-# other calendars that the user may have
-attributetype (1.2.840.113556.1.4.482
-  NAME 'calOtherCalURIs'
-  DESC 'RFC2739: multi-value URI for snapshots of other calendars'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# multi-valued property containing URIs to snapshots of other 
-# free/busy data that the user may have
-attributetype (1.2.840.113556.1.4.483
-  NAME 'calOtherFBURLs'
-  DESC 'RFC2739: multi-value URI for other free/busy data'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# multi-valued property containing URI to other calendars that
-# the user may have
-attributetype (1.2.840.113556.1.4.484
-  NAME 'calOtherCAPURIs'
-  DESC 'RFC2739: multi-value URI to other calendars'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-#  URIs to other locations that a user may want
-#   event requests sent to
-attributetype (1.2.840.113556.1.4.485
-  NAME 'calOtherCalAdrURIs'
-  DESC 'RFC2739: multi-value URI to other request destinations'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-objectclass (1.2.840.113556.1.5.87
-  NAME 'calEntry'
-  DESC 'RFC2739: Calendar Entry'
-  SUP top AUXILIARY
-  MAY ( calCalURI $ 
-        calFBURL $
-        calOtherCalURIs $
-        calOtherFBURLs $
-        calCAPURI $
-        calOtherCAPURIs ) )

Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules	2011-06-25 14:08:49 UTC (rev 1557)
+++ kolabd/trunk/debian/rules	2011-11-19 12:10:39 UTC (rev 1558)
@@ -38,11 +38,9 @@
 
 	# Kolab bootstrapping templates
 	for i in templates/*.template ; do install -D -m 644 $$i debian/kolabd/etc/kolab/$$i ; done
-	rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* freshclam.* httpd.* session_vars.* local.cf.template)
+	rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* freshclam.* httpd.* local.cf.template)
 
 	# LDAP schemas
-	install -D -m 644 debian/rfc2739.schema debian/kolabd/etc/ldap/schema/rfc2739.schema
-	install -D -m 644 horde.schema debian/kolabd/etc/ldap/schema/horde.schema
 	install -D -m 644 kolab2.schema debian/kolabd/etc/ldap/schema/kolab2.schema
 
 	#apache config




More information about the pkg-kolab-devel mailing list