summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2023-01-13 15:05:47 -0500
committerMike Gilbert <floppym@gentoo.org>2023-01-13 15:06:54 -0500
commit004f7f8ca01d10d12b3b4e5f018d262684e42f87 (patch)
tree89b5f4bfd80df0ddb5bdc9e9f79101f162496e0f /sys-apps/systemd-utils/files
parentsys-apps/systemd: drop 251.8, 251.10 (diff)
downloadgentoo-004f7f8ca01d10d12b3b4e5f018d262684e42f87.tar.gz
gentoo-004f7f8ca01d10d12b3b4e5f018d262684e42f87.tar.bz2
gentoo-004f7f8ca01d10d12b3b4e5f018d262684e42f87.zip
sys-apps/systemd-utils: drop 251.8-r1
Bug: https://bugs.gentoo.org/887581 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps/systemd-utils/files')
-rw-r--r--sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch b/sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch
deleted file mode 100644
index bbe45f85dcf2..000000000000
--- a/sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Tue, 24 May 2022 23:21:50 +0100
-Subject: [PATCH] Revert "Support -D_FORTIFY_SOURCE=3 by using
- __builtin_dynamic_object_size."
-
-Breaks Clang (even without F_S=3).
-
-This reverts commit 0bd292567a543d124cd303f7dd61169a209cae64.
-
-Bug: https://bugs.gentoo.org/841770
-Bug: https://github.com/systemd/systemd/issues/23150
---- a/src/basic/alloc-util.h
-+++ b/src/basic/alloc-util.h
-@@ -174,23 +174,13 @@ void* greedy_realloc0(void **p, size_t need, size_t size);
- * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the
- * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of
- * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by
-- * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated
-- * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801).
-- * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
-+ * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the
-+ * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory,
-+ * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
- * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner
- * case. */
--
--#if defined __has_builtin
--# if __has_builtin(__builtin_dynamic_object_size)
--# define MALLOC_SIZEOF_SAFE(x) \
-- MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0))
--# endif
--#endif
--
--#ifndef MALLOC_SIZEOF_SAFE
- #define MALLOC_SIZEOF_SAFE(x) \
- MIN(malloc_usable_size(x), __builtin_object_size(x, 0))
--#endif
-
- /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items
- * that fit into the specified memory block */