[pkgsrc/trunk]: pkgsrc/mail/spamassassin Removed patch-ar again, as I have fo...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/941c4a658fc9
branches:  trunk
changeset: 503502:941c4a658fc9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 22 13:03:22 2005 +0000

description:
Removed patch-ar again, as I have found a way to exploit it. Bumped
PKGREVISION.

diffstat:

 mail/spamassassin/Makefile         |   4 ++--
 mail/spamassassin/distinfo         |   3 +--
 mail/spamassassin/patches/patch-ar |  19 -------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diffs (51 lines):

diff -r a9951d19b46e -r 941c4a658fc9 mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Tue Nov 22 12:58:51 2005 +0000
+++ b/mail/spamassassin/Makefile        Tue Nov 22 13:03:22 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2005/11/22 10:37:39 rillig Exp $
+# $NetBSD: Makefile,v 1.64 2005/11/22 13:03:22 rillig Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.1.0
 PKGNAME=       spamassassin-3.1.0
-PKGREVISION=   1
+PKGREVISION=   2
 SVR4_PKGNAME=  sa
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
diff -r a9951d19b46e -r 941c4a658fc9 mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo        Tue Nov 22 12:58:51 2005 +0000
+++ b/mail/spamassassin/distinfo        Tue Nov 22 13:03:22 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2005/11/22 10:35:00 rillig Exp $
+$NetBSD: distinfo,v 1.34 2005/11/22 13:03:22 rillig Exp $
 
 SHA1 (Mail-SpamAssassin-3.1.0.tar.gz) = d887cbae5962cb03e45aaf71cd93881a27cccc99
 RMD160 (Mail-SpamAssassin-3.1.0.tar.gz) = 20dc1b8befcc72545b6136e58a9fcce143480ccd
@@ -7,4 +7,3 @@
 SHA1 (patch-ad) = 1949ac07780ed2c10cdff77ce2ac9982d18a9559
 SHA1 (patch-ae) = 1461b24978c75c394c607ae1d49cb49dd086b563
 SHA1 (patch-aq) = 495a3ac94a05129520e5d7018fdd56b6dad3c951
-SHA1 (patch-ar) = f25adfc8ec072a0c82a0710651a60847c6d4bcb7
diff -r a9951d19b46e -r 941c4a658fc9 mail/spamassassin/patches/patch-ar
--- a/mail/spamassassin/patches/patch-ar        Tue Nov 22 12:58:51 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2005/11/22 10:35:00 rillig Exp $
-
-See http://mail-index.netbsd.org/tech-pkg/2005/11/22/0003.html
-
---- lib/Mail/SpamAssassin/Conf/Parser.pm.orig  Fri Aug 12 02:38:46 2005
-+++ lib/Mail/SpamAssassin/Conf/Parser.pm       Tue Nov 22 11:31:13 2005
-@@ -908,6 +908,12 @@ sub is_regexp_valid {
-   # will therefore open a hole!
-   if (eval { ("" =~ m#${re}#); 1; }) {
- 
-+    # untaint $safere. We know it's safe since $re, which is derived from
-+    # $safere, passed the above test for code injection. Just good that
-+    # Perl prevents injection of (?{...}) and (??{...}) groups automatically,
-+    # so we don't need to check for that.
-+    if ($safere =~ m#^(.*)$#) { $safere = $1; }
-+    
-     # now double-check -- try with the user-supplied delimiters as well
-     my $evalstr = '("" =~ '.$safere.'); 1;';
-     if (eval $evalstr) {