1 |
commit: e7b206f216f3f1053b00ba80d6b73ef62ded11ad |
2 |
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> |
3 |
AuthorDate: Thu Dec 29 18:13:08 2022 +0000 |
4 |
Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> |
5 |
CommitDate: Thu Dec 29 18:13:08 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e7b206f2 |
7 |
|
8 |
net-p2p/feather: remove old ebuild, prevent some CFLAGS from being overridden |
9 |
|
10 |
Closes: https://bugs.gentoo.org/888876 |
11 |
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com> |
12 |
|
13 |
net-p2p/feather/feather-2.1.0.ebuild | 143 ---------------------- |
14 |
net-p2p/feather/feather-2.1.2.ebuild | 1 + |
15 |
net-p2p/feather/files/feather_remove_cflags.patch | 16 +++ |
16 |
3 files changed, 17 insertions(+), 143 deletions(-) |
17 |
|
18 |
diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild |
19 |
deleted file mode 100644 |
20 |
index 697aca1eb..000000000 |
21 |
--- a/net-p2p/feather/feather-2.1.0.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,143 +0,0 @@ |
24 |
-# Copyright 1999-2022 Gentoo Authors |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
- |
27 |
-EAPI=8 |
28 |
- |
29 |
-inherit cmake desktop xdg |
30 |
- |
31 |
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b" |
32 |
-MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450" |
33 |
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0" |
34 |
- RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c" |
35 |
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c" |
36 |
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9" |
37 |
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0" |
38 |
- |
39 |
-DESCRIPTION="A free, open-source Monero wallet" |
40 |
-HOMEPAGE="https://featherwallet.org" |
41 |
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \ |
42 |
-${P}.tar.gz |
43 |
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \ |
44 |
-${P}-singleapplication.tar.gz |
45 |
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \ |
46 |
-${P}-monero.tar.gz |
47 |
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \ |
48 |
-${P}-monero-miniupnp.tar.gz |
49 |
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \ |
50 |
-${P}-monero-randomx.tar.gz |
51 |
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \ |
52 |
-${P}-monero-rapidjson.tar.gz |
53 |
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \ |
54 |
-${P}-monero-supercop.tar.gz |
55 |
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \ |
56 |
-${P}-monero-trezorcommon.tar.gz |
57 |
-" |
58 |
- |
59 |
-# Feather is released under the terms of the BSD license, but it vendors |
60 |
-# code from Monero and Tor too. |
61 |
-LICENSE="BSD MIT" |
62 |
-SLOT="0" |
63 |
-KEYWORDS="~amd64" |
64 |
-IUSE="qrcode xmrig localmonero" |
65 |
- |
66 |
-DEPEND=" |
67 |
- dev-libs/libsodium:= |
68 |
- media-gfx/qrencode:= |
69 |
- media-gfx/zbar:=[v4l] |
70 |
- >=dev-libs/polyseed-1.0.0 |
71 |
- dev-libs/libzip:= |
72 |
- dev-libs/boost:=[nls] |
73 |
- >=dev-qt/qtcore-5.15:5 |
74 |
- >=dev-qt/qtwidgets-5.15:5 |
75 |
- >=dev-qt/qtgui-5.15:5 |
76 |
- >=dev-qt/qtnetwork-5.15:5 |
77 |
- >=dev-qt/qtsvg-5.15:5 |
78 |
- >=dev-qt/qtxml-5.15:5 |
79 |
- >=dev-qt/qtwebsockets-5.15:5 |
80 |
- >=dev-qt/qtmultimedia-5.15:5[widgets] |
81 |
- >=dev-qt/qtconcurrent-5.15:5 |
82 |
- dev-libs/libgcrypt:= |
83 |
- sys-libs/zlib |
84 |
- dev-libs/openssl:= |
85 |
- net-dns/unbound:=[threads] |
86 |
- net-libs/czmq:= |
87 |
-" |
88 |
-RDEPEND=" |
89 |
- ${DEPEND} |
90 |
- net-vpn/tor |
91 |
- xmrig? ( net-misc/xmrig ) |
92 |
-" |
93 |
-BDEPEND="virtual/pkgconfig" |
94 |
- |
95 |
-src_unpack() { |
96 |
- unpack ${P}.tar.gz \ |
97 |
- ${P}-singleapplication.tar.gz \ |
98 |
- ${P}-monero.tar.gz \ |
99 |
- ${P}-monero-miniupnp.tar.gz \ |
100 |
- ${P}-monero-randomx.tar.gz \ |
101 |
- ${P}-monero-rapidjson.tar.gz \ |
102 |
- ${P}-monero-supercop.tar.gz \ |
103 |
- ${P}-monero-trezorcommon.tar.gz |
104 |
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \ |
105 |
- "${WORKDIR}"/${P}/src/third-party/singleapplication || die |
106 |
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \ |
107 |
- "${WORKDIR}"/${P}/monero || die |
108 |
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \ |
109 |
- "${WORKDIR}"/${P}/monero/external/miniupnp || die |
110 |
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \ |
111 |
- "${WORKDIR}"/${P}/monero/external/randomx || die |
112 |
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \ |
113 |
- "${WORKDIR}"/${P}/monero/external/rapidjson || die |
114 |
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \ |
115 |
- "${WORKDIR}"/${P}/monero/external/supercop || die |
116 |
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \ |
117 |
- "${WORKDIR}"/${P}/monero/external/trezor-common || die |
118 |
-} |
119 |
- |
120 |
-src_prepare() { |
121 |
- default |
122 |
- echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die |
123 |
- echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die |
124 |
- pushd monero |
125 |
- eapply "${FILESDIR}"/monero_add_some_includes.patch |
126 |
- popd |
127 |
- cmake_src_prepare |
128 |
-} |
129 |
- |
130 |
-src_configure() { |
131 |
- local mycmakeargs=( |
132 |
- -DCMAKE_BUILD_TYPE=Release |
133 |
- -DBUILD_SHARED_LIBS=OFF |
134 |
- -DARCH=x86-64 |
135 |
- -DBUILD_TAG="linux-x64" |
136 |
- -DBUILD_64=ON |
137 |
- -DSELF_CONTAINED=OFF |
138 |
- -DLOCALMONERO=$(usex localmonero) |
139 |
- -DXMRIG=$(usex xmrig) |
140 |
- -DCHECK_UPDATES=OFF |
141 |
- -DPLATFORM_INSTALLER=OFF |
142 |
- -DUSE_DEVICE_TREZOR=OFF |
143 |
- -DDONATE_BEG=OFF |
144 |
- -DWITH_SCANNER=$(usex qrcode) |
145 |
- ) |
146 |
- |
147 |
- cmake_src_configure |
148 |
-} |
149 |
- |
150 |
-src_compile() { |
151 |
- cmake_build feather |
152 |
-} |
153 |
- |
154 |
-src_install() { |
155 |
- dobin "${BUILD_DIR}/bin/feather" |
156 |
- |
157 |
- doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png |
158 |
- domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop |
159 |
-} |
160 |
- |
161 |
-pkg_postinst() { |
162 |
- xdg_pkg_postinst |
163 |
- |
164 |
- einfo "Ensure that Tor is running with 'rc-service tor start' before" |
165 |
- einfo "using Feather." |
166 |
-} |
167 |
|
168 |
diff --git a/net-p2p/feather/feather-2.1.2.ebuild b/net-p2p/feather/feather-2.1.2.ebuild |
169 |
index 1678afc9e..4589f1a31 100644 |
170 |
--- a/net-p2p/feather/feather-2.1.2.ebuild |
171 |
+++ b/net-p2p/feather/feather-2.1.2.ebuild |
172 |
@@ -98,6 +98,7 @@ src_prepare() { |
173 |
default |
174 |
echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die |
175 |
echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die |
176 |
+ eapply "${FILESDIR}"/feather_remove_cflags.patch |
177 |
pushd monero || die |
178 |
eapply "${FILESDIR}"/monero_add_some_includes.patch |
179 |
popd || die |
180 |
|
181 |
diff --git a/net-p2p/feather/files/feather_remove_cflags.patch b/net-p2p/feather/files/feather_remove_cflags.patch |
182 |
new file mode 100644 |
183 |
index 000000000..e3a36c9af |
184 |
--- /dev/null |
185 |
+++ b/net-p2p/feather/files/feather_remove_cflags.patch |
186 |
@@ -0,0 +1,16 @@ |
187 |
+--- a/CMakeLists.txt |
188 |
++++ b/CMakeLists.txt |
189 |
+@@ -284,12 +284,6 @@ |
190 |
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS) |
191 |
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS) |
192 |
+ |
193 |
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}") |
194 |
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}") |
195 |
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}") |
196 |
+- |
197 |
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}") |
198 |
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}") |
199 |
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}") |
200 |
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STATIC_FLAGS}") |
201 |
+ |
202 |
+ add_subdirectory(src) |