diff options
author | Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-12-23 22:13:54 -0800 |
---|---|---|
committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-12-24 01:04:02 -0800 |
commit | 24543d0cf460e3cf58a55ae4da5228dffb39cb4d (patch) | |
tree | 99a3f498bf2c7c15228a3039d7a9bf25290b7ce5 /sys-apps/systemd-tmpfiles/files | |
parent | app-admin/logmon: fix HOMEPAGE (diff) | |
download | gentoo-24543d0cf460e3cf58a55ae4da5228dffb39cb4d.tar.gz gentoo-24543d0cf460e3cf58a55ae4da5228dffb39cb4d.tar.bz2 gentoo-24543d0cf460e3cf58a55ae4da5228dffb39cb4d.zip |
sys-apps/systemd-tmpfiles: drop 249.2
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'sys-apps/systemd-tmpfiles/files')
-rw-r--r-- | sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch | 67 | ||||
-rw-r--r-- | sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch | 26 |
2 files changed, 0 insertions, 93 deletions
diff --git a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch deleted file mode 100644 index 6d9e0039b9c9..000000000000 --- a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch +++ /dev/null @@ -1,67 +0,0 @@ -Silence annoying #warning's on musl - -https://github.com/systemd/systemd/pull/20362 -https://github.com/systemd/systemd/pull/20364 - -From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Mon, 2 Aug 2021 12:41:38 +0200 -Subject: [PATCH] Use correct `<fcntl.h>` include - -* `<sys/fcntl.h>` is not specified in POSIX ---- - src/basic/fileio.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/fileio.h b/src/basic/fileio.h -index af797cfafdbf..4295b84a85c5 100644 ---- a/src/basic/fileio.h -+++ b/src/basic/fileio.h -@@ -2,11 +2,11 @@ - #pragma once - - #include <dirent.h> -+#include <fcntl.h> - #include <stdbool.h> - #include <stddef.h> - #include <stdio.h> - #include <sys/stat.h> --#include <sys/fcntl.h> - #include <sys/types.h> - - #include "macro.h" -From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Mon, 2 Aug 2021 16:09:10 +0200 -Subject: [PATCH] Use correct `<poll.h>` include - -* `<sys/poll.h>` is not specified in POSIX ---- - src/shared/nscd-flush.c | 2 +- - src/shared/varlink.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c -index dfc47c423441..19e16d93455c 100644 ---- a/src/shared/nscd-flush.c -+++ b/src/shared/nscd-flush.c -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ --#include <sys/poll.h> -+#include <poll.h> - - #include "fd-util.h" - #include "io-util.h" -diff --git a/src/shared/varlink.c b/src/shared/varlink.c -index 3a53c16a7242..4033947d3b8c 100644 ---- a/src/shared/varlink.c -+++ b/src/shared/varlink.c -@@ -1,7 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - - #include <malloc.h> --#include <sys/poll.h> -+#include <poll.h> - - #include "alloc-util.h" - #include "errno-util.h" diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch deleted file mode 100644 index b931912be23e..000000000000 --- a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f -https://bugs.gentoo.org/821547 - -From: Dan Streetman <ddstreet@canonical.com> -Date: Fri, 3 Sep 2021 12:43:33 -0400 -Subject: [PATCH] meson.build: change operator combining bools from + to and - -upstream meson stopped allowing combining boolean with the plus -operator, and now requires using the logical and operator - -reference: -https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c - -Fixes: #20632 ---- a/meson.build -+++ b/meson.build -@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer', - - want_ossfuzz = get_option('oss-fuzz') - want_libfuzzer = get_option('llvm-fuzz') --if want_ossfuzz + want_libfuzzer > 1 -+if want_ossfuzz and want_libfuzzer - error('only one of oss-fuzz or llvm-fuzz can be specified') - endif - - |