Index: head/net-p2p/bitcoin/Makefile =================================================================== --- head/net-p2p/bitcoin/Makefile (revision 488523) +++ head/net-p2p/bitcoin/Makefile (revision 488524) @@ -1,132 +1,133 @@ # Created by: Shaun Amott # $FreeBSD$ PORTNAME= bitcoin -PORTVERSION= 0.17.0 -PORTREVISION?= 3 +PORTVERSION= 0.17.1 +PORTREVISION?= 0 CATEGORIES= net-p2p finance MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/:DEFAULT \ LOCAL/swills:icon DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bitcoin128.png:icon DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${_DISTFILES:N*.png} MAINTAINER= kbowling@FreeBSD.org COMMENT?= Virtual Peer-to-Peer Currency Client (QT) LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libevent.so:devel/libevent USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig qt:5 shebangfix ssl + GNU_CONFIGURE= yes SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" USES+= desktop-file-utils USE_QT= core gui network widgets \ buildtools_build linguisttools_build qmake_build BUILD_DEPENDS+= protoc:devel/protobuf LIB_DEPENDS+= libprotobuf.so:devel/protobuf TESTS_USES= qt:5 TESTS_USE= QT=testlib TESTS_PLIST_FILES= bin/test_bitcoin-qt \ bin/test_bitcoin .endif OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ OPTIONS_RADIO?= WALLET OPTIONS_RADIO_WALLET?= WALLET_BDB48 WALLET_BDBMODERN OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN OPTIONS_SUB= yes HARDENING_DESC= Attempt to harden binaries (PIE for ASLR, NX Stack) QRCODES_DESC= Display QR Codes TESTS_DESC= Build test binary and unit tests WALLET_DESC= Wallet Management Support WALLET_BDB48_DESC= Wallet using BDB 4.8 WALLET_BDBMODERN_DESC= Wallet using modern BDB 5.x or 6.x ZMQ_DESC= Block and transaction broadcasting with ZeroMQ DBUS_CONFIGURE_WITH= dbus DBUS_USES= qt:5 DBUS_USE= QT=dbus DEBUG_CONFIGURE_ENABLE= debug DEBUG_INSTALL_TARGET_OFF= install-strip HARDENING_CONFIGURE_ENABLE= hardening TESTS_CONFIGURE_ENABLE= tests bench .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes" TESTS_PLIST_FILES= bin/test_bitcoin .endif TESTS_PLIST_FILES+= bin/bench_bitcoin UPNP_CONFIGURE_WITH= miniupnpc UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc UPNP_CPPFLAGS= -I${LOCALBASE}/include UPNP_LIBS= -L${LOCALBASE}/lib QRCODES_CONFIGURE_WITH= qrencode QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode ZMQ_CONFIGURE_ENABLE= zmq ZMQ_BUILD_DEPENDS= libzmq4>0:net/libzmq4 ZMQ_RUN_DEPENDS= libzmq4>0:net/libzmq4 GH_ACCOUNT= bitcoin CONFIGURE_ARGS?= --without-libs \ --with-gui=qt5 \ --without-daemon \ --without-utils CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \ OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" MAKE_ENV+= V=1 PLIST_FILES?= bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \ share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png .include .if ${PORT_OPTIONS:MWALLET_BDB48} CONFIGURE_ARGS+= --enable-wallet USES+= bdb:48 .elif ${PORT_OPTIONS:MWALLET_BDBMODERN} CONFIGURE_ARGS+= --enable-wallet --with-incompatible-bdb USES+= bdb:5+ .else CONFIGURE_ARGS+= --disable-wallet .endif .include .if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN} CPPFLAGS+= -I${BDB_INCLUDE_DIR} LIBS+= -L${BDB_LIB_DIR} .endif .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" post-install: ${INSTALL} ${FILESDIR}/bitcoin-qt.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL} ${DISTDIR}/${DIST_SUBDIR}/bitcoin128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .endif regression-test: build # To use this sucessfully, remove --without-daemon and --without-utils # from CONFIGURE_ARGS above. @cd ${WRKSRC} && ${GMAKE} check .include Index: head/net-p2p/bitcoin/distinfo =================================================================== --- head/net-p2p/bitcoin/distinfo (revision 488523) +++ head/net-p2p/bitcoin/distinfo (revision 488524) @@ -1,5 +1,5 @@ -TIMESTAMP = 1538559976 -SHA256 (bitcoin/bitcoin-0.17.0.tar.gz) = 98ef39e851644bba1ac51edaa53c7c47c20a3980333def7bc642c8261a12785e -SIZE (bitcoin/bitcoin-0.17.0.tar.gz) = 7008522 +TIMESTAMP = 1545897686 +SHA256 (bitcoin/bitcoin-0.17.1.tar.gz) = 3e564fb5cf832f39e930e19c83ea53e09cfe6f93a663294ed83a32e194bda42a +SIZE (bitcoin/bitcoin-0.17.1.tar.gz) = 6992687 SHA256 (bitcoin/bitcoin128.png) = ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722 SIZE (bitcoin/bitcoin128.png) = 10639 Index: head/net-p2p/bitcoin/files/bitcoind.in =================================================================== --- head/net-p2p/bitcoin/files/bitcoind.in (revision 488523) +++ head/net-p2p/bitcoin/files/bitcoind.in (revision 488524) @@ -1,172 +1,172 @@ #!/bin/sh # $FreeBSD$ # PROVIDE: bitcoind # REQUIRE: LOGIN cleanvar # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable : # bitcoind_enable (bool): Set to "NO" by default. # Set it to "YES" to enable bitcoind # bitcoind_user (str) Set to "bitcoin" by default. # bitcoind_group (str) Set to "bitcoin" by default. # bitcoind_conf (str) Set to "%%PREFIX%%/etc/bitcoind.conf" by default. # bitcoind_data_dir (str) Set to "/var/db/bitcoin" by default. # bitcoindlimits_enable (bool) Set to "NO" by default. # Set it to "YES" to enable bitcoindlimits # bitcoindlimits_args Set to "-e -U ${bitcoind_user}" by default . /etc/rc.subr name="bitcoind" rcvar=bitcoind_enable start_precmd="bitcoind_precmd" start_cmd="bitcoind_start" restart_precmd="bitcoind_checkconfig" reload_precmd="bitcoind_checkconfig" configtest_cmd="bitcoind_checkconfig" status_cmd="bitcoind_status" stop_cmd="bitcoind_stop" stop_postcmd="bitcoind_wait" command="%%PREFIX%%/bin/bitcoind" daemon_command="/usr/sbin/daemon" #pidfile="/var/run/${name}.pid" extra_commands="configtest" : ${bitcoind_enable:="NO"} : ${bitcoindlimits_enable:="NO"} load_rc_config ${name} : ${bitcoind_user:="bitcoin"} : ${bitcoind_group:="bitcoin"} : ${bitcoind_data_dir:="/var/db/bitcoin"} : ${bitcoind_config_file:="%%PREFIX%%/etc/bitcoin.conf"} : ${bitcoindlimits_args:="-e -U ${bitcoind_user}"} # set up dependant variables procname="${command}" pidfile="${bitcoind_data_dir}/bitcoind.pid" required_files="${bitcoind_config_file}" bitcoind_checkconfig() { echo "Performing sanity check on bitcoind configuration:" if [ ! -d "${bitcoind_data_dir}" ] then echo "Missing data directory: ${bitcoind_data_dir}" exit 1 fi chown -R "${bitcoind_user}:${bitcoind_group}" "${bitcoind_data_dir}" if [ ! -f "${bitcoind_config_file}" ] then echo "Missing configuration file: ${bitcoind_config_file}" exit 1 fi if [ ! -x "${command}" ] then echo "Missing executable: ${command}" exit 1 fi return 0 } bitcoind_cleanup() { rm -f "${pidfile}" } bitcoind_precmd() { bitcoind_checkconfig pid=$(check_pidfile "${pidfile}" "${procname}") if [ -z "${pid}" ] then echo "Bitcoind is not running" rm -f "${pidfile}" fi if checkyesno bitcoindlimits_enable then eval $(/usr/bin/limits ${bitcoindlimits_args}) 2>/dev/null else return 0 fi } bitcoind_status() { local pid pid=$(check_pidfile "${pidfile}" "${procname}") if [ -z "${pid}" ] then echo "Bitcoind is not running" return 1 else echo "Bitcoind running, pid: ${pid}" fi } bitcoind_start() { echo "Starting bitcoind:" cd "${bitcoind_data_dir}" || return 1 - ${daemon_command} -u "${bitcoind_user}" -p "${pidfile}" -o "${bitcoind_data_dir}/bitcoind.log" \ + ${daemon_command} -u "${bitcoind_user}" -p "${pidfile}" -f \ ${command} \ -conf="${bitcoind_config_file}" \ -datadir="${bitcoind_data_dir}" } bitcoind_stop() { echo "Stopping bitcoind:" pid=$(check_pidfile "${pidfile}" "${procname}") if [ -z "${pid}" ] then echo "Bitcoind is not running" return 1 else kill ${pid} fi } bitcoind_wait() { local n=60 echo "Waiting for bitcoind shutdown:" while : do printf '.' pid=$(check_pidfile "${pidfile}" "${procname}") if [ -z "${pid}" ] then printf '\n' break fi sleep 1 n=$((${n} - 1)) if [ ${n} -eq 0 -a -f "${pidfile}" ] then printf "\nForce shutdown" kill -9 $(cat "${pidfile}") for n in 1 2 3 do printf '.' sleep 1 done printf '\n' break fi done rm -f "${pidfile}" echo "Shutdown complete" } run_rc_command "$1"