[SVN] r890 - in /branches/cyrus23/cyrus-imapd-2.3-hmh/debian: ./ patches/

debian at incase.de debian at incase.de
Wed Jun 9 02:21:13 UTC 2010


Author: hmh
Date: Wed Jun  9 04:20:54 2010
New Revision: 890

URL: https://mail.incase.de/viewcvs?rev=890&root=cyrus22&view=rev
Log:
Remove CVS Id: tags in debian/, some minor debian/patches cleanup, update standards-version

Removed:
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0020-upstream-client-literal-prefix.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0024-upstream-fix-sieve.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0025a-upstream-cve-2009-3235-partial.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/20-fix-bdb-for-4.5.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/45-kolab2-annotations.dpatch
Modified:
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.database
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.debug
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.simpleinstall
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.exim
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.postfix
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.sendmail
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.source
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/TODO.Debian
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/control
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/copyright
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-admin-2.3.README.Debian
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-clients-2.3.README.Debian
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.default
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.init
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus23.cron.daily
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postinst
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postrm
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.prerm
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs.8
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus.conf
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imap.pam
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imapd.conf
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/license.html
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/lmtp.pam
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/mupdate.pam
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0025b-cve-2009-3235-extras.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/77-change-missing-sieve-notice.dpatch
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/series
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/pop.pam
    branches/cyrus23/cyrus-imapd-2.3-hmh/debian/sieve.pam

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Cyrus IMAP for Debian
-$Id: README.Debian 544 2006-08-08 16:37:26Z sven $
 ---------------------
 
    "All systems administrators have their horror stories. For me, it was

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.database
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.database?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.database (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.database Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Cyrus IMAP for Debian: Database backend conversion
-$Id: README.Debian.database 521 2006-07-29 03:39:05Z astronut $
 --------------------------------------------------
 
    "All systems administrators have their horror stories. For me, it was

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.debug
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.debug?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.debug (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.debug Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Cyrus IMAP for Debian, debugging procedures
-$Id: README.Debian.debug 521 2006-07-29 03:39:05Z astronut $
 -------------------------------------------
 
 For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.simpleinstall
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.simpleinstall?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.simpleinstall (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.Debian.simpleinstall Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Cyrus IMAP for Debian, Simple Install Guide
-$Id: README.Debian.simpleinstall 229 2005-12-08 23:26:29Z astronut $
 -------------------------------------------
 
    "All systems administrators have their horror stories. For me, it was

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.exim
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.exim?rev=890&root=cyrus22&r1=889&r2=890&view=
3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.exim (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.exim Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Setting up Cyrus IMAPd for Exim
-$Id: README.exim 727 2007-06-19 12:33:18Z astronut $
 ===============3D============================================
 
 This is very incomplete information, if you are an exim user, please send

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.postfix
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.postfix?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.postfix (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.postfix Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Setting up Cyrus IMAPd for Postfix (Debian)
-$Id: README.postfix 521 2006-07-29 03:39:05Z astronut $
 ===============3D============================================
 
 Cyrus works wonderfully well with Postfix, both in single-system stores (where

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.sendmail
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.sendmail?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.sendmail (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.sendmail Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 Setting up Cyrus IMAPd for Sendmail (Debian)
-$Id: README.sendmail 308 2006-03-07 20:02:36Z sven $
 ===============3D============================================
 
 [This is user-contributed, unverified information]

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.source
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.source?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.source (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/README.source Wed Jun  9 04:20:54 2010
@@ -12,7 +12,9 @@
 FORMAT 1.0.
 
 You MUST set the package format in debian/control, do NOT use
-debian/source/format, or the -f switch to dpkg-source.
+debian/source/format, or the -f switch to dpkg-source.  The Format:
+header in debian/control overrides any other locations, and the 1.0
+compatibility logic in the package only checks debian/control.
 
 The package will make sure all patches are applied on build.  If you
 want to build a Debian package with some patches unapplied, you will
@@ -109,10 +111,6 @@
 You can patch the build tree using the "patch" target, and unpatch it
 using the "unpatch" target, or you can use quilt directly.
 
-Unpatch is not that smart, if a patch gets misapplied, it may fail to
-revert things properly.  If you have a fix for this, I am sure dpatch
-would benefit from it :-)
-
 
 NMUs
 ----

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/TODO.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/TODO.Debian?rev=890&root=cyrus22&r1=889&r2=890&view=
3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/TODO.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/TODO.Debian Wed Jun  9 04:20:54 2010
@@ -1,7 +1,5 @@
 Todo list
 ---------
-
-$Id: TODO.Debian 521 2006-07-29 03:39:05Z astronut $
 
 CONFIRMED TODO FOR 2.2:
 o Cyrus 2.1 has alarm() lock breaking on lib/lock_fcntl().  This has

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/changelog?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/changelog Wed Jun  9 04:20:54 2010
@@ -3,8 +3,9 @@
   [ Henrique de Moraes Holschuh ]
   * New upstream source
     + Use clean tarball from upstream and retain only debian/ dir
-      from 2.3.14-2.  This makes sure all chages from upstream come
-      from debian/patches/*
+      from 2.3.14-2.  This makes sure all chages to upstream code are
+      done by debian/patches/* and avoids problems with weird partial CVS
+      checkouts from upstream
   * Build system:
     + Switch to libdb4.7-dev, to match openldap
     + Build-depend on xutils-dev instead of xutils (makedepend)
@@ -19,10 +20,10 @@
       tarball in years...
     + cyrus-doc-2.3: add Depends: ${misc:Depends} (lintian)
     + debian/control: s/${Source-Version}/${binary:Version}/ (lintian)
-    + debian/cyrus-common-2.3.preinst: remove empty file (lintian)
     + debian/rules: drop DEBUGFLAGS, it is not needed anymore
     + debian/rules: honour CFLAGS, and drop -fPIC as upstream already
       takes care of it
+    + debian/control: bump standards-version to 3.8.4
   * Build system patch management:
     + Switch from dpatch to quilt, to make it compatible with
       dpkg-source format 3.0 (quilt)
@@ -32,16 +33,30 @@
       diff
     + Use Format 3.0 (quilt) by default
     + Build-depend on quilt with dh_quilt_patch/unpatch support
-  * Rework old patch 07-update_aclocal_and_configure.in.dpatch:
-    + Move LOCK_GIVEUP_TIMER_DEFAULT configure.in change to patch
-      12-fix_timeout_handling.dpatch where it belongs
-    + Move warnings-are-errors mode to new patch
-      07-add-warnings-are-errors-mode.dpatch
-    + Move hunk disabling AC_SYS_LONG_FILE_NAMES to new patch
-      81-dont-test-for-long-names.dpatch
+  * Debian patches cleanup:
+    * Remove obsolete patches:
+      + patches 0019,0020,0024,0025a: already upstream
+      + patch 20-fix-bdb-for-4.5: better version already upstream
+      + patch 45-kolab2-annotations.dpatch (non-trivial to port to
+        2.3, and likely somewhat outdated by now)
+    * Rework old patch 07-update_aclocal_and_configure.in.dpatch:
+      + Move LOCK_GIVEUP_TIMER_DEFAULT configure.in change to patch
+        12-fix_timeout_handling.dpatch where it belongs
+      + Move warnings-are-errors mode to new patch
+        07-add-warnings-are-errors-mode.dpatch
+      + Move hunk disabling AC_SYS_LONG_FILE_NAMES to new patch
+        81-dont-test-for-long-names.dpatch
+    * Patch 0025b-cve-2009-3235-extras: rediff, patch is now mostly
+      useless (and doesn't fix any security hole), needs to go upstream or
+      to be dropped
   * initscript: Required-Start/-Stop must refer to $remote_fs (lintian)
   * initscript: Default-Stop should not refer to runlevel S (lintian)
-  * configure: drop obsolete --with-tclsh
+  * debian/rules: drop obsolete --with-tclsh option in configure
+  * debian/cyrus-common-2.3.preinst: remove empty file (lintian)
+  * remove cvs-style Id: tags from every file in debian/, as it just
+    causes problems.  A major ugrade (2.2->2.3) is exactly the right
+    opportunity window to do this, since it can cause dpkg conffile
+    questions
 
   [ Christoph Berg ]
   * Add myself to Uploaders
@@ -53,7 +68,7 @@
   * Convert to use quilt, and update the patch headers to use clean paths
     (Closes: #563303)
 
- -- Henrique de Moraes Holschuh <hmh at debian.org>  Sun, 25 Apr 2010 16:26:45 -0300
+ -- Henrique de Moraes Holschuh <hmh at debian.org>  Sat, 05 Jun 2010 19:45:25 -0300
 
 cyrus-imapd-2.3 (2.3.14-2) UNRELEASED; urgency=medium
 

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/control
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/control?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/control (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/control Wed Jun  9 04:20:54 2010
@@ -4,7 +4,7 @@
 Priority: extra
 Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
 Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, OndÃ…=C2™ej Surý <ondrej at debian.org>, Christoph Berg <myon at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 7), libwrap0-dev, libpam0g-dev, libdb4.7-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev, perl (>= 5.6.0-16), xutils-dev, flex, bison, automake, autotools-dev, po-debconf, quilt (>> 0.46-7), transfig, ghostscript, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
 Xs-Vcs-Browser: https://mail.incase.de/viewcvs/branches/cyrus23/?root=cyrus22
 Xs-Vcs-Svn: https://mail.incase.de/svn/cyrus22/branches/cyrus23

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/copyright
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/copyright?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/copyright (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/copyright Wed Jun  9 04:20:54 2010
@@ -1,5 +1,3 @@
-$Id: copyright 491 2006-06-19 18:22:42Z astronut $
-
 This package was debianized by Henrique de Moraes Holschuh <hmh at debian.org> on
 Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner
 <mj at debian.org> and David Parker <david at neongoat.com>.

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-admin-2.3.README.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-admin-2.3.README.Debian?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-admin-2.3.README.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-admin-2.3.README.Debian Wed Jun  9 04:20:54 2010
@@ -1,6 +1,5 @@
 Cyrus IMAP for Debian, admin utilities
-$Id: cyrus-admin-2.3.README.Debian 229 2005-12-08 23:26:29Z astronut $
----------------------
+--------------------------------------
 
 Refer to the cyrus-doc-2.3 package for more information.  There is a lot
 of it, and it will save you hours (or days) of frustating bug-hunting if

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-clients-2.3.README.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-clients-2.3.README.Debian?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-clients-2.3.README.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-clients-2.3.README.Debian Wed Jun  9 04:20:54 2010
@@ -1,6 +1,5 @@
 Cyrus IMAP for Debian, generic SASL-enabled protocol clients
-$Id: cyrus-clients-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
----------------------
+------------------------------------------------------------
 
 Refer to the cyrus-doc-2.3 package for more information.  There is a lot
 of it, and it will save you hours (or days) of frustating bug-hunting if

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.default
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.default?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.default (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.default Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # Defaults for Cyrus IMAPd 2.3 scripts
-# $Id: cyrus-common-2.3.cyrus2.3.default 543 2006-08-08 16:36:00Z sven $
 # sourced by /etc/init.d/cyrus2.3, /usr/sbin/cyrus-makedirs
 # installed at /etc/default/cyrus2.3 by the maintainer scripts
 #

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.init
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.init?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.init (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus2.3.init Wed Jun  9 04:20:54 2010
@@ -19,8 +19,6 @@
 #		Copyright 2001-2005 by Henrique de Moraes Holschuh <hmh at debian.org>
 #		Various modifications done by Sven Mueller <debian at incase.de>
 #		Distributed under the GPL version 2
-#
-# $Id: cyrus-common-2.3.cyrus2.3.init 543 2006-08-08 16:36:00Z sven $
 
 # Make sure we get sane results on borked locales
 LC_ALL=C

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus23.cron.daily
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus23.cron.daily?rev=890&root=cyrus22&r1=
3D889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus23.cron.daily (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.cyrus23.cron.daily Wed Jun  9 04:20:54 2010
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Cyrus IMAPd daily maintenance script
 # Copyright (c) 2002,2003 by Henrique M. Holschuh
-# $Id: cyrus-common-2.3.cyrus23.cron.daily 549 2006-08-08 20:07:56Z astronut $
 # Distributed under the terms of the GNU General Public License version 2
 #
 # This script:

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postinst
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postinst?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postinst (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postinst Wed Jun  9 04:20:54 2010
@@ -2,7 +2,6 @@
 # postinst script for cyrus-common-2.3
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.3.postinst 503 2006-07-18 15:30:27Z sven $
 #
 # see: dh_installdeb(1)
 

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postrm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postrm?rev=890&root=cyrus22&r1=889&r2=3D890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postrm (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.postrm Wed Jun  9 04:20:54 2010
@@ -2,7 +2,6 @@
 # postrm script for cyrus-common-2.3
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.3.postrm 551 2006-08-08 22:50:11Z sven $
 #
 # see: dh_installdeb(1)
 

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.prerm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.prerm?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.prerm (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-common-2.3.prerm Wed Jun  9 04:20:54 2010
@@ -2,7 +2,6 @@
 # prerm script for cyrus-common-2.3
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.3.prerm 229 2005-12-08 23:26:29Z astronut $
 #
 # see: dh_installdeb(1)
 

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs Wed Jun  9 04:20:54 2010
@@ -5,8 +5,6 @@
 #
 #  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 725 2007-06-19 11:16:53Z astronut $
 
 # See lib/util.c, dir_hash_c for Cyrus' directory hashing
 # for the new hash style

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs.8?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus-makedirs.8 Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" $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

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus.conf?rev=890&root=cyrus22&r1=889&r2=890&view=3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus.conf (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/cyrus.conf Wed Jun  9 04:20:54 2010
@@ -2,7 +2,6 @@
 # see cyrus.conf(5) for more information
 #
 # All the tcp services are tcpd-wrapped. see hosts_access(5)
-# $Id: cyrus.conf 528 2006-07-31 03:22:25Z astronut $
 
 START {
 	# do not delete this entry!

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imap.pam
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imap.pam?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imap.pam (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imap.pam Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # PAM configuration file for Cyrus IMAP service
-# $Id: imap.pam 5 2005-03-12 23:19:45Z sven $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imapd.conf
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imapd.conf?rev=890&root=cyrus22&r1=889&r2=890&view=3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imapd.conf (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/imapd.conf Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # Debian Cyrus imapd.conf
-# $Id: imapd.conf 544 2006-08-08 16:37:26Z sven $
 # See imapd.conf(5) for more information and more options
 
 # Configuration directory

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/license.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/license.html?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/license.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/license.html Wed Jun  9 04:20:54 2010
@@ -1,6 +1,3 @@
-
-
-<! $Id: license.html 5 2005-03-12 23:19:45Z sven $ >
 <HTML>
 <TITLE>
 Cyrus IMAP Licensing

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/lmtp.pam
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/lmtp.pam?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/lmtp.pam (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/lmtp.pam Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # PAM configuration file for Cyrus LMTP service
-# $Id: lmtp.pam 5 2005-03-12 23:19:45Z sven $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/mupdate.pam
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/mupdate.pam?rev=890&root=cyrus22&r1=889&r2=890&view=
3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/mupdate.pam (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/mupdate.pam Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # PAM configuration file for Cyrus Murder mupdate service
-# $Id: mupdate.pam 5 2005-03-12 23:19:45Z sven $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0025b-cve-2009-3235-extras.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0025b-cve-2009-3235-extras.dpatch?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0025b-cve-2009-3235-extras.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/0025b-cve-2009-3235-extras.dpatch Wed Jun  9 04:20:54 2010
@@ -4,12 +4,13 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Additions to upstream fix for CVE-2009-3235 = DSA-1893-1 as
 ## DP: used by Giuseppe Iuculano <giuseppe at iuculano.it> in the Debian
-## DP: security update.
+## DP: security update.  Required if %u ever goes 128-bit ;-)
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13~/sieve/bc_eval.c cyrus-imapd-2.2.13/sieve/bc_eval.c
---- cyrus-imapd-2.2.13~/sieve/bc_eval.c	2009-09-23 09:18:50.557332445 -0300
-+++ cyrus-imapd-2.2.13/sieve/bc_eval.c	2009-09-23 09:20:15.831016330 -0300
-@@ -616,7 +616,7 @@
+Index: cyrus-imapd-2.3-pkg/sieve/bc_eval.c
+===============3D====================================================
+--- cyrus-imapd-2.3-pkg.orig/sieve/bc_eval.c
++++ cyrus-imapd-2.3-pkg/sieve/bc_eval.c
+@@ -635,7 +635,7 @@ static int eval_bc_test(sieve_interp_t *
       
  	if  (match == B_COUNT)
  	{
@@ -18,7 +19,7 @@
  	    /* search through all the data */ 
  	    currd=datai+2;
  	    for (z=0; z<numdata && !res; z++)
-@@ -732,7 +732,7 @@
+@@ -751,7 +751,7 @@ static int eval_bc_test(sieve_interp_t *
  	
  	if  (match == B_COUNT )
  	{
@@ -27,30 +28,3 @@
  	    /*search through all the data*/ 
  	    currd=datai+2;
  	    for (z=0; z<numdata && !res; z++)
-diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
---- cyrus-imapd-2.2.13~/sieve/script.c	2009-09-23 09:18:51.474832314 -0300
-+++ cyrus-imapd-2.2.13/sieve/script.c	2009-09-23 09:18:51.627330879 -0300
-@@ -668,9 +668,9 @@
-     if ((ret != SIEVE_OK) && interp->err) {
- 	char buf[1024];
- 	if (lastaction == -1) /* we never executed an action */
--	    sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret));
-+	    snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret));
- 	else
--	    sprintf(buf, "%s: %s", action_to_string(lastaction),
-+	    snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction),
- 		    errmsg ? errmsg : sieve_errstr(ret));
-  
- 	ret |= interp->execute_err(buf, interp->interp_context,
-diff -urNad cyrus-imapd-2.2.13~/sieve/sieve.y cyrus-imapd-2.2.13/sieve/sieve.y
---- cyrus-imapd-2.2.13~/sieve/sieve.y	2009-09-23 09:18:50.557332445 -0300
-+++ cyrus-imapd-2.2.13/sieve/sieve.y	2009-09-23 09:18:51.627330879 -0300
-@@ -1133,7 +1133,7 @@
- 	else if (!strcmp(r, "ne")) {return NE;}
- 	else if (!strcmp(r, "eq")) {return EQ;}
- 	else{
--	  sprintf(errbuf, "flag '%s': not a valid relational operation", r);
-+	  snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r);
- 	  yyerror(errbuf);
- 	  return -1;
- 	}

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/77-change-missing-sieve-notice.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/77-change-missing-sieve-notice.dpatch?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/77-change-missing-sieve-notice.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/77-change-missing-sieve-notice.dpatch Wed Jun  9 04:20:54 2010
@@ -6,10 +6,11 @@
 ## DP: script is missing
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/sieve/script.c /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c
---- cyrus-imapd-2.2.13/sieve/script.c	2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c	2006-08-21 23:31:25.979899091 +0200
-@@ -37,6 +37,7 @@
+Index: cyrus-imapd-2.3-pkg/sieve/script.c
+===============3D====================================================
+--- cyrus-imapd-2.3-pkg.orig/sieve/script.c
++++ cyrus-imapd-2.3-pkg/sieve/script.c
+@@ -55,6 +55,7 @@
  #include <sys/types.h>
  #include <unistd.h>
  #include <assert.h>
@@ -17,7 +18,7 @@
  
  #include "charset.h"
  #include "hash.h"
-@@ -508,7 +509,11 @@
+@@ -526,7 +527,11 @@ int sieve_script_load(const char *fname,
      if (!fname || !ret) return SIEVE_FAIL;
      
      if (stat(fname, &sbuf) == -1) {

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/series
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/series?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/series (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/patches/series Wed Jun  9 04:20:54 2010
@@ -1,6 +1,4 @@
-#0024-upstream-fix-sieve.dpatch
-#0025a-upstream-cve-2009-3235-partial.dpatch
-#0025b-cve-2009-3235-extras.dpatch
+0025b-cve-2009-3235-extras.dpatch
 01-fix_Makefile.in.dpatch
 #02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch
@@ -27,5 +25,6 @@
 65-sieveshell-enhancements.dpatch
 70-allow-larger-buffers.dpatch
 75-update-imapd.conf-documentation.dpatch
+77-change-missing-sieve-notice.dpatch
 80-kbsd-no-psstrings.dpatch
 81-dont-test-for-long-names.dpatch

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/pop.pam
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/pop.pam?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/pop.pam (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/pop.pam Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # PAM configuration file for Cyrus POP3 service
-# $Id: pop.pam 5 2005-03-12 23:19:45Z sven $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure

Modified: branches/cyrus23/cyrus-imapd-2.3-hmh/debian/sieve.pam
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-hmh/debian/sieve.pam?rev=890&root=cyrus22&r1=889&r2=890&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-hmh/debian/sieve.pam (original)
+++ branches/cyrus23/cyrus-imapd-2.3-hmh/debian/sieve.pam Wed Jun  9 04:20:54 2010
@@ -1,5 +1,4 @@
 # PAM configuration file for Cyrus SIEVE timsieved service
-# $Id: sieve.pam 5 2005-03-12 23:19:45Z sven $
 #
 # If you want to use Cyrus in a setup where users don't have
 # accounts on the local machine, you'll need to make sure




More information about the Pkg-Cyrus-imapd-Debian-devel mailing list