1 |
commit: 585981bc6fcaebaf3879436a4bb4de406ce04486 |
2 |
Author: Saki Xi <space_raccoon <AT> riseup <DOT> net> |
3 |
AuthorDate: Thu Dec 29 20:03:21 2022 +0000 |
4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
5 |
CommitDate: Sat Dec 31 19:44:51 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=585981bc |
7 |
|
8 |
net-vpn/tor: remove old, sync keywords |
9 |
|
10 |
Signed-off-by: Saki Xi <space_raccoon <AT> riseup.net> |
11 |
Closes: https://github.com/gentoo/libressl/pull/485 |
12 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
13 |
|
14 |
net-vpn/tor/Manifest | 6 -- |
15 |
net-vpn/tor/tor-0.4.7.10-r1.ebuild | 128 ------------------------------------- |
16 |
net-vpn/tor/tor-0.4.7.12.ebuild | 2 +- |
17 |
net-vpn/tor/tor-0.4.7.8.ebuild | 127 ------------------------------------ |
18 |
4 files changed, 1 insertion(+), 262 deletions(-) |
19 |
|
20 |
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest |
21 |
index bc1dc82..655ae9d 100644 |
22 |
--- a/net-vpn/tor/Manifest |
23 |
+++ b/net-vpn/tor/Manifest |
24 |
@@ -1,12 +1,6 @@ |
25 |
-DIST tor-0.4.7.10.tar.gz 7933376 BLAKE2B 46a9d932e7451bcc683e18d296d7a26bb4b544767cf4622910ebf90d82715718451ec3e0d6cd215eff5fe2cc3ae8441b8e6065c5877d7fc92c2f26ab5c7fa0cb SHA512 e82877807d9e73fe12ab424830641e52b9b45034ca06f07e37648f50a3c1c10cd1b07081d8646b8e92c58658bdff5f6e9670e5104e9d05a531b1d85d0851a606 |
26 |
-DIST tor-0.4.7.10.tar.gz.sha256sum 86 BLAKE2B 4b372b3508ffee497ecc9adab4a4d3d2b548100bb7dd54e1036c71004503d96148899096bbae807f2d626a5e26d0a947f7546df0a708a78b59b4d39bed3e849c SHA512 518b6e617702386df7a84155d528f1a904a45221c946402da3fc3d40170dcdac117bff38c92a2e58ef4dd8d422433950f3904d27da66a99d808204432732cc9b |
27 |
-DIST tor-0.4.7.10.tar.gz.sha256sum.asc 1321 BLAKE2B fc7fd43115992e5d434cc1bf2808eeb971ead532935be7493b4eef7804a65cad3cf4f9fd18158a0c8f3e19bb9e55c5fe7487ded9adb6782cbc1583e1159aaf7c SHA512 789923b465e72a1a77b1b1951cd0f66c266c10119a480ce8b622f1f4aa07381b7403c27aca3badf51381da0b41498c9b0d42b2c5cedd6c54a617df9dc138689e |
28 |
DIST tor-0.4.7.11.tar.gz 7983705 BLAKE2B 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e SHA512 318377916880310438aa9804d1ea0154c5416d6b13988c4ff7f2e65fd38c94e2cd6c53252fd76a4dcb488f452837468e19197bf5feee4020e3c1927a76ed2937 |
29 |
DIST tor-0.4.7.11.tar.gz.sha256sum 86 BLAKE2B 1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b SHA512 cfdae54a70dc0d8eb0eaf8b8c9902a7dd8bc8d597a678d5a0bf431c3e09a8b56206b70b6f9207e3c06e1ba11913b25b81d7c269e49cde5f297ff7b165a3348a9 |
30 |
DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931dbdb6cf5b13e7a99e2dcc1c784e3832ba2f0314c1c2f3a9e5ccaba3f20d7aab9b9c918373194290769e358cbb5411323012 SHA512 b5e3c82378bc18268d6d4523787e12ece39246cc0f035fd1aedc50c2182d1ba3d2a8f8817a3dada2cd60acabb78f604f06ab347b92c6f42a82f260cc49285c2c |
31 |
DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9 SHA512 b97a6cc3fd3353cc1cdbb47df6d8895d0f730967083171795be56ffab4660c9a0f8f73ce83a98eff1fbd0793bae28c987d53c29f57fc5e0f26dddc30c197abb2 |
32 |
DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1 |
33 |
DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc |
34 |
-DIST tor-0.4.7.8.tar.gz 7910081 BLAKE2B 40f6eab453d95a09e4531ce7cdb59715a21b84e1d0b1045d107add6a443fb7563a5747734b23e0e1dfda6490a5a7659f912e38c11cdb5fa635535dcff6169eeb SHA512 2daeb4ef9144772b4e0793ccd00990b7eda58c533f9616670940931d6d12770e9a7d48b33b5626d330f62bb71fbc6e1f559881f062d16bc15fbb162e29fa91f4 |
35 |
-DIST tor-0.4.7.8.tar.gz.sha256sum 85 BLAKE2B 0fa1e094af83c74f46f87d0569a623bd3061b416f272d19326faf08ab6e9e926b14c2d46c99fba80d68f22188aa74c73e68477015e1c37382e4acb115d10a5a2 SHA512 8d8ef020e8028a0d481cbf6e50809212ebfb493b11c3937f1f732be48ca139a991e68b799342a17374f6faf77f0a7113d15c5220a5bf94d110d11582a078a013 |
36 |
-DIST tor-0.4.7.8.tar.gz.sha256sum.asc 1321 BLAKE2B b70d64db73c45f50bac4ef07f12d755eaf02b676d929bd6f3a9b5b593326e1cce4a3bc8466f2ccce003ab044084fa812ce6ea4cbf32f5a4c0321199dcd291bee SHA512 5c58745abb4db4a9d53c4c4df209cab96689494704d661439efa705f143267aac648ed23240aedc802e9689223f79d2d1c7eba865d2d5b3296590f8b93e03c37 |
37 |
|
38 |
diff --git a/net-vpn/tor/tor-0.4.7.10-r1.ebuild b/net-vpn/tor/tor-0.4.7.10-r1.ebuild |
39 |
deleted file mode 100644 |
40 |
index b904340..0000000 |
41 |
--- a/net-vpn/tor/tor-0.4.7.10-r1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,128 +0,0 @@ |
44 |
-# Copyright 1999-2022 Gentoo Authors |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
- |
47 |
-EAPI="8" |
48 |
- |
49 |
-PYTHON_COMPAT=( python3_{8..10} ) |
50 |
-inherit python-any-r1 readme.gentoo-r1 systemd verify-sig |
51 |
- |
52 |
-MY_PV="$(ver_rs 4 -)" |
53 |
-MY_PF="${PN}-${MY_PV}" |
54 |
-DESCRIPTION="Anonymizing overlay network for TCP" |
55 |
-HOMEPAGE="https://www.torproject.org/" |
56 |
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz |
57 |
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz |
58 |
- verify-sig? ( |
59 |
- https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum |
60 |
- https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc |
61 |
- )" |
62 |
-S="${WORKDIR}/${MY_PF}" |
63 |
- |
64 |
-LICENSE="BSD GPL-2" |
65 |
-SLOT="0" |
66 |
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then |
67 |
- KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" |
68 |
-fi |
69 |
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" |
70 |
-RESTRICT="!test? ( test )" |
71 |
- |
72 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc |
73 |
- |
74 |
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )" |
75 |
-DEPEND=" |
76 |
- dev-libs/libevent:=[ssl] |
77 |
- sys-libs/zlib |
78 |
- caps? ( sys-libs/libcap ) |
79 |
- man? ( app-text/asciidoc ) |
80 |
- dev-libs/openssl:0=[-bindist(-)] |
81 |
- lzma? ( app-arch/xz-utils ) |
82 |
- scrypt? ( app-crypt/libscrypt ) |
83 |
- seccomp? ( >=sys-libs/libseccomp-2.4.1 ) |
84 |
- systemd? ( sys-apps/systemd ) |
85 |
- zstd? ( app-arch/zstd )" |
86 |
-RDEPEND=" |
87 |
- acct-user/tor |
88 |
- acct-group/tor |
89 |
- ${DEPEND} |
90 |
- selinux? ( sec-policy/selinux-tor )" |
91 |
- |
92 |
-# bug #764260 |
93 |
-DEPEND+=" |
94 |
- test? ( |
95 |
- ${DEPEND} |
96 |
- ${PYTHON_DEPS} |
97 |
- )" |
98 |
- |
99 |
-DOCS=() |
100 |
- |
101 |
-PATCHES=( |
102 |
- "${FILESDIR}"/${PN}-0.4.6.7-libressl.patch |
103 |
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch |
104 |
- "${FILESDIR}"/${P}-strict-prototypes-clang16.patch |
105 |
-) |
106 |
- |
107 |
-# EAPI 8 tries to append it but it doesn't exist here |
108 |
-# bug #831311 etc |
109 |
-QA_CONFIGURE_OPTIONS="--disable-static" |
110 |
- |
111 |
-pkg_setup() { |
112 |
- use test && python-any-r1_pkg_setup |
113 |
-} |
114 |
- |
115 |
-src_unpack() { |
116 |
- if use verify-sig; then |
117 |
- cd "${DISTDIR}" || die |
118 |
- verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc} |
119 |
- verify-sig_verify_unsigned_checksums \ |
120 |
- ${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz |
121 |
- cd "${WORKDIR}" || die |
122 |
- fi |
123 |
- |
124 |
- default |
125 |
-} |
126 |
- |
127 |
-src_configure() { |
128 |
- use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING ) |
129 |
- export ac_cv_lib_cap_cap_init=$(usex caps) |
130 |
- econf \ |
131 |
- --localstatedir="${EPREFIX}/var" \ |
132 |
- --disable-all-bugs-are-fatal \ |
133 |
- --enable-system-torrc \ |
134 |
- --disable-android \ |
135 |
- --disable-html-manual \ |
136 |
- --disable-libfuzzer \ |
137 |
- --enable-missing-doc-warnings \ |
138 |
- --disable-module-dirauth \ |
139 |
- --enable-pic \ |
140 |
- --disable-restart-debugging \ |
141 |
- --disable-zstd-advanced-apis \ |
142 |
- $(use_enable man asciidoc) \ |
143 |
- $(use_enable man manpage) \ |
144 |
- $(use_enable lzma) \ |
145 |
- $(use_enable scrypt libscrypt) \ |
146 |
- $(use_enable seccomp) \ |
147 |
- $(use_enable server module-relay) \ |
148 |
- $(use_enable systemd) \ |
149 |
- $(use_enable tor-hardening gcc-hardening) \ |
150 |
- $(use_enable tor-hardening linker-hardening) \ |
151 |
- $(use_enable test unittests) \ |
152 |
- $(use_enable test coverage) \ |
153 |
- $(use_enable zstd) |
154 |
-} |
155 |
- |
156 |
-src_install() { |
157 |
- default |
158 |
- readme.gentoo_create_doc |
159 |
- |
160 |
- newconfd "${FILESDIR}"/tor.confd tor |
161 |
- newinitd "${FILESDIR}"/tor.initd-r9 tor |
162 |
- systemd_dounit "${FILESDIR}"/tor.service |
163 |
- |
164 |
- keepdir /var/lib/tor |
165 |
- |
166 |
- fperms 750 /var/lib/tor |
167 |
- fowners tor:tor /var/lib/tor |
168 |
- |
169 |
- insinto /etc/tor/ |
170 |
- newins "${FILESDIR}"/torrc-r2 torrc |
171 |
-} |
172 |
|
173 |
diff --git a/net-vpn/tor/tor-0.4.7.12.ebuild b/net-vpn/tor/tor-0.4.7.12.ebuild |
174 |
index 2205869..c1d178a 100644 |
175 |
--- a/net-vpn/tor/tor-0.4.7.12.ebuild |
176 |
+++ b/net-vpn/tor/tor-0.4.7.12.ebuild |
177 |
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_PF}" |
178 |
LICENSE="BSD GPL-2" |
179 |
SLOT="0" |
180 |
if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then |
181 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos" |
182 |
+ KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" |
183 |
fi |
184 |
IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" |
185 |
RESTRICT="!test? ( test )" |
186 |
|
187 |
diff --git a/net-vpn/tor/tor-0.4.7.8.ebuild b/net-vpn/tor/tor-0.4.7.8.ebuild |
188 |
deleted file mode 100644 |
189 |
index cddfba5..0000000 |
190 |
--- a/net-vpn/tor/tor-0.4.7.8.ebuild |
191 |
+++ /dev/null |
192 |
@@ -1,127 +0,0 @@ |
193 |
-# Copyright 1999-2022 Gentoo Authors |
194 |
-# Distributed under the terms of the GNU General Public License v2 |
195 |
- |
196 |
-EAPI="8" |
197 |
- |
198 |
-PYTHON_COMPAT=( python3_{8..10} ) |
199 |
-inherit python-any-r1 readme.gentoo-r1 systemd verify-sig |
200 |
- |
201 |
-MY_PV="$(ver_rs 4 -)" |
202 |
-MY_PF="${PN}-${MY_PV}" |
203 |
-DESCRIPTION="Anonymizing overlay network for TCP" |
204 |
-HOMEPAGE="https://www.torproject.org/" |
205 |
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz |
206 |
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz |
207 |
- verify-sig? ( |
208 |
- https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum |
209 |
- https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc |
210 |
- )" |
211 |
-S="${WORKDIR}/${MY_PF}" |
212 |
- |
213 |
-LICENSE="BSD GPL-2" |
214 |
-SLOT="0" |
215 |
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then |
216 |
- KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" |
217 |
-fi |
218 |
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" |
219 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc |
220 |
- |
221 |
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )" |
222 |
-DEPEND=" |
223 |
- dev-libs/libevent:=[ssl] |
224 |
- sys-libs/zlib |
225 |
- caps? ( sys-libs/libcap ) |
226 |
- man? ( app-text/asciidoc ) |
227 |
- dev-libs/openssl:0=[-bindist(-)] |
228 |
- lzma? ( app-arch/xz-utils ) |
229 |
- scrypt? ( app-crypt/libscrypt ) |
230 |
- seccomp? ( >=sys-libs/libseccomp-2.4.1 ) |
231 |
- systemd? ( sys-apps/systemd ) |
232 |
- zstd? ( app-arch/zstd )" |
233 |
-RDEPEND=" |
234 |
- acct-user/tor |
235 |
- acct-group/tor |
236 |
- ${DEPEND} |
237 |
- selinux? ( sec-policy/selinux-tor )" |
238 |
- |
239 |
-# bug #764260 |
240 |
-DEPEND+=" |
241 |
- test? ( |
242 |
- ${DEPEND} |
243 |
- ${PYTHON_DEPS} |
244 |
- )" |
245 |
- |
246 |
-PATCHES=( |
247 |
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch |
248 |
- "${FILESDIR}"/${PN}-0.4.6.7-libressl.patch |
249 |
-) |
250 |
- |
251 |
-DOCS=() |
252 |
- |
253 |
-RESTRICT="!test? ( test )" |
254 |
- |
255 |
-# EAPI 8 tries to append it but it doesn't exist here |
256 |
-# bug #831311 etc |
257 |
-QA_CONFIGURE_OPTIONS="--disable-static" |
258 |
- |
259 |
-pkg_setup() { |
260 |
- use test && python-any-r1_pkg_setup |
261 |
-} |
262 |
- |
263 |
-src_unpack() { |
264 |
- if use verify-sig; then |
265 |
- cd "${DISTDIR}" || die |
266 |
- verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc} |
267 |
- verify-sig_verify_unsigned_checksums \ |
268 |
- ${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz |
269 |
- cd "${WORKDIR}" || die |
270 |
- fi |
271 |
- |
272 |
- default |
273 |
-} |
274 |
- |
275 |
-src_configure() { |
276 |
- use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING ) |
277 |
- export ac_cv_lib_cap_cap_init=$(usex caps) |
278 |
- econf \ |
279 |
- --localstatedir="${EPREFIX}/var" \ |
280 |
- --disable-all-bugs-are-fatal \ |
281 |
- --enable-system-torrc \ |
282 |
- --disable-android \ |
283 |
- --disable-html-manual \ |
284 |
- --disable-libfuzzer \ |
285 |
- --enable-missing-doc-warnings \ |
286 |
- --disable-module-dirauth \ |
287 |
- --enable-pic \ |
288 |
- --disable-restart-debugging \ |
289 |
- --disable-zstd-advanced-apis \ |
290 |
- $(use_enable man asciidoc) \ |
291 |
- $(use_enable man manpage) \ |
292 |
- $(use_enable lzma) \ |
293 |
- $(use_enable scrypt libscrypt) \ |
294 |
- $(use_enable seccomp) \ |
295 |
- $(use_enable server module-relay) \ |
296 |
- $(use_enable systemd) \ |
297 |
- $(use_enable tor-hardening gcc-hardening) \ |
298 |
- $(use_enable tor-hardening linker-hardening) \ |
299 |
- $(use_enable test unittests) \ |
300 |
- $(use_enable test coverage) \ |
301 |
- $(use_enable zstd) |
302 |
-} |
303 |
- |
304 |
-src_install() { |
305 |
- default |
306 |
- readme.gentoo_create_doc |
307 |
- |
308 |
- newconfd "${FILESDIR}"/tor.confd tor |
309 |
- newinitd "${FILESDIR}"/tor.initd-r9 tor |
310 |
- systemd_dounit "${FILESDIR}"/tor.service |
311 |
- |
312 |
- keepdir /var/lib/tor |
313 |
- |
314 |
- fperms 750 /var/lib/tor |
315 |
- fowners tor:tor /var/lib/tor |
316 |
- |
317 |
- insinto /etc/tor/ |
318 |
- newins "${FILESDIR}"/torrc-r2 torrc |
319 |
-} |