libnetfilter_conntrack: bump to version 1.0.2

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

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index b76ddb2cc36498bca19a7a2c2302fb467532f2d6..a6f5d96f88df5a0e4fdd4ff804476373fe8b7b19 100644 (file)
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -38,7 +38,11 @@ config BR2_PACKAGE_DNSMASQ_LUA
 config BR2_PACKAGE_DNSMASQ_CONNTRACK
        bool "conntrack marking support"
        select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+       depends on BR2_LARGEFILE
        help
          Enable DNS query connection marking in netfilter.
 
+comment "conntrack marking support requires a toolchain with LARGEFILE support"
+       depends on !BR2_LARGEFILE
+
 endif

diff --git a/package/libnetfilter_conntrack/Config.in b/package/libnetfilter_conntrack/Config.in
index caf8a8a5b635da95eeddf006ac13cb5be889615d..9f7b42a22b3effec2d42d73e9ad6b249507abc62 100644 (file)
--- a/package/libnetfilter_conntrack/Config.in
+++ b/package/libnetfilter_conntrack/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
        bool "libnetfilter_conntrack"
+       depends on BR2_LARGEFILE
+       select BR2_PACKAGE_LIBMNL
        select BR2_PACKAGE_LIBNFNETLINK
        help
          libnetfilter_conntrack is a userspace library providing
@@ -7,3 +9,6 @@ config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
          connection tracking state table.
 
          http://www.netfilter.org/projects/libnetfilter_conntrack/
+
+comment "libnetfilter_conntrack requires a toolchain with LARGEFILE support"
+       depends on !BR2_LARGEFILE

diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index a5d832f67540649e4b8464d8cd0093af8dccce67..725c39ee9c20a346d6737c2e14582335c2eefd50 100644 (file)
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-LIBNETFILTER_CONNTRACK_VERSION = 1.0.1
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.2
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
-LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink
+LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
+LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+
+LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))