[SVN] r611 - in /branches: cyrus23/cyrus-imapd-2.3-2.3.7/debian/ cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/ sarge-2.2.13/debian/ sarge-2.2.13/debian/patches/

debian at incase.de debian at incase.de
Thu Sep 14 18:24:15 UTC 2006 

Author: sven
Date: Thu Sep 14 20:24:10 2006
New Revision: 611

URL: https://mail.incase.de/viewcvs?rev=611&root=cyrus22&view=rev
Log:
Merge trunk changes up to r610, also tag sarge 2.2.13-7~bpo1 version

Modified:
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/77-change-missing-sieve-notice.dpatch
    branches/sarge-2.2.13/debian/changelog
    branches/sarge-2.2.13/debian/logcheck.ignore
    branches/sarge-2.2.13/debian/logcheck.violations.ignore
    branches/sarge-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog Thu Sep 14 20:24:10 2006
@@ -28,7 +28,7 @@
 
  -- Benjamin Seidenberg <astronut at dlgeek.net>  Tue,  5 Sep 2006 23:20:52 -0400
 
-cyrus-imapd-2.2 (2.2.13-7) UNRELEASED; urgency=low
+cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
 
   * The "Bad translations in the middle of the night" release.
   * Update czech translation by Martin Šín <martin.sin at zshk.cz>
@@ -58,8 +58,9 @@
     (henrich at samba.gr.jp)
   * Update logcheck rules (thanks to Paul Traina <reportbug at st04.pst.org>)
     (Closes: #387180)
-
- -- Sven Mueller <sven at debian.org>  Wed, 13 Sep 2006 14:24:53 +0200
+  * Add a patch to change a log message when a user has no sieve file.
+
+ -- Sven Mueller <sven at debian.org>  Thu, 14 Sep 2006 18:58:49 +0200
 
 cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low
 

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore Thu Sep 14 20:24:10 2006
@@ -53,10 +53,11 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <[^>]+> +to mailbox: .*$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
-
+

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore Thu Sep 14 20:24:10 2006
@@ -1,6 +1,7 @@
 
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START)?TLS( negotiation)? failed:
-
+

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/77-change-missing-sieve-notice.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/77-change-missing-sieve-notice.dpatch?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/77-change-missing-sieve-notice.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/patches/77-change-missing-sieve-notice.dpatch Thu Sep 14 20:24:10 2006
@@ -9,7 +9,15 @@
 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
-@@ -418,7 +418,11 @@
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <errno.h>
+ 
+ #include "xmalloc.h"
+ 
+@@ -418,7 +419,11 @@
      if (!fname || !ret) return SIEVE_FAIL;
      
      if (stat(fname, &sbuf) == -1) {

Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Thu Sep 14 20:24:10 2006
@@ -1,4 +1,4 @@
-cyrus-imapd-2.2 (2.2.13-7~bpo1) UNRELEASED; urgency=low
+cyrus-imapd-2.2 (2.2.13-7~bpo1) sarge-backports; urgency=low
 
   * backport to sarge 
 
@@ -34,8 +34,9 @@
     (henrich at samba.gr.jp)
   * Update logcheck rules (thanks to Paul Traina <reportbug at st04.pst.org>)
     (Closes: #387180)
-
- -- Sven Mueller <sven at debian.org>  Wed, 13 Sep 2006 14:35:41 +0200
+  * Add a patch to change a log message when a user has no sieve file.
+
+ -- Sven Mueller <sven at debian.org>  Thu, 14 Sep 2006 18:58:49 +0200
 
 cyrus-imapd-2.2 (2.2.13-5bpo2) sarge-backports; urgency=low
 

Modified: branches/sarge-2.2.13/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/logcheck.ignore?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/logcheck.ignore (original)
+++ branches/sarge-2.2.13/debian/logcheck.ignore Thu Sep 14 20:24:10 2006
@@ -53,10 +53,11 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <[^>]+> +to mailbox: .*$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
-
+

Modified: branches/sarge-2.2.13/debian/logcheck.violations.ignore
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/logcheck.violations.ignore?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/logcheck.violations.ignore (original)
+++ branches/sarge-2.2.13/debian/logcheck.violations.ignore Thu Sep 14 20:24:10 2006
@@ -1,6 +1,7 @@
 
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START)?TLS( negotiation)? failed:
-
+

Modified: branches/sarge-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch?rev=611&root=cyrus22&r1=610&r2=611&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch Thu Sep 14 20:24:10 2006
@@ -9,7 +9,15 @@
 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
-@@ -418,7 +418,11 @@
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <errno.h>
+ 
+ #include "xmalloc.h"
+ 
+@@ -418,7 +419,11 @@
      if (!fname || !ret) return SIEVE_FAIL;
      
      if (stat(fname, &sbuf) == -1) {

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