From 451047d14a6f3d11b633a35eb8ae3dbe273c720f Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Thu, 13 Apr 2017 17:10:32 -0700 Subject: [PATCH 1/5] Bump version numbers for v1.0.8-1. --- README.md | 4 ++-- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d04105591..ca78f36eb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Zcash 1.0.8 -=========== +Zcash 1.0.8-1 +============= What is Zcash? -------------- diff --git a/configure.ac b/configure.ac index e356b9e07..de205561c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 8) -define(_CLIENT_VERSION_BUILD, 50) +define(_CLIENT_VERSION_BUILD, 51) 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))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 90c21be45..4799bb476 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.8" +name: "zcash-1.0.8-1" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index fb934ab24..bba551eeb 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 8 -#define CLIENT_VERSION_BUILD 50 +#define CLIENT_VERSION_BUILD 51 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true From a4f764bb289bc7ffe493a0755012954fe025a39e Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Thu, 13 Apr 2017 17:39:36 -0700 Subject: [PATCH 2/5] Commit the changes from gen-manpages.sh, except manually tweak the version strings. --- doc/man/zcash-cli.1 | 8 ++++++-- doc/man/zcash-tx.1 | 8 ++++++-- doc/man/zcashd.1 | 10 +++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 9dbefb9e8..b66838b65 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH ZCASH-CLI "1" "March 2017" "zcash-cli v1.0.8" "User Commands" +.TH ZCASH-CLI "1" "April 2017" "zcash-cli v1.0.8-1" "User Commands" .SH NAME zcash-cli \- manual page for zcash-cli v1.0.8 .SH DESCRIPTION -Zcash RPC client version v1.0.8 +Zcash RPC client version v1.0.8\-1 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -66,6 +66,10 @@ Password for JSON\-RPC connections Timeout in seconds during HTTP requests, or 0 for no timeout. (default: 900) .SH COPYRIGHT + +In order to ensure you are adequately protecting your privacy when using Zcash, +please see . + Copyright (C) 2009-2017 The Bitcoin Core Developers Copyright (C) 2015-2017 The Zcash Developers diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 4bd1b6b1d..73d80230d 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH ZCASH-TX "1" "March 2017" "zcash-tx v1.0.8" "User Commands" +.TH ZCASH-TX "1" "April 2017" "zcash-tx v1.0.8-1" "User Commands" .SH NAME zcash-tx \- manual page for zcash-tx v1.0.8 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.8 +Zcash zcash\-tx utility version v1.0.8\-1 .SS "Usage:" .TP zcash\-tx [options] [commands] @@ -84,6 +84,10 @@ set=NAME:JSON\-STRING .IP Set register NAME to given JSON\-STRING .SH COPYRIGHT + +In order to ensure you are adequately protecting your privacy when using Zcash, +please see . + Copyright (C) 2009-2017 The Bitcoin Core Developers Copyright (C) 2015-2017 The Zcash Developers diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 3fbfe32e6..876562408 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH ZCASHD "1" "March 2017" "zcashd v1.0.8" "User Commands" +.TH ZCASHD "1" "April 2017" "zcashd v1.0.8-1" "User Commands" .SH NAME zcashd \- manual page for zcashd v1.0.8 .SH DESCRIPTION -Zcash Daemon version v1.0.8 +Zcash Daemon version v1.0.8\-1 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -382,7 +382,7 @@ Generate coins (default: 0) .HP \fB\-genproclimit=\fR .IP -Set the number of threads for coin generation if enabled (\fB\-1\fR = all +Set the number of threads for coin generation if enabled (\fB\fR = all cores, default: 1) .HP \fB\-equihashsolver=\fR @@ -454,6 +454,10 @@ output (default: 1 if running in a console, 0 otherwise) Number of seconds between metrics refreshes (default: 1 if running in a console, 600 otherwise) .SH COPYRIGHT + +In order to ensure you are adequately protecting your privacy when using Zcash, +please see . + Copyright (C) 2009-2017 The Bitcoin Core Developers Copyright (C) 2015-2017 The Zcash Developers From 1c360b2128342aa967533f269f38cd61d9596218 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Thu, 13 Apr 2017 17:48:08 -0700 Subject: [PATCH 3/5] Fix a release-process.md bug; commit results changelog + debian updates. --- contrib/debian/changelog | 6 ++++++ doc/authors.md | 7 ++++--- doc/release-notes/release-notes-1.0.8-1.md | 16 ++++++++++++++++ doc/release-process.md | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 doc/release-notes/release-notes-1.0.8-1.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index c400dca73..3157e06b2 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (v1.0.8+1) jessie; urgency=high + + * 1.0.8-1 release. + + -- Zcash Company Thu, 13 Apr 2017 17:44:23 -0700 + zcash (1.0.8) jessie; urgency=medium * 1.0.8 release. diff --git a/doc/authors.md b/doc/authors.md index f9fc63367..03a92cb24 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,10 +1,10 @@ Zcash Contributors ================== -Jack Grigg (392) +Jack Grigg (393) Simon Liu (254) Sean Bowe (185) -Daira Hopwood (80) +Daira Hopwood (83) Taylor Hornby (65) Wladimir J. van der Laan (58) Jonas Schnelli (48) @@ -12,7 +12,7 @@ Jay Graber (47) Kevin Gallagher (38) Cory Fields (15) Pieter Wuille (14) -Nathan Wilcox (10) +Nathan Wilcox (12) nomnombtc (9) fanquake (5) Paige Peterson (5) @@ -30,6 +30,7 @@ Daniel Cousens (4) lpescher (3) Pavel Janík (3) Alfie John (3) +str4d (2) paveljanik (2) aniemerg (2) Scott (2) diff --git a/doc/release-notes/release-notes-1.0.8-1.md b/doc/release-notes/release-notes-1.0.8-1.md new file mode 100644 index 000000000..4650f552c --- /dev/null +++ b/doc/release-notes/release-notes-1.0.8-1.md @@ -0,0 +1,16 @@ +Daira Hopwood (3): + Don't rely on a finite upper bound on fee rate or priority. + Simplify JoinSplit priority calculation. refs 1896 + Add check for JoinSplit priority as calculated by CCoinsViewCache::GetPriority. + +Jack Grigg (1): + Use a larger -rpcclienttimeout for slow performance measurements + +Nathan Wilcox (2): + Bump version numbers for v1.0.8-1. + Commit the changes from gen-manpages.sh, except manually tweak the version strings. + +str4d (2): + Update tests to check actual infinity as well as INF_FEERATE + Add unit test for security issue 2017-04-11.a + diff --git a/doc/release-process.md b/doc/release-process.md index b4e2a3565..f86e59933 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -77,7 +77,7 @@ Run the release-notes.py script to generate release notes and update authors.md Add the newly created release notes to the Git repository: - $ git add doc/release-notes/release-notes-$ZCASH_RELEASE.md + $ git add ./doc/authors.md ./doc/release-notes/release-notes-$ZCASH_RELEASE.md Update the Debian package changelog: From 9bfe6e88542948c880351724f9522f8fb4b8a33d Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Thu, 13 Apr 2017 18:08:12 -0700 Subject: [PATCH 4/5] Undo a documentation error due to an automated tool. --- doc/man/zcashd.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 876562408..394ca314c 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -382,7 +382,7 @@ Generate coins (default: 0) .HP \fB\-genproclimit=\fR .IP -Set the number of threads for coin generation if enabled (\fB\fR = all +Set the number of threads for coin generation if enabled (\fB-1\fR = all cores, default: 1) .HP \fB\-equihashsolver=\fR From c4bfb295a96b51233787c1a88521c1639ca5bb3e Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Thu, 13 Apr 2017 18:10:19 -0700 Subject: [PATCH 5/5] Fix the previous incorrect fix to the manpage. --- doc/man/zcashd.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 394ca314c..f9e976a19 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -382,7 +382,7 @@ Generate coins (default: 0) .HP \fB\-genproclimit=\fR .IP -Set the number of threads for coin generation if enabled (\fB-1\fR = all +Set the number of threads for coin generation if enabled (\fB\-1\fR = all cores, default: 1) .HP \fB\-equihashsolver=\fR