From 4475210f87c21e30c05b83cb4d5485e2a0f6066d Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 4 Apr 2022 21:50:30 +0000 Subject: [PATCH 1/4] make-release.py: Versioning changes for 4.6.0-2. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5a276efa5..70a113317 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 4.6.0-1 +Zcash 4.6.0-2 =========== diff --git a/configure.ac b/configure.ac index 4162fa308..9f26cb74c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 4) define(_CLIENT_VERSION_MINOR, 6) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 51) +define(_CLIENT_VERSION_BUILD, 52) 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 f92f5a253..cda641a12 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-4.6.0-1" +name: "zcash-4.6.0-2" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 99f24a62d..765e76f2a 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 4 #define CLIENT_VERSION_MINOR 6 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 51 +#define CLIENT_VERSION_BUILD 52 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/deprecation.h b/src/deprecation.h index baece6442..bbf30e890 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -10,7 +10,7 @@ // Per https://zips.z.cash/zip-0200 // Shut down nodes running this version of code, 16 weeks' worth of blocks after the estimated // release block height. A warning is shown during the 14 days' worth of blocks prior to shut down. -static const int APPROX_RELEASE_HEIGHT = 1504042; +static const int APPROX_RELEASE_HEIGHT = 1540976; static const int RELEASE_TO_DEPRECATION_WEEKS = 16; static const int EXPECTED_BLOCKS_PER_HOUR = 3600 / Consensus::POST_BLOSSOM_POW_TARGET_SPACING; static_assert(EXPECTED_BLOCKS_PER_HOUR == 48, "The value of Consensus::POST_BLOSSOM_POW_TARGET_SPACING was chosen such that this assertion holds."); From 8a2c2d16b663f71664242c8be95e7a19fcc47647 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 4 Apr 2022 21:53:34 +0000 Subject: [PATCH 2/4] make-release.py: Updated manpages for 4.6.0-2. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 51ebcfcf1..cdba1ad87 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.13. -.TH ZCASH-CLI "1" "January 2022" "zcash-cli v4.6.0-1" "User Commands" +.TH ZCASH-CLI "1" "April 2022" "zcash-cli v4.6.0-2" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v4.6.0-1 +zcash-cli \- manual page for zcash-cli v4.6.0-2 .SH DESCRIPTION -Zcash RPC client version v4.6.0\-1 +Zcash RPC client version v4.6.0\-2 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index ddb563fcf..78d330365 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.13. -.TH ZCASH-TX "1" "January 2022" "zcash-tx v4.6.0-1" "User Commands" +.TH ZCASH-TX "1" "April 2022" "zcash-tx v4.6.0-2" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v4.6.0-1 +zcash-tx \- manual page for zcash-tx v4.6.0-2 .SH DESCRIPTION -Zcash zcash\-tx utility version v4.6.0\-1 +Zcash zcash\-tx utility version v4.6.0\-2 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index cb512e41c..7eb447869 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.13. -.TH ZCASHD "1" "January 2022" "zcashd v4.6.0-1" "User Commands" +.TH ZCASHD "1" "April 2022" "zcashd v4.6.0-2" "User Commands" .SH NAME -zcashd \- manual page for zcashd v4.6.0-1 +zcashd \- manual page for zcashd v4.6.0-2 .SH DESCRIPTION -Zcash Daemon version v4.6.0\-1 +Zcash Daemon version v4.6.0\-2 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From f1b6e499983d005eab17349a57617f833a5d87d6 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 4 Apr 2022 21:53:34 +0000 Subject: [PATCH 3/4] make-release.py: Updated release notes and changelog for 4.6.0-2. --- contrib/debian/changelog | 6 ++++ doc/authors.md | 13 ++++---- doc/release-notes/release-notes-4.6.0-2.md | 38 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 doc/release-notes/release-notes-4.6.0-2.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 84754abf5..4d5d43922 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (4.6.0+2) stable; urgency=medium + + * 4.6.0-2 release. + + -- Electric Coin Company Mon, 04 Apr 2022 21:53:34 +0000 + zcash (4.6.0+1) stable; urgency=medium * 4.6.0-1 release. diff --git a/doc/authors.md b/doc/authors.md index c7d8886dd..7a3b8f066 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,22 +1,22 @@ Zcash Contributors ================== -Jack Grigg (1127) +Jack Grigg (1136) Simon Liu (460) Sean Bowe (367) -Daira Hopwood (270) +Daira Hopwood (274) Eirik Ogilvie-Wigley (216) Kris Nuttycombe (181) Wladimir J. van der Laan (150) Alfredo Garcia (116) -Taylor Hornby (114) +Taylor Hornby (115) Marshall Gaucher (111) -Pieter Wuille (102) +Pieter Wuille (104) Jonas Schnelli (89) Jay Graber (89) Marco Falke (82) Cory Fields (75) -Larry Ruane (72) +Larry Ruane (73) Ying Tong Lai (56) Nathan Wilcox (56) Matt Corallo (52) @@ -38,6 +38,7 @@ Per Grön (14) Benjamin Winston (13) Pavel Janík (12) Patrick Strateman (12) +Charlie O'Keefe (12) Ariel Gabizon (12) Suhas Daftuar (11) Paige Peterson (11) @@ -46,7 +47,6 @@ Alex Morcos (11) Philip Kaufmann (10) Peter Todd (10) João Barbosa (10) -Charlie O'Keefe (10) nomnombtc (9) Marius Kjærstad (9) teor (8) @@ -94,6 +94,7 @@ Danny Willems (3) Anthony Towns (3) Alfie John (3) whythat (2) +sasha (2) rofl0r (2) ptschip (2) noname45688@gmail.com (2) diff --git a/doc/release-notes/release-notes-4.6.0-2.md b/doc/release-notes/release-notes-4.6.0-2.md new file mode 100644 index 000000000..f8f9bc2aa --- /dev/null +++ b/doc/release-notes/release-notes-4.6.0-2.md @@ -0,0 +1,38 @@ +Changelog +========= + +Charlie O'Keefe (2): + Update base image used by Dockerfile from debian 10 to debian 11 + Remove stretch (debian 9), add bullseye (debian 11) in gitian descriptor + +Daira Hopwood (4): + Avoid a warning by explicitly calling drop. + Replace call to drop with zeroization. + qa/zcash/updatecheck.py: print status code and response of failed http requests. + Postpone native_clang and libcxx 14.0.0. + +Jack Grigg (9): + qa: Bump all postponed dependencies + qa: Postpone recent CCache release + depends: Update Rust to 1.59.0 + depends: Update Clang / libcxx to LLVM 13.0.1 + rust: Fix clippy lint + depends: Revert to `libc++ 13.0.0-3` for Windows cross-compile + qa: Exclude `native_libtinfo` from dependency update checks + make-release.py: Versioning changes for 4.6.0-2. + make-release.py: Updated manpages for 4.6.0-2. + +Larry Ruane (1): + document global variables + +Pieter Wuille (2): + Fix csBestBlock/cvBlockChange waiting in rpc/mining + Modernize best block mutex/cv/hash variable naming + +Taylor Hornby (1): + Untested, not working yet, use libtinfo from the debian packages + +sasha (2): + on Arch only, use Debian's libtinfo5_6.0 to satisfy clang + remove superfluous space at end of native_packages line + From ebe6f8b26dc759c0ebf0e2d570c1448d9cf98a5b Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 4 Apr 2022 22:08:04 +0000 Subject: [PATCH 4/4] Update release notes for v4.6.0-2 --- doc/release-notes/release-notes-4.6.0-2.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/release-notes/release-notes-4.6.0-2.md b/doc/release-notes/release-notes-4.6.0-2.md index f8f9bc2aa..ae6f649f5 100644 --- a/doc/release-notes/release-notes-4.6.0-2.md +++ b/doc/release-notes/release-notes-4.6.0-2.md @@ -1,3 +1,12 @@ +This is a bugfix release that also bumps the End-of-Support height to May 16th. +It backports bugfixes from v4.7.0-rc1, including a `getblocktemplate` deadlock +fix, and several portability fixes. + +Debian 9 "Stretch" is no longer supported from v4.6.0-2, due to its +[end-of-life](https://wiki.debian.org/LTS/Stretch) on June 30th, 2022. This will +allow us to direct more resources to supporting Debian 11 Bullseye, other Linux +distributions, and other platforms such as Windows and macOS. + Changelog =========