From d46d1d3a5897cade51811b3848c7bf27969da625 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2023 07:37:55 +0000 Subject: gentoo auto-resync : 28:12:2023 - 07:37:55 --- sys-apps/util-linux/Manifest | 8 +- .../files/util-linux-2.39.2-backport-pr2251.patch | 268 ++++++++++++++ sys-apps/util-linux/util-linux-2.39.1-r1.ebuild | 402 --------------------- sys-apps/util-linux/util-linux-2.39.2-r1.ebuild | 1 + sys-apps/util-linux/util-linux-2.39.3-r1.ebuild | 1 + 5 files changed, 273 insertions(+), 407 deletions(-) create mode 100644 sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch delete mode 100644 sys-apps/util-linux/util-linux-2.39.1-r1.ebuild (limited to 'sys-apps/util-linux') diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 4aa7b3a750cc..d7e73dff9569 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -5,18 +5,16 @@ AUX util-linux-2.38.1-check-for-sys-pidfd.h.patch 1764 BLAKE2B 4d71d6b708ad7a1d1 AUX util-linux-2.38.1-more-posix-exit-on-eof.patch 1216 BLAKE2B ee99884ef388a342aeceff4b6988b45cfe21dfc41fa3d978f1a4b57b35682d5cb0ca48c060d9694368ed06651661984eddb9ae70a00f7eb360fad9798caaddc5 SHA512 78136beaf600f99a5404222b6d6d7499ea40fc4e6401a36bd51e8c4183b925004a0f37a079b13b9c1c0824a7f22f43a16c8358c5e8ddfe55dd0019de58579195 AUX util-linux-2.39.1-mount-no-statx.patch 1198 BLAKE2B 1dee2438c2e8537c08b88f5835cab8db01bd06bd4dbf12dae92d3fda340e0d6b8762c132811a8617cb219fd2554a0bb6799caf8123764d7757f7ebbac1c9ca86 SHA512 dd8c0fef93bfe089bd13e4aae866255bf250303407dccc980a4c868dd4821283e1887807e485defb51a114b26fc532868dc964358a6e1d123bb8eccc8784f5e1 AUX util-linux-2.39.1-wall-no-tty.patch 1010 BLAKE2B 175ec148ede79a66650e0ab4c2ef4ad3ccefc958a3f4627db398b3dfa27e8a9e3bf26ccdd0258fcfa719c5f964ec04a5c427c2dc64de318516cf791e0481ebd6 SHA512 4b02a04656b7b9eeafa7903a5f0efe5ae89484022cdb963b53659284da86a12c398ef51cdf0c78e446c5b2f29f6bd5965155a02923411da5655911153d3e5191 +AUX util-linux-2.39.2-backport-pr2251.patch 6779 BLAKE2B bb8d4be48a55931e7f45a95953c1dd6e7ff59f7559b27ad254c2c3643cf0e6410fcd49da3a7d21af70ea1066a883e9db7c75e425baa983ed3a2918ec517fce82 SHA512 8c949125525a4e13086c63595da6c7423a747165ecf3357f2fbcf95cd5cf7840c7c33e992cf66151598a52d5d6e1fe04f5d6059efe044b41882002b808ff937c AUX util-linux-2.39.2-fincore-test.patch 848 BLAKE2B 8320b3ddc561907f6c34e6cf916202c30ab1671cd3e4f7a41187ecbe4efab7fd172d48271073d3d8aadc5c3ae2ee06c5a73b54af0165e5a885e1c5690db40eff SHA512 0562d2102fe1dea0579afcf1353844c8b84c61c6ed1ccfce3a2f010889000623f931fd2d2a0046f570ef5e8ffa0df98b19ce046903090043b292a0529b1db4b9 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.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 EBUILD util-linux-2.38.1-r3.ebuild 10645 BLAKE2B 7fab19810c7c8457592a7fbc1177b85157977cb1c0becc3a1d67f501938d92ec855d562ef8fdf0cd6ee22e611a6585f9074720015603cd0206bd3c7f339a771b SHA512 b9bd8c93df46fdb91b82c36d49b2ab0c6cc1f9ba3a76ebdc919cb49f98dff0d314643852a57cf15401e5a60f45833086cd01c0b531d856e25ef5f0a2a6734513 -EBUILD util-linux-2.39.1-r1.ebuild 10970 BLAKE2B 8dff56f232b8d39da5376b2d10e329ab5736496f8d077157db144e97bdb256a25e310a834d88bb8cc2021a4b56f87f8fb93bd499f3b469001a01a311edcb8713 SHA512 3bf85fa3b465b73dffd698727cb49506bbc159c00bbd6bd1ee04788f885fe4b99cf3adf7d7ab9c39e4d7e3dc0a650d789ff833b9acb96a0cd0b8925cfcf20132 -EBUILD util-linux-2.39.2-r1.ebuild 10825 BLAKE2B 9436f0972d53e9b87b6cdf77411914201ec2ab2370c0de3e08651cf9f088878f6283b5181ebc00e6d17c5c5c8dd7e5b52f34af231ee980d2521a02fbe22c4079 SHA512 7c62690273ab8778c60f2cfcfdd5394d08c8032889b568e41f0a3ea3ad6d97d15ac28384f5d7b32a192630ed0a53437c028507238a5d67eb9708b43f30d8b84f -EBUILD util-linux-2.39.3-r1.ebuild 10828 BLAKE2B 3f16a8b6c1f628066914694ade75aedb190013cfdad52c56f816984ce83e41b754d36791920028ee98fbb25bfa233497637cc491c2dfd4cf26998d9b541299e9 SHA512 6914bedd1e2ecac1d94516c80e5257b797eb4caab7838e3fa014b372473e3f6258530284abceae9a660f3aa180a6c2f874f4541061657f3f59b7d30d6219f81c +EBUILD util-linux-2.39.2-r1.ebuild 10875 BLAKE2B 99defc81c53b5d3c353fed44ded27cd6bca8b603814ecad10b1ef63550680f527a0a4beab782dd13d4cf456a579a4bd1501405dfb73493bbb01a16ac78f8b2c0 SHA512 2002f9e25c11ee2f9cb21e6299c004786e5ec5185aafb62aab826bce1e3581ad5cff8ec39b8e07200f3609ff9b4cce9b625cc03571c3ba21c23423ca72ec3c8d +EBUILD util-linux-2.39.3-r1.ebuild 10878 BLAKE2B b272bab87d52ad30e6089f5719b63b0f7bd0805f861964b6a816b2e5d05af9c1d04b2bb12ef3c425757fa2d6e2692af681a7f7d5855238deb41fb8e6574451f2 SHA512 a02435c0d4cbd0d5cabdfba42e7d75c4ca3d7b1e3562ccea5037d893056590a0b6507fd727b23ee62720013175c51e49eb493bfb1637cdee1d09f9af6d41a6ef EBUILD util-linux-9999.ebuild 10457 BLAKE2B b18f1badfd72af441dea9804749f6ff8d1aa36e1baca9e4145590ae9f2d6f49210795d47334bb58583639f41fca86cbc4d143331707a804e8ddb3ea2cc070ffa SHA512 67a55693d33b02b238796ebee9be191258ab420b2b6ac0e160f4f1fce9d2dc3f840a58cef8d67bf5ab67908e6717c619075731e7918ad0804d07049ad9e190c5 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch b/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch new file mode 100644 index 000000000000..b16519bb5142 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch @@ -0,0 +1,268 @@ +https://bugs.gentoo.org/914791 +https://github.com/util-linux/util-linux/issues/2249 +https://github.com/util-linux/util-linux/pull/2251 + +From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sun, 21 May 2023 21:42:14 +0200 +Subject: [PATCH 1/4] fadvise: (test) dynamically calculate expected test + values +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Weißschuh +--- + tests/ts/fadvise/drop | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 7c7eee5dc2..86c0d5b0a3 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -16,7 +16,7 @@ ts_check_prog "sleep" + ts_cd "$TS_OUTDIR" + + FILE="ddtest" +-BS=4k ++BS=4096 + COUNT=8 + + FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" +@@ -41,22 +41,22 @@ create_file() { + echo + + create_file +- echo "offset: 8192" +- "$TS_CMD_FADVISE" -o 8192 "$FILE" ++ echo "offset: $(( 2 * $BS ))" ++ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" + echo status: $? + "$TS_CMD_FINCORE" "$FILE" + echo + + create_file +- echo "length: 16384" +- "$TS_CMD_FADVISE" -l 16384 "$FILE" ++ echo "length: $(( 4 * $BS ))" ++ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" + echo status: $? + "$TS_CMD_FINCORE" "$FILE" + echo + + create_file +- echo "offset: 8192, length: 16384 fd: 42" +- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE" ++ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" ++ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" + echo status: $? + "$TS_CMD_FINCORE" "$FILE" + echo + +From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sun, 21 May 2023 21:43:38 +0200 +Subject: [PATCH 2/4] fadvise: (tests) factor out calls to "fincore" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will make it easier to pass argument later. + +Signed-off-by: Thomas Weißschuh +--- + tests/ts/fadvise/drop | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 86c0d5b0a3..8869b7da4d 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -28,37 +28,41 @@ create_file() { + dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null + } + ++do_fincore() { ++ "$TS_CMD_FINCORE" "$FILE" ++} ++ + { + create_file +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "whole file" + "$TS_CMD_FADVISE" "$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "offset: $(( 2 * $BS ))" + "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "length: $(( 4 * $BS ))" + "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" + "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + rm "$FILE" + +From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sun, 21 May 2023 21:44:20 +0200 +Subject: [PATCH 3/4] fadvise: (test) don't compare fincore page counts +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These depend on the machines pagesize and are therefore not a good +comparision. + +Signed-off-by: Thomas Weißschuh +--- + tests/expected/fadvise/drop | 20 ++++++++++---------- + tests/ts/fadvise/drop | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop +index f2360b56fb..25f23e050a 100644 +--- a/tests/expected/fadvise/drop ++++ b/tests/expected/fadvise/drop +@@ -1,23 +1,23 @@ +- RES PAGES SIZE FILE +- 32K 8 32K ddtest ++ RES SIZE FILE ++ 32K 32K ddtest + + whole file + status: 0 +-RES PAGES SIZE FILE +- 0B 0 32K ddtest ++RES SIZE FILE ++ 0B 32K ddtest + + offset: 8192 + status: 0 +-RES PAGES SIZE FILE +- 8K 2 32K ddtest ++RES SIZE FILE ++ 8K 32K ddtest + + length: 16384 + status: 0 +- RES PAGES SIZE FILE +- 16K 4 32K ddtest ++ RES SIZE FILE ++ 16K 32K ddtest + + offset: 8192, length: 16384 fd: 42 + status: 0 +- RES PAGES SIZE FILE +- 16K 4 32K ddtest ++ RES SIZE FILE ++ 16K 32K ddtest + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 8869b7da4d..6c4298e872 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -29,7 +29,7 @@ create_file() { + } + + do_fincore() { +- "$TS_CMD_FINCORE" "$FILE" ++ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" + } + + { + +From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sun, 21 May 2023 21:45:10 +0200 +Subject: [PATCH 4/4] fadvise: (test) test with 64k blocks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will allow the tests to also pass on systems with 64k pagesizes. + +Closes #2249 +Signed-off-by: Thomas Weißschuh +--- + tests/expected/fadvise/drop | 26 +++++++++++++------------- + tests/ts/fadvise/drop | 2 +- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop +index 25f23e050a..e7bb26b6e2 100644 +--- a/tests/expected/fadvise/drop ++++ b/tests/expected/fadvise/drop +@@ -1,23 +1,23 @@ +- RES SIZE FILE +- 32K 32K ddtest ++ RES SIZE FILE ++ 512K 512K ddtest + + whole file + status: 0 +-RES SIZE FILE +- 0B 32K ddtest ++RES SIZE FILE ++ 0B 512K ddtest + +-offset: 8192 ++offset: 131072 + status: 0 +-RES SIZE FILE +- 8K 32K ddtest ++ RES SIZE FILE ++ 128K 512K ddtest + +-length: 16384 ++length: 262144 + status: 0 +- RES SIZE FILE +- 16K 32K ddtest ++ RES SIZE FILE ++ 256K 512K ddtest + +-offset: 8192, length: 16384 fd: 42 ++offset: 131072, length: 262144 fd: 42 + status: 0 +- RES SIZE FILE +- 16K 32K ddtest ++ RES SIZE FILE ++ 256K 512K ddtest + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 6c4298e872..45dcb9110b 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -16,7 +16,7 @@ ts_check_prog "sleep" + ts_cd "$TS_OUTDIR" + + FILE="ddtest" +-BS=4096 ++BS=65536 + COUNT=8 + + FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" 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 deleted file mode 100644 index 0359a454d671..000000000000 --- a/sys-apps/util-linux/util-linux-2.39.1-r1.ebuild +++ /dev/null @@ -1,402 +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} == 9999 ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/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} == 9999 ]] ; then - # Required for man-page generation - BDEPEND+=" dev-ruby/asciidoctor" -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.39.1-mount-no-statx.patch - "${FILESDIR}"/${PN}-2.39.1-wall-no-tty.patch -) - -pkg_pretend() { - if use su && ! use suid ; then - elog "su will be installed as suid despite USE=-suid (bug #832092)" - elog "To use su without suid, see e.g. Portage's suidctl feature." - fi -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if use test ; then - # Prevent uuidd test failure due to socket path limit, bug #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - - # Known-failing tests - # TODO: investigate these - local known_failing_tests=( - # Subtest 'options-maximum-size-8192' fails - hardlink/options - - # Fails in sandbox - lsns/ioctl_ns - - lsfd/mkfds-symlink - lsfd/mkfds-rw-character-device - ) - - local known_failing_test - for known_failing_test in "${known_failing_tests[@]}" ; do - einfo "Removing known-failing test: ${known_failing_test}" - rm tests/ts/${known_failing_test} || die - done - - fi - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - else - elibtoolize - fi -} - -python_configure() { - local myeconfargs=( - "${commonargs[@]}" - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - --with-python - --enable-libblkid - --enable-libmount - --enable-pylibmount - ) - - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - popd >/dev/null || die -} - -multilib_src_configure() { - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. bug #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - - # bug #485486 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) - # bug #545042 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) - - # Undo bad ncurses handling by upstream. Fall back to pkg-config. - # bug #601530 - export NCURSES6_CONFIG=false NCURSES5_CONFIG=false - export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false - - # Avoid automagic dependency on ppc* - export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas) - - # configure args shared by python and non-python builds - local commonargs=( - --localstatedir="${EPREFIX}/var" - --runstatedir="${EPREFIX}/run" - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - - # 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=( - "${commonargs[@]}" - --with-bashcompletiondir="$(get_bashcompdir)" - --without-python - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) - $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(multilib_native_use_with audit) - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable nls poman) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with ncurses tinfo) - $(use_with selinux) - ) - - if multilib_is_native_abi ; then - myeconfargs+=( - --disable-chfn-chsh - --disable-login - --disable-newgrp - --disable-nologin - --disable-pylibmount - --disable-raw - --disable-vipw - --enable-agetty - --enable-bash-completion - --enable-line - --enable-partx - --enable-rename - --enable-rfkill - --enable-schedutils - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable caps setpriv) - $(use_enable cramfs) - $(use_enable fdformat) - $(use_enable hardlink) - $(use_enable kill) - $(use_enable logger) - $(use_enable ncurses pg) - $(use_enable su) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_with cryptsetup) - ) - if [[ ${PV} == *9999 ]] ; then - myeconfargs+=( --enable-asciidoc ) - else - # Upstream is shipping pre-generated man-pages for releases - myeconfargs+=( --disable-asciidoc ) - fi - else - myeconfargs+=( - --disable-all-programs - --disable-asciidoc - --disable-bash-completion - --without-systemdsystemunitdir - --disable-poman - - # build libraries - --enable-libuuid - --enable-libblkid - --enable-libsmartcols - --enable-libfdisk - --enable-libmount - ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_configure - fi -} - -src_configure() { - append-lfs-flags - multilib-minimal_src_configure -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - emake all - popd >/dev/null || die -} - -multilib_src_compile() { - emake all - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_compile - fi -} - -python_test() { - pushd "${BUILD_DIR}" >/dev/null || die - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - popd >/dev/null || die -} - -multilib_src_test() { - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - if multilib_is_native_abi && use python ; then - python_foreach_impl python_test - fi -} - -python_install() { - pushd "${BUILD_DIR}" >/dev/null || die - emake DESTDIR="${D}" install - python_optimize - popd >/dev/null || die -} - -multilib_src_install() { - if multilib_is_native_abi && use python ; then - python_foreach_impl python_install - fi - - # This needs to be called AFTER python_install call, bug #689190 - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - # Need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didn't install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if use pam ; then - # See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - - newpamd "${FILESDIR}/su-l.pamd" su-l - fi - - if use su && ! use suid ; then - # Always force suid su, even when USE=-suid, as su is useless - # for the overwhelming-majority case without suid. - # Users who wish to truly have a no-suid su can strip it out - # via e.g. Portage's suidctl or some other hook. - # See bug #832092 - fperms u+s /bin/su - fi - - # Note: - # Bash completion for "runuser" command is provided by same file which - # would also provide bash completion for "su" command. However, we don't - # use "su" command from this package. - # This triggers a known QA warning which we ignore for now to magically - # keep bash completion for "su" command which shadow package does not - # provide. - - local ver=$(tools/git-version-gen .tarballversion) - local major=$(ver_cut 1 ${ver}) - local minor=$(ver_cut 2 ${ver}) - local release=$(ver_cut 3 ${ver}) - export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}" -} - -pkg_postinst() { - if ! use tty-helpers ; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} 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 dfe02624672b..2218c522f5d8 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 @@ -99,6 +99,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch + "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch ) pkg_pretend() { 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 8c83d7e9c777..dd2902dbc1f1 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 @@ -99,6 +99,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch + "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch ) pkg_pretend() { -- cgit v1.2.3