Revision bump; fixed perl warnings for bug 80302. Keeping stable. Tidy old ebuilds.

(Portage version: 2.0.51-r15)

7 files changed, 48 insertions, 70 deletions

diff --git a/net-analyzer/snortsnarf/ChangeLog b/net-analyzer/snortsnarf/ChangeLog
index e147feba3817..c5ef249cd179 100644
--- a/net-analyzer/snortsnarf/ChangeLog
+++ b/net-analyzer/snortsnarf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/snortsnarf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsnarf/ChangeLog,v 1.11 2005/01/31 14:33:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsnarf/ChangeLog,v 1.12 2005/02/02 14:03:07 ka0ttic Exp $
+
+*snortsnarf-021111.1-r3 (02 Feb 2005)
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/snortsnarf-021111.1-fix-array-refs.diff,
+  -snortsnarf-021111.1-r1.ebuild, -snortsnarf-021111.1-r2.ebuild,
+  +snortsnarf-021111.1-r3.ebuild:
+  Revision bump; fixed perl warnings for bug 80302. Keeping stable. Tidy old
+  ebuilds.
 
 *snortsnarf-021111.1-r2 (31 Jan 2005)
 
diff --git a/net-analyzer/snortsnarf/Manifest b/net-analyzer/snortsnarf/Manifest
index 45beec8ab1dd..807f3d72d5d3 100644
--- a/net-analyzer/snortsnarf/Manifest
+++ b/net-analyzer/snortsnarf/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 eb9a923ad63633b5f924c87bc01e4b82 snortsnarf-021111.1-r2.ebuild 1390
-MD5 074943e945753b9795d9cd688af03055 snortsnarf-021111.1-r1.ebuild 1336
-MD5 de587af22bad0aa281613f8d9e7a43cb ChangeLog 1536
+MD5 22822e0ddb7351c7aa39582b6d58e537 snortsnarf-021111.1-r3.ebuild 1472
+MD5 5f6e0c4e8d8038cf65342416e4c72059 ChangeLog 1863
 MD5 7380609ed15e1e589ab8a1ac5edfc362 metadata.xml 278
