diff options
| -rw-r--r-- | net-analyzer/snortalog/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff | 13 | ||||
| -rw-r--r-- | net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild | 8 |
3 files changed, 25 insertions, 3 deletions
diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog index 8d0fae358909..a31cc74845cf 100644 --- a/net-analyzer/snortalog/ChangeLog +++ b/net-analyzer/snortalog/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/snortalog # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.10 2005/03/08 14:06:01 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.11 2005/03/20 21:21:21 vanquirius Exp $ + + 20 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> + +files/snortalog-2.3.0-limit-args.diff, snortalog-2.3.0-r1.ebuild: + Fix bug 84745; Thanks to Toralf Förster <toralf.foerster@gmx.de> + and Marco Morales <soulse@gmail.com>. *snortalog-2.3.0-r1 (08 Mar 2005) diff --git a/net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff b/net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff new file mode 100644 index 000000000000..ed3835ad4317 --- /dev/null +++ b/net-analyzer/snortalog/files/snortalog-2.3.0-limit-args.diff @@ -0,0 +1,13 @@ +--- snortalog.pl.orig 2005-03-20 11:50:08.073875696 +0000 ++++ snortalog.pl 2005-03-20 11:50:15.618728704 +0000 +@@ -347,6 +347,10 @@ + $val_opt_p = $opt{p} if ( $opt_p == 1 ); + $val_opt_g = $opt{g} if ( $opt_g == 1 ); + $val_opt_l = $opt{l} if ( $opt_l == 1 ); ++ if ( $opt_h == 1 && $opt_p == 1) { ++ print "Error: You can only create a pdf or an html file, not both simultaneously.\n"; ++ exit(); ++ } + # + # Test if kind of logs are selected else all arent chosen by default + # diff --git a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild index 52b39aadfe1b..921eed2178ac 100644 --- a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild +++ b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild,v 1.1 2005/03/08 14:06:01 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild,v 1.2 2005/03/20 21:21:21 vanquirius Exp $ inherit eutils @@ -24,14 +24,18 @@ RDEPEND="dev-lang/perl src_unpack() { unpack ${A} && cd ${S} + # one file created at a time ( pdf or html ) + epatch ${FILESDIR}/${P}-limit-args.diff + use tcltk || epatch ${FILESDIR}/${PN}-notcltk.diff use tcltk && epatch ${FILESDIR}/${P}-fix-gui.diff - # fix paths + # fix paths, erroneous can access message sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \ -e 's:\($domains_file = "\)\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \ -e 's:\($rules_file = "\)\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \ -e 's:\($hw_file = "\)\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \ -e 's:\($lang_file = "\)\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \ + -e 's:Can access:Can not access:' \ snortalog.pl || die "sed snortalog.pl failed" } |