Skip to contentSkip to conversation

iptables: bump to version 1.6.2

PATCH New Antoine Tenart 2 participants 4 messages Feb 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iptables: bump to version 1.6.2

Also removed a patch fixing the build with musl as it made its way into the 1.6.2 version.

---
 ...utils-nfsynproxy-fix-build-with-musl-libc.patch | 44 ----------------------
 package/iptables/iptables.hash                     |  6 +--
 package/iptables/iptables.mk                       |  2 +-
 3 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch
package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch deleted +0 -44
deleted file mode 100644
index 1f86ad135490..000000000000
@@ -1,44 +0,0 @@
-From 06e0312d0bfd1f0b9e7c23ab654f18524d49e86b Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Thu, 2 Mar 2017 09:20:48 +0200
-Subject: [PATCH] utils: nfsynproxy: fix build with musl libc
-
-The musl libc exposes some struct tcphdr field only when _GNU_SOURCE is
-defined. Fix the following build failure:
-
-nfsynproxy.c: In function ?parse_packet?:
-nfsynproxy.c:34:9: error: ?const struct tcphdr? has no member named ?syn?
-  if (!th->syn || !th->ack)
-         ^
-nfsynproxy.c:34:21: error: ?const struct tcphdr? has no member named ?ack?
-  if (!th->syn || !th->ack)
-                     ^
-nfsynproxy.c:42:8: error: ?const struct tcphdr? has no member named ?res2?
-  if (th->res2 == 0x1)
-        ^
-nfsynproxy.c:45:13: error: ?const struct tcphdr? has no member named ?doff?
-  length = th->doff * 4 - sizeof(*th);
-             ^
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: pending (http://patchwork.ozlabs.org/patch/734503/)
-
- utils/nfsynproxy.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils/nfsynproxy.c b/utils/nfsynproxy.c
-index baedc92c5d9f..bf5c416340f1 100644
---- a/utils/nfsynproxy.c
-+++ b/utils/nfsynproxy.c
-@@ -6,6 +6,7 @@
-  * published by the Free Software Foundation.
-  */
- 
-+#define _GNU_SOURCE
- #include <stdlib.h>
- #include <stdbool.h>
- #include <unistd.h>
--- 
-2.11.0
-
package/iptables/iptables.hash +3 -3
index b673c8abdbb4..8b191797fb82 100644
@@ -1,3 +1,3 @@
-# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.1.tar.bz2.{md5sum,sha1sum}
-md5	ab38a33806b6182c6f53d6afb4619add	iptables-1.6.1.tar.bz2
-sha1	b2592490ca7a6c2cd0f069e167a4337c86acdf91	iptables-1.6.1.tar.bz2
+# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.2.tar.bz2.{md5sum,sha1sum}
+md5	7d2b7847e4aa8832a18437b8a4c1873d	iptables-1.6.2.tar.bz2
+sha1	6279effbf8f2c7ff53d19ae13308f8a6e6a60dd9	iptables-1.6.2.tar.bz2
package/iptables/iptables.mk +1 -1
index 44cfde2b9a6c..49a537f6080a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPTABLES_VERSION = 1.6.1
+IPTABLES_VERSION = 1.6.2
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/1 iptables: bump to version 1.6.2

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Antoine" == Antoine Tenart <[email protected]> writes:

Also removed a patch fixing the build with musl as it made its way into the 1.6.2 version.

Thanks. Should this go to master or next? Does this fix any important issues?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 iptables: bump to version 1.6.2

Hi Peter,

Quoted 7 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Antoine" == Antoine Tenart <[email protected]> writes:

Also removed a patch fixing the build with musl as it made its way into the 1.6.2 version.

Thanks. Should this go to master or next? Does this fix any important issues?

I'd say this can go to next (btw, is there a specific tag to set in the subject?). I did this while compiling with RELRO and fortify source enabled, and updating the version did solve a build issue. But these two compilation options are highly experimental from what I understood and other packages are failing to build anyway, so I wouldn't say this is a real fix for the current version :)

Thanks,
Antoine

Signature · 3 lines
Antoine T?nart, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 iptables: bump to version 1.6.2

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Antoine" == Antoine Tenart <[email protected]> writes:

Hi Peter,

Quoted 2 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Antoine" == Antoine Tenart <[email protected]> writes:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Also removed a patch fixing the build with musl as it made its way into the 1.6.2 version.

Thanks. Should this go to master or next? Does this fix any important issues?

I'd say this can go to next (btw, is there a specific tag to set in the subject?).

Ok. We normally mark these with NEXT.

Quoted 2 lines

I did this while compiling with RELRO and fortify source enabled, and updating the version did solve a build issue.

Ahh, you were the one having build failures with RELRO ;)

Quoted 3 lines

But these two compilation options are highly experimental from what I understood and other packages are failing to build anyway, so I wouldn't say this is a real fix for the current version :)

Ok - Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard