gentoo resync : 14.08.2021

3 files changed, 33 insertions, 2 deletions

diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index eac6ab72e1d6..7097019a79ef 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,4 +1,5 @@
 AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
+AUX xmrig-6.14.0-narrowing-conversion-arm64.patch 1177 BLAKE2B e8c7688a729c6bc236c6efdac73f22f2081d5ccb677f7fa5bd5e20e1a71b06cece6663d7c6acf3a11c30505470f5d0889823533e7b2177478e9cdd5e6cc678f4 SHA512 87d621feee82ea3d6e0710568ad75b6bda0bc061a9c22cb989bd5ba9b7c024c7d240d499d830e1aa819553f5fa70065858698f81a0de4a3441c4163cfae781c5
 AUX xmrig.service 835 BLAKE2B 96a6d52cae6730a08d06563cac47f054b86e8bd78972ab35355fee7f8c20c08943b8aa60e776296f9383f1436a589b84f93a25c8bc960458cb4e2c9a18e38cac SHA512 ec44d44526c67457af17b50dc021832da153bee812b2588b6f3cf0bbdb46449bb3e30e53c7118f1843b156c33695a097c6ee5f52d024a1191aa31c3375e0a003
 DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
 DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175d6e624dae04f0c7d68670a41f705e8676acb6a377c35d7d572ca6e42ae0833bbf8fcb84ebdefa7a50027b0151 SHA512 49e55aef9c316b14b5974f58c3083486f097c1d2bfec10b0e615efcfb642b0186f2de866b5b88eb9fe2ee0153dd3ff7749936d142825928c68e96595478b9dc8
@@ -7,6 +8,6 @@ DIST xmrig-6.14.0.tar.gz 1698011 BLAKE2B 62391c7dde6d3d4fbb4cb78e53c6f704fb27783
 EBUILD xmrig-6.12.2.ebuild 1284 BLAKE2B ad14cf0ce42c072c6a640e32927035704a2144f76462d98fe108aae7b970ae27304abdb0600561a159ddd22874c08a19e4d42b308b1fdd6b1f9049c0f13d1c03 SHA512 87d2e6897670dd2d43383f305718536ed6769482556d8b3e88988521b4434cd635f4c5b5f0e59f59638e0851135cbf226492837e30ef96c650a1b7f71305c201
 EBUILD xmrig-6.13.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-6.13.1.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
-EBUILD xmrig-6.14.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
+EBUILD xmrig-6.14.0.ebuild 1348 BLAKE2B 464ba0de9178acb2b7eb380a58a167708425a6c97a28b4618008f830622d01629cf8d7f0a9b9482aae2da369ecd96a67c8b0771565bde8e18136399bf58351c6 SHA512 9d8af7c511fcb6a008a8cd37bc103fb821354b321453879fa9c9923c13ece6a1eb4aa4a31ec8cb5ce21f79baf358990c25f837e3fa728627a4122312a7f464ef
 EBUILD xmrig-9999.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 MISC metadata.xml 967 BLAKE2B 40681544dee425cb4bf05607ed01d3231d10be52b89da4defffe410507c4b763cf3820ccb36bdd158e8360fa24fd3028f8b93fffa8fd77cbd856e8d8e49b704f SHA512 b66915ea7f93291b609dcedcecbeddc8e0e637227eaaefb7db8d0af4353cb6c1b67dfd48e4400da268b9939f15ebb06e6f4cb322a57184757c8291ebb65a440e
diff --git a/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch b/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
new file mode 100644
index 000000000000..7f1f1bb4da72
--- /dev/null
+++ b/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
@@ -0,0 +1,27 @@
+Fixes build on arm64 (and other platforms with unsigned char).
+
+https://github.com/xmrig/xmrig/commit/f4cdc527b00571150e8521331928c75b44e071f9.patch
+https://github.com/xmrig/xmrig/issues/2527
+
+From f4cdc527b00571150e8521331928c75b44e071f9 Mon Sep 17 00:00:00 2001
+From: XMRig <support@xmrig.com>
+Date: Tue, 10 Aug 2021 01:40:36 +0700
+Subject: [PATCH] #2527 Fix narrowing conversion.
+
+---
+ src/base/net/stratum/DaemonClient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
+index 77818f34c..76f30c653 100644
+--- a/src/base/net/stratum/DaemonClient.cpp
++++ b/src/base/net/stratum/DaemonClient.cpp
+@@ -65,7 +65,7 @@ static const char *kJsonRPC                 = "/json_rpc";
+ 
+ static constexpr size_t kBlobReserveSize    = 8;
+ 
+-static const char kZMQGreeting[64] = { -1, 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
++static const char kZMQGreeting[64] = { static_cast<char>(-1), 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
+ static constexpr size_t kZMQGreetingSize1 = 11;
+ 
+ static const char kZMQHandshake[] = "\4\x19\5READY\xbSocket-Type\0\0\0\3SUB";
diff --git a/net-misc/xmrig/xmrig-6.14.0.ebuild b/net-misc/xmrig/xmrig-6.14.0.ebuild
index 97dc2905531c..454bae8f9729 100644
--- a/net-misc/xmrig/xmrig-6.14.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.14.0.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
 	!arm64? ( sys-apps/msr-tools )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+	"${FILESDIR}"/${PN}-6.14.0-narrowing-conversion-arm64.patch
+)
 
 src_prepare() {
 	if ! use donate ; then