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

Peter Eisentraut petere at alioth.debian.org
Wed Nov 1 20:30:51 CET 2006


Author: petere
Date: 2006-11-01 20:30:50 +0100 (Wed, 01 Nov 2006)
New Revision: 501

Added:
   kolab-cyrus-imapd/trunk/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch
Removed:
   kolab-cyrus-imapd/trunk/debian/patches/120-kolab-Shell.pm.dpatch
Modified:
   kolab-cyrus-imapd/trunk/debian/README.Debian
   kolab-cyrus-imapd/trunk/debian/README.Debian.database
   kolab-cyrus-imapd/trunk/debian/README.postfix
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-cyrus-imapd/trunk/debian/control
   kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
   kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8
   kolab-cyrus-imapd/trunk/debian/executable.files
   kolab-cyrus-imapd/trunk/debian/imapd.conf
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm
   kolab-cyrus-imapd/trunk/debian/patches/00list
   kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch
   kolab-cyrus-imapd/trunk/debian/rules
Log:
* Synced against cyrus-imapd package
  - New descriptions (closes: #382882)
  - Obsoletes 120-kolab-Shell.pm.dpatch; equivalent changes are now in
    65-sieveshell-enhancements.dpatch


Modified: kolab-cyrus-imapd/trunk/debian/README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian	2006-11-01 19:30:50 UTC (rev 501)
@@ -19,7 +19,7 @@
 
 
 Cyrus IMAP for Debian
-$Id: README.Debian 5 2005-03-12 23:19:45Z sven $
+$Id: README.Debian 229 2005-12-08 23:26:29Z astronut $
 ---------------------
 
    "All systems administrators have their horror stories. For me, it was
@@ -102,8 +102,8 @@
    However, you will have to configure it yourself.  No pre-packaged
    configuration of Murder is available at this time...  The documentation is
    all there, and the Cyrus packages will happily preserve your Cyrus Murder
-   configuration.  You do not have to install the cyrus22-imapd or
-   cyrus22-pop3d packages in hosts that only need the proxy daemons running,
+   configuration.  You do not have to install the cyrus-imapd-2.2 or
+   cyrus-pop3d-2.2 packages in hosts that only need the proxy daemons running,
    but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those
    packages (and they are needed by the proxies), so you will have to create
    the files manually.
@@ -116,7 +116,7 @@
 General notes and hints:
 ------------------------
 
- o *** ALWAYS READ /usr/share/doc/cyrus22-common/NEWS.Debian *** after
+ o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after
    you upgrade the package.
 
  o QUOTAS ARE LIMITIED TO 2GB on some platforms.
@@ -170,7 +170,7 @@
    subfolders are children of INBOX, and one where they are all in the same
    hierarchical level).
 
-   See /usr/share/doc/cyrus22-common/html/altnamespace.html for details. If
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details. If
    you deal with a large population of winboze users, this option can save
    you some headaches.
 
@@ -180,7 +180,7 @@
    and the slash separate folders (the "^" character is reserved in this 
    mode).
 
-   See /usr/share/doc/cyrus22-common/html/altnamespace.html for details.
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details.
 
  o When using SASL, do keep in mind that cyrus runs under user cyrus, and not
    root.  It cannot read shadow files (unless you add the user cyrus to group
@@ -219,8 +219,8 @@
    that.  xfs is probably the best one.
  
  o You may want to enable/disable synchronous metadata writes to your mail
-   store dirs (check /usr/share/doc/cyrus22-doc/html/install.html for more
-   info, in package cyrus22-docs).  The cyrus-makedirs script tries to do the
+   store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more
+   info, in package cyrus-docs-2.2).  The cyrus-makedirs script tries to do the
    right thing for ext2 and ext3 filesystems.  Failure to correctly update the
    metadata in the right order can completely screw up your Cyrus store on a
    power-loss or another disk failure.

Modified: kolab-cyrus-imapd/trunk/debian/README.Debian.database
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian.database	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian.database	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian: Database backend conversion
-$Id: README.Debian.database 5 2005-03-12 23:19:45Z sven $
+$Id: README.Debian.database 229 2005-12-08 23:26:29Z astronut $
 --------------------------------------------------
 
    "All systems administrators have their horror stories. For me, it was
@@ -28,7 +28,7 @@
 
 After converting all the mail stores and /var/lib/cyrus to use the proper
 database backends using cvt_cyrusdb(8), remove
-/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus22-common"
+/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus-common-2.2"
 once to reset the error trigger, and start cyrmaster.
 
 If cvt-cyrusdb locks up just at the beginning of the conversion, your databases
@@ -38,7 +38,7 @@
 Step-by-step conversion guide:
 
 1. Stop the Cyrus system
-   /etc/init.d/cyrus22 stop
+   /etc/init.d/cyrus2.2 stop
    
 2. Find out which databases to convert:
    diff -u /usr/lib/cyrus/cyrus-db-types.active \
@@ -103,10 +103,10 @@
 
 3. Reset the database backend change system
    rm /usr/lib/cyrus/cyrus-db-types.active
-   dpkg-reconfigure cyrus22-common
+   dpkg-reconfigure cyrus-common-2.2
 
 4. Start Cyrus, if not started by step 3
-   /etc/init.d/cyrus22 start
+   /etc/init.d/cyrus2.2 start
 
 WHY THERE IS NO AUTOMATED UPGRADE SCRIPT:  Because I dislike people who do not
 read docs, and one Debian user asked me exactly the wrong thing (about

Modified: kolab-cyrus-imapd/trunk/debian/README.postfix
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.postfix	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/README.postfix	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,5 +1,5 @@
 Setting up Cyrus IMAPd for Postfix (Debian)
-$Id: README.postfix 5 2005-03-12 23:19:45Z sven $
+$Id: README.postfix 229 2005-12-08 23:26:29Z astronut $
 ===========================================================
 
 Cyrus works wonderfully well with Postfix, both in single-system stores (where
@@ -84,7 +84,7 @@
 
 4. Restart Postfix and Cyrus IMAPd
 	# /etc/init.d/postfix restart
-	# /etc/init.d/cyrus22 restart
+	# /etc/init.d/cyrus2.2 restart
 
 
 TCP sockets:

Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,3 +1,46 @@
+kolab-cyrus-imapd (2.2.12-9) UNRELEASED; urgency=low
+
+  * Synced against cyrus-imapd package
+    - New descriptions (closes: #382882)
+    - Obsoletes 120-kolab-Shell.pm.dpatch; equivalent changes are now in
+      65-sieveshell-enhancements.dpatch
+
+ -- Peter Eisentraut <petere at debian.org>  Wed,  1 Nov 2006 12:48:56 +0100
+
+cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * Modify the Debian default TLS cipher list to use only secure ciphers
+    suitable for imap/pop/smtp/lmtp TLS, and add an explanation
+
+  [ Benjamin Seidenberg ]
+  * Rewrote descriptions to all refer to cyrus-common-2.2
+  * Changed all package names in all required files within /debian to reflect
+    the new naming scheme
+  * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that
+    this folder is deleted correctly
+  * Changed policy version to 3.6.2
+  * Added upstream patchset 6662:
+    imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error)
+    (Closes: #342314)
+
+  [ Sven Mueller ]
+  * Add a small sed call to debian rules to work around libsnmp[59]-dev
+    problem which causes an unneccesary "-lsensors" in master/Makefile,
+    resulting in an unnessary build dependency on libsensors-dev.
+    Proper fix has to go into netsmp packages, also we need to properly use
+    Debian's libtool. (Closes: #341580)
+  * Add czech translation (thanks to Martin Sin and the debian-l10n-czech
+    team) with a spelling correction from Ondrej Surý.
+  * Adjust kolab2 annotation patch according to patch from Steffen Joeris
+    (Closes: #347527)
+  * Apply patch fixing some error messages in Shell.pm (Closes: #347658)
+
+  [ Ondřej Surý ]
+  * Upload to experimental.
+
+ -- Ondřej Surý <ondrej at debian.org>  Fri, 13 Jan 2006 11:52:58 +0100
+
 kolab-cyrus-imapd (2.2.12-8) unstable; urgency=medium
 
   [ Steffen Joeris ]

Modified: kolab-cyrus-imapd/trunk/debian/control
===================================================================
--- kolab-cyrus-imapd/trunk/debian/control	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/control	2006-11-01 19:30:50 UTC (rev 501)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, libsensors-dev, libldap2-dev, transfig, gs, groff
+Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, libldap2-dev, transfig, gs, groff
 Standards-Version: 3.6.2
 XS-X-Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-cyrus-imapd/
 
@@ -42,27 +42,12 @@
 Conflicts: imap-server, cyrus21-imapd, cyrus-imapd-2.2
 Replaces: cyrus21-imapd
 Description: Cyrus mail system (IMAP support)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the IMAP (Internet Mail Access  Protocol) portion
+ of the Cyrus IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains support for IMAP (Internet Mail Access
- Protocol).
+ For more information, please see the kolab-cyrus-common package.
 
+
 Package: kolab-cyrus-pop3d
 Architecture: any
 Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
@@ -70,25 +55,10 @@
 Conflicts: pop3-server, cyrus21-pop3d, cyrus-pop3d-2.2
 Replaces: cyrus21-pop3d
 Description: Cyrus mail system (POP3 support)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the POP3 (Post Office Protocol) portion of the Cyrus
+ IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains support for POP3 (Post Office Protocol).
+ For more information, please see the kolab-cyrus-common package.
 
 Package: kolab-cyrus-admin
 Architecture: all
@@ -97,28 +67,13 @@
 Conflicts: cyrus-admin, cyrus21-admin, cyrus-admin-2.2
 Replaces: cyrus21-admin
 Description: Cyrus mail system (administration tool)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains the cyradm tool which can be used to administer 
+ This package provides the administrative tools for the Cyrus IMAPd suite.
+ It contains the cyradm tool which can be used to administer
  both local and remote Cyrus mail systems.  It also contains sieveshell
  and its deprecated cousin installsieve, which can be used to manage
  sieve scripts.
+ .
+ For more information, please see the kolab-cyrus-common package.
 
 Package: kolab-cyrus-clients
 Architecture: any
@@ -127,29 +82,15 @@
 Provides: cyrus21-clients
 Replaces: cyrus21-clients
 Description: Cyrus mail system (test clients)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Support for POP3 in addition to IMAP
-  o Virtual domain support
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains the mupdatetest, sivtest, smtptest, lmtptest,
- imtest and pop3test tools which can be used to interactively talk to 
+ This package contains client tools to test the Cyrus IMAPd suite.
+ It contains the mupdatetest, sivtest, smtptest, lmtptest,
+ imtest and pop3test tools which can be used to interactivily talk to
  a mupdate, sieve, smtp, lmtp, imap or pop3 server.
  The clients are fully SASL-enabled for authentication.
+ .
+ For more information, please see the kolab-cyrus-common package.
 
+
 Package: kolab-libcyrus-imap-perl
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}
@@ -158,20 +99,6 @@
 Replaces: libcyrus-imap-perl, libcyrus-imap-perl21
 Section: perl
 Description: Interface to Cyrus imap client imclient library
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Support for POP3 in addition to IMAP
-  o Virtual domain support
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
  The Cyrus::IMAP module provides an interface to the Cyrus imclient
  library.  These are primarily useful for implementing cyradm operations
  within a Perl script; there are easier ways to implement general client
@@ -180,3 +107,6 @@
  .
  The modules that compose Cyrus::SIEVE are also included, but they are
  undocumented upstream.
+ .
+ For more information, please see the kolab-cyrus-common package.
+

Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs	2006-11-01 19:30:50 UTC (rev 501)
@@ -6,7 +6,7 @@
 #  Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh at debian.org.
 #  Released under the terms of the GNU General Public License (GPL) version 2
 #
-# $Id: cyrus-makedirs 5 2005-03-12 23:19:45Z sven $
+# $Id: cyrus-makedirs 229 2005-12-08 23:26:29Z astronut $
 
 # See lib/util.c, dir_hash_c for Cyrus' directory hashing
 # for the new hash style

Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs.8	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" $Id: cyrus-makedirs.8 5 2005-03-12 23:19:45Z sven $
+.\" $Id: cyrus-makedirs.8 229 2005-12-08 23:26:29Z astronut $
 .\" 
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@@ -43,7 +43,7 @@
 to use.  /etc/imapd.conf is assumed, if no parameters are given.
 .SH SEE ALSO
 .BR imapd.conf(5),
-.BR /etc/default/cyrus22
+.BR /etc/default/kolab-cyrus
 .SH AUTHOR
 This manual page was written by Henrique de Moraes Holschuh <hmh at debian.org>,
 for the Debian GNU/Linux system (but may be used by others).

Modified: kolab-cyrus-imapd/trunk/debian/executable.files
===================================================================
--- kolab-cyrus-imapd/trunk/debian/executable.files	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/executable.files	2006-11-01 19:30:50 UTC (rev 501)
@@ -9,10 +9,10 @@
 ./contrib/notify_unix/simple_notify.pl
 ./contrib/notify_unix/sql_notify.pl
 ./debian/cyrus-makedirs
-./debian/cyrus22-common.cyrus22.init
-./debian/cyrus22-common.postinst
-./debian/cyrus22-common.postrm
-./debian/cyrus22-common.prerm
+./debian/kolab-cyrus-common.cyrus22.init
+./debian/kolab-cyrus-common.postinst
+./debian/kolab-cyrus-common.postrm
+./debian/kolab-cyrus-common.prerm
 ./debian/examples/mboxtocyrus
 ./debian/rules
 ./doc/internal/internationalization.html

Modified: kolab-cyrus-imapd/trunk/debian/imapd.conf
===================================================================
--- kolab-cyrus-imapd/trunk/debian/imapd.conf	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/imapd.conf	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,5 +1,5 @@
 # Debian Cyrus imapd.conf
-# $Id: imapd.conf 95 2005-04-08 00:10:54Z sven $
+# $Id: imapd.conf 229 2005-12-08 23:26:29Z astronut $
 # See imapd.conf(5) for more information and more options
 
 # Configuration directory
@@ -15,7 +15,7 @@
 
 # Alternate namespace
 # If enabled, activate the alternate namespace as documented in
-# /usr/share/doc/cyrus22-doc/html/altnamespace.html, where an user's
+# /usr/share/doc/cyrus-doc-2.2/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
@@ -256,9 +256,12 @@
 # disable session caching.
 tls_session_timeout: 1440
 
-# The list of SSL/TLS ciphers to allow.  The format of the string is described
-# in ciphers(1). THIS DISABLES THE WEAK 'FOR EXPORT' CRAP!
-tls_cipher_list: TLSv1:SSLv3:SSLv2:!NULL:!EXPORT:!DES:!LOW:@STRENGTH
+# The list of SSL/TLS ciphers to allow, in decreasing order of precedence.
+# The format of the string is described in ciphers(1).  The Debian default
+# selects TLSv1 high-security ciphers only, and removes all anonymous ciphers
+# from the list (because they provide no defense against man-in-the-middle
+# attacks).  It also orders the list so that stronger ciphers come first.
+tls_cipher_list: TLSv1+HIGH:!aNULL:@STRENGTH
 
 # Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
 #tls_require_cert: false
@@ -306,7 +309,7 @@
 ##
 ## DEBUGGING
 ##
-# Debugging hook. See /usr/share/doc/cyrus22-common/README.Debian.debug
+# Debugging hook. See /usr/share/doc/kolab-cyrus-common/README.Debian.debug
 # Keep the hook disabled when it is not in use
 #
 # gdb Back-traces

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.README.Debian	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,5 +1,5 @@
 Cyrus IMAP for Debian, admin utilities
-$Id: cyrus22-admin.README.Debian 5 2005-03-12 23:19:45Z sven $
+$Id: cyrus-admin-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
 ---------------------
 
 Refer to the cyrus22-doc package for more information.  There is a lot

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-clients.README.Debian	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,8 +1,8 @@
 Cyrus IMAP for Debian, generic SASL-enabled protocol clients
-$Id: cyrus22-clients.README.Debian 5 2005-03-12 23:19:45Z sven $
+$Id: cyrus-clients-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
 ---------------------
 
-Refer to the cyrus22-doc package for more information.  There is a lot
+Refer to the cyrus-doc-2.2 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.
 

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.cron.daily	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Cyrus IMAPd daily maintenance script
 # Copyright (c) 2002,2003 by Henrique M. Holschuh
-# $Id: cyrus22-common.cron.daily 5 2005-03-12 23:19:45Z sven $
+# $Id: cyrus-common-2.2.cron.daily 229 2005-12-08 23:26:29Z astronut $
 # Distributed under the terms of the GNU General Public License version 2
 #
 # This script:

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.default	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,5 +1,5 @@
 # Defaults for Cyrus IMAPd 2.2 scripts
-# $Id: kolab-cyrus-common.kolab-cyrus.default 5 2005-03-12 23:19:45Z sven $
+# $Id: cyrus-common-2.2.cyrus2.2.default 229 2005-12-08 23:26:29Z astronut $
 # sourced by /etc/init.d/kolab-cyrus, /usr/sbin/cyrus-makedirs
 # installed at /etc/default/kolab-cyrus by the maintainer scripts
 #

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init	2006-11-01 19:30:50 UTC (rev 501)
@@ -20,7 +20,7 @@
 #		Various modifications done by Sven Mueller <debian at incase.de>
 #		Distributed under the GPL version 2
 #
-# $Id: cyrus22-common.cyrus22.init 181 2005-11-13 19:15:03Z sven $
+# $Id: cyrus-common-2.2.cyrus2.2.init 229 2005-12-08 23:26:29Z astronut $
 
 # Make sure we get sane results on borked locales
 LC_ALL=C
@@ -118,7 +118,7 @@
 	  -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. Please refer to the guide" 1>&2
-		echo "$0: at /usr/share/doc/cyrus22-common/UPGRADE.Debian" 1>&2
+		echo "$0: at /usr/share/doc/cyrus-common-2.2/UPGRADE.Debian" 1>&2
 		echo
 		echo "$0: Cyrmaster not started."
 		exit 6
@@ -134,7 +134,7 @@
 		    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: Please refer to /usr/share/doc/cyrus22-common/README.Debian" 1>&2
+		    echo "$0: Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian" 1>&2
 		    echo "$0: for instructions." 1>&2
 		    echo
 		    echo "$0: Cyrmaster not started."

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst	2006-11-01 19:30:50 UTC (rev 501)
@@ -2,7 +2,7 @@
 # postinst script for kolab-cyrus-common
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: kolab-cyrus-common.postinst 5 2005-03-12 23:19:45Z sven $
+# $Id: cyrus-common-2.2.postinst 229 2005-12-08 23:26:29Z astronut $
 #
 # see: dh_installdeb(1)
 

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postrm	2006-11-01 19:30:50 UTC (rev 501)
@@ -2,7 +2,7 @@
 # postrm script for kolab-cyrus-common
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: kolab-cyrus-common.postrm 5 2005-03-12 23:19:45Z sven $
+# $Id: cyrus-common-2.2.postrm 232 2005-12-10 22:18:01Z astronut $
 #
 # see: dh_installdeb(1)
 
@@ -32,6 +32,8 @@
 				dpkg-statoverride --remove $i || true
 			done
 			rm -rf /var/run/cyrus || true
+			rm  /usr/lib/cyrus/cyrus-db-types.active || true
+			rm usr/lib/cyrus/cyrus-hardwired-config.active || true
 
 			# Should we remove our precious data?
 			db_title "Cyrus IMAPd 2.2" || true

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.prerm	2006-11-01 19:30:50 UTC (rev 501)
@@ -2,7 +2,7 @@
 # prerm script for kolab-cyrus-common
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: kolab-cyrus-common.prerm 5 2005-03-12 23:19:45Z sven $
+# $Id: cyrus-common-2.2.prerm 229 2005-12-08 23:26:29Z astronut $
 #
 # see: dh_installdeb(1)
 

Added: kolab-cyrus-imapd/trunk/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch	2006-11-01 19:30:50 UTC (rev 501)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23-fix_off_by_one_in_imap_spool.dpatch by Benjamin Seidenberg <astronut at dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: upstream patchset 6662:
+## DP: imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error)
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/imap/spool.c /tmp/dpep.E9tYMt/cyrus-imapd-2.2.12/imap/spool.c
+--- cyrus-imapd-2.2.12/imap/spool.c	2005-12-12 14:02:54.000000000 +0100
++++ /tmp/dpep.E9tYMt/cyrus-imapd-2.2.12/imap/spool.c	2005-12-12 14:08:27.908074019 +0100
+@@ -451,7 +451,7 @@
+ 	    p[1] = '\n';
+ 	    p[2] = '\0';
+ 	}
+-	else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-2)) {
++	else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-3)) {
+ 	    /* line contained a \0 not at the end */
+ 	    r = IMAP_MESSAGE_CONTAINSNULL;
+ 	    continue;

Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,3 +1,4 @@
+00-6662-upstream-off-by-one_in_imap_spool.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch
@@ -35,7 +36,6 @@
 101-fix_Makefile.in.dpatch
 105-cyradm.sh.dpatch
 110-Admin.pm.dpatch
-120-kolab-Shell.pm.dpatch
 130-kolab-imapd-goodchars.dpatch
 140-kolab-ldap.dpatch
 150-kolab-auth_unix

Deleted: kolab-cyrus-imapd/trunk/debian/patches/120-kolab-Shell.pm.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/120-kolab-Shell.pm.dpatch	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/patches/120-kolab-Shell.pm.dpatch	2006-11-01 19:30:50 UTC (rev 501)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 120-Shell.pm.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add small stuff from Kolab
-
- at DPATCH@
---- cyrus22-imapd-2.2.12/perl/imap/IMAP/Shell.pm.orig	2006-01-02 13:19:55.000000000 +0100
-+++ cyrus22-imapd-2.2.12/perl/imap/IMAP/Shell.pm	2006-01-02 13:25:06.000000000 +0100
-@@ -126,7 +126,7 @@
- 		  [\&_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 =>
-@@ -429,7 +429,7 @@
- # programs, as opposed to things expected from within a program.)
- sub shell {
-   my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
--    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl',
-+    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl',
-      "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
-   GetOptions('user|u=s' => \$auth,
- 	     'authz|z=s' => \$authz,
-@@ -459,7 +459,7 @@
- 			  -rock => \$cyradm});
-     $cyradm->authenticate(-authz => $authz, -user => $auth,
- 			  -mechanism => $mech, -password => $pw)
--      or die "cyradm: cannot authenticate to server with $mech as $auth\n";
-+      or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n";
-   }
-   my $fstk = [*STDIN, *STDOUT, *STDERR];
-   if ($dorc && $systemrc ne '' && -f $systemrc) {
-@@ -1339,7 +1339,7 @@
-   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 @@
-   }
-   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";

Modified: kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/patches/65-sieveshell-enhancements.dpatch	2006-11-01 19:30:50 UTC (rev 501)
@@ -5,9 +5,57 @@
 ## DP: Adds some enhancements to sieveshell and fixes some paths.
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/lib/request.c /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/lib/request.c
---- cyrus-imapd-2.2.12/perl/sieve/lib/request.c	2005-11-17 04:21:24.000000000 +0100
-+++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/lib/request.c	2005-11-21 20:21:43.907367956 +0100
+diff -urNad cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm
+--- cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm	2006-01-12 16:03:50.000000000 +0100
++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm	2006-01-12 16:06:24.305462117 +0100
+@@ -126,7 +126,7 @@
+ 		  [\&_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 =>
+@@ -429,7 +429,7 @@
+ # programs, as opposed to things expected from within a program.)
+ sub shell {
+   my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
+-    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl',
++    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl',
+      "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
+   GetOptions('user|u=s' => \$auth,
+ 	     'authz|z=s' => \$authz,
+@@ -459,7 +459,7 @@
+ 			  -rock => \$cyradm});
+     $cyradm->authenticate(-authz => $authz, -user => $auth,
+ 			  -mechanism => $mech, -password => $pw)
+-      or die "cyradm: cannot authenticate to server with $mech as $auth\n";
++      or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n";
+   }
+   my $fstk = [*STDIN, *STDOUT, *STDERR];
+   if ($dorc && $systemrc ne '' && -f $systemrc) {
+@@ -1339,7 +1339,7 @@
+   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 @@
+   }
+   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";
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/lib/request.c /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2.12/perl/sieve/lib/request.c	2006-01-12 16:03:50.000000000 +0100
++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c	2006-01-12 16:06:24.305462117 +0100
 @@ -560,7 +560,6 @@
  	      char **refer_to, char **errstrp)
  {
@@ -16,9 +64,9 @@
    mystring_t *errstr=NULL;
    lexstate_t state;
    int ret = 0;
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
---- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2005-11-21 20:21:42.000000000 +0100
-+++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2005-11-21 20:22:58.422064261 +0100
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2006-01-12 16:06:23.000000000 +0100
++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2006-01-12 16:06:24.306462019 +0100
 @@ -60,7 +60,9 @@
  my $username = $ENV{USER};
  my $authname = $ENV{USER};

Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules	2006-11-01 11:50:00 UTC (rev 500)
+++ kolab-cyrus-imapd/trunk/debian/rules	2006-11-01 19:30:50 UTC (rev 501)
@@ -109,6 +109,7 @@
 	grep with\ options config.status \
 	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
 		>> debian/README.configure-options
+	sed -i 's/ -lsensors//' master/Makefile
 	touch configure-stamp
 
 build-arch: build-arch-stamp




More information about the pkg-kolab-devel mailing list