From 5c978f7aab7f3c6c7af1e0d61ea63b5de92aa8e7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 7 Apr 2019 12:24:44 +0200 Subject: [PATCH] elogind: add patches to fix elogind on musl Add these patches for glibc too as they make sense. --- .../patches/reverse_CLOSE_ON_EXEC_removal.patch | 13 +++++++++++++ .../reverse_DISABLE_BUFFER_in_cg_attach.patch | 13 +++++++++++++ srcpkgs/elogind/template | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/elogind/patches/reverse_CLOSE_ON_EXEC_removal.patch create mode 100644 srcpkgs/elogind/patches/reverse_DISABLE_BUFFER_in_cg_attach.patch diff --git a/srcpkgs/elogind/patches/reverse_CLOSE_ON_EXEC_removal.patch b/srcpkgs/elogind/patches/reverse_CLOSE_ON_EXEC_removal.patch new file mode 100644 index 0000000000..6406396333 --- /dev/null +++ b/srcpkgs/elogind/patches/reverse_CLOSE_ON_EXEC_removal.patch @@ -0,0 +1,13 @@ +diff --git ./src/basic/fileio.c ./src/basic/fileio.c +index e981cd024..ffcbf7309 100644 +--- ./src/basic/fileio.c ++++ ./src/basic/fileio.c +@@ -156,7 +156,7 @@ int write_string_file_ts( + goto fail; + } + +- f = fdopen(fd, "w"); ++ f = fdopen(fd, "we"); + if (!f) { + r = -errno; + safe_close(fd); diff --git a/srcpkgs/elogind/patches/reverse_DISABLE_BUFFER_in_cg_attach.patch b/srcpkgs/elogind/patches/reverse_DISABLE_BUFFER_in_cg_attach.patch new file mode 100644 index 0000000000..cec4d95704 --- /dev/null +++ b/srcpkgs/elogind/patches/reverse_DISABLE_BUFFER_in_cg_attach.patch @@ -0,0 +1,13 @@ +diff --git ./src/basic/cgroup-util.c ./src/basic/cgroup-util.c +index 9235361b6..11102790e 100644 +--- ./src/basic/cgroup-util.c ++++ ./src/basic/cgroup-util.c +@@ -824,7 +824,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { + + xsprintf(c, PID_FMT "\n", pid); + +- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, c, 0); + if (r < 0) + return r; + diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index d140ae7c58..5c580555df 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,7 +1,7 @@ # Template file for 'elogind' pkgname=elogind version=241.2 -revision=1 +revision=2 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot