mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-18 03:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2020-12-29 11:05:06 +00:00
parent 30be0d3417 140b869e70
commit db56412926
16 changed files with 214 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-libs/randomx/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST randomx-1.1.8.tar.gz 163477 BLAKE2B 482f38a7e9f7b03ec5bd40ff923a1a1e575ed0c30431dcbecfe1072cdb10ccc93b61cf9d2177f4549e284125e17386e0314cb39734b22dc150193bd5d28bb813 SHA512 f41f13ba7b979a969e9d60e6c44cf289802e7459d6d817a64377428c3e833ea2f71a8a1e6559682ecc0ec2a33f958bb5b727d7faa28cb6ff69a524d713969bce

8
dev-libs/randomx/metadata.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>telans@posteo.de</email>
<name>Theo Anderson</name>
</maintainer>
</pkgmetadata>

21
dev-libs/randomx/randomx-1.1.8.ebuild Normal file
View File

@@ -0,0 +1,21 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake flag-o-matic
DESCRIPTION="Proof of work algorithm based on random code execution"
HOMEPAGE="https://github.com/tevador/RandomX"
SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S="${WORKDIR}"/RandomX-${PV}
src_configure() {
append-ldflags -Wl,-z,noexecstack
cmake_src_configure
}

1
dev-libs/supercop/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648

8
dev-libs/supercop/metadata.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>telans@posteo.de</email>
<name>Theo Anderson</name>
</maintainer>
</pkgmetadata>

25
dev-libs/supercop/supercop-0_p20200827.ebuild Normal file
View File

@@ -0,0 +1,25 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake flag-o-matic
MY_REV="633500ad8c8759995049ccd022107d1fa8a1bbc9"
DESCRIPTION="Fast cryyptographic operations for Monero wallets"
HOMEPAGE="https://github.com/monero-project/supercop"
SRC_URI="https://github.com/monero-project/supercop/archive/${MY_REV}.tar.gz -> ${PN}-${MY_REV}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
DEPEND="dev-lang/nasm"
S="${WORKDIR}"/${PN}-${MY_REV}
src_configure() {
append-ldflags -Wl,-z,noexecstack
cmake_src_configure
}

2
dev-python/hypercorn/Manifest
View File

@@ -1 +1 @@
DIST hypercorn-0.11.1.zip 189203 BLAKE2B c11a2a221fb6b5a02e96b0f463e33583389c4ab31503572f85f140d6b2d8bf58854441b31599861b648fb0b089bb7d46ec3fa7f972de963d2a2ef28a1da48e84 SHA512 7e7e1980bb82e64154f97059c90d1b429c3f18b8e40b51c2821ddf4e838dd7d95de66e83a09afd52abc8ba2758e1f43831af61c7ad79d829c9409ab6cee4d410
DIST hypercorn-0.11.1.tar.gz 148921 BLAKE2B 6fb35ee4a3da6a5a348dc5d923a79f8536b557ae91e9cb2c2c75a4f70bfb970562d80714b600463b5012ebf0b3859e7628b50d2fa992ba256958b13c17b99278 SHA512 6ea9ae3df1f268f2032de06fc392b98c8dc6df16fa7bc49956592de5a45eb991de5af4a8ac7612f932eab29633d4708a5cef34440b0b2be528478e4326e62b1b

7
dev-python/hypercorn/hypercorn-0.11.1.ebuild
View File

@@ -21,11 +21,12 @@ HOMEPAGE="
https://github.com/pgjones/hypercorn
https://pypi.org/project/Hypercorn
"
SRC_URI="https://github.com/pgjones/hypercorn/archive/${PV}.zip -> ${P}.zip"
SRC_URI="https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="~amd64 ~x86"
SLOT="0"
RESTRICT=""
KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-python/h11[${PYTHON_USEDEP}]
>=dev-python/hyper-h2-3.1.0[${PYTHON_USEDEP}]

2
media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild
View File

