Skip to content

Commit ce26608

Browse files
ajtownsajtowns
authored
Merge pull request #91 from ajtowns/202509-inq29-29.1a
Include patches from 29.1 (a)
2 parents bb5287a + c5196bc commit ce26608

53 files changed

Lines changed: 1058 additions & 234 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ get_directory_property(precious_variables CACHE_VARIABLES)
2828
#=============================
2929
set(CLIENT_NAME "Bitcoin Inquisition")
3030
set(CLIENT_VERSION_MAJOR 29)
31-
set(CLIENT_VERSION_MINOR 0)
31+
set(CLIENT_VERSION_MINOR 1)
3232
set(CLIENT_VERSION_BUILD 0)
33-
set(CLIENT_VERSION_RC 0)
33+
set(CLIENT_VERSION_RC 1)
3434
set(CLIENT_VERSION_IS_RELEASE "true")
3535
set(COPYRIGHT_YEAR "2025")
3636

‎CMakePresets.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"version": 3,
3-
"cmakeMinimumRequired": {"major": 3, "minor": 21, "patch": 0},
43
"configurePresets": [
54
{
65
"name": "vs2022",

‎contrib/guix/guix-build‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,7 @@ mkdir -p "$VERSION_BASE"
7373
# SOURCE_DATE_EPOCH should not unintentionally be set
7474
################
7575

76-
if [ -n "$SOURCE_DATE_EPOCH" ] && [ -z "$FORCE_SOURCE_DATE_EPOCH" ]; then
77-
cat << EOF
78-
ERR: Environment variable SOURCE_DATE_EPOCH is set which may break reproducibility.
79-
80-
Aborting...
81-
82-
Hint: You may want to:
83-
1. Unset this variable: \`unset SOURCE_DATE_EPOCH\` before rebuilding
84-
2. Set the 'FORCE_SOURCE_DATE_EPOCH' environment variable if you insist on
85-
using your own epoch
86-
EOF
87-
exit 1
88-
fi
76+
check_source_date_epoch
8977

9078
################
9179
# Build directories should not exist

‎contrib/guix/guix-codesign‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ EOF
6767
exit 1
6868
fi
6969

70+
################
71+
# SOURCE_DATE_EPOCH should not unintentionally be set
72+
################
73+
74+
check_source_date_epoch
75+
7076
################
7177
# The codesignature git worktree should not be dirty
7278
################

‎contrib/guix/libexec/prelude.bash‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@ check_tools() {
2121
done
2222
}
2323

24+
################
25+
# SOURCE_DATE_EPOCH should not unintentionally be set
26+
################
27+
28+
check_source_date_epoch() {
29+
if [ -n "$SOURCE_DATE_EPOCH" ] && [ -z "$FORCE_SOURCE_DATE_EPOCH" ]; then
30+
cat << EOF
31+
ERR: Environment variable SOURCE_DATE_EPOCH is set which may break reproducibility.
32+
33+
Aborting...
34+
35+
Hint: You may want to:
36+
1. Unset this variable: \`unset SOURCE_DATE_EPOCH\` before rebuilding
37+
2. Set the 'FORCE_SOURCE_DATE_EPOCH' environment variable if you insist on
38+
using your own epoch
39+
EOF
40+
exit 1
41+
fi
42+
}
43+
2444
check_tools cat env readlink dirname basename git
2545

2646
################

‎contrib/tracing/mempool_monitor.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
int trace_added(struct pt_regs *ctx) {
6767
struct added_event added = {};
6868
void *phash = NULL;
69-
bpf_usdt_readarg(1, ctx, phash);
69+
bpf_usdt_readarg(1, ctx, &phash);
7070
bpf_probe_read_user(&added.hash, sizeof(added.hash), phash);
7171
bpf_usdt_readarg(2, ctx, &added.vsize);
7272
bpf_usdt_readarg(3, ctx, &added.fee);
@@ -78,9 +78,9 @@
7878
int trace_removed(struct pt_regs *ctx) {
7979
struct removed_event removed = {};
8080
void *phash = NULL, *preason = NULL;
81-
bpf_usdt_readarg(1, ctx, phash);
81+
bpf_usdt_readarg(1, ctx, &phash);
8282
bpf_probe_read_user(&removed.hash, sizeof(removed.hash), phash);
83-
bpf_usdt_readarg(2, ctx, preason);
83+
bpf_usdt_readarg(2, ctx, &preason);
8484
bpf_probe_read_user_str(&removed.reason, sizeof(removed.reason), preason);
8585
bpf_usdt_readarg(3, ctx, &removed.vsize);
8686
bpf_usdt_readarg(4, ctx, &removed.fee);
@@ -93,9 +93,9 @@
9393
int trace_rejected(struct pt_regs *ctx) {
9494
struct rejected_event rejected = {};
9595
void *phash = NULL, *preason = NULL;
96-
bpf_usdt_readarg(1, ctx, phash);
96+
bpf_usdt_readarg(1, ctx, &phash);
9797
bpf_probe_read_user(&rejected.hash, sizeof(rejected.hash), phash);
98-
bpf_usdt_readarg(2, ctx, preason);
98+
bpf_usdt_readarg(2, ctx, &preason);
9999
bpf_probe_read_user_str(&rejected.reason, sizeof(rejected.reason), preason);
100100
rejected_events.perf_submit(ctx, &rejected, sizeof(rejected));
101101
return 0;
@@ -104,12 +104,12 @@
104104
int trace_replaced(struct pt_regs *ctx) {
105105
struct replaced_event replaced = {};
106106
void *phash_replaced = NULL, *phash_replacement = NULL;
107-
bpf_usdt_readarg(1, ctx, phash_replaced);
107+
bpf_usdt_readarg(1, ctx, &phash_replaced);
108108
bpf_probe_read_user(&replaced.replaced_hash, sizeof(replaced.replaced_hash), phash_replaced);
109109
bpf_usdt_readarg(2, ctx, &replaced.replaced_vsize);
110110
bpf_usdt_readarg(3, ctx, &replaced.replaced_fee);
111111
bpf_usdt_readarg(4, ctx, &replaced.replaced_entry_time);
112-
bpf_usdt_readarg(5, ctx, phash_replacement);
112+
bpf_usdt_readarg(5, ctx, &phash_replacement);
113113
bpf_probe_read_user(&replaced.replacement_hash, sizeof(replaced.replacement_hash), phash_replacement);
114114
bpf_usdt_readarg(6, ctx, &replaced.replacement_vsize);
115115
bpf_usdt_readarg(7, ctx, &replaced.replacement_fee);

‎depends/builders/freebsd.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ build_freebsd_CXX=clang++
33

44
build_freebsd_SHA256SUM = sha256sum
55
build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
6+
7+
# freebsd host on freebsd builder: override freebsd host preferences.
8+
freebsd_CC = clang
9+
freebsd_CXX = clang++

‎depends/builders/openbsd.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CON
77
build_openbsd_TAR = gtar
88
# openBSD touch doesn't understand -h
99
build_openbsd_TOUCH = touch -m -t 200001011200
10+
11+
# openbsd host on openbsd builder: override openbsd host preferences.
12+
openbsd_CC = clang
13+
openbsd_CXX = clang++

‎depends/funcs.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
187187
-DCMAKE_INSTALL_LIBDIR=lib/ \
188188
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
189189
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(V) \
190+
-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE \
190191
$$($(1)_config_opts)
191192
ifeq ($($(1)_type),build)
192193
$(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib"

‎depends/packages/libevent.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
66
$(package)_patches=cmake_fixups.patch
77
$(package)_patches += netbsd_fixup.patch
8+
$(package)_patches += winver_fixup.patch
89
$(package)_build_subdir=build
910

1011
# When building for Windows, we set _WIN32_WINNT to target the same Windows
@@ -25,7 +26,8 @@ endef
2526

2627
define $(package)_preprocess_cmds
2728
patch -p1 < $($(package)_patch_dir)/cmake_fixups.patch && \
28-
patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch
29+
patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch && \
30+
patch -p1 < $($(package)_patch_dir)/winver_fixup.patch
2931
endef
3032

3133
define $(package)_config_cmds

0 commit comments

Comments
 (0)