From 4bbc643f6a5c726668abb8bb7a65f7bee3915085 Mon Sep 17 00:00:00 2001 From: Raphaël Marichez Date: Sat, 7 Apr 2007 00:47:12 +0000 Subject: Fix #173594 ip6 header redeclaration if libdnet (Portage version: 2.1.2.2) --- net-analyzer/snort/ChangeLog | 6 +++++- .../snort/files/snort-2.6.1.4-libdnet-ip6.patch | 18 ++++++++++++++++++ net-analyzer/snort/snort-2.6.1.4.ebuild | 3 ++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 net-analyzer/snort/files/snort-2.6.1.4-libdnet-ip6.patch (limited to 'net-analyzer/snort') 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/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 -- cgit v1.2.3-65-gdbad