From: Rafael Sadowski Subject: UPDATE: bitcoin-29.0 To: ports@openbsd.org Cc: Rafael Sadowski Date: Fri, 2 May 2025 21:26:43 +0200 Huge but nice update diff for bitcoin to 29.0. Tested on amd64. OK? https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-29.0.md Ports related chnages: - "Support for UPnP was dropped." - "libnatpmp was replaced with a built-in implementation of PCP and NAT-PMP" - "The build system has been migrated from Autotools to CMake" - "Bye bye BerkeleyDB" - Switched from GH to https://bitcoincore.org/bin/ Cheers Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/net/bitcoin/Makefile,v diff -u -p -u -p -r1.50 Makefile --- Makefile 9 Feb 2025 16:51:36 -0000 1.50 +++ Makefile 2 May 2025 19:23:43 -0000 @@ -2,11 +2,11 @@ BROKEN-sparc64 = clang problem, probably COMMENT = P2P payment system -GH_ACCOUNT = bitcoin -GH_PROJECT = bitcoin -GH_TAGNAME = v28.1 +V = 29.0 -SHARED_LIBS += secp256k1 0.1 # 0.0 +DISTNAME = bitcoin-${V} + +SITES = https://bitcoincore.org/bin/bitcoin-core-${V}/ CATEGORIES = net @@ -17,82 +17,44 @@ MAINTAINER = Rafael Sadowski = 4.6 - -Index: build-aux/m4/bitcoin_find_bdb48.m4 ---- build-aux/m4/bitcoin_find_bdb48.m4.orig -+++ build-aux/m4/bitcoin_find_bdb48.m4 -@@ -24,7 +24,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <${searchpath}db_cxx.h> - ]],[[ -- #if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4) -+ #if !((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 6) || DB_VERSION_MAJOR > 4) - #error "failed to find bdb 4.8+" - #endif - ]])],[ -@@ -37,7 +37,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <${searchpath}db_cxx.h> - ]],[[ -- #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8) -+ #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6) - #error "failed to find bdb 4.8" - #endif - ]])],[ Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- patches/patch-configure_ac 6 Oct 2024 06:35:10 -0000 1.13 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -We already uses PIE as default. Unbreak with lld - -Index: configure.ac ---- configure.ac.orig -+++ configure.ac -@@ -886,7 +886,6 @@ if test "$use_hardening" != "no"; then - AX_CHECK_LINK_FLAG([-Wl,-z,relro], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"], [], [$LDFLAG_WERROR]) - AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [$LDFLAG_WERROR]) - AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [$LDFLAG_WERROR]) -- AX_CHECK_LINK_FLAG([-fPIE -pie], [PIE_FLAGS="-fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [$CXXFLAG_WERROR]) - fi - - dnl These flags are specific to ld64, and may cause issues with other linkers. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/bitcoin/pkg/PLIST,v diff -u -p -u -p -r1.16 PLIST --- pkg/PLIST 6 Oct 2024 06:35:10 -0000 1.16 +++ pkg/PLIST 2 May 2025 19:23:43 -0000 @@ -8,7 +8,6 @@ @mode @owner @group -@bin bin/bench_bitcoin @bin bin/bitcoin-cli @bin bin/bitcoin-tx @bin bin/bitcoin-util @@ -16,16 +15,6 @@ @bin bin/bitcoind @comment @bin bin/test_bitcoin @comment @bin bin/test_bitcoin-qt -include/secp256k1.h -include/secp256k1_ellswift.h -include/secp256k1_extrakeys.h -include/secp256k1_preallocated.h -include/secp256k1_recovery.h -include/secp256k1_schnorrsig.h -@static-lib lib/libsecp256k1.a -lib/libsecp256k1.la -@lib lib/libsecp256k1.so.${LIBsecp256k1_VERSION} -lib/pkgconfig/libsecp256k1.pc @man man/man1/bitcoin-cli.1 @man man/man1/bitcoin-tx.1 @man man/man1/bitcoin-util.1