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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA4101396D2 for ; Tue, 15 Aug 2017 09:21:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11A38E0E7B; Tue, 15 Aug 2017 09:21:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D56F1E0E7B for ; Tue, 15 Aug 2017 09:21:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8DCA34182B for ; Tue, 15 Aug 2017 09:21:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 346627846 for ; Tue, 15 Aug 2017 09:21:06 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1502788859.93cd34224fd5a22bb3258a6824a0346f4c8adfa5.polynomial-c@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.14.0-nsswitch_conf.patch x11-misc/sddm/sddm-0.14.0-r4.ebuild X-VCS-Directories: x11-misc/sddm/files/ x11-misc/sddm/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 93cd34224fd5a22bb3258a6824a0346f4c8adfa5 X-VCS-Branch: master Date: Tue, 15 Aug 2017 09:21:06 +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-Archives-Salt: e1c2cc64-d1b6-4b80-9351-5dcda39f9dbf X-Archives-Hash: 975dc4cf8c0ccd0da0af3f6fb028fe25 commit: 93cd34224fd5a22bb3258a6824a0346f4c8adfa5 Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 15 09:18:26 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 15 09:20:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93cd3422 x11-misc/sddm: Revbump to not show usernames twice (bug #627902). Permission kindly granted by kensington. Package-Manager: Portage-2.3.7, Repoman-2.3.3 .../sddm/files/sddm-0.14.0-nsswitch_conf.patch | 27 +++++++ x11-misc/sddm/sddm-0.14.0-r4.ebuild | 90 ++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch b/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch new file mode 100644 index 00000000000..371df93e2b8 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch @@ -0,0 +1,27 @@ +From 1f39c7a91ea4bc9527628adb01cb49173f1e68be Mon Sep 17 00:00:00 2001 +From: Palo Kisa +Date: Fri, 9 Jun 2017 10:13:01 +0200 +Subject: [PATCH] UserModel: Check for duplicates from getpwent() + +--- + src/greeter/UserModel.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp +index 94c492d0..33114d08 100644 +--- a/src/greeter/UserModel.cpp ++++ b/src/greeter/UserModel.cpp +@@ -72,6 +72,13 @@ namespace SDDM { + if (mainConfig.Users.HideShells.get().contains(QString::fromLocal8Bit(current_pw->pw_shell))) + continue; + ++ // skip duplicates ++ // Note: getpwent() makes no attempt to suppress duplicate information ++ // if multiple sources are specified in nsswitch.conf(5). ++ if (d->users.cend() ++ != std::find_if(d->users.cbegin(), d->users.cend(), [current_pw](const UserPtr & u) { return u->uid == current_pw->pw_uid; })) ++ continue; ++ + // create user + UserPtr user { new User() }; + user->name = QString::fromLocal8Bit(current_pw->pw_name); diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild b/x11-misc/sddm/sddm-0.14.0-r4.ebuild new file mode 100644 index 00000000000..a79ea8f1a2f --- /dev/null +++ b/x11-misc/sddm/sddm-0.14.0-r4.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="consolekit elogind +pam systemd" + +REQUIRED_USE="?? ( elogind systemd )" + +RDEPEND=">=dev-qt/qtcore-5.6:5 + >=dev-qt/qtdbus-5.6:5 + >=dev-qt/qtgui-5.6:5 + >=dev-qt/qtdeclarative-5.6:5 + >=dev-qt/qtnetwork-5.6:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb(-)] + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + elogind? ( sys-auth/elogind ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + +DEPEND="${RDEPEND} + dev-python/docutils + >=dev-qt/linguist-tools-5.6:5 + >=dev-qt/qttest-5.6:5 + kde-frameworks/extra-cmake-modules + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" + # fix for flags handling and bug 563108 + "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + "${FILESDIR}/${P}-avatars.patch" + "${FILESDIR}/${PN}-enable-elogind.patch" + "${FILESDIR}/${P}-nsswitch_conf.patch" #627902 +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then + die 'The active compiler needs to be gcc 4.7 (or newer)' + fi + fi +} + +src_prepare() { + use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch" + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PAM=$(usex pam) + -DNO_SYSTEMD=$(usex '!systemd') + -DUSE_ELOGIND=$(usex 'elogind') + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + + cmake-utils_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 +}