From nobody Mon Dec 23 15:10:35 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 4YH1fz3rJlz5hC16; Mon, 23 Dec 2024 15:10:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH1fz2wv3z4gQD; Mon, 23 Dec 2024 15:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734966635; 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=kByYjlG7EyKBtekdJ960KXYiXRGayPE1WEX/c2izkQE=; b=AQbAmaOLQwVaB4KpQ85InEum0U/C356C71er5DmtFj/FjKK66Y2l+J6yf0rgrbxk0McxHx WbHSl5H0uRn3B9ZrrU8gSXkEGsOpAJh8ld5Sp1PrFHPeywpFhTjkrS+iVsResQLuREfpY1 5IJkcKsLWpjXuwGT1jUnCWqRNk3mM687x75URK79cPQUK2amdaVsNA1cKPI1U+jFhgjxVG KEje87ULrVtbKfjninerElYlTI7/qP92xWhdd5yEQbVhlOlJ+kZlE5fg9gHhyj7G/soLV/ oxmawjsnaqPWZW0yp3eyO51uFlegPC5rXkfF8WM8xLN8nlndQ0HrqY6wN/QRFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734966635; 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=kByYjlG7EyKBtekdJ960KXYiXRGayPE1WEX/c2izkQE=; b=T8GhswN+ui5qaO+xFEIfLZaBrIxuqr4W7Pa4RsD4buaIHU9f16SxvpdcEIq+xozywazkQ5 VwBT+i3lLtRmzXdQnja0kIdu9cBwIhIA1cKYw/kyIE1zkp1E8lMvASfwcOMReAOhxpbJbE LgM5CU7eUAjbicY9A4LSXmih53RzQmsVg/wZ+X7ABzH0TZ6wnXM3TmtJ4bDmHgUsnOG702 p24Y7uj4MYmEUtJAcUG+2XubwUACEIDYfdztlIZDzz7D1+Bo8zwe0wI8fwNYKYjaYqpHVx W2r6Ae8HnWOJypEoY9rBQZ6133Y7Vhh8ilju/HvDl3mEo+UgJyLWmfEsW+4xRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734966635; a=rsa-sha256; cv=none; b=pny8bQAoSSp3UDy+uPKRYqifE8BHzXXcw1n3dFOAPXxHL4h0HfVmLul44IraHe1n/BfWh5 cj06YjyCJ0V4JE7dUl71/d1xUQ/VGa8nUWMHvcehlfjuytR6tbzXqHyEj4sRbEsvYRF5J+ CNRGUW3mZOSzaZjq6vJ85wtsrlqQALDv+rEFZFBbaZXtB9DYazNlSquO6aX7U6o1mP4CcI pZmFgHj2D6BvNodiFkHb5F26ftF1dYxMDuw68a5Tnwi5/Uc4vJC6Ly2Bf/GhbNf5NKtrIb fzjCy114oHh7QMV1CBZO1VmMu0ObDVBtz16xxACrT9qkSYZlGuyRjDlAjJMh5A== 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 4YH1fz2Xmzzxxv; Mon, 23 Dec 2024 15:10:35 +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 4BNFAZBm046715; Mon, 23 Dec 2024 15:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNFAZO7046712; Mon, 23 Dec 2024 15:10:35 GMT (envelope-from git) Date: Mon, 23 Dec 2024 15:10:35 GMT Message-Id: <202412231510.4BNFAZO7046712@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: ee46045d223a - main - net/xrdp: Update to 0.10.2-rc.1 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: ee46045d223a59b08fe7c74aa676397439e9b81d Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee46045d223a59b08fe7c74aa676397439e9b81d commit ee46045d223a59b08fe7c74aa676397439e9b81d Author: Koichiro Iwao AuthorDate: 2024-12-23 14:52:21 +0000 Commit: Koichiro Iwao CommitDate: 2024-12-23 15:09:59 +0000 net/xrdp: Update to 0.10.2-rc.1 --- net/xrdp/Makefile | 15 +++++++++++---- net/xrdp/distinfo | 6 +++--- net/xrdp/pkg-plist | 9 ++++----- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 232400baf171..ada151995b15 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -1,6 +1,6 @@ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.10.1 +DISTVERSION= 0.10.2-rc.1 PORTEPOCH= 1 CATEGORIES= net DIST_SUBDIR?= ${PORTNAME} @@ -17,7 +17,9 @@ 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 +LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ + libopenh264.so:multimedia/openh264 \ + libx264.so:multimedia/x264 USES= autoreconf:build compiler:c11 cpe jpeg libtool localbase \ pkgconfig ssl xorg @@ -33,7 +35,9 @@ GH_TUPLE= neutrinolabs:librfxcodec:c6b41af:librfxcodec/librfxcodec \ neutrinolabs:libpainter:2255b38:libpainter/libpainter \ neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca -CONFIGURE_ARGS= --enable-imlib2 \ +CONFIGURE_ARGS= --enable-openh264 \ + --enable-x264 \ + --enable-imlib2 \ --enable-jpeg \ --enable-painter \ --enable-pam-config=freebsd \ @@ -49,6 +53,9 @@ INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} +USER= _xrdp +GROUP= _xrdp + OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC OPUS OPTIONS_GROUP= AUDIO_CODEC @@ -93,7 +100,7 @@ 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 +.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 .endfor diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo index 2563aba0d455..c0a739cd1538 100644 --- a/net/xrdp/distinfo +++ b/net/xrdp/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1722434185 -SHA256 (xrdp/neutrinolabs-xrdp-v0.10.1_GH0.tar.gz) = dd04ac7151316916799e6a527e8bbef3752f79dd7c252ccc84490ad1d70bd178 -SIZE (xrdp/neutrinolabs-xrdp-v0.10.1_GH0.tar.gz) = 1040247 +TIMESTAMP = 1734961840 +SHA256 (xrdp/neutrinolabs-xrdp-v0.10.2-rc.1_GH0.tar.gz) = dccd2d4c7366e46f4a01ef8a9fca9680c77be520c29c954b2111886a04cdf006 +SIZE (xrdp/neutrinolabs-xrdp-v0.10.2-rc.1_GH0.tar.gz) = 1066431 SHA256 (xrdp/neutrinolabs-librfxcodec-c6b41af_GH0.tar.gz) = c44e4735f858e7c441eaaad5b6029cfce2e687e20a866d6da75323a6c55b510a SIZE (xrdp/neutrinolabs-librfxcodec-c6b41af_GH0.tar.gz) = 61783 SHA256 (xrdp/neutrinolabs-libpainter-2255b38_GH0.tar.gz) = df669fb5a801b2e5f9c1e6c97d85675ca63dbed6409b4bbf3adc60ac95e64f0e diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist index d2cc775f0cf2..2646ba187733 100644 --- a/net/xrdp/pkg-plist +++ b/net/xrdp/pkg-plist @@ -27,6 +27,7 @@ include/xrdp_sockets.h libdata/pkgconfig/libpainter.pc libdata/pkgconfig/rfxcodec.pc libdata/pkgconfig/xrdp.pc +libexec/xrdp/xrdp-droppriv lib/xrdp/libcommon.a lib/xrdp/libcommon.so lib/xrdp/libcommon.so.0 @@ -86,17 +87,14 @@ etc/rc.d/xrdp-sesman %%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%%/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 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 @@ -121,3 +119,4 @@ sbin/xrdp-sesman %%DATADIR%%/xrdp256.bmp %%DATADIR%%/xrdp_logo.bmp %%DATADIR%%/xrdp_logo.png +%%DATADIR%%/xrdp-chkpriv