public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/vpnc/
Date: Mon, 22 Jan 2024 13:37:56 +0000 (UTC)	[thread overview]
Message-ID: <1705930649.3034ce013a88874f5a8d31c87b86658745c28b65.soap@gentoo> (raw)

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
 }


             reply	other threads:[~2024-01-22 13:37 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-22 13:37 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-07 11:51 [gentoo-commits] repo/gentoo:master commit in: net-vpn/vpnc/ Sam James
2024-03-07 11:51 Sam James
2024-03-07 11:51 Sam James
2024-03-07 11:51 Sam James
2024-03-07 11:51 Sam James
2024-03-07 10:28 Sam James
2024-03-07 10:28 Sam James
2024-01-29 10:20 David Seifert
2024-01-29 10:12 David Seifert
2024-01-22 13:37 David Seifert
2023-02-19 16:38 Sam James
2023-02-19 12:55 Arthur Zamarin
2023-02-19 12:55 Arthur Zamarin
2023-02-19 12:55 Arthur Zamarin
2023-02-19 12:55 Arthur Zamarin
2023-02-19 12:55 Arthur Zamarin
2023-02-19 12:25 Sam James
2023-01-13 18:06 Mike Gilbert
2023-01-13 18:05 Mike Gilbert
2022-11-29 18:06 WANG Xuerui
2022-09-27  9:55 David Seifert
2022-09-27  9:55 David Seifert
2022-09-18  9:32 David Seifert
2022-09-17 17:08 David Seifert
2022-09-17 16:20 Sam James
2021-10-16 22:05 Sam James
2021-10-14 18:32 Sam James
2021-10-14 16:38 Sam James
2021-10-14  5:57 Agostino Sarubbo
2021-10-14  5:56 Agostino Sarubbo
2021-10-13 20:33 Sam James
2021-10-10 19:08 Mike Gilbert
2021-07-24 23:02 Marek Szuba
2020-06-15  9:58 David Seifert
2020-06-12  7:55 Agostino Sarubbo
2020-06-12  7:54 Agostino Sarubbo
2020-06-12  7:53 Agostino Sarubbo
2020-06-12  7:52 Agostino Sarubbo
2020-06-12  7:51 Agostino Sarubbo
2020-06-11 22:08 Mart Raudsepp
2020-06-11 18:01 Sergei Trofimovich
2020-04-14  9:47 David Seifert
2020-04-14  8:35 Joonas Niilola
2019-06-01 19:23 Michał Górny
2019-05-24 20:48 Aaron Bauman
2019-01-17  6:24 Matt Turner
2018-11-08 19:01 Mike Auty
2018-05-20  0:16 Aaron Bauman
2017-07-17 10:18 Alexis Ballier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1705930649.3034ce013a88874f5a8d31c87b86658745c28b65.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox