commit: a48dc95507286b1c1866f152d399fdee0499d8d8 Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Sun Aug 18 22:24:11 2024 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Sun Aug 25 20:23:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48dc955
net-vpn/i2pd: drop i2p-hardening USE flag Sam James and Eli Schwartz suggested that it should be done: "[the hardening] matches the defaults or makes them worse" No revbump as it was turned off by default. Closes: https://bugs.gentoo.org/909080 Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Closes: https://github.com/gentoo/gentoo/pull/38193 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> net-vpn/i2pd/i2pd-2.52.0.ebuild | 10 ++-------- net-vpn/i2pd/i2pd-2.53.1.ebuild | 10 ++-------- net-vpn/i2pd/metadata.xml | 5 ----- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/net-vpn/i2pd/i2pd-2.52.0.ebuild b/net-vpn/i2pd/i2pd-2.52.0.ebuild index 14ed8c998b07..02167b17f796 100644 --- a/net-vpn/i2pd/i2pd-2.52.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.52.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_aes i2p-hardening +upnp" +IUSE="cpu_flags_x86_aes +upnp" RDEPEND=" acct-user/i2pd @@ -29,16 +29,10 @@ DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf ) PATCHES=( "${FILESDIR}/${P}-miniupnp.patch" ) -pkg_pretend() { - if use i2p-hardening && ! tc-is-gcc; then - die "i2p-hardening requires gcc" - fi -} - src_configure() { local mycmakeargs=( -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) - -DWITH_HARDENING=$(usex i2p-hardening ON OFF) + -DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles -DWITH_STATIC=OFF -DWITH_UPNP=$(usex upnp ON OFF) -DWITH_LIBRARY=ON diff --git a/net-vpn/i2pd/i2pd-2.53.1.ebuild b/net-vpn/i2pd/i2pd-2.53.1.ebuild index cb442b9d45f9..b9b3a931569f 100644 --- a/net-vpn/i2pd/i2pd-2.53.1.ebuild +++ b/net-vpn/i2pd/i2pd-2.53.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_aes i2p-hardening +upnp" +IUSE="cpu_flags_x86_aes +upnp" DEPEND=" dev-libs/boost:= @@ -30,16 +30,10 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/build" DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf ) -pkg_pretend() { - if use i2p-hardening && ! tc-is-gcc; then - die "i2p-hardening requires gcc" - fi -} - src_configure() { local mycmakeargs=( -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) - -DWITH_HARDENING=$(usex i2p-hardening ON OFF) + -DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles -DWITH_STATIC=OFF -DWITH_UPNP=$(usex upnp ON OFF) -DWITH_LIBRARY=ON diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml index 9427ac50fa12..86d072b8ee21 100644 --- a/net-vpn/i2pd/metadata.xml +++ b/net-vpn/i2pd/metadata.xml @@ -9,11 +9,6 @@ <email>[email protected]</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="i2p-hardening"> - Compile with hardening on vanilla compilers/linkers - </flag> - </use> <upstream> <remote-id type="github">PurpleI2P/i2pd</remote-id> </upstream>
