git: a251d5962c61 - main - net-p2p/monero-cli: Update 0.18.4.0 → 0.18.4.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 03 Nov 2025 00:55:14 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a251d5962c617c982a029d03036fe31b0f05424b

commit a251d5962c617c982a029d03036fe31b0f05424b
Author:     Alexander Perechnev <alex.perechnev@gmail.com>
AuthorDate: 2025-11-03 00:50:29 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-03 00:50:29 +0000

    net-p2p/monero-cli: Update 0.18.4.0 → 0.18.4.3
    
    Changelogs:
    https://github.com/monero-project/monero/releases/tag/v0.18.4.1
    https://github.com/monero-project/monero/releases/tag/v0.18.4.2
    https://github.com/monero-project/monero/releases/tag/v0.18.4.3
    
    Improve port:
    - Update LIB_DEPENDS and USES.
    - Use one line with all 9 arches instead of long "if" with only 6.
    - Update "keep in sync with all platforms where libunwind is available".
    - Replace PORTVERSION with DISTVERSION in GIT_COMMIT.
    - Refresh patches.
    
    PR:             290181
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 net-p2p/monero-cli/Makefile                        | 27 ++++++----------------
 net-p2p/monero-cli/distinfo                        | 10 ++++----
 net-p2p/monero-cli/files/patch-cmake_Version.cmake | 10 ++++----
 .../monero-cli/files/patch-external_CMakeLists.txt |  6 ++---
 .../files/patch-src_common_stack__trace.cpp        | 11 ++-------
 .../monero-cli/files/patch-src_p2p_net__node.inl   |  8 +++----
 .../files/patch-src_wallet_api_CMakeLists.txt      |  4 ++--
 7 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile
index 64d574fe563b..cc530c46e908 100644
--- a/net-p2p/monero-cli/Makefile
+++ b/net-p2p/monero-cli/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	monero-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18.4.0
-PORTREVISION=	3
+DISTVERSION=	0.18.4.3
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	alex.perechnev@gmail.com
@@ -19,8 +18,8 @@ LIB_DEPENDS=	\
 		libboost_chrono.so:devel/boost-libs \
 		libboost_date_time.so:devel/boost-libs \
 		libboost_filesystem.so:devel/boost-libs \
+		libboost_locale.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs \
-		libboost_regex.so:devel/boost-libs \
 		libboost_serialization.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		libminiupnpc.so:net/miniupnpc \
@@ -30,16 +29,16 @@ LIB_DEPENDS=	\
 		libunbound.so:dns/unbound \
 		libzmq.so:net/libzmq4
 
-USES=		cmake compiler:c++11-lib pkgconfig readline ssl
+USES=		cmake compiler:c++14-lang pkgconfig readline ssl
 USE_GITHUB=	yes
 .if defined(PKGNAMESUFFIX)
 GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 .else
-GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
+GIT_COMMIT=	${DISTVERSIONPREFIX}${DISTVERSION}
 .endif
 GH_TUPLE=	monero-project:monero:${GIT_COMMIT} \
 		monero-project:supercop:633500ad8c875999:ext1/external/supercop \
-		tevador:RandomX:85c527a62301b7b8be89d941:ext2/external/randomx \
+		tevador:RandomX:102f8acf90a7649ada410de5:ext2/external/randomx \
 		trezor:trezor-common:bff7fdfe436c727982c:ext3/external/trezor-common
 
 CFLAGS+=	-D_WANT_SEMUN
@@ -58,24 +57,12 @@ NATIVE_CMAKE_OFF=	-DARCH=default
 # /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
+LD_EMULATION=	${ARCH:S|aarch64|aarch64elf|:S|amd64|elf_amd64|:C|armv[67]|armelf|:S|i386|elf_i386_fbsd|:S|powerpc64|elf64ppc|:S|powerpc64le|elf64lppc|:C|powerpc(spe)*|elf32ppc_fbsd|:S|riscv64|elf64lriscv|}
 
 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} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv?} || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH:Mpowerpc64*}
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .else
 CMAKE_ARGS+=	-DSTACK_TRACE:BOOL=OFF
diff --git a/net-p2p/monero-cli/distinfo b/net-p2p/monero-cli/distinfo
index a73d26c810dd..6dd66c47c9a1 100644
--- a/net-p2p/monero-cli/distinfo
+++ b/net-p2p/monero-cli/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1743767535
-SHA256 (monero-project-monero-v0.18.4.0_GH0.tar.gz) = 2ad22dfcd3766c1cc80ccf83ba06f701305ff25c25b737ca6fbdf843ca6960d3
-SIZE (monero-project-monero-v0.18.4.0_GH0.tar.gz) = 14083573
+TIMESTAMP = 1760289212
+SHA256 (monero-project-monero-v0.18.4.3_GH0.tar.gz) = fdec15d2b5c40f70aa4115aae8839ea9a247e3186c73f2d854432c7badafc939
+SIZE (monero-project-monero-v0.18.4.3_GH0.tar.gz) = 14105403
 SHA256 (monero-project-supercop-633500ad8c875999_GH0.tar.gz) = 19861f74bfc2cc0b61a49bf0ff2da5c793432d31e8677b23455a4229dcb6435b
 SIZE (monero-project-supercop-633500ad8c875999_GH0.tar.gz) = 346190
