[pkg-kolab] r10 - in trunk/kolab-cyrus-imapd/debian: . patches

Steffen Joeris white-guest at costa.debian.org
Fri Dec 16 13:21:46 UTC 2005


Author: white-guest
Date: 2005-12-16 13:21:41 +0000 (Fri, 16 Dec 2005)
New Revision: 10

Added:
   trunk/kolab-cyrus-imapd/debian/arbitronsort.8
   trunk/kolab-cyrus-imapd/debian/changelog
   trunk/kolab-cyrus-imapd/debian/compat
   trunk/kolab-cyrus-imapd/debian/control
   trunk/kolab-cyrus-imapd/debian/copyright
   trunk/kolab-cyrus-imapd/debian/cyrdump.8
   trunk/kolab-cyrus-imapd/debian/cyrus.conf
   trunk/kolab-cyrus-imapd/debian/deletable.files
   trunk/kolab-cyrus-imapd/debian/executable.files
   trunk/kolab-cyrus-imapd/debian/imapd.conf
   trunk/kolab-cyrus-imapd/debian/kolab-cyradm-16x16.xpm
   trunk/kolab-cyrus-imapd/debian/kolab-cyradm-32x32.xpm
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.contrib
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.default
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.init
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.linda
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.manpages
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages
   trunk/kolab-cyrus-imapd/debian/patches/
   trunk/kolab-cyrus-imapd/debian/patches/00list
   trunk/kolab-cyrus-imapd/debian/patches/10-lib-Makefile.in.dpatch
   trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch
   trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch
   trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch
   trunk/kolab-cyrus-imapd/debian/patches/imapd.patch
   trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch
   trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in
   trunk/kolab-cyrus-imapd/debian/rules
Log:
* first historical upload of our kolab-cyrus-imap juhhhhhhuuuuuuuuu ;)
* please notice that i used the originial packaging
* there are many templates which need editing
* i have to comment changes in the changelog
* please comment all changes in the rules to see the differences
* test it there is still useless stuff i think



Added: trunk/kolab-cyrus-imapd/debian/arbitronsort.8
===================================================================
--- trunk/kolab-cyrus-imapd/debian/arbitronsort.8	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/arbitronsort.8	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,15 @@
+.TH ARBITRONSORT "8" "Project Cyrus" "CMU"
+.SH NAME
+arbitronsort \- sorts arbitron(8) output
+.SH SYNOPSIS
+.B 
+arbitronsort
+.SH DESCRIPTION
+.PP
+This tool takes the output of arbitron (run without the -o option)
+on stdin and prints out first a ranking of mailboxes by number of 
+people who selected the mailbox, and then a ranking of mailbox by
+number of subscribers.
+.SH SEE ALSO
+.PP
+\fBarbitron(8)\fR

Added: trunk/kolab-cyrus-imapd/debian/changelog
===================================================================
--- trunk/kolab-cyrus-imapd/debian/changelog	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/changelog	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,6 @@
+kolab-cyrus-imapd (2.2.12-1) experimental; urgency=low
+
+  * Initial Release
+
+ -- Steffen Joeris <steffen.joeris at skolelinux.de>  Mon, 12 Dec 2005 09:23:02 +0000
+

Added: trunk/kolab-cyrus-imapd/debian/compat
===================================================================
--- trunk/kolab-cyrus-imapd/debian/compat	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/compat	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+4

Added: trunk/kolab-cyrus-imapd/debian/control
===================================================================
--- trunk/kolab-cyrus-imapd/debian/control	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/control	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,84 @@
+Source: kolab-cyrus-imapd
+Section: mail
+Priority: extra
+Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
+Uploaders: Noel Koethe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
+Build-Depends: debhelper (>= 4.0.0), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, libsensors-dev, libdb4.4-dev, dpatch
+Build-Depends-Indep: transfig, gs, groff
+Standards-Version: 3.6.2
+
+Package: kolab-cyrus-common
+Architecture: any
+Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: cyrus21-common
+Replaces: cyrus21-common
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus22-common, cyrus21-common
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+
+Package: kolab-cyrus-doc
+Architecture: all
+Provides: cyrus21-docs, cyrus21-doc
+Replaces: cyrus21-docs, cyrus21-doc
+Conflicts: cyrus21-docs, cyrus21-doc
+Description:
+
+Package: kolab-cyrus-imapd
+Architecture: any
+Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: imap-server, cyrus21-imapd
+Replaces: cyrus21-imapd
+Conflicts: imap-server, cyrus21-imapd
+Description:
+
+Package: kolab-cyrus-pop3d
+Architecture: any
+Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: pop3-server, cyrus21-pop3d
+Replaces: cyrus21-pop3d
+Conflicts: pop3-server, cyrus21-pop3d
+Description:
+
+Package: kolab-cyrus-admin
+Architecture: all
+Depends: kolab-libcyrus-imap-perl (>= ${Source-Version})
+Suggests: sasl2-bin
+Provides: cyrus21-admin
+Replaces: cyrus21-admin
+Conflicts: cyrus-admin, cyrus21-admin
+Description:
+
+Package: kolab-cyrus-murder
+Architecture: any
+Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
+Recommends: kolab-cyrus-imapd (= ${Source-Version}), kolab-cyrus-pop3d (= ${Source-Version})
+Provides: cyrus21-murder
+Replaces: cyrus21-murder
+Conflicts: cyrus21-murder
+Description:
+
+Package: kolab-cyrus-clients
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: cyrus21-clients
+Replaces: cyrus21-clients
+Conflicts: cyrus21-clients
+Description:
+
+Package: kolab-cyrus-dev
+Architecture: any
+Section: devel
+Depends: kolab-libcyrus-imap-perl (>= ${Source-Version}), kolab-cyrus-common (= ${Source-Version}), libsasl2-dev (>= 2.1.9)
+Provides: cyrus21-dev
+Replaces: cyrus21-dev
+Conflicts: cyrus-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), cyrus21-dev, cyrus21-common, libcyrus-imap-perl21
+Description:
+
+Package: kolab-libcyrus-imap-perl
+Architecture: any
+Depends: ${perl:Depends}, ${shlibs:Depends}
+Provides: libcyrus-imap-perl, libcyrus-imap-perl21
+Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21
+Replaces: libcyrus-imap-perl, libcyrus-imap-perl21
+Section: perl
+Description:

Added: trunk/kolab-cyrus-imapd/debian/copyright
===================================================================
--- trunk/kolab-cyrus-imapd/debian/copyright	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/copyright	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,10 @@
+This package was debianized by Steffen Joeris <steffen.joeris at skolelinux.de> on
+Mon, 12 Dec 2005 09:23:02 +0000.
+
+It was downloaded from <fill in ftp site>
+
+Copyright Holder: <put author(s) name and email here>
+
+License:
+
+<Put the license of the package here>

Added: trunk/kolab-cyrus-imapd/debian/cyrdump.8
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrdump.8	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/cyrdump.8	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,16 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH CYRDUMP "1" "Project Cyrus" "CMU"
+.SH NAME
+cyrdump \- dump mailboxes to stdout
+.SH SYNOPSIS
+.B 
+cyrdump [-C <configfile>] [-v] [mboxpattern ...]
+.SH DESCRIPTION
+.PP
+A tool for dumping IMAP mailboxes on a server.
+.TP
+\fB\-C <configfile>\fR
+Specify an alternate configuration file ( is used by default)
+.TP
+\fB\-v\fR
+Increase program verbosity.

Added: trunk/kolab-cyrus-imapd/debian/cyrus.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus.conf	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/cyrus.conf	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,44 @@
+##
+##  @l_prefix@/etc/cyrus-imapd/cyrus.conf - Cyrus IMAP server configuration
+##
+
+START {
+    #   do not delete this entry!
+    recover  cmd="@l_prefix@/bin/ctl_cyrusdb  -r"
+
+#   #   this is only necessary if using idled for IMAP IDLE
+#   idled    cmd="idled"
+}
+
+SERVICES {
+    imap     cmd="imapd"    listen="localhost:imap"  prefork=0
+    imaps    cmd="imapd -s" listen="localhost:imaps" prefork=0
+    pop3     cmd="pop3d"    listen="localhost:pop3"  prefork=0
+    pop3s    cmd="pop3d -s" listen="localhost:pop3s" prefork=0
+
+    #   at least one LMTP is required for delivery
+    #   KEEP the unix socket name IN SYNC with imapd.conf
+    lmtp     cmd="lmtpd" listen="localhost:lmtp"                   prefork=0
+    lmtpunix cmd="lmtpd" listen="@l_prefix@/var/imapd/socket/lmtp" prefork=0
+
+#   #   useful if you need to give users remote access to sieve
+#   sieve    cmd="timsieved" listen="localhost:sieve" prefork=0
+
+#   #   this one is needed for the notification services
+#   notify   cmd="notifyd" listen="@l_prefix@/var/imapd/socket/notify" prefork=1 proto="udp"
+}
+
+EVENTS {
+    #   this is required
+    checkpoint cmd="@l_prefix@/bin/ctl_cyrusdb -c"   period=30
+
+    #   this is only necessary if using duplicate delivery suppression
+    delprune   cmd="@l_prefix@/bin/ctl_deliver -E 3" period=1440
+
+    #   this is only necessary if caching TLS sessions
+    tlsprune   cmd="@l_prefix@/bin/tls_prune"        period=1440
+
+    #   this is only necessary if using squatter, a mailbox indexer
+    squatter   cmd="@l_prefix@/bin/squatter -r -s user" period=1440
+}
+

