From 08c43b7e586299bf083d3b78c2132e26fd4a69b7 Mon Sep 17 00:00:00 2001 From: goodmost Date: Tue, 19 Mar 2024 23:19:36 +0800 Subject: [PATCH 1/3] chore: remove repetitive words Signed-off-by: goodmost --- doc/CHANGELOG_OLD.md | 2 +- src/3rdparty/epee/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/CHANGELOG_OLD.md b/doc/CHANGELOG_OLD.md index 700591902..a799cb389 100644 --- a/doc/CHANGELOG_OLD.md +++ b/doc/CHANGELOG_OLD.md @@ -256,7 +256,7 @@ # v2.8.0 - **[#753](https://github.com/xmrig/xmrig/issues/753) Added new algorithm [CryptoNight variant 2](https://github.com/xmrig/xmrig/issues/753) for Monero fork, thanks [@SChernykh](https://github.com/SChernykh).** - - Added global and per thread option `"asm"` and and command line equivalent. + - Added global and per thread option `"asm"` and command line equivalent. - **[#758](https://github.com/xmrig/xmrig/issues/758) Added SSL/TLS support for secure connections to pools.** - Added per pool options `"tls"` and `"tls-fingerprint"` and command line equivalents. - [#767](https://github.com/xmrig/xmrig/issues/767) Added config autosave feature, same with GPU miners. diff --git a/src/3rdparty/epee/README.md b/src/3rdparty/epee/README.md index 57e0efb13..2f06fe06f 100644 --- a/src/3rdparty/epee/README.md +++ b/src/3rdparty/epee/README.md @@ -1 +1 @@ -epee - is a small library of helpers, wrappers, tools and and so on, used to make my life easier. +epee - is a small library of helpers, wrappers, tools and so on, used to make my life easier. From 1fb5be6c1d292c14f0d2562f6cb034087b68e9ce Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 20 Mar 2024 00:24:46 +0700 Subject: [PATCH 2/3] Update deps. --- scripts/build.hwloc.sh | 2 +- scripts/build.openssl3.sh | 2 +- scripts/build.uv.sh | 6 +++--- scripts/build_deps.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/build.hwloc.sh b/scripts/build.hwloc.sh index 223c5fb0c..077d87b8c 100755 --- a/scripts/build.hwloc.sh +++ b/scripts/build.hwloc.sh @@ -1,7 +1,7 @@ #!/bin/bash -e HWLOC_VERSION_MAJOR="2" -HWLOC_VERSION_MINOR="9" +HWLOC_VERSION_MINOR="10" HWLOC_VERSION_PATCH="0" HWLOC_VERSION="${HWLOC_VERSION_MAJOR}.${HWLOC_VERSION_MINOR}.${HWLOC_VERSION_PATCH}" diff --git a/scripts/build.openssl3.sh b/scripts/build.openssl3.sh index ffd1b9536..70e989f77 100755 --- a/scripts/build.openssl3.sh +++ b/scripts/build.openssl3.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -OPENSSL_VERSION="3.0.7" +OPENSSL_VERSION="3.0.13" mkdir -p deps mkdir -p deps/include diff --git a/scripts/build.uv.sh b/scripts/build.uv.sh index 3ee766a7c..3a016a2ab 100755 --- a/scripts/build.uv.sh +++ b/scripts/build.uv.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -UV_VERSION="1.44.2" +UV_VERSION="1.48.0" mkdir -p deps mkdir -p deps/include @@ -8,10 +8,10 @@ mkdir -p deps/lib mkdir -p build && cd build -wget https://github.com/libuv/libuv/archive/v${UV_VERSION}.tar.gz -O v${UV_VERSION}.tar.gz +wget https://dist.libuv.org/dist/v${UV_VERSION}/libuv-v${UV_VERSION}.tar.gz -O v${UV_VERSION}.tar.gz tar -xzf v${UV_VERSION}.tar.gz -cd libuv-${UV_VERSION} +cd libuv-v${UV_VERSION} sh autogen.sh ./configure --disable-shared make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu) diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index e3efbf23d..c294f9699 100755 --- a/scripts/build_deps.sh +++ b/scripts/build_deps.sh @@ -2,4 +2,4 @@ ./build.uv.sh ./build.hwloc.sh -./build.openssl.sh \ No newline at end of file +./build.openssl3.sh \ No newline at end of file From 5552e1f864b290d9b9674dbdf5f5bb8c21744dc7 Mon Sep 17 00:00:00 2001 From: XMRig Date: Thu, 21 Mar 2024 02:13:01 +0700 Subject: [PATCH 3/3] Fix scripts for systems without bash. --- scripts/build.hwloc.sh | 2 +- scripts/build.hwloc1.sh | 2 +- scripts/build.libressl.sh | 2 +- scripts/build.openssl.sh | 2 +- scripts/build.openssl3.sh | 2 +- scripts/build.uv.sh | 2 +- scripts/build_deps.sh | 2 +- scripts/enable_1gb_pages.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/build.hwloc.sh b/scripts/build.hwloc.sh index 077d87b8c..db85fb6fc 100755 --- a/scripts/build.hwloc.sh +++ b/scripts/build.hwloc.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e HWLOC_VERSION_MAJOR="2" HWLOC_VERSION_MINOR="10" diff --git a/scripts/build.hwloc1.sh b/scripts/build.hwloc1.sh index f1afc2856..825727433 100755 --- a/scripts/build.hwloc1.sh +++ b/scripts/build.hwloc1.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e HWLOC_VERSION="1.11.13" diff --git a/scripts/build.libressl.sh b/scripts/build.libressl.sh index d32c04fa4..6dde9faa3 100755 --- a/scripts/build.libressl.sh +++ b/scripts/build.libressl.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e LIBRESSL_VERSION="3.5.2" diff --git a/scripts/build.openssl.sh b/scripts/build.openssl.sh index a89b281fa..722e11b5f 100755 --- a/scripts/build.openssl.sh +++ b/scripts/build.openssl.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e OPENSSL_VERSION="1.1.1s" diff --git a/scripts/build.openssl3.sh b/scripts/build.openssl3.sh index 70e989f77..e42fcac08 100755 --- a/scripts/build.openssl3.sh +++ b/scripts/build.openssl3.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e OPENSSL_VERSION="3.0.13" diff --git a/scripts/build.uv.sh b/scripts/build.uv.sh index 3a016a2ab..ca052f7a5 100755 --- a/scripts/build.uv.sh +++ b/scripts/build.uv.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e UV_VERSION="1.48.0" diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index c294f9699..d244665f1 100755 --- a/scripts/build_deps.sh +++ b/scripts/build_deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e ./build.uv.sh ./build.hwloc.sh diff --git a/scripts/enable_1gb_pages.sh b/scripts/enable_1gb_pages.sh index 16d889f18..a1fb4c611 100755 --- a/scripts/enable_1gb_pages.sh +++ b/scripts/enable_1gb_pages.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh -e # https://xmrig.com/docs/miner/hugepages#onegb-huge-pages