net-p2p/monero: add 0.18.3.4, drop 0.18.3.3

12 files changed, 2 insertions, 192 deletions

diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index d432b4ec..28bb0c77 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1,5 +1,5 @@
-DIST monero-0.18.3.3.tar.gz 14028018 BLAKE2B 07c3272175fb05645a2f5f7ce6cef4d65054ba1d80994c4dc8445ec4df13aebe2b268d5b4be49db0cdd35dcdce1bbd33874111e21503839d63fae70ea30b0dff SHA512 26aaa02be4d1109dfdae08981b9fee16a10c358030ba99ae809eb241e805c50edc8ad10b1a375cd02e3160fa3de8ae6773cca55618d39ca30614f1d6662c18e5
-DIST monero-gui-0.18.3.3.tar.gz 6705524 BLAKE2B 616a153e797a0dcf44d3528fd553fc9fc6f41e13a7d81b427a5344d455a68685e8323a26019da29d25567884390036f1779b4aebc0a9d0cc9fc32612ceb8517f SHA512 c067ddf5a8abc5b90f5c1b5c20ba5f050e6591ba93f551156f31b53e963fca13dd3e5fd14271273c81e220774cd90ae720c58bf33c19c6fafbaac2cae5e9838f
+DIST monero-0.18.3.4.tar.gz 14039924 BLAKE2B cb60f1db4f482bac3b3f5fa606bf1c78103b14f927d4636e5fda4aa96dcc08a9f990355ceb1cdc8c253245a0a2a1c98cf4fd7101d13d78ac6e7d1450192fc2db SHA512 f2708bf7698410c1509ae41148c298e352b3401e1df900b7152c25cb5ceb2f5bde68274fd37b1a328e932be50bdf93fe364561c520a15e3df7de2cdbd20d1be8
+DIST monero-gui-0.18.3.4.tar.gz 7017813 BLAKE2B e6db9a4d9e0040fb68aee5262a251c156f0fcfbfb2f232a6800a52ac4dcfd3ae6a52dfe5873de57ff0c216a2dc271990ae775c926d4fae5594767e14961cec8c SHA512 edf8366b15794d5a69e68acc3c78eb502b32c68b236cf967a7760e39af42beaf558138e9e881bbb655291c1562218dbcd4313b45a90ec94221bd33c31682fd39
 DIST quirc-516d91a94d880ca1006fc1d57f318bdff8411f0d.tar.gz 42163 BLAKE2B 36f07063c376c51397958321e317c9f3a8718f192a16ade546add1b652a7252abeecebcb7c850b50b85c3b59b941456c4225a80aa301cdab5eb42c04e4725698 SHA512 30eb2905e03fd070ec160ad78bfba2ed973fe24fe63ab810bdb7bcec9e52da5ef042efbb50cce19fcfae13ffa531bcfb20421325e4a868856690d696f8e89eee
 DIST supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
 DIST trezor-common-028c9b2e95d83b4164748a12cfdc181f0dd11920.tar.gz 926880 BLAKE2B e2937f9e17fdf33e047084eec73bd4b75bb5e2a1ccb3ce03c9d731ddf2b93200f895de565c16913a0bb022e3662faa38777828912dc257124ea4196b23cc501c SHA512 d0fdc74dbcde444c852bf000123bc795d86a07993b79b18cc5cfb1535348059f3b7b5a4865892321c7ddc8a98be8f04e6cfbe224e7daae3aa292f40642afa609
diff --git a/net-p2p/monero/files/monero-0.18.3.3-common-support-boost-filesystem-copy_options.patch b/net-p2p/monero/files/monero-0.18.3.3-common-support-boost-filesystem-copy_options.patch
deleted file mode 100644
index 970c873d..00000000
--- a/net-p2p/monero/files/monero-0.18.3.3-common-support-boost-filesystem-copy_options.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From fcc20f5496fe97c01321963359631c4b22c4f0cf Mon Sep 17 00:00:00 2001
-From: 0xFFFC0000 <0xFFFC0000@proton.me>
-Date: Tue, 30 Apr 2024 23:20:10 +0000
-Subject: [PATCH] common: support boost filesystem copy_options.
- Co-authored-by: selsta <selsta@sent.at>
-
----
- src/common/boost_serialization_helper.h |  3 ++-
- src/common/util.cpp                     | 18 ++++++++++++++++++
- src/common/util.h                       |  2 ++
- src/p2p/net_peerlist.cpp                |  3 ++-
- src/wallet/wallet2.cpp                  |  4 ++--
- tests/unit_tests/wallet_storage.cpp     | 13 +++++++------
- 6 files changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/src/common/boost_serialization_helper.h b/src/common/boost_serialization_helper.h
-index 4a903107f3cb..1eca39f407b9 100644
---- a/src/common/boost_serialization_helper.h
-+++ b/src/common/boost_serialization_helper.h
-@@ -35,6 +35,7 @@
- #include <boost/archive/portable_binary_iarchive.hpp>
- #include <boost/filesystem/operations.hpp>
- 
-+#include "common/util.h"
- 
- namespace tools
- {
-@@ -110,7 +111,7 @@ namespace tools
-     catch(...)
-     {
-       // if failed, try reading in unportable mode
--      boost::filesystem::copy_file(file_path, file_path + ".unportable", boost::filesystem::copy_option::overwrite_if_exists);
-+      tools::copy_file(file_path, file_path + ".unportable");
-       data_file.close();
-       data_file.open( file_path, std::ios_base::binary | std::ios_base::in);
-       if(data_file.fail())
-diff --git a/src/common/util.cpp b/src/common/util.cpp
-index 4b5e2adb8a49..d5f35ea7aed2 100644
---- a/src/common/util.cpp
-+++ b/src/common/util.cpp
-@@ -115,6 +115,24 @@ static int flock_exnb(int fd)
- 
- namespace tools
- {
-+
-+  void copy_file(const std::string& from, const std::string& to)
-+  {
-+    using boost::filesystem::path;
-+  #if BOOST_VERSION < 107400
-+    // Remove this preprocessor if/else when we are bumping the boost version.
-+    boost::filesystem::copy_file(
-+        path(from),
-+        path(to),
-+        boost::filesystem::copy_option::overwrite_if_exists);
-+  #else
-+    boost::filesystem::copy_file(
-+        path(from),
-+        path(to),
-+        boost::filesystem::copy_options::overwrite_existing);
-+  #endif
-+  }
-+
-   std::function<void(int)> signal_handler::m_handler;
- 
-   private_file::private_file() noexcept : m_handle(), m_filename() {}
-diff --git a/src/common/util.h b/src/common/util.h
-index f489594e8901..cfc0fb6923c4 100644
---- a/src/common/util.h
-+++ b/src/common/util.h
-@@ -67,6 +67,8 @@ namespace tools
-     }
-   };
- 
-+  void copy_file(const std::string& from, const std::string& to);
-+
-   //! A file restricted to process owner AND process. Deletes file on destruction.
-   class private_file {
-     std::unique_ptr<std::FILE, close_file> m_handle;
-diff --git a/src/p2p/net_peerlist.cpp b/src/p2p/net_peerlist.cpp
-index 3e132c91faef..c803b0cda695 100644
---- a/src/p2p/net_peerlist.cpp
-+++ b/src/p2p/net_peerlist.cpp
-@@ -42,6 +42,7 @@
- #include <boost/serialization/version.hpp>
- 
- #include "net_peerlist_boost_serialization.h"
-+#include "common/util.h"
- 
- 
- namespace nodetool
-@@ -200,7 +201,7 @@ namespace nodetool
-     if (!out)
-     {
-       // if failed, try reading in unportable mode
--      boost::filesystem::copy_file(path, path + ".unportable", boost::filesystem::copy_option::overwrite_if_exists);
-+      tools::copy_file(path, path + ".unportable");
-       src_file.close();
-       src_file.open( path , std::ios_base::binary | std::ios_base::in);
-       if(src_file.fail())
-diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index f34b1098804e..f8aea71c1a77 100644
---- a/src/wallet/wallet2.cpp
-+++ b/src/wallet/wallet2.cpp
-@@ -6208,7 +6208,7 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass
-           catch (...)
-           {
-             LOG_PRINT_L0("Failed to open portable binary, trying unportable");
--            if (use_fs) boost::filesystem::copy_file(m_wallet_file, m_wallet_file + ".unportable", boost::filesystem::copy_option::overwrite_if_exists);
-+            if (use_fs) tools::copy_file(m_wallet_file, m_wallet_file + ".unportable");
-             std::stringstream iss;
-             iss.str("");
-             iss << cache_data;
-@@ -6230,7 +6230,7 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass
-       catch (...)
-       {
-         LOG_PRINT_L0("Failed to open portable binary, trying unportable");
--        if (use_fs) boost::filesystem::copy_file(m_wallet_file, m_wallet_file + ".unportable", boost::filesystem::copy_option::overwrite_if_exists);
-+        if (use_fs) tools::copy_file(m_wallet_file, m_wallet_file + ".unportable");
-         std::stringstream iss;
-         iss.str("");
-         iss << cache_file_buf;
-diff --git a/tests/unit_tests/wallet_storage.cpp b/tests/unit_tests/wallet_storage.cpp
-index dacaff9602ec..bf33936ed4ab 100644
---- a/tests/unit_tests/wallet_storage.cpp
-+++ b/tests/unit_tests/wallet_storage.cpp
-@@ -31,6 +31,7 @@
- 
- #include "file_io_utils.h"
- #include "wallet/wallet2.h"
-+#include "common/util.h"
- 
- using namespace boost::filesystem;
- using namespace epee::file_io_utils;
-@@ -47,8 +48,8 @@ TEST(wallet_storage, store_to_file2file)
-     ASSERT_TRUE(is_file_exist(source_wallet_file.string()));
-     ASSERT_TRUE(is_file_exist(source_wallet_file.string() + ".keys"));
- 
--    copy_file(source_wallet_file, interm_wallet_file, copy_option::overwrite_if_exists);
--    copy_file(source_wallet_file.string() + ".keys", interm_wallet_file.string() + ".keys", copy_option::overwrite_if_exists);
-+    tools::copy_file(source_wallet_file.string(), interm_wallet_file.string());
-+    tools::copy_file(source_wallet_file.string() + ".keys", interm_wallet_file.string() + ".keys");
- 
-     ASSERT_TRUE(is_file_exist(interm_wallet_file.string()));
-     ASSERT_TRUE(is_file_exist(interm_wallet_file.string() + ".keys"));
-@@ -138,8 +139,8 @@ TEST(wallet_storage, change_password_same_file)
-     ASSERT_TRUE(is_file_exist(source_wallet_file.string()));
-     ASSERT_TRUE(is_file_exist(source_wallet_file.string() + ".keys"));
- 
--    copy_file(source_wallet_file, interm_wallet_file, copy_option::overwrite_if_exists);
--    copy_file(source_wallet_file.string() + ".keys", interm_wallet_file.string() + ".keys", copy_option::overwrite_if_exists);
-+    tools::copy_file(source_wallet_file.string(), interm_wallet_file.string());
-+    tools::copy_file(source_wallet_file.string() + ".keys", interm_wallet_file.string() + ".keys");
- 
-     ASSERT_TRUE(is_file_exist(interm_wallet_file.string()));
-     ASSERT_TRUE(is_file_exist(interm_wallet_file.string() + ".keys"));
-@@ -177,8 +178,8 @@ TEST(wallet_storage, change_password_different_file)
-     ASSERT_TRUE(is_file_exist(source_wallet_file.string()));
-     ASSERT_TRUE(is_file_exist(source_wallet_file.string() + ".keys"));
- 
--    copy_file(source_wallet_file, interm_wallet_file, copy_option::overwrite_if_exists);
--    copy_file(source_wallet_file.string() + ".keys", interm_wallet_file.string() + ".keys", copy_option::overwrite_if_exists);
-+    tools::copy_file(source_wallet_file.string(), interm_wallet_file.string());
-+    tools::copy_file(source_wallet_file.string() + ".keys", interm_wallet_file.string() + ".keys");
- 
-     ASSERT_TRUE(is_file_exist(interm_wallet_file.string()));
-     ASSERT_TRUE(is_file_exist(interm_wallet_file.string() + ".keys"));
diff --git a/net-p2p/monero/files/monero-0.18.3.3-contrib-fix-compilation-error-for-boost-1.85.patch b/net-p2p/monero/files/monero-0.18.3.3-contrib-fix-compilation-error-for-boost-1.85.patch
deleted file mode 100644
index 17de8ba3..00000000
--- a/net-p2p/monero/files/monero-0.18.3.3-contrib-fix-compilation-error-for-boost-1.85.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 304dcf85701e5d57b9420722c772ce4c5a51394f Mon Sep 17 00:00:00 2001
-From: 0xFFFC0000 <0xFFFC0000@proton.me>
-Date: Wed, 1 May 2024 12:29:00 +0000
-Subject: [PATCH] contrib: fix compilation error for boost 1.85
-
----
- contrib/epee/include/storages/portable_storage_val_converters.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/epee/include/storages/portable_storage_val_converters.h b/contrib/epee/include/storages/portable_storage_val_converters.h
-index 96b0c024c53c..5eb9acffd262 100644
---- a/contrib/epee/include/storages/portable_storage_val_converters.h
-+++ b/contrib/epee/include/storages/portable_storage_val_converters.h
-@@ -37,6 +37,7 @@
- #include "misc_log_ex.h"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/numeric/conversion/bounds.hpp>
- #include <typeinfo>
- #include <iomanip>
- 
diff --git a/net-p2p/monero/files/monero-0.18.3.3-build-remove-mcpu-march-mtune.patch b/net-p2p/monero/files/monero-0.18.3.4-build-remove-mcpu-march-mtune.patch
index 93e43f91..93e43f91 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-build-remove-mcpu-march-mtune.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-build-remove-mcpu-march-mtune.patch
diff --git a/net-p2p/monero/files/monero-0.18.3.3-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.18.3.4-translations-use-host-compiler.patch
index e51bef2f..e51bef2f 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-translations-use-host-compiler.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-translations-use-host-compiler.patch
diff --git a/net-p2p/monero/files/monero-0.18.3.3-upnp-add-support-for-miniupnpc-API-version-18.patch b/net-p2p/monero/files/monero-0.18.3.4-upnp-add-support-for-miniupnpc-API-version-18.patch
index 9bd84b74..9bd84b74 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-upnp-add-support-for-miniupnpc-API-version-18.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-upnp-add-support-for-miniupnpc-API-version-18.patch
diff --git a/net-p2p/monero/files/monero-0.18.3.3-upnp-drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.18.3.4-upnp-drop-in-tree-miniupnpc.patch
index e85b7430..e85b7430 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-upnp-drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-upnp-drop-in-tree-miniupnpc.patch
diff --git a/net-p2p/monero/files/monero-0.18.3.3-upnp-fix-warning.patch b/net-p2p/monero/files/monero-0.18.3.4-upnp-fix-warning.patch
index 672123ab..672123ab 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-upnp-fix-warning.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-upnp-fix-warning.patch
diff --git a/net-p2p/monero/files/monero-0.18.3.3-use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.18.3.4-use-gentoo-dev-libs-randomx.patch
index 2579590e..2579590e 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-use-gentoo-dev-libs-randomx.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-use-gentoo-dev-libs-randomx.patch
diff --git a/net-p2p/monero/files/monero-0.18.3.3-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.18.3.4-use-gentoo-versioning.patch
index f7b6661e..f7b6661e 100644
--- a/net-p2p/monero/files/monero-0.18.3.3-use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-0.18.3.4-use-gentoo-versioning.patch
diff --git a/net-p2p/monero/files/monero-gui-0.18.3.3-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.18.3.4-cmake-use-gentoo-versioning.patch
index 1d05fdb6..1d05fdb6 100644
--- a/net-p2p/monero/files/monero-gui-0.18.3.3-cmake-use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-gui-0.18.3.4-cmake-use-gentoo-versioning.patch
diff --git a/net-p2p/monero/monero-0.18.3.3.ebuild b/net-p2p/monero/monero-0.18.3.4.ebuild
index 0f37bf97..5cf08045 100644
--- a/net-p2p/monero/monero-0.18.3.3.ebuild
+++ b/net-p2p/monero/monero-0.18.3.4.ebuild
@@ -69,9 +69,6 @@ BDEPEND="${PYTHON_DEPS}
 	smartcard? ( $(python_gen_any_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]') )"
 
 PATCHES_MONERO=(
-	"${FILESDIR}/monero-${PV}-contrib-fix-compilation-error-for-boost-1.85.patch"
-	"${FILESDIR}/monero-${PV}-common-support-boost-filesystem-copy_options.patch"
-
 	"${FILESDIR}/monero-${PV}-upnp-drop-in-tree-miniupnpc.patch"
 	"${FILESDIR}/monero-${PV}-upnp-add-support-for-miniupnpc-API-version-18.patch"
 	"${FILESDIR}/monero-${PV}-upnp-fix-warning.patch"