New version 2.36. It'a leaf package and 2.36 fixes a build problem Grant

Beattie encountered on Linux.

Relevant changes sinc 2.22:

       o   Better compatibility of Makefile.PL with new MakeMaker
       o   C Code compiles with C compilers other than GCC.
       o   Detect and skip body parts that only contain MIME headers.
       o   Fixed a bug where razor-check would terminate prematurely
	   on messages for which it could not compute a signature.
       o   Introduced SOCKS support. Net::SOCKS is required in
           order to use SOCKS.  Specify socks_server in the config file.
       o   Fixed a bug where the MIME boundary was being spuriously set
	   in certain cases.
       o   A bug in the selection of zone prefixes in bootstrap
           discovery was fixed.
       o   Razorhome is gleaned from the config file passed to
           razor-agents, if all else fails. "razor-report
           -conf=/etc/razor/razor.conf spam" will use /etc/razor
           as its home if no other home is found (eg in
           $HOME/.razor).  To force a particular Razorhome value,
           use the -home=path option.
       o   Force bootstrap discovery when all discovery servers are
	   unavailable. This fixes a bug where by razor-agents would
	   try to connect to the old Razor2 discovery server found in
	   servers.discovery.lst.

6 files changed, 37 insertions, 33 deletions

diff --git a/mail/p5-razor-agents/Makefile b/mail/p5-razor-agents/Makefile
index f3ad967fc4e..0db504f1eee 100644
--- a/mail/p5-razor-agents/Makefile
+++ b/mail/p5-razor-agents/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2003/10/07 23:20:43 heinz Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/01 00:24:15 heinz Exp $
 
-DISTNAME=	razor-agents-2.22
+DISTNAME=	razor-agents-2.36
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	# empty
 SVR4_PKGNAME=	p5ra
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=razor/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	heinz-p5ra@NetBSD.org
 HOMEPAGE=	http://razor.sourceforge.net/
 COMMENT=	Distributed and collaborative spam detection network
 
diff --git a/mail/p5-razor-agents/distinfo b/mail/p5-razor-agents/distinfo
index aab5a037247..d31caa9ec97 100644
--- a/mail/p5-razor-agents/distinfo
+++ b/mail/p5-razor-agents/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2003/10/07 23:20:43 heinz Exp $
+$NetBSD: distinfo,v 1.6 2003/12/01 00:24:15 heinz Exp $
 
-SHA1 (razor-agents-2.22.tar.gz) = 0b802112741c292a4dc7e9b3bb7c140f868a18cb
-Size (razor-agents-2.22.tar.gz) = 76222 bytes
-SHA1 (patch-aa) = 5a1b861c3b81b1a867a9e41b152f587094e34e93
-SHA1 (patch-ab) = 4cc75b2c1716de6df905bc9a4a3fad042d7859bf
-SHA1 (patch-ac) = a5cc3f0cc07eb51846dcc5b6e2c5e76287e908b8
-SHA1 (patch-ad) = be9eed1f65ed92a9764f439a9c8c18b9a921d4b1
+SHA1 (razor-agents-2.36.tar.gz) = 082f90dc658311e8933b82a67584eeebfa4e7338
+Size (razor-agents-2.36.tar.gz) = 78709 bytes
+SHA1 (patch-aa) = 741b5462e3841430be0dacf80b0ddfcfc4869425
+SHA1 (patch-ab) = 967bf2ea2476ec4205046438877bb52fccb9df50
+SHA1 (patch-ac) = 38a02c02923043733b47e5bf3bca77174670f38c
+SHA1 (patch-ad) = 39d7fff8a4a42093f57f99575fc518c262fa3be1
diff --git a/mail/p5-razor-agents/patches/patch-aa b/mail/p5-razor-agents/patches/patch-aa
index eae0ad5eb71..622e16f93dd 100644
--- a/mail/p5-razor-agents/patches/patch-aa
+++ b/mail/p5-razor-agents/patches/patch-aa
@@ -1,21 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2003/10/07 23:20:43 heinz Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/01 00:24:15 heinz Exp $
 
---- Makefile.PL.orig	Wed Oct 16 00:49:34 2002
+--- Makefile.PL.orig	Tue Aug  5 20:02:43 2003
 +++ Makefile.PL
-@@ -127,8 +127,21 @@ sub MY::install {
-  
-   $inherited =~ s/(\$\(INSTALLMAN1DIR\))/$1$man5/gm;
-   $inherited =~ s/install :: all pure_install doc_install/install :: all pure_install doc_install install_razor_agents/;
--  $inherited .= "\ninstall_razor_agents::\n\t " . '$(INST_SCRIPT)/razor-client'; 
-+  $inherited .= "\ninstall_razor_agents::\n\t " . '$(INSTALLSCRIPT)/razor-client'; 
-   $inherited;
+@@ -138,7 +138,7 @@ sub MY::install {
  
+ # begin razor-agents
+ install_razor_agents ::
+-	$(INST_SCRIPT)/razor-client
++	$(INSTALLSCRIPT)/razor-client
+ # end razor-agents
+ 
+ };
+@@ -149,6 +149,17 @@ install_razor_agents ::
+   $inherited =~ s/(\$\(INSTALL\w*MAN1DIR\))/$1$man5/gm;
+ 
+   return $inherited . $install_razor_agents;
 +}
 +
-+sub MY::libscan {
-+
-+  package MY;
 +
++sub MY::libscan {
 +  my ($self, $path) = @_;
 +
 +  if ($path =~ m/\.orig$/i) {
@@ -25,3 +28,4 @@ $NetBSD: patch-aa,v 1.3 2003/10/07 23:20:43 heinz Exp $
 +  }
  }
  
+ }
diff --git a/mail/p5-razor-agents/patches/patch-ab b/mail/p5-razor-agents/patches/patch-ab
index eee3d6922f3..0ae2f8f213b 100644
--- a/mail/p5-razor-agents/patches/patch-ab
+++ b/mail/p5-razor-agents/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2003/09/27 13:20:25 heinz Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/01 00:24:15 heinz Exp $
 
---- lib/Razor2/Client/Agent.pm.orig	Wed Nov 20 01:26:05 2002
+--- lib/Razor2/Client/Agent.pm.orig	Wed May  7 02:00:38 2003
 +++ lib/Razor2/Client/Agent.pm
-@@ -969,6 +969,7 @@ sub loadservercache {
+@@ -981,6 +981,7 @@ sub loadservercache {
      my @fns;
      if (opendir D,$self->{razorhome}) {
          @fns = map "$self->{razorhome}/$_", grep /^server\.[\S]+\.conf$/, readdir D;
diff --git a/mail/p5-razor-agents/patches/patch-ac b/mail/p5-razor-agents/patches/patch-ac
index baac27f5485..e65a3f0a9ec 100644
--- a/mail/p5-razor-agents/patches/patch-ac
+++ b/mail/p5-razor-agents/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/09/27 13:20:25 heinz Exp $
+$NetBSD: patch-ac,v 1.2 2003/12/01 00:24:15 heinz Exp $
 
---- lib/Razor2/Client/Config.pm.orig	Thu Nov 14 23:47:01 2002
+--- lib/Razor2/Client/Config.pm.orig	Mon Apr 21 21:59:56 2003
 +++ lib/Razor2/Client/Config.pm
-@@ -323,9 +323,11 @@ sub my_readlink {
+@@ -333,9 +333,11 @@ sub my_readlink {
          if ($fn =~ /^(.*)\/([^\/]+)$/) {
              my $dir = $1;
              $fn = readlink $fn;
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.1 2003/09/27 13:20:25 heinz Exp $
          }
      }
  }
-@@ -366,13 +368,13 @@ sub read_file {
+@@ -376,13 +378,13 @@ sub read_file {
          chomp; 
          next if /^\s*#/;
          if ($nothash) {
diff --git a/mail/p5-razor-agents/patches/patch-ad b/mail/p5-razor-agents/patches/patch-ad
index 7ab2dd8fa31..20393b5406c 100644
--- a/mail/p5-razor-agents/patches/patch-ad
+++ b/mail/p5-razor-agents/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2003/09/27 13:20:25 heinz Exp $
+$NetBSD: patch-ad,v 1.2 2003/12/01 00:24:15 heinz Exp $
 
---- lib/Razor2/Client/Core.pm.orig	Wed Nov 13 21:01:10 2002
+--- lib/Razor2/Client/Core.pm.orig	Tue Aug  5 20:07:53 2003
 +++ lib/Razor2/Client/Core.pm
-@@ -216,8 +216,10 @@ sub bootstrap_discovery {
+@@ -218,8 +218,10 @@ sub bootstrap_discovery {
          foreach $rr ($query->answer) { 
              my $pushed = 0;
              if ($rr->type eq "A") {