diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-15 16:36:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-15 16:36:08 +0000 |
| commit | db3d7a26fc91ea36f0780dcc3bcc59efdab02d41 (patch) | |
| tree | f1e4dcd66841437a53a8fad6c9efadbd060f692a /sys-apps/util-linux | |
| parent | 55cd3ff92ff96fafc75066838cfc2af06df3a296 (diff) | |
gentoo auto-resync : 15:11:2023 - 16:36:08
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch | 23 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.39.2.ebuild | 4 |
3 files changed, 29 insertions, 1 deletions
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 6843f71de3fb..f7542fdbbfe3 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -5,6 +5,7 @@ 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-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 @@ -13,6 +14,6 @@ DIST util-linux-2.39.2.tar.sign 833 BLAKE2B 7d804e1e1f162c176cd7f826f505590ed5fc DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3 EBUILD util-linux-2.38.1-r2.ebuild 10526 BLAKE2B b66ce8e3835a86921652c43ae6416d7129cb8c22e2d16eac3977eae36301353d9fde97228f841209832e3777017541f4fe64af8d98a063f34c040ff8f6067f72 SHA512 b9e4773e6154059c5781149b3ceb5017b0d6b72295af11689ae4977658454d45ee3d99f13fdad43c7d880df00107380470d3ab8ca2aef19fc43d206327447604 EBUILD util-linux-2.39.1-r1.ebuild 10970 BLAKE2B 8dff56f232b8d39da5376b2d10e329ab5736496f8d077157db144e97bdb256a25e310a834d88bb8cc2021a4b56f87f8fb93bd499f3b469001a01a311edcb8713 SHA512 3bf85fa3b465b73dffd698727cb49506bbc159c00bbd6bd1ee04788f885fe4b99cf3adf7d7ab9c39e4d7e3dc0a650d789ff833b9acb96a0cd0b8925cfcf20132 -EBUILD util-linux-2.39.2.ebuild 10649 BLAKE2B e4d3129367b023c0e44ffa54468403fffd1765d202e0110fcf85ea1ce14b91ba8b4736e680a735f108eecb9c07c790682373b714e9f9ef1018de37d2106eca33 SHA512 254a0b40e110086a58655eb0ad930a970d61f3bd52ee48f6b8ff51f34a610c1ac2d4a51e46b9a877f8474d920c2f009e93bfc12ceabdfee7f98626aedcc735a1 +EBUILD util-linux-2.39.2.ebuild 10709 BLAKE2B 0fabdce799eae82edee258f586fe5b9770384d3e9aa457d53d5fb9fba107ccaa107b835ee2629b0a014c156872739909c9640c8195aa13db9e581697f6d93518 SHA512 6d69a332f9bb776e0e29a4ea5afd0075031a745660aeaf7dafcca4c83ca0a02fb74d76c48c628984657cf53860c918342250b8af173901696a78e8f6e3c83609 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-fincore-test.patch b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch new file mode 100644 index 000000000000..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?= <thomas@t-8ch.de> +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.camel@physik.fu-berlin.de/ +Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> +--- 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)" |