From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Apr 2018 05:34:57 +0000 (+0200)
Subject: ebtables: update to latest git 2018-04-11
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=85a35c644eea06e843da9d631de005ee58365d17;p=openwrt%2Fstaging%2Fjogo.git

ebtables: update to latest git 2018-04-11

2e783b227766 ebt_ip: add support for matching IGMP type
b5fbb8d786c9 ebt_ip: add support for matching ICMP type and code
c5e5b784fd1a Move ICMP type handling functions from ebt_ip6 to useful_functions.c
11da52177196 include: sync linux/netfilter_bridge/ebt_ip.h with kernel

Note: the new features require at least kernel 4.17 or backported patches.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile
index 8a37cdd44f..baa8f2efed 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-01-15
+PKG_SOURCE_DATE:=2018-04-11
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://git.netfilter.org/ebtables
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=068ba959c09b1f3697ccc93dc0ab0b2557719776
-PKG_MIRROR_HASH:=5aa2ab6c70f050d78f7b8b276b0b104f04f3ae88892d1e1e201e0f6629533036
+PKG_SOURCE_VERSION:=2e783b2277665c467138e7685309622456c41db4
+PKG_MIRROR_HASH:=601a41f579f76c8121bb6076ebcf5eb5efddf634ebb5949ec9e983a17e66e689
 
 PKG_LICENSE:=GPL-2.0
 
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 b77df159aa..52ab175ec2 100644
--- a/package/network/utils/ebtables/patches/200-fix-extension-init.patch
+++ b/package/network/utils/ebtables/patches/200-fix-extension-init.patch
@@ -62,7 +62,7 @@
  }
 --- a/extensions/ebt_ip.c
 +++ b/extensions/ebt_ip.c
-@@ -338,7 +338,7 @@ static struct ebt_u_match ip_match =
+@@ -472,7 +472,7 @@ static struct ebt_u_match ip_match =
  	.extra_ops	= opts,
  };
  
@@ -73,7 +73,7 @@
  }
 --- a/extensions/ebt_ip6.c
 +++ b/extensions/ebt_ip6.c
-@@ -560,7 +560,7 @@ static struct ebt_u_match ip6_match =
+@@ -413,7 +413,7 @@ static struct ebt_u_match ip6_match =
  	.extra_ops	= opts,
  };