* [ptxdist] [PATCH v2 2/2] iptables: version bump 1.8.2 -> 1.8.3
2019-07-01 12:33 [ptxdist] [PATCH v2 1/2] libnftnl: version bump 1.1.2 -> 1.1.3 Lucas Stach
@ 2019-07-01 12:33 ` Lucas Stach
0 siblings, 0 replies; 2+ messages in thread
From: Lucas Stach @ 2019-07-01 12:33 UTC (permalink / raw)
To: ptxdist
- version bump
- drop patches, as they are all part of the 1.8.3 release
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
| 48 -------------------
| 32 -------------
...-legacy-add-missing-config.h-include.patch | 18 -------
patches/iptables-1.8.2/series | 6 ---
rules/iptables.make | 5 +-
5 files changed, 3 insertions(+), 106 deletions(-)
delete mode 100644 patches/iptables-1.8.2/0001-include-fix-build-with-kernel-headers-before-4.2.patch
delete mode 100644 patches/iptables-1.8.2/0002-include-extend-the-headers-conflict-workaround-to-in.patch
delete mode 100644 patches/iptables-1.8.2/0003-xtables-legacy-add-missing-config.h-include.patch
delete mode 100644 patches/iptables-1.8.2/series
diff --git a/patches/iptables-1.8.2/0001-include-fix-build-with-kernel-headers-before-4.2.patch b/patches/iptables-1.8.2/0001-include-fix-build-with-kernel-headers-before-4.2.patch
deleted file mode 100644
index 34bb99f277fa..000000000000
--- a/patches/iptables-1.8.2/0001-include-fix-build-with-kernel-headers-before-4.2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Fri, 16 Nov 2018 09:30:33 +0200
-Subject: [PATCH] include: fix build with kernel headers before 4.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 672accf1530 (include: update kernel netfilter header files)
-updated linux/netfilter.h and brought with it the update from kernel
-commit a263653ed798 (netfilter: don't pull include/linux/netfilter.h
-from netns headers). This triggers conflict of headers that is fixed in
-kernel commit 279c6c7fa64f (api: fix compatibility of linux/in.h with
-netinet/in.h) included in kernel version 4.2. For earlier kernel headers
-we need a workaround that prevents the headers conflict.
-
-Fixes the following build failure:
-
-In file included from .../sysroot/usr/include/netinet/ip.h:25:0,
- from ../include/libiptc/ipt_kernel_headers.h:8,
- from ../include/libiptc/libiptc.h:6,
- from libip4tc.c:29:
-.../sysroot/usr/include/linux/in.h:26:3: error: redeclaration of enumerator ‘IPPROTO_IP’
- IPPROTO_IP = 0, /* Dummy protocol for TCP */
- ^
-.../sysroot/usr/include/netinet/in.h:33:5: note: previous definition of ‘IPPROTO_IP’ was here
- IPPROTO_IP = 0, /* Dummy protocol for TCP. */
- ^~~~~~~~~~
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- include/linux/netfilter.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index c3f087ac680c..bacf8cd92116 100644
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -3,7 +3,9 @@
-
- #include <linux/types.h>
-
-+#ifndef _NETINET_IN_H
- #include <linux/in.h>
-+#endif
- #include <linux/in6.h>
- #include <limits.h>
-
diff --git a/patches/iptables-1.8.2/0002-include-extend-the-headers-conflict-workaround-to-in.patch b/patches/iptables-1.8.2/0002-include-extend-the-headers-conflict-workaround-to-in.patch
deleted file mode 100644
index c7ac48c176fb..000000000000
--- a/patches/iptables-1.8.2/0002-include-extend-the-headers-conflict-workaround-to-in.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Sun, 2 Dec 2018 18:56:34 +0200
-Subject: [PATCH] include: extend the headers conflict workaround to in6.h
-
-Commit 8d9d7e4b9ef ("include: fix build with kernel headers before 4.2")
-introduced a kernel/user headers conflict workaround that allows build
-of iptables with kernel headers older than 4.2. This minor extension
-allows build with kernel headers older than 3.12, which is the version
-that introduced explicit IP headers synchronization.
-
-Fixes: 8d9d7e4b9ef4 ("include: fix build with kernel headers before 4.2")
-Cc: Florian Westphal <fw@strlen.de>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index bacf8cd92116..042d8b1478e0 100644
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -5,8 +5,8 @@
-
- #ifndef _NETINET_IN_H
- #include <linux/in.h>
--#endif
- #include <linux/in6.h>
-+#endif
- #include <limits.h>
-
- /* Responses from hook functions. */
diff --git a/patches/iptables-1.8.2/0003-xtables-legacy-add-missing-config.h-include.patch b/patches/iptables-1.8.2/0003-xtables-legacy-add-missing-config.h-include.patch
deleted file mode 100644
index 25adb586cfc7..000000000000
--- a/patches/iptables-1.8.2/0003-xtables-legacy-add-missing-config.h-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 8 Mar 2019 15:19:12 +0100
-Subject: [PATCH] xtables-legacy: add missing config.h include
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- iptables/xtables-legacy-multi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iptables/xtables-legacy-multi.c b/iptables/xtables-legacy-multi.c
-index e68814dd082e..3b7905ff76b1 100644
---- a/iptables/xtables-legacy-multi.c
-+++ b/iptables/xtables-legacy-multi.c
-@@ -1,3 +1,4 @@
-+#include <config.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/patches/iptables-1.8.2/series b/patches/iptables-1.8.2/series
deleted file mode 100644
index 583cba667ae6..000000000000
--- a/patches/iptables-1.8.2/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-include-fix-build-with-kernel-headers-before-4.2.patch
-0002-include-extend-the-headers-conflict-workaround-to-in.patch
-0003-xtables-legacy-add-missing-config.h-include.patch
-# 5a69695cdc63f2cfe087f5d730554f57 - git-ptx-patches magic
diff --git a/rules/iptables.make b/rules/iptables.make
index 6dc859268744..ca82207c2dc5 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -21,8 +21,8 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables
#
# Paths and names
#
-IPTABLES_VERSION := 1.8.2
-IPTABLES_MD5 := 944558e88ddcc3b9b0d9550070fa3599
+IPTABLES_VERSION := 1.8.3
+IPTABLES_MD5 := 29de711d15c040c402cf3038c69ff513
IPTABLES := iptables-$(IPTABLES_VERSION)
IPTABLES_SUFFIX := tar.bz2
IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX)
@@ -48,6 +48,7 @@ IPTABLES_CONF_OPT := \
--disable-bpf-compiler \
--disable-nfsynproxy \
--$(call ptx/endis, PTXCONF_IPTABLES_NFTABLES_COMPAT)-nftables \
+ --disable-connlabel \
--with-kernel=$(KERNEL_HEADERS_DIR) \
--with-xtlibdir=/usr/lib
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread