diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/Manifest.gz | bin | 49875 -> 49878 bytes | |||
-rw-r--r-- | sys-apps/coreutils/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/coreutils/coreutils-9.3-r2.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/less/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/less/files/less-633-tinfow.patch | 52 | ||||
-rw-r--r-- | sys-apps/less/less-633-r2.ebuild | 86 | ||||
-rw-r--r-- | sys-apps/less/less-9999.ebuild | 11 | ||||
-rw-r--r-- | sys-apps/pv/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/pv/pv-1.7.0.ebuild | 64 | ||||
-rw-r--r-- | sys-apps/sandbox/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-2.37.ebuild | 64 | ||||
-rw-r--r-- | sys-apps/system-monitoring-center/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/system-monitoring-center/system-monitoring-center-2.18.1.ebuild (renamed from sys-apps/system-monitoring-center/system-monitoring-center-2.17.3.ebuild) | 0 | ||||
-rw-r--r-- | sys-apps/systemd-utils/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/systemd-utils/systemd-utils-253.7.ebuild | 532 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-253.7.ebuild | 512 |
17 files changed, 1332 insertions, 9 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 486a33408757..a33ff26e70cf 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index c7b18d84696c..c6c7f45b4bcc 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -12,7 +12,7 @@ DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941 DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5 EBUILD coreutils-8.32-r1.ebuild 5971 BLAKE2B df0b4420c70792707eac0b612bc8436ce46194b1c6939132fe1f98f35da8ca6ece969aadc7a40d80305805e46e61591284cd291408f50edbe428e48fc00b533b SHA512 e33271d936216c3a4d6c272f48b24b280116d9cde71e4188341abe1d45d97412effdaf635eda714edc7b0c71c2269003e00887bbfdffedb9990567896f818fa9 EBUILD coreutils-9.1-r2.ebuild 7117 BLAKE2B 5db5bc551fc63dfdb56044f31ab7e96d240075c2dbb6e062064922d9e31d8de12f87ce713067e06b91963365e7d7809150558dd6626ceb2da1a0708f64b1f770 SHA512 e3269b4dca6f1468f77aaafd0561833dc11a019463b05709f6485548610fd4040ae274258415b56d4e42d86ef3ad4914d4aced8d8a50c6002b6e95ea1f12e6a3 -EBUILD coreutils-9.3-r2.ebuild 7797 BLAKE2B c30b866072e234324d19bd963044c89d7769ec51ffa33876c91bf9556b7a0999d56e6a545570589b90ad65c7329225494d60f63a1edfababbc5544b7617a40fc SHA512 77f1237c0d23b158820ffde0260e4be066237fc909c27ecdfa80b7b3a249b2d3ed3c297a04105f33d827a85596e986bd749cad03a9bf1ef0dd576026a1c5a9db +EBUILD coreutils-9.3-r2.ebuild 7796 BLAKE2B bbe78d1862eac574a8f453d54d66fe6eaf2886fab51c991d71f3bb3d86abd7a64147b55df1b9461098867f1f087d0030be406fe3ba7ed307e95949e123fd8ff9 SHA512 6fa7619b865fb396da88f960b071df75ed9b7f6b75a5dcdf0355ffffb72990bf8da6c42e19f6b618433181d678f0da75b40c440ba98928529f9f5564f0ab1562 EBUILD coreutils-9.3-r3.ebuild 7936 BLAKE2B aa2665fddc17343c70d53f4a7db41d82d1ecaf869daa7ba9ea4c43106e3466b39f6984a6a4cc8b5569e9dc48ebfecb0012d2a63b77dc6397069253bbb72e33fb SHA512 1d7463859718b0d5549a301704b7e5eaee5c0fce1b4824b123641d2ef73fe59f865c6584f33ca7fd81de34f954d4669755d3d7439cab4c0c2e84a2637b372e2f EBUILD coreutils-9999.ebuild 7689 BLAKE2B ba53dbdc7590be4727654e1a8f0fdc13b45e682c335c56bb8358fd06d261248703bbb89567c9480488c4ddfbc9faff9dc99356296775e1170219040d49beb2e8 SHA512 19025126674094fdacbc002caefadf346a98e9fc2a2255532019d7e3d110d7baa689ddfeb8caac692ff12226381e4f2eb79fb72aec882cd2b8e82f09a82ad5c1 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1 diff --git a/sys-apps/coreutils/coreutils-9.3-r2.ebuild b/sys-apps/coreutils/coreutils-9.3-r2.ebuild index 8eb0b257c20d..84f4879368e4 100644 --- a/sys-apps/coreutils/coreutils-9.3-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.3-r2.ebuild @@ -33,7 +33,7 @@ else verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) " - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" fi SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 56b866bfdb52..3a7a4e819ad1 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,5 +1,6 @@ AUX less-608-CVE-2022-46663.patch 696 BLAKE2B 3f4ddff375321ec410b12b9dac457536c98a9a3f123e0715dc40cbd0fe85e4b59676767ea6819688338d6280158ae7f04f93bbf283d8616da5021816f4125fa3 SHA512 417c06b1dd7ff764b58b4cc4c93df2d44d224780b5799ecaad50348b4654bd26f181082539855203d9f1e6a928908cdf650269c9998dbd6dab31e5e912d41cfc AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668 +AUX less-633-tinfow.patch 1804 BLAKE2B fe590b454289e93278c70e479ced66bae59e83e2bb857a0eedb7011cd8133df327b7a4ff1deb7cdc3a32c2d02e9b091a37b0cbbb4d1ec4661cbce901ef95fae9 SHA512 3841d4568b290eebf9a3b1d6b8d6439b7b53c21efd7adf2c795b79c450b5e823436f9d6ddbe37b75a6fba64b72d5497adf9a006a9cb06fd8e44e5c86c8e0f946 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94 AUX lesspipe-r2.sh 8293 BLAKE2B 2c572cbb554ab229830090040a5cd523739b7ffbd41ff910170dc0865d573a946a9548a03a5dc661a272c4297c1501f4bca1d7642e0d5c2e499f9248e174d65d SHA512 d16850172c05c2d75a4c069af3b0d4556dd3da52ce008a7ebe37e421ac089a3174e0f16955ca6edfaa110925cd1bee7f61f11374c802ef5de8ed0a23a2c2b96b @@ -10,6 +11,7 @@ EBUILD less-608-r1.ebuild 1587 BLAKE2B 68675bd30388ab95aa57d8fc90bcd98fc6b27f26e EBUILD less-608-r2.ebuild 1634 BLAKE2B 87c9824276ec63f523bef354cdc92a91f6771e43adcf141c8a8e0b6ae20eb2391a15bdd8c37d18527d04135c873fe4330207bcbd331fabf20f7c3e0cbfc03343 SHA512 5f97824ddd3760ddc995d2eff9d915f023e9162a803e1fcc098abc2cd56745b250df1b37646e7cb533c74bbd3436bc4784e70f3cd7cd76716dfe7a32acdc6279 EBUILD less-632.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e EBUILD less-633-r1.ebuild 2145 BLAKE2B 75ae1bea2dbb05b4312e4eb965d8eed139cee5ee70c243452bbeda9711b582cea641871372e9cbaee0005e296291cd634a09175efe4acb7f68d2f6891e5ff3b4 SHA512 1353a46b9ccbab1fb3e58d171ae098da0a838ec37ca7b99ceec7585d927b2f6494d717890a55db7ce053e67bf010fddf7f293ad144e79275e965c0cf0efd5f3f +EBUILD less-633-r2.ebuild 2242 BLAKE2B fd789264823a69c63b959d72e425db69b232ee8af9eb051a99ca4210a422de7997880867c8cd9a0955182a9f81d56e2c61430fff3dbc4075ae9261eaf92c62b9 SHA512 f7c256e5ba0652476bb3d0f94e62dc14987c8547c53153682d877fe1428b80861cb8dffd2a613959a8b4727fb7f88e9ec8f9ca2a32e58e0e3649c3a4b9b9a74e EBUILD less-633.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e -EBUILD less-9999.ebuild 2145 BLAKE2B 75ae1bea2dbb05b4312e4eb965d8eed139cee5ee70c243452bbeda9711b582cea641871372e9cbaee0005e296291cd634a09175efe4acb7f68d2f6891e5ff3b4 SHA512 1353a46b9ccbab1fb3e58d171ae098da0a838ec37ca7b99ceec7585d927b2f6494d717890a55db7ce053e67bf010fddf7f293ad144e79275e965c0cf0efd5f3f +EBUILD less-9999.ebuild 2124 BLAKE2B 345d0f8258332cd65eca9a57f438415e69805d15a9e03b46db1267448f1c6720bb4aff6f5faf67cd44030a7337a725ab829225e9bdff348bfd06922558b56af4 SHA512 77ea066f0243f89e36f1947dd07cf0ce49294dd49cea5369b990ec294ecaccc7e18cd5ccba89d1bb7f2234cb5cf48c63b5cd12e410ba176d90e20ff15a4af54d MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f diff --git a/sys-apps/less/files/less-633-tinfow.patch b/sys-apps/less/files/less-633-tinfow.patch new file mode 100644 index 000000000000..82ea458cd008 --- /dev/null +++ b/sys-apps/less/files/less-633-tinfow.patch @@ -0,0 +1,52 @@ +https://github.com/gwsw/less/pull/403 + +From 23000c286773af153a5743bc923465707b87613b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 17 Jul 2023 22:58:27 +0100 +Subject: [PATCH] configure.ac: Check for tinfow before tinfo + +We currently check for ncursesw > ncurses and then tinfo > tinfow. This means +we can get a mismatch of ncursesw + tinfo, instead of the correct ncursesw + tinfow. + +Swap the order so we check for ncursesw first (before other ncurses variants) +and then tinfow first (before other tinfo variants). + +This is needed anyway for correctness, but also needed for certain terminfos +to work correctly with recent ncurses. + +A better fix would be to use pkg-config first which handles this correctly +and would include the appropriate -ltinfo* in the libraries list for -lncurses*, +but not doing that for now. + +Bug: https://bugs.gentoo.org/910430 +--- a/configure.ac ++++ b/configure.ac +@@ -63,10 +63,10 @@ fi + + if test $curses_broken = 0; then + +-# -- Try tinfo. ++# -- Try tinfow. + if test "x$TERMLIBS" = x; then +- if test $have_tinfo = yes; then +- TERMLIBS="-ltinfo" ++ if test $have_tinfow = yes; then ++ TERMLIBS="-ltinfow" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) +@@ -75,10 +75,10 @@ if test "x$TERMLIBS" = x; then + fi + fi + +-# -- Try tinfow. ++# -- Try tinfo. + if test "x$TERMLIBS" = x; then +- if test $have_tinfow = yes; then +- TERMLIBS="-ltinfow" ++ if test $have_tinfo = yes; then ++ TERMLIBS="-ltinfo" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) + diff --git a/sys-apps/less/less-633-r2.ebuild b/sys-apps/less/less-633-r2.ebuild new file mode 100644 index 000000000000..5d22949f4f80 --- /dev/null +++ b/sys-apps/less/less-633-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE=none +WANT_LIBTOOL=none + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gwsw/less" + inherit git-r3 +fi + +inherit autotools flag-o-matic optfeature + +# Releases are usually first a beta then promoted to stable if no +# issues were found. Upstream explicitly ask "to not generally distribute" +# the beta versions. It's okay to keyword beta versions if they fix +# a serious bug, but otherwise try to avoid it. + +MY_PV=${PV/_beta/-beta} +MY_P=${PN}-${MY_PV} +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="https://www.greenwoodsoftware.com/less/" +[[ ${PV} != 9999 ]] && SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P/?beta} + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +IUSE="pcre" +# As of 623_beta, lesstest is not included in dist tarballs +# https://github.com/gwsw/less/issues/344 +RESTRICT="test" + +DEPEND=" + >=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:= + pcre? ( dev-libs/libpcre2 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-633-tinfow.patch +) + +src_prepare() { + default + # Per upstream README to prepare live build + [[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles + # Upstream uses unpatched autoconf-2.69, which breaks with clang-16. + # https://bugs.gentoo.org/870412 + eautoreconf +} + +src_configure() { + append-lfs-flags # bug #896316 + + local myeconfargs=( + --with-regex=$(usex pcre pcre2 posix) + --with-editor="${EPREFIX}"/usr/libexec/editor + ) + econf "${myeconfargs[@]}" +} + +src_test() { + emake check VERBOSE=1 +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe-r2.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + optfeature "Colorized output supprt" dev-python/pygments + + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + fi +} diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild index c6edffba45d8..cbd0aff28900 100644 --- a/sys-apps/less/less-9999.ebuild +++ b/sys-apps/less/less-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 fi -inherit autotools optfeature +inherit autotools flag-o-matic optfeature # Releases are usually first a beta then promoted to stable if no # issues were found. Upstream explicitly ask "to not generally distribute" @@ -31,9 +31,6 @@ if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="pcre" -# As of 623_beta, lesstest is not included in dist tarballs -# https://github.com/gwsw/less/issues/344 -RESTRICT="test" DEPEND=" >=app-misc/editor-wrapper-3 @@ -42,6 +39,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-633-tinfow.patch +) + src_prepare() { default # Per upstream README to prepare live build @@ -52,6 +53,8 @@ src_prepare() { } src_configure() { + append-lfs-flags # bug #896316 + local myeconfargs=( --with-regex=$(usex pcre pcre2 posix) --with-editor="${EPREFIX}"/usr/libexec/editor diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest index 9fa68dfb553c..3205b5da0607 100644 --- a/sys-apps/pv/Manifest +++ b/sys-apps/pv/Manifest @@ -1,3 +1,5 @@ DIST pv-1.6.20.tar.bz2 115310 BLAKE2B b50623f623231e8e8615f960bad83d10e12d5274c57d23ea843d16fce30b3e690284b2d9b01f82a16b9790e2bf26f80f560e226589a62ca677a2cf90ea007691 SHA512 e445f91b298ed285ddab54a3f8a6b5d5297e2e2eb8ad7b2ee2cbacca4adda9c6ca2bf3c77bf2a93373d3875c5b3b0b345d3945cbd91fc2647c6c25f1661a6752 +DIST pv-1.7.0.tar.bz2 115665 BLAKE2B efdd0434d23fe1ed008224fe0fe5182684010a78650284e920b2cd93134f08e63172df0279b8a4b2c2c4dceb9dbdaa209e402394fb1c4c431d991225f579f718 SHA512 b90ddaa1f950b1b300f1721e5ab8bc2c7a0c46491e439ce33c7b74fd4525e730a99c218a874b3dae2dc3a8a5e0eb5c5add51f7c8be48d0c3d8f135df44779af8 EBUILD pv-1.6.20.ebuild 1456 BLAKE2B 055fc1d118f5f5500e3fb453d94ae40c0db8389425df249cd2cc8d9303db9a113a13d324c1b2f53d993ce455eaaaa695bc542a4c53f5bc2564d314ffbe76721d SHA512 583e35041a54b3123c757acad234afb053d00703e8b8a57efb680fc76d7738485f30d0aed94ad31bbd9d4a4db7356b72a0628ec74fffaa3388af8b7e3abf54a3 +EBUILD pv-1.7.0.ebuild 1597 BLAKE2B 59992824f88bf9301d94434d9e00b715ab2b4f02e9b185873cf6ade7b3e2734a3c57ea4b26c0eb3dc6e3bacb15158d2e79a31ef38f813b28c6a197ae29247165 SHA512 a6af96cc2f820081221ec2ab2923b2c1cd84a3fd9ed29999cfc104501be813ac52c14a361b25ae4c0ba8b1caaa9d9f2ffb39ae426de9ec82e5c6c6036e3ce667 MISC metadata.xml 483 BLAKE2B c6240298c7a79c7d5839c593b0139c990477ce67aeb92b585bbb09a07d51bbe9bd75aaeac678ddd81c05cc6f9e36860ad8cfc889204e835019f854477a5bc7bf SHA512 082cac9d7bcff373929e3c0a7af524b65c48cc427755232f981ccd4947466f2f3325a75f691f1bf79e74eebde3e53b4ebd4c904b40affc0d7fbd243f8ab36605 diff --git a/sys-apps/pv/pv-1.7.0.ebuild b/sys-apps/pv/pv-1.7.0.ebuild new file mode 100644 index 000000000000..d13550cbb754 --- /dev/null +++ b/sys-apps/pv/pv-1.7.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="de fr pl pt" +PLOCALE_BACKUP="en" +inherit flag-o-matic linux-info toolchain-funcs plocale + +DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe" +HOMEPAGE="https://www.ivarch.com/programs/pv.shtml" +SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug nls" + +DOCS=( README.md doc/NEWS.md doc/TODO.md ) + +QA_CONFIG_IMPL_DECL_SKIP=( + stat64 # See https://github.com/a-j-wood/pv/issues/69 +) + +pkg_setup() { + if use kernel_linux; then + CONFIG_CHECK="~SYSVIPC" + ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option." + linux-info_pkg_setup + fi +} + +src_prepare() { + default + + sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die + + # These should produce the same end result (working `pv`). + sed -i \ + -e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \ + autoconf/make/modules.mk~ || die + + sed -i -e 's:usleep 200000 || ::g' tests/019-remote-cksum || die + + disable_locale() { + local locale=${1} + sed -i configure -e "/ALL_LINGUAS=/s:${locale}::g" || die + } + + plocale_find_changes src/nls '' '.po' + plocale_for_each_disabled_locale disable_locale +} + +src_configure() { + tc-export AR + + # Workaround for https://github.com/a-j-wood/pv/issues/69 + append-lfs-flags + + econf \ + --enable-lfs \ + $(use_enable debug debugging) \ + $(use_enable nls) +} diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index f4196b0e5132..236cd9871f29 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -2,7 +2,9 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5 DIST sandbox-2.32.tar.xz 456724 BLAKE2B 95eed293ef9427726f62d0d7ac1a0c63bbfd152d71598f6c5f792c8b818999c98600f4d8c71b92c8a90ba9fca595b5619ba408ac5f0edcc012050111d84519e0 SHA512 db0fe755b0bff0888a7861194218e980a73a2c4c0afadb7f0e5bb794dbc8b3d5bfbf7e2510a7167874c9f6fbf7eea428e6eae7b52dcbc91ffbd2aa1b1b54bef8 DIST sandbox-2.35.tar.xz 459228 BLAKE2B 72a7b48d0bb9021b65093f7ab8ed98e3fecb2544869c67a4cc00e829f3885d936320fa452f8807e95123e75cd14cfaf1797015c17dd30e40ba8694665c9d7e9c SHA512 ba3351c4e6aea2a4390c6d66a7d9de0b4c80e0e6c8a2cb298cb30dcaeeb1618f66d75055ac00c0d8f169a29c9c3175bec5e95a4228f93f353a1d8c8d0a07d177 DIST sandbox-2.36.tar.xz 459348 BLAKE2B e0544e6e37533009939a6756f4d6c0f5c4aada4679bff539c65dd602024d85d70550912a4128223c691400664fd8e75cefad504e03516b3421cf7c6befdf5fcd SHA512 6590887f0e56ee322d7ff2e55041bfa6cf8edc77f0369a8dcf2287dce5fb7ba845b0336c7d8bb91b2c50e7b9a4f1e52eecaee1d2381d25bb260ea9fd2f9d4587 +DIST sandbox-2.37.tar.xz 459420 BLAKE2B 0f6c701f819139f557a5fccb59e67509b04ba6eb22e79250a69ae990b123f9f7b618bb82a43ea86e1b18614c38d0d884aceb77d17af5a92030b2b4ad89eb2bd4 SHA512 91ddb98aa118f2d606aaf64b20598dbed9239069350842ab9fd3af05b1942380c92841d044387bc2d761317faa9c44848b3010e18747d834c115929f64060056 EBUILD sandbox-2.32.ebuild 1737 BLAKE2B 398d141fabc24f78a9eb35e321bdb9bad1778ddecdf1a70d18da5fa5466274557f0922015764e32119460811d2da2467b988f09878148e3b3b20e7ff884693cb SHA512 b187bca63b637ed2cc95a7a8deaf828843da575009a33e6c39c34dbe5ea240c05bc53a6c3f71b7c8df0a004a52fb7b2ec60627ef4d04496055e6cdc89bebca94 EBUILD sandbox-2.35.ebuild 1745 BLAKE2B 1fd4a6d877782d69ccc010ddb727c918082217dc8ce703b1034a0b36f8202a19360c8b35347e7359e4b50111c597991b705434bafaf15580abd4d2fd4ae78856 SHA512 a6c206f983d388fab464412207bcbf023962d794f522671ccad76f64b4f96353f30b3c7c9ba4dc43f1687f22bfbd8f00263325e3fca315323c6d50286938e934 EBUILD sandbox-2.36.ebuild 1745 BLAKE2B 1fd4a6d877782d69ccc010ddb727c918082217dc8ce703b1034a0b36f8202a19360c8b35347e7359e4b50111c597991b705434bafaf15580abd4d2fd4ae78856 SHA512 a6c206f983d388fab464412207bcbf023962d794f522671ccad76f64b4f96353f30b3c7c9ba4dc43f1687f22bfbd8f00263325e3fca315323c6d50286938e934 +EBUILD sandbox-2.37.ebuild 1737 BLAKE2B 398d141fabc24f78a9eb35e321bdb9bad1778ddecdf1a70d18da5fa5466274557f0922015764e32119460811d2da2467b988f09878148e3b3b20e7ff884693cb SHA512 b187bca63b637ed2cc95a7a8deaf828843da575009a33e6c39c34dbe5ea240c05bc53a6c3f71b7c8df0a004a52fb7b2ec60627ef4d04496055e6cdc89bebca94 MISC metadata.xml 512 BLAKE2B 2befd96e6697e45e04b9e5c6594d30987f035b52fe2d642e10b67b3a2f9657b63f66f48439cd6df71f07ad6fe112220f195d453595c4bf1ef47561cfb8c0428d SHA512 1869fc1c558817f7c7ace988184b74647a82c94e51f0bdb610011bd6736034188abb778e3c5b852ff39daad5a7ef131b09468353b0764a4957dfe72da4767601 diff --git a/sys-apps/sandbox/sandbox-2.37.ebuild b/sys-apps/sandbox/sandbox-2.37.ebuild new file mode 100644 index 000000000000..0fb5f9276a08 --- /dev/null +++ b/sys-apps/sandbox/sandbox-2.37.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic multilib-minimal multiprocessing + +DESCRIPTION="sandbox'd LD_PRELOAD hack" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox" +SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="+nnp" + +# pax-utils lower bound for bug #265376 +DEPEND=">=app-misc/pax-utils-0.1.19" +# Avoid folks installing with older file, bug #889046. We still need the +# >= dep in Portage but this is a safety net if people do partial upgrades. +RDEPEND="!<sys-apps/file-5.44-r1" +BDEPEND="app-arch/xz-utils" + +has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice" + +sandbox_death_notice() { + ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" + ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" +} + +src_prepare() { + default + + if ! use nnp ; then + sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die + fi + + # sandbox uses `__asm__ (".symver "...` which does + # not play well with gcc's LTO: https://gcc.gnu.org/PR48200 + filter-lto +} + +multilib_src_configure() { + filter-lfs-flags #90228 + + ECONF_SOURCE="${S}" econf +} + +multilib_src_test() { + # Default sandbox build will run with --jobs set to # cpus. + emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" +} + +multilib_src_install_all() { + doenvd "${FILESDIR}"/09sandbox + + dodoc AUTHORS ChangeLog* README.md +} + +pkg_postinst() { + mkdir -p "${EROOT}"/var/log/sandbox + chown root:portage "${EROOT}"/var/log/sandbox + chmod 0770 "${EROOT}"/var/log/sandbox +} diff --git a/sys-apps/system-monitoring-center/Manifest b/sys-apps/system-monitoring-center/Manifest index f2e8d3dd5d62..280e7aa8a25f 100644 --- a/sys-apps/system-monitoring-center/Manifest +++ b/sys-apps/system-monitoring-center/Manifest @@ -1,10 +1,10 @@ DIST system-monitoring-center-2.14.0.tar.gz 550257 BLAKE2B 3ea3b392c08bcbdba960f03b00a65dab94e1911b53f17fe38ccbd9a7c59f38094a928184a0db488fcd7c60d80ff31a7e59e2bfdf0efda43035cfd59b0f3e38e1 SHA512 4453709b1ef937ba8582ab76b25573f9e4975f4f905284c273dc3490ff2348800fb1c6ed3bca96db4952fc9c3b7fae2fd278ed945fe5c14f8dcfcec410eca415 DIST system-monitoring-center-2.16.1.tar.gz 539174 BLAKE2B eca36d31a5f42632611e2dec78afe94d109522e6028331587760037cdf05e334369a7491ba703262c1fd1d45817da1041a5214e1ec779d55bdf0c19c4995bfd6 SHA512 e30e3abf00d6d3612b6406d6f4439bc0f0d384dddd4ddc2059193cb06f3968bfe64d93b46c38edff4fd290a9b39b3f6d3f595ee3f3c04b125db3e41525a01205 DIST system-monitoring-center-2.17.2.tar.gz 534153 BLAKE2B af347f35e4e29e0e8a075176fd971b60e1d474fd620ae01716de629008fac0d25a92c09271b47508173e39385927820f321e73abd6bceb46d76de88254fa257c SHA512 e98115d518e45fffc1c5a1d3391362484fd6ce517e57ba6de93dbcd1ec10c5109642fb0eaa47381eb6ba7bf107838c7f444e3829e699e38218266ab65c15870b -DIST system-monitoring-center-2.17.3.tar.gz 535119 BLAKE2B ad153000fef11497d79a780341b229275eea8dc588f768b55f58b65d24bbc0f41ac7555421ca0e3f858b780f427f49970894653f9d39b36bb9674447970849ce SHA512 336d35d04c1fe65178a77917663ec25ffae61716b7424cea93badbd7806fb3eceaf78cc945059c1adc886b305eae98f5d1cb8bc13451abbd202338a13da3a19d +DIST system-monitoring-center-2.18.1.tar.gz 1393879 BLAKE2B 54051c8bc38f29a5b517b32b1754db80c6520e9ee5fd8ae77da4ec2e32ffc01ae787ba464c991d7f77b78c200b63dfc14b57f3f51578a8c8f44d0661b9ef2d5e SHA512 e5aa1480e0c94dbc4d431a6f4040d1e0247c713de0ccd14d8597ba1dd57795f79593d3482c09cb69d5317567693e3c4f2797806f1a7202e39a67c194190aa27a EBUILD system-monitoring-center-2.14.0.ebuild 858 BLAKE2B 5bb9682c24f5e197d7cfe9f6debc1176c4dd4531645ff8cac108af67c4be0a8f042b510bcd8b0abd668224c18554673166e88e55486b04e8d001a5e19a49d554 SHA512 c76ea73610edc5523d14f466bb57055fc350b41f1eac83d87d06d699841fae306e7f0718d394f4698818a71aaec3b6f0ea4fbfa8443b9fa8435b2d9b92697ee0 EBUILD system-monitoring-center-2.16.1.ebuild 860 BLAKE2B 22e41683c737405990d4ef80e20e2dcb5f637f4e83a690cd034dd0ccb07dda66ba51a5efcce2f61049eb9bc27a4fc3f31fb0554e06abf8fd2eb0507cfa6cad0b SHA512 f573021f714e1cfeacd6edee0fc5e1c8e1791eece5ddd375da929fa6bd0f9748fa6faf9299b74d8482aafce23ef790dab27c9150299c9411756a080ed9fc2710 EBUILD system-monitoring-center-2.17.2.ebuild 986 BLAKE2B 353092ceea2ced7a7c2ee466ac000ebdffb261b7c56b3582390a626dcf47d30b90fadd97924f6763024b4f09bdcb6e6c837241ce46463789cf94672358cb2411 SHA512 1a9eb00b6d016c3c34a0bc439af2e7f0f1d088b4dfc76c542ec1f2b1145e63cee3d3ec49441d1cf5fe25d2b1e48f76337f7398a2689058f12897acc0759826a3 -EBUILD system-monitoring-center-2.17.3.ebuild 986 BLAKE2B 353092ceea2ced7a7c2ee466ac000ebdffb261b7c56b3582390a626dcf47d30b90fadd97924f6763024b4f09bdcb6e6c837241ce46463789cf94672358cb2411 SHA512 1a9eb00b6d016c3c34a0bc439af2e7f0f1d088b4dfc76c542ec1f2b1145e63cee3d3ec49441d1cf5fe25d2b1e48f76337f7398a2689058f12897acc0759826a3 +EBUILD system-monitoring-center-2.18.1.ebuild 986 BLAKE2B 353092ceea2ced7a7c2ee466ac000ebdffb261b7c56b3582390a626dcf47d30b90fadd97924f6763024b4f09bdcb6e6c837241ce46463789cf94672358cb2411 SHA512 1a9eb00b6d016c3c34a0bc439af2e7f0f1d088b4dfc76c542ec1f2b1145e63cee3d3ec49441d1cf5fe25d2b1e48f76337f7398a2689058f12897acc0759826a3 EBUILD system-monitoring-center-9999.ebuild 986 BLAKE2B 353092ceea2ced7a7c2ee466ac000ebdffb261b7c56b3582390a626dcf47d30b90fadd97924f6763024b4f09bdcb6e6c837241ce46463789cf94672358cb2411 SHA512 1a9eb00b6d016c3c34a0bc439af2e7f0f1d088b4dfc76c542ec1f2b1145e63cee3d3ec49441d1cf5fe25d2b1e48f76337f7398a2689058f12897acc0759826a3 MISC metadata.xml 1342 BLAKE2B 2c160c0ee614f2badb06264876c618b6d652adfa42fa7eab484fb1ff367e7c8e849d25e7f6969e06623c4b58b2b062159600a0c8d5a778d1d238692816a1fa74 SHA512 8f8a6149401e3b32e967cc1f5c77a65cb607957d9375cc8d69741e95e627337bc4d8c59b4afd22ea6ff2e03e3ec31b519d7cf8aab6061d89d3d8b9bc2a2ecead diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-2.17.3.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-2.18.1.ebuild index 76cc6a9cbef0..76cc6a9cbef0 100644 --- a/sys-apps/system-monitoring-center/system-monitoring-center-2.17.3.ebuild +++ b/sys-apps/system-monitoring-center/system-monitoring-center-2.18.1.ebuild diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index 06f580a38640..ef783b77dd54 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -9,8 +9,10 @@ DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a8 DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103 DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735 +DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1 EBUILD systemd-utils-252.10.ebuild 11815 BLAKE2B d25fdb6b3ea15768a7894807906e8b9bdf97e11d45d07886eb8361d214de82494986efb9757fd7ffdbffeeb99495404340013c86d2a24e928c6b744e10b050f1 SHA512 bf6ad12b10422b678d3b2110e4e27249dedb1a997d5c283bb9f48c32d593f96343ae0031721053d911a77ebcd12a3e509574eeecb8ab11c7dda5037bf52dd2ed EBUILD systemd-utils-252.9.ebuild 11806 BLAKE2B 47a6f40881f6ed002bfa21c652dc0ddf6813bc74f842e33428241fdb26fb4f8948188f53589258146fcb0a865719e7aafe138a8854e70ea5f46aa87c7b9f0851 SHA512 3c5483674b0a468f0d0f1e4346ffc5f8f6d9c306a0a79d8908d440e837eff96cd8d032f98a521c016db48c9a5bb8bfea45306f83ae82587b92e556a8637282e4 EBUILD systemd-utils-253.5.ebuild 11971 BLAKE2B 613fbd9a74a683892d36fc91ddea7dc2849fe698eaa85e56a594406cdadaa5483951c6ab5399569669e9580b271e8e3c14a78734300e0ff543fc9f5bdde273db SHA512 6aa3ecb99ff17ddf6b01da9a484d4e1ad42cb723be3affe594b6109598d83523a43938b9e8f4dd426937afa66c6197fbc4d1e96617f9b4e005a624cd681275c4 EBUILD systemd-utils-253.6.ebuild 12098 BLAKE2B 7ec47f163df41f5797a3d35045abc8c04bbba0a9942b9b540a69728bd33edd68c6af8b58e54fb6388946a840337ef31096df002019e7297455cc4ec2b4a2c17e SHA512 a3ef12fd1c71ff26a9b91428f39913ad583a48eeb52f1cf8368deb69570c9af0d13d4ce81bf7c9b91bbfa166f8c3d4869284ce4689a5e52c1c6a7f805884d860 +EBUILD systemd-utils-253.7.ebuild 12098 BLAKE2B 7ec47f163df41f5797a3d35045abc8c04bbba0a9942b9b540a69728bd33edd68c6af8b58e54fb6388946a840337ef31096df002019e7297455cc4ec2b4a2c17e SHA512 a3ef12fd1c71ff26a9b91428f39913ad583a48eeb52f1cf8368deb69570c9af0d13d4ce81bf7c9b91bbfa166f8c3d4869284ce4689a5e52c1c6a7f805884d860 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4 diff --git a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild new file mode 100644 index 000000000000..831a19ae7a53 --- /dev/null +++ b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild @@ -0,0 +1,532 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +QA_PKGCONFIG_VERSION=$(ver_cut 1) + +inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1 +inherit toolchain-funcs udev usr-ldscript + +DESCRIPTION="Utilities split out from systemd for OpenRC users" +HOMEPAGE="https://systemd.io/" + +if [[ ${PV} == *.* ]]; then + MY_P="systemd-stable-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" +else + MY_P="systemd-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" +fi + +MUSL_PATCHSET="systemd-musl-patches-253.3" +SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev" +REQUIRED_USE="|| ( boot tmpfiles sysusers udev )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + elibc_musl? ( >=sys-libs/musl-1.2.3 ) + selinux? ( sys-libs/libselinux:0= ) + tmpfiles? ( + acl? ( sys-apps/acl:0= ) + ) + udev? ( + >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + kmod? ( >=sys-apps/kmod-15:0= ) + ) + !udev? ( + >=sys-apps/util-linux-2.30:0= + sys-libs/libcap:0= + virtual/libcrypt:= + ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.11 + boot? ( >=sys-boot/gnu-efi-3.0.2 ) +" +RDEPEND="${COMMON_DEPEND} + boot? ( !<sys-boot/systemd-boot-250 ) + tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) + udev? ( + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/floppy + acct-group/input + acct-group/kmem + acct-group/kvm + acct-group/lp + acct-group/render + acct-group/sgx + acct-group/tape + acct-group/tty + acct-group/usb + acct-group/video + !sys-apps/gentoo-systemd-integration + !sys-apps/hwids[udev] + !<sys-fs/udev-250 + !sys-fs/eudev + ) + !sys-apps/systemd +" +PDEPEND=" + udev? ( >=sys-fs/udev-init-scripts-34 ) +" +BDEPEND=" + $(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 + >=sys-apps/coreutils-8.16 + sys-devel/gettext + virtual/pkgconfig +" + +TMPFILES_OPTIONAL=1 +UDEV_OPTIONAL=1 + +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" +} + +QA_EXECSTACK="usr/lib/systemd/boot/efi/*" +QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" + +CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED + ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then + linux-info_pkg_setup + fi +} + +src_prepare() { + local PATCHES=( + ) + + if use elibc_musl; then + # Applied upstream + rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die + PATCHES+=( + "${WORKDIR}/${MUSL_PATCHSET}" + ) + fi + default + + # Remove install_rpath; we link statically + local rpath_pattern="install_rpath : rootpkglibdir," + grep -q -e "${rpath_pattern}" meson.build || die + sed -i -e "/${rpath_pattern}/d" meson.build || die +} + +src_configure() { + python_setup + meson-multilib_src_configure +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use split-usr) + $(meson_use split-usr split-bin) + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + -Dsysvinit-path= + $(meson_native_use_bool boot efi) + $(meson_native_use_bool boot gnu-efi) + $(meson_native_use_bool boot kernel-install) + $(meson_native_use_bool selinux) + $(meson_native_use_bool sysusers) + $(meson_use test tests) + $(meson_native_use_bool tmpfiles) + $(meson_use udev hwdb) + + -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + + # Link staticly with libsystemd-shared + -Dlink-boot-shared=false + -Dlink-udev-shared=false + + # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target + -Dstandalone-binaries=true + + # Disable all optional features + -Dadm-group=false + -Danalyze=false + -Dapparmor=false + -Daudit=false + -Dbacklight=false + -Dbinfmt=false + -Dbpf-framework=false + -Dbzip2=false + -Dcoredump=false + -Ddbus=false + -Delfutils=false + -Denvironment-d=false + -Dfdisk=false + -Dgcrypt=false + -Dglib=false + -Dgshadow=false + -Dgnutls=false + -Dhibernate=false + -Dhostnamed=false + -Didn=false + -Dima=false + -Dinitrd=false + -Dfirstboot=false + -Dldconfig=false + -Dlibcryptsetup=false + -Dlibcurl=false + -Dlibfido2=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dlocaled=false + -Dlogind=false + -Dlz4=false + -Dmachined=false + -Dmicrohttpd=false + -Dnetworkd=false + -Dnscd=false + -Dnss-myhostname=false + -Dnss-resolve=false + -Dnss-systemd=false + -Doomd=false + -Dopenssl=false + -Dp11kit=false + -Dpam=false + -Dpcre2=false + -Dpolkit=false + -Dportabled=false + -Dpstore=false + -Dpwquality=false + -Drandomseed=false + -Dresolve=false + -Drfkill=false + -Dseccomp=false + -Dsmack=false + -Dsysext=false + -Dtimedated=false + -Dtimesyncd=false + -Dtpm=false + -Dqrencode=false + -Dquotacheck=false + -Duserdb=false + -Dutmp=false + -Dvconsole=false + -Dwheel-group=false + -Dxdg-autostart=false + -Dxkbcommon=false + -Dxz=false + -Dzlib=false + -Dzstd=false + ) + + if use tmpfiles || use udev; then + emesonargs+=( $(meson_native_use_bool acl) ) + else + emesonargs+=( -Dacl=false ) + fi + + if use udev; then + emesonargs+=( $(meson_native_use_bool kmod) ) + else + emesonargs+=( -Dkmod=false ) + fi + + if use elibc_musl; then + # Avoid redefinition of struct ethhdr. + append-cppflags -D__UAPI_DEF_ETHHDR=0 + fi + + if multilib_is_native_abi || use udev; then + meson_src_configure + fi +} + +efi_arch() { + case "$(tc-arch)" in + amd64) echo x64 ;; + arm) echo arm ;; + arm64) echo aa64 ;; + x86) echo x86 ;; + esac +} + +multilib_src_compile() { + local targets=() + if multilib_is_native_abi; then + if use boot; then + targets+=( + bootctl + kernel-install + man/bootctl.1 + man/kernel-install.8 + 90-loaderentry.install + src/boot/efi/linux$(efi_arch).{efi,elf}.stub + src/boot/efi/systemd-boot$(efi_arch).efi + ) + fi + if use sysusers; then + targets+=( + systemd-sysusers.standalone + man/sysusers.d.5 + man/systemd-sysusers.8 + ) + if use test; then + targets+=( + systemd-runtest.env + ) + fi + fi + if use tmpfiles; then + targets+=( + systemd-tmpfiles.standalone + man/tmpfiles.d.5 + man/systemd-tmpfiles.8 + tmpfiles.d/{etc,static-nodes-permissions,var}.conf + ) + if use test; then + targets+=( test-tmpfiles ) + fi + fi + if use udev; then + targets+=( + udevadm + systemd-hwdb + src/udev/ata_id + src/udev/cdrom_id + src/udev/fido_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/udev.pc + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-hwdb.8 + man/systemd-udevd.service.8 + man/udevadm.8 + hwdb.d/60-autosuspend-chromiumos.hwdb + rules.d/50-udev-default.rules + rules.d/64-btrfs.rules + ) + if use test; then + targets+=( + # Used by udev-test.pl + systemd-detect-virt + test/sys + test-udev + + test-fido-id-desc + test-udev-builtin + test-udev-event + test-udev-node + test-udev-util + ) + fi + fi + fi + if use udev; then + targets+=( + udev:shared_library + src/libudev/libudev.pc + ) + if use test; then + targets+=( + test-libudev + test-libudev-sym + test-udev-device-thread + ) + fi + fi + if multilib_is_native_abi || use udev; then + meson_src_compile "${targets[@]}" + fi +} + +multilib_src_test() { + local tests=() + if multilib_is_native_abi; then + if use sysusers; then + tests+=( + test-sysusers.standalone + ) + fi + if use tmpfiles; then + tests+=( + test-systemd-tmpfiles.standalone + test-tmpfiles + ) + fi + if use udev; then + tests+=( + rule-syntax-check + test-fido-id-desc + test-udev-builtin + test-udev-event + test-udev-node + test-udev-util + ) + if [[ -w /dev ]]; then + tests+=( udev-test ) + else + ewarn "Skipping udev-test (needs write access to /dev)" + fi + fi + fi + if use udev; then + tests+=( + test-libudev + test-libudev-sym + test-udev-device-thread + ) + fi + if [[ ${#tests[@]} -ne 0 ]]; then + meson_src_test "${tests[@]}" + fi +} + +src_install() { + local rootprefix="$(usex split-usr '' /usr)" + meson-multilib_src_install +} + +multilib_src_install() { + if multilib_is_native_abi; then + if use boot; then + into /usr + dobin bootctl kernel-install + doman man/{bootctl.1,kernel-install.8} + # 90-loaderentry.install is generated from 90-loaderentry.install.in + exeinto usr/lib/kernel/install.d + doexe src/kernel-install/*.install + insinto usr/lib/systemd/boot/efi + doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi} + fi + if use sysusers; then + into "${rootprefix:-/}" + newbin systemd-sysusers{.standalone,} + doman man/{systemd-sysusers.8,sysusers.d.5} + fi + if use tmpfiles; then + into "${rootprefix:-/}" + newbin systemd-tmpfiles{.standalone,} + doman man/{systemd-tmpfiles.8,tmpfiles.d.5} + insinto /usr/lib/tmpfiles.d + doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf + fi + if use udev; then + into "${rootprefix:-/}" + dobin udevadm systemd-hwdb + dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd + + exeinto "${rootprefix}"/lib/udev + doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + + insinto "${rootprefix}"/lib/udev/rules.d + doins rules.d/*.rules + + insinto "${rootprefix}"/lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8} + newman man/systemd-udevd.service.8 systemd-udevd.8 + fi + fi + if use udev; then + meson_install --no-rebuild --tags libudev + gen_usr_ldscript -a udev + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + fi +} + +multilib_src_install_all() { + einstalldocs + if use boot; then + into /usr + exeinto usr/lib/kernel/install.d + doexe src/kernel-install/*.install + dobashcomp shell-completion/bash/bootctl + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/{_bootctl,_kernel-install} + fi + if use tmpfiles; then + doinitd "${FILESDIR}"/systemd-tmpfiles-setup + doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev + exeinto /etc/cron.daily + doexe "${FILESDIR}"/systemd-tmpfiles-clean + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_systemd-tmpfiles + insinto /usr/lib/tmpfiles.d + doins tmpfiles.d/{tmp,x11}.conf + doins "${FILESDIR}"/legacy.conf + fi + if use udev; then + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto "${rootprefix}"/lib/systemd/network + doins network/99-default.link + + # Remove to avoid conflict with elogind + # https://bugs.gentoo.org/856433 + rm rules.d/70-power-switch.rules || die + insinto "${rootprefix}"/lib/udev/rules.d + doins rules.d/*.rules + doins "${FILESDIR}"/40-gentoo.rules + + insinto "${rootprefix}"/lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + fi +} + +add_service() { + local initd=$1 + local runlevel=$2 + + ebegin "Adding '${initd}' service to the '${runlevel}' runlevel" + mkdir -p "${EROOT}/etc/runlevels/${runlevel}" && + ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" + eend $? +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + add_service systemd-tmpfiles-setup-dev sysinit + add_service systemd-tmpfiles-setup boot + fi + if use udev; then + ebegin "Updating hwdb" + systemd-hwdb --root="${ROOT}" update + eend $? + udev_reload + fi +} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index b024a5e9da21..c6b5e88b0773 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -9,10 +9,12 @@ DIST systemd-stable-253.3.tar.gz 11996044 BLAKE2B fdbac11914ea4a3718dd48c19f0dc3 DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1 DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f95958ab55064596c13ab967a182cdaace302cc85c19e2cdabd9bdc8ba0a1a04999ae588fbce2fe2626c0f792ee22836feddf4 SHA512 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735 +DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1 EBUILD systemd-253.3-r1.ebuild 14579 BLAKE2B ec9e31176bad8f142e224369a868b275facb3d3f48e26a9753efd89f40af5c107e70febbbf79fffbefcfe174e258ffae6175e23dde6c3105cec40ec60e5aee7b SHA512 f25ca4b5fbeee20f1137ea9cdf7305a8eb41814ab10946bb3fbacb4bbd9aa5f03fe804119c76e5b4c05abc8b7abb2b5ed9d40dea300b009ca8dab774239b7069 EBUILD systemd-253.4.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af EBUILD systemd-253.5-r1.ebuild 14638 BLAKE2B bb5ed4957e83a475bd623082ddfd0eee83c64caeffaac19db420682020c7c96bf712284f8391d337a687e343293c1068fb8351c3150d12159027233e6a77eca9 SHA512 7f633ea7d5330c725a6af618e19194d1ff2c7c42f4168aedf5af7bb7fd9c52a67aa0fafe881fe65044dfc0d7bb4edc3f8475079d88bbc31d40bf7bdc247a005c EBUILD systemd-253.5.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af EBUILD systemd-253.6.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af +EBUILD systemd-253.7.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af EBUILD systemd-9999.ebuild 14794 BLAKE2B 6aa071b3fa6e51042c0cea91da3f0bca99a004371be1b74424be9daf377ac3440ee9a7d14059c4b9a7014f5975c267ccd26a3ca8e22732da24c448fba0b9e683 SHA512 ec579f5701f944f6aeb2c042ecffc62da07a689eed5b65f2851561f57d1b5d48c6e5d1ad1e1265371dd48103520b36e20679325a44046501684710fbd26ecdb4 MISC metadata.xml 2612 BLAKE2B 60495769a304d0623f73de8eb305770eb93706fdcbea158a2de2beb72e5d04495fc5ef45b4e55d3003a9a70bc3f60a7a5d6880aaac9512647132be69f96112ad SHA512 397f63a498b46647edfb665f92680197607de5edef42c3c17ab96abf94f117d82eda4863bf138329e25880609e8c631e9d154277e8a548eafbe87e8b83e47ccc diff --git a/sys-apps/systemd/systemd-253.7.ebuild b/sys-apps/systemd/systemd-253.7.ebuild new file mode 100644 index 000000000000..72824b08e850 --- /dev/null +++ b/sys-apps/systemd/systemd-253.7.ebuild @@ -0,0 +1,512 @@ +# Copyright 2011-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) + +# Avoid QA warnings +TMPFILES_OPTIONAL=1 +UDEV_OPTIONAL=1 + +QA_PKGCONFIG_VERSION=$(ver_cut 1) + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + MY_PV=${PV/_/-} + MY_P=${MY_PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +inherit bash-completion-r1 linux-info meson-multilib pam +inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://systemd.io/" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE=" + acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils + fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod + +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode + +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd +" +REQUIRED_USE=" + dns-over-tls? ( || ( gnutls openssl ) ) + fido2? ( cryptsetup openssl ) + homed? ( cryptsetup pam openssl ) + importd? ( curl lzma || ( gcrypt openssl ) ) + pwquality? ( homed ) +" +RESTRICT="!test? ( test )" + +MINKV="4.15" + +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + fido2? ( dev-libs/libfido2:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + gnutls? ( >=net-libs/gnutls-3.6.0:0= ) + http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) + idn? ( net-dns/libidn2:= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + iptables? ( net-firewall/iptables:0= ) + openssl? ( >=dev-libs/openssl-1.1.0:0= ) + pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) + pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + tpm? ( app-crypt/tpm2-tss:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) +" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=acct-group/adm-0-r1 + >=acct-group/wheel-0-r1 + >=acct-group/kmem-0-r1 + >=acct-group/tty-0-r1 + >=acct-group/utmp-0-r1 + >=acct-group/audio-0-r1 + >=acct-group/cdrom-0-r1 + >=acct-group/dialout-0-r1 + >=acct-group/disk-0-r1 + >=acct-group/input-0-r1 + >=acct-group/kvm-0-r1 + >=acct-group/lp-0-r1 + >=acct-group/render-0-r1 + acct-group/sgx + >=acct-group/tape-0-r1 + acct-group/users + >=acct-group/video-0-r1 + >=acct-group/systemd-journal-0-r1 + >=acct-user/root-0-r1 + acct-user/nobody + >=acct-user/systemd-journal-remote-0-r1 + >=acct-user/systemd-coredump-0-r1 + >=acct-user/systemd-network-0-r1 + acct-user/systemd-oom + >=acct-user/systemd-resolve-0-r1 + >=acct-user/systemd-timesync-0-r1 + >=sys-apps/baselayout-2.2 + selinux? ( + sec-policy/selinux-base-policy[systemd] + sec-policy/selinux-ntp + ) + sysv-utils? ( + !sys-apps/openrc[sysv-utils(-)] + !sys-apps/sysvinit + ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !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() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && + python_has_version "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="~BLK_DEV_BSG ~CGROUPS + ~CGROUP_BPF ~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" + + if kernel_is -ge 5 10 20; then + CONFIG_CHECK+=" ~KCMP" + else + CONFIG_CHECK+=" ~CHECKPOINT_RESTORE" + fi + + if kernel_is -ge 4 18; then + CONFIG_CHECK+=" ~AUTOFS_FS" + else + CONFIG_CHECK+=" ~AUTOFS4_FS" + fi + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + if linux_chkconfig_present X86; then + CONFIG_CHECK+=" ~DMIID" + fi + fi + + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + : +} + +src_unpack() { + default + [[ ${PV} != 9999 ]] || git-r3_src_unpack +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}/systemd-253-initrd-generators.patch" + ) + + if ! use vanilla; then + PATCHES+=( + "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-journald-audit-r1.patch" + ) + fi + + # Fails with split-usr. + sed -i -e '2i exit 77' test/test-rpm-macros.sh || die + + 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)" + $(meson_use split-usr) + $(meson_use split-usr split-bin) + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + # Disable compatibility with sysvinit + -Dsysvinit-path= + -Dsysvrcnd-path= + # 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 test tests) + $(meson_use zstd) + $(meson_native_use_bool iptables libiptc) + $(meson_native_use_bool openssl) + $(meson_use pam) + $(meson_native_use_bool pkcs11 p11kit) + $(meson_native_use_bool pcre pcre2) + $(meson_native_use_bool policykit polkit) + $(meson_native_use_bool pwquality) + $(meson_native_use_bool qrcode qrencode) + $(meson_native_use_bool seccomp) + $(meson_native_use_bool selinux) + $(meson_native_use_bool tpm tpm2) + $(meson_native_use_bool test dbus) + $(meson_native_use_bool xkb xkbcommon) + -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + # Breaks screen, tmux, etc. + -Ddefault-kill-user-processes=false + -Dcreate-log-dirs=false + + # multilib options + $(meson_native_true backlight) + $(meson_native_true binfmt) + $(meson_native_true coredump) + $(meson_native_true environment-d) + $(meson_native_true firstboot) + $(meson_native_true hibernate) + $(meson_native_true hostnamed) + $(meson_native_true ldconfig) + $(meson_native_true localed) + $(meson_native_true man) + $(meson_native_true networkd) + $(meson_native_true quotacheck) + $(meson_native_true randomseed) + $(meson_native_true rfkill) + $(meson_native_true sysusers) + $(meson_native_true timedated) + $(meson_native_true timesyncd) + $(meson_native_true tmpfiles) + $(meson_native_true vconsole) + ) + + meson_src_configure "${myconf[@]}" +} + +multilib_src_test() { + unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR + local -x COLUMNS=80 + meson_src_test +} + +multilib_src_install_all() { + local rootprefix=$(usex split-usr '' /usr) + local sbin=$(usex split-usr sbin bin) + + # meson doesn't know about docdir + mv "${ED}"/usr/share/doc/{systemd,${PF}} || die + + einstalldocs + dodoc "${FILESDIR}"/nsswitch.conf + + insinto /usr/lib/tmpfiles.d + doins "${FILESDIR}"/legacy.conf + + if ! use resolvconf; then + rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die + fi + + if ! use sysv-utils; then + rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,shutdown} || die + rm "${ED}"/usr/share/man/man1/init.1 || die + rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die + fi + + if ! use resolvconf && ! use sysv-utils && use split-usr; 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 usr/sbin; do + if [[ ! -L ${EROOT}/${dir} ]]; then + eerror "'${EROOT}/${dir}' is not a symbolic link." + FAIL=1 + fi + done + if [[ ${FAIL} ]]; then + eerror "Migration to system layout with merged directories must be performed before" + eerror "installing ${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 +} |