Date: Sun, 13 May 2018 07:25:24 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469777 - in head: . net/xrdp net/xrdp-devel net/xrdp-devel/files net/xrdp/files x11-servers x11-servers/x11rdp Message-ID: <201805130725.w4D7POl3009864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Sun May 13 07:25:24 2018 New Revision: 469777 URL: https://svnweb.freebsd.org/changeset/ports/469777 Log: net/xrdp{,-devel}: Update to 0.9.6 * mark -devel port as IGNORE since net/xrdp has been updated * s/XRDP/xrdp/ in pkg-message, upstream usually spell it lowercase x11-servers/x11rdp: remove port This port is only required by net/xrdp 0.6.2. Since net/xrdp has been updated to 0.9.6, it is no longer required any other port and not useful with standalone at all. 0.9.1 or later uses x11-drivers/xorgxrdp instead. Approved by: hrs (mentor, via email) Relnotes: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.1 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.2 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.3 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.4 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.5 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.6 Differential Revision: https://reviews.freebsd.org/D15375 Added: head/net/xrdp-devel/files/patch-sesman_sesman.ini.in - copied, changed from r469776, head/net/xrdp-devel/files/patch-sesman_sesman.ini head/net/xrdp/files/patch-configure.ac (contents, props changed) head/net/xrdp/files/patch-sesman_sesman.ini.in (contents, props changed) head/net/xrdp/files/pkg-install.in (contents, props changed) Deleted: head/net/xrdp-devel/files/patch-sesman_sesman.ini head/net/xrdp-devel/files/patch-upstream-issue-1030 head/net/xrdp/files/extra-patch-x11rdp_xrdp.ini head/net/xrdp/files/km-0411.ini head/net/xrdp/files/km-e0010411.ini head/net/xrdp/files/km-e0200411.ini head/net/xrdp/files/km-e0210411.ini head/net/xrdp/files/patch-instfiles__Makefile.am head/net/xrdp/files/patch-sesman__Makefile.am head/net/xrdp/files/patch-sesman__session.c head/net/xrdp/files/patch-xrdp__Makefile.am head/net/xrdp/files/patch-xrdp_xrdp.ini head/net/xrdp/files/xrdp.in head/x11-servers/x11rdp/ Modified: head/MOVED head/UPDATING head/net/xrdp-devel/Makefile head/net/xrdp-devel/distinfo head/net/xrdp-devel/files/pkg-message.in head/net/xrdp-devel/pkg-plist head/net/xrdp/Makefile head/net/xrdp/distinfo head/net/xrdp/files/pkg-message.in head/net/xrdp/pkg-plist head/x11-servers/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sun May 13 07:21:26 2018 (r469776) +++ head/MOVED Sun May 13 07:25:24 2018 (r469777) @@ -10182,3 +10182,4 @@ devel/tesla||2018-05-06|Outdated and almost certainly devel/llvm39||2018-05-08|Obsolete, no remaining dependencies textproc/p5-Spork||2018-05-09|Removed, depends on expired www/p5-Kwiki www/p5-Kwiki||2018-05-09|Has expired: All www files wrongly belongs to www user +x11-servers/x11rdp|x11-drivers/xorgxrdp|2018-05-13|Obsoleted by update of net/xrdp Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun May 13 07:21:26 2018 (r469776) +++ head/UPDATING Sun May 13 07:25:24 2018 (r469777) @@ -5,6 +5,18 @@ 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. +20180513: + AFFECTS: users of net/xrdp + AUTHOR: meta@FreeBSD.org + + net/xrdp has been updated from 0.6.2 to 0.9.6. There are significant + changes between these versions. You should consider backing up your + configuration files such as xrdp.ini and sesman.ini, and then migrate + configuration files by hand. + + Regarding km-*.ini, don't use the old files. They can be safely replaced + with new ones. + 20180507: AFFECTS: users of math/suitesparse who build it locally AUTHOR: yuri@FreeBSD.org Modified: head/net/xrdp-devel/Makefile ============================================================================== --- head/net/xrdp-devel/Makefile Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp-devel/Makefile Sun May 13 07:25:24 2018 (r469777) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.9.5 +PORTVERSION= 0.9.6 DISTVERSIONPREFIX= v -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel @@ -16,7 +15,9 @@ COMMENT= Open source Remote Desktop Protocol (RDP) ser LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -# pulseaudio's built source is required for audio redirection +IGNORE= no development version available right now, use net/xrdp instead + +# pulseaudio's configured source is required for audio redirection BUILD_DEPENDS= ${NONEXISTENT}:audio/pulseaudio:configure \ ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp @@ -69,9 +70,6 @@ post-extract: @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ post-patch: - @${REINPLACE_CMD} \ - -e "s|^PULSE_SCRIPT=/etc/xrdp/pulse/default.pa|PULSE_SCRIPT=${PREFIX}/etc/xrdp/pulse/default.pa|" \ - ${WRKSRC}/sesman/sesman.ini @${REINPLACE_CMD} \ -e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \ -e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \ Modified: head/net/xrdp-devel/distinfo ============================================================================== --- head/net/xrdp-devel/distinfo Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp-devel/distinfo Sun May 13 07:25:24 2018 (r469777) @@ -1,6 +1,6 @@ -TIMESTAMP = 1514517059 -SHA256 (xrdp/neutrinolabs-xrdp-v0.9.5_GH0.tar.gz) = a932fc6a56d570207a58df9238cdf44f717071fd8061ac4445b5193fc3c73392 -SIZE (xrdp/neutrinolabs-xrdp-v0.9.5_GH0.tar.gz) = 1877715 +TIMESTAMP = 1522053694 +SHA256 (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 68361f4e75fd70a85e258af78af244754dc7190092abfdb9c709e20905de260d +SIZE (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 1878049 SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3 SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 Copied and modified: head/net/xrdp-devel/files/patch-sesman_sesman.ini.in (from r469776, head/net/xrdp-devel/files/patch-sesman_sesman.ini) ============================================================================== --- head/net/xrdp-devel/files/patch-sesman_sesman.ini Sun May 13 07:21:26 2018 (r469776, copy source) +++ head/net/xrdp-devel/files/patch-sesman_sesman.ini.in Sun May 13 07:25:24 2018 (r469777) @@ -1,5 +1,5 @@ ---- sesman/sesman.ini.orig 2017-12-27 14:40:24 UTC -+++ sesman/sesman.ini +--- sesman/sesman.ini.in.orig 2017-12-27 14:40:24 UTC ++++ sesman/sesman.ini.in @@ -75,8 +75,8 @@ param=xrdp/xorg.conf param=-noreset param=-nolisten Modified: head/net/xrdp-devel/files/pkg-message.in ============================================================================== --- head/net/xrdp-devel/files/pkg-message.in Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp-devel/files/pkg-message.in Sun May 13 07:25:24 2018 (r469777) @@ -1,6 +1,6 @@ ============================================================================== -XRDP has been installed. +xrdp has been installed. There is an rc.d script, so the service can be enabled by adding this line in /etc/rc.conf: Modified: head/net/xrdp-devel/pkg-plist ============================================================================== --- head/net/xrdp-devel/pkg-plist Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp-devel/pkg-plist Sun May 13 07:25:24 2018 (r469777) @@ -50,6 +50,7 @@ etc/pam.d/xrdp-sesman etc/rc.d/xrdp %%ETCDIR%%/km-00000407.ini %%ETCDIR%%/km-00000409.ini +%%ETCDIR%%/km-00010409.ini %%ETCDIR%%/km-0000040a.ini %%ETCDIR%%/km-0000040b.ini %%ETCDIR%%/km-0000040c.ini Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp/Makefile Sun May 13 07:25:24 2018 (r469777) @@ -2,76 +2,100 @@ # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.6.2 +PORTVERSION= 0.9.6 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= net -DIST_SUBDIR= ${PORTNAME} +DIST_SUBDIR?= ${PORTNAME} MAINTAINER= meta@FreeBSD.org COMMENT= Open source Remote Desktop Protocol (RDP) server -LICENSE= GPLv2 +LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING +# pulseaudio's configured source is required for audio redirection +BUILD_DEPENDS= ${NONEXISTENT}:audio/pulseaudio:configure \ + ${LOCALBASE}/bin/nasm:devel/nasm +RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp + +USES= autoreconf:build jpeg localbase libtool pkgconfig ssl +USE_XORG= ice pixman sm x11 xfixes xrandr GNU_CONFIGURE= yes -USES= autoreconf:build libtool pkgconfig ssl USE_LDCONFIG= ${PREFIX}/lib/xrdp -USE_RC_SUBR= xrdp -USE_XORG= x11 xfixes - USE_GITHUB= yes GH_ACCOUNT= neutrinolabs +GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter +GH_TAGNAME= v0.1.4:librfxcodec v0.1.1:libpainter -CONFIGURE_ARGS= --localstatedir=/var -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -SUB_FILES= pkg-message +CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ + --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ + --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter +LDFLAGS+= -lssl +CONFLICTS= xrdp-devel[0-9]* +INSTALL_TARGET= install-strip +SUB_FILES= pkg-install pkg-message +SUB_LIST= OPENSSLBASE=${OPENSSLBASE} -OPTIONS_DEFINE= DEBUG -OPTIONS_DEFAULT= JP106 X11RDP -OPTIONS_GROUP= KEYMAP XSERVER -OPTIONS_GROUP_KEYMAP= JP106 -OPTIONS_GROUP_XSERVER= X11RDP -OPTIONS_RADIO= XVNC -OPTIONS_RADIO_XVNC= TIGERVNC TIGHTVNC TRIDIAVNC -TIGERVNC_DESC= Use TigerVNC (recommended) -TIGHTVNC_DESC= Use TightVNC -TRIDIAVNC_DESC= Use TridiaVNC -X11RDP_DESC= Use X11rdp (most recommended) -JP106_DESC= Install Japanese JP106 keymap +OPTIONS_DEFINE= DEBUG FUSE IPV6 +OPTIONS_DEFAULT= FDKAAC MP3LAME 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 DEBUG_CONFIGURE_ENABLE= xrdpdebug -# Xvnc -TIGERVNC_RUN_DEPENDS= Xvnc:net/tigervnc -TIGHTVNC_RUN_DEPENDS= Xvnc:net/tightvnc -TRIDIAVNC_RUN_DEPENDS= Xvnc:net/tridiavnc -# X11rdp -X11RDP_RUN_DEPENDS= X11rdp:x11-servers/x11rdp -X11RDP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini -# JP106 keymap -JP106_PLIST_SUB= JP106="" -JP106_PLIST_SUB_OFF= JP106="@comment " +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 <bsd.port.options.mk> +# don't forget to increase PORTREVISION after pulseaudio update +PULSE_VERSION= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VPORTVERSION +PULSE_WRKSRC= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC -.if ${PORT_OPTIONS:MJP106} -KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ - km-e0200411.ini km-e0210411.ini -.endif +post-extract: + # librfxcodec is provided as git submodule + @${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/ + @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ post-patch: -.for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini - @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample -.endfor + @${REINPLACE_CMD} \ + -e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \ + -e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \ + ${WRKSRC}/sesman/chansrv/pulse/Makefile pre-configure: - @cd ${WRKSRC} && ./bootstrap + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap +post-build: + # build pulseaudio module + @${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR} + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C sesman/chansrv/pulse + post-install: -.for f in ${KEYMAP_FILES} - ${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp + # install pulseaudio module + ${MKDIR} "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/" +.for f in module-xrdp-sink.so module-xrdp-source.so + ${INSTALL_LIB} -m 0755 ${WRKSRC}/sesman/chansrv/pulse/$f \ + "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/" +.endfor + # substitute pkg-plist not using PLIST_SUB + ${REINPLACE_CMD} -e "s|%%PULSE_VERSION%%|`${PULSE_VERSION}`|g" ${TMPPLIST} + +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 <bsd.port.mk> Modified: head/net/xrdp/distinfo ============================================================================== --- head/net/xrdp/distinfo Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp/distinfo Sun May 13 07:25:24 2018 (r469777) @@ -1,3 +1,7 @@ -TIMESTAMP = 1475561595 -SHA256 (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1e12e41537b3cac15f5c216663fc18a15df5a16e9eb2bc1768bea16190815438 -SIZE (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1559505 +TIMESTAMP = 1522053694 +SHA256 (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 68361f4e75fd70a85e258af78af244754dc7190092abfdb9c709e20905de260d +SIZE (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 1878049 +SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3 +SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379 +SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 +SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929 Added: head/net/xrdp/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp/files/patch-configure.ac Sun May 13 07:25:24 2018 (r469777) @@ -0,0 +1,40 @@ +--- configure.ac.orig 2017-12-27 14:40:24 UTC ++++ configure.ac +@@ -159,11 +159,35 @@ AC_CHECK_FUNC(dlopen, [], + 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 <stdlib.h>]) ++ ] ++ ) ++ ++ 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 Added: head/net/xrdp/files/patch-sesman_sesman.ini.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp/files/patch-sesman_sesman.ini.in Sun May 13 07:25:24 2018 (r469777) @@ -0,0 +1,13 @@ +--- sesman/sesman.ini.in.orig 2017-12-27 14:40:24 UTC ++++ sesman/sesman.ini.in +@@ -75,8 +75,8 @@ param=xrdp/xorg.conf + param=-noreset + param=-nolisten + param=tcp +-param=-logfile +-param=.xorgxrdp.%s.log ++#param=-logfile ++#param=.xorgxrdp.%s.log + + [X11rdp] + param=X11rdp Added: head/net/xrdp/files/pkg-install.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/xrdp/files/pkg-install.in Sun May 13 07:25:24 2018 (r469777) @@ -0,0 +1,39 @@ +#!/bin/sh +# vim:ts=4:sw=4:et + +if [ $# -ne 2 ]; then + echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 + exit 1 +fi + +case $2 in + PRE-INSTALL) + : nothing to do here + ;; + POST-INSTALL) + RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini + PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem + CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem + # make sure rsakeys and certificates are private + umask 077 + # generate rsakeys.ini + [ -e "$RSAKEYS" ] || %%PREFIX%%/bin/xrdp-keygen xrdp "$RSAKEYS" + # generate self-signed certificate + [ -e "$PRIVATEKEY" -a -e "$CERTIFICATE" ] || \ + %%OPENSSLBASE%%/bin/openssl req \ + -x509 \ + -newkey rsa:4096 \ + -keyout "$PRIVATEKEY" \ + -sha256 \ + -nodes \ + -out "$CERTIFICATE" \ + -days 365 \ + -subj "/CN=$(hostname)" + ;; + *) + echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 + exit 1 + ;; +esac + +exit 0 Modified: head/net/xrdp/files/pkg-message.in ============================================================================== --- head/net/xrdp/files/pkg-message.in Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp/files/pkg-message.in Sun May 13 07:25:24 2018 (r469777) @@ -1,6 +1,6 @@ ============================================================================== -XRDP has been installed. +xrdp has been installed. There is an rc.d script, so the service can be enabled by adding this line in /etc/rc.conf: Modified: head/net/xrdp/pkg-plist ============================================================================== --- head/net/xrdp/pkg-plist Sun May 13 07:21:26 2018 (r469776) +++ head/net/xrdp/pkg-plist Sun May 13 07:25:24 2018 (r469777) @@ -3,59 +3,95 @@ bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun -bin/xrdp-sestest +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/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 +lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so +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/libmc.so.0 -lib/xrdp/libmc.so.0.0.0 -lib/xrdp/librdp.a -lib/xrdp/librdp.so -lib/xrdp/librdp.so.0 -lib/xrdp/librdp.so.0.0.0 lib/xrdp/libscp.a lib/xrdp/libscp.so lib/xrdp/libscp.so.0 lib/xrdp/libscp.so.0.0.0 lib/xrdp/libvnc.a lib/xrdp/libvnc.so -lib/xrdp/libvnc.so.0 -lib/xrdp/libvnc.so.0.0.0 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/libxup.so.0 -lib/xrdp/libxup.so.0.0.0 -man/man5/sesman.ini.5.gz -man/man5/xrdp.ini.5.gz -man/man8/xrdp-sesman.8.gz -man/man8/xrdp-sesrun.8.gz -man/man8/xrdp.8.gz +lib/xrdp/libxrdpapi.so +lib/xrdp/libxrdpapi.a +lib/xrdp/libxrdpapi.so.0 +lib/xrdp/libxrdpapi.so.0.0.0 etc/pam.d/xrdp-sesman -%%ETCDIR%%/km-0407.ini -%%ETCDIR%%/km-0409.ini -%%ETCDIR%%/km-040c.ini -%%ETCDIR%%/km-0410.ini -%%ETCDIR%%/km-0419.ini -%%ETCDIR%%/km-041d.ini -%%JP106%%%%ETCDIR%%/km-0411.ini -%%JP106%%%%ETCDIR%%/km-e0010411.ini -%%JP106%%%%ETCDIR%%/km-e0200411.ini -%%JP106%%%%ETCDIR%%/km-e0210411.ini -@sample %%ETCDIR%%/rsakeys.ini.sample +etc/rc.d/xrdp +%%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-0000080c.ini +%%ETCDIR%%/km-00000813.ini +%%ETCDIR%%/km-00000816.ini +%%ETCDIR%%/km-0000100c.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 +man/man1/xrdp-dis.1.gz +man/man5/sesman.ini.5.gz +man/man8/xrdp.8.gz +man/man5/xrdp.ini.5.gz +man/man8/xrdp-chansrv.8.gz +man/man8/xrdp-genkeymap.8.gz +man/man8/xrdp-keygen.8.gz +man/man8/xrdp-sesadmin.8.gz +man/man8/xrdp-sesman.8.gz +man/man8/xrdp-sesrun.8.gz sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman -sbin/xrdp-sessvc %%DATADIR%%/ad24b.bmp %%DATADIR%%/ad256.bmp %%DATADIR%%/cursor0.cur @@ -63,3 +99,4 @@ sbin/xrdp-sessvc %%DATADIR%%/sans-10.fv1 %%DATADIR%%/xrdp24b.bmp %%DATADIR%%/xrdp256.bmp +%%DATADIR%%/xrdp_logo.bmp Modified: head/x11-servers/Makefile ============================================================================== --- head/x11-servers/Makefile Sun May 13 07:21:26 2018 (r469776) +++ head/x11-servers/Makefile Sun May 13 07:25:24 2018 (r469777) @@ -4,7 +4,6 @@ COMMENT = X11 servers SUBDIR += Xfstt - SUBDIR += x11rdp SUBDIR += x2vnc SUBDIR += x2x SUBDIR += xephyr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805130725.w4D7POl3009864>