added patch, fixes #47229

5 files changed, 98 insertions, 37 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index c8679e3b40cd..2a064ab1d785 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.38 2004/04/06 11:00:31 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.39 2004/04/14 17:59:00 squinky86 Exp $
+
+  14 Apr 2004; Jon Hood <squinky86@gentoo.org> files/2.1.2-libnet-1.0.patch:
+  added patch, fixes #47229
 
   06 Apr 2004; Joshua Brindle <method@gentoo.org> snort-2.1.1.ebuild,
   snort-2.1.2.ebuild:
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 920d4e8b8d19..a0877ac33559 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,49 +1,50 @@
-MD5 5e70aec1235b636a881b0a081971e93b ChangeLog 7917
-MD5 f629e6b9c8a922659de794d67f0cd115 metadata.xml 928
-MD5 6b8e74b31bd8b33a1abf5099637de1f1 snort-1.9.1-r3.ebuild 2280
-MD5 03c287fe6ca2ab40814f12608b76d96a snort-2.0.0.ebuild 3035
-MD5 d0243fa346143e030c5fe251ca78e6d8 snort-2.0.1-r1.ebuild 2722
-MD5 07a597c9eb16d5d35587bd93bde7f9f7 snort-2.0.2.ebuild 2638
+MD5 62672e8499fe0a4727f6572fc84bc702 snort-2.1.2.ebuild 3523
 MD5 c692e9896d16b7cb8693287a03db20a6 snort-2.0.5-r1.ebuild 2998
-MD5 f80a28eb514d54c97e9962eebf935123 snort-2.0.5-r2.ebuild 3146
-MD5 d668166df3d6facc2279cdd681c108ae snort-2.0.5.ebuild 2638
+MD5 d0243fa346143e030c5fe251ca78e6d8 snort-2.0.1-r1.ebuild 2722
 MD5 6b11ef1508669652a616528841ab6204 snort-2.0.6.ebuild 3141
+MD5 faf59c0762ba0e03a99a40332312a903 snort-2.1.1.ebuild 3521
+MD5 51b288810a6fdcc5cce3f7ab2a5945a7 snort-1.9.1-r3.ebuild 2283
+MD5 d668166df3d6facc2279cdd681c108ae snort-2.0.5.ebuild 2638
+MD5 03c287fe6ca2ab40814f12608b76d96a snort-2.0.0.ebuild 3035
 MD5 51ee9de48d3300ec9fd8cae6a3a9f254 snort-2.1.0-r1.ebuild 3677
+MD5 9fa3f3ef9cfd1f0c5228e972b664dbb6 snort-2.0.5-r2.ebuild 3149
+MD5 07a597c9eb16d5d35587bd93bde7f9f7 snort-2.0.2.ebuild 2638
 MD5 38f50d2214776f9d9919c8dbcf742bc5 snort-2.1.0.ebuild 3475
-MD5 faf59c0762ba0e03a99a40332312a903 snort-2.1.1.ebuild 3521
-MD5 62672e8499fe0a4727f6572fc84bc702 snort-2.1.2.ebuild 3523
+MD5 1c78431de888e481582ffa47911ee04c ChangeLog 8026
+MD5 f629e6b9c8a922659de794d67f0cd115 metadata.xml 928
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.0-libnet-1.0.patch 2753
+MD5 c74e62bbbd323e3ab1bda711f6d1875f files/snort.rc6 771
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.2-gcc3.patch 350
 MD5 a45c40b1fd8165ed1e9616808d8f4d41 files/1.9.1-libnet-1.0.patch 2907
-MD5 79f3f73bc2f906d80d46bbb2e5816c81 files/2.0.0-libnet-1.0.patch 2679
+MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
+MD5 121c260ad08b288811994e7b3d78d098 files/snort-1.9.1-alpha.patch 1614
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.1-libnet-1.0.patch 2753
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.2-libnet-1.0.patch 2753
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.5-libnet-1.0.patch 2753
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.0-libnet-1.0.patch 2753
-MD5 4a957dd6316ffe54d0a8c3f5780aac10 files/digest-snort-1.9.1-r3 63
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
 MD5 c57b7870750dc2c7d6e78af937fefc4b files/digest-snort-2.0.0 64
-MD5 6892a20ff14df4a1de3a08e966d2f106 files/digest-snort-2.0.1-r1 136
 MD5 108c39f03b69a47daeb6d7d066830f15 files/digest-snort-2.0.2 136
 MD5 72fcf2ac8274916456a4b43269692a69 files/digest-snort-2.0.5 136
-MD5 f0da97d8f9acc787973aa956caebb66c files/digest-snort-2.0.5-r1 150
-MD5 f0da97d8f9acc787973aa956caebb66c files/digest-snort-2.0.5-r2 150
 MD5 202dd3be05b16c852303a04284eba720 files/digest-snort-2.0.6 150
 MD5 7c11e6d5a07263b09e86572d96222d09 files/digest-snort-2.1.0 150
