diff options
Diffstat (limited to 'sys-apps')
19 files changed, 186 insertions, 1232 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex a14f27f103a7..cc7e9b429b96 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/bfs/Manifest b/sys-apps/bfs/Manifest index 8c71511ae7bf..7517279c9a0b 100644 --- a/sys-apps/bfs/Manifest +++ b/sys-apps/bfs/Manifest @@ -1,5 +1,5 @@ DIST bfs-3.1.1.tar.gz 234742 BLAKE2B efb0cd9ceb6105697983bb91d1ce7e149afbb372e6df03d76d63e0922fcd0542675a55cc18cbbb44134d4ae07dc72beb0d64ce848919d5b5f152c378af2b7d4b SHA512 98696cead293281d3b7f29e01abaa6c8de83a8ea32353fcb5ec11daad47692e67b40e4f402cd5012782203101133e8ba42dd9e3c678a2b1066f65dc0145ec1b8 -DIST bfs-3.1.tar.gz 234153 BLAKE2B a5b501016b1513dc9a3964ed4167db37c9a810e49a565059275919d234becf4f66300bdade48f3cde69a952ed0a6c68ee7f4adaf0e500e433f8cf75cc76f3db2 SHA512 d2be9d931d2a53fb292431551cc881103584a75d444f91d4e7d92dffe781aa9cdeda7281ab0c7598e8bfdd944b1392e345eff4bd2e60ea5ae65491f8860d862d +DIST bfs-3.1.2.tar.gz 237571 BLAKE2B 48051f50bcc11a06c542f21e33a858903c80d6950651c022d2a909e5da3f8813659f08937b202b11753ea132388899f3ebc66d28751682f0bfbfa9cf13e3938f SHA512 324a32067b2ae4ed50f166c783c28f16048ac33c8457eda5acc4ea86f25b3c0268c96c3d7c3230e1dde75fee72d41e7d4d53371d5fb6a95b2a9c812d079d1ad5 EBUILD bfs-3.1.1.ebuild 1018 BLAKE2B 0fd542926fa7d6469a439f399a0e5cbda3e5e51549257f2e9370bc43efe2646e4475cf5071dedd421bb8d2c4ab41107e4c59a212c2e03127d7fa9bdc49aefca4 SHA512 a93c320d5e64b28082050644d8a205367cb1ba59b9d56ff8dba15b60e5ca20e630cf02bc80b893fb30aa96290ac0197d888ed2f2c4f86749b1ff932dd69392dd -EBUILD bfs-3.1.ebuild 1006 BLAKE2B 76662c7fc1375c9933c9ff259ceba3c91558f7685b2d87409c6f412a4a13bf820a3fa4d420d9f3c48d14fec4234281595af8f6947bca83b526a87a5d794a9e0f SHA512 c98cff4624c9d2deec842fa63d0de154abf6855adf726ce84adf1bfcac4d1590c29321de36faba054780fd8e2c167fc511c36e6c2cfed0067d641c20b39e25dc +EBUILD bfs-3.1.2.ebuild 1018 BLAKE2B 0fd542926fa7d6469a439f399a0e5cbda3e5e51549257f2e9370bc43efe2646e4475cf5071dedd421bb8d2c4ab41107e4c59a212c2e03127d7fa9bdc49aefca4 SHA512 a93c320d5e64b28082050644d8a205367cb1ba59b9d56ff8dba15b60e5ca20e630cf02bc80b893fb30aa96290ac0197d888ed2f2c4f86749b1ff932dd69392dd MISC metadata.xml 419 BLAKE2B eadf85369714b56ec89d384a8603c78c282e197db94c324fa9e627d70fa8c0c7c557c21c9c25ff292c93312d9752f36b4dd06a9a9c758c5375621694fb55e50d SHA512 192ae0599d4f36d43d8d2d94fa1e16fc5798b75abf0befecfa4a768a2b57e17387cb98a0663678b0c672c65c50d74cc3d1668cf222e0a9a4084be9078eb09445 diff --git a/sys-apps/bfs/bfs-3.1.ebuild b/sys-apps/bfs/bfs-3.1.2.ebuild index bd390cfcfcf9..ba8cd9bde472 100644 --- a/sys-apps/bfs/bfs-3.1.ebuild +++ b/sys-apps/bfs/bfs-3.1.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P LICENSE="0BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~sparc" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc" IUSE="acl caps debug io-uring unicode xattr" DEPEND=" diff --git a/sys-apps/goawk/Manifest b/sys-apps/goawk/Manifest index 7037515d42ce..73ad36a91a17 100644 --- a/sys-apps/goawk/Manifest +++ b/sys-apps/goawk/Manifest @@ -1,3 +1,5 @@ DIST goawk-1.25.0.tar.gz 1685633 BLAKE2B e435393c17e6502a8642af53982ce964aaba86c3f72d373f69c0d7a4c6c163b6801c952d5e2cc7f2704df233d3eac9e5db8beb3e9379d05940711021c83dc6e5 SHA512 33a00063f6b12359da8d9d2788d893d149f5c14105de8899f5e44c3146b6b30ce778529bbeaac142f2f7fdd23ac1037ea9ef902569b0189eab3deabff54785bd +DIST goawk-1.26.0.tar.gz 1686762 BLAKE2B c627c9e182139d7c325f8da36985ddba596fd7c9900a6c59f6111ceb822231ed575ad133c1a242c668b4a8fd911889234c20d259a6d82830c09e2672f7751195 SHA512 d645aac503ad52e63fdc737aef45a52f58543554d7ecfad22a55b2626c509551cf09d091c7148762249ae57d97095c33ef8591684afdb410456d85240450c1fc EBUILD goawk-1.25.0.ebuild 516 BLAKE2B 26bcac19ad9cfafd88003426adb559441063a43ada772990829e9c2bc9d5330e34afd5dbb0166beffbddb5113e180cd119dd41729205f1cb79e5f66fdcc0bec9 SHA512 0e5a422170398b15854091b28d427725d7685e8bca0268b423cf797ffa79a49782a21101fe021b6f83b6294551957b594f43c11f04afb411cfc2cf78ff155d24 +EBUILD goawk-1.26.0.ebuild 516 BLAKE2B 6a671df7abd17599373e2d26f62492c6c669b2a8a8254185af92f0aae603d9af18232bbcb67549f9ca4acae55e988bafe4533662b5eda79fcfaceee9c491b185 SHA512 3e8521df8805522f17896434ae0a2e55bb2fdb278c3501b273086d59ad1f956b6e5b60758c0b6ea7ef889d3182363b8942677bd777f205c2a129c721cc94daae MISC metadata.xml 318 BLAKE2B 1bc03337ba487236a6383f479302000f84b599ed693cc52e438f17c7fa41385b30879bf3ff6e13756f80a1cd9c82b8482b9baf607705e72cdceb540b4a83c420 SHA512 bea14196826043116194b13ab92a5cf54af3df5ea414208415f88067a87ddcc86acfe0b6967f1cb2aa077e4d55a8142192da55cf668cb1d0d4c07042249d5e03 diff --git a/sys-apps/goawk/goawk-1.26.0.ebuild b/sys-apps/goawk/goawk-1.26.0.ebuild new file mode 100644 index 000000000000..9b774e46f9c9 --- /dev/null +++ b/sys-apps/goawk/goawk-1.26.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="POSIX-compliant AWK interpreter written in Go, with CSV support" +HOMEPAGE="https://github.com/benhoyt/goawk" +SRC_URI="https://github.com/benhoyt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +BDEPEND=">=dev-lang/go-1.16" + +src_compile() { + ego build +} + +src_test() { + ego test +} + +src_install() { + einstalldocs + + dobin goawk +} diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 57cdff504c23..e93636b2f929 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,8 +1,7 @@ -AUX kmod-30-configure-clang16.patch 948 BLAKE2B 35403640d79e60d1600abd676be818331ea975f139136bd60cd06df183768d78e11427505e7eda56d501a964420bff07eebff61e414655a7b043076e082ab143 SHA512 5f1b765ba51e224d464814247aa343649d1677f619dcca99d0a00ca244580443cc7615bf5291773062aa03cdeb42c7475d40da749c39d79907ae4ba0c9ed9c29 +AUX kmod-31-musl-basename.patch 3352 BLAKE2B 3fc8fa107d22de1806b40ea2c52110952813877cb98798f15a76aafb900b3cf7382d5ca7d5c6acc0ca540099cc1eaf575d61a3ec0aa71a4a46d0dab61b1f963f SHA512 4349ac247039aed1015a14e6eda5ac479edaff97804d251adf2f48ff492706c0bc55a5258b1e37c38f6fefe9069589693ad66b99bf21eeec18c87ec296f8bd72 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63 -DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 -EBUILD kmod-30-r1.ebuild 6136 BLAKE2B 4285ca6d980306986e2d9f8c9234cfe516f30a22c3671ff9508beabde97dedab078eb454a2d472e8bb13db7639d48bdc9bd2e84d90897841ac00a6f8d316e02c SHA512 fabf19d73da3738474595ad339bcd2fbdb5d8dc0b23a5fd11c19a6cee2b9bfaa2920349fed6735c765d4a8b5f27330fca71eae2aaf2d240ee354b6adeafc6f3c +EBUILD kmod-31-r1.ebuild 4060 BLAKE2B 51002c2d019b425de450833fd11776d68d35e8536ca8c52b3d431393f5eb089492c6ba16726eaf6de07ab8377427daba841028b8e44abcdb8890db4e3a896296 SHA512 3dbf1d3320920204e740fece6e05ffa37025bd16ce51eb44b738f0497144786f4c8c4f8a68c55a7fed849f7186c16e782652a8d93c07c843b4e67a61beb8e884 EBUILD kmod-31.ebuild 5880 BLAKE2B 636d01e1c32f4f22e64c868e56d49c238bd6beed835ed5d1b3aef655162ac5741adba02b03e5ed6d89e7303465a7727cf4dcfaed0f87b78318f2142edbb6d1c1 SHA512 eed9173f25d7a9436652a0f0661308ac68a85ef6fdfb88949264189bc836401b6394f62f5bcefadb1564f350a2e011873a3c73d8eadde3a0fc5686d017f0b12e -EBUILD kmod-9999.ebuild 5888 BLAKE2B a31dcd044092ccbc5f8c9e05f99ca346878df0bc86ce304245aef40ccbaa5f58b6108482433d5a9ff8bd36e8f6ee128267801cb428bb8a3dace4ffec72fa001e SHA512 a4aa51e456355e92ecb0c79c67f1f18f36076b75729c81916078e02a0292ab778bfde656fc942bcf654c09cb9980927a4b808bf1e8e24774bd4eeb3a7a6b6483 +EBUILD kmod-9999.ebuild 4060 BLAKE2B 51002c2d019b425de450833fd11776d68d35e8536ca8c52b3d431393f5eb089492c6ba16726eaf6de07ab8377427daba841028b8e44abcdb8890db4e3a896296 SHA512 3dbf1d3320920204e740fece6e05ffa37025bd16ce51eb44b738f0497144786f4c8c4f8a68c55a7fed849f7186c16e782652a8d93c07c843b4e67a61beb8e884 MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3 diff --git a/sys-apps/kmod/files/kmod-30-configure-clang16.patch b/sys-apps/kmod/files/kmod-30-configure-clang16.patch deleted file mode 100644 index a9e1093aecff..000000000000 --- a/sys-apps/kmod/files/kmod-30-configure-clang16.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/kmod-project/kmod/commit/035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 - -From 035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Sat, 17 Dec 2022 17:52:34 +0100 -Subject: [PATCH] kmod: configure.ac: In _Noreturn check, include <stdlib.h> - for exit - -Otherwise, an implicit functiona declaration is used, causing -a C99 compatibility issue. - -Signed-off-by: Florian Weimer <fweimer@redhat.com> -Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com> ---- a/configure.ac -+++ b/configure.ac -@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE( - - AC_MSG_CHECKING([whether _Noreturn is supported]) - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])], -+ [AC_LANG_SOURCE([[#include <stdlib.h> -+ _Noreturn int foo(void) { exit(0); }]])], - [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - diff --git a/sys-apps/kmod/files/kmod-31-musl-basename.patch b/sys-apps/kmod/files/kmod-31-musl-basename.patch new file mode 100644 index 000000000000..f4839dad2474 --- /dev/null +++ b/sys-apps/kmod/files/kmod-31-musl-basename.patch @@ -0,0 +1,113 @@ +https://github.com/kmod-project/kmod/pull/32 + +From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 9 Dec 2023 17:35:59 -0800 +Subject: [PATCH] Use portable implementation for basename API + +musl has removed the non-prototype declaration of basename from +string.h [1] which now results in build errors with clang-17+ compiler + +Implement GNU basename behavior using strchr which is portable across libcs + +Fixes +../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +71 | "Commands:\n", basename(argv[0])); +| ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Suggested-by: Rich Felker + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, + bool is_single = false; + + if (name == NULL) { +- name = basename(path); ++ name = gnu_basename(path); + is_single = true; + } + +--- a/shared/util.c ++++ b/shared/util.c +@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * + + char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) + { +- char *modname; ++ const char *modname; + +- modname = basename(path); ++ modname = gnu_basename(path); + if (modname == NULL || modname[0] == '\0') + return NULL; + +--- a/shared/util.h ++++ b/shared/util.h +@@ -5,6 +5,7 @@ + #include <stdbool.h> + #include <stdlib.h> + #include <stdio.h> ++#include <string.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <time.h> +@@ -76,6 +77,12 @@ do { \ + __p->__v = (val); \ + } while(0) + ++static _always_inline_ const char *gnu_basename(const char *s) ++{ ++ const char *p = strrchr(s, '/'); ++ return p ? p+1 : s; ++} ++ + static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) + { + return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); +--- a/testsuite/testsuite.c ++++ b/testsuite/testsuite.c +@@ -70,7 +70,7 @@ static void help(void) + + printf("Usage:\n" + "\t%s [options] <test>\n" +- "Options:\n", basename(progname)); ++ "Options:\n", gnu_basename(progname)); + + for (itr = options, itr_short = options_short; + itr->name != NULL; itr++, itr_short++) +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files + if (name != NULL) + namelen = strlen(name); + else { +- name = basename(dir); ++ name = gnu_basename(dir); + namelen = strlen(name); + dirlen -= namelen + 1; + } +--- a/tools/kmod.c ++++ b/tools/kmod.c +@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) + "Options:\n" + "\t-V, --version show version\n" + "\t-h, --help show this help\n\n" +- "Commands:\n", basename(argv[0])); ++ "Commands:\n", gnu_basename(argv[0])); + + for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { + if (kmod_cmds[i]->help != NULL) { +@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) + const char *cmd; + size_t i; + +- cmd = basename(argv[0]); ++ cmd = gnu_basename(argv[0]); + + for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { + if (streq(kmod_compat_cmds[i]->name, cmd)) + diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-31-r1.ebuild index 5dff1407325b..d0de1d663e3e 100644 --- a/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sys-apps/kmod/kmod-31-r1.ebuild @@ -3,24 +3,22 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +inherit autotools libtool bash-completion-r1 -inherit autotools libtool bash-completion-r1 python-r1 +DESCRIPTION="Library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -31,15 +29,16 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch # - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools +RDEPEND=" + !sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" + zstd? ( >=app-arch/zstd-1.5.2-r1:= ) +" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -47,23 +46,14 @@ BDEPEND=" dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" + BDEPEND+=" dev-libs/libxslt" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README.md TODO ) - PATCHES=( - "${FILESDIR}"/${P}-configure-clang16.patch + "${FILESDIR}"/${PN}-31-musl-basename.patch ) src_prepare() { @@ -78,10 +68,7 @@ src_prepare() { fi eautoreconf else - #elibtoolize - # TODO: restore to elibtoolize in next release after 30 - # autoreconf only here for clang patch. - eautoreconf + elibtoolize fi # Restore possibility of running --enable-static, bug #472608 @@ -96,8 +83,9 @@ src_configure() { --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" + --disable-python $(use_enable debug) - $(usex doc '--enable-gtk-doc' '') + $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) @@ -106,76 +94,11 @@ src_configure() { $(use_with zstd) ) - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_test() { - python_test() { - mkdir "${T}/test-${EPYTHON}" || die - emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - - # Smoke test based on https://bugs.gentoo.org/891975#c5 - local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" - ${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die - rm -r "${T}/test-${EPYTHON}" || die - } - - if use python; then - python_foreach_impl python_test - fi + econf "${myeconfargs[@]}" } src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - - einstalldocs - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - python_optimize - } - - python_foreach_impl python_install - fi + default find "${ED}" -type f -name "*.la" -delete || die diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index a67cecf3e9af..d0de1d663e3e 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -3,9 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +inherit autotools libtool bash-completion-r1 -inherit autotools libtool bash-completion-r1 python-r1 +DESCRIPTION="Library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -15,12 +16,9 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -31,15 +29,16 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch # - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools +RDEPEND=" + !sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" + zstd? ( >=app-arch/zstd-1.5.2-r1:= ) +" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -47,20 +46,15 @@ BDEPEND=" dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" + BDEPEND+=" dev-libs/libxslt" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README.md TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-31-musl-basename.patch +) src_prepare() { default @@ -89,8 +83,9 @@ src_configure() { --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" + --disable-python $(use_enable debug) - $(usex doc '--enable-gtk-doc' '') + $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) @@ -99,76 +94,11 @@ src_configure() { $(use_with zstd) ) - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_test() { - python_test() { - mkdir "${T}/test-${EPYTHON}" || die - emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - - # Smoke test based on https://bugs.gentoo.org/891975#c5 - local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" - ${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die - rm -r "${T}/test-${EPYTHON}" || die - } - - if use python; then - python_foreach_impl python_test - fi + econf "${myeconfargs[@]}" } src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - - einstalldocs - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - python_optimize - } - - python_foreach_impl python_install - fi + default find "${ED}" -type f -name "*.la" -delete || die diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest index 4b211cec7178..551caffd7d3b 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -1,9 +1,7 @@ -DIST man-pages-6.04.tar.xz 2188236 BLAKE2B 741ff7e279c9bd961a1d39e432599a985d010516c03eb13978c5bda46a26ef914053c511bce923d49eb9111b3a1f7537e4418df3b5abd2eb0c051faf9f39c7fb SHA512 3f95d15dda419e824f902947a268d8021e9e04c5ba8503e4fe9f96a9ab8363fde8088b2712cc9c795638163ad8432bc5f8c6a3ea320293ec6aa79bb748e85b9e DIST man-pages-6.05.01.tar.xz 2194472 BLAKE2B edc40828bc9c75f655a8352f10c214d68b64f90815cc947f65d49794e0b588b103cae28b3644e41bedd8caaa6cef3c77b02525d8c2ccc91ccf887a10b2f2c32a SHA512 ad3f6dc28bb83824faf8c855a5db8983dc0f5ac3b5702624033ed320a6f39a7f1f0845acf0bc62a0a10cdfe42eb66ba9596e2796ba2683cfb29e480710da3d70 DIST man-pages-6.06.tar.sign 833 BLAKE2B 7198f7a024731fcaeb97c131ff02611cefc60cf26fa8bac013c82d90f1f9dcd39230adc6ad94c97488c7a8d844b0bb31db6fea2528d84084dec54454a073f3c1 SHA512 21304778df56f079c8b3ff38cf42453697a2b155964069bf6837b9c89b32c3a80eef9cfd0c2f9e3feeee12889cb4e6dd1d4ef1fae75cc646fed84289c5862578 DIST man-pages-6.06.tar.xz 2166012 BLAKE2B 49c022204f8ce82fafd6f34a590a310beb6618d884290123a755efd38a71c974aa2e49d729655fcf82df0b96db8f782c1b2eac5174b319b6a383740e715fa11a SHA512 c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 -EBUILD man-pages-6.04.ebuild 3585 BLAKE2B d0fadcaf3f096029d388447a0cb9f0f281786fada32a79a2f6cfa400226f653cdeceec92fdafc56a13f8fcfc7b788f2ccb124ff6763d0082c8cf9d0b738bb763 SHA512 d4f0ada88c0aefc8a753300f930170ea1d3faad28d24bec4df9fffae8c285974360f00a6ded62bd6b301af1881a15f5ac732267304473dba95edc973942f2ad7 EBUILD man-pages-6.05.01.ebuild 3585 BLAKE2B d0fadcaf3f096029d388447a0cb9f0f281786fada32a79a2f6cfa400226f653cdeceec92fdafc56a13f8fcfc7b788f2ccb124ff6763d0082c8cf9d0b738bb763 SHA512 d4f0ada88c0aefc8a753300f930170ea1d3faad28d24bec4df9fffae8c285974360f00a6ded62bd6b301af1881a15f5ac732267304473dba95edc973942f2ad7 EBUILD man-pages-6.06.ebuild 4449 BLAKE2B a0753ea92b599e432710e8c9cfe291fd23370426a7c64e15e9bfa29e3749d3eb0ff4a57c9f0d4120462e0b18d98ef990cd59d4deb8bbf9326e95a896a237f711 SHA512 c409a7c58bfbbf15d2e76d330e1b9ccfd42712516dc07aa61a27b5968a39edb793124ed8f904055a9423ac41a3519ad067665455d79dc273a7b9767ac27d2de7 EBUILD man-pages-9999.ebuild 4449 BLAKE2B a0753ea92b599e432710e8c9cfe291fd23370426a7c64e15e9bfa29e3749d3eb0ff4a57c9f0d4120462e0b18d98ef990cd59d4deb8bbf9326e95a896a237f711 SHA512 c409a7c58bfbbf15d2e76d330e1b9ccfd42712516dc07aa61a27b5968a39edb793124ed8f904055a9423ac41a3519ad067665455d79dc273a7b9767ac27d2de7 diff --git a/sys-apps/man-pages/man-pages-6.04.ebuild b/sys-apps/man-pages/man-pages-6.04.ebuild deleted file mode 100644 index 7af943a8a925..000000000000 --- a/sys-apps/man-pages/man-pages-6.04.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintenance notes: -# - Upstream are very friendly, do approach them if have any questions; -# -# - It's considered fine (and somewhat encouraged) for us to make snapshots -# if we want specific fixes, perhaps aligned with newer kernels, glibc, etc. -# Just generate it with 'make dist'. We can set DISTVERSION if we want a vanity -# name or if the comit hash is too long; -# -# - If we do use a snapshot, *don't* grab it directly from git and use it -# raw in the ebuild. Use 'make dist' as above; -# -# - Sometimes there's no dist tarball available post-release and upstream -# encourage distros to make their own. Set MAN_PAGES_GENTOO_DIST to 1 if none is -# available, 0 otherwise. -MAN_PAGES_GENTOO_DIST=0 -GENTOO_PATCH=2 - -DESCRIPTION="A somewhat comprehensive collection of Linux man pages" -HOMEPAGE="https://www.kernel.org/doc/man-pages/" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git" - inherit git-r3 -elif [[ ${PV} == *_rc* ]] ; then - MY_P=${PN}-${PV/_/-} - - SRC_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/snapshot/${MY_P}.tar.gz" - S="${WORKDIR}"/${MY_P} -else - if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz" - else - SRC_URI=" - https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz - https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz - " - fi - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos" -fi - -SRC_URI+=" - mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 - https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 -" - -LICENSE="man-pages GPL-2+ BSD" -SLOT="0" -# Keep the following in sync with app-i18n/man-pages-l10n -MY_L10N=( cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi ) -IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" -RESTRICT="binchecks" - -BDEPEND=" - app-alternatives/bc -" -# Block packages that used to install colliding man pages: -# bug #341953, bug #548900, bug #612640, bug #617462 -RDEPEND=" - virtual/man - !<sys-apps/keyutils-1.5.9-r4 - !<dev-libs/libbsd-0.8.3-r1 -" -PDEPEND=" - l10n_ja? ( app-i18n/man-pages-ja ) - l10n_ru? ( || ( - app-i18n/man-pages-l10n[l10n_ru(-)] - app-i18n/man-pages-ru - ) ) - l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) -" -for lang in "${MY_L10N[@]}"; do - PDEPEND+=" l10n_${lang}? ( app-i18n/man-pages-l10n[l10n_${lang}(-)] )" -done -unset lang - -src_unpack() { - default - - [[ ${PV} == 9999 ]] && git-r3_src_unpack -} - -src_prepare() { - default - - # passwd.5 installed by sys-apps/shadow, bug #776787 - rm man5/passwd.5 || die -} - -src_compile() { :; } - -src_test() { - # We don't use the 'check' target right now because of known errors - # https://lore.kernel.org/linux-man/0dfd5319-2d22-a8ad-f085-d635eb6d0678@gmail.com/T/#t - emake lint-man-tbl -} - -src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" - dodoc README Changes* - - # Override with Gentoo specific or additional Gentoo pages - cd "${WORKDIR}"/man-pages-gentoo || die - doman */* - dodoc README.Gentoo -} - -pkg_postinst() { - for ver in ${REPLACING_VERSIONS} ; do - if ver_test ${ver} -lt 5.13-r2 ; then - # Avoid ACCEPT_LICENSE issues for users by default - # bug #871636 - ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!" - ewarn "Please install sys-apps/man-pages-posix yourself if needed." - break - fi - done -} diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest index 78c75199acf5..607322671b84 100644 --- a/sys-apps/pkgcraft-tools/Manifest +++ b/sys-apps/pkgcraft-tools/Manifest @@ -1,6 +1,4 @@ -DIST pkgcraft-tools-0.0.13.tar.xz 29739764 BLAKE2B b4f66650b644e1efc7c6b39fa26dd9f3930e9c41b9022bd56dbd07cbeaacf0dba52e020b12f11f87e56798a136798dc95d5a60a23b6ef965abc2a86fd64f8c47 SHA512 e387a0d772aedb6aa165e88f484a4485a6f9848421fabb04114af777591d7988e70516c92387268a9c33e4931ec8fcc13ac172e00e4c077876df80d1aca0f6ac DIST pkgcraft-tools-0.0.14.tar.xz 30138240 BLAKE2B b9d0b238f26d980f032cfad26602348dabe574e3968e8adf5172e91efeea051b9720b158941a1bea53e2c1fa8180d516b1bb9668d9178f17c789fb5ba76b7bd9 SHA512 ca7c0f429228567c91a18db793b2fa81f6918cde54f302269deb6a1d2f6445756fbc73e3957ad7b29c8a0e8e000c1b939290c6bbc34bb693cc54b87841fef06c -EBUILD pkgcraft-tools-0.0.13.ebuild 1138 BLAKE2B 44c8ffbdf3134fd52cb57d5c9bb94ceccc66fc974c33b490f26a0b61dd9dd5c7d1c1b86be2957e1662d03ebb152e88378f9eebc31aab730da96ee440c7ceed7d SHA512 12c99d238dbb9943940b998872a14250208aa40f9866196854f1e280cfcdca318502116da99343d2ee20da0ae057c0dc77bf6ff8da0b918df12a955c0a89619b EBUILD pkgcraft-tools-0.0.14.ebuild 1143 BLAKE2B db8d072ac5674edd8de492a4df64c9da5b3e87c288159e71e5376bfb11776129e70f69c979d03a60f5a780d30b940800f16d924881cb93fa69ede13af750c5ec SHA512 1441db25715bdf6ded23ceb9fde80e53bcd66b349fb6d588a524236751a64e9676235b1ddbd54c4cda66919b49b107f4e759e25a710419c1570cda4c91ffa8c6 EBUILD pkgcraft-tools-9999.ebuild 1143 BLAKE2B 41fc28049557fa8b0c8744aabaf5bf7f7c6b69a661b66377375bd4e6365b96aa178b17fdc4251419df986212c271c93c2b88b66b05c4ae1429215ff8004979ce SHA512 1c6643a547b3be610be712b68955b136c1904400c1ed19bf296dd4fd917b50cb2662beecd153b81e412938074170c2a43e4c8089d391da5fee02e4948fdedd5b MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.13.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.13.ebuild deleted file mode 100644 index 1aa8a495d7a2..000000000000 --- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.13.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" " -LLVM_MAX_SLOT=17 -inherit edo cargo llvm - -DESCRIPTION="pkgcraft-based tools for Gentoo" -HOMEPAGE="https://pkgcraft.github.io/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft" - inherit git-r3 - - S="${WORKDIR}"/${P}/crates/pkgcraft-tools -else - SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz" - - KEYWORDS="~amd64 ~arm64" -fi - -LICENSE="MIT" -# Dependent crate licenses -LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test ) " - -QA_FLAGS_IGNORED="usr/bin/pk" - -# Clang needed for bindgen -BDEPEND=" - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)) - >=virtual/rust-1.71 - test? ( dev-util/cargo-nextest ) -" - -llvm_check_deps() { - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - fi -} - -src_test() { - edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests -} diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index 5b33d1cef92a..91f5d08ca8d6 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -10,21 +10,14 @@ AUX shadow-4.13-usermod-prefix-gid.patch 1206 BLAKE2B 8efa85ab6c4eee199b5cd21f70 AUX shadow-4.14.0-bug912446.patch 35069 BLAKE2B 7c9ba6cc174553def2e28b251946e8795a591d807f8c1a684249a859a1fc7ef718f9ac406697eb94fe09b2e180c63a91767e2cb87dc996c068b3b6a93a521966 SHA512 91acf61fcd8dccbec3ad3914edb9e2a4d3b8db814c1d8f391801aaa1216711f0e211d3eac048fc919be13ec2d60ef6812586c6d363b62e491ffcfb727d85823d DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3ae21c35ae243d09a4facf97a13c1d672990876e74ef94f5284402acf14997663743e2aaefa6cfc4369b7d24dc SHA512 2949a728c3312bef13d23138d6b79caf402781b1cb179e33b5be546c1790971ec20778d0e9cd3dbe09691d928ffcbe88e60da42fab58c69a90d5ebe5e3e2ab8e DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648 -DIST shadow-4.14.0.tar.xz 1787892 BLAKE2B 6e9a6108f856953ec91c597e46ad4f912101a829c7b3ff3389510be43f56f0a70425bd562119282d73df269df45af354e626741ad748f9c1e6f27b74a462a62c SHA512 ff960481d576f9db5a9f10becc4e1a74c03de484ecfdcd7f1ea735fded683d7ba0f9cd895dc6a431b77e5a633752273178b1bcda4cefaa5adbf0f143c9a0c86f -DIST shadow-4.14.0.tar.xz.asc 488 BLAKE2B e9ccdb38f130088ba2193e40a4ef7ccce3a592972bc7cb4e50cd8ad768c152b9bbb61432abbfe6ccc0cbed3979b4f54b8da68d1c58cb25bdb668bf5427b5a628 SHA512 d011a732d73b4b066ca8d204c0420303f925c87efc7655feb5c5f60b619d67da450e220ee44f6c86929ae79cbd4343136fe9c20d25b39fa0a228a48e57636309 DIST shadow-4.14.2.tar.xz 1799548 BLAKE2B 419f0a516753616ef691f71ec9002eef6fd7568c013ac71900d7481eff1bd9165c69d9587b7ca25800543a2eac58cfb7ce4224063e8af7b278f589640485c28f SHA512 b417dbe0fbbeced1022e64efe9dcd8b41d14779c45163e6de63891ac63f837d43f3e559f99f884099aa45282299ceb4dcb9fd29d21c9925687ff8462fe6ead2f DIST shadow-4.14.2.tar.xz.asc 833 BLAKE2B 9e085c79ccd3aa77489eb92e947dd4875dea84be2dbcbd2b8443e70b3dc065d288171ee024f81c6c3bf44d0ebfcabbb69937a906fdb26b6622d5a369aa415e8e SHA512 47a2607fa782a48b0333e353343a32f358115bb40225ea962fab86d4a8dbed1df976eb6231baf5b95f34a13139b99d6b719521626e5d3e9c80fc4c685767d9b7 -DIST shadow-4.14.3.tar.xz 1799112 BLAKE2B 6707cae41a0f8478cadd94ea5eaba95cdc6b1b23896b8dd903c62c931839a82b0538f04f8c12433f148da5b23c12a033963380be81f6fc97fa0e3f9399e51b21 SHA512 da5bba26ccf64535e39a4918033f76bf40da00959512424b23427511bedd9b5a4973343062cc8e415690ebc842a1d4a3ac344bca8d14a57f38281629d0bf3edd -DIST shadow-4.14.3.tar.xz.asc 833 BLAKE2B 80c1b2ef54081b48bb912fa486f5f1a29b5435de0f5c312984f67c7bee38ab4b80d63026aba24cf04f45994af5502ae5f3dad1e24b89d2094ab6dc2e5641e304 SHA512 8f2e07a91752e43dc382abc3999c34e4bdc719a28e39090dadccddaf2e865535d8ff1223edb2949ce791f999ce7e8c088b079497d544e33f6b8871a4fb49aafc -DIST shadow-4.14.4.tar.xz 1805956 BLAKE2B 05704e9c4a1d0fc35d89c651887b8114bfe19530b68ffc8562042080d41f5defa2aba00fdf34318b080abe9b1eae4f428f5370ab381b1a37c5b4ec3012a2f98a SHA512 f15aeb3819e1cd6e040ef112ea0f45f3dd89b32f27f6a028c696fab4df03771ac857563c09e5e89f2bece150e6de0567b0a6cbacbea9bd25cd94a02d419fac62 -DIST shadow-4.14.4.tar.xz.asc 833 BLAKE2B 0052d88a24c7d8a69ab33a1b263dcd42c51e27b6d91aa4cae47b7b5f7d3500fce284728450eaf99977dce28f6ab4dd42226eadb24b1cbcac3f4b38a11603ae12 SHA512 c76b8ea87d8b4bfb97895c5ff45daa4ca08c9c8f444371d3683f2af8b71db5186143c206b0df96bf50d95691d6a4e34f864be5e8942c72d76683bbf6d786735a DIST shadow-4.14.5.tar.xz 1806416 BLAKE2B 885d2b23ed670cf26452eb208d561478b7410ffbb04a054feb65efb7da6f1d51eb992da61b72409f8991ee35efd7e7cf7a9bc770edec5f855ace32f82aaa7b55 SHA512 30de7837874b3ad41d579ffe337a6defa22fbe151fdbf8a32c54f267af1f565c7e06b92d953571482e3b622f98291f08f3155179a23266a3e54df1546b87b156 DIST shadow-4.14.5.tar.xz.asc 833 BLAKE2B 191b6a26993f9276ea712e926d5e429112b6f6c3d55e6ac7ba9bacd5ffd1f26ea687a9021fdb1c61d7d5032dd103d0c58b963020504549237b070a7025d0de4a SHA512 94fa6939b681ef286803300d12d519370e03fc08018b44779217ae877021f9d77a0b3e39e72fbdfa463191a126b41aedc0be1471d1d5594825d8435c45f6c23f -EBUILD shadow-4.13-r3.ebuild 6753 BLAKE2B 5cb485a450116fdf66708a920ed55ef07a655498cdcb662e54dba3e9aac20768c4c7fd944bb22a109c46b59c2f8e0e0507fbdcdf34719f047be406e1f424d44f SHA512 cb942699ff9734b8494300269810b0729a0eab4d66f619f1deb02d84856c823d2cd4b3add0a38b1f8df43321c228e942b01a423e3623ea0c1708eded2bf00e26 +DIST shadow-4.14.6.tar.xz 1805900 BLAKE2B e910131eab6527c1222afadf02ebd7bd6a3460baf95c23cc9eefa7aa21ddb70c02e58e4f58db2cb24fa8e2996c82b11664420545a8b1af573e4e6a25ceb3f921 SHA512 994a81afbafb19622a1d0f84527f96a84b0955c4ffa5e826682ead82af7940b8e3a091514bd2075622ebdf7638643c9c6b6b7ac3e48d985278db896249d70ae6 +DIST shadow-4.14.6.tar.xz.asc 833 BLAKE2B 2fdcbd073687de829006ed9eb3ffd0b5f1312a94fe81b9c6840b25807e1268c58136d378da87f481c3cb53dc262d7afb6d97c77528e14dfbf5d54212fa7f84f2 SHA512 41f8fa92379392d4caa83987f9ea513ec18103dacfc01461f7bfb67ee6738a67e097fe76e7aa1f6004dfe14d5c55973667037c683fdd8ebb082264cb62222d27 EBUILD shadow-4.13-r4.ebuild 6834 BLAKE2B da0e190f18aa68350ac8689505c0399252ab54036583ee2b4fa865433406f64469d6a43162f422da5e315cf7378e0accc595c8a2eaccf801353947cc504c3983 SHA512 dc4dad7bd7c4f4206f9cbc83166269dde3b868eca3a5a83f2698795efb7696c438468c8c22293963a52597735888efb8b959bccddb6d19b6eefc3cbeb5564dd7 -EBUILD shadow-4.14.0-r3.ebuild 7225 BLAKE2B 2ea66e8e81966f39a8325b9290a7ea26cef5e3ac8ec36830ab150a05def6bdeef25bf3b00d02c5398da8238405b95a98bc5919195f0b632db9b8076bf3d27d85 SHA512 38f65bbf59690acf66a724766a84a0bd2cdc8f86141e70e22490daa3c6a7d6940167af149ae5f8f46e574129200c15e2e21227c70eb1f28417831ae5ccb507b0 EBUILD shadow-4.14.2.ebuild 7216 BLAKE2B 93bcce72598fc8669416d440fc6605819aa68f03a8acadc3280337b62626efac4911a39e79bc6b0d4bb724377d1891fc8343c0f716d2fc15b73ee9b2f351ce76 SHA512 98736041a51b60443a28019e5fb2c8406c7a8eeb2dd8c54a39d2718690c251c53b1bd214100998be18202e29ad62ec6327220ec9f35d0e1992b9d96eef048bb1 -EBUILD shadow-4.14.3.ebuild 7224 BLAKE2B 0c9d1086a3d938eff1b3e80b86b8ad7daa28d5843b87da99855ecc02e7320461da5a3371c3678efdaa6af68d0cf35ed32fe97490338cdd1d7f03967025475375 SHA512 90efe2ad8e141a6ae8d8b582632c7d32db1212aaf481d456fc641a65ab29599021135bb17b90ba156308d95ccbc127f4ba6149c4ebc8c0902163a2e651962848 -EBUILD shadow-4.14.4.ebuild 7224 BLAKE2B 0c9d1086a3d938eff1b3e80b86b8ad7daa28d5843b87da99855ecc02e7320461da5a3371c3678efdaa6af68d0cf35ed32fe97490338cdd1d7f03967025475375 SHA512 90efe2ad8e141a6ae8d8b582632c7d32db1212aaf481d456fc641a65ab29599021135bb17b90ba156308d95ccbc127f4ba6149c4ebc8c0902163a2e651962848 EBUILD shadow-4.14.5.ebuild 7224 BLAKE2B 0c9d1086a3d938eff1b3e80b86b8ad7daa28d5843b87da99855ecc02e7320461da5a3371c3678efdaa6af68d0cf35ed32fe97490338cdd1d7f03967025475375 SHA512 90efe2ad8e141a6ae8d8b582632c7d32db1212aaf481d456fc641a65ab29599021135bb17b90ba156308d95ccbc127f4ba6149c4ebc8c0902163a2e651962848 +EBUILD shadow-4.14.6.ebuild 7224 BLAKE2B 0c9d1086a3d938eff1b3e80b86b8ad7daa28d5843b87da99855ecc02e7320461da5a3371c3678efdaa6af68d0cf35ed32fe97490338cdd1d7f03967025475375 SHA512 90efe2ad8e141a6ae8d8b582632c7d32db1212aaf481d456fc641a65ab29599021135bb17b90ba156308d95ccbc127f4ba6149c4ebc8c0902163a2e651962848 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16 diff --git a/sys-apps/shadow/shadow-4.13-r3.ebuild b/sys-apps/shadow/shadow-4.13-r3.ebuild deleted file mode 100644 index 0302c5face3c..000000000000 --- a/sys-apps/shadow/shadow-4.13-r3.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream sometimes pushes releases as pre-releases before marking them -# official. Don't keyword the pre-releases! -# Check https://github.com/shadow-maint/shadow/releases. - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sergehallyn.asc -inherit libtool pam verify-sig - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="https://github.com/shadow-maint/shadow" -SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )" - -LICENSE="BSD GPL-2" -# Subslot is for libsubid's SONAME. -SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr" -# Taken from the man/Makefile.am file. -LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) - -REQUIRED_USE="?? ( cracklib pam )" - -COMMON_DEPEND=" - virtual/libcrypt:= - acl? ( sys-apps/acl:0= ) - audit? ( >=sys-process/audit-2.6:0= ) - cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) - nls? ( virtual/libintl ) - pam? ( sys-libs/pam:0= ) - skey? ( sys-auth/skey:0= ) - selinux? ( - >=sys-libs/libselinux-1.28:0= - sys-libs/libsemanage:0= - ) - xattr? ( sys-apps/attr:0= ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-4.14 -" -RDEPEND="${COMMON_DEPEND} - !<sys-apps/man-pages-5.11-r1 - !=sys-apps/man-pages-5.12-r0 - !=sys-apps/man-pages-5.12-r1 - nls? ( - !<app-i18n/man-pages-it-5.06-r1 - !<app-i18n/man-pages-ja-20180315-r1 - !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 - ) - pam? ( >=sys-auth/pambase-20150213 ) - su? ( !sys-apps/util-linux[su(-)] ) -" -BDEPEND=" - app-arch/xz-utils - sys-devel/gettext - verify-sig? ( sec-keys/openpgp-keys-sergehallyn ) -" - -PATCHES=( - "${FILESDIR}"/${P}-configure-clang16.patch - "${FILESDIR}"/${P}-CVE-2023-29383.patch -) - -src_prepare() { - default - - elibtoolize -} - -src_configure() { - local myeconfargs=( - --disable-account-tools-setuid - --disable-static - --with-btrfs - --without-group-name-max-length - --without-tcb - $(use_enable nls) - $(use_with acl) - $(use_with audit) - $(use_with bcrypt) - $(use_with cracklib libcrack) - $(use_with elibc_glibc nscd) - $(use_with pam libpam) - $(use_with selinux) - $(use_with skey) - $(use_with su) - $(use_with xattr attr) - ) - - econf "${myeconfargs[@]}" - - if use nls ; then - local l langs="po" # These are the pot files. - for l in ${LANGS[*]} ; do - has ${l} ${LINGUAS-${l}} && langs+=" ${l}" - done - sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die - fi -} - -set_login_opt() { - local comment="" opt=${1} val=${2} - if [[ -z ${val} ]]; then - comment="#" - sed -i \ - -e "/^${opt}\>/s:^:#:" \ - "${ED}"/etc/login.defs || die - else - sed -i -r \ - -e "/^#?${opt}\>/s:.*:${opt} ${val}:" \ - "${ED}"/etc/login.defs - fi - local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs) - einfo "${res:-Unable to find ${opt} in /etc/login.defs}" -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install - - # 4.9 regression: https://github.com/shadow-maint/shadow/issues/389 - emake DESTDIR="${D}" -C man install - - find "${ED}" -name '*.la' -type f -delete || die - - insinto /etc - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - if use split-usr ; then - # move passwd to / to help recover broke systems #64441 - # We cannot simply remove this or else net-misc/scponly - # and other tools will break because of hardcoded passwd - # location - dodir /bin - mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die - dosym ../../bin/passwd /usr/bin/passwd - fi - - cd "${S}" || die - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - set_login_opt CREATE_HOME yes - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - set_login_opt CONSOLE - else - dopamd "${FILESDIR}"/pam.d-include/shadow - - for x in chsh chfn ; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} - done - - for x in chpasswd newusers ; do - newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x} - done - - newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems - - # Comment out login.defs options that pam hates - local opt sed_args=() - for opt in \ - CHFN_AUTH \ - CONSOLE \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - sed_args+=( -e "/^#${opt}\>/b pamnote" ) - done - sed -i "${sed_args[@]}" \ - -e 'b exit' \ - -e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \ - -e ': exit' \ - "${ED}"/etc/login.defs || die - - # Remove manpages that pam will install for us - # and/or don't apply when using pam - find "${ED}"/usr/share/man -type f \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -delete - - # Remove pam.d files provided by pambase. - rm "${ED}"/etc/pam.d/{login,passwd} || die - if use su ; then - rm "${ED}"/etc/pam.d/su || die - fi - fi - - # Remove manpages that are handled by other packages - find "${ED}"/usr/share/man -type f \ - '(' -name id.1 -o -name getspnam.3 ')' \ - -delete || die - - if ! use su ; then - find "${ED}"/usr/share/man -type f -name su.1 -delete || die - fi - - cd "${S}" || die - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc || die - dodoc HOWTO README* WISHLIST *.txt - - if use elibc_musl; then - QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent ) - fi -} - -pkg_preinst() { - rm -f "${EROOT}"/etc/pam.d/system-auth.new \ - "${EROOT}/etc/login.defs.new" -} - -pkg_postinst() { - # Missing entries from /etc/passwd can cause odd system blips. - # See bug #829872. - if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then - ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors." - fi - - # Enable shadow groups. - if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then - if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then - grpconv -R "${EROOT:-/}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - [[ ! -f "${EROOT}"/etc/subgid ]] && - touch "${EROOT}"/etc/subgid - [[ ! -f "${EROOT}"/etc/subuid ]] && - touch "${EROOT}"/etc/subuid - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.14.0-r3.ebuild b/sys-apps/shadow/shadow-4.14.0-r3.ebuild deleted file mode 100644 index 3e4f1ed078f2..000000000000 --- a/sys-apps/shadow/shadow-4.14.0-r3.ebuild +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != 4.14.0 ]]; then - die "Please replace eautoreconf with elibtoolize and drop autotools when bumping!" -fi - -# Upstream sometimes pushes releases as pre-releases before marking them -# official. Don't keyword the pre-releases! -# Check https://github.com/shadow-maint/shadow/releases. - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sergehallyn.asc -inherit autotools libtool pam verify-sig - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="https://github.com/shadow-maint/shadow" -SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )" - -LICENSE="BSD GPL-2" -# Subslot is for libsubid's SONAME. -SLOT="0/4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey split-usr su systemd xattr" -# Taken from the man/Makefile.am file. -LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) - -REQUIRED_USE="?? ( cracklib pam )" - -# TODO: Revisit libbsd dep once glibc-2.28 is stable as it provides strlcpy. -COMMON_DEPEND=" - dev-libs/libbsd - virtual/libcrypt:= - acl? ( sys-apps/acl:= ) - audit? ( >=sys-process/audit-2.6:= ) - cracklib? ( >=sys-libs/cracklib-2.7-r3:= ) - nls? ( virtual/libintl ) - pam? ( sys-libs/pam:= ) - skey? ( sys-auth/skey:= ) - selinux? ( - >=sys-libs/libselinux-1.28:= - sys-libs/libsemanage:= - ) - systemd? ( sys-apps/systemd:= ) - xattr? ( sys-apps/attr:= ) -" -DEPEND=" - ${COMMON_DEPEND} - >=sys-kernel/linux-headers-4.14 -" -RDEPEND=" - ${COMMON_DEPEND} - !<sys-apps/man-pages-5.11-r1 - !=sys-apps/man-pages-5.12-r0 - !=sys-apps/man-pages-5.12-r1 - nls? ( - !<app-i18n/man-pages-it-5.06-r1 - !<app-i18n/man-pages-ja-20180315-r1 - !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 - ) - pam? ( >=sys-auth/pambase-20150213 ) - su? ( !sys-apps/util-linux[su(-)] ) -" -BDEPEND=" - app-arch/xz-utils - sys-devel/gettext - verify-sig? ( sec-keys/openpgp-keys-sergehallyn ) -" - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/shadow-4.14.0-bug912446.patch - ) - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - # Negate new upstream default of disabling for now - --enable-lastlog - --disable-account-tools-setuid - --disable-static - --with-btrfs - # shadow uses a bundled copy of readpassphrase if --without-libbsd - --with-libbsd - --without-group-name-max-length - --without-tcb - --with-bcrypt - --with-yescrypt - $(use_enable nls) - # TODO: wire up upstream for elogind too - $(use_enable systemd logind) - $(use_with acl) - $(use_with audit) - $(use_with cracklib libcrack) - $(use_with elibc_glibc nscd) - $(use_with pam libpam) - $(use_with selinux) - $(use_with skey) - $(use_with su) - $(use_with xattr attr) - ) - - econf "${myeconfargs[@]}" - - if use nls ; then - local l langs="po" # These are the pot files. - for l in ${LANGS[*]} ; do - has ${l} ${LINGUAS-${l}} && langs+=" ${l}" - done - sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die - fi -} - -set_login_opt() { - local comment="" opt=${1} val=${2} - if [[ -z ${val} ]]; then - comment="#" - sed -i \ - -e "/^${opt}\>/s:^:#:" \ - "${ED}"/etc/login.defs || die - else - sed -i -r \ - -e "/^#?${opt}\>/s:.*:${opt} ${val}:" \ - "${ED}"/etc/login.defs - fi - local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs) - einfo "${res:-Unable to find ${opt} in /etc/login.defs}" -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install - - # 4.9 regression: https://github.com/shadow-maint/shadow/issues/389 - emake DESTDIR="${D}" -C man install - - find "${ED}" -name '*.la' -type f -delete || die - - insinto /etc - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - if use split-usr ; then - # move passwd to / to help recover broke systems #64441 - # We cannot simply remove this or else net-misc/scponly - # and other tools will break because of hardcoded passwd - # location - dodir /bin - mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die - dosym ../../bin/passwd /usr/bin/passwd - fi - - cd "${S}" || die - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - set_login_opt CREATE_HOME yes - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - set_login_opt CONSOLE - else - dopamd "${FILESDIR}"/pam.d-include/shadow - - for x in chsh chfn ; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} - done - - for x in chpasswd newusers ; do - newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x} - done - - newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems - - # Comment out login.defs options that pam hates - local opt sed_args=() - for opt in \ - CHFN_AUTH \ - CONSOLE \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - sed_args+=( -e "/^#${opt}\>/b pamnote" ) - done - sed -i "${sed_args[@]}" \ - -e 'b exit' \ - -e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \ - -e ': exit' \ - "${ED}"/etc/login.defs || die - - # Remove manpages that pam will install for us - # and/or don't apply when using pam - find "${ED}"/usr/share/man -type f \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -delete - - # Remove pam.d files provided by pambase. - rm "${ED}"/etc/pam.d/{login,passwd} || die - if use su ; then - rm "${ED}"/etc/pam.d/su || die - fi - fi - - # Remove manpages that are handled by other packages - find "${ED}"/usr/share/man -type f \ - '(' -name id.1 -o -name getspnam.3 ')' \ - -delete || die - - if ! use su ; then - find "${ED}"/usr/share/man -type f -name su.1 -delete || die - fi - - cd "${S}" || die - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc || die - dodoc HOWTO README* WISHLIST *.txt - - if use elibc_musl; then - QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent ) - fi -} - -pkg_preinst() { - rm -f "${EROOT}"/etc/pam.d/system-auth.new \ - "${EROOT}/etc/login.defs.new" -} - -pkg_postinst() { - # Missing entries from /etc/passwd can cause odd system blips. - # See bug #829872. - if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then - ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors." - fi - - # Enable shadow groups. - if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then - if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then - grpconv -R "${EROOT:-/}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - [[ ! -f "${EROOT}"/etc/subgid ]] && - touch "${EROOT}"/etc/subgid - [[ ! -f "${EROOT}"/etc/subuid ]] && - touch "${EROOT}"/etc/subuid - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.14.4.ebuild b/sys-apps/shadow/shadow-4.14.4.ebuild deleted file mode 100644 index 104e0f560ccf..000000000000 --- a/sys-apps/shadow/shadow-4.14.4.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream sometimes pushes releases as pre-releases before marking them -# official. Don't keyword the pre-releases! -# Check https://github.com/shadow-maint/shadow/releases. - -inherit libtool pam verify-sig - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="https://github.com/shadow-maint/shadow" -SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )" - -LICENSE="BSD GPL-2" -# Subslot is for libsubid's SONAME. -SLOT="0/4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey split-usr su systemd xattr" -# Taken from the man/Makefile.am file. -LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) - -REQUIRED_USE="?? ( cracklib pam )" - -# TODO: Revisit libbsd dep once glibc-2.28 is stable as it provides strlcpy. -COMMON_DEPEND=" - dev-libs/libbsd - virtual/libcrypt:= - acl? ( sys-apps/acl:= ) - audit? ( >=sys-process/audit-2.6:= ) - cracklib? ( >=sys-libs/cracklib-2.7-r3:= ) - nls? ( virtual/libintl ) - pam? ( sys-libs/pam:= ) - skey? ( sys-auth/skey:= ) - selinux? ( - >=sys-libs/libselinux-1.28:= - sys-libs/libsemanage:= - ) - systemd? ( sys-apps/systemd:= ) - xattr? ( sys-apps/attr:= ) -" -DEPEND=" - ${COMMON_DEPEND} - >=sys-kernel/linux-headers-4.14 -" -RDEPEND=" - ${COMMON_DEPEND} - !<sys-apps/man-pages-5.11-r1 - !=sys-apps/man-pages-5.12-r0 - !=sys-apps/man-pages-5.12-r1 - nls? ( - !<app-i18n/man-pages-it-5.06-r1 - !<app-i18n/man-pages-ja-20180315-r1 - !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 - ) - pam? ( >=sys-auth/pambase-20150213 ) - su? ( !sys-apps/util-linux[su(-)] ) -" -BDEPEND=" - app-arch/xz-utils - sys-devel/gettext -" - -if [[ ${PV} == *.0 ]]; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-sergehallyn )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sergehallyn.asc -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc -fi - -src_prepare() { - default - elibtoolize -} - -src_configure() { - local myeconfargs=( - # Negate new upstream default of disabling for now - --enable-lastlog - --disable-account-tools-setuid - --disable-static - --with-btrfs - # shadow uses a bundled copy of readpassphrase if --without-libbsd - --with-libbsd - --without-group-name-max-length - --without-tcb - --with-bcrypt - --with-yescrypt - $(use_enable nls) - # TODO: wire up upstream for elogind too - $(use_enable systemd logind) - $(use_with acl) - $(use_with audit) - $(use_with cracklib libcrack) - $(use_with elibc_glibc nscd) - $(use_with pam libpam) - $(use_with selinux) - $(use_with skey) - $(use_with su) - $(use_with xattr attr) - ) - - econf "${myeconfargs[@]}" - - if use nls ; then - local l langs="po" # These are the pot files. - for l in ${LANGS[*]} ; do - has ${l} ${LINGUAS-${l}} && langs+=" ${l}" - done - sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die - fi -} - -set_login_opt() { - local comment="" opt=${1} val=${2} - if [[ -z ${val} ]]; then - comment="#" - sed -i \ - -e "/^${opt}\>/s:^:#:" \ - "${ED}"/etc/login.defs || die - else - sed -i -r \ - -e "/^#?${opt}\>/s:.*:${opt} ${val}:" \ - "${ED}"/etc/login.defs - fi - local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs) - einfo "${res:-Unable to find ${opt} in /etc/login.defs}" -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install - - # 4.9 regression: https://github.com/shadow-maint/shadow/issues/389 - emake DESTDIR="${D}" -C man install - - find "${ED}" -name '*.la' -type f -delete || die - - insinto /etc - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - if use split-usr ; then - # move passwd to / to help recover broke systems #64441 - # We cannot simply remove this or else net-misc/scponly - # and other tools will break because of hardcoded passwd - # location - dodir /bin - mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die - dosym ../../bin/passwd /usr/bin/passwd - fi - - cd "${S}" || die - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - set_login_opt CREATE_HOME yes - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - set_login_opt CONSOLE - else - dopamd "${FILESDIR}"/pam.d-include/shadow - - for x in chsh chfn ; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} - done - - for x in chpasswd newusers ; do - newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x} - done - - newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems - - # Comment out login.defs options that pam hates - local opt sed_args=() - for opt in \ - CHFN_AUTH \ - CONSOLE \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - sed_args+=( -e "/^#${opt}\>/b pamnote" ) - done - sed -i "${sed_args[@]}" \ - -e 'b exit' \ - -e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \ - -e ': exit' \ - "${ED}"/etc/login.defs || die - - # Remove manpages that pam will install for us - # and/or don't apply when using pam - find "${ED}"/usr/share/man -type f \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -delete - - # Remove pam.d files provided by pambase. - rm "${ED}"/etc/pam.d/{login,passwd} || die - if use su ; then - rm "${ED}"/etc/pam.d/su || die - fi - fi - - # Remove manpages that are handled by other packages - find "${ED}"/usr/share/man -type f \ - '(' -name id.1 -o -name getspnam.3 ')' \ - -delete || die - - if ! use su ; then - find "${ED}"/usr/share/man -type f -name su.1 -delete || die - fi - - cd "${S}" || die - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc || die - dodoc HOWTO README* WISHLIST *.txt - - if use elibc_musl; then - QA_CONFIG_IMPL_DECL_SKIP+=( sgetsgent ) - fi -} - -pkg_preinst() { - rm -f "${EROOT}"/etc/pam.d/system-auth.new \ - "${EROOT}/etc/login.defs.new" -} - -pkg_postinst() { - # Missing entries from /etc/passwd can cause odd system blips. - # See bug #829872. - if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then - ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors." - fi - - # Enable shadow groups. - if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then - if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then - grpconv -R "${EROOT:-/}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - [[ ! -f "${EROOT}"/etc/subgid ]] && - touch "${EROOT}"/etc/subgid - [[ ! -f "${EROOT}"/etc/subuid ]] && - touch "${EROOT}"/etc/subuid - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.14.3.ebuild b/sys-apps/shadow/shadow-4.14.6.ebuild index 104e0f560ccf..104e0f560ccf 100644 --- a/sys-apps/shadow/shadow-4.14.3.ebuild +++ b/sys-apps/shadow/shadow-4.14.6.ebuild |