| 1 |
commit: ef3b51926ede813b240e807911eef302ac0c4fdb |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Jan 1 13:43:19 2023 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 1 18:16:15 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3b5192 |
| 7 |
|
| 8 |
sys-apps/systemd: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28917 |
| 12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/systemd/files/251-meson-0.64.patch | 26 -------------- |
| 15 |
.../files/251-revert-fortify-source-3-fix.patch | 40 ---------------------- |
| 16 |
2 files changed, 66 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/files/251-meson-0.64.patch b/sys-apps/systemd/files/251-meson-0.64.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 6cc200bbd87d..000000000000 |
| 21 |
--- a/sys-apps/systemd/files/251-meson-0.64.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,26 +0,0 @@ |
| 24 |
-From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Jan Janssen <medhefgo@×××.de> |
| 26 |
-Date: Sun, 9 Oct 2022 17:16:12 +0200 |
| 27 |
-Subject: [PATCH] meson: Fix build with --optimization=plain |
| 28 |
- |
| 29 |
-Note that -O0 is deliberately filtered out as we have to compile with at |
| 30 |
-least -O1 due to #24202. |
| 31 |
- |
| 32 |
-Fixes: #24323 |
| 33 |
---- |
| 34 |
- src/boot/efi/meson.build | 2 +- |
| 35 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 36 |
- |
| 37 |
-diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build |
| 38 |
-index e0cd4ebad993..395386d3eda7 100644 |
| 39 |
---- a/src/boot/efi/meson.build |
| 40 |
-+++ b/src/boot/efi/meson.build |
| 41 |
-@@ -223,7 +223,7 @@ endif |
| 42 |
- if get_option('debug') and get_option('mode') == 'developer' |
| 43 |
- efi_cflags += ['-ggdb', '-DEFI_DEBUG'] |
| 44 |
- endif |
| 45 |
--if get_option('optimization') != '0' |
| 46 |
-+if get_option('optimization') in ['1', '2', '3', 's', 'g'] |
| 47 |
- efi_cflags += ['-O' + get_option('optimization')] |
| 48 |
- endif |
| 49 |
- if get_option('b_ndebug') == 'true' or ( |
| 50 |
|
| 51 |
diff --git a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch b/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch |
| 52 |
deleted file mode 100644 |
| 53 |
index bbe45f85dcf2..000000000000 |
| 54 |
--- a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch |
| 55 |
+++ /dev/null |
| 56 |
@@ -1,40 +0,0 @@ |
| 57 |
-From: Sam James <sam@g.o> |
| 58 |
-Date: Tue, 24 May 2022 23:21:50 +0100 |
| 59 |
-Subject: [PATCH] Revert "Support -D_FORTIFY_SOURCE=3 by using |
| 60 |
- __builtin_dynamic_object_size." |
| 61 |
- |
| 62 |
-Breaks Clang (even without F_S=3). |
| 63 |
- |
| 64 |
-This reverts commit 0bd292567a543d124cd303f7dd61169a209cae64. |
| 65 |
- |
| 66 |
-Bug: https://bugs.gentoo.org/841770 |
| 67 |
-Bug: https://github.com/systemd/systemd/issues/23150 |
| 68 |
---- a/src/basic/alloc-util.h |
| 69 |
-+++ b/src/basic/alloc-util.h |
| 70 |
-@@ -174,23 +174,13 @@ void* greedy_realloc0(void **p, size_t need, size_t size); |
| 71 |
- * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the |
| 72 |
- * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of |
| 73 |
- * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by |
| 74 |
-- * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated |
| 75 |
-- * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801). |
| 76 |
-- * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and |
| 77 |
-+ * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the |
| 78 |
-+ * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory, |
| 79 |
-+ * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and |
| 80 |
- * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner |
| 81 |
- * case. */ |
| 82 |
-- |
| 83 |
--#if defined __has_builtin |
| 84 |
--# if __has_builtin(__builtin_dynamic_object_size) |
| 85 |
--# define MALLOC_SIZEOF_SAFE(x) \ |
| 86 |
-- MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0)) |
| 87 |
--# endif |
| 88 |
--#endif |
| 89 |
-- |
| 90 |
--#ifndef MALLOC_SIZEOF_SAFE |
| 91 |
- #define MALLOC_SIZEOF_SAFE(x) \ |
| 92 |
- MIN(malloc_usable_size(x), __builtin_object_size(x, 0)) |
| 93 |
--#endif |
| 94 |
- |
| 95 |
- /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items |
| 96 |
- * that fit into the specified memory block */ |
Archives