* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2022-12-29 18:14 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2022-12-29 18:14 UTC (permalink / raw
To: gentoo-commits
commit: e7b206f216f3f1053b00ba80d6b73ef62ded11ad
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Thu Dec 29 18:13:08 2022 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Thu Dec 29 18:13:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e7b206f2
net-p2p/feather: remove old ebuild, prevent some CFLAGS from being overridden
Closes: https://bugs.gentoo.org/888876
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/feather-2.1.0.ebuild | 143 ----------------------
net-p2p/feather/feather-2.1.2.ebuild | 1 +
net-p2p/feather/files/feather_remove_cflags.patch | 16 +++
3 files changed, 17 insertions(+), 143 deletions(-)
diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
deleted file mode 100644
index 697aca1eb..000000000
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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="b45c66e9c62d7e8f24abbcb447f408e618bfd450"
- 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
- pushd monero
- eapply "${FILESDIR}"/monero_add_some_includes.patch
- popd
- 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."
-}
diff --git a/net-p2p/feather/feather-2.1.2.ebuild b/net-p2p/feather/feather-2.1.2.ebuild
index 1678afc9e..4589f1a31 100644
--- a/net-p2p/feather/feather-2.1.2.ebuild
+++ b/net-p2p/feather/feather-2.1.2.ebuild
@@ -98,6 +98,7 @@ 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.patch
pushd monero || die
eapply "${FILESDIR}"/monero_add_some_includes.patch
popd || die
diff --git a/net-p2p/feather/files/feather_remove_cflags.patch b/net-p2p/feather/files/feather_remove_cflags.patch
new file mode 100644
index 000000000..e3a36c9af
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -284,12 +284,6 @@
+ 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_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STATIC_FLAGS}")
+
+ add_subdirectory(src)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-02-03 6:13 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2023-02-03 6:13 UTC (permalink / raw
To: gentoo-commits
commit: 012161af0b9f82255795e2049b591098109ca9fb
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Fri Feb 3 06:12:11 2023 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Fri Feb 3 06:12:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=012161af
net-p2p/feather: stop monero subdirectory from touching cflags
Closes: https://bugs.gentoo.org/892577
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/feather-2.2.3.ebuild | 5 +++--
...ove_cflags.patch => feather_remove_cflags-2.2.3.patch} | 0
...ncludes.patch => monero_add_some_includes-2.2.3.patch} | 0
net-p2p/feather/files/monero_remove_cflags-2.2.3.patch | 15 +++++++++++++++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/net-p2p/feather/feather-2.2.3.ebuild b/net-p2p/feather/feather-2.2.3.ebuild
index 5052332ab..6a22d7eb0 100644
--- a/net-p2p/feather/feather-2.2.3.ebuild
+++ b/net-p2p/feather/feather-2.2.3.ebuild
@@ -98,9 +98,10 @@ 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.patch
+ eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
pushd monero || die
- eapply "${FILESDIR}"/monero_add_some_includes.patch
+ eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
+ eapply "${FILESDIR}"/monero_add_some_includes-${PV}.patch
popd || die
cmake_src_prepare
}
diff --git a/net-p2p/feather/files/feather_remove_cflags.patch b/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
similarity index 100%
rename from net-p2p/feather/files/feather_remove_cflags.patch
rename to net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
diff --git a/net-p2p/feather/files/monero_add_some_includes.patch b/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
similarity index 100%
rename from net-p2p/feather/files/monero_add_some_includes.patch
rename to net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
new file mode 100644
index 000000000..5ae53dd88
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -901,9 +901,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.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-03-14 21:14 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2023-03-14 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 3d371c387d801db2f54b3333043a362e03fb464c
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Tue Mar 14 22:12:44 2023 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Tue Mar 14 22:12:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3d371c38
net-p2p/feather: version bump
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 8 ++
net-p2p/feather/feather-2.4.2.ebuild | 144 +++++++++++++++++++++
.../files/feather_remove_cflags-2.4.2.patch | 18 +++
.../feather/files/monero_remove_cflags-2.4.2.patch | 25 ++++
4 files changed, 195 insertions(+)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 25eccdd69..5dfc062b9 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -22,3 +22,11 @@ DIST feather-2.4.1_pre20230301-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f28
DIST feather-2.4.1_pre20230301-monero.tar.gz 11621070 BLAKE2B 8361a9f44eeb8a2035d3e110481aada7607b4bac2b52efc04ac6003665585d4d56629e88ab8c501e51997b3c3fe514a81b6f981bc07f3070eb24b897169300a6 SHA512 1bc23d60bebd51fdf459244376406c3eaec698457d0fc58f9628081c4b6297a15fb12dc848bbbbaafc77c367c59811ff36dbe499ac0fbcafd4ea10e0c6771f7e
DIST feather-2.4.1_pre20230301-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.4.1_pre20230301.tar.gz 5458207 BLAKE2B 40f754a19778c227fcf73350f4bc5b61df142d18d17227dc7d83f2beef160ad170d1d40eea589d003c19459c2821b6b8630220dc612ba3abb981ebe622225b6d SHA512 eb09f6c7d45e238110d2f7c60401aba147acbb38784e51d5e43966b077c52e4e26c1d08cfbf4093cdb777fc8a01932b927603cb834f0d1b4b8b41fa913a9987b
+DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.4.2-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
+DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
diff --git a/net-p2p/feather/feather-2.4.2.ebuild b/net-p2p/feather/feather-2.4.2.ebuild
new file mode 100644
index 000000000..f2fb17331
--- /dev/null
+++ b/net-p2p/feather/feather-2.4.2.ebuild
@@ -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="72519d14203061b59191144ee8cab736bc88b978"
+ 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."
+}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
@@ -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)
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
@@ -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.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-04-22 5:47 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2023-04-22 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 69694a5828da73b27011786de11c968578556285
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sat Apr 22 05:46:30 2023 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Sat Apr 22 05:46:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=69694a58
net-p2p/feather: version bump
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 8 ++
net-p2p/feather/feather-2.4.5.ebuild | 149 +++++++++++++++++++++
.../files/feather_remove_cflags-2.4.5.patch | 18 +++
.../feather/files/monero_remove_cflags-2.4.5.patch | 25 ++++
4 files changed, 200 insertions(+)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 5dfc062b9..33ebcb7c7 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -30,3 +30,11 @@ DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
+DIST feather-2.4.5-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.4.5-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.4.5-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.4.5-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.4.5-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.4.5-monero.tar.gz 11620246 BLAKE2B 7ea16ac6b61009e8bc562736d00aca8a4b3b2c6b14c22e60a3e198bacb7efc1a557fa7ed17e907a338f9904b161e3ede7e50478b09b43b3cf3e64ca8dd2278a4 SHA512 5ec5fbcbbae9a49d8e558f0b98f587ca704a64075a03874fab5fd77fb008a010baf327079f26a138b0365d728f8e5603fdcb9fdd911523ab7264bbb4a293465f
+DIST feather-2.4.5-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.4.5.tar.gz 1196741 BLAKE2B fe38f8e004f1fdc3cfedcb8596e4a77586e14556148e6692117dcbc5e7ae5265116df90ef40f36a70d7757bf568d485dda8e60dce3dad38b93f69d798a83deac SHA512 48d6a4457e8decf3bf50e4e5b0f1ffb242e6b43d91070ee0d2ad5043fb586772d4cc9cf1f89677b680b6d0cfcd8034a61597dec44a3c62c37cc6cd9ac60bd1b0
diff --git a/net-p2p/feather/feather-2.4.5.ebuild b/net-p2p/feather/feather-2.4.5.ebuild
new file mode 100644
index 000000000..86dd7b83a
--- /dev/null
+++ b/net-p2p/feather/feather-2.4.5.ebuild
@@ -0,0 +1,149 @@
+# 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="543582872aeb6ac5dd5853983765dbdd7706163d"
+ 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"
+
+ newicon -s 256 "${WORKDIR}"/${PF}/src/assets/images/appicons/256x256.png feather.png
+ newicon -s 128 "${WORKDIR}"/${PF}/src/assets/images/appicons/128x128.png feather.png
+ newicon -s 96 "${WORKDIR}"/${PF}/src/assets/images/appicons/96x96.png feather.png
+ newicon -s 64 "${WORKDIR}"/${PF}/src/assets/images/appicons/64x64.png feather.png
+ newicon -s 48 "${WORKDIR}"/${PF}/src/assets/images/appicons/48x48.png feather.png
+ newicon -s 32 "${WORKDIR}"/${PF}/src/assets/images/appicons/32x32.png 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."
+}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
@@ -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)
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
@@ -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.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-10-13 23:50 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2023-10-13 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 5ee72a4f9b93f6bfc782dc6bc013884034c3ea54
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Fri Oct 13 23:50:11 2023 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Fri Oct 13 23:50:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5ee72a4f
net-p2p/feather: version bump, fix USE flags, fix live ebuild, update manifest, remove old ebuild
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 32 ++---
net-p2p/feather/feather-2.4.5.ebuild | 149 ---------------------
net-p2p/feather/feather-2.4.9-r1.ebuild | 2 +-
net-p2p/feather/feather-2.4.9.ebuild | 145 --------------------
.../{feather-2.5.0.ebuild => feather-2.5.1.ebuild} | 5 +-
net-p2p/feather/feather-9999.ebuild | 15 +--
net-p2p/feather/files/MoneroArbo.asc | 51 +++++++
net-p2p/feather/files/tobtoht.asc | 51 +++++++
8 files changed, 119 insertions(+), 331 deletions(-)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 63fca25bf8..0f7db46408 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,17 +1,3 @@
-DIST feather-2.4.5-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.5-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.5-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.5-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.5-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.5-monero.tar.gz 11620246 BLAKE2B 7ea16ac6b61009e8bc562736d00aca8a4b3b2c6b14c22e60a3e198bacb7efc1a557fa7ed17e907a338f9904b161e3ede7e50478b09b43b3cf3e64ca8dd2278a4 SHA512 5ec5fbcbbae9a49d8e558f0b98f587ca704a64075a03874fab5fd77fb008a010baf327079f26a138b0365d728f8e5603fdcb9fdd911523ab7264bbb4a293465f
-DIST feather-2.4.5-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.5.tar.gz 1196741 BLAKE2B fe38f8e004f1fdc3cfedcb8596e4a77586e14556148e6692117dcbc5e7ae5265116df90ef40f36a70d7757bf568d485dda8e60dce3dad38b93f69d798a83deac SHA512 48d6a4457e8decf3bf50e4e5b0f1ffb242e6b43d91070ee0d2ad5043fb586772d4cc9cf1f89677b680b6d0cfcd8034a61597dec44a3c62c37cc6cd9ac60bd1b0
-DIST feather-2.4.9-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.9-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.9-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.9-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.9-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.9-monero.tar.gz 11649111 BLAKE2B fc087623b02fe57947aa4c4294e1bdee09ef171651382af99e870d299093f3380e00f9852f28683a6c4b4cff4ef0d1c573fb94c53083f4077d3b22e6b352b3bd SHA512 69dcc76e4e23c26ff1e7d01b1993af09a0f6f075d091a9169f7cfecfb094386380d657f66664a538c82977a7ca91f8df2ac33338339f53d55bc3beda2f8235db
DIST feather-2.4.9-r1-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
DIST feather-2.4.9-r1-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
DIST feather-2.4.9-r1-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
@@ -20,13 +6,11 @@ DIST feather-2.4.9-r1-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5
DIST feather-2.4.9-r1-monero.tar.gz 14011935 BLAKE2B b46ef62cb982f134c9c643f9bbe8fee196a42d9c7291f296c6185e598c240565c5c2714ed3f5337df34f2233cb0c54e1f70af605f7e871c0e4cc385d8820e6e1 SHA512 a9e5edf93f7d75dca47a0a9b0a06326f3e6774aa9e759492f399af18a0b0842237ad27beb7b1d0fbfd69a0e9e8adbdd2439b79ddc3e872c8a0bcb2ff546eb64e
DIST feather-2.4.9-r1-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.4.9-r1.tar.gz 1241941 BLAKE2B 725c949525970fb8368fdcc3443b5fde7ffbdb12b82608c6fa590e5104bd3fe4c42a5dca299e83acbd2b74d9bd2f7bf11a885c1cbdbafaed1eac3e7a825addc6 SHA512 71637871fead4d607c4a4536be1737c8640672921da5807dc17956e11ba95d5ae71467163dc01075df8c7b7c56ffe63ffbcdab433e4882215d542fcb89dac9a0
-DIST feather-2.4.9-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.9.tar.gz 1241941 BLAKE2B 725c949525970fb8368fdcc3443b5fde7ffbdb12b82608c6fa590e5104bd3fe4c42a5dca299e83acbd2b74d9bd2f7bf11a885c1cbdbafaed1eac3e7a825addc6 SHA512 71637871fead4d607c4a4536be1737c8640672921da5807dc17956e11ba95d5ae71467163dc01075df8c7b7c56ffe63ffbcdab433e4882215d542fcb89dac9a0
-DIST feather-2.5.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.5.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.5.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.5.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.5.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.5.0-monero.tar.gz 14014516 BLAKE2B 0f5f74b1e9c72e0671d010910730e21b0990be09f5fffc472e7493004c2d3583b60f4eab90ba396be359cf22771b5d21c66e6d7a46b2094d94f0b81f4375260e SHA512 ab9466d9d93632fea476d9aa9de5fb4298a8b74a340d144c061ce438e36f2bee056a30d66d37c1cc3128576539f45b135e8d336c66c6961651e1846370f205e2
-DIST feather-2.5.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.5.0.tar.gz 1318133 BLAKE2B 06569bc2458a94e3f30668162d3f8f0f8372f0778b997b50c787a2afbcdff2fcb9804b666443661029871257d4f61ef5be6642bedbbe3efad817926f42452fb2 SHA512 c8cc4967187f4f8b31b8e722daeda6e9ce1d04bdc748f7e4eac56915a9f3a041f3c0b72fc7205832fc04ea4a3d0e2fe514e4ff73d025374df0b0b710dbc9dccc
+DIST feather-2.5.1-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.5.1-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.5.1-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.5.1-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.5.1-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.5.1-monero.tar.gz 14014516 BLAKE2B 0f5f74b1e9c72e0671d010910730e21b0990be09f5fffc472e7493004c2d3583b60f4eab90ba396be359cf22771b5d21c66e6d7a46b2094d94f0b81f4375260e SHA512 ab9466d9d93632fea476d9aa9de5fb4298a8b74a340d144c061ce438e36f2bee056a30d66d37c1cc3128576539f45b135e8d336c66c6961651e1846370f205e2
+DIST feather-2.5.1-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.5.1.tar.gz 1318136 BLAKE2B 7950ba90b8c8c03cf336d09da1145616791a9ee00d81e45f9f38d3022286bd586f8c367b4c852c2fac7c5afaa291666b8dfd510777b4e0faec1bb5bcbe501cca SHA512 816a9375939baac42b796bb4caaf6fc273afb681c4d22946180cdcd5ffe65ff93db2a0aaa3b7dc7eb19a1cff7a22fb05b9c2a36893cf1511c5e8fbde216c768c
diff --git a/net-p2p/feather/feather-2.4.5.ebuild b/net-p2p/feather/feather-2.4.5.ebuild
deleted file mode 100644
index 86dd7b83ac..0000000000
--- a/net-p2p/feather/feather-2.4.5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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="543582872aeb6ac5dd5853983765dbdd7706163d"
- 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"
-
- newicon -s 256 "${WORKDIR}"/${PF}/src/assets/images/appicons/256x256.png feather.png
- newicon -s 128 "${WORKDIR}"/${PF}/src/assets/images/appicons/128x128.png feather.png
- newicon -s 96 "${WORKDIR}"/${PF}/src/assets/images/appicons/96x96.png feather.png
- newicon -s 64 "${WORKDIR}"/${PF}/src/assets/images/appicons/64x64.png feather.png
- newicon -s 48 "${WORKDIR}"/${PF}/src/assets/images/appicons/48x48.png feather.png
- newicon -s 32 "${WORKDIR}"/${PF}/src/assets/images/appicons/32x32.png 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."
-}
diff --git a/net-p2p/feather/feather-2.4.9-r1.ebuild b/net-p2p/feather/feather-2.4.9-r1.ebuild
index 4565940bc9..1f9782dfc2 100644
--- a/net-p2p/feather/feather-2.4.9-r1.ebuild
+++ b/net-p2p/feather/feather-2.4.9-r1.ebuild
@@ -44,7 +44,7 @@ DEPEND="
dev-libs/libsodium:=
media-gfx/qrencode:=
media-gfx/zbar:=[v4l]
- =dev-libs/polyseed-1.0.0
+ ~dev-libs/polyseed-1.0.0
dev-libs/libzip:=
dev-libs/boost:=[nls]
>=dev-qt/qtcore-5.15:5
diff --git a/net-p2p/feather/feather-2.4.9.ebuild b/net-p2p/feather/feather-2.4.9.ebuild
deleted file mode 100644
index f4a70a2a32..0000000000
--- a/net-p2p/feather/feather-2.4.9.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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="4a7881a55606b41eb79509b33b0f291b64860922"
- 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
- 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"
-
- newicon -s 256 "${WORKDIR}"/${PF}/src/assets/images/appicons/256x256.png feather.png
- newicon -s 128 "${WORKDIR}"/${PF}/src/assets/images/appicons/128x128.png feather.png
- newicon -s 96 "${WORKDIR}"/${PF}/src/assets/images/appicons/96x96.png feather.png
- newicon -s 64 "${WORKDIR}"/${PF}/src/assets/images/appicons/64x64.png feather.png
- newicon -s 48 "${WORKDIR}"/${PF}/src/assets/images/appicons/48x48.png feather.png
- newicon -s 32 "${WORKDIR}"/${PF}/src/assets/images/appicons/32x32.png 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."
-}
diff --git a/net-p2p/feather/feather-2.5.0.ebuild b/net-p2p/feather/feather-2.5.1.ebuild
similarity index 97%
rename from net-p2p/feather/feather-2.5.0.ebuild
rename to net-p2p/feather/feather-2.5.1.ebuild
index 4ffd27226d..5785d1321e 100644
--- a/net-p2p/feather/feather-2.5.0.ebuild
+++ b/net-p2p/feather/feather-2.5.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
inherit cmake desktop xdg
+#Verify feather-${PV}.tar.gz with https://github.com/feather-wallet/feather-sigs
SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
MONERO_DIST_COMIT="1f068d1ee84849b3b1758b0a46844834019de1bc"
MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
@@ -38,13 +39,13 @@ ${PF}-monero-trezorcommon.tar.gz
LICENSE="BSD MIT"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero qt6"
+IUSE="qrcode xmrig localmonero"
DEPEND="
dev-libs/libsodium:=
media-gfx/qrencode:=
media-gfx/zbar:=[v4l]
- =dev-libs/polyseed-1.0.0
+ ~dev-libs/polyseed-1.0.0
dev-libs/libzip:=
dev-libs/boost:=[nls]
>=dev-qt/qtbase-6.5.2:6
diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild
index a3931f296d..71233bddf6 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -21,18 +21,13 @@ DEPEND="
dev-libs/libsodium:=
media-gfx/qrencode:=
media-gfx/zbar:=[v4l]
- >=dev-libs/polyseed-1.0.0
+ ~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-qt/qtbase-6.5.2:6
+ >=dev-qt/qtsvg-6.5.2:6
+ >=dev-qt/qtmultimedia-6.5.2:6
+ >=dev-qt/qtwebsockets-6.5.2:6
dev-libs/libgcrypt:=
sys-libs/zlib
dev-libs/openssl:=
diff --git a/net-p2p/feather/files/MoneroArbo.asc b/net-p2p/feather/files/MoneroArbo.asc
new file mode 100644
index 0000000000..6ecc8b67d6
--- /dev/null
+++ b/net-p2p/feather/files/MoneroArbo.asc
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=L0EV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/net-p2p/feather/files/tobtoht.asc b/net-p2p/feather/files/tobtoht.asc
new file mode 100644
index 0000000000..16311b2d82
--- /dev/null
+++ b/net-p2p/feather/files/tobtoht.asc
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=KI4D
+-----END PGP PUBLIC KEY BLOCK-----
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2024-07-16 3:01 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2024-07-16 3:01 UTC (permalink / raw
To: gentoo-commits
commit: 82333b2b1fe208637962287d7e8e6b985ae23f3a
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Tue Jul 16 03:01:19 2024 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Tue Jul 16 03:01:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82333b2b
net-p2p/feather: deleted old files and simplified latest ebuild
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 10 +---
...eather-2.6.7.ebuild => feather-2.6.7-r1.ebuild} | 54 ++--------------------
.../files/feather_remove_cflags-2.4.5.patch | 18 --------
.../feather/files/monero_remove_cflags-2.4.5.patch | 25 ----------
4 files changed, 6 insertions(+), 101 deletions(-)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 40863a595..36e426a97 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -6,11 +6,5 @@ DIST feather-2.6.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
DIST feather-2.6.2-monero.tar.gz 14007104 BLAKE2B e14c36698dfce91e430960166a3d6012139c12c6eda4bbf5cd1372054e80c7f762612a477a41bb5193cb7e01330edd138770fad03230b93ed7325ecff1a28943 SHA512 d1597e76bb51d3b56cb44c0b16b8e9e5329221e61364c4053319319736cd392ba354056fc2e911dda281d0f456b2a7da2393991b2e1d002ee23ae051351a2c58
DIST feather-2.6.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.6.2.tar.gz 1390990 BLAKE2B b173be0a32b9781613a22d6454ba9a2ed8d8512b210b36a1c0f99d4a7e5b344b86bcb3fc1c92652b5222c4df9b67f5adc767c06b9865390e9f265776068fd43f SHA512 4d59a79462634ac7ab2d8060457979c69a1f5ca42d92b8b565f98f8f2ccd7f8de13ea0bd698632eb0b09621ac725052629c128d77ef9389cff0ab855ef0e57d8
-DIST feather-2.6.7-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.6.7-monero-randomx.tar.gz 181365 BLAKE2B 93c061f2531747c25f3e232c52f7dae39bde798ed54174e186be7d6fbe20675281279157d6fe7f3495887a88524cd0a10a78ff827ea8c7584249db47dd66c49b SHA512 9bbe7d106a6cd518b81f3fcae7ddc78c94cc95ba7862911a0bd291755a0b6fcabcc183235befa7806945abde8160833b1fda1fa656bde6816f3d2672c5460fb5
-DIST feather-2.6.7-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.6.7-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.6.7-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.6.7-monero.tar.gz 14030046 BLAKE2B 9f366c65381085641c1ccfed96272fbced14a8217dd3021e54809b10f0d08132754f05a1257c5dc1950a15897a3480524d876a296002c481583057da3bdc38de SHA512 52115dcc0eb974c187250e964a5423dd210f4a66e317170312da550e768fa2244b3a6cc541066cd97609ae86b3994d1dcec6d041817f042d151d774bd313a95e
-DIST feather-2.6.7-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.6.7.tar.gz 1475553 BLAKE2B 167802dd711c536514ba5f989b96390e9d09cbbc8e72bcdb374b1eb588c5d80d0c45ba3242a546553eaf47934ec48d1803961b5faa2ea14a28291479f5759007 SHA512 babf869bb4546d5b40bcead3ba5aa6511db918f937c3ef28500fb48b24dd759c942adfb1884e21aac52c2ea6966171b580c941cceafb64bc47e77d4fcd5f29aa
+DIST feather-2.6.7-r1.tar.gz 29105182 BLAKE2B efdeee978cccc859c8951440e2d32f5375d251963aa99d50b676a7c8dd753ee8eb8f8ee401f5d4045b277e8c8133c260a62b97450f32f8a6fe7db3563140237e SHA512 c304a45f3a6a5ec89805012d8c5a6b906387db329e58969d88f45a4743eba5875e1f5ba76fc3f2be14764efc28b0e63c7641378e20fe312deed53900c35c939d
+DIST feather-2.6.7-r1.tar.gz.asc 833 BLAKE2B 337e7c41ad3c6e2d101470ef32d47ded55b5abb4c9451c66ccff55a62f49d19ed335371278fa1ef76d77e67e08b93dba2efd51855ebe7a7d2630c2a12937b269 SHA512 f9242645e7e2f591173f29949a87a31ec9eab5898e33179cde3031ad050441f03f9b4dff3eb1a72681f6873c84ecc198aef2e08a7224cd92d72de3c1b00b4618
diff --git a/net-p2p/feather/feather-2.6.7.ebuild b/net-p2p/feather/feather-2.6.7-r1.ebuild
similarity index 52%
rename from net-p2p/feather/feather-2.6.7.ebuild
rename to net-p2p/feather/feather-2.6.7-r1.ebuild
index 639462fc7..d61a00d47 100644
--- a/net-p2p/feather/feather-2.6.7.ebuild
+++ b/net-p2p/feather/feather-2.6.7-r1.ebuild
@@ -5,33 +5,13 @@ EAPI=8
inherit cmake desktop xdg
-#TODO: Verify feather-${PV}.tar.gz with https://github.com/feather-wallet/feather-sigs
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="ad951be2edfb3045ec3d0bb74a25badb91bc8b92"
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
- RANDOMX_DIST_COMIT="102f8acf90a7649ada410de5499a7ec62e49e1da"
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
+#TODO: Verify feather-${PV}.tar.gz with GPG keys provided at release page (against files/tobtoht.asc) perhaps with pkg_pretend?
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 -> \
-${PF}.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${PF}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${PF}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${PF}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${PF}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${PF}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${PF}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${PF}-monero-trezorcommon.tar.gz
+SRC_URI="
+ https://github.com/feather-wallet/feather/releases/download/${PV}/feather-${PV}.tar.gz -> ${PF}.tar.gz
+ https://github.com/feather-wallet/feather/releases/download/2.6.7/feather-2.6.7.tar.gz.asc -> ${PF}.tar.gz.asc
"
# Feather is released under the terms of the BSD license, but it vendors
@@ -67,31 +47,6 @@ BDEPEND="
virtual/pkgconfig
"
-src_unpack() {
- unpack ${PF}.tar.gz \
- ${PF}-singleapplication.tar.gz \
- ${PF}-monero.tar.gz \
- ${PF}-monero-miniupnp.tar.gz \
- ${PF}-monero-randomx.tar.gz \
- ${PF}-monero-rapidjson.tar.gz \
- ${PF}-monero-supercop.tar.gz \
- ${PF}-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}"/${P}/src/config-feather.h || die
@@ -123,7 +78,6 @@ src_configure() {
-DDONATE_BEG=OFF
-DWITH_SCANNER=$(usex qrcode)
)
-
cmake_src_configure
}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
deleted file mode 100644
index a3dbbb06e..000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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)
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
deleted file mode 100644
index 869a7bdc8..000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2024-07-16 13:18 Adam Pimentel
0 siblings, 0 replies; 7+ messages in thread
From: Adam Pimentel @ 2024-07-16 13:18 UTC (permalink / raw
To: gentoo-commits
commit: a20f34daf1b360fa921d484b4f5caa14a44f0b86
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Tue Jul 16 13:17:59 2024 +0000
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Tue Jul 16 13:17:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a20f34da
net-p2p/feather: update GPG info
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/feather-2.6.7-r1.ebuild | 2 +-
net-p2p/feather/files/featherwallet.asc | 52 +++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/net-p2p/feather/feather-2.6.7-r1.ebuild b/net-p2p/feather/feather-2.6.7-r1.ebuild
index d61a00d47..3948e447f 100644
--- a/net-p2p/feather/feather-2.6.7-r1.ebuild
+++ b/net-p2p/feather/feather-2.6.7-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit cmake desktop xdg
-#TODO: Verify feather-${PV}.tar.gz with GPG keys provided at release page (against files/tobtoht.asc) perhaps with pkg_pretend?
+#TODO: Verify feather-${PV}.tar.gz with GPG keys provided at release page (against files/featherwallet.asc)
DESCRIPTION="A free, open-source Monero wallet"
HOMEPAGE="https://featherwallet.org"
diff --git a/net-p2p/feather/files/featherwallet.asc b/net-p2p/feather/files/featherwallet.asc
new file mode 100644
index 000000000..c047b2f4c
--- /dev/null
+++ b/net-p2p/feather/files/featherwallet.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Ig==
+=2rq8
+-----END PGP PUBLIC KEY BLOCK-----
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-16 13:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 3:01 [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/, net-p2p/feather/files/ Adam Pimentel
-- strict thread matches above, loose matches on Subject: below --
2024-07-16 13:18 Adam Pimentel
2023-10-13 23:50 Adam Pimentel
2023-04-22 5:47 Adam Pimentel
2023-03-14 21:14 Adam Pimentel
2023-02-03 6:13 Adam Pimentel
2022-12-29 18:14 Adam Pimentel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox