diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
commit | eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch) | |
tree | 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /sys-auth/elogind | |
parent | a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff) |
gentoo resync : 18.05.2019
Diffstat (limited to 'sys-auth/elogind')
-rw-r--r-- | sys-auth/elogind/Manifest | 5 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-241.2.ebuild | 130 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-241.3.ebuild | 2 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-241.2-unbreak-musl.patch | 41 |
4 files changed, 2 insertions, 176 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 5a7388019181..63960aaf4f15 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,13 +1,10 @@ AUX elogind-238.1-docs.patch 793 BLAKE2B eb6683d5bf221459fb0ff0aab6f10f179769bcaf6a914f6b41f8526ee2075924f80cee1cd320aa7697d60bed24d5652e6bc8c02451a0da98c4b29cb8a73641ce SHA512 16503a616b511e4cf049260c34b1390844ce06b22a99e31813b11886d1dc12c90aa46b3dc67343b2a33df85923b5cd6116d7338ee9bd32f2d7a9be9db934ca74 AUX elogind-239.3-broken-test.patch 593 BLAKE2B 16b67f89479d823609e44af141bb51790b2e06ae3e9f56977f2fc231fb5e5ac5419df6ad5c13b10650dc9b87f2470307f65619530d8e0f2be505a1a4344a1e31 SHA512 cebf306753beefc9ce5c62ca3c5afa332fac9757868f1b58664b2fb2ee1d39b38786362cf5c2f045b5f96bd9d10558bfcd1c787fc6eb9cfb61514807aeeb9208 AUX elogind-241.1-docs.patch 855 BLAKE2B 08fc89a264ab0408c13caa059649a004b775ec2e75ca0561d658106c9947ee0f6b9594ede8a40eb0fb7d0d0454123411f7c408e4701b88d20e0c4042a84b6916 SHA512 9260d94e77512ab8dede225d01c56194b01a0140be66489991ec17f6e1d09f7ab9f9b2efa0205fe3c6c3dedcd2145d6b9eb6126aef047a02e228cd4270972124 -AUX elogind-241.2-unbreak-musl.patch 1364 BLAKE2B fd47458717d77352b14d297e7501c9c0384ff58083ff2eaa88a2c6e7878c65b78b76892afab0ebf793b9e80a8ff516bd98288a0cae8db26d2520e9b8b8c8c833 SHA512 835098e8189878882fbe6fe0238544db0ae4cbbaa9091508f08525fc79dc62d22bda19f05c4ba9aba09a732a155bdef8dc7c471ba237f8a95c2b0ada0b53423a AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a DIST elogind-239.4.tar.gz 1183999 BLAKE2B 3a0aa216ee565ae8f3311b16af9752a99519254ac8737de2a44821e95d05b3e2d8b82af3d397367e8804d7bc45cb942859516f195848ba0317aa73891d77903b SHA512 84e9765d7c3039478b06a683870b37ec718724f1185b56c1b74885133283ad1678f3ca8a73510cb4b0777d099c54f59e927caaae7ae988abda803150b84cf8fc -DIST elogind-241.2.tar.gz 1399508 BLAKE2B 4f4104785c629b1d7378439ab03e2bead800bbe2403120b9337e747aee5b5d0486cc893b49ddc972c833b2201c7eeef3b60e34b4f5c9cf1d6a89e9a487888a8a SHA512 7f4a822682856547d430f893bb55a9bf5fc2680aff1b31bb3f120f92ccb1d69b848cbba7f59edd3376d083b641d570bf9c56e62a789090e76e4b37dfb375995a DIST elogind-241.3.tar.gz 1401391 BLAKE2B 90bc10af1b6d66bc6b6e15314cbc7005f270ebd04767a88d93605d81b199758c7f5423ea85f9810f8dfcde82c6c2b8094e2237cf2ca70a9dfc45a4a8e20b0439 SHA512 b33c0ed85c4a97216f8d56441207510be180258d4f4e5ff9dea07d59d53b84b03c27f5397f09214ce9fc880f38865e20d7c05b41255d4b762c33099b7ebb53eb EBUILD elogind-239.4.ebuild 3515 BLAKE2B 57b0f118f082cfe21433d593c68b2a815303219ba1bd5b33e7b966167a0d0c614412093b6c789f64d9c0892c5f17a7ce6e40c3658cf5fb22522f6606add9ab97 SHA512 63565d8fef437ace9ec05856f7590258c9fd37ddee62b4152f947cc889a81435f54cc5c1e70fb5b6b9c79892b67941bbdc3d971eaac561bdd89bf5a09dd71075 -EBUILD elogind-241.2.ebuild 3539 BLAKE2B fc84fa17a2b0beef70971775753ec428c885147178e598341286ada635ce6599beb44f14f7d9e86fa4e6baffd88e0463c208b5fdb607e92ff6e34926b0146272 SHA512 cd237a22e4d02bffe364b5cabc63aebeaf7d0f65cd615c3af3feb77afb6d7612d0ff555568aa4da8b663482c27d859f724c80d5d2a9e0ca323d47b646c363b71 -EBUILD elogind-241.3.ebuild 3499 BLAKE2B 4116a3e8929951c5682664a166d73abd9b2074f47c61bf129321fddf26e783b8b61bb8818fbeaa32ea2d62c0e8f452113dc52f36b7a692f71f255506752188f7 SHA512 94088760be0c15b8c27e0727eb2b8b0197a0396f34d42274828527621dd32318d3d65d32125d689be1fafd95866ab8787aadb52145b84b7933649cf4e8de4320 +EBUILD elogind-241.3.ebuild 3496 BLAKE2B 6dcbf84cbc683cd1cd5a5e3348c53ee5fb2ccc4366645ac57e99c64d386aa59f9ccc1f53537dd9c9c0c0e6be0412ce5815fe37d0ccdc885a111493d8bc8ee48b SHA512 f52d69f97ec4577dd7842f0016b48ba26b280f48c0b09efa90c202c2efcb61e3318c76265ed275fc228421881b97ede6ea232a32ec0eb95718e6eeba4a5e4f66 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68 diff --git a/sys-auth/elogind/elogind-241.2.ebuild b/sys-auth/elogind/elogind-241.2.ebuild deleted file mode 100644 index 9e90bc76496c..000000000000 --- a/sys-auth/elogind/elogind-241.2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 arm64 ~ppc ~ppc64 ~sparc ~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 ) -" - -DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) - -PATCHES=( - "${FILESDIR}/${PN}-241.2-unbreak-musl.patch" - "${FILESDIR}/${PN}-241.1-docs.patch" -) - -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 /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" - -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/elogind-241.3.ebuild b/sys-auth/elogind/elogind-241.3.ebuild index c4f05ff75329..8ee99a8405fe 100644 --- a/sys-auth/elogind/elogind-241.3.ebuild +++ b/sys-auth/elogind/elogind-241.3.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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="+acl debug doc +pam +policykit selinux" COMMON_DEPEND=" diff --git a/sys-auth/elogind/files/elogind-241.2-unbreak-musl.patch b/sys-auth/elogind/files/elogind-241.2-unbreak-musl.patch deleted file mode 100644 index 3688402d2e09..000000000000 --- a/sys-auth/elogind/files/elogind-241.2-unbreak-musl.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cac266581e2bc3595be60171910db6274c3bf944 Mon Sep 17 00:00:00 2001 -From: Sven Eden <sven.eden@prydeworx.com> -Date: Thu, 18 Apr 2019 19:25:55 +0200 -Subject: [PATCH] src/basic/filio.c: Do not disable file buffers on non-glibc - [#130] - -When opening an existing file with open() and then turning is into -a FILE* with fdopen(), a following fputs() returns EOF and sets errno -to EINVAL on musl-libc based systems when setvbuf() was used to turn -off the file buffer. - -To remedy this return to the old behavior until v239 and never -diesable the file buffer in such cases when not on a glibc based -system. - -Bug: #130 -Closes: #130 -Signed-off-by: Sven Eden <sven.eden@prydeworx.com> ---- - src/basic/fileio.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/basic/fileio.c b/src/basic/fileio.c -index e981cd024..eaad5ccf0 100644 ---- a/src/basic/fileio.c -+++ b/src/basic/fileio.c -@@ -162,6 +162,11 @@ int write_string_file_ts( - safe_close(fd); - goto fail; - } -+ -+#ifndef __GLIBC__ /// elogind must not disable buffers on musl-libc based systems when going this route -+ if (flags & WRITE_STRING_FILE_DISABLE_BUFFER) -+ flags ^= WRITE_STRING_FILE_DISABLE_BUFFER; -+#endif // __GLIBC__ - } - - (void) __fsetlocking(f, FSETLOCKING_BYCALLER); --- -2.21.0 - |