Added usage patch for bug 82087; thanks to soulse for the patch.

(Portage version: 2.0.51.16)

5 files changed, 89 insertions, 12 deletions

diff --git a/net-analyzer/snortsnarf/ChangeLog b/net-analyzer/snortsnarf/ChangeLog
index c5ef249cd179..06c6f5bbe961 100644
--- a/net-analyzer/snortsnarf/ChangeLog
+++ b/net-analyzer/snortsnarf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2005/02/02 14:03:07 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsnarf/ChangeLog,v 1.13 2005/02/18 11:08:58 ka0ttic Exp $
+
+*snortsnarf-021111.1-r4 (18 Feb 2005)
+
+  18 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/snortsnarf-021111.1-usage.patch, +snortsnarf-021111.1-r4.ebuild:
+  Added usage patch for bug 82087; thanks to soulse for the patch.
 
 *snortsnarf-021111.1-r3 (02 Feb 2005)
 
diff --git a/net-analyzer/snortsnarf/Manifest b/net-analyzer/snortsnarf/Manifest
index 77c1c0eb0fca..c6d8378d8eb4 100644
--- a/net-analyzer/snortsnarf/Manifest
+++ b/net-analyzer/snortsnarf/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5ef311f5386cf3dbd1f702045b305eb9 snortsnarf-021111.1-r4.ebuild 1509
 MD5 e9cf129ba77c0e4833d9f9fd3097f5d3 snortsnarf-021111.1-r3.ebuild 1472
-MD5 6a989d7b0406a06feb6b6786a0ea4a45 ChangeLog 1863
+MD5 bcc2f91d44222ecc9855f765f74757a4 ChangeLog 2093
 MD5 7380609ed15e1e589ab8a1ac5edfc362 metadata.xml 278
+MD5 a3446421109ba3ee7f4fde3acdad7eac files/snortsnarf-021111.1-usage.patch 665
 MD5 a25e9ca70d5bf65e193bdbbe153ae7e2 files/digest-snortsnarf-021111.1-r3 71
+MD5 a25e9ca70d5bf65e193bdbbe153ae7e2 files/digest-snortsnarf-021111.1-r4 71
 MD5 cba2a821966b2abf0265fb38c18e5c9a files/snortsnarf-021111.1-fix-array-refs.diff 1554
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCAN2kEZCkKN40op4RAkbKAKCRzrXEhzu1PzZKMQxeYrcObzrJkQCglq9w
-e2EJn5dSvqUCwYoVfV8IeXs=
-=B7TI
------END PGP SIGNATURE-----
diff --git a/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r4 b/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r4
new file mode 100644
index 000000000000..258fb7870393
--- /dev/null
+++ b/net-analyzer/snortsnarf/files/digest-snortsnarf-021111.1-r4
@@ -0,0 +1 @@
+MD5 74eb59a60f859af8c74a816c346c67cc SnortSnarf-021111.1.tar.gz 143623
diff --git a/net-analyzer/snortsnarf/files/snortsnarf-021111.1-usage.patch b/net-analyzer/snortsnarf/files/snortsnarf-021111.1-usage.patch
new file mode 100644
index 000000000000..173a6e1428e8
--- /dev/null
+++ b/net-analyzer/snortsnarf/files/snortsnarf-021111.1-usage.patch
@@ -0,0 +1,20 @@
+--- snortsnarf.pl.orig	2005-02-16 04:54:49.229405520 +0000
++++ snortsnarf.pl	2005-02-16 04:56:34.709370128 +0000
+@@ -347,7 +347,9 @@
+             $ss_no_run = 1;
+         } elsif ($arg =~ /^-/) {
+             warn "Unknown option $arg\n";
+-        } elsif ($arg =~ /^([\w\-]+|[\w\-]+:.*)@/ && $arg !~ /.log$/) {
++            &usage();
++	    $ss_no_run = 1;
++	} elsif ($arg =~ /^([\w\-]+|[\w\-]+:.*)@/ && $arg !~ /.log$/) {
+             push(@SDIsources,$arg);
+         } else {
+             push(@SFIsources,$arg);
+@@ -457,4 +459,4 @@
+ -v              Show the version number ($version)
+ -usage          Shows this information
+ >>
+-}
+\ No newline at end of file
++}
diff --git a/net-analyzer/snortsnarf/snortsnarf-021111.1-r4.ebuild b/net-analyzer/snortsnarf/snortsnarf-021111.1-r4.ebuild
new file mode 100644
index 000000000000..f994b8b046b6
--- /dev/null
+++ b/net-analyzer/snortsnarf/snortsnarf-021111.1-r4.ebuild
@@ -0,0 +1,57 @@
+# 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-r4.ebuild,v 1.1 2005/02/18 11:08:58 ka0ttic Exp $
+
+inherit eutils webapp
+
+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"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+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 's:"snort.alert":"snort".$dirsep."alert":g' snortsnarf.pl \
+		|| die "sed snortsnarf.pl failed"
+	epatch ${FILESDIR}/${P}-fix-array-refs.diff
+	epatch ${FILESDIR}/${P}-usage.patch
+}
+
+src_install() {
+	webapp_src_preinst
+
+	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 ${MY_CGIBINDIR}/snortsnarf/
+	insinto ${MY_CGIBINDIR}/snortsnarf/
+	doins cgi/*
+
+	dodir /usr/lib/perl5/site_perl/$PERL_V/SnortSnarf
+	cp -a include/* ${D}/usr/lib/perl5/site_perl/$PERL_V
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	setup_anns_dir.pl /var/log/snortsnarf
+}