Merge pull request #5829 from zcash/merge-hotfix-v4.6.0-2

Merge hotfix-v4.6.0-2

contrib/debian/changelog

@@ -1,3 +1,9 @@
+zcash (4.6.0+2) stable; urgency=medium
+
+  * 4.6.0-2 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Mon, 04 Apr 2022 21:53:34 +0000
+
 zcash (4.7.0~rc1) stable; urgency=medium
 
   * 4.7.0-rc1 release.

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)

doc/release-notes/release-notes-4.6.0-2.md

@@ -0,0 +1,47 @@
+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
+=========
+
+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
+

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.");