Added: trunk/kolab-cyrus-imapd/debian/deletable.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/deletable.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/deletable.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,61 @@
+doc/man/arbitron.8.html
+doc/man/chk_cyrus.8.html
+doc/man/ctl_cyrusdb.8.html
+doc/man/ctl_deliver.8.html
+doc/man/ctl_mboxlist.8.html
+doc/man/cvt_cyrusdb.8.html
+doc/man/cyr_expire.8.html
+doc/man/cyrus.conf.5.html
+doc/man/deliver.8.html
+doc/man/fetchnews.8.html
+doc/man/fud.8.html
+doc/man/idled.8.html
+doc/man/imapd.8.html
+doc/man/imapd.conf.5.html
+doc/man/imclient.3.html
+doc/man/imtest.1.html
+doc/man/installsieve.1.html
+doc/man/ipurge.8.html
+doc/man/krb.equiv.5.html
+doc/man/lmtpd.8.html
+doc/man/lmtptest.1.html
+doc/man/master.8.html
+doc/man/mbexamine.8.html
+doc/man/mbpath.8.html
+doc/man/mupdatetest.1.html
+doc/man/nntpd.8.html
+doc/man/nntptest.1.html
+doc/man/notifyd.8.html
+doc/man/pop3d.8.html
+doc/man/pop3test.1.html
+doc/man/quota.8.html
+doc/man/reconstruct.8.html
+doc/man/rmnews.8.html
+doc/man/sivtest.1.html
+doc/man/smmapd.8.html
+doc/man/smtptest.1.html
+doc/man/squatter.8.html
+doc/man/syncnews.8.html
+doc/man/timsieved.8.html
+doc/man/tls_prune.8.html
+doc/man/cyradm.1.html
+doc/man/sieveshell.1.html
+doc/murder.png
+imap/imap_err.h
+imap/imap_err.c
+imap/lmtpstats.h
+imap/lmtpstats.c
+imap/pushstats.h
+imap/pushstats.c
+man/sieveshell.1
+sieve/addr.h
+sieve/addr-lex.c
+sieve/addr.c
+sieve/sieve.h
+sieve/sieve-lex.c
+sieve/sieve.c
+sieve/sieve_err.h
+sieve/sieve_err.c
+autom4te.cache/requests
+autom4te.cache/output.0
+autom4te.cache/traces.0

Added: trunk/kolab-cyrus-imapd/debian/executable.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/executable.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/executable.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,36 @@
+./install-sh
+./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+./contrib/cyrus-graphtools.1.0/script/cyrus.pl
+./contrib/cyrus-graphtools.1.0/script/run
+./contrib/mupdate-test.pl
+./contrib/notify_unix/sql_notify.pl
+./contrib/notify_unix/simple_notify.pl
+./doc/internal/internationalization.html
+./imap/xversion.sh
+./lib/test/run
+./makedepend/configure
+./makedepend/install-sh
+./netnews/inn.diffs
+./perl/imap/examples/test-imsp.pl
+./snmp/snmpgen
+./tools/mknewsgroups
+./tools/config2man
+./tools/arbitronsort.pl
+./tools/config2header
+./tools/dohash
+./tools/masssievec
+./tools/mkimap
+./tools/translatesieve
+./tools/not-mkdep
+./tools/mupdate-loadgen.pl
+./tools/rehash
+./tools/upgradesieve
+./tools/undohash
+./sieve/hmac-md5.h
+./configure.lineno
+./configure
+./debian/rules
+./autogen.sh
+./mkinstalldirs

Added: trunk/kolab-cyrus-imapd/debian/imapd.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/imapd.conf	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/imapd.conf	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,28 @@
+##
+##  imapd.conf -- IMAP daemon configuration
+##  Copyright (c) 2002-2003 Ralf S. Engelschall <rse at engelschall.com>
+##
+
+#   Warning: Do not use a trailing slash in paths!
+configdirectory:        @l_prefix@/var/imapd
+partition-default:      @l_prefix@/var/imapd/spool
+admins:                 @l_rusr@
+defaultacl:             @l_rusr@ lrswipcda
+sasl_pwcheck_method:    saslauthd
+sasl_mech_list:         PLAIN
+sendmail:               @l_prefix@/sbin/sendmail
+lmtpsocket:             @l_prefix@/var/imapd/socket/lmtp
+temp_path:              @l_prefix@/var/imapd/tmp
+unixhierarchysep:       yes
+#altnamespace:           yes
+allowanonymouslogin:    no
+allowplaintext:         yes
+allowusermoves:         no
+servername:             @l_hostname at .@l_domainname@
+autocreatequota:        10000
+reject8bit:             no
+quotawarn:              90
+timeout:                30
+defaultdomain:          @l_domainname@
+virtdomains:            on
+

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyradm-16x16.xpm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyradm-16x16.xpm	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyradm-16x16.xpm	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,45 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 23 1",
+"  c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"22111;1212211111",
+"211221213<121221",
+"2111212232<11122",
+"121121221<231<11",
+"2112232<34334112",
+"1112222243213212",
+";2221<11*&<<*<<1",
+"1221233323232231",
+"2233223333332&1<",
+"2213123333233*1*",
+"123312121222233*",
+"1233212<<213223<",
+"12331<1<<11<123*",
+"123333322222223*",
+"123223322222323*",
+"2<&%%%X%%%%X%%X%"
+};

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyradm-32x32.xpm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyradm-32x32.xpm	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyradm-32x32.xpm	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,61 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 23 1",
+"  c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"222111112;2112121222111112112121",
+"121112;2112211223+11212111121111",
+"221112222112111333+221121221112;",
+"2112111211222133333&12222;212222",
+"11111112212122333323$221+2121211",
+"212121112122333%3 332&41%1111121",
+";212112;22132233211%44443&112211",
+"2211222222233.3112344444442112;2",
+"11111211133321114444441444%22121",
+"1212222133311 444444*%4444%22212",
+"211112233111444444:4334%444%2111",
+";11222331 433223* 2332%322231112",
+"222213&&11&*&&%#%%# %&#%  #%&221",
+"12233343434444434444344444443311",
+"113&2&&&3333333333333332222333+2",
+"2133333333333333332333232X**23%o",
+"22344333333333232233222221#*24.%",
+"124#&34#&#333333333223323:.#24.%",
+"223333333333333333322332332224.%",
+"214333333323333323322222322224.X",
+"11333333 &23X&2&&3223223222234.X",
+"123334433333333333222232223234.%",
+"12333333&2X12X& &13X2322322134.%",
+"123333333233333332333222222224.X",
+"21333332&&&1&X2 3&&3X&&X222234.X",
+"213333333333323222222222222134.%",
+"123333333333332223322322222134.X",
+"113333233233232332232222322324.X",
+"223334434434444444434434444444.%",
+"12 .     .                    .X",
+"2112%%%%o%%X%%o%X%%%o%X%X%oXXo%%",
+"11121222122212122122122122222222"
+};

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, admin utilities
+$Id: cyrus21-admin.README.Debian,v 1.1 2003/03/04 13:13:29 hmh Exp $
+---------------------
+
+Refer to the cyrus21-doc package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/bin

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,3 @@
+usr/bin/cyradm
+usr/bin/sieveshell
+usr/share/icons/*

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,2 @@
+Tag: interp-minus-n-fails
+Data: usr/bin/cyradm

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+kolab-cyrus-admin: shell-script-fails-syntax-check ./usr/bin/cyradm

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,2 @@
+man/sieveshell.1
+perl/imap/blib/man1/cyradm.1p

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,6 @@
+?package(kolab-cyrus-admin):needs="text" section="Apps/System/Admin"\
+	hints="Mail,Admin,Cyrus"\
+	title="Cyrus 2.1 cyradm (cyrus at localhost)"\
+	longtitle="Administer local Cyrus IMAPd 2.1 accounts as user cyrus"\
+	icon="/usr/share/icons/kolab-cyradm.xpm"\
+	command="/usr/bin/cyradm --user cyrus localhost"

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, generic SASL-enabled protocol clients
+$Id: cyrus21-clients.README.Debian,v 1.1 2003/03/04 13:13:29 hmh Exp $
+---------------------
+
+Refer to the cyrus21-doc package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/bin

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+man/*test.1

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.contrib
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.contrib	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.contrib	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,7 @@
+contrib/cyrus-graphtools.1.0
+contrib/fud-client.c
+contrib/README
+contrib/sieve-spamasssassin
+contrib/squatrunner.pl
+contrib/squatrunner.txt
+contrib/add-cyrus-user

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Cyrus IMAPd daily maintenance script
+# Copyright (c) 2002,2003 by Henrique M. Holschuh
+# Distributed under the terms of the GNU General Public License version 2
+# $Id: cyrus21-common.cron.daily,v 1.4 2004/08/10 15:09:38 hmh Exp $
+#
+# This script:
+#   1. Backups the mailbox database to the portable text format,
+#      and compresses the result.  This backup can be used to restore
+#      the Cyrus mailbox database using ctl_mboxlist (after uncompressing
+#      the backup file).
+#
+#   2. Cleans up any leftover crap in .stage directories.
+#
+#   3. Runs chk_cyrus and outputs warning messages (so that cron
+#      sends them to the administrator) if any problems are detected.
+
+set -e
+
+# Make sure we get sane behaviour in broken locales
+LC_ALL=C
+export LC_ALL
+
+bak=/var/backups
+bakfile=${bak}/cyrus-mboxlist.txt.gz
+CONF=/etc/imapd.conf
+CHKCYRUS=0
+[ -r /etc/default/cyrus21 ] && . /etc/default/cyrus21
+umask 022
+
+# 1. backup mailbox database
+[ -x /usr/sbin/ctl_mboxlist ] && {
+	[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak )
+	[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak
+#	su "--command=/usr/sbin/ctl_mboxlist -d" - cyrus | ...
+	start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile}
+}
+
+# 2. clean up all leftover .stage directories in all spools listed in
+#    the default config file
+[ $CHKCYRUS -ne 0 ] && {
+    [ -r "$CONF" ] || {
+	echo $0: unable to read configuration file $CONF. Aborting...
+	exit 1
+    }
+    partitions=$(sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \
+            s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \
+	    p
+	    } " < "$CONF" | sort | uniq | xargs)
+    for i in $partitions ; do
+	find "$i" -name '.stage' -type d -print0 | \
+	  xargs --null -n 1 -r -i'{1}' \
+	    find {1} -type f -ctime +1 -exec rm -f {} \;
+    done
+}
+
+# 3. runs chk_cyrus
+[ -x /usr/sbin/chk_cyrus ] && {
+	tmpfile=$(mktemp -t cyrus-daily-cronjob.XXXXXXXXXX)
+	trap 'rm -f "${tmpfile}"' 0
+#	su "--command=/usr/sbin/chk_cyrus" - cyrus | ...
+	start-stop-daemon --start --exec /usr/sbin/chk_cyrus --quiet --chuid cyrus >"${tmpfile}" 2>&1 || cat "${tmpfile}" 1>&2
+	rm -f "${tmpfile}"
+	trap '' 0
+}
+
+exit 0

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.default
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.default	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.default	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,29 @@
+# Defaults for Cyrus IMAPd 2.1 scripts
+# sourced by /etc/init.d/cyrus21, /usr/sbin/cyrus-makedirs
+# installed at /etc/default/cyrus21 by the maintainer scripts
+# $Id: cyrus21-common.cyrus21.default,v 1.2 2003/10/08 11:43:52 hmh Exp $
+
+#
+# This is a POSIX shell fragment
+#
+
+# Set this to 1 or higher to enable debugging on cyrmaster
+#CYRUS_VERBOSE=1
+
+# Socket listen queue backlog size
+# See listen(2). Default is 32, you may want to increase
+# this number if you have a very high connection rate
+#LISTENQUEUE=32
+
+# Wether cyrus-makedirs should optimize filesystems
+# or not.  Switch it off if you are going to do your
+# own optimizations.  Set to 1 to enable, 0 to disable
+#CYRUSOPTFILESYS=1
+
+# The default Cyrus IMAP config file that the scripts should
+# use.  You better know what you're doing if you change this
+#CONF=/etc/imapd.conf
+
+# Check spool condition with chk_cyrus on daily cronjob
+# Set to 1 to enable, default is disabled
+#CHKCYRUS=0

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.init
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.init	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.init	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,149 @@
+#! /bin/sh
+#
+# cyrus21	/etc/init.d/ script for cyrus2 IMAPd
+#		This file manages the Cyrus IMAPd master process.
+#
+#		Copr. 2001 by Henrique de Moraes Holschuh <hmh at debian.org>
+#		Distributed under the GPL version 2
+#
+# Version:	$Id: cyrus21-common.cyrus21.init,v 1.2 2004/08/10 15:09:38 hmh Exp $
+#
+
+# Make sure we get sane results on borked locales
+LC_ALL=C
+export LC_ALL
+
+# Overridable defaults
+unset CYRUS_VERBOSE
+unset LISTENQUEUE
+[ -r /etc/default/cyrus21 ] && . /etc/default/cyrus21
+
+[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
+OPTIONS="-d"
+[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DAEMON=/usr/sbin/cyrmaster
+NAME=cyrmaster
+DESC="Cyrus IMAPd"
+
+test -x ${DAEMON} || exit 0
+
+set -e
+
+START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} -- ${OPTIONS}"
+
+verifydb() {
+   while read -r DBKEY DBVALUE ; do
+	match=`gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	[ "x${match}" != "x${DBVALUE}" ] && return 0
+   done
+   return 1
+}
+
+createdir() {
+# $1 = user
+# $2 = group
+# $3 = permissions (octal)
+# $4 = path to directory
+	[ -d "$4" ] || mkdir -p "$4"
+	chown -c -h "$1:$2" "$4"
+	chmod -c "$3" "$4"
+}
+
+missingstatoverride () {
+	echo "$0: You are missing a dpkg-statoverride on $1.  Add it." >&2
+	exit 1
+}
+
+fixdirs () {
+	dir=`dpkg-statoverride --list /var/run/cyrus` \
+		|| missingstatoverride /var/run/cyrus
+	[ -z "$dir" ] \
+		|| createdir $dir
+	dir=`dpkg-statoverride --list /var/run/cyrus/socket` \
+		|| missingstatoverride /var/run/cyrus/socket
+	[ -z "$dir" ] \
+		|| createdir $dir
+}
+
+case "$1" in
+  start)
+  	# Verify if there are old Cyrus 1.5 spools that were not upgraded
+	[ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \
+	  -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && {
+	  	echo "$0: It appears that you still have an version 1.5 spool" 1>&2
+		echo "$0: that needs to be upgraded." 1>&2
+		exit 2
+	}
+	# Verify consistency of database backends
+	[ -f /usr/lib/cyrus/cyrus-db-types.active ] && {
+		# is it safe to start cyrmaster? compare "key value" pairs
+		# from the (old) active database types file with the new one
+		verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+		    < /usr/lib/cyrus/cyrus-db-types.active && {
+		    echo "$0: Database backends mismatch! You must manually" 1>&2
+		    echo "$0: verify and update the Cyrus databases to the" 1>&2
+		    echo "$0: new backends." 1>&2
+		    echo "$0: Cyrmaster not started."
+		    exit 2
+		}
+	}
+	echo -n "Starting ${DESC}: "
+	fixdirs
+	if start-stop-daemon ${START} >/dev/null 2>&1 ; then
+		echo "$NAME."
+	else
+		if start-stop-daemon --test ${START} >/dev/null 2>&1; then
+			echo "(failed)."
+			exit 1
+		else
+			echo "${DAEMON} already running."
+			exit 0
+		fi
+	fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+			--quiet --startas $DAEMON >/dev/null 2>&1 ; then
+		echo "$NAME."
+	else
+		echo "(failed)."
+	fi
+	;;
+  reload|force-reload)
+	echo "Reloading $DESC configuration files."
+	start-stop-daemon --stop --signal 1 --quiet \
+		--pidfile /var/run/$NAME.pid --exec $DAEMON >/dev/null 2>&1
+  	;;
+  restart)
+  	$0 stop && {
+	  echo -n "Waiting for complete shutdown..."
+	  i=5
+	  while [ $i -gt 0 ] ; do
+	  	if start-stop-daemon --start --test \
+	  	   --pidfile /var/run/$NAME.pid \
+		   --exec $DAEMON >/dev/null 2>&1 ; then
+			break
+		fi
+		sleep 2s
+		i=$(($i - 1))
+		echo -n "."
+	  done
+	  [ $i -eq 0 ] && {
+	  	echo
+		echo "fatal: incomplete shutdown detected, aborting."
+		exit 1
+	  }
+	  echo
+	}
+	exec $0 start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2
+	exit 1
+	;;
+esac
+
+exit 0


Property changes on: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cyrus.init
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.dirs	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.dirs	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,12 @@
+etc/pam.d
+etc/default
+etc/logcheck/ignore.d.server
+etc/logcheck/violations.ignore.d
+usr/sbin
+usr/lib/cyrus
+usr/lib/cyrus/upgrade
+usr/share/snmp/mibs
+var/lib/cyrus
+var/spool/cyrus
+var/spool/sieve
+var/run/cyrus/socket

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,17 @@
+etc/*conf
+etc/pam.d/lmtp
+etc/pam.d/sieve
+usr/sbin/cyr*
+usr/sbin/ctl_*
+usr/sbin/cvt_*
+usr/sbin/chk_*
+usr/sbin/ipurge
+usr/sbin/tls_prune
+usr/sbin/mbpath
+usr/sbin/arbitron*
+usr/lib/cyrus/bin/lmtpd
+usr/lib/cyrus/bin/timsieved
+usr/lib/cyrus/bin/notifyd
+usr/lib/cyrus/bin/fud
+usr/lib/cyrus/get-backtrace.gdb
+usr/share/snmp

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.linda
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.linda	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.linda	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,2 @@
+Tag: postinst-db-input
+

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.links	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.links	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,3 @@
+var/spool/sieve etc/sieve
+usr/sbin/cyrreconstruct usr/lib/cyrus/bin/reconstruct
+usr/sbin/cyrquota usr/lib/cyrus/bin/quota

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.lintian	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,2 @@
+kolab-cyrus-common: no-debconf-config
+kolab-cyrus-common: postinst-uses-db-input

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,19 @@
+debian/tmp/usr/share/man/man5/cyrus.conf.5
+debian/tmp/usr/share/man/man5/imapd.conf.5
+debian/cyrdump.8
+debian/tmp/usr/share/man/man8/mbpath.8
+debian/tmp/usr/share/man/man8/arbitron.8
+debian/tmp/usr/share/man/man8/arbitronsort.8
+debian/tmp/usr/share/man/man8/timsieved.8
+debian/tmp/usr/share/man/man8/notifyd.8
+debian/tmp/usr/share/man/man8/lmtpd.8
+debian/tmp/usr/share/man/man8/ctl_*.8
+debian/tmp/usr/share/man/man8/cvt_*.8
+debian/tmp/usr/share/man/man8/chk_*.8
+debian/tmp/usr/share/man/man8/fud.8
+debian/tmp/usr/share/man/man8/ipurge.8
+debian/tmp/usr/share/man/man8/tls_prune.8
+debian/tmp/usr/share/man/man8/cyrdeliver.8
+debian/tmp/usr/share/man/man8/cyrmaster.8
+debian/tmp/usr/share/man/man8/cyrreconstruct.8
+debian/tmp/usr/share/man/man8/cyrquota.8

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,156 @@
+#! /bin/sh
+# postinst script for cyrus21-common
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus21-common.postinst,v 1.18 2004/08/10 15:20:08 hmh Exp $
+#
+# see: dh_installdeb(1)
+
+# debconf hook
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+verifydb() {
+   while read -r DBKEY DBVALUE ; do
+	match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	[ "x${match}" != "x${DBVALUE}" ] && return 0
+   done
+   return 1
+}
+
+verifydbkey() {
+   while read -r DBKEY DBVALUE ; do
+	if [ "${DBKEY}" = "$2" ] ; then
+	    match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	    [ "x${match}" != "x${DBVALUE}" ] && return 0
+	fi
+   done
+   return 1
+}
+
+case "$1" in
+    configure)
+	# Add the cyrus user (requires adduser >= 3.34)
+	echo "Creating/updating cyrus user account..."
+	adduser --system --ingroup mail --home /var/spool/cyrus \
+           --shell /bin/sh --disabled-password \
+	   --gecos "Cyrus Mailsystem User"  cyrus >/dev/null 2>&1 || {
+	   if getent passwd | grep -s -q -E '^cyrus:'; then
+		   echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
+		   echo "user. Remove the user and reinstall cyrus21-common." >&2
+		   exit 1
+	   fi
+	   # unknown adduser error, simply exit
+	   exit 1
+	}
+
+	# Force correct owner and modes
+	dpkg-statoverride --list /var/lib/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 750 /var/lib/cyrus
+	dpkg-statoverride --list /var/spool/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/spool/cyrus
+	dpkg-statoverride --list /var/spool/sieve 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/spool/sieve
+	dpkg-statoverride --list /var/run/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/run/cyrus
+	dpkg-statoverride --list /var/run/cyrus/socket 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 750 \
+				 /var/run/cyrus/socket
+
+	# Add user cyrus to group SASL, if such group exists
+	adduser cyrus sasl || true
+
+	# Convert the spool to the proper mode, if needed (autodetects
+	# only Debian's default spool, this codepath is meant for package
+	# upgrades only)
+	# DISABLED, since rehash seems busted
+	#[ -d /var/spool/cyrus/mail/A ] && {
+	#	echo Converting spools to basic hash scheme...
+	#	#su - cyrus -c /usr/lib/cyrus/upgrade/rehash basic
+	#	start-stop-daemon --start --exec /usr/lib/cyrus/upgrade/rehash --chuid cyrus:mail --verbose -- basic
+	#}
+
+	# Parse imapd.conf and generate all required directories...
+	# also kill any left over squatter indexes
+	/usr/sbin/cyrus-makedirs --cleansquat
+
+	# Deal with database type information
+	if [ -f /usr/lib/cyrus/cyrus-db-types.active ] ; then
+		# is it safe to start cyrmaster? compare "key value" pairs
+		# from the (old) active database types file with the new one
+		if verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+		    < /usr/lib/cyrus/cyrus-db-types.active ; then
+		    db_input high kolab-cyrus-common/warnbackendchange || true
+		    db_go || true
+		else
+		    cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+		    db_fset kolab-cyrus-common/warnbackendchange seen false || true
+		fi
+	else
+		[ -f /usr/lib/cyrus/cyrus-db-types.txt ] && \
+		  cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+		db_fset kolab-cyrus-common/warnbackendchange seen false || true
+	fi
+
+	# Deal with hardwired config changes
+	if [ -f /usr/lib/cyrus/cyrus-hardwired-config.active ] ; then
+		# do we need to do something about a spool hash type change
+		# if verifydbkey /usr/lib/cyrus/cyrus-hardwired-config.txt USE_DIR_FULL \
+		#    < /usr/lib/cyrus/cyrus-hardwired-config.active ; then
+		# ... (do hash conversion)...
+		# fi
+		cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \
+		      /usr/lib/cyrus/cyrus-hardwired-config.active
+	else
+		[ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] && \
+		  cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \
+		        /usr/lib/cyrus/cyrus-hardwired-config.active
+	fi
+
+	# No leaking of debconf file handles to the initscript stuff
+	db_stop
+
+	# Register initscript, and start it (it is ok if start fails)
+	[ -x /etc/init.d/kolab-cyrus ] && {
+		update-rc.d kolab-cyrus defaults >/dev/null
+		invoke-rc.d kolab-cyrus start || true
+	}
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+db_stop
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0


Property changes on: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postinst
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,71 @@
+#! /bin/sh
+# postrm script for cyrus21-common
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus21-common.postrm,v 1.12 2004/11/23 12:41:47 hmh Exp $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# debconf hook
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+		remove)
+			;;
+		purge)
+			for i in /var/lib/cyrus /var/spool/sieve \
+				 /var/spool/cyrus \
+				 /var/run/cyrus /var/run/cyrus/socket ; do
+				dpkg-statoverride --remove $i || true
+			done
+			rm -rf /var/run/cyrus || true
+
+			# Should we remove our precious data?
+			db_title "Cyrus IMAPd 2.1" || true
+			db_fset cyrus21-common/removespools seen false || true
+			db_input high cyrus21-common/removespools || true
+			db_go || true
+
+			db_get cyrus21-common/removespools
+			[ "${RET}" = "true" ] && {
+				for i in /var/spool/cyrus /var/lib/cyrus \
+				         /var/spool/sieve /etc/sieve ; do
+				        find "$i" -type f -exec rm -f '{}' \; || true
+				        find "$i" -type d -depth -not -name 'lost+found' -exec rmdir '{}' \; || true
+				done
+				# Remove database type information
+				rm -f /usr/lib/cyrus/cyrus-*.active
+			}
+
+			update-rc.d cyrus21 remove >/dev/null
+        	;;
+
+		upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+			;;
+
+		*)
+			echo "postrm called with unknown argument \`$1'" >&2
+			exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0


Property changes on: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.postrm
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,43 @@
+#! /bin/sh
+# prerm script for cyrus21-common
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus21-common.prerm,v 1.3 2002/05/26 20:55:50 hmh Exp $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    	# Call initscript, if it is there to stop the daemon
+ 	invoke-rc.d cyrus21 stop || true
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+


Property changes on: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.prerm
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.templates	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,25 @@
+Template: kolab-cyrus-common/warnbackendchange
+Type: note
+_Description: Database backends have changed!
+ Comparison between /usr/lib/cyrus/cyrus-db-types.txt and
+ /usr/lib/cyrus/cyrus-db-types.active shows that database backends for
+ Cyrus IMAPd have been changed.
+ .
+ This means that those databases for which the database backends changed
+ might need to be converted manually to the new format, using the
+ cvt_cyrusdb(8) utility.
+ .
+ Please refer to /usr/share/doc/cyrus21-common/README.Debian.database
+ for more information.  Do not start cyrmaster until you have converted
+ the databases to the new format.
+
+Template: kolab-cyrus-common/removespools
+Type: boolean
+Default: false
+_Description: Remove the Cyrus spools, and user sieve scripts?
+ Should I remove the Cyrus mail and news spools, as well as the user's
+ sieve scripts, when the package is purged ?
+ .
+ This question only applies to the default spools and sieve script
+ directories in /var.  If you modified their location in imapd.conf, the
+ new locations will not be removed; just the old ones in /var.

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.dirs	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.dirs	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,2 @@
+usr/include/cyrus
+usr/lib

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,3 @@
+usr/lib/*.a
+usr/include/cyrus/*
+usr/share/man/man3/imclient*

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/share/doc/cyrus21-common usr/share/doc/cyrus21-dev

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,10 @@
+Document: cyrus21-manual
+Title: CMU Cyrus 2.1 Manual
+Author: Carnegie Mellon University
+Abstract: This manual describes how to configure and administer 
+ the Cyrus POP/IMAP mail system, version 2.1
+Section: mail
+
+Format: HTML
+Index: /usr/share/doc/kolab-cyrus-doc/html/index.html
+Files: /usr/share/doc/kolab-cyrus-doc/html/*.html

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/share/doc/kolab-cyrus-doc usr/share/doc/kolab-cyrus-common/docs

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.dirs	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.dirs	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,3 @@
+etc/pam.d/imap
+usr/lib/cyrus/bin/imapd
+usr/sbin/squatter

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/share/doc/cyrus21-common usr/share/doc/cyrus21-imapd

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.manpages	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.manpages	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/idled.8
+debian/tmp/usr/share/man/man8/imapd.8
+debian/tmp/usr/share/man/man8/squatter.8

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,3 @@
+etc/pam.d/mupdate
+usr/lib/cyrus/bin/*proxyd
+usr/lib/cyrus/bin/mupdate*

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/share/doc/cyrus21-common usr/share/doc/cyrus21-murder

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/lib/cyrus

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,4 @@
+etc/pam.d/pop
+usr/sbin/pop3*
+usr/lib/cyrus/bin/pop3d
+usr/share/man/man8/pop3d*

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+usr/share/doc/cyrus21-common usr/share/doc/cyrus21-pop3d

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+man/pop3d.8

Added: trunk/kolab-cyrus-imapd/debian/patches/00list
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/00list	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/00list	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1 @@
+10-lib-Makefile.in

Added: trunk/kolab-cyrus-imapd/debian/patches/10-lib-Makefile.in.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/10-lib-Makefile.in.dpatch	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/10-lib-Makefile.in.dpatch	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+## 10-lib-Makefile.in.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for broken Makefile. We use dpatch for this patch.
+
+if [ $# -lt 1 ]; then
+echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+      -patch) patch $patch_opts -p1 < $0;;
+      -unpatch) patch $patch_opts -p1 -R < $0;;
+      *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- kolab-cyrus-imapd-2.2.12.orig/lib/Makefile.in.orig	2005-12-16 13:40:47.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/lib/Makefile.in	2005-12-16 13:41:02.000000000 +0100
+@@ -153,8 +153,7 @@
+ 	$(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
+ 
+ clean:
+-	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
+-	$(BUILTSOURCES)
++	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log
+ 
+ distclean: clean
+ 	rm -f Makefile


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/10-lib-Makefile.in.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,75 @@
+#diff -upr ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html ./doc/man/cyradm.1.html
+#--- ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html	2005-02-14 19:02:26.000000000 +0100
+#+++ ./doc/man/cyradm.1.html	2005-08-29 04:35:21.000000000 +0200
+#@@ -191,6 +191,10 @@ Indicates that the mailbox should have a
+# <DD>
+# Sets an email address to which messages injected into the server via NNTP 
+# will be sent.
+#+<P></P>
+#+<DT><STRONG><A NAME="item__2fexplicit_2fannotation"><CODE>/explicit/annotation</CODE></A></STRONG><BR>
+#+<DD>
+#+Sets the annotation <EM>/explicit/annotation</EM> on <EM>mailbox</EM> to <EM>value</EM>.
+# <P></P></DL>
+# <DT><STRONG><A NAME="item_renamemailbox_%5B%2D%2Dpartition_partition%5D_oldn"><CODE>renamemailbox</CODE> [<CODE>--partition</CODE> <EM>partition</EM>] <EM>oldname</EM> <EM>newname</EM></A></STRONG><BR>
+# <DD>
+--- kolab-cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh	2004-01-15 15:35:34.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/perl/imap/cyradm.sh	2005-08-29 04:28:51.000000000 +0200
+@@ -225,6 +225,10 @@ Indicates that the mailbox should have a
+ Sets an email address to which messages injected into the server via NNTP 
+ will be sent.
+ 
++=item C</explicit/annotation>
++
++Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
++
+ =back 
+ 
+ =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>
+--- kolab-cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm	2004-02-19 23:50:12.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/perl/imap/IMAP/Admin.pm	2005-08-29 04:02:38.000000000 +0200
+@@ -789,12 +789,12 @@ sub mboxconfig {
+     return undef;
+   }
+ 
+-  if(!exists($values{$entry})) {
+-    $self->{error} = "Unknown parameter $entry";
++  if(exists($values{$entry})) {
++    $entry = $values{$entry};    
++  } else {
++    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
+   }
+ 
+-  $entry = $values{$entry};
+-
+   my ($rc, $msg);
+ 
+   $value = undef if($value eq "none");
+--- kolab-cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm	2004-01-15 15:35:35.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm	2005-08-29 04:02:38.000000000 +0200
+@@ -126,7 +126,7 @@ my %builtins = (exit =>
+ 		  [\&_sc_info, '[mailbox]',
+ 		   'display mailbox/server metadata'],
+ 		mboxcfg =>
+-		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
++		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
+ 		   'configure mailbox'],
+ 		mboxconfig => 'mboxcfg',
+ 		reconstruct =>
+@@ -1339,7 +1339,7 @@ sub _sc_mboxcfg {
+   while (defined ($opt = shift(@argv))) {
+     last if $opt eq '--';
+     if ($opt =~ /^-/) {
+-      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
++      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+     }
+     else {
+       push(@nargv, $opt);
+@@ -1348,7 +1348,7 @@ sub _sc_mboxcfg {
+   }
+   push(@nargv, @argv);
+   if (@nargv < 2) {
+-    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
++    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+   }
+   if (!$cyrref || !$$cyrref) {
+     die "mboxconfig: no connection to server\n";


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/cyradm.annotate.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,51 @@
+--- kolab-cyrus-imapd-2.2.12.orig/imap/imapd.c	2005-02-14 07:39:55.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/imap/imapd.c	2005-04-21 00:59:50.865255448 +0200
+@@ -3923,10 +3923,12 @@ void cmd_rename(const char *tag, 
+ 	}
+     }
+ 
++#ifdef notdef
+     /* verify that the mailbox doesn't have a wildcard in it */
+     for (p = oldmailboxname; !r && *p; p++) {
+ 	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
+     }
++#endif
+ 
+     /* attempt to rename the base mailbox */
+     if (!r) {
+Kun i ./imap: imapd.c.orig
+diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c ./imap/mboxlist.c
+--- kolab-cyrus-imapd-2.2.12.orig/imap/mboxlist.c	2004-07-26 20:08:03.000000000 +0200
++++ kolab-cyrus-imapd-2.2.12/imap/mboxlist.c	2005-04-21 00:59:50.874254080 +0200
+@@ -476,10 +476,12 @@ mboxlist_mycreatemailboxcheck(char *name
+ 		free(acl);
+ 		return IMAP_PERMISSION_DENIED;
+ 	    }
++#ifdef notdef
+ 	    /* disallow wildcards in userids with inboxes. */	     
+ 	    if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
+ 		return IMAP_MAILBOX_BADNAME;
+ 	    }
++#endif
+ 
+ 	    /*
+ 	     * Users by default have all access to their personal mailbox(es),
+diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxname.c ./imap/mboxname.c
+--- kolab-cyrus-imapd-2.2.12.orig/imap/mboxname.c	2005-02-14 07:39:57.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/imap/mboxname.c	2005-04-21 00:59:50.879253320 +0200
+@@ -649,8 +649,13 @@ int mboxname_netnewscheck(char *name)
+ /*
+  * Apply site policy restrictions on mailbox names.
+  * Restrictions are hardwired for now.
+- */
++
++ * original definition 
+ #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
++ */
++
++#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
++
+ int mboxname_policycheck(char *name)
+ {
+     unsigned i;
+Kun i ./imap: mboxname.c.orig


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/imapd-goodchars.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,117 @@
+--- kolab-cyrus-imapd-2.2.6.orig/imap/annotate.c	2004-05-22 05:45:48.000000000 +0200
++++ kolab-cyrus-imapd-2.2.6/imap/annotate.c	2004-07-05 11:59:13.000000000 +0200
+@@ -1598,6 +1598,11 @@ const struct annotate_st_entry mailbox_r
+     { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
+ };
+ 
++const struct annotate_st_entry vendor_entry =
++    { NULL, ATTRIB_TYPE_STRING, BACKEND_ONLY,
++      ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
++      ACL_ADMIN, annotation_set_todb, NULL };
++
+ int annotatemore_store(char *mailbox,
+ 		       struct entryattlist *l,
+ 		       struct namespace *namespace,
+@@ -1610,6 +1615,7 @@ int annotatemore_store(char *mailbox,
+     struct attvaluelist *av;
+     struct storedata sdata;
+     const struct annotate_st_entry *entries;
++    struct annotate_st_entry * working_entry;
+     time_t now = time(0);
+ 
+     memset(&sdata, 0, sizeof(struct storedata));
+@@ -1631,37 +1637,55 @@ int annotatemore_store(char *mailbox,
+     while (e) {
+ 	int entrycount, attribs;
+ 	struct annotate_st_entry_list *nentry = NULL;
++	struct annotate_st_entry *ientry = NULL;
+ 
+ 	/* See if we support this entry */
++	working_entry = NULL;
+ 	for (entrycount = 0;
+ 	     entries[entrycount].name;
+ 	     entrycount++) {
+ 	    if (!strcmp(e->entry, entries[entrycount].name)) {
++	        working_entry = &(entries[entrycount]);
+ 		break;
+ 	    }
+ 	}
+-	if (!entries[entrycount].name) {
+-	    /* unknown annotation */
+-	    return IMAP_PERMISSION_DENIED;
++	if (working_entry==NULL) {
++	    /* test for generic vendor annotation */
++	    if ((strncmp("/vendor/", e->entry, strlen("/vendor/"))==0) &&
++	        (strlen(e->entry)>strlen("/vendor/"))) {
++	      working_entry = &(vendor_entry);
++	    }
++	    else {
++	        /* unknown annotation */
++	        return IMAP_PERMISSION_DENIED;
++	    }
+ 	}
+ 
+ 	/* Add this entry to our list only if it
+ 	   applies to our particular server type */
+-	if (entries[entrycount].proxytype == PROXY_AND_BACKEND
++	if (working_entry->proxytype == PROXY_AND_BACKEND
+ 	    || (proxy_store_func &&
+-		entries[entrycount].proxytype == PROXY_ONLY)
++		working_entry->proxytype == PROXY_ONLY)
+ 	    || (!proxy_store_func &&
+-		entries[entrycount].proxytype == BACKEND_ONLY)) {
++		working_entry->proxytype == BACKEND_ONLY)) {
++            ientry = xzmalloc(sizeof(struct annotate_st_entry));
++            ientry->name = e->entry;
++            ientry->type = working_entry->type;
++            ientry->proxytype = working_entry->proxytype;
++            ientry->attribs = working_entry->attribs;
++            ientry->acl = working_entry->acl;
++            ientry->set = working_entry->set;
++            ientry->rock = working_entry->rock;	
+ 	    nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
+ 	    nentry->next = sdata.entry_list;
+-	    nentry->entry = &(entries[entrycount]);
++	    nentry->entry = ientry;
+ 	    nentry->shared.modifiedsince = now;
+ 	    nentry->priv.modifiedsince = now;
+ 	    sdata.entry_list = nentry;
+ 	}
+ 
+ 	/* See if we are allowed to set the given attributes. */
+-	attribs = entries[entrycount].attribs;
++	attribs = working_entry->attribs;
+ 	av = e->attvalues;
+ 	while (av) {
+ 	    const char *value;
+@@ -1671,7 +1695,7 @@ int annotatemore_store(char *mailbox,
+ 		    goto cleanup;
+ 		}
+ 		value = annotate_canon_value(av->value,
+-					     entries[entrycount].type);
++					     working_entry->type);
+ 		if (!value) {
+ 		    r = IMAP_ANNOTATION_BADVALUE;
+ 		    goto cleanup;
+@@ -1697,7 +1721,7 @@ int annotatemore_store(char *mailbox,
+ 		    goto cleanup;
+ 		}
+ 		value = annotate_canon_value(av->value,
+-					     entries[entrycount].type);
++					     working_entry->type);
+ 		if (!value) {
+ 		    r = IMAP_ANNOTATION_BADVALUE;
+ 		    goto cleanup;
+@@ -1797,6 +1821,12 @@ int annotatemore_store(char *mailbox,
+     /* Free the entry list */
+     while (sdata.entry_list) {
+ 	struct annotate_st_entry_list *freeme = sdata.entry_list;
++	if (freeme != NULL){
++	    struct annotate_st_entry *freeme2 = freeme->entry;
++	    if (freeme2 != NULL) {
++	        free( freeme2 );
++	    }
++	}
+ 	sdata.entry_list = sdata.entry_list->next;
+ 	free(freeme);
+     }


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/imapd.annotate.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/patches/imapd.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/imapd.patch	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/imapd.patch	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,99 @@
+--- kolab-cyrus-imap-2.2.12.orig/et/com_err.c.orig	2003-06-04 05:27:50.000000000 +0200
++++ kolab-cyrus-imap-2.2.12/et/com_err.c	2004-02-02 19:56:00.000000000 +0100
+@@ -50,7 +50,7 @@
+ #include <string.h>
+ #include "mit-sipb-copyright.h"
+ 
+-#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
++#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
+--- kolab-cyrus-imapd-2.2.12.orig/lib/cyrusdb_skiplist.c.orig	2003-12-15 17:04:35.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/lib/cyrusdb_skiplist.c	2004-02-02 19:56:00.000000000 +0100
+@@ -71,6 +71,11 @@
+ 
+ #define PROB (0.5)
+ 
++#ifdef __FreeBSD__
++/* #define fdatasync(fd) fsync(fd) */
++#define O_DSYNC 0
++#endif
++
+ /* 
+  *
+  * disk format; all numbers in network byte order
+--- kolab-cyrus-imapd-2.2.12.orig/lib/prot.h.orig	2003-10-22 20:50:12.000000000 +0200
++++ kolab-cyrus-imapd-2.2.12/lib/prot.h	2004-02-02 19:58:47.000000000 +0100
+@@ -49,6 +49,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/time.h>
+ 
+ #include <sasl/sasl.h>
+ 
+--- kolab-cyrus-imapd-2.2.12.orig/perl/sieve/lib/isieve.c.orig	2003-10-22 20:50:25.000000000 +0200
++++ kolab-cyrus-imapd-2.2.12/perl/sieve/lib/isieve.c	2004-02-02 20:01:21.000000000 +0100
+@@ -41,9 +41,7 @@
+ 
+ /* $Id: imapd.patch,v 1.12 2004/11/13 14:53:34 rse Exp $ */
+ 
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
++#include "../../../config.h"
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+--- kolab-cyrus-imapd-2.2.12.orig/perl/Makefile.in.orig	2003-10-22 20:50:17.000000000 +0200
++++ kolab-cyrus-imapd-2.2.12/perl/Makefile.in	2004-02-02 21:23:32.000000000 +0100
+@@ -82,7 +82,8 @@
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL PREFIX=$(prefix) \
++			         INSTALLDIRS="vendor" INSTALLMAN3DIR="none" INSTALLSITEMAN3DIR="none" INSTALLVENDORMAN3DIR="none"; \
+ 			fi; \
+ 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
+--- kolab-cyrus-imapd-2.2.12.orig/perl/sieve/Makefile.in.orig	2003-10-22 20:50:24.000000000 +0200
++++ kolab-cyrus-imapd-2.2.12/perl/sieve/Makefile.in	2004-02-02 21:41:22.000000000 +0100
+@@ -84,7 +84,8 @@
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL PREFIX=$(prefix) \
++			         INSTALLDIRS="vendor" INSTALLMAN3DIR="none" INSTALLSITEMAN3DIR="none" INSTALLVENDORMAN3DIR="none"; \
+ 			fi; \
+ 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
+--- kolab-cyrus-imapd-2.2.12.orig/imap/mboxname.c.orig	2004-03-17 10:03:40.000000000 +0200
++++ kolab-cyrus-imapd-2.2.12/imap/mboxname.c	2004-03-17 10:03:40.000000000 +0200
+@@ -129,7 +129,11 @@
+ 		domainlen = strlen(result);
+ 	    }
+ 	}
++#ifdef ATVDOM /* allow '@' being a regular character in mboxname even when using virtual domains */
++	else if ((cp = strrchr(name, '@'))) {
++#else
+ 	if ((cp = strrchr(name, '@'))) {
++#endif /* ATVDOM */
+ 	    /* mailbox specified as mbox at domain */
+ 	    namelen = cp - name;
+ 
+
+Index: lib/cyrusdb_berkeley.c
+--- kolab-cyrus-imapd-2.2.12.orig/lib/cyrusdb_berkeley.c.orig	2004-03-11 19:36:44 +0100
++++ kolab-cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c	2004-11-13 13:48:28 +0100
+@@ -104,7 +104,7 @@
+     exit(EC_TEMPFAIL);
+ }
+ 
+-static void db_err(const char *db_prfx, char *buffer)
++static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer)
+ {
+     syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/imapd.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,25 @@
+--- kolab-cyrus-imapd-2.2.12.orig/lib/imapopts.h.orig	2005-12-13 23:46:23.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/lib/imapopts.h	2005-12-13 23:47:29.000000000 +0100
+@@ -178,7 +178,6 @@
+ 
+ };
+ 
+-extern struct imapopt_s imapopts[];
+ 
+ 
+ 
+@@ -188,6 +187,7 @@
+ 
+   IMAP_ENUM_VIRTDOMAINS_ON,
+   IMAP_ENUM_VIRTDOMAINS_USERID,
++  IMAP_ENUM_VIRTDOMAINS_LDAP,
+   IMAP_ENUM_VIRTDOMAINS_OFF = 0
+ 
+ };
+@@ -236,5 +236,6 @@
+ 
+ };
+ 
++extern struct imapopt_s imapopts[];
+ #endif /* INCLUDED_IMAPOPTIONS_H */
+ 


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/kolab-ldap-new.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in
===================================================================
--- trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,12 @@
+--- kolab-cyrus-imapd-2.2.12.orig/lib/Makefile.in.orig	2005-12-16 13:40:47.000000000 +0100
++++ kolab-cyrus-imapd-2.2.12/lib/Makefile.in	2005-12-16 13:41:02.000000000 +0100
+@@ -153,8 +153,7 @@
+ 	$(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
+ 
+ clean:
+-	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
+-	$(BUILTSOURCES)
++	rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log
+ 
+ distclean: clean
+ 	rm -f Makefile


Property changes on: trunk/kolab-cyrus-imapd/debian/patches/lib-Makefile.in
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/kolab-cyrus-imapd/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/debian/rules	2005-12-16 13:12:00 UTC (rev 9)
+++ trunk/kolab-cyrus-imapd/debian/rules	2005-12-16 13:21:41 UTC (rev 10)
@@ -0,0 +1,387 @@
+#!/usr/bin/make -f
+# debian/rules for CMU Cyrus IMAP version 2.1
+# GNU copyright 1997 by Joey Hess.
+# Copyright (c) 2001 by Henrique de Moraes Holschuh
+# Published under the GNU GPL license
+# Based on previous work by Michael-John Turner <mj at debian.org>,
+#			    David Parker <david at neongoat.com>
+#
+# $Id: rules,v 1.85 2005/03/03 13:42:48 hmh Exp $
+
+# Include Kolab patches
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+# DebHelper control
+export DH_ALWAYS_EXCLUDE=CVS
+
+export MAINPKG=kolab-cyrus-common
+export DOCPKG=kolab-cyrus-doc
+export TMPPKG := $(CURDIR)/debian/tmp
+export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
+export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG)
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# Extra version information to add to Cyrus IMAPd ID
+DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p')
+EXTRA_IDENT:="Debian-$(DEBVERSION)"
+
+# DB engine version
+DBENGINE=BerkeleyDB3.2
+
+DEBUGFLAGS=-g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	DEBUGFLAGS += -O0
+else
+	DEBUGFLAGS += -O2
+endif
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+CONFFLAGS =
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
+else
+  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Other oddities
+ifneq (,$(findstring strict,$(DEB_BUILD_OPTIONS)))
+	CONFFLAGS += --enable-warnings-are-errors
+endif
+
+# The clean target will remove any and all cruft (as defined by 
+# configure ; make distclean ; cd intl; make distclean ). 
+# This is done to make sure the build daemon's source tree is the 
+# same as the one I am using to produce the i386 debs. 
+clean::	configure
+	dh_testdir
+	dh_testroot
+	-xargs -t -r chmod +x < debian/executable.files
+	-rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp
+	-$(MAKE) -i distclean
+	dpatch deapply-all
+	rm -rf debian/patched
+	-rm -f config.h config.cache config.status config.log stamp-config confdefs.h
+	-rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/acap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
+	-rm -f doc/pod2htmd.x~~ doc/pod2htmi.x~~ imap/imap_err.[ch] imap/pushstats.[ch] imap/lmtpstats.[ch] master/makedepend.log 
+#	Uncomment this for Kolab ...
+#	-rm -f sieve/addr.[ch] sieve/addr-lex.[ch] sieve/sieve.[ch] sieve/sieve-lex.c sieve/sieve_err.[ch]
+	-rm -f man/sieveshell.1 doc/murder.png
+	-rm -rf doc/man
+	-rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt
+
+# Changes during Kolabisation
+#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+#        cp -f /usr/share/misc/config.sub config.sub
+#endif
+#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+#        cp -f /usr/share/misc/config.guess config.guess
+#endif
+	rm -f sieve/sievec
+	rm -f sieve/sieved
+
+	-rm -f config.sub config.guess
+# 	Uncomment this for Kolab ...
+#	-rm -rf et/
+#	Uncomment this for Kolab
+#	Beta build don't need this
+#	-xargs -t -r rm -f < debian/deletable.files
+	dh_clean
+
+configure:
+	./autogen.sh
+
+build: 
+	@echo Use the build-arch or build-indep targets to build...
+
+configure-stamp:
+	dh_testdir
+	-rm -f config.sub config.guess
+	ln -s /usr/share/misc/config.sub config.sub
+	ln -s /usr/share/misc/config.guess config.guess
+	touch configure.in && touch aclocal.m4 && touch configure
+	dpatch apply-all
+	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
+	# DBENGINE AT THE TOP OF THIS MAKEFILE!
+	./configure CFLAGS="-fno-strict-aliasing -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+	 --with-extraident=$(EXTRA_IDENT) \
+	 --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \
+	 --bindir=/usr/sbin --sbindir=/usr/sbin \
+	 --includedir=/usr/include/cyrus \
+	 --datadir=/usr/share/cyrus --sysconfdir=/etc \
+	 --with-statedir=/var/state \
+	 --sharedstatedir=/usr/share/cyrus \
+	 --localstatedir=/var/lib/cyrus \
+	 --with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \
+	 --with-perl=/usr/bin/perl \
+	 --with-openssl=/usr --with-auth=unix --enable-murder \
+	 --disable-listext --enable-annotatemore --with-sasl=/usr \
+	 --with-idle=poll --with-drac=/usr \
+	 --with-cyrus-user=cyrus --with-cyrus-group=mail \
+	 --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \
+	 --with-pidfile=/var/run/cyrmaster.pid \
+	 --with-syslogfacility=MAIL \
+	 --with-seen-db=skiplist --with-mboxlist-db=skiplist \
+	 --with-ucdsnmp=/usr
+
+	touch configure-stamp
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+	dh_testdir
+
+	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
+	# store database configuration for possible automatic
+	# upgrading later
+	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
+	grep -E 'CONFIG_DB_[A-Z]+[[:space:]]+[(]' config.h |\
+	  sed -e 's/&cyrusdb_//' -e 's/.*CONFIG_DB_//' -e 's/(//' -e 's/)//' \
+	  >>debian/cyrus-db-types.txt
+	# store some useful state about the current package
+	echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
+	if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \
+		echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\
+	else \
+		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
+	fi
+
+	touch build-arch-stamp
+
+# We aren't actually able to build arch-indep independently from
+# arch-dep, so we guarantee that the arch build has been done first
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp build-arch
+	dh_testdir
+
+	cd doc &&\
+	pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\
+	fig2dev -L png murder.fig murder.png &&\
+	rm -f groff-html-*.png pod2htm*
+	cd doc &&\
+	mkdir -p man &&\
+	for man in ../man/*.[1-9] ../debian/*.[1-9]; do \
+	   echo "Generating html manpage for $$man..."; \
+	   groff -man -Thtml $$man > man/`basename $$man`.html; \
+	done
+	pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
+	rm -f pod2htm*
+
+	touch build-indep-stamp
+
+install-arch: build-arch 
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a
+
+	$(MAKE) install DESTDIR=$(TMPPKG)
+
+	# fix totaly broken location of the include files;
+	# while at it, also avoid namespace colision, and move
+	# lots of admin-only/system-only stuff to sbin and lib
+	# also, do the renaming needed for alternatives
+	# and fix the weird side-effect of setting the proper cyrus
+	# location in configure.
+	mkdir -p $(TMPPKG)/usr/sbin
+	mkdir -p $(TMPPKG)/usr/lib/cyrus
+	for i in master reconstruct quota deliver ; do \
+		mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\
+	done
+	for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
+	         tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron; do \
+		mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\
+	done
+	mkdir -p $(TMPPKG)/usr/include
+	mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include
+	#mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin
+
+	# Move the perl crap to a saner place
+	mkdir -p $(TMPPKG)/usr/lib
+	mkdir -p $(TMPPKG)/usr/share/perl5
+	#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
+	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
+
+	# Uncomment this for Kolab as we don't need pam authentification ...
+	# for stuff in /etc
+#	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
+	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
+	install -m 644 debian/cyrus.conf    $(TMPPKG)/etc
+#	(cd debian ; for i in *.pam ;\
+#		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
+#	done)
+
+	# We rename some utils, so we need to sort out the manpages
+	for i in master reconstruct quota deliver ; do \
+		mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \
+	done
+
+	# And add our own manpages
+	mkdir -p $(TMPPKG)/usr/share/man/man8
+
+	# Uncomment it for Kolab
+#	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
+	install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
+
+	# SNMP files
+	mkdir -p $(TMPPKG)/usr/share/snmp/mibs
+	install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
+
+	# Install cyradm icons
+	mkdir -p $(TMPPKG)/usr/share/icons/mini
+
+	# Modify it for Kolab
+	install -m 644 debian/kolab-cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/kolab-cyradm.xpm
+	install -m 644 debian/kolab-cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/kolab-cyradm.xpm
+
+	# Uncomment this for Kolab. 
+	# First we have to look at them and decide wether we include them or not.
+	# Install debian-provided scripts
+#	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
+#	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
+
+	# Uncomment this for Kolab.
+	# First check ...
+	# and logcheck files
+#	install -m 644 debian/logcheck.ignore \
+#	  $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus21
+#	install -m 644 debian/logcheck.ignore \
+#	  $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus21
+
+	# Install the stuff needed for upgrades
+	for i in convert-sieve.pl dohash rehash undohash translatesieve \
+		 upgradesieve ; do \
+		install -m 755 tools/$$i $(PKGDIR)/usr/lib/cyrus/upgrade ;\
+	done
+	
+	# Uncomment this for Kolab.
+	# First check ...
+#	install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade
+	# And other upgrade helpers
+#	install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \
+		   $(PKGDIR)/usr/lib/cyrus
+	# And other misc useful tools
+	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
+
+	# Modify for Kolab
+	# Install imtest and its symlinks
+	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/kolab-cyrus-clients/usr/bin
+	for i in $(TMPPKG)/usr/bin/*test ; do \
+		rm -f "$$i" || true ;\
+		(cd $(CURDIR)/debian/kolab-cyrus-clients/usr/bin &&\
+		 ln -s imtest `basename $$i`) ;\
+	done
+
+	# Let's uncomment this for Kolab and
+	# at first see what Linda and Lintian say ...
+	# Lintian and Linda overrides
+#	cd debian ; \
+#	for i in *.linda ; do \
+#		mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
+#		install  -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
+#	done ;\
+#	for i in *.lintian ; do \
+#		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
+#		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
+#	done
+#
+#	dh_movefiles -a
+#	touch install-arch-stamp
+
+# We aren't actually able to install arch-indep independently from
+# arch-dep, so we guarantee that the arch build has been done first
+install-indep: build-indep install-arch
+	dh_testdir
+	dh_testroot
+	#dh_clean -k
+	dh_installdirs -i
+
+	# Massage the documentation into place
+	#mkdir -p $(DOCDIR)
+	#find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;
+	#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
+	#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
+
+	# Install the html docs and examples
+	mkdir -p $(DOCDIR)/html
+	install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
+	cp -a doc/man $(DOCDIR)/html
+
+	# Uncomment this for Kolab, first check ...
+#	cp -a debian/examples $(DOCDIR)
+	install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
+
+	# Install contrib/ files
+	# small modify for Kolab
+	mkdir -p $(DOCDIR)/contrib
+	xargs < debian/kolab-cyrus-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
+
+	# Modifications for Kolab
+	# We want a binary in /usr/bin not in /usr/share/bin
+	mv debian/tmp/usr/share/bin/cyradm debian/tmp/usr/bin/cyradm
+	
+	dh_movefiles -i
+
+# Modification for Kolab, we need an install target ;(
+install: install-indep
+
+binary-indep: install-indep
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+#	Modify for Kolab
+	dh_installdocs -p kolab-cyrus-admin -p kolab-cyrus-doc
+	dh_installexamples -p kolab-cyrus-admin
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installcron -i
+	dh_installman -i
+	dh_installchangelogs -p kolab-cyrus-admin doc/changes.html
+	dh_installchangelogs -p kolab-cyrus-doc
+	dh_strip -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_makeshlibs -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install-arch
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdebconf -a
+	dh_installdocs -p $(MAINPKG) -p kolab-cyrus-clients -p kolab-libcyrus-imap-perl
+	dh_installexamples -p $(MAINPKG) -p kolab-libcyrus-imap-perl -p kolab-cyrus-clients
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installpam -a
+#	dh_installmime -a
+#	Modify for Kolab (check if it is right ;) 
+	dh_installinit -p $(MAINPKG) --noscripts --name=kolab-cyrus
+	dh_installcron -a
+	dh_installman -a
+#	dh_installinfo -a
+#	Modify for Kolab
+	dh_installchangelogs -p $(MAINPKG) -p kolab-cyrus-clients doc/changes.html
+	dh_installchangelogs -p kolab-libcyrus-imap-perl perl/imap/Changes
+	dh_fixperms -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep


Property changes on: trunk/kolab-cyrus-imapd/debian/rules
___________________________________________________________________
Name: svn:executable
   + *




More information about the pkg-kolab-devel mailing list