Update bitcoin to the latest stable version.
Tests and feedback welcome!
diff --git a/net/bitcoin/Makefile b/net/bitcoin/Makefile
index 005370af81b..acbb303bc76 100644
--- a/net/bitcoin/Makefile
+++ b/net/bitcoin/Makefile
@@ -1,4 +1,4 @@
- $OpenBSD: Makefile,v 1.25 2020/08/14 11:12:12 rsadowski Exp $
+$OpenBSD: Makefile,v 1.25 2020/08/14 11:12:12 rsadowski Exp $
BROKEN-sparc64 = clang problem, probably needs newer binutils
@@ -6,10 +6,10 @@ COMMENT = P2P payment system
GH_ACCOUNT = bitcoin
GH_PROJECT = bitcoin
-GH_TAGNAME = v0.20.1
+GH_TAGNAME = v0.21.0
-SHARED_LIBS += bitcoinconsensus 3.0 # 0.0
-SHARED_LIBS += secp256k1 0.0 # 0.0
+SHARED_LIBS += bitcoinconsensus 4.0 # 0.0
+SHARED_LIBS += secp256k1 0.1 # 0.0
SHARED_LIBS += univalue 0.0 # 100.3
CATEGORIES = net
@@ -22,8 +22,8 @@ MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} boost_filesystem
-WANTLIB += boost_system boost_system-mt boost_thread-mt c crypto
-WANTLIB += db_cxx event_core event_extra event_pthreads icuio
+WANTLIB += boost_system boost_thread-mt c crypto
+WANTLIB += db_cxx event_core event_extra event_pthreads
WANTLIB += m sodium ssl zmq zstd
LIB_DEPENDS = archivers/zstd \
@@ -65,7 +65,7 @@ WANTLIB += expat freetype glapi glib-2.0 graphite2 gthread-2.0
WANTLIB += harfbuzz iconv icudata icui18n icuuc intl miniupnpc
WANTLIB += pcre pcre2-16 png qrencode xcb xcb-dri2 double-conversion
WANTLIB += xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes xshmfence
-WANTLIB += z
+WANTLIB += Xau Xdmcp sqlite3 z
MODULES += x11/qt5
diff --git a/net/bitcoin/distinfo b/net/bitcoin/distinfo
index 0bb02d6c39b..3ec24a6956f 100644
--- a/net/bitcoin/distinfo
+++ b/net/bitcoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.20.1.tar.gz) = S71i/WrPpemGTr83okoEvC3P4+MiLwVgViiNhUxTuXg=
-SIZE (bitcoin-0.20.1.tar.gz) = 6981793
+SHA256 (bitcoin-0.21.0.tar.gz) = GpEgLGLuSftk1XpSuNbQHNOS//y+8le1c4APkollXzc=
+SIZE (bitcoin-0.21.0.tar.gz) = 7531395
diff --git a/net/bitcoin/patches/patch-configure_ac
b/net/bitcoin/patches/patch-configure_ac
index fece1600cf3..e38981805e3 100644
--- a/net/bitcoin/patches/patch-configure_ac
+++ b/net/bitcoin/patches/patch-configure_ac
@@ -5,10 +5,10 @@ We already uses PIE as default. Unbreak with lld
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -748,7 +748,6 @@ if test x$use_hardening != xno; then
- AX_CHECK_LINK_FLAG([[-Wl,--high-entropy-va]],
[HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--high-entropy-va"])
- AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS
-Wl,-z,relro"])
- AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS
-Wl,-z,now"])
+@@ -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]])
case $host in
diff --git a/net/bitcoin/patches/patch-src_wallet_db_cpp
b/net/bitcoin/patches/patch-src_wallet_bdb_cpp
similarity index 58%
rename from net/bitcoin/patches/patch-src_wallet_db_cpp
rename to net/bitcoin/patches/patch-src_wallet_bdb_cpp
index 6ccf0e48487..95b8b48cd8c 100644
--- a/net/bitcoin/patches/patch-src_wallet_db_cpp
+++ b/net/bitcoin/patches/patch-src_wallet_bdb_cpp
@@ -1,14 +1,9 @@
-$OpenBSD: patch-src_wallet_db_cpp,v 1.6 2020/06/08 20:32:55 rsadowski Exp $
-Index: src/wallet/db.cpp
---- src/wallet/db.cpp.orig
-+++ src/wallet/db.cpp
-@@ -1,4 +1,4 @@
--// Copyright (c) 2009-2010 Satoshi Nakamoto
-+
- // Copyright (c) 2009-2020 The Bitcoin Core developers
- // Distributed under the MIT software license, see the accompanying
- // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-@@ -195,7 +195,9 @@ bool BerkeleyEnvironment::Open(bool retry)
+$OpenBSD$
+
+Index: src/wallet/bdb.cpp
+--- src/wallet/bdb.cpp.orig
++++ src/wallet/bdb.cpp
+@@ -158,7 +158,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);
@@ -18,7 +13,7 @@ Index: src/wallet/db.cpp
int ret = dbenv->open(strPath.c_str(),
DB_CREATE |
DB_INIT_LOCK |
-@@ -250,7 +252,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
+@@ -201,7 +203,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
dbenv->set_lk_max_locks(10000);
dbenv->set_lk_max_objects(10000);
dbenv->set_flags(DB_AUTO_COMMIT, 1);
diff --git a/net/bitcoin/pkg/PLIST b/net/bitcoin/pkg/PLIST
index 1c448363a5c..5f49257cca0 100644
--- a/net/bitcoin/pkg/PLIST
+++ b/net/bitcoin/pkg/PLIST
@@ -18,7 +18,10 @@
@comment @bin bin/test_bitcoin-qt
include/bitcoinconsensus.h
include/secp256k1.h
+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
