Browse Source

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>
Gustavo Zacarias 11 years ago
parent
commit
6ee86f603b

+ 4 - 0
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

+ 5 - 0
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

+ 4 - 2
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))