summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/spamassassin/Makefile21
-rw-r--r--mail/spamassassin/PLIST6
-rw-r--r--mail/spamassassin/distinfo13
-rw-r--r--mail/spamassassin/patches/patch-ab38
-rw-r--r--mail/spamassassin/patches/patch-ac2
-rw-r--r--mail/spamassassin/patches/patch-ad2
-rw-r--r--mail/spamassassin/patches/patch-ae6
-rw-r--r--mail/spamassassin/patches/patch-af14
-rw-r--r--mail/spamassassin/patches/patch-ag17
-rw-r--r--mail/spamassassin/patches/patch-ah17
10 files changed, 82 insertions, 54 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 90cd5bd2ff2..400323cc5c9 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/10/08 16:41:32 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/20 20:09:05 heinz Exp $
-DISTNAME= Mail-SpamAssassin-2.42
-PKGNAME= spamassassin-2.42
-PKGREVISION= 1
+DISTNAME= Mail-SpamAssassin-2.43
+PKGNAME= spamassassin-2.43
+PKGREVISION= 0
SVR4_PKGNAME= sa
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \
@@ -59,8 +59,11 @@ test: build
pre-configure: perl5-configure
post-configure:
-.for f in README lib/Mail/SpamAssassin/Conf.pm spamd/README.spamd-vpopmail
- @${SED} -e "s,/usr/share,${PREFIX}/share," \
+.for f in INSTALL README lib/Mail/SpamAssassin/Conf.pm \
+ spamd/README.spamd-vpopmail sql/README
+ @${SED} -e "s,/usr/share,${PREFIX}/share,g" \
+ -e "s,/usr/bin,${PREFIX}/bin,g" \
+ -e "s,/usr/lib,${PREFIX}/lib,g" \
-e "s,/etc/mail,${PKG_SYSCONFBASE},g" \
${WRKSRC}/${f} > ${WRKSRC}/${f}.fixed && \
${MV} ${WRKSRC}/${f}.fixed ${WRKSRC}/${f}
@@ -68,16 +71,18 @@ post-configure:
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
-.for d in html masses/lib/Mail spamd sql tools
+.for d in masses/lib/Mail spamd sql tools
${INSTALL_DATA_DIR} ${DOCDIR}/$d
.endfor
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/spamassassin
+ ${INSTALL_DATA} ${WRKSRC}/ninjabutton.png \
+ ${PREFIX}/share/doc/html/spamassassin/
.for f in INSTALL License README TRADEMARK sample-nonspam.txt \
sample-spam.txt sql/README sql/spamassassin.sql \
spamd/README.spamd spamd/README.spamd-vpopmail
${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/$f
.endfor
${INSTALL_DATA} ${WRKSRC}/rules/STATISTICS.txt ${DOCDIR}/
- ${INSTALL_DATA} ${WRKSRC}/ninjabutton.png ${DOCDIR}/html/
${INSTALL_DATA} ${WRKSRC}/masses/lib/Mail/ArchiveIterator.pm \
${DOCDIR}/masses/lib/Mail/ArchiveIterator.pm
@(cd ${WRKSRC}/masses/; \
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index e13fab0d046..fc61dd2005c 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/10/08 16:41:32 heinz Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/10/20 20:09:05 heinz Exp $
@comment bin/spamassassin
@comment bin/spamc
@comment bin/spamd
@@ -6,12 +6,12 @@ etc/rc.d/spamd
@comment etc/spamassassin/local.cf
@comment etc/spamassassin/netbsd_lists.cf
@comment etc/spamassassin/user_prefs.template
+share/doc/html/spamassassin/ninjabutton.png
share/doc/spamassassin/INSTALL
share/doc/spamassassin/License
share/doc/spamassassin/README
share/doc/spamassassin/STATISTICS.txt
share/doc/spamassassin/TRADEMARK
-share/doc/spamassassin/html/ninjabutton.png
share/doc/spamassassin/masses/CORPUS_POLICY
share/doc/spamassassin/masses/CORPUS_SUBMIT
share/doc/spamassassin/masses/README
@@ -73,6 +73,6 @@ share/spamassassin/user_prefs.template
@dirrm share/doc/spamassassin/masses/lib/Mail
@dirrm share/doc/spamassassin/masses/lib
@dirrm share/doc/spamassassin/masses
-@dirrm share/doc/spamassassin/html
@dirrm share/doc/spamassassin
+@dirrm share/doc/html/spamassassin
@comment @dirrm etc/spamassassin
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 759a27bcb48..4039522cbe1 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2002/10/08 16:41:32 heinz Exp $
+$NetBSD: distinfo,v 1.8 2002/10/20 20:09:05 heinz Exp $
-SHA1 (Mail-SpamAssassin-2.42.tar.gz) = 2a08e271c3496eaacf15a06369972d3395b9b70e
-Size (Mail-SpamAssassin-2.42.tar.gz) = 532504 bytes
-SHA1 (patch-ab) = 696c68944717aeac1046e2eddf6d3cff426ce58b
+SHA1 (Mail-SpamAssassin-2.43.tar.gz) = ffe0f4d80ab2367bb3df856ec777bafb6ac7616e
+Size (Mail-SpamAssassin-2.43.tar.gz) = 538505 bytes
+SHA1 (patch-ab) = df905aebb1e374a549808a5b925fbf9511dc3333
SHA1 (patch-ac) = 229d234f56d113022f08d5b3250c4f12d6808636
SHA1 (patch-ad) = 3aea245cbe066f34004e019ea1bee5c3f62afad3
-SHA1 (patch-ae) = 55f46734f460abb1611e0df07ca8a6091ab2eb43
-SHA1 (patch-af) = f6159bf019ae7af56c132e224c9dfd205f222145
+SHA1 (patch-ae) = 579b1705a3c56b822b5665b2c97c9989e2867e24
+SHA1 (patch-ag) = 1fab0e1a0cc6845f2928ef4983a961ae8f8186f6
+SHA1 (patch-ah) = aa91d70524284ba445e7535e808ce7c5b14d09bb
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 1886f5f76a2..6dcb8689dde 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,17 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2002/10/08 00:49:22 heinz Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/20 20:09:05 heinz Exp $
---- Makefile.PL.orig Fri Oct 4 14:54:10 2002
+--- Makefile.PL.orig Mon Oct 14 18:44:27 2002
+++ Makefile.PL
-@@ -110,7 +110,7 @@
- #. q#
+@@ -134,8 +134,8 @@
+ DEF_RULES_DIR = $(INST_PREFIX)/share/spamassassin
+ PKG_DEF_RULES_DIR = $(PREFIX)/share/spamassassin
- DEF_RULES_DIR = $(PREFIX)/share/spamassassin
--LOCAL_RULES_DIR = $(SYSCONFDIR)/mail/spamassassin
-+LOCAL_RULES_DIR = $(SYSCONFDIR)
+-LOCAL_RULES_DIR = $(INST_SYSCONFDIR)/mail/spamassassin
+-PKG_LOCAL_RULES_DIR = $(SYSCONFDIR)/mail/spamassassin
++LOCAL_RULES_DIR = $(INST_SYSCONFDIR)
++PKG_LOCAL_RULES_DIR = $(SYSCONFDIR)
FIXVARS = -Mvars \
-DVERSION="$(VERSION)" \
-@@ -119,7 +119,7 @@
+@@ -144,7 +144,7 @@
-DLOCAL_RULES_DIR="$(LOCAL_RULES_DIR)" \
-DINSTALLSITELIB="$(INSTALLSITELIB)"
@@ -20,27 +22,27 @@ $NetBSD: patch-ab,v 1.1 2002/10/08 00:49:22 heinz Exp $
spamassassin: spamassassin.raw
$(PERL) build/preprocessor $(FIXVARS) -Msharpbang <$? >$@
-@@ -138,7 +138,7 @@
+@@ -163,7 +163,7 @@
binaries.mk: configure
./configure
--inst_cfs: $(DEF_RULES_DIR) $(LOCAL_RULES_DIR) $(LOCAL_RULES_DIR)/local.cf
-+inst_cfs: $(DEF_RULES_DIR) $(LOCAL_RULES_DIR)
- $(RM_F) $(DEF_RULES_DIR)/*; \
+-inst_cfs: $(PKG_DEF_RULES_DIR) $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
++inst_cfs: $(PKG_DEF_RULES_DIR) $(PKG_LOCAL_RULES_DIR)
+ $(RM_F) $(PKG_DEF_RULES_DIR)/*; \
for file in $(RULES) ; do \
- $(PERL) build/preprocessor $(FIXVARS) <rules/$$file >$(DEF_RULES_DIR)/$$file; \
-@@ -146,13 +146,14 @@
- $(CHMOD) $(PERM_RW) $(DEF_RULES_DIR)/*
+ $(PERL) build/preprocessor $(FIXVARS) <rules/$$file >$(PKG_DEF_RULES_DIR)/$$file; \
+@@ -171,13 +171,14 @@
+ $(CHMOD) $(PERM_RW) $(PKG_DEF_RULES_DIR)/*
- $(DEF_RULES_DIR):
+ $(PKG_DEF_RULES_DIR):
- $(MKPATH) $@
+ $(BSD_INSTALL_DATA_DIR) $@
- $(LOCAL_RULES_DIR):
+ $(PKG_LOCAL_RULES_DIR):
- $(MKPATH) $@
+ $(BSD_INSTALL_DATA_DIR) $@
- $(LOCAL_RULES_DIR)/local.cf: rules/local.cf
+ $(PKG_LOCAL_RULES_DIR)/local.cf: rules/local.cf
- test -f $@ || \
+ \# manage local.cf through pkgsrc .mk files
+ \# test -f $@ || \
diff --git a/mail/spamassassin/patches/patch-ac b/mail/spamassassin/patches/patch-ac
index 9cb39e8d583..cb6e5cd7341 100644
--- a/mail/spamassassin/patches/patch-ac
+++ b/mail/spamassassin/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2002/10/08 00:49:22 heinz Exp $
+$NetBSD: patch-ac,v 1.2 2002/10/20 20:09:05 heinz Exp $
--- spamassassin.raw.orig Fri Oct 4 14:54:12 2002
+++ spamassassin.raw
diff --git a/mail/spamassassin/patches/patch-ad b/mail/spamassassin/patches/patch-ad
index 61645ca3f91..d6527076eed 100644
--- a/mail/spamassassin/patches/patch-ad
+++ b/mail/spamassassin/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/10/08 00:49:22 heinz Exp $
+$NetBSD: patch-ad,v 1.2 2002/10/20 20:09:05 heinz Exp $
--- spamd/netbsd-rc-script.sh.orig Thu Sep 26 12:50:26 2002
+++ spamd/netbsd-rc-script.sh
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index 3186a99a709..54de5850992 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2002/10/08 00:49:23 heinz Exp $
+$NetBSD: patch-ae,v 1.2 2002/10/20 20:09:06 heinz Exp $
---- spamd/spamd.raw.orig Fri Oct 4 14:54:27 2002
+--- spamd/spamd.raw.orig Mon Oct 14 18:44:42 2002
+++ spamd/spamd.raw
-@@ -834,7 +834,8 @@
+@@ -831,7 +831,8 @@
use POSIX 'setsid';
sub daemonize
{
diff --git a/mail/spamassassin/patches/patch-af b/mail/spamassassin/patches/patch-af
deleted file mode 100644
index 0ffe41ad85b..00000000000
--- a/mail/spamassassin/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/10/08 16:41:33 heinz Exp $
-
---- lib/Mail/SpamAssassin/AutoWhitelist.pm.orig Thu Sep 26 13:13:25 2002
-+++ lib/Mail/SpamAssassin/AutoWhitelist.pm
-@@ -100,7 +100,8 @@
- # 5 seems to allow folks who get (3,4,3,2,4,5,...) to dig
- # themselves out, after 6 messages.
- $self->{entry}->{count} ||= 0;
-- $score = $score - ($self->{entry}->{count} * 5);
-+ # pkgsrc: go back to 2.31 AWL behaviour (2.50 (maybe 2.43) will do that, too)
-+ # $score = $score - ($self->{entry}->{count} * 5);
-
- $self->{checker}->add_score($self->{entry},$score);
- }
diff --git a/mail/spamassassin/patches/patch-ag b/mail/spamassassin/patches/patch-ag
new file mode 100644
index 00000000000..1e3bc350d12
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2002/10/20 20:09:06 heinz Exp $
+
+--- lib/Mail/SpamAssassin/Dns.pm.orig Fri Oct 4 14:54:16 2002
++++ lib/Mail/SpamAssassin/Dns.pm
+@@ -389,6 +389,12 @@
+ my $objects = $rc->prepare_objects( \@msg )
+ or die "error in prepare_objects";
+ $rc->get_server_info() or die $rc->errprefix("checkit");
++
++ # let's reset the alarm since get_server_info() calls
++ # nextserver() which calls discover() which very likely will
++ # reset the alarm for us ... how polite. :(
++ alarm $timeout;
++
+ my $sigs = $rc->compute_sigs($objects)
+ or die "error in compute_sigs";
+
diff --git a/mail/spamassassin/patches/patch-ah b/mail/spamassassin/patches/patch-ah
new file mode 100644
index 00000000000..f70ecddc3a0
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1 2002/10/20 20:09:06 heinz Exp $
+
+--- lib/Mail/SpamAssassin/Reporter.pm.orig Mon Oct 14 18:44:35 2002
++++ lib/Mail/SpamAssassin/Reporter.pm
+@@ -151,6 +151,12 @@
+ my $objects = $rc->prepare_objects( \@msg )
+ or adie ("error in prepare_objects");
+ $rc->get_server_info() or adie $rc->errprefix("reportit");
++
++ # let's reset the alarm since get_server_info() calls
++ # nextserver() which calls discover() which very likely will
++ # reset the alarm for us ... how polite. :(
++ alarm $timeout;
++
+ my $sigs = $rc->compute_sigs($objects)
+ or adie ("error in compute_sigs");
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 04:07:06 +0000