From 0a65aa74175d9ac6570321fe11725dc30c574e08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Aug 2022 13:55:12 +0100 Subject: gentoo auto-resync : 03:08:2022 - 13:55:12 --- sys-apps/Manifest.gz | Bin 48159 -> 48156 bytes sys-apps/ipmiutil/Manifest | 2 +- sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild | 2 +- sys-apps/systemd-utils/Manifest | 3 +- sys-apps/systemd-utils/files/251-glibc-2.36.patch | 154 ------ sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 5 +- sys-apps/systemd/Manifest | 9 +- sys-apps/systemd/files/251-glibc-2.36.patch | 154 ------ sys-apps/systemd/metadata.xml | 1 + sys-apps/systemd/systemd-250.7.ebuild | 556 ++++++++++++++++++++++ sys-apps/systemd/systemd-251.3.ebuild | 12 +- sys-apps/systemd/systemd-9999.ebuild | 8 +- 12 files changed, 581 insertions(+), 325 deletions(-) delete mode 100644 sys-apps/systemd-utils/files/251-glibc-2.36.patch delete mode 100644 sys-apps/systemd/files/251-glibc-2.36.patch create mode 100644 sys-apps/systemd/systemd-250.7.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 7d592959faeb..e38359874d4d 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest index dd9033d70c53..7b1a3f36d3de 100644 --- a/sys-apps/ipmiutil/Manifest +++ b/sys-apps/ipmiutil/Manifest @@ -13,5 +13,5 @@ EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4 EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9 EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c EBUILD ipmiutil-3.1.7.ebuild 1657 BLAKE2B d40ba9d2aa612b8ef9c9e52c8d4c702bda5800f8f6042afd6b7f08e862ffc51247a41cff79c43b3595adb887b5ffc809cdb78536b5eda0d030acab1e4efc6099 SHA512 d5fe935fd756afbfda7af92cb84349693bc9f75855b2030d4218ed6336375459e9a3e70cf6320915f05fa694b55d3c3fa1495b965089d03b68e9815ce632f15b -EBUILD ipmiutil-3.1.8.ebuild 1960 BLAKE2B c62c9d9ed45f37c3924d5e205337a29074bc870312a2a572daa02669db3be89733a018231578a89635d9e6fd3314c03b188944a899d83b16e98f1360d81dc3c2 SHA512 a8a584fba370cc061d0b636275d761f579e54967b92a2f94ac4c83a4be05cbea759d0481b5a599858c35a2259b87208b410be7dab9df2c6349de50a701328c94 +EBUILD ipmiutil-3.1.8.ebuild 1961 BLAKE2B 377059c8a5c7aa0cc2957f667eabf1b5e49f0f2a5fba8518d796b6df93d1b278e45f48e5ab0bdb92b55478a2c3ce75029e0fb5e1e258775ab6e250eb8d97e2ba SHA512 e9cdc6c21fe607e241f13a3b66952e38647267ed66fb4c3bc118e63893473222f7d0038498bef4e021a36688f36c281c7a3b0ba76d42793dc0f0cb945529236b MISC metadata.xml 395 BLAKE2B bbc505300e1bb4a974b8c5f19c43fe9cbfe4300c31a5174adad799cac0d2507e231845ab8f586ca427538b67ad45012aec660692f1a4a134af4e7615467b0ee0 SHA512 170e9a7718037935d373ad84c37f7c87764e30fdb1c2860fa3021021f91dd94adb2d3acb4adfc5cea8d64a7e612340a2286c5a4748f91ed32d603b9c306f3513 diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild index dacddd92252b..45f547fdfb09 100644 --- a/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild +++ b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" IUSE="static-libs" RDEPEND=">=dev-libs/openssl-1:0=" diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index 46ca64410505..f8eb0c30033c 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -1,5 +1,4 @@ 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 @@ -12,5 +11,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 11651 BLAKE2B 92eef4c99e3b56ac1937ac5313f956521b7e885343d9d8ba9ddb1ad0ed236742706b8e991d70c251a79d1e440d31dec5463d4172a6b0733f3a6e3ebf63a01055 SHA512 e418bd452f730ba74a5176508feadd6514adba0e0325b453079ed052b53fdc5757d8471f512c082d3853289e18f4d0c00920a30d256174f2a7cfeca05eef4dc2 +EBUILD systemd-utils-251.3.ebuild 11600 BLAKE2B 506dea49b8298a2ae656c9fc0d2eee8fcc4d0dd290a229118e83e23dd6ba5875c43e764b62ed837ab932f742936d237aa2befe6c28d2a741e2d7fbb58d9b617a SHA512 8bddb78d725c950c4871f490da11b6b5c4ba53d8e2aba347ddecf47b6efd19e5877e5993d9196121c87467c3c7a075d94f771cff9da80f4a355db617bae785d9 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 deleted file mode 100644 index 65693d747ca3..000000000000 --- a/sys-apps/systemd-utils/files/251-glibc-2.36.patch +++ /dev/null @@ -1,154 +0,0 @@ -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-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild index c6130d04ccb6..21ec7a6de8f9 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,10 +105,7 @@ 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 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index be9bb47671fe..0ec4d467398b 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,6 +1,5 @@ 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 @@ -8,9 +7,11 @@ AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed8 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 +DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c 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 15512 BLAKE2B 52d7560c9946e5be35aec7a3ec6928536c0543543cd7d2ffa5ab02ecaae6d3cc752b0c9b6a28ac6e3064bbc974c9687ff789111ca14c8e8b9f1cf0e6414b73ba SHA512 d3419152d411fce037206905aba34e2cae46d8f66697578db8d19628de6e337170ba0f03c5fd34c9d1e50615547c5840ef81cedbc2073c35fe23f6b8c6aaf0ec -EBUILD systemd-9999.ebuild 15326 BLAKE2B b7766927af373ea36f35917e2eeee3c80a6cb6f1c779dd2bafae6939d6b7c38ae878092378569c0f8729a7370707a43275c414152e54335354ab9e50e7035c94 SHA512 b018d9d52830cceef6a9a9e106c53597a1261430163576bb909088ee509f4dc9a06f4e730994a4bcb601309b5f2ea96ac75b17fbcb1dd6a13775f8d7813df52b -MISC metadata.xml 2600 BLAKE2B 718d14371e0df2946ec8c21459d51199d7103c40b8457fb685c2e8a0728b4c266718ea9854db46f732a12d176c6c8f34619ed03301f8183f8422c3d99fa705e2 SHA512 03cf65f6f619b90e76fe7837016dd21ea43c992da61ad2bf266a0c3adbbacb9b24e644751bda605cdd4be081c0892e48c00682b9ffe965333e8290d47a851e43 +EBUILD systemd-251.3.ebuild 15598 BLAKE2B 74279a36d028eda0f23fd9c00f576ca295a26841a91162e7f5e27152d622970e66ca81025d76e281ae1e5d7f870aff19df8e1cec4256433a059511185b026c17 SHA512 86b01c5359c4fa70805b87eda6312d6fe8cea762d7f2ada563b6ab5893a0ec556c007423915ddd800aa1a1cf144250071d7335168cec8156aa05d59f5ec7e56a +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 deleted file mode 100644 index 65693d747ca3..000000000000 --- a/sys-apps/systemd/files/251-glibc-2.36.patch +++ /dev/null @@ -1,154 +0,0 @@ -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/metadata.xml b/sys-apps/systemd/metadata.xml index d258d4fa7cf8..d9f94345f7ab 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -20,6 +20,7 @@ Enable FIDO2 support Enable use of dev-libs/libgcrypt for various features Enable portable home directories + Enable setting hostname with networkd/hostnamed without polkit (requires running sys-apps/dbus-broker) Enable embedded HTTP server in journald Enable import daemon Use libiptc from net-firewall/iptables for NAT support in systemd-networkd; this is used only if the running kernel does not support nftables diff --git a/sys-apps/systemd/systemd-250.7.ebuild b/sys-apps/systemd/systemd-250.7.ebuild new file mode 100644 index 000000000000..6c099f218fd6 --- /dev/null +++ b/sys-apps/systemd/systemd-250.7.ebuild @@ -0,0 +1,556 @@ +# Copyright 2011-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +# Avoid QA warnings +TMPFILES_OPTIONAL=1 +UDEV_OPTIONAL=1 + +QA_PKGCONFIG_VERSION=$(ver_cut 1) + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + MY_PV=${PV/_/-} + MY_P=${MY_PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://systemd.io/" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE=" + acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils + fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd iptables +kmod + +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode + +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd +" +REQUIRED_USE=" + dns-over-tls? ( || ( gnutls openssl ) ) + homed? ( cryptsetup pam openssl ) + importd? ( curl lzma || ( gcrypt openssl ) ) + policykit? ( !hostnamed-fallback ) + pwquality? ( homed ) +" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + fido2? ( dev-libs/libfido2:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + gnutls? ( >=net-libs/gnutls-3.6.0:0= ) + http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) + idn? ( net-dns/libidn2:= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + iptables? ( net-firewall/iptables:0= ) + openssl? ( >=dev-libs/openssl-1.1.0:0= ) + pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) + pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + tpm? ( app-crypt/tpm2-tss:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) +" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=acct-group/adm-0-r1 + >=acct-group/wheel-0-r1 + >=acct-group/kmem-0-r1 + >=acct-group/tty-0-r1 + >=acct-group/utmp-0-r1 + >=acct-group/audio-0-r1 + >=acct-group/cdrom-0-r1 + >=acct-group/dialout-0-r1 + >=acct-group/disk-0-r1 + >=acct-group/input-0-r1 + >=acct-group/kvm-0-r1 + >=acct-group/lp-0-r1 + >=acct-group/render-0-r1 + acct-group/sgx + >=acct-group/tape-0-r1 + acct-group/users + >=acct-group/video-0-r1 + >=acct-group/systemd-journal-0-r1 + >=acct-user/root-0-r1 + acct-user/nobody + >=acct-user/systemd-journal-remote-0-r1 + >=acct-user/systemd-coredump-0-r1 + >=acct-user/systemd-network-0-r1 + acct-user/systemd-oom + >=acct-user/systemd-resolve-0-r1 + >=acct-user/systemd-timesync-0-r1 + >=sys-apps/baselayout-2.2 + hostnamed-fallback? ( + acct-group/systemd-hostname + sys-apps/dbus-broker + ) + selinux? ( + sec-policy/selinux-base-policy[systemd] + sec-policy/selinux-ntp + ) + sysv-utils? ( + !sys-apps/openrc[sysv-utils(-)] + !sys-apps/sysvinit + ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-apps/hwids[udev] + !sys-auth/nss-myhostname + !sys-fs/eudev + !sys-fs/udev +" + +# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) +PDEPEND=">=sys-apps/dbus-1.9.8[systemd] + >=sys-fs/udev-init-scripts-34 + policykit? ( sys-auth/polkit ) + !vanilla? ( sys-apps/gentoo-systemd-integration )" + +BDEPEND=" + app-arch/xz-utils:0 + dev-util/gperf + >=dev-util/meson-0.46 + >=sys-apps/coreutils-8.16 + sys-devel/gettext + virtual/pkgconfig + test? ( + app-text/tree + dev-lang/perl + sys-apps/dbus + ) + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') +" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && + has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" +} + +QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" +QA_EXECSTACK="usr/lib/systemd/boot/efi/*" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if use test && has pid-sandbox ${FEATURES}; then + ewarn "Tests are known to fail with PID sandboxing enabled." + ewarn "See https://bugs.gentoo.org/674458." + fi + + local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS + ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE + ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS + ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS + ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH + ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED + ~!SYSFS_DEPRECATED_V2" + + use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" + use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" + kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" + kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" + kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" + + if kernel_is -ge 5 10 20; then + CONFIG_CHECK+=" ~KCMP" + else + CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" + fi + + if kernel_is -ge 4 18; then + CONFIG_CHECK+=" ~AUTOFS_FS" + else + CONFIG_CHECK+=" ~AUTOFS4_FS" + fi + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + if linux_chkconfig_present X86; then + CONFIG_CHECK+=" ~DMIID" + fi + fi + + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + : +} + +src_unpack() { + default + [[ ${PV} != 9999 ]] || git-r3_src_unpack +} + +src_prepare() { + # Do NOT add patches here + local PATCHES=() + + [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + # Add local patches here + PATCHES+=( + ) + + if ! use vanilla; then + PATCHES+=( + "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" + "${FILESDIR}/gentoo-journald-audit.patch" + ) + fi + + default +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + + # Broken with FORTIFY_SOURCE=3 without a patch. And the patch + # wasn't backported to 250.x, but it turns out to break Clang + # anyway: bug #841770. + # + # Our toolchain sets F_S=2 by default w/ >= -O2, so we need + # to unset F_S first, then explicitly set 2, to negate any default + # and anything set by the user if they're choosing 3 (or if they've + # modified GCC to set 3). + # + if is-flagq '-O[23]' || is-flagq '-Ofast' ; then + # We can't unconditionally do this b/c we fortify needs + # some level of optimisation. + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + + python_setup + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --localstatedir="${EPREFIX}/var" + -Dsupport-url="https://gentoo.org/support/" + -Dpamlibdir="$(getpam_mod_dir)" + # avoid bash-completion dep + -Dbashcompletiondir="$(get_bashcompdir)" + # make sure we get /bin:/sbin in PATH + $(meson_use split-usr) + -Dsplit-bin=true + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + # Avoid infinite exec recursion, bug 642724 + -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" + # no deps + -Dima=true + -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) + # Optional components/dependencies + $(meson_native_use_bool acl) + $(meson_native_use_bool apparmor) + $(meson_native_use_bool audit) + $(meson_native_use_bool cryptsetup libcryptsetup) + $(meson_native_use_bool curl libcurl) + $(meson_native_use_bool dns-over-tls dns-over-tls) + $(meson_native_use_bool elfutils) + $(meson_native_use_bool fido2 libfido2) + $(meson_use gcrypt) + $(meson_native_use_bool gnuefi gnu-efi) + $(meson_native_use_bool gnutls) + -Defi-includedir="${ESYSROOT}/usr/include/efi" + -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + $(meson_native_use_bool homed) + $(meson_native_use_bool http microhttpd) + $(meson_native_use_bool idn) + $(meson_native_use_bool importd) + $(meson_native_use_bool importd bzip2) + $(meson_native_use_bool importd zlib) + $(meson_native_use_bool kmod) + $(meson_use lz4) + $(meson_use lzma xz) + $(meson_use zstd) + $(meson_native_use_bool iptables libiptc) + $(meson_native_use_bool openssl) + $(meson_use pam) + $(meson_native_use_bool pkcs11 p11kit) + $(meson_native_use_bool pcre pcre2) + $(meson_native_use_bool policykit polkit) + $(meson_native_use_bool pwquality) + $(meson_native_use_bool qrcode qrencode) + $(meson_native_use_bool seccomp) + $(meson_native_use_bool selinux) + $(meson_native_use_bool tpm tpm2) + $(meson_native_use_bool test dbus) + $(meson_native_use_bool xkb xkbcommon) + -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + # Breaks screen, tmux, etc. + -Ddefault-kill-user-processes=false + -Dcreate-log-dirs=false + + # multilib options + $(meson_native_true backlight) + $(meson_native_true binfmt) + $(meson_native_true coredump) + $(meson_native_true environment-d) + $(meson_native_true firstboot) + $(meson_native_true hibernate) + $(meson_native_true hostnamed) + $(meson_native_true ldconfig) + $(meson_native_true localed) + $(meson_native_true man) + $(meson_native_true networkd) + $(meson_native_true quotacheck) + $(meson_native_true randomseed) + $(meson_native_true rfkill) + $(meson_native_true sysusers) + $(meson_native_true timedated) + $(meson_native_true timesyncd) + $(meson_native_true tmpfiles) + $(meson_native_true vconsole) + ) + + meson_src_configure "${myconf[@]}" +} + +multilib_src_test() { + unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR + meson_src_test +} + +multilib_src_install_all() { + local rootprefix=$(usex split-usr '' /usr) + + # meson doesn't know about docdir + mv "${ED}"/usr/share/doc/{systemd,${PF}} || die + + einstalldocs + dodoc "${FILESDIR}"/nsswitch.conf + + if ! use resolvconf; then + rm -f "${ED}${rootprefix}"/sbin/resolvconf || die + fi + + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + + if ! use sysv-utils; then + rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rm "${ED}"/usr/share/man/man1/init.1 || die + rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die + fi + + if ! use resolvconf && ! use sysv-utils; then + rmdir "${ED}${rootprefix}"/sbin || die + fi + + # https://bugs.gentoo.org/761763 + rm -r "${ED}"/usr/lib/sysusers.d || die + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} + keepdir /etc/kernel/install.d + keepdir /etc/systemd/{network,system,user} + keepdir /etc/udev/rules.d + + keepdir /etc/udev/hwdb.d + + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/{binfmt.d,modules-load.d} + keepdir /usr/lib/systemd/user-generators + keepdir /var/lib/systemd + keepdir /var/log/journal + + # Symlink /etc/sysctl.conf for easy migration. + dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf + + if use pam; then + newpamd "${FILESDIR}"/systemd-user.pam systemd-user + fi + + if use split-usr; then + # Avoid breaking boot/reboot + dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd + dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown + fi + + # workaround for https://github.com/systemd/systemd/issues/13501 + if use hostnamed-fallback; then + # this file requires dbus-broker + insinto /usr/share/dbus-1/system.d/ + doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" + + insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" + doins "${FILESDIR}/00-hostnamed-network-user.conf" + fi + + gen_usr_ldscript -a systemd udev +} + +migrate_locale() { + local envd_locale_def="${EROOT}/etc/env.d/02locale" + local envd_locale=( "${EROOT}"/etc/env.d/??locale ) + local locale_conf="${EROOT}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +pkg_preinst() { + if ! use split-usr; then + local dir + for dir in bin sbin lib; do + if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then + eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." + eerror "One of them should be a symbolic link to the other one." + FAIL=1 + fi + done + if [[ ${FAIL} ]]; then + eerror "Migration to system layout with merged directories must be performed before" + eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." + die "System layout with split directories still used" + fi + fi +} + +pkg_postinst() { + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. + systemd-hwdb --root="${ROOT}" update + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respected, and ensure consistency + # between OpenRC & systemd + migrate_locale + + if [[ -z ${REPLACING_VERSIONS} ]]; then + if type systemctl &>/dev/null; then + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 + fi + elog "To enable a useful set of services, run the following:" + elog " systemctl preset-all --preset-mode=enable-only" + fi + + if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then + rm "${EROOT}/var/lib/systemd/timesync" + fi + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi + + if use hostnamed-fallback; then + if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then + ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run." + ewarn "To enable dbus-broker.service run the next command as root:" + ewarn "systemctl enable dbus-broker.service" + fi + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-251.3.ebuild b/sys-apps/systemd/systemd-251.3.ebuild index 64205981ece9..f296bf73bc4e 100644 --- a/sys-apps/systemd/systemd-251.3.ebuild +++ b/sys-apps/systemd/systemd-251.3.ebuild @@ -23,7 +23,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - 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" fi inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript @@ -234,12 +234,16 @@ src_unpack() { } src_prepare() { - local PATCHES=( + # Do NOT add patches here + local PATCHES=() + + [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + # Add local patches here + PATCHES+=( # 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 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 1a8b1c931c45..b3bc091078ab 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -234,7 +234,13 @@ src_unpack() { } src_prepare() { - local PATCHES=( + # Do NOT add patches here + local PATCHES=() + + [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + # Add local patches here + PATCHES+=( ) if ! use vanilla; then -- cgit v1.2.3