aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2019-04-18 16:01:11 -0500
committerJory Pratt <anarchy@gentoo.org>2019-04-18 16:01:11 -0500
commit9057585df5e2dd8a3e9ac28dea580e5a3fc55de4 (patch)
treea0705925d9af1e6d3cead92c0e305cd5fc913441 /sys-auth/elogind/files
parentnet-fs/samba: 4.8.6-r2 stable on amd64 and x86 (diff)
downloadmusl-9057585df5e2dd8a3e9ac28dea580e5a3fc55de4.tar.gz
musl-9057585df5e2dd8a3e9ac28dea580e5a3fc55de4.tar.bz2
musl-9057585df5e2dd8a3e9ac28dea580e5a3fc55de4.zip
sys-auth/elogind: use in tree 241.2 which is fully supported
Package-Manager: Portage-2.3.63, Repoman-2.3.12 Signed-off-by: Jory Pratt <anarchy@gentoo.org>
Diffstat (limited to 'sys-auth/elogind/files')
-rw-r--r--sys-auth/elogind/files/elogind-238.1-docs.patch23
-rw-r--r--sys-auth/elogind/files/elogind-239-fix-musl.patch33
-rw-r--r--sys-auth/elogind/files/elogind-239.3-broken-test.patch23
-rw-r--r--sys-auth/elogind/files/elogind.conf.in7
-rw-r--r--sys-auth/elogind/files/elogind.init25
5 files changed, 0 insertions, 111 deletions
diff --git a/sys-auth/elogind/files/elogind-238.1-docs.patch b/sys-auth/elogind/files/elogind-238.1-docs.patch
deleted file mode 100644
index 2288ddf..0000000
--- a/sys-auth/elogind/files/elogind-238.1-docs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/meson.build 2018-06-25 16:41:00.000000000 +0200
-+++ b/meson.build 2018-06-30 21:45:52.139755680 +0200
-@@ -2928,11 +2928,6 @@
- # install_data('modprobe.d/systemd.conf',
- # install_dir : modprobedir)
- #endif // 0
--install_data('LICENSE.GPL2',
-- 'LICENSE.LGPL2.1',
-- 'NEWS',
-- 'README',
-- 'doc/CODING_STYLE',
- #if 0 /// irrelevant for elogind
- # 'doc/DISTRO_PORTING',
- # 'doc/ENVIRONMENT.md',
-@@ -2941,8 +2936,6 @@
- # 'doc/TRANSLATORS',
- # 'doc/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-239-fix-musl.patch b/sys-auth/elogind/files/elogind-239-fix-musl.patch
deleted file mode 100644
index ae9442f..0000000
--- a/sys-auth/elogind/files/elogind-239-fix-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 347c5bb22f8f79f339e578e30a19fed15e7f3e09 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Thu, 4 Apr 2019 18:59:18 -0500
-Subject: [PATCH] fix musl libc compile
-
----
- src/test/test-hexdecoct.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
-index 101a78b..dc4e09b 100644
---- a/src/test/test-hexdecoct.c
-+++ b/src/test/test-hexdecoct.c
-@@ -10,6 +10,16 @@
- /// Additional includes needed by elogind
- #include "musl_missing.h"
-
-+#define strndupa(s, n) \
-+ ({ \
-+ const char *__in = (s); \
-+ size_t __len = strnlen(__in, (n)); \
-+ char *__out = (char *)alloca(__len + 1); \
-+ __out[__len] = '\0'; \
-+ (char *)memcpy(__out, __in, __len); \
-+ })
-+
-+
- static void test_hexchar(void) {
- assert_se(hexchar(0xa) == 'a');
- assert_se(hexchar(0x0) == '0');
---
-2.21.0
-
diff --git a/sys-auth/elogind/files/elogind-239.3-broken-test.patch b/sys-auth/elogind/files/elogind-239.3-broken-test.patch
deleted file mode 100644
index 601d1cb..0000000
--- a/sys-auth/elogind/files/elogind-239.3-broken-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/test/meson.build 2018-12-07 07:36:50.000000000 +0100
-+++ b/src/test/meson.build 2019-02-15 00:50:23.254064681 +0100
-@@ -947,13 +947,13 @@
- # [['src/libsystemd/sd-resolve/test-resolve.c'],
- # [],
- # [threads]],
--#endif // 0
--
-- [['src/libelogind/sd-login/test-login.c'],
-- [],
-- []],
--
--#if 0 /// UNNEEDED in elogind
-+#
-+#
-+# [['src/libelogind/sd-login/test-login.c'],
-+# [],
-+# []],
-+#
-+#
- # [['src/libsystemd/sd-device/test-udev-device-thread.c'],
- # [libbasic,
- # libshared_static,
diff --git a/sys-auth/elogind/files/elogind.conf.in b/sys-auth/elogind/files/elogind.conf.in
deleted file mode 100644
index 7b05b35..0000000
--- a/sys-auth/elogind/files/elogind.conf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/elogind: config file for /etc/init.d/elogind
-
-# this is the elogind executable
-ELOGIND_EXEC="/@libdir@/elogind/elogind"
-
-# this is where elogind will store its pid file
-ELOGIND_PIDFILE="/run/elogind.pid"
diff --git a/sys-auth/elogind/files/elogind.init b/sys-auth/elogind/files/elogind.init
deleted file mode 100644
index 019c3af..0000000
--- 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 \
- --pidfile "${ELOGIND_PIDFILE}" \
- --exec "${ELOGIND_EXEC}" -- --daemon
- eend $?
-}
-
-stop() {
- ebegin "Stopping elogind"
- start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}"
- eend $?
-}