From: Cédric Krier <cedk@gentoo.org>
Date: Sat, 10 Feb 2007 17:44:48 +0000 (+0000)
Subject: net-libs/libnetfilter_conntrack: Improve kernel check config for bug #165891
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14c34cc0634e827cee978149939cb3b00d293e88;p=gentoo.git

net-libs/libnetfilter_conntrack: Improve kernel check config for bug #165891
Package-Manager: portage-2.1.1-r2
---

diff --git a/net-libs/libnetfilter_conntrack/ChangeLog b/net-libs/libnetfilter_conntrack/ChangeLog
index 857d8c188c81..3aa285418203 100644
--- a/net-libs/libnetfilter_conntrack/ChangeLog
+++ b/net-libs/libnetfilter_conntrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnetfilter_conntrack
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.2 2007/02/07 21:06:04 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.3 2007/02/10 17:44:48 cedk Exp $
+
+  10 Feb 2007; Cedric Krier <cedk@gentoo.org>
+  libnetfilter_conntrack-0.0.50.ebuild:
+  Improve kernel check config for bug #165891
 
 *libnetfilter_conntrack-0.0.50 (07 Feb 2007)
 
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index e29934d18dd5..d29404cd8d14 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -4,14 +4,14 @@ EBUILD libnetfilter_conntrack-0.0.31.ebuild 826 RMD160 ba6a52caf5770e90a3fb19aa4
 MD5 1b3ff70915cd883b0b4e543fd3065f9d libnetfilter_conntrack-0.0.31.ebuild 826
 RMD160 ba6a52caf5770e90a3fb19aa455502dfb8783cc8 libnetfilter_conntrack-0.0.31.ebuild 826
 SHA256 77eda4f3cdf06bc994ddbe082ff1acbf507d13ec7171f93255045180261ed93d libnetfilter_conntrack-0.0.31.ebuild 826
-EBUILD libnetfilter_conntrack-0.0.50.ebuild 835 RMD160 1de2619c29cb88cc37014ff24bb7f7b2fc46fd35 SHA1 74c3cb9ac2712e82e1d8aa79132dd76d2b5ae81d SHA256 3e3361b124f553e23e5b4c51df73447a0a7d670d472e74705643d61e0c427e82
-MD5 b45b608f593a3379464928916c027ca3 libnetfilter_conntrack-0.0.50.ebuild 835
-RMD160 1de2619c29cb88cc37014ff24bb7f7b2fc46fd35 libnetfilter_conntrack-0.0.50.ebuild 835
-SHA256 3e3361b124f553e23e5b4c51df73447a0a7d670d472e74705643d61e0c427e82 libnetfilter_conntrack-0.0.50.ebuild 835
-MISC ChangeLog 575 RMD160 f2de276127d6ec9152961427f414d79c7dc1f55c SHA1 b84cfb9e65feffcc0cfdb4fb7c1b0fd2447754d7 SHA256 9e17a04145c24e26b4711b6ef2dc00d9bd7499ad8cdb87a8c90f2e3af8e3a218
-MD5 1c514256f44cf22936729849580fae1a ChangeLog 575
-RMD160 f2de276127d6ec9152961427f414d79c7dc1f55c ChangeLog 575
-SHA256 9e17a04145c24e26b4711b6ef2dc00d9bd7499ad8cdb87a8c90f2e3af8e3a218 ChangeLog 575
+EBUILD libnetfilter_conntrack-0.0.50.ebuild 947 RMD160 43db61fa4e2762bfdc2c1dd0fda7b461c5b88494 SHA1 8dcaf6cd258b5f0879d2cabb8c9e3f684d7ed884 SHA256 ecd85bdcc8b2ff7c4aabf85d0de5d7df60ec2e4cd98974fd3ca7c51cd38f70bd
+MD5 91e623ced2024801590ad8f565719b7b libnetfilter_conntrack-0.0.50.ebuild 947
+RMD160 43db61fa4e2762bfdc2c1dd0fda7b461c5b88494 libnetfilter_conntrack-0.0.50.ebuild 947
+SHA256 ecd85bdcc8b2ff7c4aabf85d0de5d7df60ec2e4cd98974fd3ca7c51cd38f70bd libnetfilter_conntrack-0.0.50.ebuild 947
+MISC ChangeLog 708 RMD160 6826a928bd13d55e88d8b3bcc1508700e9dfc735 SHA1 96a0f98b4f213105e534ad3f0a4644fdd3dfa142 SHA256 97f0784577f9b5f3ea655eac76e7817c617911d20c7ffaa412e3aa0a43a648aa
+MD5 77cfd86c546be25aec218cbec02e3de1 ChangeLog 708
+RMD160 6826a928bd13d55e88d8b3bcc1508700e9dfc735 ChangeLog 708
+SHA256 97f0784577f9b5f3ea655eac76e7817c617911d20c7ffaa412e3aa0a43a648aa ChangeLog 708
 MISC metadata.xml 331 RMD160 07e93d010ce6a8e6e384c8dd81c3888b0eb52da9 SHA1 d6454b530ba0d23387823bd1ac1817ef8b432e53 SHA256 feaa021b8f9e31b42d7dc79aabb51db3bf24eeca7b8917f84435c9ca1e17012e
 MD5 717ea0e4ffbe42c03cf426f33f3c9894 metadata.xml 331
 RMD160 07e93d010ce6a8e6e384c8dd81c3888b0eb52da9 metadata.xml 331
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild
index 3435afb93702..4494cc9f0773 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.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-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.1 2007/02/07 21:06:04 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.2 2007/02/10 17:44:48 cedk Exp $
 
 inherit linux-info
 
@@ -19,8 +19,13 @@ RDEPEND=${DEPEND}
 CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
 
 pkg_setup() {
-	linux-info_pkg_setup
 	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+	if kernel_is le 2 6 18; then
+		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+	else
+		CONFIG_CHECK="NF_CT_NETLINK"
+	fi
+	linux-info_pkg_setup
 }
 
 src_install() {