From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- sys-auth/elogind/Manifest | 9 +- sys-auth/elogind/elogind-235.2-r2.ebuild | 123 --------------------- sys-auth/elogind/elogind-235.5.ebuild | 122 -------------------- sys-auth/elogind/elogind-238.1.ebuild | 17 ++- sys-auth/elogind/files/elogind-235.2-docs.patch | 19 ---- .../files/elogind-235.2-drop-logintest.patch | 17 --- .../files/elogind-235.2-legacy-cgroupmode.patch | 56 ---------- 7 files changed, 14 insertions(+), 349 deletions(-) delete mode 100644 sys-auth/elogind/elogind-235.2-r2.ebuild delete mode 100644 sys-auth/elogind/elogind-235.5.ebuild delete mode 100644 sys-auth/elogind/files/elogind-235.2-docs.patch delete mode 100644 sys-auth/elogind/files/elogind-235.2-drop-logintest.patch delete mode 100644 sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch (limited to 'sys-auth/elogind') diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 1da138a75f84..b71411f0417f 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,13 +1,6 @@ -AUX elogind-235.2-docs.patch 652 BLAKE2B c1d5336d18942efb082e39b2278b8af88da5da37c54a9cca0a9fd45f11fc8751da720d80dfad2c2688ebe81cac3101b491a098b516403bd4c46d9c277d39b2e8 SHA512 59179098c638b8b7228ed6013ff133305138b4aff32e8210fddcc8b056e21d2baeb8619debc9c2231f629cd5c99b79040da677f1eddc958119e488a91222f011 -AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe -AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2 AUX elogind-238.1-docs.patch 793 BLAKE2B eb6683d5bf221459fb0ff0aab6f10f179769bcaf6a914f6b41f8526ee2075924f80cee1cd320aa7697d60bed24d5652e6bc8c02451a0da98c4b29cb8a73641ce SHA512 16503a616b511e4cf049260c34b1390844ce06b22a99e31813b11886d1dc12c90aa46b3dc67343b2a33df85923b5cd6116d7338ee9bd32f2d7a9be9db934ca74 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a -DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313 -DIST elogind-235.5.tar.gz 990321 BLAKE2B 03730f449e01ef74a92aa3313f59b93de3941425f95610e2d50dd6a0651682df5f2e245f9eeaeef5c5fd38300102fbccc980a55466ea12100e8904f126a5c44f SHA512 8f12c576f291fb9768e343e8257c74c62686f1a67b10170715b678e0431692cec7b6382102467dd2598a331c20d823d935128d5ff36f5b074dc02802ffec863c DIST elogind-238.1.tar.gz 1074179 BLAKE2B 3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3 SHA512 ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c -EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402 -EBUILD elogind-235.5.ebuild 3248 BLAKE2B ea8412e276879ad063cba63f3385d152464120344d041bc900370344d7a4233a3b3496f428cea8b91703e3b02383e0d0bc2cf00c5683188baadbb9a6acf0fc1f SHA512 12fd4d2a03049406ed12d5c436b6386938e15b5a92b03114a4e1f76c7dd2671c5cbb5a613ac0fb5455cf2d472f287b7bb0344135ef4fb66739381d3da779b6ea -EBUILD elogind-238.1.ebuild 3171 BLAKE2B 2097e4ce51024006d51ee7248c29c1d24d9989f83c17da1c6b503582f82a1af258d4873207830a62914cde67dbd94900c457d47adaf11314693b37b651472942 SHA512 f0c93cecc2561a254516f2a0a7c415989a5ecedb0399374d64838c154ebbb7b00c91aabf931597a1938b3a150ee01ccf07d28f317302ad1a3dd416b1a4bb819f +EBUILD elogind-238.1.ebuild 3472 BLAKE2B e0be747f257ee41fabb5294e16aef69f4d071aa04b6bf6dad05b67648957b69a41f99d80515d37a038fa11e539d657dac23fab4fe757365974d691b2914354bc SHA512 907afc4f04ad48b7eb9ea278e6ea116639c5d27d71f52b1dbe236f3b4016cff1fa5323686b27d27723589c86479922c0801ea9aa0d0596b2931a82615d912a08 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68 diff --git a/sys-auth/elogind/elogind-235.2-r2.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild deleted file mode 100644 index bae01cc02e4f..000000000000 --- a/sys-auth/elogind/elogind-235.2-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info meson pam udev xdg-utils - -DESCRIPTION="The systemd project's logind, extracted to a standalone package" -HOMEPAGE="https://github.com/elogind/elogind" -SRC_URI="https://github.com/${PN}/${PN}/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 debug doc +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 ) -" -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 -" -RDEPEND="${COMMON_DEPEND} - !sys-apps/systemd -" -PDEPEND=" - sys-apps/dbus - policykit? ( sys-auth/polkit ) -" - -PATCHES=( - "${FILESDIR}/${P}-docs.patch" - "${FILESDIR}/${P}-legacy-cgroupmode.patch" - "${FILESDIR}/${P}-drop-logintest.patch" # bug 645156 -) - -pkg_setup() { - local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" - - if use kernel_linux; then - linux-info_pkg_setup - fi -} - -src_prepare() { - default - xdg_environment_reset -} - -src_configure() { - local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" - local cgroupmode="legacy" - - if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then - cgroupmode="hybrid" - elif [[ "xunified" = "x${rccgroupmode}" ]] ; then - cgroupmode="unified" - fi - - local emesonargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" - -Dpamlibdir=$(getpam_mod_dir) - -Dudevrulesdir="$(get_udevdir)"/rules.d - --libdir="${EPREFIX}"/usr/$(get_libdir) - -Drootlibdir="${EPREFIX}"/$(get_libdir) - -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind - -Drootprefix="${EPREFIX}/" - -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" - -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" - -Dman=auto - -Dsmack=true - -Dcgroup-controller=openrc - -Ddefault-hierarchy=${cgroupmode} - -Ddefault-kill-user-processes=false - -Dacl=$(usex acl true false) - -Ddebug=$(usex debug elogind false) - --buildtype $(usex debug debug release) - -Dhtml=$(usex doc auto false) - -Dpam=$(usex pam true false) - -Dselinux=$(usex selinux true false) - ) - - meson_src_configure -} - -src_install() { - DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) - - meson_src_install - - newinitd "${FILESDIR}"/${PN}.init ${PN} - - sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die - newconfd ${PN}.conf ${PN} -} - -pkg_postinst() { - if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then - elog "elogind is currently started from boot runlevel." - elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then - ewarn "elogind is currently started from default runlevel." - ewarn "Please remove elogind from the default runlevel and" - ewarn "add it to the boot runlevel by:" - ewarn "# rc-update del elogind default" - ewarn "# rc-update add elogind boot" - else - ewarn "elogind is currently not started from any runlevel." - ewarn "You may add it to the boot runlevel by:" - ewarn "# rc-update add elogind boot" - fi -} diff --git a/sys-auth/elogind/elogind-235.5.ebuild b/sys-auth/elogind/elogind-235.5.ebuild deleted file mode 100644 index c2dbf0ad0277..000000000000 --- a/sys-auth/elogind/elogind-235.5.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info meson pam udev xdg-utils - -DESCRIPTION="The systemd project's logind, extracted to a standalone package" -HOMEPAGE="https://github.com/elogind/elogind" -SRC_URI="https://github.com/${PN}/${PN}/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 debug doc +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 ) -" -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 -" -RDEPEND="${COMMON_DEPEND} - !sys-apps/systemd -" -PDEPEND=" - sys-apps/dbus - policykit? ( sys-auth/polkit ) -" - -PATCHES=( - "${FILESDIR}/${PN}-235.2-docs.patch" - "${FILESDIR}/${PN}-235.2-drop-logintest.patch" # bug 645156 -) - -pkg_setup() { - local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" - - if use kernel_linux; then - linux-info_pkg_setup - fi -} - -src_prepare() { - default - xdg_environment_reset -} - -src_configure() { - local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" - local cgroupmode="legacy" - - if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then - cgroupmode="hybrid" - elif [[ "xunified" = "x${rccgroupmode}" ]] ; then - cgroupmode="unified" - fi - - local emesonargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" - -Dpamlibdir=$(getpam_mod_dir) - -Dudevrulesdir="$(get_udevdir)"/rules.d - --libdir="${EPREFIX}"/usr/$(get_libdir) - -Drootlibdir="${EPREFIX}"/$(get_libdir) - -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind - -Drootprefix="${EPREFIX}/" - -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" - -Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" - -Dman=auto - -Dsmack=true - -Dcgroup-controller=openrc - -Ddefault-hierarchy=${cgroupmode} - -Ddefault-kill-user-processes=false - -Dacl=$(usex acl true false) - -Ddebug=$(usex debug elogind false) - --buildtype $(usex debug debug release) - -Dhtml=$(usex doc auto false) - -Dpam=$(usex pam true false) - -Dselinux=$(usex selinux true false) - ) - - meson_src_configure -} - -src_install() { - DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) - - meson_src_install - - newinitd "${FILESDIR}"/${PN}.init ${PN} - - sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die - newconfd ${PN}.conf ${PN} -} - -pkg_postinst() { - if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then - elog "elogind is currently started from boot runlevel." - elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then - ewarn "elogind is currently started from default runlevel." - ewarn "Please remove elogind from the default runlevel and" - ewarn "add it to the boot runlevel by:" - ewarn "# rc-update del elogind default" - ewarn "# rc-update add elogind boot" - else - ewarn "elogind is currently not started from any runlevel." - ewarn "You may add it to the boot runlevel by:" - ewarn "# rc-update add elogind boot" - fi -} diff --git a/sys-auth/elogind/elogind-238.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild index c532686d9faa..cc148ee6f8da 100644 --- a/sys-auth/elogind/elogind-238.1.ebuild +++ b/sys-auth/elogind/elogind-238.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="CC0-1.0 LGPL-2.1+ public-domain" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="+acl debug doc +pam +policykit selinux" COMMON_DEPEND=" @@ -113,8 +113,17 @@ pkg_postinst() { ewarn "# rc-update del elogind default" ewarn "# rc-update add elogind boot" else - ewarn "elogind is currently not started from any runlevel." - ewarn "You may add it to the boot runlevel by:" - ewarn "# rc-update add elogind boot" + elog "elogind is currently not started from any runlevel." + elog "You may add it to the boot runlevel by:" + elog "# rc-update add elogind boot" + elog + elog "Alternatively, you can leave elogind out of any" + elog "runlevel. It will then be started automatically" + if use pam; then + elog "when the first service calls it via dbus, or" + elog "the first user logs into the system." + else + elog "when the first service calls it via dbus." + fi fi } diff --git a/sys-auth/elogind/files/elogind-235.2-docs.patch b/sys-auth/elogind/files/elogind-235.2-docs.patch deleted file mode 100644 index 7fbb4594bdc4..000000000000 --- a/sys-auth/elogind/files/elogind-235.2-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/meson.build 2018-01-14 18:59:36.141461154 +0100 -+++ b/meson.build 2018-01-14 19:00:46.208461781 +0100 -@@ -2634,16 +2634,5 @@ - # install_data('modprobe.d/systemd.conf', - # install_dir : modprobedir) - #endif // 0 --install_data('README', -- 'NEWS', -- 'CODING_STYLE', --#if 0 /// UNNEEDED by elogind --# 'DISTRO_PORTING', --# 'ENVIRONMENT.md', --#endif // 0 -- 'LICENSE.GPL2', -- 'LICENSE.LGPL2.1', -- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION', -- install_dir : docdir) - - meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) diff --git a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch b/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch deleted file mode 100644 index 45f17f1b843a..000000000000 --- a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/test/meson.build 2018-01-15 20:34:18.000000000 +0100 -+++ b/src/test/meson.build 2018-01-31 15:11:33.342989914 +0100 -@@ -868,10 +868,10 @@ - # [], - # [threads]], - #endif // 0 -- -- [['src/libelogind/sd-login/test-login.c'], -- [], -- []], -+# Broken in chroot; needs elogind at runtime? -+# [['src/libelogind/sd-login/test-login.c'], -+# [], -+# []], - ] - - #if 0 /// UNNEEDED in elogind diff --git a/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch b/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch deleted file mode 100644 index eb86e930f6f8..000000000000 --- a/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 003ece760231aba0c661e2390dfd11075d72a8da Mon Sep 17 00:00:00 2001 -From: Sven Eden -Date: Thu, 18 Jan 2018 23:01:12 +0100 -Subject: [PATCH] Prep v235.3 : Fix cgroup hierarchy detection code - -There is no sub-grouping with elogind, so /sys/fs/cgroup/elogind is -not needed to be mounted as cgroup fs in legacy mode. - -Fixes Bug https://bugs.gentoo.org/644834 ---- - src/basic/cgroup-util.c | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7f86c532c..cb60108ef 100644 ---- a/src/basic/cgroup-util.c -+++ b/src/basic/cgroup-util.c -@@ -2550,28 +2550,31 @@ static int cg_unified_update(void) { - - if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) - unified_cache = CGROUP_UNIFIED_ALL; -+#if 0 /// The handling of cgroups is a bit different with elogind - else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) { -+#else -+ else if (F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC) -+ || F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) { -+#endif // 0 - if (statfs("/sys/fs/cgroup/unified/", &fs) == 0 && - F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) { - unified_cache = CGROUP_UNIFIED_SYSTEMD; - unified_systemd_v232 = false; - #if 0 /// elogind uses its own name - } else if (statfs("/sys/fs/cgroup/systemd/", &fs) == 0 && -- F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) { -- unified_cache = CGROUP_UNIFIED_SYSTEMD; -- unified_systemd_v232 = true; -- } else { -- if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) -- return -errno; - #else - } else if (statfs("/sys/fs/cgroup/elogind/", &fs) == 0 && -+#endif // 0 - F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) { - unified_cache = CGROUP_UNIFIED_SYSTEMD; - unified_systemd_v232 = true; - } else { --#endif // 0 -+#if 0 /// There is no sub-grouping within elogind -+ if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) -+ return -errno; - if (!F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC)) - return -ENOMEDIUM; -+#endif // 0 - unified_cache = CGROUP_UNIFIED_NONE; - } - } else -- cgit v1.2.3