From 1dfbad54dfd2b4adda93c4c580820f7bb0bdee05 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sun, 6 Oct 2024 23:08:45 +0000 Subject: [PATCH] bump(main/bitcoin): 28.0 Switch from using downloaded libevent and boost to using system ones. --- packages/bitcoin/build.sh | 10 +++++----- packages/bitcoin/configure.ac.patch | 14 -------------- packages/bitcoin/src-test-fuzz-util.cpp.patch | 12 ------------ 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 packages/bitcoin/configure.ac.patch delete mode 100644 packages/bitcoin/src-test-fuzz-util.cpp.patch diff --git a/packages/bitcoin/build.sh b/packages/bitcoin/build.sh index 7c55033480..568e747ab1 100644 --- a/packages/bitcoin/build.sh +++ b/packages/bitcoin/build.sh @@ -2,16 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://bitcoincore.org/ TERMUX_PKG_DESCRIPTION="Bitcoin Core" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="27.1" +TERMUX_PKG_VERSION="28.0" TERMUX_PKG_SRCURL=https://github.com/bitcoin/bitcoin/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=ee486a3e9d6e925c39b46274d130efdf8ececebc16faa0b7262620a457af6450 +TERMUX_PKG_SHA256=4c2fa1758be368ccfd366b785776aeb3647fc03b97a5cf2721ed5d69cb125519 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_DEPENDS="libc++, libevent" +TERMUX_PKG_BUILD_DEPENDS="boost-headers" TERMUX_PKG_SERVICE_SCRIPT=("bitcoind" 'exec bitcoind 2>&1') TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-tests +--disable-fuzz-binary --with-daemon --with-gui=no --without-libs @@ -21,7 +23,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " termux_step_pre_configure() { - export ANDROID_TOOLCHAIN_BIN="$TERMUX_STANDALONE_TOOLCHAIN/bin" - (cd depends && make HOST=$TERMUX_HOST_PLATFORM NO_QT=1 -j $TERMUX_PKG_MAKE_PROCESSES) ./autogen.sh } diff --git a/packages/bitcoin/configure.ac.patch b/packages/bitcoin/configure.ac.patch deleted file mode 100644 index bdec878e04..0000000000 --- a/packages/bitcoin/configure.ac.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -828,7 +828,10 @@ - *aarch64*) - ANDROID_ARCH=arm64-v8a - ;; -- *armv7a*) -+ *i686*) -+ ANDROID_ARCH=x86 -+ ;; -+ *arm*) - ANDROID_ARCH=armeabi-v7a - ;; - *) AC_MSG_ERROR([Could not determine Android arch, or it is unsupported]) ;; diff --git a/packages/bitcoin/src-test-fuzz-util.cpp.patch b/packages/bitcoin/src-test-fuzz-util.cpp.patch deleted file mode 100644 index 6ecd8e5c2a..0000000000 --- a/packages/bitcoin/src-test-fuzz-util.cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr bitcoin-26.1/src/test/fuzz/util.cpp bitcoin-26.1.mod/src/test/fuzz/util.cpp ---- bitcoin-26.1/src/test/fuzz/util.cpp 2024-03-26 00:51:08.000000000 +0800 -+++ bitcoin-26.1.mod/src/test/fuzz/util.cpp 2024-04-04 11:26:34.031996907 +0800 -@@ -255,7 +255,7 @@ - [&] { - mode = "a+"; - }); --#if defined _GNU_SOURCE && (defined(__linux__) || defined(__FreeBSD__)) -+#if defined _GNU_SOURCE && (defined(__linux__) || defined(__FreeBSD__)) && !defined (__ANDROID__) - const cookie_io_functions_t io_hooks = { - FuzzedFileProvider::read, - FuzzedFileProvider::write,