git: ee46045d223a - main - net/xrdp: Update to 0.10.2-rc.1

The branch main has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ee46045d223a59b08fe7c74aa676397439e9b81d

commit ee46045d223a59b08fe7c74aa676397439e9b81d
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2024-12-23 14:52:21 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2024-12-23 15:09:59 +0000

    net/xrdp: Update to 0.10.2-rc.1
---
 net/xrdp/Makefile  | 15 +++++++++++----
 net/xrdp/distinfo  |  6 +++---
 net/xrdp/pkg-plist |  9 ++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 232400baf171..ada151995b15 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xrdp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.10.1
+DISTVERSION=	0.10.2-rc.1
 PORTEPOCH=	1
 CATEGORIES=	net
 DIST_SUBDIR?=	${PORTNAME}
@@ -17,7 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
 RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
 		xterm:x11/xterm
-LIB_DEPENDS=	libImlib2.so:graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
+		libopenh264.so:multimedia/openh264 \
+		libx264.so:multimedia/x264
 
 USES=		autoreconf:build compiler:c11 cpe jpeg libtool localbase \
 		pkgconfig ssl xorg
@@ -33,7 +35,9 @@ GH_TUPLE=	neutrinolabs:librfxcodec:c6b41af:librfxcodec/librfxcodec \
 		neutrinolabs:libpainter:2255b38:libpainter/libpainter \
 		neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca
 
-CONFIGURE_ARGS=	--enable-imlib2 \
+CONFIGURE_ARGS=	--enable-openh264 \
+		--enable-x264 \
+		--enable-imlib2 \
 		--enable-jpeg \
 		--enable-painter \
 		--enable-pam-config=freebsd \
@@ -49,6 +53,9 @@ INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
 
+USER=		_xrdp
+GROUP=		_xrdp
+
 OPTIONS_DEFINE=			DEBUG FUSE IPV6
 OPTIONS_DEFAULT=		FDKAAC OPUS
 OPTIONS_GROUP=			AUDIO_CODEC
@@ -93,7 +100,7 @@ post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem
-.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini
+.for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini gfx.toml
 	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
 .endfor
 
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index 2563aba0d455..c0a739cd1538 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1722434185
-SHA256 (xrdp/neutrinolabs-xrdp-v0.10.1_GH0.tar.gz) = dd04ac7151316916799e6a527e8bbef3752f79dd7c252ccc84490ad1d70bd178
-SIZE (xrdp/neutrinolabs-xrdp-v0.10.1_GH0.tar.gz) = 1040247
+TIMESTAMP = 1734961840
+SHA256 (xrdp/neutrinolabs-xrdp-v0.10.2-rc.1_GH0.tar.gz) = dccd2d4c7366e46f4a01ef8a9fca9680c77be520c29c954b2111886a04cdf006
+SIZE (xrdp/neutrinolabs-xrdp-v0.10.2-rc.1_GH0.tar.gz) = 1066431
 SHA256 (xrdp/neutrinolabs-librfxcodec-c6b41af_GH0.tar.gz) = c44e4735f858e7c441eaaad5b6029cfce2e687e20a866d6da75323a6c55b510a
 SIZE (xrdp/neutrinolabs-librfxcodec-c6b41af_GH0.tar.gz) = 61783
 SHA256 (xrdp/neutrinolabs-libpainter-2255b38_GH0.tar.gz) = df669fb5a801b2e5f9c1e6c97d85675ca63dbed6409b4bbf3adc60ac95e64f0e
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index d2cc775f0cf2..2646ba187733 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -27,6 +27,7 @@ include/xrdp_sockets.h
 libdata/pkgconfig/libpainter.pc
 libdata/pkgconfig/rfxcodec.pc
 libdata/pkgconfig/xrdp.pc
+libexec/xrdp/xrdp-droppriv
 lib/xrdp/libcommon.a
 lib/xrdp/libcommon.so
 lib/xrdp/libcommon.so.0
@@ -86,17 +87,14 @@ etc/rc.d/xrdp-sesman
 %%ETCDIR%%/km-0000100c.ini
 %%ETCDIR%%/km-19360409.ini
 %%ETCDIR%%/pulse/default.pa
-@postunexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
-@postunexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
-@postunexec if cmp -s %D/etc/xrdp/reconnectwm.sh.sample %D/etc/xrdp/reconnectwm.sh; then rm -f %D/etc/xrdp/reconnectwm.sh; fi
-@postunexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
-@postunexec if cmp -s %D/etc/xrdp/xrdp_keyboard.ini.sample %D/etc/xrdp/xrdp_keyboard.ini; then rm -f %D/etc/xrdp/xrdp_keyboard.ini; fi
+@sample %%ETCDIR%%/gfx.toml.sample
 @sample %%ETCDIR%%/sesman.ini.sample
 @sample %%ETCDIR%%/startwm.sh.sample
 @sample %%ETCDIR%%/reconnectwm.sh.sample
 @sample %%ETCDIR%%/xrdp.ini.sample
 @sample %%ETCDIR%%/xrdp_keyboard.ini.sample
 share/man/man1/xrdp-dis.1.gz
+share/man/man5/gfx.toml.5.gz
 share/man/man5/sesman.ini.5.gz
 share/man/man8/xrdp.8.gz
 share/man/man5/xrdp.ini.5.gz
@@ -121,3 +119,4 @@ sbin/xrdp-sesman
 %%DATADIR%%/xrdp256.bmp
 %%DATADIR%%/xrdp_logo.bmp
 %%DATADIR%%/xrdp_logo.png
+%%DATADIR%%/xrdp-chkpriv