From nobody Sun Dec 29 16:03:10 2024 X-Original-To: dev-commits-ports-main@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 4YLkXv2bZ3z5jLQN; Sun, 29 Dec 2024 16:03:11 +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 4YLkXv0b3Bz4tvJ; Sun, 29 Dec 2024 16:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735488191; 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=wVFop5ard/8M6k3rio8SeER+QcsrMRmIfuLxxKThj+U=; b=D8nfVFOoMhcxYeoiV17suosaxvXZv2ke1M9+8K2jE/KTz312YvzTlmRKaDG3KqrnV9Gp+b oqxsFOvSEQPhX37wHz0fTVXJBslyGvINklqNBIvsrlYY9xdf3mCsj+7Px7PDxDuh0AdMzj 0RnxV2mKHvizgnCuCSjBsFF51NQiW7LftwBgQiHhbu9P2Rmp/J4zjQSn+ie9FPIXn/lEEn tIsby7uf9w0JL5z8Ddvj5TD8pwIKrnV6mLfc2qX2GJNRAFfbEtt5QdA2UvskHAzXN3oDk9 KZN5VE3I4+R1i8JED2ojdErGsmMhDh5SazF58ZFJkSyx6i43nBa3LBuhaI6byg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735488191; 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=wVFop5ard/8M6k3rio8SeER+QcsrMRmIfuLxxKThj+U=; b=rgZChWC1MM324eQDzv6rJcxeFzVksKfWFB5zG6QJQ3RS0JU+ilEDs4b2agOHu/ecVN5atV rY0Y3StXQoXHwJOrm+qA1bDFW3ZgXZjww/Jb/P7fDINi1eP6FzayPAgj1Bt5MpxM/rJNu9 EnuGKld8wDDxMI0jy2hwmZ9iDnbCCKHlH9P4ta5mB/dt3G4Mdf52nvsPh9DcBu+Pe0D2WK Z53/O8EaGmy40y/HGNmz7vrwitinL8uEfETzwQKvlwwBQpejeHyqr7R970eg03x+ZVfO+y JN1AtJPQEd4J5IsRYfECbOaMxHXg/RKNFallLQZlNU/03cJ+CLbK9Z6yxAnYRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735488191; a=rsa-sha256; cv=none; b=QnwzKGONHiNsd2O0+BpIcVYK5PToZtc3xo6R0TO5XW3Oio0qYrAMxEsJfZG1MzOxXM6kgK g8IYd4kX4R6xGSzSqrnugbw6fP6q+B5YI8NohcW3tWk5r1U2qxBbm9K2SnCDpGkPHspnaa qDf1O8gpNSKSi3aYdRr/9ZxRxZ+Sdgj0WIRcaS4PsRamGIA45bgXJ64mMMMFLGdcM6NipJ 3Ls6UgHXLjE2wLSnys+LvDd65InAeVUgydkJfdvr+QBH92r+ys1JDYZOyyuZ4ml4ffN4mI ZKQi01fbBHlpsc4h2uVzsfzl9y+qeU2c6hZ1FhxQhnubFO7DpURH6EwcKj5tVg== 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 4YLkXv095zzG6B; Sun, 29 Dec 2024 16:03:11 +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 4BTG3ADs011156; Sun, 29 Dec 2024 16:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTG3ANN011153; Sun, 29 Dec 2024 16:03:10 GMT (envelope-from git) Date: Sun, 29 Dec 2024 16:03:10 GMT Message-Id: <202412291603.4BTG3ANN011153@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: 4ec35bd8e32c - main - net/xrdp: sort pkg-plist, update files/pkg-*.in List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 4ec35bd8e32c306eeae1ceaf92a4468b7a1c0bd4 Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ec35bd8e32c306eeae1ceaf92a4468b7a1c0bd4 commit 4ec35bd8e32c306eeae1ceaf92a4468b7a1c0bd4 Author: Koichiro Iwao AuthorDate: 2024-12-27 02:49:26 +0000 Commit: Koichiro Iwao CommitDate: 2024-12-29 16:02:24 +0000 net/xrdp: sort pkg-plist, update files/pkg-*.in to sync them with net/xrdp-devel. And finally bump PORTREVISION which wasn't actually bumped despite the previous commit message. --- net/xrdp/Makefile | 10 ++-- net/xrdp/files/pkg-deinstall.in | 6 +-- net/xrdp/files/pkg-install.in | 6 +-- net/xrdp/files/pkg-message.in | 6 +-- net/xrdp/pkg-plist | 108 ++++++++++++++++++++-------------------- 5 files changed, 69 insertions(+), 67 deletions(-) diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 3fdb08df40c3..07a26565e086 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -1,5 +1,6 @@ PORTNAME= xrdp DISTVERSION= 0.10.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= https://github.com/neutribolabs/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -96,12 +97,13 @@ 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 + @${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}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample + @${MV} ${STAGEDIR}${ETCDIR}/$f \ + ${STAGEDIR}${ETCDIR}/$f.sample .endfor .include diff --git a/net/xrdp/files/pkg-deinstall.in b/net/xrdp/files/pkg-deinstall.in index 370aa90a5e7d..f9dd3bd74f1f 100644 --- a/net/xrdp/files/pkg-deinstall.in +++ b/net/xrdp/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%%/xrdp/key.pem + CERTIFICATE=%%ETCDIR%%/xrdp/cert.pem # if keys are generated during post-install script, remove it # but do not remove user's keys diff --git a/net/xrdp/files/pkg-install.in b/net/xrdp/files/pkg-install.in index d59b15822207..728714ad985e 100644 --- a/net/xrdp/files/pkg-install.in +++ b/net/xrdp/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/files/pkg-message.in b/net/xrdp/files/pkg-message.in index 3037b2edebd4..d2ca0fe7f3b0 100644 --- a/net/xrdp/files/pkg-message.in +++ b/net/xrdp/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/pkg-plist b/net/xrdp/pkg-plist index fa2fffc9631d..553a5180939a 100644 --- a/net/xrdp/pkg-plist +++ b/net/xrdp/pkg-plist @@ -1,16 +1,48 @@ 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.ini +%%ETCDIR%%/km-00000406.ini +%%ETCDIR%%/km-00000407.ini +%%ETCDIR%%/km-00000409.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-00010409.ini +%%ETCDIR%%/km-19360409.ini +%%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 @@ -24,20 +56,18 @@ 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 -libexec/xrdp/xrdp-droppriv +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 @@ -52,52 +82,24 @@ 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-00000405.ini -%%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 -@sample %%ETCDIR%%/gfx.toml.sample -@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.ini.5.gz share/man/man8/xrdp-chansrv.8.gz share/man/man8/xrdp-dumpfv1.8.gz @@ -106,18 +108,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