gentoo resync : 03.03.2019

4 files changed, 107 insertions, 1 deletions

diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 345552ce210f..2b1b70d1ad55 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,7 +1,9 @@
+AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
 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 1897 BLAKE2B adc6b8bae11bc8158f8dc78939aad6f40a22142768c2aab3b714b21f1af7bda11266a0b27e3bbe88fe47eed29afebac9ce066c1694945a7417589a9704390193 SHA512 2a511b4eaf02b03d11c6cb47428bd69c12edcf11a3d1f3fd19a18310aef4fc4d21724e85037cc2f460a994c842350c517692b02bb28bf1c279c6f164df36eccb
 EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0
-MISC metadata.xml 503 BLAKE2B 2abaa727781a7a18a68993b4bb95d475138ca1b3d2a30080da7f619d35f2d323bbd8273c9983887bf884a026f9750ef68e0a53f75603f1329f28257066787967 SHA512 5d8635e9f87aaee274f263bff2fb05be5bf8e348d4e9a899924049a210dea6210be4df0c9b9c8db4af04798cf49f16e10a47018482d9aaaa38b5613d2348b1b1
+MISC metadata.xml 790 BLAKE2B 90e23b3c192f477495a8189840b49f980b16c6dbd388dd51a43106034c0a74d77867d8a64f4fa60b4dc94368a03276fd6e0ada7d761bd8abd7e8b446caa1395b SHA512 9663dd9893db04ac99cb62de85803531fa350c112e7c5335ed1b7b9195c73811f8ed8ce418a13f119e0b3c50093aec48d363b1bf81e6f4c269dd362059742d74
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch
new file mode 100644
index 000000000000..21872e73cb7c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch
@@ -0,0 +1,23 @@
+From 3024af3685be9eb618352bd17ba37953d8076946 Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Thu, 17 Jan 2019 14:05:53 +0100
+Subject: [PATCH] unixpw: don't try to use crypt() when it isn't available
+
+Closes #86
+---
+ src/unixpw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixpw.c b/src/unixpw.c
+index 9a43cec..e2cb016 100644
+--- a/src/unixpw.c
++++ b/src/unixpw.c
+@@ -757,7 +757,7 @@ int unixpw_list_match(char *user) {
+ }
+ 
+ int crypt_verify(char *user, char *pass) {
+-#ifndef UNIXPW_CRYPT
++#if !defined UNIXPW_CRYPT || !defined HAVE_LIBCRYPT
+ 	return 0;
+ #else
+ 	struct passwd *pwd;
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index f25d54c19120..4ad5dbb6d54e 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -7,6 +7,12 @@
 		simple command-line server utility that allows a VNC viewer
 		to connect to an actual X display.
 	</longdescription>
+	<use>
+		<flag name="xdamage">Enable support for the Xdamage library</flag>
+		<flag name="xfixes">Enable support for the Xfixes library</flag>
+		<flag name="xrandr">Enable support for the X xrandr extension</flag>
+		<flag name="xtrap">Enable support for the XTrap library</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">libvncserver</remote-id>
 		<remote-id type="github">LibVNC/x11vnc</remote-id>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
new file mode 100644
index 000000000000..b34c657ccd34
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
@@ -0,0 +1,75 @@
+# 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 +xcomposite +xdamage +xfixes xinerama +xrandr xtrap 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
+	ssl? (
+		!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 )
+	xtrap? ( x11-libs/libXTrap )
+	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="dev-lang/tk:0"
+
+PATCHES=(
+	# https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-crypto.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+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) \
+		$(use_with xtrap) \
+		$(use_with zeroconf avahi)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}