From: Raphaël Marichez Date: Sat, 7 Apr 2007 00:47:12 +0000 (+0000) Subject: Fix #173594 ip6 header redeclaration if libdnet X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c6b1b0688a21b253119ec04febb6415340d2ae2;p=gentoo.git Fix #173594 ip6 header redeclaration if libdnet Package-Manager: portage-2.1.2.2 --- diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog index e341321e5b88..7c770e1214c5 100644 --- a/net-analyzer/snort/ChangeLog +++ b/net-analyzer/snort/ChangeLog @@ -1,6 +1,10 @@ # 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.126 2007/04/06 17:05:26 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.127 2007/04/07 00:47:12 falco Exp $ + + 07 Apr 2007; Raphael Marichez + +files/snort-2.6.1.4-libdnet-ip6.patch, snort-2.6.1.4.ebuild: + Fix #173594, ip6 header redeclaration if libdnet. *snort-2.6.1.4 (06 Apr 2007) diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index 4dd6ceb6437e..99c253068258 100644 --- 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 @@ -14,6 +17,10 @@ AUX snort-2.6.1.2-react.patch 952 RMD160 f5856ba63d63c20386af53b1e95db3d3ce75884 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-2.6.1.4-libdnet-ip6.patch 482 RMD160 9d420da94d42aacf1a4c8fabb1a9637f73dff8b3 SHA1 2ff42e316d5c49201b85e78f99b1cae4449b7656 SHA256 7f24211c9295a848d1d29effaab2f7f38459823acb83e2d78da3d45019139e14 +MD5 77d340703e2b261879ef3da6fdeb8e75 files/snort-2.6.1.4-libdnet-ip6.patch 482 +RMD160 9d420da94d42aacf1a4c8fabb1a9637f73dff8b3 files/snort-2.6.1.4-libdnet-ip6.patch 482 +SHA256 7f24211c9295a848d1d29effaab2f7f38459823acb83e2d78da3d45019139e14 files/snort-2.6.1.4-libdnet-ip6.patch 482 AUX snort.confd 423 RMD160 8312bad7b271cc20a9eeb8f08f0cba5cd330eb2f SHA1 149a377477a43ff78c7b3c73c159773e41adf892 SHA256 d504cb31ffcce9acc8fc7b68123a31a53b491444c52730339ea9a4e986521f71 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423 RMD160 8312bad7b271cc20a9eeb8f08f0cba5cd330eb2f files/snort.confd 423 @@ -47,14 +54,14 @@ EBUILD snort-2.6.1.3-r1.ebuild 5907 RMD160 e291e085d9b1fe1da3f6e48f522039ddc35ae MD5 47ffbc85772ccf7095b71ced3d2d7fd0 snort-2.6.1.3-r1.ebuild 5907 RMD160 e291e085d9b1fe1da3f6e48f522039ddc35ae9b1 snort-2.6.1.3-r1.ebuild 5907 SHA256 93f28bc63690ff05a202b6bff5e50be38be6c7386165e632860d1b198fedd53c snort-2.6.1.3-r1.ebuild 5907 -EBUILD snort-2.6.1.4.ebuild 5907 RMD160 19205ea57ddfa0d4feeba5c440fd7f92b235e9c4 SHA1 6668d3e8cae59fe87d68f9201bf15b290b6fa757 SHA256 713bd05a5781d32ac1af85d56a000830c11c2a43b5a957cfae46cc648bb12fba -MD5 fb348b1cfe15a262ed8ebfa6a7a127f0 snort-2.6.1.4.ebuild 5907 -RMD160 19205ea57ddfa0d4feeba5c440fd7f92b235e9c4 snort-2.6.1.4.ebuild 5907 -SHA256 713bd05a5781d32ac1af85d56a000830c11c2a43b5a957cfae46cc648bb12fba snort-2.6.1.4.ebuild 5907 -MISC ChangeLog 22529 RMD160 9e8f180b0ecc56c08c96f7b242f06bc50f808067 SHA1 6ba28f686f5eba7b1358cf44463f0e1799559755 SHA256 a1ef5bf369b455ae394a8b0689913b54558ff1043ae87259bc1084a22858595f -MD5 98d5725a8e52d484cfbaabdcdfa27bbe ChangeLog 22529 -RMD160 9e8f180b0ecc56c08c96f7b242f06bc50f808067 ChangeLog 22529 -SHA256 a1ef5bf369b455ae394a8b0689913b54558ff1043ae87259bc1084a22858595f ChangeLog 22529 +EBUILD snort-2.6.1.4.ebuild 5947 RMD160 8bc74b81c4c47ab9080031b1f5dda428c7c58f34 SHA1 bb7d91d4443d4de22aaec5f4f32676ce0107615a SHA256 82bda250ebabcae3b5b42aacaed9f1ab9f6312fe0933c8414d6352c11ddf423d +MD5 ecd5db1dc4479f31445e4162ab0a65a5 snort-2.6.1.4.ebuild 5947 +RMD160 8bc74b81c4c47ab9080031b1f5dda428c7c58f34 snort-2.6.1.4.ebuild 5947 +SHA256 82bda250ebabcae3b5b42aacaed9f1ab9f6312fe0933c8414d6352c11ddf423d snort-2.6.1.4.ebuild 5947 +MISC ChangeLog 22692 RMD160 643e55f6ec775e25ff1b04992832b0c2b1314b7d SHA1 6e1091071f7018f4fff1100197b2ff4b448934fe SHA256 7be1498cd7e44a536bdf77bb640091f4631d149702bc0c964d903decf091d716 +MD5 88c94c0f920470662037abd4075e7fae ChangeLog 22692 +RMD160 643e55f6ec775e25ff1b04992832b0c2b1314b7d ChangeLog 22692 +SHA256 7be1498cd7e44a536bdf77bb640091f4631d149702bc0c964d903decf091d716 ChangeLog 22692 MISC metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb SHA1 470a19ab011412f7f219d654304b7a43876082ae SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb metadata.xml 246 @@ -71,3 +78,14 @@ SHA256 4bd85630e9420e683d70be000370bcc0c5cf927c25c4ed1406c585d6481f1f9e files/di MD5 0a41105e90aae43a766364d2f7822a41 files/digest-snort-2.6.1.4 1006 RMD160 8046913eb94ba65bf1e82402e64bb4572fd326dd files/digest-snort-2.6.1.4 1006 SHA256 78dac29646fdafa52b5fca59970c439aa43fb3ecf689390e56e7ab011e58af21 files/digest-snort-2.6.1.4 1006 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iQEVAwUBRhbqGjvRww8BFPxFAQLtyAf/fsAnZxcJlW4G9VW/8zA0y89kwcnPiScf +6SkhTBFeDRs3rOYdPg92TM7NSZLU2EQLc4GAeQaojUsdJcehL5RcY1TYC3m3wa0Q +HzciB1t4dhC6hP9nCcCuo8SodVuYLT46YvfgnJwdIeyM+pToR8mcHPNcys+btaQ2 +6cMjhH714IoU7hjtsPw3dVX+Uny7zcTdWL0qQSl6mUHCkf5/NzWc8uopqe+lahHF +MZ1New/azuluO37Lw+UFxZLcr3SsfqsjX8YgLN+l0t0WGW9dF/HaaVQ3RlCov3Mx +ti4mhg91NXtUEJHLszuuHybPYrFAoa/zIOVW7jOeqo75NOkoFaEr0g== +=1SU9 +-----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..e580ecb0669c --- /dev/null +++ b/net-analyzer/snort/files/snort-2.6.1.4-libdnet-ip6.patch @@ -0,0 +1,18 @@ +--- 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/snort-2.6.1.4.ebuild b/net-analyzer/snort/snort-2.6.1.4.ebuild index 0d84fdfe4ff8..3abf4c0dce46 100644 --- a/net-analyzer/snort/snort-2.6.1.4.ebuild +++ b/net-analyzer/snort/snort-2.6.1.4.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.4.ebuild,v 1.1 2007/04/06 17:05:26 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.4.ebuild,v 1.2 2007/04/07 00:47:12 falco Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -62,6 +62,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-2.6.1.2-libdir.patch" epatch "${FILESDIR}/${PN}-2.6.1.1-libnet.patch" + epatch "${FILESDIR}/${P}-libdnet-ip6.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