diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2018-07-02 17:31:03 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:44:03 +0100 |
| commit | 3341376e0bed6b9928b338c1eec6ac1578727390 (patch) | |
| tree | 8010433164efe15c47ec0462225472ba5c14c0d8 | |
| parent | b1c42ef11571b7fa179d302fa8fbdb074937c19b (diff) | |
| download | upstream-3341376e0bed6b9928b338c1eec6ac1578727390.tar.gz upstream-3341376e0bed6b9928b338c1eec6ac1578727390.tar.bz2 upstream-3341376e0bed6b9928b338c1eec6ac1578727390.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>
(backported from afac2a2dd67502ef8bd9799f328fa2e3b39292b1)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | package/network/utils/ebtables/Makefile | 6 | ||||
| -rw-r--r-- | package/network/utils/ebtables/patches/100-musl_fix.patch | 2 | ||||
| -rw-r--r-- | package/network/utils/ebtables/patches/200-fix-extension-init.patch | 2 |
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 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, }; |