libnfnetlink: new package

PATCH Superseded Gustavo Zacarias 2 participants 6 messages Apr 30, 2012 – May 2, 2012

lore

Share & tools

lore

Gustavo Zacarias

author

2012-04-30 12:49 UTC #0 lore raw

PATCH 1/4 libnfnetlink: new package

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/Config.in                    |    1 +
 package/libnfnetlink/Config.in       |   11 +++++++++++
 package/libnfnetlink/libnfnetlink.mk |   12 ++++++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 package/libnfnetlink/Config.in
 create mode 100644 package/libnfnetlink/libnfnetlink.mk

package/Config.in +1 -0

index 0b1a746..1587ffb 100644
@@ -369,6 +369,7 @@ source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
+source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"

package/libnfnetlink/Config.in new file +11 -0

new file mode 100644
index 0000000..fa247c5
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBNFNETLINK
+	bool "libnfnetlink"
+	help
+	  libnfnetlink is the low-level library for netfilter related
+	  kernel/userspace communication.
+	  It provides a generic messaging infrastructure for in-kernel
+	  netfilter subsystems (such as nfnetlink_log, nfnetlink_queue,
+	  nfnetlink_conntrack) and their respective users
+	  and/or management tools in userspace.
+
+	  http://www.netfilter.org/projects/libnfnetlink/

package/libnfnetlink/libnfnetlink.mk new file +12 -0

new file mode 100644
index 0000000..67ea266
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libnfnetlink
+#
+#############################################################
+
+LIBNFNETLINK_VERSION = 1.0.0
+LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
+LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
+LIBNFNETLINK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

Signature · 1 line

1.7.3.4

Gustavo Zacarias

author

2012-04-30 12:49 UTC #1 lore raw

PATCH 2/4 libnetfilter_conntrack: new package

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/Config.in                                  |    1 +
 package/libnetfilter_conntrack/Config.in           |    9 +++++++++
 .../libnetfilter-conntrack.mk                      |   13 +++++++++++++
 3 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 package/libnetfilter_conntrack/Config.in
 create mode 100644 package/libnetfilter_conntrack/libnetfilter-conntrack.mk

package/Config.in +1 -0

index 1587ffb..6b97c64 100644
@@ -369,6 +369,7 @@ source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
+source "package/libnetfilter_conntrack/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"

package/libnetfilter_conntrack/Config.in new file +9 -0

new file mode 100644
index 0000000..caf8a8a
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	bool "libnetfilter_conntrack"
+	select BR2_PACKAGE_LIBNFNETLINK
+	help
+	  libnetfilter_conntrack is a userspace library providing
+	  a programming interface (API) to the in-kernel
+	  connection tracking state table.
+
+	  http://www.netfilter.org/projects/libnetfilter_conntrack/

package/libnetfilter_conntrack/libnetfilter-conntrack.mk new file +13 -0

new file mode 100644
index 0000000..66f0f69
@@ -0,0 +1,13 @@
+#############################################################
+#
+# libnetfilter-conntrack
+#
+#############################################################
+
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.0
+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-pkg-config libnfnetlink
+
+$(eval $(call AUTOTARGETS))

Signature · 1 line

1.7.3.4

Gustavo Zacarias

author

2012-04-30 12:49 UTC #2 lore raw

PATCH 3/4 conntrack-tools: new package

In reply to Gustavo Zacarias

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/Config.in                          |    1 +
 package/conntrack-tools/Config.in          |   14 ++++++++++++++
 package/conntrack-tools/conntrack-tools.mk |   12 ++++++++++++
 3 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 package/conntrack-tools/Config.in
 create mode 100644 package/conntrack-tools/conntrack-tools.mk

package/Config.in +1 -0

index 6b97c64..81a006b 100644
@@ -456,6 +456,7 @@ source "package/can-utils/Config.in"
 source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cifs-utils/Config.in"
+source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"

package/conntrack-tools/Config.in new file +14 -0

