diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile index 621c5fe5e9ca..a54596a086d7 100644 --- a/net-p2p/monero-cli/Makefile +++ b/net-p2p/monero-cli/Makefile @@ -1,109 +1,109 @@ # Created by: Vasil Dimov PORTNAME= monero-cli # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) -PORTVERSION= 0.17.2.3 +PORTVERSION= 0.17.3.0 DISTVERSIONPREFIX= v # and uncomment the following two lines (use for example -git-HEAD or -git-b6420e1) #PORTVERSION= 0 #PKGNAMESUFFIX= -git-HEAD CATEGORIES= net-p2p finance MAINTAINER= vd@FreeBSD.org COMMENT= Private, secure, untraceable, decentralised digital currency (CLI) LICENSE= BSD3CLAUSE BROKEN_i386= fails to compile: register r15d is only available in 64-bit mode LIB_DEPENDS= \ libboost_chrono.so:devel/boost-libs \ libboost_date_time.so:devel/boost-libs \ libboost_filesystem.so:devel/boost-libs \ libboost_program_options.so:devel/boost-libs \ libboost_regex.so:devel/boost-libs \ libboost_serialization.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ libminiupnpc.so:net/miniupnpc \ libnorm.so:net/norm \ libpgm.so:net/openpgm \ libsodium.so:security/libsodium \ libunbound.so:dns/unbound \ libzmq.so:net/libzmq4 BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \ ${LOCALBASE}/include/zmq.hpp:net/cppzmq USES= cmake compiler:c++11-lib pkgconfig readline ssl USE_GITHUB= yes .if defined(PKGNAMESUFFIX) GIT_COMMIT= ${PKGNAMESUFFIX:C/-git-//} .else GIT_COMMIT= ${DISTVERSIONPREFIX}${PORTVERSION} .endif GH_TUPLE= monero-project:monero:${GIT_COMMIT} \ monero-project:supercop:633500ad8c875999:ext1/external/supercop \ - tevador:RandomX:fe4324e8c0c035fec3affd6e:ext2/external/randomx \ + tevador:RandomX:9efc398c196ef1c50d8e6f5e:ext2/external/randomx \ trezor:trezor-common:bff7fdfe436c727982c:ext3/external/trezor-common CFLAGS+= -D_WANT_SEMUN OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ doxygen:devel/doxygen DOXYGEN_CMAKE_BOOL= BUILD_DOCUMENTATION .include # On FreeBSD 12.x the default ld(1) is LLVM's ld which needs an explicit -m option # when linking without any input .o on the command line, like: # /usr/bin/ld -melf_amd64 -r -b binary -o blocksdat.o blocks.dat # See Bug 226996 - net-p2p/monero-cli: fails to link with lld as the system linker # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226996 .if ${ARCH} == aarch64 LD_EMULATION= aarch64elf .elif ${ARCH} == amd64 LD_EMULATION= elf_amd64 .elif ${ARCH} == i386 LD_EMULATION= elf_i386_fbsd .elif ${ARCH} == powerpc LD_EMULATION= elf32ppc .elif ${ARCH} == powerpc64 LD_EMULATION= elf64ppc .elif ${ARCH} == powerpc64le LD_EMULATION= elf64lppc .endif CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} # keep in sync with all platforms where libunwind is available .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LIB_DEPENDS+= libunwind.so:devel/libunwind .else CMAKE_ARGS+= -DSTACK_TRACE:BOOL=OFF .endif CMAKE_ARGS+= -DMANUAL_SUBMODULES:BOOL=ON USE_RC_SUBR= monerod USERS= monero GROUPS= monero PLIST_FILES= \ bin/monero-blockchain-ancestry \ bin/monero-blockchain-depth \ bin/monero-blockchain-export \ bin/monero-blockchain-import \ bin/monero-blockchain-mark-spent-outputs \ bin/monero-blockchain-prune \ bin/monero-blockchain-prune-known-spent-data \ bin/monero-blockchain-stats \ bin/monero-blockchain-usage \ bin/monero-gen-ssl-cert \ bin/monero-gen-trusted-multisig \ bin/monero-wallet-cli \ bin/monero-wallet-rpc \ bin/monerod .include diff --git a/net-p2p/monero-cli/distinfo b/net-p2p/monero-cli/distinfo index 0d5b9b191d71..51e9d4d21a22 100644 --- a/net-p2p/monero-cli/distinfo +++ b/net-p2p/monero-cli/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1630575700 -SHA256 (monero-project-monero-v0.17.2.3_GH0.tar.gz) = e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d -SIZE (monero-project-monero-v0.17.2.3_GH0.tar.gz) = 10640501 +TIMESTAMP = 1639063756 +SHA256 (monero-project-monero-v0.17.3.0_GH0.tar.gz) = 23d56d0c366576ff49bd785290a3e6377d4e51156e70ce4bb774b3d70f8cada4 +SIZE (monero-project-monero-v0.17.3.0_GH0.tar.gz) = 10659302 SHA256 (monero-project-supercop-633500ad8c875999_GH0.tar.gz) = 19861f74bfc2cc0b61a49bf0ff2da5c793432d31e8677b23455a4229dcb6435b SIZE (monero-project-supercop-633500ad8c875999_GH0.tar.gz) = 346190 -SHA256 (tevador-RandomX-fe4324e8c0c035fec3affd6e_GH0.tar.gz) = e62470bae4ac94f180b423a039fd091c2a8f2b9c9b31afc5456841e36dd86d57 -SIZE (tevador-RandomX-fe4324e8c0c035fec3affd6e_GH0.tar.gz) = 163749 +SHA256 (tevador-RandomX-9efc398c196ef1c50d8e6f5e_GH0.tar.gz) = 21cb41e2e52ea76385746a52c0d3ce39ca15678243148aefabd9fbc0805600e4 +SIZE (tevador-RandomX-9efc398c196ef1c50d8e6f5e_GH0.tar.gz) = 163979 SHA256 (trezor-trezor-common-bff7fdfe436c727982c_GH0.tar.gz) = 298338e9924437677be76546929c64cda2bd8b04dbd2c3b533cdcf1291f903a0 SIZE (trezor-trezor-common-bff7fdfe436c727982c_GH0.tar.gz) = 1327776 diff --git a/net-p2p/monero-cli/files/patch-external_CMakeLists.txt b/net-p2p/monero-cli/files/patch-external_CMakeLists.txt index 43324d187f5b..ab18e4dbf954 100644 --- a/net-p2p/monero-cli/files/patch-external_CMakeLists.txt +++ b/net-p2p/monero-cli/files/patch-external_CMakeLists.txt @@ -1,46 +1,50 @@ ---- external/CMakeLists.txt.orig 2018-10-12 11:58:33.398503000 +0200 -+++ external/CMakeLists.txt 2018-10-12 12:01:52.063061000 +0200 -@@ -31,25 +31,28 @@ +--- external/CMakeLists.txt.orig 2021-12-09 16:37:10.161405000 +0100 ++++ external/CMakeLists.txt 2021-12-09 16:36:54.211336000 +0100 +@@ -31,27 +31,30 @@ # This is broken up into two parts: first we check for miniupnp, compile it if we can't # find it, and thereafter we check for libunbound, and compile it if we can't find it. -# We always compile if we are building statically to reduce static dependency issues... -# ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with -# others. find_package(Miniupnpc REQUIRED) -message(STATUS "Using in-tree miniupnpc") +-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") -endif() -if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") -endif() +if(NOT MINIUPNPC_FOUND OR STATIC) + message(STATUS "Using in-tree miniupnpc") ++ set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) + add_subdirectory(miniupnp/miniupnpc) + set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") ++ set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) + if(MSVC) + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") + elseif(NOT MSVC) + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") + endif() + if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") + endif() -set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) + set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) +else() + message(STATUS "Found miniupnpc shared library (${MINIUPNP_LIBRARY})") + set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + set(UPNP_INCLUDE_DIR ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) +endif() find_package(Unbound)