From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBA0515808B for ; Fri, 1 Apr 2022 14:48:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C0C0E08D3; Fri, 1 Apr 2022 14:48:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0497E08D3 for ; Fri, 1 Apr 2022 14:48:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5B82341678 for ; Fri, 1 Apr 2022 14:48:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80892361 for ; Fri, 1 Apr 2022 14:48:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1648824427.ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/sddm/files/sddm-0.18.1-Xsession.patch x11-misc/sddm/sddm-0.18.1-r6.ebuild X-VCS-Directories: x11-misc/sddm/ x11-misc/sddm/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe X-VCS-Branch: master Date: Fri, 1 Apr 2022 14:48:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 462f3898-30d6-45e2-9efa-c8c6914574c6 X-Archives-Hash: b53f25e14348c9de0fd301ae8eb144c4 commit: ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 31 20:32:24 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 14:47:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6b9e57 x11-misc/sddm: Drop obsolete ConsoleKit patch and quirks Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/files/sddm-0.18.1-Xsession.patch | 24 ++++++++++++++++++++++++ x11-misc/sddm/sddm-0.18.1-r6.ebuild | 6 ++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch new file mode 100644 index 000000000000..e1e3c1527be7 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch @@ -0,0 +1,24 @@ +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -50,6 +50,10 @@ + ;; + esac + ++# Make D-Bus start properly, see: ++# /etc/X11/xinit/xinitrc.d/80-dbus ++command="$@" ++ + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f $HOME/.xprofile ] && . $HOME/.xprofile + +@@ -94,8 +98,8 @@ + . "$USERXSESSION" + fi + +-if [ -z "$*" ]; then ++if [ -z "$command" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec $command + fi diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild index 3d1b2b680504..3ee4febc099e 100644 --- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 + "${FILESDIR}/${P}-Xsession.patch" # bug 611210 "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" # fix for groups: https://github.com/sddm/sddm/issues/1159 "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" @@ -54,12 +54,10 @@ PATCHES=( # fix for ReuseSession=true "${FILESDIR}/${P}-only-reuse-online-sessions.patch" # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 "${FILESDIR}/pam-1.4-substack.patch" # upstream git develop branch: "${FILESDIR}/${P}-qt-5.15.2.patch" - # bug 753104 - "${FILESDIR}/${P}-cve-2020-28049.patch" + "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104 ) src_prepare() {