diff options
| author | Brian Somers <brian@FreeBSD.org> | 2004-06-10 10:51:05 +0000 |
|---|---|---|
| committer | Brian Somers <brian@FreeBSD.org> | 2004-06-10 10:51:05 +0000 |
| commit | dd4b9659e2b392d6d4498445f1052c556b35a5f3 (patch) | |
| tree | 68f2c07986ea84c9dd980666325ddaac57ae021a | |
| parent | 37d79d944c64d0a7b323a2f226370a79e4f87c41 (diff) | |
| download | ports-dd4b9659e2b392d6d4498445f1052c556b35a5f3.tar.gz ports-dd4b9659e2b392d6d4498445f1052c556b35a5f3.zip | |
Handle plussed ``User'' names so that mail to user+something attempts to
read ~user/.spamassassin/user_prefs
Bump portrevision to 4
Notes
Notes:
svn path=/head/; revision=111206
| -rw-r--r-- | mail/spamass-milter/Makefile | 2 | ||||
| -rw-r--r-- | mail/spamass-milter/files/patch-spamass-milter.cpp | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index a2e5453a4d42..fd9cc89f1954 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -7,7 +7,7 @@ PORTNAME= spamass-milter PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= spamass-milt diff --git a/mail/spamass-milter/files/patch-spamass-milter.cpp b/mail/spamass-milter/files/patch-spamass-milter.cpp index abb9a0e48b75..c3fa0049b4c1 100644 --- a/mail/spamass-milter/files/patch-spamass-milter.cpp +++ b/mail/spamass-milter/files/patch-spamass-milter.cpp @@ -1,5 +1,5 @@ ---- spamass-milter.cpp.orig Thu Jun 26 17:10:44 2003 -+++ spamass-milter.cpp Tue May 25 00:29:58 2004 +--- spamass-milter.cpp.orig Thu Jun 26 16:10:44 2003 ++++ spamass-milter.cpp Thu Jun 10 11:46:12 2004 @@ -102,6 +102,10 @@ #include <csignal> #include <string> @@ -19,13 +19,26 @@ break; default: /* Parent */ exit(0); -@@ -350,6 +355,9 @@ - string::size_type eoh2(assassin->d().find("\n\r\n")); +@@ -351,6 +356,9 @@ string::size_type eoh = ( eoh1 < eoh2 ? eoh1 : eoh2 ); string::size_type bob = assassin->d().find_first_not_of("\r\n", eoh); -+ + + if (bob == string::npos) + bob = assassin->d().size(); - ++ update_or_insert(assassin, ctx, assassin->spam_flag(), &SpamAssassin::set_spam_flag, "X-Spam-Flag"); update_or_insert(assassin, ctx, assassin->spam_status(), &SpamAssassin::set_spam_status, "X-Spam-Status"); + +@@ -1341,7 +1349,11 @@ + { + // assuming we have a recipient in the form: <username@somehost.somedomain> + // we return 'username' +- return _rcpt.substr(1,_rcpt.find('@')-1); ++ int at = _rcpt.find('@'); ++ int plus = _rcpt.find('+'); ++ if (plus > 0 && plus < at) ++ at = plus; ++ return _rcpt.substr(1,at-1); + } + + int |