aboutsummaryrefslogtreecommitdiff
path: root/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2019-07-01 15:12:55 +0300
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-07-03 23:55:27 +0200
commit326a9ae2e5cd1e13abd1ea3de2a17909086e221c (patch)
tree6beb4dc33555955ab571723da1cea345165fc033 /package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
parent1208e41561da7c8347d430c5af3efcd271ad5260 (diff)
downloadbuildroot-326a9ae2e5cd1e13abd1ea3de2a17909086e221c.tar.gz
buildroot-326a9ae2e5cd1e13abd1ea3de2a17909086e221c.tar.bz2
package/iptables: bump to version 1.8.3
Drop upstream patches. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch')
-rw-r--r--package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch b/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
deleted file mode 100644
index 37c6f96af4..0000000000
--- a/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 51d374ba41ae4f1bb851228c06b030b83dd2092f Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 13 Nov 2018 19:22:08 +0200
-Subject: [PATCH] ebtables: vlan: fix userspace/kernel headers collision
-
-Build with musl libc fails because of conflicting struct ethhdr
-definitions:
-
-In file included from .../sysroot/usr/include/net/ethernet.h:10:0,
- from ../iptables/nft-bridge.h:8,
- from libebt_vlan.c:18:
-.../sysroot/usr/include/netinet/if_ether.h:107:8: error: redefinition of ‘struct ethhdr’
- struct ethhdr {
- ^~~~~~
-In file included from libebt_vlan.c:16:0:
-.../sysroot/usr/include/linux/if_ether.h:160:8: note: originally defined here
- struct ethhdr {
- ^~~~~~
-
-Include the userspace header first for the definition suppression logic
-to do the right thing.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
-Upstream status: commit 51d374ba41ae
-
- extensions/libebt_vlan.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c
-index 4a2eb7126895..be269c6cdb4c 100644
---- a/extensions/libebt_vlan.c
-+++ b/extensions/libebt_vlan.c
-@@ -12,6 +12,7 @@
- #include <getopt.h>
- #include <ctype.h>
- #include <xtables.h>
-+#include <netinet/if_ether.h>
- #include <linux/netfilter_bridge/ebt_vlan.h>
- #include <linux/if_ether.h>
- #include "iptables/nft.h"
---
-2.19.1
-