git: aff43de9c48e - main - net/xrdp: Update to 0.9.18.1

From: Koichiro Iwao <meta_at_FreeBSD.org>
Date: Wed, 16 Feb 2022 05:33:41 UTC
The branch main has been updated by meta:

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

commit aff43de9c48e734df5a132446efd28b96b8ab749
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2022-02-16 05:30:29 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2022-02-16 05:33:03 +0000

    net/xrdp: Update to 0.9.18.1
    
    Changes:        https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.18.1
    Changes:        https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.18
    Security:       CVE-2022-23613
    Security:       fc2a9541-8893-11ec-9d01-80ee73419af3
---
 net/xrdp/Makefile | 15 ++++++++-------
 net/xrdp/distinfo | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index fdba59d8cdc7..04b1dc804c18 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xrdp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.17
+DISTVERSION=	0.9.18.1
 PORTEPOCH=	1
 CATEGORIES=	net
 DIST_SUBDIR?=	${PORTNAME}
@@ -19,26 +19,27 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
 RUN_DEPENDS=	xterm:x11/xterm \
 		${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
 		${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		autoreconf:build compiler:c11 cpe jpeg localbase libtool pkgconfig \
 		ssl xorg
+CPE_VENDOR=	neutrinolabs
 USE_XORG=	ice pixman sm x11 xfixes xrandr
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 
-CPE_VENDOR=	neutrinolabs
-
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
-GH_TUPLE=	neutrinolabs:librfxcodec:v0.1.5:librfxcodec/librfxcodec \
+GH_TUPLE=	neutrinolabs:librfxcodec:v0.1.6:librfxcodec/librfxcodec \
 		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter
 
 CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
 		--enable-pam-config=freebsd \
-		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
+		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter \
+		--enable-imlib2
 LDFLAGS+=	-lssl
-CONFLICTS=	xrdp-devel[0-9]*
+CONFLICTS=	xrdp-devel
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
@@ -52,7 +53,7 @@ FUSE_DESC=	Enable drive redirection via FUSE (experimental)
 MP3LAME_DESC=	Enable MP3 Lame for audio redirection
 OPUS_DESC=	Enable Opus for audio redirection
 
-DEBUG_CONFIGURE_ENABLE=	debug-all
+DEBUG_CONFIGURE_ENABLE=	devel-debug devel-logging
 FDKAAC_CONFIGURE_ENABLE=	fdkaac
 FDKAAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
 FUSE_CONFIGURE_ENABLE=	fuse
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index 0cf77940ab57..960f3a487d95 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1633108765
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.17_GH0.tar.gz) = 1eca2d5975473398c4c96c5ec34d61f863375eaad86ee32618c0e642ace04af6
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.17_GH0.tar.gz) = 728218
-SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8
-SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 48387
+TIMESTAMP = 1644895213
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.18.1_GH0.tar.gz) = a0a344e6ce4443bbbf47d2567da2ee6723a906595529d23f8de67f6894347979
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.18.1_GH0.tar.gz) = 757814
+SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.6_GH0.tar.gz) = 84c6e514ab1a7475f76227937bc9aa29ed9b98836d2ebe81daa7fad35bde0273
+SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.6_GH0.tar.gz) = 49431
 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
 SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929