From 14b5fdf828aef5ef8423947c50c0d713d0cc98d3 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Wed, 18 Apr 2018 22:22:31 +0200
Subject: [PATCH 1/4] fix gtest/gmock

OSX related path-fix in makefile
---
 depends/packages/googletest.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/depends/packages/googletest.mk b/depends/packages/googletest.mk
index b9fa3e7e8..1275593f5 100644
--- a/depends/packages/googletest.mk
+++ b/depends/packages/googletest.mk
@@ -14,7 +14,8 @@ endif
 ifeq ($(build_os),darwin)
 $(package)_install=ginstall
 define $(package)_build_cmds
-    $(MAKE) -C make gtest.a
+    $(MAKE) -C googlemock/make gmock.a && \
+    $(MAKE) -C googletest/make gtest.a
 endef
 else
 $(package)_install=install

From 1672d0d9132443351deb971ae65ea44a59841995 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Wed, 18 Apr 2018 22:31:58 +0200
Subject: [PATCH 2/4] fix proton.mk

0.17.0 not hosted under legacy URL. moved to apache archive.
https://github.com/zcash/zcash/commit/2b0e6432fe6170f4dc0d9c0e2f9921d3b3b24880
---
 depends/packages/proton.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/depends/packages/proton.mk b/depends/packages/proton.mk
index aa49f380f..39428f54b 100644
--- a/depends/packages/proton.mk
+++ b/depends/packages/proton.mk
@@ -1,6 +1,6 @@
 package=proton
 $(package)_version=0.17.0
-$(package)_download_path=http://apache.cs.utah.edu/qpid/proton/$($(package)_version)
+$(package)_download_path=https://archive.apache.org/dist/qpid/proton/$($(package)_version)
 $(package)_file_name=qpid-proton-$($(package)_version).tar.gz
 $(package)_sha256_hash=6ffd26d3d0e495bfdb5d9fefc5349954e6105ea18cc4bb191161d27742c5a01a
 $(package)_patches=minimal-build.patch
@@ -21,4 +21,3 @@ endef
 define $(package)_stage_cmds
   cd build; $(MAKE) VERBOSE=1 DESTDIR=$($(package)_staging_prefix_dir) install
 endef
-

From 069ee2d327364557821c68ac06ce9221c463e937 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Thu, 19 Apr 2018 03:20:54 +0200
Subject: [PATCH 3/4] update libsodium

OSX fallback to 1.0.11 due to missing atoll/atoi compiler support
---
 depends/packages/libsodium.mk | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk
index 91e6f27b7..efa5d90de 100644
--- a/depends/packages/libsodium.mk
+++ b/depends/packages/libsodium.mk
@@ -1,17 +1,20 @@
+ifeq ($(build_os),darwin)
+package=libsodium
+$(package)_version=1.0.11
+$(package)_download_path=https://supernetorg.bintray.com/misc
+$(package)_file_name=libsodium-1.0.11.tar.gz
+$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
+$(package)_dependencies=
+$(package)_config_opts=
+else
 package=libsodium
-#<<<<<<< HEAD
-#$(package)_version=1.0.11
-#$(package)_download_path=https://supernetorg.bintray.com/misc
-#$(package)_file_name=libsodium-1.0.11.tar.gz
-#$(package)_sha256_hash=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765
-#=======
 $(package)_version=1.0.15
 $(package)_download_path=https://download.libsodium.org/libsodium/releases/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
-#>>>>>>> zcash/master
 $(package)_dependencies=
 $(package)_config_opts=
+endif
 
 define $(package)_preprocess_cmds
   cd $($(package)_build_subdir); ./autogen.sh

From f543a1cae00f6ad0e31f3232562c726285e33d99 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Thu, 19 Apr 2018 03:25:45 +0200
Subject: [PATCH 4/4] update rust

add rust WIN
---
 depends/packages/rust.mk | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/depends/packages/rust.mk b/depends/packages/rust.mk
index eb28c76d1..2e3f0b204 100644
--- a/depends/packages/rust.mk
+++ b/depends/packages/rust.mk
@@ -1,23 +1,16 @@
 package=rust
 $(package)_version=1.16.0
 $(package)_download_path=https://static.rust-lang.org/dist
-#<<<<<<< HEAD
-#ifeq ($(build_os),darwin)
-#$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-#$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
-#else ifeq ($(host_os),mingw32)
-#$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
-#$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
-#else
-#$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-#$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
-#endif
-#=======
-$(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_linux=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
-$(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
-#>>>>>>> zcash/master
+ifeq ($(build_os),darwin)
+$(package)_file_name=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
+$(package)_sha256_hash=2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926
+else ifeq ($(host_os),mingw32)
+$(package)_file_name=rust-$($(package)_version)-i686-unknown-linux-gnu.tar.gz
+$(package)_sha256_hash=b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5
+else
+$(package)_file_name=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
+$(package)_sha256_hash=48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd
+endif
 
 define $(package)_stage_cmds
   ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig