gentoo auto-resync : 28:10:2024 - 03:04:40

4 files changed, 269 insertions, 2 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 8487ea6b0d67..862b46f41b08 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -4,11 +4,13 @@ AUX tigervnc-1.14.0-typo-VncAuth.patch 763 BLAKE2B 6e0f209159aac2f6ed78784606b7d
 AUX tigervnc-1.14.0-xsession-path.patch 1008 BLAKE2B f73bbab10b21a8b27b5b1773e43b254ca5e5017efd84aba8916ad6b5549c2cffabcbac7c14c0b1d8dbb2fb280299d580ceab45399b593abc8f520d692988024b SHA512 cc3ead0af6c618b00914a131723fcf401f913a10e3398e92702387e805dc94f7878558deff4ee12d58e8f2608a7d268ba937a8fcc34ed303b9e3328e77b98bf6
 AUX tigervnc-1.14.0.confd 530 BLAKE2B 1152c237744ee69ab317a8d979a8282abb259cb359500b251c31faf6a683ec11c31ef283749e420f5fce54a9f5bec7e97df4ccfdae41871173d30458c8669137 SHA512 75dbae29d2bab1e1b56f9d2d73bb674cbd968a9919e085bc1d356726caed91b469474753176d657c0b5ef2afe6fdf691b661d2224062b22bc39a9752951ac6d4
 AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251d520cc5d98cfd2c2f075737fb3ed192903a08f850603847ce7769e3ae01b2c29dc4591cb3444edf835c6e0d SHA512 0e4043df37125e48d4314fc87400bf5e4eb9ca9848d2afead2f34b4f94422a03b939c3cf246a40c44b91e9cf0aec261f35a3c98e9861810db2f5a73f384a3c60
+AUX tigervnc-1.14.1-pam.patch 959 BLAKE2B 384b065ac6f273ff302f8469c039e81f0bc7a98f684162aa8883af5332bc3450032e2a87f12d0f0c576df167817b3b7875b6675cc8af26de14f0c0147077b353 SHA512 d6ee39c53cab920a9f3432012714aaaa7f87db90763156bfcea26e394e381fa47eed8cbe62a956cb983059b28811932b16e79dc0445390a59288c27fc77d6caa
 DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
 DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba SHA512 d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
 EBUILD tigervnc-1.14.0-r1.ebuild 5648 BLAKE2B cf2e9b7cb7b3ae15f82751208af5a099f9473ec36a9e0245c55b229dbd0c60c37281a16d2ab1808dd52e97cc48d05dc5ea25f4a4bedfa1037643d052de34d6df SHA512 7c604be55ba944b2537b96cb76163da300f9a9e1f9dcb09f78f536885cc850a5fd154a8d39a49ad98481eb5b6f7be892baa9bcd8a62f02c9f081beae9a109422
 EBUILD tigervnc-1.14.0-r2.ebuild 5715 BLAKE2B f00a310aa248027dad8cbe929fc016a63168234f9fdc2bfe19d52fe683a64fe814a1b8c42a40cd13f7fa3a48eea93cc09c04a98d66611fce8d5fa5806ca7f41f SHA512 0e744258f23643cb53848db65250759be19166b8bdbcbeb9db0d324ef1b73629e5056831b75b17629c309c4b2f45d81f0be59c841af9ca7e9d5e5f97d8535444
+EBUILD tigervnc-1.14.1-r1.ebuild 5542 BLAKE2B bc1fd9d9db838cc27cf2c4ad12a792606fcb218c205b5d08eb492cec71ad0e26d09175ce1e635b9a449136ccbe77fd6d6ea8c8d80c0af1f4c508b8f79d8ca895 SHA512 aa4a2d6ce6b85019671aa4d44141709b83fae388fffedcf4a9f94aad999e1fed1a4740755df845d54ae209fc3555c699ed03dc1462a46d2ddab5f6d829c3c436
 EBUILD tigervnc-1.14.1.ebuild 5666 BLAKE2B b0e2aafaf54a75cedcbf6d6c4ad76a8e776b53077edf416858f67cf9d17ba1b2d161070b6080be9ae6114d71fed0723e3ff8a9b8f8caca6c82ecd24b5994c187 SHA512 9efb21ab42c8390e629b1b249e5aed3eec7d7e85cf84ca93df2329a71ba7bdfdff6b7dd5a191b616ddb91f5edfa3368d6de4572e8e20d597756350a9603475a7
-EBUILD tigervnc-9999.ebuild 5666 BLAKE2B b0e2aafaf54a75cedcbf6d6c4ad76a8e776b53077edf416858f67cf9d17ba1b2d161070b6080be9ae6114d71fed0723e3ff8a9b8f8caca6c82ecd24b5994c187 SHA512 9efb21ab42c8390e629b1b249e5aed3eec7d7e85cf84ca93df2329a71ba7bdfdff6b7dd5a191b616ddb91f5edfa3368d6de4572e8e20d597756350a9603475a7
+EBUILD tigervnc-9999.ebuild 5704 BLAKE2B 533c2e4e58426108e0436555d1849d17978c9a6135bcfe3778005bf692b789c390a7ff7dd43b3d9e7d8bc6d1b6ffb311350095918c3fca788bc6275a099b3b72 SHA512 f32eafb73811f138386e88b25f2649899cf12f8641a6f162e7e44de50afb22dc032782075f7e22409ff415b3cdc2163fdd1e3dc7ddf3632eb089487587ada51f
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch b/net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch
new file mode 100644
index 000000000000..b4630fab5f99
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch
@@ -0,0 +1,28 @@
+Comment out pam_selinux.so, the server does not start if missing.
+Add pam_elogind.so for non-systemd installs.
+
+See also:
+Bug: https://bugs.gentoo.org/746227
+Bug: https://bugs.gentoo.org/937283
+
+--- a/unix/vncserver/tigervnc.pam
++++ b/unix/vncserver/tigervnc.pam
+@@ -1,15 +1,13 @@
+ #%PAM-1.0
+ 
+-# THIS IS AN EXAMPLE CONFIGURATION
+-# MODIFY AS NEEDED FOR YOUR DISTRIBUTION
+-
+ # pam_selinux.so close should be the first session rule
+--session   required     pam_selinux.so close
++#-session   required     pam_selinux.so close
+ session    required     pam_loginuid.so
+--session   required     pam_selinux.so open
++#-session   required     pam_selinux.so open
+ session    required     pam_namespace.so
+ session    optional     pam_keyinit.so force revoke
+ session    required     pam_limits.so
+ -session   optional     pam_systemd.so
++-session   optional     pam_elogind.so
+ session    required     pam_unix.so
+ -session   optional     pam_reauthorize.so prepare
diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..e77f6a356656
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.13"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	java? ( viewer )
+	opengl? ( server )
+	|| ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libxcvt
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		dri3? (
+			media-libs/mesa[opengl]
+			x11-libs/libxshmfence
+		)
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/xtrans
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+	"${FILESDIR}"/${PN}-1.14.1-pam.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+		eautoreconf
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os present hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+		elog 'OpenRC users: please migrate to one service per display as documented here:'
+		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+		elog
+	}
+
+	use server && {
+		elog 'PLEASE NOTE:'
+		elog '	The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
+		elog '	~/.config/tigervnc instead of ~/.vnc'
+		elog
+	}
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index ec1ec5f986dc..d19c1b53cdd3 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
 		dev-libs/openssl:0=
 		sys-libs/pam
 		x11-libs/libXau
+		x11-libs/libxcvt
 		x11-libs/libXdamage
 		x11-libs/libXdmcp
 		x11-libs/libXfixes
@@ -83,7 +84,6 @@ DEPEND="${COMMON_DEPEND}
 	server? (
 		media-fonts/font-util
 		x11-base/xorg-proto
-		x11-libs/libxcvt
 		x11-libs/libXi
 		x11-libs/libxkbfile
 		x11-libs/libXrender
@@ -102,6 +102,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
 	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+	"${FILESDIR}"/${PN}-1.14.1-pam.patch
 )
 
 src_unpack() {