From c0e2a156144e56ad4efd3fa8ec005b6334d2be3e Mon Sep 17 00:00:00 2001
From: snider <snider@hashvault.pro>
Date: Mon, 1 Apr 2019 12:16:36 +0100
Subject: [PATCH 1/8] updates image used in readme for new pool url
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ee16862aa..2023b212a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
* [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
-<img src="http://i.imgur.com/OKZRVDh.png" width="619" >
+<img src="http://i.imgur.com/Ymumes5.png" width="619" >
#### Table of contents
* [Features](#features)
From 356fd04b0f230bfae3d7674a05e11796a527c331 Mon Sep 17 00:00:00 2001
From: xmrig <support@xmrig.com>
Date: Mon, 1 Apr 2019 18:55:30 +0700
Subject: [PATCH 2/8] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2023b212a..5b6dc7a03 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
* [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
-<img src="http://i.imgur.com/Ymumes5.png" width="619" >
+<img src="http://i.imgur.com/Ymumes5.png" width="670" >
#### Table of contents
* [Features](#features)
From 51b92f66cfddf151570c643cb0407dd3720cdc65 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sat, 25 May 2019 10:58:35 +0700
Subject: [PATCH 3/8] Sync changes.
---
src/api/ApiRouter.cpp | 8 +++++---
src/version.h | 4 +++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/api/ApiRouter.cpp b/src/api/ApiRouter.cpp
index bdedac4d3..beee8fd35 100644
--- a/src/api/ApiRouter.cpp
+++ b/src/api/ApiRouter.cpp
@@ -51,13 +51,15 @@
#include "workers/Workers.h"
-static inline double normalize(double d)
+static inline rapidjson::Value normalize(double d)
{
+ using namespace rapidjson;
+
if (!isnormal(d)) {
- return 0.0;
+ return Value(kNullType);
}
- return floor(d * 100.0) / 100.0;
+ return Value(floor(d * 100.0) / 100.0);
}
diff --git a/src/version.h b/src/version.h
index 4e8fee459..b6ae7102d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -39,7 +39,9 @@
#define APP_VER_PATCH 2
#ifdef _MSC_VER
-# if (_MSC_VER >= 1910)
+# if (_MSC_VER >= 1920)
+# define MSVC_VERSION 2019
+# elif (_MSC_VER >= 1910 && _MSC_VER < 1920)
# define MSVC_VERSION 2017
# elif _MSC_VER == 1900
# define MSVC_VERSION 2015
From 10165da53efcad10c3d9a56f01b58f9471ac5172 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sun, 26 May 2019 18:54:47 +0700
Subject: [PATCH 4/8] Removed obsolete automatic variants.
---
src/common/net/Job.cpp | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/src/common/net/Job.cpp b/src/common/net/Job.cpp
index 851507adc..cb6be4e69 100644
--- a/src/common/net/Job.cpp
+++ b/src/common/net/Job.cpp
@@ -127,24 +127,6 @@ bool xmrig::Job::setBlob(const char *blob)
m_algorithm.setVariant(variant());
}
- if (!m_algorithm.isForced()) {
- if (m_algorithm.variant() == VARIANT_XTL && m_blob[0] >= 9) {
- m_algorithm.setVariant(VARIANT_HALF);
- }
- else if (m_algorithm.variant() == VARIANT_MSR && m_blob[0] >= 8) {
- m_algorithm.setVariant(VARIANT_HALF);
- }
- else if (m_algorithm.variant() == VARIANT_WOW && m_blob[0] < 11) {
- m_algorithm.setVariant(VARIANT_2);
- }
- else if (m_algorithm.variant() == VARIANT_RWZ && m_blob[0] < 12) {
- m_algorithm.setVariant(VARIANT_2);
- }
- else if (m_algorithm.variant() == VARIANT_ZLS && m_blob[0] < 8) {
- m_algorithm.setVariant(VARIANT_2);
- }
- }
-
# ifdef XMRIG_PROXY_PROJECT
memset(m_rawBlob, 0, sizeof(m_rawBlob));
memcpy(m_rawBlob, blob, m_size * 2);
From 809efb4700dc9f14e78eea7f7f1a5c38c6d37cfa Mon Sep 17 00:00:00 2001
From: xmrig <support@xmrig.com>
Date: Sun, 26 May 2019 19:21:13 +0700
Subject: [PATCH 5/8] Update CHANGELOG.md
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79c8bb4a5..be30f774c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.14.4
+- [#992](https://github.com/xmrig/xmrig/pull/992) Fixed compilation with Clang 3.5.
+- [#1012](https://github.com/xmrig/xmrig/pull/1012) Fixed compilation with Clang 9.0.
+- In HTTP API for unknown hashrate now used `null` instead of `0.0`.
+- Fixed MSVC 2019 version detection.
+- Removed obsolete automatic variants.
+
# v2.14.1
* [#975](https://github.com/xmrig/xmrig/issues/975) Fixed crash on Linux if double thread mode used.
From 1d4bc030fb4ccb366765cd4feb31b95ebd9db9a5 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sun, 26 May 2019 19:28:28 +0700
Subject: [PATCH 6/8] v2.14.4-dev
---
src/version.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/version.h b/src/version.h
index b6ae7102d..33be0af8e 100644
--- a/src/version.h
+++ b/src/version.h
@@ -28,7 +28,7 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "XMRig CPU miner"
-#define APP_VERSION "2.14.2-dev"
+#define APP_VERSION "2.14.4-dev"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
@@ -36,7 +36,7 @@
#define APP_VER_MAJOR 2
#define APP_VER_MINOR 14
-#define APP_VER_PATCH 2
+#define APP_VER_PATCH 4
#ifdef _MSC_VER
# if (_MSC_VER >= 1920)
From 2d8e8c92ab031745e2d26596ca2b0b395a420d24 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Thu, 30 May 2019 12:16:19 +0700
Subject: [PATCH 7/8] v2.14.4
---
src/version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/version.h b/src/version.h
index 33be0af8e..6a5ecb02c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -28,7 +28,7 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "XMRig CPU miner"
-#define APP_VERSION "2.14.4-dev"
+#define APP_VERSION "2.14.4"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
From 3dde8cacff0e30dd1c265d7b5ddae858885ad707 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Fri, 31 May 2019 22:50:39 +0700
Subject: [PATCH 8/8] v2.14.5-dev
---
src/version.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/version.h b/src/version.h
index 6a5ecb02c..7ba9c7767 100644
--- a/src/version.h
+++ b/src/version.h
@@ -28,7 +28,7 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "XMRig CPU miner"
-#define APP_VERSION "2.14.4"
+#define APP_VERSION "2.14.5-dev"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
@@ -36,7 +36,7 @@
#define APP_VER_MAJOR 2
#define APP_VER_MINOR 14
-#define APP_VER_PATCH 4
+#define APP_VER_PATCH 5
#ifdef _MSC_VER
# if (_MSC_VER >= 1920)