now includes priviledge drop and does 64bit library paths in default config files.

Package-Manager: portage-2.1.2.2

8 files changed, 40 insertions, 275 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 7c770e1214c5..2a2e8a9146dc 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.127 2007/04/07 00:47:12 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.128 2007/04/22 05:55:08 dragonheart Exp $
+
+*snort-2.6.1.4-r1 (22 Apr 2007)
+
+  22 Apr 2007; Daniel Black <dragonheart@gentoo.org> +snort-2.6.1.4-r1.ebuild,
+  files/snort.rc9:
+  now includes priv drop thanks to <drear> on irc. Default config file now
+  x86_64 friendly with library paths too.
 
   07 Apr 2007; Raphael Marichez <falco@gentoo.org>
   +files/snort-2.6.1.4-libdnet-ip6.patch, snort-2.6.1.4.ebuild:
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 99c253068258..3bd0ef56945b 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX snort-2.6.1.1-gre.patch 1164 RMD160 c80be0a6286ad7f79bb22fa94148e2f77ce25a34 SHA1 f0b3e80f05a433a9182d038fe4a28bc37260337a SHA256 72df4c81f615a72a3d305ac236b38aee5a2c953ff1e5fa39e075a7ef2e6b82ef
-MD5 e83ddd6b75669ad58e2ce6cafedc0aaf files/snort-2.6.1.1-gre.patch 1164
-RMD160 c80be0a6286ad7f79bb22fa94148e2f77ce25a34 files/snort-2.6.1.1-gre.patch 1164
-SHA256 72df4c81f615a72a3d305ac236b38aee5a2c953ff1e5fa39e075a7ef2e6b82ef files/snort-2.6.1.1-gre.patch 1164
 AUX snort-2.6.1.1-libnet.patch 8062 RMD160 fb42546b2efce968160afb0a0e0e96c8f0ad1471 SHA1 bcac8005327e016d8ffc1cf4b74aeb80228a2839 SHA256 ff36205cdd4554ff23c845383a82c9fdef6682a399072f3306f6aa3b74378b86
 MD5 24315885b9f04323523e4fec8906888d files/snort-2.6.1.1-libnet.patch 8062
 RMD160 fb42546b2efce968160afb0a0e0e96c8f0ad1471 files/snort-2.6.1.1-libnet.patch 8062
@@ -25,67 +18,45 @@ AUX snort.confd 423 RMD160 8312bad7b271cc20a9eeb8f08f0cba5cd330eb2f SHA1 149a377
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
 RMD160 8312bad7b271cc20a9eeb8f08f0cba5cd330eb2f files/snort.confd 423
 SHA256 d504cb31ffcce9acc8fc7b68123a31a53b491444c52730339ea9a4e986521f71 files/snort.confd 423
-AUX snort.rc7 739 RMD160 360f4288acafbed3d5ed3601ff073fb218d3e2a3 SHA1 2714cd44118595688ea68c21fb7460b05de1b6de SHA256 9123a58ab32548355ac6a557cf46baa08c3696725a9a3a4b2f467413006830e4
-MD5 cbbb4b70707fd563ba56143897b3d371 files/snort.rc7 739
-RMD160 360f4288acafbed3d5ed3601ff073fb218d3e2a3 files/snort.rc7 739
-SHA256 9123a58ab32548355ac6a557cf46baa08c3696725a9a3a4b2f467413006830e4 files/snort.rc7 739
 AUX snort.rc8 764 RMD160 37ca479a48a97dfcade39f4756cadc15fa31b971 SHA1 f4b79149468ceb694526972da36bb1221c72b19d SHA256 b657ad099ce1df24cbc4c5b1f48718572bec65a14cd52c9f29b87e4f7f549693
 MD5 c7aa5ee74c08a1a5223a818f4b47248c files/snort.rc8 764
 RMD160 37ca479a48a97dfcade39f4756cadc15fa31b971 files/snort.rc8 764
 SHA256 b657ad099ce1df24cbc4c5b1f48718572bec65a14cd52c9f29b87e4f7f549693 files/snort.rc8 764
+AUX snort.rc9 789 RMD160 23822ae1771de0a840e889fe32b68935f8a1d72e SHA1 6c1d4c6c77ae7c2078ced9adcab547e84ec00901 SHA256 57b86fa18f008549620d05d12887dff98bfe0f282214d566273aa1ce739e3e70
+MD5 daddf6fbef484d7fedb101cae4884063 files/snort.rc9 789
+RMD160 23822ae1771de0a840e889fe32b68935f8a1d72e files/snort.rc9 789
+SHA256 57b86fa18f008549620d05d12887dff98bfe0f282214d566273aa1ce739e3e70 files/snort.rc9 789
 DIST Community-Rules-2.4.tar.gz 110044 RMD160 ecfb4444cb0152545d823692eb6e5e2347151b54 SHA1 cbb5e5e8183608145642b3a47eb0be7fc06423f6 SHA256 4c82f90c960626aae5804c2375540f2d7241524c31ae3c7ab69df6c46e295c4c
-DIST Community-Rules.tar.gz 11678 RMD160 a65b656e4dbf29f1c807622e865e945f509fe0c5 SHA1 de02fd44c58529795e0ab59b65aa08a608cffd95 SHA256 fd37a897455dcb4bace1f7f0af11747b5360e0e3896cd0b9649e5d19281bb2cf
-DIST snort-2.4.0-genpatches.tar.bz2 6475 RMD160 9ea99c71892a2cbf409ead3514ae792210bdf3d0 SHA1 23d7ac5fb3e3fca5340a4f45ff6d64c4a4214e42 SHA256 8bf51a47b2a0db9ccad83a27105994befd9be381b41aeb02561882308f4c6dff
-DIST snort-2.4.5.tar.gz 2817837 RMD160 1b697ccd84e1c10406ac20ccc0c46f79ea661e11 SHA1 3ba7dae8058aecf4e4eb1c7a816a7c8a4fb7c550 SHA256 84eb84da542d23e9f1c29b8eb319614c509fb19a745f1fa2a88d07c740645184
-DIST snort-2.6.1.2.tar.gz 3511538 RMD160 bd0ce3a4629a6e594a5f24723254e85d36597d04 SHA1 745f56806a0bae128a5c93c93c5eda9a4b80f593 SHA256 ca8bf1b1aa2fe23c9e8f8cb23482da123aac4b5842950b3cc2a40ba13da96b51
 DIST snort-2.6.1.3.tar.gz 3700149 RMD160 0c390bd7cdbe705ba43ce8c8894bfec53c3179f6 SHA1 cb944d74ab6c254f88d356d45e4492ba560dfc3c SHA256 8cc112d6e0a55b0a7e0802428abbd1b7815e0d01a1240c84a726ecc563629a79
 DIST snort-2.6.1.4.tar.gz 3716052 RMD160 b9768992698fd9967b66b89938d38555260660ab SHA1 2709f1ef0953029a8b9a23c94dea81bcd42b2906 SHA256 5f830d3c95b6fb96b8abaa5539e71c3cdcfd8df95b376c77323149436f7bbf70
 DIST snortrules-pr-2.4.tar.gz 789097 RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 SHA1 b8b59754ccb59b1dcf324d2faa399326117a60e9 SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504
 DIST snortsam-20050110.tar.gz 29395 RMD160 ec80ce024ed7a013da35444ef1098ba3faa6cfc3 SHA1 46a274abeeea4e808849c65b9d510a5b5a221ba6 SHA256 dc428458f3c47684aabb89036ca7e601a6aa92864dbf23b31f33732b76c2a01e
-EBUILD snort-2.4.5.ebuild 4425 RMD160 e0df6b4511ecd8ea5447d49963b32279981a2aa8 SHA1 730c173bfdf4a5b0cbc659e48f994844470a2e03 SHA256 8fcef1aae9797a4c5bd51f4810c17d4de69cfa6d351bb131f3f8fa1cfdc873c7
-MD5 edd3367ef6795d519b1ae1cf237de552 snort-2.4.5.ebuild 4425
-RMD160 e0df6b4511ecd8ea5447d49963b32279981a2aa8 snort-2.4.5.ebuild 4425
-SHA256 8fcef1aae9797a4c5bd51f4810c17d4de69cfa6d351bb131f3f8fa1cfdc873c7 snort-2.4.5.ebuild 4425
-EBUILD snort-2.6.1.2.ebuild 5820 RMD160 c55a6607e6145176ac83f2103f1b798ca6138087 SHA1 6d30fd834bdd08dae4a6c4312b4e556f844bc4b0 SHA256 95fd4baa1a21c52b232a58a3829a0d3615145d2b228cb3b2520e71e81c6315c9
-MD5 4ef735b46033fb051dddd4d61cbdf277 snort-2.6.1.2.ebuild 5820
-RMD160 c55a6607e6145176ac83f2103f1b798ca6138087 snort-2.6.1.2.ebuild 5820
-SHA256 95fd4baa1a21c52b232a58a3829a0d3615145d2b228cb3b2520e71e81c6315c9 snort-2.6.1.2.ebuild 5820
 EBUILD snort-2.6.1.3-r1.ebuild 5907 RMD160 e291e085d9b1fe1da3f6e48f522039ddc35ae9b1 SHA1 a2b77b8b706bffb0b856c1d39767e2fb51d8761c SHA256 93f28bc63690ff05a202b6bff5e50be38be6c7386165e632860d1b198fedd53c
 MD5 47ffbc85772ccf7095b71ced3d2d7fd0 snort-2.6.1.3-r1.ebuild 5907
 RMD160 e291e085d9b1fe1da3f6e48f522039ddc35ae9b1 snort-2.6.1.3-r1.ebuild 5907
 SHA256 93f28bc63690ff05a202b6bff5e50be38be6c7386165e632860d1b198fedd53c snort-2.6.1.3-r1.ebuild 5907
+EBUILD snort-2.6.1.4-r1.ebuild 5988 RMD160 c41c5b10178ef43f270020b65be62ebab1af3916 SHA1 f7c13658e68d8f9c5afeb0bf189e761ab51e541f SHA256 64ae0e2b4ba9bcd460bfc6170377640ff5c184a6fdd93f60fc330a224da42c98
+MD5 1d39642f32d9345f29c5403760f3c0b4 snort-2.6.1.4-r1.ebuild 5988
+RMD160 c41c5b10178ef43f270020b65be62ebab1af3916 snort-2.6.1.4-r1.ebuild 5988
+SHA256 64ae0e2b4ba9bcd460bfc6170377640ff5c184a6fdd93f60fc330a224da42c98 snort-2.6.1.4-r1.ebuild 5988
 EBUILD snort-2.6.1.4.ebuild 5947 RMD160 8bc74b81c4c47ab9080031b1f5dda428c7c58f34 SHA1 bb7d91d4443d4de22aaec5f4f32676ce0107615a SHA256 82bda250ebabcae3b5b42aacaed9f1ab9f6312fe0933c8414d6352c11ddf423d
 MD5 ecd5db1dc4479f31445e4162ab0a65a5 snort-2.6.1.4.ebuild 5947
 RMD160 8bc74b81c4c47ab9080031b1f5dda428c7c58f34 snort-2.6.1.4.ebuild 5947
 SHA256 82bda250ebabcae3b5b42aacaed9f1ab9f6312fe0933c8414d6352c11ddf423d snort-2.6.1.4.ebuild 5947
-MISC ChangeLog 22692 RMD160 643e55f6ec775e25ff1b04992832b0c2b1314b7d SHA1 6e1091071f7018f4fff1100197b2ff4b448934fe SHA256 7be1498cd7e44a536bdf77bb640091f4631d149702bc0c964d903decf091d716
-MD5 88c94c0f920470662037abd4075e7fae ChangeLog 22692
-RMD160 643e55f6ec775e25ff1b04992832b0c2b1314b7d ChangeLog 22692
-SHA256 7be1498cd7e44a536bdf77bb640091f4631d149702bc0c964d903decf091d716 ChangeLog 22692
+MISC ChangeLog 22947 RMD160 cf6db4fa22e0736188a69246331b9de636f8a282 SHA1 83e1e45ea0786dbf09cfdfba0e7473503af2875c SHA256 ad885522393ba28de3cba398beb645d5448fd51de23c4caaea7ea94949025c7c
+MD5 c67458355197454b7df7f2d97828ba27 ChangeLog 22947
+RMD160 cf6db4fa22e0736188a69246331b9de636f8a282 ChangeLog 22947
+SHA256 ad885522393ba28de3cba398beb645d5448fd51de23c4caaea7ea94949025c7c ChangeLog 22947
 MISC metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb SHA1 470a19ab011412f7f219d654304b7a43876082ae SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb metadata.xml 246
 SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e metadata.xml 246
-MD5 8ab79a3b3485b8028ffc95ef22f0e4a7 files/digest-snort-2.4.5 1250
-RMD160 9f1bbc6e281b0a46b8dad256d91b2c7898d21d4e files/digest-snort-2.4.5 1250
-SHA256 eca549eac2e372a4307f224ffb2150f9fd940540134ecae1c73621c81f61d826 files/digest-snort-2.4.5 1250
-MD5 815d00c6b73946345b8c4860388db41d files/digest-snort-2.6.1.2 1006
-RMD160 a5a63f7a2ddef96a836bb966b98d7d71431965e0 files/digest-snort-2.6.1.2 1006
-SHA256 c776d126ad4060bf4566a1457d753418cf16c4014207e82aa3b34d7c834cefb0 files/digest-snort-2.6.1.2 1006
 MD5 e7cdd3d5ed52e8d17a5f3f284439d5aa files/digest-snort-2.6.1.3-r1 1006
 RMD160 05f6c24285518a6fb48e50b7d1b4314c9693cc75 files/digest-snort-2.6.1.3-r1 1006
 SHA256 4bd85630e9420e683d70be000370bcc0c5cf927c25c4ed1406c585d6481f1f9e files/digest-snort-2.6.1.3-r1 1006
 MD5 0a41105e90aae43a766364d2f7822a41 files/digest-snort-2.6.1.4 1006
 RMD160 8046913eb94ba65bf1e82402e64bb4572fd326dd files/digest-snort-2.6.1.4 1006
 SHA256 78dac29646fdafa52b5fca59970c439aa43fb3ecf689390e56e7ab011e58af21 files/digest-snort-2.6.1.4 1006
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iQEVAwUBRhbqGjvRww8BFPxFAQLtyAf/fsAnZxcJlW4G9VW/8zA0y89kwcnPiScf
-6SkhTBFeDRs3rOYdPg92TM7NSZLU2EQLc4GAeQaojUsdJcehL5RcY1TYC3m3wa0Q
-HzciB1t4dhC6hP9nCcCuo8SodVuYLT46YvfgnJwdIeyM+pToR8mcHPNcys+btaQ2
-6cMjhH714IoU7hjtsPw3dVX+Uny7zcTdWL0qQSl6mUHCkf5/NzWc8uopqe+lahHF
-MZ1New/azuluO37Lw+UFxZLcr3SsfqsjX8YgLN+l0t0WGW9dF/HaaVQ3RlCov3Mx
-ti4mhg91NXtUEJHLszuuHybPYrFAoa/zIOVW7jOeqo75NOkoFaEr0g==
-=1SU9
------END PGP SIGNATURE-----
+MD5 0a41105e90aae43a766364d2f7822a41 files/digest-snort-2.6.1.4-r1 1006
+RMD160 8046913eb94ba65bf1e82402e64bb4572fd326dd files/digest-snort-2.6.1.4-r1 1006
+SHA256 78dac29646fdafa52b5fca59970c439aa43fb3ecf689390e56e7ab011e58af21 files/digest-snort-2.6.1.4-r1 1006
diff --git a/net-analyzer/snort/files/digest-snort-2.4.5 b/net-analyzer/snort/files/digest-snort-2.4.5
deleted file mode 100644
index 24ce062cfcbd..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 39d8250f47a33aaec4712e29c0dcd1d0 Community-Rules.tar.gz 11678
-RMD160 a65b656e4dbf29f1c807622e865e945f509fe0c5 Community-Rules.tar.gz 11678
-SHA256 fd37a897455dcb4bace1f7f0af11747b5360e0e3896cd0b9649e5d19281bb2cf Community-Rules.tar.gz 11678
-MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
-RMD160 9ea99c71892a2cbf409ead3514ae792210bdf3d0 snort-2.4.0-genpatches.tar.bz2 6475
-SHA256 8bf51a47b2a0db9ccad83a27105994befd9be381b41aeb02561882308f4c6dff snort-2.4.0-genpatches.tar.bz2 6475
-MD5 108b3c20dcbaf3cdb17ea9203342eaaa snort-2.4.5.tar.gz 2817837
-RMD160 1b697ccd84e1c10406ac20ccc0c46f79ea661e11 snort-2.4.5.tar.gz 2817837
-SHA256 84eb84da542d23e9f1c29b8eb319614c509fb19a745f1fa2a88d07c740645184 snort-2.4.5.tar.gz 2817837
-MD5 35d9a2486f8c0280bb493aa03c011927 snortrules-pr-2.4.tar.gz 789097
-RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 snortrules-pr-2.4.tar.gz 789097
-SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504 snortrules-pr-2.4.tar.gz 789097
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
-RMD160 ec80ce024ed7a013da35444ef1098ba3faa6cfc3 snortsam-20050110.tar.gz 29395
-SHA256 dc428458f3c47684aabb89036ca7e601a6aa92864dbf23b31f33732b76c2a01e snortsam-20050110.tar.gz 29395
diff --git a/net-analyzer/snort/files/digest-snort-2.6.1.2 b/net-analyzer/snort/files/digest-snort-2.6.1.4-r1
index 1ab41e7196dd..6976695869d4 100644
--- a/net-analyzer/snort/files/digest-snort-2.6.1.2
+++ b/net-analyzer/snort/files/digest-snort-2.6.1.4-r1
@@ -1,9 +1,9 @@
 MD5 52c0c6bc60d7123cb048e562d25bc34a Community-Rules-2.4.tar.gz 110044
 RMD160 ecfb4444cb0152545d823692eb6e5e2347151b54 Community-Rules-2.4.tar.gz 110044
 SHA256 4c82f90c960626aae5804c2375540f2d7241524c31ae3c7ab69df6c46e295c4c Community-Rules-2.4.tar.gz 110044
-MD5 22c448e25538cdf74c62abe586aeac0a snort-2.6.1.2.tar.gz 3511538
-RMD160 bd0ce3a4629a6e594a5f24723254e85d36597d04 snort-2.6.1.2.tar.gz 3511538
-SHA256 ca8bf1b1aa2fe23c9e8f8cb23482da123aac4b5842950b3cc2a40ba13da96b51 snort-2.6.1.2.tar.gz 3511538
+MD5 70e7f297c9fcf1f46d6fa3e1bb4aae49 snort-2.6.1.4.tar.gz 3716052
+RMD160 b9768992698fd9967b66b89938d38555260660ab snort-2.6.1.4.tar.gz 3716052
+SHA256 5f830d3c95b6fb96b8abaa5539e71c3cdcfd8df95b376c77323149436f7bbf70 snort-2.6.1.4.tar.gz 3716052
 MD5 35d9a2486f8c0280bb493aa03c011927 snortrules-pr-2.4.tar.gz 789097
 RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 snortrules-pr-2.4.tar.gz 789097
 SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504 snortrules-pr-2.4.tar.gz 789097
diff --git a/net-analyzer/snort/files/snort-2.6.1.1-gre.patch b/net-analyzer/snort/files/snort-2.6.1.1-gre.patch
deleted file mode 100644
index cc1f7a239e7e..000000000000
--- a/net-analyzer/snort/files/snort-2.6.1.1-gre.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -uNr -r 2.6.1.1-orig/src/decode.c 2.6.1.1/src/decode.c
---- 2.6.1.1-orig/src/decode.c	2006-10-13 19:40:41.000000000 +0200
-+++ 2.6.1.1/src/decode.c	2007-01-14 00:35:03.000000000 +0100
-@@ -2346,7 +2346,13 @@
-      * since p->iph will be pointing to this inner IP
-      */
-     if (p->greh != NULL)
-+    {
-         p->ip_options_data = NULL;
-+        p->ip_options_len = 0;
-+        memset(&(p->ip_options[0]), 0, sizeof(p->ip_options));
-+        p->ip_lastopt_bad = 0;
-+    }
-+
- #endif
- 
-         p->ip_option_count = 0;
-@@ -2642,7 +2648,7 @@
-     u_int16_t uhlen;
-     struct pseudoheader ph;
- 
--    if(len < sizeof(UDPHdr))
-+    if(len < GRE_HEADER_LEN)
-     {
-         if(pv.verbose_flag)
-         {
-@@ -3566,9 +3572,7 @@
-         }
-     }
- 
--    payload_len = len - hlen;
--
--    if (payload_len < 0)
-+    if (hlen > len)
-     {
-         if(pv.verbose_flag)
-             ErrorMessage("GRE header length > rest of packet length");
-@@ -3589,6 +3593,8 @@
-         return;
-     }
- 
-+    payload_len = len - hlen;
-+
-     /* send to next protocol decoder */
-     /* As described in RFC 2784 the possible protocols are listed in
-      * RFC 1700 under "ETHER TYPES"
diff --git a/net-analyzer/snort/files/snort.rc7 b/net-analyzer/snort/files/snort.rc9
index 668b807af87e..6dec60ec60e3 100644
--- a/net-analyzer/snort/files/snort.rc7
+++ b/net-analyzer/snort/files/snort.rc9
@@ -1,10 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.rc7,v 1.1 2006/02/17 16:22:03 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.rc9,v 1.1 2007/04/22 05:55:08 dragonheart Exp $
 
 depend() {
 	need net
+	after mysql
+	after postgresql
 }
 
 checkconfig() {
@@ -20,7 +22,7 @@ start() {
 	ebegin "Starting snort"
 	start-stop-daemon --start --quiet --exec /usr/bin/snort \
 		--pidfile ${PIDFILE} \
-		-- ${SNORT_OPTS} >/dev/null 2>&1
+		-- ${SNORT_OPTS} -u snort -g snort >/dev/null 2>&1
 	eend $?
 }
 
diff --git a/net-analyzer/snort/snort-2.4.5.ebuild b/net-analyzer/snort/snort-2.4.5.ebuild
deleted file mode 100644
index 4711ebcd3048..000000000000
--- a/net-analyzer/snort/snort-2.4.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.5.ebuild,v 1.9 2006/11/25 18:18:20 cedk Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
-	mirror://gentoo/snort-2.4.0-genpatches.tar.bz2
-	http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
-	http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz
-	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha amd64 ppc ppc64 -sparc x86"
-IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	postgres? ( || ( dev-db/postgresql dev-db/libpq ) )
-	mysql? ( virtual/mysql )
-	ssl? ( dev-libs/openssl )
-	prelude? ( >=dev-libs/libprelude-0.9.0 )
-	odbc? ( dev-db/unixODBC )
-	inline? (
-		~net-libs/libnet-1.0.2a
-		net-firewall/iptables
-		)"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-
-pkg_setup() {
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use flexresp || use inline ; then
-		epatch "${WORKDIR}/2.4.0-libnet-1.0.patch"
-	fi
-
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
-		etc/snort.conf || die "sed snort.conf failed"
-
-	if use prelude ; then
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed configure.in failed"
-	fi
-
-	if use sguil ; then
-		epatch "${WORKDIR}/2.4.0-spp_portscan_sguil.patch"
-		epatch "${WORKDIR}/2.4.0-spp_stream4_sguil.patch"
-	fi
-
-	if use snortsam ; then
-		cd ..
-		einfo "Applying snortsam patch"
-		./patchsnort.sh "${S}" || die "snortsam patch failed"
-		cd "${S}"
-	fi
-
-	einfo "Regenerating autoconf/automake files"
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	# bug #149496
-	append-flags -fno-strict-aliasing
-
-	# There is no --disable-flexresp, cannot use use_enable
-	use flexresp && myconf="${myconf} --enable-flexresp"
-
-	use inline && append-flags -I/usr/include/libipq
-
-	econf \
-		$(use_with postgres postgresql) \
-		$(use_with mysql) \
-		$(use_with ssl openssl) \
-		$(use_with odbc) \
-		--without-oracle \
-		$(use_enable prelude) \
-		$(use_with sguil) \
-		$(use_enable inline) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-
-	dodoc doc/*
-	docinto schemas ; dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config \
-		etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf
-	if use sguil ; then
-		sed -i -e "/^# output log_unified/s:# ::" \
-			-e "s:snort.log:snort_unified.log:" \
-		"${D}/etc/snort/snort.conf" || die "sed failed"
-	fi
-
-	newinitd "${FILESDIR}/snort.rc7" snort
-	newconfd "${FILESDIR}/snort.confd" snort
-	if use sguil ; then
-		sed -i -e "s:/var/log/snort:/var/lib/sguil/$(hostname):" \
-		-e "/^SNORT_OPTS/s%-u snort%-m 122 -u sguil -g sguil -A none%" \
-			"${D}/etc/conf.d/snort" || die "sed failed"
-	fi
-
-	fowners snort:snort /var/log/snort
-	fperms 0770 /var/log/snort
-
-	# install rules
-	dodir /etc/snort/rules
-	mv "${WORKDIR}"/rules/* "${D}/etc/snort/rules/"
-}
-
-pkg_postinst() {
-	if use mysql || use postgres || use odbc ; then
-		einfo "To use a database as a backend for snort you will have to"
-		einfo "import the correct tables to the database."
-		einfo "You will have to setup a database called snort first."
-		einfo
-		use mysql && \
-			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
-		use postgres && \
-			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
-		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic-t-399801.html'
-	fi
-	einfo
-	ewarn "Only a basic set of rules was installed."
-	ewarn "Please add your other sets of rules to /etc/snort/rules."
-	ewarn "For more information on rules, visit ${HOMEPAGE}."
-}
diff --git a/net-analyzer/snort/snort-2.6.1.2.ebuild b/net-analyzer/snort/snort-2.6.1.4-r1.ebuild
index 6b1e2beec1e6..055bbd164f27 100644
--- a/net-analyzer/snort/snort-2.6.1.2.ebuild
+++ b/net-analyzer/snort/snort-2.6.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.2.ebuild,v 1.7 2007/02/21 12:23:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.4-r1.ebuild,v 1.1 2007/04/22 05:55:08 dragonheart Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,7 +17,7 @@ SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 -sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 -sparc ~x86"
 IUSE="postgres mysql flexresp selinux snortsam odbc prelude inline dynamicplugin
 timestats perfprofiling linux-smp-stats flexresp2 react sguil gre"
 
@@ -60,10 +60,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-libdir.patch"
+	epatch "${FILESDIR}/${PN}-2.6.1.2-libdir.patch"
 	epatch "${FILESDIR}/${PN}-2.6.1.1-libnet.patch"
-	use gre && epatch "${FILESDIR}/${PN}-2.6.1.1-gre.patch"
-	use react && epatch "${FILESDIR}/${P}-react.patch"
+	epatch "${FILESDIR}/${P}-libdnet-ip6.patch"
+	use react && epatch "${FILESDIR}/${PN}-2.6.1.2-react.patch"
 	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
 		etc/snort.conf
 
@@ -129,9 +129,11 @@ src_install() {
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config \
 		etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf
+	use dynamicplugin || sed -i -e 's:^dynamic:# dynamic:g' etc/snort.conf
+	sed -e "s:/usr/local/lib:/usr/$(get_libdir):g" -e 's:/usr/local/:/usr/:g' \
+		etc/snort.conf > ${D}/etc/snort.conf
 
-	newinitd "${FILESDIR}/snort.rc8" snort
+	newinitd "${FILESDIR}/snort.rc9" snort
 	newconfd "${FILESDIR}/snort.confd" snort
 
 	fowners snort:snort /var/log/snort
@@ -163,7 +165,7 @@ pkg_postinst() {
 	ewarn "lower cost to memory. For more information on the new features"
 	ewarn "in snort 2.6, please take a look at the release notes located in..."
 	ewarn
-	ewarn "  /usr/share/doc/${PF}/RELEASE.NOTES.gz"
+	ewarn "  /usr/share/doc/${PF}/RELEASE.NOTES.bz2"
 	ewarn
 	einfo "To use a database as a backend for snort you will have to"
 	einfo "import the correct tables to the database."