From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- sys-apps/Manifest.gz | Bin 48355 -> 48350 bytes sys-apps/coreutils/Manifest | 4 +- sys-apps/coreutils/coreutils-9.0-r1.ebuild | 42 +- sys-apps/coreutils/coreutils-9.0.ebuild | 42 +- sys-apps/epoch/Manifest | 8 +- sys-apps/epoch/epoch-1.2.2.ebuild | 73 --- sys-apps/epoch/epoch-1.3.0.ebuild | 32 +- sys-apps/epoch/epoch-9999.ebuild | 26 +- sys-apps/epoch/files/epoch-1.3.0-fix-main.patch | 4 +- sys-apps/file/Manifest | 6 +- sys-apps/file/file-5.40-r3.ebuild | 148 ------ sys-apps/file/file-5.41.ebuild | 4 +- sys-apps/file/file-9999.ebuild | 4 +- sys-apps/flatpak/Manifest | 4 + sys-apps/flatpak/flatpak-1.10.6.ebuild | 102 ++++ sys-apps/flatpak/flatpak-1.12.3.ebuild | 102 ++++ sys-apps/fwupd/Manifest | 15 +- .../fwupd/files/fwupd-1.5.7-logind_plugin.patch | 8 - sys-apps/fwupd/fwupd-1.5.9-r1.ebuild | 168 ------- sys-apps/fwupd/fwupd-1.6.4-r1.ebuild | 174 ------- sys-apps/fwupd/fwupd-1.7.1.ebuild | 175 ------- sys-apps/fwupd/fwupd-1.7.2-r1.ebuild | 170 ------- sys-apps/fwupd/fwupd-1.7.2-r2.ebuild | 173 +++++++ sys-apps/fwupd/fwupd-1.7.3-r1.ebuild | 173 +++++++ sys-apps/fwupd/fwupd-1.7.4.ebuild | 174 +++++++ sys-apps/fwupd/metadata.xml | 1 - sys-apps/gradm/Manifest | 2 +- sys-apps/gradm/gradm-3.1.201903191516.ebuild | 4 +- sys-apps/haveged/Manifest | 6 +- sys-apps/haveged/haveged-1.9.14-r1.ebuild | 43 -- sys-apps/haveged/haveged-1.9.17.ebuild | 45 ++ sys-apps/haveged/haveged-1.9.8c-r1.ebuild | 47 -- sys-apps/hdparm/Manifest | 2 + sys-apps/hdparm/hdparm-9.63.ebuild | 43 ++ sys-apps/ipmitool/Manifest | 2 +- .../ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild | 4 +- sys-apps/ipmiutil/Manifest | 2 +- sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild | 4 +- sys-apps/iproute2/Manifest | 5 +- ...route2-5.16.0-fix-ax25.h-include-for-musl.patch | 25 + sys-apps/iproute2/iproute2-5.16.0.ebuild | 176 +++++++ sys-apps/iproute2/iproute2-9999.ebuild | 26 +- sys-apps/keyutils/Manifest | 2 +- sys-apps/keyutils/keyutils-1.6.3.ebuild | 4 +- sys-apps/lshw/Manifest | 2 +- sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 4 +- sys-apps/opal-utils/Manifest | 2 + sys-apps/opal-utils/opal-utils-7.0.ebuild | 95 ++++ sys-apps/systemd-readahead/Manifest | 2 +- .../systemd-readahead/systemd-readahead-216.ebuild | 7 +- sys-apps/systemd-tmpfiles/Manifest | 10 +- .../files/249.9-cross-compile.patch | 23 + sys-apps/systemd-tmpfiles/metadata.xml | 9 +- .../systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild | 257 ---------- .../systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild | 260 ++++++++++ .../systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild | 260 ++++++++++ sys-apps/systemd/Manifest | 14 +- sys-apps/systemd/files/249.9-cross-compile.patch | 23 + sys-apps/systemd/files/250-fix-openssl.patch | 102 ---- sys-apps/systemd/systemd-249.6-r1.ebuild | 505 -------------------- sys-apps/systemd/systemd-249.7.ebuild | 505 -------------------- sys-apps/systemd/systemd-249.9.ebuild | 506 ++++++++++++++++++++ sys-apps/systemd/systemd-250-r1.ebuild | 521 --------------------- sys-apps/systemd/systemd-250.1.ebuild | 520 -------------------- sys-apps/systemd/systemd-250.2.ebuild | 520 ++++++++++++++++++++ 65 files changed, 2807 insertions(+), 3614 deletions(-) delete mode 100644 sys-apps/epoch/epoch-1.2.2.ebuild delete mode 100644 sys-apps/file/file-5.40-r3.ebuild create mode 100644 sys-apps/flatpak/flatpak-1.10.6.ebuild create mode 100644 sys-apps/flatpak/flatpak-1.12.3.ebuild delete mode 100644 sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch delete mode 100644 sys-apps/fwupd/fwupd-1.5.9-r1.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.6.4-r1.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.7.1.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.7.2-r1.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.7.2-r2.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.7.3-r1.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.7.4.ebuild delete mode 100644 sys-apps/haveged/haveged-1.9.14-r1.ebuild create mode 100644 sys-apps/haveged/haveged-1.9.17.ebuild delete mode 100644 sys-apps/haveged/haveged-1.9.8c-r1.ebuild create mode 100644 sys-apps/hdparm/hdparm-9.63.ebuild create mode 100644 sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch create mode 100644 sys-apps/iproute2/iproute2-5.16.0.ebuild create mode 100644 sys-apps/opal-utils/opal-utils-7.0.ebuild create mode 100644 sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch delete mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild create mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild create mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild create mode 100644 sys-apps/systemd/files/249.9-cross-compile.patch delete mode 100644 sys-apps/systemd/files/250-fix-openssl.patch delete mode 100644 sys-apps/systemd/systemd-249.6-r1.ebuild delete mode 100644 sys-apps/systemd/systemd-249.7.ebuild create mode 100644 sys-apps/systemd/systemd-249.9.ebuild delete mode 100644 sys-apps/systemd/systemd-250-r1.ebuild delete mode 100644 sys-apps/systemd/systemd-250.1.ebuild create mode 100644 sys-apps/systemd/systemd-250.2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index c188a953446c..c7e38ee0b7d7 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 9249c81e5783..7310b731fd15 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -5,6 +5,6 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c -EBUILD coreutils-9.0-r1.ebuild 7160 BLAKE2B 81e9c23e14dc9e196b2afa2fb1b323c48100ef10c221c27f182b36d783414cef042b4e582fd292fc668c021fda4d9d600f566dd27c387d98761367f368dec2aa SHA512 528a2a6eb7af7ff233b4afa87511940a1406c8b57d1d4262b3b6118fddf3910b8adae3f802fd4a9c59316a412e56f6f9d8a1b7c6f8b86c81f9553149ae35a232 -EBUILD coreutils-9.0.ebuild 6976 BLAKE2B 20c21abb122307ce22ab5a73015ae749ed116625e2bad311af72a42018605591dbdbe918a8444ae581635738d5eab8a53de6835bd68671040d28221c2c83ef25 SHA512 90ff56fbb94c9ddadea01e002d7b497e17fd34f59ca411dff6e4f11660b99370f59d3e32e26801613107926a08d2acba6b1cedcc292335f9a0ffb83006ab4b79 +EBUILD coreutils-9.0-r1.ebuild 6067 BLAKE2B 3d35f7334effe9b7f913168d37139d26b96e553eaadd7ae309d4ea525a55632ae6bb9d66947553b6d24f8aea95cdb8913cc1cc1c37e9f12a07003c9951f11924 SHA512 e90e144a12fa05c19bdba824846f6f2e659ebf4bd97725f4d8e7592d8cf2b6c19a5846ccfcfeab78a3c7c117a5533a7b008ae86f506951e96f755fc07e9d22bd +EBUILD coreutils-9.0.ebuild 5919 BLAKE2B d77953c6649536031894dfb4dc7464c1d23639848dfbed13a86e2a742e9070cbc58058904dbce008555eeeaca9141e058e544645e88707e41f27fd7e9f7e9fa4 SHA512 a7193dec152d0674e4fb4333597694b2063efff6a4d020cc6ce3090f1d65398dc30aa9ef32de9b6cbfc98ec61611f66c3c6eaa1001055838d187088fb1025a17 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595 diff --git a/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sys-apps/coreutils/coreutils-9.0-r1.ebuild index f8036f5a79b2..6f7eccb90d52 100644 --- a/sys-apps/coreutils/coreutils-9.0-r1.ebuild +++ b/sys-apps/coreutils/coreutils-9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,46 +58,6 @@ RDEPEND+=" !/dev/null) ; then - einfo "Checking for running ZFS module version" - - local kmodv minver - kmodv="$(grep kmod <(zfs -V 2>/dev/null))" - # Convert zfs-kmod-2.1.1-r3-gentoo -> 2.1.1-r3 - kmodv="${kmodv//zfs-kmod-}" - kmodv="${kmodv%%-gentoo}" - - minver="$(ver_cut 2 ${kmodv})" - local diemsg=$(cat <<-EOF - Attempted installation of ${P} on unsupported version of zfs-kmod! - Please reboot to a newer version of zfs-kmod first: - zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3 - Using ${P} with running version of zfs-kmod of can - lead to data loss while using cp command on some configurations. - See https://github.com/openzfs/zfs/issues/11900 for details. - EOF - ) - - case "${minver}" in - # 2.0.x - 0) - ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}" - ;; - # 2.1.x - 1) - ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}" - ;; - # 0.8.x/9999 - *) - # We can't really cover this case realistically - # 9999 is too hard to check and 0.8.x isn't being supported anymore. - ;; - esac - fi - -} - pkg_setup() { if use test ; then python-any-r1_pkg_setup diff --git a/sys-apps/coreutils/coreutils-9.0.ebuild b/sys-apps/coreutils/coreutils-9.0.ebuild index 231339807e73..ecfbcd3f4be6 100644 --- a/sys-apps/coreutils/coreutils-9.0.ebuild +++ b/sys-apps/coreutils/coreutils-9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,46 +58,6 @@ RDEPEND+=" ! 2.1.1-r3 - kmodv="${kmodv//zfs-kmod-}" - kmodv="${kmodv%%-gentoo}" - - minver="$(ver_cut 2 ${kmodv})" - local diemsg=$(cat <<-EOF - Attempted installation of ${P} on unsupported version of zfs-kmod! - Please reboot to a newer version of zfs-kmod first: - zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3 - Using ${P} with running version of zfs-kmod of can - lead to data loss while using cp command on some configurations. - See https://github.com/openzfs/zfs/issues/11900 for details. - EOF - ) - - case "${minver}" in - # 2.0.x - 0) - ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}" - ;; - # 2.1.x - 1) - ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}" - ;; - # 0.8.x/9999 - *) - # We can't really cover this case realistically - # 9999 is too hard to check and 0.8.x isn't being supported anymore. - ;; - esac - fi - -} - pkg_setup() { if use test ; then python-any-r1_pkg_setup diff --git a/sys-apps/epoch/Manifest b/sys-apps/epoch/Manifest index e14d5a264a6b..bb4b72dd95b4 100644 --- a/sys-apps/epoch/Manifest +++ b/sys-apps/epoch/Manifest @@ -1,11 +1,9 @@ AUX epoch-1.0-epoch.conf 1914 BLAKE2B 3ccb5ae37d8453702049c11ba3e4cc6b65133ccc2aa76ac3c490d1285112a768c68f83ad6e77f3df821ac329ca086a571774032dd1cf1a6c85aec7db0f413d6d SHA512 7844d05f86e969e308cbbeb6b0e766a724b59ba5d58f2905ffe1e6d8cdc55436233203fa4434e41becd8b7488c774bf8f3d5cd6ff0b43acabc738643cd3c292b AUX epoch-1.0-fix-CFLAGS.patch 156 BLAKE2B 8cc3a52e243d839df65c27cd9517c8ae5d8a84effba6d9288867ebae2dee214c0cbdcfc50c388229b06a437c649f9e530118552fe9cf90861bdfb0888880243a SHA512 ddb76c70acc1f76a8842f8abbc5e62861e249b37dea0b97dd4b74496dca95683123ccb86c39d2414b679b4cb74db00a2cc069801897efbe3a8eafaa9454db538 -AUX epoch-1.3.0-fix-main.patch 631 BLAKE2B c9513ad352d9a2f8644595a6b1d3a881ec9bb2423ddf4ce19c80f6a6dfe3764b7989c56c08bbc9e17562fd13e228e6ae3956fec4992d489dbb8fae53a80557ce SHA512 ab542435d5dec6be5d71a742270b5897a6798c6c89163853cf089c76ee3602056201eaa8836af1d0dad0392396f45b50d8c15e1b65ada892b703c5f70ed8ec32 +AUX epoch-1.3.0-fix-main.patch 558 BLAKE2B ee210b3579ba0a57fa458cdc894b7c05a8bb8993215bf37360cb7c0d83893c64dd7046c6222754439f866cbb8baa205771cc8c77e10ce3ee6162cbee1fa8b5b2 SHA512 079d1d53ca2b8703376d11da14a978ff3075d798e6c2e79dc1820e135bfa575d34afb19d5516b1b91d8dad896ea76f595667a4390049302d40036f46b1a4fd0d DIST epoch-1.2.1.tar.gz 66718 BLAKE2B 1fc75001ead0f65df6a303ae4933995eb5607e4f8f2de21c2b74b95f7a8a5ca0be21bf6c509826d36c79795905a1f65c18a755b7944d0eceb0364abc1d58613a SHA512 2d0c767165ec41452d1dabf338c8ea31772f1a8cd1e1dbd60c8469f2f235bb1f0cb60b467189f1fd1079dfc223b0687c1cfe5e729e1142ebc63323b1f9c0cf93 -DIST epoch_1.2.2.tar.gz 229377 BLAKE2B 0f2c00df56a7d35dd224b8a1b22c78dae943c09eabb78c72cddc1085d5596cf6ef23b4d0c240191bb6b69e511a97f0bdb9f0cf99a4146097211867ae1beaf213 SHA512 9e3e38ef95c20237a3db4f47c9464f27e893a665f0692200d89e96b12f6b2e3af9b84d951356b7b354f19ea4fbe372e2e0ba406fdfeb8819914d46cfed3024a3 DIST epoch_1.3.0.tar.gz 70681 BLAKE2B 7ad2ab4c7f6c5544138aeb29a9b3a3f8889ade23b448abf1ec257fc7bbf811f4f6b01f0c9c81005aec56fe243d1f1e53a2daacdcdc4ff935bfcbd707fb8b2ab6 SHA512 1e4a8bee26d8819303cbeb67265ee74e294502acfb3f5e594222bb7bdcb2d077fe19e73c40e9111a6ef9af788d767434f5a9a357430b59d6a0cac0e36a3b8f9e EBUILD epoch-1.2.1.ebuild 1848 BLAKE2B 7f8b52344040a2e3832735dd43cdfc6170b1e70b50df351eb04667de382bb1fecb2b5f14b1ae3b3ece4beb83e69445366522baff437af26e86b9ff0583983f2c SHA512 6d5a03c2ebabb0e40a5771744cd703eecac16adf4eb37e3deeebefb40b53f808f87176f8f226cf6e390d03540e369578b947a7878928a6480d2a5428d30fbde7 -EBUILD epoch-1.2.2.ebuild 1818 BLAKE2B 15777f6382a6c5c6dad9dacb7bfd52b5df3d93892b65d9db05deb9482fad8bd215a1cbb80d00bc8de527b8b7995f20dd80b97e7e5ccfb7e63a3de474e2f5208f SHA512 ec88610743e15cf38e5fa028cffd9d9e801cf2398cfc8fd39964e28e4d503ed7bfd985e1f05cef2bef7e20491e69973244cd5b3dc5c08761d50999deab4b03bd -EBUILD epoch-1.3.0.ebuild 1867 BLAKE2B 255ee90b14302b5bf81c818d9292da5872bdbe9538cee6b039e89d366feea7dcd5747d294c16a25cd9004f830b42b678b1a5830f673c61c690bc4fb3725a4dc1 SHA512 5082ce94571599d5396b27ce542eb4eaec367344fb2c4c6f209593b3c349104b7de029ca10ba3d3ffab9dd4fbde72ece7d0fcb9778661e4d2dbe8e2880d9b483 -EBUILD epoch-9999.ebuild 1813 BLAKE2B 2053480d5b90cfddb11d32c084dcdda42cce3006c460f098dbf13b360b7bc2e6c44d225d2acf8673ceae0ad3da98131eca721429379beb7cc7372006c623fb15 SHA512 68178acc8e4781240eb700d69df4d765df522df641ee87f62f536f7546b702d4b496993263ed0de27cc737734ec14e57d5b9892653fac2624dad6941d631f625 +EBUILD epoch-1.3.0.ebuild 1794 BLAKE2B 2f9423e2952f3fe93d5c1faa6d076ecb258e9a4a830a487834b5b817d2049237fbd1a94e6605e3550d5b3bd32438b21fbe4098034bed1c81e7e8e0146f31d2bd SHA512 3cd02ecd31dfac1c6d49d040668c1bdf33a08da81d429f321b85f37c1d34244768c50586145651811fbe5a36302cd6f42ebcb2b5a91fd299a476c5f59a88782a +EBUILD epoch-9999.ebuild 1753 BLAKE2B 0d16756e1ef06e12ccc93a5393dc221a6fd35d627ac9383bf4bae35c4259d075873d6aca33d881303095cd549930150deff8ccf802e6d00914702b114f135512 SHA512 83fdf4f68e744781d2d86df5e14ebb942cf4a2f1c8e8911dbf0e2afaf4b973ce9e05590d18f6a963b2335cfc14605bd83a1e5eb462d32ac86ccfa22f2df84f0d MISC metadata.xml 979 BLAKE2B 9ebcc97c47fa3d0d3b97bca019a55177c4164df79d82f061029f6b90401ceef2152b9b6386e03509a75c8b2df00deb86ef3f1cd838f50fc829304febb70c85c5 SHA512 322c71336dad1949b9b739c476576dcaaadad0210f0d1d0bda89948dd209f4c2349ac92896495f56f8542c4a068c6aac602dcf7e7e1939dcc10f5a674191aabd diff --git a/sys-apps/epoch/epoch-1.2.2.ebuild b/sys-apps/epoch/epoch-1.2.2.ebuild deleted file mode 100644 index af18fc85b21a..000000000000 --- a/sys-apps/epoch/epoch-1.2.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch linux-info - -MY_PV="${PV/rc/RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity" -HOMEPAGE="http://universe2.us/epoch.html" -SRC_URI="http://universe2.us/${PN}_${PV}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -S="${WORKDIR}/${PN}_${PV}" - -pkg_pretend() { - local CONFIG_CHECK="~PROC_FS" - - [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch -} - -src_compile() { - NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch." -} - -newepochins() { - local type="$1" - - cd ${type} || die "Cannot change directory." - for file in * ; do - if [[ "${file}" != "epoch" ]] ; then - new${type} ${file} epoch-${file} - fi - done - cd .. || die "Cannot change directory." -} - -src_install() { - cd built || die "Cannot change directory." - - dosbin sbin/epoch - - # For now, rename to epoch-* until we can blend in with a standard approach. - newepochins bin - newepochins sbin - - insinto /etc/epoch/ - newins "${FILESDIR}"/${PN}-1.0-epoch.conf epoch.conf -} - -pkg_postinst() { - elog "Make sure to provide /run and /tmp tmpfs mounts using /etc/fstab." - elog "" - elog "An example epoch configuration is provided at /etc/epoch/epoch.conf" - elog "which starts a minimal needed to use Gentoo." - elog "" - elog "To use epoch, add this kernel parameter: init=/usr/sbin/epoch-init" - elog "" - elog "Additional information about epoch is available at" - elog "${HOMEPAGE} and configuration documentation at" - elog "http://universe2.us/epochconfig.html which is useful reading material." - elog "" - elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net." -} diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild index a37c2f912f6a..6e888e4e4b61 100644 --- a/sys-apps/epoch/epoch-1.3.0.ebuild +++ b/sys-apps/epoch/epoch-1.3.0.ebuild @@ -1,22 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 -inherit epatch linux-info +inherit linux-info -MY_PV="${PV/rc/RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity" -HOMEPAGE="http://universe2.us/epoch.html" -SRC_URI="http://universe2.us/${PN}_${PV}.tar.gz" +DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity" +HOMEPAGE="https://universe2.us/epoch.html" +SRC_URI="https://universe2.us/${PN}_${PV}.tar.gz" +S="${WORKDIR}/${PN}_${PV/rc/RC}" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -S="${WORKDIR}/${PN}_${PV}" +KEYWORDS="amd64 arm x86" pkg_pretend() { local CONFIG_CHECK="~PROC_FS" @@ -24,10 +20,10 @@ pkg_pretend() { [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config } -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch - epatch "${FILESDIR}"/${PN}-1.3.0-fix-main.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch + "${FILESDIR}"/${PN}-1.3.0-fix-main.patch +) src_compile() { NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch." @@ -68,7 +64,7 @@ pkg_postinst() { elog "" elog "Additional information about epoch is available at" elog "${HOMEPAGE} and configuration documentation at" - elog "http://universe2.us/epochconfig.html which is useful reading material." + elog "https://universe2.us/epochconfig.html which is useful reading material." elog "" - elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net." + elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat." } diff --git a/sys-apps/epoch/epoch-9999.ebuild b/sys-apps/epoch/epoch-9999.ebuild index 007de0c5e28b..8022520e994c 100644 --- a/sys-apps/epoch/epoch-9999.ebuild +++ b/sys-apps/epoch/epoch-9999.ebuild @@ -1,32 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 -inherit epatch linux-info git-r3 +inherit linux-info git-r3 -MY_PV="${PV/rc/RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity" -HOMEPAGE="http://universe2.us/epoch.html" +DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity" +HOMEPAGE="https://universe2.us/epoch.html" EGIT_REPO_URI="https://github.com/Subsentient/epoch.git" +S="${WORKDIR}/${PN}-${PV/rc/RC}" LICENSE="public-domain" SLOT="0" KEYWORDS="" -S="${WORKDIR}/${MY_P}" - pkg_pretend() { local CONFIG_CHECK="~PROC_FS" [[ ${MERGE_TYPE} != buildonly ]] && check_extra_config } -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch +) src_compile() { NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch." @@ -67,7 +63,7 @@ pkg_postinst() { elog "" elog "Additional information about epoch is available at" elog "${HOMEPAGE} and configuration documentation at" - elog "http://universe2.us/epochconfig.html which is useful reading material." + elog "https://universe2.us/epochconfig.html which is useful reading material." elog "" - elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net." + elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat." } diff --git a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch index b158ae2e3396..f6df7680ac29 100644 --- a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch +++ b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch @@ -1,5 +1,5 @@ ---- src/main.c.orig 2016-11-13 15:11:58.511021203 +0000 -+++ src/main.c 2016-11-13 15:12:21.096021358 +0000 +--- a/src/main.c ++++ b/src/main.c @@ -1142,8 +1142,9 @@ static ReturnCode HandleEpochCommand(int ShutdownMemBus(false); //We're done with membus now. diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 37de4dff1069..638352fe3b73 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -4,9 +4,7 @@ AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb6397 AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f49cf42420eb13444783301af5f5e380e67da932d298ed94fb64a2a1a50ca349b43d73b77d6495df090d8b3adddc2b236b7fe3a42 SHA512 b25110ca59be28ca67a972c9737315efe357c2bbb8dbae4e6ecf80283bb0e9db4184574bfef2d965087493ede4979f649a762fa9bef2415d2359db117dfdb04f AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5 -DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654 -EBUILD file-5.40-r3.ebuild 3556 BLAKE2B 52835f37e7c4c78cc5239e86a2b096da50200e2cee7d07d904242f7c42eaa8369d1e4ed5b9239d53708e4bc7bfd54a55e7856c0850e8247a471bf68f529a8d71 SHA512 03fe26852e181ecd4ffd456482abb31717eaa3d3190a33a116cb9b3abac66532b7802d1dfe3bfaeac8a30c45d9a683ee0529e5d200a6e83c41ca7c3cfa16b14b -EBUILD file-5.41.ebuild 3347 BLAKE2B 10ede799a15988fcb598fba90760d36c0d71e088fc3fa30d0b118284964120add20935c506d167530f83362ba91cc429c073204e75dba752bab15d2bda922dde SHA512 f82720d0b17fd56a2076a3348cfa322f16b3294085019ba5eadd682c4047e75ba9f2ed27024d46169297a65e6dc4431cf1307c215547e56b9bdad6de45a5dd20 -EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347 +EBUILD file-5.41.ebuild 3340 BLAKE2B bbb550c4fb782299757a2d8628e0e3ea830e5165055fe2aa78bb84846c868f6427a253ea0c8540b9b681663be20b61958093dfa9ce40d829fcb682c99d33facd SHA512 72d9d212b1d1a1a234612a7361f217e50c4172877fffdd1f60847b4ad691d9ceb8955930f28f61665cffcba06008d7957d11b765725cc2932a019deded25bfb8 +EBUILD file-9999.ebuild 3266 BLAKE2B 967412ca3e0b7dfff1e2104e0d859c5376f3221a8b27b7c270c38f76c02b57bee0b3dac01387f8fc006a19bac875afabfc08eec1773ef419ff33679cf911cbf9 SHA512 2575765252b959a63833187ced7094bda200a5c3fa2cb69f0135e5028fd71358c9c2aae2a685ad27731437e2aebacd23df9766f39d539ad232e92195c3a6b3a2 MISC metadata.xml 382 BLAKE2B 204b7440b6a18907045d7eae05e8c99d017fa57b5178462125b998d8b3af3e2be656353f5c69823f3b5ea4d86e7e6c028229af27abaf2f7ace6f181f9ebf4153 SHA512 0e56117ac1957f2393ab47dc875e5f07851f3866014388418f84668f5f9767f6ca83963547442606e1c637ed3bcbb81b317cf994de4a04cd28725d8f6cb49b5e diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild deleted file mode 100644 index bb2ef20e0af9..000000000000 --- a/sys-apps/file/file-5.40-r3.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="bzip2 lzma python seccomp static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 - "${FILESDIR}/file-5.40-xz_magic.patch" #784773 - "${FILESDIR}/file-5.40-seccomp-faccessat.patch" - "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857 - "${FILESDIR}/file-5.40-revert-char-count.patch" #799188 - "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - fi - - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --enable-fsect-man5 - $(use_enable bzip2 bzlib) - $(use_enable lzma xzlib) - $(use_enable seccomp libseccomp) - $(use_enable static-libs static) - $(use_enable zlib) - ) - econf "${myeconfargs[@]}" -} - -build_src_configure() { - local myeconfargs=( - --disable-shared - --disable-libseccomp - --disable-bzlib - --disable-xzlib - --disable-zlib - ) - tc-env_build econf "${myeconfargs[@]}" -} - -need_build_file() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" -} - -src_configure() { - local ECONF_SOURCE="${S}" - - if need_build_file ; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - build_src_configure - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if need_build_file ; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - emake -C "${WORKDIR}"/build/src file - local -x PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - # Required for `file -C` - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild index a60b0fb70b25..b64e9a3a0156 100644 --- a/sys-apps/file/file-5.41.ebuild +++ b/sys-apps/file/file-5.41.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -75,7 +75,7 @@ build_src_configure() { --disable-xzlib --disable-zlib ) - tc-env_build econf "${myeconfargs[@]}" + econf_build "${myeconfargs[@]}" } need_build_file() { diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index 9e1359cd588f..75f6a558ae52 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -74,7 +74,7 @@ build_src_configure() { --disable-xzlib --disable-zlib ) - tc-env_build econf "${myeconfargs[@]}" + econf_build "${myeconfargs[@]}" } need_build_file() { diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index ff2e0cb5b5f8..e734e3c8e70d 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1,7 +1,11 @@ AUX flatpak-1.12.2-pyparsing-3.0.2-compat.patch 1694 BLAKE2B 88c7bd915e670f99c26c7d868fa5f85e2e0b9071b3dd342bb7ba476d0be3747ae7c1713d8a6617a3d57d9f30613c43a7ab1f55daa9de83c8b2b42d4e121a3976 SHA512 a67d011d8be0d1077f47ae561c3a875ac2bb99d908ffba477bc7cb180f52e7fb3c9be10b76563ee5eb129469cf500e92e66b7bf1fe6564fd95f083e0fe0a2845 DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b84277547fbb08400fe11abf243f5d9b5a6219c79188b362174f2a61eea42ae548d4279646838f3de3e4e75b8782f3dabe SHA512 8c2e365ce442a092c15178a8b39daecf21bfe162078c9a323e68d53194413f174e329812dd01d8da6bbfba3b0087aeb4d92a44067df3f6fa0253e33014d138ae +DIST flatpak-1.10.6.tar.xz 1517800 BLAKE2B 517251ff75fe8f44ed5a7d2b69301ceb801265854c3570d5349da3e3bac0f4f416163226db0b518e3e2b67427ccb57f9e47b6ed5a6d8ea6a86af146e779a3525 SHA512 a6fd46eaaea8510c74671b365e633cd782a02ad05c54ff107226573e3333ae2e9bd9b2ed76dbed401383e784d9530079c80beebb9d8512738815a16cabbe278c DIST flatpak-1.12.2.tar.xz 1541068 BLAKE2B 78162c9ccf0b7b18e69c2594865999fc052a507b255b855f3879cdac0c86dbfcabc6a282f0a4de548d3e85142b0b3c8c26d21825f35e6a2f25ebc1aa13ff2b8b SHA512 4887fe540a821f2c8539fbe1fd89b1cc350126a6fa90c1acf070e08db0de1073406a061f5483bc7a7ef9b07f73409beb7bc02d055d4b3ae1c33ba5c318e11b6f +DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc EBUILD flatpak-1.10.5.ebuild 2417 BLAKE2B c6101934112c06a45808d798916d8bbbb422b945671d3b57f958f59030e7b4f7e5143de10a3955263c51b50060cc8ea8ed3b83af5cd95c6ecb4a58ed215fe73c SHA512 3da93b5a0a7581d4dd8e15970834b9044f17ecca60304c24143fc06280c710197ab8c11981e49a10d9c8cba54c0093e3074c16e30c1b963ea707850c9353e606 +EBUILD flatpak-1.10.6.ebuild 2421 BLAKE2B 54a83418c803c5a62dfdb806bd9103431fdbd9c19b8c9a10b276b97dba2a259cfefbf001ba7eff6954d4bec2a9366d0b2e27168aea51787f77c63de62772f176 SHA512 bc9928086cac8774c3081530492474daae0a61dcda68a843d525190f0ab0507307c39b59f0bbf4b969510bfdde687dfd33d2a6ab153ebecc991bcd66035b02ae EBUILD flatpak-1.12.2-r1.ebuild 2486 BLAKE2B 9115921fb2e836293ef37565803d2592469f703123fd9a46522dc6dba0475ee99c3c9cad2e8ffe771b6f665330e14a804876557fb1556b0f501f8810bb775c9d SHA512 3840079a8ff08b9deb741e314b35a01cd60ba6621e723d77afb5ba8424f7caa8c09faedca807d20c043cf31c88d68fde10918cd6f0c72e9913c0fa68abd64324 EBUILD flatpak-1.12.2.ebuild 2423 BLAKE2B 0c40f9666929437cd0d6656143c41568c5a968dcd3215a9117fae3f1a84c9d2eb9f9833ae5db1b5b36de1c4913dc6f3e2d51ead94f28c7d4e4b816f4d398492b SHA512 7c579099711ab8033fba546c2ed922b02a56b4aafb51e45021fff81ceb31b635950d629e8743eb25bf763341c57d1da4e61bb9b7e64c5d20c427c6fbce70e965 +EBUILD flatpak-1.12.3.ebuild 2416 BLAKE2B 340209f6c8e81bca5388438b9585364c4e2d29dd6c2d4f326eb51e4e774291d8649d86b874ab116745a88471ca5d0e332f8efe307a359f4aa80bc4744000ec9d SHA512 e6902114b6cc33838fe8a597392dd5dd092f7af98f017df86e4a11aaee5be591b95e6aefe19995c520f68edcd5484e53e07a4e53468f09b365810e70d92ca0be MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464 diff --git a/sys-apps/flatpak/flatpak-1.10.6.ebuild b/sys-apps/flatpak/flatpak-1.10.6.ebuild new file mode 100644 index 000000000000..fb5079a71c10 --- /dev/null +++ b/sys-apps/flatpak/flatpak-1.10.6.ebuild @@ -0,0 +1,102 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit autotools linux-info python-any-r1 + +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" +DESCRIPTION="Linux application sandboxing and distribution framework" +HOMEPAGE="https://flatpak.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +IUSE="doc gtk kde introspection policykit seccomp systemd" +RESTRICT+=" test" + +RDEPEND=" + acct-group/flatpak + acct-user/flatpak + >=app-arch/libarchive-2.8:= + app-arch/zstd:= + >=app-crypt/gpgme-1.1.8:= + >=dev-libs/appstream-glib-0.5.10:= + >=dev-libs/glib-2.56:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + dev-libs/libassuan:= + >=dev-util/ostree-2020.8:=[gpg(+)] + || ( + dev-util/ostree[curl] + dev-util/ostree[soup] + ) + >=gnome-base/dconf-0.26:= + >=net-libs/libsoup-2.4:= + sys-apps/bubblewrap + sys-apps/dbus + >=sys-fs/fuse-2.9.9:0= + sys-apps/xdg-dbus-proxy + x11-apps/xauth + x11-libs/gdk-pixbuf:2= + x11-libs/libXau:= + policykit? ( >=sys-auth/polkit-0.98:= ) + seccomp? ( sys-libs/libseccomp:= ) + systemd? ( sys-apps/systemd:= ) +" + +DEPEND="${RDEPEND}" +# pyparsing version pinned for https://bugs.gentoo.org/825230 +BDEPEND=" + >=sys-devel/automake-1.13.4 + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + dev-util/gdbus-codegen + sys-devel/bison + introspection? ( >=dev-libs/gobject-introspection-1.40 ) + doc? ( + >=dev-util/gtk-doc-1.20 + dev-libs/libxslt + ) + $(python_gen_any_dep '= 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - sed '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use archive libarchive) - $(meson_use bluetooth bluez) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use flashrom plugin_flashrom) - $(meson_use gnutls) - $(meson_use gtk-doc gtkdoc) - $(meson_use gusb) - $(meson_use gusb plugin_altos) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_pk) - -Dconsolekit="false" - -Dcurl="true" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - use ppc64 && emesonargs+=( -Dplugin_msr="false" ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - newinitd "${FILESDIR}"/${PN}-r2 ${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from = 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - - sed -e '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - - sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ - -i data/builder/meson.build || die - - vala_src_prepare -} - -src_configure() { - local plugins=( - $(meson_use amt plugin_amt) - $(meson_use dell plugin_dell) - $(meson_use flashrom plugin_flashrom) - $(meson_use gusb plugin_altos) - $(meson_use modemmanager plugin_modem_manager) - $(meson_use nvme plugin_nvme) - $(meson_use spi plugin_intel_spi) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_capsule_splash) - $(meson_use uefi plugin_uefi_pk) - ) - use ppc64 && plugins+=( -Dplugin_msr="false" ) - use riscv && plugins+=( -Dplugin_msr="false" ) - - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - -Dconsolekit="false" - -Dcurl="true" - -Ddocs="$(usex gtk-doc gtkdoc none)" - -Defi_binary="false" - -Dsupported_build="true" - $(meson_use archive libarchive) - $(meson_use bluetooth bluez) - $(meson_use elogind) - $(meson_use gnutls) - $(meson_use gusb) - $(meson_use lzma) - $(meson_use man) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use systemd) - $(meson_use test tests) - - ${plugins[@]} - ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - newinitd "${FILESDIR}"/${PN}-r2 ${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} diff --git a/sys-apps/fwupd/fwupd-1.7.1.ebuild b/sys-apps/fwupd/fwupd-1.7.1.ebuild deleted file mode 100644 index a5c8fc642ce5..000000000000 --- a/sys-apps/fwupd/fwupd-1.7.1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit linux-info meson python-single-r1 vala xdg - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( elogind minimal systemd ) - dell? ( uefi ) - fastboot? ( gusb ) - logitech? ( gusb ) - minimal? ( !introspection ) - spi? ( lzma ) - synaptics? ( gnutls ) - uefi? ( gnutls ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) - test? ( - thunderbolt? ( dev-util/umockdev ) - net-libs/gnutls[tools] - ) -" -COMMON_DEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 - dev-libs/json-glib - dev-libs/libgpg-error - dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.0[gpg,pkcs7] - >=dev-libs/libxmlb-0.1.13:=[introspection?] - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - ') - >=net-libs/libsoup-2.51.92:2.4[introspection?] - net-misc/curl - virtual/libelf:0= - virtual/udev - archive? ( app-arch/libarchive:= ) - dell? ( >=sys-libs/libsmbios-2.4.0 ) - elogind? ( >=sys-auth/elogind-211 ) - flashrom? ( >=sys-apps/flashrom-1.2-r3 ) - gnutls? ( net-libs/gnutls ) - gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) - logitech? ( dev-libs/protobuf-c:= ) - lzma? ( app-arch/xz-utils ) - modemmanager? ( net-misc/modemmanager[qmi] ) - policykit? ( >=sys-auth/polkit-0.103 ) - systemd? ( >=sys-apps/systemd-211 ) - tpm? ( app-crypt/tpm2-tss ) - uefi? ( - sys-apps/fwupd-efi - sys-boot/efibootmgr - sys-fs/udisks - sys-libs/efivar - ) -" -# Block sci-chemistry/chemical-mime-data for bug #701900 -RDEPEND=" - != 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - - sed -e '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - - sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ - -i data/builder/meson.build || die - - vala_src_prepare -} - -src_configure() { - local plugins=( - $(meson_use amt plugin_amt) - $(meson_use dell plugin_dell) - $(meson_use fastboot plugin_fastboot) - $(meson_use flashrom plugin_flashrom) - $(meson_use gusb plugin_altos) - $(meson_use logitech plugin_logitech_bulkcontroller) - $(meson_use modemmanager plugin_modem_manager) - $(meson_use nvme plugin_nvme) - $(meson_use spi plugin_intel_spi) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_capsule_splash) - $(meson_use uefi plugin_uefi_pk) - ) - use ppc64 && plugins+=( -Dplugin_msr="false" ) - use riscv && plugins+=( -Dplugin_msr="false" ) - - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - -Dconsolekit="false" - -Dcurl="true" - -Ddocs="$(usex gtk-doc gtkdoc none)" - -Defi_binary="false" - -Dsupported_build="true" - $(meson_use archive libarchive) - $(meson_use bluetooth bluez) - $(meson_use elogind) - $(meson_use gnutls) - $(meson_use gusb) - $(meson_use lzma) - $(meson_use man) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use systemd) - $(meson_use test tests) - - ${plugins[@]} - ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - newinitd "${FILESDIR}"/${PN}-r2 ${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} diff --git a/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild b/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild deleted file mode 100644 index 5aef904b6ca8..000000000000 --- a/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( elogind minimal systemd ) - dell? ( uefi ) - fastboot? ( gusb ) - logitech? ( gusb ) - minimal? ( !introspection ) - spi? ( lzma ) - synaptics? ( gnutls ) - uefi? ( gnutls ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - bash-completion? ( >=app-shells/bash-completion-2.0 ) - introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) - test? ( - thunderbolt? ( dev-util/umockdev ) - net-libs/gnutls[tools] - ) -" -COMMON_DEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 - dev-libs/json-glib - dev-libs/libgpg-error - dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.0[gpg,pkcs7] - >=dev-libs/libxmlb-0.1.13:=[introspection?] - >=net-libs/libsoup-2.51.92:2.4[introspection?] - net-misc/curl - virtual/udev - archive? ( app-arch/libarchive:= ) - dell? ( >=sys-libs/libsmbios-2.4.0 ) - elogind? ( >=sys-auth/elogind-211 ) - flashrom? ( >=sys-apps/flashrom-1.2-r3 ) - gnutls? ( net-libs/gnutls ) - gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) - logitech? ( dev-libs/protobuf-c:= ) - lzma? ( app-arch/xz-utils ) - modemmanager? ( net-misc/modemmanager[qmi] ) - policykit? ( >=sys-auth/polkit-0.103 ) - systemd? ( >=sys-apps/systemd-211 ) - tpm? ( app-crypt/tpm2-tss ) - uefi? ( - sys-apps/fwupd-efi - sys-boot/efibootmgr - sys-fs/udisks - sys-libs/efivar - ) -" -# Block sci-chemistry/chemical-mime-data for bug #701900 -RDEPEND=" - != 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - - sed -e '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - - sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ - -i data/builder/meson.build || die - - vala_src_prepare -} - -src_configure() { - local plugins=( - $(meson_use amt plugin_amt) - $(meson_use dell plugin_dell) - $(meson_use fastboot plugin_fastboot) - $(meson_use flashrom plugin_flashrom) - $(meson_use logitech plugin_logitech_bulkcontroller) - $(meson_use modemmanager plugin_modem_manager) - $(meson_use nvme plugin_nvme) - $(meson_use spi plugin_intel_spi) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_capsule_splash) - $(meson_use uefi plugin_uefi_pk) - ) - use ppc64 && plugins+=( -Dplugin_msr="false" ) - use riscv && plugins+=( -Dplugin_msr="false" ) - - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - -Dconsolekit="false" - -Dcurl="true" - -Ddocs="$(usex gtk-doc gtkdoc none)" - -Defi_binary="false" - -Dsupported_build="true" - $(meson_use archive libarchive) - $(meson_use bash-completion bash_completion) - $(meson_use bluetooth bluez) - $(meson_use elogind) - $(meson_use gnutls) - $(meson_use gusb) - $(meson_use lzma) - $(meson_use man) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use systemd) - $(meson_use test tests) - - ${plugins[@]} - ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - newinitd "${FILESDIR}"/${PN}-r2 ${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} diff --git a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild new file mode 100644 index 000000000000..03e200fc2781 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + fastboot? ( gusb ) + logitech? ( gusb ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + bash-completion? ( >=app-shells/bash-completion-2.0 ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + virtual/udev + archive? ( app-arch/libarchive:= ) + dell? ( >=sys-libs/libsmbios-2.4.0 ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + logitech? ( dev-libs/protobuf-c:= ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.103 ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use fastboot plugin_fastboot) + $(meson_use flashrom plugin_flashrom) + $(meson_use logitech plugin_logitech_bulkcontroller) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + use riscv && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use archive libarchive) + $(meson_use bash-completion bash_completion) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} diff --git a/sys-apps/fwupd/fwupd-1.7.3-r1.ebuild b/sys-apps/fwupd/fwupd-1.7.3-r1.ebuild new file mode 100644 index 000000000000..164e0e06e4f1 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.7.3-r1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + fastboot? ( gusb ) + logitech? ( gusb ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + bash-completion? ( >=app-shells/bash-completion-2.0 ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + app-arch/xz-utils + >=dev-libs/glib-2.58:2 + dev-libs/json-glib + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + archive? ( app-arch/libarchive:= ) + dell? ( >=sys-libs/libsmbios-2.4.0 ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + logitech? ( dev-libs/protobuf-c:= ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.103 ) + sqlite? ( dev-db/sqlite ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use fastboot plugin_fastboot) + $(meson_use flashrom plugin_flashrom) + $(meson_use logitech plugin_logitech_bulkcontroller) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use sqlite) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + use riscv && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use archive libarchive) + $(meson_use bash-completion bash_completion) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} diff --git a/sys-apps/fwupd/fwupd-1.7.4.ebuild b/sys-apps/fwupd/fwupd-1.7.4.ebuild new file mode 100644 index 000000000000..282861f294ad --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.7.4.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + fastboot? ( gusb ) + logitech? ( gusb ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + bash-completion? ( >=app-shells/bash-completion-2.0 ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + app-arch/xz-utils + >=dev-libs/glib-2.58:2 + dev-libs/json-glib + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + archive? ( app-arch/libarchive:= ) + dell? ( >=sys-libs/libsmbios-2.4.0 ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + logitech? ( dev-libs/protobuf-c:= ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.103 ) + sqlite? ( dev-db/sqlite ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use fastboot plugin_fastboot) + $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_uf2) + $(meson_use logitech plugin_logitech_bulkcontroller) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use sqlite) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + use riscv && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use archive libarchive) + $(meson_use bash-completion bash_completion) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml index 09178d3fd158..0016b0a19524 100644 --- a/sys-apps/fwupd/metadata.xml +++ b/sys-apps/fwupd/metadata.xml @@ -10,7 +10,6 @@ Thomas Deutschmann - Enable update notification agent Use app-arch/libarchive for archives support Build and install Intel AMT plugin Enable Dell-specific support diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest index 099a33d9e794..58ddf52ccb3a 100644 --- a/sys-apps/gradm/Manifest +++ b/sys-apps/gradm/Manifest @@ -8,5 +8,5 @@ EBUILD gradm-3.1.201603152148.ebuild 1079 BLAKE2B c4dc23c49a67e287c7bb5d7f200f5a EBUILD gradm-3.1.201607172312.ebuild 1079 BLAKE2B c4dc23c49a67e287c7bb5d7f200f5ae44c713a98df5ca246e7af6357f4af451a99800eb69b14f5e030e688cb638e8dfe68ad4a01af9e7d0c7d6dc6297e8c88b7 SHA512 8b4f2130078db6de540c63c7853dcf51e52f1c1e0029d87d23b0a8953b1c4bdca744b0a0a11bd8ac1510f89dc898f9e708f5373c719b8815058a99aad8ac29d3 EBUILD gradm-3.1.201608131257.ebuild 1081 BLAKE2B d5801d4236212c6ed59a95ca6a341bf73c98862b5097329bb2797b3fdbd73a9e8ee5f240be28076516761b6002a65b5d394d3db9603067330c627550ddb4272c SHA512 f0b7fe6ed9de901c69ff515d92f6c4889ca1b3dfb22b7b2a397015392059eb9d0e1c0b4ff2e737f34d4cf44c9e3a6340cc089a2e1501197a64e80b8565a7e7dd EBUILD gradm-3.1.201708012022.ebuild 1081 BLAKE2B d5801d4236212c6ed59a95ca6a341bf73c98862b5097329bb2797b3fdbd73a9e8ee5f240be28076516761b6002a65b5d394d3db9603067330c627550ddb4272c SHA512 f0b7fe6ed9de901c69ff515d92f6c4889ca1b3dfb22b7b2a397015392059eb9d0e1c0b4ff2e737f34d4cf44c9e3a6340cc089a2e1501197a64e80b8565a7e7dd -EBUILD gradm-3.1.201903191516.ebuild 1045 BLAKE2B 435bfad4428c4d083695e4d20475f70a499ad5409ec7fbe1200234dcef7e99af16f703cccb839342f416fe3cfe3dc5967d12f3eedd9e18c59766a089f4795d40 SHA512 0b61da8dcd907a0b4b06e24826903e0eccde2fa37074e01f5caeaa42294db555e874dc19c21d6fa121341c02b90f99b40da851687c356981057ec1dae4d31ac4 +EBUILD gradm-3.1.201903191516.ebuild 1043 BLAKE2B 7fdc16313e9edac2f3b37f9cbcf53b9a427fef06a436c84d01193067e46f059bc0996269780a62d2087342c45f5bccee2542c965c3580e2be7eceae653dd0c64 SHA512 31c1dfeba3511b41f19c4a8cfd20ba40b6d88492765a039f86ccffb138104f5e62516cf1ff4bbe8eca638530e48e836390f5e47d482a2f474f4ae4c4da5624c7 MISC metadata.xml 252 BLAKE2B 77d0ee5309919adedac9caf60e48d1feea156ab00e03740fc83282b32e3424e66a9e49c3736b6e186143373653d99cb43baca8a876b9601720583693af3d43f7 SHA512 0638df454dd637421d42dd06154095824d66a1e08c5160ab406bfa45dd414d3330a5181a1d0127bee99eb56c125832b68b4ea1c1ee8da54e4929a1748070f435 diff --git a/sys-apps/gradm/gradm-3.1.201903191516.ebuild b/sys-apps/gradm/gradm-3.1.201903191516.ebuild index 35dd8bc4384a..95fe975573eb 100644 --- a/sys-apps/gradm/gradm-3.1.201903191516.ebuild +++ b/sys-apps/gradm/gradm-3.1.201903191516.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/gradm/${PN}-${MY_PV}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="pam" RDEPEND="" diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest index 15b2159753ec..dc60a8ec9f62 100644 --- a/sys-apps/haveged/Manifest +++ b/sys-apps/haveged/Manifest @@ -3,10 +3,8 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88 -DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924 DIST haveged-1.9.15.tar.gz 493789 BLAKE2B 08d956651e3e717bdaf42f957bca93d0f74049b38219b2d283c3b0e2dc49be0061c8a58b742c63cb1f8b03f8060ed9816735879d023c5dc606a0362e81b56f75 SHA512 405fe15e3711de503d4d28f5f67fc9f393da03eb80d2a5f6167c3539fda4f11f7e7b8e795a6770d6dfa3273ee887133898c1ca4b41d80c62e1997d8796f4325e -DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa -EBUILD haveged-1.9.14-r1.ebuild 1012 BLAKE2B a13a79a0348ef09079fd0bee5e2a5c90a065253f8c28ec586e2b15bc3e1fe8b594abb84336e92c3ab71d5de5a0617c98bfa7d6084e17e52608cf178efdf7025b SHA512 e6c083a00a025291cb4eada1ec5690ec76a8659c629d654d1179b7ef1e6818b1c0954def8858f1ea582a6b6b3f751c091c8896fdc6248a78e37e84a36a775ff5 +DIST haveged-1.9.17.tar.gz 495429 BLAKE2B e1f89bc47a9920517ffe9040b4bfcf2fb25e8b7f7404b16fe526fc225550050d602446ccba7442cb68b797c1b12d6e93e1826cc847c27e1a6d3a04814c31b4cb SHA512 0db4fc287dc80b6d7fbe6e1b4a6fb73bcab9db6604b437ac127f4fb4aeef64867d7bb90b24b4286e5e46e85db8e85f4b5fc15f189a8fe1f071ec79c9b5f24095 EBUILD haveged-1.9.15.ebuild 1012 BLAKE2B 4984b1d33da747d0ac7cf62dd9bc11c420daaa2f9296069e44ad018c0c6e1ab9d7f5a7ee3fee3213a39316eeda3a2eec02f46f9cee743c38020e9323d752436f SHA512 8b47e4fbe680c208027eacb76365b216a74364dee285d1da024763138f80cdbdc0f1062f258b6254dcf0d3e0a9bb0a0f81d088b5ccccbd09a6112ae5d3f4015c -EBUILD haveged-1.9.8c-r1.ebuild 1065 BLAKE2B c3d29001c9f5256876f0e5ddd4590a19bce73ee9ab68c09459bd499bd88476a000e1731569e8e86ffbcbf3e96fa274e800b3911f3a4f313936f8d642ae49ecea SHA512 b2e11b2c7b4012717eaefd24ae30885c983964d28fa7c61931e5a7b6dab442989b383e6da6df897fcbdb3452331eacb709829552894b697d07f7b085c144dff8 +EBUILD haveged-1.9.17.ebuild 1018 BLAKE2B aa32a6115afc8ab03ca6d39ebceb3cf19a260f0ca8df76a4bedd19fc9b3afdb4dfe5192bdb220cfa8b72f5503bd41790b518c72084f9426e9965a549273440e3 SHA512 e2d5e54f5be8f4c1c336fddaff3f2ab62398dc7d54fdd1a0563a390a20628a34948b5672fec3facfd31b467962d4816f3c5ff034cb2a8cacde1e8268572904e8 MISC metadata.xml 453 BLAKE2B 8e0b710e55e214dd0dfeed4222fbfd8eeb4fd363a2d0e8f3c1d3ac401d7bb68a7d608f5629f06fe46b2d368e221772a63a03641c6aa8c6e62b21aa0ed2ca2960 SHA512 46efe891a245b81f9d872fe8be2cf62beb8a7e39659ab6929f52a4936deb8e9b66c52d7575b741a1ddf3d158ce5ca1b1df8b3c6ffee97b15effc5b4ba8c4c23f diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild deleted file mode 100644 index 6d3133dc452a..000000000000 --- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd - -DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="https://www.issihosts.com/haveged/" -SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv x86" -IUSE="selinux static-libs threads" - -RDEPEND=" - ! +Date: Thu, 13 Jan 2022 08:05:33 +0000 +Subject: [PATCH] Fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102 +--- a/lib/ax25_ntop.c ++++ b/lib/ax25_ntop.c +@@ -2,7 +2,7 @@ + + #include + #include +-#include ++#include + + #include "utils.h" + diff --git a/sys-apps/iproute2/iproute2-5.16.0.ebuild b/sys-apps/iproute2/iproute2-5.16.0.ebuild new file mode 100644 index 000000000000..a86a737045cb --- /dev/null +++ b/sys-apps/iproute2/iproute2-5.16.0.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl:= ) + atm? ( net-dialup/linux-atm ) + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-3.16 +" +BDEPEND=" + app-arch/xz-utils + >=sys-devel/bison-2.4 + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch + "${FILESDIR}"/${PN}-5.16.0-fix-ax25.h-include-for-musl.patch +) + +doecho() { + echo "${@}" + "${@}" || die +} + +src_prepare() { + if ! use ipv6 ; then + PATCHES+=( + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch # bug #326849 + ) + fi + + default + + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Build against system headers + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null || die + printf '#include \nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null || die + + # run "configure" script first which will create "config.mk"... + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) + doecho ./configure --libbpf_force $(usex bpf on off) + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers, bug #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, bug #144265, bug #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) + EOF +} + +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED}"/{s,}bin/ip || die # bug #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. # bug #467716 + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die + + if use berkdb ; then + keepdir /var/lib/arpd + # bug #47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die + fi +} diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 367b3541cbfe..c26a054ac839 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs flag-o-matic multilib +inherit toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" @@ -46,8 +46,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 #"${FILESDIR}"/${PN}-5.1.0-portability.patch "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) @@ -60,7 +60,7 @@ doecho() { src_prepare() { if ! use ipv6 ; then PATCHES+=( - "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch # bug #326849 ) fi @@ -85,7 +85,7 @@ src_prepare() { -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ Makefile || die - # build against system headers + # Build against system headers rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die @@ -99,12 +99,12 @@ src_configure() { # This sure is ugly. Should probably move into toolchain-funcs at some point. local setns - pushd "${T}" >/dev/null + pushd "${T}" >/dev/null || die printf '#include \nint main(){return setns(0, 0);}\n' > test.c ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n echo 'int main(){return 0;}' > test.c ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null + popd >/dev/null || die # run "configure" script first which will create "config.mk"... # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) @@ -116,7 +116,7 @@ src_configure() { TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 + # We've locked in recent enough kernel headers, bug #549948 TC_CONFIG_IPSET := y HAVE_BERKELEY_DB := $(usex berkdb y n) HAVE_CAP := $(usex caps y n) @@ -124,7 +124,7 @@ src_configure() { HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 + # Use correct iptables dir, bug #144265, bug #293709 IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) HAVE_LIBBSD := $(usex libbsd y n) EOF @@ -154,19 +154,19 @@ src_install() { install dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 + mv "${ED}"/{s,}bin/ip || die # bug #330115 dolib.a lib/libnetlink.a insinto /usr/include doins include/libnetlink.h # This local header pulls in a lot of linux headers it # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 + # linux-headers-3.8 until that goes stable. # bug #467716 sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die if use berkdb ; then keepdir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin + # bug #47482, arpd doesn't need to be in /sbin dodir /usr/bin mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die elif [[ -d "${ED}"/var/lib/arpd ]]; then diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest index b9183523c10b..daa7b2c4096f 100644 --- a/sys-apps/keyutils/Manifest +++ b/sys-apps/keyutils/Manifest @@ -6,5 +6,5 @@ AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 EBUILD keyutils-1.6.1.ebuild 3870 BLAKE2B 9c3bfe57a55d744623756154f5f599b5e66bb731ad1903e42acb3646883095006bacf338a7d8fb161be6c9a2e6e14f924105b527c191552f6e1c31d5d7742d3f SHA512 1f08385e89141147decfd3e4f125928c743eebdffeb2bdb074778186357e674c747c9681dbab14a7474cee459d8683b7bf390528a7d3cc5c574cbd7122a69c0a -EBUILD keyutils-1.6.3.ebuild 3775 BLAKE2B a307381bcf40e901ce8e7936eea97e78909363db1464c15cc0f0f8652e8647b6e09b3037cd3aa0514fa6a71c35f20135811316c28cf983ccb91313800586a7ab SHA512 2fc21bf6d1d7f83daf0d30db791fe0931417fac256cb686fcccac56b619291f0a86d28284e9570d47f99ef8858d467b3476b7bb28ea061fa8a4e388da31aa506 +EBUILD keyutils-1.6.3.ebuild 3773 BLAKE2B 5dee83357a3cb3422a417882cff0b13acbd80181f9c9eb07a590b6eab88d21af2b46478d54f134c7fa10e1119c2294546ac627261eff63812f8918dd82349633 SHA512 8c140672226b95199f3118c04b5d365c4a9c7f85654e44fa7b49306b4e921cb9a996b4911e1a2ba407cad04d6bddca7d1fbed012211e945adbb02f5602de7661 MISC metadata.xml 425 BLAKE2B 2e1c7ba57d9ff2133d453198363f3d6ebb299f86b6e20a40de99922a04bb3661473bbe93b2cad53fce887a62eaa3760e2a209ac278a0456d57903e3fd613f274 SHA512 fca0158e8e96854a03da5a5d877ce23b635a4f052cd7580108dd4ee47fdafab79a436f01ff32e0111421e0904a16e71eafb8629bcafe4e3199e025f0554b2932 diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild b/sys-apps/keyutils/keyutils-1.6.3.ebuild index d32b3b91f411..e70d7c5d4311 100644 --- a/sys-apps/keyutils/keyutils-1.6.3.ebuild +++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s LICENSE="GPL-2 LGPL-2.1" SLOT="0/1.9" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="static static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index 0d9d8b3eda6a..7a3f286a0e5a 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,5 +1,5 @@ AUX lshw-02.19.2b-respect-LDFLAGS.patch 815 BLAKE2B 44cd1820a6ba3c854d04d9affeeaab1780ec1c0eebbea930906519363ef8cd31b831c7f6d7c22f8770d6f97cc6dc90d63f2a140e79c7bd3c93cabef1b9542567 SHA512 e3a98a0c5d5b890f18589295bf0d64db04b1d08b66353ad1a658ef84a4e1abd85f9d3d52e8ec7a54234e3573cb3c89e7ccb953544fe3af0b6a168dabb00d45e5 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 EBUILD lshw-02.19.2b_p20210121-r1.ebuild 2267 BLAKE2B b4dee0d296ab18f6ab8eb050d11d911856aaf254c5df4c6ebc3e35fec5af8ed552d6fbca147b586da873320746eb9abbc4f2910240726c6dd69a72e0e5aa7cea SHA512 d6148eaf68bf55043274d39cc77cc6f627c1a160d2bb2689549530d35a4ec0d0f6a2af25428d1152b3d94facabfb5457cc4d206525d536016c1e1e336ae97873 -EBUILD lshw-02.19.2b_p20210121-r2.ebuild 2337 BLAKE2B b10667741c441265be37d6d6be87fae0f5f61fd0703b7505d8fbade3a64d276bcee9ec50458a94c2971be63aad86cbcb490ec7c5e5b863dcfeea7d1ec84087cc SHA512 6542c88a86299725facd8a366955035ded5014d76a88431609725afa8128dcb71a82cb0d57840af9d830db5fdb0e5e419c0228eb608f003d5fdb7b8bcb682af5 +EBUILD lshw-02.19.2b_p20210121-r2.ebuild 2331 BLAKE2B cd8e3796307dea3bb08e15c4fe129257c0734ac769b86d677e9a3fe5cf3b928d0e06d22d0d80a62f1ea72c7e1f7a1f9c55e8f33a20cdf602df537feeeb764499 SHA512 7254f00651db0653eb204676085e29c7201ce66e0268957562693ebeadae8ca141a79112d84444dda1b5b54a22fcde690ede0b7e1e6f1bc3ebba98bcc89cbbeb MISC metadata.xml 462 BLAKE2B 0eca79307d6db1495a4799c970f6de55239b0b3b3636fb6ab833eccf824ed6569206a33272a2dbbc420d8f3d746ee8db7312fbc56f119f068634043699705e0a SHA512 948063d79d644ddfd3b559a7f113c73fa45a43d9282aad12400444d7e9431db44e0a5ef75fc0d866cfae9e0b67859df2b5996512e9eb296622546cb2bfdea9e7 diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild index e3f4bf9fca99..6818ad6ef392 100644 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="gtk sqlite static" REQUIRED_USE="static? ( !gtk !sqlite )" diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest index 5367956f605e..97899757c9f2 100644 --- a/sys-apps/opal-utils/Manifest +++ b/sys-apps/opal-utils/Manifest @@ -2,5 +2,7 @@ AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b89 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459 DIST opal-utils-6.8.tar.gz 5321377 BLAKE2B 3be812618dcbd3d877576e1dec0b6a74ad9091b59760bd8f1f67ba9a8efbce79cba4130464dcb6f2b8e61dedca3a1a60103f36d04fcd234b5a4c577c6e07635b SHA512 a799112c14abdcdb37e1a4c63e48e12bb7a67b6c90476d4e60597f06fd6050a58ffd25859cf6bb12c393522e4b4771ce3aa25a1277bac35855d599e9eb357814 +DIST opal-utils-7.0.tar.gz 5418069 BLAKE2B 86ad4c1a3000753b0bd48f0cf50e9a91eeff8c2a420a6339e4359a5ce6a35954120d7fe7caff64def83bb06e96c602d099fb1fc8e5b580adb67c48a09fb9d7a8 SHA512 72198f0d1bb0d09cb74fe4656421a73ec1a604ec6fa0965bd82e56819a2d41a1a6588f8a8cc7eb507d73ef401f8557901a5305c844fbfc9f27534c7b2e2e9db3 EBUILD opal-utils-6.8.ebuild 2479 BLAKE2B 4ffa2f22532e19ed4669651cc945653208042341b025dffdc3618b36a6246a38b410a4bd9d556426e1314f0d1cfedd3b68239add8929cb2bd674112df9dd8e30 SHA512 5ff7b665abe48acd0515ff41152e956c60a76fca0d5e76196f167a2afe890c1eb996412f4af22155bef933f56866d535cbb61b1d6b355ec0b166ebbfae6c4471 +EBUILD opal-utils-7.0.ebuild 2536 BLAKE2B 4b7f883c4ae1afc2a82083c146b6d746f478f0acce56efda717a0d13a8b14012ec2e427bec1af193ed0d1b079a8a1da8f3248c79bd1bd3fd2d8cfd0815e91773 SHA512 a94d3a8d122adf223691104ff6d3dc8f7b614d0b04f5b90542e456ddb0a4342aa1ebd8ea35063470cb20a8e81c60bd9f6724cea317a7404b1acba4d714e274ee MISC metadata.xml 1100 BLAKE2B 1e8e44dd35f5ced685c12c0ac30fb2b9c466103b75df166e53344c60c4c58d70be0bd42f4fcc59c37199ea770f40cedc4577c099dc6cd2f03b66606758f40247 SHA512 0e1b9cd39bdfa603a8e11a550d59877fe88d095332b500e470ac40fd3f3cfc84952a97b376cbff8037cd729ba8a2164a6aef390cb0cd13798909a2e1bda14ecd diff --git a/sys-apps/opal-utils/opal-utils-7.0.ebuild b/sys-apps/opal-utils/opal-utils-7.0.ebuild new file mode 100644 index 000000000000..c0dc400c7312 --- /dev/null +++ b/sys-apps/opal-utils/opal-utils-7.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit linux-info python-single-r1 systemd toolchain-funcs + +DESCRIPTION="OPAL firmware utilities" +HOMEPAGE="https://github.com/open-power/skiboot" +SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2+" +SLOT="0" +KEYWORDS="~ppc64" +IUSE="doc" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="" +RDEPEND="${DEPEND} ${PYTHON_DEPS}" + +BDEPEND="doc? ( $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}]') +)" + +CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS" +ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard" +ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon" +ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" + +S="${WORKDIR}/skiboot-${PV}" + +PATCHES=( + "${FILESDIR}/flags.patch" +) + +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + tc-export CC LD + export OPAL_PRD_VERSION="${PV}" + export GARD_VERSION="${PV}" + export PFLASH_VERSION="${PV}" + export XSCOM_VERSION="${PV}" + export FFSPART_VERSION="${PV}" +} + +src_compile() { + emake V=1 -C external/opal-prd + emake V=1 -C external/gard + emake V=1 -C external/pflash + emake V=1 -C external/xscom-utils + emake V=1 -C external/ffspart + + use doc && emake V=1 -C doc html +} + +src_install() { + emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dosbin external/ffspart/ffspart + + python_domodule external/pci-scripts/ppc.py + python_doscript external/pci-scripts/phberr.py + + newinitd "${FILESDIR}"/opal-prd.initd opal-prd + newconfd "${FILESDIR}"/opal-prd.confd opal-prd + + systemd_dounit external/opal-prd/opal-prd.service + + if use doc; then + rm -r doc/_build/html/_sources || die + local HTML_DOCS=( doc/_build/html/. ) + fi + einstalldocs +} + +src_test() { + emake V=1 -C external/opal-prd test + emake V=1 -C external/gard check + + # 2 test are fragile and fails because of filename path + rm -v external/pflash/test/tests/01-info || die + rm -v external/pflash/test/tests/06-miscprint || die + emake V=1 -C external/pflash check + emake V=1 -C external/ffspart check +} diff --git a/sys-apps/systemd-readahead/Manifest b/sys-apps/systemd-readahead/Manifest index d35d6b75ae6f..b8d662054ce5 100644 --- a/sys-apps/systemd-readahead/Manifest +++ b/sys-apps/systemd-readahead/Manifest @@ -1,5 +1,5 @@ AUX systemd-readahead-216-glibc-2.27.patch 397 BLAKE2B 020f750428b4cebb642a6ea98a8f85bfad0f4758c3643b2d5d66374015ffa745e9c849fe77d6f5367b10c8fa60b249edeefb1fc678e5b8ed0042eaf6b4e89061 SHA512 5a9ae51246342a81727e672e8528b95dbf18c18129c2c90521fc79e5c57b039e05706c78aa683da736f4e879fad948622b3723678604ee2629faa679afe68714 AUX systemd-readahead-216-sysmacros.patch 1814 BLAKE2B 74dc5ed9bd5bc1947889c8f7a7e5574322ee8bf2bdee3cd068cbb3a453eae09cf13500757608b4e6b4a24d012a9c7af3f67e444b6ea68ff4dc2b3b658e062b1e SHA512 e48c013913b4db636f070d045eb65dff193d0b5cd25a0d1c98ed62b4071bc6925dce7c835341122fd6e0dc3136d11a8fa4ed35332a8b44ffb6f13195db9d6763 DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 -EBUILD systemd-readahead-216.ebuild 4971 BLAKE2B b2ac4edf851d975d86c47e783da10c6f9404e6986f2ac1d9e2c7144ac851ae3c54f59756961c83ed52b45bafe815f7d3bfba12f7df65a68e6912615afdb2b137 SHA512 65418575593a6aabba47f5a609d295e5203c3d3dcdc13f24da45963bd10b7ebd27b80a1f6570a9de2fad436df90745669b424dbfb0ed42632b945b048c767340 +EBUILD systemd-readahead-216.ebuild 4982 BLAKE2B 2ec9776829fc0dae7a05676cb1f38795b25f5e7b7c95eeae9c1f8402971252c56f2cbb7f93f1dbb5a8d2ba5302471b7a06ec046c01de30f26f9704ee29fc6b79 SHA512 9630a35cc8795a1488e5ffa55aa32394314fe378440f3a6ac9eca820762df56c9748918b455d7c1018b50e2175f58f008016eea3e1f1d8453f84db2b46ccd96f MISC metadata.xml 244 BLAKE2B ef0fed756f714193730d5c9b111f85fbc050482d1b828cef3d2048fc61f87c4a69eb64b0d3d6203757d24d1c1c7888004623ae6b635b17ac56c56c25d1e4f3f7 SHA512 3b91401bf8504f8db213637e29ae377d72c06c406b01802764d14db5e3438e1b62c3ba90a44339ace16d38c7b568c7f01ec940acdc69fedfe6c8ccba56abb49d diff --git a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild index 301b757c717d..d35257f5fe9a 100644 --- a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild +++ b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit systemd toolchain-funcs udev DESCRIPTION="Split of readahead systemd implementation" @@ -16,7 +16,8 @@ IUSE="" S="${WORKDIR}/systemd-${PV}" RDEPEND=">=sys-apps/systemd-217:=" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest index f8e907072b65..ef6768c27f43 100644 --- a/sys-apps/systemd-tmpfiles/Manifest +++ b/sys-apps/systemd-tmpfiles/Manifest @@ -1,7 +1,11 @@ +AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194 AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40 +DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598 DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b -DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f -EBUILD systemd-tmpfiles-249.5.ebuild 5968 BLAKE2B 72a4b96753da7d54754c79d2dd90c669987adfc1fae84a9bb4985cb953702db10d74e2cb4f6e7bb34d11afa43506c16f5a63b8e6b4f15e041c95d817f64931aa SHA512 2acbac61323d3d744e9e0ee9362cee06b8460ab8673cf07181e4a76a44a0b287516f634abe8fdea1ca2ee143364ee56e6e8f85ec8a1651a5d056c136bfe148b2 -MISC metadata.xml 361 BLAKE2B 51c4e3dcb18cea86f9508c51e534a670e92e81aefe8e04af436f279d3158999d6dd8836dd53abcd4b35cacfeffff829a4157d2a63ce08d4eea62791b6761feb4 SHA512 6645f474e642a386927ae353561fadda273327321705500ddb8de14ed53f94788d782680b4b765c5da0151395a9f3f3c9bea2726c05cb79e52ee26a6e033c63f +DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc +DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 +EBUILD systemd-tmpfiles-249.7.ebuild 6091 BLAKE2B 63064cd496f780af754185f05a47551804f05d2b21c58d4b173d2a2ec82b7ba986c947ca1fc15cfc793f411caebf2b7586315ef7e741c534e00649c26c5d5bcf SHA512 e56de86404b80d686e233a17761adfd7f7f59afd1a8f90c2a50658d1fd04e8d1a8b62acbc4cc1d882d094fac10ed5964a03edc1f182c00b3821c856245e33eb3 +EBUILD systemd-tmpfiles-249.9.ebuild 5990 BLAKE2B 9739faa844c7ad1a449c229bf8696cb4ef1af75ecbe6a7c788b8b9299785dc66b09fb83534b289a5499687a263018d6b58369eca84e116e045a6b695b1db80c8 SHA512 cab2c35242e3cee3b441c50c2596f83217f39a68b6a102e7307e1fc81a372adec594b7a935cc22a0dbb264db7f791a3f4221562a4e52d459cee035135d337d9b +MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc diff --git a/sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch b/sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch new file mode 100644 index 000000000000..e063d303c7d8 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch @@ -0,0 +1,23 @@ +From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Tue, 21 Dec 2021 20:10:09 +0900 +Subject: [PATCH] meson: fix cross compiling + +(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02495d16c9..c76cab535d 100644 +--- a/meson.build ++++ b/meson.build +@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include ')) + conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include ')) + conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include ')) + conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) +-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include ')) ++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include ')) + + decl_headers = ''' + #include diff --git a/sys-apps/systemd-tmpfiles/metadata.xml b/sys-apps/systemd-tmpfiles/metadata.xml index de4a6cef156b..31123d01cb4d 100644 --- a/sys-apps/systemd-tmpfiles/metadata.xml +++ b/sys-apps/systemd-tmpfiles/metadata.xml @@ -1,12 +1,7 @@ - - gyakovlev@gentoo.org - Georgy Yakovlev - - - williamh@gentoo.org - William Hubbs + + systemd@gentoo.org diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild deleted file mode 100644 index d4b97e07bdd5..000000000000 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable -else - MY_PN=systemd -fi - -MINKV="3.11" -MUSL_PATCHSET="${PV}-r1" -PYTHON_COMPAT=( python3_{8..10} ) -inherit flag-o-matic meson python-any-r1 - -DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz - elibc_musl? ( - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - )" - -LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-apps/acl:0= - >=sys-apps/util-linux-2.30:0= - sys-libs/libcap:0= - selinux? ( sys-libs/libselinux:0= ) - virtual/libcrypt:= - !sys-apps/opentmpfiles - !sys-apps/systemd -" - -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-${MINKV} -" - -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gperf - >=dev-util/meson-0.46 - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ -n ${EPREFIX} ]]; then - ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.". - fi -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # musl patchset from: - # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd - # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches - # we share patch tarball with sys-fs/udev - if use elibc_musl; then - einfo "applying musl patches and workarounds" - eapply "${WORKDIR}/musl-patches" - - # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch - append-cppflags '-D__UAPI_DEF_ETHHDR=0' - - # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, - # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} - # not a nice workaround, but it comes from debug messages and we don't really use this component. - append-cflags '-Wno-error=format' - fi - - default - - # https://bugs.gentoo.org/767403 - python_fix_shebang src/test/*.py - python_fix_shebang test/*.py - python_fix_shebang tools/*.py -} - -src_configure() { - # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)" - # and optionally selinux feature can be enabled to make tmpfiles secontext-aware - local systemd_disable_options=( - adm-group - analyze - apparmor - audit - backlight - binfmt - blkid - bzip2 - coredump - dbus - efi - elfutils - environment-d - fdisk - gcrypt - glib - gshadow - gnutls - hibernate - hostnamed - hwdb - idn - ima - initrd - firstboot - kernel-install - kmod - ldconfig - libcryptsetup - libcurl - libfido2 - libidn - libidn2 - libiptc - link-networkd-shared - link-systemctl-shared - link-timesyncd-shared - link-udev-shared - localed - logind - lz4 - machined - microhttpd - networkd - nscd - nss-myhostname - nss-resolve - nss-systemd - oomd - openssl - p11kit - pam - pcre2 - polkit - portabled - pstore - pwquality - randomseed - resolve - rfkill - seccomp - smack - sysext - sysusers - timedated - timesyncd - tpm - qrencode - quotacheck - userdb - utmp - vconsole - wheel-group - xdg-autostart - xkbcommon - xz - zlib - zstd - ) - - # prepend -D and append =false, e.g. zstd becomes -Dzstd=false - systemd_disable_options=( ${systemd_disable_options[@]/#/-D} ) - systemd_disable_options=( ${systemd_disable_options[@]/%/=false} ) - - local emesonargs=( - -Drootprefix="${EPREFIX:-/}" - -Dacl=true - -Dtmpfiles=true - -Dstandalone-binaries=true # this and below option does the magic - -Dstatic-libsystemd=true - -Dsysvinit-path='' - ${systemd_disable_options[@]} - $(meson_use selinux) - ) - meson_src_configure -} - -src_compile() { - # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically. - # https://github.com/systemd/systemd/pull/16061 original implementation - # we just need to pass -Dstandalone-binaries=true and - # use .standalone target below. - # check meson.build for if have_standalone_binaries condition per target. - local mytargets=( - systemd-tmpfiles.standalone - man/tmpfiles.d.5 - man/systemd-tmpfiles.8 - ) - meson_src_compile "${mytargets[@]}" -} - -src_install() { - # lean and mean installation, single binary and man-pages - pushd "${BUILD_DIR}" > /dev/null || die - into / - newbin systemd-tmpfiles.standalone systemd-tmpfiles - - doman man/{systemd-tmpfiles.8,tmpfiles.d.5} - - popd > /dev/null || die - - # service files adapter from opentmpfiles - newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev - newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup - - # same content, but install as different file - newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev - newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup -} - -src_test() { - # 'meson test' will compile full systemd, but we can still outsmart it - "${EPYTHON}" test/test-systemd-tmpfiles.py \ - "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" -} - -# stolen from opentmpfiles ebuild -add_service() { - local initd=$1 - local runlevel=$2 - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - mkdir -p "${EROOT}/etc/runlevels/${runlevel}" - ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" -} - -pkg_postinst() { - if [[ -z $REPLACING_VERSIONS ]]; then - add_service stmpfiles-dev sysinit - add_service stmpfiles-setup boot - fi -} diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild new file mode 100644 index 000000000000..f9142ca4addc --- /dev/null +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild @@ -0,0 +1,260 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable +else + MY_PN=systemd +fi + +MINKV="3.11" +MUSL_PATCHSET="249.5-r1" +PYTHON_COMPAT=( python3_{8..10} ) +inherit flag-o-matic meson python-any-r1 + +DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz + https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz + elibc_musl? ( + https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + )" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-apps/acl:0= + >=sys-apps/util-linux-2.30:0= + sys-libs/libcap:0= + selinux? ( sys-libs/libselinux:0= ) + virtual/libcrypt:= + !sys-apps/opentmpfiles + !sys-apps/systemd +" + +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-${MINKV} +" + +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gperf + >=dev-util/meson-0.46 + >=sys-apps/coreutils-8.16 + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + if [[ -n ${EPREFIX} ]]; then + ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.". + fi +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + eapply "${WORKDIR}/systemd-249.7-CVE-2021-3997" + + # musl patchset from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches + # we share patch tarball with sys-fs/udev + if use elibc_musl; then + einfo "applying musl patches and workarounds" + eapply "${WORKDIR}/musl-patches" + + # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch + append-cppflags '-D__UAPI_DEF_ETHHDR=0' + + # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, + # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} + # not a nice workaround, but it comes from debug messages and we don't really use this component. + append-cflags '-Wno-error=format' + fi + + default + + # https://bugs.gentoo.org/767403 + python_fix_shebang src/test/*.py + python_fix_shebang test/*.py + python_fix_shebang tools/*.py +} + +src_configure() { + # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)" + # and optionally selinux feature can be enabled to make tmpfiles secontext-aware + local systemd_disable_options=( + adm-group + analyze + apparmor + audit + backlight + binfmt + blkid + bzip2 + coredump + dbus + efi + elfutils + environment-d + fdisk + gcrypt + glib + gshadow + gnutls + hibernate + hostnamed + hwdb + idn + ima + initrd + firstboot + kernel-install + kmod + ldconfig + libcryptsetup + libcurl + libfido2 + libidn + libidn2 + libiptc + link-networkd-shared + link-systemctl-shared + link-timesyncd-shared + link-udev-shared + localed + logind + lz4 + machined + microhttpd + networkd + nscd + nss-myhostname + nss-resolve + nss-systemd + oomd + openssl + p11kit + pam + pcre2 + polkit + portabled + pstore + pwquality + randomseed + resolve + rfkill + seccomp + smack + sysext + sysusers + timedated + timesyncd + tpm + qrencode + quotacheck + userdb + utmp + vconsole + wheel-group + xdg-autostart + xkbcommon + xz + zlib + zstd + ) + + # prepend -D and append =false, e.g. zstd becomes -Dzstd=false + systemd_disable_options=( ${systemd_disable_options[@]/#/-D} ) + systemd_disable_options=( ${systemd_disable_options[@]/%/=false} ) + + local emesonargs=( + -Drootprefix="${EPREFIX:-/}" + -Dacl=true + -Dtmpfiles=true + -Dstandalone-binaries=true # this and below option does the magic + -Dstatic-libsystemd=true + -Dsysvinit-path='' + ${systemd_disable_options[@]} + $(meson_use selinux) + ) + meson_src_configure +} + +src_compile() { + # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically. + # https://github.com/systemd/systemd/pull/16061 original implementation + # we just need to pass -Dstandalone-binaries=true and + # use .standalone target below. + # check meson.build for if have_standalone_binaries condition per target. + local mytargets=( + systemd-tmpfiles.standalone + man/tmpfiles.d.5 + man/systemd-tmpfiles.8 + ) + meson_src_compile "${mytargets[@]}" +} + +src_install() { + # lean and mean installation, single binary and man-pages + pushd "${BUILD_DIR}" > /dev/null || die + into / + newbin systemd-tmpfiles.standalone systemd-tmpfiles + + doman man/{systemd-tmpfiles.8,tmpfiles.d.5} + + popd > /dev/null || die + + # service files adapter from opentmpfiles + newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev + newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup + + # same content, but install as different file + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup +} + +src_test() { + # 'meson test' will compile full systemd, but we can still outsmart it + "${EPYTHON}" test/test-systemd-tmpfiles.py \ + "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" +} + +# stolen from opentmpfiles ebuild +add_service() { + local initd=$1 + local runlevel=$2 + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + mkdir -p "${EROOT}/etc/runlevels/${runlevel}" + ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" +} + +pkg_postinst() { + if [[ -z $REPLACING_VERSIONS ]]; then + add_service stmpfiles-dev sysinit + add_service stmpfiles-setup boot + fi +} diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild new file mode 100644 index 000000000000..77ba2a1996bb --- /dev/null +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild @@ -0,0 +1,260 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable +else + MY_PN=systemd +fi + +MINKV="3.11" +MUSL_PATCHSET="249.5-r1" +PYTHON_COMPAT=( python3_{8..10} ) +inherit flag-o-matic meson python-any-r1 + +DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz + elibc_musl? ( + https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + )" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-apps/acl:0= + >=sys-apps/util-linux-2.30:0= + sys-libs/libcap:0= + selinux? ( sys-libs/libselinux:0= ) + virtual/libcrypt:= + !sys-apps/opentmpfiles + !sys-apps/systemd +" + +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-${MINKV} +" + +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gperf + >=dev-util/meson-0.46 + >=sys-apps/coreutils-8.16 + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + if [[ -n ${EPREFIX} ]]; then + ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.". + fi +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}/249.9-cross-compile.patch" + ) + + # musl patchset from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches + # we share patch tarball with sys-fs/udev + if use elibc_musl; then + PATCHES+=( "${WORKDIR}/musl-patches" ) + + # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch + append-cppflags '-D__UAPI_DEF_ETHHDR=0' + + # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’, + # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’} + # not a nice workaround, but it comes from debug messages and we don't really use this component. + append-cflags '-Wno-error=format' + fi + + default + + # https://bugs.gentoo.org/767403 + python_fix_shebang src/test/*.py + python_fix_shebang test/*.py + python_fix_shebang tools/*.py +} + +src_configure() { + # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)" + # and optionally selinux feature can be enabled to make tmpfiles secontext-aware + local systemd_disable_options=( + adm-group + analyze + apparmor + audit + backlight + binfmt + blkid + bzip2 + coredump + dbus + efi + elfutils + environment-d + fdisk + gcrypt + glib + gshadow + gnutls + hibernate + hostnamed + hwdb + idn + ima + initrd + firstboot + kernel-install + kmod + ldconfig + libcryptsetup + libcurl + libfido2 + libidn + libidn2 + libiptc + link-networkd-shared + link-systemctl-shared + link-timesyncd-shared + link-udev-shared + localed + logind + lz4 + machined + microhttpd + networkd + nscd + nss-myhostname + nss-resolve + nss-systemd + oomd + openssl + p11kit + pam + pcre2 + polkit + portabled + pstore + pwquality + randomseed + resolve + rfkill + seccomp + smack + sysext + sysusers + timedated + timesyncd + tpm + qrencode + quotacheck + userdb + utmp + vconsole + wheel-group + xdg-autostart + xkbcommon + xz + zlib + zstd + ) + + # prepend -D and append =false, e.g. zstd becomes -Dzstd=false + systemd_disable_options=( ${systemd_disable_options[@]/#/-D} ) + systemd_disable_options=( ${systemd_disable_options[@]/%/=false} ) + + local emesonargs=( + -Drootprefix="${EPREFIX:-/}" + -Dacl=true + -Dtmpfiles=true + -Dstandalone-binaries=true # this and below option does the magic + -Dstatic-libsystemd=true + -Dsysvinit-path='' + ${systemd_disable_options[@]} + $(meson_use selinux) + ) + meson_src_configure +} + +src_compile() { + # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically. + # https://github.com/systemd/systemd/pull/16061 original implementation + # we just need to pass -Dstandalone-binaries=true and + # use .standalone target below. + # check meson.build for if have_standalone_binaries condition per target. + local mytargets=( + systemd-tmpfiles.standalone + man/tmpfiles.d.5 + man/systemd-tmpfiles.8 + ) + meson_src_compile "${mytargets[@]}" +} + +src_install() { + # lean and mean installation, single binary and man-pages + pushd "${BUILD_DIR}" > /dev/null || die + into / + newbin systemd-tmpfiles.standalone systemd-tmpfiles + + doman man/{systemd-tmpfiles.8,tmpfiles.d.5} + + popd > /dev/null || die + + # service files adapter from opentmpfiles + newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev + newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup + + # same content, but install as different file + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup +} + +src_test() { + # 'meson test' will compile full systemd, but we can still outsmart it + "${EPYTHON}" test/test-systemd-tmpfiles.py \ + "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" +} + +# stolen from opentmpfiles ebuild +add_service() { + local initd=$1 + local runlevel=$2 + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + mkdir -p "${EROOT}/etc/runlevels/${runlevel}" + ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" +} + +pkg_postinst() { + if [[ -z $REPLACING_VERSIONS ]]; then + add_service stmpfiles-dev sysinit + add_service stmpfiles-setup boot + fi +} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 808a8eed4059..8a4ccee0cde1 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,18 +1,14 @@ AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b -AUX 250-fix-openssl.patch 3558 BLAKE2B 719581b5e54202e7de45e8f23d7e2453a53184556598077fdc45bf5d6fdf208d00e5cb122cc33f5cb493e833d21e6e9335d553e964c1cb3ef1b2efcd027ff5d7 SHA512 a5673aa00ac018d3685f882a2843c397842024cff873467ecc6f6f4977a641c3c8f0350c60301fc3cb59ce75d5781ab15d6c79974a847ce0e0f1d03731a01430 +AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d 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-250.tar.gz 11112823 BLAKE2B c75ac7f1fcf1a65c9c88b25dce78dd44a039025b52767c3a1de78fae7a89705ed8ba8986d18d674faa9bfac3380a1c847bde35292d16f90bf22d992a459ddc73 SHA512 7894ea63793dd0c6ae12f6acab04ba02e247e537c404693f69174bf4a10d85f01f51c4938912c9a43c35e526b3ae945a1774d45249b58b31a393332b6c01f4f8 -DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f -DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc -DIST systemd-stable-250.1.tar.gz 11116731 BLAKE2B 9c0a8d02deb12a359c8665ba4d8d7e9d2ddee3f819f47b4598269e8ee8180e2e01ab774caeca7a19e98d118aebea5a38a07e916db4155efa0c19ce54a2b7e979 SHA512 a40a83dae353de8cf816f3408f91b9f72dfa1f4bae195fb48c2756c0c316bf6cb0def1be550c0322456e4940690d90ff324ca6d91126d9b13cfe9954c42e0216 -EBUILD systemd-249.6-r1.ebuild 14730 BLAKE2B c40a2c8ba95cfb613f3260fc0ad4b21408c35a5e4d804d3f80df0934fa4a86276cfe19de8354189f5e1554deb75b6e73caa701d64995f97ff0d4f57a1b418ca4 SHA512 45196efcb82b33fe295e29aa37066a0b175ca603d62cbadd0ee655b22ec4b8a91c0edd1107d38320e292b885b2f83b9ae625fed21db3a24392c253b9d90685d0 -EBUILD systemd-249.7.ebuild 14731 BLAKE2B 3aedadd028899d1a74cb841660f8fe1a59d78330cb7bd951388d87aa7197f94d2fbcec600a95a0a6d76c55d085178f7c5fdcd3374f49ee58d040e7ce66f1e73b SHA512 5b75ee51471cc21e3fbb4c77c4fd4f2580f4932964f90f787b51d72ec60785193a06ea72f0281fabc73aa514eca73b8ecefe6e7192decdcb091b449e47f302bb -EBUILD systemd-250-r1.ebuild 15274 BLAKE2B 3d2add620e89c66e586503a78fec3f349028267e38d84dc2d07a8706f04e2a65f9f5764ef9a14358ce197095ef6a0abad2577c2062821fd76c833a09e29d27ac SHA512 a654338a354558d36f46b3ff6d5cb4fc3f068789a267dda300b9a4db14bd10dc9f9d9a13327f5c7dc20fea4f593e6ba026b83390cec4791672a4c22d9dcb4d03 -EBUILD systemd-250.1.ebuild 15236 BLAKE2B b5ec69d56db03c03887530773faa4a824cee21a493d9ccca74cc1d1a1948faaa2fcec3798932c5d50bf8e124faee2c910fa727313456807f9fde8f141efcff7f SHA512 d0b3dc2cf86aceff1a0de842fd10a48d9897006a62bc8c97f44309a5a60ca36880f75b78203fdef11c2e95ef7f50a9dbdfb7e16b9dbb6298a2fc1453a3e12c2c +DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 +DIST systemd-stable-250.2.tar.gz 11121031 BLAKE2B ddbb33648dbf0442e4258bf23ace04eac6d5ab6a2434537395b900b7bd4113a86199d6d559f8d76dcbede88484240a6593439acdcc7b1801857d13840c389c6c SHA512 2f734c1d1ea98ee3f1beb00689a0d56603cd981aa938bee1655445ddd4af3b2bb6472249fa158741edcb2259ee302b625e124c38b7d2ec00c53760d6b362d5bb +EBUILD systemd-249.9.ebuild 14772 BLAKE2B dd30c3e815f172ef3bba39e7a6431a0c4b6e22e822ff25e2c9ebdaabf4ae41fc84c1b9b11c23b2f2ec5c736e8d4d6680230f9f98f949915a0e3cd8fc2a13dc7f SHA512 b4dacfeb6c93be2bcbd5ef9259de7d7a645c1fa308745cb7e9a966c0e0d3c457f4add78c2e20912c75cd72b4bdf02eb51505000e36cfe5b253b4cfae826c1344 +EBUILD systemd-250.2.ebuild 15236 BLAKE2B b5ec69d56db03c03887530773faa4a824cee21a493d9ccca74cc1d1a1948faaa2fcec3798932c5d50bf8e124faee2c910fa727313456807f9fde8f141efcff7f SHA512 d0b3dc2cf86aceff1a0de842fd10a48d9897006a62bc8c97f44309a5a60ca36880f75b78203fdef11c2e95ef7f50a9dbdfb7e16b9dbb6298a2fc1453a3e12c2c EBUILD systemd-9999.ebuild 15236 BLAKE2B 886bb6be8442cf7a137c8bad923802a79c39418bdc1940a6f5efa50f090de609921c3c009e5ad077f81f83c13c8567b0be7a4cfbeeb1819e71be1269d0acc667 SHA512 19144abfacf1484fb26bccccbed1704de52ba247af2c06a91348f4998ecbe4c788ffd141d32371420b798315561713499f79306f6cf5d4d88e1ce9579a64bd38 MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b diff --git a/sys-apps/systemd/files/249.9-cross-compile.patch b/sys-apps/systemd/files/249.9-cross-compile.patch new file mode 100644 index 000000000000..e063d303c7d8 --- /dev/null +++ b/sys-apps/systemd/files/249.9-cross-compile.patch @@ -0,0 +1,23 @@ +From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Tue, 21 Dec 2021 20:10:09 +0900 +Subject: [PATCH] meson: fix cross compiling + +(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02495d16c9..c76cab535d 100644 +--- a/meson.build ++++ b/meson.build +@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include ')) + conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include ')) + conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include ')) + conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) +-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include ')) ++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include ')) + + decl_headers = ''' + #include diff --git a/sys-apps/systemd/files/250-fix-openssl.patch b/sys-apps/systemd/files/250-fix-openssl.patch deleted file mode 100644 index 520ba0b66427..000000000000 --- a/sys-apps/systemd/files/250-fix-openssl.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 9bcf483b117b23ae25bf4a5d39ddc3eade8659a6 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Fri, 24 Dec 2021 10:06:13 +0900 -Subject: [PATCH] meson: fix build with -Dcryptolib=openssl - -Ddns-over-tls=false - -Previously, when -Ddns-over-tls=false, libopenssl was missing in the -dependency of resolved. -Also, this drops libgpg_error when it is not necessary. - -Replaces #21878. ---- - meson.build | 3 +-- - src/resolve/meson.build | 9 +-------- - 2 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/meson.build b/meson.build -index c0cbadecb123..0b7c1918ad4c 100644 ---- a/meson.build -+++ b/meson.build -@@ -1474,7 +1474,7 @@ conf.set10('PREFER_OPENSSL', - opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0)) - conf.set10('HAVE_OPENSSL_OR_GCRYPT', - conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1) --lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? libopenssl : libgcrypt -+lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? [libopenssl] : [libgcrypt, libgpg_error] - - dns_over_tls = get_option('dns-over-tls') - if dns_over_tls != 'false' -@@ -2200,7 +2200,6 @@ if conf.get('ENABLE_RESOLVE') == 1 - libsystemd_resolve_core], - dependencies : [threads, - lib_openssl_or_gcrypt, -- libgpg_error, - libm, - libidn], - install_rpath : rootlibexecdir, -diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index 0580fbeec625..2cdf24b1cbef 100644 ---- a/src/resolve/meson.build -+++ b/src/resolve/meson.build -@@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target( - output : 'resolved-dnssd-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - --systemd_resolved_dependencies = [threads, libgpg_error, libm] -+systemd_resolved_dependencies = [threads, libm] + [lib_openssl_or_gcrypt] - if conf.get('ENABLE_DNS_OVER_TLS') == 1 - if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1 - systemd_resolved_sources += files( -@@ -178,14 +178,12 @@ tests += [ - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm]], - - [['src/resolve/test-dns-packet.c'], - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm]], - - [['src/resolve/test-resolved-etc-hosts.c', -@@ -194,21 +192,18 @@ tests += [ - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm]], - - [['src/resolve/test-resolved-packet.c'], - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm]], - - [['src/resolve/test-dnssec.c'], - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm], - [], 'HAVE_OPENSSL_OR_GCRYPT'], - -@@ -216,7 +211,6 @@ tests += [ - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm], - [], '', 'manual'], - ] -@@ -226,6 +220,5 @@ fuzzers += [ - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, -- libgpg_error, - libm]], - ] diff --git a/sys-apps/systemd/systemd-249.6-r1.ebuild b/sys-apps/systemd/systemd-249.6-r1.ebuild deleted file mode 100644 index 0e72de6fff3e..000000000000 --- a/sys-apps/systemd/systemd-249.6-r1.ebuild +++ /dev/null @@ -1,505 +0,0 @@ -# Copyright 2011-2021 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 - -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 ~mips ppc ppc64 ~riscv sparc x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -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 homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" - -REQUIRED_USE=" - homed? ( cryptsetup pam ) - importd? ( curl gcrypt lzma ) - pwquality? ( homed ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" - -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= ) - dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - homed? ( ${OPENSSL_DEP} ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] - >=net-libs/gnutls-3.1.4:0= - ) - 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}] ) - nat? ( net-firewall/iptables: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= ) - repart? ( ${OPENSSL_DEP} ) - 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 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - 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="~AUTOFS4_FS ~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 -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - 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 - - 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) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-ld="$(tc-getLD)" - -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 nat libiptc) - $(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 repart) - $(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 - - 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 -} - -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-249.7.ebuild b/sys-apps/systemd/systemd-249.7.ebuild deleted file mode 100644 index 0d9a1792bad8..000000000000 --- a/sys-apps/systemd/systemd-249.7.ebuild +++ /dev/null @@ -1,505 +0,0 @@ -# Copyright 2011-2021 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 - -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 ~mips ppc ppc64 ~riscv ~sparc x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -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 homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" - -REQUIRED_USE=" - homed? ( cryptsetup pam ) - importd? ( curl gcrypt lzma ) - pwquality? ( homed ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" - -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= ) - dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - homed? ( ${OPENSSL_DEP} ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] - >=net-libs/gnutls-3.1.4:0= - ) - 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}] ) - nat? ( net-firewall/iptables: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= ) - repart? ( ${OPENSSL_DEP} ) - 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 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - 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="~AUTOFS4_FS ~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 -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - 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 - - 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) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-ld="$(tc-getLD)" - -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 nat libiptc) - $(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 repart) - $(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 - - 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 -} - -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-249.9.ebuild b/sys-apps/systemd/systemd-249.9.ebuild new file mode 100644 index 000000000000..33318710a8e7 --- /dev/null +++ b/sys-apps/systemd/systemd-249.9.ebuild @@ -0,0 +1,506 @@ +# 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 + +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 ~mips ppc ppc64 ~riscv sparc x86" +fi + +inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +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 homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" + +REQUIRED_USE=" + homed? ( cryptsetup pam ) + importd? ( curl gcrypt lzma ) + pwquality? ( homed ) +" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + +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= ) + dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + fido2? ( dev-libs/libfido2:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + homed? ( ${OPENSSL_DEP} ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] + >=net-libs/gnutls-3.1.4:0= + ) + 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}] ) + nat? ( net-firewall/iptables: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= ) + repart? ( ${OPENSSL_DEP} ) + 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 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + 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="~AUTOFS4_FS ~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 -lt 5 10 20; then + CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" + else + CONFIG_CHECK+=" ~KCMP" + 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+=( + "${FILESDIR}/249.9-cross-compile.patch" + ) + + 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 + + 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) + -Defi-includedir="${ESYSROOT}/usr/include/efi" + -Defi-ld="$(tc-getLD)" + -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 nat libiptc) + $(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 repart) + $(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 + + 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 +} + +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-250-r1.ebuild b/sys-apps/systemd/systemd-250-r1.ebuild deleted file mode 100644 index 3b2c62053490..000000000000 --- a/sys-apps/systemd/systemd-250-r1.ebuild +++ /dev/null @@ -1,521 +0,0 @@ -# Copyright 2011-2021 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 - -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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -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 +kmod - +lz4 lzma nat +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}] ) - nat? ( 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] ) - 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="~AUTOFS4_FS ~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 -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - 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+=( - "${FILESDIR}"/250-fix-openssl.patch - ) - - 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 - - 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 nat 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 -} - -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-250.1.ebuild b/sys-apps/systemd/systemd-250.1.ebuild deleted file mode 100644 index d4624f9759b6..000000000000 --- a/sys-apps/systemd/systemd-250.1.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# 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 - -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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -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 +kmod - +lz4 lzma nat +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}] ) - nat? ( 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] ) - 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="~AUTOFS4_FS ~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 -lt 5 10 20; then - CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" - else - CONFIG_CHECK+=" ~KCMP" - 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 - - 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 nat 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 -} - -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-250.2.ebuild b/sys-apps/systemd/systemd-250.2.ebuild new file mode 100644 index 000000000000..d4624f9759b6 --- /dev/null +++ b/sys-apps/systemd/systemd-250.2.ebuild @@ -0,0 +1,520 @@ +# 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 + +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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +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 +kmod + +lz4 lzma nat +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}] ) + nat? ( 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] ) + 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="~AUTOFS4_FS ~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 -lt 5 10 20; then + CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" + else + CONFIG_CHECK+=" ~KCMP" + 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 + + 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 nat 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 +} + +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 +} -- cgit v1.2.3