Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/xmrig/files/, net-misc/xmrig/
Date: Fri, 11 Jun 2021 00:44:21
Message-Id: 1623372252.5fcfb5ae623c7d369ff8ff3a03c8e7a4d83b0a62.candrews@gentoo
1 commit: 5fcfb5ae623c7d369ff8ff3a03c8e7a4d83b0a62
2 Author: Matt Smith <matt <AT> offtopica <DOT> uk>
3 AuthorDate: Thu Jun 10 07:39:16 2021 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 00:44:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fcfb5ae
7
8 net-misc/xmrig: Fix install with USE=-ssl
9
10 Closes: https://bugs.gentoo.org/795180
11 Package-Manager: Portage-3.0.19, Repoman-3.0.3
12 Signed-off-by: Matt Smith <matt <AT> offtopica.uk>
13 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
14
15 net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch | 23 +++++++++++++++++++++++
16 net-misc/xmrig/xmrig-6.12.2.ebuild | 2 ++
17 net-misc/xmrig/xmrig-9999.ebuild | 2 ++
18 3 files changed, 27 insertions(+)
19
20 diff --git a/net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch b/net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch
21 new file mode 100644
22 index 00000000000..f58c7e2ce5b
23 --- /dev/null
24 +++ b/net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch
25 @@ -0,0 +1,23 @@
26 +From ee98bfe01a94d021d81ed4c2bb11ec91c0bd81c8 Mon Sep 17 00:00:00 2001
27 +From: Matt Smith <matt@×××××××××.uk>
28 +Date: Sun, 7 Jun 2020 13:20:04 +0100
29 +Subject: [PATCH] Don't suffix binary with -notls
30 +
31 +---
32 + cmake/OpenSSL.cmake | 2 --
33 + 1 file changed, 2 deletions(-)
34 +
35 +diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake
36 +index 89805301..c01c940a 100644
37 +--- a/cmake/OpenSSL.cmake
38 ++++ b/cmake/OpenSSL.cmake
39 +@@ -54,6 +54,4 @@ else()
40 + src/base/net/http/HttpServer.h
41 + )
42 + endif()
43 +-
44 +- set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
45 + endif()
46 +--
47 +2.27.0
48 +
49
50 diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
51 index 4f4a7913aa0..2a641434ba4 100644
52 --- a/net-misc/xmrig/xmrig-6.12.2.ebuild
53 +++ b/net-misc/xmrig/xmrig-6.12.2.ebuild
54 @@ -30,6 +30,8 @@ RDEPEND="
55 sys-apps/msr-tools
56 "
57
58 +PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
59 +
60 src_prepare() {
61 if ! use donate ; then
62 sed -i 's/1;/0;/g' src/donate.h || die
63
64 diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
65 index 4f4a7913aa0..2a641434ba4 100644
66 --- a/net-misc/xmrig/xmrig-9999.ebuild
67 +++ b/net-misc/xmrig/xmrig-9999.ebuild
68 @@ -30,6 +30,8 @@ RDEPEND="
69 sys-apps/msr-tools
70 "
71
72 +PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
73 +
74 src_prepare() {
75 if ! use donate ; then
76 sed -i 's/1;/0;/g' src/donate.h || die