[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.2+dfsg-3-4-gea794b7

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit 5a042dfab38590616f6f9db5397d12fe5eafffec
Author: Thomas Preud'homme <robotux at celest.fr>
Date:   Mon Jan 14 15:12:52 2013 +0100

    Fix corruption when releasing msg from quarantine
    
    Fix recipient corruption when releasing a message from quarantine.

diff --git a/debian/changelog b/debian/changelog
index e5689d5..9ecd349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dspam (3.10.2+dfsg-4) unstable; urgency=low
     architectures (Closes: #695275).
   * Enhance 008_fix_exim_integration_doc.diff to state more explicitly in
     CHANGELOG which changes are backports for Debian of upstream commits.
+  * Cherry-pick patch from upstream to fix recipient corruption when releasing
+    a message from quarantine (Closes: #698136).
 
  -- Thomas Preud'homme <robotux at debian.org>  Tue, 08 Jan 2013 18:50:26 +0100
 
diff --git a/debian/patches/009_fix_recipient_corruption_when_releasing_message_from_quarantine.diff b/debian/patches/009_fix_recipient_corruption_when_releasing_message_from_quarantine.diff
new file mode 100644
index 0000000..18d31da
--- /dev/null
+++ b/debian/patches/009_fix_recipient_corruption_when_releasing_message_from_quarantine.diff
@@ -0,0 +1,41 @@
+Description: Fix recipient corruption when releasing a message from quarantine
+
+When releasing mail from quarantine, dspam corrupts the FROM part in the
+SMTP/LMTP handshake.
+
+Author: Allan Ievers <aimail-dspam_users at rearden.com>
+Origin: upstream, http://dspam.git.sourceforge.net/git/gitweb.cgi?p=dspam/dspam;a=commitdiff;h=cbed19764df8ecc1469f739ca33eb92aa3f67584;hp=0fee2f95025e6111d6f785e2ed762e5e1106253f
+Bug-Debian: http://bugs.debian.org/698136
+Forwarded: http://dspam.git.sourceforge.net/git/gitweb.cgi?p=dspam/dspam;a=commit;h=cbed19764df8ecc1469f739ca33eb92aa3f67584
+Last-Update: 2013-01-14
+Applied-Upstream: commit:cbed19764df8ecc1469f739ca33eb92aa3f67584
+
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,6 +1,8 @@
+-Patch backported for Debian
++Patches backported for Debian
+ --------------
+ 
+ [20121202:2115] sbajic: Update documentation for Exim integration.
+ 
++[20120510:2300] sbajic: Fix recipient corrpution when releasing a message from quarantine
++
+ Version 3.10.2
+--- a/src/dspam.c
++++ b/src/dspam.c
+@@ -1,4 +1,4 @@
+-/* $Id: dspam.c,v 1.412 2011/11/10 00:26:00 tomhendr Exp $ */
++/* $Id: dspam.c,v 1.413 2012/05/10 23:03:25 sbajic Exp $ */
+ 
+ /*
+  DSPAM
+@@ -500,7 +500,7 @@ process_message (
+         }
+ 
+         /* Change also the mail recipient */
+-        ATX->recipient = CTX->username;
++        strcpy(ATX->recipient, CTX->username);
+ 
+       }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 771de47..4ed04b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 006_default-daemon-port.diff
 007_process_quarantine_if_spanish.diff
 008_fix_exim_integration_doc.diff
+009_fix_recipient_corruption_when_releasing_message_from_quarantine.diff

-- 
Debian packages for the DSPAM anti-spam filter