[ptxdist] [PATCH v2 1/5] libnftnl: add new library package in version 1.0.5

[ptxdist] [PATCH v2 1/5] libnftnl: add new library package in version 1.0.5

[Andreas Geisenhainer]

	- lbnftnl will be used by
	  - iptable version 1.6.0
	  - nftables version 0.5

Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
---
 rules/libnftnl.in   | 26 +++++++++++++++++++++++++
 rules/libnftnl.make | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 rules/libnftnl.in
 create mode 100644 rules/libnftnl.make

diff --git a/rules/libnftnl.in b/rules/libnftnl.in
new file mode 100644
index 0000000..ac6d808
--- /dev/null
+++ b/rules/libnftnl.in
@@ -0,0 +1,26 @@
+## SECTION=networking
+
+menuconfig LIBNFTNL
+	tristate
+	select LIBMXML if LIBNFTNL_XML
+	select JANSSON if LIBNFTNL_JSON
+	prompt "libnftnl                      "
+	help
+	  libnftnl is a userspace library providing a low-level netlink
+	  programming interface (API) to the in-kernel nf_tables subsystem.
+	  The library libnftnl has been previously known as libnftables.
+	  This library is currently used by nftables.
+
+if LIBNFTNL
+
+config LIBNFTNL_XML
+	bool
+	depends on LIBNFTNL
+	prompt "XML parsing support"
+
+config LIBNFTNL_JSON
+	bool
+	depends on LIBNFTNL
+	prompt "JSON parsing support"
+
+endif
diff --git a/rules/libnftnl.make b/rules/libnftnl.make
new file mode 100644
index 0000000..659fa0b
--- /dev/null
+++ b/rules/libnftnl.make
@@ -0,0 +1,56 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBNFTNL) += libnftnl
+
+#
+# Paths and names
+#
+LIBNFTNL_VERSION	:= 1.0.5
+LIBNFTNL_MD5	:= af0c62ce6bbd7a7d39def0996c1c17c9
+LIBNFTNL		:= libnftnl-$(LIBNFTNL_VERSION)
+LIBNFTNL_SUFFIX	:= tar.bz2
+LIBNFTNL_URL		:= http://ftp.netfilter.org/pub/libnftnl/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
+LIBNFTNL_SOURCE	:= $(SRCDIR)/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
+LIBNFTNL_DIR		:= $(BUILDDIR)/$(LIBNFTNL)
+LIBNFTNL_LICENSE	:= GPL-2.0
+
+#
+# autoconf
+#
+LIBNFTNL_CONF_TOOL	:= autoconf
+LIBNFTNL_CONF_OPT	:= \
+	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/wwo, PTXCONF_LIBNFTNL_XML)-xml-parsing \
+	--$(call ptx/wwo, PTXCONF_LIBNFTNL_JSON)-json-parsing
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libnftnl.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libnftnl)
+	@$(call install_fixup, libnftnl,PRIORITY,optional)
+	@$(call install_fixup, libnftnl,SECTION,base)
+	@$(call install_fixup, libnftnl,AUTHOR,"Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>")
+	@$(call install_fixup, libnftnl,DESCRIPTION,missing)
+
+	@$(call install_lib, libnftnl, 0, 0, 0644, libnftnl)
+
+	@$(call install_finish, libnftnl)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.8.0.rc3

____________
Virus checked by G Data MailSecurity
Version: AVA 25.6096 dated 08.04.2016
Virus news: www.antiviruslab.com.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/5] libnfnetlink: bump version to 1.0.1

[Andreas Geisenhainer]

Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
---
 rules/libnfnetlink.in   | 1 -
 rules/libnfnetlink.make | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rules/libnfnetlink.in b/rules/libnfnetlink.in
index 8684131..91e68a5 100644
--- a/rules/libnfnetlink.in
+++ b/rules/libnfnetlink.in
@@ -12,4 +12,3 @@ config LIBNFNETLINK
           This library is not meant as a public API for application
           developers. It is only used by other netfilter.org projects,
           such as libnetfilter_log,
-
diff --git a/rules/libnfnetlink.make b/rules/libnfnetlink.make
index bde7316..a9fc6e1 100644
--- a/rules/libnfnetlink.make
+++ b/rules/libnfnetlink.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBNFNETLINK) += libnfnetlink
 #
 # Paths and names
 #
-LIBNFNETLINK_VERSION	:= 1.0.0
-LIBNFNETLINK_MD5	:= 016fdec8389242615024c529acc1adb8
+LIBNFNETLINK_VERSION	:= 1.0.1
+LIBNFNETLINK_MD5	:= 98927583d2016a9fb1936fed992e2c5e
 LIBNFNETLINK		:= libnfnetlink-$(LIBNFNETLINK_VERSION)
 LIBNFNETLINK_SUFFIX	:= tar.bz2
 LIBNFNETLINK_URL		:= http://ftp.netfilter.org/pub/libnfnetlink/$(LIBNFNETLINK).$(LIBNFNETLINK_SUFFIX)
-- 
2.8.0.rc3

