Update bitcoin to 0.18.0. Upstream changlog:
https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.18.0.md Notable port changes: - Disable BIP70, form changlog: "A new --disable-bip70 option may be passed to ./configure to prevent Bitcoin-Qt from being built with support for the BIP70 payment protocol or from linking libssl. As the payment protocol has exposed Bitcoin Core to libssl vulnerabilities in the past, builders who don't need BIP70 support are encouraged to use this option to reduce their exposure to future vulnerabilities." - Major lib bump: libbitcoinconsensus (Check with check_sym) - WANTLIB png clean up - devel/protobuf is not more need with disabled BIP70 OK? Index: Makefile =================================================================== RCS file: /cvs/ports/net/bitcoin/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile 11 Mar 2019 04:11:57 -0000 1.14 +++ Makefile 6 May 2019 17:45:42 -0000 @@ -4,10 +4,9 @@ COMMENT = P2P payment system GH_ACCOUNT = bitcoin GH_PROJECT = bitcoin -GH_TAGNAME = v0.17.1 -REVISION = 1 +GH_TAGNAME = v0.18.0 -SHARED_LIBS += bitcoinconsensus 1.0 # 0.0 +SHARED_LIBS += bitcoinconsensus 2.0 # 0.0 SHARED_LIBS += secp256k1 0.0 # 0.0 SHARED_LIBS += univalue 0.0 # 100.3 @@ -23,7 +22,7 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += ${COMPILER_LIBCXX} boost_chrono-mt boost_filesystem WANTLIB += boost_system boost_system-mt boost_thread-mt c crypto WANTLIB += db_cxx event_core event_extra event_pthreads m sodium -WANTLIB += ssl zmq +WANTLIB += zmq BUILD_DEPENDS = ${MODGNU_AUTOMAKE_DEPENDS} \ ${MODGNU_AUTOCONF_DEPENDS} \ @@ -43,7 +42,8 @@ COMPILER = base-clang ports-clang CONFIGURE_STYLE = gnu AUTOCONF_VERSION = 2.69 AUTOMAKE_VERSION = 1.14 -CONFIGURE_ARGS += --with-incompatible-bdb +CONFIGURE_ARGS += --with-incompatible-bdb \ + --disable-bip70 CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib/db4" @@ -67,14 +67,13 @@ 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 png16 protobuf qrencode xcb xcb-dri2 +WANTLIB += pcre pcre2-16 png qrencode xcb xcb-dri2 WANTLIB += xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes xshmfence WANTLIB += z MODULES += x11/qt5 -LIB_DEPENDS += devel/protobuf \ - graphics/libqrencode \ +LIB_DEPENDS += graphics/libqrencode \ net/miniupnp/miniupnpc CONFIGURE_ARGS += --with-gui=qt5 Index: distinfo =================================================================== RCS file: /cvs/ports/net/bitcoin/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo 27 Dec 2018 10:32:06 -0000 1.6 +++ distinfo 6 May 2019 17:45:42 -0000 @@ -1,2 +1,2 @@ -SHA256 (bitcoin-0.17.1.tar.gz) = 1RuugPwKRgznUtBAl8ShJxpmtVJg1TFl2CMTSIEX0pA= -SIZE (bitcoin-0.17.1.tar.gz) = 6219440 +SHA256 (bitcoin-0.18.0.tar.gz) = 75hq4XMKqXVoK2zIMmh16OfJ1jm6IXE1HFDQU6VfzTg= +SIZE (bitcoin-0.18.0.tar.gz) = 6528139 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/net/bitcoin/patches/patch-configure_ac,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-configure_ac --- patches/patch-configure_ac 23 Oct 2018 15:26:42 -0000 1.1 +++ patches/patch-configure_ac 6 May 2019 17:45:42 -0000 @@ -5,7 +5,7 @@ We already uses PIE as default. Unbreak Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -710,7 +710,6 @@ if test x$use_hardening != xno; then +@@ -742,7 +742,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.3 diff -u -p -u -p -r1.3 patch-src_wallet_db_cpp --- patches/patch-src_wallet_db_cpp 27 Dec 2018 10:32:06 -0000 1.3 +++ patches/patch-src_wallet_db_cpp 6 May 2019 17:45:42 -0000 @@ -8,7 +8,7 @@ Index: src/wallet/db.cpp // Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -@@ -156,7 +156,9 @@ bool BerkeleyEnvironment::Open(bool retry) +@@ -191,7 +191,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 | -@@ -213,7 +215,9 @@ void BerkeleyEnvironment::MakeMock() +@@ -248,7 +250,9 @@ BerkeleyEnvironment::BerkeleyEnvironment() dbenv->set_lk_max_locks(10000); dbenv->set_lk_max_objects(10000); dbenv->set_flags(DB_AUTO_COMMIT, 1); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/bitcoin/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 10 Sep 2018 11:11:29 -0000 1.3 +++ pkg/PLIST 6 May 2019 17:45:42 -0000 @@ -12,6 +12,7 @@ @bin bin/bench_bitcoin @bin bin/bitcoin-cli @bin bin/bitcoin-tx +@bin bin/bitcoin-wallet @bin bin/bitcoind @comment @bin bin/test_bitcoin @comment @bin bin/test_bitcoin-qt
