[gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/files/, x11-misc/x11vnc/

[Patrice Clement]

commit:     eaf94805fbdfae94005b6798052091b40818eccb
Author:     Alex Xu <alex_y_xu <AT> yahoo <DOT> ca>
AuthorDate: Fri Nov 27 15:38:46 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 17:20:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf94805

x11-misc/x11vnc: 0.9.14 bump, clean metadata.xml

Credit for init.d and conf.d script to:
Sal Gonzalez <sgonzalez <AT> codejunkie.net>.

Package-Manager: portage-2.2.24

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 x11-misc/x11vnc/Manifest             |  1 +
 x11-misc/x11vnc/files/x11vnc.conf.d  | 37 +++++++++++++++++++
 x11-misc/x11vnc/files/x11vnc.init.d  | 70 ++++++++++++++++++++++++++++++++++++
 x11-misc/x11vnc/metadata.xml         |  5 ---
 x11-misc/x11vnc/x11vnc-0.9.14.ebuild | 62 ++++++++++++++++++++++++++++++++
 5 files changed, 170 insertions(+), 5 deletions(-)

diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 0ad1bcf..85e88f5 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,2 +1,3 @@
 DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b68931019ce038b6e2fcd78e93de7f6984a22262252d01c16f SHA512 0fa4f7b52442793ec1bd82c74f9d092c69262e4f1fa93584fef17bbe0e5cbde08bc5ad0924631801bb43b41d90c37077a317c61511553f98698096eab05791eb WHIRLPOOL f1a45b549fb6ff9bea2eb4e3719b5dd43a78f6f418c61691cebab313d56761147d928648e103c654309575bec7c716a6f1cd1ef7a9b484c09edee37233cb0ce7
 DIST x11vnc-0.9.13_p20150627.tar.gz 1700142 SHA256 14fb77e9b875224b47fee659d5a883c26c2792c5e37d1e32286b03103fdaef07 SHA512 c28cfe47c1a0bb486bb3290511a8a71cf499e55617e3f488d45cb6a1e9050e4f52c5bb6eb9f2f655728f2028d2472a88d8b9178d59e79c1f07464782555abc82 WHIRLPOOL d0342ef8d948b0dda119967f9e59be6f1e4d2639859f8c2a45c37eeb644e970b322937635f151256b3c30a69d37838f380ab4732c5afd44499e9decb8412aa15
+DIST x11vnc-0.9.14.tar.gz 1700802 SHA256 45f87c5e4382988c73e8c7891ac2bfb45d8f9ce1196ae06651c84636684ea143 SHA512 5d18e5ff493fbc4f6f1efe952812c1acd3087e855a2a9f2c99f3b2606cfa40a20b83e2d0c736e12b453b47f7ff7746069a1b6718d842d1a8f73b00d5c4c4a93f WHIRLPOOL 3980edaa9327395e55dffdf06fb4a2eab9b94e1aaf8da65cdd1b4c5d765351eedc003b1150b7d4da065385cb7460a556509bf57c58cf1cbe443865c551f6a170

diff --git a/x11-misc/x11vnc/files/x11vnc.conf.d b/x11-misc/x11vnc/files/x11vnc.conf.d
new file mode 100644
index 0000000..7df3a13
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc.conf.d
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Configuration for running x11vnc as a service. This allows VNC 
+# connections prior to logging in to the X display manager.
+
+# Password file location of the password file for VNC Connections
+#   Prior to first run, you must configure a password, to do so please
+#   run `x11vnc -storepasswd /etc/x11vnc.pass`. Replace /etc/x11vnc.pass 
+#   ith the location you have specified below
+#X11VNC_RFBAUTH="/etc/x11vnc.pass"
+
+# Port to listen on for incoming connections
+#X11VNC_RFBPORT="5900"
+
+# Automatically probe for a free port to listen on for incoming connections
+# starting from the port number specified
+#   Setting this will diable X11VNC_RFBPORT above
+#   See `man x11vnc`, option `-autoport` for more information
+#X11VNC_AUTOPORT=""
+
+# X Display to attach to
+#   This should match the display your DM is running on
+#X11VNC_DISPLAY=":0"
+
+# Location of the x11vnc logfile
+#X11VNC_LOG="/var/log/x11vnc"
+
+# Miscelaneous options to pass to x11vnc.
+#   Do not set options that are configurable above.
+#   Check `x11vnc -help` or `man x11vnc` for more options.
+#   * Modern composting DMs/WMs will require "-noxdamage"
+#   * If you experience crashes on logging in, try "-noxfixes"
+#   * Other suggested options include "-noxrecord" and "-ncache ##"
+#     Refer to the x11vnc man page for further explanations.
+#X11VNC_OPTS=""
+

diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d
new file mode 100644
index 0000000..08968f0
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc.init.d
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="The x11vnc daemon init script"
+
+depend() {
+	need net
+	need xdm
+}
+
+checkconfig() {
+
+	# Set Defaults
+	X11VNC_RFBAUTH=${X11VNC_RFBAUTH:-/etc/x11vnc.pass}
+	X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900}
+	X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0}
+	X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc}
+	
+	X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}"	
+
+	if [ -n "${X11VNC_AUTOPORT}" ]; then
+		X11VNC_PORT=""
+	fi
+
+	if [ ! -f "${X11VNC_RFBAUTH}" -o ! -s "${X11VNC_RFBAUTH}" ]; then
+		eerror "VNC Password not set, please set one by running: \`x11vnc -storepasswd ${X11VNC_RFBAUTH}\`"
+		return 1
+	fi
+	checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}"
+
+	# Attempt to find X-Auth file
+	if ! type xauth > /dev/null 2>&1 ||
+			! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null ||
+			[ ! -s "${X11VNC_AUTH}" ]; then
+		# Let x11vnc guess at auth
+		X11VNC_AUTH_OPTS="--env FD_XDM=1 -auth guess"
+	else
+		# We found the proper auth
+		X11VNC_AUTH_OPTS="-auth ${X11VNC_AUTH}"
+	fi
+
+	if [ ! -f "${X11VNC_AUTH}" ]; then
+		eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!"
+		return 1
+	fi	
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--exec /usr/bin/x11vnc -- \
+			${X11VNC_AUTH_OPTS} \
+			-rfbauth ${X11VNC_RFBAUTH} \
+			${X11VNC_RFBPORT:+-rfbport} ${X11VNC_RFBPORT} \
+			${X11VNC_AUTOPORT:+-autoport} ${X11VNC_AUTOPORT} \
+			-display ${X11VNC_DISPLAY} \
+			-o ${X11VNC_LOG} \
+			-bg -forever \
+			${X11VNC_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop /usr/bin/x11vnc
+	eend $?
+}

diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index ab3d805..a9e6e83 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -12,11 +12,6 @@
 		simple command-line server utility that allows a VNC viewer
 		to connect to an actual X display.
 	</longdescription>
-	<use>
-		<flag name="system-libvncserver">Build x11vnc against the system
-			libvncserver (experimental)</flag>
-		<flag name="tk">Support the simple tcl/tk -gui option</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.14.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14.ebuild
new file mode 100644
index 0000000..0829431
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils vcs-snapshot
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/0.9.14.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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon libressl ssl xinerama"
+
+RDEPEND=">=net-libs/libvncserver-0.9.8
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	>=x11-libs/libXtst-1.1.0
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+DOCS=(ChangeLog README)
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with avahi) \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		--without-v4l \
+		$(use_with xinerama)
+}
+
+src_install() {
+	default
+	doinitd "${FILESDIR}/x11vnc.init.d"
+	doconfd "${FILESDIR}/x11vnc.conf.d"
+}