summaryrefslogtreecommitdiff
path: root/sys-apps/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/Manifest10
-rw-r--r--sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch165
-rw-r--r--sys-apps/util-linux/util-linux-2.33.2.ebuild5
-rw-r--r--sys-apps/util-linux/util-linux-2.34-r3.ebuild5
-rw-r--r--sys-apps/util-linux/util-linux-2.35.1-r2.ebuild (renamed from sys-apps/util-linux/util-linux-2.35.1-r1.ebuild)8
-rw-r--r--sys-apps/util-linux/util-linux-2.35.1.ebuild314
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild5
7 files changed, 172 insertions, 340 deletions
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index e9c6627a2543..808b69653931 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,13 +2,13 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f31680
AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
AUX util-linux-2.35.1-cleanup-pidfd-include.patch 1117 BLAKE2B a207824f36b2167f721b4420b5de47462cdc3f12187316ee0ba37bebd1561aee0c591a522cb9cf7f24986322e1954f1fab1e6fe1751dfebc116aec12f70cc81e SHA512 315b5aabad68d3363f1a06034c22347d755ead4b974fd7879ce41b29953b41be510705a4806577710bb8e9d32a8034002f6868fea287a214640c80324754ea00
+AUX util-linux-2.35.1-hwclock-glibc-2.31.patch 7779 BLAKE2B ba277632152ce2c628c959d31b76cd513fe1a52d8dfc362d357c58b6468293c5b1349cc5751323040892ce25a3a5c7e8c5fcb489e1fe823bf94667307a945cc7 SHA512 8de03a955cb9c90ebb4c08294054ce2d578bfc3d6910f1e7628832baa2fcbba4d80cc6368c4068ba8e14bdd359846923c6dd0493ab9cdd546e16136b9ea4e06e
AUX util-linux-2.35.1-include_sys_types-header.patch 1774 BLAKE2B 813067f05881846cc0a3f7a06595900aae05e53a18de8d9660c9254326f1736dab701bb16185a2906d75372503d0bf1ac275456a0b213d0545e29ad752fc16cf SHA512 e02c1d4ed4c719c35eb8413c8cdf1868f571937ecaca13e3d5db4f82b690376ae92b4f75c25538e28fbc9d4cf5a1699e34e820d0a2b3e26d3354e916e3524f73
DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
-EBUILD util-linux-2.33.2.ebuild 8551 BLAKE2B 938210cb2c11773bffdce52da59dfd8ebbec9d5113137e2ce8aa3008528f5fafb0002db21f6f3beab9e21c540afb494183c993c98a550d0fe0bec1dab9b4556b SHA512 951944abf8d426ff204f1414ba9319c0b5beccd2ecd4cbb9f87350a9729b83e08beeca964275f1b53e51ecc368826fc366c30b33db607c00e3d7398b4f5b3ca3
-EBUILD util-linux-2.34-r3.ebuild 8584 BLAKE2B 9784e46b22a8a9ea83459dabab76b0721502d8ee6e6356c63c7b638c009bec3fec70e111020a6794b71ea97de897caf0cbb98619bfe27f8ca2f2fa083318b6ec SHA512 658f1f0fc07133c3ef4e87cc39cfbb263d0ee1132393e96d4ff6b0d6fd2e74f34b67d7f886dd6b374f65a486ca5a0f12a8dc0c7da45c7ab377bc29cbac31568d
-EBUILD util-linux-2.35.1-r1.ebuild 9099 BLAKE2B 304a8fce27ac4c7f0b98f3fb6193c3fa73ce05c3858f26e8cd6e8b418a94b89e89fcb14c32d1429aedeac5bafdc9c2748c7b466417f6c04bd9b28c0917cb778a SHA512 73f9265571b0d848977304648b04bec8f7be48283b00986a6a7585bf46ca922d0e1db759febe4b08c924dbce93a126f0cd82f45c6252a6b6d694220f1c814cf9
-EBUILD util-linux-2.35.1.ebuild 8815 BLAKE2B c85da11208ba2e9f080ca3963e0980af6542a2e129dea7d97187ad22835fb91f96ea4008fb98031ef2dde38db8dba10e25df5ed9b57133c3bfa07cc138d1e1e7 SHA512 da76bcf689f7a0ed0bd24dfccc85da8057837df8ecf798b98da6c41ffb801b4a308bf75cdd07099bdf1229fb04f87a18938e4a2ae8ce805ce64ff6e9b163248d
-EBUILD util-linux-9999.ebuild 8974 BLAKE2B dea4a1e61f4f7c80bdbf278bd41e7bdb6903f7b91df9c142b24ba2ee50f86fa7ccb6fc756f2faa3bbc925cd6a4103932ba9fda3f6fd6657efb00d89e8a7ac1a4 SHA512 6c1fc66a7faeade9c99412036ccca1da7ab65b3586e7ccaacf13ccf7643c7035f2d7073eb9354b4dce36a38bc37bb1d3cddcca620dd09ab4a4c6ad0e4abc65c9
+EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
+EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
+EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
+EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch b/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch
new file mode 100644
index 000000000000..c8b5cf76a23c
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch
@@ -0,0 +1,165 @@
+From cd781c405be82540484da3bfe3d3f17a39b8eb5c Mon Sep 17 00:00:00 2001
+From: J William Piggott <elseifthen@gmx.com>
+Date: Fri, 21 Feb 2020 20:03:47 -0500
+Subject: hwclock: make glibc 2.31 compatible
+
+______________________________________________________
+GNU C Library NEWS -- history of user-visible changes.
+Version 2.31
+Deprecated and removed features, and other changes affecting compatibility:
+
+* The settimeofday function can still be used to set a system-wide time
+ zone when the operating system supports it. This is because the Linux
+ kernel reused the API, on some architectures, to describe a system-wide
+ time-zone-like offset between the software clock maintained by the kernel,
+ and the "RTC" clock that keeps time when the system is shut down.
+
+ However, to reduce the odds of this offset being set by accident,
+ settimeofday can no longer be used to set the time and the offset
+ simultaneously. If both of its two arguments are non-null, the call
+ will fail (setting errno to EINVAL).
+
+ Callers attempting to set this offset should also be prepared for the call
+ to fail and set errno to ENOSYS; this already happens on the Hurd and on
+ some Linux architectures. The Linux kernel maintainers are discussing a
+ more principled replacement for the reused API. After a replacement
+ becomes available, we will change settimeofday to fail with ENOSYS on all
+ platforms when its 'tzp' argument is not a null pointer.
+
+ settimeofday itself is obsolescent according to POSIX. Programs that set
+ the system time should use clock_settime and/or the adjtime family of
+ functions instead. We may cease to make settimeofday available to newly
+ linked binaries after there is a replacement for Linux's time-zone-like
+ offset API.
+______________________________________________________
+
+hwclock(8) had one settimeofday(2) call where both args were set for
+--hctosys when the RTC was ticking UTC. This allowed setting the system
+time, timezone, and locking the warp_clock function with a single call.
+That operation now takes 3 calls of settimeofday(2).
+
+Although this common operation now takes three calls, the overall logic
+for the set_system_clock() function was simplified.
+
+Co-Author: Karel Zak <kzak@redhat.com>
+Signed-off-by: J William Piggott <elseifthen@gmx.com>
+---
+ sys-utils/hwclock.c | 71 ++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 37 insertions(+), 34 deletions(-)
+
+diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
+index e736da717..1191a8571 100644
+--- a/sys-utils/hwclock.c
++++ b/sys-utils/hwclock.c
+@@ -643,28 +643,28 @@ display_time(struct timeval hwctime)
+ * tz.tz_minuteswest argument and sets PCIL (see below). At boot settimeofday(2)
+ * has one-shot access to this function as shown in the table below.
+ *
+- * +-------------------------------------------------------------------+
+- * | settimeofday(tv, tz) |
+- * |-------------------------------------------------------------------|
+- * | Arguments | System Time | PCIL | | warp_clock |
+- * | tv | tz | set | warped | set | firsttime | locked |
+- * |---------|---------|---------------|------|-----------|------------|
+- * | pointer | NULL | yes | no | no | 1 | no |
+- * | pointer | pointer | yes | no | no | 0 | yes |
+- * | NULL | ptr2utc | no | no | no | 0 | yes |
+- * | NULL | pointer | no | yes | yes | 0 | yes |
+- * +-------------------------------------------------------------------+
++ * +-------------------------------------------------------------------------+
++ * | settimeofday(tv, tz) |
++ * |-------------------------------------------------------------------------|
++ * | Arguments | System Time | TZ | PCIL | | warp_clock |
++ * | tv | tz | set | warped | set | set | firsttime | locked |
++ * |---------|---------|---------------|-----|------|-----------|------------|
++ * | pointer | NULL | yes | no | no | no | 1 | no |
++ * | NULL | ptr2utc | no | no | yes | no | 0 | yes |
++ * | NULL | pointer | no | yes | yes | yes | 0 | yes |
++ * +-------------------------------------------------------------------------+
+ * ptr2utc: tz.tz_minuteswest is zero (UTC).
+ * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale.
+ * firsttime: locks the warp_clock function (initialized to 1 at boot).
++ * Since glibc v2.31 settimeofday() will fail if both args are non NULL
+ *
+ * +---------------------------------------------------------------------------+
+ * | op | RTC scale | settimeofday calls |
+ * |---------|-----------|-----------------------------------------------------|
+ * | systz | Local | 1) warps system time*, sets PCIL* and kernel tz |
+ * | systz | UTC | 1st) locks warp_clock* 2nd) sets kernel tz |
+- * | hctosys | Local | 1st) sets PCIL* 2nd) sets system time and kernel tz |
+- * | hctosys | UTC | 1) sets system time and kernel tz |
++ * | hctosys | Local | 1st) sets PCIL* & kernel tz 2nd) sets system time |
++ * | hctosys | UTC | 1st) locks warp* 2nd) sets tz 3rd) sets system time |
+ * +---------------------------------------------------------------------------+
+ * * only on first call after boot
+ */
+@@ -675,42 +675,45 @@ set_system_clock(const struct hwclock_control *ctl,
+ struct tm broken;
+ int minuteswest;
+ int rc = 0;
+- const struct timezone tz_utc = { 0 };
+
+ localtime_r(&newtime.tv_sec, &broken);
+ minuteswest = -get_gmtoff(&broken) / 60;
+
+ if (ctl->verbose) {
+- if (ctl->hctosys && !ctl->universal)
+- printf(_("Calling settimeofday(NULL, %d) to set "
+- "persistent_clock_is_local.\n"), minuteswest);
+- if (ctl->systz && ctl->universal)
++ if (ctl->universal) {
+ puts(_("Calling settimeofday(NULL, 0) "
+- "to lock the warp function."));
++ "to lock the warp_clock function."));
++ if (!( ctl->universal && !minuteswest ))
++ printf(_("Calling settimeofday(NULL, %d) "
++ "to set the kernel timezone.\n"),
++ minuteswest);
++ } else
++ printf(_("Calling settimeofday(NULL, %d) to warp "
++ "System time, set PCIL and the kernel tz.\n"),
++ minuteswest);
++
+ if (ctl->hctosys)
+- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"),
+- newtime.tv_sec, newtime.tv_usec, minuteswest);
+- else {
+- printf(_("Calling settimeofday(NULL, %d) "), minuteswest);
+- if (ctl->universal)
+- puts(_("to set the kernel timezone."));
+- else
+- puts(_("to warp System time."));
+- }
++ printf(_("Calling settimeofday(%ld.%06ld, NULL) "
++ "to set the System time.\n"),
++ newtime.tv_sec, newtime.tv_usec);
+ }
+
+ if (!ctl->testing) {
++ const struct timezone tz_utc = { 0 };
+ const struct timezone tz = { minuteswest };
+
+- if (ctl->hctosys && !ctl->universal) /* set PCIL */
+- rc = settimeofday(NULL, &tz);
+- if (ctl->systz && ctl->universal) /* lock warp_clock */
++ /* If UTC RTC: lock warp_clock and PCIL */
++ if (ctl->universal)
+ rc = settimeofday(NULL, &tz_utc);
+- if (!rc && ctl->hctosys)
+- rc = settimeofday(&newtime, &tz);
+- else if (!rc)
++
++ /* Set kernel tz; if localtime RTC: warp_clock and set PCIL */
++ if (!rc && !( ctl->universal && !minuteswest ))
+ rc = settimeofday(NULL, &tz);
+
++ /* Set the System Clock */
++ if ((!rc || errno == ENOSYS) && ctl->hctosys)
++ rc = settimeofday(&newtime, NULL);
++
+ if (rc) {
+ warn(_("settimeofday() failed"));
+ return EXIT_FAILURE;
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index c1a6be18c5c6..c711fd63f4dc 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -51,11 +51,6 @@ RDEPEND+="
!sys-process/procps[kill]
)
!net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
!<app-shells/bash-completion-2.7-r1"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
index 92f5cc3aaa24..f2e5cc62adc4 100644
--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
@@ -62,11 +62,6 @@ RDEPEND+="
!>=sys-apps/shadow-4.7-r2[su]
)
!net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
!<app-shells/bash-completion-2.7-r1"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/util-linux/util-linux-2.35.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild
index c7848ba55183..293433d1724c 100644
--- a/sys-apps/util-linux/util-linux-2.35.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
[[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
@@ -68,11 +68,6 @@ RDEPEND+="
!>=sys-apps/shadow-4.7-r2[su]
)
!net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
!<app-shells/bash-completion-2.7-r1"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -83,6 +78,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/util-linux-2.35.1-include_sys_types-header.patch
"${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
+ "${FILESDIR}"/util-linux-2.35.1-hwclock-glibc-2.31.patch
)
src_prepare() {
diff --git a/sys-apps/util-linux/util-linux-2.35.1.ebuild b/sys-apps/util-linux/util-linux-2.35.1.ebuild
deleted file mode 100644
index 9153eb2da129..000000000000
--- a/sys-apps/util-linux/util-linux-2.35.1.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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
- inherit git-r3 autotools
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
- SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
- virtual/libcrypt:=
- caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib:= )
- cryptsetup? ( sys-fs/cryptsetup )
- ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
- nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- 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? ( sys-devel/gettext )
- test? ( sys-devel/bc )
-"
-DEPEND="
- ${RDEPEND}
- virtual/os-headers
-"
-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
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/util-linux-2.35.1-include_sys_types-header.patch
- "${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
-)
-
-src_prepare() {
- default
-
- # Prevent uuidd test failure due to socket path limit. #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"
-
- if ! use userland_GNU; then
- # test runner is using GNU-specific xargs call
- sed -i -e 's:xargs:gxargs:' tests/run.sh || die
- # test requires util-linux uuidgen (which we don't build)
- rm tests/ts/uuid/oids || die
- fi
-
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
-
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
- local myeconfargs=(
- "${commonargs[@]}"
- --disable-all-programs
- --disable-bash-completion
- --without-systemdsystemunitdir
- --with-python
- )
- if use userland_GNU; then
- myeconfargs+=(
- --enable-libblkid
- --enable-libmount
- --enable-pylibmount
- )
- fi
- mkdir "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
- popd >/dev/null || die
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- # 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. #531856
- tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
- # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
- export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
- export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
- # configure args shared by python and non-python builds
- local commonargs=(
- --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 unicode ncursesw)" '--without-ncursesw')
- $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
- $(tc-has-tls || echo --disable-tls)
- $(use_enable nls)
- $(use_enable unicode widechar)
- $(use_enable static-libs static)
- $(use_with ncurses tinfo)
- $(use_with selinux)
- )
- # build programs only on GNU, on *BSD we want libraries only
- if multilib_is_native_abi && use userland_GNU; then
- myeconfargs+=(
- --disable-chfn-chsh
- --disable-login
- --disable-nologin
- --disable-pylibmount
- --enable-agetty
- --enable-bash-completion
- --enable-line
- --enable-partx
- --enable-raw
- --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 su)
- $(use_enable tty-helpers mesg)
- $(use_enable tty-helpers wall)
- $(use_enable tty-helpers write)
- $(use_with cryptsetup)
- )
- else
- myeconfargs+=(
- --disable-all-programs
- --disable-bash-completion
- --without-systemdsystemunitdir
- # build libraries
- --enable-libuuid
- --enable-libblkid
- --enable-libsmartcols
- --enable-libfdisk
- )
- if use userland_GNU; then
- # those libraries don't work on *BSD
- myeconfargs+=(
- --enable-libmount
- )
- fi
- fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
- if multilib_is_native_abi && use python; then
- python_foreach_impl python_configure
- fi
-}
-
-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 (#689190)
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use userland_GNU; 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 didnt install .la files, and .pc work fine
- find "${ED}" -name "*.la" -delete || die
-
- if ! use userland_GNU; then
- # manpage collisions
- # TODO: figure out a good way to keep them
- rm "${ED}"/usr/share/man/man3/uuid* || die
- fi
-
- if use pam; then
- newpamd "${FILESDIR}/runuser.pamd" runuser
- newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
- 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.
-}
-
-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
-}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index dd30ee98905d..345734beabba 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -68,11 +68,6 @@ RDEPEND+="
!>=sys-apps/shadow-4.7-r2[su]
)
!net-wireless/rfkill
- !sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
!<app-shells/bash-completion-2.7-r1"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 07:48:13 +0000