| 1 |
commit: bee10b04b6f7eaaaf0396f9f44b2c262f8726295 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 1 16:07:53 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 1 16:08:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee10b04 |
| 7 |
|
| 8 |
net-misc/turbovnc: make SSL optional (openssl or gnutls) |
| 9 |
|
| 10 |
OpenSSL is preferred. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-misc/turbovnc/turbovnc-2.2.6.ebuild | 22 ++++++++++++++++++++++ |
| 15 |
1 file changed, 22 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild |
| 18 |
index c6879d50e22..9c47e973cb1 100644 |
| 19 |
--- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild |
| 20 |
+++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild |
| 21 |
@@ -12,6 +12,7 @@ SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/downl |
| 22 |
LICENSE="GPL-2" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~amd64" |
| 25 |
+IUSE="+ssl gnutls" |
| 26 |
|
| 27 |
DEPEND=" |
| 28 |
app-arch/bzip2 |
| 29 |
@@ -22,6 +23,10 @@ DEPEND=" |
| 30 |
virtual/opengl |
| 31 |
x11-libs/libX11 |
| 32 |
x11-libs/libXext |
| 33 |
+ ssl? ( |
| 34 |
+ !gnutls? ( dev-libs/openssl:= ) |
| 35 |
+ gnutls? ( net-libs/gnutls:= ) |
| 36 |
+ ) |
| 37 |
!net-misc/tigervnc |
| 38 |
" |
| 39 |
RDEPEND=" |
| 40 |
@@ -44,6 +49,23 @@ src_configure() { |
| 41 |
-DXKB_DFLT_RULES=base |
| 42 |
) |
| 43 |
|
| 44 |
+ if use ssl ; then |
| 45 |
+ # We prefer OpenSSL, so default to that if SSL is enabled |
| 46 |
+ if use gnutls ; then |
| 47 |
+ mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) |
| 48 |
+ else |
| 49 |
+ # Link properly against OpenSSL to ensure |
| 50 |
+ # we catch e.g. ABI change |
| 51 |
+ # (i.e. don't dlopen it) |
| 52 |
+ mycmakeargs+=( |
| 53 |
+ -DTVNC_USETLS=ON |
| 54 |
+ -DTVNC_DLOPENSSL=0 |
| 55 |
+ ) |
| 56 |
+ fi |
| 57 |
+ else |
| 58 |
+ mycmakeargs+=( -DTVNC_USETLS=OFF ) |
| 59 |
+ fi |
| 60 |
+ |
| 61 |
if use java ; then |
| 62 |
export JAVACFLAGS="$(java-pkg_javac-args)" |
| 63 |
export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" |
Archives