diff options
| author |   Markus Ullmann <jokey@gentoo.org> | 2007-04-18 17:32:52 +0000 |
|---|---|---|
| committer | Markus Ullmann <jokey@gentoo.org> | 2007-04-18 17:32:52 +0000 |
| commit | e2e6d5d653940591bd36f08fed1ef8657aea68e3 (patch) | |
| tree | 88d8622de0a9434e5ca37ad57edeeef1435e08d6 /net-firewall | |
| parent | Use eclass function for check and error message ;) and we're stable on x86 now (diff) | |
| download | gentoo-2-e2e6d5d653940591bd36f08fed1ef8657aea68e3.tar.gz gentoo-2-e2e6d5d653940591bd36f08fed1ef8657aea68e3.tar.bz2 gentoo-2-e2e6d5d653940591bd36f08fed1ef8657aea68e3.zip | |
Fix check for more recent kernels per bug #174706 thanks to Olivier Huber and stable on x86
(Portage version: 2.1.2.3)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/conntrack/ChangeLog | 9 | ||||
| -rw-r--r-- | net-firewall/conntrack/conntrack-1.00_beta2.ebuild | 24 |
2 files changed, 24 insertions, 9 deletions
diff --git a/net-firewall/conntrack/ChangeLog b/net-firewall/conntrack/ChangeLog index 95419fc8a1b8..3f378185c433 100644 --- a/net-firewall/conntrack/ChangeLog +++ b/net-firewall/conntrack/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/conntrack -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/ChangeLog,v 1.1 2006/11/25 15:56:24 cedk Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/ChangeLog,v 1.2 2007/04/18 17:32:52 jokey Exp $ + + 18 Apr 2007; Markus Ullmann <jokey@gentoo.org> + conntrack-1.00_beta2.ebuild: + Fix check for more recent kernels per bug #174706 thanks to Olivier Huber + and stable on x86 *conntrack-1.00_beta2 (25 Nov 2006) diff --git a/net-firewall/conntrack/conntrack-1.00_beta2.ebuild b/net-firewall/conntrack/conntrack-1.00_beta2.ebuild index 66be213bfd39..2ac5d8464c84 100644 --- a/net-firewall/conntrack/conntrack-1.00_beta2.ebuild +++ b/net-firewall/conntrack/conntrack-1.00_beta2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/conntrack-1.00_beta2.ebuild,v 1.1 2006/11/25 15:56:24 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/conntrack-1.00_beta2.ebuild,v 1.2 2007/04/18 17:32:52 jokey Exp $ inherit linux-info @@ -8,11 +8,11 @@ MY_P="${P/_}" DESCRIPTION="view and manage the in-kernel connection tracking state table" HOMEPAGE="http://www.netfilter.org/projects/conntrack/" -SRC_URI="http://www.netfilter.org/projects/${PN}/files/${MY_P}.tar.bz2" +SRC_URI="http://www.netfilter.org/projects/conntrack/files/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="x86" IUSE="" DEPEND="net-libs/libnfnetlink @@ -21,11 +21,21 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" -CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" - pkg_setup() { linux-info_pkg_setup - kernel_is lt 2 6 14 && die "${PN} requires at least 2.6.14 kernel version" + + if kernel_is lt 2 6 14 ; then + die "${PN} requires at least 2.6.14 kernel version" + fi + + #netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="NF_CT_NETLINK" + fi + + check_extra_config } src_install() { |