-SHA256 (tevador-RandomX-85c527a62301b7b8be89d941_GH0.tar.gz) = f21ada9d84387061f9d93d2fb4314c4eb136ee916d6fd168c0fcba24fb6bfbbb
-SIZE (tevador-RandomX-85c527a62301b7b8be89d941_GH0.tar.gz) = 164353
+SHA256 (tevador-RandomX-102f8acf90a7649ada410de5_GH0.tar.gz) = 9a81ebe53e8d61e2fd81df10e96232a22bcc38b9e5c948e8450f5fcb74131c52
+SIZE (tevador-RandomX-102f8acf90a7649ada410de5_GH0.tar.gz) = 181318
 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-cmake_Version.cmake b/net-p2p/monero-cli/files/patch-cmake_Version.cmake
index b2c7b81faa61..b703036dcd71 100644
--- a/net-p2p/monero-cli/files/patch-cmake_Version.cmake
+++ b/net-p2p/monero-cli/files/patch-cmake_Version.cmake
@@ -1,11 +1,11 @@
---- cmake/Version.cmake.orig	2018-06-01 14:10:23.694883000 UTC
-+++ cmake/Version.cmake	2018-06-01 14:10:35.450366000 UTC
-@@ -32,7 +32,7 @@
+--- cmake/Version.cmake.orig	2025-10-07 19:25:41 UTC
++++ cmake/Version.cmake
+@@ -32,7 +32,7 @@ find_package(Git QUIET)
  endfunction ()
  
  find_package(Git QUIET)
 -if ("$Format:$" STREQUAL "")
 +if (TRUE)
    # We're in a tarball; use hard-coded variables.
-   write_static_version_header("release")
- elseif (GIT_FOUND OR Git_FOUND)
+   set(VERSION_IS_RELEASE "true")
+   write_version("release")
diff --git a/net-p2p/monero-cli/files/patch-external_CMakeLists.txt b/net-p2p/monero-cli/files/patch-external_CMakeLists.txt
index 583a3d867128..1ee00b929281 100644
--- a/net-p2p/monero-cli/files/patch-external_CMakeLists.txt
+++ b/net-p2p/monero-cli/files/patch-external_CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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 @@
+--- external/CMakeLists.txt.orig	2025-10-07 19:25:41 UTC
++++ external/CMakeLists.txt
+@@ -31,28 +31,31 @@
  
  # 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.
diff --git a/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp b/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp
index 6ec68141f87d..1e4112591eb0 100644
--- a/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp
+++ b/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp
@@ -1,6 +1,6 @@
---- src/common/stack_trace.cpp.orig	2019-11-04 14:13:39 UTC
+--- src/common/stack_trace.cpp.orig	2025-10-07 19:25:41 UTC
 +++ src/common/stack_trace.cpp
-@@ -26,13 +26,14 @@
+@@ -26,7 +26,7 @@
  // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
@@ -9,10 +9,3 @@
  #define USE_UNWIND
  #else
  #define ELPP_FEATURE_CRASH_LOG 1
- #endif
- #include "easylogging++/easylogging++.h"
- 
-+#include <iomanip>
- #include <stdexcept>
- #ifdef USE_UNWIND
- #define UNW_LOCAL_ONLY
diff --git a/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl b/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl
index b2414132714d..62eeec1dbb39 100644
--- a/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl
+++ b/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl
@@ -1,4 +1,4 @@
---- src/p2p/net_node.inl.orig	2023-10-02 19:28:11 UTC
+--- src/p2p/net_node.inl.orig	2025-10-07 19:25:41 UTC
 +++ src/p2p/net_node.inl
 @@ -60,9 +60,9 @@
  #include "cryptonote_core/cryptonote_core.h"
@@ -13,7 +13,7 @@
  
  #undef MONERO_DEFAULT_LOG_CATEGORY
  #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
-@@ -2989,7 +2989,11 @@ namespace nodetool
+@@ -3090,7 +3090,11 @@ namespace nodetool
      UPNPUrls urls;
      IGDdatas igdData;
      char lanAddress[64];
@@ -25,7 +25,7 @@
      freeUPNPDevlist(deviceList);
      if (result > 0) {
        if (result == 1) {
-@@ -3057,10 +3061,18 @@ namespace nodetool
+@@ -3158,10 +3162,18 @@ namespace nodetool
      UPNPUrls urls;
      IGDdatas igdData;
      char lanAddress[64];
@@ -44,7 +44,7 @@
          std::ostringstream portString;
          portString << port;
  
-@@ -3071,10 +3083,17 @@ namespace nodetool
+@@ -3172,10 +3184,17 @@ namespace nodetool
          } else {
            MLOG_GREEN(el::Level::Info, "Deleted IGD port mapping.");
          }
diff --git a/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt b/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt
index 814be825002d..9df8c37bd3b2 100644
--- a/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt
+++ b/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/wallet/api/CMakeLists.txt.orig	2018-03-26 15:45:58 UTC
+--- src/wallet/api/CMakeLists.txt.orig	2025-10-07 19:25:41 UTC
 +++ src/wallet/api/CMakeLists.txt
-@@ -87,6 +87,3 @@ if(IOS)
+@@ -90,6 +90,3 @@ endif()
  else()
      set(lib_folder lib)
  endif()