Cleaning out unused files

(Portage version: 2.1.6.13/cvs/Linux i686)

10 files changed, 9 insertions, 582 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index fe6026ebf858..661cb3e9e7ae 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.152 2009/08/17 16:18:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.153 2009/09/12 03:01:27 vostorga Exp $
+
+  12 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
+  -files/snort-2.6.1.1-libnet.patch, -files/snort-2.6.1.2-libdir.patch,
+  -files/snort-2.6.1.2-react.patch, -files/snort-2.6.1.4-libdnet-ip6.patch,
+  -files/snort-2.6.1.4-server_stats.patch,
+  -files/snort-2.8.3.1-libnet.patch, -files/snort.rc7, -files/snort.rc8,
+  -files/spo_database_fix.patch:
+  Cleaning out unused files
 
   17 Aug 2009; Patrick Lauer <patrick@gentoo.org> snort-2.8.4.1.ebuild:
   Small typo fix, closes #279926
diff --git a/net-analyzer/snort/files/snort-2.6.1.1-libnet.patch b/net-analyzer/snort/files/snort-2.6.1.1-libnet.patch
deleted file mode 100644
index 0c777ec9048f..000000000000
--- a/net-analyzer/snort/files/snort-2.6.1.1-libnet.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -ru snort-2.6.1.1~/configure.in snort-2.6.1.1/configure.in
---- snort-2.6.1.1~/configure.in	2006-11-25 12:36:50.000000000 +0100
-+++ snort-2.6.1.1/configure.in	2006-11-25 13:26:11.000000000 +0100
-@@ -799,19 +799,19 @@
-          else
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
--        AC_MSG_CHECKING("for libnet.h version 1.0.x")
-+        AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x")
-         for i in $libnet_dir; do
--            if test -r $i/libnet.h; then
-+            if test -r $i/libnet-1.0.h; then
-                 LIBNET_INC_DIR=$i
-             fi
-         done
- 
-         if test "$LIBNET_INC_DIR" != ""; then
--            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then
--                FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR)
-+            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0 >/dev/null"; then
-+                FAIL_MESSAGE("libnet 1.0.x (libnet-1.0.h)", $LIBNET_INC_DIR)
-             fi
--            CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"
--            LIBS="${LIBS} `libnet-config --libs`"
-+            CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`"
-+            LIBS="${LIBS} `libnet-1.0-config --libs`"
-             CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
-             AC_MSG_RESULT($i)
-         else
-@@ -828,7 +828,7 @@
- 
- AC_ARG_ENABLE(flexresp,
- [  --enable-flexresp        Flexible Responses on hostile connection attempts],
--[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],)
-+[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"],)
-                 
- 
- if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then
-@@ -838,21 +838,21 @@
-     exit
-   fi
- 
--  if test `libnet-config --cflags | wc -c` = "1"; then
-+  if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-     CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-     LIBNET_CONFIG_BROKEN_CFLAGS=yes
-   fi
- 
--  if test `libnet-config --libs | wc -c` = "1"; then
--    AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+  if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+    AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-     AC_MSG_WARN(are using a precompiled package please notify the) 
-     AC_MSG_WARN(maintainer.)
-     LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
--    LIBS="${LIBS} -lnet"
-+    LIBS="${LIBS} -lnet-1.0"
-   fi
- 
-   LNET=""
--  AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+  AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
-   if test "$LNET" = "no"; then
-     echo
-     echo "   ERROR!  Libnet header not found, go get it from"
-@@ -870,33 +870,33 @@
-       libnet_dir="/usr/include /usr/local/include /sw/include"
-     fi
-   else
--    libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-   fi
- 
-   LIBNET_INC_DIR=""
-   for i in $libnet_dir; do
--    if test -r $i/libnet.h; then
-+    if test -r $i/libnet-1.0.h; then
-       LIBNET_INC_DIR=$i
-     fi
-   done
- 
-   if test "$LIBNET_INC_DIR" != ""; then
--    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-       AC_MSG_RESULT(no)
-       echo
-       echo "   ERROR!  Snort with --enable-flexresp will *only* work with"
-       echo "   libnet version 1.0.2a, go get it from"
-       echo "   http://www.packetfactory.net/projects/libnet/"
--      FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+      FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-     fi
-     AC_MSG_RESULT(yes)
-   else
-     AC_MSG_RESULT(no)
--    FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+    FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
-   fi
- 
-   LNET=""
--  AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+  AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
-   if test "$LNET" = "no"; then
-     echo
-     echo "   ERROR!  Libnet library not found, go get it from"
-@@ -942,7 +942,7 @@
- 
- AC_ARG_ENABLE(react,
- [  --enable-react           Intercept and terminate offending HTTP accesses],
--[ CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],)
-+[ CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"],)
- 
- 
- if test "$enable_react" != "no" -a "$enable_react" = "yes"; then
-@@ -953,13 +953,13 @@
-     exit
-   fi
- 
--  if test `libnet-config --cflags | wc -c` = "1"; then
-+  if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-     CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-     LIBNET_CONFIG_BROKEN_CFLAGS=yes
-   fi
- 
--  if test `libnet-config --libs | wc -c` = "1"; then
--    AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+  if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+    AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-     AC_MSG_WARN(are using a precompiled package please notify the)
-     AC_MSG_WARN(maintainer.)
-     LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
-@@ -967,7 +967,7 @@
-   fi
- 
-   LNET=""
--  AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+  AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
-   if test "$LNET" = "no"; then
-     echo
-     echo "   ERROR!  Libnet header not found, go get it from"
-@@ -985,29 +985,29 @@
-       libnet_dir="/usr/include /usr/local/include /sw/include"
-     fi
-   else
--    libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-   fi
- 
-   LIBNET_INC_DIR=""
-   for i in $libnet_dir; do
--    if test -r $i/libnet.h; then
-+    if test -r $i/libnet-1.0.h; then
-       LIBNET_INC_DIR=$i
-     fi
-   done
- 
-   if test "$LIBNET_INC_DIR" != ""; then
--    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-       AC_MSG_RESULT(no)
-       echo
-       echo "   ERROR!  Snort with --enable-react will *only* work with"
-       echo "   libnet version 1.0.2a, go get it from"
-       echo "   http://www.packetfactory.net/projects/libnet/"
--      FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+      FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-     fi
-     AC_MSG_RESULT(yes)
-   else
-     AC_MSG_RESULT(no)
--    FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+    FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
-   fi
- 
-   LNET=""
-diff -ru snort-2.6.1.1~/src/detection-plugins/sp_react.c snort-2.6.1.1/src/detection-plugins/sp_react.c
---- snort-2.6.1.1~/src/detection-plugins/sp_react.c	2006-11-25 12:36:50.000000000 +0100
-+++ snort-2.6.1.1/src/detection-plugins/sp_react.c	2006-11-25 13:07:47.000000000 +0100
-@@ -57,7 +57,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "rules.h"
- #include "decode.h"
-diff -ru snort-2.6.1.1~/src/detection-plugins/sp_respond.c snort-2.6.1.1/src/detection-plugins/sp_respond.c
---- snort-2.6.1.1~/src/detection-plugins/sp_respond.c	2006-11-25 12:36:50.000000000 +0100
-+++ snort-2.6.1.1/src/detection-plugins/sp_respond.c	2006-11-25 13:07:29.000000000 +0100
-@@ -34,7 +34,7 @@
- 
- 
- #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "rules.h"
-diff -ru snort-2.6.1.1~/src/inline.c snort-2.6.1.1/src/inline.c
---- snort-2.6.1.1~/src/inline.c	2006-11-25 12:36:50.000000000 +0100
-+++ snort-2.6.1.1/src/inline.c	2006-11-25 13:07:07.000000000 +0100
-@@ -20,7 +20,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <pcap.h>
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "inline.h"
diff --git a/net-analyzer/snort/files/snort-2.6.1.2-libdir.patch b/net-analyzer/snort/files/snort-2.6.1.2-libdir.patch
deleted file mode 100644
index 329e5558bbb0..000000000000
--- a/net-analyzer/snort/files/snort-2.6.1.2-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- snort-2.6.1.2/src/dynamic-plugins/sf_engine/Makefile.am.old	2007-02-03 21:11:09.000000000 +0100
-+++ snort-2.6.1.2/src/dynamic-plugins/sf_engine/Makefile.am	2007-02-03 21:11:22.000000000 +0100
-@@ -3,9 +3,9 @@
- 
- #INCLUDES = -I../include
- 
--lib_LTLIBRARIES = libsf_engine.la
-+libsf_LTLIBRARIES = libsf_engine.la
- 
--libdir = ${exec_prefix}/lib/snort_dynamicengine
-+libsfdir = ${libdir}/snort_dynamicengine
- 
- libsf_engine_la_LDFLAGS = -module
- 
diff --git a/net-analyzer/snort/files/snort-2.6.1.2-react.patch b/net-analyzer/snort/files/snort-2.6.1.2-react.patch
deleted file mode 100644
index c03f1daf6bc2..000000000000
--- a/net-analyzer/snort/files/snort-2.6.1.2-react.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN ./snort-2.6.1.2-orig/configure.in ./snort-2.6.1.2/configure.in
---- ./snort-2.6.1.2-orig/configure.in	2007-02-01 16:09:42.000000000 +0100
-+++ ./snort-2.6.1.2/configure.in	2007-02-01 16:59:55.000000000 +0100
-@@ -963,7 +963,7 @@
-     AC_MSG_WARN(are using a precompiled package please notify the)
-     AC_MSG_WARN(maintainer.)
-     LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
--    LIBS="${LIBS} -lnet"
-+    LIBS="${LIBS} -lnet-1.0"
-   fi
- 
-   LNET=""
-@@ -1011,10 +1011,10 @@
-   fi
- 
-   LNET=""
--  AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+  AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
-   if test "$LNET" = "no"; then
-     echo
--    echo "   ERROR!  Libnet library not found, go get it from"
-+    echo "   ERROR!  Libnet-1.0 library not found, go get it from"
-     echo "   http://www.packetfactory.net/projects/libnet/"
-     echo "   or use the --with-libnet-* options, if you have it installed"
-     echo "   in unusual place"
diff --git a/net-analyzer/snort/files/snort-2.6.1.4-libdnet-ip6.patch b/net-analyzer/snort/files/snort-2.6.1.4-libdnet-ip6.patch
deleted file mode 100644
index e580ecb0669c..000000000000
--- a/net-analyzer/snort/files/snort-2.6.1.4-libdnet-ip6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- snort-2.6.1.4-orig/src/decode.h     2007-03-19 14:31:33.000000000 +0100
-+++ snort-2.6.1.4/src/decode.h  2007-04-07 02:32:02.851976653 +0200
-@@ -885,6 +885,7 @@
- #endif
- #endif
-
-+#ifndef DNET_IP6_H
- struct ip6_hdr
- {
-     union
-@@ -908,6 +909,7 @@
- #define ip6_plen  ip6_ctlun.ip6_un1.ip6_un1_plen
- #define ip6_nxt   ip6_ctlun.ip6_un1.ip6_un1_nxt
- #define ip6_hlim  ip6_ctlun.ip6_un1.ip6_un1_hlim
-+#endif
- #define ip6_hops  ip6_ctlun.ip6_un1.ip6_un1_hlim
-
- /* Fragment header */
diff --git a/net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch b/net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch
deleted file mode 100644
index 752b24fc4592..000000000000
--- a/net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- snort-2.6.1.4/src/preprocessors/flow/portscan/server_stats.c.orig	2006-05-24 18:06:57.000000000 +0200
-+++ snort-2.6.1.4/src/preprocessors/flow/portscan/server_stats.c	2009-03-01 07:57:10.000000000 +0100
-@@ -325,7 +325,7 @@
- 
-     /* open this description, create it if necessary, always wait on
-      * sync to disk w/ every write, only write */
--    fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY);
-+    fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
- 
-     if(fd < 0)
-     {
diff --git a/net-analyzer/snort/files/snort-2.8.3.1-libnet.patch b/net-analyzer/snort/files/snort-2.8.3.1-libnet.patch
deleted file mode 100644
index b51b1531569f..000000000000
--- a/net-analyzer/snort/files/snort-2.8.3.1-libnet.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -ru snort-2.8.3.1/configure.in snort-2.8.3.1_gentoo/configure.in
---- snort-2.8.3.1/configure.in	2008-09-15 10:45:24.000000000 -0400
-+++ snort-2.8.3.1_gentoo/configure.in	2008-11-03 16:34:41.000000000 -0500
-@@ -1151,19 +1151,19 @@
-          else
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
--        AC_MSG_CHECKING("for libnet.h version 1.0.x")
-+        AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x")
-         for i in $libnet_dir; do
--            if test -r "$i/libnet.h"; then
-+            if test -r "$i/libnet-1.0.h"; then
-                 LIBNET_INC_DIR="$i"
-             fi
-         done
- 
-         if test "$LIBNET_INC_DIR" != ""; then
--            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then
--                FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR)
-+            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0 >/dev/null"; then
-+                FAIL_MESSAGE("libnet 1.0.x (libnet-1.0.h)", $LIBNET_INC_DIR)
-             fi
--            CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"
--            LIBS="${LIBS} `libnet-config --libs`"
-+            CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`"
-+            LIBS="${LIBS} `libnet-1.0-config --libs`"
-             CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
-             AC_MSG_RESULT($i)
-         else
-@@ -1185,8 +1185,8 @@
- [  --enable-flexresp        Flexible Responses on hostile connection attempts],
-        enable_flexresp="$enableval", enable_flexresp="no")
- if test "x$enable_flexresp" = "xyes"; then
--    CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`"
--    LDFLAGS="${LDFLAGS} `libnet-config --libs`"
-+    CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`"
-+    LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
- fi
-                 
- if test "x$enable_flexresp" != "xno" -a "x$enable_flexresp" = "xyes"; then
-@@ -1196,21 +1196,21 @@
-         exit
-     fi
- 
--    if test `libnet-config --cflags | wc -c` = "1"; then
-+    if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-         CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-         LIBNET_CONFIG_BROKEN_CFLAGS="yes"
-     fi
- 
--    if test `libnet-config --libs | wc -c` = "1"; then
--        AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+    if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+        AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-         AC_MSG_WARN(are using a precompiled package please notify the) 
-         AC_MSG_WARN(maintainer.)
-         LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
--        LIBS="${LIBS} -lnet"
-+        LIBS="${LIBS} -lnet-1.0"
-     fi
- 
-     LNET=""
--    AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+    AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet header not found, go get it from"
-@@ -1228,33 +1228,33 @@
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
-     else
--        libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+        libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-     fi
- 
-     LIBNET_INC_DIR=""
-     for i in $libnet_dir; do
--        if test -r "$i/libnet.h"; then
-+        if test -r "$i/libnet-1.0.h"; then
-             LIBNET_INC_DIR="$i"
-         fi
-     done
- 
-     if test "x$LIBNET_INC_DIR" != "x"; then
--        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-             AC_MSG_RESULT(no)
-             echo
-             echo "   ERROR!  Snort with --enable-flexresp will *only* work with"
-             echo "   libnet version 1.0.2a, go get it from"
-             echo "   http://www.packetfactory.net/projects/libnet/"
--            FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+            FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-         fi
-         AC_MSG_RESULT(yes)
-     else
-         AC_MSG_RESULT(no)
--        FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+        FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
-     fi
- 
-     LNET=""
--    AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+    AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet library not found, go get it from"
-@@ -1305,8 +1305,8 @@
- [  --enable-react           Intercept and terminate offending HTTP accesses],
-        enable_react="$enableval", enable_react="no")
- if test "x$enable_react" = "xyes"; then
--    CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`"
--    LDFLAGS="${LDFLAGS} `libnet-config --libs`"
-+    CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`"
-+    LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
- fi
- 
- if test "x$enable_react" != "xno" -a "x$enable_react" = "xyes"; then
-@@ -1317,13 +1317,13 @@
-         exit
-     fi
- 
--    if test `libnet-config --cflags | wc -c` = "1"; then
-+    if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-         CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-         LIBNET_CONFIG_BROKEN_CFLAGS="yes"
-     fi
- 
--    if test `libnet-config --libs | wc -c` = "1"; then
--        AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+    if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+        AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-         AC_MSG_WARN(are using a precompiled package please notify the)
-         AC_MSG_WARN(maintainer.)
-         LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
-@@ -1331,7 +1331,7 @@
-     fi
- 
-     LNET=""
--    AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+    AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet header not found, go get it from"
-@@ -1349,33 +1349,33 @@
-             libnet_dir="/usr/include /usr/local/include /sw/include"
-         fi
-     else
--        libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+        libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-     fi
- 
-     LIBNET_INC_DIR=""
-     for i in $libnet_dir; do
--        if test -r "$i/libnet.h"; then
-+        if test -r "$i/libnet-1.0.h"; then
-             LIBNET_INC_DIR="$i"
-         fi
-     done
- 
-     if test "x$LIBNET_INC_DIR" != "x"; then
--        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-             AC_MSG_RESULT(no)
-             echo
-             echo "   ERROR!  Snort with --enable-react will *only* work with"
-             echo "   libnet version 1.0.2a, go get it from"
-             echo "   http://www.packetfactory.net/projects/libnet/"
--            FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+            FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-         fi
-         AC_MSG_RESULT(yes)
-     else
-         AC_MSG_RESULT(no)
--        FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+        FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
-     fi
- 
-     LNET=""
--    AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+    AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
-     if test "x$LNET" = "xno"; then
-         echo
-         echo "   ERROR!  Libnet library not found, go get it from"
-diff -ru snort-2.8.3.1/src/detection-plugins/sp_react.c snort-2.8.3.1_gentoo/src/detection-plugins/sp_react.c
---- snort-2.8.3.1/src/detection-plugins/sp_react.c	2008-07-11 16:56:00.000000000 -0400
-+++ snort-2.8.3.1_gentoo/src/detection-plugins/sp_react.c	2008-11-03 16:39:16.000000000 -0500
-@@ -59,7 +59,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "rules.h"
- #include "decode.h"
-diff -ru snort-2.8.3.1/src/detection-plugins/sp_respond.c snort-2.8.3.1_gentoo/src/detection-plugins/sp_respond.c
---- snort-2.8.3.1/src/detection-plugins/sp_respond.c	2008-07-11 16:56:00.000000000 -0400
-+++ snort-2.8.3.1_gentoo/src/detection-plugins/sp_respond.c	2008-11-03 16:38:50.000000000 -0500
-@@ -36,7 +36,7 @@
- 
- 
- #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "rules.h"
-diff -ru snort-2.8.3.1/src/inline.c snort-2.8.3.1_gentoo/src/inline.c
---- snort-2.8.3.1/src/inline.c	2008-02-25 16:34:56.000000000 -0500
-+++ snort-2.8.3.1_gentoo/src/inline.c	2008-11-03 16:39:44.000000000 -0500
-@@ -20,7 +20,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <pcap.h>
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "inline.h"
diff --git a/net-analyzer/snort/files/snort.rc7 b/net-analyzer/snort/files/snort.rc7
deleted file mode 100644
index ea6507c017fa..000000000000
--- a/net-analyzer/snort/files/snort.rc7
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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.3 2007/04/22 06:21:15 dragonheart Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e $CONF ] ; then
-		eerror "You need a configuration file to run snort"
-		eerror "There is an example config in /etc/snort/snort.conf.distrib"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting snort"
-	start-stop-daemon --start --quiet --exec /usr/bin/snort \
-		--pidfile ${PIDFILE} \
-		-- ${SNORT_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snort"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/snort/files/snort.rc8 b/net-analyzer/snort/files/snort.rc8
deleted file mode 100644
index d118db849b66..000000000000
--- a/net-analyzer/snort/files/snort.rc8
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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.rc8,v 1.1 2006/11/25 16:39:42 cedk Exp $
-
-depend() {
-	need net
-	after mysql
-	after postgresql
-}
-
-checkconfig() {
-	if [ ! -e $CONF ] ; then
-		eerror "You need a configuration file to run snort"
-		eerror "There is an example config in /etc/snort/snort.conf.distrib"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting snort"
-	start-stop-daemon --start --quiet --exec /usr/bin/snort \
-		--pidfile ${PIDFILE} \
-		-- ${SNORT_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snort"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/snort/files/spo_database_fix.patch b/net-analyzer/snort/files/spo_database_fix.patch
deleted file mode 100644
index 944b3ee49e14..000000000000
--- a/net-analyzer/snort/files/spo_database_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru snort-2.8.4.orig/src/output-plugins/spo_database.c snort-2.8.4/src/output-plugins/spo_database.c
---- snort-2.8.4.orig/src/output-plugins/spo_database.c	2009-01-26 16:50:26.000000000 -0500
-+++ snort-2.8.4/src/output-plugins/spo_database.c	2009-04-14 10:43:28.000000000 -0400
-@@ -2798,6 +2798,14 @@
-                     {
-                         result = atoi(data->m_row[0]);
-                     }
-+		      else
-+		      {
-+		    	result = 0;
-+		      }
-+		    }
-+		    else
-+		    {
-+		      result = 0;
-                 }
-             }
-             mysql_free_result(data->m_result);