gentoo auto-resync : 11:03:2023 - 18:08:11

6 files changed, 36 insertions, 158 deletions

diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 12f8bc98790c..a3c1e7098d23 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -2,10 +2,9 @@ AUX x11vnc-0.9.16-CVE-2020-29074.patch 774 BLAKE2B 5a8fcb123f1698e78f76eb1828f93
 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-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2b9a18261a279b05fa54dff1240674d51dc44ce4fff9ea64a6644e532c80499287bbb1025b06b47d3b2546eb76f32fbce SHA512 3acaa4e57921673aef14ce2e9931880bcbc8c3d73708124599b8ffc79be6c4fa43713184f01983f4f432e29137c3628902681aed275ca98c7a6f32cb10bc54ca
+AUX x11vnc-0.9.16-implicit-function-declaration.patch 633 BLAKE2B 54f24f5f46f91c2c9b9aaec2b0446b0a48772ebfae7ac479f500ceec45d46c7c5f025ce9daa1094052ec5a1c3a81ebc8a04fc89c60d634b4acbaea4c6f0b0214 SHA512 a95fad04879bcfcd2660acb22006f35042d3a2be0a7013c35ab2cc38103c1e9ced283cb6a1c5e46d28dcae2c7da55c92e4f2e6309c52b8b879e0257c8c65cc29
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
-AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
-AUX x11vnc.init.d-r1 1737 BLAKE2B ac457d4acf27e3a2e26b6315530d326efae4e5583770623362eed65e45aad5a596a13da5325de8ad4155a2d335d3a8a62a41a1bc01facfdefacd5d5e42005df0 SHA512 b39efb164beeda4cf62c530aae4a3127358cc7ccea888df09e48f6a3a53affad0d3f3fce9cfbcfb17e9de131ec945a51e2680d7410e14b169d0295aa4cf85e91
+AUX x11vnc.init.d-r1 1740 BLAKE2B 85f5c40a47287eb648d49c5e6211ea950abcad1378690ee7f45313378d49f4cc826a08d15f36dc49fc76dc4cc763fd6182c4324de053c5ba40cea97001546c74 SHA512 def0edac62b35b231354fb24372b48ac346730af2e507522e7a598c9661a78252ee31dab7c3635d85ec128873d0261913a35482c8dc0be744806e8db5af222aa
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r6.ebuild 1971 BLAKE2B ec83908a840e64367f24479464335dc14977b0851e8fd7853afe69fb96ddaf2474e3209c84ed2f86e1b7be2d9fd2eec74f5b1aebd147029570fb180200a248e5 SHA512 b164d832673fcf2752ac7c5d3372ddbaac0196a80cf1f3e82a25784e7ad6c6303f744ff27b45d20f2b5dda5aebcf48d679e3a402d030e95ea589f9d21528f88e
-EBUILD x11vnc-0.9.16-r7.ebuild 1981 BLAKE2B f8d8b9ad3d5db228def8ccd8d767dad330a62670084494f7f99bfe13d35f7040a7ff8d02399d52102ff3e9eacd109f8caec62b27a326e80cbff1026c507d5fd6 SHA512 0070581125bdae6cc9a9443182ad9143505b9fb33c8415ca5f6b7146e215f66d577bc74b972b0a3ee7cefb2c7415834ac196b175f9c37a424da8a31cda5ebcc6
+EBUILD x11vnc-0.9.16-r8.ebuild 2037 BLAKE2B 643621bb1bc88b54df7829e661adbdb0f075dd4a4143e683eb42c13d353d752f41012ed811df6ee1ba5ed9ffb6d20c337e6d56b389c9be83c7a0d45c6a190788 SHA512 dbee62887862077830ea142614c3f364f857d6cf2a8b7874f0d424365bc817e72fe414ed61d0fae00acea464523dc38abfce34da4a5a56a40164cc205383b3da
 MISC metadata.xml 953 BLAKE2B 716b40da30ae65560d74a2dc7ea528180e0d8da048355dfc7557df06704ccde01cba1a3fa24a3f5f53bc6349482d430f180e0678bf6d032be8966d971a612445 SHA512 a9de2facb44bc2eeab0fda61de359b191d7c1243560a3cfa21e1566cad6c113ed126dd117befc8666d4dfa8080cb291ac9fed75b9fcc4f6986ed6bebd89ab710
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch
new file mode 100644
index 000000000000..c6d1c494bd23
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch
@@ -0,0 +1,26 @@
+From 351d27d4a846e3d0e5c724e067f44b52e04402f1 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 6 Mar 2023 00:57:20 +0300
+Subject: [PATCH] Drop AC_FUNC_STAT macro
+
+This macro is obsolescent and doesn't work with
+-Werror=implicit-function-declaration compiler flag
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b62ac5..5a386db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -474,7 +474,6 @@ if test $inaddrt = no ; then
+ fi
+ # Checks for library functions.
+ AC_FUNC_MEMCMP
+-AC_FUNC_STAT
+ AC_FUNC_STRFTIME
+ AC_FUNC_VPRINTF
+ AC_FUNC_FORK
+-- 
+2.39.2
+
diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d
deleted file mode 100644
index b6b16dafb943..000000000000
--- a/x11-misc/x11vnc/files/x11vnc.init.d
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/openrc-run
-# 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/files/x11vnc.init.d-r1 b/x11-misc/x11vnc/files/x11vnc.init.d-r1
index 04c36ea361db..8907b3858a31 100644
--- a/x11-misc/x11vnc/files/x11vnc.init.d-r1
+++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1
@@ -16,8 +16,8 @@ checkconfig() {
 	X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900}
 	X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0}
 	X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc}
-	
-	X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}"	
+
+	X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}"
 
 	if [ -n "${X11VNC_AUTOPORT}" ]; then
 		X11VNC_PORT=""
@@ -30,7 +30,7 @@ checkconfig() {
 	checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}"
 
 	# Attempt to find X-Auth file
-	if ! type xauth > /dev/null 2>&1 ||
+	if ! command -v 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
@@ -43,7 +43,7 @@ checkconfig() {
 	if [ ! -f "${X11VNC_AUTH}" ]; then
 		eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!"
 		return 1
-	fi	
+	fi
 }
 
 start() {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild
deleted file mode 100644
index 74df787e2dd1..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 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+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon ssl +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
-	virtual/libcrypt:=
-	ssl? ( dev-libs/openssl:0= )
-	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
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-CVE-2020-29074.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	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() {
-	default
-	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
-	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
index 74b94b9ee0ae..63e3af4a67a1 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-CVE-2020-29074.patch
+	"${FILESDIR}"/${P}-implicit-function-declaration.patch
 )
 
 src_prepare() {