Version bump; Moved >20k patches to the mirrors.

Package-Manager: portage-2.0.51.19

8 files changed, 139 insertions, 233 deletions

diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog
index a31cc74845cf..91bdbc66f9a4 100644
--- a/net-analyzer/snortalog/ChangeLog
+++ b/net-analyzer/snortalog/ChangeLog
@@ -1,6 +1,15 @@
 # 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.11 2005/03/20 21:21:21 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.12 2005/04/14 12:51:04 ka0ttic Exp $
+
+*snortalog-2.4.0 (14 Apr 2005)
+
+  14 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/snortalog-2.3.0-fix-gui.diff,
+  +files/snortalog-2.4.0-limit-args.diff,
+  +files/snortalog-2.4.0-notcltk.diff, snortalog-2.3.0-r1.ebuild,
+  +snortalog-2.4.0.ebuild:
+  Version bump; Moved >20k patches to the mirrors.
 
   20 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
   +files/snortalog-2.3.0-limit-args.diff, snortalog-2.3.0-r1.ebuild:
diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
index 20e4998617f9..532f95b78875 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,9 +1,22 @@
-MD5 46a3fe99cef6fdfae60f265b8ffd0018 snortalog-2.3.0-r1.ebuild 1556
-MD5 b23b2c51a9098b18c75e62a315d0d9bb ChangeLog 1989
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b361b54ea89d5d6ca0683c41255405c2 snortalog-2.3.0-r1.ebuild 1622
+MD5 119ef5b7c429dfd38ef63a4124fd5ea7 snortalog-2.4.0.ebuild 1649
+MD5 a6ebf34d22099ebbc7071dca5e986eca ChangeLog 2293
 MD5 fc4e25d7343dc6d2b44602bd3972903a metadata.xml 245
 MD5 3c6299c73242108db6f0c15e9db57df6 snortalog-2.2.1.ebuild 771
-MD5 d310df1dda7c5bd218d9b38c97429c7c files/snortalog-2.3.0-fix-gui.diff 20004
+MD5 0b9975fa825cb3029556ddb3a722cfb3 files/snortalog-2.4.0-notcltk.diff 908
 MD5 424d2f24724379f96c1c10b866081de4 files/digest-snortalog-2.2.1 65
+MD5 423b8e9ae91455bd383da76f9c5b3d8e files/digest-snortalog-2.4.0 65
+MD5 a5a0841e5bd64eaa526550646dfa3f5c files/snortalog-2.4.0-limit-args.diff 495
 MD5 9ffebf50ecd9113ef41a27a476b5bbe5 files/digest-snortalog-2.3.0-r1 65
 MD5 2f2b2b3bb86008d2d74474f2523d1420 files/snortalog-notcltk.diff 813
 MD5 af01fbfd326839abf6cf3bb9f0bc5226 files/snortalog-2.3.0-limit-args.diff 484
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCXmdxEZCkKN40op4RAowzAKC+CezguS2+IwXTv+X30mE2USo2XACdEBw5
+xFn32pG1GsPfPdzD82k/hug=
+=zhrm
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/snortalog/files/digest-snortalog-2.4.0 b/net-analyzer/snortalog/files/digest-snortalog-2.4.0
new file mode 100644
index 000000000000..a8f7f9839d4a
--- /dev/null
+++ b/net-analyzer/snortalog/files/digest-snortalog-2.4.0
@@ -0,0 +1 @@
+MD5 f7ff35957ea9870f630973f33f2f2cff snortalog_v2.4.0.tgz 215079
diff --git a/net-analyzer/snortalog/files/snortalog-2.3.0-fix-gui.diff b/net-analyzer/snortalog/files/snortalog-2.3.0-fix-gui.diff
deleted file mode 100644
index 24f7958255d8..000000000000
--- a/net-analyzer/snortalog/files/snortalog-2.3.0-fix-gui.diff
+++ /dev/null
@@ -1,223 +0,0 @@
---- modules/gui.snortalog.orig	2005-03-08 08:41:22.396167392 -0500
-+++ modules/gui.snortalog	2005-03-08 08:50:09.702004720 -0500
-@@ -92,20 +92,20 @@
- 	$pageresult = $note->add("pageresult", label => 'Result');
- 	$pagedebug = $note->add("pagedebug", label => 'Debug');
- 
--	$label_file = $pagegen->Label(text => 'File :')->place(-x => 10, -y => 0);
--	$entry_file = $pagegen->Entry(width => 33, background => 'gray')->place(-x => 10, -y => 20);
-+	$label_file = $pagegen->Label(-text => 'File :')->place(-x => 10, -y => 0);
-+	$entry_file = $pagegen->Entry(-width => 33, -background => 'gray')->place(-x => 10, -y => 20);
- 
--	$cadre_load_option = $pagegen->Label(width => 33, height => 30, relief => 'groove')->place(-x => 270 , -y => 20);
--	$label_work = $pagegen->Label(text => 'Load Options :')->place(-x => 275, -y => 10);
-+	$cadre_load_option = $pagegen->Label(-width => 33, -height => 30, -relief => 'groove')->place(-x => 270 , -y => 20);
-+	$label_work = $pagegen->Label(-text => 'Load Options :')->place(-x => 275, -y => 10);
- 
- 
--	$button_load = $pagegen->Button( text => 'Load File', width => 12, command => \&xload)->place(-x => 330, -y => 40);
--	$button_unload = $pagegen->Button( text => 'Unload All', width => 12 , command => \&x_unload)->place(-x => 330, -y => 70);
-+	$button_load = $pagegen->Button( -text => 'Load File', -width => 12, -command => \&xload)->place(-x => 330, -y => 40);
-+	$button_unload = $pagegen->Button( -text => 'Unload All', -width => 12 , -command => \&x_unload)->place(-x => 330, -y => 70);
- 	$optdbm = 0;                     # Starting value
--	$opt_dbm = $pagegen->Checkbutton ( variable => \$optdbm, text => 'Use DBM')->place(-x => 340, -y => 110);
-+	$opt_dbm = $pagegen->Checkbutton ( -variable => \$optdbm, -text => 'Use DBM')->place(-x => 340, -y => 110);
- 	$optd = 0;                     # Starting value
--	$opt_d = $pagegen->Checkbutton ( variable => \$optd, text => 'Debug Mode')->place(-x => 340, -y => 130);
--	$listbox_load = $pagegen->Scrolled('Text', width => 30, height => 14, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->place(-x => 10, -y => 40);
-+	$opt_d = $pagegen->Checkbutton ( -variable => \$optd, -text => 'Debug Mode')->place(-x => 340, -y => 130);
-+	$listbox_load = $pagegen->Scrolled('Text', -width => 30, -height => 14, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->place(-x => 10, -y => 40);
- 	$optall = 1;                   # Starting value
- 	$opt1 = 0;                     # Starting value
- 	$opt2 = 0;                     # Starting value
-@@ -115,22 +115,22 @@
- 	$opt6 = 0;                     # Starting value
- 	$opt7 = 0;                     # Starting value
- 	$opt8 = 0;                     # Starting value
--	$cadre_all = $pagegen->Label(width => 25, height => 17, relief => 'groove')->place(-x => 300 , -y => 180);
--	$label_all = $pagegen->Label(text => 'Type of log')->place(-x => 305, -y => 170);
--	$opt_all = $pagegen->Checkbutton ( variable => \$optall, text => 'All logs')->place(-x => 320, -y => 200);
--	$opt_1 = $pagegen->Checkbutton ( variable => \$opt1, text => 'Snort fast')->place(-x => 320, -y => 220);
--	$opt_2 = $pagegen->Checkbutton ( variable => \$opt2, text => 'Snort syslog')->place(-x => 320, -y => 240);
--	$opt_3 = $pagegen->Checkbutton ( variable => \$opt3, text => 'Snort full')->place(-x => 320, -y => 260);
--	$opt_4 = $pagegen->Checkbutton ( variable => \$opt4, text => 'Fw-1 export')->place(-x => 320, -y => 280);
--	$opt_5 = $pagegen->Checkbutton ( variable => \$opt5, text => 'Fw-1 syslog')->place(-x => 320, -y => 300);
--	$opt_6 = $pagegen->Checkbutton ( variable => \$opt6, text => 'Pix')->place(-x => 320, -y => 320);
--	$opt_7 = $pagegen->Checkbutton ( variable => \$opt7, text => 'IPFilter')->place(-x => 320, -y => 340);
--	$opt_8 = $pagegen->Checkbutton ( variable => \$opt8, text => 'NetFilter')->place(-x => 320, -y => 360);
--
--	$label4 = $pagegen->Label(width => 45, height => 15, relief => 'groove')->place(-x => 530, -y => 20);
--	$label_result_option = $pagegen->Label(text => 'Result Options :')->place(-x => 535, -y => 10);
--	$label5 = $pagegen->Label(width => 45, height => 14, relief => 'groove')->place(-x => 530, -y => 250);
--	$label_html_option = $pagegen->Label(text => 'Output Options :')->place(-x => 535, -y => 240);
-+	$cadre_all = $pagegen->Label(-width => 25, -height => 17, -relief => 'groove')->place(-x => 300 , -y => 180);
-+	$label_all = $pagegen->Label(-text => 'Type of log')->place(-x => 305, -y => 170);
-+	$opt_all = $pagegen->Checkbutton ( -variable => \$optall, -text => 'All logs')->place(-x => 320, -y => 200);
-+	$opt_1 = $pagegen->Checkbutton ( -variable => \$opt1, -text => 'Snort fast')->place(-x => 320, -y => 220);
-+	$opt_2 = $pagegen->Checkbutton ( -variable => \$opt2, -text => 'Snort syslog')->place(-x => 320, -y => 240);
-+	$opt_3 = $pagegen->Checkbutton ( -variable => \$opt3, -text => 'Snort full')->place(-x => 320, -y => 260);
-+	$opt_4 = $pagegen->Checkbutton ( -variable => \$opt4, -text => 'Fw-1 export')->place(-x => 320, -y => 280);
-+	$opt_5 = $pagegen->Checkbutton ( -variable => \$opt5, -text => 'Fw-1 syslog')->place(-x => 320, -y => 300);
-+	$opt_6 = $pagegen->Checkbutton ( -variable => \$opt6, -text => 'Pix')->place(-x => 320, -y => 320);
-+	$opt_7 = $pagegen->Checkbutton ( -variable => \$opt7, -text => 'IPFilter')->place(-x => 320, -y => 340);
-+	$opt_8 = $pagegen->Checkbutton ( -variable => \$opt8, -text => 'NetFilter')->place(-x => 320, -y => 360);
-+
-+	$label4 = $pagegen->Label(-width => 45, -height => 15, -relief => 'groove')->place(-x => 530, -y => 20);
-+	$label_result_option = $pagegen->Label(-text => 'Result Options :')->place(-x => 535, -y => 10);
-+	$label5 = $pagegen->Label(-width => 45, -height => 14, -relief => 'groove')->place(-x => 530, -y => 250);
-+	$label_html_option = $pagegen->Label(-text => 'Output Options :')->place(-x => 535, -y => 240);
- 
- 	$optn = 0;                     # Starting value
- 	$opth = 0;                     # Starting value
-@@ -142,85 +142,85 @@
- 	$optr = 0;                     # Starting value
- 	$optc = 0;                     # Starting value
- 	$nb_files = 0;			# Initialize nb-files variables for index
--	$opt_i = $pagegen->Checkbutton ( variable => \$opti, text => 'Ascending Order')->place(-x => 600, -y => 40);
--	$opt_r = $pagegen->Checkbutton ( variable => \$optr, text => 'Resolve Addresses')->place(-x => 600, -y => 70);
--	$opt_d = $pagegen->Checkbutton ( variable => \$optc, text => 'Resolve Domain')->place(-x => 600, -y => 100);
--	$opt_n = $pagegen->Checkbutton ( variable => \$optw, text => 'Whois Database Informations')->place(-x => 600, -y => 130);
--	$opt_n = $pagegen->Checkbutton ( variable => \$optn, text => 'Number of Occurences :')->place(-x => 600, -y => 160);
--	$entry_option_n = $pagegen->Entry(width => 5, background => 'gray')->place(-x => 770, -y => 160);
--	$label_option_l = $pagegen->Label(text => "     Output Language :")->place(-x => 600, -y => 190);
--	$entry_option_l = $pagegen->Entry(width => 5, background => 'gray')->place(-x => 770, -y => 190);
-+	$opt_i = $pagegen->Checkbutton ( -variable => \$opti, -text => 'Ascending Order')->place(-x => 600, -y => 40);
-+	$opt_r = $pagegen->Checkbutton ( -variable => \$optr, -text => 'Resolve Addresses')->place(-x => 600, -y => 70);
-+	$opt_d = $pagegen->Checkbutton ( -variable => \$optc, -text => 'Resolve Domain')->place(-x => 600, -y => 100);
-+	$opt_n = $pagegen->Checkbutton ( -variable => \$optw, -text => 'Whois Database Informations')->place(-x => 600, -y => 130);
-+	$opt_n = $pagegen->Checkbutton ( -variable => \$optn, -text => 'Number of Occurences :')->place(-x => 600, -y => 160);
-+	$entry_option_n = $pagegen->Entry(-width => 5, -background => 'gray')->place(-x => 770, -y => 160);
-+	$label_option_l = $pagegen->Label(-text => "     Output Language :")->place(-x => 600, -y => 190);
-+	$entry_option_l = $pagegen->Entry(-width => 5, -background => 'gray')->place(-x => 770, -y => 190);
- 	$entry_option_l->insert('end', 'en');
--	$opt_h = $pagegen->Checkbutton ( variable => \$opth, text => 'HTML File :')->place(-x => 560, -y => 270);
--	$entry_option_h = $pagegen->Entry(width => 15, background => 'gray')->place(-x => 700, -y => 270);
--	$opt_p = $pagegen->Checkbutton ( variable => \$optp, text => 'PDF File :')->place(-x => 560, -y => 300);
--	$entry_option_p = $pagegen->Entry(width => 15, background => 'gray')->place(-x => 700, -y => 300);
--	$opt_g = $pagegen->Checkbutton ( variable => \$optg, text => 'Graph Format :')->place(-x => 560, -y => 330);
-- 	$listbox_option_g = $pagegen->Listbox(width => 15, height => 3, background => 'gray')->place(-x => 700, -y => 330);
-+	$opt_h = $pagegen->Checkbutton ( -variable => \$opth, -text => 'HTML File :')->place(-x => 560, -y => 270);
-+	$entry_option_h = $pagegen->Entry(-width => 15, -background => 'gray')->place(-x => 700, -y => 270);
-+	$opt_p = $pagegen->Checkbutton ( -variable => \$optp, -text => 'PDF File :')->place(-x => 560, -y => 300);
-+	$entry_option_p = $pagegen->Entry(-width => 15, -background => 'gray')->place(-x => 700, -y => 300);
-+	$opt_g = $pagegen->Checkbutton ( -variable => \$optg, -text => 'Graph Format :')->place(-x => 560, -y => 330);
-+ 	$listbox_option_g = $pagegen->Listbox(-width => 15, -height => 3, -background => 'gray')->place(-x => 700, -y => 330);
- 	$listbox_option_g->insert('end', 'gif','png','jpg');
- 	$listbox_option_g->selectionSet(0);
- 
--	$scrolled_result  = $pageresult->Scrolled('Text', width => 120, height => 35, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->pack;
--	$scrolled_debug  = $pagedebug->Scrolled('Text', width => 120, height => 35, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->pack;
--	$label_status = $pagegen->Label(text => 'Status :')->place(-x => 10, -y => 240);
--	$scrolled_status  = $pagegen->Scrolled('Text', width => 30, height => 14, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->place(-x => 10, -y => 260);
--
--	$label21 = $pagefilter->Label(width => 55, height => 13, relief => 'groove')->place(-x => 30, -y => 20);
--	$label22 = $pagefilter->Label(text => 'Time Filter')->place(-x => 35 , -y => 10);
--	$label_fhour = $pagefilter->Label(text => 'Hour :')->place(-x => 50, -y => 40);
--	$entry_fhour = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 40);
--	$label_fday = $pagefilter->Label(text => 'Day :')->place(-x => 50, -y => 70);
--	$entry_fday = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 70);
--	$label_fmonth = $pagefilter->Label(text => 'Month :')->place(-x => 50, -y => 100);
--	$entry_fmonth = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 100);
--	$label23 = $pagefilter->Label(width => 55, height => 13, relief => 'groove')->place(-x => 450, -y => 20);
--	$label24 = $pagefilter->Label(text => 'IP Filter')->place(-x => 455 , -y => 10);
--	$label_fsrc = $pagefilter->Label(text => 'IP src :')->place(-x => 470, -y => 40);
--	$entry_fsrc = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 540, -y => 40);
--	$label_fdst = $pagefilter->Label(text => 'IP dst :')->place(-x => 470, -y => 70);
--	$entry_fdst = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 540, -y => 70);
--	$label_fhost = $pagefilter->Label(text => 'IP host :')->place(-x => 470, -y => 100);
--	$entry_fhost = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 540, -y => 100);
--	$label25 = $pagefilter->Label(width => 55, height => 13, relief => 'groove')->place(-x => 30, -y => 250);
--	$label26 = $pagefilter->Label(text => 'Other Filter')->place(-x => 35 , -y => 240);
--	$label_fproto = $pagefilter->Label(text => 'Protocol :')->place(-x => 50, -y => 270);
--	$entry_fproto = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 270);
--	$label_fdport = $pagefilter->Label(text => 'Dst port :')->place(-x => 50, -y => 300);
--	$entry_fdport = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 300);
--	$label_fether = $pagefilter->Label(text => 'Interface :')->place(-x => 50, -y => 330);
--	$entry_fether = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 330);
--	$label_fseverity = $pagefilter->Label(text => 'Severity :')->place(-x => 50, -y => 360);
--	$entry_fseverity = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 360);
--	$label_frule = $pagefilter->Label(text => 'Rule :')->place(-x => 50, -y => 390);
--	$entry_frule = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 120, -y => 390);
--	$label_faction = $pagefilter->Label(text => 'Action :')->place(-x => 230, -y => 270);
--	$entry_faction = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 300, -y => 270);
--	$label_ftype = $pagefilter->Label(text => 'Type :')->place(-x => 230, -y => 300);
--	$entry_ftype = $pagefilter->Entry(width => 10, background => 'gray')->place(-x => 300, -y => 300);
-+	$scrolled_result  = $pageresult->Scrolled('Text', -width => 120, -height => 35, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->pack;
-+	$scrolled_debug  = $pagedebug->Scrolled('Text', -width => 120, -height => 35, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->pack;
-+	$label_status = $pagegen->Label(-text => 'Status :')->place(-x => 10, -y => 240);
-+	$scrolled_status  = $pagegen->Scrolled('Text', -width => 30, -height => 14, -bg => 'gray', -scrollbars => 'e', -wrap =>'word')->place(-x => 10, -y => 260);
-+
-+	$label21 = $pagefilter->Label(-width => 55, -height => 13, -relief => 'groove')->place(-x => 30, -y => 20);
-+	$label22 = $pagefilter->Label(-text => 'Time Filter')->place(-x => 35 , -y => 10);
-+	$label_fhour = $pagefilter->Label(-text => 'Hour :')->place(-x => 50, -y => 40);
-+	$entry_fhour = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 40);
-+	$label_fday = $pagefilter->Label(-text => 'Day :')->place(-x => 50, -y => 70);
-+	$entry_fday = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 70);
-+	$label_fmonth = $pagefilter->Label(-text => 'Month :')->place(-x => 50, -y => 100);
-+	$entry_fmonth = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 100);
-+	$label23 = $pagefilter->Label(-width => 55, -height => 13, -relief => 'groove')->place(-x => 450, -y => 20);
-+	$label24 = $pagefilter->Label(-text => 'IP Filter')->place(-x => 455 , -y => 10);
-+	$label_fsrc = $pagefilter->Label(-text => 'IP src :')->place(-x => 470, -y => 40);
-+	$entry_fsrc = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 540, -y => 40);
-+	$label_fdst = $pagefilter->Label(-text => 'IP dst :')->place(-x => 470, -y => 70);
-+	$entry_fdst = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 540, -y => 70);
-+	$label_fhost = $pagefilter->Label(-text => 'IP host :')->place(-x => 470, -y => 100);
-+	$entry_fhost = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 540, -y => 100);
-+	$label25 = $pagefilter->Label(-width => 55, -height => 13, -relief => 'groove')->place(-x => 30, -y => 250);
-+	$label26 = $pagefilter->Label(-text => 'Other Filter')->place(-x => 35 , -y => 240);
-+	$label_fproto = $pagefilter->Label(-text => 'Protocol :')->place(-x => 50, -y => 270);
-+	$entry_fproto = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 270);
-+	$label_fdport = $pagefilter->Label(-text => 'Dst port :')->place(-x => 50, -y => 300);
-+	$entry_fdport = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 300);
-+	$label_fether = $pagefilter->Label(-text => 'Interface :')->place(-x => 50, -y => 330);
-+	$entry_fether = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 330);
-+	$label_fseverity = $pagefilter->Label(-text => 'Severity :')->place(-x => 50, -y => 360);
-+	$entry_fseverity = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 360);
-+	$label_frule = $pagefilter->Label(-text => 'Rule :')->place(-x => 50, -y => 390);
-+	$entry_frule = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 120, -y => 390);
-+	$label_faction = $pagefilter->Label(-text => 'Action :')->place(-x => 230, -y => 270);
-+	$entry_faction = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 300, -y => 270);
-+	$label_ftype = $pagefilter->Label(-text => 'Type :')->place(-x => 230, -y => 300);
-+	$entry_ftype = $pagefilter->Entry(-width => 10, -background => 'gray')->place(-x => 300, -y => 300);
- 
--	$label_domains_file = $pageconf->Label(text => 'Path to Domain File :')->place(-x => 30, -y => 40);
--	$entry_domains_file = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 40);
-+	$label_domains_file = $pageconf->Label(-text => 'Path to Domain File :')->place(-x => 30, -y => 40);
-+	$entry_domains_file = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 40);
- 	$entry_domains_file->insert('end', "$domains_file");
--	$label_rules_file = $pageconf->Label(text => 'Path to Rules File :')->place(-x => 30, -y => 80);
--	$entry_rules_file = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 80);
-+	$label_rules_file = $pageconf->Label(-text => 'Path to Rules File :')->place(-x => 30, -y => 80);
-+	$entry_rules_file = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 80);
- 	$entry_rules_file->insert('end', "$rules_file");
--	$label_hw_file = $pageconf->Label(text => 'Path to Hardware Related File :')->place(-x => 30, -y => 120);
--	$entry_hw_file = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 120);
-+	$label_hw_file = $pageconf->Label(-text => 'Path to Hardware Related File :')->place(-x => 30, -y => 120);
-+	$entry_hw_file = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 120);
- 	$entry_hw_file->insert('end', "$hw_file");
--	$label_langfile_directory = $pageconf->Label(text => 'Path to Language File :')->place(-x => 30, -y => 160);
--	$entry_langfile_directory = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 160);
-+	$label_langfile_directory = $pageconf->Label(-text => 'Path to Language File :')->place(-x => 30, -y => 160);
-+	$entry_langfile_directory = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 160);
- 	$entry_langfile_directory->insert('end', "$lang_file");
--	$label_html_directory = $pageconf->Label(text => 'Specify the Output directory :')->place(-x => 30, -y => 200);
--	$entry_html_directory = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 200);
-+	$label_html_directory = $pageconf->Label(-text => 'Specify the Output directory :')->place(-x => 30, -y => 200);
-+	$entry_html_directory = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 200);
- 	$entry_html_directory->insert('end', "$html_directory");
--	$label_dbm_directory = $pageconf->Label(text => 'Specify the DBM directory :')->place(-x => 30, -y => 240);
--	$entry_dbm_directory = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 240);
-+	$label_dbm_directory = $pageconf->Label(-text => 'Specify the DBM directory :')->place(-x => 30, -y => 240);
-+	$entry_dbm_directory = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 240);
- 	$entry_dbm_directory->insert('end', "$dbm_directory");
--	$label_tmpout_file = $pageconf->Label(text => 'Specify the Tempory File :')->place(-x => 30, -y => 280);
--	$entry_tmpout_file = $pageconf->Entry(width => 30, background => 'gray')->place(-x => 250, -y => 280);
-+	$label_tmpout_file = $pageconf->Label(-text => 'Specify the Tempory File :')->place(-x => 30, -y => 280);
-+	$entry_tmpout_file = $pageconf->Entry(-width => 30, -background => 'gray')->place(-x => 250, -y => 280);
- 	$entry_tmpout_file->insert('end', "$tmpout_file");
- 
--	$top->configure(title => "SnortALog v$version", menu => $menu);
-+	$top->configure(-title => "SnortALog v$version", -menu => $menu);
- 	$top->geometry("895x515");
- 	MainLoop();
- 	} else {
diff --git a/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff b/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff
new file mode 100644
index 000000000000..2678a969117f
--- /dev/null
+++ b/net-analyzer/snortalog/files/snortalog-2.4.0-limit-args.diff
@@ -0,0 +1,15 @@
+--- snortalog.pl.orig	2005-04-13 04:42:06.000000000 -0400
++++ snortalog.pl	2005-04-14 00:36:20.000000000 -0400
+@@ -397,6 +397,12 @@
+ 	$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/files/snortalog-2.4.0-notcltk.diff b/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
new file mode 100644
index 000000000000..ce4858134fe6
--- /dev/null
+++ b/net-analyzer/snortalog/files/snortalog-2.4.0-notcltk.diff
@@ -0,0 +1,28 @@
+--- snortalog.pl.orig	2005-04-14 00:52:36.000000000 -0400
++++ snortalog.pl	2005-04-14 00:53:31.000000000 -0400
+@@ -92,18 +92,18 @@
+ # Graphical Tool Kit Librairies
+ #
+ $TK = 0 ;
+-$TK = eval "use Tk;1;" ;
+-$TK = eval "use Tk::NoteBook;2;" if ($TK == 1);
+-$TK = eval "use Tk::Dialog;3;" if ($TK == 2);
++#$TK = eval "use Tk;1;" ;
++#$TK = eval "use Tk::NoteBook;2;" if ($TK == 1);
++#$TK = eval "use Tk::Dialog;3;" if ($TK == 2);
+ 
+ #
+ # GD Librairies for charts
+ #
+ $GD = 0 ;
+-$GD = eval "use GD::Graph::pie;1;";
+-$GD = eval "use GD::Graph::bars;2;" if ($GD == 1);
+-$GD = eval "use GD::Graph::lines;3;" if ($GD == 2);
+-$GD = eval "use GD::Graph::area;4;" if ($GD == 3);
++#$GD = eval "use GD::Graph::pie;1;";
++#$GD = eval "use GD::Graph::bars;2;" if ($GD == 1);
++#$GD = eval "use GD::Graph::lines;3;" if ($GD == 2);
++#$GD = eval "use GD::Graph::area;4;" if ($GD == 3);
+ 
+ #
+ # HTML and PDF manipulation libraries
diff --git a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
index 921eed2178ac..b8753cc3c811 100644
--- a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
@@ -1,19 +1,22 @@
 # 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.2 2005/03/20 21:21:21 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild,v 1.3 2005/04/14 12:51:04 ka0ttic Exp $
 
 inherit eutils
 
+MY_P="${PN}_v${PV}"
+
 DESCRIPTION="a powerful perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
-HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${MY_P}.tgz"
+HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/
+	tcltk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
 
 KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="tcltk"
 
-S="${WORKDIR}/${PN}_v${PV%.?}"
+S="${WORKDIR}/${MY_P%.?}"
 
 RDEPEND="dev-lang/perl
 	dev-perl/Getopt-Long
@@ -23,12 +26,12 @@ RDEPEND="dev-lang/perl
 			 dev-perl/GDGraph )"
 
 src_unpack() {
-	unpack ${A} && cd ${S}
+	unpack ${MY_P}.tgz && 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
+	use tcltk && epatch ${DISTDIR}/${P}-fix-gui.diff.gz
 	# 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:' \
diff --git a/net-analyzer/snortalog/snortalog-2.4.0.ebuild b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
new file mode 100644
index 000000000000..b10a2560ce37
--- /dev/null
+++ b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
@@ -0,0 +1,60 @@
+# 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.4.0.ebuild,v 1.1 2005/04/14 12:51:04 ka0ttic Exp $
+
+inherit eutils
+
+MY_P="${PN}_v${PV}"
+
+DESCRIPTION="a powerful perl script that summarizes snort logs"
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${MY_P}.tgz"
+HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/
+	tcltk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
+
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tcltk"
+
+S="${WORKDIR}/${MY_P%.?}"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Getopt-Long
+	dev-perl/DB_File
+	dev-perl/HTML-HTMLDoc
+	tcltk? ( dev-perl/perl-tk
+			 dev-perl/GDGraph )"
+
+src_unpack() {
+	[[ -d ${S} ]] || mkdir ${S}
+	cd ${S}
+	unpack ${A}
+
+	# one file created at a time ( pdf or html )
+	epatch ${FILESDIR}/${P}-limit-args.diff
+
+	use tcltk || epatch ${FILESDIR}/${P}-notcltk.diff
+	use tcltk && epatch ${DISTDIR}/${P}-fix-gui.diff.gz
+
+	# fix paths, erroneous can access message
+	sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
+		-e 's:\($domains_file = "\)conf/\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($rules_file = "\)conf/\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($hw_file = "\)conf/\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($lang_file ="\)conf/\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:Can access:Cannot access:' \
+		snortalog.pl || die "sed snortalog.pl failed"
+}
+
+src_install () {
+	dobin snortalog.pl || die
+
+	insinto /etc/${PN}
+	doins conf/{domains,hw,lang,rules}
+
+	insinto /usr/lib/${PN}/${PV}/modules
+	doins -r modules/*
+
+	cd doc
+	dodoc CHANGES
+}