new file mode 100644
index 0000000..12eb988
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_CONNTRACK_TOOLS
+	bool "conntrack-tools"
+	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	help
+	  The conntrack-tools are a set of tools targeted at
+	  system administrators.
+	  They are conntrack, the userspace command line interface,
+	  and conntrackd, the userspace daemon.
+
+	  http://www.netfilter.org/projects/conntrack-tools/
+
+comment "conntrack-tools requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6

package/conntrack-tools/conntrack-tools.mk new file +12 -0

new file mode 100644
index 0000000..395734e
@@ -0,0 +1,12 @@
+#############################################################
+#
+# conntrack-tools
+#
+#############################################################
+
+CONNTRACK_TOOLS_VERSION = 1.0.1
+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-bison host-flex host-pkg-config libnetfilter_conntrack
+
+$(eval $(call AUTOTARGETS))

Signature · 1 line

1.7.3.4

Thomas Petazzoni

2012-05-02 08:31 UTC #3 lore raw

PATCH 3/4 conntrack-tools: new package

Le Mon, 30 Apr 2012 09:49:37 -0300,
Gustavo Zacarias <[email protected]> a ?crit :

Quoted 1 line

+CONNTRACK_TOOLS_DEPENDENCIES = host-bison host-flex host-pkg-config libnetfilter_conntrack

Bison and Flex are part of our required host dependencies in support/dependencies/dependencies.sh. Can't we use these instead?

Thanks!

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Gustavo Zacarias

author

2012-05-02 09:48 UTC #4 lore raw

PATCH 3/4 conntrack-tools: new package

Quoted 6 lines · Thomas Petazzoni

Le Mon, 30 Apr 2012 09:49:37 -0300,
Gustavo Zacarias <[email protected]> a ?crit :
Quoted 2 lines
+CONNTRACK_TOOLS_DEPENDENCIES = host-bison host-flex host-pkg-config libnetfilter_conntrack

Quoted 6 lines

Bison and Flex are part of our required host dependencies in support/dependencies/dependencies.sh. Can't we use these instead?
Thanks!
Thomas

My bad, yes, they're good enough.
I'll respin and resend this patch.
Regards.

Gustavo Zacarias

author

2012-04-30 12:49 UTC #5 lore raw

PATCH 4/4 dnsmasq: bump to version 2.61

In reply to Gustavo Zacarias

Bump dnsmasq to version 2.61 and add new conntrack functionality. This allows for more sturdy firewall setups and/or accounting.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/dnsmasq/Config.in  |    6 ++++++
 package/dnsmasq/dnsmasq.mk |   14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)

package/dnsmasq/Config.in +6 -0

index f434b8b..fa2499e 100644
@@ -35,4 +35,10 @@ config BR2_PACKAGE_DNSMASQ_LUA
 	help
 	  Enable lua scripting for dnsmasq
 
+config BR2_PACKAGE_DNSMASQ_CONNTRACK
+	bool "conntrack marking support"
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	help
+	  Enable DNS query connection marking in netfilter.
+
 endif

package/dnsmasq/dnsmasq.mk +13 -1

index c1995a0..3f189d7 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.60
+DNSMASQ_VERSION = 2.61
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

@@ -28,6 +28,17 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-lintl -lidn"
 endif
 
+ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
+	DNSMASQ_DEPENDENCIES += host-pkg-config libnetfilter_conntrack
+endif
+
+ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
+define DNSMASQ_ENABLE_CONNTRACK
+	$(SED) 's^.*#define HAVE_CONNTRACK.*^#define HAVE_CONNTRACK^' \
+		$(DNSMASQ_DIR)/src/config.h
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
 	DNSMASQ_DEPENDENCIES += lua
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl"

@@ -70,6 +81,7 @@ define DNSMASQ_BUILD_CMDS
 	$(DNSMASQ_FIX_PKGCONFIG)
 	$(DNSMASQ_ENABLE_DBUS)
 	$(DNSMASQ_ENABLE_LUA)
+	$(DNSMASQ_ENABLE_CONNTRACK)
 	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT)
 endef

Signature · 1 line

1.7.3.4