net-libs/libnetfilter_conntrack: Better fix for bug #165891

Package-Manager: portage-2.1.2.2

diff --git a/net-libs/libnetfilter_conntrack/ChangeLog b/net-libs/libnetfilter_conntrack/ChangeLog
index 8bad340920e951a0e358893ce77745258dcb4d55..c81ba8d27c1eb708358b322151e578e0071d112f 100644 (file)
--- 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.4 2007/04/15 10:20:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.5 2007/04/17 18:07:09 cedk Exp $
+
+  17 Apr 2007; Cedric Krier <cedk@gentoo.org>
+  libnetfilter_conntrack-0.0.50.ebuild:
+  Better fix for bug #165891
 
   15 Apr 2007; Daniel Black <dragonheart@gentoo.org>
   libnetfilter_conntrack-0.0.50.ebuild:

diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index f2681f312d20aec0e453494e6d38962b2f5a3c01..300c9a3ae9b6ce5fded82ae6aee4046986513358 100644 (file)
--- 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 961 RMD160 c5a471f3616d469bbc0b12e477f3cb2e071483f4 SHA1 fd816584410cd3be36b84006859b0f9014a4f075 SHA256 c41e60c164b0cc7dad66335ad5188a3fb83f20e6c7d5c225dd1291b57f2cae4c
-MD5 7c8bdb9c6e63e7ed359a267f42e2dced libnetfilter_conntrack-0.0.50.ebuild 961
-RMD160 c5a471f3616d469bbc0b12e477f3cb2e071483f4 libnetfilter_conntrack-0.0.50.ebuild 961
-SHA256 c41e60c164b0cc7dad66335ad5188a3fb83f20e6c7d5c225dd1291b57f2cae4c libnetfilter_conntrack-0.0.50.ebuild 961
-MISC ChangeLog 874 RMD160 9b7aca0f8370508191d1a6f7adda061070a56c6e SHA1 8420dc2d90351d1833316055d612d0942d43677f SHA256 26549247180d0bd6f444dd030b9119a699bdf446820da9bb404b95819fae869f
-MD5 b591559cfc40d1154f23b8c5b6ba0a2c ChangeLog 874
-RMD160 9b7aca0f8370508191d1a6f7adda061070a56c6e ChangeLog 874
-SHA256 26549247180d0bd6f444dd030b9119a699bdf446820da9bb404b95819fae869f ChangeLog 874
+EBUILD libnetfilter_conntrack-0.0.50.ebuild 1235 RMD160 19cdc5aab3c78dd405f2f93b810d2c6a8abe1a63 SHA1 2b7a4bc225eda460430df23185578d2bb1dcdf05 SHA256 8ebddf7377780f14b32235d7f1e8887c7aa7b04642c3f14b99d2fa0a13a24aee
+MD5 6e698f432a7c6d80a2c0d97af2904f2e libnetfilter_conntrack-0.0.50.ebuild 1235
+RMD160 19cdc5aab3c78dd405f2f93b810d2c6a8abe1a63 libnetfilter_conntrack-0.0.50.ebuild 1235
+SHA256 8ebddf7377780f14b32235d7f1e8887c7aa7b04642c3f14b99d2fa0a13a24aee libnetfilter_conntrack-0.0.50.ebuild 1235
+MISC ChangeLog 983 RMD160 7973327671015404725455691e72a42fb5065950 SHA1 b8f0e14881fb18cff53041bb544dcecd4525e243 SHA256 f1591b3509697f8e0ab5c0432a9f7b873b8c476b1667f49fbb607e844b89da6c
+MD5 7d64f4f45ac4fd6ee40a4ea7e8adbc4c ChangeLog 983
+RMD160 7973327671015404725455691e72a42fb5065950 ChangeLog 983
+SHA256 f1591b3509697f8e0ab5c0432a9f7b873b8c476b1667f49fbb607e844b89da6c ChangeLog 983
 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 6f9f63673e42858ad7596049a55aad62e9626953..2a5bb34d40693c6428cea2d1eb136ff43e0b2336 100644 (file)
--- 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.3 2007/04/15 10:20:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.4 2007/04/17 18:07:09 cedk Exp $
 
 inherit linux-info
 
@@ -20,12 +20,14 @@ CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
 
 pkg_setup() {
        kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
-       if kernel_is le 2 6 19; then
-               CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-       else
-               CONFIG_CHECK="NF_CT_NETLINK"
+
+       einfo "Checking for suitable kernel configuration options..."
+       if ! linux_chkconfig_present "IP_NF_CONNTRACK_NETLINK" -a ! linux_chkconfig_present "NF_CT_NETLINK" ; then
+               eerror "Could not find IP_NF_CONNTRACK_NETLINK "
+               eerror "nor NF_CT_NETLINK in the kernel configuration"
+               eerror "Please check to make sure at least one of the options are set correctly."
+               die "Incorrect kernel configuration options"
        fi
-       linux-info_pkg_setup
 }
 
 src_install() {