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 53A4F1396DA for ; Sat, 21 Oct 2017 19:46:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 691852BC034; Sat, 21 Oct 2017 19:46:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3024B2BC034 for ; Sat, 21 Oct 2017 19:46:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5FA9B33BF0B for ; Sat, 21 Oct 2017 19:45:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6A8F325 for ; Sat, 21 Oct 2017 19:45:56 +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: <1508615138.efe17b52278ad2d1c223b002b567f746f85265a8.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.14.0-nsswitch_conf.patch x11-misc/sddm/files/sddm-enable-elogind.patch x11-misc/sddm/sddm-0.14.0-r4.ebuild X-VCS-Directories: x11-misc/sddm/files/ x11-misc/sddm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: efe17b52278ad2d1c223b002b567f746f85265a8 X-VCS-Branch: master Date: Sat, 21 Oct 2017 19:45:56 +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: 7a88fe1d-0297-4d4d-9f6c-811bb2747af2 X-Archives-Hash: 6599fcc42c9308a9ab43eb62951847de commit: efe17b52278ad2d1c223b002b567f746f85265a8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 21 16:29:24 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 21 19:45:38 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe17b52 x11-misc/sddm: Drop old Package-Manager: Portage-2.3.12, Repoman-2.3.3 .../sddm/files/sddm-0.14.0-nsswitch_conf.patch | 27 ------- x11-misc/sddm/files/sddm-enable-elogind.patch | 56 ------------- x11-misc/sddm/sddm-0.14.0-r4.ebuild | 92 ---------------------- 3 files changed, 175 deletions(-) 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 deleted file mode 100644 index 371df93e2b8..00000000000 --- a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch deleted file mode 100644 index d1277e9554f..00000000000 --- a/x11-misc/sddm/files/sddm-enable-elogind.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/CMakeLists.txt 2016-11-10 09:27:03.866358608 +0100 -+++ b/CMakeLists.txt 2016-11-10 10:28:25.384374766 +0100 -@@ -93,7 +93,7 @@ - endif() - - # systemd --if(NOT NO_SYSTEMD) -+if(NOT NO_SYSTEMD AND NOT USE_ELOGIND) - pkg_check_modules(SYSTEMD "systemd") - endif() - -@@ -127,12 +127,34 @@ - set(REBOOT_COMMAND "/usr/bin/systemctl reboot") - else() - set(SYSTEMD_FOUND 0) -+endif() -+add_feature_info("systemd" SYSTEMD_FOUND "systemd support") -+add_feature_info("journald" JOURNALD_FOUND "journald support") -+ -+# elogind -+if(NO_SYSTEMD AND USE_ELOGIND) -+ pkg_check_modules(ELOGIND "libelogind") -+endif() -+ -+if(ELOGIND_FOUND) -+ add_definitions(-DHAVE_ELOGIND) -+ set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND) -+ -+ set(MINIMUM_VT 7) -+ set(HALT_COMMAND "/usr/bin/loginctl poweroff") -+ set(REBOOT_COMMAND "/usr/bin/loginctl reboot") -+else() -+ set(ELOGIND_FOUND 0) -+endif() -+add_feature_info("elogind" ELOGIND_FOUND "elogind support") -+ -+# Default behaviour if neither systemd nor elogind is used -+if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND) - set(MINIMUM_VT 7) - set(HALT_COMMAND "/sbin/shutdown -h -P now") - set(REBOOT_COMMAND "/sbin/shutdown -r now") - endif() --add_feature_info("systemd" SYSTEMD_FOUND "systemd support") --add_feature_info("journald" JOURNALD_FOUND "journald support") -+ - - # Set constants - set(DATA_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/sddm" CACHE PATH "System application data install directory") ---- a/services/sddm-greeter.pam 2016-06-19 12:24:42.000000000 +0200 -+++ b/services/sddm-greeter.pam 2016-11-02 09:48:18.990032363 +0100 -@@ -14,4 +14,5 @@ - - # Setup session - session required pam_unix.so - session optional pam_systemd.so -+session optional pam_elogind.so diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild b/x11-misc/sddm/sddm-0.14.0-r4.ebuild deleted file mode 100644 index f67abdc0bdc..00000000000 --- a/x11-misc/sddm/sddm-0.14.0-r4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils systemd 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 - - systemd_reenable sddm.service - - 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 -}