git: 10ec490f259d - main - net/xrdp: Update to 0.10.2

From: Koichiro Iwao <meta_at_FreeBSD.org>
Date: Tue, 24 Dec 2024 15:02:19 UTC
The branch main has been updated by meta:

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

commit 10ec490f259dd982abf6035be3b04d3120ea6645
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2024-12-24 14:57:14 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2024-12-24 15:01:39 +0000

    net/xrdp: Update to 0.10.2
    
    While here,
    - Add UPDATING entry
    - Switch to release tarball which includes submodules
    - Correct origin for libx264.so
---
 UPDATING           | 19 +++++++++++++++++++
 net/xrdp/Makefile  | 13 ++++---------
 net/xrdp/distinfo  | 12 +++---------
 net/xrdp/pkg-plist |  1 +
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/UPDATING b/UPDATING
index 7b923a10769d..95bdb512fc00 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,25 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20241224:
+  AFFECTS: users of net/xrdp
+  AUTHOR: meta@FreeBSD.org
+
+  xrdp supports H.264 encoding in graphics remoting since v0.10.2.
+  It reduces the amount of data transmitted over the network and provides
+  a much smoother and more responsive experience compared to previous
+  versions. When updating from older v0.10.x versions to v0.10.2, make
+  sure to merge the new xrdp.ini with the old one because xrdp.ini has
+  some new configuration parameters for H.264. See 20240704 if updating
+  from v0.9.x.
+
+  Furthermore, xrdp v0.10.2 supports running the xrdp daemon as an
+  unprivileged user. See the xrdp.ini(5) man page for configuring xrdp to
+  run as an unprivileged user. You can also check if xrdp is properly
+  configured to run as an unprivleged user using the script located at:
+
+    %%PREFIX%%/share/xrdp/xrdp-chkpriv
+
 20241203:
   AFFECTS: users of deskutils/treesheets
   AUTHOR: eduardo@FreeBSD.org
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index ada151995b15..7b1abce086af 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	xrdp
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.10.2-rc.1
+DISTVERSION=	0.10.2
 PORTEPOCH=	1
 CATEGORIES=	net
+MASTER_SITES=	https://github.com/neutribolabs/${PORTNAME}/releases/download/v${DISTVERSION}/
 DIST_SUBDIR?=	${PORTNAME}
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCH_SITES=	https://github.com/neutrinolabs/${PORTNAME}/commit/
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
@@ -19,21 +19,16 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
 		xterm:x11/xterm
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libopenh264.so:multimedia/openh264 \
-		libx264.so:multimedia/x264
+		libx264.so:multimedia/libx264
 
 USES=		autoreconf:build compiler:c11 cpe jpeg libtool localbase \
 		pkgconfig ssl xorg
 CPE_VENDOR=	neutrinolabs
 USE_XORG=	ice pixman sm x11 xfixes xrandr
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
-USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-GH_ACCOUNT=	neutrinolabs
-GH_TUPLE=	neutrinolabs:librfxcodec:c6b41af:librfxcodec/librfxcodec \
-		neutrinolabs:libpainter:2255b38:libpainter/libpainter \
-		neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca
 
 CONFIGURE_ARGS=	--enable-openh264 \
 		--enable-x264 \
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index c0a739cd1538..9b45b9cb91b9 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,9 +1,3 @@
-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
-SIZE (xrdp/neutrinolabs-libpainter-2255b38_GH0.tar.gz) = 13940
-SHA256 (xrdp/neutrinolabs-ulalaca-xrdp-f683d17_GH0.tar.gz) = 7745c30c26986bfa537237053de34e9feaae8f2f4af1a9a898be680771b891b8
-SIZE (xrdp/neutrinolabs-ulalaca-xrdp-f683d17_GH0.tar.gz) = 18247
+TIMESTAMP = 1735047634
+SHA256 (xrdp/xrdp-0.10.2.tar.gz) = 6e2b4fb719fbd74a42c1008afc670e5e2940c8cbf3d8977e78c8451f7d267b62
+SIZE (xrdp/xrdp-0.10.2.tar.gz) = 2447761
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index 2646ba187733..fa2fffc9631d 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -63,6 +63,7 @@ libexec/xrdp/xrdp-sesexec
 etc/pam.d/xrdp-sesman
 etc/rc.d/xrdp
 etc/rc.d/xrdp-sesman
+%%ETCDIR%%/km-00000405.ini
 %%ETCDIR%%/km-00000406.ini
 %%ETCDIR%%/km-00000407.ini
 %%ETCDIR%%/km-00000409.ini