diff options
| author | Alexander Dahl <ada@thorsis.com> | 2018-04-04 14:56:53 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-04 16:29:12 +0200 |
| commit | 86aeee28e5b076617126e568c5dc11d4d60d1482 (patch) | |
| tree | 3884f051e250092b50e8c0a4dbdf7dfe889b3cf3 /patches/nftables-0.8.3 | |
| parent | 130fe33e854c536e974dea00729171ec0d5fa3b8 (diff) | |
| download | ptxdist-86aeee28e5b076617126e568c5dc11d4d60d1482.tar.gz ptxdist-86aeee28e5b076617126e568c5dc11d4d60d1482.tar.xz | |
nftables: Upgrade from v0.6 to v0.8.3
Options for configure were reviewed, docs can now be disabled with
switches.
Support for the new option --with-xtables is not included. The
additional patch is necessary to successfully call configure with
--without-xtables for a setup without iptables. (Patch is currently
under review upstream, got it from
http://patchwork.ozlabs.org/patch/894947/ )
For details on new version see announcements:
* v0.7: http://lists.netfilter.org/pipermail/netfilter-announce/2016/000222.html
* v0.8: http://lists.netfilter.org/pipermail/netfilter-announce/2017/000225.html
* v0.8.1: http://lists.netfilter.org/pipermail/netfilter-announce/2018/000227.html
* v0.8.2: http://lists.netfilter.org/pipermail/netfilter-announce/2018/000229.html
* v0.8.3: https://marc.info/?l=netfilter&m=152009279821556
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/nftables-0.8.3')
| -rw-r--r-- | patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch | 32 | ||||
| l--------- | patches/nftables-0.8.3/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/nftables-0.8.3/series | 4 |
3 files changed, 37 insertions, 0 deletions
diff --git a/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch b/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch new file mode 100644 index 000000000..2b5ff1bf5 --- /dev/null +++ b/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch @@ -0,0 +1,32 @@ +From: Florian Westphal <fw@strlen.de> +Date: Wed, 4 Apr 2018 13:53:28 +0200 +Subject: [PATCH] configure: don't enable xtables when --without-xtables is + passed + +AC_ARG_WITH runs this when EITHER --with-foo or --without-foo is given, +so use 'withval'. + +After this patch: +./configure -> xtables off +./configure --with-xtables -> xtables on +./configure --without-xtables -> xtables off (was on). + +Reported-by: Alexander Dahl <ada@thorsis.com> +Signed-off-by: Florian Westphal <fw@strlen.de> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2d0b1b939a18..74e721cd4691 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,7 +99,7 @@ AM_CONDITIONAL([BUILD_CLI], [test "x$with_cli" != xno]) + + AC_ARG_WITH([xtables], [AS_HELP_STRING([--with-xtables], + [Use libxtables for iptables interaction)])], +- [with_libxtables=yes], [with_libxtables=no]) ++ [with_libxtables=$withval], [with_libxtables=no]) + AS_IF([test "x$with_libxtables" != xno], [ + PKG_CHECK_MODULES([XTABLES], [xtables >= 1.6.1]) + AC_DEFINE([HAVE_LIBXTABLES], [1], [0]) diff --git a/patches/nftables-0.8.3/autogen.sh b/patches/nftables-0.8.3/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/nftables-0.8.3/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/nftables-0.8.3/series b/patches/nftables-0.8.3/series new file mode 100644 index 000000000..d4fe1dc34 --- /dev/null +++ b/patches/nftables-0.8.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-don-t-enable-xtables-when-without-xtables-.patch +# 12321dad8667c00b553d2c9b76ee6dd3 - git-ptx-patches magic |