____________
Virus checked by G Data MailSecurity
Version: AVA 25.6096 dated 08.04.2016
Virus news: www.antiviruslab.com.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 3/5] iptables: bump version to 1.6.0 and update compile switches

[Andreas Geisenhainer]

Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
---
 rules/iptables.in   |  8 ++++++++
 rules/iptables.make | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/rules/iptables.in b/rules/iptables.in
index e6f3699..5ac66e0 100644
--- a/rules/iptables.in
+++ b/rules/iptables.in
@@ -7,6 +7,7 @@ menuconfig IPTABLES
 	select LIBC_M
 	select LIBC_DL
 	select GCCLIBS_GCC_S
+	select LIBNFTNL
 	select LIBNFNETLINK if IPTABLES_LIBNFNETLINK
 	help
 	  Iptables  is used to set up, maintain, and inspect the
@@ -61,4 +62,11 @@ config IPTABLES_LIBNFNETLINK
 	help
 	  Select if iptables should be build against libnfnetlink
 
+config IPTABLES_NFTABLES_COMPAT
+	bool
+	select NFTABLES
+	prompt "nftables compat"
+	help
+	  install xtables-compat-multi, allowing compability with nftables
+
 endif
diff --git a/rules/iptables.make b/rules/iptables.make
index 8a1ea66..3650bf5 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -4,6 +4,8 @@
 #               2007 by Carsten Schlote, konzeptpark
 #               2008 by Juergen Beisert
 #               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#               2016 by Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>
+#
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -19,8 +21,8 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables
 #
 # Paths and names
 #
-IPTABLES_VERSION	:= 1.4.21
-IPTABLES_MD5		:= 536d048c8e8eeebcd9757d0863ebb0c0
+IPTABLES_VERSION	:= 1.6.0
+IPTABLES_MD5		:= 27ba3451cb622467fc9267a176f19a31
 IPTABLES		:= iptables-$(IPTABLES_VERSION)
 IPTABLES_SUFFIX		:= tar.bz2
 IPTABLES_URL		:= http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX)
@@ -43,13 +45,10 @@ IPTABLES_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-devel \
 	--$(call ptx/endis, PTXCONF_IPTABLES_LIBIPQ)-libipq \
+	--$(call ptx/endis, PTXCONF_IPTABLES_NFTABLES_COMPAT)-nftables \
 	--with-kernel=$(KERNEL_HEADERS_DIR) \
 	--with-xtlibdir=/usr/lib
 
-## broken configure.ac, so setting these would _enable_ the options:
-#	--disable-bpf-compiler
-#	--disable-nfsynproxy
-
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
@@ -110,8 +109,8 @@ endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_TOOLS
 	@$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-multi)
-
 	@$(call install_link, iptables, ../sbin/xtables-multi, /usr/bin/iptables-xml)
+	@$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/nfnl_osf)
 
 ifdef PTXCONF_IPTABLES_IPV6
 # 	# IPv6 part
@@ -132,6 +131,28 @@ ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_APPLY
 	@$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/iptables-apply)
 endif
 
+#	#  compability layer for nftables
+ifdef PTXCONF_IPTABLES_NFTABLES_COMPAT
+	@$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-compat-multi)
+
+ifdef PTXCONF_IPTABLES_IPV4
+# 	# IPv4 part
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/iptables-compat)
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/iptables-compat-save)
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/iptables-compat-restore)
+endif
+
+ifdef PTXCONF_IPTABLES_IPV6
+# 	# IPv6 part
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ip6tables-compat)
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ip6tables-compat-save)
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ip6tables-compat-restore)
+endif
+
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/arptables-compat)
+	@$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ebtables-compat)
+endif
+
 	@$(call install_finish, iptables)
 
 	@$(call touch)
-- 
2.8.0.rc3

____________
Virus checked by G Data MailSecurity
Version: AVA 25.6096 dated 08.04.2016
Virus news: www.antiviruslab.com.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 4/5] libmnl: adding new library in version 1.0.3

[Andreas Geisenhainer]

	- library will be used by nftables

Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
---
 rules/libmnl.in   | 11 +++++++++++
 rules/libmnl.make | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 rules/libmnl.in
 create mode 100644 rules/libmnl.make

