summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49507 -> 49507 bytes
-rw-r--r--sys-apps/cpu-x/Manifest2
-rw-r--r--sys-apps/cpu-x/metadata.xml1
-rw-r--r--sys-apps/util-linux/Manifest4
-rw-r--r--sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch98
-rw-r--r--sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch46
-rw-r--r--sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch13
-rw-r--r--sys-apps/util-linux/util-linux-2.39-r3.ebuild399
8 files changed, 561 insertions, 2 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 573f16291293..b9761568b85d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
index 47e241900c71..dd2110e19c28 100644
--- a/sys-apps/cpu-x/Manifest
+++ b/sys-apps/cpu-x/Manifest
@@ -4,4 +4,4 @@ DIST cpu-x-4.5.3.tar.gz 1910854 BLAKE2B 98bb905e24d11ba4f599badd8f9de272fc0b8cd6
EBUILD cpu-x-4.5.1.ebuild 1670 BLAKE2B f4cd9e218fa3d4fd71e79e04069e423de89e3b2d8a96a523aef310a06485b9f45735dc5e4c6079b87504e874b9226b416cc5533e1a6393c0fa0375166323164b SHA512 b35c73b882a6b5bb28384fa6b7e71df8bc44571e630f1957f22d7e67a8a50acfb1d82df2a828dd08dd0e8fb5e9c4cd741c8463bc152af782b2263ec87c17f6a4
EBUILD cpu-x-4.5.2.ebuild 1670 BLAKE2B f4cd9e218fa3d4fd71e79e04069e423de89e3b2d8a96a523aef310a06485b9f45735dc5e4c6079b87504e874b9226b416cc5533e1a6393c0fa0375166323164b SHA512 b35c73b882a6b5bb28384fa6b7e71df8bc44571e630f1957f22d7e67a8a50acfb1d82df2a828dd08dd0e8fb5e9c4cd741c8463bc152af782b2263ec87c17f6a4
EBUILD cpu-x-4.5.3.ebuild 1745 BLAKE2B 13e76ce2dc3deb7fe8fd18c8a14199ebbdab30f2f3d717ca4a4eb0cd9c5862165d9a647ddbd554d20ee011fa4cc930d6c2714874ee8ec7a11549fbf8cdaa9ec3 SHA512 9b83036a9db89f518f1965c16ffbcbe5ecd12639273c78f4a80bcd5f8be8095013ed25e5eb7818b760429a58853aa30ed67a10009279d96f831a87d6df1121fc
-MISC metadata.xml 2421 BLAKE2B 9038d6b977cd18eaf1624ae15c7f0cf1953a650e3d15142db8ed1899d20d71131359a1d2c9db5242e22af73e4227e82a65c9058008276d8ae26f0c16c8b63ee8 SHA512 8f18fe2cd35a834b585e9d4aec3d5ad26cd78b323bbcfab177168047c40665b9be5282ec3921fb44b8b78ac8f1ccff4357877601899f2485823147bc330135af
+MISC metadata.xml 2370 BLAKE2B edf7d35e28a2c5b60f8b6d6d7d616146c72fb937f07fe16e8d89f5e0522a4a8dfdbe838dcc1b9e57dea30f267e6e7e51b200a11f60b67ca528eb7851ad1b0a28 SHA512 026acb991c7a80c6ba84fe24b14ec7686ba9d389c94e9f6d2e25ff8c9cb8cd36fe795b571ccb02a0ae1335604d5074bf43373fbaa8388f9e6a446c326385f4a7
diff --git a/sys-apps/cpu-x/metadata.xml b/sys-apps/cpu-x/metadata.xml
index 2dbac098c827..52d661f4aca7 100644
--- a/sys-apps/cpu-x/metadata.xml
+++ b/sys-apps/cpu-x/metadata.xml
@@ -25,7 +25,6 @@
<flag name="gpu">Use the <pkg>media-libs/glfw</pkg> library for GPU info</flag>
<flag name="pci">Use the <pkg>sys-apps/pciutils</pkg> library for PCI info</flag>
<flag name="opencl">Use the <pkg>virtual/opencl</pkg> library</flag>
- <flag name="vulkan">Enable vulkan support</flag>
</use>
<use lang="fr">
<flag name="bandwidth">Intégrer bandwidth</flag>
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index d86fcd949a07..3e3fb9b23e60 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,11 +3,15 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
AUX su-l.pamd 140 BLAKE2B 34f00c8814d454c8caa6bd5f0dd0bb89b24c12dbc0e39e852dc45965c4fae4dcfd0ab1def2364163908d416f9306c5193357c0be3a559d35574ef9a56fa645a4 SHA512 4490b7e516a9c306e991c0f719f742c5a13841d28a57385fc96482663f409025aa7ecc3a3855c20099547702ecd7a160b308761e28316f90d4d6622eea1ba21f
AUX util-linux-2.38.1-check-for-sys-pidfd.h.patch 1764 BLAKE2B 4d71d6b708ad7a1d1f01c6c0df5c57db12ea699e4449d83ae6df55c47b62380079d5b118bb081d229d118f06fb1881b36185979f9a03f4fd1defcc253887bdc4 SHA512 294b8b7f002772dcabd69d956390f9bdca1837563dd673ea1114a915fb94beec7e3c6bc1927712f1dae46eecd1cc10c3788b12dcddadc35dd92782ce600479ac
AUX util-linux-2.38.1-more-posix-exit-on-eof.patch 1216 BLAKE2B ee99884ef388a342aeceff4b6988b45cfe21dfc41fa3d978f1a4b57b35682d5cb0ca48c060d9694368ed06651661984eddb9ae70a00f7eb360fad9798caaddc5 SHA512 78136beaf600f99a5404222b6d6d7499ea40fc4e6401a36bd51e8c4183b925004a0f37a079b13b9c1c0824a7f22f43a16c8358c5e8ddfe55dd0019de58579195
+AUX util-linux-2.39-check-for-mount_setattr.patch 3032 BLAKE2B c522135ea8f5e418db243bbe0ce7582e1bcabde6761bbbb9fea0e17f5174fdda0ed14378bec91bc289e5aaee4a585a49bc50b7dd0e6600f495c34a9385e77e2f SHA512 339cf169bcb12777f5d4c580ac8c87127d615573d83cd18331866a2e99e308c68456b8904f562e0c9551b79fbb7f24f139e6d407400f3d34457211b1b9ce0ff3
+AUX util-linux-2.39-mount-parse-options-user.patch 1549 BLAKE2B a6b77aa14d31ed05fc096d84297303558ef2cc7c641eea7a70cfe425dfe418f9f31df0cb60466215af72d620966a002689bd9891dfc1541c01e4212aa5ddd51d SHA512 0ec00e2f8bc1cb22bb295e9090d9963684240afa031d2c6fb1e5e2fcea75a6fca527e21d8abe6c363ec8d9a500470a197ed2d573c6b327286ecf638c604c7941
+AUX util-linux-2.39-tests-for-mount_setattr.patch 388 BLAKE2B b96c38ffe2dd119914af60d8ee4465e0de0217a98185b46873253a3d86e8638e1a22f5bd3155ec83101d4f26a07eafa84ebba9363381dd681c6ce6627c3dcb77 SHA512 4d38274342a599ec6ca3124c86067dbf4a92c0bc1bf987d4f2400393bf68e71d9ba46860da76e717aac68ed6aac099b1da63354f38c4d9236062121d1da13356
DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
DIST util-linux-2.39.tar.sign 833 BLAKE2B f4b35d35f1d20094169c8651d127c6d1f37b0946bc72c40f4824d77f8c117a23ae2633ac2449e91ba316d4cac6e4f3c2afb9fd410302683384988dc794062d9e SHA512 f5df4f7e5c39995ad3c7b52f06bfc7759e53d4df82b2b42f09d4570faeff5c156e83e42be053b00b0bfb4a71e27bfa580fb996a92225eb8a0df46d9f296ef4ef
DIST util-linux-2.39.tar.xz 8103428 BLAKE2B 39d415b6e303c21d2e5566bd29dd1803c67fbaed079fab85fab620db727a69c96f9c705a3671a639185c78ea1e70f374e21ef8694115ce42fa30c86b546023d1 SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94
EBUILD util-linux-2.38.1-r2.ebuild 10536 BLAKE2B ea36003f87fb328c0e3c478543a07fc0469e59859172f605a0ef879bfe65e4fc55e1c4caf2d86dda2306ff752754f162a4970b67abd9dd23ff98576cc3fc7c44 SHA512 075a4a012eb9464f4871baecdaf32a14c4e29fac0b6b04dfa8d55c90c69fd192f23fc248ae757fc231d8dfc57f1be168f1213d6de15170d27636c769bd03f451
EBUILD util-linux-2.39-r1.ebuild 10680 BLAKE2B 7d9a476479a453dd134da66f4273fde6aa171b1b0e74f5cbd4c6d70cf435d63c2c80e50e3f15b3c57ca462bc123f6e4fbc010660a6c81d00a28366bbcd426312 SHA512 375c5999803ae4352cfe32c4d7556eb98d6d416a909d75aad7df976f98256b6dfc722c755ce9a55bd95babf8a4b12f36d665d21117e27fcdcb2e9bb9aa34fc6c
+EBUILD util-linux-2.39-r3.ebuild 10862 BLAKE2B 65b7946b5ba6eb581dabb7f371b5a82f9a1b2fb4e52d1e70173c4ac8e9883eb90d74c12dcfeada492c84e2e2a9ba92199fb7a15f141a96be6d54175b5bebd089 SHA512 6f486974ae929f1e1ad7f9a6ce5f5c6ef18e3580c4345771aae22465463bdf8ec3e0fa1beb2f0efe4fa89c4abf295d603f1f1ce6072056e314cb556963d63bc4
EBUILD util-linux-9999.ebuild 10680 BLAKE2B 7d9a476479a453dd134da66f4273fde6aa171b1b0e74f5cbd4c6d70cf435d63c2c80e50e3f15b3c57ca462bc123f6e4fbc010660a6c81d00a28366bbcd426312 SHA512 375c5999803ae4352cfe32c4d7556eb98d6d416a909d75aad7df976f98256b6dfc722c755ce9a55bd95babf8a4b12f36d665d21117e27fcdcb2e9bb9aa34fc6c
MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch b/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch
new file mode 100644
index 000000000000..c1eb3748f782
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch
@@ -0,0 +1,98 @@
+https://bugs.gentoo.org/906797
+https://github.com/util-linux/util-linux/pull/2248
+
+From 1bd85b64632280d6bf0e86b4ff29da8b19321c5f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
+Date: Sat, 20 May 2023 06:38:20 +0200
+Subject: [PATCH] libmount: check for availability of mount_setattr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If mount_setattr is not available but needed fall back to the legacy
+mount API.
+
+Fixes #2247
+
+Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
+--- a/libmount/src/hook_mount.c
++++ b/libmount/src/hook_mount.c
+@@ -510,6 +510,15 @@ static inline int fsopen_is_supported(void)
+ return rc;
+ }
+
++static inline int mount_setattr_is_supported(void)
++{
++ int rc;
++
++ errno = 0;
++ rc = mount_setattr(-1, NULL, 0, NULL, 0);
++ return !(rc == -1 && errno == ENOSYS);
++}
++
+ /*
+ * open_tree() and fsopen()
+ */
+@@ -675,9 +684,14 @@ static int hook_prepare(struct libmnt_context *cxt,
+ /* call mount_setattr() */
+ if (!rc
+ && cxt->helper == NULL
+- && (set != 0 || clr != 0 || (flags & MS_REMOUNT)))
++ && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) {
++ if (!mount_setattr_is_supported()) {
++ hookset_deinit(cxt, hs);
++ return 1;
++ }
+ rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT, NULL,
+ hook_set_vfsflags);
++ }
+
+ /* call move_mount() to attach target */
+ if (!rc
+@@ -688,9 +702,14 @@ static int hook_prepare(struct libmnt_context *cxt,
+ hook_attach_target);
+
+ /* set propagation (has to be attached to VFS) */
+- if (!rc && mnt_optlist_get_propagation(ol))
++ if (!rc && mnt_optlist_get_propagation(ol)) {
++ if (!mount_setattr_is_supported()) {
++ hookset_deinit(cxt, hs);
++ return 1;
++ }
+ rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT_POST, NULL,
+ hook_set_propagation);
++ }
+
+ DBG(HOOK, ul_debugobj(hs, "prepare mount done [rc=%d]", rc));
+ return rc;
+diff --git a/tests/expected/mount/fallback-mount_setattr b/tests/expected/mount/fallback-mount_setattr
+new file mode 100644
+index 0000000000..3e18ebf09e
+--- /dev/null
++++ b/tests/expected/mount/fallback-mount_setattr
+@@ -0,0 +1 @@
++private
+--- a/tests/ts/mount/fallback
++++ b/tests/ts/mount/fallback
+@@ -68,5 +68,21 @@ $TS_CMD_UMOUNT $MOUNTPOINT
+ ts_finalize_subtest
+
+
++ts_init_subtest "mount_setattr"
++"$TS_CMD_MOUNT" "$DEVICE" "$MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
++ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
++$TS_HELPER_ENOSYS -s mount_setattr -- \
++ "$TS_CMD_MOUNT" -o remount,ro "$MOUNTPOINT" \
++ >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_FINDMNT --kernel --mountpoint "$MOUNTPOINT" --options "ro" &> /dev/null
++[ "$?" == "0" ] || ts_die "Cannot find read-only in $MOUNTPOINT in /proc/self/mountinfo"
++$TS_HELPER_ENOSYS -s mount_setattr -- \
++ "$TS_CMD_MOUNT" --make-slave "$MOUNTPOINT" \
++ >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_FINDMNT -n --kernel --mountpoint "$MOUNTPOINT" -o PROPAGATION >> $TS_OUTPUT
++$TS_CMD_UMOUNT $MOUNTPOINT
++ts_finalize_subtest
++
++
+ ts_finalize
+
diff --git a/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch b/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch
new file mode 100644
index 000000000000..e02d02c7f503
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/906797#c4
+https://bugs.gentoo.org/906859
+https://github.com/util-linux/util-linux/issues/2238
+https://github.com/util-linux/util-linux/commit/c0267687fd7b41b00d523d1985182d7eb574effd
+
+From c0267687fd7b41b00d523d1985182d7eb574effd Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 22 May 2023 15:00:25 +0200
+Subject: [PATCH] libmount: fix options prepend/insert and merging
+
+ * the order of the new options should not be changed
+ (for example prepend "a,b,c" to list with "d" has to generate "a,b,c,d", not "c,b,a,d")
+
+ * make sure that options map is defined when merging options
+
+Fixes: https://github.com/util-linux/util-linux/issues/2238
+Signed-off-by: Karel Zak <kzak@redhat.com>
+--- a/libmount/src/optlist.c
++++ b/libmount/src/optlist.c
+@@ -338,6 +338,7 @@ int mnt_optlist_merge_opts(struct libmnt_optlist *ls)
+
+ /* remove inverted option */
+ else if (opt->ent && x->ent
++ && opt->map == x->map
+ && opt->ent->id == x->ent->id
+ && (opt->ent->mask & MNT_INVERT
+ || x->ent->mask & MNT_INVERT))
+@@ -520,6 +521,8 @@ static int optlist_add_optstr(struct libmnt_optlist *ls, const char *optstr,
+ if (!opt)
+ return -ENOMEM;
+ opt->src = MNT_OPTSRC_STRING;
++ if (where)
++ where = &opt->opts;
+ }
+
+ optlist_cleanup_cache(ls);
+@@ -622,6 +625,8 @@ static int optlist_add_flags(struct libmnt_optlist *ls, unsigned long flags,
+ if (!opt)
+ return -ENOMEM;
+ opt->src = MNT_OPTSRC_FLAG;
++ if (where)
++ where = &opt->opts;
+ }
+
+ optlist_cleanup_cache(ls);
+
diff --git a/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch b/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch
new file mode 100644
index 000000000000..0b0ade4e181c
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch
@@ -0,0 +1,13 @@
+https://github.com/util-linux/util-linux/pull/2248
+https://bugs.gentoo.org/906797
+
+--- a/tests/helpers/test_enosys.c
++++ b/tests/helpers/test_enosys.c
+@@ -68,6 +68,7 @@ const struct syscall syscalls[] = {
+ { "move_mount", __NR_move_mount },
+ { "open_tree", __NR_open_tree },
+ { "fsopen", __NR_fsopen },
++ { "mount_setattr", __NR_mount_setattr },
+ };
+
+ int main(int argc, char **argv)
diff --git a/sys-apps/util-linux/util-linux-2.39-r3.ebuild b/sys-apps/util-linux/util-linux-2.39-r3.ebuild
new file mode 100644
index 000000000000..edd0dd68e804
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.39-r3.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+ pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+ inherit autotools git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
+ inherit verify-sig
+
+ if [[ ${PV} != *_rc* ]] ; then
+ 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="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+ virtual/libcrypt:=
+ audit? ( >=sys-process/audit-2.6:= )
+ caps? ( sys-libs/libcap-ng )
+ cramfs? ( sys-libs/zlib:= )
+ cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
+ hardlink? ( dev-libs/libpcre2:= )
+ ncurses? (
+ sys-libs/ncurses:=[unicode(+)?]
+ magic? ( sys-apps/file:0= )
+ )
+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+ pam? ( sys-libs/pam )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0= )
+ rtas? ( sys-libs/librtas )
+ selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+ slang? ( sys-libs/slang )
+ !build? ( systemd? ( sys-apps/systemd ) )
+ udev? ( virtual/libudev:= )"
+BDEPEND="
+ virtual/pkgconfig
+ nls? (
+ app-text/po4a
+ sys-devel/gettext
+ )
+ test? ( sys-devel/bc )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/os-headers
+ acct-group/root
+"
+RDEPEND+="
+ hardlink? ( !app-arch/hardlink )
+ logger? ( !>=app-admin/sysklogd-2.0[logger] )
+ kill? (
+ !sys-apps/coreutils[kill]
+ !sys-process/procps[kill]
+ )
+ su? (
+ !<sys-apps/shadow-4.7-r2
+ !>=sys-apps/shadow-4.7-r2[su]
+ )
+ !net-wireless/rfkill
+"
+
+if [[ ${PV} == 9999 ]] ; then
+ # Required for man-page generation
+ BDEPEND+=" dev-ruby/asciidoctor"
+else
+ BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.39-check-for-mount_setattr.patch"
+ "${FILESDIR}/${PN}-2.39-tests-for-mount_setattr.patch"
+ "${FILESDIR}/${PN}-2.39-mount-parse-options-user.patch"
+)
+
+pkg_pretend() {
+ if use su && ! use suid ; then
+ elog "su will be installed as suid despite USE=-suid (bug #832092)"
+ elog "To use su without suid, see e.g. Portage's suidctl feature."
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ return
+ fi
+
+ if use verify-sig ; then
+ mkdir "${T}"/verify-sig || die
+ pushd "${T}"/verify-sig &>/dev/null || die
+
+ # Upstream sign the decompressed .tar
+ # Let's do it separately in ${T} then cleanup to avoid external
+ # effects on normal unpack.
+ cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+ xz -d ${MY_P}.tar.xz || die
+ verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+ popd &>/dev/null || die
+ rm -r "${T}"/verify-sig || die
+ fi
+
+ default
+}
+
+src_prepare() {
+ default
+
+ if use test ; then
+ # Prevent uuidd test failure due to socket path limit, bug #593304
+ sed -i \
+ -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+ tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+ # Known-failing tests
+ # TODO: investigate these
+ local known_failing_tests=(
+ # Subtest 'options-maximum-size-8192' fails
+ hardlink/options
+
+ # Fails in sandbox
+ lsns/ioctl_ns
+
+ lsfd/mkfds-symlink
+ lsfd/mkfds-rw-character-device
+ )
+
+ local known_failing_test
+ for known_failing_test in "${known_failing_tests[@]}" ; do
+ einfo "Removing known-failing test: ${known_failing_test}"
+ rm tests/ts/${known_failing_test} || die
+ done
+
+ fi
+
+ if [[ ${PV} == 9999 ]] ; then
+ po/update-potfiles
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+python_configure() {
+ local myeconfargs=(
+ "${commonargs[@]}"
+ --disable-all-programs
+ --disable-bash-completion
+ --without-systemdsystemunitdir
+ --with-python
+ --enable-libblkid
+ --enable-libmount
+ --enable-pylibmount
+ )
+
+ mkdir "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ # The scanf test in a run-time test which fails while cross-compiling.
+ # Blindly assume a POSIX setup since we require libmount, and libmount
+ # itself fails when the scanf test fails. bug #531856
+ tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+
+ # bug #485486
+ export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
+ # bug #545042
+ export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
+
+ # Undo bad ncurses handling by upstream. Fall back to pkg-config.
+ # bug #601530
+ export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+ export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+ # Avoid automagic dependency on ppc*
+ export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
+ # configure args shared by python and non-python builds
+ local commonargs=(
+ --localstatedir="${EPREFIX}/var"
+ --runstatedir="${EPREFIX}/run"
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+ )
+
+ local myeconfargs=(
+ "${commonargs[@]}"
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ --without-python
+ $(multilib_native_use_enable suid makeinstall-chown)
+ $(multilib_native_use_enable suid makeinstall-setuid)
+ $(multilib_native_use_with readline)
+ $(multilib_native_use_with slang)
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with udev)
+ $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+ $(multilib_native_use_with audit)
+ $(tc-has-tls || echo --disable-tls)
+ $(use_enable nls)
+ $(use_enable nls poman)
+ $(use_enable unicode widechar)
+ $(use_enable static-libs static)
+ $(use_with ncurses tinfo)
+ $(use_with selinux)
+ )
+
+ if multilib_is_native_abi ; then
+ myeconfargs+=(
+ --disable-chfn-chsh
+ --disable-login
+ --disable-newgrp
+ --disable-nologin
+ --disable-pylibmount
+ --disable-raw
+ --disable-vipw
+ --enable-agetty
+ --enable-bash-completion
+ --enable-line
+ --enable-partx
+ --enable-rename
+ --enable-rfkill
+ --enable-schedutils
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable caps setpriv)
+ $(use_enable cramfs)
+ $(use_enable fdformat)
+ $(use_enable hardlink)
+ $(use_enable kill)
+ $(use_enable logger)
+ $(use_enable ncurses pg)
+ $(use_enable su)
+ $(use_enable tty-helpers mesg)
+ $(use_enable tty-helpers wall)
+ $(use_enable tty-helpers write)
+ $(use_with cryptsetup)
+ )
+ if [[ ${PV} == *9999 ]] ; then
+ myeconfargs+=( --enable-asciidoc )
+ else
+ # Upstream is shipping pre-generated man-pages for releases
+ myeconfargs+=( --disable-asciidoc )
+ fi
+ else
+ myeconfargs+=(
+ --disable-all-programs
+ --disable-asciidoc
+ --disable-bash-completion
+ --without-systemdsystemunitdir
+ --disable-poman
+
+ # build libraries
+ --enable-libuuid
+ --enable-libblkid
+ --enable-libsmartcols
+ --enable-libfdisk
+ --enable-libmount
+ )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ if multilib_is_native_abi && use python ; then
+ python_foreach_impl python_configure
+ fi
+}
+
+src_configure() {
+ append-lfs-flags
+ multilib-minimal_src_configure
+}
+
+python_compile() {
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake all
+ popd >/dev/null || die
+}
+
+multilib_src_compile() {
+ emake all
+
+ if multilib_is_native_abi && use python ; then
+ python_foreach_impl python_compile
+ fi
+}
+
+python_test() {
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+ popd >/dev/null || die
+}
+
+multilib_src_test() {
+ emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+ if multilib_is_native_abi && use python ; then
+ python_foreach_impl python_test
+ fi
+}
+
+python_install() {
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake DESTDIR="${D}" install
+ python_optimize
+ popd >/dev/null || die
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi && use python ; then
+ python_foreach_impl python_install
+ fi
+
+ # This needs to be called AFTER python_install call, bug #689190
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi ; then
+ # Need the libs in /
+ gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+ # e2fsprogs-libs didn't install .la files, and .pc work fine
+ find "${ED}" -name "*.la" -delete || die
+
+ if use pam ; then
+ # See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
+ newpamd "${FILESDIR}/runuser.pamd" runuser
+ newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+
+ newpamd "${FILESDIR}/su-l.pamd" su-l
+ fi
+
+ if use su && ! use suid ; then
+ # Always force suid su, even when USE=-suid, as su is useless
+ # for the overwhelming-majority case without suid.
+ # Users who wish to truly have a no-suid su can strip it out
+ # via e.g. Portage's suidctl or some other hook.
+ # See bug #832092
+ fperms u+s /bin/su
+ fi
+
+ # Note:
+ # Bash completion for "runuser" command is provided by same file which
+ # would also provide bash completion for "su" command. However, we don't
+ # use "su" command from this package.
+ # This triggers a known QA warning which we ignore for now to magically
+ # keep bash completion for "su" command which shadow package does not
+ # provide.
+
+ local ver=$(tools/git-version-gen .tarballversion)
+ local major=$(ver_cut 1 ${ver})
+ local minor=$(ver_cut 2 ${ver})
+ local release=$(ver_cut 3 ${ver})
+ export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
+}
+
+pkg_postinst() {
+ if ! use tty-helpers ; then
+ elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+ fi
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "The agetty util now clears the terminal by default. You"
+ elog "might want to add --noclear to your /etc/inittab lines."
+ fi
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 00:39:07 +0000