From nobody Sun Dec 29 16:03:09 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YLkXt1mq5z5jLYc; Sun, 29 Dec 2024 16:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLkXs6vRFz4tr6; Sun, 29 Dec 2024 16:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735488189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WRTTQKYJ1Wrwc88rzbL1HEuwrTx+pSmf4fcbcxM8Qs=; b=pAiR82oCClPQi2RJkiglZIduZCjXxgRoHY8fX1WA3aQqGYZh+RtQgGl0IwLKS80XDeXaLX XLuHmMhruBDkrAqAbIWpKOTlTW0l1CdcykDR2H8nOxly3CzDg1fpT61FmDU1nmUftZwkDW CGpSexiprlVZRRAWG3c3v7gk65I6Fet2+s2e4MALcIGlbSBdlYuihgKa/qxPuXcV56XG/o rOATFGYZzIzmkZb6ehaYc6bWcDsJqtY62YQus6ULlrpsQFBudpMQn3Z8s0MFDX/Zz+i+MV CzpIn+S5fQ+9a1aB7rrq/eUhJtoUBsf836jghdBkkP+WNpauJwjVR0iC2umrpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735488189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WRTTQKYJ1Wrwc88rzbL1HEuwrTx+pSmf4fcbcxM8Qs=; b=OAFb9yl/fhgRURhugU6+eGcSyiO5zd1Ssx+lblxuFdncIUi96b3TzHYDahdd5jf0anXPEk fqr7eNICS1DCHj6DrD3TrQovteQNusQwfDCQI0Zn4Zg3DiRs8pYExEihAk2uV2thv48qZm 5uGE8EZDzuwXH19s3nSwStYCWGz59ivoVMxhCHyzhyW7Xin3B0r+bD+9qnlkaOQOoHHq/0 QFhzIczpqpDZw7xCMKHO3VZvr28tSOKEh7/qR0f7doj5sJRjVMermcS5wNo7X53tnWjtz/ 8iCidGoCmZ0gMjz/vzlmd2B4Yh76lVZNyhMJ4lKq1RZoAXOZVmZFwbxhGlbzaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735488189; a=rsa-sha256; cv=none; b=ySXnyEyhcaxzJAfVsnbmZo7nXuFf3DeEuoMWRD3lu0j0AooBA1lbX/cOefx6L4KR1qvmsf C7hnWI7pbKRNBMMrSjlBLc7PNQtpW1Ebck4EeWPXkEvBD1xwtzzpwOKFiHaVAzuld+uPjy cglK+e4FJBNzwqaTNk38b4vgssNb4v+khVf7rS3SFTK8MG1yGLoiOw6ag4gBXf5rn92Rbe 7YTA3L97NS3o4sYsMEHuLocT6nyIRCsaXXtpqc1rOiIf45aflCSA2Dot8kJUmRdxsw2LEF j+bQTX5wcdY4wOgcdfAzg03SSlSwX27uC+Zq8lIUu1jvOeEpr9iuT08Pw5XVmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YLkXs6VYqzGcC; Sun, 29 Dec 2024 16:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BTG39iT011114; Sun, 29 Dec 2024 16:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTG39d7011111; Sun, 29 Dec 2024 16:03:09 GMT (envelope-from git) Date: Sun, 29 Dec 2024 16:03:09 GMT Message-Id: <202412291603.4BTG39d7011111@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: df5ed26f9502 - main - net/xrdp-devel: Update to 0.10.80.b20241229 4c8c773 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df5ed26f95022735403258335aa6bf8ce2d6c44c Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=df5ed26f95022735403258335aa6bf8ce2d6c44c commit df5ed26f95022735403258335aa6bf8ce2d6c44c Author: Koichiro Iwao AuthorDate: 2024-12-29 15:52:48 +0000 Commit: Koichiro Iwao CommitDate: 2024-12-29 16:02:15 +0000 net/xrdp-devel: Update to 0.10.80.b20241229 4c8c773 While here, - Change config file directory to PREFIX/etc/xrdp to PREFIX/etc/xrdp-devel - Pet portclippy - Sort pkg-plist --- UPDATING | 13 ++++ net/xrdp-devel/Makefile | 64 ++++++++++++------- net/xrdp-devel/distinfo | 6 +- net/xrdp-devel/files/pkg-deinstall.in | 6 +- net/xrdp-devel/files/pkg-install.in | 6 +- net/xrdp-devel/files/pkg-message.in | 6 +- net/xrdp-devel/pkg-plist | 115 +++++++++++++++++----------------- 7 files changed, 127 insertions(+), 89 deletions(-) diff --git a/UPDATING b/UPDATING index 95bdb512fc00..3e1d0850ddea 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,19 @@ 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. +20241230: + AFFECTS: users of net/xrdp-devel + AUTHOR: meta@FreeBSD.org + + The port has been updated to the latest development snapshot. + + The directory for the config files has also changed from + PREFIX/etc/xrdp to PREFIX/etc/xrdp-devel to prevent incompatible config + files for net/xrdp and net/xrdp-devel from getting mixed up. + + When updating net/xrdp-devel from old verisons, move the config files to + the new directory. + 20241224: AFFECTS: users of net/xrdp AUTHOR: meta@FreeBSD.org diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile index 21e9b79bb077..344f19343357 100644 --- a/net/xrdp-devel/Makefile +++ b/net/xrdp-devel/Makefile @@ -1,7 +1,6 @@ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.10.0 -PORTREVISION= 1 +DISTVERSION= 0.10.80.b20241229 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel @@ -17,24 +16,24 @@ 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 -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_TAGNAME= 4e378c9 GH_TUPLE= neutrinolabs:librfxcodec:e8208bf:librfxcodec/librfxcodec \ neutrinolabs:libpainter:2255b38: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 \ @@ -44,32 +43,46 @@ CONFIGURE_ARGS= --enable-imlib2 \ --enable-strict-locations \ --enable-vsock \ --localstatedir=/var \ + --with-sysconfsubdir=${PORTNAME}${PKGNAMESUFFIX} \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig + +INSTALL_TARGET= install-strip LDFLAGS+= -lssl CONFLICTS= xrdp -INSTALL_TARGET= install-strip +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 OPUS -OPTIONS_GROUP= AUDIO_CODEC +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_CONFIGURE_ENABLE= fdkaac FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac -FUSE_CONFIGURE_ENABLE= fuse +FDKAAC_CONFIGURE_ENABLE= fdkaac FUSE_USES= fuse +FUSE_CONFIGURE_ENABLE= fuse IPV6_CONFIGURE_ENABLE= ipv6 -MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -OPUS_CONFIGURE_ENABLE= opus +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 @@ -83,18 +96,27 @@ CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ pre-configure: # This version doesn't require GH_TAGNAME override now - #@${REINPLACE_CMD} -e "s|0.9.90|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac + @${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}${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 + @${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 \ + 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 29ad67d3937f..feb888b68588 100644 --- a/net/xrdp-devel/distinfo +++ b/net/xrdp-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1715519167 -SHA256 (xrdp/neutrinolabs-xrdp-v0.10.0_GH0.tar.gz) = d3c8fb7d4af9131199a98fb4403179a7707da79fc205d62def8efd84fe67eacc -SIZE (xrdp/neutrinolabs-xrdp-v0.10.0_GH0.tar.gz) = 1040405 +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 diff --git a/net/xrdp-devel/files/pkg-deinstall.in b/net/xrdp-devel/files/pkg-deinstall.in index 370aa90a5e7d..3ebbe5952d43 100644 --- a/net/xrdp-devel/files/pkg-deinstall.in +++ b/net/xrdp-devel/files/pkg-deinstall.in @@ -11,9 +11,9 @@ case $2 in : nothing to do here ;; POST-DEINSTALL) - RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini - PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem - CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem + RSAKEYS=%%ETCDIR%%/rsakeys.ini + PRIVATEKEY=%%ETCDIR%%/key.pem + CERTIFICATE=%%ETCDIR%%/cert.pem # if keys are generated during post-install script, remove it # but do not remove user's keys diff --git a/net/xrdp-devel/files/pkg-install.in b/net/xrdp-devel/files/pkg-install.in index d59b15822207..728714ad985e 100644 --- a/net/xrdp-devel/files/pkg-install.in +++ b/net/xrdp-devel/files/pkg-install.in @@ -11,9 +11,9 @@ case $2 in : nothing to do here ;; POST-INSTALL) - RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini - PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem - CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem + RSAKEYS=%%ETCDIR%%/rsakeys.ini + PRIVATEKEY=%%ETCDIR%%/key.pem + CERTIFICATE=%%ETCDIR%%/cert.pem # make sure rsakeys and certificates are private umask 077 # generate rsakeys.ini diff --git a/net/xrdp-devel/files/pkg-message.in b/net/xrdp-devel/files/pkg-message.in index 3037b2edebd4..d2ca0fe7f3b0 100644 --- a/net/xrdp-devel/files/pkg-message.in +++ b/net/xrdp-devel/files/pkg-message.in @@ -7,10 +7,10 @@ There is an rc.d script, so the service can be enabled by adding this line in /etc/rc.conf: xrdp_enable="YES" -xrdp_sesman_enable="YES" # if you want to run xrdp-sesman on the same machine +xrdp_sesman_enable="YES" -Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp" -and the "%%PREFIX%%/etc/xrdp/startwm.sh" script. +Do not forget to edit the configuration files in "%%ETCDIR%%" +and the "%%ETCDIR%%/startwm.sh" script. To enable audio redirection, install the following ports/packages to meet your environment. diff --git a/net/xrdp-devel/pkg-plist b/net/xrdp-devel/pkg-plist index d2cc775f0cf2..0e8046571ab2 100644 --- a/net/xrdp-devel/pkg-plist +++ b/net/xrdp-devel/pkg-plist @@ -1,16 +1,49 @@ bin/xrdp-dis +bin/xrdp-dumpfv1 bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun -bin/xrdp-dumpfv1 -lib/libpainter.a -lib/librfxencode.a +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-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-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.ini.sample include/ms-erref.h include/ms-fscc.h include/ms-rdpbcgr.h -include/ms-rdpedisp.h include/ms-rdpeclip.h +include/ms-rdpedisp.h include/ms-rdpefs.h include/ms-rdpegdi.h include/ms-rdpele.h @@ -23,20 +56,20 @@ 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 -libdata/pkgconfig/libpainter.pc -libdata/pkgconfig/rfxcodec.pc -libdata/pkgconfig/xrdp.pc +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/libmc.a -lib/xrdp/libmc.so 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 @@ -51,54 +84,25 @@ 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 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 -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 +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/man8/xrdp.8.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 @@ -107,17 +111,16 @@ 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 +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%%/xrdp24b.bmp -%%DATADIR%%/xrdp256.bmp %%DATADIR%%/xrdp_logo.bmp %%DATADIR%%/xrdp_logo.png +%%DATADIR%%/xrdp-chkpriv +%%DATADIR%%/xrdp24b.bmp +%%DATADIR%%/xrdp256.bmp