* [Buildroot] [PATCH 1/4] libnfnetlink: new package
@ 2012-04-30 12:49 Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 2/4] libnetfilter_conntrack: " Gustavo Zacarias
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-30 12:49 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
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
diff --git a/package/Config.in b/package/Config.in
index 0b1a746..1587ffb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/libnfnetlink/Config.in b/package/libnfnetlink/Config.in
new file mode 100644
index 0000000..fa247c5
--- /dev/null
+++ b/package/libnfnetlink/Config.in
@@ -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/
diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
new file mode 100644
index 0000000..67ea266
--- /dev/null
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -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))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/4] libnetfilter_conntrack: new package
2012-04-30 12:49 [Buildroot] [PATCH 1/4] libnfnetlink: new package Gustavo Zacarias
@ 2012-04-30 12:49 ` Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 3/4] conntrack-tools: " Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 4/4] dnsmasq: bump to version 2.61 Gustavo Zacarias
2 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-30 12:49 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
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
diff --git a/package/Config.in b/package/Config.in
index 1587ffb..6b97c64 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/libnetfilter_conntrack/Config.in b/package/libnetfilter_conntrack/Config.in
new file mode 100644
index 0000000..caf8a8a
--- /dev/null
+++ b/package/libnetfilter_conntrack/Config.in
@@ -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/
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
new file mode 100644
index 0000000..66f0f69
--- /dev/null
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -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))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/4] conntrack-tools: new package
2012-04-30 12:49 [Buildroot] [PATCH 1/4] libnfnetlink: new package Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 2/4] libnetfilter_conntrack: " Gustavo Zacarias
@ 2012-04-30 12:49 ` Gustavo Zacarias
2012-05-02 8:31 ` Thomas Petazzoni
2012-04-30 12:49 ` [Buildroot] [PATCH 4/4] dnsmasq: bump to version 2.61 Gustavo Zacarias
2 siblings, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-30 12:49 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
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
diff --git a/package/Config.in b/package/Config.in
index 6b97c64..81a006b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
new file mode 100644
index 0000000..12eb988
--- /dev/null
+++ b/package/conntrack-tools/Config.in
@@ -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
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
new file mode 100644
index 0000000..395734e
--- /dev/null
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -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))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 4/4] dnsmasq: bump to version 2.61
2012-04-30 12:49 [Buildroot] [PATCH 1/4] libnfnetlink: new package Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 2/4] libnetfilter_conntrack: " Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 3/4] conntrack-tools: " Gustavo Zacarias
@ 2012-04-30 12:49 ` Gustavo Zacarias
2 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-30 12:49 UTC (permalink / raw)
To: buildroot
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 <gustavo@zacarias.com.ar>
---
package/dnsmasq/Config.in | 6 ++++++
package/dnsmasq/dnsmasq.mk | 14 +++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index f434b8b..fa2499e 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -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
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index c1995a0..3f189d7 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/4] conntrack-tools: new package
2012-04-30 12:49 ` [Buildroot] [PATCH 3/4] conntrack-tools: " Gustavo Zacarias
@ 2012-05-02 8:31 ` Thomas Petazzoni
2012-05-02 9:48 ` Gustavo Zacarias
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2012-05-02 8:31 UTC (permalink / raw)
To: buildroot
Le Mon, 30 Apr 2012 09:49:37 -0300,
Gustavo Zacarias <gustavo@zacarias.com.ar> a ?crit :
> +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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/4] conntrack-tools: new package
2012-05-02 8:31 ` Thomas Petazzoni
@ 2012-05-02 9:48 ` Gustavo Zacarias
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2012-05-02 9:48 UTC (permalink / raw)
To: buildroot
On 2012-05-02 05:31, Thomas Petazzoni wrote:
> Le Mon, 30 Apr 2012 09:49:37 -0300,
> Gustavo Zacarias <gustavo@zacarias.com.ar> a ?crit :
>
>> +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
My bad, yes, they're good enough.
I'll respin and resend this patch.
Regards.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-02 9:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-30 12:49 [Buildroot] [PATCH 1/4] libnfnetlink: new package Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 2/4] libnetfilter_conntrack: " Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 3/4] conntrack-tools: " Gustavo Zacarias
2012-05-02 8:31 ` Thomas Petazzoni
2012-05-02 9:48 ` Gustavo Zacarias
2012-04-30 12:49 ` [Buildroot] [PATCH 4/4] dnsmasq: bump to version 2.61 Gustavo Zacarias
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.