-MD5 37a67a034efff43a090ca4c84bc65251 files/digest-snort-2.1.0-r1 64
-MD5 891c0d6b2028a15a44c40ba3f131192d files/snort-1.9.0-gentoo.diff 384
-MD5 20eeb720d24e091ead1b128bc4981748 files/snort-1.9.1-alpha-core_vuln.diff 9864
-MD5 121c260ad08b288811994e7b3d78d098 files/snort-1.9.1-alpha.patch 1614
-MD5 c9c8c46d1a7e6847025090e76d9a9f64 files/snort-1.9.1-configure.patch 375
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.2-gcc3.patch 350
+MD5 a0a2702875fd25016f4e627cf801edb9 files/digest-snort-2.1.1 64
+MD5 cfa70b4b7a18ef0615bd6a8681ace3e2 files/digest-snort-2.1.2 64
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.1-libnet-1.0.patch 2753
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.5-gcc3.patch 350
+MD5 4a957dd6316ffe54d0a8c3f5780aac10 files/digest-snort-1.9.1-r3 63
+MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.0-pgsql.patch 645
+MD5 891c0d6b2028a15a44c40ba3f131192d files/snort-1.9.0-gentoo.diff 384
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.6-gcc3.patch 350
+MD5 c9c8c46d1a7e6847025090e76d9a9f64 files/snort-1.9.1-configure.patch 375
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.0-gcc3.patch 350
-MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.0-pgsql.patch 645
-MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.2-libnet-1.0.patch 2753
+MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.1-pgsql.patch 645
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
-MD5 c74e62bbbd323e3ab1bda711f6d1875f files/snort.rc6 771
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.1-libnet-1.0.patch 2753
-MD5 a0a2702875fd25016f4e627cf801edb9 files/digest-snort-2.1.1 64
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.1-gcc3.patch 350
-MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.1-pgsql.patch 645
-MD5 cfa70b4b7a18ef0615bd6a8681ace3e2 files/digest-snort-2.1.2 64
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.2-libnet-1.0.patch 2753
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
+MD5 79f3f73bc2f906d80d46bbb2e5816c81 files/2.0.0-libnet-1.0.patch 2679
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.5-libnet-1.0.patch 2753
+MD5 6892a20ff14df4a1de3a08e966d2f106 files/digest-snort-2.0.1-r1 136
+MD5 f0da97d8f9acc787973aa956caebb66c files/digest-snort-2.0.5-r1 150
+MD5 f0da97d8f9acc787973aa956caebb66c files/digest-snort-2.0.5-r2 150
+MD5 37a67a034efff43a090ca4c84bc65251 files/digest-snort-2.1.0-r1 64
+MD5 20eeb720d24e091ead1b128bc4981748 files/snort-1.9.1-alpha-core_vuln.diff 9864
diff --git a/net-analyzer/snort/files/2.1.2-libnet-1.0.patch b/net-analyzer/snort/files/2.1.2-libnet-1.0.patch
new file mode 100644
index 000000000000..c26fa717ba1c
--- /dev/null
+++ b/net-analyzer/snort/files/2.1.2-libnet-1.0.patch
@@ -0,0 +1,57 @@
+--- configure.orig	2003-08-19 01:19:05.948824752 -0400
++++ configure	2003-08-19 01:19:06.212784624 -0400
+@@ -6376 +6376 @@
+-   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`"
+@@ -6382 +6382 @@
+-  if test `libnet-config --cflags | wc -c` = "1"; then
++  if test `libnet-1.0-config --cflags | wc -c` = "1"; then
+@@ -6387,3 +6387,3 @@
+-  if test `libnet-config --libs | wc -c` = "1"; then
+-    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
+-echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
++  if test `libnet-1.0-config --libs | wc -c` = "1"; then
++    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
++echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
+@@ -6395 +6395 @@
+-    LIBS="${LIBS} -lnet"
++    LIBS="${LIBS} -lnet-1.0"
+@@ -6400 +6400 @@
+-for ac_header in libnet.h
++for ac_header in libnet-1.0.h
+@@ -6533 +6533 @@
+-    libnet_dir=`libnet-config --cflags | cut -dI -f2`
++    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
+@@ -6538 +6538 @@
+-    if test -r $i/libnet.h; then
++    if test -r $i/libnet-1.0.h; then
+@@ -6544 +6544 @@
+-    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
+@@ -6555 +6555 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -6574 +6574 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -6587,2 +6587,2 @@
+-echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
+-echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
++echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
+@@ -6593 +6593 @@
+-LIBS="-lnet  $LIBS"
++LIBS="-lnet-1.0  $LIBS"
+@@ -6647 +6647 @@
+-  LIBS="-lnet $LIBS"
++  LIBS="-lnet-1.0 $LIBS"
+--- src/detection-plugins/sp_react.c.orig	2003-08-19 01:19:06.106800736 -0400
++++ src/detection-plugins/sp_react.c	2003-08-19 01:19:06.220783408 -0400
+@@ -56 +56 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- src/detection-plugins/sp_respond.c.orig	2003-08-19 01:19:06.111799976 -0400
++++ src/detection-plugins/sp_respond.c	2003-08-19 01:19:06.225782648 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/snort/snort-1.9.1-r3.ebuild b/net-analyzer/snort/snort-1.9.1-r3.ebuild
index ff4e6f73ea1c..e1c3b8fba1dc 100644
--- a/net-analyzer/snort/snort-1.9.1-r3.ebuild
+++ b/net-analyzer/snort/snort-1.9.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-1.9.1-r3.ebuild,v 1.6 2003/12/08 07:45:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-1.9.1-r3.ebuild,v 1.7 2004/04/14 17:59:00 squinky86 Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/snort/snort-2.0.5-r2.ebuild b/net-analyzer/snort/snort-2.0.5-r2.ebuild
index 7f3ad9b6b905..33cd8d968732 100644
--- a/net-analyzer/snort/snort-2.0.5-r2.ebuild
+++ b/net-analyzer/snort/snort-2.0.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.5-r2.ebuild,v 1.2 2003/12/20 16:48:53 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.5-r2.ebuild,v 1.3 2004/04/14 17:59:00 squinky86 Exp $
 
 inherit eutils