[Pkg-dspam-commits] [pkg-dspam-commits] r221 - in branches/experimental/debian: . patches

[Julien Valroff]

Author: julien-guest
Date: Sat Dec 19 15:31:37 2009
New Revision: 221

Log:
Updated patch

Added:
   branches/experimental/debian/patches/009_remove-double-virus-warning.diff
Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/series

Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog	Sat Dec 19 12:43:23 2009	(r220)
+++ branches/experimental/debian/changelog	Sat Dec 19 15:31:37 2009	(r221)
@@ -1,4 +1,4 @@
-dspam (3.9.0~rc2-2) stable; urgency=low
+dspam (3.9.0~rc2-2) experimental; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.

Added: branches/experimental/debian/patches/009_remove-double-virus-warning.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/009_remove-double-virus-warning.diff	Sat Dec 19 15:31:37 2009	(r221)
@@ -0,0 +1,21 @@
+Description: Prevents infected mail warnings to be sent twice to syslog
+Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
+Forwarded: yes
+
+--- a/src/dspam.c
++++ b/src/dspam.c
+@@ -415,9 +415,11 @@ process_message (
+       result = DSR_ISSPAM;
+       strcpy(CTX->class, LANG_CLASS_VIRUS);
+       internally_canned = 1;
+-      if (!dspam_getsource (CTX, ip, sizeof (ip)))
+-      {
+-        LOG(LOG_WARNING, "virus warning: infected message from %s", ip);
++      if(!_ds_match_attribute(agent_config, "TrackSources", "virus")) {
++        if (!dspam_getsource (CTX, ip, sizeof (ip)))
++        {
++          LOG(LOG_WARNING, "virus warning: infected message from %s", ip);
++        }
+       }
+     }
+   }

Modified: branches/experimental/debian/patches/series
==============================================================================
--- branches/experimental/debian/patches/series	Sat Dec 19 12:43:23 2009	(r220)
+++ branches/experimental/debian/patches/series	Sat Dec 19 15:31:37 2009	(r221)
@@ -6,3 +6,4 @@
 006_clean-manpages.diff
 007_path-to-dspam_for-training-script.diff
 008_where-to-find-txt-files.diff
+009_remove-double-virus-warning.diff