diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
commit | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch) | |
tree | c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /x11-misc/x11vnc | |
parent | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff) |
gentoo resync : 02.06.2019
Diffstat (limited to 'x11-misc/x11vnc')
-rw-r--r-- | x11-misc/x11vnc/Manifest | 10 | ||||
-rw-r--r-- | x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch | 26 | ||||
-rw-r--r-- | x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 93 | ||||
-rw-r--r-- | x11-misc/x11vnc/metadata.xml | 9 | ||||
-rw-r--r-- | x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild | 55 | ||||
-rw-r--r-- | x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild | 75 | ||||
-rw-r--r-- | x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild (renamed from x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild) | 50 | ||||
-rw-r--r-- | x11-misc/x11vnc/x11vnc-0.9.16.ebuild | 56 |
8 files changed, 235 insertions, 139 deletions
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest index 28912b5b2b86..67bfe5359bb4 100644 --- a/x11-misc/x11vnc/Manifest +++ b/x11-misc/x11vnc/Manifest @@ -1,9 +1,9 @@ +AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6 +AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e6025ba57ac984a04dc118e642b1ee2a6757c11d400a2e3641e71b367e4ea42d7557d48ba932d55ef839f122ea9170aab2 SHA512 041f57dc654bbf18c9fc741d42d9cc6f0646f619b2d3a473898b2e5d20609e7f475a7abfbd1e0fb9ed01017474aab0241ce04c37cec2e8acbd813f8ee678ee53 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2 -DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec -EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6 -EBUILD x11vnc-0.9.16-r1.ebuild 1839 BLAKE2B d144f710a56ccd92f144315bb18217fbf3d9ff747abca835a52383fe2718c03aa25abddbb31b80b5bc9109794c7e8833602d04735f755820d44a62326e99066e SHA512 b33d6de82001218e7fa03edc3e98c66a2021fdc12ea4e3d00d446a1372629cecebc91ac695949e359e5087ee021fd48e081149098bb3bd8a896935fedc7b146d -EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0 -MISC metadata.xml 725 BLAKE2B dfdda6a6c38d7df5cf8da77b4b2ff64823f5d176711d163d3cb95e50eae631eff64098f774b3886fb1b8baebf16289d7d8958357cdd987ec697f8a915d3a6184 SHA512 07648db4c5c5198e76e08fb5de36424286eccf09e7dc685c61ef0f148c908864275611fbd339cf791551f13a3867f8196a2645ec23927a6f0afe8b4c0bda7e62 +EBUILD x11vnc-0.9.16-r2.ebuild 1954 BLAKE2B 6fc7723a676f81cf9ce0cedb651e9c08d10ab9d1f79acb31bbce5404e3d8abb4a626ae68ee1d9502f9c67608045e4bf49acf58731ffd8b08c11eb604da31328e SHA512 98e99bc49f08d8302836290d308b5415ff9ed99ebfd4193c93c7f919bf8fa4594318cee11cc7e9d4e7423018e31258f951d2c903b398746262ce9232ab653574 +EBUILD x11vnc-0.9.16-r3.ebuild 1991 BLAKE2B ac681294caad34b791298219d76ffd0f60e39b3943fbdaee1c566c56d764978f4fe75e8759b5f48ba475ef0ddfd6b75ae6e3876196a7d6c785a650b7218f26aa SHA512 e1abca08c362bdcdd5087be05078990fad5d3d93fdbb180a0b0d81b39df26957eaab629f8f6ab4ef2eaa4d7dbf08cec3a5d469c005bf823d25f7eeeae86701d4 +MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6 diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch new file mode 100644 index 000000000000..3dafb9aa6b0c --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch @@ -0,0 +1,26 @@ +From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001 +From: Jim Broadus <jbroadus@xevo.com> +Date: Wed, 2 Jan 2019 17:37:40 -0800 +Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a + security level concept. Only level 0 allows the use of unauthenticated cipher + suites such as ADH. + +--- + src/sslhelper.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/sslhelper.c b/src/sslhelper.c +index 1a3e7474..04c2e273 100644 +--- a/src/sslhelper.c ++++ b/src/sslhelper.c +@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) { + if (ssl_client_mode) { + return 1; + } ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ /* Security level must be set to 0 for unauthenticated suites. */ ++ SSL_CTX_set_security_level(ctx, 0); ++#endif + if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) { + return 0; + } diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch new file mode 100644 index 000000000000..8e5d8a692175 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch @@ -0,0 +1,93 @@ +diff --git a/src/sslhelper.c b/src/sslhelper.c +index 04c2e27..fb9daa6 100644 +--- a/src/sslhelper.c ++++ b/src/sslhelper.c +@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag, + static int crl_callback(X509_STORE_CTX *callback_ctx) { + const ASN1_INTEGER *revoked_serial; + X509_STORE_CTX *store_ctx; +-#if OPENSSL_VERSION_NUMBER > 0x10100000L ++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT *obj; + #else + X509_OBJECT obj; +@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + * the current certificate in order to verify it's integrity. */ + store_ctx = X509_STORE_CTX_new(); + X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL); +-#if OPENSSL_VERSION_NUMBER > 0x10100000L ++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + obj = X509_OBJECT_new(); + rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj); + crl = X509_OBJECT_get0_X509_CRL(obj); +@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + rfbLog("Invalid signature on CRL\n"); + X509_STORE_CTX_set_error(callback_ctx, + X509_V_ERR_CRL_SIGNATURE_FAILURE); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT_free(obj); + #else + X509_OBJECT_free_contents(&obj); +@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + rfbLog("Found CRL has invalid nextUpdate field\n"); + X509_STORE_CTX_set_error(callback_ctx, + X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT_free(obj); + #else + X509_OBJECT_free_contents(&obj); +@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + rfbLog("Found CRL is expired - " + "revoking all certificates until you get updated CRL\n"); + X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT_free(obj); + #else + X509_OBJECT_free_contents(&obj); + #endif + return 0; /* Reject connection */ + } +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT_free(obj); + #else + X509_OBJECT_free_contents(&obj); +@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + * the current certificate in order to check for revocation. */ + store_ctx = X509_STORE_CTX_new(); + X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL); +-#if OPENSSL_VERSION_NUMBER > 0x10100000L ++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + obj = X509_OBJECT_new(); + rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj); + crl = X509_OBJECT_get0_X509_CRL(obj); +@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + "revoked per CRL from issuer %s\n", serial, serial, cp); + OPENSSL_free(cp); + X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT_free(obj); + #else + X509_OBJECT_free_contents(&obj); +@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { + return 0; /* Reject connection */ + } + } +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + X509_OBJECT_free(obj); + #else + X509_OBJECT_free_contents(&obj); +@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) { + if (ssl_client_mode) { + return 1; + } +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + /* Security level must be set to 0 for unauthenticated suites. */ + SSL_CTX_set_security_level(ctx, 0); + #endif diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml index ff9539136145..40fa3182ee05 100644 --- a/x11-misc/x11vnc/metadata.xml +++ b/x11-misc/x11vnc/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>alexander@tsoy.me</email> + <name>Alexander Tsoy</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> The primary goal of this program is to create a portable and simple command-line server utility that allows a VNC viewer diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild deleted file mode 100644 index ebf7c1d17f60..000000000000 --- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools vcs-snapshot - -DESCRIPTION="A VNC server for real X displays" -HOMEPAGE="https://libvnc.github.io/" -SRC_URI="https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a30292a485999e.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt fbcon libressl ssl xinerama zeroconf" - -RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?] - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - >=x11-libs/libXtst-1.1.0 - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - xinerama? ( x11-libs/libXinerama ) - zeroconf? ( >=net-dns/avahi-0.6.4 ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --without-v4l because of missing video4linux 2.x support wrt #389079 - econf \ - $(use_with crypt) \ - $(use_with fbcon fbdev) \ - $(use_with ssl) \ - $(use_with ssl crypto) \ - --without-v4l \ - $(use_with xinerama) \ - $(use_with zeroconf avahi) -} - -src_install() { - default - doinitd "${FILESDIR}/x11vnc.init.d" - doconfd "${FILESDIR}/x11vnc.conf.d" -} diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild new file mode 100644 index 000000000000..7ddfb82395ea --- /dev/null +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="VNC server for real X displays" +HOMEPAGE="https://libvnc.github.io/" +SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" + +COMMON_DEPEND=" + >=net-libs/libvncserver-0.9.8[ssl] + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXtst-1.1.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + xcomposite? ( x11-libs/libXcomposite ) + xdamage? ( x11-libs/libXdamage ) + xfixes? ( x11-libs/libXfixes ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr ) + zeroconf? ( >=net-dns/avahi-0.6.4 ) +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt +" +# https://bugzilla.redhat.com/show_bug.cgi?id=920554 +RDEPEND="${COMMON_DEPEND} + dev-lang/tk:0 +" + +PATCHES=( + "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 + "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # --without-v4l because of missing video4linux 2.x support wrt #389079 + # --with-crypto --with-ssl because USE=-ssl is broken (bug #686494) + econf \ + --with-crypto \ + --with-ssl \ + --without-v4l \ + --without-xkeyboard \ + --without-fbpm \ + --without-dpms \ + $(use_with crypt) \ + $(use_with fbcon fbdev) \ + $(use_with xcomposite) \ + $(use_with xdamage) \ + $(use_with xfixes) \ + $(use_with xinerama) \ + $(use_with xrandr) \ + $(use_with zeroconf avahi) +} + +src_install() { + default + newinitd "${FILESDIR}/x11vnc.init.d" x11vnc + newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc +} diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild index b4e3e583f68f..752f08e414d2 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild @@ -1,20 +1,21 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools vcs-snapshot +EAPI=7 -DESCRIPTION="A VNC server for real X displays" +inherit autotools + +DESCRIPTION="VNC server for real X displays" HOMEPAGE="https://libvnc.github.io/" SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+-with-openssl-exception" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" COMMON_DEPEND=" - >=net-libs/libvncserver-0.9.8[ssl?] + >=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext @@ -35,11 +36,14 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXt " # https://bugzilla.redhat.com/show_bug.cgi?id=920554 -RDEPEND="dev-lang/tk:0" +RDEPEND="${COMMON_DEPEND} + dev-lang/tk:0 +" PATCHES=( - # https://github.com/LibVNC/x11vnc/issues/86 - "${FILESDIR}"/${P}-crypto.patch + "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 + "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 + "${FILESDIR}"/${P}-libressl.patch ) src_prepare() { @@ -49,21 +53,23 @@ src_prepare() { src_configure() { # --without-v4l because of missing video4linux 2.x support wrt #389079 - econf \ - --without-v4l \ - --without-xkeyboard \ - --without-fbpm \ - --without-dpms \ - $(use_with crypt) \ - $(use_with fbcon fbdev) \ - $(use_with ssl) \ - $(use_with ssl crypto) \ - $(use_with xcomposite) \ - $(use_with xdamage) \ - $(use_with xfixes) \ - $(use_with xinerama) \ - $(use_with xrandr) \ + local myconf=( + --without-v4l + --without-xkeyboard + --without-fbpm + --without-dpms + $(use_with crypt) + $(use_with fbcon fbdev) + $(use_with ssl) + $(use_with ssl crypto) + $(use_with xcomposite) + $(use_with xdamage) + $(use_with xfixes) + $(use_with xinerama) + $(use_with xrandr) $(use_with zeroconf avahi) + ) + econf "${myconf[@]}" } src_install() { diff --git a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild deleted file mode 100644 index fdb0b5c8392a..000000000000 --- a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools vcs-snapshot - -DESCRIPTION="A VNC server for real X displays" -HOMEPAGE="https://libvnc.github.io/" -SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt fbcon libressl ssl xinerama zeroconf" - -RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?] - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - >=x11-libs/libXtst-1.1.0 - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - xinerama? ( x11-libs/libXinerama ) - zeroconf? ( >=net-dns/avahi-0.6.4 ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --without-v4l because of missing video4linux 2.x support wrt #389079 - econf \ - --without-v4l \ - $(use_with crypt) \ - $(use_with fbcon fbdev) \ - $(use_with ssl) \ - $(use_with ssl crypto) \ - $(use_with xinerama) \ - $(use_with zeroconf avahi) -} - -src_install() { - default - newinitd "${FILESDIR}/x11vnc.init.d" x11vnc - newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc -} |