diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index ae097f79b9fc..9ac6c945f403 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -1,98 +1,100 @@ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.9.26 +DISTVERSION= 0.10.0 PORTEPOCH= 1 CATEGORIES= net DIST_SUBDIR?= ${PORTNAME} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ MAINTAINER= meta@FreeBSD.org COMMENT= Open source Remote Desktop Protocol (RDP) server -WWW= http://www.xrdp.org/ +WWW= https://www.xrdp.org/ LICENSE= APACHE20 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 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:c537401a:librfxcodec/librfxcodec \ - neutrinolabs:libpainter:b44f2fa:libpainter/libpainter +GH_TUPLE= neutrinolabs:librfxcodec:e8208bf:librfxcodec/librfxcodec \ + neutrinolabs:libpainter:2255b38:libpainter/libpainter \ + neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca CONFIGURE_ARGS= --enable-imlib2 \ --enable-jpeg \ --enable-painter \ --enable-pam-config=freebsd \ --enable-pixman \ --enable-rfxcodec \ --enable-strict-locations \ + --enable-vsock \ --localstatedir=/var \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig LDFLAGS+= -lssl CONFLICTS= xrdp-devel INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC OPUS OPTIONS_GROUP= AUDIO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS 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 OPUS_DESC= Enable Opus for audio redirection DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging FDKAAC_CONFIGURE_ENABLE= fdkaac FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FUSE_CONFIGURE_ENABLE= fuse FUSE_USES= fuse IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus .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: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap post-patch: ${REINPLACE_CMD} -e "s|^param=Xorg|param=${LOCALBASE}/libexec/Xorg|" \ ${WRKSRC}/sesman/sesman.ini.in post-install: ${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR} 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 @${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample .endfor .include diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo index a54daec76944..29ad67d3937f 100644 --- a/net/xrdp/distinfo +++ b/net/xrdp/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1718892691 -SHA256 (xrdp/neutrinolabs-xrdp-v0.9.26_GH0.tar.gz) = 0fbbb8240d8c222ea1628e099717defce2a727d41896a378a83c68ce846afcf9 -SIZE (xrdp/neutrinolabs-xrdp-v0.9.26_GH0.tar.gz) = 785475 -SHA256 (xrdp/neutrinolabs-librfxcodec-c537401a_GH0.tar.gz) = ecfae401b6c19496c9f7cde91ef10bd97a6cced100d4bba9a5dda60f21bee478 -SIZE (xrdp/neutrinolabs-librfxcodec-c537401a_GH0.tar.gz) = 49437 -SHA256 (xrdp/neutrinolabs-libpainter-b44f2fa_GH0.tar.gz) = 2bd410db1e9eda7b889278187bf9818aee4fd1029ee0ce7c1e6b9f2cfe8e8217 -SIZE (xrdp/neutrinolabs-libpainter-b44f2fa_GH0.tar.gz) = 13936 +TIMESTAMP = 1715519167 +SHA256 (xrdp/neutrinolabs-xrdp-v0.10.0_GH0.tar.gz) = d3c8fb7d4af9131199a98fb4403179a7707da79fc205d62def8efd84fe67eacc +SIZE (xrdp/neutrinolabs-xrdp-v0.10.0_GH0.tar.gz) = 1040405 +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 +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/pkg-plist b/net/xrdp/pkg-plist index 91dbebd8ed5e..d2cc775f0cf2 100644 --- a/net/xrdp/pkg-plist +++ b/net/xrdp/pkg-plist @@ -1,114 +1,123 @@ bin/xrdp-dis bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun +bin/xrdp-dumpfv1 lib/libpainter.a -lib/libpainter.so -lib/libpainter.so.0 -lib/libpainter.so.0.0.0 -lib/librfxencode.so -lib/librfxencode.so.0.0.0 lib/librfxencode.a -lib/librfxencode.so.0 include/ms-erref.h include/ms-fscc.h include/ms-rdpbcgr.h -include/ms-rdpeclip.h include/ms-rdpedisp.h +include/ms-rdpeclip.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_sockets.h libdata/pkgconfig/libpainter.pc libdata/pkgconfig/rfxcodec.pc libdata/pkgconfig/xrdp.pc lib/xrdp/libcommon.a lib/xrdp/libcommon.so lib/xrdp/libcommon.so.0 lib/xrdp/libcommon.so.0.0.0 lib/xrdp/libmc.a lib/xrdp/libmc.so -lib/xrdp/libscp.a -lib/xrdp/libscp.so -lib/xrdp/libscp.so.0 -lib/xrdp/libscp.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/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/libxup.a lib/xrdp/libxup.so lib/xrdp/libxrdpapi.so lib/xrdp/libxrdpapi.a lib/xrdp/libxrdpapi.so.0 lib/xrdp/libxrdpapi.so.0.0.0 +libexec/xrdp/waitforx +libexec/xrdp/xrdp-sesexec etc/pam.d/xrdp-sesman etc/rc.d/xrdp etc/rc.d/xrdp-sesman %%ETCDIR%%/km-00000406.ini %%ETCDIR%%/km-00000407.ini %%ETCDIR%%/km-00000409.ini %%ETCDIR%%/km-00010409.ini %%ETCDIR%%/km-0000040a.ini %%ETCDIR%%/km-0000040b.ini %%ETCDIR%%/km-0000040c.ini %%ETCDIR%%/km-00000410.ini %%ETCDIR%%/km-00000411.ini %%ETCDIR%%/km-00000412.ini %%ETCDIR%%/km-00000414.ini %%ETCDIR%%/km-00000415.ini %%ETCDIR%%/km-00000416.ini %%ETCDIR%%/km-00000419.ini %%ETCDIR%%/km-0000041d.ini %%ETCDIR%%/km-00000807.ini %%ETCDIR%%/km-00000809.ini %%ETCDIR%%/km-0000080a.ini %%ETCDIR%%/km-0000080c.ini %%ETCDIR%%/km-00000813.ini %%ETCDIR%%/km-00000816.ini %%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%%/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/sesman.ini.5.gz share/man/man8/xrdp.8.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 sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman +%%DATADIR%%/README.logo %%DATADIR%%/ad24b.bmp %%DATADIR%%/ad256.bmp %%DATADIR%%/cursor0.cur %%DATADIR%%/cursor1.cur %%DATADIR%%/sans-10.fv1 +%%DATADIR%%/sans-18.fv1 %%DATADIR%%/xrdp24b.bmp %%DATADIR%%/xrdp256.bmp %%DATADIR%%/xrdp_logo.bmp +%%DATADIR%%/xrdp_logo.png