From 8fce81733c74d9b5e7263849363e1e3f01e4613b Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Fri, 27 Apr 2018 09:57:34 -0300
Subject: [PATCH] elogind: update to 236.1.

Closes #13906.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
---
 .../patches/fix-missing-ftw-macros.patch      | 34 +++++++++++++++++++
 srcpkgs/elogind/template                      | 32 +++++++----------
 2 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/elogind/patches/fix-missing-ftw-macros.patch

diff --git a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch b/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch
new file mode 100644
index 00000000000..3cdfdf061c5
--- /dev/null
+++ b/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch
@@ -0,0 +1,34 @@
+Source: maxice8
+Upstream: https://github.com/elogind/elogind/pull/57
+Reason: add missing FTW_* macros for musl libc based systems
+
+--- src/shared/musl_missing.h
++++ src/shared/musl_missing.h
+@@ -107,6 +107,27 @@ typedef __compar_fn_t comparison_fn_t;
+  */
+ #define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child)
+ 
++/* 
++ * Missing FTW macros in musl, define them if not defined
++ * taken from
++ * https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
++ */
++#ifndef FTW_ACTIONRETVAL
++#define FTW_ACTIONRETVAL 16
++#endif
++
++#ifndef FTW_CONTINUE
++#define FTW_CONTINUE 0
++#endif
++
++#ifndef FTW_STOP
++#define FTW_STOP 1
++#endif
++
++#ifndef FTW_SKIP_SUBTREE
++#define FTW_SKIP_SUBTREE 2
++#endif
++
+ #endif // !defined(__GLIBC__)
+ 
+ #endif // ELOGIND_BASIC_MUSL_MISSING_H_INCLUDED
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index bd67182e1c5..0a43f62cfdc 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,31 +1,23 @@
 # Template file for 'elogind'
 pkgname=elogind
-version=235.3
-revision=4
+version=236.1
+revision=1
 build_style=meson
-hostmakedepends="intltool pkg-config gperf docbook-xsl gettext-devel shadow m4 libxslt git"
-makedepends="libcap-devel libmount-devel libseccomp-devel libblkid-devel pam-devel gettext-devel eudev-libudev-devel acl-devel glib-devel"
+configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
+ -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
+ -Dkexec-path=/usr/bin/kexec -Ddefault-hierarchy=legacy"
+hostmakedepends="docbook-xsl gettext-devel git gperf intltool libxslt m4
+ pkg-config shadow"
+makedepends="acl-devel eudev-libudev-devel gettext-devel glib-devel libcap-devel
+ libseccomp-devel pam-devel"
 depends="dbus"
 short_desc="Standalone logind fork"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
-license="GPL-2, LGPL-2"
+license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/elogind/elogind"
 distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=986c78f0504533eaf9dbbe8302ca7c3bbd63a44c12f3577e4094f2f2a2b06355
+checksum=391fdb66d97983827e30e7e518f822c96eadb29d5e54092c3cd348dfb3a7a3b6
 conf_files="/etc/elogind/logind.conf"
-configure_args+="
- -Dcgroup-controller=elogind
- -Drootlibexecdir=/usr/libexec/elogind
- -Dhalt-path=/usr/bin/halt
- -Dreboot-path=/usr/bin/reboot
- -Dkexec-path=/usr/bin/kexec
- -Ddefault-hierarchy=legacy"
-
-pre_build() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) cp build/config.h src/shared;;
-	esac
-}
 
 pre_check() {
 	# test-fs-util checks for /etc/machine-id/foo and expects ENOTDIR
@@ -61,7 +53,7 @@ elogind-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 		vmove usr/share/man/man3
 		vmove usr/lib/pkgconfig
 	}