From: Hans Dedecker <dedeckeh@gmail.com>
Date: Mon, 2 Jul 2018 15:31:03 +0000 (+0200)
Subject: ebtables: update to latest git 2018-06-27
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3341376e0bed6b9928b338c1eec6ac1578727390;p=openwrt%2Fstaging%2Fdedeckeh.git

ebtables: update to latest git 2018-06-27

48cff25 build: drop install -o/-g root
53d7e7a extensions: ebt_string: take action if snprintf discards data

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from afac2a2dd67502ef8bd9799f328fa2e3b39292b1)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile
index 9afc542fb2..732e9bf2b5 100644
--- a/package/network/utils/ebtables/Makefile
+++ b/package/network/utils/ebtables/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
-PKG_SOURCE_DATE:=2018-06-06
+PKG_SOURCE_DATE:=2018-06-27
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://git.netfilter.org/ebtables
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=56993546c80576986930f9bae7ae4ba744b1e508 
-PKG_MIRROR_HASH:=0ec27dc8c6de15f5fed1977ca04db554a47891e12814da3742b351f347a51fc6
+PKG_SOURCE_VERSION:=48cff25dfea5b37e16ba5dc6601e98ab140f5f99
+PKG_MIRROR_HASH:=1327cdc3402e5e3056819e4e9b6f9d4a5bfd401f2c4f58447afb2c3c73fc8aac
 
 PKG_LICENSE:=GPL-2.0
 
diff --git a/package/network/utils/ebtables/patches/100-musl_fix.patch b/package/network/utils/ebtables/patches/100-musl_fix.patch
index 9528fe4b19..f393ea7d91 100644
--- a/package/network/utils/ebtables/patches/100-musl_fix.patch
+++ b/package/network/utils/ebtables/patches/100-musl_fix.patch
@@ -7,4 +7,4 @@
 +#define _NETINET_IF_ETHER_H
  #include <netinet/in.h>
  #include <netinet/ether.h>
- #include <ebtables.h>
+ #include <linux/netfilter_bridge/ebtables.h>
diff --git a/package/network/utils/ebtables/patches/200-fix-extension-init.patch b/package/network/utils/ebtables/patches/200-fix-extension-init.patch
index 4b202ac57e..60e2afd331 100644
--- a/package/network/utils/ebtables/patches/200-fix-extension-init.patch
+++ b/package/network/utils/ebtables/patches/200-fix-extension-init.patch
@@ -249,7 +249,7 @@
  }
 --- a/extensions/ebt_string.c
 +++ b/extensions/ebt_string.c
-@@ -310,7 +310,7 @@ static struct ebt_u_match string_match =
+@@ -312,7 +312,7 @@ static struct ebt_u_match string_match =
  	.extra_ops	= opts,
  };