diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile index 24f674fe8726..61009d1129b2 100644 --- a/net/xrdp-devel/Makefile +++ b/net/xrdp-devel/Makefile @@ -1,123 +1,122 @@ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.10.80.b20241229 -PORTREVISION= 3 +DISTVERSION= 0.10.80.b20260203 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= 4e378c9 -GH_TUPLE= neutrinolabs:librfxcodec:e8208bf:librfxcodec/librfxcodec \ - neutrinolabs:libpainter:2255b38:libpainter/libpainter \ +GH_TAGNAME= 4d9dde8 +GH_TUPLE= neutrinolabs:librfxcodec:962b3a3:librfxcodec/librfxcodec \ + neutrinolabs:libpainter:379b8fb:libpainter/libpainter \ neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca 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.ini \ +.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 feb888b68588..38dbb75a6b7f 100644 --- a/net/xrdp-devel/distinfo +++ b/net/xrdp-devel/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1735438248 -SHA256 (xrdp/neutrinolabs-xrdp-v0.10.80.b20241229-4e378c9_GH0.tar.gz) = 3fada9a0e9a7a26f72dd7f18026714dc015c1bb0f98f107df6bc31332480f5bd -SIZE (xrdp/neutrinolabs-xrdp-v0.10.80.b20241229-4e378c9_GH0.tar.gz) = 1122678 -SHA256 (xrdp/neutrinolabs-librfxcodec-e8208bf_GH0.tar.gz) = f6e6760033675e24bdfc222f6d455164919221e693c2b7306187b31af6de88c5 -SIZE (xrdp/neutrinolabs-librfxcodec-e8208bf_GH0.tar.gz) = 60593 -SHA256 (xrdp/neutrinolabs-libpainter-2255b38_GH0.tar.gz) = df669fb5a801b2e5f9c1e6c97d85675ca63dbed6409b4bbf3adc60ac95e64f0e -SIZE (xrdp/neutrinolabs-libpainter-2255b38_GH0.tar.gz) = 13940 +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 +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/pkg-plist b/net/xrdp-devel/pkg-plist index 0e8046571ab2..04904906e9b7 100644 --- a/net/xrdp-devel/pkg-plist +++ b/net/xrdp-devel/pkg-plist @@ -1,126 +1,132 @@ bin/xrdp-dis bin/xrdp-dumpfv1 bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun etc/pam.d/xrdp-sesman etc/rc.d/xrdp etc/rc.d/xrdp-sesman %%ETCDIR%%/km-00000405.toml %%ETCDIR%%/km-00000406.toml %%ETCDIR%%/km-00000407.toml %%ETCDIR%%/km-00000409.toml %%ETCDIR%%/km-0000040a.toml %%ETCDIR%%/km-0000040b.toml %%ETCDIR%%/km-0000040c.toml +%%ETCDIR%%/km-0000040e.toml %%ETCDIR%%/km-00000410.toml %%ETCDIR%%/km-00000411.toml %%ETCDIR%%/km-00000412.toml %%ETCDIR%%/km-00000414.toml %%ETCDIR%%/km-00000415.toml %%ETCDIR%%/km-00000416.toml %%ETCDIR%%/km-00000419.toml %%ETCDIR%%/km-0000041d.toml +%%ETCDIR%%/km-00000424.toml +%%ETCDIR%%/km-00000426.toml +%%ETCDIR%%/km-00010426.toml +%%ETCDIR%%/km-00020426.toml %%ETCDIR%%/km-00000807.toml %%ETCDIR%%/km-00000809.toml %%ETCDIR%%/km-0000080a.toml %%ETCDIR%%/km-0000080c.toml %%ETCDIR%%/km-00000813.toml %%ETCDIR%%/km-00000816.toml %%ETCDIR%%/km-0000100c.toml %%ETCDIR%%/km-00010409.toml %%ETCDIR%%/km-00060409.toml %%ETCDIR%%/km-19360409.toml %%ETCDIR%%/pulse/default.pa @sample %%ETCDIR%%/gfx.toml.sample @sample %%ETCDIR%%/reconnectwm.sh.sample @sample %%ETCDIR%%/sesman.ini.sample @sample %%ETCDIR%%/startwm.sh.sample -@sample %%ETCDIR%%/xrdp_keyboard.ini.sample +@sample %%ETCDIR%%/xrdp_keyboard.toml.sample @sample %%ETCDIR%%/xrdp.ini.sample include/ms-erref.h include/ms-fscc.h include/ms-rdpbcgr.h include/ms-rdpeclip.h include/ms-rdpedisp.h include/ms-rdpefs.h include/ms-rdpegdi.h include/ms-rdpele.h include/ms-rdperp.h include/ms-smb2.h include/painter.h include/rfxcodec_common.h include/rfxcodec_decode.h include/rfxcodec_encode.h include/xrdp_client_info.h include/xrdp_constants.h include/xrdp_rail.h include/xrdp_scancode_defs.h include/xrdp_sockets.h +include/xup_client_info.h lib/libpainter.a lib/librfxencode.a lib/xrdp/libcommon.a lib/xrdp/libcommon.so lib/xrdp/libcommon.so.0 lib/xrdp/libcommon.so.0.0.0 lib/xrdp/libipm.a lib/xrdp/libipm.so lib/xrdp/libipm.so.0 lib/xrdp/libipm.so.0.0.0 lib/xrdp/libmc.a lib/xrdp/libmc.so lib/xrdp/libsesman.a lib/xrdp/libsesman.so lib/xrdp/libsesman.so.0 lib/xrdp/libsesman.so.0.0.0 lib/xrdp/libtoml.a lib/xrdp/libtoml.so lib/xrdp/libtoml.so.1 lib/xrdp/libtoml.so.1.0.0 lib/xrdp/libvnc.a lib/xrdp/libvnc.so lib/xrdp/libxrdp.a lib/xrdp/libxrdp.so lib/xrdp/libxrdp.so.0 lib/xrdp/libxrdp.so.0.0.0 lib/xrdp/libxrdpapi.a lib/xrdp/libxrdpapi.so lib/xrdp/libxrdpapi.so.0 lib/xrdp/libxrdpapi.so.0.0.0 lib/xrdp/libxup.a lib/xrdp/libxup.so libdata/pkgconfig/libpainter.pc libdata/pkgconfig/rfxcodec.pc libdata/pkgconfig/xrdp.pc libexec/xrdp/waitforx libexec/xrdp/xrdp-droppriv libexec/xrdp/xrdp-sesexec sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman share/man/man1/xrdp-dis.1.gz share/man/man5/gfx.toml.5.gz share/man/man5/sesman.ini.5.gz share/man/man5/xrdp-km.toml.5.gz share/man/man5/xrdp.ini.5.gz share/man/man8/xrdp-chansrv.8.gz share/man/man8/xrdp-dumpfv1.8.gz share/man/man8/xrdp-genkeymap.8.gz share/man/man8/xrdp-keygen.8.gz share/man/man8/xrdp-sesadmin.8.gz share/man/man8/xrdp-sesman.8.gz share/man/man8/xrdp-sesrun.8.gz share/man/man8/xrdp.8.gz %%DATADIR%%/ad24b.bmp %%DATADIR%%/ad256.bmp %%DATADIR%%/cursor0.cur %%DATADIR%%/cursor1.cur %%DATADIR%%/README.logo %%DATADIR%%/sans-10.fv1 %%DATADIR%%/sans-18.fv1 %%DATADIR%%/xrdp_logo.bmp %%DATADIR%%/xrdp_logo.png %%DATADIR%%/xrdp-chkpriv %%DATADIR%%/xrdp24b.bmp %%DATADIR%%/xrdp256.bmp