[24.x] Additional backports for 24.1

fanquake commented at 2:18 pm on April 17, 2023: member

Backports:

#27279 (only f73782a9032a462a71569e9424db9bf9eeababf3)
#27462
#27468
#27473

Don't return OutputType::UNKNOWN in ParseOutputType

Fixes https://github.com/bitcoin/bitcoin/issues/27472

Signed-off-by: Pttn <28868425+Pttn@users.noreply.github.com>

Github-Pull: #27473
Rebased-From: 0d6383fda04a99726654945a737bbb1369e0e44a

0bac52d5cf

fanquake added this to the milestone 24.1 on Apr 17, 2023

DrahtBot commented at 2:18 pm on April 17, 2023: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	stickies-v, hebasto, jonatack

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

DrahtBot added the label Backport on Apr 17, 2023

jonatack commented at 2:22 pm on April 17, 2023: contributor

Suggest adding https://github.com/bitcoin/bitcoin/commit/f73782a9032a462a71569e9424db9bf9eeababf3.

depends: fix compiling bdb with clang-16 on aarch64

Compiling bdb with clang-16 on aarch64 (hardware) currently fails:
```bash
make -C depends/ bdb CC=clang CXX=clang++
...
checking for mutexes... UNIX/fcntl
configure: WARNING: NO SHARED LATCH IMPLEMENTATION FOUND FOR THIS PLATFORM.
configure: error: Unable to find a mutex implementation
```

Looking at config.log we've got:
```bash
configure:18704: checking for mutexes
configure:18815: clang -o conftest -pipe -std=c11 -O2 -Wno-error=implicit-function-declaration -Wno-error=format-security    -I/bitcoin/depends/aarch64-unknown-linux-gnu/include -D_GNU_SOURCE -D_REENTRANT   -L/bitcoin/depends/aarch64-unknown-linux-gnu/lib conftest.c  -lpthread >&5
conftest.c:45:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
main() {
^
int
conftest.c:50:2: warning: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
        exit (
        ^
conftest.c:50:2: note: include the header <stdlib.h> or explicitly provide a declaration for 'exit'
1 warning and 1 error generated.
```

Clang-16 changed `-Wimplicit-function-declaration` and `-Wimplicit-int`
warnings into errors, see:
https://releases.llvm.org/16.0.0/tools/clang/docs/ReleaseNotes.html#potentially-breaking-changes.

> The -Wimplicit-function-declaration and -Wimplicit-int warnings now
> default to an error in C99, C11, and C17. As of C2x, support for implicit
> function declarations and implicit int has been removed, and the
> warning options will have no effect. Specifying -Wimplicit-int in
> C89 mode will now issue warnings instead of being a noop.

Github-Pull: #27462
Rebased-From: f8b8458276983f8fc1e2a47c4d00c1e30633067d

c40b1da2fd

fanquake force-pushed on Apr 18, 2023

hebasto approved

hebasto commented at 9:34 am on April 18, 2023: member

ACK 5c937ae7c323198c76f1743870c68f8576305a6e

stickies-v commented at 10:40 am on April 18, 2023: contributor

Suggest adding https://github.com/stickies-v/bitcoin/commit/db6cf79694112a4679378fdd1f2bdf69cf6adbea which backports #27468, but without the changes to rest_mempool (query parameters in this endpoint were added only after v24 in #26207).

Edit: this backport is relevant only for 24.x, not for 23.x.

bugfix: rest: avoid segfault for invalid URI

`evhttp_uri_parse` can return a nullptr, for example when the URI
contains invalid characters (e.g. "%").
`GetQueryParameterFromUri` passes the output of `evhttp_uri_parse`
straight into `evhttp_uri_get_query`, which means that anyone calling
a REST endpoint in which query parameters are used (e.g. `rest_headers`)
can cause a segfault.

This bugfix is designed to be minimal and without additional behaviour change.

Github-Pull: #27468
Rebased-From: 11422cc5720c8d73a87600de8fe8abb156db80dc

3a26b19df2

doc: fix/improve warning helps in {create,load,unload,restore}wallet

- clarify that there can be multiple warning messages
- specify the correct wallet action
- describe the use of newlines as delimiters

Github-Pull: #27279
Rebased-From: f73782a9032a462a71569e9424db9bf9eeababf3

fc8c1a8deb

doc: update 24.1 release notes dc711fbd32

fanquake commented at 11:30 am on April 18, 2023: member

Suggest adding https://github.com/stickies-v/bitcoin/commit/db6cf79694112a4679378fdd1f2bdf69cf6adbea which backports #27468,

Pulled & added metadata.

Suggest adding https://github.com/bitcoin/bitcoin/commit/f73782a9032a462a71569e9424db9bf9eeababf3.

Ok.

fanquake force-pushed on Apr 18, 2023

stickies-v approved

stickies-v commented at 1:43 pm on April 18, 2023: contributor

ACK dc711fbd32653b09e196f72942106114a32353f4

Verified that the backports correspond to their original PR, and I can’t see any silent merge conflicts. Release notes match the backported changes.

DrahtBot requested review from hebasto on Apr 18, 2023

hebasto approved

hebasto commented at 1:53 pm on April 18, 2023: member

re-ACK dc711fbd32653b09e196f72942106114a32353f4

jonatack commented at 2:00 pm on April 18, 2023: contributor

ACK dc711fbd32653b09e196f72942106114a32353f4

Pull description is missing some of the changes.

fanquake commented at 2:32 pm on April 18, 2023: member

This has been merged.

fanquake closed this on Apr 18, 2023

fanquake deleted the branch on Apr 18, 2023

fanquake referenced this in commit 15a24781d0 on Apr 18, 2023

fanquake referenced this in commit 36c15d7d5c on Apr 19, 2023

bitcoin locked this on Apr 17, 2024

[24.x] Additional backports for 24.1 #27474

Reviews