From 44c745288ca1b7ea647335100aaa44dc0253d491 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 9 Nov 2020 13:24:09 +0100 Subject: build: bump wintun hash Signed-off-by: Jason A. Donenfeld --- Makefile | 2 +- README.md | 4 ++-- build.bat | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f1d88cd7..d1d4c79c 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ define download = endef $(eval $(call download,go.tar.gz,https://golang.org/dl/go1.15.4.linux-amd64.tar.gz,eb61005f0b932c93b424a3a4eaa67d72196c79129d9a3ea8578047683e2c80d5)) -$(eval $(call download,wintun.zip,https://www.wintun.net/builds/wintun-0.9.zip,69afc860c9e5b5579f09847aeb9ac7b5190ec8ff6f21b6ec799f80351f19d1dd)) +$(eval $(call download,wintun.zip,https://www.wintun.net/builds/wintun-0.9.zip,ef435b3c26fdb3bd79dd3f27f4e0020af1733e6cd186c93072dd540a13fcd53e)) .deps/go/prepared: .distfiles/go.tar.gz $(wildcard go-patches/*.patch) mkdir -p .deps diff --git a/README.md b/README.md index 33cc6fa5..c1e9c835 100644 --- a/README.md +++ b/README.md @@ -72,10 +72,10 @@ After, run the above `build` commands as usual, from a shell that has [`signtool ### Alternative: Building from Linux -You must first have Go ≥1.12, Mingw, and ImageMagick installed. +You must first have Mingw and ImageMagick installed. ``` -$ sudo apt install mingw-w64 golang-go imagemagick +$ sudo apt install mingw-w64 imagemagick $ git clone https://git.zx2c4.com/wireguard-windows $ cd wireguard-windows $ make diff --git a/build.bat b/build.bat index 22909a2b..a73c7ce6 100644 --- a/build.bat +++ b/build.bat @@ -23,7 +23,7 @@ if exist .deps\prepared goto :render call :download wireguard-tools.zip https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-66714e2c47bb0ff55e6f8360301af833f879b6ac.zip ad8bc49879434f52dedf7a8fc53fac014f12f708c96d61e01b3160d0f0d43ed7 "--exclude wg-quick --strip-components 1" || goto :error rem Mirror of https://sourceforge.net/projects/gnuwin32/files/patch/2.5.9-7/patch-2.5.9-7-bin.zip with fixed manifest call :download patch.zip https://download.wireguard.com/windows-toolchain/distfiles/patch-2.5.9-7-bin-fixed-manifest.zip 25977006ca9713f2662a5d0a2ed3a5a138225b8be3757035bd7da9dcf985d0a1 "--strip-components 1 bin" || goto :error - call :download wintun.zip https://www.wintun.net/builds/wintun-0.9.zip 69afc860c9e5b5579f09847aeb9ac7b5190ec8ff6f21b6ec799f80351f19d1dd || goto :error + call :download wintun.zip https://www.wintun.net/builds/wintun-0.9.zip ef435b3c26fdb3bd79dd3f27f4e0020af1733e6cd186c93072dd540a13fcd53e || goto :error echo [+] Patching go for %%a in ("..\go-patches\*.patch") do .\patch.exe -f -N -r- -d go -p1 --binary < "%%a" || goto :error cd go\src || goto :error -- cgit v1.3-18-gd494