From bfd63d5b0e96ad32e0d0a8fe15512b6a9ac6fc9e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2024 00:05:36 +0100 Subject: gentoo auto-resync : 21:05:2024 - 00:05:35 --- sys-apps/Manifest.gz | Bin 51371 -> 51390 bytes sys-apps/daisydog/Manifest | 2 +- sys-apps/daisydog/metadata.xml | 5 +- sys-apps/grep/Manifest | 2 +- sys-apps/grep/grep-3.11-r1.ebuild | 2 +- sys-apps/man-db/Manifest | 6 +- sys-apps/man-db/man-db-2.12.0.ebuild | 5 +- sys-apps/man-db/man-db-2.12.1.ebuild | 3 + sys-apps/man-db/man-db-9999.ebuild | 3 + sys-apps/nosig/Manifest | 2 +- sys-apps/nosig/metadata.xml | 6 +- sys-apps/util-linux/Manifest | 6 +- sys-apps/util-linux/files/uuidd.initd | 7 + sys-apps/util-linux/util-linux-2.40.1-r1.ebuild | 432 ------------------------ sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 432 ++++++++++++++++++++++++ sys-apps/util-linux/util-linux-9999.ebuild | 4 +- 16 files changed, 463 insertions(+), 454 deletions(-) delete mode 100644 sys-apps/util-linux/util-linux-2.40.1-r1.ebuild create mode 100644 sys-apps/util-linux/util-linux-2.40.1-r3.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 56bd0a6d0483..8dee52282712 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest index c108d50674fc..37edfade9794 100644 --- a/sys-apps/daisydog/Manifest +++ b/sys-apps/daisydog/Manifest @@ -4,4 +4,4 @@ AUX daisydog.init.d-r1 328 BLAKE2B ffaa2733df070d7c52ce64e0bdb084ec7ec3b25679e7e DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5 EBUILD daisydog-2014.05.30-r1.ebuild 890 BLAKE2B cc637758901fbff60eea3c61d199ad84a248a8a9dc301c88239fbb689b62787e6498685e323add23809690264fee0ca043cafa3ec5feecf7a6b3a5d0e840ca38 SHA512 8bf018d63ffe4f3697e843aa3321be1c9c63180a821c967db8d274a85af389c2a8dae4fe2d5362fbfdd6f3ed5452a03da1d2c1d62f98e23c685e0eeb7993308f EBUILD daisydog-2014.05.30.ebuild 880 BLAKE2B c9fbccaa8f7d1769019e9dd12de3f2c4d94d7a56d790667b4fb44522c4b4c228696cfd5378fa62d9f657caa5412f6410cac94f383b7e377fba6879cb10e297f2 SHA512 00e7357d2f3e0e19b3c39cd77fbb81c696423617ee6a8f85374c5e513c45449f64f34cc8bba48dd3308f2a3f918884a0057812cedd6ddfa5c838fb219c5241cc -MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/sys-apps/daisydog/metadata.xml b/sys-apps/daisydog/metadata.xml index 7517f8d97dd7..115e9d64a669 100644 --- a/sys-apps/daisydog/metadata.xml +++ b/sys-apps/daisydog/metadata.xml @@ -1,8 +1,5 @@ - - Mike Frysinger - vapier@gentoo.org - + diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index b7984e37d275..b6f424ce57dd 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,6 +1,6 @@ AUX grep-3.11-100k-files-dir.patch 4488 BLAKE2B 54d97710fbfe400980cd2fa7385fb7b10a481b138be5f37a17ec43843dab90b18ca61afb957cead8ee3f7dbb4f9b49f28e6cd3b54f33b3dc3e1b3b5d577d3ce3 SHA512 9e1948be0115f225fcca01763f1dbfd25c32b0ba48e543d2c25ad73b0e155f1fc1aa0c6277cce9cf65d226f3b878b718bd42b4b89f7c1f2750382ae54b76b871 DIST grep-3.11.tar.xz 1703776 BLAKE2B e21785bca20b5a090d32bb5dc525fb298af30165106ed4c289b1518ea3d2acdcacfd6309b12f13be29a4b958f19588546119c695deb2b7500d49dcff86357bdc SHA512 f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42 DIST grep-3.11.tar.xz.sig 833 BLAKE2B 5edfba20e3a9f54d25ae63cf04985382bf6afb0ca643979561321090614e68b5d234767b07e48211888722c52c441233093735e183ff69432d5ee2e6a4f53aea SHA512 487aba063373ca0594c519991f19b2a6a33b3da0d74735c890f3828fd0880e7e6f64495d2c8f9efa5da53d1eb2d446609bab2399a4b89dcb4510a632e31ffb54 -EBUILD grep-3.11-r1.ebuild 3169 BLAKE2B ec46924d738bbc7619f040ac07bf7c2f699b5cb4fc0778d883d2a360710965dea449d1b38af89ca594e3c545abdf5452a55a3d291dbd701084e4d7ba82b28bba SHA512 40161b9bc53462f35f4a026892bb3116ca0602cfeeb46db30277208009eb25942518794835b0ac67a5d884f03751b84906eaac30fa0baeeacaf0a1858aa6a187 +EBUILD grep-3.11-r1.ebuild 3168 BLAKE2B 043743a3820f1285fdaa05e7c760127084891f99786d7a0c1b5d40b1807114026357050c6fa4e34f4013e63a8b81ee7296182e969a8ffb3a83dcfbd87965c64b SHA512 a0fa3a0638d879d5addca898aa30eb406f23c027f9892fb3735149e87e183dd51b1efbe2f916fbb5e18ba4c2a455973257d52e8440543b50ed43eeef96425d00 EBUILD grep-3.11.ebuild 2965 BLAKE2B 90d42080d7615909a4e6554cd6a366e64a3535f12d06a70ebc451771565b3644afa62a524d2e7bd397cfd60f7e577a0568f1f6b0e4dd0ddd5ca639f8e2ba6ee8 SHA512 d04e7d9202f03895b0f0e0919e07b5167ff5d59bd34f751114fbadf50822c8531c6ed6d847649b2f30b9a3475b3778da3383b43b42a5a9c765463243ddd8f53c MISC metadata.xml 712 BLAKE2B 9cc40dc17c2f903378eba194b71412eca93b013576e23f8deafbce55262b52ec799d11612856d30c91c4fddd51236f4c1a670c39ed0b38b2751dcd9c456cbb9f SHA512 46734c74422d8dfe79bbf635d34e200db3b884be830bf275cb95ac0dea5fc2ada7d2745dff1d535efbf6cc4277381347d13f3f2551a2901a6fcdbf598151953b diff --git a/sys-apps/grep/grep-3.11-r1.ebuild b/sys-apps/grep/grep-3.11-r1.ebuild index e330ebb9fbd4..4768f27624a6 100644 --- a/sys-apps/grep/grep-3.11-r1.ebuild +++ b/sys-apps/grep/grep-3.11-r1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-3+" diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 38108426c7f0..67f1cca3149e 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -4,7 +4,7 @@ DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176 DIST man-db-2.12.0.tar.xz 1987444 BLAKE2B a6258c1fc9cd81be5d288298660f5b9bda22d726ef98dd5c0a1998809a32391f7244be6897ee8e03483e705a426d6a59d442de3dc2e84f45500daa825ac639db SHA512 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf DIST man-db-2.12.1.tar.xz 2041380 BLAKE2B b06c48431608cf798659d19df754d992dca8ba31842613a3326e376e80fe74d913146f45a7f3c5e70c421a2401aeabdb091de78ebb3102b9d70c194286c245a7 SHA512 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329 EBUILD man-db-2.11.2.ebuild 5086 BLAKE2B 406c4420f624699316cd0fede3756738f38b84033dbb3ca884b7921729738b098db428156faa6cdca1a7a2aee4128f6e0c9107473f2965f2e83a67f2672fc118 SHA512 6f2b1b64720de1aca1c009218dabe589a4be49e649d08eeb51187750719fb42a60f3795246f4334d78d57917ef86fe349d73af499fb7aeb93229ea5b4af90601 -EBUILD man-db-2.12.0.ebuild 5114 BLAKE2B 9e11654946a22c91339940ef7fe676935f1108756e7db938757c59bdacd068010feea0d1f3213d93eb17e09a832500312aecdeed5ec5a8be6699246370d111c6 SHA512 ee12a25768839a03616abe45a648b019abf9ab5cf1d4bc73abd35d6864d0c776c090a09174bbba20d6e6f47a43b6e540130fd26535f07c49ba0c1d85e27f90d9 -EBUILD man-db-2.12.1.ebuild 5205 BLAKE2B b6834b3d9024977301c33fdc2305d4d3c7dd00675b979f0b09828efb69530dfbc8f792f4eb1fe21ab86642f529bd73261ccd0fc202be9d8292083b16d4f41c0d SHA512 c923727d67834b33e90e63e04b068f4dd44fd2f0cf7e3bc3e8b26295b586ad91c5b4d6489886f4700df5e4d5c924baebf0f1c71ab618cea4dbb2702616c672b1 -EBUILD man-db-9999.ebuild 5205 BLAKE2B b6834b3d9024977301c33fdc2305d4d3c7dd00675b979f0b09828efb69530dfbc8f792f4eb1fe21ab86642f529bd73261ccd0fc202be9d8292083b16d4f41c0d SHA512 c923727d67834b33e90e63e04b068f4dd44fd2f0cf7e3bc3e8b26295b586ad91c5b4d6489886f4700df5e4d5c924baebf0f1c71ab618cea4dbb2702616c672b1 +EBUILD man-db-2.12.0.ebuild 5151 BLAKE2B 35baebfc8a608baaff255699403d356e58c4663b9a55005d9a13d36b07415b8e23a73ceb0c3ab1beaa849dfe3510e3547de07284094ea6432bf0651d803037c1 SHA512 7069ca85d19e3d331be0ac82398e5936c4956c957771df3eb52ba48e6c420e831039caec1fdf79ff0357a61053ee29a9fa9142ef5e5beb78b76e8ae0a64b5176 +EBUILD man-db-2.12.1.ebuild 5242 BLAKE2B 4bfee22d4d5c2ad7ea4ec3003c578eb2cedb543465f2fbe90411300c3f16e28474bbb151ac96ffae08198bfa78a3a8886441b38b22175934cde07ef4eb992c12 SHA512 d254eea4cd658646ca2663dfeaa6d0667e3d80d5466ccd5c1c58f57cff929a4e11f1269b3faa3a701df7393a8e0961d4c52ea866463e66d922b24ddffb5168ae +EBUILD man-db-9999.ebuild 5242 BLAKE2B 4bfee22d4d5c2ad7ea4ec3003c578eb2cedb543465f2fbe90411300c3f16e28474bbb151ac96ffae08198bfa78a3a8886441b38b22175934cde07ef4eb992c12 SHA512 d254eea4cd658646ca2663dfeaa6d0667e3d80d5466ccd5c1c58f57cff929a4e11f1269b3faa3a701df7393a8e0961d4c52ea866463e66d922b24ddffb5168ae MISC metadata.xml 493 BLAKE2B 33282cbeba0e727dbe080ce8dab8b903590f4139d346e260d950d531fadee3c9a36451b8ec37564b313c8c2fa3ce0accf41cb632db2b2f709287fae4c57bcfd5 SHA512 2ac84cdda859f02a19005ca0cc43b84160171f9080a100491cef5451d0ba3f6d38cdbfb4da35bf38b1942f14eae8ea705774820c2c7a0cd86d4bc9540c9c5490 diff --git a/sys-apps/man-db/man-db-2.12.0.ebuild b/sys-apps/man-db/man-db-2.12.0.ebuild index 795e71f73b1f..100ac1d652e1 100644 --- a/sys-apps/man-db/man-db-2.12.0.ebuild +++ b/sys-apps/man-db/man-db-2.12.0.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 @@ -11,6 +11,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://gitlab.com/man-db/man-db" else + inherit libtool # TODO: Change tarballs to gitlab too...? SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" @@ -73,6 +74,8 @@ src_prepare() { sh ./bootstrap "${bootstrap_opts[@]}" || die eautoreconf + else + elibtoolize fi hprefixify src/man_db.conf.in diff --git a/sys-apps/man-db/man-db-2.12.1.ebuild b/sys-apps/man-db/man-db-2.12.1.ebuild index edcfb60226c1..cf68b64447c6 100644 --- a/sys-apps/man-db/man-db-2.12.1.ebuild +++ b/sys-apps/man-db/man-db-2.12.1.ebuild @@ -11,6 +11,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://gitlab.com/man-db/man-db" else + inherit libtool # TODO: Change tarballs to gitlab too...? SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" @@ -78,6 +79,8 @@ src_prepare() { sh ./bootstrap "${bootstrap_opts[@]}" || die eautoreconf + else + elibtoolize fi hprefixify src/man_db.conf.in diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index edcfb60226c1..cf68b64447c6 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -11,6 +11,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://gitlab.com/man-db/man-db" else + inherit libtool # TODO: Change tarballs to gitlab too...? SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" @@ -78,6 +79,8 @@ src_prepare() { sh ./bootstrap "${bootstrap_opts[@]}" || die eautoreconf + else + elibtoolize fi hprefixify src/man_db.conf.in diff --git a/sys-apps/nosig/Manifest b/sys-apps/nosig/Manifest index 8a17a89c82ac..f70c0e9d28ae 100644 --- a/sys-apps/nosig/Manifest +++ b/sys-apps/nosig/Manifest @@ -1,3 +1,3 @@ DIST nosig-2.tar.gz 15586 BLAKE2B d49bf9f9d4b443e8bcbee11e59beac4593e1429c414d7b0e2b7e31cdea9dd68c53b3604fdc8c8a0eabf2753aed64ee60f5e70f92aec807fb2030b83df0ed191b SHA512 9cc00a0250def091e5df070506128d260300909cc8664d9cee4d9fe459b1b8362a5671ad5b537675fb7e15665750a158e19193171aefa973d932756ea15b3430 EBUILD nosig-2.ebuild 475 BLAKE2B 3093563282c421f6225dee21ab55e78a722e1805055f841ea6928f8d24d13a232ee7a88284a797d0515434b7acfc335bdfe9543e12e7d2fbc9fb2f1ca746e143 SHA512 e7b5f52806c8840a1d40659bf188bb449a19861b88663d5f68e68c2d178436af1eea7325435c295d3d98726aabb293af19bc3c971b1ec261da62a5da74ef1721 -MISC metadata.xml 296 BLAKE2B 8730075a71482e6863724cb45219e404dd14251f1be3d4591f1f0df0e54b12da404dbab24c10d06d9cc1f4c74d0e60b666e9613f0a90024e92f48f8edb84b736 SHA512 3635b8c677af028c2b701ce3298d3e0f965f4d2d73a73b348ebf9bcdfc776e25702884fd72049523cb63532751be5a87ad1a22648ee514d9c41795183a71ec4a +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/sys-apps/nosig/metadata.xml b/sys-apps/nosig/metadata.xml index 11c18486599d..115e9d64a669 100644 --- a/sys-apps/nosig/metadata.xml +++ b/sys-apps/nosig/metadata.xml @@ -1,9 +1,5 @@ - - Mike Frysinger - vapier@gentoo.org - Primary maintainer - + diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 182f38bacb2f..240e0e7e9e59 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -10,7 +10,7 @@ AUX util-linux-2.39.3-libblkid-luks.patch 1499 BLAKE2B d08f33f3be0709abb3969a898 AUX util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch 1710 BLAKE2B 04a3b4db45447556edbf66bdb9bf9c895cdf47a801b41743603b14420bcffe9618c17c8153b6800b872dbc28d1e5c33a55667f2a31e9ff63f7f026c1beb9f524 SHA512 da91fb5f9443907558f6245d4eee3f578e0f0549866a6e9f39bd82d6123868180c1d2aa357e5ef47f163b7ddf67d1c24f6a4768837f21577b2887555a956afe9 AUX util-linux-2.39.3-musl-1.2.5-basename.patch 1814 BLAKE2B 29463f6aedec98cbd7edaa68e3ef0b6c7a4932e6f1b02948237689e75cb720d406970a6521564dd97c68c922b087f23683c219550c5092755057e734f94bc338 SHA512 74f6ccd530766fdbaac55a20becc8e2ce8dc8aeb65aaba3d22430a7c72e19e9483031b508b4448507d245d42e6d730d0d17ec6bc8edb63eaf0cb8ce0365be4d7 AUX util-linux-2.39.4-umount-readonly.patch 1519 BLAKE2B 80fdd82a9fda61e8cb03a5ceed5f601687cc8a621e8cf2c8d71125bf2aa849d32c413253050d2e4680bbf1636b8add212fe6dd4f7802ccd59b0ff677854b600f SHA512 240863efa932d385aa6b6d999624d4630bbbf0b5ae92f1f341df940167009eeebe0ccec2c460fce69a19988f96a6fa988a740682b3da864ebfc21b1bbeddd3b5 -AUX uuidd.initd 209 BLAKE2B 6c5cb40a6a51643b3588552b3eda5617bd4ee2977b7f11240c354b27225538cfe2a5980b814e0034fdce28cfff790424a7cb8a1aa96d6cb3a6e6f618784d0760 SHA512 7db3e5519c1957f8bcf4611cb1e69762a2714e251f4063ad231d558866535fce30fe88d4adca973bfeb4a5aac38cb276ff2eb271353508857cb97bb127f31ac9 +AUX uuidd.initd 380 BLAKE2B 9c72790654c03d96d059cc8b52ec68ace24c036198e60fd1cd42c06460e426670417a319e97cf82a423c7870b7c966cb9736cdf313929822107b95a50bcbc24e SHA512 5892808de27bcb1bcd4b2498a3208bc198c00c48101902eb0ead005ef7d812f21e824e0a50ab57c900d83cb9d24c66fbd863118faff964b3aa2e844ce17bbbd0 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 @@ -20,6 +20,6 @@ DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923 EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b7848e3c85ab0d548672283cc76bf34eae1bf80aa39cc9afaa7105e5ad9bf0ed0494ddbebe062e7dba6aa9ec0616ee77a7eb2 SHA512 b8cc2a20122f1c094cfbd4fb3652672cf7def1d6d9b38971f2f52511893f9de1e7774ed06c03a17c4b19d58cc564a1291833974ffe0c43778d077165f6f6f538 EBUILD util-linux-2.39.3-r7.ebuild 11232 BLAKE2B 09dcc169238dbec2e428420511062be1571484086784925f8c727ad89c10e4db37d164f2777c7f259f43ef6399c8a36d7478fe2ccb5215fbb683f6e79a81a73a SHA512 ca017f44d330ca86e64413fc78353118cbb75304e60d8c700f1e30e466a614fd888670e9232a12445311828bc356fa00008ea60b935840115da7b96347b40e42 EBUILD util-linux-2.39.4-r1.ebuild 11142 BLAKE2B 1ee7d40ec8a47faafe30845a712be27f31689db47882d95195474970d0ad4dc8fc741782a6b2e8b46e8ed6a87d106f689f226c86e65bfd155bd7739271a282f8 SHA512 f7767ef10dfde3b1c8342a87f576ec2994018b7d22283e9dde2fed33e0711ade68d95f8a2d8e31ba2fea883f8720a9f6024ce02068950fead868436b9fc5ddaa -EBUILD util-linux-2.40.1-r1.ebuild 11331 BLAKE2B afff7841cc378a8ea14631f1cc4fc28cd93c23f5d1ed7ec5bc1b23f6f505c4ff37e5d60cc5508dac692554a1aeae10a6eba14230e8da7faabbd3c752d5480600 SHA512 525715bc25ef55a6f323c6d91151a36ab21d6483f098db83f001e9df964dc55e60b84a0e48896df4f4b263489608011916db235dc891832e3ec3bd0086349f01 -EBUILD util-linux-9999.ebuild 11275 BLAKE2B 7bb396dfafd83a1b8e3fe68792240277ca0f3a2b7c067c3b11e954be3231ad841ac0d98977df46133ef9d4373c9c6c7b72eef42b4f515a73b3f57ccd61239239 SHA512 e321c6ac7afb959707ad8d7ab2e65d9b1fc29de252424af0a77c687fe78a0f1c0dfedbf093bb054351b6847292260f582b50cf6eeebc9d87d61d104861ad31c4 +EBUILD util-linux-2.40.1-r3.ebuild 11359 BLAKE2B 73223610da28fa2866598a1c3ee303116c0d1ed72e5dea37e37a2ec6567a05e3f7711896d221bdc947384e8fa09a4712536fc2af532cff8431b885424df16385 SHA512 53303e45451635c137225a168015598dec0e895fa7b50eac1d61543a66440bd692df370528291c075c900f3aec359d33310a3edce31fc8a0f302da5646d8e2fb +EBUILD util-linux-9999.ebuild 11303 BLAKE2B 9f11f485707d401119e1dc7bc8c1e2808d27e84d9b8e8d4a522f6ea23b5b9274df99d4627ab4421a20692babaaef0a05d066ddd97ad82608b3fab4e5c3970c40 SHA512 aa0e0bce5b200a7b7ecf08d81c187c09276299d7bd2c7bce3b494b55fb78f73fb2d39f5a65226a78f93cdb9093f4f2d4444c1bf7c1f44280d4923834b51eda99 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd index 329929e9a9ab..3ddedc3f3b7f 100644 --- a/sys-apps/util-linux/files/uuidd.initd +++ b/sys-apps/util-linux/files/uuidd.initd @@ -3,8 +3,15 @@ # 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() { 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-r1.ebuild deleted file mode 100644 index c112b4749522..000000000000 --- a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild +++ /dev/null @@ -1,432 +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} ) -TMPFILES_OPTIONAL=1 - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-r1 multilib-minimal multiprocessing systemd tmpfiles - -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} == 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}" - -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 uuidd" - -# 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] - ) - uuidd? ( - acct-user/uuidd - virtual/tmpfiles - ) - !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 )" - -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 - # Known-failing tests - local known_failing_tests=( - # Subtest 'options-maximum-size-8192' fails - 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 - 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 - for known_failing_test in "${known_failing_tests[@]}" ; do - einfo "Removing known-failing test: ${known_failing_test}" - rm tests/ts/${known_failing_test} || die - done - fi - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - else - elibtoolize - fi -} - -python_configure() { - local myeconfargs=( - "${commonargs[@]}" - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - --with-python - --enable-libblkid - --enable-libmount - --enable-pylibmount - ) - - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - popd >/dev/null || die -} - -multilib_src_configure() { - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. bug #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - - # bug #485486 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) - # bug #545042 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) - - # Undo bad ncurses handling by upstream. Fall back to pkg-config. - # bug #601530 - export NCURSES6_CONFIG=false NCURSES5_CONFIG=false - export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false - - # Avoid automagic dependency on ppc* - export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas) - - # configure args shared by python and non-python builds - local commonargs=( - --localstatedir="${EPREFIX}/var" - --runstatedir="${EPREFIX}/run" - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - ) - - local myeconfargs=( - "${commonargs[@]}" - --with-bashcompletiondir="$(get_bashcompdir)" - --without-python - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_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) - $(multilib_native_use_enable uuidd) - - # 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 - ) - - 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 - --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)" - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - $(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 - - # Support uuidd for non-native libuuid - $(use_enable uuidd libuuid-force-uuidd) - ) - 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 - # XXX: -j1 as temporary workaround for bug #931301 - emake DESTDIR="${D}" install -j1 -} - -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 - - 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 - - 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 - # 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 - - if use uuidd; then - tmpfiles_process uuidd-tmpfiles.conf - fi -} 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 new file mode 100644 index 000000000000..a9980ed89514 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -0,0 +1,432 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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 tmpfiles + +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} == 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}" + +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 uuidd" + +# 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] + ) + uuidd? ( + acct-user/uuidd + systemd? ( virtual/tmpfiles ) + ) + !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 )" + +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 + # Known-failing tests + local known_failing_tests=( + # Subtest 'options-maximum-size-8192' fails + 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 + 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 + for known_failing_test in "${known_failing_tests[@]}" ; do + einfo "Removing known-failing test: ${known_failing_test}" + rm tests/ts/${known_failing_test} || die + done + fi + + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + else + elibtoolize + fi +} + +python_configure() { + local myeconfargs=( + "${commonargs[@]}" + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + +multilib_src_configure() { + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. bug #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + + # bug #485486 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) + # bug #545042 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) + + # Undo bad ncurses handling by upstream. Fall back to pkg-config. + # bug #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + + # Avoid automagic dependency on ppc* + export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas) + + # configure args shared by python and non-python builds + local commonargs=( + --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + ) + + local myeconfargs=( + "${commonargs[@]}" + --with-bashcompletiondir="$(get_bashcompdir)" + --without-python + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_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) + $(multilib_native_use_enable uuidd) + + # 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 + ) + + 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 + --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)" + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + $(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 + + # Support uuidd for non-native libuuid + $(use_enable uuidd libuuid-force-uuidd) + ) + 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 + # XXX: -j1 as temporary workaround for bug #931301 + emake DESTDIR="${D}" install -j1 +} + +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 + + 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 + + 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 + # 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 + + if use systemd && use uuidd; then + tmpfiles_process uuidd-tmpfiles.conf + fi +} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 053f45a99077..f3ea42edeeff 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.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 } -- cgit v1.2.3