cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update bitcoin to 23.0

Browse Source 
Tweak and ok kirby@
This commit is contained in:
rsadowski 2022-11-13 10:35:44 +00:00
parent 452fd208cb
commit 3dc225ba05
6 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/bitcoin/Makefile
View File

@ -4,13 +4,10 @@ COMMENT = P2P payment system
GH_ACCOUNT = bitcoin
GH_PROJECT = bitcoin
GH_TAGNAME = v0.21.2
GH_TAGNAME = v23.0
REVISION = 2
SHARED_LIBS += bitcoinconsensus 4.0 # 0.0
SHARED_LIBS += secp256k1 0.1 # 0.0
SHARED_LIBS += univalue 0.0 # 100.3
SHARED_LIBS += bitcoinconsensus 5.0 # 0.0
SHARED_LIBS += secp256k1 0.2 # 0.0
CATEGORIES = net
@ -21,19 +18,19 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# MIT
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} boost_filesystem boost_system boost_thread-mt
WANTLIB += c db_cxx event_core event_extra event_pthreads m sodium
WANTLIB += sqlite3 z zmq
WANTLIB += ${COMPILER_LIBCXX} c db_cxx event_core event_extra
WANTLIB += event_pthreads m sodium sqlite3 z zmq
BUILD_DEPENDS = devel/boost
LIB_DEPENDS = databases/db/v4 \
databases/sqlite3 \
devel/boost \
devel/libevent2 \
net/zeromq
USE_GMAKE = Yes
# C++11
# C++17
# Undefined reference to boost and db4 with GCC
COMPILER = base-clang ports-clang
@ -42,12 +39,13 @@ AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.14
AUTORECONF = ./autogen.sh
CONFIGURE_ARGS += --with-incompatible-bdb \
--with-sqlite=yes \
--disable-bip70
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/db4"
CXXFLAGS += -std=c++11
CXXFLAGS += -std=c++17
MAKE_FLAGS = CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
@ -55,7 +53,8 @@ FLAVORS = no_x11
FLAVOR ?=
.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS += --without-gui
CONFIGURE_ARGS += --without-gui \
--with-miniupnpc=no
.else
WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets X11
@ -83,8 +82,6 @@ SUBST_VARS += VARBASE
post-install:
cd ${WRKBUILD}/src/secp256k1 && \
${MAKE_PROGRAM} ${MAKE_FLAGS} install
cd ${WRKBUILD}/src/univalue && \
${MAKE_PROGRAM} ${MAKE_FLAGS} install
${INSTALL_DATA_DIR} ${PREFIX}/share/bitcoin
${INSTALL_SCRIPT} ${WRKDIST}/share/rpcauth/rpcauth.py \
${PREFIX}/share/bitcoin/

4
net/bitcoin/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bitcoin-0.21.2.tar.gz) = QUb3UfxWkb3PkRy9uNMtjSXCl9KdWBcyJ64a5kOO254=
SIZE (bitcoin-0.21.2.tar.gz) = 7762621
SHA256 (bitcoin-23.0.tar.gz) = JnSL9J1ta0AU0P7cysRr8rzKQunTSzrP2eNGfEFazAU=
SIZE (bitcoin-23.0.tar.gz) = 10978750

4
net/bitcoin/patches/patch-build-aux_m4_bitcoin_find_bdb48_m4
View File

@ -3,7 +3,7 @@ Build with BerkeleyDB >= 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
@@ -22,7 +22,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
@@ -24,7 +24,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <${searchpath}db_cxx.h>
]],[[
@ -12,7 +12,7 @@ Index: build-aux/m4/bitcoin_find_bdb48.m4
#error "failed to find bdb 4.8+"
#endif
]])],[
@@ -35,7 +35,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
@@ -37,7 +37,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <${searchpath}db_cxx.h>
]],[[

10
net/bitcoin/patches/patch-configure_ac
View File

@ -3,11 +3,11 @@ We already uses PIE as default. Unbreak with lld
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -840,7 +840,6 @@ if test x$use_hardening != xno; 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]])
@@ -945,7 +945,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])
case $host in
*mingw*)

4
net/bitcoin/patches/patch-src_wallet_bdb_cpp
View File

@ -1,7 +1,7 @@
Index: src/wallet/bdb.cpp
--- src/wallet/bdb.cpp.orig
+++ src/wallet/bdb.cpp
@@ -158,7 +158,9 @@ bool BerkeleyEnvironment::Open(bilingual_str& err)
@@ -157,7 +157,9 @@ bool BerkeleyEnvironment::Open(bilingual_str& err)
dbenv->set_errfile(fsbridge::fopen(pathErrorFile, "a")); /// debug
dbenv->set_flags(DB_AUTO_COMMIT, 1);
dbenv->set_flags(DB_TXN_WRITE_NOSYNC, 1);
@ -11,7 +11,7 @@ Index: src/wallet/bdb.cpp
int ret = dbenv->open(strPath.c_str(),
DB_CREATE |
DB_INIT_LOCK |
@@ -201,7 +203,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
@@ -200,7 +202,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
dbenv->set_lk_max_locks(10000);
dbenv->set_lk_max_objects(10000);
dbenv->set_flags(DB_AUTO_COMMIT, 1);

9
net/bitcoin/pkg/PLIST
View File

@ -11,6 +11,7 @@
@bin bin/bench_bitcoin
@bin bin/bitcoin-cli
@bin bin/bitcoin-tx
@bin bin/bitcoin-util
@bin bin/bitcoin-wallet
@bin bin/bitcoind
@comment @bin bin/test_bitcoin
@ -21,23 +22,21 @@ include/secp256k1_extrakeys.h
include/secp256k1_preallocated.h
include/secp256k1_recovery.h
include/secp256k1_schnorrsig.h
include/univalue.h
@static-lib lib/libbitcoinconsensus.a
lib/libbitcoinconsensus.la
@lib lib/libbitcoinconsensus.so.${LIBbitcoinconsensus_VERSION}
@static-lib lib/libsecp256k1.a
lib/libsecp256k1.la
@lib lib/libsecp256k1.so.${LIBsecp256k1_VERSION}
@static-lib lib/libunivalue.a
lib/libunivalue.la
@lib lib/libunivalue.so.${LIBunivalue_VERSION}
lib/pkgconfig/libbitcoinconsensus.pc
lib/pkgconfig/libsecp256k1.pc
lib/pkgconfig/libunivalue.pc
@man man/man1/bitcoin-cli.1
@man man/man1/bitcoin-tx.1
@man man/man1/bitcoin-util.1
@man man/man1/bitcoin-wallet.1
@man man/man1/bitcoind.1
share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/bitcoin/
share/bash-completion/completions/bitcoin/bitcoin-cli.bash-completion
share/bash-completion/completions/bitcoin/bitcoin-tx.bash-completion