From 83cfc3cac0511042177fc061cc188c99bf900be9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Aug 2022 03:20:23 +0100 Subject: gentoo auto-resync : 03:08:2022 - 03:20:22 --- sys-apps/systemd/Manifest | 3 +- sys-apps/systemd/files/251-glibc-2.36.patch | 154 ++++++++++++++++++++++++++++ sys-apps/systemd/systemd-251.3.ebuild | 2 + 3 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 sys-apps/systemd/files/251-glibc-2.36.patch (limited to 'sys-apps/systemd') diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 0ec4d467398b..12ecefa23fea 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,5 +1,6 @@ AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b AUX 251-format-string.patch 1038 BLAKE2B 2b7400516fd93bdaa887e6203b44e656ccc27ddd963264c2ae1a360c5899cbd42417e66f72fb8c02366a64371257d782d9c34e5288b17e357edebdb55da939c8 SHA512 d300bdcad16485a92c80df575c403fabbdcd4e8c71251e56147b0d85c2a2e8d271eb055b5f188a184cb652c22ce428176355f322e679b88bb8db90610e63c1a4 +AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad @@ -12,6 +13,6 @@ DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f EBUILD systemd-250.7.ebuild 16382 BLAKE2B 465a4e903c31401e7f0d8804dde61cca9df52176719f71f3f7b6997620ce01e6720bcf9a6505cd3cfe0cf399f6f215c4851a39683e04b1e47f6e4f500fe85018 SHA512 601674acd39e5b6135bf7c0a3495978e54254f590cefc1882f978830829e29d2ed848a3c9749477a7331e3c68eb59beb74e61dd1cbb89ada91b072bbb366325d EBUILD systemd-251.2.ebuild 15630 BLAKE2B e107322c07f313e0ec5bffaaace81074c71ad7d8ec33d71382ba9726552b0ebd587b4cd8b3b52093deb38e3d11b115eb41854cc76a43e9794e08eef0d724a30a SHA512 1b9cd6a6dd45185f40272a29a06bcd8eee8de4a0d9a2469aaf487d3bf476dee439170ee089bedce41abbe83bf98bc7f9ed752dcda441eff13bf60c41e2caf005 -EBUILD systemd-251.3.ebuild 15598 BLAKE2B 74279a36d028eda0f23fd9c00f576ca295a26841a91162e7f5e27152d622970e66ca81025d76e281ae1e5d7f870aff19df8e1cec4256433a059511185b026c17 SHA512 86b01c5359c4fa70805b87eda6312d6fe8cea762d7f2ada563b6ab5893a0ec556c007423915ddd800aa1a1cf144250071d7335168cec8156aa05d59f5ec7e56a +EBUILD systemd-251.3.ebuild 15651 BLAKE2B 1847f057cac876067f28e32a5ba4e519b75e6dd2f47219caf7b3018660cebf8dd2720d2d330f125c69b4f1d9a198c13c21a830b8fc2b8327eda56b41da7ebd68 SHA512 7bf07834c83cdd5f524c2fbfed7b042b2c3304a6585b0f38f5e9a2ddaadddcb374139de640a7a17261f2f39b81913d5c74002294aeb56d74cbfd98a106376636 EBUILD systemd-9999.ebuild 15462 BLAKE2B 1208bd9c96e23d479a545385db048e9f9aac405a5b011fe8de6af40e190ad4e855d69136bab6874d0e152baf5e22b2e03cd6ceb31a0d654c6cc1b7690a625d05 SHA512 1360af2b5fb12c687a773a572fa8a31f03efa7dc949ffae1ceb0f24c10b9e9f7792816f5e2362e9d82b315a6280c5bcddfff2514e33fbc0ffcfff1e0547fee22 MISC metadata.xml 2755 BLAKE2B 54ce05794b190925dbe103ef494c904d23a3891765dcff82ee09bbe6bcafece47362e52522828277978309566eb8eea5b850afc6f58f18c628d3a6cf989bdc58 SHA512 23851ca77dabeb4a0b2c7e5853ba47550955369af5453c7af74e73515380b8fd0f570cf9d552127cff1934793b72e57581b13630c251431c9c612860b6a4d6bc diff --git a/sys-apps/systemd/files/251-glibc-2.36.patch b/sys-apps/systemd/files/251-glibc-2.36.patch new file mode 100644 index 000000000000..65693d747ca3 --- /dev/null +++ b/sys-apps/systemd/files/251-glibc-2.36.patch @@ -0,0 +1,154 @@ +https://bugs.gentoo.org/863218 +https://github.com/systemd/systemd/issues/23984 +https://github.com/systemd/systemd/commit/3657d3a01c7e25ff86d7a4642065b367c4ff7484 +https://github.com/systemd/systemd/commit/0a58cd00454cc7b57b04f3a4a334584d743d7f7a + +From: Rudi Heitbaum +Date: Sat, 23 Jul 2022 10:38:49 +0000 +Subject: [PATCH] glibc: Remove #include to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 + +--- a/meson.build ++++ b/meson.build +@@ -511,7 +511,6 @@ decl_headers = ''' + #include + #include + #include +-#include + ''' + + foreach decl : ['char16_t', +@@ -523,6 +522,17 @@ foreach decl : ['char16_t', + # We get -1 if the size cannot be determined + have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 + ++ if decl == 'struct mount_attr' ++ if have ++ want_linux_fs_h = false ++ else ++ have = cc.sizeof(decl, ++ prefix : decl_headers + '#include ', ++ args : '-D_GNU_SOURCE') > 0 ++ want_linux_fs_h = have ++ endif ++ endif ++ + if decl == 'struct statx' + if have + want_linux_stat_h = false +@@ -538,6 +548,7 @@ foreach decl : ['char16_t', + endforeach + + conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) ++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h) + + foreach ident : ['secure_getenv', '__secure_getenv'] + conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident)) +--- a/src/basic/fd-util.c ++++ b/src/basic/fd-util.c +@@ -3,7 +3,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + #include + #include + #include +--- a/src/core/namespace.c ++++ b/src/core/namespace.c +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "base-filesystem.h" +--- a/src/shared/mount-util.c ++++ b/src/shared/mount-util.c +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "chase-symlinks.h" + +From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Tue, 26 Jul 2022 20:03:12 +0900 +Subject: [PATCH] home: drop conflicted headers + +Fixes #24117. +--- a/src/basic/missing_fs.h ++++ b/src/basic/missing_fs.h +@@ -64,3 +64,8 @@ + #ifndef FS_PROJINHERIT_FL + #define FS_PROJINHERIT_FL 0x20000000 + #endif ++ ++/* linux/fscrypt.h */ ++#ifndef FS_KEY_DESCRIPTOR_SIZE ++#define FS_KEY_DESCRIPTOR_SIZE 8 ++#endif +--- a/src/home/homework-cifs.c ++++ b/src/home/homework-cifs.c +@@ -1,5 +1,10 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + ++#include ++#if WANT_LINUX_FS_H ++#include ++#endif ++ + #include "dirent-util.h" + #include "fd-util.h" + #include "fileio.h" +--- a/src/home/homework-luks.c ++++ b/src/home/homework-luks.c +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include + #include + + #if HAVE_VALGRIND_MEMCHECK_H +--- a/src/home/homework-mount.c ++++ b/src/home/homework-mount.c +@@ -2,7 +2,9 @@ + + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "fd-util.h" +--- a/src/home/homework.h ++++ b/src/home/homework.h +@@ -1,13 +1,14 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + +-#include + #include + + #include "sd-id128.h" + ++#include "cryptsetup-util.h" + #include "homework-password-cache.h" + #include "loop-util.h" ++#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */ + #include "missing_keyctl.h" + #include "missing_syscall.h" + #include "user-record.h" + diff --git a/sys-apps/systemd/systemd-251.3.ebuild b/sys-apps/systemd/systemd-251.3.ebuild index f296bf73bc4e..6e5bdcbd47f9 100644 --- a/sys-apps/systemd/systemd-251.3.ebuild +++ b/sys-apps/systemd/systemd-251.3.ebuild @@ -244,6 +244,8 @@ src_prepare() { # Breaks Clang. Revert the commit for now and force off F_S=3. # bug #841770. "${FILESDIR}/251-revert-fortify-source-3-fix.patch" + # bug #863218 + "${FILESDIR}/251-glibc-2.36.patch" ) if ! use vanilla; then -- cgit v1.2.3