commit: 3034ce013a88874f5a8d31c87b86658745c28b65 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Jan 22 13:37:29 2024 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Jan 22 13:37:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3034ce01
net-vpn/vpnc: switch to openssl by default Closes: https://bugs.gentoo.org/911794 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild | 14 ++------------ net-vpn/vpnc/vpnc-9999.ebuild | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild index 9502c01179cd..6a9b3dc4bf33 100644 --- a/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild +++ b/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,8 +21,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="resolvconf +gnutls selinux" -RESTRICT="!gnutls? ( bindist )" +IUSE="resolvconf gnutls selinux" DEPEND=" dev-libs/libgcrypt:= @@ -77,13 +76,4 @@ pkg_postinst() { elog "You can generate a configuration file from the original Cisco profiles of your" elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file" elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"; - - if use gnutls; then - elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." - elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"; - else - ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" - ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL," - ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"; - fi } diff --git a/net-vpn/vpnc/vpnc-9999.ebuild b/net-vpn/vpnc/vpnc-9999.ebuild index 5f4e12444a64..be06b4919b2c 100644 --- a/net-vpn/vpnc/vpnc-9999.ebuild +++ b/net-vpn/vpnc/vpnc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,8 +21,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="resolvconf +gnutls selinux" -RESTRICT="!gnutls? ( bindist )" +IUSE="resolvconf gnutls selinux" DEPEND=" dev-libs/libgcrypt:= @@ -77,13 +76,4 @@ pkg_postinst() { elog "You can generate a configuration file from the original Cisco profiles of your" elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file" elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"; - - if use gnutls; then - elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." - elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"; - else - ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" - ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL," - ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"; - fi }
