[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: e24f00ba44a6e528c95e3d2312007c65a8879c3d Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 20 10:17:45 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 20 10:17:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24f00ba sys-apps/util-linux: Stabilize 2.39.4-r1 x86, #936182 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild index 06be196fba19..7dae5bfb1ab7 100644 --- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -22,7 +22,7 @@ else inherit verify-sig if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 20ae1c7ef17a633f07e144698dbffa35ff406c64 Author: Sam James gentoo org> AuthorDate: Wed Jul 17 05:55:31 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 17 05:55:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ae1c7e sys-apps/util-linux: Stabilize 2.39.4-r1 ppc64, #936182 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild index 33858614d2eb..5b7975b7b36a 100644 --- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: aa462b17f17f0707b808f7f9029f222dd514b245 Author: Sam James gentoo org> AuthorDate: Wed Jul 17 05:16:24 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 17 05:16:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa462b17 sys-apps/util-linux: Stabilize 2.39.4-r1 ppc, #936182 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild index 26bcdfe3d3a7..33858614d2eb 100644 --- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 94236624d34a85e23e7dea31e58718c6a1c7f36c Author: Sam James gentoo org> AuthorDate: Wed Jul 17 05:05:13 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 17 05:05:13 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94236624 sys-apps/util-linux: fix WhitespaceFound Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index 1205062fedfc..857fb9418af0 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -110,10 +110,10 @@ pkg_pretend() { } src_unpack() { -if [[ ${PV} == ]] ; then -git-r3_src_unpack -return -fi + if [[ ${PV} == ]] ; then + git-r3_src_unpack + return + fi # Upstream sign the decompressed .tar if use verify-sig; then
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: ba9e282a50f4bfe22f0e1a4dbdf50af27289628a Author: Sam James gentoo org> AuthorDate: Wed Jul 17 04:59:01 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 17 04:59:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9e282a sys-apps/util-linux: Stabilize 2.39.4-r1 amd64, #936182 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild index 3e73938a80e4..26bcdfe3d3a7 100644 --- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: fbbd4f775254fb527a18f8ad51681d428980aecd Author: Sam James gentoo org> AuthorDate: Wed Jul 17 04:43:46 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 17 04:43:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbd4f77 sys-apps/util-linux: Stabilize 2.39.4-r1 arm64, #936182 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild index e61811263ec4..3e73938a80e4 100644 --- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: ce49eb686687c88ee9a20cbe5f10f26f80999cf5 Author: Sam James gentoo org> AuthorDate: Fri Jul 5 05:48:17 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jul 5 05:48:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce49eb68 sys-apps/util-linux: restore -j1 workaround Bug: https://bugs.gentoo.org/931301 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.2.ebuild | 3 ++- sys-apps/util-linux/util-linux-.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.40.2.ebuild b/sys-apps/util-linux/util-linux-2.40.2.ebuild index bf1e8d57e929..6cdf721aeeef 100644 --- a/sys-apps/util-linux/util-linux-2.40.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.2.ebuild @@ -389,7 +389,8 @@ multilib_src_install() { fi # This needs to be called AFTER python_install call, bug #689190 - emake DESTDIR="${D}" install + # XXX: -j1 as temporary workaround for bug #931301 + emake DESTDIR="${D}" install -j1 } multilib_src_install_all() { diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index bf1e8d57e929..6cdf721aeeef 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -389,7 +389,8 @@ multilib_src_install() { fi # This needs to be called AFTER python_install call, bug #689190 - emake DESTDIR="${D}" install + # XXX: -j1 as temporary workaround for bug #931301 + emake DESTDIR="${D}" install -j1 } multilib_src_install_all() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 2e206ca65010039e7c1cd0b20361fc66dccbe2ec Author: Sam James gentoo org> AuthorDate: Fri Jul 5 00:04:26 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jul 5 05:09:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e206ca6 sys-apps/util-linux: add 2.40.2 Closes: https://bugs.gentoo.org/931328 Closes: https://bugs.gentoo.org/931301 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 ++ ...-linux-.ebuild => util-linux-2.40.2.ebuild} | 26 ++ sys-apps/util-linux/util-linux-.ebuild | 26 ++ 3 files changed, 54 insertions(+) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 92dcc309d4e0..e9d4b82a0979 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -4,3 +4,5 @@ DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0 DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0 DIST util-linux-2.40.1.tar.sign 833 BLAKE2B 2f8537cd4f52e0c203360d081a91f17c2db13c0f6054ef02f967e8fdf03099bb8c42604864003bfb911ea7804033f4020e2f56a933667fc84ac9c4b8d01e9ed5 SHA512 ab73a27fc8601041bf7b8a088586b78c49ca83cf9c8cfe5877280c0b5c607e95695512804335a8c0ac1d243e4433595f44256407fdbfb053451b8ab40d605502 DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923fdeb5a649a5c59d2d44888e5e741dfd95e589247355296e050d9ec8dc4334c5898453af055abcb30082af6b835a3e3 SHA512 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc +DIST util-linux-2.40.2.tar.sign 833 BLAKE2B 10aae23d25c1364bac0034d6862df5738c7a405d52198fba1e4e9173a1b2ba9f3d994dacb881d920c3339c0f1018c7dd1c97c7752bdf0e8e634f54235c2b3f5c SHA512 e4ace52333df0c8dd7c8ffc3b813020615c456e06a6978e06c8183ec29896be5af7c25f59e65fc2c2849750d8d7b43043775b8504d6d01f626f1adf296493ce1 +DIST util-linux-2.40.2.tar.xz 8854820 BLAKE2B 8306d651f27db6665e91a937c9f1970938fec5b069636fea3c2688afddebd1a3424f0b0802a034eab049cf7692dd435cf93e82aa5f4a40cc8064d60b4ca59535 SHA512 ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2 diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-2.40.2.ebuild similarity index 94% copy from sys-apps/util-linux/util-linux-.ebuild copy to sys-apps/util-linux/util-linux-2.40.2.ebuild index 8e74d1439e60..bf1e8d57e929 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.2.ebuild @@ -153,6 +153,32 @@ src_prepare() { lsfd/column-xmode ) + # debug prints confuse the tests which look for a diff + # in output + if has_version "=app-shells/bash-5.3_alpha*" ; then + known_failing_tests+=( + lsfd/column-ainodeclass + lsfd/mkfds-netlink-protocol + lsfd/column-type + lsfd/mkfds-eventfd + lsfd/mkfds-signalfd + lsfd/mkfds-mqueue + lsfd/mkfds-tcp6 + lsfd/mkfds-tcp + lsfd/filter-floating-point-nums + lsfd/mkfds-unix-stream-requiring-sockdiag + lsfd/mkfds-unix-dgram + lsfd/mkfds-directory + lsfd/mkfds-pty + lsfd/mkfds-pipe-no-fork + lsfd/mkfds-unix-stream + lsfd/mkfds-ro-regular-file + lsfd/mkfds-timerfd + lsfd/mkfds-udp + lsfd/mkfds-udp6 + ) + fi + local known_failing_test for known_failing_test in "${known_failing_tests[@]}" ; do einfo "Removing known-failing test: ${known_failing_test}" diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 8e74d1439e60..bf1e8d57e929 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -153,6 +153,32 @@ src_prepare() { lsfd/column-xmode ) + # debug prints confuse the tests which look for a diff + # in output + if has_version "=app-shells/bash-5.3_alpha*" ;
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: b534772e7ad5744049921be64ee39bbb7cd4ef6a Author: Sam James gentoo org> AuthorDate: Thu Jun 20 10:18:47 2024 + Commit: Sam James gentoo org> CommitDate: Thu Jun 20 10:23:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b534772e sys-apps/util-linux: optimize src_unpack further As mentioned in c8e331071da74d11d651ebd32bbf4efbd25e0f8e. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 25 + sys-apps/util-linux/util-linux-.ebuild | 15 --- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index ac289f40eb68..1205062fedfc 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -110,19 +110,20 @@ pkg_pretend() { } src_unpack() { - if [[ ${PV} == ]] ; then - git-r3_src_unpack - return - fi - - if use verify-sig ; then - # Upstream sign the decompressed .tar - verify-sig_verify_detached \ - <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ - "${DISTDIR}"/${MY_P}.tar.sign +if [[ ${PV} == ]] ; then +git-r3_src_unpack +return +fi + + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - - default } src_prepare() { diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index c9f50b8ca79a..8e74d1439e60 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -115,14 +115,15 @@ src_unpack() { return fi - if use verify-sig ; then - # Upstream sign the decompressed .tar - verify-sig_verify_detached \ - <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ - "${DISTDIR}"/${MY_P}.tar.sign + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - - default } src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: c8e331071da74d11d651ebd32bbf4efbd25e0f8e Author: Sam James gentoo org> AuthorDate: Thu Jun 20 07:25:07 2024 + Commit: Sam James gentoo org> CommitDate: Thu Jun 20 07:25:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e33107 sys-apps/util-linux: optimize src_unpack See 7e4aeaf563a8d9b6997d872e9ce513e01b7ee022 and 5cc8ea52655a502cf3f1bc818d163e5154c05b3d. Note that as mgorny points out at https://github.com/gentoo/gentoo/pull/37220#discussion_r1646906325, we still unpack twice, so we should look at that next. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 14 +++--- sys-apps/util-linux/util-linux-.ebuild | 14 +++--- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index 340527c06ae4..ac289f40eb68 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -116,18 +116,10 @@ src_unpack() { 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 + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign fi default diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 90d69b34f877..c9f50b8ca79a 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -116,18 +116,10 @@ src_unpack() { 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 + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign fi default
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: cff553aa62f8370d84805550b38de5e87017aa89 Author: Matoro Mahri matoro tk> AuthorDate: Wed Jun 5 20:27:01 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Jun 6 14:03:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff553aa sys-apps/util-linux: Stabilize 2.39.3-r7 hppa, #927999 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index b54bdcad2d03..139ddab7c622 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 9aa2b1a14f8c5d41f02b5112c31e9a2f47e928b1 Author: Sam James gentoo org> AuthorDate: Fri May 24 06:02:26 2024 + Commit: Sam James gentoo org> CommitDate: Fri May 24 06:03:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa2b1a1 sys-apps/util-linux: skip flaky rename/subdir test It passes for me on re-runs. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.4-r1.ebuild | 3 +++ sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 3 +++ sys-apps/util-linux/util-linux-.ebuild | 3 +++ 3 files changed, 9 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild index 0230482e78cd..e61811263ec4 100644 --- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -155,6 +155,9 @@ src_prepare() { # Fails with network-sandbox at least in nspawn lsfd/option-inet utmp/last-ipv6 + + # Flaky + rename/subdir ) local known_failing_test diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index a9980ed89514..340527c06ae4 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -152,6 +152,9 @@ src_prepare() { lsfd/option-inet utmp/last-ipv6 + # Flaky + rename/subdir + # Permission issues on /dev/random lsfd/mkfds-eventpoll lsfd/column-xmode diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index f3ea42edeeff..90d69b34f877 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -152,6 +152,9 @@ src_prepare() { lsfd/option-inet utmp/last-ipv6 + # Flaky + rename/subdir + # Permission issues on /dev/random lsfd/mkfds-eventpoll lsfd/column-xmode
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: 7ddfccad678873273113f79167393d738c53f4b4 Author: Mike Gilbert gentoo org> AuthorDate: Mon May 20 16:04:30 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Mon May 20 17:34:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ddfccad sys-apps/util-linux: init script tweaks Set command_args_foreground="-FP". Set command_user=uuidd. Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/files/uuidd.initd | 2 ++ .../{util-linux-2.40.1-r2.ebuild => util-linux-2.40.1-r3.ebuild}| 0 2 files changed, 2 insertions(+) diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd index b1e7e563b297..3ddedc3f3b7f 100644 --- a/sys-apps/util-linux/files/uuidd.initd +++ b/sys-apps/util-linux/files/uuidd.initd @@ -3,6 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/uuidd +command_args_foreground="-FP" +command_user=uuidd pidfile=/run/uuidd/uuidd.pid depend() { diff --git a/sys-apps/util-linux/util-linux-2.40.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild similarity index 100% rename from sys-apps/util-linux/util-linux-2.40.1-r2.ebuild rename to sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: c41f012f4b8aa5b7fc231a2da8a0dd8a5af72ec1 Author: Mike Gilbert gentoo org> AuthorDate: Mon May 20 15:03:48 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Mon May 20 15:06:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41f012f sys-apps/util-linux: uuidd fixes for OpenRC The build system only installs the tmpfiles.d file when systemd is enabled. Compensate by calling checkpath in the init script. Closes: https://bugs.gentoo.org/932276 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/files/uuidd.initd| 5 + .../{util-linux-2.40.1-r1.ebuild => util-linux-2.40.1-r2.ebuild} | 4 ++-- sys-apps/util-linux/util-linux-.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd index 329929e9a9ab..b1e7e563b297 100644 --- a/sys-apps/util-linux/files/uuidd.initd +++ b/sys-apps/util-linux/files/uuidd.initd @@ -8,3 +8,8 @@ pidfile=/run/uuidd/uuidd.pid depend() { need clock localmount } + +start_pre() { + checkpath -d -m 2755 -o uuidd:uuidd /run/uuidd && + checkpath -d -m 0755 -o uuidd:uuidd /var/lib/libuuid +} diff --git a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r2.ebuild similarity index 99% rename from sys-apps/util-linux/util-linux-2.40.1-r1.ebuild rename to sys-apps/util-linux/util-linux-2.40.1-r2.ebuild index c112b4749522..a9980ed89514 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r2.ebuild @@ -87,7 +87,7 @@ RDEPEND+=" ) uuidd? ( acct-user/uuidd - virtual/tmpfiles + systemd? ( virtual/tmpfiles ) ) !net-wireless/rfkill " @@ -426,7 +426,7 @@ pkg_postinst() { elog "might want to add --noclear to your /etc/inittab lines." fi - if use uuidd; then + if use systemd && use uuidd; then tmpfiles_process uuidd-tmpfiles.conf fi } diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 053f45a99077..f3ea42edeeff 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -87,7 +87,7 @@ RDEPEND+=" ) uuidd? ( acct-user/uuidd - virtual/tmpfiles + systemd? ( virtual/tmpfiles ) ) !net-wireless/rfkill " @@ -425,7 +425,7 @@ pkg_postinst() { elog "might want to add --noclear to your /etc/inittab lines." fi - if use uuidd; then + if use systemd && use uuidd; then tmpfiles_process uuidd-tmpfiles.conf fi }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 149508aeee8b3c41a04e5bca8d326d693590d810 Author: Sam James gentoo org> AuthorDate: Sat May 18 16:58:43 2024 + Commit: Sam James gentoo org> CommitDate: Sat May 18 17:05:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149508ae sys-apps/util-linux: drop 2.39.4 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.4.ebuild | 416 --- 1 file changed, 416 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.4.ebuild b/sys-apps/util-linux/util-linux-2.39.4.ebuild deleted file mode 100644 index 4b340e5f7039.. --- a/sys-apps/util-linux/util-linux-2.39.4.ebuild +++ /dev/null @@ -1,416 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; - -if [[ ${PV} == ]] ; 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=/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}" - -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? ( app-alternatives/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[su] - ) - !net-wireless/rfkill -" - -if [[ ${PV} == ]] ; 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.2-fincore-test.patch - "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch - "${FILESDIR}"/${PN}-2.39.3-musl-1.2.5-basename.patch - "${FILESDIR}"/${PN}-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch - "${FILESDIR}"/${PN}-2.39.3-fix-use-after-free.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} == ]] ; 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. -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 8bdea3071842b04cc1c183856c7af4ce8a118154 Author: Mike Gilbert gentoo org> AuthorDate: Sat May 11 17:18:07 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Sat May 11 17:19:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdea307 sys-apps/util-linux: wire up uuidd properly Closes: https://bugs.gentoo.org/470910 Closes: https://bugs.gentoo.org/931303 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/files/uuidd.initd | 10 ++ sys-apps/util-linux/metadata.xml| 1 + ...ux-2.40.1.ebuild => util-linux-2.40.1-r1.ebuild} | 21 +++-- sys-apps/util-linux/util-linux-.ebuild | 21 +++-- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd new file mode 100644 index ..329929e9a9ab --- /dev/null +++ b/sys-apps/util-linux/files/uuidd.initd @@ -0,0 +1,10 @@ +#!/sbin/openrc-run +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=/usr/sbin/uuidd +pidfile=/run/uuidd/uuidd.pid + +depend() { + need clock localmount +} diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml index 2d9b8b837fe2..291587be5409 100644 --- a/sys-apps/util-linux/metadata.xml +++ b/sys-apps/util-linux/metadata.xml @@ -24,6 +24,7 @@ su: non-root users may become root install the mesg/wall/write tools for talking to local users + build uuidd daemon cpe:/a:andries_brouwer:util-linux diff --git a/sys-apps/util-linux/util-linux-2.40.1.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild similarity index 95% rename from sys-apps/util-linux/util-linux-2.40.1.ebuild rename to sys-apps/util-linux/util-linux-2.40.1-r1.ebuild index fefca19af628..c112b4749522 100644 --- a/sys-apps/util-linux/util-linux-2.40.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild @@ -4,9 +4,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) +TMPFILES_OPTIONAL=1 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-r1 multilib-minimal multiprocessing systemd + pam python-r1 multilib-minimal multiprocessing systemd tmpfiles MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -33,7 +34,7 @@ S="${WORKDIR}/${MY_P}" 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" +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 uuidd" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. @@ -84,6 +85,10 @@ RDEPEND+=" !=sys-apps/shadow-4.7-r2[su] ) + uuidd? ( + acct-user/uuidd + virtual/tmpfiles + ) !net-wireless/rfkill " @@ -230,6 +235,7 @@ multilib_src_configure() { $(use_enable static-libs static) $(use_with ncurses tinfo) $(use_with selinux) + $(multilib_native_use_enable uuidd) # TODO: Wire this up (bug #931118) --without-econf @@ -303,6 +309,9 @@ multilib_src_configure() { --enable-libsmartcols --enable-libfdisk --enable-libmount + + # Support uuidd for non-native libuuid + $(use_enable uuidd libuuid-force-uuidd) ) fi @@ -388,6 +397,10 @@ multilib_src_install_all() { fperms u+s /bin/su fi + if use uuidd; then + newinitd "${FILESDIR}/uuidd.initd" uuidd + 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 @@ -412,4 +425,8 @@ pkg_postinst() { elog "The agetty util now clears the terminal by default. You" elog "might want to add --noclear to your /etc/inittab lines." fi + + if use uuidd; then + tmpfiles_process uuidd-tmpfiles.conf + fi } diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index a3c518db9e1d..053f45a99077 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -4,9 +4,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) +TMPFILES_OPTIONAL=1 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pa
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: 575b2c990c42dca1c38973906f9839c3c0efbf06 Author: Sam James gentoo org> AuthorDate: Thu May 9 23:47:48 2024 + Commit: Sam James gentoo org> CommitDate: Thu May 9 23:47:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=575b2c99 sys-apps/util-linux: backport umount --read-only fix to 2.39.x Bug: https://bugs.gentoo.org/573760 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39.4-umount-readonly.patch | 35 ++ sys-apps/util-linux/util-linux-2.39.4-r1.ebuild| 417 + 2 files changed, 452 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.4-umount-readonly.patch b/sys-apps/util-linux/files/util-linux-2.39.4-umount-readonly.patch new file mode 100644 index ..57c8903348af --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.4-umount-readonly.patch @@ -0,0 +1,35 @@ +https://github.com/util-linux/util-linux/commit/9ba8eb5d89f0ebba8b3a542c041a5838e10a0d75 +https://bugs.gentoo.org/573760#c11 + +From 9ba8eb5d89f0ebba8b3a542c041a5838e10a0d75 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 23 Apr 2024 10:29:37 +0200 +Subject: [PATCH] libmount: fix umount --read-only +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported-by: Krzysztof Olędzki +Signed-off-by: Karel Zak +(cherry picked from commit a20e7e23a8565e01b1c84de6924d1fbbdb1cfccc) +--- a/libmount/src/context_umount.c b/libmount/src/context_umount.c +@@ -267,6 +267,9 @@ static int lookup_umount_fs_by_statfs(struct libmnt_context *cxt, const char *tg +* So, let's use statfs() if possible (it's bad idea for --lazy/--force +* umounts as target is probably unreachable NFS, also for --detach-loop +* as this additionally needs to know the name of the loop device). ++ * ++ * For the "umount --read-only" command, we need to read the mountinfo ++ * to obtain the mount source. +*/ + if (mnt_context_is_restricted(cxt) + || *tgt != '/' +@@ -275,6 +278,7 @@ static int lookup_umount_fs_by_statfs(struct libmnt_context *cxt, const char *tg + || mnt_context_is_lazy(cxt) + || mnt_context_is_nocanonicalize(cxt) + || mnt_context_is_loopdel(cxt) ++ || mnt_context_is_rdonly_umount(cxt) + || mnt_safe_stat(tgt, &st) != 0 || !S_ISDIR(st.st_mode) + || has_utab_entry(cxt, tgt)) + return 1; /* not found */ + diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild new file mode 100644 index ..0230482e78cd --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild @@ -0,0 +1,417 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; + +if [[ ${PV} == ]] ; 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=/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}" + +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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 9d318bceb92283f3a3f4ae4d1d61f02512b28cef Author: Sam James gentoo org> AuthorDate: Mon May 6 17:03:24 2024 + Commit: Sam James gentoo org> CommitDate: Mon May 6 17:03:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d318bce sys-apps/util-linux: install with -j1 for now in 2.40.1 Temporary workaround but better than leaving it broken. I haven't yet managed to get it to fail on another machine where I could get a seed... Bug: https://bugs.gentoo.org/931301 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.40.1.ebuild b/sys-apps/util-linux/util-linux-2.40.1.ebuild index a3c518db9e1d..fefca19af628 100644 --- a/sys-apps/util-linux/util-linux-2.40.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1.ebuild @@ -358,7 +358,8 @@ multilib_src_install() { fi # This needs to be called AFTER python_install call, bug #689190 - emake DESTDIR="${D}" install + # XXX: -j1 as temporary workaround for bug #931301 + emake DESTDIR="${D}" install -j1 } multilib_src_install_all() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: cfa8638b0efd1c5561e07c0c7c2e48c77b8b38c1 Author: Sam James gentoo org> AuthorDate: Mon May 6 09:26:40 2024 + Commit: Sam James gentoo org> CommitDate: Mon May 6 09:27:14 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa8638b sys-apps/util-linux: add 2.40.1 Also, add TODO for lastlog2. Bug: https://bugs.gentoo.org/931297 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 4 ++-- .../{util-linux-2.40.1_rc1.ebuild => util-linux-2.40.1.ebuild}| 1 + sys-apps/util-linux/util-linux-.ebuild| 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 1d52ca273334..92dcc309d4e0 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,5 +2,5 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d00 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0 -DIST util-linux-2.40.1-rc1.tar.sign 833 BLAKE2B ba3b6d9314f23b6d9ff810c3de42c3f15ea5f5b372995bf1a9b4b3ab9946d037eda8fac3f5f61b14db7c9491e693e09738140a20477b0cc508f44a08f81cf8d5 SHA512 eaeba8f822f84a399ce0a7df2bac6a609c1802c7c33877b3cd18279869d007c32d6d267488222475846acc05ec0dc2b93b90975fd67b7df3dc17c50a46d8cf2d -DIST util-linux-2.40.1-rc1.tar.xz 8766372 BLAKE2B 7903f75c01ba18fd73ac3f65ab7233f6d3e77954c19f28236744dbd9eec6539774a130fb20aea887e9d77d960bef62281feec1fe71623fde4d8a81932b04c33c SHA512 6023ed8f98599e1145e8d74ed5bdfe6877da5e806ac05f5e5737cf3150aac4d473e38c63e3ae7ae3d81862936bff1000bcba080166b6e673d5f226dbe271d2ff +DIST util-linux-2.40.1.tar.sign 833 BLAKE2B 2f8537cd4f52e0c203360d081a91f17c2db13c0f6054ef02f967e8fdf03099bb8c42604864003bfb911ea7804033f4020e2f56a933667fc84ac9c4b8d01e9ed5 SHA512 ab73a27fc8601041bf7b8a088586b78c49ca83cf9c8cfe5877280c0b5c607e95695512804335a8c0ac1d243e4433595f44256407fdbfb053451b8ab40d605502 +DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923fdeb5a649a5c59d2d44888e5e741dfd95e589247355296e050d9ec8dc4334c5898453af055abcb30082af6b835a3e3 SHA512 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc diff --git a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild b/sys-apps/util-linux/util-linux-2.40.1.ebuild similarity index 99% rename from sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild rename to sys-apps/util-linux/util-linux-2.40.1.ebuild index 6bf89abd6a80..a3c518db9e1d 100644 --- a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1.ebuild @@ -234,6 +234,7 @@ multilib_src_configure() { # TODO: Wire this up (bug #931118) --without-econf + # TODO: Wire this up (bug #931297) # TODO: investigate build failure w/ 2.40.1_rc1 --disable-liblastlog2 --disable-pam-lastlog2 diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 6bf89abd6a80..a3c518db9e1d 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -234,6 +234,7 @@ multilib_src_configure() { # TODO: Wire this up (bug #931118) --without-econf + # TODO: Wire this up (bug #931297) # TODO: investigate build failure w/ 2.40.1_rc1 --disable-liblastlog2 --disable-pam-lastlog2
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: f1a7069b8ca99304e0673f934d37d521ccf7ffef Author: Sam James gentoo org> AuthorDate: Fri May 3 08:25:42 2024 + Commit: Sam James gentoo org> CommitDate: Fri May 3 08:25:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a7069b sys-apps/util-linux: link to upstream bug for test failure Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild | 1 + sys-apps/util-linux/util-linux-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild index 397aca96159e..6bf89abd6a80 100644 --- a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild @@ -138,6 +138,7 @@ src_prepare() { hardlink/options # Fails in sandbox + # re ioctl_ns: https://github.com/util-linux/util-linux/issues/2967 lsns/ioctl_ns lsfd/mkfds-inotify lsfd/mkfds-symlink diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 397aca96159e..6bf89abd6a80 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -138,6 +138,7 @@ src_prepare() { hardlink/options # Fails in sandbox + # re ioctl_ns: https://github.com/util-linux/util-linux/issues/2967 lsns/ioctl_ns lsfd/mkfds-inotify lsfd/mkfds-symlink
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 58ccf0a0e0748cb9c91c26b55eed59ff8366a2d3 Author: Sam James gentoo org> AuthorDate: Fri May 3 08:17:32 2024 + Commit: Sam James gentoo org> CommitDate: Fri May 3 08:17:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ccf0a0 sys-apps/util-linux: disable automagic econf for now, add bug ref for TODO Bug: https://bugs.gentoo.org/931118 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 3 +++ sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 3 +++ sys-apps/util-linux/util-linux-2.39.4.ebuild | 3 +++ sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild | 3 +++ sys-apps/util-linux/util-linux-.ebuild | 3 +++ 5 files changed, 15 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 33249fda2a28..03c9e04f677b 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -236,6 +236,9 @@ multilib_src_configure() { $(use_enable static-libs static) $(use_with ncurses tinfo) $(use_with selinux) + + # TODO: Wire this up (bug #931118) + --without-econf ) if use build ; then diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index 8b0173d9239e..b54bdcad2d03 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -241,6 +241,9 @@ multilib_src_configure() { $(use_enable static-libs static) $(use_with ncurses tinfo) $(use_with selinux) + + # TODO: Wire this up (bug #931118) + --without-econf ) if use build ; then diff --git a/sys-apps/util-linux/util-linux-2.39.4.ebuild b/sys-apps/util-linux/util-linux-2.39.4.ebuild index 4ab9b929aade..4b340e5f7039 100644 --- a/sys-apps/util-linux/util-linux-2.39.4.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.4.ebuild @@ -238,6 +238,9 @@ multilib_src_configure() { $(use_enable static-libs static) $(use_with ncurses tinfo) $(use_with selinux) + + # TODO: Wire this up (bug #931118) + --without-econf ) if use build ; then diff --git a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild index d53436745abc..397aca96159e 100644 --- a/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild @@ -230,6 +230,9 @@ multilib_src_configure() { $(use_with ncurses tinfo) $(use_with selinux) + # TODO: Wire this up (bug #931118) + --without-econf + # TODO: investigate build failure w/ 2.40.1_rc1 --disable-liblastlog2 --disable-pam-lastlog2 diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index d53436745abc..397aca96159e 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -230,6 +230,9 @@ multilib_src_configure() { $(use_with ncurses tinfo) $(use_with selinux) + # TODO: Wire this up (bug #931118) + --without-econf + # TODO: investigate build failure w/ 2.40.1_rc1 --disable-liblastlog2 --disable-pam-lastlog2
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 5a086f7ec18d19ef8903b104dcf184fd90920f04 Author: Sam James gentoo org> AuthorDate: Thu May 2 06:32:31 2024 + Commit: Sam James gentoo org> CommitDate: Thu May 2 06:35:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a086f7e sys-apps/util-linux: add 2.40.1_rc1 (unkeyworded) Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 ++ .../{util-linux-.ebuild => util-linux-2.40.1_rc1.ebuild} | 12 ++-- sys-apps/util-linux/util-linux-.ebuild | 12 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 8cb48e8e36b1..1d52ca273334 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,3 +2,5 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d00 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0 +DIST util-linux-2.40.1-rc1.tar.sign 833 BLAKE2B ba3b6d9314f23b6d9ff810c3de42c3f15ea5f5b372995bf1a9b4b3ab9946d037eda8fac3f5f61b14db7c9491e693e09738140a20477b0cc508f44a08f81cf8d5 SHA512 eaeba8f822f84a399ce0a7df2bac6a609c1802c7c33877b3cd18279869d007c32d6d267488222475846acc05ec0dc2b93b90975fd67b7df3dc17c50a46d8cf2d +DIST util-linux-2.40.1-rc1.tar.xz 8766372 BLAKE2B 7903f75c01ba18fd73ac3f65ab7233f6d3e77954c19f28236744dbd9eec6539774a130fb20aea887e9d77d960bef62281feec1fe71623fde4d8a81932b04c33c SHA512 6023ed8f98599e1145e8d74ed5bdfe6877da5e806ac05f5e5737cf3150aac4d473e38c63e3ae7ae3d81862936bff1000bcba080166b6e673d5f226dbe271d2ff diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild similarity index 97% copy from sys-apps/util-linux/util-linux-.ebuild copy to sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild index f25f71aca3a8..d53436745abc 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1_rc1.ebuild @@ -133,19 +133,22 @@ src_prepare() { if use test ; then # 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-inotify lsfd/mkfds-symlink lsfd/mkfds-rw-character-device # Fails with network-sandbox at least in nspawn lsfd/option-inet utmp/last-ipv6 + + # Permission issues on /dev/random + lsfd/mkfds-eventpoll + lsfd/column-xmode ) local known_failing_test @@ -226,6 +229,10 @@ multilib_src_configure() { $(use_enable static-libs static) $(use_with ncurses tinfo) $(use_with selinux) + + # TODO: investigate build failure w/ 2.40.1_rc1 + --disable-liblastlog2 + --disable-pam-lastlog2 ) if use build ; then @@ -257,6 +264,7 @@ multilib_src_configure() { --enable-rfkill --enable-schedutils --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d $(use_enable caps setpriv) $(use_enable cramfs) $(use_enable fdformat) diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index f25f71aca3a8..d53436745abc 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -133,19 +133,22 @@ src_prepare() { if use test ; then # Known-failing tests - # TODO: investigate these local known_fai
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 4ed011977d575a7349a37f0587e979fe38adb522 Author: Sam James gentoo org> AuthorDate: Thu May 2 05:18:45 2024 + Commit: Sam James gentoo org> CommitDate: Thu May 2 05:18:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed01197 sys-apps/util-linux: drop 2.39.3-r5, 2.39.3-r6 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r5.ebuild | 414 --- sys-apps/util-linux/util-linux-2.39.3-r6.ebuild | 415 2 files changed, 829 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild deleted file mode 100644 index 30a4c80b43a1.. --- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild +++ /dev/null @@ -1,414 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; - -if [[ ${PV} == ]] ; 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=/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}" - -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? ( app-alternatives/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[su] - ) - !net-wireless/rfkill -" - -if [[ ${PV} == ]] ; 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.2-fincore-test.patch - "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch - "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch - "${FILESDIR}"/${PN}-2.39.3-libblkid-luks.patch - "${FILESDIR}"/${PN}-2.39.3-musl-1.2.5-basename.patch - "${FILESDIR}"/${PN}-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.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} == ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 12732752e032e9b4e017d1e8b10551e187430b39 Author: Sam James gentoo org> AuthorDate: Thu May 2 05:18:30 2024 + Commit: Sam James gentoo org> CommitDate: Thu May 2 05:18:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12732752 sys-apps/util-linux: add 2.39.4 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 + sys-apps/util-linux/util-linux-2.39.4.ebuild | 413 +++ 2 files changed, 415 insertions(+) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 3e28df35ce6e..8cb48e8e36b1 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,2 +1,4 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa +DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa +DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0 diff --git a/sys-apps/util-linux/util-linux-2.39.4.ebuild b/sys-apps/util-linux/util-linux-2.39.4.ebuild new file mode 100644 index ..4ab9b929aade --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.4.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; + +if [[ ${PV} == ]] ; 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=/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}" + +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? ( app-alternatives/bc ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + acct-group/root +" +RDEPEND+=" + hardlink? ( !app-arch/hardlink ) + logger? ( !>=app-admin/sysklogd-2.0[logger] ) + kill? ( + !sys-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: ad3ff153a36b897eb8928b0ae42ba948ff0313e3 Author: Matoro Mahri matoro tk> AuthorDate: Fri Apr 19 21:07:52 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Tue Apr 23 05:19:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3ff153 sys-apps/util-linux: Stabilize 2.39.3-r7 x86, #927999 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Viorel Munteanu gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index c8676b638700..8b0173d9239e 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 0a7f495912ec14f41a1b5efe964d5dbd4e3806fc Author: Matoro Mahri matoro tk> AuthorDate: Fri Apr 19 01:35:00 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Apr 19 06:37:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a7f4959 sys-apps/util-linux: Stabilize 2.39.3-r7 arm64, #927999 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index c6e0137960ef..b1abc08155d0 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 06528950678f0c2271fdade0d8b6ce5d8a044c8e Author: Matoro Mahri matoro tk> AuthorDate: Fri Apr 19 06:21:33 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Apr 19 06:37:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06528950 sys-apps/util-linux: Stabilize 2.39.3-r7 arm, #927999 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index d5ac1256cc63..c8676b638700 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 6ffc8b05a1b9db1f238a6516c9d46bc208ab5d3f Author: Matoro Mahri matoro tk> AuthorDate: Thu Apr 18 18:39:25 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Apr 19 06:37:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffc8b05 sys-apps/util-linux: Stabilize 2.39.3-r7 sparc, #927999 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index 3ce3abaad9bf..c6e0137960ef 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 4c5206f843bb57377e8c48f67714430a6dd1c5d9 Author: Matoro Mahri matoro tk> AuthorDate: Fri Apr 19 06:09:30 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Apr 19 06:37:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5206f8 sys-apps/util-linux: Stabilize 2.39.3-r7 ppc, #927999 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index b1abc08155d0..d5ac1256cc63 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: f94783afde44a2033b13a3cf53410de192cf6d00 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Apr 4 06:50:29 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Apr 4 06:50:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94783af sys-apps/util-linux: Stabilize 2.39.3-r7 amd64, #927999 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index 7892f3ad5d47..7c356d1c1f6e 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 8f8e1c05fd9115bdedd0c452adf69a13bc8c4a7c Author: Arthur Zamarin gentoo org> AuthorDate: Thu Apr 4 06:50:32 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Apr 4 06:50:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8e1c05 sys-apps/util-linux: Stabilize 2.39.3-r7 ppc64, #927999 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild index 7c356d1c1f6e..3ce3abaad9bf 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
commit: 5036479d424f6dd8c6cb2502da3d65c90129c2b8 Author: Sam James gentoo org> AuthorDate: Thu Apr 4 01:09:39 2024 + Commit: Sam James gentoo org> CommitDate: Thu Apr 4 01:09:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5036479d sys-apps/util-linux: add refs to patch Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch index dac2edaf4791..6ebbd0a430f7 100644 --- a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch +++ b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch @@ -1,3 +1,6 @@ +https://bugs.gentoo.org/928396 +https://github.com/util-linux/util-linux/commit/4b2e6f5071a4c5beebbd9668d24dc05defc096d7 + From 4b2e6f5071a4c5beebbd9668d24dc05defc096d7 Mon Sep 17 00:00:00 2001 From: Tanish Yadav Date: Tue, 5 Mar 2024 00:51:41 +0530
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 172b16c18b35c538e32c120969c7c751bfcd24ad Author: Christopher Fore posteo net> AuthorDate: Mon Apr 1 22:22:47 2024 + Commit: Sam James gentoo org> CommitDate: Thu Apr 4 01:08:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=172b16c1 sys-apps/util-linux: fix use-after-free in su This fixes a use-after-free introduced by the musl 1.2.5 patch. Upstream fix: https://github.com/util-linux/util-linux/commit/4b2e6f5071a4c5beebbd9668d24dc05defc096d7 Closes: https://bugs.gentoo.org/928396 Signed-off-by: Christopher Fore posteo.net> Closes: https://github.com/gentoo/gentoo/pull/36050 Signed-off-by: Sam James gentoo.org> .../util-linux-2.39.3-fix-use-after-free.patch | 49 +++ sys-apps/util-linux/util-linux-2.39.3-r7.ebuild| 416 + 2 files changed, 465 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch new file mode 100644 index ..dac2edaf4791 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch @@ -0,0 +1,49 @@ +From 4b2e6f5071a4c5beebbd9668d24dc05defc096d7 Mon Sep 17 00:00:00 2001 +From: Tanish Yadav +Date: Tue, 5 Mar 2024 00:51:41 +0530 +Subject: [PATCH] su: fix use after free in run_shell + +Do not free tmp for non login branch as basename may return a pointer to +some part of it. + +[k...@redhat.com: - improve coding style of the function] + +Signed-off-by: Tanish Yadav +Signed-off-by: Karel Zak +--- + login-utils/su-common.c | 9 - + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/login-utils/su-common.c b/login-utils/su-common.c +index 242b6ce4ea..9bc0231961 100644 +--- a/login-utils/su-common.c b/login-utils/su-common.c +@@ -835,13 +835,14 @@ static void run_shell( + size_t n_args = 1 + su->fast_startup + 2 * ! !command + n_additional_args + 1; + const char **args = xcalloc(n_args, sizeof *args); + size_t argno = 1; ++ char *tmp; + + DBG(MISC, ul_debug("starting shell [shell=%s, command=\"%s\"%s%s]", + shell, command, + su->simulate_login ? " login" : "", + su->fast_startup ? " fast-start" : "")); ++ tmp = xstrdup(shell); + +- char* tmp = xstrdup(shell); + if (su->simulate_login) { + char *arg0; + char *shell_basename; +@@ -851,10 +852,8 @@ static void run_shell( + arg0[0] = '-'; + strcpy(arg0 + 1, shell_basename); + args[0] = arg0; +- } else { +-args[0] = basename(tmp); +- } +- free(tmp); ++ } else ++ args[0] = basename(tmp); + + if (su->fast_startup) + args[argno++] = "-f"; diff --git a/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild new file mode 100644 index ..7892f3ad5d47 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.3-r7.ebuild @@ -0,0 +1,416 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; + +if [[ ${PV} == ]] ; 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=/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}" + +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/ncurse
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 0bb2e4ceb978badc15545481d2c85a86720c31dd Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 29 13:37:09 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 29 13:37:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb2e4ce sys-apps/util-linux: Stabilize 2.39.3-r5 ppc, #927999 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild index 02a953d7537d..30a4c80b43a1 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 496d20394bced858a7c3ee518a4ad6581cd2bb86 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 29 09:18:08 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 29 09:18:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496d2039 sys-apps/util-linux: Stabilize 2.39.3-r5 ppc64, #927999 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild index 6f8979f37ece..02a953d7537d 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild @@ -22,7 +22,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: 5af27a0a2b08e0035abb6a7e080aaa27cf80ce63 Author: Sam James gentoo org> AuthorDate: Thu Mar 28 16:42:03 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 28 16:42:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af27a0a sys-apps/util-linux: backport fix for CVE-2024-28085 Bug: https://bugs.gentoo.org/927980 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39.3-CVE-2024-28085.patch | 25 ++ sys-apps/util-linux/util-linux-2.39.3-r6.ebuild| 415 + 2 files changed, 440 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch b/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch new file mode 100644 index ..99092c05aa7e --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/927980 +https://people.rit.edu/sjf5462/6831711781/wall_2_27_2024.txt +https://github.com/util-linux/util-linux/commit/404b0781f52f7c045ca811b2dceec526408ac253 + +From 404b0781f52f7c045ca811b2dceec526408ac253 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 21 Mar 2024 11:16:20 +0100 +Subject: [PATCH] wall: fix escape sequence Injection [CVE-2024-28085] + +Let's use for all cases the same output function. + +Reported-by: Skyler Ferrante +Signed-off-by: Karel Zak +--- a/term-utils/wall.c b/term-utils/wall.c +@@ -368,7 +368,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, + int i; + + for (i = 0; i < mvecsz; i++) { +- fputs(mvec[i], fs); ++ fputs_careful(mvec[i], fs, '^', true, TERM_WIDTH); + if (i < mvecsz - 1) + fputc(' ', fs); + } + diff --git a/sys-apps/util-linux/util-linux-2.39.3-r6.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r6.ebuild new file mode 100644 index ..256c7ca3c751 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.3-r6.ebuild @@ -0,0 +1,415 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; + +if [[ ${PV} == ]] ; 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=/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}" + +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? ( app-alternatives/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[su] + ) +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 9b14258aec6fde6f24f30c5f722983362ce7f2f1 Author: Sam James gentoo org> AuthorDate: Thu Mar 28 04:53:57 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 28 04:54:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b14258a sys-apps/util-linux: drop 2.38.1-r3, 2.39.2-r1 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 4 - .../util-linux-2.38.1-check-for-sys-pidfd.h.patch | 52 --- .../util-linux-2.38.1-more-posix-exit-on-eof.patch | 32 -- sys-apps/util-linux/util-linux-2.38.1-r3.ebuild| 395 sys-apps/util-linux/util-linux-2.39.2-r1.ebuild| 413 - 5 files changed, 896 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index a00b2a507023..3e28df35ce6e 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,6 +1,2 @@ -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.2.tar.sign 833 BLAKE2B 7d804e1e1f162c176cd7f826f505590ed5fcefc76ecbaa27b1b96fac6160cf46b696fe1c6a761094a91c05878b2169a1227039a7f82ee3d135e283e7907179a2 SHA512 e6acc5a20251aa7c69f3853271959f80428f1825dda1d1a046663e345af8fb17e5d65ebd78aef3dba21e843de58e4dd1a1639415fa9a22b91080cc6436e9a45a -DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3 DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa diff --git a/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch b/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch deleted file mode 100644 index 0a1975fff685.. --- a/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://github.com/util-linux/util-linux/pull/1769 -https://bugs.gentoo.org/893966 - -From 84732a8849a08d42a9a95dcbee9005116be78eb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 7 Aug 2022 14:39:19 -0700 -Subject: [PATCH] check for sys/pidfd.h - -This header in newer glibc defines the signatures of functions -pidfd_send_signal() and pidfd_open() and when these functions are -defined by libc then we need to include the relevant header to get -the definitions. Clang 15+ has started to error out when function -signatures are missing. - -Fixes errors like -misc-utils/kill.c:402:6: error: call to undeclared function 'pidfd_send_signal'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] -if (pidfd_send_signal(pfd, ctl->numsig, &info, 0) < 0) - -Signed-off-by: Khem Raj - configure.ac | 1 + - include/pidfd-utils.h | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 51deeecd4e..daa8f0dca4 100644 a/configure.ac -+++ b/configure.ac -@@ -342,6 +342,7 @@ AC_CHECK_HEADERS([ \ - sys/mkdev.h \ - sys/mount.h \ - sys/param.h \ -+ sys/pidfd.h \ - sys/prctl.h \ - sys/resource.h \ - sys/sendfile.h \ -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index eddede9767..d9e33cbc57 100644 a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -4,8 +4,10 @@ - #ifdef HAVE_SYS_SYSCALL_H - # include - # if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) -+# ifdef HAVE_SYS_PIDFD_H -+# include -+# endif - # include -- - # ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) diff --git a/sys-apps/util-linux/fil
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: fc223a92ac54adfc57a7cf970122c0ce27799f94 Author: Sam James gentoo org> AuthorDate: Thu Mar 28 04:55:09 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 28 04:55:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc223a92 sys-apps/util-linux: fix VariableOrderWrong Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r5.ebuild | 6 +++--- sys-apps/util-linux/util-linux-.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild index 00a684831353..6f8979f37ece 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild @@ -11,6 +11,9 @@ inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; + if [[ ${PV} == ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"; inherit autotools git-r3 @@ -28,9 +31,6 @@ 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" diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 4732e2661ee8..f25f71aca3a8 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -11,6 +11,9 @@ inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"; + if [[ ${PV} == ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"; inherit autotools git-r3 @@ -28,9 +31,6 @@ 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"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 524b5f279e77c8147305b3955c141ffe918e07af Author: Sam James gentoo org> AuthorDate: Thu Mar 28 04:53:37 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 28 04:53:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524b5f27 sys-apps/util-linux: drop 2.39.3-r3, 2.39.3-r4 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r3.ebuild | 411 --- sys-apps/util-linux/util-linux-2.39.3-r4.ebuild | 413 2 files changed, 824 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild deleted file mode 100644 index 2e67860394fd.. --- a/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild +++ /dev/null @@ -1,411 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == ]] ; 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=/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? ( app-alternatives/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[su] - ) - !net-wireless/rfkill -" - -if [[ ${PV} == ]] ; 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.2-fincore-test.patch - "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch - "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.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} == ]] ; 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 -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 2e3e930a9998454e41339f69b67f43f9a99fbaa8 Author: Sam James gentoo org> AuthorDate: Thu Mar 28 03:07:02 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 28 03:07:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3e930a sys-apps/util-linux: Stabilize 2.39.3-r5 amd64, #927999 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild index fd64ce2da061..00a684831353 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 7a7c95f731da87dc8e09f6ea8e97e038fa7d46ac Author: Sam James gentoo org> AuthorDate: Thu Mar 28 03:07:01 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 28 03:07:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7c95f7 sys-apps/util-linux: Stabilize 2.39.3-r5 arm64, #927999 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild index 110e710683a5..fd64ce2da061 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 8b47f3e31e88331b75c8108ea827b78118b0fe70 Author: Matt Turner gentoo org> AuthorDate: Fri Mar 22 00:10:11 2024 + Commit: Matt Turner gentoo org> CommitDate: Fri Mar 22 00:12:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b47f3e3 sys-apps/util-linux: Fix export of mnt_context_is_lazy Closes: https://bugs.gentoo.org/927258 Signed-off-by: Matt Turner gentoo.org> ...x-export-of-mnt_context_is_lazy-and-mnt_c.patch | 55 +++ sys-apps/util-linux/util-linux-2.39.3-r5.ebuild| 414 + 2 files changed, 469 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch b/sys-apps/util-linux/files/util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch new file mode 100644 index ..710ca934115f --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch @@ -0,0 +1,55 @@ +https://bugs.gentoo.org/927258 +https://github.com/util-linux/util-linux/pull/2845 + +From d271589d9536181184fcd19194f879e7c776d43e Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Mon, 18 Mar 2024 21:29:13 -0400 +Subject: [PATCH] libmount: Fix export of mnt_context_is_lazy and + mnt_context_is_onlyonce + +[k...@redhat.com: - fix also function docs] + +Bug: https://bugs.gentoo.org/927258 +Closes: https://github.com/util-linux/util-linux/issues/2844 +Fixes: 3d1c41c8c ("libmount: add --onlyonce") +Signed-off-by: Matt Turner +Signed-off-by: Karel Zak +(cherry picked from commit 6d2917f2eb910fb8bcdc6476be18c34fee152911) +--- + libmount/src/context.c| 4 ++-- + libmount/src/libmount.sym | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libmount/src/context.c b/libmount/src/context.c +index 0cd320190..20f4c64ae 100644 +--- a/libmount/src/context.c b/libmount/src/context.c +@@ -549,10 +549,10 @@ int mnt_context_enable_onlyonce(struct libmnt_context *cxt, int enable) + } + + /** +- * mnt_context_is_lazy: ++ * mnt_context_is_onlyonce: + * @cxt: mount context + * +- * Returns: 1 if lazy umount is enabled or 0 ++ * Returns: 1 if only-once mount is enabled or 0 + */ + int mnt_context_is_onlyonce(struct libmnt_context *cxt) + { +diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym +index 715bb5c5f..1fa8bce3c 100644 +--- a/libmount/src/libmount.sym b/libmount/src/libmount.sym +@@ -370,7 +370,7 @@ MOUNT_2_38 { + MOUNT_2_39 { + mnt_cache_set_sbprobe; + mnt_context_enable_onlyonce; +- mnt_context_is_lazy; ++ mnt_context_is_onlyonce; + mnt_context_enable_noautofs; + mnt_table_enable_noautofs; + mnt_table_is_noautofs; +-- +2.43.2 + diff --git a/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild new file mode 100644 index ..110e710683a5 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.3-r5.ebuild @@ -0,0 +1,414 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == ]] ; 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=/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/l
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: 5f364406d48c2e886059080044c3259a14d4bb5a Author: Sam James gentoo org> AuthorDate: Mon Mar 18 13:34:04 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 18 13:42:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f364406 sys-apps/util-linux: backport fix for LVM2 metadata parsing, basename w/ musl-1.2.5 Closes: https://bugs.gentoo.org/926293 Closes: https://bugs.gentoo.org/926950 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39.3-libblkid-luks.patch| 40 ++ .../util-linux-2.39.3-musl-1.2.5-basename.patch| 56 +++ sys-apps/util-linux/util-linux-2.39.3-r4.ebuild| 413 + 3 files changed, 509 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch b/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch new file mode 100644 index ..43426d5e --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/926950 +https://gitlab.com/lvmteam/lvm2/-/issues/11 +https://bugzilla.opensuse.org/show_bug.cgi?id=1213227 +https://github.com/util-linux/util-linux/pull/2373 +https://github.com/util-linux/util-linux/commit/93ba7961779789217a1f814ce3110ff8c040c8c3 + +From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 12 Jul 2023 15:48:27 +0200 +Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing" + +mdadm superblocks before 1.1 are placed at the end of the device, which +means that the data contained inside the array starts at offset 0. For +LUKS inside MD, blkid falsely detects this as plain LUKS instead of a +linux_raid_member. This causes e.g. dracut to not assemble the array +during boot and system startup fails. + +This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa. +--- a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c +@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage); + */ + static const struct blkid_idinfo *idinfos[] = + { +- /* In case the volume is locked with OPAL we are going to get +- * an I/O error when reading past the LUKS header, so try it +- * first. */ +- &luks_idinfo, +- + /* RAIDs */ + &linuxraid_idinfo, + &ddfraid_idinfo, +@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] = + &snapcow_idinfo, + &verity_hash_idinfo, + &integrity_idinfo, ++ &luks_idinfo, + &vmfs_volume_idinfo, + &ubi_idinfo, + &vdo_idinfo, diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-musl-1.2.5-basename.patch b/sys-apps/util-linux/files/util-linux-2.39.3-musl-1.2.5-basename.patch new file mode 100644 index ..519545e17088 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.3-musl-1.2.5-basename.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/926293 +https://github.com/util-linux/util-linux/commit/77454e58d58f904cfdc02d3ca5bb65f1bd8739fc + +From 77454e58d58f904cfdc02d3ca5bb65f1bd8739fc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 3 Dec 2023 19:59:46 -0800 +Subject: [PATCH] login-utils: include libgen.h 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 + +include libgen.h for using the posix declaration of the funciton. + +Fixes + +../util-linux-2.39.2/login-utils/su-common.c:847:20: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + 847 | shell_basename = basename(shell); + | ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Signed-off-by: Khem Raj +--- a/login-utils/su-common.c b/login-utils/su-common.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_SECURITY_PAM_MISC_H + # include +@@ -840,17 +841,20 @@ static void run_shell( + su->simulate_login ? " login" : "", + su->fast_startup ? " fast-start" : "")); + ++ char* tmp = xstrdup(shell); + if (su->simulate_login) { + char *arg0; + char *shell_basename; + +- shell_basename = basename(shell); ++ shell_basename = basename(tmp); + arg0 = xmalloc(strlen(shell_basename) + 2); + arg0[0] = '-'; + strcpy(arg0 + 1, shell_basename); + args[0] = arg0; +- } else +- args[0] = basename(shell); ++ } else { ++args[0] = basename(tmp); ++ } ++ free(tmp); + + if (su->fast_startup) + args[argno++] = "-f"; + diff --git a/sys-apps/util-linux/util-linux-2.39.3-r4.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r4.ebuil
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: f25671c421eb6692d31777a1679d3e44c20be46a Author: Michał Górny gentoo org> AuthorDate: Sat Mar 9 14:52:09 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Mar 9 15:11:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25671c4 sys-apps/util-linux: Enable py3.12 Signed-off-by: Michał Górny gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r3.ebuild | 2 +- sys-apps/util-linux/util-linux-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild index 3458a795464b..2e67860394fd 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ pam python-r1 multilib-minimal multiprocessing systemd diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 19f6a4af62d1..4732e2661ee8 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ pam python-r1 multilib-minimal multiprocessing systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: daee7b2891e51fc218016d7363b654276c15d86e Author: Ulrich Müller gentoo org> AuthorDate: Tue Mar 5 12:17:16 2024 + Commit: Ulrich Müller gentoo org> CommitDate: Tue Mar 5 15:40:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daee7b28 sys-apps/util-linux: Allow hexdump to be invoked as hd hexdump(1) automatically uses -C when called as "hd". Closes: https://bugs.gentoo.org/926091 Signed-off-by: Ulrich Müller gentoo.org> .../{util-linux-.ebuild => util-linux-2.39.3-r3.ebuild} | 13 + sys-apps/util-linux/util-linux-.ebuild | 3 +++ 2 files changed, 16 insertions(+) diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild similarity index 96% copy from sys-apps/util-linux/util-linux-.ebuild copy to sys-apps/util-linux/util-linux-2.39.3-r3.ebuild index f0f5f21353c8..3458a795464b 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild @@ -97,6 +97,12 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch + "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch + "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch +) + pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)" @@ -205,6 +211,10 @@ multilib_src_configure() { --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + + # Temporary workaround until ~2.39.2. 2.39.x introduced a big rewrite. + # https://github.com/util-linux/util-linux/issues/2287#issuecomment-1576640373 + --disable-libmount-mountfd-support ) local myeconfargs=( @@ -351,6 +361,9 @@ multilib_src_install() { multilib_src_install_all() { dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + dosym hexdump /usr/bin/hd + newman - hd.1 <<< '.so man1/hexdump.1' + # e2fsprogs-libs didn't install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index f0f5f21353c8..19f6a4af62d1 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -351,6 +351,9 @@ multilib_src_install() { multilib_src_install_all() { dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + dosym hexdump /usr/bin/hd + newman - hd.1 <<< '.so man1/hexdump.1' + # e2fsprogs-libs didn't install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 3093cca8d770cb1c7bb0c1551d472ba9bb1f9ae5 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:25 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3093cca8 sys-apps/util-linux: Stabilize 2.39.3-r2 sparc, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 8722e838a0cc..3f95c13ef08c 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 89d7a89b7031bd1def361b0c2366eedc6471aed1 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:28 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d7a89b sys-apps/util-linux: Stabilize 2.39.3-r2 hppa, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 3f95c13ef08c..33249fda2a28 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 6c2f012a602431b5fe437a0b8e29bbaa4f806088 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:22 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c2f012a sys-apps/util-linux: Stabilize 2.39.3-r2 ppc64, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index fd3beb022bf3..8722e838a0cc 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: c8285011e2ca2da0b8a1d7ea922bdf2b0347ebc6 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:16 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8285011 sys-apps/util-linux: Stabilize 2.39.3-r2 amd64, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index c177415e2966..89f556f4cf4d 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: c3e2be2dce93ab476aeda8e9fed1edf23a19bd52 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:19 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e2be2d sys-apps/util-linux: Stabilize 2.39.3-r2 ppc, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 89f556f4cf4d..fd3beb022bf3 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: dc8115add7f634e9f017920a22db58be1aa1d219 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:10 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8115ad sys-apps/util-linux: Stabilize 2.39.3-r2 arm64, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 7a058e6d0fb8..f45db474120d 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 34f64b275cb090eb7a2cd44bb575bf333121a437 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:07 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f64b27 sys-apps/util-linux: Stabilize 2.39.3-r2 arm, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index bea51fe15f33..7a058e6d0fb8 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 6fd0f81bc7c6eba4971c672a7f2ddee85802c055 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 2 12:13:13 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 2 12:13:13 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd0f81b sys-apps/util-linux: Stabilize 2.39.3-r2 x86, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index f45db474120d..c177415e2966 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 077a7b0c85c80d1ca837e4838cb7f7aa9dd8adf1 Author: Eli Schwartz gmail com> AuthorDate: Tue Feb 6 05:12:28 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 22:49:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077a7b0c sys-apps/util-linux: sync live Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-.ebuild | 20 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index ad0a0bbd4117..f0f5f21353c8 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -55,8 +55,10 @@ RDEPEND=" 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:= ) + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + ) " BDEPEND=" virtual/pkgconfig @@ -213,8 +215,6 @@ multilib_src_configure() { $(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') @@ -228,6 +228,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: e9a7d7be53452e2c0d85579eed3454cedfe28316 Author: Eli Schwartz gmail com> AuthorDate: Tue Feb 6 05:03:51 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 22:49:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a7d7be sys-apps/util-linux: remove usr-ldscript support Per news item 2024-01-05-usr-initramfs, we no longer support this use case. It is fragile and hacky and leads to bizarre forms of load errors. The functionality is, despite being called "split-usr", not really about split-usr at all. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> .../{util-linux-2.39.3-r1.ebuild => util-linux-2.39.3-r2.ebuild} | 7 +-- sys-apps/util-linux/util-linux-.ebuild | 7 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild similarity index 98% rename from sys-apps/util-linux/util-linux-2.39.3-r1.ebuild rename to sys-apps/util-linux/util-linux-2.39.3-r2.ebuild index 6d2aa61d4365..bea51fe15f33 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ pam python-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" @@ -356,11 +356,6 @@ multilib_src_install() { # 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() { diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index d7b81f31df52..ad0a0bbd4117 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ pam python-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" @@ -334,11 +334,6 @@ multilib_src_install() { # 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() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: a64ba8b93d012270a92208b1871934feb1d5d45a Author: Sam James gentoo org> AuthorDate: Mon Jan 8 09:39:38 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 09:42:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64ba8b9 sys-apps/util-linux: sys-devel/bc -> app-alternatives/bc All of these will be using app-alternatives/bc anyway as they're not calling bc-reference, so make the dep reflect reality. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r3.ebuild | 4 ++-- sys-apps/util-linux/util-linux-2.39.2-r1.ebuild | 4 ++-- sys-apps/util-linux/util-linux-2.39.3-r1.ebuild | 4 ++-- sys-apps/util-linux/util-linux-.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild index dd3d6ec43259..68439d236b90 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -62,7 +62,7 @@ RDEPEND=" BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index b5fc889bbfc3..facafaf1a697 100644 --- a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -66,7 +66,7 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild index 6ba55f0e06ad..6d2aa61d4365 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -66,7 +66,7 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 64c79cdbe908..d7b81f31df52 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -64,7 +64,7 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
commit: 83e6d06addde9b8beac5ab796e7429e7ab5c742c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Dec 29 14:19:27 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Dec 31 02:36:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e6d06a sys-apps/util-linux: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34540 Signed-off-by: Conrad Kostecki gentoo.org> .../files/util-linux-2.39.1-mount-no-statx.patch | 34 -- .../files/util-linux-2.39.1-wall-no-tty.patch | 26 - 2 files changed, 60 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch b/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch deleted file mode 100644 index 02e8ef20c416.. --- a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/util-linux/util-linux/issues/2409 -https://github.com/util-linux/util-linux/commit/91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea - -From 91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Thu, 3 Aug 2023 07:13:28 +0200 -Subject: [PATCH] libmount: (utils) fix statx fallback -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the systemcall is not available ENOSYS is returned. - -Under glibc the statx implementation also has its own fallback logic. -As AT_STATX_DONT_SYNC can't be implemented correctly in that fallback -logic the wrapper will return EINVAL in case the emulation is needed and -AT_STATX_DONT_SYNC is set. -So also use our own fallback in that case. - -Fixes: #2409 -Signed-off-by: Thomas Weißschuh a/libmount/src/utils.c -+++ b/libmount/src/utils.c -@@ -133,7 +133,8 @@ static int safe_stat(const char *target, struct stat *st, int nofollow) - st->st_mode = stx.stx_mode; - } - -- if (rc == 0 || errno != EOPNOTSUPP) -+ if (rc == 0 || -+ (errno != EOPNOTSUPP && errno != ENOSYS && errno != EINVAL)) - return rc; - } - #endif - diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch b/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch deleted file mode 100644 index e95dbc358d33.. --- a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/911336 -https://github.com/util-linux/util-linux/pull/2412 - -From 7d3713a6d541be0bac0bb78cc8fea1620583fd08 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 29 Jul 2023 17:32:57 -0400 -Subject: [PATCH] wall: do not error for ttys that do not exist - -Some wayland display managers (GDM) put strings like "seat0" in the -ut_line field of utmp entries. These are not valid tty devices. - -Avoid writing a confusing error message for ttys that do not exist. - -Bug: https://bugs.gentoo.org/911336 -Signed-off-by: Mike Gilbert a/term-utils/ttymsg.c -+++ b/term-utils/ttymsg.c -@@ -100,7 +100,7 @@ ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) { -* if not running as root; not an error. -*/ - if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) { -- if (errno == EBUSY || errno == EACCES) -+ if (errno == EBUSY || errno == EACCES || errno == ENOENT) - return NULL; - - len = snprintf(errbuf, sizeof(errbuf), "%s: %m", device);
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 0f36f14aa0e81089016f33353e9ac97f2fb04bf6 Author: Sam James gentoo org> AuthorDate: Fri Dec 29 01:12:26 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 29 01:12:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f36f14a sys-apps/util-linux: skip utmp/last-ipv6 too May sometimes think it has network access when it doesn't. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.2-r1.ebuild | 1 + sys-apps/util-linux/util-linux-2.39.3-r1.ebuild | 1 + sys-apps/util-linux/util-linux-.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index 28556848e5cd..b5fc889bbfc3 100644 --- a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -151,6 +151,7 @@ src_prepare() { lsfd/mkfds-rw-character-device # Fails with network-sandbox at least in nspawn lsfd/option-inet + utmp/last-ipv6 ) local known_failing_test diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild index 85b01bb6d900..6ba55f0e06ad 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild @@ -151,6 +151,7 @@ src_prepare() { lsfd/mkfds-rw-character-device # Fails with network-sandbox at least in nspawn lsfd/option-inet + utmp/last-ipv6 ) local known_failing_test diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 3ae57148c8b8..64c79cdbe908 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -143,6 +143,7 @@ src_prepare() { lsfd/mkfds-rw-character-device # Fails with network-sandbox at least in nspawn lsfd/option-inet + utmp/last-ipv6 ) local known_failing_test
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 1dd336f0030bb204295cf084ec8a867d629bb45d Author: Arthur Zamarin gentoo org> AuthorDate: Thu Dec 21 20:15:24 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Dec 21 20:15:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd336f0 sys-apps/util-linux: Stabilize 2.39.2-r1 ppc, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index f1a98bd3395c..dfe02624672b 100644 --- a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: a0ff82d513b952a0cd7764ffe8958806499c981d Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Dec 5 10:52:56 2023 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Dec 5 10:54:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ff82d5 sys-apps/util-linux: Cut dependency loop in stage1 build Signed-off-by: Andreas K. Hüttel gentoo.org> ...-2.38.1-r2.ebuild => util-linux-2.38.1-r3.ebuild} | 20 ...nux-2.39.2.ebuild => util-linux-2.39.2-r1.ebuild} | 20 ...nux-2.39.3.ebuild => util-linux-2.39.3-r1.ebuild} | 20 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.38.1-r2.ebuild rename to sys-apps/util-linux/util-linux-2.38.1-r3.ebuild index 48a7610afb48..dd3d6ec43259 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild @@ -55,8 +55,10 @@ RDEPEND=" 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:= )" + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + )" BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) @@ -207,8 +209,6 @@ multilib_src_configure() { $(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') @@ -221,6 +221,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.39.2.ebuild rename to sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index 1996b460e1b3..f1a98bd3395c 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -55,8 +55,10 @@ RDEPEND=" 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:= ) + !build? ( + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + ) " BDEPEND=" virtual/pkgconfig @@ -220,8 +222,6 @@ multilib_src_configure() { $(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') @@ -235,6 +235,18 @@ multilib_src_configure() { $(use_with selinux) ) + if use build ; then + myeconfargs+=( + --without-systemd + --without-udev + ) + else + myeconfargs+=( + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + ) + fi + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh diff --git a/sys-apps/util-linux/util-linux-2.39.3.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.39.3.ebuild rename to sys-apps/util-linux/util-linux-2.39.3-r1.ebuild index 6655149f15a6..8c83d7e9c777 10
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: aeba0740234a5bf5e018004269881ce0bc738fc2 Author: Sam James gentoo org> AuthorDate: Tue Dec 5 07:13:16 2023 + Commit: Sam James gentoo org> CommitDate: Tue Dec 5 07:13:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeba0740 sys-apps/util-linux: add 2.39.3 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 + sys-apps/util-linux/util-linux-2.39.3.ebuild | 398 +++ 2 files changed, 400 insertions(+) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 893ac1856a7e..5a4876c0017a 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -4,3 +4,5 @@ DIST util-linux-2.39.1.tar.sign 833 BLAKE2B 8c1e7089bcec1f47f5c7b4ba60ca1c35955b DIST util-linux-2.39.1.tar.xz 8351164 BLAKE2B 1c2f3a77414dc9e99d17c426ca710524f898b6fd13bee120c08ceb375e475044ff6f2668f58bd799d0e3befe36de6cc1e161a1be7102e4590a8e372b6547ec1c SHA512 8fe2c9014f6161330610f7470b870855cecbd3fab9c187b75d8f22e16573c82516050479be39cfb9f7dd6d7ef1cc298d31d839b194dda5ec4daf0d1197ac71e9 DIST util-linux-2.39.2.tar.sign 833 BLAKE2B 7d804e1e1f162c176cd7f826f505590ed5fcefc76ecbaa27b1b96fac6160cf46b696fe1c6a761094a91c05878b2169a1227039a7f82ee3d135e283e7907179a2 SHA512 e6acc5a20251aa7c69f3853271959f80428f1825dda1d1a046663e345af8fb17e5d65ebd78aef3dba21e843de58e4dd1a1639415fa9a22b91080cc6436e9a45a DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3 +DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d +DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa diff --git a/sys-apps/util-linux/util-linux-2.39.3.ebuild b/sys-apps/util-linux/util-linux-2.39.3.ebuild new file mode 100644 index ..6655149f15a6 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.3.ebuild @@ -0,0 +1,398 @@ +# 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} == ]] ; 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=/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=" +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 5a8777389a15ded29b1e1ba127be685b1f4df16a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 1 13:31:10 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 1 13:31:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a877738 sys-apps/util-linux: Stabilize 2.39.2 arm64, #914791 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.39.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild index 6655149f15a6..1996b460e1b3 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: 13688d9b6994558d6e78d6f9a80da685d8bd299b Author: Sam James gentoo org> AuthorDate: Wed Nov 15 10:37:40 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 15 10:37:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13688d9b sys-apps/util-linux: backport sparc test fix Test-only fix. Thanks to glaubitz for the heads-up! Closes: https://bugs.gentoo.org/627532 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39.2-fincore-test.patch | 23 ++ sys-apps/util-linux/util-linux-2.39.2.ebuild | 4 2 files changed, 27 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch new file mode 100644 index ..f69876fe0a18 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/627532 +https://github.com/util-linux/util-linux/commit/f5715c117e727d4ff45e0d8568f188753620356e + +From f5715c117e727d4ff45e0d8568f188753620356e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Mon, 13 Nov 2023 21:05:59 +0100 +Subject: [PATCH] fincore: (tests) also use nosize error file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.ca...@physik.fu-berlin.de/ +Signed-off-by: Thomas Weißschuh +--- a/tests/ts/fincore/count b/tests/ts/fincore/count +@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then + OUT_COLUMNS="PAGES,SIZE,FILE" + else + TS_EXPECTED+=".nosize" ++ TS_EXPECTED_ERR+=".nosize" + OUT_COLUMNS="PAGES,FILE" + fi + diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild index 94d37237dd40..6655149f15a6 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild @@ -95,6 +95,10 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch +) + pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 65336598770f217b215cd5e776f6dfcb633cfee6 Author: Sam James gentoo org> AuthorDate: Tue Nov 14 11:13:24 2023 + Commit: Sam James gentoo org> CommitDate: Tue Nov 14 11:41:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65336598 sys-apps/util-linux: skip test failing under network-sandbox Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.2.ebuild | 2 ++ sys-apps/util-linux/util-linux-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild index 3b2516a8abac..94d37237dd40 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild @@ -141,6 +141,8 @@ src_prepare() { lsfd/mkfds-symlink lsfd/mkfds-rw-character-device + # Fails with network-sandbox at least in nspawn + lsfd/option-inet ) local known_failing_test diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 1f3d37f82191..3ae57148c8b8 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -141,6 +141,8 @@ src_prepare() { lsfd/mkfds-symlink lsfd/mkfds-rw-character-device + # Fails with network-sandbox at least in nspawn + lsfd/option-inet ) local known_failing_test
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: d0b346078b71c0d308ea37563399db3eb143f760 Author: Sam James gentoo org> AuthorDate: Fri Aug 18 05:09:41 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 05:17:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b34607 sys-apps/util-linux: add 2.39.2 Drop old test workaround while at it (the source file changed so it wasn't doing anything). Bug: https://bugs.gentoo.org/593304 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest| 2 ++ .../{util-linux-.ebuild => util-linux-2.39.2.ebuild}| 13 ++--- sys-apps/util-linux/util-linux-.ebuild | 9 ++--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 42cecce9549c..893ac1856a7e 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,3 +2,5 @@ DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957 DIST util-linux-2.39.1.tar.sign 833 BLAKE2B 8c1e7089bcec1f47f5c7b4ba60ca1c35955bdad99683f0682f6ba08171d3102079e7584989ea764e60096e0d64e5f9ffc8757c7feba23f79dafdb7942396a96a SHA512 6d6cabd24ebe3ce7437d98d08793b0b27d6240f2a28e08e216b4b1d358c9024fa1cec6d17df6cf7f024f97647cd31990db94716a575b08ad15f3a0b75797912b DIST util-linux-2.39.1.tar.xz 8351164 BLAKE2B 1c2f3a77414dc9e99d17c426ca710524f898b6fd13bee120c08ceb375e475044ff6f2668f58bd799d0e3befe36de6cc1e161a1be7102e4590a8e372b6547ec1c SHA512 8fe2c9014f6161330610f7470b870855cecbd3fab9c187b75d8f22e16573c82516050479be39cfb9f7dd6d7ef1cc298d31d839b194dda5ec4daf0d1197ac71e9 +DIST util-linux-2.39.2.tar.sign 833 BLAKE2B 7d804e1e1f162c176cd7f826f505590ed5fcefc76ecbaa27b1b96fac6160cf46b696fe1c6a761094a91c05878b2169a1227039a7f82ee3d135e283e7907179a2 SHA512 e6acc5a20251aa7c69f3853271959f80428f1825dda1d1a046663e345af8fb17e5d65ebd78aef3dba21e843de58e4dd1a1639415fa9a22b91080cc6436e9a45a +DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3 diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild similarity index 97% copy from sys-apps/util-linux/util-linux-.ebuild copy to sys-apps/util-linux/util-linux-2.39.2.ebuild index f58e55eaff9f..a8c1aa8baa12 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild @@ -56,7 +56,8 @@ RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" + udev? ( virtual/libudev:= ) +" BDEPEND=" virtual/pkgconfig nls? ( @@ -129,11 +130,6 @@ 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}/uuiddX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - # Known-failing tests # TODO: investigate these local known_failing_tests=( @@ -152,7 +148,6 @@ src_prepare() { einfo "Removing known-failing test: ${known_failing_test}" rm tests/ts/${known_failing_test} || die done - fi if [[ ${PV} == ]] ; then @@ -205,6 +200,10 @@ multilib_src_configure() { --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + + # Temporary workaround until ~2.39.2. 2.39.x introduced a big rewrite. + # https://github.com/util-linux/util-linux/issues/2287#issuecomment-1576640373 + --disable-libmount-mountfd-support ) local myeconfargs=( diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index f58e55eaff9f..43a5d92c0f2c 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -56,7 +56,8 @@ RDEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? (
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 282069f8658c651cb1eca5bf270ead09dd876c44 Author: Sam James gentoo org> AuthorDate: Fri Aug 18 05:18:33 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 05:18:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=282069f8 sys-apps/util-linux: drop 2.39.1 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.39.1.ebuild | 397 --- 1 file changed, 397 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.39.1.ebuild b/sys-apps/util-linux/util-linux-2.39.1.ebuild deleted file mode 100644 index 52d3712ca204.. --- a/sys-apps/util-linux/util-linux-2.39.1.ebuild +++ /dev/null @@ -1,397 +0,0 @@ -# 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} == ]] ; 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[su] - ) - !net-wireless/rfkill -" - -if [[ ${PV} == ]] ; 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 )" - -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} == ]] ; 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 ;
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: 5a7839bf00b46ac9675d8e05998130d29e77135d Author: Sam James gentoo org> AuthorDate: Thu Aug 3 19:02:43 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 3 19:03:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7839bf sys-apps/util-linux: fix mount with older kernels (no statx); fix wall Ended up backporting the wall fix as we need the mount w/ no statx fix anyway. Bug: https://bugs.gentoo.org/911336 Bug: https://github.com/util-linux/util-linux/issues/2409 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39.1-mount-no-statx.patch | 34 ++ .../files/util-linux-2.39.1-wall-no-tty.patch | 26 ++ sys-apps/util-linux/util-linux-2.39.1-r1.ebuild| 402 + 3 files changed, 462 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch b/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch new file mode 100644 index ..02e8ef20c416 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch @@ -0,0 +1,34 @@ +https://github.com/util-linux/util-linux/issues/2409 +https://github.com/util-linux/util-linux/commit/91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea + +From 91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Thu, 3 Aug 2023 07:13:28 +0200 +Subject: [PATCH] libmount: (utils) fix statx fallback +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If the systemcall is not available ENOSYS is returned. + +Under glibc the statx implementation also has its own fallback logic. +As AT_STATX_DONT_SYNC can't be implemented correctly in that fallback +logic the wrapper will return EINVAL in case the emulation is needed and +AT_STATX_DONT_SYNC is set. +So also use our own fallback in that case. + +Fixes: #2409 +Signed-off-by: Thomas Weißschuh +--- a/libmount/src/utils.c b/libmount/src/utils.c +@@ -133,7 +133,8 @@ static int safe_stat(const char *target, struct stat *st, int nofollow) + st->st_mode = stx.stx_mode; + } + +- if (rc == 0 || errno != EOPNOTSUPP) ++ if (rc == 0 || ++ (errno != EOPNOTSUPP && errno != ENOSYS && errno != EINVAL)) + return rc; + } + #endif + diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch b/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch new file mode 100644 index ..e95dbc358d33 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/911336 +https://github.com/util-linux/util-linux/pull/2412 + +From 7d3713a6d541be0bac0bb78cc8fea1620583fd08 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sat, 29 Jul 2023 17:32:57 -0400 +Subject: [PATCH] wall: do not error for ttys that do not exist + +Some wayland display managers (GDM) put strings like "seat0" in the +ut_line field of utmp entries. These are not valid tty devices. + +Avoid writing a confusing error message for ttys that do not exist. + +Bug: https://bugs.gentoo.org/911336 +Signed-off-by: Mike Gilbert +--- a/term-utils/ttymsg.c b/term-utils/ttymsg.c +@@ -100,7 +100,7 @@ ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) { +* if not running as root; not an error. +*/ + if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) { +- if (errno == EBUSY || errno == EACCES) ++ if (errno == EBUSY || errno == EACCES || errno == ENOENT) + return NULL; + + len = snprintf(errbuf, sizeof(errbuf), "%s: %m", device); diff --git a/sys-apps/util-linux/util-linux-2.39.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.1-r1.ebuild new file mode 100644 index ..f3add5efd6b6 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.1-r1.ebuild @@ -0,0 +1,402 @@ +# 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} == ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: efd6ba4f2700a0d421ac88465d1f4a32e3505e84 Author: Sam James gentoo org> AuthorDate: Thu Jun 29 06:17:04 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jun 29 06:17:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd6ba4f sys-apps/util-linux: drop 2.39-r4 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 - .../util-linux-2.39-check-for-mount_setattr.patch | 98 - .../util-linux-2.39-mount-dont-call-hooks.patch| 79 .../util-linux-2.39-mount-parse-options-user.patch | 46 --- .../util-linux-2.39-tests-for-mount_setattr.patch | 13 - sys-apps/util-linux/util-linux-2.39-r4.ebuild | 400 - 6 files changed, 638 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index ee5ae5dcfb43..42cecce9549c 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,5 +2,3 @@ DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957 DIST util-linux-2.39.1.tar.sign 833 BLAKE2B 8c1e7089bcec1f47f5c7b4ba60ca1c35955bdad99683f0682f6ba08171d3102079e7584989ea764e60096e0d64e5f9ffc8757c7feba23f79dafdb7942396a96a SHA512 6d6cabd24ebe3ce7437d98d08793b0b27d6240f2a28e08e216b4b1d358c9024fa1cec6d17df6cf7f024f97647cd31990db94716a575b08ad15f3a0b75797912b DIST util-linux-2.39.1.tar.xz 8351164 BLAKE2B 1c2f3a77414dc9e99d17c426ca710524f898b6fd13bee120c08ceb375e475044ff6f2668f58bd799d0e3befe36de6cc1e161a1be7102e4590a8e372b6547ec1c SHA512 8fe2c9014f6161330610f7470b870855cecbd3fab9c187b75d8f22e16573c82516050479be39cfb9f7dd6d7ef1cc298d31d839b194dda5ec4daf0d1197ac71e9 -DIST util-linux-2.39.tar.sign 833 BLAKE2B f4b35d35f1d20094169c8651d127c6d1f37b0946bc72c40f4824d77f8c117a23ae2633ac2449e91ba316d4cac6e4f3c2afb9fd410302683384988dc794062d9e SHA512 f5df4f7e5c39995ad3c7b52f06bfc7759e53d4df82b2b42f09d4570faeff5c156e83e42be053b00b0bfb4a71e27bfa580fb996a92225eb8a0df46d9f296ef4ef -DIST util-linux-2.39.tar.xz 8103428 BLAKE2B 39d415b6e303c21d2e5566bd29dd1803c67fbaed079fab85fab620db727a69c96f9c705a3671a639185c78ea1e70f374e21ef8694115ce42fa30c86b546023d1 SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94 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 deleted file mode 100644 index c1eb3748f782.. --- a/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch +++ /dev/null @@ -1,98 +0,0 @@ -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?= -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 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; -+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: d88c855e06c781e41c803261df783307dedaf934 Author: Sam James gentoo org> AuthorDate: Tue Jun 27 13:31:58 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jun 27 13:31:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88c855e sys-apps/util-linux: add 2.39.1 Pass --disable-libmount-mountfd-support for now to avoid regressions from the big rewrite. Hopefully be ok for 2.39.2. Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 + sys-apps/util-linux/util-linux-2.39.1.ebuild | 397 +++ 2 files changed, 399 insertions(+) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index b73c496ece4d..ee5ae5dcfb43 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,4 +1,6 @@ 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.1.tar.sign 833 BLAKE2B 8c1e7089bcec1f47f5c7b4ba60ca1c35955bdad99683f0682f6ba08171d3102079e7584989ea764e60096e0d64e5f9ffc8757c7feba23f79dafdb7942396a96a SHA512 6d6cabd24ebe3ce7437d98d08793b0b27d6240f2a28e08e216b4b1d358c9024fa1cec6d17df6cf7f024f97647cd31990db94716a575b08ad15f3a0b75797912b +DIST util-linux-2.39.1.tar.xz 8351164 BLAKE2B 1c2f3a77414dc9e99d17c426ca710524f898b6fd13bee120c08ceb375e475044ff6f2668f58bd799d0e3befe36de6cc1e161a1be7102e4590a8e372b6547ec1c SHA512 8fe2c9014f6161330610f7470b870855cecbd3fab9c187b75d8f22e16573c82516050479be39cfb9f7dd6d7ef1cc298d31d839b194dda5ec4daf0d1197ac71e9 DIST util-linux-2.39.tar.sign 833 BLAKE2B f4b35d35f1d20094169c8651d127c6d1f37b0946bc72c40f4824d77f8c117a23ae2633ac2449e91ba316d4cac6e4f3c2afb9fd410302683384988dc794062d9e SHA512 f5df4f7e5c39995ad3c7b52f06bfc7759e53d4df82b2b42f09d4570faeff5c156e83e42be053b00b0bfb4a71e27bfa580fb996a92225eb8a0df46d9f296ef4ef DIST util-linux-2.39.tar.xz 8103428 BLAKE2B 39d415b6e303c21d2e5566bd29dd1803c67fbaed079fab85fab620db727a69c96f9c705a3671a639185c78ea1e70f374e21ef8694115ce42fa30c86b546023d1 SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94 diff --git a/sys-apps/util-linux/util-linux-2.39.1.ebuild b/sys-apps/util-linux/util-linux-2.39.1.ebuild new file mode 100644 index ..52d3712ca204 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39.1.ebuild @@ -0,0 +1,397 @@ +# 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} == ]] ; 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}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: d89394c9345cc488d5ed7b7c40aac61c6a86dcd4 Author: Sam James gentoo org> AuthorDate: Fri May 26 07:24:26 2023 + Commit: Sam James gentoo org> CommitDate: Fri May 26 07:24:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89394c9 sys-apps/util-linux: backport another mount regression fix (still masked) util-linux-2.39.1 is coming next week. Bug: https://bugs.gentoo.org/906797 Signed-off-by: Sam James gentoo.org> .../util-linux-2.39-mount-dont-call-hooks.patch| 79 + sys-apps/util-linux/util-linux-2.39-r1.ebuild | 393 - ...ux-2.39-r3.ebuild => util-linux-2.39-r4.ebuild} | 7 +- 3 files changed, 83 insertions(+), 396 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch b/sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch new file mode 100644 index ..96dfb1f2c234 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch @@ -0,0 +1,79 @@ +https://github.com/util-linux/util-linux/issues/2267 +https://github.com/storaged-project/libblockdev/pull/889 +https://bugzilla.redhat.com/show_bug.cgi?id=2189241 +https://github.com/util-linux/util-linux/commit/f94a7760ed7ce81389a6059f020238981627a70d + +From f94a7760ed7ce81389a6059f020238981627a70d Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 25 May 2023 11:48:24 +0200 +Subject: [PATCH] libmount: don't call hooks after mount. helper + +In case more filesystems are specified (or when libmount follows +/{etc,proc}/filesystems) then the library may try to use and +initialize the new API because for some filesystems, we need +exec(/sbin/mount.) and for another fsopen(). + +The hooks that use the API have to smart and detect that the mount +operation was done in external /sbin/mount. helper. And in this +case, the new API file descriptors must be ignored. + +The exception is propagation flags, mount(8) can set the flags after +exec(/sbin/mount.), for example, "mount -t ntfs --make-private". + +Fixes: https://github.com/util-linux/util-linux/issues/2267 +Signed-off-by: Karel Zak +--- a/libmount/src/context_mount.c b/libmount/src/context_mount.c +@@ -508,6 +508,8 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) + assert(cxt->fs); + assert((cxt->flags & MNT_FL_MOUNTFLAGS_MERGED)); + ++ mnt_context_reset_status(cxt); ++ + if (try_type) { + rc = mnt_context_prepare_helper(cxt, "mount", try_type); + if (rc) +--- a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c +@@ -239,6 +239,10 @@ static int hook_create_mount(struct libmnt_context *cxt, + int rc = 0; + + assert(cxt); ++ ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + assert(cxt->fs); + + api = get_sysapi(cxt); +@@ -309,6 +313,9 @@ static int hook_reconfigure_mount(struct libmnt_context *cxt, + + assert(cxt); + ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + api = get_sysapi(cxt); + assert(api); + assert(api->fd_tree >= 0); +@@ -379,6 +386,9 @@ static int hook_set_vfsflags(struct libmnt_context *cxt, + uint64_t set = 0, clr = 0; + int rc = 0; + ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + DBG(HOOK, ul_debugobj(hs, "setting VFS flags")); + + ol = mnt_context_get_optlist(cxt); +@@ -471,6 +481,9 @@ static int hook_attach_target(struct libmnt_context *cxt, + const char *target; + int rc = 0; + ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + target = mnt_fs_get_target(cxt->fs); + if (!target) + return -EINVAL; + diff --git a/sys-apps/util-linux/util-linux-2.39-r1.ebuild b/sys-apps/util-linux/util-linux-2.39-r1.ebuild deleted file mode 100644 index f58e55eaff9f.. --- a/sys-apps/util-linux/util-linux-2.39-r1.ebuild +++ /dev/null @@ -1,393 +0,0 @@ -# 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} == ]] ; 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? ( ht
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 981f36533f7d0930bcb794d305e392678e83da5b Author: Sam James gentoo org> AuthorDate: Tue May 23 04:20:10 2023 + Commit: Sam James gentoo org> CommitDate: Tue May 23 04:20:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=981f3653 sys-apps/util-linux: update mount_setattr patch to new upstream version The PR got updated slightly. Closes: https://bugs.gentoo.org/906797 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39-check-for-mount_setattr.patch| 14 +- ...util-linux-2.39-r2.ebuild => util-linux-2.39-r3.ebuild} | 0 2 files changed, 9 insertions(+), 5 deletions(-) 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 index 538f33b30ffe..c1eb3748f782 100644 --- 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 @@ -1,7 +1,7 @@ https://bugs.gentoo.org/906797 https://github.com/util-linux/util-linux/pull/2248 -From 9b68f614c8d02ca41f077ba064e0a83d2ae7b1fe Mon Sep 17 00:00:00 2001 +From 1bd85b64632280d6bf0e86b4ff29da8b19321c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Sat, 20 May 2023 06:38:20 +0200 Subject: [PATCH] libmount: check for availability of mount_setattr @@ -33,28 +33,32 @@ Signed-off-by: Thomas Weißschuh /* * open_tree() and fsopen() */ -@@ -675,9 +684,12 @@ static int hook_prepare(struct libmnt_context *cxt, +@@ -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()) ++ 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 +700,12 @@ static int hook_prepare(struct libmnt_context *cxt, +@@ -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()) ++ 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); + } diff --git a/sys-apps/util-linux/util-linux-2.39-r2.ebuild b/sys-apps/util-linux/util-linux-2.39-r3.ebuild similarity index 100% rename from sys-apps/util-linux/util-linux-2.39-r2.ebuild rename to sys-apps/util-linux/util-linux-2.39-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: ca46cab3e9d658ced95d386616f0b2c3abda5400 Author: Hank Leininger korelogic com> AuthorDate: Sat May 20 19:38:04 2023 + Commit: Sam James gentoo org> CommitDate: Tue May 23 03:09:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca46cab3 sys-apps/util-linux: Fix for mount_setattr use on <5.12 kernels Backported pending upstream fix from https://github.com/util-linux/util-linux/pull/2248 Note that there's at least one other breaking bug in util-linux-2.39 so the mask probably shouldn't be removed yet. Bug: https://bugs.gentoo.org/906859 Closes: https://bugs.gentoo.org/906797 Closes: https://github.com/gentoo/gentoo/pull/31108 Signed-off-by: Hank Leininger korelogic.com> Signed-off-by: Sam James gentoo.org> .../util-linux-2.39-check-for-mount_setattr.patch | 94 + .../util-linux-2.39-tests-for-mount_setattr.patch | 13 + sys-apps/util-linux/util-linux-2.39-r2.ebuild | 398 + 3 files changed, 505 insertions(+) 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 ..538f33b30ffe --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch @@ -0,0 +1,94 @@ +https://bugs.gentoo.org/906797 +https://github.com/util-linux/util-linux/pull/2248 + +From 9b68f614c8d02ca41f077ba064e0a83d2ae7b1fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +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 +--- 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,12 @@ 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()) ++ 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 +700,12 @@ 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()) ++ 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 00..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-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 ..0b0ade4e181c --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch @@ -0,0 +1,13 @@ +https://g
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 5ef0405e6d22915b93da87d5eb77ff132ca6da14 Author: Sam James gentoo org> AuthorDate: Tue May 23 03:13:09 2023 + Commit: Sam James gentoo org> CommitDate: Tue May 23 03:13:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef0405e sys-apps/util-linux: backport another mount regression fix (user option parsing) Closes: https://bugs.gentoo.org/906859 Signed-off-by: Sam James gentoo.org> .../util-linux-2.39-mount-parse-options-user.patch | 46 ++ sys-apps/util-linux/util-linux-2.39-r2.ebuild | 1 + 2 files changed, 47 insertions(+) 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 ..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 +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 +--- 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/util-linux-2.39-r2.ebuild b/sys-apps/util-linux/util-linux-2.39-r2.ebuild index 43dd41681342..edd0dd68e804 100644 --- a/sys-apps/util-linux/util-linux-2.39-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39-r2.ebuild @@ -97,6 +97,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 4eec5b99e9529e5ef0437b60da6aa1fcebb88c4a Author: Mike Gilbert gentoo org> AuthorDate: Fri May 19 22:23:43 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 19 22:25:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eec5b99 sys-apps/util-linux: pass --runstatedir=/run to configure This path is used in a few places. Previously this got defaulted to /var/lib/run because econf sets localstatedir to /var/lib. Closes: https://github.com/gentoo/gentoo/pull/30870 Signed-off-by: Mike Gilbert gentoo.org> .../util-linux/{util-linux-2.39.ebuild => util-linux-2.39-r1.ebuild}| 2 ++ sys-apps/util-linux/util-linux-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.39.ebuild b/sys-apps/util-linux/util-linux-2.39-r1.ebuild similarity index 99% rename from sys-apps/util-linux/util-linux-2.39.ebuild rename to sys-apps/util-linux/util-linux-2.39-r1.ebuild index 209689b06193..f58e55eaff9f 100644 --- a/sys-apps/util-linux/util-linux-2.39.ebuild +++ b/sys-apps/util-linux/util-linux-2.39-r1.ebuild @@ -202,6 +202,8 @@ multilib_src_configure() { # 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" ) diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 209689b06193..f58e55eaff9f 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -202,6 +202,8 @@ multilib_src_configure() { # 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" )
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: ff5a27ef581b4190f1e95e6c32a33698ef11bd46 Author: Mike Gilbert gentoo org> AuthorDate: Fri May 19 22:29:23 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 19 22:29:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5a27ef sys-apps/util-linux: drop 2.37.4, 2.38.1 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/Manifest | 1 - .../util-linux-2.37.1-agetty_ctrl-c_erase.patch| 50 --- .../util-linux-2.37.2-ioctl_ns-test-hang.patch | 37 -- sys-apps/util-linux/util-linux-2.37.4.ebuild | 333 - sys-apps/util-linux/util-linux-2.38.1.ebuild | 395 - 5 files changed, 816 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index fbcb78e8c66a..b73c496ece4d 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,4 +1,3 @@ -DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7 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 diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch b/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch deleted file mode 100644 index 4828fd449f95.. --- a/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6eb1c01e9dd25a73100f06db37190c63fd57d4d9 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Fri, 30 Jul 2021 11:50:46 +0200 -Subject: [PATCH] agetty: use CTRL+C to erase username - -aggety(8) from the beginning ignores ^C (the small exception was -between 2.32 and 2.34 when this char has been misinterpreted). - -This patch forces agetty to interpret ^C like ^U, it means to -erase the user's input and wait for a completely new username. -The small difference is that for ^C it does not set 'kill character'. - -This change does not affect serial lines where ^C is still ignored like -in previous decades. I'd like to avoid any regression as I have -no clue if any serial lines do not send this control char in some -context ... - -Fixes: https://github.com/karelzak/util-linux/issues/1399 -References: https://github.com/karelzak/util-linux/issues/1046 -Signed-off-by: Karel Zak - term-utils/agetty.c | 8 +--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 3b3d5101a..d072d64d3 100644 a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -2267,6 +2267,11 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t - break; - case CTL('U'): - cp->kill = ascval; /* set kill character */ -+ /* fallthrough */ -+ case CTL('C'): -+ if (key == CTL('C') && !(op->flags & F_VCONSOLE)) -+ /* Ignore CTRL+C on serial line */ -+ break; - while (bp > logname) { - if ((tp->c_lflag & ECHO) == 0) - write_all(1, erase[cp->parity], 3); -@@ -2275,9 +2280,6 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t - break; - case CTL('D'): - exit(EXIT_SUCCESS); -- case CTL('C'): -- /* Ignore */ -- break; - default: - if ((size_t)(bp - logname) >= sizeof(logname) - 1) - log_err(_("%s: input overrun"), op->tty); diff --gi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 9a59fd7a80c23b5c9417464d03bc8dd8130c4023 Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 14:27:14 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 14:27:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a59fd7a sys-apps/util-linux: Stabilize 2.38.1-r2 ppc, #902599 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 2e6a72d9c50e..35a992ec39dd 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 01f8f7182d6c17e149ea73e375824389a86311ea Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 14:27:17 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 14:27:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f8f718 sys-apps/util-linux: Stabilize 2.38.1-r2 sparc, #902599 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 35a992ec39dd..1693389c83a4 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 6635f51b8c7de87f3708e2a4324b1c3ee86f5da0 Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 14:27:11 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 14:27:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6635f51b sys-apps/util-linux: Stabilize 2.38.1-r2 arm, #902599 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index c883ac30b0c2..2e6a72d9c50e 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: a56f5788f4b3dbfece3e3765550ead2c3204b9e1 Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 14:27:20 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 14:27:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56f5788 sys-apps/util-linux: Stabilize 2.38.1-r2 x86, #902599 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 1693389c83a4..14d0022251cd 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + 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";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 0c5e25f039f9a017d8b906c6256ed309163bc959 Author: Sam James gentoo org> AuthorDate: Thu Apr 20 15:14:21 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 20 15:40:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5e25f0 sys-apps/util-linux: add 2.39_rc3 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 2 + sys-apps/util-linux/util-linux-2.39_rc3.ebuild | 383 + 2 files changed, 385 insertions(+) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 5cb5b3ba00c7..dcb66e131794 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -3,3 +3,5 @@ DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957 DIST util-linux-2.39-rc2.tar.sign 833 BLAKE2B ec2ea0c2034b5e8f24c72610e53acc4c922d3d4b84ffd31c3b51849e60a99a6e9bf3e17b773e222f89bc1fe33fb06722e2770b981c7dcc4519bec4db797d8348 SHA512 20b1f2ec5368c74f751238451be9ec5f8f74d8c63d331365b00ed06144f6874fe3f44e062e7b52c5d0a05c650353a741c1594e150e58a16544e5ffc8ed100a5b DIST util-linux-2.39-rc2.tar.xz 8080452 BLAKE2B d2476d1aff1c2e4e3cb3d4b71fa3410ce4db26448139dc439865b03d108acf4c797eb92e9edc2451dca099116fda8950b529f1b22b657d47268164642fe794a6 SHA512 11f5b8ed1eb90a4e7161369eafcf0157b205aeded221cd435f95a79d01901bdef289660486849778b3d3c15500db593cad24e0a7f87f52968c9c292ea68040c0 +DIST util-linux-2.39-rc3.tar.sign 833 BLAKE2B da99dfaf40efd052414c30ae172ad1a42654d3fcd7fc41fe8ba48f99db3e3b88c2fde863351cd5d354d5a5191e191e21f4867a8e20453e2512e2cc815f591000 SHA512 8a311c1bb680f1c71221a9e512bf42f13c7d5f8fb0b888dc7aac04a2e0da6315f58631fc315aa73d34b8275a48c9adfe5d5676fcce905f75d5c88f8aac3abf0f +DIST util-linux-2.39-rc3.tar.xz 8106892 BLAKE2B 514f26cf624a39f271a8987a38d51bd36e5494bea5f859abfd67fd4924495457e46519b712c52578c94210aa8bddab707a5ec699be3bb798c8ff22a17d3c4931 SHA512 8a93d32a5ceb38d50a4b2c8bfa48bcab7ec9b758c89b5a1a4f7fd74558dce37385bd7ea203345148d4389de4ea60ec42058f9d7889a8075d3e616773d085427e diff --git a/sys-apps/util-linux/util-linux-2.39_rc3.ebuild b/sys-apps/util-linux/util-linux-2.39_rc3.ebuild new file mode 100644 index ..0baf9332ec6f --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39_rc3.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..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} == ]] ; 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" + 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:= )" +BD
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/
commit: ac650ffd409003694733d9f1ff003c15a219c9b9 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Apr 6 16:24:27 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Fri Apr 7 20:05:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac650ffd sys-apps/util-linux: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30501 Signed-off-by: Conrad Kostecki gentoo.org> .../files/util-linux-2.39_rc1-test-build.patch | 33 -- 1 file changed, 33 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch b/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch deleted file mode 100644 index 5fdb5a51bb9e.. --- a/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/util-linux/util-linux/issues/2119 -https://github.com/util-linux/util-linux/commit/bccae5d85831c4cfa6b5d147acec739bd3c148b9 - -From bccae5d85831c4cfa6b5d147acec739bd3c148b9 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Fri, 17 Mar 2023 13:11:50 +0100 -Subject: [PATCH] build-sys: fix libblkid fuzz sample test if-endif - -All tests have to be covered by BUILD_LIBBLKID_TESTS otherwise -proper CFLAGS ($blkid_tests_cflags) are undefined. - -Fixes: https://github.com/util-linux/util-linux/issues/2119 -Signed-off-by: Karel Zak a/libblkid/src/Makemodule.am -+++ b/libblkid/src/Makemodule.am -@@ -224,8 +224,6 @@ test_blkid_fuzz_LDFLAGS = $(blkid_tests_ldflags) -lpthread - test_blkid_fuzz_LDADD = $(blkid_tests_ldadd) $(LIB_FUZZING_ENGINE) - endif - --endif # BUILD_LIBBLKID_TESTS -- - check_PROGRAMS += test_blkid_fuzz_sample - - test_blkid_fuzz_sample_SOURCES = libblkid/src/fuzz.c -@@ -234,6 +232,7 @@ test_blkid_fuzz_sample_CFLAGS = $(blkid_tests_cflags) - test_blkid_fuzz_sample_LDFLAGS = $(blkid_tests_ldflags) - test_blkid_fuzz_sample_LDADD = $(blkid_tests_ldadd) - -+endif # BUILD_LIBBLKID_TESTS - - # move lib from $(usrlib_execdir) to $(libdir) if needed - install-exec-hook-libblkid: -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: cf8a74813af6ead939c0c53a021fbf809670c9b3 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Apr 6 18:44:31 2023 + Commit: Sam James gentoo org> CommitDate: Fri Apr 7 01:48:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf8a7481 sys-apps/util-linux: stable 2.38.1-r2 for hppa, bug #902599 Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 3aeb70032cfa..c57abd499ba7 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: d06e93839823bc76397f693df858a685300d8c89 Author: Sam James gentoo org> AuthorDate: Wed Apr 5 00:34:33 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 5 00:34:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06e9383 sys-apps/util-linux: add 2.39_rc2, drop 2.39_rc1 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 5 ++--- .../{util-linux-2.39_rc1.ebuild => util-linux-2.39_rc2.ebuild}| 8 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 8026f61f..5cb5b3ba00c7 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,6 +1,5 @@ DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7 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-rc1.tar.sign 833 BLAKE2B d540ee98c09879b26a1175b00145872b518d30edc91a1d4c625da502d8fffa8a5fb7ec7f36151e5da4a0c215cc1e53acf6134d5d5842e73f43a7ad8d05d5c0c3 SHA512 00c4e573513941fcf7f254b31bdc0747df24bcfee071f27b66ebd8b30680b098ea63c0590a139bf2b29ac02033c3b1cfae126d9ac0d5829c4e85acb348a643b7 -DIST util-linux-2.39-rc1.tar.xz 8083996 BLAKE2B a74d3b40540cd31c34c37caca20a2cd6691cfdf664da0a4a5b6c04201204d2cd6d357861f15dd41532aceb1adf3def7422f2c987ea79875330ca7c09039f03e8 SHA512 e9981d7c65eed7cd3f96f590e2190c7c804b1767464c821cd9277c72aaf38b8407f324cf9e8f3b96eb96359a0746f21a01dfb6baa504f49c8c7e1aff2dc956b3 -DIST util-linux-2.39_rc1-autotools-regenerate.patch.xz 17616 BLAKE2B 8bf56506f915b7c24bb47c6591b93bc132c3a4bbee9bd8bb78df03b08723cd1103b7ea34b6e53042aa38a1822007628c26f97e8aa8efae170765cbf9e710276b SHA512 e73e5b11a52a0e8ad0bda83fa5a5b41c06f452d6f34a42ad8714968261e0990ba2afda04f9bb3389c61a5fc67182701b9d44c4ead69cae6d268083f94191a977 +DIST util-linux-2.39-rc2.tar.sign 833 BLAKE2B ec2ea0c2034b5e8f24c72610e53acc4c922d3d4b84ffd31c3b51849e60a99a6e9bf3e17b773e222f89bc1fe33fb06722e2770b981c7dcc4519bec4db797d8348 SHA512 20b1f2ec5368c74f751238451be9ec5f8f74d8c63d331365b00ed06144f6874fe3f44e062e7b52c5d0a05c650353a741c1594e150e58a16544e5ffc8ed100a5b +DIST util-linux-2.39-rc2.tar.xz 8080452 BLAKE2B d2476d1aff1c2e4e3cb3d4b71fa3410ce4db26448139dc439865b03d108acf4c797eb92e9edc2451dca099116fda8950b529f1b22b657d47268164642fe794a6 SHA512 11f5b8ed1eb90a4e7161369eafcf0157b205aeded221cd435f95a79d01901bdef289660486849778b3d3c15500db593cad24e0a7f87f52968c9c292ea68040c0 diff --git a/sys-apps/util-linux/util-linux-2.39_rc1.ebuild b/sys-apps/util-linux/util-linux-2.39_rc2.ebuild similarity index 97% rename from sys-apps/util-linux/util-linux-2.39_rc1.ebuild rename to sys-apps/util-linux/util-linux-2.39_rc2.ebuild index 0e42fe563e2b..0baf9332ec6f 100644 --- a/sys-apps/util-linux/util-linux-2.39_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39_rc2.ebuild @@ -24,9 +24,6 @@ else 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 )" - - # Drop on next release, it's just here for ${P}-test-build.patch - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz"; fi S="${WORKDIR}/${MY_P}" @@ -94,11 +91,6 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${P}-test-build.patch - "${WORKDIR}"/${P}-autotools-regenerate.patch -) - pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 9019649206b3be07006aebd99f14951c101e8aa8 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 4 16:48:04 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 4 16:48:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90196492 sys-apps/util-linux: Stabilize 2.38.1-r2 amd64, #902599 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 5bb7516dd3ab..3aeb70032cfa 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: b065ef24bebf9fcd037214e431c0d4458cc7683b Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 31 11:42:22 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 31 11:42:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b065ef24 sys-apps/util-linux: Stabilize 2.38.1 x86, #888447 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index ae549597222c..caf72bb74270 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: ee2847853d0b485948eee2127b57dd2b0a65a668 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 24 13:33:14 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 24 13:33:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee284785 sys-apps/util-linux: Stabilize 2.38.1-r2 arm64, #902599 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 7d6e5fc4cc0a..5bb7516dd3ab 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 44a51abda5c77d851a7129d5f94047fd6d5ef064 Author: Sam James gentoo org> AuthorDate: Wed Mar 22 05:32:30 2023 + Commit: Sam James gentoo org> CommitDate: Wed Mar 22 05:32:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a51abd sys-apps/util-linux: Stabilize 2.38.1-r2 ppc64, #902599 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 7de646c812ab..7d6e5fc4cc0a 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 5c2b7ece52f0db0658d46932834381a8bf29 Author: Sam James gentoo org> AuthorDate: Sun Mar 19 05:37:38 2023 + Commit: Sam James gentoo org> CommitDate: Sun Mar 19 05:37:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2b7ece sys-apps/util-linux: add 2.39_rc1 (unkeyworded) Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/Manifest | 3 + .../files/util-linux-2.39_rc1-test-build.patch | 33 ++ sys-apps/util-linux/util-linux-2.39_rc1.ebuild | 391 + 3 files changed, 427 insertions(+) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 0748d8f9a93e..8026f61f 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,3 +1,6 @@ DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7 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-rc1.tar.sign 833 BLAKE2B d540ee98c09879b26a1175b00145872b518d30edc91a1d4c625da502d8fffa8a5fb7ec7f36151e5da4a0c215cc1e53acf6134d5d5842e73f43a7ad8d05d5c0c3 SHA512 00c4e573513941fcf7f254b31bdc0747df24bcfee071f27b66ebd8b30680b098ea63c0590a139bf2b29ac02033c3b1cfae126d9ac0d5829c4e85acb348a643b7 +DIST util-linux-2.39-rc1.tar.xz 8083996 BLAKE2B a74d3b40540cd31c34c37caca20a2cd6691cfdf664da0a4a5b6c04201204d2cd6d357861f15dd41532aceb1adf3def7422f2c987ea79875330ca7c09039f03e8 SHA512 e9981d7c65eed7cd3f96f590e2190c7c804b1767464c821cd9277c72aaf38b8407f324cf9e8f3b96eb96359a0746f21a01dfb6baa504f49c8c7e1aff2dc956b3 +DIST util-linux-2.39_rc1-autotools-regenerate.patch.xz 17616 BLAKE2B 8bf56506f915b7c24bb47c6591b93bc132c3a4bbee9bd8bb78df03b08723cd1103b7ea34b6e53042aa38a1822007628c26f97e8aa8efae170765cbf9e710276b SHA512 e73e5b11a52a0e8ad0bda83fa5a5b41c06f452d6f34a42ad8714968261e0990ba2afda04f9bb3389c61a5fc67182701b9d44c4ead69cae6d268083f94191a977 diff --git a/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch b/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch new file mode 100644 index ..5fdb5a51bb9e --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39_rc1-test-build.patch @@ -0,0 +1,33 @@ +https://github.com/util-linux/util-linux/issues/2119 +https://github.com/util-linux/util-linux/commit/bccae5d85831c4cfa6b5d147acec739bd3c148b9 + +From bccae5d85831c4cfa6b5d147acec739bd3c148b9 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Fri, 17 Mar 2023 13:11:50 +0100 +Subject: [PATCH] build-sys: fix libblkid fuzz sample test if-endif + +All tests have to be covered by BUILD_LIBBLKID_TESTS otherwise +proper CFLAGS ($blkid_tests_cflags) are undefined. + +Fixes: https://github.com/util-linux/util-linux/issues/2119 +Signed-off-by: Karel Zak +--- a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am +@@ -224,8 +224,6 @@ test_blkid_fuzz_LDFLAGS = $(blkid_tests_ldflags) -lpthread + test_blkid_fuzz_LDADD = $(blkid_tests_ldadd) $(LIB_FUZZING_ENGINE) + endif + +-endif # BUILD_LIBBLKID_TESTS +- + check_PROGRAMS += test_blkid_fuzz_sample + + test_blkid_fuzz_sample_SOURCES = libblkid/src/fuzz.c +@@ -234,6 +232,7 @@ test_blkid_fuzz_sample_CFLAGS = $(blkid_tests_cflags) + test_blkid_fuzz_sample_LDFLAGS = $(blkid_tests_ldflags) + test_blkid_fuzz_sample_LDADD = $(blkid_tests_ldadd) + ++endif # BUILD_LIBBLKID_TESTS + + # move lib from $(usrlib_execdir) to $(libdir) if needed + install-exec-hook-libblkid: + diff --git a/sys-apps/util-linux/util-linux-2.39_rc1.ebuild b/sys-apps/util-linux/util-linux-2.39_rc1.ebuild new file mode 100644 index ..0e42fe563e2b --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.39_rc1.ebuild @@ -0,0 +1,391 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..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} == ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"; + inherit autotools git-r3 +e
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 854f99ed4acc077bb0b8d4161f1dc1c1e8cb80b9 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Feb 26 19:03:27 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Feb 26 19:03:27 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854f99ed sys-apps/util-linux: Stabilize 2.38.1 hppa, #888447 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index b8e57fab2c1a..ae549597222c 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 4d6936d7773c6b6770b0e763787e7500e33585fc Author: Arthur Zamarin gentoo org> AuthorDate: Sun Feb 26 18:35:50 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Feb 26 18:35:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6936d7 sys-apps/util-linux: Stabilize 2.38.1 ppc, #888447 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index f614835c865b..b8e57fab2c1a 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 37f510da22bbe73cd606c7df841cbae8d2611132 Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 11 22:04:40 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Feb 11 22:13:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f510da sys-apps/util-linux: remove obsolete fallocate test Bug: https://bugs.gentoo.org/300307 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 22 +- sys-apps/util-linux/util-linux-.ebuild | 22 +- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index f49e21c65cae..7de646c812ab 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -157,21 +157,6 @@ src_prepare() { eautoreconf } -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS, bug #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - 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[@]}" @@ -191,8 +176,6 @@ python_configure() { } 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. bug #531856 @@ -297,6 +280,11 @@ multilib_src_configure() { fi } +src_configure() { + append-lfs-flags + multilib-minimal_src_configure +} + python_compile() { pushd "${BUILD_DIR}" >/dev/null || die emake all diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index f76687a5bc42..0baf9332ec6f 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -157,21 +157,6 @@ src_prepare() { fi } -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS, bug #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - 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[@]}" @@ -191,8 +176,6 @@ python_configure() { } 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. bug #531856 @@ -297,6 +280,11 @@ multilib_src_configure() { fi } +src_configure() { + append-lfs-flags + multilib-minimal_src_configure +} + python_compile() { pushd "${BUILD_DIR}" >/dev/null || die emake all
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
commit: e3b100621b371849f79a62ba82c9fe2c4ef6b2dd Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 11 22:00:36 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Feb 11 22:13:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b10062 sys-apps/util-linux: backport fix for implicit declartion of pidfd_open Closes: https://bugs.gentoo.org/893966 Signed-off-by: Mike Gilbert gentoo.org> .../util-linux-2.38.1-check-for-sys-pidfd.h.patch | 52 ++ 38.1-r1.ebuild => util-linux-2.38.1-r2.ebuild} | 10 ++--- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch b/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch new file mode 100644 index ..0a1975fff685 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch @@ -0,0 +1,52 @@ +https://github.com/util-linux/util-linux/pull/1769 +https://bugs.gentoo.org/893966 + +From 84732a8849a08d42a9a95dcbee9005116be78eb8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 7 Aug 2022 14:39:19 -0700 +Subject: [PATCH] check for sys/pidfd.h + +This header in newer glibc defines the signatures of functions +pidfd_send_signal() and pidfd_open() and when these functions are +defined by libc then we need to include the relevant header to get +the definitions. Clang 15+ has started to error out when function +signatures are missing. + +Fixes errors like +misc-utils/kill.c:402:6: error: call to undeclared function 'pidfd_send_signal'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +if (pidfd_send_signal(pfd, ctl->numsig, &info, 0) < 0) + +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + include/pidfd-utils.h | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 51deeecd4e..daa8f0dca4 100644 +--- a/configure.ac b/configure.ac +@@ -342,6 +342,7 @@ AC_CHECK_HEADERS([ \ + sys/mkdev.h \ + sys/mount.h \ + sys/param.h \ ++ sys/pidfd.h \ + sys/prctl.h \ + sys/resource.h \ + sys/sendfile.h \ +diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h +index eddede9767..d9e33cbc57 100644 +--- a/include/pidfd-utils.h b/include/pidfd-utils.h +@@ -4,8 +4,10 @@ + #ifdef HAVE_SYS_SYSCALL_H + # include + # if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) ++# ifdef HAVE_SYS_PIDFD_H ++# include ++# endif + # include +- + # ifndef HAVE_PIDFD_SEND_SIGNAL + static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + unsigned int flags) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild similarity index 98% rename from sys-apps/util-linux/util-linux-2.38.1-r1.ebuild rename to sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index 746b411e2e6e..f49e21c65cae 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ +inherit toolchain-funcs autotools flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd MY_PV="${PV/_/-}" @@ -93,6 +93,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${P}-more-posix-exit-on-eof.patch + "${FILESDIR}"/util-linux-2.38.1-check-for-sys-pidfd.h.patch ) pkg_pretend() { @@ -153,12 +154,7 @@ src_prepare() { fi - if [[ ${PV} == ]] ; then - po/update-potfiles - eautoreconf - else - elibtoolize - fi + eautoreconf } lfs_fallocate_test() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
commit: 795576427d6297dd5b813c65261965e190766e22 Author: Sam James gentoo org> AuthorDate: Thu Feb 9 03:54:01 2023 + Commit: Sam James gentoo org> CommitDate: Thu Feb 9 03:54:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79557642 sys-apps/util-linux: backport fix for 'more' exit Signed-off-by: Sam James gentoo.org> .../util-linux-2.38.1-more-posix-exit-on-eof.patch | 32 ++ sys-apps/util-linux/util-linux-2.38.1-r1.ebuild| 399 + 2 files changed, 431 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch b/sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch new file mode 100644 index ..07d158761c26 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch @@ -0,0 +1,32 @@ +https://forums.gentoo.org/viewtopic-t-1160959.html +https://github.com/util-linux/util-linux/issues/1703 +https://github.com/util-linux/util-linux/commit/28b391ce7e58f8327c092b3911c05f526d0ad586 + +From 28b391ce7e58f8327c092b3911c05f526d0ad586 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 15 Jun 2022 10:03:44 +0200 +Subject: [PATCH] more: restore exit-on-eof if POSIXLY_CORRECT is not set + +In version 2.38, exit-on-eof has been disabled by default. This change +is annoying for users and forces many users to use 'alias more="more +-e"'. It seems better to force POSIX lovers to use POSIXLY_CORRECT +env. variable and stay backwardly compatible by default. + +Addresses: https://github.com/util-linux/util-linux/issues/1703 +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2088493 +Signed-off-by: Karel Zak +--- a/text-utils/more.c b/text-utils/more.c +@@ -2052,8 +2052,11 @@ int main(int argc, char **argv) + if (!(strcmp(program_invocation_short_name, "page"))) + ctl.no_scroll++; + ++ ctl.exit_on_eof = getenv("POSIXLY_CORRECT") ? 0 : 1; ++ + if ((s = getenv("MORE")) != NULL) + env_argscan(&ctl, s); ++ + argscan(&ctl, argc, argv); + + /* clear any inherited settings */ + diff --git a/sys-apps/util-linux/util-linux-2.38.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r1.ebuild new file mode 100644 index ..746b411e2e6e --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.38.1-r1.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_{9..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} == ]] ; 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" + 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? ( sys-devel/gettext ) + test? ( sys-devel/bc ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + acct-group/root +" +RDEPEND+=" + hardlink? ( !app-arch/hardlink ) +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 25782eb0f14e3ed02ae651d44e0f3259c643b6ab Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Jan 18 12:33:18 2023 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Jan 18 12:33:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25782eb0 sys-apps/util-linux: add dependency on acct-group/root (needed during install) Signed-off-by: Andreas K. Hüttel gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 1 + sys-apps/util-linux/util-linux-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index 4a3f29503756..f614835c865b 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -65,6 +65,7 @@ BDEPEND=" DEPEND=" ${RDEPEND} virtual/os-headers + acct-group/root " RDEPEND+=" hardlink? ( !app-arch/hardlink ) diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index b71617b0fc5c..f76687a5bc42 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -65,6 +65,7 @@ BDEPEND=" DEPEND=" ${RDEPEND} virtual/os-headers + acct-group/root " RDEPEND+=" hardlink? ( !app-arch/hardlink )
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 3341e94d64b0ccde9f2506b78a88ddce5d6b5f8a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 13 18:55:40 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 13 18:55:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3341e94d sys-apps/util-linux: Stabilize 2.38.1 sparc, #888447 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index 66c1ff075870..977f03aea06e 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 4f0037b06464c6f5556319039d01939ddca3d64d Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 13 13:37:02 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 13 13:37:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0037b0 sys-apps/util-linux: Stabilize 2.38.1 ppc64, #888447 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index c56daa8d4939..66c1ff075870 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: abf0b5413de9be5318a13dd4f1d7a2f50f2d90e2 Author: Matt Turner gentoo org> AuthorDate: Mon Jan 9 15:25:48 2023 + Commit: Matt Turner gentoo org> CommitDate: Mon Jan 9 15:25:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf0b541 sys-apps/util-linux: Add Python 3.11 compatibility Signed-off-by: Matt Turner gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- sys-apps/util-linux/util-linux-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index 0bb5603d9c24..c56daa8d4939 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd diff --git a/sys-apps/util-linux/util-linux-.ebuild b/sys-apps/util-linux/util-linux-.ebuild index 59eecef07674..ad5755f84912 100644 --- a/sys-apps/util-linux/util-linux-.ebuild +++ b/sys-apps/util-linux/util-linux-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: 2ac0d55665d99c02c960ea6427cfe2a8cccbfddd Author: Sam James gentoo org> AuthorDate: Tue Jan 3 06:21:46 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jan 3 06:22:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac0d556 sys-apps/util-linux: Stabilize 2.38.1 amd64, #888447 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index bcf9a09b7ac4..0bb5603d9c24 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: af934c5cd71ea44308a96e8120c35d28b4ed9718 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 25 20:13:31 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 25 20:14:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af934c5c sys-apps/util-linux: Stabilize 2.38.1 arm, #888447 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index 269c710e31bb..bcf9a09b7ac4 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
commit: c21854d94eb9c64496d247ff1e70b515d1de4d13 Author: Sam James gentoo org> AuthorDate: Sun Dec 25 20:12:39 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 25 20:13:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21854d9 sys-apps/util-linux: Stabilize 2.38.1 arm64, #888447 Signed-off-by: Sam James gentoo.org> sys-apps/util-linux/util-linux-2.38.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild index 59eecef07674..269c710e31bb 100644 --- a/sys-apps/util-linux/util-linux-2.38.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild @@ -19,7 +19,7 @@ else 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" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";