conntrack-tools: bump to version 1.4.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index be491e6fbfe629fac52053211e1e9063cd470dc4..f109adf1d8189c3fd86d8d0b01d1d41cefb71388 100644 (file)
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -1,9 +1,12 @@
 config BR2_PACKAGE_CONNTRACK_TOOLS
        bool "conntrack-tools"
        depends on BR2_INET_IPV6
+       depends on BR2_INET_RPC
        depends on BR2_LARGEFILE
        select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+       select BR2_PACKAGE_LIBNETFILTER_CTHELPER
        select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
+       select BR2_PACKAGE_LIBNETFILTER_QUEUE
        help
          The conntrack-tools are a set of tools targeted at
          system administrators.
@@ -12,5 +15,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
          http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
-       depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
+comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and RPC support"
+       depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_INET_RPC

diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index b8c8f5a90521e5aa7d75ed817e27a3b2e574fb37..ce6402142517d8115b6f326d9aebbd204bf5692b 100644 (file)
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,11 +4,12 @@
 #
 #############################################################
 
-CONNTRACK_TOOLS_VERSION = 1.2.2
+CONNTRACK_TOOLS_VERSION = 1.4.0
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
-       libnetfilter_conntrack libnetfilter_cttimeout
+       libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
+       libnetfilter_queue
 CONNTRACK_TOOLS_LICENSE = GPLv2
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING