diff options
author | merge-script <fanquake@gmail.com> | 2024-06-11 14:18:57 +0100 |
---|---|---|
committer | merge-script <fanquake@gmail.com> | 2024-06-11 14:18:57 +0100 |
commit | 1088a98f5aad080cc6cca2da174f206509fcda6c (patch) | |
tree | 5413456a24cc6b63a7b6cf1be9d2cc3041d43e20 | |
parent | fccd32efe6e2950b2c74fdec2ade54040ca32a2c (diff) | |
parent | d756a384d2bebe85f2ce0d192e4d31bbbbe750a1 (diff) |
Merge bitcoin/bitcoin#30222: [27.1] Finalizev27.1
d756a384d2bebe85f2ce0d192e4d31bbbbe750a1 doc: update manual pages for 27.1 (fanquake)
93bb18f1c837a90916bd02ac80bd4b639c17d904 build: bump version to v27.1 final (fanquake)
fcf12419714218122e4abb3f6d7f008dadbf4ed9 doc: update release notes for v27.1 final (fanquake)
f2e05cd2a9bdc42fa45d284a5162f1f670d07ab6 depends: Update Boost download link (Hennadii Stepanov)
ba359205421e2f765391a8330e8a61055acd87fc build: Fix building `fuzz` binary on on SunOS / illumos (Hennadii Stepanov)
Pull request description:
Backports:
* https://github.com/bitcoin/bitcoin/pull/30216
* https://github.com/bitcoin/bitcoin/pull/30217
I don't think either of these changes warrants an `rc2` cycle.
ACKs for top commit:
stickies-v:
ACK d756a384d2bebe85f2ce0d192e4d31bbbbe750a1
willcl-ark:
ACK d756a384d2bebe85f2ce0d192e4d31bbbbe750a1
Tree-SHA512: b5662143283a49156403d865dee25f3b6c22741345a4c8ff10f16845ea7a1a6d9d1319a70a44d07f31263bf1a6d85701146e9cc697b82a5a58922c48504a552c
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | depends/packages/boost.mk | 2 | ||||
-rw-r--r-- | doc/man/bitcoin-cli.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-qt.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-tx.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-util.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoin-wallet.1 | 6 | ||||
-rw-r--r-- | doc/man/bitcoind.1 | 6 | ||||
-rw-r--r-- | doc/release-notes.md | 8 | ||||
-rw-r--r-- | src/Makefile.test.include | 2 |
10 files changed, 26 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index a2e08ccda1..cfd7e53d57 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 27) define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 1) +define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2024) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index ab43764b38..5e61036227 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,6 +1,6 @@ package=boost $(package)_version=1.81.0 -$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/ +$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/ $(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2 $(package)_sha256_hash=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa $(package)_patches=process_macos_sdk.patch diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 42fb158d7f..2db27ebf42 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-CLI "1" "May 2024" "bitcoin-cli v27.1.0rc1" "User Commands" +.TH BITCOIN-CLI "1" "June 2024" "bitcoin-cli v27.1.0" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v27.1.0rc1 +bitcoin-cli \- manual page for bitcoin-cli v27.1.0 .SH SYNOPSIS .B bitcoin-cli [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v27.1.0rc1 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v27.1.0rc1 +Bitcoin Core RPC client version v27.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index 249ef0787a..d91f0e7c57 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-QT "1" "May 2024" "bitcoin-qt v27.1.0rc1" "User Commands" +.TH BITCOIN-QT "1" "June 2024" "bitcoin-qt v27.1.0" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v27.1.0rc1 +bitcoin-qt \- manual page for bitcoin-qt v27.1.0 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] [\fI\,URI\/\fR] .SH DESCRIPTION -Bitcoin Core version v27.1.0rc1 +Bitcoin Core version v27.1.0 .PP Optional URI is a Bitcoin address in BIP21 URI format. .SH OPTIONS diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index 86c6a65f5d..92e3f2a2c2 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-TX "1" "May 2024" "bitcoin-tx v27.1.0rc1" "User Commands" +.TH BITCOIN-TX "1" "June 2024" "bitcoin-tx v27.1.0" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v27.1.0rc1 +bitcoin-tx \- manual page for bitcoin-tx v27.1.0 .SH SYNOPSIS .B bitcoin-tx [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR @@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v27.1.0rc1 .B bitcoin-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-tx utility version v27.1.0rc1 +Bitcoin Core bitcoin\-tx utility version v27.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index 4bf8877d3c..e3252cbe1e 100644 --- a/doc/man/bitcoin-util.1 +++ b/doc/man/bitcoin-util.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-UTIL "1" "May 2024" "bitcoin-util v27.1.0rc1" "User Commands" +.TH BITCOIN-UTIL "1" "June 2024" "bitcoin-util v27.1.0" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v27.1.0rc1 +bitcoin-util \- manual page for bitcoin-util v27.1.0 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v27.1.0rc1 +Bitcoin Core bitcoin\-util utility version v27.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index 49b001ade3..2b4593beee 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/bitcoin-wallet.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIN-WALLET "1" "May 2024" "bitcoin-wallet v27.1.0rc1" "User Commands" +.TH BITCOIN-WALLET "1" "June 2024" "bitcoin-wallet v27.1.0" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v27.1.0rc1 +bitcoin-wallet \- manual page for bitcoin-wallet v27.1.0 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v27.1.0rc1 +Bitcoin Core bitcoin\-wallet version v27.1.0 .PP bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files. By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index ee5ddd3ce5..bc7f41a5a7 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BITCOIND "1" "May 2024" "bitcoind v27.1.0rc1" "User Commands" +.TH BITCOIND "1" "June 2024" "bitcoind v27.1.0" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v27.1.0rc1 +bitcoind \- manual page for bitcoind v27.1.0 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v27.1.0rc1 +Bitcoin Core version v27.1.0 .SH OPTIONS .HP \-? diff --git a/doc/release-notes.md b/doc/release-notes.md index 165cdaec92..b19d70da33 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,9 @@ -27.1rc1 Release Notes +27.1 Release Notes ===================== -Bitcoin Core version 27.1rc1 is now available from: +Bitcoin Core version 27.1 is now available from: - <https://bitcoincore.org/bin/bitcoin-core-27.1/test.rc1/> + <https://bitcoincore.org/bin/bitcoin-core-27.1/> This release includes various bug fixes and performance improvements, as well as updated translations. @@ -74,6 +74,8 @@ Notable changes - #29985 depends: Fix build of Qt for 32-bit platforms with recent glibc - #30097 crypto: disable asan for sha256_sse4 with clang and -O0 - #30151 depends: Fetch miniupnpc sources from an alternative website +- #30216 build: Fix building fuzz binary on on SunOS / illumos +- #30217 depends: Update Boost download link ### Doc diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 9f9bdbbd0c..a8a52e3ca5 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -274,7 +274,7 @@ FUZZ_SUITE_LD_COMMON += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_FUZZ_BINARY -test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) test_fuzz_fuzz_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_fuzz_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_fuzz_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) |