gentoo auto-resync : 06:05:2023 - 23:35:15

3 files changed, 0 insertions, 101 deletions

diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e57195d1a759..893fb29ad390 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,3 @@
-AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
-AUX 251-tmpfiles-ub.patch 2892 BLAKE2B 0c65c90c0a631a48b7f3b8194350fb90e6915e0e7f32b0de87cfb83ca170f68576017efbe8a531fdeb01485ac6840a4c75628d1a384e750fc5094dff68dddcab SHA512 5c4fac1933a0b8443b80cff7069f21904773d486f30be24337f2b68234c708568ccd0f1ab216968ce71f760e4e27f85912971cdb9dd3ee724d7e6a2d8bc917d7
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be
 AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
diff --git a/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch b/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch
deleted file mode 100644
index f56f2febfd2b..000000000000
--- a/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/systemd/systemd/commit/d0523bb0d12766485fde3b87bb42db8dfc3c45d3
-https://github.com/systemd/systemd/issues/24978
-
-From d0523bb0d12766485fde3b87bb42db8dfc3c45d3 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 12 Oct 2022 21:47:29 +0200
-Subject: [PATCH] gpt-auto: allow using without cryptsetup
-
-Fixes #24978
---- a/src/gpt-auto-generator/gpt-auto-generator.c
-+++ b/src/gpt-auto-generator/gpt-auto-generator.c
-@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) {
- 
- #if ENABLE_EFI
- static int add_root_cryptsetup(void) {
-+#if HAVE_LIBCRYPTSETUP
- 
-         /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which
-          * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */
- 
-         return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL);
-+#else
-+        return 0;
-+#endif
- }
- #endif
- 
-
diff --git a/sys-apps/systemd-utils/files/251-tmpfiles-ub.patch b/sys-apps/systemd-utils/files/251-tmpfiles-ub.patch
deleted file mode 100644
index df190d500e34..000000000000
--- a/sys-apps/systemd-utils/files/251-tmpfiles-ub.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/systemd/systemd/pull/25957
-https://github.com/systemd/systemd/pull/25959
-https://github.com/systemd/systemd/commit/9f804ab04d566ff745849e1c4ced680a0447cf76
-https://github.com/systemd/systemd/commit/34680637e838415204850f77c93ca6ca219abaf1
-
-From 9f804ab04d566ff745849e1c4ced680a0447cf76 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 6 Jan 2023 10:58:32 +0000
-Subject: [PATCH] tmpfiles: avoid null free() for acl attributes
-
-When built with ACL support, we might be processing a tmpfiles
-entry where there's no cause for us to call parse_acls_from_arg,
-then we get to the end of parse_line without having ever populated
-i.{acl_access, acl_default}.
-
-Then we pass a null pointer into acl_free().
-
-From UBSAN w/ GCC 13.0.0_pre20230101:
-```
-$ systemd-tmpfiles --clean
-/var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44:14: runtime error: applying non-zero offset 18446744073709551608 to null pointer
-    #0 0x7f65d868b482 in acl_free /var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44
-    #1 0x55fe7e592249 in item_free_contents ../systemd-9999/src/tmpfiles/tmpfiles.c:2855
-    #2 0x55fe7e5a347a in parse_line ../systemd-9999/src/tmpfiles/tmpfiles.c:3158
-    #3 0x55fe7e5a347a in read_config_file ../systemd-9999/src/tmpfiles/tmpfiles.c:3897
-    #4 0x55fe7e590c61 in read_config_files ../systemd-9999/src/tmpfiles/tmpfiles.c:3985
-    #5 0x55fe7e590c61 in run ../systemd-9999/src/tmpfiles/tmpfiles.c:4157
-    #6 0x55fe7e590c61 in main ../systemd-9999/src/tmpfiles/tmpfiles.c:4218
-    #7 0x7f65d7ebe289  (/usr/lib64/libc.so.6+0x23289)
-    #8 0x7f65d7ebe344 in __libc_start_main (/usr/lib64/libc.so.6+0x23344)
-    #9 0x55fe7e591900 in _start (/usr/bin/systemd-tmpfiles+0x11900)
-```
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -2852,8 +2852,11 @@ static void item_free_contents(Item *i) {
-         strv_free(i->xattrs);
- 
- #if HAVE_ACL
--        acl_free(i->acl_access);
--        acl_free(i->acl_default);
-+        if (i->acl_access)
-+                acl_free(i->acl_access);
-+
-+        if (i->acl_default)
-+                acl_free(i->acl_default);
- #endif
- }
- 
-
-From 34680637e838415204850f77c93ca6ca219abaf1 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 6 Jan 2023 12:30:36 +0100
-Subject: [PATCH] nspawn: guard acl_free() with a NULL check
-
-Inspired by #25957 there's one other place where we don't guard
-acl_free() calls with a NULL check.
-
-Fix that.
---- a/src/nspawn/nspawn-patch-uid.c
-+++ b/src/nspawn/nspawn-patch-uid.c
-@@ -181,7 +181,9 @@ static int patch_acls(int fd, const char *name, const struct stat *st, uid_t shi
- 
-         if (S_ISDIR(st->st_mode)) {
-                 acl_free(acl);
--                acl_free(shifted);
-+
-+                if (shifted)
-+                        acl_free(shifted);
- 
-                 acl = shifted = NULL;
-