From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1593372-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6ABCE15838C
for <garchives@archives.gentoo.org>; Mon, 22 Jan 2024 13:37:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 96344E29D2;
Mon, 22 Jan 2024 13:37:58 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4D33CE29D2
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Jan 2024 13:37:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 88FD6343266
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Jan 2024 13:37:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 22F92105D
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Jan 2024 13:37:56 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1705930649.3034ce013a88874f5a8d31c87b86658745c28b65.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/vpnc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild net-vpn/vpnc/vpnc-9999.ebuild
X-VCS-Directories: net-vpn/vpnc/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 3034ce013a88874f5a8d31c87b86658745c28b65
X-VCS-Branch: master
Date: Mon, 22 Jan 2024 13:37:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 678d51d0-1f38-4423-8e85-68a94b8d6624
X-Archives-Hash: deb86bb56ce2fd38645243ae75af36d4
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
}