diff options
Diffstat (limited to 'sys-apps/systemd-utils')
| -rw-r--r-- | sys-apps/systemd-utils/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/files/251-glibc-2.36.patch | 154 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 5 |
3 files changed, 160 insertions, 2 deletions
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index f8eb0c30033c..46ca64410505 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -1,4 +1,5 @@ AUX 250.4-test-systemd-tmpfiles.standalone.patch 1369 BLAKE2B c0f2f51d0b7127a5a0161f9a56f4e94d9b4e983f9f496601ba4ce9197076556df4f699871480ce0cc0a4002b0c8a6fec6706a358b1b28ab75dcf216f2e408821 SHA512 18b9852cf9fe53e45ca0d3f051580e726aa39462c5477c7143523903c3836f131df44837ec19acfff10281bfe0e0b4c53ea4cb2ebed9e342f1289db07fc752ed +AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222 @@ -11,5 +12,5 @@ DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d3 EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537 EBUILD systemd-utils-250.8.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058 EBUILD systemd-utils-251.2-r1.ebuild 11492 BLAKE2B d32e0222842f5981ee2aab1a3a67b1679e409b195503ad9f7ef185150e5fa2b98504c774f4bbcf5260523309d431582dc75fcf3d67818a981dbaffe40add999a SHA512 b2c1c51130c7ac90a98ae8af25167d2dc47dee6ec92342bd83159898f1a2170b4599c984d00430294cd4ac7895996e7b8682d111ff82148d574e613719b00588 -EBUILD systemd-utils-251.3.ebuild 11600 BLAKE2B 506dea49b8298a2ae656c9fc0d2eee8fcc4d0dd290a229118e83e23dd6ba5875c43e764b62ed837ab932f742936d237aa2befe6c28d2a741e2d7fbb58d9b617a SHA512 8bddb78d725c950c4871f490da11b6b5c4ba53d8e2aba347ddecf47b6efd19e5877e5993d9196121c87467c3c7a075d94f771cff9da80f4a355db617bae785d9 +EBUILD systemd-utils-251.3.ebuild 11651 BLAKE2B 92eef4c99e3b56ac1937ac5313f956521b7e885343d9d8ba9ddb1ad0ed236742706b8e991d70c251a79d1e440d31dec5463d4172a6b0733f3a6e3ebf63a01055 SHA512 e418bd452f730ba74a5176508feadd6514adba0e0325b453079ed052b53fdc5757d8471f512c082d3853289e18f4d0c00920a30d256174f2a7cfeca05eef4dc2 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4 diff --git a/sys-apps/systemd-utils/files/251-glibc-2.36.patch b/sys-apps/systemd-utils/files/251-glibc-2.36.patch new file mode 100644 index 000000000000..65693d747ca3 --- /dev/null +++ b/sys-apps/systemd-utils/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 <rudi@heitbaum.com> +Date: Sat, 23 Jul 2022 10:38:49 +0000 +Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 + +--- a/meson.build ++++ b/meson.build +@@ -511,7 +511,6 @@ decl_headers = ''' + #include <uchar.h> + #include <sys/mount.h> + #include <sys/stat.h> +-#include <linux/fs.h> + ''' + + 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 <linux/fs.h>', ++ 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 <errno.h> + #include <fcntl.h> + #include <linux/btrfs.h> ++#if WANT_LINUX_FS_H + #include <linux/fs.h> ++#endif + #include <linux/magic.h> + #include <sys/ioctl.h> + #include <sys/resource.h> +--- a/src/core/namespace.c ++++ b/src/core/namespace.c +@@ -7,7 +7,9 @@ + #include <sys/file.h> + #include <sys/mount.h> + #include <unistd.h> ++#if WANT_LINUX_FS_H + #include <linux/fs.h> ++#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 <sys/statvfs.h> + #include <unistd.h> + #include <linux/loop.h> ++#if WANT_LINUX_FS_H + #include <linux/fs.h> ++#endif + + #include "alloc-util.h" + #include "chase-symlinks.h" + +From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+github@gmail.com> +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 <sys/mount.h> ++#if WANT_LINUX_FS_H ++#include <linux/fs.h> ++#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 <poll.h> + #include <sys/file.h> + #include <sys/ioctl.h> +-#include <sys/mount.h> + #include <sys/xattr.h> + + #if HAVE_VALGRIND_MEMCHECK_H +--- a/src/home/homework-mount.c ++++ b/src/home/homework-mount.c +@@ -2,7 +2,9 @@ + + #include <sched.h> + #include <sys/mount.h> ++#if WANT_LINUX_FS_H + #include <linux/fs.h> ++#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 <linux/fs.h> + #include <sys/vfs.h> + + #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-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild index 21ec7a6de8f9..c6130d04ccb6 100644 --- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild @@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev" REQUIRED_USE="|| ( boot tmpfiles sysusers udev )" RESTRICT="!test? ( test )" @@ -105,7 +105,10 @@ QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" src_prepare() { local PATCHES=( + # bug #863218 + "${FILESDIR}/251-glibc-2.36.patch" ) + if use elibc_musl; then PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" ) # Applied upstream in 251.3 |