Updated debdiff pointed at upstream commit. Thanks to David Prévot for the suggestion.
diff -Nru dspam-3.10.1+dfsg/debian/changelog dspam-3.10.1+dfsg/debian/changelog --- dspam-3.10.1+dfsg/debian/changelog 2012-02-11 05:05:38.000000000 +0800 +++ dspam-3.10.1+dfsg/debian/changelog 2012-08-12 01:01:23.000000000 +0800 @@ -1,3 +1,13 @@ +dspam (3.10.1+dfsg-5) testing-proposed-updates; urgency=low + + * Team upload. + * Upload via testing-proposed-updates as unstable contains a new upstream + version. + * Cherry-pick patch from upstream to recommend using -oi when using dspam + with exim (Closes: #644392). + + -- Thomas Preud'homme <robo...@celest.fr> Sat, 11 Aug 2012 22:25:43 +0800 + dspam (3.10.1+dfsg-4) unstable; urgency=low * Apply patch from upstream to use POSIX::ctime() instead of deprecated diff -Nru dspam-3.10.1+dfsg/debian/dspam-documents/exim4/dspam.conf dspam-3.10.1+dfsg/debian/dspam-documents/exim4/dspam.conf --- dspam-3.10.1+dfsg/debian/dspam-documents/exim4/dspam.conf 2012-02-11 05:05:38.000000000 +0800 +++ dspam-3.10.1+dfsg/debian/dspam-documents/exim4/dspam.conf 2012-08-12 01:01:23.000000000 +0800 @@ -22,7 +22,7 @@ # Other popular configurations: #TrustedDeliveryAgent "/usr/cyrus/bin/deliver" # Cyrus #TrustedDeliveryAgent "/bin/maildrop" # Maildrop -#TrustedDeliveryAgent "/usr/sbin/exim -oMr spam-scanned $u" # Exim +#TrustedDeliveryAgent "/usr/sbin/exim -oMr spam-scanned -oi $u" # Exim TrustedDeliveryAgent "/usr/sbin/exim4" # Exim # #TrustedDeliveryAgent "/usr/bin/procmail" diff -Nru dspam-3.10.1+dfsg/debian/patches/fix_exim_integration_doc dspam-3.10.1+dfsg/debian/patches/fix_exim_integration_doc --- dspam-3.10.1+dfsg/debian/patches/fix_exim_integration_doc 1970-01-01 08:00:00.000000000 +0800 +++ dspam-3.10.1+dfsg/debian/patches/fix_exim_integration_doc 2012-08-12 01:01:07.000000000 +0800 @@ -0,0 +1,62 @@ +Description: Fix documentation about exim integration + +Using dspam with exim requires to call exim with option -oi to avoid mails +from being truncated. This commit modify the documentation and configuration +file to add the -oi option when calling exim. + +Author: Kenneth Marshall <k...@rice.edu> +Origin: upstream, http://dspam.git.sourceforge.net/git/gitweb.cgi?p=dspam/dspam;a=commitdiff;h=e515570c74b0e48e714c5b45f11de2a5b3482459 +Bug-Debian: http://bugs.debian.org/644392 +Forwarded: http://sourceforge.net/mailarchive/forum.php?thread_name=20120802190055.GF15829%40aart.rice.edu&forum_name=dspam-user +Last-Update: 2012-08-12 + +--- dspam-3.10.1+dfsg.orig/CHANGELOG ++++ dspam-3.10.1+dfsg/CHANGELOG +@@ -1,3 +1,5 @@ ++[20121202:2115] sbajic: Update documentation for Exim integration. ++ + Version 3.10.1 + -------------- + +--- dspam-3.10.1+dfsg.orig/doc/exim.txt ++++ dspam-3.10.1+dfsg/doc/exim.txt +@@ -1,4 +1,4 @@ +-$Id: exim.txt,v 1.1 2005/03/11 21:16:03 jonz Exp $ ++$Id: exim.txt,v 1.2 2012/08/02 21:09:23 sbajic Exp $ + + EXIM 4 INTEGRATION + +@@ -40,11 +40,17 @@ domain as part of the username: + + command = /usr/local/bin/dspam --deliver=innocent --user "$local_part@$domain" -- %u + +-Finally, you will need to configure and compile DSPAM. DSPAM will most likely +-end up calling exim again for delivery, using the spam-scanned protocol to +-identify scanned messages. The most common example is: +- +- ./configure --with-delivery-agent="/usr/sbin/exim -oMr spam-scanned" ++Finally, you will need to configure and compile DSPAM. You can configure ++DSPAM with the appropriate LDA using --with-delivery-agent= at configure ++time or by specifying TrustedDeliveryAgent in dspam.conf. DSPAM will most ++likely end up calling exim again for delivery, using the spam-scanned ++protocol to identify scanned messages. The most common example is: ++ ++ ./configure --with-delivery-agent="/usr/local/sbin/exim -oMr spam-scanned -oi" ++ ++Note: DSPAM expects the LDA to NOT provide the "line with a single dot (.)" ++processing to indicate the end of data that a MTA must provide to meet the ++SMTP RFC, hence the "-oi" option to exim above. + + RUNNING WITHOUT PRIVILEGED EXIM USERS + +--- dspam-3.10.1+dfsg.orig/src/dspam.conf.in ++++ dspam-3.10.1+dfsg/src/dspam.conf.in +@@ -43,7 +43,7 @@ StorageDriver @libdir@/dspam/@storage_dr + # Other popular configurations: + #TrustedDeliveryAgent "/usr/cyrus/bin/deliver" # Cyrus + #TrustedDeliveryAgent "/bin/maildrop" # Maildrop +-#TrustedDeliveryAgent "/usr/local/sbin/exim -oMr spam-scanned" # Exim ++#TrustedDeliveryAgent "/usr/local/sbin/exim -oMr spam-scanned -oi" # Exim + # + TrustedDeliveryAgent "@delivery_agent@" + diff -Nru dspam-3.10.1+dfsg/debian/patches/series dspam-3.10.1+dfsg/debian/patches/series --- dspam-3.10.1+dfsg/debian/patches/series 2012-02-11 05:05:38.000000000 +0800 +++ dspam-3.10.1+dfsg/debian/patches/series 2012-08-12 01:01:03.000000000 +0800 @@ -5,3 +5,4 @@ 005_dspam-notify.diff 006_default-daemon-port.diff 007_ctime.pl.diff +fix_exim_integration_doc