-MD5 a25e9ca70d5bf65e193bdbbe153ae7e2 files/digest-snortsnarf-021111.1-r1 71
-MD5 a25e9ca70d5bf65e193bdbbe153ae7e2 files/digest-snortsnarf-021111.1-r2 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB/kHSEZCkKN40op4RAiWvAKCoujuWz4MIhKoultoDHZQsA5g3SQCfRBkZ
-SDjyneiURCbSFtuu/DgyXBc=
-=rB23
------END PGP SIGNATURE-----
+MD5 a25e9ca70d5bf65e193bdbbe153ae7e2 files/digest-snortsnarf-021111.1-r3 71
+MD5 cba2a821966b2abf0265fb38c18e5c9a files/snortsnarf-021111.1-fix-array-refs.diff 1554
diff --git a/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r2 b/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r2
deleted file mode 100644
index 258fb7870393..000000000000
--- a/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74eb59a60f859af8c74a816c346c67cc SnortSnarf-021111.1.tar.gz 143623
diff --git a/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r1 b/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r3
index 258fb7870393..258fb7870393 100644
--- a/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r1
+++ b/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r3
diff --git a/net-analyzer/snortsnarf/files/snortsnarf-021111.1-fix-array-refs.diff b/net-analyzer/snortsnarf/files/snortsnarf-021111.1-fix-array-refs.diff
new file mode 100644
index 000000000000..135643d45b13
--- /dev/null
+++ b/net-analyzer/snortsnarf/files/snortsnarf-021111.1-fix-array-refs.diff
@@ -0,0 +1,26 @@
+Files SnortSnarf-021111.1.orig/include/SnortSnarf/.HTMLAnomMemStorage.pm.swp and SnortSnarf-021111.1/include/SnortSnarf/.HTMLAnomMemStorage.pm.swp differ
+Files SnortSnarf-021111.1.orig/include/SnortSnarf/.HTMLMemStorage.pm.swp and SnortSnarf-021111.1/include/SnortSnarf/.HTMLMemStorage.pm.swp differ
+diff -urN SnortSnarf-021111.1.orig/include/SnortSnarf/HTMLAnomMemStorage.pm SnortSnarf-021111.1/include/SnortSnarf/HTMLAnomMemStorage.pm
+--- SnortSnarf-021111.1.orig/include/SnortSnarf/HTMLAnomMemStorage.pm	2005-02-02 08:19:49.000000000 -0500
++++ SnortSnarf-021111.1/include/SnortSnarf/HTMLAnomMemStorage.pm	2005-02-02 08:50:44.740926336 -0500
+@@ -263,7 +263,7 @@
+         # already sorted
+         my $end= $last-1;
+         $end= $#{$arr} if ($end > $#{$arr});
+-        return @arr->[($first-1)..$end];
++	return (\@arr)->[($first-1)..$end];
+     } elsif (!defined($arr)) { # storage space had never been used
+     	return ();
+     }
+diff -urN SnortSnarf-021111.1.orig/include/SnortSnarf/HTMLMemStorage.pm SnortSnarf-021111.1/include/SnortSnarf/HTMLMemStorage.pm
+--- SnortSnarf-021111.1.orig/include/SnortSnarf/HTMLMemStorage.pm	2005-02-02 08:19:49.000000000 -0500
++++ SnortSnarf-021111.1/include/SnortSnarf/HTMLMemStorage.pm	2005-02-02 08:50:39.479797785 -0500
+@@ -287,7 +287,7 @@
+         # already sorted
+         my $end= $last-1;
+         $end= $#{$arr} if ($end > $#{$arr});
+-        return @arr->[($first-1)..$end];
++	return (\@arr)->[($first-1)..$end];
+     } elsif (!defined($arr)) { # storage space had never been used
+     	return ();
+     }
diff --git a/net-analyzer/snortsnarf/snortsnarf-021111.1-r1.ebuild b/net-analyzer/snortsnarf/snortsnarf-021111.1-r1.ebuild
deleted file mode 100644
index dd2ca38fc303..000000000000
--- a/net-analyzer/snortsnarf/snortsnarf-021111.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsnarf/snortsnarf-021111.1-r1.ebuild,v 1.5 2004/07/11 10:36:38 eldad Exp $
-
-DESCRIPTION="Snort Snarf parses Snort log files, and converts them into easy-to-read HTML files."
-HOMEPAGE="http://www.silicondefense.com/software/snortsnarf/"
-MY_P="SnortSnarf-${PV}"
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.silicondefense.com/software/snortsnarf/${MY_P}.tar.gz"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-RDEPEND="dev-lang/perl
-	dev-perl/Time-modules
-	dev-perl/XML-Parser"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.7"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:"snort.alert":"snort".$dirsep."alert":g' snortsnarf.pl
-}
-
-src_install() {
-	PERL_V=$( perl '-V:version' | awk -F "'" '{print $2}' )
-
-	dodoc Usage COPYING Changes README README.SISR README.nmap2html \
-		new-annotation-base.xml
-
-	dobin snortsnarf.pl nmap2html/log2db.pl nmap2html/nmap2html.pl \
-		nmap2html/nmaplog-dns.pl utilities/*
-
-	dodir /var/www/localhost/snortsnarf/cgi-bin
-	dodir /usr/lib/perl5/site_perl/$PERL_V/SnortSnarf
-
-	insinto /var/www/localhost/snortsnarf/cgi-bin
-	doins cgi/*
-
-	cp -a include/* ${D}/usr/lib/perl5/site_perl/$PERL_V
-}
-
-pkg_postinst() {
-	setup_anns_dir.pl /var/log/snortsnarf
-}
diff --git a/net-analyzer/snortsnarf/snortsnarf-021111.1-r2.ebuild b/net-analyzer/snortsnarf/snortsnarf-021111.1-r3.ebuild
index fe460b7acf06..b7a533c31cf3 100644
--- a/net-analyzer/snortsnarf/snortsnarf-021111.1-r2.ebuild
+++ b/net-analyzer/snortsnarf/snortsnarf-021111.1-r3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsnarf/snortsnarf-021111.1-r2.ebuild,v 1.2 2005/01/31 14:33:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsnarf/snortsnarf-021111.1-r3.ebuild,v 1.1 2005/02/02 14:03:07 ka0ttic Exp $
 
-inherit webapp
+inherit eutils webapp
 
-MY_P="SnortSnarf-${PV}"
+MY_P="${P//s/S}"
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Snort Snarf parses Snort log files, and converts them into easy-to-read HTML files."
 HOMEPAGE="http://www.silicondefense.com/software/snortsnarf/"
 SRC_URI="http://www.silicondefense.com/software/snortsnarf/${MY_P}.tar.gz"
 
-S=${WORKDIR}/${MY_P}
-IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 	dev-perl/Time-modules
@@ -24,7 +24,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i -e 's:"snort.alert":"snort".$dirsep."alert":g' snortsnarf.pl
+	sed -i 's:"snort.alert":"snort".$dirsep."alert":g' snortsnarf.pl \
+		|| die "sed snortsnarf.pl failed"
+	epatch ${FILESDIR}/${P}-fix-array-refs.diff
 }
 
 src_install() {