public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/
@ 2016-01-30 14:22 99% Michael Palimaka
  0 siblings, 0 replies; 1+ results
From: Michael Palimaka @ 2016-01-30 14:22 UTC (permalink / raw
  To: gentoo-commits

commit:     448091cb54719cb8c1bb02466dbb4051a10fff0b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 30 13:35:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 14:22:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448091cb

x11-misc/sddm: Add ewarn for erroneous existing pambase config

Previous recommendation for sddm without real consolekit support breaks
modern sddm with consolekit2 support.

 x11-misc/sddm/sddm-0.12.0-r1.ebuild | 14 ++++++++++++++
 x11-misc/sddm/sddm-0.13.0-r1.ebuild | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/x11-misc/sddm/sddm-0.12.0-r1.ebuild b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
index 2b31915..c472cbc 100644
--- a/x11-misc/sddm/sddm-0.12.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.12.0-r1.ebuild
@@ -62,4 +62,18 @@ src_configure() {
 pkg_postinst() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+
+	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
+		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
+		if [[ -z ${line} ]]; then
+			ewarn
+			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
+			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
+			ewarn
+			ewarn "session      optional      pam_ck_connector.so nox11"
+			ewarn
+			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
+			ewarn
+		fi
+	fi
 }

diff --git a/x11-misc/sddm/sddm-0.13.0-r1.ebuild b/x11-misc/sddm/sddm-0.13.0-r1.ebuild
index 7c61eb0..8b55dfb 100644
--- a/x11-misc/sddm/sddm-0.13.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.13.0-r1.ebuild
@@ -62,4 +62,18 @@ src_configure() {
 pkg_postinst() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+
+	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
+		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
+		if [[ -z ${line} ]]; then
+			ewarn
+			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
+			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
+			ewarn
+			ewarn "session      optional      pam_ck_connector.so nox11"
+			ewarn
+			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
+			ewarn
+		fi
+	fi
 }


^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-01-30 14:22 99% [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/ Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox