* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2024-07-27 17:46 David Roman
0 siblings, 0 replies; 7+ messages in thread
From: David Roman @ 2024-07-27 17:46 UTC (permalink / raw
To: gentoo-commits
commit: aedc02ff3297b1d82263925c6a5d79188f7b5dbd
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Sat Jul 27 09:45:14 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Jul 27 09:45:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aedc02ff
net-p2p/monero: add 0.18.3.3-r2
With patch to allow for newer versions of miniupnpc
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
.../files/monero-0.18.3.3-miniupnp-api-18.patch | 30 +++++
net-p2p/monero/monero-0.18.3.3-r2.ebuild | 123 +++++++++++++++++++++
2 files changed, 153 insertions(+)
diff --git a/net-p2p/monero/files/monero-0.18.3.3-miniupnp-api-18.patch b/net-p2p/monero/files/monero-0.18.3.3-miniupnp-api-18.patch
new file mode 100644
index 000000000..d281f60ec
--- /dev/null
+++ b/net-p2p/monero/files/monero-0.18.3.3-miniupnp-api-18.patch
@@ -0,0 +1,30 @@
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index 30e3d31b9..c49783e1c 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -2989,7 +2989,12 @@ namespace nodetool
+ UPNPUrls urls;
+ IGDdatas igdData;
+ char lanAddress[64];
++#if MINIUPNPC_API_VERSION > 17
++ char wanAddress[64];
++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof(wanAddress));
++#else
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
++#endif
+ freeUPNPDevlist(deviceList);
+ if (result > 0) {
+ if (result == 1) {
+@@ -3057,7 +3062,12 @@ namespace nodetool
+ UPNPUrls urls;
+ IGDdatas igdData;
+ char lanAddress[64];
++#if MINIUPNPC_API_VERSION > 17
++ char wanAddress[64];
++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof(wanAddress));
++#else
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
++#endif
+ freeUPNPDevlist(deviceList);
+ if (result > 0) {
+ if (result == 1) {
diff --git a/net-p2p/monero/monero-0.18.3.3-r2.ebuild b/net-p2p/monero/monero-0.18.3.3-r2.ebuild
new file mode 100644
index 000000000..2b6b6e997
--- /dev/null
+++ b/net-p2p/monero/monero-0.18.3.3-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="The secure, private, untraceable cryptocurrency"
+HOMEPAGE="https://github.com/monero-project/monero"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/monero-project/monero.git"
+ EGIT_SUBMODULES=()
+else
+ SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+daemon hw-wallet readline +tools +wallet-cli +wallet-rpc"
+REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
+RESTRICT="test"
+
+DEPEND="
+ acct-group/monero
+ acct-user/monero
+ <dev-libs/boost-1.85:=[nls]
+ dev-libs/libsodium:=
+ dev-libs/openssl:=
+ dev-libs/randomx
+ dev-libs/rapidjson
+ dev-libs/supercop
+ net-dns/unbound:=[threads]
+ net-libs/czmq:=
+ net-libs/miniupnpc:=
+ readline? ( sys-libs/readline:0= )
+ hw-wallet? (
+ dev-libs/hidapi
+ dev-libs/protobuf:=
+ virtual/libusb:1
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.18.3.3-miniupnp-api-18.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ # TODO: Update CMake to install built libraries (help wanted)
+ -DBUILD_SHARED_LIBS=OFF
+ -DMANUAL_SUBMODULES=ON
+ -DUSE_DEVICE_TREZOR=$(usex hw-wallet ON OFF)
+ )
+
+ use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ local targets=()
+ use daemon && targets+=(daemon)
+ use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
+ use wallet-cli && targets+=(simplewallet)
+ use wallet-rpc && targets+=(wallet_rpc_server)
+ cmake_build ${targets[@]}
+}
+
+src_install() {
+ einstalldocs
+
+ # Install all binaries.
+ find "${BUILD_DIR}/bin/" -type f -executable -print0 |
+ while IFS= read -r -d '' line; do
+ dobin "$line"
+ done
+
+ if use daemon; then
+ dodoc utils/conf/monerod.conf
+
+ # data-dir
+ keepdir /var/lib/monero
+ fowners monero:monero /var/lib/monero
+ fperms 0755 /var/lib/monero
+
+ # log-file dir
+ keepdir /var/log/monero
+ fowners monero:monero /var/log/monero
+ fperms 0755 /var/log/monero
+
+ # /etc/monero/monerod.conf
+ insinto /etc/monero
+ doins "${FILESDIR}/monerod.conf"
+
+ # OpenRC
+ newconfd "${FILESDIR}/monerod.confd" monerod
+ newinitd "${FILESDIR}/monerod.initd" monerod
+
+ # systemd
+ systemd_dounit "${FILESDIR}/monerod.service"
+ fi
+}
+
+pkg_postinst() {
+ if use daemon; then
+ elog "Start the Monero P2P daemon as a system service with"
+ elog "'rc-service monerod start'. Enable it at startup with"
+ elog "'rc-update add monerod default'."
+ elog
+ elog "Run monerod status as any user to get sync status and other stats."
+ elog
+ elog "The Monero blockchain can take up a lot of space (200 GiB) and is stored"
+ elog "in /var/lib/monero by default. You may want to enable pruning by adding"
+ elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
+ elog "or move the data directory to another disk."
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2024-07-27 17:46 David Roman
0 siblings, 0 replies; 7+ messages in thread
From: David Roman @ 2024-07-27 17:46 UTC (permalink / raw
To: gentoo-commits
commit: c32a870f0bfad91442422df9279a5b2049f13501
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Sat Jul 27 07:38:26 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Jul 27 07:51:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c32a870f
net-p2p/monero: cleaning and general improvements
- add version restriction to 9999 and remaining 0.17 package
- unify latest package and git version
- rename patch for 0.17.1.2 to 0.17.3.2
- rename patch for 0.18.1.0 to 0.18.3.3
- drop old versions
- drop unused patches
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
net-p2p/monero/Manifest | 7 --
.../monero/files/monero-0.17.1.7-linkjobs.patch | 44 --------
.../monero-0.17.1.7-unbundle-dependencies.patch | 112 -------------------
.../monero/files/monero-0.17.2.0-boost-176.patch | 24 -----
...=> monero-0.17.3.2-unbundle-dependencies.patch} | 0
.../monero-0.18.1.0-unbundle-dependencies.patch | 112 -------------------
net-p2p/monero/files/monero-0.18.2.2-cstdint.patch | 60 -----------
...=> monero-0.18.3.3-unbundle-dependencies.patch} | 0
net-p2p/monero/monero-0.17.2.0.ebuild | 117 --------------------
net-p2p/monero/monero-0.17.2.3.ebuild | 117 --------------------
net-p2p/monero/monero-0.17.3.0.ebuild | 115 --------------------
net-p2p/monero/monero-0.17.3.2.ebuild | 6 +-
net-p2p/monero/monero-0.18.1.2.ebuild | 119 ---------------------
net-p2p/monero/monero-0.18.2.0.ebuild | 117 --------------------
net-p2p/monero/monero-0.18.2.2.ebuild | 118 --------------------
net-p2p/monero/monero-0.18.3.1.ebuild | 4 +-
net-p2p/monero/monero-0.18.3.3-r1.ebuild | 2 +-
net-p2p/monero/monero-9999.ebuild | 24 +++--
18 files changed, 22 insertions(+), 1076 deletions(-)
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index 394d1ed3b..a4b7a5322 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1,10 +1,3 @@
-DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f5cd3269460944aac30a315ac7c273c12fd809d86d41445bfc7e8c2feb0538d4e9fc1dadeb55f7e09f2920778f07a7 SHA512 85b764f1fc25127e7ca4ada67b1d832a9604c4cf65b160d689650e7ca7bbc36b73d8b26c5409fabdaad7369684997447cd812d1c521fad19d24f5b35f4789a1e
-DIST monero-0.17.2.3.tar.gz 10640501 BLAKE2B 15c7b92e7d00788214953c09af96d578e79c65ba9263d2a9ea19cfb9cc65e77d15770b873a10b77aae9e908dce74162d3577ed241600ebd57098b860bfd8f114 SHA512 7f3363c2cb66fa90a47a4cbb03b367182afa63af21d40bf07ea57cd91e4805684ec4795c0390bc966626a3b7b3c0a47167036873f5d1ea4b487a3d02bf01aaa4
-DIST monero-0.17.3.0.tar.gz 10659302 BLAKE2B fe73172e490f119a3d3730e3c11afd386e54fa22e12ac69d6f5e420d5409ba8201289feb01041520b374768325ea82132108972f68ef59114f414451232daea6 SHA512 97a40f594aaa6f588a3ad982142a0ea4f4410d208dd5ff43b09c70baadd32f87e92eac97abd800f25298e8d0613ae85f68605f586ceccf9dc078fcb189d7511a
DIST monero-0.17.3.2.tar.gz 10685156 BLAKE2B f313ec0e5e224797448a43ad46d4e990174eec6cdceec6dc9a25d62f014a775172e103d05a33558404bd84a8443ba6ada0c27f81a3a83fe630d16cbad97602f5 SHA512 2d34e0525b2ca1d7bddb8ea51776b49fec4fb866a1c1239c347460ed3369af2f430be32da45666f16c369cebef099f285971c0e806d75d60354f195c5f93891d
-DIST monero-0.18.1.2.tar.gz 11609034 BLAKE2B 3186a1038e9dd8f204a506df28c526bf3e0e5f788ad2d6b512f02735162a479be3f46d309d4e6888f30f962d68ecaf269888c8c0b21a066cad78b3c06f8cfc83 SHA512 d112f34b2fe6720c324560dd523badb68f08d03183d4bbbe7e1aa95f641cde4a1c4fa4042f1d47f9920f799269cc9620150136ebbef6dd66fcd4df0336c0d7f3
-DIST monero-0.18.2.0.tar.gz 11624875 BLAKE2B e8dc2e89c664cb218d900ce0803dd1716f1ee363bbddb232fbd22570818c9a9ca307df04808ffef1eb30ee6097fbe243f6977dfad181f57b9169f22d4819f145 SHA512 19625d8e6ee3e9f27ba06eb6027ef21571a2ae8261c9e32f6e74d2f7adf8c73e9dfe34516cd456426274c41ce941e1e5b7eba9f9d20492b99decbd9262aec434
-DIST monero-0.18.2.2.tar.gz 11640001 BLAKE2B 04b19e760b09636d7862af2a071128a28006d2829f08039cf55cfa1fd7d054b1382dbbcfc7f0ed381fcbd358e75ec437467349c7f250510e99e06527d1209da6 SHA512 78d4f7fee4eb37ba4837bc392c5869e21c9ea1e9bd9e95f768003bc833302935121c315fb3b4fcbe8f07a9513f928e9e9146dc7ca8892a3db2eb14cfe1371727
DIST monero-0.18.3.1.tar.gz 14005197 BLAKE2B 169d876caf94090894c9a2bd9d07b71e46411971b06da0f51fc57f01396de4f5f770062e08cbebf702b6b49dbcd47923675d2375795969f5673bf2091a7da742 SHA512 b29d25043d50fa30459e59e0c82627cc3dc4a7e2e28a727a353915a32cf5e70e36f548bda152dee13329cb2d09a978ff45c2121f8bf7acc8966957a53e772f03
DIST monero-0.18.3.3.tar.gz 14028018 BLAKE2B 07c3272175fb05645a2f5f7ce6cef4d65054ba1d80994c4dc8445ec4df13aebe2b268d5b4be49db0cdd35dcdce1bbd33874111e21503839d63fae70ea30b0dff SHA512 26aaa02be4d1109dfdae08981b9fee16a10c358030ba99ae809eb241e805c50edc8ad10b1a375cd02e3160fa3de8ae6773cca55618d39ca30614f1d6662c18e5
-DIST monero-8682.patch 1053 BLAKE2B 6252ee36961d41e6c7161004f2b3ddb0916a2dc91b91eed0e500a9681040366eb7e696abc91b138484bc735da5eb13f0a79ec1ded6f3c36dd3c8f8565113d7cf SHA512 2960a937ec04bc96a3564d2c730ca53cd1369f26d47567cd08c8e90abaf126f336a083e297b4240b5fae22ab3ad3cb45d741f2f48364d30f1442df393109a6eb
diff --git a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch b/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
deleted file mode 100644
index d0f59a6f9..000000000
--- a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12a78e5e745556c29e45b7716a8b038ecfbff800 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Wed, 5 Aug 2020 18:39:44 +0100
-Subject: [PATCH] cmake: Use job pool feature to limit concurrent jobs
-
-Add two new options, MONERO_PARALLEL_COMPILE_JOBS and
-MONERO_PARALLEL_LINK_JOBS to try and prevent running out of memory when
-building everything.
-
-Requires >= cmake 3.0.0, and the use of the Ninja generator.
-
-Useful links:
-
-* https://cmake.org/cmake/help/latest/prop_gbl/JOB_POOLS.html
-* https://reviews.llvm.org/D6304
----
- CMakeLists.txt | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f63c07a35d..3729a6b659 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,20 @@ else()
- message(STATUS "ccache deselected")
- endif()
-
-+if (${CMAKE_VERSION} VERSION_GREATER "3.0.0" AND CMAKE_MAKE_PROGRAM MATCHES "ninja")
-+ set(MONERO_PARALLEL_COMPILE_JOBS "" CACHE STRING "The maximum number of concurrent compilation jobs.")
-+ if (MONERO_PARALLEL_COMPILE_JOBS)
-+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${MONERO_PARALLEL_COMPILE_JOBS})
-+ set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
-+ endif ()
-+
-+ set(MONERO_PARALLEL_LINK_JOBS "" CACHE STRING "The maximum number of concurrent link jobs.")
-+ if (MONERO_PARALLEL_LINK_JOBS)
-+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${MONERO_PARALLEL_LINK_JOBS})
-+ set(CMAKE_JOB_POOL_LINK link_job_pool)
-+ endif ()
-+endif()
-+
- enable_language(C ASM)
-
- function (die msg)
diff --git a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
deleted file mode 100644
index ea7f80499..000000000
--- a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,7 +312,7 @@ endif()
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- # set(BSDI TRUE)
-
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
-
- if(APPLE)
- include_directories(SYSTEM /usr/include/malloc)
-@@ -995,7 +995,6 @@ if(SODIUM_LIBRARY)
- set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
-
--include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,19 +37,7 @@
-
- find_package(Miniupnpc REQUIRED)
-
--message(STATUS "Using in-tree miniupnpc")
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--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 "miniupnpc" PARENT_SCOPE)
-
- find_package(Unbound)
-
-@@ -81,4 +69,3 @@ endif()
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
-diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
-index 3b33fe90a..ba354a0e8 100644
---- a/src/crypto/CMakeLists.txt
-+++ b/src/crypto/CMakeLists.txt
-@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S)
- endif()
-
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
-
- set(crypto_headers)
-
-@@ -116,6 +117,3 @@ endif()
-
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
-
- #include <cstddef>
--#include "crypto/wallet/ops.h"
-
- namespace crypto {
- namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -72,7 +72,7 @@ target_link_libraries(device
- ${HIDAPI_LIBRARIES}
- cncrypto
- ringct_basic
-- wallet-crypto
-+ monero-crypto
- ${OPENSSL_CRYPTO_LIBRARIES}
- ${Boost_SERIALIZATION_LIBRARY}
- PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -60,9 +60,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
-
--#include <miniupnp/miniupnpc/miniupnpc.h>
--#include <miniupnp/miniupnpc/upnpcommands.h>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+#include <miniupnpc/miniupnpc.h>
-+#include <miniupnpc/upnpcommands.h>
-+#include <miniupnpc/upnperrors.h>
-
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
deleted file mode 100644
index 07a584a39..000000000
--- a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c28d2f7c110c0a2161fa02d6c20df94a60a41965 Mon Sep 17 00:00:00 2001
-From: loqs <loqs@users.noreply.github.com>
-Date: Sun, 23 May 2021 20:29:17 +0100
-Subject: [PATCH] Fix boost 1.76.0 compatibility
-
-Add missing header boost/mpl/contains.hpp
-monero-project/monero/issues/7728
----
- contrib/epee/include/storages/portable_storage.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
-index 1e68605abf5..801bb2c3465 100644
---- a/contrib/epee/include/storages/portable_storage.h
-+++ b/contrib/epee/include/storages/portable_storage.h
-@@ -40,6 +40,8 @@
- #include "span.h"
- #include "int-util.h"
-
-+#include <boost/mpl/contains.hpp>
-+
- namespace epee
- {
- namespace serialization
diff --git a/net-p2p/monero/files/monero-0.17.3.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
similarity index 100%
rename from net-p2p/monero/files/monero-0.17.3.0-unbundle-dependencies.patch
rename to net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
diff --git a/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch
deleted file mode 100644
index 181b4ddcc..000000000
--- a/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -382,7 +382,7 @@
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- # set(BSDI TRUE)
-
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
-
- if(APPLE)
- include_directories(SYSTEM /usr/include/malloc)
-@@ -1082,7 +1082,6 @@
- set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
-
--include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,21 +37,7 @@
-
- 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()
--
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
-
- find_package(Unbound)
-
-@@ -83,4 +69,3 @@
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
---- a/src/crypto/CMakeLists.txt 2022-08-15 18:09:12.275043765 +0200
-+++ b/src/crypto/CMakeLists.txt 2022-08-15 18:10:52.687184277 +0200
-@@ -55,6 +55,7 @@
- endif()
-
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
-
- set(crypto_headers)
-
-@@ -97,6 +98,3 @@
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
- set_property(SOURCE CryptonightR_template.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
-
- #include <cstddef>
--#include "crypto/wallet/ops.h"
-
- namespace crypto {
- namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -73,7 +73,7 @@
- cncrypto
- cryptonote_format_utils_basic
- ringct_basic
-- wallet-crypto
-+ monero-crypto
- ${OPENSSL_CRYPTO_LIBRARIES}
- ${Boost_SERIALIZATION_LIBRARY}
- PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -61,9 +61,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
-
--#include <miniupnp/miniupnpc/miniupnpc.h>
--#include <miniupnp/miniupnpc/upnpcommands.h>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+#include <miniupnpc/miniupnpc.h>
-+#include <miniupnpc/upnpcommands.h>
-+#include <miniupnpc/upnperrors.h>
-
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch b/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch
deleted file mode 100644
index 8ac44be8e..000000000
--- a/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c32befe4f8385f5f893c0db611060bc7c7b425f3 Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Sat, 6 May 2023 18:13:18 +0200
-Subject: [PATCH] fix missing <cstdint> includes
-
----
- contrib/epee/include/file_io_utils.h | 1 +
- contrib/epee/include/storages/parserse_base_utils.h | 1 +
- src/common/combinator.h | 1 +
- src/wallet/api/wallet2_api.h | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h
-index da05520c1b9..de95e58c3ea 100644
---- a/contrib/epee/include/file_io_utils.h
-+++ b/contrib/epee/include/file_io_utils.h
-@@ -29,6 +29,7 @@
-
- #include <string>
- #include <ctime>
-+#include <cstdint>
-
- namespace epee
- {
-diff --git a/contrib/epee/include/storages/parserse_base_utils.h b/contrib/epee/include/storages/parserse_base_utils.h
-index 898813ff9fd..4658eba77ad 100644
---- a/contrib/epee/include/storages/parserse_base_utils.h
-+++ b/contrib/epee/include/storages/parserse_base_utils.h
-@@ -30,6 +30,7 @@
-
- #include <boost/utility/string_ref_fwd.hpp>
- #include <string>
-+#include <cstdint>
-
- namespace epee
- {
-diff --git a/src/common/combinator.h b/src/common/combinator.h
-index cb237ed8d40..6ef244a1ed1 100644
---- a/src/common/combinator.h
-+++ b/src/common/combinator.h
-@@ -34,6 +34,7 @@
- #include <iostream>
- #include <vector>
- #include <stdexcept>
-+#include <cstdint>
-
- namespace tools {
-
-diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
-index ab3d9732e8f..df86da847ea 100644
---- a/src/wallet/api/wallet2_api.h
-+++ b/src/wallet/api/wallet2_api.h
-@@ -38,6 +38,7 @@
- #include <ctime>
- #include <iostream>
- #include <stdexcept>
-+#include <cstdint>
-
- // Public interface for libwallet library
- namespace Monero {
diff --git a/net-p2p/monero/files/monero-0.18.1.2-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.3.3-unbundle-dependencies.patch
similarity index 100%
rename from net-p2p/monero/files/monero-0.18.1.2-unbundle-dependencies.patch
rename to net-p2p/monero/files/monero-0.18.3.3-unbundle-dependencies.patch
diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
deleted file mode 100644
index 6b1e9824b..000000000
--- a/net-p2p/monero/monero-0.17.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
- <dev-libs/boost-1.85:=[nls]
- dev-libs/libsodium:=
- dev-libs/openssl:=
- dev-libs/randomx
- dev-libs/rapidjson
- dev-libs/supercop
- net-dns/unbound:=[threads]
- net-libs/czmq:=
- net-libs/miniupnpc:=
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
- "${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- # TODO: Update CMake to install built libraries (help wanted)
- -DBUILD_SHARED_LIBS=OFF
- -DMANUAL_SUBMODULES=ON
- -DMONERO_PARALLEL_LINK_JOBS=1
- -DUSE_DEVICE_TREZOR=OFF
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- local targets=()
- use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
- use wallet-cli && targets+=(simplewallet)
- use wallet-rpc && targets+=(wallet_rpc_server)
- cmake_build ${targets[@]}
-}
-
-src_install() {
- einstalldocs
-
- # Install all binaries.
- find "${BUILD_DIR}/bin/" -type f -executable -print0 |
- while IFS= read -r -d '' line; do
- dobin "$line"
- done
-
- if use daemon; then
- dodoc utils/conf/monerod.conf
-
- # data-dir
- keepdir /var/lib/monero
- fowners monero:monero /var/lib/monero
- fperms 0755 /var/lib/monero
-
- # log-file dir
- keepdir /var/log/monero
- fowners monero:monero /var/log/monero
- fperms 0755 /var/log/monero
-
- # /etc/monero/monerod.conf
- insinto /etc/monero
- doins "${FILESDIR}/monerod.conf"
-
- # OpenRC
- newconfd "${FILESDIR}/monerod.confd" monerod
- newinitd "${FILESDIR}/monerod.initd" monerod
-
- # systemd
- systemd_dounit "${FILESDIR}/monerod.service"
- fi
-}
-
-pkg_postinst() {
- if use daemon; then
- elog "Start the Monero P2P daemon as a system service with"
- elog "'rc-service monerod start'. Enable it at startup with"
- elog "'rc-update add monerod default'."
- elog
- elog "Run monerod status as any user to get sync status and other stats."
- elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
- elog "in /var/lib/monero by default. You may want to enable pruning by adding"
- elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
- elog "or move the data directory to another disk."
- fi
-}
diff --git a/net-p2p/monero/monero-0.17.2.3.ebuild b/net-p2p/monero/monero-0.17.2.3.ebuild
deleted file mode 100644
index 6b1e9824b..000000000
--- a/net-p2p/monero/monero-0.17.2.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
- <dev-libs/boost-1.85:=[nls]
- dev-libs/libsodium:=
- dev-libs/openssl:=
- dev-libs/randomx
- dev-libs/rapidjson
- dev-libs/supercop
- net-dns/unbound:=[threads]
- net-libs/czmq:=
- net-libs/miniupnpc:=
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
- "${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- # TODO: Update CMake to install built libraries (help wanted)
- -DBUILD_SHARED_LIBS=OFF
- -DMANUAL_SUBMODULES=ON
- -DMONERO_PARALLEL_LINK_JOBS=1
- -DUSE_DEVICE_TREZOR=OFF
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- local targets=()
- use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
- use wallet-cli && targets+=(simplewallet)
- use wallet-rpc && targets+=(wallet_rpc_server)
- cmake_build ${targets[@]}
-}
-
-src_install() {
- einstalldocs
-
- # Install all binaries.
- find "${BUILD_DIR}/bin/" -type f -executable -print0 |
- while IFS= read -r -d '' line; do
- dobin "$line"
- done
-
- if use daemon; then
- dodoc utils/conf/monerod.conf
-
- # data-dir
- keepdir /var/lib/monero
- fowners monero:monero /var/lib/monero
- fperms 0755 /var/lib/monero
-
- # log-file dir
- keepdir /var/log/monero
- fowners monero:monero /var/log/monero
- fperms 0755 /var/log/monero
-
- # /etc/monero/monerod.conf
- insinto /etc/monero
- doins "${FILESDIR}/monerod.conf"
-
- # OpenRC
- newconfd "${FILESDIR}/monerod.confd" monerod
- newinitd "${FILESDIR}/monerod.initd" monerod
-
- # systemd
- systemd_dounit "${FILESDIR}/monerod.service"
- fi
-}
-
-pkg_postinst() {
- if use daemon; then
- elog "Start the Monero P2P daemon as a system service with"
- elog "'rc-service monerod start'. Enable it at startup with"
- elog "'rc-update add monerod default'."
- elog
- elog "Run monerod status as any user to get sync status and other stats."
- elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
- elog "in /var/lib/monero by default. You may want to enable pruning by adding"
- elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
- elog "or move the data directory to another disk."
- fi
-}
diff --git a/net-p2p/monero/monero-0.17.3.0.ebuild b/net-p2p/monero/monero-0.17.3.0.ebuild
deleted file mode 100644
index 654199f4f..000000000
--- a/net-p2p/monero/monero-0.17.3.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
- <dev-libs/boost-1.85:=[nls]
- dev-libs/libsodium:=
- dev-libs/openssl:=
- dev-libs/randomx
- dev-libs/rapidjson
- dev-libs/supercop
- net-dns/unbound:=[threads]
- net-libs/czmq:=
- net-libs/miniupnpc:=
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.17.3.0-unbundle-dependencies.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- # TODO: Update CMake to install built libraries (help wanted)
- -DBUILD_SHARED_LIBS=OFF
- -DMANUAL_SUBMODULES=ON
- -DUSE_DEVICE_TREZOR=OFF
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- local targets=()
- use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
- use wallet-cli && targets+=(simplewallet)
- use wallet-rpc && targets+=(wallet_rpc_server)
- cmake_build ${targets[@]}
-}
-
-src_install() {
- einstalldocs
-
- # Install all binaries.
- find "${BUILD_DIR}/bin/" -type f -executable -print0 |
- while IFS= read -r -d '' line; do
- dobin "$line"
- done
-
- if use daemon; then
- dodoc utils/conf/monerod.conf
-
- # data-dir
- keepdir /var/lib/monero
- fowners monero:monero /var/lib/monero
- fperms 0755 /var/lib/monero
-
- # log-file dir
- keepdir /var/log/monero
- fowners monero:monero /var/log/monero
- fperms 0755 /var/log/monero
-
- # /etc/monero/monerod.conf
- insinto /etc/monero
- doins "${FILESDIR}/monerod.conf"
-
- # OpenRC
- newconfd "${FILESDIR}/monerod.confd" monerod
- newinitd "${FILESDIR}/monerod.initd" monerod
-
- # systemd
- systemd_dounit "${FILESDIR}/monerod.service"
- fi
-}
-
-pkg_postinst() {
- if use daemon; then
- elog "Start the Monero P2P daemon as a system service with"
- elog "'rc-service monerod start'. Enable it at startup with"
- elog "'rc-update add monerod default'."
- elog
- elog "Run monerod status as any user to get sync status and other stats."
- elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
- elog "in /var/lib/monero by default. You may want to enable pruning by adding"
- elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
- elog "or move the data directory to another disk."
- fi
-}
diff --git a/net-p2p/monero/monero-0.17.3.2.ebuild b/net-p2p/monero/monero-0.17.3.2.ebuild
index a8253123a..d05784e9e 100644
--- a/net-p2p/monero/monero-0.17.3.2.ebuild
+++ b/net-p2p/monero/monero-0.17.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,14 +34,14 @@ DEPEND="
dev-libs/supercop
net-dns/unbound:=[threads]
net-libs/czmq:=
- net-libs/miniupnpc:=
+ <net-libs/miniupnpc-2.2.8:=
readline? ( sys-libs/readline:0= )
"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-0.17.3.0-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.17.3.2-unbundle-dependencies.patch"
)
src_configure() {
diff --git a/net-p2p/monero/monero-0.18.1.2.ebuild b/net-p2p/monero/monero-0.18.1.2.ebuild
deleted file mode 100644
index 7d2e23515..000000000
--- a/net-p2p/monero/monero-0.18.1.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/monero-project/monero/commit/96677fffcd436c5c108718b85419c5dbf5da9df2.patch -> ${PN}-8682.patch"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
- <dev-libs/boost-1.85:=[nls]
- dev-libs/libsodium:=
- dev-libs/openssl:=
- dev-libs/randomx
- dev-libs/rapidjson
- dev-libs/supercop
- net-dns/unbound:=[threads]
- net-libs/czmq:=
- net-libs/miniupnpc:=
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
- "${DISTDIR}/${PN}-8682.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- # TODO: Update CMake to install built libraries (help wanted)
- -DBUILD_SHARED_LIBS=OFF
- -DMANUAL_SUBMODULES=ON
- -DUSE_DEVICE_TREZOR=OFF
- )
-
- use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
- cmake_src_configure
-}
-
-src_compile() {
- local targets=()
- use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
- use wallet-cli && targets+=(simplewallet)
- use wallet-rpc && targets+=(wallet_rpc_server)
- cmake_build ${targets[@]}
-}
-
-src_install() {
- einstalldocs
-
- # Install all binaries.
- find "${BUILD_DIR}/bin/" -type f -executable -print0 |
- while IFS= read -r -d '' line; do
- dobin "$line"
- done
-
- if use daemon; then
- dodoc utils/conf/monerod.conf
-
- # data-dir
- keepdir /var/lib/monero
- fowners monero:monero /var/lib/monero
- fperms 0755 /var/lib/monero
-
- # log-file dir
- keepdir /var/log/monero
- fowners monero:monero /var/log/monero
- fperms 0755 /var/log/monero
-
- # /etc/monero/monerod.conf
- insinto /etc/monero
- doins "${FILESDIR}/monerod.conf"
-
- # OpenRC
- newconfd "${FILESDIR}/monerod.confd" monerod
- newinitd "${FILESDIR}/monerod.initd" monerod
-
- # systemd
- systemd_dounit "${FILESDIR}/monerod.service"
- fi
-}
-
-pkg_postinst() {
- if use daemon; then
- elog "Start the Monero P2P daemon as a system service with"
- elog "'rc-service monerod start'. Enable it at startup with"
- elog "'rc-update add monerod default'."
- elog
- elog "Run monerod status as any user to get sync status and other stats."
- elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
- elog "in /var/lib/monero by default. You may want to enable pruning by adding"
- elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
- elog "or move the data directory to another disk."
- fi
-}
diff --git a/net-p2p/monero/monero-0.18.2.0.ebuild b/net-p2p/monero/monero-0.18.2.0.ebuild
deleted file mode 100644
index cb583f3e9..000000000
--- a/net-p2p/monero/monero-0.18.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
- <dev-libs/boost-1.85:=[nls]
- dev-libs/libsodium:=
- dev-libs/openssl:=
- dev-libs/randomx
- dev-libs/rapidjson
- dev-libs/supercop
- net-dns/unbound:=[threads]
- net-libs/czmq:=
- net-libs/miniupnpc:=
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- # TODO: Update CMake to install built libraries (help wanted)
- -DBUILD_SHARED_LIBS=OFF
- -DMANUAL_SUBMODULES=ON
- -DUSE_DEVICE_TREZOR=OFF
- )
-
- use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
- cmake_src_configure
-}
-
-src_compile() {
- local targets=()
- use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
- use wallet-cli && targets+=(simplewallet)
- use wallet-rpc && targets+=(wallet_rpc_server)
- cmake_build ${targets[@]}
-}
-
-src_install() {
- einstalldocs
-
- # Install all binaries.
- find "${BUILD_DIR}/bin/" -type f -executable -print0 |
- while IFS= read -r -d '' line; do
- dobin "$line"
- done
-
- if use daemon; then
- dodoc utils/conf/monerod.conf
-
- # data-dir
- keepdir /var/lib/monero
- fowners monero:monero /var/lib/monero
- fperms 0755 /var/lib/monero
-
- # log-file dir
- keepdir /var/log/monero
- fowners monero:monero /var/log/monero
- fperms 0755 /var/log/monero
-
- # /etc/monero/monerod.conf
- insinto /etc/monero
- doins "${FILESDIR}/monerod.conf"
-
- # OpenRC
- newconfd "${FILESDIR}/monerod.confd" monerod
- newinitd "${FILESDIR}/monerod.initd" monerod
-
- # systemd
- systemd_dounit "${FILESDIR}/monerod.service"
- fi
-}
-
-pkg_postinst() {
- if use daemon; then
- elog "Start the Monero P2P daemon as a system service with"
- elog "'rc-service monerod start'. Enable it at startup with"
- elog "'rc-update add monerod default'."
- elog
- elog "Run monerod status as any user to get sync status and other stats."
- elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
- elog "in /var/lib/monero by default. You may want to enable pruning by adding"
- elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
- elog "or move the data directory to another disk."
- fi
-}
diff --git a/net-p2p/monero/monero-0.18.2.2.ebuild b/net-p2p/monero/monero-0.18.2.2.ebuild
deleted file mode 100644
index b2dafb62a..000000000
--- a/net-p2p/monero/monero-0.18.2.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
- <dev-libs/boost-1.85:=[nls]
- dev-libs/libsodium:=
- dev-libs/openssl:=
- dev-libs/randomx
- dev-libs/rapidjson
- dev-libs/supercop
- net-dns/unbound:=[threads]
- net-libs/czmq:=
- net-libs/miniupnpc:=
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
- "${FILESDIR}/${P}-cstdint.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- # TODO: Update CMake to install built libraries (help wanted)
- -DBUILD_SHARED_LIBS=OFF
- -DMANUAL_SUBMODULES=ON
- -DUSE_DEVICE_TREZOR=OFF
- )
-
- use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
- cmake_src_configure
-}
-
-src_compile() {
- local targets=()
- use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
- use wallet-cli && targets+=(simplewallet)
- use wallet-rpc && targets+=(wallet_rpc_server)
- cmake_build ${targets[@]}
-}
-
-src_install() {
- einstalldocs
-
- # Install all binaries.
- find "${BUILD_DIR}/bin/" -type f -executable -print0 |
- while IFS= read -r -d '' line; do
- dobin "$line"
- done
-
- if use daemon; then
- dodoc utils/conf/monerod.conf
-
- # data-dir
- keepdir /var/lib/monero
- fowners monero:monero /var/lib/monero
- fperms 0755 /var/lib/monero
-
- # log-file dir
- keepdir /var/log/monero
- fowners monero:monero /var/log/monero
- fperms 0755 /var/log/monero
-
- # /etc/monero/monerod.conf
- insinto /etc/monero
- doins "${FILESDIR}/monerod.conf"
-
- # OpenRC
- newconfd "${FILESDIR}/monerod.confd" monerod
- newinitd "${FILESDIR}/monerod.initd" monerod
-
- # systemd
- systemd_dounit "${FILESDIR}/monerod.service"
- fi
-}
-
-pkg_postinst() {
- if use daemon; then
- elog "Start the Monero P2P daemon as a system service with"
- elog "'rc-service monerod start'. Enable it at startup with"
- elog "'rc-update add monerod default'."
- elog
- elog "Run monerod status as any user to get sync status and other stats."
- elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
- elog "in /var/lib/monero by default. You may want to enable pruning by adding"
- elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
- elog "or move the data directory to another disk."
- fi
-}
diff --git a/net-p2p/monero/monero-0.18.3.1.ebuild b/net-p2p/monero/monero-0.18.3.1.ebuild
index f707b6a2c..5477acec3 100644
--- a/net-p2p/monero/monero-0.18.3.1.ebuild
+++ b/net-p2p/monero/monero-0.18.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
)
src_configure() {
diff --git a/net-p2p/monero/monero-0.18.3.3-r1.ebuild b/net-p2p/monero/monero-0.18.3.3-r1.ebuild
index 565af48f3..36b9f1e65 100644
--- a/net-p2p/monero/monero-0.18.3.3-r1.ebuild
+++ b/net-p2p/monero/monero-0.18.3.3-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
)
src_configure() {
diff --git a/net-p2p/monero/monero-9999.ebuild b/net-p2p/monero/monero-9999.ebuild
index df4d6cf6b..36b9f1e65 100644
--- a/net-p2p/monero/monero-9999.ebuild
+++ b/net-p2p/monero/monero-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,14 +19,14 @@ fi
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
+IUSE="+daemon hw-wallet readline +tools +wallet-cli +wallet-rpc"
REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
RESTRICT="test"
DEPEND="
acct-group/monero
acct-user/monero
- dev-libs/boost:=[nls]
+ <dev-libs/boost-1.85:=[nls]
dev-libs/libsodium:=
dev-libs/openssl:=
dev-libs/randomx
@@ -34,23 +34,31 @@ DEPEND="
dev-libs/supercop
net-dns/unbound:=[threads]
net-libs/czmq:=
- net-libs/miniupnpc:=
+ <net-libs/miniupnpc-2.2.8:=
readline? ( sys-libs/readline:0= )
+ hw-wallet? (
+ dev-libs/hidapi
+ dev-libs/protobuf:=
+ virtual/libusb:1
+ )
"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
+)
src_configure() {
local mycmakeargs=(
# TODO: Update CMake to install built libraries (help wanted)
-DBUILD_SHARED_LIBS=OFF
-DMANUAL_SUBMODULES=ON
- -DMONERO_PARALLEL_LINK_JOBS=1
- -DUSE_DEVICE_TREZOR=OFF
+ -DUSE_DEVICE_TREZOR=$(usex hw-wallet ON OFF)
)
+ use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
+
cmake_src_configure
}
@@ -106,7 +114,7 @@ pkg_postinst() {
elog
elog "Run monerod status as any user to get sync status and other stats."
elog
- elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
+ elog "The Monero blockchain can take up a lot of space (200 GiB) and is stored"
elog "in /var/lib/monero by default. You may want to enable pruning by adding"
elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
elog "or move the data directory to another disk."
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2025-03-31 10:07 David Roman
0 siblings, 0 replies; 7+ messages in thread
From: David Roman @ 2025-03-31 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 5d797b1469d3ed59dcd95cad89605ea9a9a31f1b
Author: Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Sun Mar 30 23:32:44 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Mar 30 23:32:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5d797b14
net-p2p/monero: bump to 0.18.4.0
Signed-off-by: Sergey Alirzaev <l29ah <AT> riseup.net>
net-p2p/monero/Manifest | 1 +
.../monero-0.18.4.0-unbundle-dependencies.patch | 103 +++++++++++++++++++++
.../{monero-9999.ebuild => monero-0.18.4.0.ebuild} | 2 +-
net-p2p/monero/monero-9999.ebuild | 2 +-
4 files changed, 106 insertions(+), 2 deletions(-)
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index f9cccb695..900f20ab0 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1 +1,2 @@
DIST monero-0.18.3.4.tar.gz 14039924 BLAKE2B cb60f1db4f482bac3b3f5fa606bf1c78103b14f927d4636e5fda4aa96dcc08a9f990355ceb1cdc8c253245a0a2a1c98cf4fd7101d13d78ac6e7d1450192fc2db SHA512 f2708bf7698410c1509ae41148c298e352b3401e1df900b7152c25cb5ceb2f5bde68274fd37b1a328e932be50bdf93fe364561c520a15e3df7de2cdbd20d1be8
+DIST monero-0.18.4.0.tar.gz 14083573 BLAKE2B 6edd37cf89305dabddf04aa454a605f578276a924f703025b906612438de9dce12c854127b851ae0a71eb4b7aac6c9aa1bb7beb0d6ed311a55c19387117c2ba0 SHA512 6d17654a37d1a3aec37f641a58026a5f602e13836bdc50223ce6bf82ad9be9db2cf5abadd6b7bc963f4bfc0e18aa76298d89050686f6563d0567d2745e0512eb
diff --git a/net-p2p/monero/files/monero-0.18.4.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.4.0-unbundle-dependencies.patch
new file mode 100644
index 000000000..744f2da20
--- /dev/null
+++ b/net-p2p/monero/files/monero-0.18.4.0-unbundle-dependencies.patch
@@ -0,0 +1,103 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -458,7 +458,7 @@
+ # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
+ # set(BSDI TRUE)
+
+-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
++include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
+
+ if(APPLE)
+ cmake_policy(SET CMP0042 NEW)
+@@ -1201,7 +1201,6 @@
+ set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
+ endif()
+
+-include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
+ add_subdirectory(contrib)
+ add_subdirectory(src)
+
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -37,22 +37,7 @@
+
+ find_package(Miniupnpc REQUIRED)
+
+-message(STATUS "Using in-tree miniupnpc")
+-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
+-set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" 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 "miniupnpc" PARENT_SCOPE)
+
+ find_package(Unbound)
+
+@@ -69,4 +55,3 @@
+ add_subdirectory(db_drivers)
+ add_subdirectory(easylogging++)
+ add_subdirectory(qrcodegen)
+-add_subdirectory(randomx EXCLUDE_FROM_ALL)
+--- a/src/crypto/CMakeLists.txt
++++ b/src/crypto/CMakeLists.txt
+@@ -55,6 +55,7 @@
+ endif()
+
+ include_directories(${RANDOMX_INCLUDE})
++include_directories(SYSTEM /usr/include/monero)
+
+ set(crypto_headers)
+
+@@ -97,6 +98,3 @@
+ # cheat because cmake and ccache hate each other
+ set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
+ set_property(SOURCE CryptonightR_template.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
+-
+-# Must be done last, because it references libraries in this directory
+-add_subdirectory(wallet)
+--- a/src/crypto/wallet/crypto.h
++++ b/src/crypto/wallet/crypto.h
+@@ -30,7 +30,6 @@
+ #pragma once
+
+ #include <cstddef>
+-#include "crypto/wallet/ops.h"
+
+ namespace crypto {
+ namespace wallet {
+--- a/src/device/CMakeLists.txt
++++ b/src/device/CMakeLists.txt
+@@ -73,7 +73,7 @@
+ cncrypto
+ cryptonote_format_utils_basic
+ ringct_basic
+- wallet-crypto
++ monero-crypto
+ ${OPENSSL_CRYPTO_LIBRARIES}
+ ${Boost_SERIALIZATION_LIBRARY}
+ PRIVATE
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -60,9 +60,9 @@
+ #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
+
+-#include <miniupnp/miniupnpc/miniupnpc.h>
+-#include <miniupnp/miniupnpc/upnpcommands.h>
+-#include <miniupnp/miniupnpc/upnperrors.h>
++#include <miniupnpc/miniupnpc.h>
++#include <miniupnpc/upnpcommands.h>
++#include <miniupnpc/upnperrors.h>
+
+ #undef MONERO_DEFAULT_LOG_CATEGORY
+ #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/net-p2p/monero/monero-9999.ebuild b/net-p2p/monero/monero-0.18.4.0.ebuild
similarity index 98%
copy from net-p2p/monero/monero-9999.ebuild
copy to net-p2p/monero/monero-0.18.4.0.ebuild
index bb6dec0e5..0a88c629d 100644
--- a/net-p2p/monero/monero-9999.ebuild
+++ b/net-p2p/monero/monero-0.18.4.0.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.18.4.0-unbundle-dependencies.patch"
"${FILESDIR}/${PN}-0.18.3.3-miniupnp-api-18.patch"
)
diff --git a/net-p2p/monero/monero-9999.ebuild b/net-p2p/monero/monero-9999.ebuild
index bb6dec0e5..0a88c629d 100644
--- a/net-p2p/monero/monero-9999.ebuild
+++ b/net-p2p/monero/monero-9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.18.4.0-unbundle-dependencies.patch"
"${FILESDIR}/${PN}-0.18.3.3-miniupnp-api-18.patch"
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2025-05-07 12:08 David Roman
0 siblings, 0 replies; 7+ messages in thread
From: David Roman @ 2025-05-07 12:08 UTC (permalink / raw
To: gentoo-commits
commit: e3ef9c0a09f4eee60d170b9fe19615b605417c33
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Tue May 6 16:46:29 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue May 6 17:58:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3ef9c0a
net-p2p/monero: add 0.18.4.0 with improvements
ebuild:
- adjust DEPENDs
- add libbsd, libmd
- swap czmq for zeromq
conf.d:
- capitalize variables
- comment out default values
init.d:
- move name & description to top
- use command_background instead of -bmp
- use command_user instead of -u user
- also fixed not chanigng group
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
net-p2p/monero/files/monerod-0.18.4.0.confd | 7 ++
net-p2p/monero/files/monerod-0.18.4.0.initd | 25 ++++++
net-p2p/monero/monero-0.18.4.0-r1.ebuild | 125 ++++++++++++++++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/net-p2p/monero/files/monerod-0.18.4.0.confd b/net-p2p/monero/files/monerod-0.18.4.0.confd
new file mode 100644
index 000000000..7a29d428e
--- /dev/null
+++ b/net-p2p/monero/files/monerod-0.18.4.0.confd
@@ -0,0 +1,7 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#MONEROD_USER=monero
+#MONEROD_GROUP=monero
+
+MONEROD_ARGS="--config-file /etc/monero/monerod.conf"
\ No newline at end of file
diff --git a/net-p2p/monero/files/monerod-0.18.4.0.initd b/net-p2p/monero/files/monerod-0.18.4.0.initd
new file mode 100644
index 000000000..d02c81d76
--- /dev/null
+++ b/net-p2p/monero/files/monerod-0.18.4.0.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Monero P2P Daemon"
+description="Connects to the Monero P2P network"
+
+pidfile=/var/run/monerod.pid
+command=/usr/bin/monerod
+command_args="--non-interactive ${MONEROD_ARGS}"
+command_background=1
+command_progress=1
+command_user="${MONEROD_USER:=monero}:${MONEROD_GROUP:=monero}"
+retry="SIGTERM/30/SIGKILL/5"
+
+
+depend() {
+ need localmount
+ need net
+}
+
+start_pre() {
+ checkpath --directory --owner ${command_user} --mode 0755 \
+ /var/lib/monero /var/log/monero
+}
diff --git a/net-p2p/monero/monero-0.18.4.0-r1.ebuild b/net-p2p/monero/monero-0.18.4.0-r1.ebuild
new file mode 100644
index 000000000..9f03849f1
--- /dev/null
+++ b/net-p2p/monero/monero-0.18.4.0-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="The secure, private, untraceable cryptocurrency"
+HOMEPAGE="https://github.com/monero-project/monero"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/monero-project/monero.git"
+ EGIT_SUBMODULES=()
+else
+ SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+daemon hw-wallet readline +tools +wallet-cli +wallet-rpc"
+REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
+RESTRICT="test"
+
+DEPEND="
+ acct-group/monero
+ acct-user/monero
+ app-crypt/libmd
+ dev-libs/boost:=[nls]
+ dev-libs/libsodium:=
+ dev-libs/libbsd
+ dev-libs/openssl:=
+ dev-libs/randomx
+ dev-libs/rapidjson
+ dev-libs/supercop
+ net-dns/unbound:=[threads]
+ net-libs/miniupnpc:=
+ net-libs/zeromq:=
+ readline? ( sys-libs/readline:0= )
+ hw-wallet? (
+ dev-libs/hidapi
+ dev-libs/protobuf:=
+ virtual/libusb:1
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.18.4.0-unbundle-dependencies.patch"
+ "${FILESDIR}/${PN}-0.18.3.3-miniupnp-api-18.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ # TODO: Update CMake to install built libraries (help wanted)
+ -DBUILD_SHARED_LIBS=OFF
+ -DMANUAL_SUBMODULES=ON
+ -DUSE_DEVICE_TREZOR=$(usex hw-wallet ON OFF)
+ )
+
+ use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ local targets=()
+ use daemon && targets+=(daemon)
+ use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
+ use wallet-cli && targets+=(simplewallet)
+ use wallet-rpc && targets+=(wallet_rpc_server)
+ cmake_build ${targets[@]}
+}
+
+src_install() {
+ einstalldocs
+
+ # Install all binaries.
+ find "${BUILD_DIR}/bin/" -type f -executable -print0 |
+ while IFS= read -r -d '' line; do
+ dobin "$line"
+ done
+
+ if use daemon; then
+ dodoc utils/conf/monerod.conf
+
+ # data-dir
+ keepdir /var/lib/monero
+ fowners monero:monero /var/lib/monero
+ fperms 0755 /var/lib/monero
+
+ # log-file dir
+ keepdir /var/log/monero
+ fowners monero:monero /var/log/monero
+ fperms 0755 /var/log/monero
+
+ # /etc/monero/monerod.conf
+ insinto /etc/monero
+ doins "${FILESDIR}/monerod.conf"
+
+ # OpenRC
+ newconfd "${FILESDIR}/monerod-0.18.4.0.confd" monerod
+ newinitd "${FILESDIR}/monerod-0.18.4.0.initd" monerod
+
+ # systemd
+ systemd_dounit "${FILESDIR}/monerod.service"
+ fi
+}
+
+pkg_postinst() {
+ if use daemon; then
+ elog "Start the Monero P2P daemon as a system service with"
+ elog "'rc-service monerod start'. Enable it at startup with"
+ elog "'rc-update add monerod default'."
+ elog
+ elog "Run monerod status as any user to get sync status and other stats."
+ elog
+ elog "The Monero blockchain can take up a lot of space (250 GiB) and is stored"
+ elog "in /var/lib/monero by default. You may want to enable pruning by adding"
+ elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
+ elog "or move the data directory to another disk."
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2025-06-03 8:50 David Roman
0 siblings, 0 replies; 7+ messages in thread
From: David Roman @ 2025-06-03 8:50 UTC (permalink / raw
To: gentoo-commits
commit: a4fe4a41ef77b2487eb9672e40fb2ac07f7f09fe
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Mon Jun 2 14:44:53 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jun 2 14:47:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4fe4a41
net-p2p/monero: init.d swap `need net` to `use net`
daemon does not not need to restart when net restarts
also fix ExcessiveLineLength
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
net-p2p/monero/files/monerod-0.18.4.0.initd | 2 +-
.../monero/{monero-0.18.4.0-r1.ebuild => monero-0.18.4.0-r2.ebuild} | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net-p2p/monero/files/monerod-0.18.4.0.initd b/net-p2p/monero/files/monerod-0.18.4.0.initd
index d02c81d762..a066695285 100644
--- a/net-p2p/monero/files/monerod-0.18.4.0.initd
+++ b/net-p2p/monero/files/monerod-0.18.4.0.initd
@@ -16,7 +16,7 @@ retry="SIGTERM/30/SIGKILL/5"
depend() {
need localmount
- need net
+ use net
}
start_pre() {
diff --git a/net-p2p/monero/monero-0.18.4.0-r1.ebuild b/net-p2p/monero/monero-0.18.4.0-r2.ebuild
similarity index 95%
rename from net-p2p/monero/monero-0.18.4.0-r1.ebuild
rename to net-p2p/monero/monero-0.18.4.0-r2.ebuild
index 9f03849f1b..f0e7e6f438 100644
--- a/net-p2p/monero/monero-0.18.4.0-r1.ebuild
+++ b/net-p2p/monero/monero-0.18.4.0-r2.ebuild
@@ -68,7 +68,9 @@ src_configure() {
src_compile() {
local targets=()
use daemon && targets+=(daemon)
- use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
+ use tools && targets+=(
+ blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage}
+ )
use wallet-cli && targets+=(simplewallet)
use wallet-rpc && targets+=(wallet_rpc_server)
cmake_build ${targets[@]}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2025-06-08 7:36 Viorel Munteanu
0 siblings, 0 replies; 7+ messages in thread
From: Viorel Munteanu @ 2025-06-08 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 229763d2256ee36f7f47e09fe8d8b4a46c8cc9c7
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Sat Jun 7 22:23:44 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Jun 8 00:39:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=229763d2
net-p2p/monero: major improvements
ebuild:
- add USE=cpu_flags_x86_aes
- add comment about USE=test restrict
- require acct-{user,group} ony if USE=daemon
- shorten `usex readline`
- fix ineffective USE=readline
- do not build documentation
- disable ccache use
- declare targets more declaratively (src_compile)
- improve elog message by adding quotes for a command
- removed generic openrc elog
- quote just FILESDIR
init.d:
- pidfile: put in /run & guarantee uniqueness
- use command_args_background
- added custom status()
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
net-p2p/monero/files/monerod-0.18.4.0.initd | 13 ++-
net-p2p/monero/monero-0.18.4.0-r4.ebuild | 135 ++++++++++++++++++++++++++++
2 files changed, 145 insertions(+), 3 deletions(-)
diff --git a/net-p2p/monero/files/monerod-0.18.4.0.initd b/net-p2p/monero/files/monerod-0.18.4.0.initd
index 4631771b5a..baaea3b7ff 100644
--- a/net-p2p/monero/files/monerod-0.18.4.0.initd
+++ b/net-p2p/monero/files/monerod-0.18.4.0.initd
@@ -5,10 +5,11 @@
name="Monero P2P Daemon"
description="Connects to the Monero P2P network"
-pidfile=/var/run/monerod.pid
command=/usr/bin/monerod
+pidfile=/run/${RC_SVCNAME}/${RC_SVCNAME}.pid
+
command_args="--non-interactive ${MONEROD_ARGS}"
-command_background=1
+command_args_background="--detach --pidfile $pidfile"
command_progress=1
command_user="${MONEROD_USER:=monero}:${MONEROD_GROUP:=monero}"
retry="SIGTERM/30/SIGKILL/5"
@@ -21,5 +22,11 @@ depend() {
start_pre() {
checkpath --directory --owner ${command_user} --mode 0755 \
- /var/lib/monero /var/log/monero
+ /var/lib/monero /var/log/monero $(dirname ${pidfile})
+}
+
+status() {
+ if supervise_status; then
+ monerod status
+ fi
}
diff --git a/net-p2p/monero/monero-0.18.4.0-r4.ebuild b/net-p2p/monero/monero-0.18.4.0-r4.ebuild
new file mode 100644
index 0000000000..e5a9939dfa
--- /dev/null
+++ b/net-p2p/monero/monero-0.18.4.0-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="The secure, private, untraceable cryptocurrency"
+HOMEPAGE="https://github.com/monero-project/monero"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/monero-project/monero.git"
+ EGIT_SUBMODULES=()
+else
+ SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+daemon hw-wallet readline +tools +wallet-cli +wallet-rpc cpu_flags_x86_aes"
+REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
+RESTRICT="test"
+# Test requires python's requests, psutil, deepdiff which are packaged
+# but also monotonic & zmq which we do not have
+
+DEPEND="
+ app-crypt/libmd
+ dev-libs/boost:=[nls]
+ dev-libs/libsodium:=
+ dev-libs/libbsd
+ dev-libs/openssl:=
+ dev-libs/randomx
+ dev-libs/rapidjson
+ dev-libs/supercop
+ net-dns/unbound:=[threads]
+ net-libs/miniupnpc:=
+ net-libs/zeromq:=
+ daemon? (
+ acct-group/monero
+ acct-user/monero
+ )
+ readline? ( sys-libs/readline:= )
+ hw-wallet? (
+ dev-libs/hidapi
+ dev-libs/protobuf:=
+ virtual/libusb:1
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig
+ <dev-build/cmake-4
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.3.3-miniupnp-api-18.patch
+ "${FILESDIR}"/${PN}-0.18.4.0-unbundle-dependencies.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ # TODO: Update CMake to install built libraries (help wanted)
+ -DBUILD_SHARED_LIBS=OFF
+ -DMANUAL_SUBMODULES=ON
+ -DUSE_CCACHE=OFF
+ -DNO_AES=$(usex !cpu_flags_x86_aes)
+ -DBUILD_DOCUMENTATION=OFF # we don't install it either way
+ -DUSE_DEVICE_TREZOR=$(usex hw-wallet)
+ -DUSE_READLINE=$(usex readline)
+ )
+
+ use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ local targets=(
+ $(usev daemon)
+ $(usev wallet-cli simplewallet)
+ $(usev wallet-rpc wallet_rpc_server)
+ )
+ use tools && targets+=(
+ blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage}
+ )
+
+ cmake_build ${targets[@]}
+}
+
+src_install() {
+ einstalldocs
+
+ # Install all binaries.
+ find "${BUILD_DIR}/bin/" -type f -executable -print0 |
+ while IFS= read -r -d '' line; do
+ dobin "$line"
+ done
+
+ if use daemon; then
+ dodoc utils/conf/monerod.conf
+
+ # data-dir
+ keepdir /var/lib/monero
+ fowners monero:monero /var/lib/monero
+ fperms 0755 /var/lib/monero
+
+ # log-file dir
+ keepdir /var/log/monero
+ fowners monero:monero /var/log/monero
+ fperms 0755 /var/log/monero
+
+ # /etc/monero/monerod.conf
+ insinto /etc/monero
+ doins "${FILESDIR}"/monerod.conf
+
+ # OpenRC
+ newconfd "${FILESDIR}"/monerod-0.18.4.0.confd monerod
+ newinitd "${FILESDIR}"/monerod-0.18.4.0.initd monerod
+
+ # systemd
+ systemd_dounit "${FILESDIR}"/monerod.service
+ fi
+}
+
+pkg_postinst() {
+ if use daemon; then
+ elog "Run 'monerod status' as any user to get sync status and other stats."
+ elog
+ elog "The Monero blockchain can take up a lot of space (250 GiB) and is stored"
+ elog "in /var/lib/monero by default. You may want to enable pruning by adding"
+ elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
+ elog "or move the data directory to another disk."
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/
@ 2025-06-08 7:36 Viorel Munteanu
0 siblings, 0 replies; 7+ messages in thread
From: Viorel Munteanu @ 2025-06-08 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 6e52316eca45830f85fe9d35bf348cc7238f5150
Author: Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Sun Jun 8 01:29:04 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Jun 8 01:29:04 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e52316e
net-p2p/monero: fixed building with cmake-4
Signed-off-by: Sergey Alirzaev <l29ah <AT> riseup.net>
net-p2p/monero/files/monero-0.18.4.0-cmake-4.patch | 22 ++++++++++++++++++++++
net-p2p/monero/monero-0.18.4.0-r4.ebuild | 5 ++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/net-p2p/monero/files/monero-0.18.4.0-cmake-4.patch b/net-p2p/monero/files/monero-0.18.4.0-cmake-4.patch
new file mode 100644
index 0000000000..3a97c82f86
--- /dev/null
+++ b/net-p2p/monero/files/monero-0.18.4.0-cmake-4.patch
@@ -0,0 +1,22 @@
+From 0d0a656618e396de7ff60368dde708ad9d45f866 Mon Sep 17 00:00:00 2001
+From: cyan <cyjan@mrcyjanek.net>
+Date: Tue, 1 Apr 2025 09:22:19 +0000
+Subject: [PATCH] build: set cmake_minimum_required(VERSION 3.5) consistently
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37ad0a23e2c..46bd5eb1bb2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -219,7 +219,7 @@ function(forbid_undefined_symbols)
+ file(MAKE_DIRECTORY "${TEST_PROJECT}")
+ file(WRITE "${TEST_PROJECT}/CMakeLists.txt"
+ [=[
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ project(test)
+ option(EXPECT_SUCCESS "" ON)
+ file(WRITE "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }")
diff --git a/net-p2p/monero/monero-0.18.4.0-r4.ebuild b/net-p2p/monero/monero-0.18.4.0-r4.ebuild
index e5a9939dfa..f00ea18a8e 100644
--- a/net-p2p/monero/monero-0.18.4.0-r4.ebuild
+++ b/net-p2p/monero/monero-0.18.4.0-r4.ebuild
@@ -49,13 +49,12 @@ DEPEND="
)
"
RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig
- <dev-build/cmake-4
-"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-0.18.3.3-miniupnp-api-18.patch
"${FILESDIR}"/${PN}-0.18.4.0-unbundle-dependencies.patch
+ "${FILESDIR}"/${PN}-0.18.4.0-cmake-4.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-06-08 7:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-07 12:08 [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/files/, net-p2p/monero/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2025-06-08 7:36 Viorel Munteanu
2025-06-08 7:36 Viorel Munteanu
2025-06-03 8:50 David Roman
2025-03-31 10:07 David Roman
2024-07-27 17:46 David Roman
2024-07-27 17:46 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox