commit: d9bfff4f73e27b7f5f39a76a3ecb7b7bbd410b8a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 14 19:00:38 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 14 19:00:38 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9bfff4f
sys-auth/elogind: Moved to tree Package-Manager: portage-2.3.0 sys-auth/elogind/elogind-219.12-r4.ebuild | 95 --------------- .../files/elogind-219.12-login1-perms.patch | 129 --------------------- .../elogind/files/elogind-219.12-session.patch | 45 ------- sys-auth/elogind/files/elogind-docs.patch | 19 --- sys-auth/elogind/files/elogind-lrt.patch | 10 -- sys-auth/elogind/files/elogind.conf | 7 -- sys-auth/elogind/files/elogind.init | 32 ----- sys-auth/elogind/metadata.xml | 11 -- 8 files changed, 348 deletions(-) diff --git a/sys-auth/elogind/elogind-219.12-r4.ebuild b/sys-auth/elogind/elogind-219.12-r4.ebuild deleted file mode 100644 index 3b419cb..0000000 --- a/sys-auth/elogind/elogind-219.12-r4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit autotools linux-info pam udev - -DESCRIPTION="The systemd project's logind, extracted to a standalone package" -HOMEPAGE="https://github.com/wingo/elogind"; -SRC_URI="https://github.com/wingo/elogind/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC0-1.0 LGPL-2.1+ public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="acl apparmor pam policykit +seccomp selinux" - -COMMON_DEPEND=" - sys-libs/libcap - sys-apps/util-linux - virtual/libudev:= - acl? ( sys-apps/acl ) - apparmor? ( sys-libs/libapparmor ) - pam? ( virtual/pam ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sys-libs/libselinux ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/dbus - policykit? ( sys-auth/polkit ) - !sys-auth/systemd -" -DEPEND="${COMMON_DEPEND} - =dev-util/gperf-3.0* - dev-util/intltool - sys-devel/libtool - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-docs.patch" - "${FILESDIR}/${PN}-lrt.patch" - "${FILESDIR}/${P}-session.patch" - "${FILESDIR}/${P}-login1-perms.patch" -) - -pkg_setup() { - local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK - ~SIGNALFD ~TIMERFD" - - use seccomp && CONFIG_CHECK+=" ~SECCOMP" - - if use kernel_linux; then - linux-info_pkg_setup - fi -} - -src_prepare() { - default - eautoreconf # Makefile.am patched by "${FILESDIR}/${PN}-{docs,lrt}.patch" -} - -src_configure() { - econf \ - --with-pamlibdir=$(getpam_mod_dir) \ - --with-udevrulesdir="$(get_udevdir)"/rules.d \ - --libdir="${EPREFIX}"/$(get_libdir) \ - --enable-smack \ - $(use_enable acl) \ - $(use_enable apparmor) \ - $(use_enable pam) \ - $(use_enable seccomp) \ - $(use_enable selinux) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - - # Build system ignores --with-rootlibdir and puts pkgconfig below - # /$(libdir) - Move it to /usr/$(libdir)/pkgconfig - mkdir -p "${ED%/}"/usr/$(get_libdir) || die - mv "${ED%/}"/$(get_libdir)/pkgconfig "${ED%/}"/usr/$(get_libdir)/ || die - - newinitd "${FILESDIR}"/${PN}.init ${PN} - newconfd "${FILESDIR}"/${PN}.conf ${PN} -} - -pkg_postinst() { - if [ "$(rc-config list default | grep elogind)" = "" ]; then - ewarn "To enable the elogind daemon, elogind must be" - ewarn "added to the default runlevel:" - ewarn "# rc-update add elogind default" - fi -} diff --git a/sys-auth/elogind/files/elogind-219.12-login1-perms.patch b/sys-auth/elogind/files/elogind-219.12-login1-perms.patch deleted file mode 100644 index eecf38e..0000000 --- a/sys-auth/elogind/files/elogind-219.12-login1-perms.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 1ca40c077cd9a08f96a559ba51e8dba230298c4d Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <[email protected]> -Date: Sun, 19 Jun 2016 01:56:56 +1000 -Subject: [PATCH] Update org.freedesktop.login1.conf - -This mirrors an upstream change opening up all of logind's bus calls to -unprivileged users via polkit. - -See systemd/systemd/issues/471. -Closes #3. ---- - src/login/org.freedesktop.login1.conf | 68 +++++++++++++++++++++++++++++++++++ - 1 file changed, 68 insertions(+) - -diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf -index 1318328..2e67e3d 100644 ---- a/src/login/org.freedesktop.login1.conf -+++ b/src/login/org.freedesktop.login1.conf -@@ -90,6 +90,42 @@ - - <allow send_destination="org.freedesktop.login1" - send_interface="org.freedesktop.login1.Manager" -+ send_member="LockSession"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="UnlockSession"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="LockSessions"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="UnlockSessions"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="KillSession"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="KillUser"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="TerminateSession"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="TerminateUser"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" -+ send_member="TerminateSeat"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" - send_member="PowerOff"/> - - <allow send_destination="org.freedesktop.login1" -@@ -130,6 +166,10 @@ - - <allow send_destination="org.freedesktop.login1" - send_interface="org.freedesktop.login1.Manager" -+ send_member="SetWallMessage"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Manager" - send_member="AttachDevice"/> - - <allow send_destination="org.freedesktop.login1" -@@ -138,6 +178,10 @@ - - <allow send_destination="org.freedesktop.login1" - send_interface="org.freedesktop.login1.Seat" -+ send_member="Terminate"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Seat" - send_member="ActivateSession"/> - - <allow send_destination="org.freedesktop.login1" -@@ -154,14 +198,30 @@ - - <allow send_destination="org.freedesktop.login1" - send_interface="org.freedesktop.login1.Session" -+ send_member="Terminate"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Session" - send_member="Activate"/> - - <allow send_destination="org.freedesktop.login1" - send_interface="org.freedesktop.login1.Session" -+ send_member="Lock"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Session" -+ send_member="Unlock"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Session" - send_member="SetIdleHint"/> - - <allow send_destination="org.freedesktop.login1" - send_interface="org.freedesktop.login1.Session" -+ send_member="Kill"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.Session" - send_member="TakeControl"/> - - <allow send_destination="org.freedesktop.login1" -@@ -180,6 +240,14 @@ - send_interface="org.freedesktop.login1.Session" - send_member="PauseDeviceComplete"/> - -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.User" -+ send_member="Terminate"/> -+ -+ <allow send_destination="org.freedesktop.login1" -+ send_interface="org.freedesktop.login1.User" -+ send_member="Kill"/> -+ - <allow receive_sender="org.freedesktop.login1"/> - </policy> - diff --git a/sys-auth/elogind/files/elogind-219.12-session.patch b/sys-auth/elogind/files/elogind-219.12-session.patch deleted file mode 100644 index 82cbebd..0000000 --- a/sys-auth/elogind/files/elogind-219.12-session.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b5c5dd2ad43a3bf4fa0fb21139f8d16959b5d14e Mon Sep 17 00:00:00 2001 -From: Andy Wingo <[email protected]> -Date: Sun, 6 Mar 2016 16:56:33 +0100 -Subject: [PATCH] Fixes to user and session saving - -* src/login/logind-dbus.c (method_create_session): No need to save - session here, as session_send_create_reply will do it. -* src/login/logind-session-dbus.c (session_send_create_reply): On the - other hand we do need to save the user here, so the file marks them as - being active. ---- - src/login/logind-dbus.c | 2 -- - src/login/logind-session-dbus.c | 5 +++-- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 5e6952d..6f7e569 100644 ---- a/src/login/logind-dbus.c -+++ b/src/login/logind-dbus.c -@@ -801,8 +801,6 @@ static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use - if (r < 0) - goto fail; - -- session_save(session); -- - return 1; - - fail: -diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c -index f71798b..337bbbb 100644 ---- a/src/login/logind-session-dbus.c -+++ b/src/login/logind-session-dbus.c -@@ -721,9 +721,10 @@ int session_send_create_reply(Session *s, sd_bus_error *error) { - if (fifo_fd < 0) - return fifo_fd; - -- /* Update the session state file before we notify the client -- * about the result. */ -+ /* Update the session and user state files before we notify -+ * the client about the result. */ - session_save(s); -+ user_save(s->user); - - p = session_bus_path(s); - if (!p) diff --git a/sys-auth/elogind/files/elogind-docs.patch b/sys-auth/elogind/files/elogind-docs.patch deleted file mode 100644 index 4763be2..0000000 --- a/sys-auth/elogind/files/elogind-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -253,16 +253,6 @@ - dist_bashcompletion_DATA = - dist_zshcompletion_DATA = - --dist_doc_DATA = \ -- README \ -- NEWS \ -- LICENSE.LGPL2.1 \ -- LICENSE.GPL2 \ -- LICENSE.MIT \ -- src/libelogind/sd-bus/PORTING-DBUS1 \ -- src/libelogind/sd-bus/DIFFERENCES \ -- src/libelogind/sd-bus/GVARIANT-SERIALIZATION -- - @INTLTOOL_POLICY_RULE@ - - # ------------------------------------------------------------------------------ diff --git a/sys-auth/elogind/files/elogind-lrt.patch b/sys-auth/elogind/files/elogind-lrt.patch deleted file mode 100644 index 19055fa..0000000 --- a/sys-auth/elogind/files/elogind-lrt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -778,6 +778,7 @@ - - libelogind_core_la_LIBADD = \ - $(UDEV_LIBS) \ -+ -lrt \ - libelogind-internal.la - - if HAVE_ACL diff --git a/sys-auth/elogind/files/elogind.conf b/sys-auth/elogind/files/elogind.conf deleted file mode 100644 index fafc1ae..0000000 --- a/sys-auth/elogind/files/elogind.conf +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/elogind: config file for /etc/init.d/elogind - -# this is the elogind executable -ELOGIND_EXEC="/usr/libexec/elogind/elogind" - -# this is where elogind will store its pid file -ELOGIND_PIDFILE="/var/run/elogind.pid" diff --git a/sys-auth/elogind/files/elogind.init b/sys-auth/elogind/files/elogind.init deleted file mode 100644 index af7c82e..0000000 --- a/sys-auth/elogind/files/elogind.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need dbus - - # Make sure elogind is up before xdm starts any dm - before xdm -} - -start() { - ebegin "Starting elogind" - - # elogind needs a /run/systemd directory - if [[ ! -e /run/systemd ]]; then - mkdir -p /run/systemd - chmod 644 /run/systemd - fi - - start-stop-daemon --start --quiet --background \ - --make-pidfile --pidfile "${ELOGIND_PIDFILE}" \ - --exec "${ELOGIND_EXEC}" - eend $? -} - -stop() { - ebegin "Stopping elogind" - start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}" - eend $? -} diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml deleted file mode 100644 index 64e0ff8..0000000 --- a/sys-auth/elogind/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="apparmor">Enable AppArmor support</flag> - </use> -</pkgmetadata>
