diff --git a/configure.ac b/configure.ac index 6a3e0534f..b1ce69a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 3) define(_CLIENT_VERSION_MINOR, 2) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_REVISION, 2) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk index 179ebe86c..d57e9886a 100644 --- a/depends/packages/libsodium.mk +++ b/depends/packages/libsodium.mk @@ -1,8 +1,8 @@ package=libsodium -$(package)_version=1.0.15 -$(package)_download_path=https://download.libsodium.org/libsodium/releases/old +$(package)_version=1.0.18 +$(package)_download_path=https://download.libsodium.org/libsodium/releases $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4 +$(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 $(package)_dependencies= $(package)_config_opts= diff --git a/src/clientversion.h b/src/clientversion.h index d4868380a..5204b525c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -34,7 +34,7 @@ // Must be kept in sync with configure.ac ! #define CLIENT_VERSION_MAJOR 3 #define CLIENT_VERSION_MINOR 2 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_REVISION 2 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build diff --git a/src/init.cpp b/src/init.cpp index 423a8e88b..edbbbb06a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -809,11 +809,13 @@ static void ZC_LoadParams( struct timeval tv_start, tv_end; float elapsed; bool found = false; + char cwd[1024]; + getcwd(cwd, sizeof(cwd)); + + LogPrintf("Looking for sapling params, PWD=%s\n", cwd); // Some people have previous partial downloads of zcash params, so check that last // Sapling Param Search path: . /usr/share/hush .. ../hush3 ./Contents/MacOS/ ~/.zcash-params - - LogPrintf("Looking for sapling params..."); gettimeofday(&tv_start, 0); // PWD @@ -855,11 +857,21 @@ static void ZC_LoadParams( } if (!found) { - // DMG Support: Apple just has to do things differently... - sapling_spend = boost::filesystem::path("Contents/MacOS") / "hush3" / "sapling-spend.params"; - sapling_output = boost::filesystem::path("Contents/MacOS") / "hush3" / "sapling-output.params"; + // This will only work when SD is installed into /Applications, which is the only supported method + sapling_spend = boost::filesystem::path("/Applications/silentdragon.app/Contents/MacOS") / "sapling-spend.params"; + sapling_output = boost::filesystem::path("/Applications/silentdragon.app/Contents/MacOS") / "sapling-output.params"; if (files_exist(sapling_spend, sapling_output)) { - fprintf(stderr,"Found sapling params in ../Contents/MacOS\n"); + fprintf(stderr,"Found sapling params in /Applications/Contents/MacOS\n"); + found = true; + } + } + + if (!found) { + // DMG Support: Apple just has to do things differently... + sapling_spend = boost::filesystem::path("./silentdragon.app/Contents/MacOS") / "sapling-spend.params"; + sapling_output = boost::filesystem::path("./silentdragon.app/Contents/MacOS") / "sapling-output.params"; + if (files_exist(sapling_spend, sapling_output)) { + fprintf(stderr,"Found sapling params in /Applications/Contents/MacOS\n"); found = true; } }