Hi All. I would like to see the latest stable bitcoin version in OpenBSD 6.4. If there is no concern I would like to commit the diff below.
For the release notes please see the git repository: https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.17.0.md Port changes: - Better DB <= 4.8 patch. Hint from upstream - Major bumb bitcoinconsensus (Simboles added and removed) - Install all pixmaps sizes. - bitcoin-qt.desktop is gone I'm not expecting an okay, is there an objection? Tested 3 days running on amd64. Best regards, Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/net/bitcoin/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile 20 Sep 2018 16:21:20 -0000 1.6 +++ Makefile 7 Oct 2018 18:54:53 -0000 @@ -4,9 +4,9 @@ COMMENT = P2P payment system GH_ACCOUNT = bitcoin GH_PROJECT = bitcoin -GH_TAGNAME = v0.16.3 +GH_TAGNAME = v0.17.0 -SHARED_LIBS += bitcoinconsensus 0.0 # 0.0 +SHARED_LIBS += bitcoinconsensus 1.0 # 0.0 SHARED_LIBS += secp256k1 0.0 # 0.0 SHARED_LIBS += univalue 0.0 # 100.3 @@ -69,8 +69,6 @@ WANTLIB += harfbuzz iconv icudata icui18 WANTLIB += pcre pcre2-16 png protobuf qrencode xcb xcb-dri2 xcb-glx WANTLIB += z -RUN_DEPENDS += devel/desktop-file-utils - MODULES += x11/qt5 LIB_DEPENDS += devel/protobuf \ @@ -84,8 +82,6 @@ CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/l SUBST_VARS += VARBASE -BTCCONTRIBDIR = ${WRKDIST}/contrib/debian - post-patch: cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh @@ -99,7 +95,7 @@ post-install: ${INSTALL_PROGRAM} ${WRKDIST}/share/rpcauth/rpcauth.py \ ${PREFIX}/share/bitcoin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bitcoin - ${INSTALL_DATA} ${BTCCONTRIBDIR}/examples/bitcoin.conf \ + ${INSTALL_DATA} ${WRKDIST}/share/examples/bitcoin.conf \ ${PREFIX}/share/examples/bitcoin ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/bitcoin ${INSTALL_DATA} ${WRKDIST}/contrib/*.bash-completion \ @@ -117,15 +113,13 @@ post-install: ${PREFIX}/share/doc/bitcoin .if ! ${FLAVOR:Mno_x11} - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications - ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} -c \ - ${BTCCONTRIBDIR}/bitcoin-qt.desktop \ - ${PREFIX}/share/applications/bitcoin-qt.desktop ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIST}/share/pixmaps/bitcoin128.png \ - ${PREFIX}/share/pixmaps/bitcoin128.png - ${INSTALL_DATA} ${WRKDIST}/share/pixmaps/bitcoin128.xpm \ - ${PREFIX}/share/pixmaps/bitcoin128.xpm +.for s in 16 32 64 128 256 + ${INSTALL_DATA} ${WRKDIST}/share/pixmaps/bitcoin${s}.png \ + ${PREFIX}/share/pixmaps/bitcoin${s}.png + ${INSTALL_DATA} ${WRKDIST}/share/pixmaps/bitcoin${s}.xpm \ + ${PREFIX}/share/pixmaps/bitcoin${s}.xpm +.endfor .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/bitcoin/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 20 Sep 2018 16:21:20 -0000 1.3 +++ distinfo 7 Oct 2018 18:54:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (bitcoin-0.16.3.tar.gz) = yFV7bfX1zfZ7Pd9v5QHPxuC+aY8XXxaSfdCNYEDffZ8= -SIZE (bitcoin-0.16.3.tar.gz) = 6655896 +SHA256 (bitcoin-0.17.0.tar.gz) = TCIyDxeHUI1NIjVrJuKFnGAkJZf1SqE4HDPyKlDhcVU= +SIZE (bitcoin-0.17.0.tar.gz) = 6237089 Index: patches/patch-src_wallet_db_cpp =================================================================== RCS file: /cvs/ports/net/bitcoin/patches/patch-src_wallet_db_cpp,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_wallet_db_cpp --- patches/patch-src_wallet_db_cpp 9 Jul 2018 12:22:16 -0000 1.1.1.1 +++ patches/patch-src_wallet_db_cpp 7 Oct 2018 18:54:53 -0000 @@ -12,7 +12,7 @@ Index: src/wallet/db.cpp dbenv->set_errfile(fsbridge::fopen(pathErrorFile, "a")); /// debug dbenv->set_flags(DB_AUTO_COMMIT, 1); dbenv->set_flags(DB_TXN_WRITE_NOSYNC, 1); -+#if DB_VERSION_MINOR > 7 ++#if ((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 7)) dbenv->log_set_config(DB_LOG_AUTO_REMOVE, 1); +#endif int ret = dbenv->open(strPath.c_str(), @@ -22,7 +22,7 @@ Index: src/wallet/db.cpp dbenv->set_lk_max_locks(10000); dbenv->set_lk_max_objects(10000); dbenv->set_flags(DB_AUTO_COMMIT, 1); -+#if DB_VERSION_MINOR > 7 ++#if ((DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 7)) dbenv->log_set_config(DB_LOG_IN_MEMORY, 1); +#endif int ret = dbenv->open(nullptr, Index: pkg/PFRAG.no-no_x11 =================================================================== RCS file: /cvs/ports/net/bitcoin/pkg/PFRAG.no-no_x11,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 9 Jul 2018 12:22:16 -0000 1.1.1.1 +++ pkg/PFRAG.no-no_x11 7 Oct 2018 18:54:53 -0000 @@ -1,8 +1,14 @@ @comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2018/07/09 12:22:16 rsadowski Exp $ @bin bin/bitcoin-qt @man man/man1/bitcoin-qt.1 -share/applications/bitcoin-qt.desktop share/pixmaps/ share/pixmaps/bitcoin128.png share/pixmaps/bitcoin128.xpm -@tag update-desktop-database +share/pixmaps/bitcoin16.png +share/pixmaps/bitcoin16.xpm +share/pixmaps/bitcoin256.png +share/pixmaps/bitcoin256.xpm +share/pixmaps/bitcoin32.png +share/pixmaps/bitcoin32.xpm +share/pixmaps/bitcoin64.png +share/pixmaps/bitcoin64.xpm
