DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Auto merge of #2743 - str4d:release-v1.0.13-rc2, r=arcalinea

Browse Source 
Release v1.0.13-rc2
This commit is contained in:
Homu
2017-11-17 10:05:17 -08:00
parent 2c72e703c5 48ea914cd0
commit 05207b865c
11 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,4 +1,4 @@
Zcash 1.0.13-rc1 Zcash 1.0.13-rc2
============= =============
What is Zcash? What is Zcash?

2
configure.ac
View File

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 13) define(_CLIENT_VERSION_REVISION, 13)
define(_CLIENT_VERSION_BUILD, 25) define(_CLIENT_VERSION_BUILD, 26)
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(_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_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) define(_CLIENT_VERSION_IS_RELEASE, true)

6
contrib/debian/changelog
View File

@@ -1,3 +1,9 @@
zcash (1.0.13~rc2) stable; urgency=medium
* 1.0.13-rc2 release.
-- Zcash Company <team@z.cash> Fri, 17 Nov 2017 18:01:08 +0000
zcash (1.0.13~rc1) stable; urgency=medium zcash (1.0.13~rc1) stable; urgency=medium
* 1.0.13-rc1 release. * 1.0.13-rc1 release.

2
contrib/gitian-descriptors/gitian-linux.yml
View File

@@ -1,5 +1,5 @@
--- ---
name: "zcash-1.0.13-rc1" name: "zcash-1.0.13-rc2"
enable_cache: true enable_cache: true
distro: "debian" distro: "debian"
suites: suites:

2
doc/authors.md
View File

@@ -1,7 +1,7 @@
Zcash Contributors Zcash Contributors
================== ==================
Jack Grigg (506) Jack Grigg (512)
Simon Liu (281) Simon Liu (281)
Sean Bowe (193) Sean Bowe (193)
Daira Hopwood (102) Daira Hopwood (102)

6
doc/man/zcash-cli.1
View File

@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "November 2017" "zcash-cli v1.0.13-rc1" "User Commands" .TH ZCASH-CLI "1" "November 2017" "zcash-cli v1.0.13-rc2" "User Commands"
.SH NAME .SH NAME
zcash-cli \- manual page for zcash-cli v1.0.13-rc1 zcash-cli \- manual page for zcash-cli v1.0.13-rc2
.SH DESCRIPTION .SH DESCRIPTION
Zcash RPC client version v1.0.13\-rc1 Zcash RPC client version v1.0.13\-rc2
.PP .PP
In order to ensure you are adequately protecting your privacy when using Zcash, In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>. please see <https://z.cash/support/security/>.

6
doc/man/zcash-tx.1
View File

@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-TX "1" "November 2017" "zcash-tx v1.0.13-rc1" "User Commands" .TH ZCASH-TX "1" "November 2017" "zcash-tx v1.0.13-rc2" "User Commands"
.SH NAME .SH NAME
zcash-tx \- manual page for zcash-tx v1.0.13-rc1 zcash-tx \- manual page for zcash-tx v1.0.13-rc2
.SH DESCRIPTION .SH DESCRIPTION
Zcash zcash\-tx utility version v1.0.13\-rc1 Zcash zcash\-tx utility version v1.0.13\-rc2
.SS "Usage:" .SS "Usage:"
.TP .TP
zcash\-tx [options] <hex\-tx> [commands] zcash\-tx [options] <hex\-tx> [commands]

8
doc/man/zcashd.1
View File

@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASHD "1" "November 2017" "zcashd v1.0.13-rc1" "User Commands" .TH ZCASHD "1" "November 2017" "zcashd v1.0.13-rc2" "User Commands"
.SH NAME .SH NAME
zcashd \- manual page for zcashd v1.0.13-rc1 zcashd \- manual page for zcashd v1.0.13-rc2
.SH DESCRIPTION .SH DESCRIPTION
Zcash Daemon version v1.0.13\-rc1 Zcash Daemon version v1.0.13\-rc2
.PP .PP
In order to ensure you are adequately protecting your privacy when using Zcash, In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>. please see <https://z.cash/support/security/>.
@@ -54,7 +54,7 @@ Specify data directory
\fB\-disabledeprecation=\fR<version> \fB\-disabledeprecation=\fR<version>
.IP .IP
Disable block\-height node deprecation and automatic shutdown (example: Disable block\-height node deprecation and automatic shutdown (example:
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13\-rc1) \fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13\-rc2)
.HP .HP
\fB\-exportdir=\fR<dir> \fB\-exportdir=\fR<dir>
.IP .IP

11
doc/release-notes/release-notes-1.0.13-rc2.md Normal file
View File

@@ -0,0 +1,11 @@
Changelog
=========
Jack Grigg (6):
Move libsnark from DIST_SUBDIRS into EXTRA_DIST
Pass correct dependencies path to libsnark from both Gitian and build.sh
Mark libsnark includes as library includes
Add the tar-pax option to automake
make-release.py: Versioning changes for 1.0.13-rc2.
make-release.py: Updated manpages for 1.0.13-rc2.

2
src/clientversion.h
View File

@@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 13 #define CLIENT_VERSION_REVISION 13
#define CLIENT_VERSION_BUILD 25 #define CLIENT_VERSION_BUILD 26
//! Set to true for release, false for prerelease or test build //! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true #define CLIENT_VERSION_IS_RELEASE true

2
src/deprecation.h
View File

@@ -8,7 +8,7 @@
// Deprecation policy: // Deprecation policy:
// * Shut down 16 weeks' worth of blocks after the estimated release block height. // * Shut down 16 weeks' worth of blocks after the estimated release block height.
// * A warning is shown during the 2 weeks' worth of blocks prior to shut down. // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
static const int APPROX_RELEASE_HEIGHT = 219700; static const int APPROX_RELEASE_HEIGHT = 221270;
static const int WEEKS_UNTIL_DEPRECATION = 16; static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);