monero: update to 0.18.1.2.
This commit is contained in:
Kevin Crumb
Michal Vasilek
parent
36f1862d26
commit
71d0dd211a
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec logger -p daemon.notice -t monerod
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b05c087cf..4f1a20101 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
|
||||
@@ -676,6 +676,14 @@ ExternalProject_Add(generate_translations_header
|
||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
|
||||
add_subdirectory(external)
|
||||
|
||||
+# Final setup for miniupnpc
|
||||
|
|
@ -12,38 +15,13 @@
|
|||
+endif()
|
||||
+
|
||||
# Final setup for libunbound
|
||||
include_directories(${UNBOUND_INCLUDE})
|
||||
link_directories(${UNBOUND_LIBRARY_DIRS})
|
||||
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
|
||||
index 9b21705e..76340a22 100644
|
||||
--- a/src/p2p/net_node.inl
|
||||
+++ b/src/p2p/net_node.inl
|
||||
@@ -61,9 +61,16 @@ #include "storages/levin_abstract_invoke2.h"
|
||||
#include "cryptonote_core/cryptonote_core.h"
|
||||
#include "net/parse.h"
|
||||
include_directories(${UNBOUND_INCLUDE_DIR})
|
||||
|
||||
-#include <miniupnp/miniupnpc/miniupnpc.h>
|
||||
-#include <miniupnp/miniupnpc/upnpcommands.h>
|
||||
-#include <miniupnp/miniupnpc/upnperrors.h>
|
||||
+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
|
||||
+#ifdef UPNP_STATIC
|
||||
+ #include <miniupnp/miniupnpc/miniupnpc.h>
|
||||
+ #include <miniupnp/miniupnpc/upnpcommands.h>
|
||||
+ #include <miniupnp/miniupnpc/upnperrors.h>
|
||||
+#else
|
||||
+ #include "miniupnpc.h"
|
||||
+ #include "upnpcommands.h"
|
||||
+ #include "upnperrors.h"
|
||||
+#endif
|
||||
|
||||
#undef MONERO_DEFAULT_LOG_CATEGORY
|
||||
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
|
||||
--
|
||||
2.17.0
|
||||
|
||||
--- a/external/CMakeLists.txt 2018-10-10 13:13:55.759414180 +0200
|
||||
+++ b/external/CMakeLists.txt 2018-10-10 13:19:33.363411827 +0200
|
||||
@@ -34,22 +34,46 @@
|
||||
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||||
index 5b7f69a56..00ef3f43d 100644
|
||||
--- a/external/CMakeLists.txt
|
||||
+++ b/external/CMakeLists.txt
|
||||
@@ -34,24 +34,47 @@
|
||||
# We always compile if we are building statically to reduce static dependency issues...
|
||||
# ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
|
||||
# others.
|
||||
|
|
@ -54,8 +32,10 @@ index 9b21705e..76340a22 100644
|
|||
-find_package(Miniupnpc REQUIRED)
|
||||
-
|
||||
-message(STATUS "Using in-tree miniupnpc")
|
||||
set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
|
||||
-add_subdirectory(miniupnp/miniupnpc)
|
||||
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
|
||||
-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
-if(MSVC)
|
||||
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
|
||||
-elseif(NOT MSVC)
|
||||
|
|
@ -100,3 +80,27 @@ index 9b21705e..76340a22 100644
|
|||
|
||||
find_package(Unbound)
|
||||
|
||||
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
|
||||
index f33ce977d..87d23a1e1 100644
|
||||
--- a/src/p2p/net_node.inl
|
||||
+++ b/src/p2p/net_node.inl
|
||||
@@ -60,9 +60,16 @@
|
||||
#include "cryptonote_core/cryptonote_core.h"
|
||||
#include "net/parse.h"
|
||||
|
||||
-#include <miniupnp/miniupnpc/miniupnpc.h>
|
||||
-#include <miniupnp/miniupnpc/upnpcommands.h>
|
||||
-#include <miniupnp/miniupnpc/upnperrors.h>
|
||||
+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
|
||||
+#ifdef UPNP_STATIC
|
||||
+ #include <miniupnp/miniupnpc/miniupnpc.h>
|
||||
+ #include <miniupnp/miniupnpc/upnpcommands.h>
|
||||
+ #include <miniupnp/miniupnpc/upnperrors.h>
|
||||
+#else
|
||||
+ #include "miniupnpc.h"
|
||||
+ #include "upnpcommands.h"
|
||||
+ #include "upnperrors.h"
|
||||
+#endif
|
||||
|
||||
#undef MONERO_DEFAULT_LOG_CATEGORY
|
||||
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Template file for 'monero'
|
||||
pkgname=monero
|
||||
version=0.17.2.3
|
||||
revision=3
|
||||
_randomx_version="1.1.9"
|
||||
version=0.18.1.2
|
||||
revision=1
|
||||
# the revision monero uses as a submodule for the specific version
|
||||
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
|
||||
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
|
||||
_supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
|
||||
build_style=cmake
|
||||
|
|
@ -16,18 +16,18 @@ makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
|
|||
readline-devel unbound-devel miniupnpc-devel expat-devel
|
||||
cppzmq czmq-devel libsodium-devel"
|
||||
short_desc="Private, secure, untraceable, decentralised digital currency"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
maintainer="Kevin Crumb <kevcrumb@splitlinux.org>"
|
||||
license="BSD-3-Clause"
|
||||
homepage="https://getmonero.org"
|
||||
distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
|
||||
https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
|
||||
https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
|
||||
https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
|
||||
checksum="e4462f8909bdc5e66d76f4023374ff759159c15fe7d407f0c21619769e87c35d
|
||||
b878fd6ea6d4e1dcdfa085427ce4666c1085e8c5a9e049c04ca2036b4aead0f5
|
||||
https://github.com/tevador/RandomX/archive/${_randomx_gitrev}.tar.gz>RandomX-${_randomx_gitrev}.tar.gz
|
||||
https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz>rapidjson-${_rapidjson_gitrev}.tar.gz
|
||||
https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz>supercop-${_supercop_gitrev}.tar.gz"
|
||||
checksum="f7fec9c7456e22b70cb86a34dd9192c948161155fdbdfb8505f8ea95c357a38e
|
||||
4aeadafe16810320fd492491e39d03fb6028a2db35916aba0fef96c716aba46f
|
||||
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
|
||||
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
|
||||
skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz"
|
||||
skip_extraction="RandomX-${_randomx_gitrev}.tar.gz rapidjson-${_rapidjson_gitrev}.tar.gz supercop-${_supercop_gitrev}.tar.gz"
|
||||
system_accounts="monero"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
|
|
@ -52,11 +52,11 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
esac
|
||||
|
||||
post_extract() {
|
||||
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz \
|
||||
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/RandomX-${_randomx_gitrev}.tar.gz \
|
||||
--strip-components=1 -C ${wrksrc}/external/randomx
|
||||
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz \
|
||||
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/rapidjson-${_rapidjson_gitrev}.tar.gz \
|
||||
--strip-components=1 -C ${wrksrc}/external/rapidjson
|
||||
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz \
|
||||
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/supercop-${_supercop_gitrev}.tar.gz \
|
||||
--strip-components=1 -C ${wrksrc}/external/supercop
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue