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 D448E138334 for ; Thu, 27 Sep 2018 08:13:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C8F2E0884; Thu, 27 Sep 2018 08:13:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D3F1CE0884 for ; Thu, 27 Sep 2018 08:13:04 +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 06009335C2B for ; Thu, 27 Sep 2018 08:13:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 704BE3E1 for ; Thu, 27 Sep 2018 08:13:00 +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: <1538035964.a53723eb13bfa401e1b48c0041518bafd25b96dd.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch x11-misc/lightdm/lightdm-1.28.0-r1.ebuild X-VCS-Directories: x11-misc/lightdm/ x11-misc/lightdm/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a53723eb13bfa401e1b48c0041518bafd25b96dd X-VCS-Branch: master Date: Thu, 27 Sep 2018 08:13:00 +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: f25d7678-f9b9-4785-8378-2c6280a8a996 X-Archives-Hash: 604ffb9501ef4d6b89fd5aa587ed5c0f commit: a53723eb13bfa401e1b48c0041518bafd25b96dd Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 27 08:12:44 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 27 08:12:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53723eb Revert "x11-misc/lightdm: use upstream lightdm-greeter pam config" This reverts commit 39b530b86790bb5d4a909118be9457be22cf7ad3. which was accidentally added. .../lightdm/files/lightdm-1.28.0-pam-greeter.patch | 10 -- x11-misc/lightdm/lightdm-1.28.0-r1.ebuild | 144 --------------------- 2 files changed, 154 deletions(-) diff --git a/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch b/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch deleted file mode 100644 index 89b47798a79..00000000000 --- a/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/pam/lightdm-greeter -+++ b/data/pam/lightdm-greeter -@@ -14,4 +14,6 @@ password required pam_deny.so - - # Setup session - session required pam_unix.so --session optional pam_systemd.so -+-session optional pam_systemd.so -+-session optional pam_elogind.so -+-session optional pam_ck_connector.so nox11 diff --git a/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild deleted file mode 100644 index 748ee4f83bb..00000000000 --- a/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils - -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM" -SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="audit +gnome +gtk +introspection qt5 vala" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2 - dev-libs/libxml2 - virtual/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - audit? ( sys-process/audit ) - gnome? ( sys-apps/accountsservice ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - ) -" -RDEPEND="${COMMON_DEPEND} - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - gnome? ( gnome-base/gnome-common ) - vala? ( $(vala_depend) ) -" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" - -DOCS=( NEWS ) -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-1.28.0-pam-greeter.patch ) - -src_prepare() { - xdg_environment_reset - - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die - - einfo "Fixing the session-wrapper variable in lightdm.conf" - sed -i -e \ - "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ - data/lightdm.conf || die "Failed to fix lightdm.conf" - - # use correct version of qmake. bug #566950 - sed \ - -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ - -i configure.ac || die - - default - - # Remove bogus Makefile statement. This needs to go upstream - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die - if has_version dev-libs/gobject-introspection; then - eautoreconf - else - AT_M4DIR=${WORKDIR} eautoreconf - fi - - use vala && vala_src_prepare -} - -src_configure() { - # Set default values if global vars unset - local _greeter _session _user - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} - _session=${LIGHTDM_SESSION:=gnome} - _user=${LIGHTDM_USER:=root} - # Let user know how lightdm is configured - einfo "Gentoo configuration" - einfo "Default greeter: ${_greeter}" - einfo "Default session: ${_session}" - einfo "Greeter user: ${_user}" - - use qt5 && append-cxxflags -std=c++11 - - # also disable tests because libsystem.c does not build. Tests are - # restricted so it does not matter anyway. - local myeconfargs=( - --localstatedir=/var - --disable-static - --disable-tests - $(use_enable audit libaudit) - $(use_enable introspection) - --disable-liblightdm-qt - $(use_enable qt5 liblightdm-qt5) - $(use_enable vala) - --with-user-session=${_session} - --with-greeter-session=${_greeter} - --with-greeter-user=${_user} - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Delete apparmor profiles because they only work with Ubuntu's - # apparmor package. Bug #494426 - if [[ -d ${ED%/}/etc/apparmor.d ]]; then - rm -r "${ED%/}/etc/apparmor.d" || die \ - "Failed to remove apparmor profiles" - fi - - insinto /etc/${PN} - doins data/{${PN},keys}.conf - doins "${FILESDIR}"/Xsession - fperms +x /etc/${PN}/Xsession - # /var/lib/lightdm-data could be useful. Bug #522228 - dodir /var/lib/lightdm-data - - find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die - rm -rf "${ED%/}"/etc/init - - # Remove existing pam file. We will build a new one. Bug #524792 - rm -rf "${ED%/}"/etc/pam.d/${PN} - pamd_mimic system-local-login ${PN} auth account password session #372229 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 - - readme.gentoo_create_doc - - systemd_dounit "${FILESDIR}/${PN}.service" - keepdir /var/lib/${PN}-data -} - -pkg_postinst() { - systemd_reenable "${PN}.service" -}