From owner-svn-ports-all@freebsd.org Thu Feb 20 13:50:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93F1B23996E; Thu, 20 Feb 2020 13:50:02 +0000 (UTC) (envelope-from arrowd@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48NbZ228rsz3GMR; Thu, 20 Feb 2020 13:50:02 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26BC422A15; Thu, 20 Feb 2020 13:50:02 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01KDo2Ox030586; Thu, 20 Feb 2020 13:50:02 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01KDo1kN030585; Thu, 20 Feb 2020 13:50:01 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <202002201350.01KDo1kN030585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Thu, 20 Feb 2020 13:50:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526571 - in head/x11/sddm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: in head/x11/sddm: . files X-SVN-Commit-Revision: 526571 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Feb 2020 13:50:02 -0000 Author: arrowd Date: Thu Feb 20 13:50:01 2020 New Revision: 526571 URL: https://svnweb.freebsd.org/changeset/ports/526571 Log: x11/sddm: Enhance Backend.cpp patch to take into account not only /etc/login.conf but also ~/.login_conf file. PR: 241519 Submitted by: Martin Birgmeier Modified: head/x11/sddm/Makefile head/x11/sddm/files/patch-src_helper_Backend.cpp Modified: head/x11/sddm/Makefile ============================================================================== --- head/x11/sddm/Makefile Thu Feb 20 13:35:01 2020 (r526570) +++ head/x11/sddm/Makefile Thu Feb 20 13:50:01 2020 (r526571) @@ -3,6 +3,7 @@ PORTNAME= sddm PORTVERSION= 0.18.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= kde@FreeBSD.org Modified: head/x11/sddm/files/patch-src_helper_Backend.cpp ============================================================================== --- head/x11/sddm/files/patch-src_helper_Backend.cpp Thu Feb 20 13:35:01 2020 (r526570) +++ head/x11/sddm/files/patch-src_helper_Backend.cpp Thu Feb 20 13:50:01 2020 (r526571) @@ -1,5 +1,5 @@ ---- src/helper/Backend.cpp.orig 2019-03-13 09:22:35 UTC -+++ src/helper/Backend.cpp +--- src/helper/Backend.cpp.orig 2019-03-13 10:22:35.000000000 +0100 ++++ src/helper/Backend.cpp 2020-02-16 16:39:53.134892000 +0100 @@ -29,6 +29,10 @@ #include @@ -11,7 +11,7 @@ namespace SDDM { Backend::Backend(HelperApp* parent) -@@ -70,6 +74,19 @@ namespace SDDM { +@@ -70,6 +74,26 @@ .arg(mainConfig.X11.UserAuthFile.get()); env.insert(QStringLiteral("XAUTHORITY"), value); } @@ -24,6 +24,13 @@ + if ((lc = login_getpwclass(pw)) != 0) { + setclassenvironment(lc, pw, 1); /* path variables */ + setclassenvironment(lc, pw, 0); /* non-path variables */ ++ login_close(lc); ++ if ((lc = login_getuserclass(pw)) != NULL) { ++ setclassenvironment(lc, pw, 1); ++ setclassenvironment(lc, pw, 0); ++ } ++ if (lc != NULL) ++ login_close(lc); + /* copy all environment variables that are now set */ + env.insert(QProcessEnvironment::systemEnvironment()); + }