diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile index 61009d1129b2..18ea02c5f910 100644 --- a/net/xrdp-devel/Makefile +++ b/net/xrdp-devel/Makefile @@ -1,122 +1,121 @@ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.10.80.b20260203 +DISTVERSION= 0.10.80.b20260702 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel DIST_SUBDIR?= ${PORTNAME} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ MAINTAINER= meta@FreeBSD.org COMMENT= Open source Remote Desktop Protocol (RDP) server (development version) WWW= https://www.xrdp.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm LIB_DEPENDS= libImlib2.so:graphics/imlib2 RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp-devel \ xterm:x11/xterm USES= autoreconf:build compiler:c11 cpe jpeg libtool localbase \ pkgconfig ssl xorg CPE_VENDOR= neutrinolabs USE_GITHUB= yes GH_ACCOUNT= neutrinolabs -GH_TAGNAME= 4d9dde8 -GH_TUPLE= neutrinolabs:librfxcodec:962b3a3:librfxcodec/librfxcodec \ - neutrinolabs:libpainter:379b8fb:libpainter/libpainter \ - neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca +GH_TAGNAME= 3af31df3 +GH_TUPLE= neutrinolabs:librfxcodec:0badc06:librfxcodec/librfxcodec \ + neutrinolabs:libpainter:379b8fb:libpainter/libpainter USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_XORG= ice pixman sm x11 xfixes xkbfile xrandr GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --enable-imlib2 \ --enable-jpeg \ --enable-painter \ --enable-pam-config=freebsd \ --enable-pixman \ --enable-rfxcodec \ --enable-strict-locations \ --enable-vsock \ --localstatedir=/var \ --with-sysconfsubdir=${PORTNAME}${PKGNAMESUFFIX} \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig INSTALL_TARGET= install-strip LDFLAGS+= -lssl CONFLICTS= xrdp ETCDIR= ${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC OPENH264 OPUS X264 OPTIONS_GROUP= AUDIO_CODEC VIDEO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS OPTIONS_GROUP_VIDEO_CODEC= OPENH264 X264 FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection FUSE_DESC= Enable drive redirection via FUSE (experimental) MP3LAME_DESC= Enable MP3 Lame for audio redirection OPENH264_DESC= H.264 video codec support via OpenH264 OPUS_DESC= Enable Opus for audio redirection DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FDKAAC_CONFIGURE_ENABLE= fdkaac FUSE_USES= fuse:3 FUSE_CONFIGURE_ENABLE= fuse IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame MP3LAME_CONFIGURE_ENABLE= mp3lame OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CONFIGURE_ENABLE= openh264 OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= opus X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= x264 GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share GROUP= _xrdp USER= _xrdp .include .if ${SSL_DEFAULT} == base # As base OpenSSL doesn't install a .pc file, some flags such as -lcrypto # cannot be obtained automatically via pkgconfig. When compiled with base # OpenSSL, it needs to be specified explicitly. CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" .endif pre-configure: # This version doesn't require GH_TAGNAME override now @${REINPLACE_CMD} -e "s|0.10.80|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap post-patch: ${REINPLACE_CMD} -e "s|^param=Xorg|param=${LOCALBASE}/libexec/Xorg|" \ -e "s|^LogFile=xrdp-sesman\.log|LogFile=xrdp-sesman${PKGNAMESUFFIX}.log|" \ ${WRKSRC}/sesman/sesman.ini.in ${REINPLACE_CMD} -e "s|^LogFile=xrdp\.log|LogFile=xrdp${PKGNAMESUFFIX}.log|" \ ${WRKSRC}/xrdp/xrdp.ini.in post-install: ${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR} post-stage: @${RM} ${STAGEDIR}${ETCDIR}/rsakeys.ini @${RM} ${STAGEDIR}${ETCDIR}/cert.pem @${RM} ${STAGEDIR}${ETCDIR}/key.pem .for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.toml \ gfx.toml @${MV} ${STAGEDIR}${ETCDIR}/$f \ ${STAGEDIR}${ETCDIR}/$f.sample .endfor .include diff --git a/net/xrdp-devel/distinfo b/net/xrdp-devel/distinfo index 38dbb75a6b7f..9672c7012b58 100644 --- a/net/xrdp-devel/distinfo +++ b/net/xrdp-devel/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1770182429 -SHA256 (xrdp/neutrinolabs-xrdp-v0.10.80.b20260203-4d9dde8_GH0.tar.gz) = f5655834cfe46fe2511116e560c5c4cf4ea464103415ba26f16cf9ab9563d5fe -SIZE (xrdp/neutrinolabs-xrdp-v0.10.80.b20260203-4d9dde8_GH0.tar.gz) = 1282002 -SHA256 (xrdp/neutrinolabs-librfxcodec-962b3a3_GH0.tar.gz) = 85a5ee4374e372f5c554a7b0b7c5a4cb50e52421f4d3b8810b1ac0ff33998067 -SIZE (xrdp/neutrinolabs-librfxcodec-962b3a3_GH0.tar.gz) = 66422 +TIMESTAMP = 1783398635 +SHA256 (xrdp/neutrinolabs-xrdp-v0.10.80.b20260702-3af31df3_GH0.tar.gz) = 8487d7f8b901a2ce64d8414981e866893ba2e890d45bd179f158e62d740e8b25 +SIZE (xrdp/neutrinolabs-xrdp-v0.10.80.b20260702-3af31df3_GH0.tar.gz) = 1286744 +SHA256 (xrdp/neutrinolabs-librfxcodec-0badc06_GH0.tar.gz) = 7cd00304e17617fce7f531d47c671ed1b90837aa50dedc9d34a641f55b5135d4 +SIZE (xrdp/neutrinolabs-librfxcodec-0badc06_GH0.tar.gz) = 66446 SHA256 (xrdp/neutrinolabs-libpainter-379b8fb_GH0.tar.gz) = 7a9e22e78d08afdc24c6591cacd0e66f434e5016901800bcdd1a43f3355f1e1d SIZE (xrdp/neutrinolabs-libpainter-379b8fb_GH0.tar.gz) = 13956 -SHA256 (xrdp/neutrinolabs-ulalaca-xrdp-f683d17_GH0.tar.gz) = 7745c30c26986bfa537237053de34e9feaae8f2f4af1a9a898be680771b891b8 -SIZE (xrdp/neutrinolabs-ulalaca-xrdp-f683d17_GH0.tar.gz) = 18247 diff --git a/net/xrdp-devel/files/patch-configure.ac b/net/xrdp-devel/files/patch-configure.ac index 762394926700..8df1fbd0cfb9 100644 --- a/net/xrdp-devel/files/patch-configure.ac +++ b/net/xrdp-devel/files/patch-configure.ac @@ -1,40 +1,40 @@ ---- configure.ac.orig 2017-12-27 14:40:24 UTC +--- configure.ac.orig 2026-07-02 08:33:45 UTC +++ configure.ac -@@ -159,11 +159,35 @@ AC_CHECK_FUNC(dlopen, [], +@@ -257,11 +257,35 @@ AC_SUBST(DLOPEN_LIBS) AC_SUBST(DLOPEN_LIBS) # checking for openssl -PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8], [], +if test "x$freebsd" = "xyes"; then + # FreeBSD may have two OpenSSL, base and port however + # base OpenSSL doesn.t have openssl.pc file. + PKG_CHECK_MODULES( + [OPENSSL], + [openssl >= 0], + [freebsd_openssl=port], + [ + AC_CHECK_HEADER( + [openssl/rc4.h], + [freebsd_openssl=base], + [AC_MSG_ERROR([please install libssl-dev or openssl-devel])], + [#include ]) + ] + ) + + if test "x$freebsd_openssl" = "xport"; then + OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin + elif test "x$freebsd_openssl" = "xbase"; then + OPENSSL_BIN=/usr/bin + fi +else + # OpenSSL detection for other OS + PKG_CHECK_MODULES([OPENSSL], [openssl >= 0], [], [AC_MSG_ERROR([please install libssl-dev or openssl-devel])]) + OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin +fi # look for openssl binary -OPENSSL_BIN=`$PKG_CONFIG --variable=exec_prefix openssl`/bin AC_PATH_PROGS([OPENSSL], [openssl], [:], [$OPENSSL_BIN:$PATH]) - # checking for pam variation + # checking for PAM variation diff --git a/net/xrdp-devel/files/patch-sesman_sesman.ini.in b/net/xrdp-devel/files/patch-sesman_sesman.ini.in index 94302d0cee34..36f518fd4af1 100644 --- a/net/xrdp-devel/files/patch-sesman_sesman.ini.in +++ b/net/xrdp-devel/files/patch-sesman_sesman.ini.in @@ -1,13 +1,13 @@ ---- sesman/sesman.ini.in.orig 2017-12-27 14:40:24 UTC +--- sesman/sesman.ini.in.orig 2026-07-02 08:33:45 UTC +++ sesman/sesman.ini.in -@@ -75,8 +75,8 @@ param=xrdp/xorg.conf - param=-noreset - param=-nolisten - param=tcp +@@ -181,8 +181,8 @@ param=tcp + ; edit these lines to get debugging info in the xorgxrdp log file + #param=-logverbose + #param=5 -param=-logfile -param=.xorgxrdp.%s.log +#param=-logfile +#param=.xorgxrdp.%s.log - [X11rdp] - param=X11rdp + [Xvnc] + param=Xvnc