[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: spamassassin update



Ben Lovett wrote:

I received this update from steven mestdagh. Since I'm no longer running
SpamAssassin on any systems, I offered it to steven, and he mentioned
he didn't have the time for it. So if there is anyone out there that
would like to take over, please do so.

I've attached an updated patch since there is a bug in the Razor2 plugin that was only noticed after the release. I've also added myself as the new maintainer.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile	8 Feb 2006 04:54:49 -0000	1.37
+++ Makefile	19 Mar 2006 11:15:15 -0000
@@ -2,11 +2,11 @@
 
 COMMENT=		"mailfilter to identify and mark spam"
 
-DISTNAME=		Mail-SpamAssassin-3.1.0
-PKGNAME=		p5-${DISTNAME}p0
+DISTNAME=		Mail-SpamAssassin-3.1.1
+PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		mail perl5
 
-MAINTAINER=		Ben Lovett <ben_(_at_)_tilderoot_(_dot_)_com>
+MAINTAINER=		Andreas Voegele <voegelas_(_at_)_gmx_(_dot_)_net>
 
 HOMEPAGE=		http://spamassassin.apache.org/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo	9 Oct 2005 09:05:43 -0000	1.23
+++ distinfo	19 Mar 2006 11:15:15 -0000
@@ -1,4 +1,4 @@
-MD5 (Mail-SpamAssassin-3.1.0.tar.gz) = f70c1fcab3d9563731bbc307eda7d69e
-RMD160 (Mail-SpamAssassin-3.1.0.tar.gz) = 20dc1b8befcc72545b6136e58a9fcce143480ccd
-SHA1 (Mail-SpamAssassin-3.1.0.tar.gz) = d887cbae5962cb03e45aaf71cd93881a27cccc99
-SIZE (Mail-SpamAssassin-3.1.0.tar.gz) = 1185499
+MD5 (Mail-SpamAssassin-3.1.1.tar.gz) = f7844cbc149de3d7b09a4310f4ab6739
+RMD160 (Mail-SpamAssassin-3.1.1.tar.gz) = 35e3ff6f8396a9057d9f12acf62a304410d60096
+SHA1 (Mail-SpamAssassin-3.1.1.tar.gz) = cda06e3d38d831521c59e50ec024e468b76035cb
+SIZE (Mail-SpamAssassin-3.1.1.tar.gz) = 1129275
Index: patches/patch-Makefile_PL
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile_PL
--- patches/patch-Makefile_PL	9 Oct 2005 09:05:43 -0000	1.3
+++ patches/patch-Makefile_PL	19 Mar 2006 11:15:15 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_PL,v 1.3 2005/10/09 09:05:43 mbalmer Exp $
---- Makefile.PL.orig	Wed Oct  5 09:35:06 2005
-+++ Makefile.PL	Wed Oct  5 09:35:33 2005
-@@ -809,7 +809,7 @@ sub MY::install {
+--- Makefile.PL.orig	Fri Mar 10 20:30:24 2006
++++ Makefile.PL	Sun Mar 19 11:59:51 2006
+@@ -857,7 +857,7 @@ sub MY::install {
  
    foreach (@code) {
      # Add our install targets as a dependency to all top-level install targets
@@ -10,7 +10,7 @@
  
      # Now do the DESTDIR hack, if necessary.
      next if !$mm_needs_destdir;
-@@ -1085,12 +1085,6 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+@@ -1143,12 +1143,6 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  #bin__install: $(INST_SCRIPT)/sa-filter
  #        # $(RM_F) $(B_SCRIPTDIR)/spamassassin
  #        # $(SYMLINK) $(INST_SCRIPT)/sa-filter $(B_SCRIPTDIR)/spamassassin
Index: patches/patch-lib_Mail_SpamAssassin_Plugin_Razor2_pm
===================================================================
RCS file: patches/patch-lib_Mail_SpamAssassin_Plugin_Razor2_pm
diff -N patches/patch-lib_Mail_SpamAssassin_Plugin_Razor2_pm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Mail_SpamAssassin_Plugin_Razor2_pm	19 Mar 2006 11:15:15 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- lib/Mail/SpamAssassin/Plugin/Razor2.pm.orig	Fri Mar 10 20:29:54 2006
++++ lib/Mail/SpamAssassin/Plugin/Razor2.pm	Sun Mar 19 12:00:45 2006
+@@ -46,6 +46,7 @@ package Mail::SpamAssassin::Plugin::Razo
+ 
+ use Mail::SpamAssassin::Plugin;
+ use Mail::SpamAssassin::Logger;
++use Mail::SpamAssassin::Timeout;
+ use strict;
+ use warnings;
+ use bytes;
Index: patches/patch-lib_Mail_SpamAssassin_pm
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_pm,v
retrieving revision 1.7
diff -u -r1.7 patch-lib_Mail_SpamAssassin_pm
--- patches/patch-lib_Mail_SpamAssassin_pm	31 Oct 2004 08:44:44 -0000	1.7
+++ patches/patch-lib_Mail_SpamAssassin_pm	19 Mar 2006 11:15:15 -0000
@@ -1,6 +1,6 @@
---- lib/Mail/SpamAssassin.pm.orig	Tue Sep 21 15:05:27 2004
-+++ lib/Mail/SpamAssassin.pm	Sun Oct  3 10:46:22 2004
-@@ -150,6 +150,7 @@ $HOME_URL = "http://spamassassin.apache.
+--- lib/Mail/SpamAssassin.pm.orig	Fri Mar 10 20:29:55 2006
++++ lib/Mail/SpamAssassin.pm	Sun Mar 19 11:59:51 2006
+@@ -151,6 +151,7 @@ $HOME_URL = "http://spamassassin.apache.
    '/etc/mail/spamassassin/user_prefs.template',
    '/usr/local/share/spamassassin/user_prefs.template',
    '/usr/share/spamassassin/user_prefs.template',
Index: patches/patch-spamc_spamc_pod
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-spamc_spamc_pod,v
retrieving revision 1.2
diff -u -r1.2 patch-spamc_spamc_pod
--- patches/patch-spamc_spamc_pod	9 Oct 2005 09:05:43 -0000	1.2
+++ patches/patch-spamc_spamc_pod	19 Mar 2006 11:15:15 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-spamc_spamc_pod,v 1.2 2005/10/09 09:05:43 mbalmer Exp $
---- spamc/spamc.pod.orig	Tue Sep 13 19:07:32 2005
-+++ spamc/spamc.pod	Wed Oct  5 09:37:19 2005
-@@ -261,7 +261,7 @@ in an error code.  The exit codes used a
+--- spamc/spamc.pod.orig	Fri Mar 10 20:30:13 2006
++++ spamc/spamc.pod	Sun Mar 19 11:59:51 2006
+@@ -257,7 +257,7 @@ in an error code.  The exit codes used a
  
  =head1 SEE ALSO
  
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- pkg/PLIST	28 Jan 2006 21:27:17 -0000	1.17
+++ pkg/PLIST	19 Mar 2006 11:15:15 -0000
@@ -78,6 +78,7 @@
 ${P5SITE}/Mail/SpamAssassin/SQLBasedAddrList.pm
 ${P5SITE}/Mail/SpamAssassin/SpamdForkScaling.pm
 ${P5SITE}/Mail/SpamAssassin/SubProcBackChannel.pm
+${P5SITE}/Mail/SpamAssassin/Timeout.pm
 ${P5SITE}/Mail/SpamAssassin/Util/
 ${P5SITE}/Mail/SpamAssassin/Util.pm
 ${P5SITE}/Mail/SpamAssassin/Util/DependencyInfo.pm
@@ -135,6 +136,7 @@
 @man man/man3p/Mail::SpamAssassin::PluginHandler.3p
 @man man/man3p/Mail::SpamAssassin::SQLBasedAddrList.3p
 @man man/man3p/Mail::SpamAssassin::SubProcBackChannel.3p
+_(_at_)_man man/man3p/Mail::SpamAssassin::Timeout.3p
 @man man/man3p/Mail::SpamAssassin::Util.3p
 @man man/man3p/Mail::SpamAssassin::Util::Progress.3p
 @man man/man3p/spamassassin-run.3p
@@ -198,5 +200,6 @@
 share/spamassassin/60_whitelist_spf.cf
 share/spamassassin/60_whitelist_subject.cf
 share/spamassassin/languages
+share/spamassassin/sa-update-pubkey.txt
 share/spamassassin/triplets.txt
 share/spamassassin/user_prefs.template