[SVN] r579 - in /trunk/cyrus-imapd-2.2.13/debian: changelog logcheck.ignore logcheck.violations.ignore patches/00list patches/77-change-missing-sieve-notice.dpatch

[debian at incase.de]

Author: sven
Date: Mon Aug 21 23:21:05 2006
New Revision: 579

URL: https://mail.incase.de/viewcvs?rev=579&root=cyrus22&view=rev
Log:
Add a "WARNING" prefix to the error message about missing sieve scripts.

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore
    trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=579&root=cyrus22&r1=578&r2=579&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Mon Aug 21 23:21:05 2006
@@ -15,9 +15,11 @@
   * Update italian translation by Cristian Rigamonti <cri at linux.it>
   * Correct README.Debian.database regarding number of .seen and .sub
     databases. (Closes: #383484)
-  * Change wording regarding installsieve in README.Debian. (Closes: #383485) 
-
- -- Sven Mueller <sven at debian.org>  Mon, 21 Aug 2006 23:02:33 +0200
+  * Change wording regarding installsieve in README.Debian. (Closes: #383485)
+  * Add a "WARNING" prefix to the error message about missing sieve scripts.
+    This needs some rework later, but: (Closes: #383640)
+
+ -- Sven Mueller <sven at debian.org>  Mon, 21 Aug 2006 23:19:46 +0200
 
 cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low
 

Modified: trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore?rev=579&root=cyrus22&r1=578&r2=579&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore (original)
+++ trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore Mon Aug 21 23:21:05 2006
@@ -51,5 +51,5 @@
 cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
 cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
 cyrus/notifyd\[[0-9]+\]: do_notify using method
-cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +WARNING: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
 cyrus/lmtpunix\[[0-9]+\]: +Delivered: <[^>]*> to mailbox: .*

Modified: trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore?rev=579&root=cyrus22&r1=578&r2=579&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore (original)
+++ trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore Mon Aug 21 23:21:05 2006
@@ -1,4 +1,4 @@
-cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +WARNING: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
 cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
 cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
 cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=579&root=cyrus22&r1=578&r2=579&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Mon Aug 21 23:21:05 2006
@@ -49,4 +49,5 @@
 70-allow-larger-buffers.dpatch
 72-faster-isdigit.dpatch
 75-update-imapd.conf-documentation.dpatch
+77-change-missing-sieve-notice.dpatch
 99-update-autoconf.dpatch

Added: trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch?rev=579&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch Mon Aug 21 23:21:05 2006
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 77-change-missing-sieve-notice.dpatch.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change the wording of sieved's notice when a user's default sieve
+## DP: script is missing
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/sieve/sieved.c /tmp/dpep.N8OTr9/cyrus-imapd-2.2.13/sieve/sieved.c
+--- cyrus-imapd-2.2.13/sieve/sieved.c	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.N8OTr9/cyrus-imapd-2.2.13/sieve/sieved.c	2006-08-21 23:17:30.638015906 +0200
+@@ -63,7 +63,7 @@
+     unsigned long len=0;
+     
+     if (fstat(fd, &sbuf) == -1) {
+-	printf("IOERROR: fstating sieve script: %m");
++	printf("WARNING: IOERROR: fstating sieve script: %m");
+ 	return SIEVE_FAIL;
+     }
+