From 27b33dca402702c7f7d4bc875676456039573b92 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 6 Aug 2018 01:46:23 +0200 Subject: [PATCH] wireguard-tools: Update from 0.0.20180718 to 0.0.20180802 --- packages/wireguard-tools/android.c.patch | 24 +++++++++++++++++++++--- packages/wireguard-tools/build.sh | 4 ++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/packages/wireguard-tools/android.c.patch b/packages/wireguard-tools/android.c.patch index c511313b7..2d2f0c7a7 100644 --- a/packages/wireguard-tools/android.c.patch +++ b/packages/wireguard-tools/android.c.patch @@ -1,6 +1,24 @@ ---- ../android.c.orig 2018-07-11 09:28:18.815358450 +0000 -+++ ./src/tools/wg-quick/android.c 2018-07-11 09:29:03.722806783 +0000 -@@ -247,17 +247,17 @@ +diff -u -r ../WireGuard-0.0.20180802/src/tools/wg-quick/android.c ./src/tools/wg-quick/android.c +--- ../WireGuard-0.0.20180802/src/tools/wg-quick/android.c 2018-08-03 03:19:55.000000000 +0000 ++++ ./src/tools/wg-quick/android.c 2018-08-05 23:42:23.137024693 +0000 +@@ -38,6 +38,16 @@ + + static bool is_exiting = false; + ++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 ++static char *strchrnul(const char *s, int c) ++{ ++ char *x = strchr(s, c); ++ if (!x) ++ return (char *)s + strlen(s); ++ return x; ++} ++#endif ++ + static void *xmalloc(size_t size) + { + void *ret = malloc(size); +@@ -242,17 +252,17 @@ if (!getuid()) return; diff --git a/packages/wireguard-tools/build.sh b/packages/wireguard-tools/build.sh index 37dbe9a27..aa5e057c7 100644 --- a/packages/wireguard-tools/build.sh +++ b/packages/wireguard-tools/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://www.wireguard.com TERMUX_PKG_DESCRIPTION="Tools for the WireGuard secure network tunnel" -TERMUX_PKG_VERSION=0.0.20180718 +TERMUX_PKG_VERSION=0.0.20180802 +TERMUX_PKG_SHA256=cd1da34b377d58df760aadf69ced045081517570586fc2d4eed7f09f5d5a47c6 TERMUX_PKG_SRCURL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=083c093a6948c8d38f92e7ea5533f9ff926019f24dc2612ea974851ed3e24705 TERMUX_PKG_DEPENDS="libmnl, tsu" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src/tools WITH_BASHCOMPLETION=yes WITH_WGQUICK=no WITH_SYSTEMDUNITS=no"