From nobody Mon Jun 17 09:28:39 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 4W2l1h0pFdz5NVwc; Mon, 17 Jun 2024 09:28:40 +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 4W2l1h03Q9z4PC6; Mon, 17 Jun 2024 09:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718616520; 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=G1mW+URo689c84du5dkqvp6OshrD6e8XTiRLVrmDNkU=; b=M4zsYB14nzDjRE4BUibPD1QjVWPH923tsROv6G5Xn6jSKCZ1ykTfSQvFz1DjE4cx2EO1Jo pSo7u1sur5obe5xFMp0edBInnyo0B/w6FU+qeK8+Mc4wDlAZt0VdwKYzYN6IbAEDk7ogkd jQzH/fPxDXAk7En1onTVtSiYH4pD5Z3h5OUbRYpwtXHEjewyMXrdRhlze9d7TEM658vRW2 1dGE0nP5Jue5JxHnH7jdjYnBgU75Nyfa85UIx3KEfYdi4sImZltr4lnjzHsAukPqmBQhQE plIiKCnqxA3195Exw5o+CAgBaLw2ke6xeHRpt1ljhgWvP3R6dQOMjWL7ebwWpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718616520; a=rsa-sha256; cv=none; b=vUSrGWhueDmnXR4zjuHQh7vdE81DYfU4wkJ3rk/dVpjijK6PHAT07StA1st5C7AiQRsFTG 5o7NEp9/i+XtqtNEWdykYWqQRTZUEOvopEdrRjRibRj/fXwsFZNaREOddmenM8lwif72ng lXRbXDm4EKiy/6YwPoE4KSWhMwD/t6gfjx8PDJUa/DiiaaCrAXcpVi/0qkSQuh5eVSobSi +uN0zJFX6t86pypS43Z/mZZXsql3n0NrzZ+Upv9jTV7Ui0a+qBEB6VQ09x3vRlVdvDwhGV 8K3J474eu6Hq54UcCBACRFV7ZKKgEVzBNhPprZRWQscw/qgM/8c9A7HrfZ9CUw== 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=1718616520; 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=G1mW+URo689c84du5dkqvp6OshrD6e8XTiRLVrmDNkU=; b=DEtRdvqWQJDBFeEf36NkSqlhADyK0IVFZa0BAjTDUQN+YRzGiatasyEnQVZroo14tYcjUN jHwXxm8lgRNZw7KESQXvejlSxsrRM+W2dBdx/+ji1sO8rQAAkW0sSVglE6zT3GRODYSlcG fW+v3QygCm1YrnmItJlNsAtx/LTQID9doMxSGbci0hVHf1CBN/z9QsvbefUTJFj58ZjLla yqyM4NYRUltr/dYW/wIsyXtvLI+JCWs4owqczBaOs/AXNhBtjpYfwpEBwhuUace+mC7wvw txoQl5D4tuplo6moQzQnBhZ0YELIJi8rxnNbScZjvbQG9UFSZ03HKuMD7CokhA== 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 4W2l1g6mJnz1PRk; Mon, 17 Jun 2024 09:28:39 +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 45H9SdbJ081117; Mon, 17 Jun 2024 09:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H9SdQx081114; Mon, 17 Jun 2024 09:28:39 GMT (envelope-from git) Date: Mon, 17 Jun 2024 09:28:39 GMT Message-Id: <202406170928.45H9SdQx081114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f6c04193d0f8 - main - x11/ly: fixed application of login class via setusercontext() 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6c04193d0f8d2fe1610a74662d575ef526c16c4 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6c04193d0f8d2fe1610a74662d575ef526c16c4 commit f6c04193d0f8d2fe1610a74662d575ef526c16c4 Author: Robin Haberkorn AuthorDate: 2024-01-21 19:35:34 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-17 09:26:54 +0000 x11/ly: fixed application of login class via setusercontext() See also https://github.com/fairyglade/ly/issues/572 --- x11/ly/files/patch-makefile | 2 +- x11/ly/files/patch-src_login.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/x11/ly/files/patch-makefile b/x11/ly/files/patch-makefile index d8da24fa3b66..9c79340c04c1 100644 --- a/x11/ly/files/patch-makefile +++ b/x11/ly/files/patch-makefile @@ -15,7 +15,7 @@ endif +ifeq ($(OS), FreeBSD) + FLAGS+= -D_DEFAULT_SOURCE ${CPPFLAGS} ${CFLAGS} -+ LINK+= ${LIBS} ++ LINK+= ${LIBS} -lutil +endif BIND = bin diff --git a/x11/ly/files/patch-src_login.c b/x11/ly/files/patch-src_login.c index 740077a873e7..0bdfda667e36 100644 --- a/x11/ly/files/patch-src_login.c +++ b/x11/ly/files/patch-src_login.c @@ -1,6 +1,6 @@ --- src/login.c.orig 2023-06-15 07:30:09 UTC +++ src/login.c -@@ -19,7 +19,7 @@ +@@ -19,9 +19,13 @@ #include #include #include @@ -8,8 +8,14 @@ +#include #include ++#include ++#include ++#include ++ int get_free_display() -@@ -214,13 +214,13 @@ void env_init(struct passwd* pwd) + { + char xlock[1024]; +@@ -214,13 +218,13 @@ // clean env environ[0] = NULL; @@ -25,7 +31,7 @@ // Set PATH if specified in the configuration if (strlen(config.path)) -@@ -259,9 +259,15 @@ void env_xdg(const char* tty_id, const char* desktop_n +@@ -259,9 +263,15 @@ void env_xdg(const char* tty_id, const char* desktop_name) { @@ -41,7 +47,7 @@ setenv("XDG_SESSION_CLASS", "user", 0); setenv("XDG_SESSION_ID", "1", 0); setenv("XDG_SESSION_DESKTOP", desktop_name, 0); -@@ -269,8 +275,8 @@ void env_xdg(const char* tty_id, const char* desktop_n +@@ -269,8 +279,8 @@ setenv("XDG_VTNR", tty_id, 0); } @@ -52,7 +58,7 @@ char *username, pid_t display_pid ) { -@@ -281,24 +287,23 @@ void add_utmp_entry( +@@ -281,24 +291,23 @@ /* only correct for ptys named /dev/tty[pqr][0-9a-z] */ strcpy(entry->ut_id, ttyname(STDIN_FILENO) + strlen("/dev/tty")); @@ -89,7 +95,28 @@ } void xauth(const char* display_name, const char* shell, char* pwd) -@@ -616,7 +621,7 @@ void auth( +@@ -598,6 +607,16 @@ + exit(EXIT_FAILURE); + } + ++ ok = setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL); ++ ++ if (ok != 0) ++ { ++ dgn_throw(DGN_USER_UID); ++ exit(EXIT_FAILURE); ++ } ++ ++ /* This is done by setusercontext() on FreeBSD. */ ++#if 0 + ok = setgid(pwd->pw_gid); + + if (ok != 0) +@@ -613,10 +632,11 @@ + dgn_throw(DGN_USER_UID); + exit(EXIT_FAILURE); + } ++#endif // get a display char vt[5]; @@ -98,7 +125,7 @@ // set env (this clears the environment) env_init(pwd); -@@ -671,13 +676,13 @@ void auth( +@@ -671,13 +691,13 @@ } // add utmp audit