From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C12291382C5 for ; Mon, 1 Mar 2021 16:08:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF0CDE091F; Mon, 1 Mar 2021 16:08:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6E73E091F for ; Mon, 1 Mar 2021 16:08:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A085B340BC9 for ; Mon, 1 Mar 2021 16:08:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16067533 for ; Mon, 1 Mar 2021 16:08:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1614614898.bee10b04b6f7eaaaf0396f9f44b2c262f8726295.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/turbovnc/turbovnc-2.2.6.ebuild X-VCS-Directories: net-misc/turbovnc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bee10b04b6f7eaaaf0396f9f44b2c262f8726295 X-VCS-Branch: master Date: Mon, 1 Mar 2021 16:08:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2aef708c-4641-43a6-8f71-641d0457d767 X-Archives-Hash: c85d5424edf6282cc08e24a195ff22da commit: bee10b04b6f7eaaaf0396f9f44b2c262f8726295 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 16:07:53 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 1 16:08:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee10b04 net-misc/turbovnc: make SSL optional (openssl or gnutls) OpenSSL is preferred. Signed-off-by: Sam James gentoo.org> net-misc/turbovnc/turbovnc-2.2.6.ebuild | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild index c6879d50e22..9c47e973cb1 100644 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild @@ -12,6 +12,7 @@ SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/downl LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" +IUSE="+ssl gnutls" DEPEND=" app-arch/bzip2 @@ -22,6 +23,10 @@ DEPEND=" virtual/opengl x11-libs/libX11 x11-libs/libXext + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) !net-misc/tigervnc " RDEPEND=" @@ -44,6 +49,23 @@ src_configure() { -DXKB_DFLT_RULES=base ) + if use ssl ; then + # We prefer OpenSSL, so default to that if SSL is enabled + if use gnutls ; then + mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) + else + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=ON + -DTVNC_DLOPENSSL=0 + ) + fi + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + if use java ; then export JAVACFLAGS="$(java-pkg_javac-args)" export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"