diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
commit | f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch) | |
tree | e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-apps/systemd/files | |
parent | db063b515939ab15261136b24e4bc44386335c0c (diff) |
gentoo resync : 30.09.2020
Diffstat (limited to 'sys-apps/systemd/files')
-rw-r--r-- | sys-apps/systemd/files/245-clang-gnu11.patch | 60 | ||||
-rw-r--r-- | sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch | 67 |
2 files changed, 0 insertions, 127 deletions
diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch b/sys-apps/systemd/files/245-clang-gnu11.patch deleted file mode 100644 index 9056b56d48ee..000000000000 --- a/sys-apps/systemd/files/245-clang-gnu11.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001 -From: Denis Pronin <dannftk@yandex.ru> -Date: Sun, 8 Mar 2020 23:57:07 +0300 -Subject: [PATCH] Support compiling with clang and gnu11 standard - -Signed-off-by: Denis Pronin <dannftk@yandex.ru> ---- - src/shared/json-internal.h | 35 ++++++++++++++++++++++++----------- - 1 file changed, 24 insertions(+), 11 deletions(-) - -diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h -index bf158bff0d4..fabff0c860e 100644 ---- a/src/shared/json-internal.h -+++ b/src/shared/json-internal.h -@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U); - /* We use fake JsonVariant objects for some special values, in order to avoid memory allocations for them. Note that - * effectively this means that there are multiple ways to encode the same objects: via these magic values or as - * properly allocated JsonVariant. We convert between both on-the-fly as necessary. */ --#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1) --#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2) --#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3) --#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4) --#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5) --#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6) --#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7) --#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8) --#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9) --#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10) -+enum -+{ -+ _JSON_VARIANT_MAGIC_TRUE = 1, -+#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE) -+ _JSON_VARIANT_MAGIC_FALSE, -+#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE) -+ _JSON_VARIANT_MAGIC_NULL, -+#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL) -+ _JSON_VARIANT_MAGIC_ZERO_INTEGER, -+#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_INTEGER) -+ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED, -+#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_UNSIGNED) -+ _JSON_VARIANT_MAGIC_ZERO_REAL, -+#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_REAL) -+ _JSON_VARIANT_MAGIC_EMPTY_STRING, -+#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_STRING) -+ _JSON_VARIANT_MAGIC_EMPTY_ARRAY, -+#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_ARRAY) -+ _JSON_VARIANT_MAGIC_EMPTY_OBJECT, -+#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_OBJECT) -+ __JSON_VARIANT_MAGIC_MAX -+#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) __JSON_VARIANT_MAGIC_MAX) -+}; - - /* This is only safe as long as we don't define more than 4K magic pointers, i.e. the page size of the simplest - * architectures we support. That's because we rely on the fact that malloc() will never allocate from the first memory - * page, as it is a faulting page for catching NULL pointer dereferences. */ --assert_cc((uintptr_t) _JSON_VARIANT_MAGIC_MAX < 4096U); -+assert_cc((unsigned) __JSON_VARIANT_MAGIC_MAX < 4096U); - - enum { /* JSON tokens */ - JSON_TOKEN_END, diff --git a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch deleted file mode 100644 index 08affa501700..000000000000 --- a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch +++ /dev/null @@ -1,67 +0,0 @@ -From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Tue, 30 Jun 2020 09:56:10 +0200 -Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The return type of callbacks was changed from int to an enum. ---- - src/journal-remote/journal-gatewayd.c | 4 ++-- - src/journal-remote/journal-remote-main.c | 2 +- - src/journal-remote/microhttpd-util.h | 6 ++++++ - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c -index 5177e0d1577..3ab7c98b0b5 100644 ---- a/src/journal-remote/journal-gatewayd.c -+++ b/src/journal-remote/journal-gatewayd.c -@@ -349,7 +349,7 @@ static int request_parse_range( - return 0; - } - --static int request_parse_arguments_iterator( -+static mhd_result request_parse_arguments_iterator( - void *cls, - enum MHD_ValueKind kind, - const char *key, -@@ -796,7 +796,7 @@ static int request_handler_machine( - return MHD_queue_response(connection, MHD_HTTP_OK, response); - } - --static int request_handler( -+static mhd_result request_handler( - void *cls, - struct MHD_Connection *connection, - const char *url, -diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index 69a111afead..f82d188a8c6 100644 ---- a/src/journal-remote/journal-remote-main.c -+++ b/src/journal-remote/journal-remote-main.c -@@ -253,7 +253,7 @@ static int process_http_upload( - return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK."); - }; - --static int request_handler( -+static mhd_result request_handler( - void *cls, - struct MHD_Connection *connection, - const char *url, -diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h -index d90c6bbd4f1..4ca9a5c4f16 100644 ---- a/src/journal-remote/microhttpd-util.h -+++ b/src/journal-remote/microhttpd-util.h -@@ -47,6 +47,12 @@ - # define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset - #endif - -+#if MHD_VERSION >= 0x00097002 -+# define mhd_result enum MHD_Result -+#else -+# define mhd_result int -+#endif -+ - void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0); - - /* respond_oom() must be usable with return, hence this form. */ |