Update bitcoin to 0.20.0. Release notes:
https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.20.0.md
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/bitcoin/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 20 Mar 2020 18:42:33 -0000 1.23
+++ Makefile 4 Jun 2020 05:44:24 -0000
@@ -6,10 +6,9 @@ COMMENT = P2P payment system
GH_ACCOUNT = bitcoin
GH_PROJECT = bitcoin
-GH_TAGNAME = v0.19.1
-REVISION = 0
+GH_TAGNAME = v0.20.0
-SHARED_LIBS += bitcoinconsensus 2.0 # 0.0
+SHARED_LIBS += bitcoinconsensus 3.0 # 0.0
SHARED_LIBS += secp256k1 0.0 # 0.0
SHARED_LIBS += univalue 0.0 # 100.3
@@ -22,16 +21,16 @@ MAINTAINER = Rafael Sadowski <rsadowski
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} boost_chrono-mt boost_filesystem
+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 += m sodium ssl zmq zstd
LIB_DEPENDS = archivers/zstd \
+ databases/db/v4 \
devel/boost \
- net/zeromq \
devel/libevent2 \
- databases/db/v4
+ net/zeromq
USE_GMAKE = Yes
@@ -64,13 +63,14 @@ WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5
WANTLIB += X11-xcb Xdamage Xext Xfixes Xxf86vm dbus-1 drm execinfo
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
+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
MODULES += x11/qt5
LIB_DEPENDS += graphics/libqrencode \
+ math/double-conversion \
net/miniupnp/miniupnpc
CONFIGURE_ARGS += --with-gui=qt5
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/bitcoin/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 20 Mar 2020 06:24:00 -0000 1.10
+++ distinfo 4 Jun 2020 05:44:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.19.1.tar.gz) = O51YK6NrUJVfbfrRLN8TlGLRmtMGBLSXZtwsohoaMiw=
-SIZE (bitcoin-0.19.1.tar.gz) = 6655953
+SHA256 (bitcoin-0.20.0.tar.gz) = 7FojWO6GjYRRFdxPw+1jH/BjxX1eCnE1YtCDxcRe+yg=
+SIZE (bitcoin-0.20.0.tar.gz) = 6980404
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/net/bitcoin/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-configure_ac
--- patches/patch-configure_ac 13 Jan 2020 19:59:26 -0000 1.4
+++ patches/patch-configure_ac 4 Jun 2020 05:44:24 -0000
@@ -5,7 +5,7 @@ We already uses PIE as default. Unbreak
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -761,7 +761,6 @@ if test x$use_hardening != xno; then
+@@ -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"])
Index: patches/patch-src_wallet_db_cpp
===================================================================
RCS file: /cvs/ports/net/bitcoin/patches/patch-src_wallet_db_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_wallet_db_cpp
--- patches/patch-src_wallet_db_cpp 13 Jan 2020 19:59:26 -0000 1.5
+++ patches/patch-src_wallet_db_cpp 4 Jun 2020 05:44:24 -0000
@@ -5,10 +5,10 @@ Index: src/wallet/db.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2010 Satoshi Nakamoto
+
- // Copyright (c) 2009-2019 The Bitcoin Core developers
+ // 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.
-@@ -196,7 +196,9 @@ bool BerkeleyEnvironment::Open(bool retry)
+@@ -195,7 +195,9 @@ bool BerkeleyEnvironment::Open(bool retry)
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 +18,7 @@ Index: src/wallet/db.cpp
int ret = dbenv->open(strPath.c_str(),
DB_CREATE |
DB_INIT_LOCK |
-@@ -253,7 +255,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
+@@ -250,7 +252,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
dbenv->set_lk_max_locks(10000);
dbenv->set_lk_max_objects(10000);
dbenv->set_flags(DB_AUTO_COMMIT, 1);
