gre patches included in the latest. Fix ebuild error with USE=gre too. Thanks Tobias...

Package-Manager: portage-2.1.2-r10

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 14e4d7b8d82582078cfa41250a15430fbedfbbe0..8596f76b7cf13bef76aff4fe464b8ef68366d8da 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.120 2007/02/20 19:29:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.121 2007/02/21 12:23:31 dragonheart Exp $
+
+  21 Feb 2007; Daniel Black <dragonheart@gentoo.org> snort-2.6.1.2.ebuild,
+  snort-2.6.1.3.ebuild:
+  gre patches included in the latest. Fix ebuild error with USE=gre too.
+  Thanks Tobias bug #167730
 
   20 Feb 2007; Markus Rothe <corsair@gentoo.org> snort-2.6.1.3.ebuild:
   Stable on ppc64; bug #167730

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 2bb5df10ae11e453f1bc4967337a50b4a525a7a5..47527cf76746850a93cc849f971ae9de134bd4df 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
@@ -38,18 +41,18 @@ 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 5795 RMD160 d45d0f9a356e17d59c855797aabfe7f395692a41 SHA1 d59838013dda8b19e7dd13d3ba6e6b8f4253f004 SHA256 7bf4f501d887c23d588b7721c45ec670298d078a16a5b4a5abbfeb80a3a36fee
-MD5 4d9eb32731c5778ea6745a7f8d89a67c snort-2.6.1.2.ebuild 5795
-RMD160 d45d0f9a356e17d59c855797aabfe7f395692a41 snort-2.6.1.2.ebuild 5795
-SHA256 7bf4f501d887c23d588b7721c45ec670298d078a16a5b4a5abbfeb80a3a36fee snort-2.6.1.2.ebuild 5795
-EBUILD snort-2.6.1.3.ebuild 5817 RMD160 0926790c35b789b46e327ebf5af79bbc29dce3a9 SHA1 ba284a04db851e5e20ef669e1c1bbef097069825 SHA256 8f1265a6c016951505cd9176f40a4c1317c3450cddcfae30404d973866b4e54e
-MD5 095a43af8bb307fa1f9a8da7baaec9ec snort-2.6.1.3.ebuild 5817
-RMD160 0926790c35b789b46e327ebf5af79bbc29dce3a9 snort-2.6.1.3.ebuild 5817
-SHA256 8f1265a6c016951505cd9176f40a4c1317c3450cddcfae30404d973866b4e54e snort-2.6.1.3.ebuild 5817
-MISC ChangeLog 21635 RMD160 ba4663aa57b9b3a8d4e6991ba90f7800912eeef9 SHA1 c3594b48d660ac6f9630dd2ccc3cfa35fd0b636a SHA256 d5d09c9a2ef7541a3b46fc4c001f4f0763ed304610910c5cdce73a6c629e7203
-MD5 6628c9b6439d6f66111ac2a2af06b24a ChangeLog 21635
-RMD160 ba4663aa57b9b3a8d4e6991ba90f7800912eeef9 ChangeLog 21635
-SHA256 d5d09c9a2ef7541a3b46fc4c001f4f0763ed304610910c5cdce73a6c629e7203 ChangeLog 21635
+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.ebuild 5783 RMD160 c1f82e1acb4ebed2814174166e5b7dc99e0aed72 SHA1 dac0d68e253574af3a02246787fa043ac7b60c2f SHA256 d4badfd3af697ce59027774e83b7430bc57d06cd3ab028636838b7eb5837b597
+MD5 54a22fdc13e0c75c279be60ecbbb190e snort-2.6.1.3.ebuild 5783
+RMD160 c1f82e1acb4ebed2814174166e5b7dc99e0aed72 snort-2.6.1.3.ebuild 5783
+SHA256 d4badfd3af697ce59027774e83b7430bc57d06cd3ab028636838b7eb5837b597 snort-2.6.1.3.ebuild 5783
+MISC ChangeLog 21840 RMD160 aaf8082238ea6654b77e1f2550e7b076299631d9 SHA1 df936d6c1e92fd63f7333693ccce7fd3ae10b884 SHA256 ec5a715f1edb86a7650ca57f969405696499a574c1d708c77ef097804e322360
+MD5 91d47eef0409d885910e30e44130de65 ChangeLog 21840
+RMD160 aaf8082238ea6654b77e1f2550e7b076299631d9 ChangeLog 21840
+SHA256 ec5a715f1edb86a7650ca57f969405696499a574c1d708c77ef097804e322360 ChangeLog 21840
 MISC metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb SHA1 470a19ab011412f7f219d654304b7a43876082ae SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb metadata.xml 246
@@ -63,3 +66,10 @@ SHA256 c776d126ad4060bf4566a1457d753418cf16c4014207e82aa3b34d7c834cefb0 files/di
 MD5 e7cdd3d5ed52e8d17a5f3f284439d5aa files/digest-snort-2.6.1.3 1006
 RMD160 05f6c24285518a6fb48e50b7d1b4314c9693cc75 files/digest-snort-2.6.1.3 1006
 SHA256 4bd85630e9420e683d70be000370bcc0c5cf927c25c4ed1406c585d6481f1f9e files/digest-snort-2.6.1.3 1006
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF3D4RmdTrptrqvGERAkPeAJ99Ze9W+qewbKvdwXPTqL5IHvRIEACcDP2G
+vEutUTull4lmGfyrtskrDNg=
+=J1D7
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/snort/snort-2.6.1.2.ebuild b/net-analyzer/snort/snort-2.6.1.2.ebuild
index 3d4731d088eb3e09f8e9dcd4c8db247ebd9db534..6b1e2beec1e6dcaacbda85ae9a26a517a6cd73d0 100644 (file)
--- a/net-analyzer/snort/snort-2.6.1.2.ebuild
+++ b/net-analyzer/snort/snort-2.6.1.2.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.6 2007/02/11 12:44:17 blubb Exp $
+# $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 $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -96,7 +96,7 @@ src_compile() {
                myconf="${myconf} --enable-react"
        fi
 
-       use gre && --enable-gre
+       use gre && myconf="${myconf} --enable-gre"
 
        myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
 

diff --git a/net-analyzer/snort/snort-2.6.1.3.ebuild b/net-analyzer/snort/snort-2.6.1.3.ebuild
index 568f9eee74410513ff04397d24cf9662f838bf34..a9a741cd00c774df03e7dea9b8f75eb0bcb11443 100644 (file)
--- a/net-analyzer/snort/snort-2.6.1.3.ebuild
+++ b/net-analyzer/snort/snort-2.6.1.3.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.3.ebuild,v 1.3 2007/02/20 19:29:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.3.ebuild,v 1.4 2007/02/21 12:23:31 dragonheart Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -62,7 +62,6 @@ src_unpack() {
 
        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}/${PN}-2.6.1.2-react.patch"
        sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
                etc/snort.conf
@@ -96,7 +95,7 @@ src_compile() {
                myconf="${myconf} --enable-react"
        fi
 
-       use gre && --enable-gre
+       use gre && myconf="${myconf} --enable-gre"
 
        myconf="${myconf} --with-libipq-includes=/usr/include/libipq"