diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-10-30 08:56:06 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-10-30 08:56:06 +0000 |
| commit | 43e9b2bdff9dcdd0927b847b5a2a958e42db8316 (patch) | |
| tree | 13a27de47c27e5a0fc684976994b4de2cbad5194 /mail/spamass-milter | |
| parent | add gsasl 0.0.8 (diff) | |
- Add a security/stability patch backported from main trunk. [1]
- Utilize USE_AUTOCONF_VER rather than having a direct dependency.
Submitted by: Andrew Belashov <bel@orel.ru> [1]
Approved by: maintainer
Obtained from: Savannah
Notes
Notes:
svn path=/head/; revision=92627
Diffstat (limited to 'mail/spamass-milter')
| -rw-r--r-- | mail/spamass-milter/Makefile | 7 | ||||
| -rw-r--r-- | mail/spamass-milter/files/patch-spamass-milter.cpp | 15 |
2 files changed, 16 insertions, 6 deletions
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index b556b799a31f..f3f2376ed5f4 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -7,6 +7,7 @@ PORTNAME= spamass-milter PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= spamass-milt @@ -14,17 +15,15 @@ MASTER_SITE_SUBDIR= spamass-milt MAINTAINER= ab@astralblue.net COMMENT= Sendmail Milter (mail filter) for SpamAssassin -BUILD_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \ - autoconf:${PORTSDIR}/devel/autoconf +BUILD_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin .if !exists(/usr/lib/libmilter.a) IGNORE= requires Sendmail 8.12; upgrade the base system .endif +USE_AUTOCONF_VER= 253 USE_AUTOMAKE_VER= 15 -AUTOCONF= autoconf -AUTOCONF_DIR= ${LOCALBASE}/share/autoconf MAN1= spamass-milter.1 diff --git a/mail/spamass-milter/files/patch-spamass-milter.cpp b/mail/spamass-milter/files/patch-spamass-milter.cpp index 32769fcf69a7..049ea89572b7 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 18:10:44 2003 -+++ spamass-milter.cpp Wed Jul 2 14:12:25 2003 +--- spamass-milter.cpp.orig Thu Jun 26 19:10:44 2003 ++++ spamass-milter.cpp Wed Oct 29 13:43:29 2003 @@ -102,6 +102,10 @@ #include <csignal> #include <string> @@ -11,3 +11,14 @@ #ifdef __cplusplus extern "C" { +@@ -350,6 +354,9 @@ + string::size_type eoh2(assassin->d().find("\n\r\n")); + 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"); + |