diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /sys-auth/elogind | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'sys-auth/elogind')
-rw-r--r-- | sys-auth/elogind/Manifest | 4 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-243.4.ebuild | 137 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-243.4-nodocs.patch | 29 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch | 36 |
4 files changed, 0 insertions, 206 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 8166c0e81884..91c4184a912e 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,11 +1,7 @@ AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91ca59077438a1f07d1ecaf1cd68556cf1915460cacb2e3a062702dd84c8ca9729e7c4dfdd385a0435329784c8a33b4a66 SHA512 55435fa4cf902299f4957361393e7d1c5394970193fd814019d4dd5f9abddce3a7ea1da507eee4712f2f98284a989af8b22b6e1ff8a71e8faeb82417d1891c97 -AUX elogind-243.4-nodocs.patch 994 BLAKE2B 14e704d541e44b18f4e95b655c4ab5751f537d638e87c90a08ab5615d68c34c1cd75d8cb3fd8032924965fed1f913df3c1bf214db5d610a4df2bdd98bf89f7e1 SHA512 f3567219f31af39cc43ec2ee6856f0363f2fc98391ea807d7a7887e819b622652d6ca4be02d5d447bb446b323e48f0a5c8d58256aa7c2024eb7af9e4e3033d28 -AUX elogind-243.4-selinux-missing-headers.patch 1040 BLAKE2B c8ba321ea788ed68892b10bb34ea8e293f0536208acda8c5fb6436e3877eed616958178ee908491ea29ce8315cfe0771d35a8a2c4633ead9bf581800a7fcd866 SHA512 b8b7b02f4f94326ed12222bab24327b31859da9037a4bfc24a5868cb2f8c2342d267312cff9e66e5cbf3c9a10231c17b7b57d1513d019cb004308577779aa229 AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a -DIST elogind-243.4.tar.gz 1335747 BLAKE2B 37c4eb1c476f97948aed44901fbd61ee1b1b8215d3167b368be00c542c64cdcb8b1e8e2725515820df4542d800079810e95f59469e3c6f5229932e55de4a3c1f SHA512 9751a3d0ed65dd73d9363097ee1752d437d5636db2a4137395596e0c81e04d4715f314568d1d7c6f367f1ecbda011086cb165bd4dc207302626b16e693cd0a02 DIST elogind-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472 -EBUILD elogind-243.4.ebuild 3745 BLAKE2B 0778c9ca7458d93981579a8965d5b446019defa82128b17fbb6217f3cf090a27ee5355d1124f0a1f7b8fa43d409a5ec01f93e49d0de95212d7fc79b328a2b162 SHA512 bdf33b24df3a9969cf406c6765eb9c549889f37f59df61b3dd8d215d1cdf54430ef6738365a317189a377e0f4c03e37a2c392634dac3b1ea8c52b60959d506d0 EBUILD elogind-243.7.ebuild 3694 BLAKE2B 46f263f7b7df5fe7ab3c4aaa4273f7a32ef6c0004a52e012743392eb0c3622b24ae0a6a27e9c09251904f59e9bd9bbac930e7641e0e52457384627ca8d9b5da2 SHA512 47fb4b2fed51531816064f7a443c209e09e7a75c1839f2d31fb28535796ede5d77e5f15b72b5cdc17cd8f5ab211c14b6d8a87cee339bf1ccb22327b35c95779d MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68 diff --git a/sys-auth/elogind/elogind-243.4.ebuild b/sys-auth/elogind/elogind-243.4.ebuild deleted file mode 100644 index 9b5b3ebd4f36..000000000000 --- a/sys-auth/elogind/elogind-243.4.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_BRANCH="v241-stable" - EGIT_REPO_URI="https://github.com/elogind/elogind.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -fi - -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" - -LICENSE="CC0-1.0 LGPL-2.1+ public-domain" -SLOT="0" -IUSE="+acl debug doc +pam +policykit selinux" - -BDEPEND=" - 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 - virtual/pkgconfig -" -DEPEND=" - sys-apps/util-linux - sys-libs/libcap - virtual/libudev:= - acl? ( sys-apps/acl ) - pam? ( sys-libs/pam ) - selinux? ( sys-libs/libselinux ) -" -RDEPEND="${DEPEND} - !sys-apps/systemd -" -PDEPEND=" - sys-apps/dbus - policykit? ( sys-auth/polkit ) -" - -DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) - -PATCHES=( - "${FILESDIR}/${P}-nodocs.patch" - "${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116 - "${FILESDIR}/${P}-selinux-missing-headers.patch" # bug 711432 -) - -pkg_setup() { - local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" - - use kernel_linux && linux-info_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset -} - -src_configure() { - local rccgroupmode="$(grep rc_cgroup_mode ${EPREFIX}/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="${EPREFIX}$(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" - -Dman=auto - -Dsmack=true - -Dcgroup-controller=openrc - -Ddefault-hierarchy=${cgroupmode} - -Ddefault-kill-user-processes=false - -Dacl=$(usex acl true false) - --buildtype $(usex debug debug release) - -Dhtml=$(usex doc auto false) - -Dpam=$(usex pam true false) - -Dselinux=$(usex selinux true false) - -Dutmp=$(usex elibc_musl false true) - ) - - 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 - 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-243.4-nodocs.patch b/sys-auth/elogind/files/elogind-243.4-nodocs.patch deleted file mode 100644 index c83611a4ef6f..000000000000 --- a/sys-auth/elogind/files/elogind-243.4-nodocs.patch +++ /dev/null @@ -1,29 +0,0 @@ -We don't want the build system to install to docdir for us. - ---- a/meson.build 2020-01-20 08:22:09.000000000 +0100 -+++ b/meson.build 2020-02-02 16:16:00.074882830 +0100 -@@ -3342,15 +3342,11 @@ - # install_data('modprobe.d/systemd.conf', - # install_dir : modprobedir) - #endif // 0 --install_data('LICENSE.GPL2', -- 'LICENSE.LGPL2.1', - #if 0 /// elogind has upgraded to markdown, and the NEWS file is useless - # 'NEWS', - # 'README', - #else -- 'README.md', - #endif // 0 -- 'docs/CODING_STYLE.md', - #if 0 /// irrelevant for elogind - # 'docs/DISTRO_PORTING.md', - # 'docs/ENVIRONMENT.md', -@@ -3359,8 +3355,6 @@ - # 'docs/TRANSLATORS.md', - # 'docs/UIDS-GIDS.md', - #endif // 0 -- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION', -- install_dir : docdir) - - #if 0 /// UNNEEDED by elogind - # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) diff --git a/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch b/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch deleted file mode 100644 index 7cc46fd05ebd..000000000000 --- a/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1cd3fe4083eb8784fa2a125e4af0edb80e6928b5 Mon Sep 17 00:00:00 2001 -From: Sven Eden <sven.eden@prydeworx.com> -Date: Thu, 12 Mar 2020 20:31:00 +0100 -Subject: [PATCH] basic/selinux-util.c : Uncomment missing includes (#157) - -Compiling on Debian unstable failed using gcc 9.2.1 and libc6 2.29. -Uncommenting the two commented includes in basic/selinux-util.c -fixes the compilation issues. - -Bug: #157 -Closes: #157 -Signed-off-by: Sven Eden <sven.eden@prydeworx.com> ---- - src/basic/selinux-util.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c -index 40a85feec..3be9f2c0d 100644 ---- a/src/basic/selinux-util.c -+++ b/src/basic/selinux-util.c -@@ -1,13 +1,13 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - - #include <errno.h> --//#include <fcntl.h> -+#include <fcntl.h> - #include <malloc.h> - #include <stddef.h> - #include <string.h> - #include <sys/stat.h> - #include <sys/time.h> --//#include <sys/types.h> -+#include <sys/types.h> - #include <sys/un.h> - #include <syslog.h> - |