| Message ID | 045cb32775a51576353bc4aa73dcc5fa8b554864.1488441240.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Thu, 2 Mar 2017 09:54:00 +0200, Baruch Siach wrote: > Add a patch that defines _GNU_SOURCE to expose some struct tcphdr fields. > > Fixes: > http://autobuild.buildroot.net/results/bee/bee20b689345b593378cfd91e0abc48bf381d3f9/ > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > ...utils-nfsynproxy-fix-build-with-musl-libc.patch | 44 ++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > create mode 100644 package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch Applied to master, thanks. Peter: I believe this one is *not* needed for the LTS branch, because it fixes a problem with the iptables 1.6.1 bump, which was merged after the 2017.02 release. Baruch, could you confirm? Thanks, Thomas
Hi Thomas, On Thu, Mar 02, 2017 at 09:23:04AM +0100, Thomas Petazzoni wrote: > On Thu, 2 Mar 2017 09:54:00 +0200, Baruch Siach wrote: > > Add a patch that defines _GNU_SOURCE to expose some struct tcphdr fields. > > > > Fixes: > > http://autobuild.buildroot.net/results/bee/bee20b689345b593378cfd91e0abc48bf381d3f9/ > > > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > > --- > > ...utils-nfsynproxy-fix-build-with-musl-libc.patch | 44 ++++++++++++++++++++++ > > 1 file changed, 44 insertions(+) > > create mode 100644 package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch > > Applied to master, thanks. Peter: I believe this one is *not* needed > for the LTS branch, because it fixes a problem with the iptables 1.6.1 > bump, which was merged after the 2017.02 release. Baruch, could you > confirm? It's true that this issue does not effect 2017.02, but not because of the iptables version. In 2017.02 iptables is disabled for musl build. Commit 6a27508ffb (Revert "package/iptables: nfsynproxy not available on musl") that enabled musl was applied to next. baruch
Hello, On Thu, 2 Mar 2017 12:57:16 +0200, Baruch Siach wrote: > > Applied to master, thanks. Peter: I believe this one is *not* needed > > for the LTS branch, because it fixes a problem with the iptables 1.6.1 > > bump, which was merged after the 2017.02 release. Baruch, could you > > confirm? > > It's true that this issue does not effect 2017.02, but not because of the > iptables version. In 2017.02 iptables is disabled for musl build. Commit > 6a27508ffb (Revert "package/iptables: nfsynproxy not available on musl") that > enabled musl was applied to next. OK. Thanks for the explanation! Thomas
diff --git a/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch b/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch new file mode 100644 index 000000000000..1f86ad135490 --- /dev/null +++ b/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch @@ -0,0 +1,44 @@ +From 06e0312d0bfd1f0b9e7c23ab654f18524d49e86b Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +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 <baruch@tkos.co.il> +--- +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 +
Add a patch that defines _GNU_SOURCE to expose some struct tcphdr fields. Fixes: http://autobuild.buildroot.net/results/bee/bee20b689345b593378cfd91e0abc48bf381d3f9/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- ...utils-nfsynproxy-fix-build-with-musl-libc.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch