aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2019-04-04 19:13:44 -0500
committerJory Pratt <anarchy@gentoo.org>2019-04-04 19:13:44 -0500
commit8af5d3267ae4593548c172a92863a4a20ab2ddd3 (patch)
tree950948d84c9ca1d0f36d01c8ea3338ae02f4898a /sys-auth/elogind/files
parentnet-misc/networkmanager: update to use networkmanager-1.16.0 (diff)
downloadmusl-8af5d3267ae4593548c172a92863a4a20ab2ddd3.tar.gz
musl-8af5d3267ae4593548c172a92863a4a20ab2ddd3.tar.bz2
musl-8af5d3267ae4593548c172a92863a4a20ab2ddd3.zip
sys-auth/elogind: update to 239.4 wich is working on musl
Package-Manager: Portage-2.3.62, 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-226.4-docs.patch15
-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-fix-musl.patch38
-rw-r--r--sys-auth/elogind/files/elogind.conf8
6 files changed, 79 insertions, 61 deletions
diff --git a/sys-auth/elogind/files/elogind-226.4-docs.patch b/sys-auth/elogind/files/elogind-226.4-docs.patch
deleted file mode 100644
index 4161f63..0000000
--- a/sys-auth/elogind/files/elogind-226.4-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am 2017-02-16 13:22:56.764985896 +0100
-+++ b/Makefile.am 2017-02-16 13:23:04.998986057 +0100
-@@ -194,12 +194,6 @@
- bin_PROGRAMS =
- rootlibexec_PROGRAMS =
-
--dist_doc_DATA = \
-- README \
-- NEWS \
-- LICENSE.LGPL2.1 \
-- LICENSE.GPL2
--
- @INTLTOOL_POLICY_RULE@
-
- # ------------------------------------------------------------------------------
diff --git a/sys-auth/elogind/files/elogind-238.1-docs.patch b/sys-auth/elogind/files/elogind-238.1-docs.patch
new file mode 100644
index 0000000..2288ddf
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-238.1-docs.patch
@@ -0,0 +1,23 @@
+--- 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
new file mode 100644
index 0000000..ae9442f
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-239-fix-musl.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000..601d1cb
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-239.3-broken-test.patch
@@ -0,0 +1,23 @@
+--- 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-fix-musl.patch b/sys-auth/elogind/files/elogind-fix-musl.patch
deleted file mode 100644
index 4aba103..0000000
--- a/sys-auth/elogind/files/elogind-fix-musl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/test/test-hexdecoct.c
-+++ b/src/test/test-hexdecoct.c
-@@ -22,6 +22,16 @@
- #include "macro.h"
- #include "string-util.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');
---- a/src/test/test-sizeof.c
-+++ b/src/test/test-sizeof.c
-@@ -48,8 +48,6 @@
- info(unsigned);
- info(long unsigned);
- info(long long unsigned);
-- info(__syscall_ulong_t);
-- info(__syscall_slong_t);
-
- info(float);
- info(double);
-@@ -59,7 +57,6 @@
- info(ssize_t);
- info(time_t);
- info(usec_t);
-- info(__time_t);
-
- info(enum Enum);
- info(enum BigEnum);
diff --git a/sys-auth/elogind/files/elogind.conf b/sys-auth/elogind/files/elogind.conf
deleted file mode 100644
index b66a158..0000000
--- a/sys-auth/elogind/files/elogind.conf
+++ /dev/null
@@ -1,8 +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"
-