commit: 7553a8eb68d0acc7e7efe965bf800c11df5b89ce Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Wed Apr 23 12:08:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 21 16:48:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7553a8eb
net-vpn/tor: rename USE=tor-hardening to hardened Generic description fits here well Bug: https://bugs.gentoo.org/956335 Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Part-of: https://github.com/gentoo/gentoo/pull/41713 Signed-off-by: Sam James <sam <AT> gentoo.org> net-vpn/tor/metadata.xml | 1 - net-vpn/tor/tor-0.4.8.14.ebuild | 6 +++--- net-vpn/tor/tor-0.4.8.16.ebuild | 6 +++--- net-vpn/tor/tor-9999.ebuild | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml index fcc4644d2af6..5cf84b77111e 100644 --- a/net-vpn/tor/metadata.xml +++ b/net-vpn/tor/metadata.xml @@ -12,6 +12,5 @@ <use> <flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag> <flag name="server">Enable tor's relay module so it can operate as a relay/bridge/authority</flag> - <flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag> </use> </pkgmetadata> diff --git a/net-vpn/tor/tor-0.4.8.14.ebuild b/net-vpn/tor/tor-0.4.8.14.ebuild index 252fac071348..7eae4226bb50 100644 --- a/net-vpn/tor/tor-0.4.8.14.ebuild +++ b/net-vpn/tor/tor-0.4.8.14.ebuild @@ -39,7 +39,7 @@ fi # that's different from the actual binary. LICENSE="BSD GPL-2 GPL-3" SLOT="0" -IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" +IUSE="caps doc hardened lzma +man scrypt seccomp selinux +server systemd test zstd" RESTRICT="!test? ( test )" RDEPEND=" @@ -140,6 +140,8 @@ src_configure() { --enable-gpl --enable-module-pow + $(use_enable hardened gcc-hardening) + $(use_enable hardened linker-hardening) $(use_enable man asciidoc) $(use_enable man manpage) $(use_enable lzma) @@ -147,8 +149,6 @@ src_configure() { $(use_enable seccomp) $(use_enable server module-relay) $(use_enable systemd) - $(use_enable tor-hardening gcc-hardening) - $(use_enable tor-hardening linker-hardening) $(use_enable test unittests) $(use_enable zstd) ) diff --git a/net-vpn/tor/tor-0.4.8.16.ebuild b/net-vpn/tor/tor-0.4.8.16.ebuild index 252fac071348..7eae4226bb50 100644 --- a/net-vpn/tor/tor-0.4.8.16.ebuild +++ b/net-vpn/tor/tor-0.4.8.16.ebuild @@ -39,7 +39,7 @@ fi # that's different from the actual binary. LICENSE="BSD GPL-2 GPL-3" SLOT="0" -IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" +IUSE="caps doc hardened lzma +man scrypt seccomp selinux +server systemd test zstd" RESTRICT="!test? ( test )" RDEPEND=" @@ -140,6 +140,8 @@ src_configure() { --enable-gpl --enable-module-pow + $(use_enable hardened gcc-hardening) + $(use_enable hardened linker-hardening) $(use_enable man asciidoc) $(use_enable man manpage) $(use_enable lzma) @@ -147,8 +149,6 @@ src_configure() { $(use_enable seccomp) $(use_enable server module-relay) $(use_enable systemd) - $(use_enable tor-hardening gcc-hardening) - $(use_enable tor-hardening linker-hardening) $(use_enable test unittests) $(use_enable zstd) ) diff --git a/net-vpn/tor/tor-9999.ebuild b/net-vpn/tor/tor-9999.ebuild index cd30d48f8f7e..fd36a841746b 100644 --- a/net-vpn/tor/tor-9999.ebuild +++ b/net-vpn/tor/tor-9999.ebuild @@ -39,7 +39,7 @@ fi # that's different from the actual binary. LICENSE="BSD GPL-2 GPL-3" SLOT="0" -IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" +IUSE="caps doc hardened lzma +man scrypt seccomp selinux +server systemd test zstd" RESTRICT="!test? ( test )" RDEPEND=" @@ -140,6 +140,8 @@ src_configure() { --enable-gpl --enable-module-pow + $(use_enable hardened gcc-hardening) + $(use_enable hardened linker-hardening) $(use_enable man asciidoc) $(use_enable man manpage) $(use_enable lzma) @@ -147,8 +149,6 @@ src_configure() { $(use_enable seccomp) $(use_enable server module-relay) $(use_enable systemd) - $(use_enable tor-hardening gcc-hardening) - $(use_enable tor-hardening linker-hardening) $(use_enable test unittests) $(use_enable zstd) )
