summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorheinz <heinz>2003-06-08 01:11:37 +0000
committerheinz <heinz>2003-06-08 01:11:37 +0000
commitef4e231ed19fab59d2bd919e9a85dec50afe7269 (patch)
treef9af96502c66f96ff4dac925b2954730f1f36641 /mail
parente0e05653569176b0bc0257fb449d909eb8f61e63 (diff)
downloadpkgsrc-ef4e231ed19fab59d2bd919e9a85dec50afe7269.tar.gz
- include patch from SA CVS repository to fix a bug with 'spamassassin -r'
learning a message without Message-Id as ham (see bugzilla #2030) - depend on p5-IO-Socket-SSL>=0.92 because of bugs in earlier versions - bump revision
Diffstat (limited to 'mail')
-rw-r--r--mail/spamassassin/Makefile6
-rw-r--r--mail/spamassassin/distinfo3
-rw-r--r--mail/spamassassin/patches/patch-ap13
3 files changed, 18 insertions, 4 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index a0a1607ab15..b1cfd85b76b 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2003/05/22 11:41:02 abs Exp $
+# $NetBSD: Makefile,v 1.22 2003/06/08 01:11:38 heinz Exp $
DISTNAME= Mail-SpamAssassin-2.55
PKGNAME= spamassassin-2.55
-PKGREVISION= # empty
+PKGREVISION= 1
SVR4_PKGNAME= sa
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \
@@ -22,7 +22,7 @@ DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File
.endif
.if defined(SPAMASSASSIN_USE_SSL) && ${SPAMASSASSIN_USE_SSL} == "YES"
-DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
+DEPENDS+= p5-IO-Socket-SSL>=0.92:../../security/p5-IO-Socket-SSL
CONFIGURE_ARGS+= --enable-ssl
.else
CONFIGURE_ARGS+= --disable-ssl
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 1b319922d1d..c806b9bcb6c 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2003/05/22 11:41:02 abs Exp $
+$NetBSD: distinfo,v 1.15 2003/06/08 01:11:38 heinz Exp $
SHA1 (Mail-SpamAssassin-2.55.tar.gz) = 35aa4f2264694b656154ed5732e4ffecde08c76a
Size (Mail-SpamAssassin-2.55.tar.gz) = 700610 bytes
@@ -9,3 +9,4 @@ SHA1 (patch-ad) = 055d499f89bd5ec7f5c86ce5884c8192df6085f8
SHA1 (patch-ae) = d0f709a8c664481023be93a874afa4033ed4736c
SHA1 (patch-af) = 1c7a1c1490515c8d9c34c8dfddc3b11d87f4c700
SHA1 (patch-ag) = 89d0459d2234ed9333ef2e1a31a619a184250f29
+SHA1 (patch-ap) = 97837a522b94cd365b23ce731d49c4f0aaecbdf2
diff --git a/mail/spamassassin/patches/patch-ap b/mail/spamassassin/patches/patch-ap
new file mode 100644
index 00000000000..dd9a1a18bec
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2003/06/08 01:11:37 heinz Exp $
+
+--- lib/Mail/SpamAssassin.pm.orig Tue May 20 08:06:17 2003
++++ lib/Mail/SpamAssassin.pm
+@@ -558,7 +558,7 @@ sub report_as_spam {
+ $mail = $self->encapsulate_mail_object ($mail);
+
+ # learn as spam
+- $self->learn ($mail, $mail->get_header("Message-Id"), 1, 0);
++ $self->learn ($mail, scalar($mail->get_header("Message-Id")), 1, 0);
+
+ require Mail::SpamAssassin::Reporter;
+ $mail = Mail::SpamAssassin::Reporter->new($self, $mail, $options);