Update to version 20021111.1.

Based on a patch sent by Hiramatsu Yoshifumi via PR pkg/21540.

Changes:

- fix all installed scripts
- simplify installation
- DESCR has 80 columns
- style nits

20021111.1:
===========
- alerts with original packet included now have both sets of ports and first
  set of IPs as links
- added -obfuscateip option to change the IP addresses in alerts to randomly
  (but consistently) chosen alternates (not presently available for database
  input)
- Updated parsing for Snort 1.9.0 full alert files
- new-style Spade reports now processed (Spade version 021008.1 and on)
- spp_portscan2 log files now processed (these entries are displayed somewhat
  prettified)
- updated linking to ICMP log files; this involved updates for new ICMP header
  format in Snort 1.9.0
- more robust recognition of non-packet alerts in different formats(these get
  ignored)
- clarified warning about unknown ICMP type text and added repeat warning
  suppression (you'll now only get a warning about a particular string twice)
- SnortSnarf will now ignore lines beginning with '#' between alerts, so you
  can use that to begin a comment

5 files changed, 30 insertions, 35 deletions

diff --git a/security/snortsnarf/DESCR b/security/snortsnarf/DESCR
index d430309ef9b..07b0610b08f 100644
--- a/security/snortsnarf/DESCR
+++ b/security/snortsnarf/DESCR
@@ -1,3 +1,3 @@
-SnortSnarf is a Perl program to take files of alerts from the free
-Snort Intrusion Detection System , and produce HTML output intended
-for diagnostic inspection and tracking down problems.
+SnortSnarf is a Perl program to take files of alerts from the free Snort
+Intrusion Detection System, produce HTML output intended for diagnostic
+inspection and tracking down problems.
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index c23479d2e3e..f5f254a10da 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/05 06:29:54 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/13 00:27:48 salo Exp $
 #
 
-DISTNAME=	SnortSnarf-020516.1
-PKGNAME=	snortsnarf-20020516.1
+DISTNAME=	SnortSnarf-021111.1
+PKGNAME=	${DISTNAME:S/SnortSnarf-/snortsnarf-20/}
 CATEGORIES=	security net
 MASTER_SITES=	http://www.silicondefense.com/software/snortsnarf/
 
@@ -10,35 +10,28 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.silicondefense.com/software/snortsnarf/
 COMMENT=	Generate HTML report summaries from snort incident alerts
 
-DEPENDS+=	p5-Time>=101.062101:../../time/p5-Time
+DEPENDS=	p5-Time>=101.062101:../../time/p5-Time
 
-USE_PERL5=	YES
-REPLACE_PERL=	snortsnarf.pl
-NO_BUILD=	# defined
+USE_BUILDLINK2=	YES
+NO_BUILD=	YES
+USE_PERL5=	run
+
+REPLACE_PERL=	snortsnarf.pl include/ann_xml.pl include/web_utils.pl	\
+		include/xml_help.pl
 
 post-configure:
 	@cd ${WRKSRC} && \
-		${SED} -e "s|@PREFIX@|${PREFIX}|g" snortsnarf.pl \
-			> ${WRKDIR}/snortsnarf.pl
+		${SED} -e "s|@PREFIX@|${PREFIX}|g" snortsnarf.pl >	\
+			${WRKDIR}/snortsnarf.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/snortsnarf.pl ${PREFIX}/bin/snortsnarf.pl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snortsnarf/SnortSnarf
-.for f in IPAddrContact.pm ann_xml.pl web_utils.pl xml_help.pl
-		${INSTALL_DATA} ${WRKSRC}/include/${f} \
-			${PREFIX}/share/snortsnarf
-.endfor
-.for f in AlertBase.pm HTMLOutput.pm MemTimeBase.pm MultiStore.pm	\
-	MemPacket.pm HTMLMemStorage.pm Filtering.pm PacketBase.pm	\
-	AllMods.pm BasicFilters.pm KnownEquiv.pm SnortFileInput.pm	\
-	HTMLAnomMemStorage.pm Input.pm SorterBase.pm Sort.pm		\
-	StorageBase.pm MemAlert.pm BasicSorters.pm Filter.pm		\
-	SnortRules.pm MemStorage.pm SnortDBInput.pm TimeFilters.pm
-	${INSTALL_DATA} ${WRKSRC}/include/SnortSnarf/${f} \
-		${PREFIX}/share/snortsnarf/SnortSnarf
-.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/snortsnarf
+	cd ${WRKSRC}/include && ${PAX} -rw -pm * ${PREFIX}/share/snortsnarf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snortsnarf
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/snortsnarf
 	${INSTALL_DATA} ${WRKSRC}/Usage ${PREFIX}/share/doc/snortsnarf
 
+.include "../../lang/perl5/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/snortsnarf/PLIST b/security/snortsnarf/PLIST
index 811af7306ae..edda4b42497 100644
--- a/security/snortsnarf/PLIST
+++ b/security/snortsnarf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/12 16:38:53 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/13 00:27:48 salo Exp $
 bin/snortsnarf.pl
 share/doc/snortsnarf/README
 share/doc/snortsnarf/Usage
@@ -11,7 +11,9 @@ share/snortsnarf/SnortSnarf/Filter.pm
 share/snortsnarf/SnortSnarf/Filtering.pm
 share/snortsnarf/SnortSnarf/HTMLAnomMemStorage.pm
 share/snortsnarf/SnortSnarf/HTMLMemStorage.pm
+share/snortsnarf/SnortSnarf/HTMLOutput+other.pm
 share/snortsnarf/SnortSnarf/HTMLOutput.pm
+share/snortsnarf/SnortSnarf/IPObfuscater.pm
 share/snortsnarf/SnortSnarf/Input.pm
 share/snortsnarf/SnortSnarf/KnownEquiv.pm
 share/snortsnarf/SnortSnarf/MemAlert.pm
diff --git a/security/snortsnarf/distinfo b/security/snortsnarf/distinfo
index 37c69b23605..7728f006147 100644
--- a/security/snortsnarf/distinfo
+++ b/security/snortsnarf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/02/05 06:29:55 grant Exp $
+$NetBSD: distinfo,v 1.4 2003/05/13 00:27:48 salo Exp $
 
-SHA1 (SnortSnarf-020516.1.tar.gz) = 01b4aebabea68dee5973e0d3fa20bfb73afa4b3f
-Size (SnortSnarf-020516.1.tar.gz) = 146806 bytes
-SHA1 (patch-aa) = b99cf1b838b2173f1bc17954e1acb51e37ba8682
+SHA1 (SnortSnarf-021111.1.tar.gz) = f06ce45095b9bcdc0e49033f8180a29141978f43
+Size (SnortSnarf-021111.1.tar.gz) = 143623 bytes
+SHA1 (patch-aa) = bfec42be2afd405cf9c9b79576a247f2239977a2
diff --git a/security/snortsnarf/patches/patch-aa b/security/snortsnarf/patches/patch-aa
index c59afc9a546..7b30b377b6b 100644
--- a/security/snortsnarf/patches/patch-aa
+++ b/security/snortsnarf/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2003/02/05 06:29:55 grant Exp $
+$NetBSD: patch-aa,v 1.4 2003/05/13 00:27:49 salo Exp $
 
---- snortsnarf.pl.orig	Fri May 17 09:00:56 2002
+--- snortsnarf.pl.orig	2002-11-12 10:11:36.000000000 +0900
 +++ snortsnarf.pl
 @@ -77,3 +77,3 @@
  
 -use lib qw(./include);
-+use lib qw(@PREFIX@/share/snortsnarf/);
++use lib qw(@PREFIX@/share/snortsnarf);
  use Cwd;
-@@ -455,2 +455,3 @@ OPTION is one of the following:
+@@ -459,2 +459,3 @@ OPTION is one of the following:
  >>
 -}
 \ No newline at end of file