From e06bc305a8add7d6a1078959cd3e8e03934d898b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 23 Jun 2018 09:20:53 +0200 Subject: [PATCH] systemd: update to 239 Signed-off-by: Matthias Reichl --- packages/sysutils/systemd/package.mk | 4 +- ...faults-in-libc-after-mounting-cgroup.patch | 42 ------------------- ...emd-0202-fix-_nr_statx-buildspam-aml.patch | 38 ----------------- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-0201-fix-segfaults-in-libc-after-mounting-cgroup.patch delete mode 100644 packages/sysutils/systemd/patches/systemd-0202-fix-_nr_statx-buildspam-aml.patch diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 3019c19edb..1a2642e704 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="238" -PKG_SHA256="bbc8599bab2e3c4273886dfab12464e488ecdaf20b8284949e50f8858de3e022" +PKG_VERSION="239" +PKG_SHA256="8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" diff --git a/packages/sysutils/systemd/patches/systemd-0201-fix-segfaults-in-libc-after-mounting-cgroup.patch b/packages/sysutils/systemd/patches/systemd-0201-fix-segfaults-in-libc-after-mounting-cgroup.patch deleted file mode 100644 index 23ef68dbda..0000000000 --- a/packages/sysutils/systemd/patches/systemd-0201-fix-segfaults-in-libc-after-mounting-cgroup.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/systemd/systemd/pull/8391 -From 3b3a93045c3e35b45e410d765eaad78300104cec Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Thu, 8 Mar 2018 15:22:59 +0900 -Subject: [PATCH] core: do not free heap-allocated strings - -Fixes #8387. ---- - src/core/mount-setup.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c -index 536c17b4d56..9c27972aff5 100644 ---- a/src/core/mount-setup.c -+++ b/src/core/mount-setup.c -@@ -248,6 +248,7 @@ int mount_setup_early(void) { - - int mount_cgroup_controllers(char ***join_controllers) { - _cleanup_set_free_free_ Set *controllers = NULL; -+ bool has_argument = !!join_controllers; - int r; - - if (!cg_is_legacy_wanted()) -@@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) { - - /* Mount all available cgroup controllers that are built into the kernel. */ - -- if (!join_controllers) -+ if (!has_argument) - /* The defaults: - * mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio". - * -@@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) { - - t = set_remove(controllers, *i); - if (!t) { -- free(*i); -+ if (has_argument) -+ free(*i); - continue; - } - } diff --git a/packages/sysutils/systemd/patches/systemd-0202-fix-_nr_statx-buildspam-aml.patch b/packages/sysutils/systemd/patches/systemd-0202-fix-_nr_statx-buildspam-aml.patch deleted file mode 100644 index 5e006df38b..0000000000 --- a/packages/sysutils/systemd/patches/systemd-0202-fix-_nr_statx-buildspam-aml.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/systemd/systemd/pull/8872 -From 773c84349d80c7a6f818f5909a160ddb7337987f Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Wed, 2 May 2018 04:04:50 -0400 -Subject: [PATCH] add __nr_statx defines for extra architectures (#8872) - -This includes: - - arm - - arm64 - - alpha - - powerpc64 - - sparc - -Taken from kernel 4.16.6 ---- - src/basic/missing_syscall.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 2948f789b51..42ada30d524 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -403,8 +403,14 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) { - - #if !HAVE_STATX - # ifndef __NR_statx --# if defined __i386__ -+# if defined __aarch64__ || defined __arm__ -+# define __NR_statx 397 -+# elif defined __alpha__ -+# define __NR_statx 522 -+# elif defined __i386__ || defined __powerpc64__ - # define __NR_statx 383 -+# elif defined __sparc__ -+# define __NR_statx 360 - # elif defined __x86_64__ - # define __NR_statx 332 - # else