From owner-svn-ports-head@freebsd.org Thu Mar 5 13:38:03 2020 Return-Path: Delivered-To: svn-ports-head@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 EEB9D269E00; Thu, 5 Mar 2020 13:38:03 +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 48YBdl25D0z4dml; Thu, 5 Mar 2020 13:38:03 +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 94F737EEF; Thu, 5 Mar 2020 13:38:01 +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 025Dc10D016720; Thu, 5 Mar 2020 13:38:01 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 025Dc10E016718; Thu, 5 Mar 2020 13:38:01 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <202003051338.025Dc10E016718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Thu, 5 Mar 2020 13:38:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527832 - 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: 527832 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2020 13:38:04 -0000 Author: arrowd Date: Thu Mar 5 13:38:00 2020 New Revision: 527832 URL: https://svnweb.freebsd.org/changeset/ports/527832 Log: lang/sddm: Make SDDM honour sddm_lang rc variable again. PR: 244341 Submitted by: Martin Birgmeier (initial patch) Modified: head/x11/sddm/Makefile head/x11/sddm/files/patch-src_helper_Backend.cpp Modified: head/x11/sddm/Makefile ============================================================================== --- head/x11/sddm/Makefile Thu Mar 5 13:33:35 2020 (r527831) +++ head/x11/sddm/Makefile Thu Mar 5 13:38:00 2020 (r527832) @@ -3,7 +3,7 @@ PORTNAME= sddm PORTVERSION= 0.18.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 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 Mar 5 13:33:35 2020 (r527831) +++ head/x11/sddm/files/patch-src_helper_Backend.cpp Thu Mar 5 13:38:00 2020 (r527832) @@ -1,5 +1,5 @@ ---- 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 +--- src/helper/Backend.cpp.orig 2019-03-13 09:22:35 UTC ++++ src/helper/Backend.cpp @@ -29,6 +29,10 @@ #include @@ -11,29 +11,37 @@ namespace SDDM { Backend::Backend(HelperApp* parent) -@@ -70,6 +74,26 @@ +@@ -70,6 +74,34 @@ namespace SDDM { .arg(mainConfig.X11.UserAuthFile.get()); env.insert(QStringLiteral("XAUTHORITY"), value); } +#if defined(Q_OS_FREEBSD) + /* get additional environment variables via setclassenvironment(); + this needs to be done here instead of in UserSession::setupChildProcess -+ as the environment for execve() is prepared here */ ++ as the environment for execve() is prepared here; ++ save and restore SDDM's environment because setclassenvironment() mangles it */ + login_cap_t *lc; + -+ if ((lc = login_getpwclass(pw)) != 0) { ++ auto savedEnv = QProcessEnvironment::systemEnvironment(); ++ ++ if ((lc = login_getpwclass(pw)) != NULL) { + 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); ++ } ++ if ((lc = login_getuserclass(pw)) != NULL) { ++ setclassenvironment(lc, pw, 1); /* path variables */ ++ setclassenvironment(lc, pw, 0); /* non-path variables */ ++ login_close(lc); ++ } + /* copy all environment variables that are now set */ ++ QString savedLang = env.value(QStringLiteral("LANG")); + env.insert(QProcessEnvironment::systemEnvironment()); -+ } ++ if (qobject_cast(parent())->user() == QStringLiteral("sddm")) ++ env.insert(QStringLiteral("LANG"), savedLang); ++ /* restore original environment */ ++ QProcessEnvironment::systemEnvironment().clear(); ++ QProcessEnvironment::systemEnvironment().insert(savedEnv); +#endif /* defined(Q_OS_FREEBSD) */ // TODO: I'm fairly sure this shouldn't be done for PAM sessions, investigate! m_app->session()->setProcessEnvironment(env);