From 1a093404e1762072e85e1c51171ef243b64e9e16 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 25 Nov 2019 16:28:56 -0800 Subject: [PATCH 1/5] bump version to 3.2.2 --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/src/clientversion.h b/src/clientversion.h index 2cb13cb2e..0a8fa3d32 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 From d8caae05bfe3d7e8fae7c95a6b54c5aedd7166c7 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 25 Nov 2019 16:28:56 -0800 Subject: [PATCH 2/5] bump version to 3.2.2 --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/src/clientversion.h b/src/clientversion.h index 2cb13cb2e..0a8fa3d32 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 From 9444d8de859e061bdeb48292f0dcdac6e0e6605b Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Tue, 26 Nov 2019 08:21:32 -0500 Subject: [PATCH 3/5] update manpages --- contrib/devtools/gen-manpages.sh | 2 +- doc/man/komodo-cli.1 | 6 +++--- doc/man/komodo-tx.1 | 6 +++--- doc/man/komodod.1 | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 9a5027422..1b497c398 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -11,7 +11,7 @@ KOMODOTX=${KOMODOTX:-$SRCDIR/komodo-tx} [ ! -x $KOMODOD ] && echo "$KOMODOD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -KMDVER="v3.2.1" +KMDVER="v3.2.2" # Create a footer file with copyright content. # This gets autodetected fine for komodod if --version-string is not set, diff --git a/doc/man/komodo-cli.1 b/doc/man/komodo-cli.1 index 8297286ed..e4ab707d8 100644 --- a/doc/man/komodo-cli.1 +++ b/doc/man/komodo-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH KOMODO-CLI "1" "October 2019" "komodo-cli v3.2.1" "User Commands" +.TH KOMODO-CLI "1" "November 2019" "komodo-cli v3.2.2" "User Commands" .SH NAME -komodo-cli \- manual page for komodo-cli v3.2.1 +komodo-cli \- manual page for komodo-cli v3.2.2 .SH DESCRIPTION -Komodo RPC client version v3.2.1\-659ebb148 +Komodo RPC client version v3.2.2\-d8caae05b\-dirty .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . diff --git a/doc/man/komodo-tx.1 b/doc/man/komodo-tx.1 index df0808515..746c72891 100644 --- a/doc/man/komodo-tx.1 +++ b/doc/man/komodo-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH KOMODO-TX "1" "October 2019" "komodo-tx v3.2.1" "User Commands" +.TH KOMODO-TX "1" "November 2019" "komodo-tx v3.2.2" "User Commands" .SH NAME -komodo-tx \- manual page for komodo-tx v3.2.1 +komodo-tx \- manual page for komodo-tx v3.2.2 .SH DESCRIPTION -Hush komodo\-tx utility version v3.2.1\-659ebb148 +Hush komodo\-tx utility version v3.2.2\-d8caae05b\-dirty .SS "Usage:" .TP komodo\-tx [options] [commands] diff --git a/doc/man/komodod.1 b/doc/man/komodod.1 index 0caab5b23..ccdb4d003 100644 --- a/doc/man/komodod.1 +++ b/doc/man/komodod.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH KOMODOD "1" "October 2019" "komodod v3.2.1" "User Commands" +.TH KOMODOD "1" "November 2019" "komodod v3.2.2" "User Commands" .SH NAME -komodod \- manual page for komodod v3.2.1 +komodod \- manual page for komodod v3.2.2 .SH DESCRIPTION -Hush Daemon version v3.2.1\-659ebb148 +Hush Daemon version v3.2.2\-d8caae05b\-dirty .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . From 2010b75193409fabc8d4fff78c2863223b1d1703 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 2 Dec 2019 04:35:28 -0800 Subject: [PATCH 4/5] Update libgmp dep URL with our own github fork --- depends/packages/libgmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/libgmp.mk b/depends/packages/libgmp.mk index c62fa18ed..acd5d4c0e 100644 --- a/depends/packages/libgmp.mk +++ b/depends/packages/libgmp.mk @@ -18,7 +18,7 @@ $(package)_dependencies= $(package)_config_opts=--enable-cxx --disable-shared else $(package)_version=6.1.1 -$(package)_download_path=https://supernetorg.bintray.com/misc +$(package)_download_path=https://github.com/MyHush/libgmp/releases/download/v6.1.1 $(package)_file_name=gmp-$($(package)_version).tar.bz2 $(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6 $(package)_dependencies= From e46815f3380a2c2c21596c756e6c00f1a4a0fb71 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 2 Dec 2019 04:36:45 -0800 Subject: [PATCH 5/5] Sick of libsodium changing URLs. Github URLs do not change --- depends/packages/libsodium.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk index df1ac5f32..885921644 100644 --- a/depends/packages/libsodium.mk +++ b/depends/packages/libsodium.mk @@ -1,6 +1,6 @@ package=libsodium $(package)_version=1.0.15 -$(package)_download_path=https://download.libsodium.org/libsodium/releases/old/unsupported +$(package)_download_path=https://github.com/jedisct1/libsodium/releases/download/1.0.15 $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4 $(package)_dependencies=