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

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2023-02-04 09:46:48 +00:00
parent 1e0e03a62e 946c727ad3
commit 2dd66d9ea5
16 changed files with 263 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app-crypt/clevis/Manifest
View File

@@ -1,2 +1 @@
DIST clevis-18.tar.gz 78191 BLAKE2B 317f30df3c05a9a651363daf17b9320e47a903929af991ecfd9d4d3d630a0ab8e92815db2e5736e9b9ca7f3fb4a41f4cf198ec447f04a9849f4d2a03bb196b22 SHA512 19b6743ff61ff7e29699bbc3fb69dfa31567a37ab824629330b57c92aa89b70759d63c1770be68d4525681ec9ba56d980cae2bb1cdeee6192992ede449a0e4ff
DIST clevis-19.tar.gz 81324 BLAKE2B 75323940d0b53e307f5dbc197e3117e7ddc900d76ae1043bac3d17cc3af0264ba00a5f840c5c9dd3c2dd9c8fbde2cf05934b8ab3e89cd403ad8a8eb28609bb78 SHA512 dee19354c908c3843fc295a84b431780d5d6062c77766ee7ce9550636d3623d92b0cd1f6d4c40d57bef14debddc161da2b72289a5d6185cdd17b09a1ef67409a

30
app-crypt/clevis/clevis-18.ebuild
View File

@@ -1,30 +0,0 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson
DESCRIPTION="Automated Encryption Framework"
HOMEPAGE="https://github.com/latchset/clevis"
SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+luks +tpm"
DEPEND="luks? ( app-misc/jq )
>=dev-libs/jose-8
luks? ( dev-libs/libpwquality )
luks? ( dev-libs/luksmeta )
tpm? ( app-crypt/tpm2-tools )
sys-fs/cryptsetup"
RDEPEND="${DEPEND}"
BDEPEND=""
PATCHES=(
"${FILESDIR}/${PN}-dracut.patch"
"${FILESDIR}/${PN}-meson.patch"
"${FILESDIR}/${PN}-openssl.patch"
)

4
app-crypt/clevis/clevis-19.ebuild → app-crypt/clevis/clevis-19-r1.ebuild
View File

@@ -27,5 +27,9 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
# From https://github.com/latchset/clevis/pull/347
# Allows using dracut without systemd
"${FILESDIR}/clevis-dracut.patch"
# Fix for systemd on Gentoo
"${FILESDIR}/clevis-meson.patch"
)

52
app-crypt/clevis/files/clevis-dracut.patch
View File

