Remove old ebuilds and unused files.

(Portage version: 2.1-r1)
 (Unsigned Manifest commit)

11 files changed, 0 insertions, 548 deletions

diff --git a/net-analyzer/snort/files/2.3.0-libnet-1.0.patch b/net-analyzer/snort/files/2.3.0-libnet-1.0.patch
deleted file mode 100644
index 6247e16a01eb..000000000000
--- a/net-analyzer/snort/files/2.3.0-libnet-1.0.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -urN snort-2.3.0.orig/configure.in snort-2.3.0/configure.in
---- snort-2.3.0.orig/configure.in	2005-01-27 10:11:34.000000000 -0500
-+++ snort-2.3.0/configure.in	2005-01-27 10:36:24.727932095 -0500
-@@ -686,20 +686,20 @@
-         fi
- 
-         LIBNET_INC_DIR=""
--        AC_MSG_CHECKING("for libnet.h version 1.0.x")
-+        AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x")
-         libnet_dir="/usr/include /usr/local/include"
-         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)", $tmp)
-+            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)", $tmp)
-             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
-@@ -711,26 +711,26 @@
- 
- 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
- 
--  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"
-@@ -748,33 +748,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"
-diff -urN snort-2.3.0.orig/src/detection-plugins/sp_react.c snort-2.3.0/src/detection-plugins/sp_react.c
---- snort-2.3.0.orig/src/detection-plugins/sp_react.c	2005-01-27 10:11:34.000000000 -0500
-+++ snort-2.3.0/src/detection-plugins/sp_react.c	2005-01-27 10:36:24.733931106 -0500
-@@ -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 -urN snort-2.3.0.orig/src/detection-plugins/sp_respond.c snort-2.3.0/src/detection-plugins/sp_respond.c
---- snort-2.3.0.orig/src/detection-plugins/sp_respond.c	2005-01-27 10:11:34.000000000 -0500
-+++ snort-2.3.0/src/detection-plugins/sp_respond.c	2005-01-27 10:36:24.734930941 -0500
-@@ -34,7 +34,7 @@
- 
- 
- #ifdef ENABLE_RESPONSE
--#include <libnet.h>
-+#include <libnet-1.0.h>
- 
- #include "decode.h"
- #include "rules.h"
-diff -urN snort-2.3.0.orig/src/inline.c snort-2.3.0/src/inline.c
---- snort-2.3.0.orig/src/inline.c	2005-01-27 10:11:34.000000000 -0500
-+++ snort-2.3.0/src/inline.c	2005-01-27 10:37:00.735994060 -0500
-@@ -3,7 +3,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/digest-snort-2.3.3 b/net-analyzer/snort/files/digest-snort-2.3.3
deleted file mode 100644
index 9a3883a9ec8e..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.3.3
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
-MD5 06bf140893e7cb120aaa9372d10a0100 snort-2.3.3.tar.gz 2631270
-RMD160 6bb635df1c62d293d8dd4b2fec55cfa486916908 snort-2.3.3.tar.gz 2631270
-SHA256 25b25b4c4028288945b968173d692ae2b72d811aaeea3715ae6a77945d9af2e9 snort-2.3.3.tar.gz 2631270
-MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
-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.3.3-r1 b/net-analyzer/snort/files/digest-snort-2.3.3-r1
deleted file mode 100644
index 563db8f40c76..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.3.3-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
-MD5 ad562cd6fdfab3049608144d9ba2d480 snort-2.3.3-prelude-0.9.0_rc1.diff.bz2 331076
-MD5 06bf140893e7cb120aaa9372d10a0100 snort-2.3.3.tar.gz 2631270
-RMD160 6bb635df1c62d293d8dd4b2fec55cfa486916908 snort-2.3.3.tar.gz 2631270
-SHA256 25b25b4c4028288945b968173d692ae2b72d811aaeea3715ae6a77945d9af2e9 snort-2.3.3.tar.gz 2631270
-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.4.3 b/net-analyzer/snort/files/digest-snort-2.4.3
deleted file mode 100644
index 3e3044f63ca5..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.3
+++ /dev/null
@@ -1,12 +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 5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz 2733590
-RMD160 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2 snort-2.4.3.tar.gz 2733590
-SHA256 4f3aa911234a9fc4beb5ba9b0fe88f1e3af0fcbfe84d4448415f049b9791bc65 snort-2.4.3.tar.gz 2733590
-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.4.3-r1 b/net-analyzer/snort/files/digest-snort-2.4.3-r1
deleted file mode 100644
index 67fb32dbdbdc..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.3-r1
+++ /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 5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz 2733590
-RMD160 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2 snort-2.4.3.tar.gz 2733590
-SHA256 4f3aa911234a9fc4beb5ba9b0fe88f1e3af0fcbfe84d4448415f049b9791bc65 snort-2.4.3.tar.gz 2733590
-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.4.3-r2 b/net-analyzer/snort/files/digest-snort-2.4.3-r2
deleted file mode 100644
index 67fb32dbdbdc..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.3-r2
+++ /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 5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz 2733590
-RMD160 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2 snort-2.4.3.tar.gz 2733590
-SHA256 4f3aa911234a9fc4beb5ba9b0fe88f1e3af0fcbfe84d4448415f049b9791bc65 snort-2.4.3.tar.gz 2733590
-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.4.4 b/net-analyzer/snort/files/digest-snort-2.4.4
deleted file mode 100644
index 1ba9a6396076..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.4
+++ /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 9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz 2825187
-RMD160 5c0ff9aafdb083438cb10e82bdcdba43f806f86e snort-2.4.4.tar.gz 2825187
-SHA256 b9f3e21467a5f6dd827ddb80dc9ac29ea272e4a5633a6a8a583f523a219e00e9 snort-2.4.4.tar.gz 2825187
-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.4.4-r1 b/net-analyzer/snort/files/digest-snort-2.4.4-r1
deleted file mode 100644
index 1ba9a6396076..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.4-r1
+++ /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 9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz 2825187
-RMD160 5c0ff9aafdb083438cb10e82bdcdba43f806f86e snort-2.4.4.tar.gz 2825187
-SHA256 b9f3e21467a5f6dd827ddb80dc9ac29ea272e4a5633a6a8a583f523a219e00e9 snort-2.4.4.tar.gz 2825187
-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/snort-2.3.3-log.c.diff b/net-analyzer/snort/files/snort-2.3.3-log.c.diff
deleted file mode 100644
index d1286b1dd5ef..000000000000
--- a/net-analyzer/snort/files/snort-2.3.3-log.c.diff
+++ /dev/null
@@ -1,115 +0,0 @@
---- snort-2.3.3.orig/src/log.c	2005-09-17 00:34:21.000000000 -0300
-+++ snort-2.3.3/src/log.c	2005-09-17 00:47:50.000000000 -0300
-@@ -1478,7 +1478,10 @@
-                 {
-                     for(j = 0; j < p->ip_options[i].len; j++)
-                     {
--                        fprintf(fp, "%02X", p->ip_options[i].data[j]);
-+                        if (p->ip_options[i].data)
-+                            fprintf(fp, "%02X", p->ip_options[i].data[j]);
-+                        else
-+                            fprintf(fp, "%02X", 0);
-                         
-                         if((j % 2) == 0)
-                             fprintf(fp, " ");
-@@ -1522,7 +1525,8 @@
-             case TCPOPT_MAXSEG:
-                 bzero((char *) tmp, 5);
-                 fwrite("MSS: ", 5, 1, fp);
--                memcpy(tmp, p->tcp_options[i].data, 2);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 2);
-                 fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
-                 break;
- 
-@@ -1535,15 +1539,20 @@
-                 break;
- 
-             case TCPOPT_WSCALE:
--                fprintf(fp, "WS: %u ", p->tcp_options[i].data[0]);
-+                if (p->tcp_options[i].data)
-+                    fprintf(fp, "WS: %u ", p->tcp_options[i].data[0]);
-+                else
-+                    fprintf(fp, "WS: %u ", 0);
-                 break;
- 
-             case TCPOPT_SACK:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 2);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 2);
-                 fprintf(fp, "Sack: %u@", EXTRACT_16BITS(tmp));
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
-                 fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
-                 break;
- 
-@@ -1553,40 +1562,47 @@
- 
-             case TCPOPT_ECHO:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "Echo: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_ECHOREPLY:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "Echo Rep: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_TIMESTAMP:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "TS: %u ", EXTRACT_32BITS(tmp));
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
-                 fprintf(fp, "%u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_CC:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "CC %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_CCNEW:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "CCNEW: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_CCECHO:
-                 bzero((char *) tmp, 5);
--                memcpy(tmp, p->tcp_options[i].data, 4);
-+                if (p->tcp_options[i].data)
-+                    memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "CCECHO: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-@@ -1598,7 +1614,10 @@
- 
-                     for(j = 0; j < p->tcp_options[i].len; j++)
-                     {
--                        fprintf(fp, "%02X", p->tcp_options[i].data[j]);
-+                        if (p->tcp_options[i].data)
-+                            fprintf(fp, "%02X", p->tcp_options[i].data[j]);
-+                        else
-+                            fprintf(fp, "%02X", 0);
-                         
-                         if((j % 2) == 0)
-                             fprintf(fp, " ");
diff --git a/net-analyzer/snort/files/snort-2.4.4-demarc-patch.diff b/net-analyzer/snort/files/snort-2.4.4-demarc-patch.diff
deleted file mode 100644
index bca2f038e011..000000000000
--- a/net-analyzer/snort/files/snort-2.4.4-demarc-patch.diff
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -Nuar snort-2.4.4/src/preprocessors/HttpInspect/client/hi_client.c snort-2.4.4-demarc/src/preprocessors/HttpInspect/client/hi_client.c
---- snort-2.4.4/src/preprocessors/HttpInspect/client/hi_client.c	2005-03-16 13:52:18.000000000 -0800
-+++ snort-2.4.4-demarc/src/preprocessors/HttpInspect/client/hi_client.c	2006-05-30 22:54:44.000000000 -0700
-@@ -40,6 +40,7 @@
- 
- #define URI_END  1
- #define NO_URI  -1
-+#define CR_IN_URI 18 
- #define INVALID_HEX_VAL -1
- 
- /**
-@@ -455,6 +456,11 @@
-         return URI_END;
-     }
- 
-+	if(isspace(**ptr) )
-+	{
-+		return CR_IN_URI;
-+	}
-+
-     return NO_URI;
- }
- 
-@@ -1345,8 +1351,21 @@
-                     */
-                     break;
-                 }
-+		else if(iRet == CR_IN_URI)
-+		{
-+        		if(hi_eo_generate_event(Session,ServerConf->non_std_cr.alert))
-+        		{
-+            			hi_eo_client_event_log(Session,ServerConf->non_std_cr.alert,
-+                                   NULL, NULL);
-+			}
-+			break;
-+		}
-+
-+
-+
-                 else /* NO_URI */
-                 {
-+
-                     /*
-                     **  Check for chunk encoding, because the delimiter can
-                     **  also be a space, which would look like a pipeline request
-diff -Nuar snort-2.4.4/src/preprocessors/HttpInspect/event_output/hi_eo_log.c snort-2.4.4-demarc/src/preprocessors/HttpInspect/event_output/hi_eo_log.c
---- snort-2.4.4/src/preprocessors/HttpInspect/event_output/hi_eo_log.c	2004-03-11 14:25:53.000000000 -0800
-+++ snort-2.4.4-demarc/src/preprocessors/HttpInspect/event_output/hi_eo_log.c	2006-05-30 10:27:49.000000000 -0700
-@@ -64,7 +64,9 @@
-     {HI_EO_CLIENT_PROXY_USE, HI_EO_LOW_PRIORITY,
-         HI_EO_CLIENT_PROXY_USE_STR },
-     {HI_EO_CLIENT_WEBROOT_DIR, HI_EO_HIGH_PRIORITY,
--        HI_EO_CLIENT_WEBROOT_DIR_STR }
-+        HI_EO_CLIENT_WEBROOT_DIR_STR },
-+    { HI_EO_CLIENT_CR_IN_URI, HI_EO_MED_PRIORITY,
-+        HI_EO_CLIENT_CR_IN_URI_STR },
- };
- 
- static HI_EVENT_INFO anom_server_event_info[HI_EO_ANOM_SERVER_EVENT_NUM] = {
-diff -Nuar snort-2.4.4/src/preprocessors/HttpInspect/include/hi_eo_events.h snort-2.4.4-demarc/src/preprocessors/HttpInspect/include/hi_eo_events.h
---- snort-2.4.4/src/preprocessors/HttpInspect/include/hi_eo_events.h	2004-03-11 14:25:53.000000000 -0800
-+++ snort-2.4.4-demarc/src/preprocessors/HttpInspect/include/hi_eo_events.h	2006-05-25 13:01:08.000000000 -0700
-@@ -24,13 +24,14 @@
- #define HI_EO_CLIENT_LARGE_CHUNK    15  /* done */
- #define HI_EO_CLIENT_PROXY_USE      16  /* done */
- #define HI_EO_CLIENT_WEBROOT_DIR    17  /* done */
-+#define HI_EO_CLIENT_CR_IN_URI      18  /* done */
- 
- /*
- **  IMPORTANT:
- **  Every time you add a client event, this number must be
- **  incremented.
- */
--#define HI_EO_CLIENT_EVENT_NUM      18
-+#define HI_EO_CLIENT_EVENT_NUM      19
- 
- /*
- **  These defines are the alert names for each event
-@@ -71,6 +72,8 @@
-     "(http_inspect) UNAUTHORIZED PROXY USE DETECTED"
- #define HI_EO_CLIENT_WEBROOT_DIR_STR                    \
-     "(http_inspect) WEBROOT DIRECTORY TRAVERSAL"
-+#define HI_EO_CLIENT_CR_IN_URI_STR                       \
-+    "(http_inspect) NON-STD CARRIAGE RETURN IN URI"
- 
- /*
- **  Anomalous Server Events
-diff -Nuar snort-2.4.4/src/preprocessors/HttpInspect/include/hi_ui_config.h snort-2.4.4-demarc/src/preprocessors/HttpInspect/include/hi_ui_config.h
---- snort-2.4.4/src/preprocessors/HttpInspect/include/hi_ui_config.h	2005-03-16 13:52:18.000000000 -0800
-+++ snort-2.4.4-demarc/src/preprocessors/HttpInspect/include/hi_ui_config.h	2006-05-30 09:44:18.000000000 -0700
-@@ -113,6 +113,7 @@
-     HTTPINSPECT_CONF_OPT webroot;
-     HTTPINSPECT_CONF_OPT apache_whitespace;
-     HTTPINSPECT_CONF_OPT iis_delimiter;
-+    HTTPINSPECT_CONF_OPT non_std_cr;
-     
- }  HTTPINSPECT_CONF;
- 
-diff -Nuar snort-2.4.4/src/preprocessors/HttpInspect/user_interface/hi_ui_config.c snort-2.4.4-demarc/src/preprocessors/HttpInspect/user_interface/hi_ui_config.c
---- snort-2.4.4/src/preprocessors/HttpInspect/user_interface/hi_ui_config.c	2005-03-16 13:52:19.000000000 -0800
-+++ snort-2.4.4-demarc/src/preprocessors/HttpInspect/user_interface/hi_ui_config.c	2006-05-30 23:00:25.000000000 -0700
-@@ -117,6 +117,9 @@
- 
-     GlobalConf->global_server.non_strict = 1;
- 
-+    GlobalConf->global_server.non_std_cr.on = 1;
-+    GlobalConf->global_server.non_std_cr.alert = 1;
-+
-     return HI_SUCCESS;
- }
- 
-@@ -209,6 +212,9 @@
- 
-     ServerConf->tab_uri_delimiter = 1;
- 
-+    ServerConf->non_std_cr.on = 1;
-+    ServerConf->non_std_cr.alert = 1;
-+
-     return HI_SUCCESS;
- }
-     
-@@ -279,6 +285,9 @@
- 
-     ServerConf->non_strict = 1;
- 
-+    ServerConf->non_std_cr.on = 1;
-+    ServerConf->non_std_cr.alert = 1;
-+
-     return HI_SUCCESS;
- }
- 
-@@ -349,6 +358,9 @@
- 
-     ServerConf->tab_uri_delimiter = 1;
- 
-+    ServerConf->non_std_cr.on = 1;
-+    ServerConf->non_std_cr.alert = 1;
-+
-     return HI_SUCCESS;
- }
- 
-diff -Nuar snort-2.4.4/src/preprocessors/snort_httpinspect.c snort-2.4.4-demarc/src/preprocessors/snort_httpinspect.c
---- snort-2.4.4/src/preprocessors/snort_httpinspect.c	2005-08-23 08:52:19.000000000 -0700
-+++ snort-2.4.4-demarc/src/preprocessors/snort_httpinspect.c	2006-05-30 10:33:54.000000000 -0700
-@@ -134,6 +134,7 @@
- #define GLOBAL_ALERT      "no_alerts"
- #define WEBROOT           "webroot"
- #define TAB_URI_DELIMITER "tab_uri_delimiter"
-+#define NON_STD_CR		  "non_std_cr"
- 
- /*
- **  Alert subkeywords
-@@ -1449,6 +1450,15 @@
-                 return iRet;
-             }
-         }
-+        else if(!strcmp(NON_STD_CR, pcToken))
-+        {
-+            ConfOpt = &ServerConf->non_std_cr;
-+            if((iRet = ProcessConfOpt(ConfOpt, NON_STD_CR,
-+                                      ErrorString, ErrStrLen)))
-+            {
-+                return iRet;
-+            }
-+        }
-         else if(!strcmp(IIS_BACKSLASH, pcToken))
-         {
-             ConfOpt = &ServerConf->iis_backslash;
-@@ -1583,6 +1593,7 @@
-     PrintConfOpt(&ServerConf->webroot, "Web Root Traversal");
-     PrintConfOpt(&ServerConf->apache_whitespace, "Apache WhiteSpace");
-     PrintConfOpt(&ServerConf->iis_delimiter, "IIS Delimiter");
-+    PrintConfOpt(&ServerConf->non_std_cr, "Non-Std Carriage Return");
- 
-     if(ServerConf->iis_unicode_map_filename)
-     {
diff --git a/net-analyzer/snort/files/snort.rc6 b/net-analyzer/snort/files/snort.rc6
deleted file mode 100644
index ef70d44e5bcd..000000000000
--- a/net-analyzer/snort/files/snort.rc6
+++ /dev/null
@@ -1,30 +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.rc6,v 1.6 2005/11/26 13:57:06 strerror 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 \
-		-- ${SNORT_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snort"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $?
-}