about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-12-07 23:32:14 +0000
committerEric Wong <e@80x24.org>2023-12-08 00:06:43 +0000
commitc5515401eb4f51998c8444afee9e8f6db1e8d514 (patch)
tree4f7e0b9b5822ca83d6baaef1dc5470af872c4581
parent5f99c1620f44bd06679009f462364186c139cdec (diff)
downloadpublic-inbox-c5515401eb4f51998c8444afee9e8f6db1e8d514.tar.gz
As of SpamAssassin 4.0.0, spamc(1) corrupts messages with NUL in
the body when the `--headers' switch is used.  This increases
transport costs, but most spamc/spamd setups are via local
sockets, so it's unlikely to be significant.

Link: https://bugs.debian.org/1057749
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
-rw-r--r--lib/PublicInbox/Spamcheck/Spamc.pm2
-rwxr-xr-xscripts/dc-dlvr4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/PublicInbox/Spamcheck/Spamc.pm b/lib/PublicInbox/Spamcheck/Spamc.pm
index 798de218..b4f95e2b 100644
--- a/lib/PublicInbox/Spamcheck/Spamc.pm
+++ b/lib/PublicInbox/Spamcheck/Spamc.pm
@@ -11,7 +11,7 @@ use Fcntl qw(SEEK_SET);
 sub new {
         my ($class) = @_;
         bless {
-                checkcmd => [qw(spamc -E --headers)],
+                checkcmd => [qw(spamc -E)],
                 hamcmd => [qw(spamc -L ham)],
                 spamcmd => [qw(spamc -L spam)],
         }, $class;
diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index 935a8312..ef6033b9 100755
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -47,9 +47,9 @@ then
         rm_list="$rm_list $PREMSG"
         set +e
         mv -f $TMPMSG $PREMSG
-        $spamc -E --headers <$PREMSG >$TMPMSG
+        $spamc -E <$PREMSG >$TMPMSG
 else
-        $spamc -E --headers <$CDMSG >$TMPMSG
+        $spamc -E <$CDMSG >$TMPMSG
 fi
 err=$?