diff options
| author | heinz <heinz@pkgsrc.org> | 2005-11-13 05:08:00 +0000 |
|---|---|---|
| committer | heinz <heinz@pkgsrc.org> | 2005-11-13 05:08:00 +0000 |
| commit | e8265013ad7db012611e58b80272133847127bf6 (patch) | |
| tree | 24115f0cbe55c8392866fcbf99a520ad4a954588 /mail | |
| parent | 97ba8e5080f03ece39c71c763805faa57ea3263a (diff) | |
| download | pkgsrc-e8265013ad7db012611e58b80272133847127bf6.tar.gz | |
Added a patch to fix a potential DoS vulnerability (CVE-2005-3351).
See
http://issues.apache.org/SpamAssassin/show_bug.cgi?id=4570
http://secunia.com/advisories/17386
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/spamassassin/Makefile | 4 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 3 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-ax | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index df9fb15f77c..1a2fc76c961 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.60 2005/11/04 11:09:07 rillig Exp $ +# $NetBSD: Makefile,v 1.61 2005/11/13 05:08:00 heinz Exp $ DISTNAME= Mail-SpamAssassin-${SPAMASSASSIN_VERSION} PKGNAME= spamassassin-${SPAMASSASSIN_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 SVR4_PKGNAME= sa CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} \ diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index d95b971c6cb..43f6081db0e 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2005/06/19 22:29:35 heinz Exp $ +$NetBSD: distinfo,v 1.31 2005/11/13 05:08:00 heinz Exp $ SHA1 (Mail-SpamAssassin-3.0.4.tar.gz) = df37b629ab7b8a3fbb370c16537c59749eac1927 RMD160 (Mail-SpamAssassin-3.0.4.tar.gz) = a2c975585f20cd9dba09b645ef69993faed17fb4 @@ -6,3 +6,4 @@ Size (Mail-SpamAssassin-3.0.4.tar.gz) = 1001430 bytes SHA1 (patch-ab) = 36280764366900829205be94466a77662c422524 SHA1 (patch-ae) = 7d57eb154af72ea82cb8fdafd7277823e33b7dd5 SHA1 (patch-aq) = c918a738e0c7048183f5efbb0b7265d355ded7b3 +SHA1 (patch-ax) = d874d0b0b03a90e2db1242ec6c2f99f60452abc4 diff --git a/mail/spamassassin/patches/patch-ax b/mail/spamassassin/patches/patch-ax new file mode 100644 index 00000000000..b1c0c26c2f9 --- /dev/null +++ b/mail/spamassassin/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2005/11/13 05:08:00 heinz Exp $ + +--- lib/Mail/SpamAssassin/Message.pm.orig Mon Jun 6 03:31:23 2005 ++++ lib/Mail/SpamAssassin/Message.pm +@@ -324,7 +324,7 @@ sub get_pristine_header { + my ($self, $hdr) = @_; + + return $self->{pristine_headers} unless $hdr; +- my(@ret) = $self->{pristine_headers} =~ /^(?:$hdr:[ \t]+(.*\n(?:\s+\S.*\n)*))/mig; ++ my(@ret) = $self->{pristine_headers} =~ /^\Q$hdr\E:[ \t]+(.*?\n(?![ \t]))/smgi; + if (@ret) { + return wantarray ? @ret : $ret[-1]; + } |