@@ -1,45 +1,3 @@
From a5aa695821e34fb218c7d705065aaf7077737c8c Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Fri, 5 Nov 2021 15:24:12 +0000
Subject: [PATCH] Moved dracut directory up to top-level to decouple it with
systemd.
Adds a clevis-luks-generic-unlocker for alternative use without systemd.
Based on patch by Sergio Correia <scorreia@redhat.com>
Closes: #346
Signed-off-by: Jonathan Davies <jpds@protonmail.com>
---
.../dracut/clevis-pin-sss/meson.build | 0
.../dracut/clevis-pin-sss/module-setup.sh.in | 0
.../dracut/clevis-pin-tang/meson.build | 0
.../dracut/clevis-pin-tang/module-setup.sh.in | 0
.../dracut/clevis-pin-tpm2/meson.build | 0
.../dracut/clevis-pin-tpm2/module-setup.sh.in | 0
src/dracut/clevis/clevis-hook.sh.in | 3 +
.../clevis/clevis-luks-generic-unlocker | 70 +++++++++++++++++++
.../systemd => }/dracut/clevis/meson.build | 1 +
.../dracut/clevis/module-setup.sh.in | 19 +++--
src/{luks/systemd => }/dracut/meson.build | 0
.../systemd/dracut/clevis/clevis-hook.sh.in | 2 -
src/luks/systemd/meson.build | 1 -
src/meson.build | 1 +
14 files changed, 90 insertions(+), 7 deletions(-)
rename src/{luks/systemd => }/dracut/clevis-pin-sss/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-sss/module-setup.sh.in (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tang/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tang/module-setup.sh.in (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/module-setup.sh.in (100%)
create mode 100755 src/dracut/clevis/clevis-hook.sh.in
create mode 100755 src/dracut/clevis/clevis-luks-generic-unlocker
rename src/{luks/systemd => }/dracut/clevis/meson.build (87%)
rename src/{luks/systemd => }/dracut/clevis/module-setup.sh.in (76%)
rename src/{luks/systemd => }/dracut/meson.build (100%)
delete mode 100755 src/luks/systemd/dracut/clevis/clevis-hook.sh.in
diff --git a/src/luks/systemd/dracut/clevis-pin-sss/meson.build b/src/dracut/clevis-pin-sss/meson.build
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-sss/meson.build
@@ -213,9 +171,17 @@ index bfe657c..dbce790 100755
grep sed cut \
clevis-decrypt \
diff --git a/src/luks/systemd/dracut/meson.build b/src/dracut/meson.build
similarity index 100%
similarity index 78%
rename from src/luks/systemd/dracut/meson.build
rename to src/dracut/meson.build
index 7ad5b14..fdb264b 100644
--- a/src/luks/systemd/dracut/meson.build
+++ b/src/dracut/meson.build
@@ -2,4 +2,3 @@ subdir('clevis')
subdir('clevis-pin-tang')
subdir('clevis-pin-tpm2')
subdir('clevis-pin-sss')
-subdir('clevis-pin-null')
diff --git a/src/luks/systemd/dracut/clevis/clevis-hook.sh.in b/src/luks/systemd/dracut/clevis/clevis-hook.sh.in
deleted file mode 100755
index cb257c9..0000000

44
app-crypt/clevis/files/clevis-openssl.patch
View File

@@ -1,44 +0,0 @@
From ee1dfedb9baca107e66a0fec76693c9d479dcfd9 Mon Sep 17 00:00:00 2001
From: Sergio Correia <scorreia@redhat.com>
Date: Mon, 3 May 2021 22:36:36 -0300
Subject: [PATCH] sss: use BN_set_word(x, 0) instead of BN_zero()
Different OpenSSL versions define BN_zero() differently -- sometimes
returning an integer, sometimes as void --, so let's use instead
BN_set_word() instead, not to have issues when building with these
different versions.
---
src/pins/sss/sss.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pins/sss/sss.c b/src/pins/sss/sss.c
index a37215d7..7486d6c5 100644
--- a/src/pins/sss/sss.c
+++ b/src/pins/sss/sss.c
@@ -214,7 +214,7 @@ sss_point(const json_t *sss, size_t *len)
if (BN_rand_range(xx, pp) <= 0)
return NULL;
- if (BN_zero(yy) <= 0)
+ if (BN_set_word(yy, 0) <= 0)
return NULL;
for (size_t i = 0; i < json_array_size(e); i++) {
@@ -272,7 +272,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
if (!ctx || !pp || !acc || !tmp || !k)
return NULL;
- if (BN_zero(k) <= 0)
+ if (BN_set_word(k, 0) <= 0)
return NULL;
len = jose_b64_dec(p, NULL, 0);
@@ -303,7 +303,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
/* acc *= (0 - xi) / (xo - xi) */
- if (BN_zero(tmp) <= 0)
+ if (BN_set_word(tmp, 0) <= 0)
return NULL;
if (BN_mod_sub(tmp, tmp, xi, pp, ctx) <= 0)

4
media-sound/qpwgraph/qpwgraph-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 2022 Gentoo Authors
# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ inherit cmake git-r3 xdg
DESCRIPTION="PipeWire Graph Qt GUI Interface"
HOMEPAGE="https://gitlab.freedesktop.org/rncbc/qpwgraph"
EGIT_REPO="https://gitlab.freedesktop.org/rncbc/qpwgraph"
EGIT_REPO_URI="https://gitlab.freedesktop.org/rncbc/qpwgraph"
LICENSE="GPL-2"
SLOT="0"

1
net-misc/maestral-qt/Manifest
View File

@@ -1,2 +1,3 @@
DIST maestral-qt-1.5.3.gh.tar.gz 1209467 BLAKE2B d810df1f7e21938b81565afb16049e385c5de1e295d64feeaa317966e139ddc76542a747db71ae76dc1c82a11ec7e266b69968cefa2839878941def4af7711f8 SHA512 fbc8723d6751e31504529a62f00f7becd4531d8613559edde2a4725bc0d5ac783e6c817814059489bead87923135462a871cdffd0f8d1f0f06481df20efde4f5
DIST maestral-qt-1.6.5.gh.tar.gz 1217959 BLAKE2B fb57171e3b6ed286e03d143e0fbd7dba0eae69bd4402c271bd9897549d84f3b509f459577f0c44ba252bca6a9b651d70bd825565e2afdb86a97966a728803eaf SHA512 f34ca35fad1b1509a1cea605974c5f0ffb79763c2e6e6dcf68454246dd303d67274e1e46954270cd0d2eb171a427af2ef477cc19d0bb05634a3aeb593f69d7aa
DIST maestral-qt-1.6.6_rc1.gh.tar.gz 1219500 BLAKE2B 221750f753f1e8dd58365823fb8aedfadf0ef59aadac700712e8637a18878769c90862a8ac406551e695f07dbfe7e212037d2b6ba8674b62e73c6e9d1c45d45d SHA512 adbf4efded4130d7d955409511389608d71b5171d0e5d64e04c391311bf94ff8c1c79e5934cd42d5fab168e081ac85ee8be31a6812c3c4903eb1b8b6bdefd018

37
net-misc/maestral-qt/maestral-qt-1.6.6_rc1.ebuild Normal file
View File

@@ -0,0 +1,37 @@
# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )
inherit desktop distutils-r1
MY_PV=${PV/_rc/.dev}
DESCRIPTION="Maestral is an open-source Dropbox client written in Python"
HOMEPAGE="https://maestral.app"
SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="MIT"
SLOT="0"
if [[ ${PV} != *_rc* ]]; then
KEYWORDS="~amd64"
fi
RDEPEND="
>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
dev-python/markdown2[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/PyQt6[widgets,gui,svg,${PYTHON_USEDEP}]
~net-misc/maestral-${PV}[${PYTHON_USEDEP}]
"
BDEPEND="
dev-python/build[${PYTHON_USEDEP}]
"
python_install_all() {
distutils-r1_python_install_all
domenu src/maestral_qt/resources/maestral.desktop
}

2
net-misc/maestral/Manifest
View File

@@ -1,3 +1,3 @@
DIST maestral-1.5.3.gh.tar.gz 8280040 BLAKE2B dcda43880cea3fb00098b6bf87e43318a523a7c9d83886efff58be715cde17f67504b31735a006b951963e5cf0ef70b4b6431cb84200722cae186053a01edd63 SHA512 aa21277623f4e6f3283cd989be910eeb1caa3a842abca595b27a551c1c9bd1e7ef083e495ee0f096190accd91835939cb2f4a26624feae0046d8770d53aaac2f
DIST maestral-1.6.5.gh.tar.gz 7983512 BLAKE2B b77cc7eb1a6089cc78e47680d99a53bc4c4752feed3970a57e67eefcf1ab2491c0b3aaebd2fb7caf6fc5420eef2e7fe8776e87047f82db7d1466a4c3d17beaf8 SHA512 ee182505b305dbd6730078ce71725eb75515fb5682889c5226c26a69d32f85ad28e335bcd65b57fd1624da8ecd8914df337a93f6b296d86dcc6e94d4f2747995
DIST maestral-1.6.6_rc0.gh.tar.gz 7985437 BLAKE2B 2a88625f4b0b1e2097c747e5893308c73dd402ec613557439a9ac8a974390fa7fb03d7c05747f0266c6e74fb09c09aba239948d0dec2a1aa8e778399ad52b097 SHA512 38bab89f7ce81e8a9db4958eee401fc7b47f16f1cf5018a659a53777872cd5bc305bd9aa4749912de23b4b178c38efa07518346714a7ad05c173389eb012fbb8
DIST maestral-1.6.6_rc1.gh.tar.gz 7985890 BLAKE2B e83f63e7bb082bc494e4c3e865a04dede4b969a3f4fc093b714eac7663264d32c0ac9e56b0a7fdb1ffd18d0793c9f22be06145a0890ea4f53057391017bfb148 SHA512 e3ec2612a7dc496a81c6c33de9dc601ed4d78494b2d56652dab2cf2bd5f9dd93fcaea62475662fb7a419769be361f2e8cae67d3706fdbaef3de646e6a0071746

0
net-misc/maestral/maestral-1.6.6_rc0.ebuild → net-misc/maestral/maestral-1.6.6_rc1.ebuild
View File

8
net-p2p/feather/Manifest
View File

@@ -6,3 +6,11 @@ DIST feather-2.2.3-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
DIST feather-2.2.3-monero.tar.gz 11615445 BLAKE2B b30f7e8b72989f14a482997a17e925afaef4ac198ecfe57e545f72f4923e26d3352db5bcb393252ab2488040b8fe82dba2c7be05c2c59cb5dff2499c6dd306a2 SHA512 cdb4f0634f50319622920faf56484f975fef7e94caf01f276118552ba7de284ec3ec06e43b1476de3255710f7bb47a47d75d974174a3c30657074943fa1f415a
DIST feather-2.2.3-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.2.3.tar.gz 2197323 BLAKE2B 413b6acfbb1eaa55844a01c324325707a25b99f78e52c882c1b57e66ff0f85a0535811568c43f0746818592a8775341678c1f565abdff2eefa25a81ac8d1c97b SHA512 96f5e3a3bd401bea1c15b77b9180da8cfddecfff85138a7cace27876ebe56558e1cf884ef28d9b466bfbf5b7beaa4232d96144e71d458c0d4c647129406199a9
DIST feather-2.3.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
DIST feather-2.3.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
DIST feather-2.3.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
DIST feather-2.3.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
DIST feather-2.3.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
DIST feather-2.3.0-monero.tar.gz 11624682 BLAKE2B cf4e53e4ba08d51a8b8b36181437ff531a37aa04888e0987152f7bc33e71acd8378848ad54caf3184494bf5071f0041fd8059c55047957dc4a973d7519165342 SHA512 a5246e5c1cc65cbc7c719979f07054f55016e8fcb9401b96809b1867d09f262850c7b24d42580f4aad2b0a2d25063b5c405dbc6537f72d87bd3109e52dc3196c
DIST feather-2.3.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.3.0.tar.gz 2204981 BLAKE2B d2635a52b092e4f90783074b1041a7256fcaa0ae66ae25bd1e19e04e4112a2a5bfb043d78aeeb62e2ce508498d531e4eb9677d6f4f223a298c5fac5d020c434a SHA512 b85f9932ed347cd78f9153a1e50e4374836f5d169efeb0a21e1d319c7f10b3f027a28384cad6fbc322c7bad8766bd30da6cbaf4b64a7a0e501634fe02f5cded0

144
net-p2p/feather/feather-2.3.0.ebuild Normal file
View File

@@ -0,0 +1,144 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake desktop xdg
SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
MONERO_DIST_COMIT="18bdad879d9f25f35f065354aedf1236e6b0a60b"
MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
DESCRIPTION="A free, open-source Monero wallet"
HOMEPAGE="https://featherwallet.org"
SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
${P}.tar.gz
https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
${P}-singleapplication.tar.gz
https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
${P}-monero.tar.gz
https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
${P}-monero-miniupnp.tar.gz
https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
${P}-monero-randomx.tar.gz
https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
${P}-monero-rapidjson.tar.gz
https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
${P}-monero-supercop.tar.gz
https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
${P}-monero-trezorcommon.tar.gz
"
# Feather is released under the terms of the BSD license, but it vendors
# code from Monero and Tor too.
LICENSE="BSD MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="qrcode xmrig localmonero"
DEPEND="
dev-libs/libsodium:=
media-gfx/qrencode:=
media-gfx/zbar:=[v4l]
>=dev-libs/polyseed-1.0.0
dev-libs/libzip:=
dev-libs/boost:=[nls]
>=dev-qt/qtcore-5.15:5
>=dev-qt/qtwidgets-5.15:5
>=dev-qt/qtgui-5.15:5
>=dev-qt/qtnetwork-5.15:5
>=dev-qt/qtsvg-5.15:5
>=dev-qt/qtxml-5.15:5
>=dev-qt/qtwebsockets-5.15:5
>=dev-qt/qtmultimedia-5.15:5[widgets]
>=dev-qt/qtconcurrent-5.15:5
dev-libs/libgcrypt:=
sys-libs/zlib
dev-libs/openssl:=
net-dns/unbound:=[threads]
net-libs/czmq:=
"
RDEPEND="
${DEPEND}
net-vpn/tor
xmrig? ( net-misc/xmrig )
"
BDEPEND="virtual/pkgconfig"
src_unpack() {
unpack ${P}.tar.gz \
${P}-singleapplication.tar.gz \
${P}-monero.tar.gz \
${P}-monero-miniupnp.tar.gz \
${P}-monero-randomx.tar.gz \
${P}-monero-rapidjson.tar.gz \
${P}-monero-supercop.tar.gz \
${P}-monero-trezorcommon.tar.gz
mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
"${WORKDIR}"/${P}/src/third-party/singleapplication || die
mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
"${WORKDIR}"/${P}/monero || die
mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
"${WORKDIR}"/${P}/monero/external/miniupnp || die
mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
"${WORKDIR}"/${P}/monero/external/randomx || die
mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
"${WORKDIR}"/${P}/monero/external/rapidjson || die
mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
"${WORKDIR}"/${P}/monero/external/supercop || die
mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
"${WORKDIR}"/${P}/monero/external/trezor-common || die
}
src_prepare() {
default
echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
pushd monero || die
eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
popd || die
cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DCMAKE_BUILD_TYPE=Release
-DBUILD_SHARED_LIBS=OFF
-DARCH=x86-64
-DBUILD_TAG="linux-x64"
-DBUILD_64=ON
-DSELF_CONTAINED=OFF
-DLOCALMONERO=$(usex localmonero)
-DXMRIG=$(usex xmrig)
-DCHECK_UPDATES=OFF
-DPLATFORM_INSTALLER=OFF
-DUSE_DEVICE_TREZOR=OFF
-DDONATE_BEG=OFF
-DWITH_SCANNER=$(usex qrcode)
)
cmake_src_configure
}
src_compile() {
cmake_build feather
}
src_install() {
dobin "${BUILD_DIR}/bin/feather"
doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
}
pkg_postinst() {
xdg_pkg_postinst
einfo "Ensure that Tor is running with 'rc-service tor start' before"
einfo "using Feather."
}

6
net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
View File

@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,12 +284,6 @@
@@ -284,12 +284,8 @@
add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
@@ -11,6 +11,8 @@
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STATIC_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
add_subdirectory(src)

18
net-p2p/feather/files/feather_remove_cflags-2.3.0.patch Normal file
View File

@@ -0,0 +1,18 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,12 +262,8 @@
add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
add_subdirectory(src)

11
net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
View File

@@ -1,6 +1,15 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -901,9 +901,9 @@
@@ -773,8 +773,6 @@
message(STATUS "AES support disabled")
endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -901,9 +899,9 @@
message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")

25
net-p2p/feather/files/monero_remove_cflags-2.3.0.patch Normal file
View File

@@ -0,0 +1,25 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -773,9 +773,6 @@
message(STATUS "AES support disabled")
endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
-
set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(ARM)
@@ -901,9 +898,9 @@
message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
# With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
# is fixed in the code (Issue #847), force compiler to be conservative.