summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonimal2018-07-12 01:11:47 +0000
committeranonimal2018-07-12 01:11:47 +0000
commit94fa8e713af13eaa3448162b6fa02742902059c0 (patch)
tree2407b55bedc725e7d128c339dfea795714eb051e
parent0e104888ed04e10f64c3351fcebf242fbc5eb00c (diff)
downloadaur-94fa8e713af13eaa3448162b6fa02742902059c0.tar.gz
Bump to v0.12.3.0
-rw-r--r--.SRCINFO12
-rw-r--r--0001-account-fix-build-with-GCC-8.1.0.patch53
-rw-r--r--0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch26
-rw-r--r--PKGBUILD12
4 files changed, 7 insertions, 96 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c722dace1a4..6a40898d7dfb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Jun 12 21:54:24 UTC 2018
+# Thu Jul 12 01:11:33 UTC 2018
pkgbase = monero
pkgdesc = Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)
- pkgver = 0.12.2.0
- pkgrel = 3
+ pkgver = 0.12.3.0
+ pkgrel = 1
url = https://getmonero.org/
arch = x86_64
arch = i686
@@ -25,13 +25,9 @@ pkgbase = monero
provides = libmonero-wallet
conflicts = bitmonero-git
conflicts = libmonero-wallet-git
- source = monero::git+https://github.com/monero-project/monero#tag=v0.12.2.0
- source = 0001-account-fix-build-with-GCC-8.1.0.patch
- source = 0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch
+ source = monero::git+https://github.com/monero-project/monero#tag=v0.12.3.0
source = 0001-cmake-do-not-install-into-the-system.patch
sha256sums = SKIP
- sha256sums = 3802e9a6eb21309c6d08d7da4a1979c369fc6a0d74789f34beaaf60a89e82af2
- sha256sums = 44f10ce6a462dd901070333a0dba960cb73fe2053e07650a9ce01b16d7f31037
sha256sums = 653853f9c0fed231a2cec476703f09198e6a87af12bb0a3bfe98b32e48e7a1c5
pkgname = monero
diff --git a/0001-account-fix-build-with-GCC-8.1.0.patch b/0001-account-fix-build-with-GCC-8.1.0.patch
deleted file mode 100644
index 0f4c02a5f731..000000000000
--- a/0001-account-fix-build-with-GCC-8.1.0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ae6a40dfd76f5fb024b48a83d900cf5e6d02db93 Mon Sep 17 00:00:00 2001
-From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
-Date: Thu, 24 May 2018 09:12:16 +0100
-Subject: [PATCH] account: fix build with GCC 8.1.0
-
----
- src/cryptonote_basic/account.cpp | 2 +-
- src/daemon/rpc_command_executor.cpp | 2 +-
- src/rpc/core_rpc_server_commands_defs.h | 2 ++
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/cryptonote_basic/account.cpp b/src/cryptonote_basic/account.cpp
-index bab991d19..aac6ec22b 100644
---- a/src/cryptonote_basic/account.cpp
-+++ b/src/cryptonote_basic/account.cpp
-@@ -157,7 +157,7 @@ DISABLE_VS_WARNINGS(4244 4345)
- void account_base::create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey)
- {
- crypto::secret_key fake;
-- memset(&fake, 0, sizeof(fake));
-+ memset(&unwrap(fake), 0, sizeof(fake));
- create_from_keys(address, fake, viewkey);
- }
- //-----------------------------------------------------------------
-diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
-index 2efb501ea..c6dd9f538 100644
---- a/src/daemon/rpc_command_executor.cpp
-+++ b/src/daemon/rpc_command_executor.cpp
-@@ -973,7 +973,7 @@ bool t_rpc_command_executor::print_transaction_pool_stats() {
- }
- else
- {
-- memset(&res.pool_stats, 0, sizeof(res.pool_stats));
-+ res.pool_stats = {};
- if (!m_rpc_server->on_get_transaction_pool_stats(req, res, false) || res.status != CORE_RPC_STATUS_OK)
- {
- tools::fail_msg_writer() << make_error(fail_message, res.status);
-diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
-index 250c88e90..1227afef5 100644
---- a/src/rpc/core_rpc_server_commands_defs.h
-+++ b/src/rpc/core_rpc_server_commands_defs.h
-@@ -1554,6 +1554,8 @@ namespace cryptonote
- std::vector<txpool_histo> histo;
- uint32_t num_double_spends;
-
-+ txpool_stats(): bytes_total(0), bytes_min(0), bytes_max(0), bytes_med(0), fee_total(0), oldest(0), txs_total(0), num_failing(0), num_10m(0), num_not_relayed(0), histo_98pc(0), num_double_spends(0) {}
-+
- BEGIN_KV_SERIALIZE_MAP()
- KV_SERIALIZE(bytes_total)
- KV_SERIALIZE(bytes_min)
---
-2.17.0
-
diff --git a/0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch b/0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch
deleted file mode 100644
index e0228c9a58e3..000000000000
--- a/0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4812c062c5c09876a62e47df0621a68cfcdf739d Mon Sep 17 00:00:00 2001
-From: Teutone <Teutone@users.noreply.github.com>
-Date: Mon, 30 Apr 2018 19:01:58 +0200
-Subject: [PATCH] add .load() to make Boost 1.67 happy with its new is_integral
- check
-
----
- src/wallet/api/wallet.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index b78a471b9..7d6389904 100644
---- a/src/wallet/api/wallet.cpp
-+++ b/src/wallet/api/wallet.cpp
-@@ -1752,7 +1752,7 @@ void WalletImpl::refreshThreadFunc()
- // if auto refresh enabled, we wait for the "m_refreshIntervalSeconds" interval.
- // if not - we wait forever
- if (m_refreshIntervalMillis > 0) {
-- boost::posix_time::milliseconds wait_for_ms(m_refreshIntervalMillis);
-+ boost::posix_time::milliseconds wait_for_ms(m_refreshIntervalMillis.load());
- m_refreshCV.timed_wait(lock, wait_for_ms);
- } else {
- m_refreshCV.wait(lock);
---
-2.17.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 4c2ba5d60cbd..01ba8af3fd7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
pkgbase=('monero')
pkgname=('monero' 'libmonero-wallet')
-pkgver=0.12.2.0
-pkgrel=3
+pkgver=0.12.3.0
+pkgrel=1
pkgdesc="Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)"
license=('custom:Cryptonote')
arch=('x86_64' 'i686' 'armv7h' 'aarch64')
@@ -15,14 +15,10 @@ makedepends=('git' 'cmake' 'boost' 'gtest' 'qt5-tools')
provides=('monero' 'libmonero-wallet')
conflicts=('bitmonero-git' 'libmonero-wallet-git')
-source=("${pkgname}"::'git+https://github.com/monero-project/monero#tag=v0.12.2.0'
- "0001-account-fix-build-with-GCC-8.1.0.patch"
- "0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch"
+source=("${pkgname}"::"git+https://github.com/monero-project/monero#tag=v${pkgver}"
"0001-cmake-do-not-install-into-the-system.patch")
sha256sums+=('SKIP'
- '3802e9a6eb21309c6d08d7da4a1979c369fc6a0d74789f34beaaf60a89e82af2'
- '44f10ce6a462dd901070333a0dba960cb73fe2053e07650a9ce01b16d7f31037'
'653853f9c0fed231a2cec476703f09198e6a87af12bb0a3bfe98b32e48e7a1c5')
_monero="${pkgbase}"
@@ -33,8 +29,6 @@ prepare()
git -C "${pkgname}" submodule update --init --recursive --force
cd "${srcdir}/${_monero}"
- patch -Np1 -i "${srcdir}/0001-account-fix-build-with-GCC-8.1.0.patch"
- patch -Np1 -i "${srcdir}/0001-add-.load-to-make-Boost-1.67-happy-with-its-new-is_i.patch"
patch -Np1 -i "${srcdir}/0001-cmake-do-not-install-into-the-system.patch" -d "${srcdir}/monero/external/miniupnp"
}