aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2018-07-02 17:31:03 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-07-02 17:33:55 +0200
commitafac2a2dd67502ef8bd9799f328fa2e3b39292b1 (patch)
treeba845a99af5135c293a07456bf130b198d1950fc /package/network/utils
parente705342bf8cf1e5c2c1750cf50ab3cf04cc2e080 (diff)
downloadupstream-afac2a2dd67502ef8bd9799f328fa2e3b39292b1.tar.gz
upstream-afac2a2dd67502ef8bd9799f328fa2e3b39292b1.tar.bz2
upstream-afac2a2dd67502ef8bd9799f328fa2e3b39292b1.zip
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>
Diffstat (limited to 'package/network/utils')
-rw-r--r--package/network/utils/ebtables/Makefile6
-rw-r--r--package/network/utils/ebtables/patches/100-musl_fix.patch2
-rw-r--r--package/network/utils/ebtables/patches/200-fix-extension-init.patch2
3 files changed, 5 insertions, 5 deletions
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 3fe5845897..f393ea7d91 100644
--- a/package/network/utils/ebtables/patches/100-musl_fix.patch
+++ b/package/network/utils/ebtables/patches/100-musl_fix.patch
@@ -6,5 +6,5 @@
#define EBTABLES_U_H
+#define _NETINET_IF_ETHER_H
#include <netinet/in.h>
+ #include <netinet/ether.h>
#include <linux/netfilter_bridge/ebtables.h>
- #include <linux/netfilter/x_tables.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,
};