diff --git a/rules/libmnl.in b/rules/libmnl.in
new file mode 100644
index 0000000..aa71e5d
--- /dev/null
+++ b/rules/libmnl.in
@@ -0,0 +1,11 @@
+## SECTION=networking
+
+config LIBMNL
+	bool
+	prompt "libmnl"
+	help
+		libmnl is a minimalistic user-space library oriented to Netlink
+		developers. There are a lot of common tasks in parsing, validating,
+		constructing of both the Netlink header and TLVs that are repetitive
+		and easy to get wrong. This library aims to provide simple helpers
+		that allows you to re-use code and to avoid re-inventing the wheel.
diff --git a/rules/libmnl.make b/rules/libmnl.make
new file mode 100644
index 0000000..c71f004
--- /dev/null
+++ b/rules/libmnl.make
@@ -0,0 +1,52 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBMNL) += libmnl
+
+#
+# Paths and names
+#
+LIBMNL_VERSION	:= 1.0.3
+LIBMNL_MD5	:= 7d95fc3bea3365bc03c48e484224f65f
+LIBMNL		:= libmnl-$(LIBMNL_VERSION)
+LIBMNL_SUFFIX	:= tar.bz2
+LIBMNL_URL		:= http://ftp.netfilter.org/pub/libmnl/$(LIBMNL).$(LIBMNL_SUFFIX)
+LIBMNL_SOURCE	:= $(SRCDIR)/$(LIBMNL).$(LIBMNL_SUFFIX)
+LIBMNL_DIR		:= $(BUILDDIR)/$(LIBMNL)
+LIBMNL_LICENSE	:= GPL-2.0
+
+#
+# autoconf
+#
+LIBMNL_CONF_TOOL	:= autoconf
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libmnl.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libmnl)
+	@$(call install_fixup, libmnl,PRIORITY,optional)
+	@$(call install_fixup, libmnl,SECTION,base)
+	@$(call install_fixup, libmnl,AUTHOR,"Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>")
+	@$(call install_fixup, libmnl,DESCRIPTION,missing)
+
+	@$(call install_lib, libmnl, 0, 0, 0644, libmnl)
+
+	@$(call install_finish, libmnl)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.8.0.rc3

____________
Virus checked by G Data MailSecurity
Version: AVA 25.6096 dated 08.04.2016
Virus news: www.antiviruslab.com.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 5/5] nftables: adds new package nftables in version 0.5

[Andreas Geisenhainer]

	- nftables is the replacement for iptables, arptables, ebtables

Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
---
 rules/nftables.in   | 37 +++++++++++++++++++++++++++++++++
 rules/nftables.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 rules/nftables.in
 create mode 100644 rules/nftables.make

diff --git a/rules/nftables.in b/rules/nftables.in
new file mode 100644
index 0000000..a08a78f
--- /dev/null
+++ b/rules/nftables.in
@@ -0,0 +1,37 @@
+## SECTION=networking
+
+menuconfig NFTABLES
+	tristate
+	prompt "nftables                      "
+	select LIBGMP if !NFTABLES_MGMP
+	select READLINE
+	select LIBMNL
+	select LIBNFTNL
+	help
+	  nftables is the project that aims to replace the existing
+	  {ip,ip6,arp,eb}tables framework. Basically, this project provides
+	  a new packet filtering framework, a new userspace utility and also
+	  a compatibility layer for {ip,ip6}tables. nftables is built upon
+	  the building blocks of the Netfilter infrastructure such as the
+	  existing hooks, the connection tracking system, the userspace
+	  queueing component and the logging subsystem.
+	  Don't forget to enable nf_tables in kernel.
+
+if NFTABLES
+
+config NFTABLES_DEBUG
+	bool
+	default y
+	prompt "enable debug"
+
+
+config NFTABLES_MGMP
+	bool
+	prompt "use mini-GMP"
+	# broken in v0.5 (seems to be fixed some time after)
+	depends on BROKEN
+	help
+	  use the nftables build-in mini-GMP instead of linking to the shared
+	  libgmp. (may reduce debugging verbosity on some files)
+
+endif
diff --git a/rules/nftables.make b/rules/nftables.make
new file mode 100644
index 0000000..8eed244
--- /dev/null
+++ b/rules/nftables.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Andreas Geisenhainer <andreas.geisenhainer@atsonline.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NFTABLES) += nftables
+
+#
+# Paths and names
+#
+NFTABLES_VERSION	:= 0.5
+NFTABLES_MD5		:= 94bfe1c54bcb9f6ed974835f2fca8069
+NFTABLES		:= nftables-$(NFTABLES_VERSION)
+NFTABLES_SUFFIX		:= tar.bz2
+NFTABLES_URL		:= http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX)
+NFTABLES_SOURCE		:= $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX)
+NFTABLES_DIR		:= $(BUILDDIR)/$(NFTABLES)
+NFTABLES_LICENSE	:= GPL-2.0
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+NFTABLES_CONF_TOOL	:= autoconf
+NFTABLES_CONF_OPT	:= \
+	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/endis, PTXCONF_NFTABLES_DEBUG)-debug \
+	--$(call ptx/wwo, PTXCONF_NFTABLES_MGMP)-mini-gmp
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/nftables.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, nftables)
+	@$(call install_fixup, nftables,PRIORITY,optional)
+	@$(call install_fixup, nftables,SECTION,base)
+	@$(call install_fixup, nftables,AUTHOR,"Andreas Geisenhainer <andreas.geisenhainer@atsonline.de")
+	@$(call install_fixup, nftables,DESCRIPTION,missing)
+
+	@$(call install_copy, nftables, 0, 0, 0755, -, /usr/sbin/nft)
+
+	@$(call install_finish, nftables)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.8.0.rc3

____________
Virus checked by G Data MailSecurity
Version: AVA 25.6096 dated 08.04.2016
Virus news: www.antiviruslab.com.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de