Add patch for react failure, see bug #162598 for details, thanks to perry@csk.pl

Package-Manager: portage-2.1.2-r1

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 842d22347f27d11b29d1f054269babec204422a6..d2020479f050df0d6f02fdac7b7dabf456180713 100644 (file)
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,11 @@
 # 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.115 2007/01/31 19:00:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.116 2007/02/01 16:04:30 jokey Exp $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/snort-2.6.1.2-react.patch, snort-2.6.1.2.ebuild:
+  Add patch for react failure, see bug #162598 for details, thanks to
+  perry@csk.pl
 
   31 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   snort-2.6.1.2.ebuild:

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index f3289929e781aaf5024499ae7e478f81b08ddf63..ba42ed96690718165ad1078648229fa5d4e3d6fa 100644 (file)
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,6 +9,10 @@ AUX snort-2.6.1.1-libnet.patch 8062 RMD160 fb42546b2efce968160afb0a0e0e96c8f0ad1
 MD5 24315885b9f04323523e4fec8906888d files/snort-2.6.1.1-libnet.patch 8062
 RMD160 fb42546b2efce968160afb0a0e0e96c8f0ad1471 files/snort-2.6.1.1-libnet.patch 8062
 SHA256 ff36205cdd4554ff23c845383a82c9fdef6682a399072f3306f6aa3b74378b86 files/snort-2.6.1.1-libnet.patch 8062
+AUX snort-2.6.1.2-react.patch 952 RMD160 f5856ba63d63c20386af53b1e95db3d3ce758843 SHA1 b2c87c82b4c32af573b30fc39441d3f393afd284 SHA256 15cfb26179883a962612cdf54f283fd195199118328586595f001a750ad68ab1
+MD5 9926736655005465b6f2e85f6ccbb359 files/snort-2.6.1.2-react.patch 952
+RMD160 f5856ba63d63c20386af53b1e95db3d3ce758843 files/snort-2.6.1.2-react.patch 952
+SHA256 15cfb26179883a962612cdf54f283fd195199118328586595f001a750ad68ab1 files/snort-2.6.1.2-react.patch 952
 AUX snort.confd 423 RMD160 8312bad7b271cc20a9eeb8f08f0cba5cd330eb2f SHA1 149a377477a43ff78c7b3c73c159773e41adf892 SHA256 d504cb31ffcce9acc8fc7b68123a31a53b491444c52730339ea9a4e986521f71
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
 RMD160 8312bad7b271cc20a9eeb8f08f0cba5cd330eb2f files/snort.confd 423
@@ -29,14 +36,14 @@ EBUILD snort-2.4.5.ebuild 4425 RMD160 e0df6b4511ecd8ea5447d49963b32279981a2aa8 S
 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 5709 RMD160 be2581dafddf2d671c07fbcc9ba8e1aa73ab97f0 SHA1 5ffd930d65f6d9d1ecee49880a03795f7a2a331c SHA256 34e274d84578c8b36e4a3c7df2b959d7b7312f677cc3e280930f042289836db8
-MD5 149255de239f11a8c5478c984708035c snort-2.6.1.2.ebuild 5709
-RMD160 be2581dafddf2d671c07fbcc9ba8e1aa73ab97f0 snort-2.6.1.2.ebuild 5709
-SHA256 34e274d84578c8b36e4a3c7df2b959d7b7312f677cc3e280930f042289836db8 snort-2.6.1.2.ebuild 5709
-MISC ChangeLog 20926 RMD160 10943d753e0798e1ea48d3b648365455d4f53646 SHA1 2bd08a55b593e6b51503991eeae0b9475bd1ab9b SHA256 c4d4ad3ccab8802e3696b865fd003a9f294885d75b1f092b7845f58370e5f5dc
-MD5 02379c7a3058c4e7987b0eca58f63d7c ChangeLog 20926
-RMD160 10943d753e0798e1ea48d3b648365455d4f53646 ChangeLog 20926
-SHA256 c4d4ad3ccab8802e3696b865fd003a9f294885d75b1f092b7845f58370e5f5dc ChangeLog 20926
+EBUILD snort-2.6.1.2.ebuild 5756 RMD160 ba648cb9b9d17082bb2f6918648bf6ab5aef361a SHA1 36d1d8439ff973186dc55ce3e93fdb444ee4ce05 SHA256 6c855e0836c84f3db56b2c80216f38942dd2fbd739a5c656e6e2bb4594763dfa
+MD5 08b696ddcd9ffe3e3d71327de8b6fefc snort-2.6.1.2.ebuild 5756
+RMD160 ba648cb9b9d17082bb2f6918648bf6ab5aef361a snort-2.6.1.2.ebuild 5756
+SHA256 6c855e0836c84f3db56b2c80216f38942dd2fbd739a5c656e6e2bb4594763dfa snort-2.6.1.2.ebuild 5756
+MISC ChangeLog 21114 RMD160 f25cd8ffd7b91295a9d1082486c7770f550c4e1b SHA1 ec5cfe9814d4721d4eb7214e52e870b6071525b8 SHA256 86e0d40b68c65edabc8958f802a541051b67edba0d474044de136a59b84f1f3c
+MD5 9a71d0d9adbe1c644a710fb527a5ac2c ChangeLog 21114
+RMD160 f25cd8ffd7b91295a9d1082486c7770f550c4e1b ChangeLog 21114
+SHA256 86e0d40b68c65edabc8958f802a541051b67edba0d474044de136a59b84f1f3c ChangeLog 21114
 MISC metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb SHA1 470a19ab011412f7f219d654304b7a43876082ae SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb metadata.xml 246
@@ -47,3 +54,10 @@ SHA256 eca549eac2e372a4307f224ffb2150f9fd940540134ecae1c73621c81f61d826 files/di
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFwg96z974XjDVpbkRAlogAKCEzJtTEyCdB73t0b2yaMHBV488zACfWINN
+OKa3BUIEnS7cHNItmbStYYQ=
+=/pfZ
+-----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..c03f1da
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.6.1.2-react.patch
@@ -0,0 +1,25 @@
+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/snort-2.6.1.2.ebuild b/net-analyzer/snort/snort-2.6.1.2.ebuild
index 159ead76d4cb1156c9783386ac49d5b58bc01324..e5bff0c3bb9e4d182cb402d0ff6f7be8b2adb930 100644 (file)
--- a/net-analyzer/snort/snort-2.6.1.2.ebuild
+++ b/net-analyzer/snort/snort-2.6.1.2.ebuild
@@ -1,9 +1,11 @@
 # 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.4 2007/01/31 19:00:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.2.ebuild,v 1.5 2007/02/01 16:04:30 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
+AT_M4DIR=m4
+
 inherit eutils autotools
 
 DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
@@ -60,7 +62,7 @@ src_unpack() {
 
        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"
        sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
                etc/snort.conf
 
@@ -77,7 +79,7 @@ src_unpack() {
        fi
 
        einfo "Regenerating autoconf/automake files"
-       AT_M4DIR=m4 eautoreconf
+       eautoreconf
 }
 
 src_compile() {