@@ -26,7 +26,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="
app-arch/unzip
$(python_gen_cond_dep '
dev-python/python-mpv[${PYTHON_USEDEP}]
dev-python/jellyfin-apiclient-python[${PYTHON_USEDEP}]
@@ -47,6 +46,7 @@ RDEPEND="
dev-python/werkzeug[${PYTHON_USEDEP}]
')
"
BDEPEND="app-arch/unzip"
src_install() {
distutils-r1_src_install

2
media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild
View File

@@ -26,7 +26,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="
app-arch/unzip
$(python_gen_cond_dep '
dev-python/python-mpv[${PYTHON_USEDEP}]
dev-python/jellyfin-apiclient-python[${PYTHON_USEDEP}]
@@ -47,6 +46,7 @@ RDEPEND="
dev-python/werkzeug[${PYTHON_USEDEP}]
')
"
BDEPEND="app-arch/unzip"
src_install() {
distutils-r1_src_install

3
net-p2p/monero/Manifest
View File

@@ -1,4 +1 @@
DIST monero-0.17.1.7.tar.gz 10598750 BLAKE2B 03a80f3c38bc1b643d8d9ddba4ee1de59e0f4c6d66cfc5dcb700d19659a5cb66add4fcf1320c1ed2b7dfa15fdfe9548eb758e67661832f9da7bd0e173b5a0ae1 SHA512 b049a738eb5752a620fc19dfafd5e2996d3f33d89737774264a5ef69b7fcfcd9fe852b89e35187486f48fdc8bb73c2010a1917d1ed7fcb4f1f87b18a6bb4c2d5
DIST monero-randomx-0.17.1.7.tar.gz 163581 BLAKE2B d1a4021a652c95d0af9c6bf2fdab2470641206e908778daafa2640e986d5635bdddfa39f44a6a9542d0c17284cf0551eac3be68a24176f1ba7106611517a080f SHA512 626cc83aa22015049c82811be5d66e96f3d14a413d9cb3eee3c28464fbdef71889b97a6385f24c7cac5fc5a9cada197ba887ae2c0782cec0d3e29debad0f3e91
DIST monero-supercop-0.17.1.7.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
DIST monero-trezor-common-0.17.1.7.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf

112
net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch Normal file
View File

@@ -0,0 +1,112 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41f82e26c..3eb2b2e78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,7 @@ endif()
# elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
# set(BSDI TRUE)
-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
if(APPLE)
include_directories(SYSTEM /usr/include/malloc)
@@ -995,7 +995,6 @@ if(SODIUM_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
endif()
-include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
add_subdirectory(contrib)
add_subdirectory(src)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index a8916a7d0..05ab35c82 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -37,19 +37,7 @@
find_package(Miniupnpc REQUIRED)
-message(STATUS "Using in-tree miniupnpc")
-add_subdirectory(miniupnp/miniupnpc)
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-if(MSVC)
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-elseif(NOT MSVC)
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-endif()
-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
-endif()
-
-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
find_package(Unbound)
@@ -81,4 +69,3 @@ endif()
add_subdirectory(db_drivers)
add_subdirectory(easylogging++)
add_subdirectory(qrcodegen)
-add_subdirectory(randomx EXCLUDE_FROM_ALL)
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 3b33fe90a..ba354a0e8 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S)
endif()
include_directories(${RANDOMX_INCLUDE})
+include_directories(SYSTEM /usr/include/monero)
set(crypto_headers)
@@ -116,6 +117,3 @@ endif()
# cheat because cmake and ccache hate each other
set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
-
-# Must be done last, because it references libraries in this directory
-add_subdirectory(wallet)
diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
index a4c5d5a07..5c6b96cd8 100644
--- a/src/crypto/wallet/crypto.h
+++ b/src/crypto/wallet/crypto.h
@@ -29,7 +29,6 @@
#pragma once
#include <cstddef>
-#include "crypto/wallet/ops.h"
namespace crypto {
namespace wallet {
diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
index ff2afba4b..26b0f4523 100644
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@ -72,7 +72,7 @@ target_link_libraries(device
${HIDAPI_LIBRARIES}
cncrypto
ringct_basic
- wallet-crypto
+ monero-crypto
${OPENSSL_CRYPTO_LIBRARIES}
${Boost_SERIALIZATION_LIBRARY}
PRIVATE
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 65db2615c..3ace310f6 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -60,9 +60,9 @@
#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>
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpcommands.h>
+#include <miniupnpc/upnperrors.h>
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"

4
net-p2p/monero/metadata.xml
View File

@@ -14,10 +14,6 @@
<flag name="daemon">
Build the Monero daemon used to connect to the P2P network.
</flag>
<flag name="hw-wallet">
Enable if you want to use a hardware wallet like a Trezor or
Ledger.
</flag>
<flag name="tools">
Build tools used to manipulate the blockchain as it is stored on
disk.

72
net-p2p/monero/monero-0.17.1.7.ebuild
View File

@@ -5,39 +5,28 @@ EAPI=7
inherit cmake systemd
MY_RANDOMX_REV="5ce5f4906c1eb166be980f6d83cc80f4112ffc2a"
MY_SUPERCOP_REV="633500ad8c8759995049ccd022107d1fa8a1bbc9"
MY_TREZORCOMMON_REV="bff7fdfe436c727982cc553bdfb29a9021b423b0"
DESCRIPTION="The secure, private, untraceable cryptocurrency"
HOMEPAGE="https://github.com/monero-project/monero"
SRC_URI="
https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/tevador/RandomX/archive/${MY_RANDOMX_REV}.tar.gz -> ${PN}-randomx-${PV}.tar.gz
https://github.com/monero-project/supercop/archive/${MY_SUPERCOP_REV}.tar.gz -> ${PN}-supercop-${PV}.tar.gz
hw-wallet? ( https://github.com/trezor/trezor-common/archive/${MY_TREZORCOMMON_REV}.tar.gz -> ${PN}-trezor-common-${PV}.tar.gz )
"
SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+daemon hw-wallet libressl readline tools +wallet-cli +wallet-rpc"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+daemon libressl readline +tools +wallet-cli +wallet-rpc"
REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
RESTRICT="test"
DEPEND="
acct-group/monero
acct-user/monero
dev-libs/boost:=[nls,threads]
dev-libs/libsodium:=
dev-libs/randomx
dev-libs/rapidjson
dev-libs/supercop
net-dns/unbound:=[threads]
net-libs/czmq:=
net-libs/miniupnpc
hw-wallet? (
dev-libs/hidapi
dev-libs/protobuf:=
virtual/libusb:1
)
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
readline? ( sys-libs/readline:0= )
@@ -45,33 +34,18 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=("${FILESDIR}/${P}-linkjobs.patch")
src_unpack() {
unpack ${A}
rmdir "${S}"/external/{randomx,supercop,trezor-common} || die
mv "${WORKDIR}"/RandomX-${MY_RANDOMX_REV} "${S}"/external/randomx || die
mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die
use hw-wallet && (mv "${WORKDIR}"/trezor-common-${MY_TREZORCOMMON_REV} "${S}"/external/trezor-common || die)
}
src_prepare() {
cmake_src_prepare
sed -i 's:miniupnp/::' src/p2p/net_node.inl || die
sed -e 's/UPNP_LIBRARIES "libminiupnpc-static/UPNP_LIBRARIES "miniupnpc'/ \
-e '/libminiupnpc-static/d' \
-e '/\/miniupnpc/d' \
-i external/CMakeLists.txt || die
}
PATCHES=(
"${FILESDIR}/${P}-linkjobs.patch"
"${FILESDIR}/${P}-unbundle-dependencies.patch"
)
src_configure() {
local mycmakeargs=(
# Monero's liblmdb conflicts with the system liblmdb :(
# TODO: Update CMake to install built libraries (help wanted)
-DBUILD_SHARED_LIBS=OFF
-DMANUAL_SUBMODULES=ON
-DMONERO_PARALLEL_LINK_JOBS=1
-DUSE_DEVICE_TREZOR=$(usex hw-wallet 1 0)
-DUSE_DEVICE_TREZOR=OFF
)
cmake_src_configure
@@ -87,6 +61,8 @@ src_compile() {
}
src_install() {
einstalldocs
# Install all binaries.
find "${BUILD_DIR}/bin/" -type f -executable -print0 |
while IFS= read -r -d '' line; do
@@ -121,15 +97,15 @@ src_install() {
pkg_postinst() {
if use daemon; then
einfo "Start the Monero P2P daemon as a system service with"
einfo "'rc-service monerod start'. Enable it at startup with"
einfo "'rc-update add monerod default'."
einfo
einfo "Run monerod status as any user to get sync status and other stats."
einfo
einfo "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
einfo "in /var/lib/monero by default. You may want to enable pruning by adding"
einfo "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
einfo "or move the data directory to another disk."
elog "Start the Monero P2P daemon as a system service with"
elog "'rc-service monerod start'. Enable it at startup with"
elog "'rc-update add monerod default'."
elog
elog "Run monerod status as any user to get sync status and other stats."
elog
elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
elog "in /var/lib/monero by default. You may want to enable pruning by adding"
elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
elog "or move the data directory to another disk."
fi
}

2
sys-kernel/tirdad/Manifest
View File

@@ -1 +1 @@
DIST tirdad-0_p20200926.zip 16985 BLAKE2B c0b8e289e6731ca86d1c29dce256468d634167bde9196f620a037cccb4737788b54dd6544c79ecff6c61dd4f4c62920a541e1dbe8db301c948b7923ae82be393 SHA512 4bff32fd61712bb48cb9f723193f3f7f9a35c7cd537ff2b0736f7b0169e74016d69479e24464084e19a749ce67b33278421b9b2a80c007cf53f6836e3126427d
DIST tirdad-0_p20200926.tar.gz 15656 BLAKE2B 02c628f8d4c9f539cfaf2e7e6a6cc3323169c785f7854b9ac283c59ca95b84fd5361948815d5aa400886b118b8dbd6b0be9b5d1ddd1433ecf56a9fc1137d8b38 SHA512 db6aef5225a2651600f93700e7b858957a20ada3d3d55c19124f2a149b20e270d10ead959580dff9031b346f8c35f9fab3cf21db74afb47937dd977e35d13156

13
sys-kernel/tirdad/tirdad-0_p20200926.ebuild
View File

@@ -2,21 +2,20 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-mod
COMMIT="9a0e137ae05dd1aa05c20750975598e4dac77dbf"
MY_REV="9a0e137ae05dd1aa05c20750975598e4dac77dbf"
DESCRIPTION="kernel module for random ISN generation"
HOMEPAGE="https://github.com/0xsirus/tirdad"
SRC_URI="https://github.com/0xsirus/tirdad/archive/${COMMIT}.zip -> ${P}.zip"
SRC_URI="https://github.com/0xsirus/tirdad/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
DEPEND=""
RDEPEND="${DEPEND}"
BDEPEND="app-arch/unzip"
S="${WORKDIR}/${PN}-${COMMIT}"
S="${WORKDIR}/${PN}-${MY_REV}"
MODULE_NAMES="tirdad(misc:${S}:${S}/module)"
BUILD_TARGETS="all"