From 29d3c320e8cba725ffb848feaea1706ef1a50e40 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 29 Nov 2017 04:43:02 +0100 Subject: Android.mk: we need master's compat fixes for 3.10 --- fetch.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fetch.sh b/fetch.sh index 0556dfb..d7c53f3 100755 --- a/fetch.sh +++ b/fetch.sh @@ -1,21 +1,23 @@ #!/bin/bash set -e -WIREGUARD_VERSION=0.0.20171127 +WIREGUARD_VERSION=d698467a75c497a5b0dcb09775b7c2e9e12e0976 LIBMNL_VERSION=1.0.4 USER_AGENT="WireGuard-AndroidROMBuild/0.1 ($(uname -a))" fetch_wireguard() { - [[ -d wireguard && -f wireguard/src/version.h && $(< wireguard/src/version.h) == *"\"$WIREGUARD_VERSION\""* ]] && return 0 + [[ -d wireguard && -f wireguard/.version && $(< wireguard/.version) == "$WIREGUARD_VERSION" ]] && return 0 rm -rf wireguard mkdir wireguard curl -A "$USER_AGENT" -L "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$WIREGUARD_VERSION.tar.xz" | tar -C "wireguard" --strip-components=1 -xJf - + echo "$WIREGUARD_VERSION" > wireguard/.version } fetch_libmnl() { - [[ -d libmnl && -f libmnl/configure.ac && $(< libmnl/configure.ac) == *"[$LIBMNL_VERSION]"* ]] && return 0 + [[ -d libmnl && -f libmnl/.version && $(< libmnl/.version) == "$LIBMNL_VERSION" ]] && return 0 rm -rf libmnl mkdir libmnl curl -A "$USER_AGENT" -L "https://www.netfilter.org/projects/libmnl/files/libmnl-$LIBMNL_VERSION.tar.bz2" | tar -C libmnl --strip-components=1 -xjf - + echo "$LIBMNL_VERSION" > libmnl/.version } fetch_wireguard -- cgit v1.2.3-59-g8ed1b