* [gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
@ 2017-02-20 11:19 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-02-20 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 4a2d803749f9fc7c068ab5d77257eebe43812230
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 11:17:58 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 11:19:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a2d8037
sys-auth/elogind: add live ebuild
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-auth/elogind/elogind-9999.ebuild | 90 +++++++++++++++++++++++++++++++
sys-auth/elogind/files/elogind-docs.patch | 15 ++++++
sys-auth/elogind/files/elogind.conf | 7 +++
sys-auth/elogind/files/elogind.init | 32 +++++++++++
sys-auth/elogind/metadata.xml | 10 ++++
5 files changed, 154 insertions(+)
diff --git a/sys-auth/elogind/elogind-9999.ebuild b/sys-auth/elogind/elogind-9999.ebuild
new file mode 100644
index 0000000000..38df8c18de
--- /dev/null
+++ b/sys-auth/elogind/elogind-9999.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools git-r3 linux-info pam udev
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+EGIT_BRANCH="dev_v226"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE="acl pam policykit selinux"
+
+COMMON_DEPEND="
+ sys-apps/util-linux
+ sys-libs/libcap
+ virtual/libudev:=
+ acl? ( sys-apps/acl )
+ pam? ( virtual/pam )
+ selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/dbus
+ !sys-apps/systemd
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-util/gperf
+ dev-util/intltool
+ sys-devel/libtool
+ virtual/pkgconfig
+"
+PDEPEND="policykit? ( sys-auth/polkit )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-docs.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
+ ~SIGNALFD ~TIMERFD"
+
+ if use kernel_linux; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf # Makefile.am patched by "${FILESDIR}/${PN}-docs.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 pam) \
+ $(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-docs.patch b/sys-auth/elogind/files/elogind-docs.patch
new file mode 100644
index 0000000000..b48e52d73a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-docs.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -191,12 +191,6 @@
+ rootbin_PROGRAMS =
+ pkglibexec_PROGRAMS =
+
+-dist_doc_DATA = \
+- README \
+- NEWS \
+- LICENSE.LGPL2.1 \
+- LICENSE.GPL2
+-
+ @INTLTOOL_POLICY_RULE@
+
+ # ------------------------------------------------------------------------------
diff --git a/sys-auth/elogind/files/elogind.conf b/sys-auth/elogind/files/elogind.conf
new file mode 100644
index 0000000000..73d1336aec
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.conf
@@ -0,0 +1,7 @@
+# /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
new file mode 100644
index 0000000000..04ce34ab4c
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.init
@@ -0,0 +1,32 @@
+#!/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 755 /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
new file mode 100644
index 0000000000..927a215253
--- /dev/null
+++ b/sys-auth/elogind/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="apparmor">Enable AppArmor support</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
@ 2017-10-10 11:26 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-10-10 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 7d4f082b6f0c5c0b81d31e02840a8a4b9be6456a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 11:24:07 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 11:26:44 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d4f082b
sys-auth/elogind: remove live ebuild
The live ebuild was branch specific to track some upstream changes before
release. Since there's newer versions in the main tree now, this is obsolete.
sys-auth/elogind/elogind-229.9999.ebuild | 85 ----------------------
sys-auth/elogind/files/elogind-229.9999-docs.patch | 15 ----
sys-auth/elogind/files/elogind.conf | 7 --
sys-auth/elogind/files/elogind.init | 25 -------
sys-auth/elogind/metadata.xml | 7 --
5 files changed, 139 deletions(-)
diff --git a/sys-auth/elogind/elogind-229.9999.ebuild b/sys-auth/elogind/elogind-229.9999.ebuild
deleted file mode 100644
index 3e04b1653f..0000000000
--- a/sys-auth/elogind/elogind-229.9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools git-r3 linux-info pam udev
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-EGIT_REPO_URI="https://github.com/elogind/elogind.git"
-EGIT_BRANCH="v229-stable"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS=""
-IUSE="acl debug pam policykit selinux"
-
-RDEPEND="
- sys-apps/util-linux
- sys-libs/libcap
- virtual/libudev:=
- acl? ( sys-apps/acl )
- pam? ( virtual/pam )
- selinux? ( sys-libs/libselinux )
- !sys-apps/systemd
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-util/gperf
- dev-util/intltool
- sys-devel/libtool
- virtual/pkgconfig
-"
-PDEPEND="
- sys-apps/dbus
- policykit? ( sys-auth/polkit )
-"
-
-PATCHES=( "${FILESDIR}/${P}-docs.patch" )
-
-pkg_setup() {
- local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
- ~SIGNALFD ~TIMERFD"
-
- if use kernel_linux; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- default
- eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
-}
-
-src_configure() {
- econf \
- --with-pamlibdir=$(getpam_mod_dir) \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --with-rootlibdir="${EPREFIX}"/$(get_libdir) \
- --enable-smack \
- --disable-kdbus \
- $(use_enable debug debug elogind) \
- $(use_enable acl) \
- $(use_enable pam) \
- $(use_enable selinux)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || 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-229.9999-docs.patch b/sys-auth/elogind/files/elogind-229.9999-docs.patch
deleted file mode 100644
index b48e52d73a..0000000000
--- a/sys-auth/elogind/files/elogind-229.9999-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -191,12 +191,6 @@
- rootbin_PROGRAMS =
- pkglibexec_PROGRAMS =
-
--dist_doc_DATA = \
-- README \
-- NEWS \
-- LICENSE.LGPL2.1 \
-- LICENSE.GPL2
--
- @INTLTOOL_POLICY_RULE@
-
- # ------------------------------------------------------------------------------
diff --git a/sys-auth/elogind/files/elogind.conf b/sys-auth/elogind/files/elogind.conf
deleted file mode 100644
index 73d1336aec..0000000000
--- 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 fc5ac38184..0000000000
--- a/sys-auth/elogind/files/elogind.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need dbus
-
- # Make sure elogind is up before xdm starts any dm
- before xdm
-}
-
-start() {
- ebegin "Starting elogind"
-
- 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 95e86c1210..0000000000
--- a/sys-auth/elogind/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>freedesktop-bugs@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
@ 2017-02-25 9:45 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-02-25 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 8cf2900b95905e4e78312a6d74201d4e12df8d27
Author: Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Sat Feb 25 09:44:10 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 09:44:49 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cf2900b
sys-auth/elogind: improve ebuild
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{elogind-9999.ebuild => elogind-225.9999.ebuild} | 16 +++++++---------
.../{elogind-docs.patch => elogind-225.9999-docs.patch} | 0
sys-auth/elogind/metadata.xml | 3 ---
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/sys-auth/elogind/elogind-9999.ebuild b/sys-auth/elogind/elogind-225.9999.ebuild
similarity index 80%
rename from sys-auth/elogind/elogind-9999.ebuild
rename to sys-auth/elogind/elogind-225.9999.ebuild
index 38df8c18de..75c77b0a5e 100644
--- a/sys-auth/elogind/elogind-9999.ebuild
+++ b/sys-auth/elogind/elogind-225.9999.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="dev_v226"
LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
SLOT="0"
KEYWORDS=""
-IUSE="acl pam policykit selinux"
+IUSE="acl debug pam policykit selinux"
COMMON_DEPEND="
sys-apps/util-linux
@@ -40,7 +40,7 @@ DEPEND="${COMMON_DEPEND}
PDEPEND="policykit? ( sys-auth/polkit )"
PATCHES=(
- "${FILESDIR}/${PN}-docs.patch"
+ "${FILESDIR}/${P}-docs.patch"
)
pkg_setup() {
@@ -54,15 +54,18 @@ pkg_setup() {
src_prepare() {
default
- eautoreconf # Makefile.am patched by "${FILESDIR}/${PN}-docs.patch"
+ eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
}
src_configure() {
econf \
--with-pamlibdir=$(getpam_mod_dir) \
--with-udevrulesdir="$(get_udevdir)"/rules.d \
- --libdir="${EPREFIX}"/$(get_libdir) \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --with-rootlibdir="${EPREFIX}"/$(get_libdir) \
--enable-smack \
+ --disable-kdbus \
+ $(use_enable debug debug elogind) \
$(use_enable acl) \
$(use_enable pam) \
$(use_enable selinux)
@@ -72,11 +75,6 @@ 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}
}
diff --git a/sys-auth/elogind/files/elogind-docs.patch b/sys-auth/elogind/files/elogind-225.9999-docs.patch
similarity index 100%
rename from sys-auth/elogind/files/elogind-docs.patch
rename to sys-auth/elogind/files/elogind-225.9999-docs.patch
diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml
index 927a215253..95e86c1210 100644
--- a/sys-auth/elogind/metadata.xml
+++ b/sys-auth/elogind/metadata.xml
@@ -4,7 +4,4 @@
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
- <use>
- <flag name="apparmor">Enable AppArmor support</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
@ 2017-01-14 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-01-14 19:40 UTC (permalink / raw
To: gentoo-commits
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 <kensington@gentoo.org>
-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 <wingo@pobox.com>
-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>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <use>
- <flag name="apparmor">Enable AppArmor support</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
@ 2017-01-06 22:24 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-01-06 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 1f88f2840e6677ad4615be7f5b3c58f63e392990
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 6 22:22:29 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 22:22:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1f88f284
sys-auth/elogind: Add init script, kernel checks
Gentoo-bug: 599474
Thanks-to: Sven Eden <yamakuzure <AT> gmx.net>
Initial ebuild and init script by Sven Eden, simplified by me.
Package-Manager: portage-2.3.0
sys-auth/elogind/elogind-219.12-r3.ebuild | 90 ++++++++++++++
.../files/elogind-219.12-login1-perms.patch | 129 +++++++++++++++++++++
sys-auth/elogind/files/elogind.conf | 7 ++
sys-auth/elogind/files/elogind.init | 32 +++++
4 files changed, 258 insertions(+)
diff --git a/sys-auth/elogind/elogind-219.12-r3.ebuild b/sys-auth/elogind/elogind-219.12-r3.ebuild
new file mode 100644
index 0000000..6029bac
--- /dev/null
+++ b/sys-auth/elogind/elogind-219.12-r3.ebuild
@@ -0,0 +1,90 @@
+# 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 selinux +seccomp"
+
+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
+ 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}"/usr/$(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
+
+ 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
new file mode 100644
index 0000000..eecf38e
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-219.12-login1-perms.patch
@@ -0,0 +1,129 @@
+From 1ca40c077cd9a08f96a559ba51e8dba230298c4d Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+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.conf b/sys-auth/elogind/files/elogind.conf
new file mode 100644
index 0000000..fafc1ae
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.conf
@@ -0,0 +1,7 @@
+# /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
new file mode 100644
index 0000000..af7c82e
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.init
@@ -0,0 +1,32 @@
+#!/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 $?
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-10 11:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-20 11:19 [gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2017-10-10 11:26 Michael Palimaka
2017-02-25 9:45 Michael Palimaka
2017-01-14 19:40 Andreas Sturmlechner
2017-01-06 22:24 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox