From nobody Wed Oct 11 05:27:48 2023 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 4S51W83rNhz4wvFD; Wed, 11 Oct 2023 05:27:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S51W83QNZz3QJM; Wed, 11 Oct 2023 05:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697002068; 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=vPog2K4MYD33a03wZ5foahK1tqa4Tvfs2HFOdpE1U4c=; b=VS18bXoILfytlCARDxcOlDYCPpcRflX1yYvjEOWgOBDVMjPaV29QErAivHyyMRapntdxvo qXFFgzC3BS8KYYo3cK4OMVnZ1xfvhgmWxbN4KI5yB7Bl6cBJfO6ByKQzerLuQj/ESCBuQF kyQDypMYQ76wl94AbNfwWiLz3+PFLzJLLoFkC1C2JKh/N9f4MPkGHs2LKyuGSxlP37bYW0 xAKwuNjX4vZZF6yC7csOjeqtGSSeBbMdNX8xlGASpqevqCwuvnoadRfU12thz4IZFehqll 243N9WNycm0J6yU6D/bKY+kruNQ31SyIS9SGiZLY5nGR2Y0dv9QjVzb2sO8Fbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697002068; a=rsa-sha256; cv=none; b=BEghrHM6YI4tQ/EvbPYW7i+YHGLhaElBgTMriXobVYZE8ul13CiS44U8aYD4XBIsmSpSCr 1pfFoyg7WB9zhjIbJ+74g5Z9wi0/KenjRajhph7AEZ36fcmdVDcQwVtMP0+VXGRtwSlVYp wEQWzUtaSMg8x6cI7R0DMmuqShI5LwtHVw+EEON4C83PTlvawAdgqZw8H9YFFABeHR06Vc ww4K0koyi1NDPVAxByuALzP8NdCbwY7Bk/q++Obs9Ddi5NZgO6SLxWQnCjIoFfcvR/F5ua LrVOZGNI0gkhuoMmWl8Ca/vsrn7QfGN/BcKcL0pNlEdsksHzT88isR8CuM3QXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697002068; 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=vPog2K4MYD33a03wZ5foahK1tqa4Tvfs2HFOdpE1U4c=; b=e+vQHjc8RydecV5kjrIYW6NVl9xl92DV4ZXoSrX5C8KojsgtC7RLSLbu6YHZNBQZvnM3gS pQHquXeYOJ1uHoMTKm41VRkLIaVGstIfkSZNjwapZ3Jr+pu5HhQmN23Fa/3q9tRaJRgwJ/ KNWL8VcEtBQxaaIrAZG+2fdJFWRYRG1toRvhwJgsN7CfSrH+FS7ghVYBa6csPEXbtx91iJ nEELWJoO9sAqRwyHngZOQ9wsy/vWCBEtBLS9Ih/ufgJfcw6+U7k+tExjjCtqHvywhECr3M 4Flym7LcSBdf0YTEm80gs0W26/0s5sFVQe91tBgBq0cwlmhbdYIhVqeWQHTAKA== 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 4S51W82528z17lw; Wed, 11 Oct 2023 05:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39B5RmCQ086437; Wed, 11 Oct 2023 05:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B5RmPH086434; Wed, 11 Oct 2023 05:27:48 GMT (envelope-from git) Date: Wed, 11 Oct 2023 05:27:48 GMT Message-Id: <202310110527.39B5RmPH086434@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 0c7256704da0 - main - x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c7256704da0778c1c685da54f50f8d42ed2cbf6 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c7256704da0778c1c685da54f50f8d42ed2cbf6 commit 0c7256704da0778c1c685da54f50f8d42ed2cbf6 Author: Cy Schubert AuthorDate: 2023-10-05 20:26:46 +0000 Commit: Cy Schubert CommitDate: 2023-10-11 05:26:05 +0000 x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args Hard coding Xserver args forces people to invoke xdm through init by placing an entry in /etc/ttys when Xserver args different from those hardcoded in rc.d/xdm are desired. Instead glean arguments from $LOCALBASE/etc/xdm/Xservers, defaulting to the hardcoded entry if none are found for :0. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42097 --- x11/xdm/Makefile | 2 +- x11/xdm/files/xdm.in | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 6dfb4290412b..65ab112a321c 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= xdm PORTVERSION= 1.1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdm/files/xdm.in b/x11/xdm/files/xdm.in index dae4a2a40039..4f46257a5da4 100644 --- a/x11/xdm/files/xdm.in +++ b/x11/xdm/files/xdm.in @@ -38,7 +38,11 @@ xdm_set_vty() { # X views vt as starting at 01, not ttyv0 vtarg=`printf vt%02d $((${xdm_tty#ttyv} + 1))` - command_args="-server \":0 local %%LOCALBASE%%/bin/X :0 $vtarg\"" + xserver_args=$(grep '^:0' %%LOCALBASE%%/etc/X11/xdm/Xservers) + if [ $? -ne 0 ]; then + xserver_args=":0 local %%LOCALBASE%%/bin/X :0" + fi + command_args="-server \"$xserver_args $vtarg\"" } run_rc_command $1