[LEDE-DEV] wireguard: bump to 20180514

Message ID 20180516151415.19320-1-ldir@darbyshire-bryant.me.uk
State Accepted
Headers show
Series
  • [LEDE-DEV] wireguard: bump to 20180514
Related show

Commit Message

Kevin Darbyshire-Bryant May 16, 2018, 3:14 p.m.
52be69b version: bump snapshot
4884b45 ncat-client-server: add wg-quick variant
a333551 wg-quick: add darwin implementation
f5bf84d compat: backport for OpenSUSE 15
fe1ae1b wg-quick: add wg symlink
ecc1c5f wg-quick: add android implementation
3e6bb79 tools: reorganize for multiplatform wg-quick
b289d12 allowedips: Fix graphviz output after endianness patch

Refresh cross compile compatibility patch

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---

This snuck out the day after the previous bump!

 package/network/services/wireguard/Makefile               |  4 ++--
 .../services/wireguard/patches/100-portability.patch      | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

Comments

Hans Dedecker May 17, 2018, 7:58 a.m. | #1
On Wed, May 16, 2018 at 5:14 PM, Kevin Darbyshire-Bryant
<ldir@darbyshire-bryant.me.uk> wrote:
> 52be69b version: bump snapshot
> 4884b45 ncat-client-server: add wg-quick variant
> a333551 wg-quick: add darwin implementation
> f5bf84d compat: backport for OpenSUSE 15
> fe1ae1b wg-quick: add wg symlink
> ecc1c5f wg-quick: add android implementation
> 3e6bb79 tools: reorganize for multiplatform wg-quick
> b289d12 allowedips: Fix graphviz output after endianness patch
>
> Refresh cross compile compatibility patch
Patch submitted both to master and openwrt-18.06; thx

Hans
>
> Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
> ---
>
> This snuck out the day after the previous bump!
>
>  package/network/services/wireguard/Makefile               |  4 ++--
>  .../services/wireguard/patches/100-portability.patch      | 15 ++++++++-------
>  2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile
> index 1aa8659124..5ca7b7da57 100644
> --- a/package/network/services/wireguard/Makefile
> +++ b/package/network/services/wireguard/Makefile
> @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
>
>  PKG_NAME:=wireguard
>
> -PKG_VERSION:=0.0.20180513
> +PKG_VERSION:=0.0.20180514
>  PKG_RELEASE:=1
>
>  PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
>  PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
> -PKG_HASH:=28a15c59f6710851587ebca76a335f1aaaa077aad052732e0959f2bae9ba8d5c
> +PKG_HASH:=e895b65e06e85429403be3d1987577a6967476b069f0ff53caead6f682f466da
>
>  PKG_LICENSE:=GPL-2.0 Apache-2.0
>  PKG_LICENSE_FILES:=COPYING
> diff --git a/package/network/services/wireguard/patches/100-portability.patch b/package/network/services/wireguard/patches/100-portability.patch
> index b26d51ebd8..33a7373cc7 100644
> --- a/package/network/services/wireguard/patches/100-portability.patch
> +++ b/package/network/services/wireguard/patches/100-portability.patch
> @@ -7,12 +7,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
>  ---
>  --- a/src/tools/Makefile
>  +++ b/src/tools/Makefile
> -@@ -43,7 +43,7 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR
> - ifeq ($(DEBUG_TOOLS),y)
> - CFLAGS += -g
> +@@ -36,6 +36,9 @@ endif
>   endif
> --ifeq ($(shell uname -s),Linux)
> +
> + PLATFORM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
>  +ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1)
> - LIBMNL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libmnl 2>/dev/null)
> - LIBMNL_LDLIBS := $(shell $(PKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)
> - CFLAGS += $(LIBMNL_CFLAGS)
> ++PLATFORM := linux
> ++endif
> +
> + CFLAGS ?= -O3
> + CFLAGS += -std=gnu11 -D_GNU_SOURCE
> --
> 2.15.1 (Apple Git-101)
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev

Patch

diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile
index 1aa8659124..5ca7b7da57 100644
--- a/package/network/services/wireguard/Makefile
+++ b/package/network/services/wireguard/Makefile
@@ -11,12 +11,12 @@  include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard
 
-PKG_VERSION:=0.0.20180513
+PKG_VERSION:=0.0.20180514
 PKG_RELEASE:=1
 
 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
-PKG_HASH:=28a15c59f6710851587ebca76a335f1aaaa077aad052732e0959f2bae9ba8d5c
+PKG_HASH:=e895b65e06e85429403be3d1987577a6967476b069f0ff53caead6f682f466da
 
 PKG_LICENSE:=GPL-2.0 Apache-2.0
 PKG_LICENSE_FILES:=COPYING
diff --git a/package/network/services/wireguard/patches/100-portability.patch b/package/network/services/wireguard/patches/100-portability.patch
index b26d51ebd8..33a7373cc7 100644
--- a/package/network/services/wireguard/patches/100-portability.patch
+++ b/package/network/services/wireguard/patches/100-portability.patch
@@ -7,12 +7,13 @@  Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/src/tools/Makefile
 +++ b/src/tools/Makefile
-@@ -43,7 +43,7 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR
- ifeq ($(DEBUG_TOOLS),y)
- CFLAGS += -g
+@@ -36,6 +36,9 @@ endif
  endif
--ifeq ($(shell uname -s),Linux)
+ 
+ PLATFORM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]')
 +ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1)
- LIBMNL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libmnl 2>/dev/null)
- LIBMNL_LDLIBS := $(shell $(PKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)
- CFLAGS += $(LIBMNL_CFLAGS)
++PLATFORM := linux
++endif
+ 
+ CFLAGS ?= -O3
+ CFLAGS += -std=gnu11 -D_GNU_SOURCE