From 7c96bf6aeb9fd87bb19ec2b81f854af184a458bf Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Thu, 4 Oct 2018 23:53:54 -0700 Subject: [PATCH 1/2] Start doing the needful for our next release --- README.md | 4 ++-- configure.ac | 4 ++-- contrib/devtools/gen-manpages.sh | 1 + doc/man/hush-cli.1 | 8 ++++---- doc/man/hush-tx.1 | 8 ++++---- doc/man/hushd.1 | 12 ++++++------ 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9dd93225f..746c2be5f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# HUSH 1.0.14 +# HUSH 2.0.0 ## What is HUSH? @@ -7,7 +7,7 @@ HUSH (formerly Zdash) is a code fork of [ZCash](https://z.cash/) which has it's own genesis block. Based on Bitcoin's code, it intends to offer a far higher standard of privacy through a sophisticated zero-knowledge proving scheme that preserves -confidentiality of transaction metadata. +confidentiality of transaction metadata. This software is the HUSH node and command-line client. It downloads and stores the entire history of HUSH transactions; depending on the speed of your computer and network diff --git a/configure.ac b/configure.ac index 6a26a3ed8..4ff059697 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) -define(_CLIENT_VERSION_MAJOR, 1) +define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 14) +define(_CLIENT_VERSION_REVISION, 0) 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/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index a03c1fd2d..69b2960fd 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -1,4 +1,5 @@ #!/bin/sh +alias sed=gsed TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1 index b522ff4e9..05b967786 100644 --- a/doc/man/hush-cli.1 +++ b/doc/man/hush-cli.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH HUSH-CLI "1" "March 2018" "hush-cli v1.0.14-a0d4aef" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH HUSH-CLI "1" "October 2018" "hush-cli v1.0.13-72e2e60" "User Commands" .SH NAME -hush-cli \- manual page for hush-cli v1.0.14-a0d4aef +hush-cli \- manual page for hush-cli v1.0.13-72e2e60 .SH DESCRIPTION -Hush RPC client version v1.0.14\-a0d4aef +Hush RPC client version v1.0.13 .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1 index ae3184a35..ae75d0e68 100644 --- a/doc/man/hush-tx.1 +++ b/doc/man/hush-tx.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH HUSH-TX "1" "March 2018" "hush-tx v1.0.14-a0d4aef" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH HUSH-TX "1" "October 2018" "hush-tx v1.0.13-72e2e60" "User Commands" .SH NAME -hush-tx \- manual page for hush-tx v1.0.14-a0d4aef +hush-tx \- manual page for hush-tx v1.0.13-72e2e60 .SH DESCRIPTION -Hush hush\-tx utility version v1.0.14\-a0d4aef +Hush hush\-tx utility version v1.0.13 .SS "Usage:" .TP hush\-tx [options] [commands] diff --git a/doc/man/hushd.1 b/doc/man/hushd.1 index 2a587ac13..97038cb21 100644 --- a/doc/man/hushd.1 +++ b/doc/man/hushd.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH HUSHD "1" "March 2018" "hushd v1.0.14-a0d4aef" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH HUSHD "1" "October 2018" "hushd v1.0.13-72e2e60" "User Commands" .SH NAME -hushd \- manual page for hushd v1.0.14-a0d4aef +hushd \- manual page for hushd v1.0.13-72e2e60 .SH DESCRIPTION -Hush Daemon version v1.0.14\-a0d4aef +Hush Daemon version v1.0.13 .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . @@ -54,7 +54,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.14) +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13) .HP \fB\-exportdir=\fR .IP @@ -79,7 +79,7 @@ mempool will accept (default: 0 = no limit applied) .HP \fB\-par=\fR .IP -Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 = +Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 = leave that many cores free, default: 0) .HP \fB\-pid=\fR From d9b4ba02f5a540245015bbc360270b2569e0471b Mon Sep 17 00:00:00 2001 From: Jonathan Duke Leto Date: Sat, 6 Oct 2018 15:46:36 +0200 Subject: [PATCH 2/2] Remove gsed hack and update man pages to say 2.0.0 --- contrib/devtools/gen-manpages.sh | 1 - doc/man/hush-cli.1 | 14 +++++++------- doc/man/hush-tx.1 | 14 +++++++------- doc/man/hushd.1 | 16 ++++++++-------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 69b2960fd..a03c1fd2d 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -1,5 +1,4 @@ #!/bin/sh -alias sed=gsed TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1 index 05b967786..8605c4e26 100644 --- a/doc/man/hush-cli.1 +++ b/doc/man/hush-cli.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH HUSH-CLI "1" "October 2018" "hush-cli v1.0.13-72e2e60" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. +.TH HUSH-CLI "1" "October 2018" "hush-cli v2.0.0" "User Commands" .SH NAME -hush-cli \- manual page for hush-cli v1.0.13-72e2e60 +hush-cli \- manual page for hush-cli v2.0.0 .SH DESCRIPTION -Hush RPC client version v1.0.13 +Hush RPC client version v2.0.0 .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . @@ -70,9 +70,9 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default: In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2009-2017 The Bitcoin Core Developers -Copyright (C) 2015-2017 The Zcash Developers -Copyright (C) 2016-2017 The Hush Developers +Copyright (C) 2009-2018 The Bitcoin Core Developers +Copyright (C) 2015-2018 The Zcash Developers +Copyright (C) 2016-2018 The Hush Developers This is experimental software. diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1 index ae75d0e68..555151b10 100644 --- a/doc/man/hush-tx.1 +++ b/doc/man/hush-tx.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH HUSH-TX "1" "October 2018" "hush-tx v1.0.13-72e2e60" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. +.TH HUSH-TX "1" "October 2018" "hush-tx v2.0.0" "User Commands" .SH NAME -hush-tx \- manual page for hush-tx v1.0.13-72e2e60 +hush-tx \- manual page for hush-tx v2.0.0 .SH DESCRIPTION -Hush hush\-tx utility version v1.0.13 +Hush hush\-tx utility version v2.0.0 .SS "Usage:" .TP hush\-tx [options] [commands] @@ -88,9 +88,9 @@ Set register NAME to given JSON\-STRING In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2009-2017 The Bitcoin Core Developers -Copyright (C) 2015-2017 The Zcash Developers -Copyright (C) 2016-2017 The Hush Developers +Copyright (C) 2009-2018 The Bitcoin Core Developers +Copyright (C) 2015-2018 The Zcash Developers +Copyright (C) 2016-2018 The Hush Developers This is experimental software. diff --git a/doc/man/hushd.1 b/doc/man/hushd.1 index 97038cb21..c53ecf6db 100644 --- a/doc/man/hushd.1 +++ b/doc/man/hushd.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH HUSHD "1" "October 2018" "hushd v1.0.13-72e2e60" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. +.TH HUSHD "1" "October 2018" "hushd v2.0.0" "User Commands" .SH NAME -hushd \- manual page for hushd v1.0.13-72e2e60 +hushd \- manual page for hushd v2.0.0 .SH DESCRIPTION -Hush Daemon version v1.0.13 +Hush Daemon version v2.0.0 .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . @@ -54,7 +54,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13) +\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.0) .HP \fB\-exportdir=\fR .IP @@ -504,9 +504,9 @@ console, 600 otherwise) In order to ensure you are adequately protecting your privacy when using Hush, please see . -Copyright (C) 2009-2017 The Bitcoin Core Developers -Copyright (C) 2015-2017 The Zcash Developers -Copyright (C) 2016-2017 The Hush Developers +Copyright (C) 2009-2018 The Bitcoin Core Developers +Copyright (C) 2015-2018 The Zcash Developers +Copyright (C) 2016-2018 The Hush Developers This is experimental software.