diff options
Diffstat (limited to 'sys-fs')
76 files changed, 2194 insertions, 459 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 25703652461f..84f89e08c4fc 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index 7add54191981..a301b23197f9 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1,5 +1,5 @@ AUX android-file-transfer-linux-4.2-gcc13.patch 641 BLAKE2B 5e3b17588a1d1822fc8eef582aa1abcc821691b3ccaefc4a2b6ef6aee46eac86846ead67614aa624a7d4f7c4a35739f40c3b28ce2507b3ae6718614e29c15aaf SHA512 066f5a7d60c7c26af3e7608111da305c60cc4029ad95e24fb27dc2fd25e9b151b077e611163f9425646acc73bb2025db45895a758f327159741a309ee062eaee DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 -EBUILD android-file-transfer-linux-4.2.ebuild 1577 BLAKE2B c34b9657d09b2e37654525af29a3167dcb8d7bc8394062449d3b03359f5374517912a25eb6296fb2743c69330ca1281f6004f4cba448ab08b477739d8af4432b SHA512 5a99730a6f5beef2c0d1264d92b156bdc477fababe0f8277c28935c3eef87f721968e3143e545a4f6727d2278e7e0642fed31b251347e479afa98b289c8517ef -EBUILD android-file-transfer-linux-9999.ebuild 1528 BLAKE2B 2a9cc10eb1a72f6a30eb8c08b72709db16772edfebcb4471f35397ad5cdd481c79db5d1968585d01325916c5cf515f6f8ffb0f227bca77f2dee33e03cabdeba8 SHA512 923328d98652bfc3d75f5e729b719580a908f3dc670e3a1bf3a19bf17b413ec7dcdcaf8a7c3a9e1408180ca8df18539884657c2e7b51b4bdbf08089705576b4f +EBUILD android-file-transfer-linux-4.2.ebuild 1578 BLAKE2B 0fef85680683eafd6f72fb3091162187677d0bba661aaf2a023e85bdf22ef148bbec92795d49636b77d19b2f27e5342921d58923dfa14fdc208e6e00ee49cada SHA512 cbfd7a874d1b5f86b2cc0f10a24886a183de04871218585443e9420703fed2dd19a1f8d01f93107d4077f9c44ad91817a0de8d28fadfa1cf3d480c3fb654c37f +EBUILD android-file-transfer-linux-9999.ebuild 1578 BLAKE2B 0fef85680683eafd6f72fb3091162187677d0bba661aaf2a023e85bdf22ef148bbec92795d49636b77d19b2f27e5342921d58923dfa14fdc208e6e00ee49cada SHA512 cbfd7a874d1b5f86b2cc0f10a24886a183de04871218585443e9420703fed2dd19a1f8d01f93107d4077f9c44ad91817a0de8d28fadfa1cf3d480c3fb654c37f MISC metadata.xml 404 BLAKE2B 09a744466822e45ff378269c52b5aea8192b203bb1a6364de5e23690994ee57906ebeb28be99f8a3569f62ebfdfdc07497cdd28809cfc21014c67fb80b755e42 SHA512 7650fb9e5b3b86aa0233a2429ccc65bd144065e3e349fa1f1147570377a4f33b3663fffcc73a42416453e317bbf2c7bbd33baabc497a838cc91c705999b97497 diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild index 33a9407c95aa..ae4c96bbe345 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 xdg diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild index 6e72c38e8220..ae4c96bbe345 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 xdg @@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]] ; then EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git" else SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="LGPL-2.1" @@ -54,6 +54,10 @@ BDEPEND=" qt5? ( dev-qt/linguist-tools:5 ) " +PATCHES=( + "${FILESDIR}"/${PN}-4.2-gcc13.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest index 897c81f3a059..053667092b89 100644 --- a/sys-fs/avfs/Manifest +++ b/sys-fs/avfs/Manifest @@ -1,5 +1,7 @@ DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 DIST avfs-1.1.4.tar.bz2 614657 BLAKE2B a742f2e7fd4f97f2a3207cfe95d9358cfd895e4c047c39bbbf3ac0a35e1702542339f46199ba5f92868ceb48f009736a513431c0467ba49d9aacf73a667956ec SHA512 5caa7050e6b9cdce0b5ccd515af8233dc1e9226a97cdf3a3284ced5edd44fbde426049b4ce500ce1daf020d085f9f0a9f81eff339657e92ff2d09b1dec6e4267 +DIST avfs-1.1.5.tar.bz2 623927 BLAKE2B 3b4c3f1d510019c82c5c0f954f9ed35e6aebd0cd108ac33f5b89b3dc6e5ffb1ef88102c11351eea84f57922e377257e2e256f4e0fbe436efde669259f5b6c0d5 SHA512 03e9abbda17d7976f9c6e4f8a426ff0b85f626ba2942cb2ec17aff3239476d6de385d7d709d7f0b23e31fbde5bcf131e512d38354f78f7fdc04d4b6d0d593e1b EBUILD avfs-1.1.3.ebuild 1625 BLAKE2B 42f6913b2c4ddce0a036d685d55d5050aa3d9d5f2d65e7909644bcaf62a05a475196acfe568466c5725b4f99d5a95eeba28bc4f85d11878cfe33234a374ff034 SHA512 93b3f4c34a4774418c5960e2f418436f3e9f276e08bba920c263f287d4ed5a42931eb499629221aaa5a23bf2d058a9e8c9d45b6013640eb5ede23392602a0919 EBUILD avfs-1.1.4.ebuild 1677 BLAKE2B 26b198c60a8161a8563519176a93ee973ba01f5633ed66a46575c5ffa50d0891aa0a06ded9cfcdf82628d5a141126d07f7809e1e2c849dcbe9cd9436b9cd3ade SHA512 a3b33bcb64790ec768c2e502c45a5b544288ce4b880e7f872ac9a971646431bf582eb3c30d97aa1b80b19c8a1febc324cf649bf64e7975896d00d56e9aa8c4e6 +EBUILD avfs-1.1.5.ebuild 1690 BLAKE2B 747206cf7bfb141e7c66c20b183d3f5fec471a1b649ee6f3f55ffe49e9a80082776ad1531e3ec76e84d200eb6895b5dca4638ae8ddc4ed33810afea8e421039b SHA512 f942080055f9be95a76f6ec05fcce956c67fe0cbc6b3ca08cc046ec24921a9a46c4013bb31b9cf7b3d80a8c07d6293b14b3d9100cd5ae335507d28de1b4238f3 MISC metadata.xml 422 BLAKE2B 5720c903e0e80fb62aa958a2827d912156187d2ea7c792bfa9f939419c5406d93ac136b177f5b3edf745fb584a533163c44a7218afe5c0b84857439d46ad1517 SHA512 73d2e76af54657a28041c64d078d55aa9da46265f0c1837cd7872e66152508bc1fe6dfb6fd18dac34a738c7cf6c12339975c3f0eefcb3f5c07684ef223ace50d diff --git a/sys-fs/avfs/avfs-1.1.5.ebuild b/sys-fs/avfs/avfs-1.1.5.ebuild new file mode 100644 index 000000000000..acd4104c3756 --- /dev/null +++ b/sys-fs/avfs/avfs-1.1.5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual filesystem that allows browsing of compressed files" +HOMEPAGE="https://sourceforge.net/projects/avf/" +SRC_URI="https://downloads.sourceforge.net/avf/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="lzip +lzma webdav +zstd" + +RDEPEND=" + app-arch/bzip2:= + >=sys-fs/fuse-2.4:0 + sys-libs/zlib + lzip? ( app-arch/lzlib ) + lzma? ( app-arch/xz-utils ) + webdav? ( net-libs/neon:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/libtool + virtual/pkgconfig +" + +src_configure() { + myeconfargs=( + --enable-fuse + --enable-library + --enable-shared + --with-system-zlib + --with-system-bzlib + --disable-static + $(use_enable webdav dav) + $(use_with lzip) + $(use_with lzma xz) + $(use_with zstd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # remove cruft + rm "${ED}"/usr/bin/{davpass,ftppass} || die + + # install docs + dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse} + dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs + + docinto scripts + dodoc scripts/*pass + + find "${ED}" -name "*.la" -delete || die +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + einfo "This version of AVFS includes FUSE support. It is user-based." + einfo "To execute:" + einfo "1) as user, mkdir ~/.avfs" + einfo "2) make sure fuse is either compiled into the kernel OR" + einfo " modprobe fuse or add to startup." + einfo "3) run mountavfs" + einfo "To unload daemon, type umountavfs" + einfo + einfo "READ the documentation! Enjoy :)" + fi +} diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index 880d87481f75..5e7a594de8fe 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -19,6 +19,7 @@ DIST bcachefs-tools-1.4.1.tar.gz 1069244 BLAKE2B 7be0a343758a221a39dad5eca1c11c7 DIST bcachefs-tools-1.6.4.tar.gz 1083811 BLAKE2B 656b1545ccf41dd35e3e6f656a9b5280fe0b5fa43a0ea86243c6693033d986b091fdd3d79ab2ff5c1c9402bce6f4ee33f49e070f6aebd5bba355df7a82d8fc21 SHA512 3e73ee15673eac771393859132146f1c23f4250f68bf8753b5214e88e854959c56efabdaeff4a8ad883287bd289abe08c5c37f6ef7220b984fa679a90c578e57 DIST bcachefs-tools-1.7.0.tar.gz 1103425 BLAKE2B 952310999035465a4e8621e8e3ef65e5a3ba50d40a0ca76a3ca8b7265bab2f33c40981d2ca83ef3ecc70a5da9cff0d002d2f9676aa6355d1717a0dad968828af SHA512 5f7934997c0cd6b893c67a87e9cb5060cdd37857d6761356bdb1c96572b67ea3a2c03c43fcbd8beb01b0cf9c30da3297d082ef40bb312f5ca40c85faa46cdd3a DIST bcachefs-tools-1.9.1.tar.gz 1125178 BLAKE2B b54b86d681f0694fc39a13c6229a2d79dd8e1fe7dc269f3a8e6ba38b5d972b05aa7ba199114a3935ff95f3b51711e515f124ca247aa1a390f6e2bd771d55e5ee SHA512 93bc85bb7b15d08eadc60a2af1b9c8b0b561400bcd4567c088af8f426d11ccc4321482455e89a10cd544b421da3a953cca9008eb936128124f9bd2e6818c484e +DIST bcachefs-tools-1.9.4.tar.gz 1132203 BLAKE2B 447881b52dcaa3990a4c233523bf8c2b3faf4755f3a0fad315ca17fa900e2192b9a2168f22a3ac8c59ad2756999f8a6792b732a527510361044b541fec6ce26b SHA512 8a6a2896620c4e1aa3abd26a2e59087d417b5d546ee6dc1130a59e06c8e8561e8de29edeb1d5dd3c5223be8338a8b4265ad3e753c830f475413ed83a0d968dd8 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 @@ -45,6 +46,7 @@ DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645 DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb SHA512 c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1 DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d @@ -57,8 +59,10 @@ DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 +DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544 +DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce @@ -72,6 +76,7 @@ DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb7115 DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71 DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe @@ -108,6 +113,7 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78 DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e DIST rustix-0.38.25.crate 362735 BLAKE2B 8d368458850d031d63c76c75e716d8e580a763fa365aaf3f065de7f6f28fa314cd57c558286b0322438b9a8fe5475ebc709b02dc804862e02ebf02ad8fd2f30b SHA512 f14d3112f82e254ee01059a845062e305b5386b84e2de14fd89443606b37c5640322258cac91dda3be79b11cd72de60557515649ee266bfe7a796a284afe6a11 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 +DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3 DIST shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a @@ -118,6 +124,7 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a +DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46 @@ -131,6 +138,7 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 @@ -157,5 +165,6 @@ EBUILD bcachefs-tools-1.4.1.ebuild 5563 BLAKE2B 4011b46e0e0f4d2fb7b5b3125c3ad258 EBUILD bcachefs-tools-1.6.4-r1.ebuild 5241 BLAKE2B 1fb30d4d2ae8deabbe02c5d1db7d20adf2787da35bbcea37cbcde629b0c58610beb056986afb493948f35fab436e1e1e590413d860c7f7334a6aee4e978f6813 SHA512 3df29ecaba769f0f15f904c18b0630eb90f3e9de9813158f5753723eee54eeeb0b7978d89016ff508f4b0bf7b741da21b3224f9cffafded3c3fc2c1eb18760e9 EBUILD bcachefs-tools-1.7.0.ebuild 5276 BLAKE2B 898d087a1a1503dab6cc088117a55514d7bb77ba0874156d930f112f07298714071d2143614777308a10c8a9901c0ba1aa353ab00b6bc291c979e297ba42a9bb SHA512 0df8db9e271820259c546442b785e06ddb7c674a406fbe9006d4ed7ef3310e8123cecf4c6dd8f6dfb01c09c430b2e9d58ed21263fae25cd55fc9c295165589ac EBUILD bcachefs-tools-1.9.1.ebuild 5348 BLAKE2B cdf335f63f60112cec40cc498fbc5cae96cc8afbbd2f8774565b0357fb355af556035646c147b66489ac5d186cae2118decb53f59ec00f8831d2ea3942c2929e SHA512 60a864050856d1d32c6eb9e533de74d91d5bbd93cdb246c1f8542edc0d10438dc37e95c467c19295beb59a4598e0e35c3ecc7bd974857d7aa7669c525569797a -EBUILD bcachefs-tools-9999.ebuild 5242 BLAKE2B fd962577af482a9c6c1c83480eab65e9bd949c21e2560fb5c03c350ff63e0e81b3fc31f48725d38faf2ec28a250e753949e058d4c3e75bf4dd57e3d4938b8c98 SHA512 8a634605a38375893a9aa65c8ce9ab79aaa4a6b77f298bd4aa67175f94b254921acccdd4f9401e61bd9ef61bc9162d86c44216f9defaeb154e46f45fb744b22b +EBUILD bcachefs-tools-1.9.4.ebuild 5393 BLAKE2B a422469f9e73e2c3c4de02b6e468ca6e003de7ff0d18b12b8152e5397f5ef11de1599949596161c80dc520b99901fe328e4656ee880baba6dfa044fcb14ec34e SHA512 812b39660e73f2c7e3511b9f447c7dea20338f24cbec855977bd6dd8f22541b7f0e626e73068aeee9b703cd9c2fc4007d04b1df0e3c874589621405f63e7bc3d +EBUILD bcachefs-tools-9999.ebuild 4412 BLAKE2B cbb050d6d6fa74d5c4febb700a27e3c19d5a44adfcbe7396232901cf9e206223a7fc4aa859c9667d4d9f48457c86b5d84ae132fa8a920fcd9d5ab367e1530053 SHA512 1d9d98f845f277fd115b1101a3137705e9aed9893686865c8b514e437d2c3701aeef274af6525e712720e2c7e2a448f052c097d42abc1f534eed2c4e3297c23f MISC metadata.xml 751 BLAKE2B 58fb2ebb3092cb1056b36a5389d486faf4fb3fc6c107f5aeb65d1002722f7f238f776df5698bfceb4e2bf6b0ee4f1aa04d3015784c95141d300f6f82654525bd SHA512 5a6a46cfb145160a0871bf7a591238470d08744552870b54b9c7c78afac860a256fbd6765972a77ca81b78239695850b26c04acc1b24d1a4b35f52d6ef9e2501 diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild new file mode 100644 index 000000000000..dd482ce9dcf3 --- /dev/null +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.1.2 + anstream@0.6.11 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + anstyle@1.0.6 + anyhow@1.0.79 + autocfg@1.1.0 + bindgen@0.69.4 + bitfield@0.14.0 + bitflags@1.3.2 + bitflags@2.4.2 + byteorder@1.5.0 + cc@1.0.83 + cexpr@0.6.0 + cfg-if@1.0.0 + clang-sys@1.7.0 + clap@4.4.18 + clap_builder@4.4.18 + clap_complete@4.4.10 + clap_derive@4.4.7 + clap_lex@0.6.0 + colorchoice@1.0.0 + either@1.9.0 + env_logger@0.10.2 + errno-dragonfly@0.1.2 + errno@0.2.8 + errno@0.3.8 + glob@0.3.1 + heck@0.4.1 + hermit-abi@0.3.9 + home@0.5.9 + is-terminal@0.4.12 + itertools@0.12.1 + lazy_static@1.4.0 + lazycell@1.3.0 + libc@0.2.153 + libloading@0.8.1 + libudev-sys@0.1.4 + linux-raw-sys@0.4.13 + log@0.4.22 + memchr@2.7.1 + memoffset@0.8.0 + minimal-lexical@0.2.1 + nom@7.1.3 + once_cell@1.19.0 + paste@1.0.14 + pkg-config@0.3.29 + prettyplease@0.2.16 + proc-macro2@1.0.78 + quote@1.0.35 + regex-automata@0.4.5 + regex-syntax@0.8.2 + regex@1.10.3 + rustc-hash@1.1.0 + rustix@0.38.34 + rustversion@1.0.17 + shlex@1.3.0 + strsim@0.10.0 + strum@0.26.2 + strum_macros@0.26.2 + syn@2.0.48 + termcolor@1.4.1 + terminal_size@0.3.0 + udev@0.7.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.7.0 + which@4.4.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.8 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + zeroize@1.8.1 + zeroize_derive@1.4.2 +" + +LLVM_COMPAT=( {16..18} ) +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="https://bcachefs.org/" +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git" +else + SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS}" + S="${WORKDIR}/${P}" + KEYWORDS="~amd64 ~arm64" +fi + +LICENSE="Apache-2.0 BSD GPL-2 MIT" +SLOT="0" +IUSE="fuse test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/lz4:= + app-arch/zstd:= + dev-libs/libaio + dev-libs/libsodium:= + dev-libs/userspace-rcu:= + sys-apps/keyutils:= + sys-apps/util-linux + sys-libs/zlib + virtual/udev + fuse? ( >=sys-fs/fuse-3.7.0 ) +" + +RDEPEND="${DEPEND}" +# +# Clang is required for bindgen +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) + ') + $(unpacker_src_uri_depends) + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + ') + virtual/pkgconfig + virtual/rust +" + +QA_FLAGS_IGNORED="/sbin/bcachefs" + +python_check_deps() { + if use test; then + python_has_version \ + "dev-python/pytest[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + fi + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" +} + +pkg_setup() { + llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + S="${S}/rust-src" cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + tc-export CC + + # Version sed needed because the Makefile hasn't been bumped yet + # Check if it is no longer before bumping + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g::' \ + -i Makefile || die + append-lfs-flags +} + +src_compile() { + use fuse && export BCACHEFS_FUSE=1 + export BUILD_VERBOSE=1 + export VERSION=${PV} + + default + + use test && emake tests + + local shell + for shell in bash fish zsh; do + ./bcachefs completions ${shell} > ${shell}.completion || die + done +} + +src_test() { + if ! use fuse; then + EPYTEST_IGNORE=( tests/test_fuse.py ) + fi + EPYTEST_DESELECT=( + # Valgrind + 'tests/test_fixture.py::test_read_after_free' + 'tests/test_fixture.py::test_undefined' + 'tests/test_fixture.py::test_write_after_free' + 'tests/test_fixture.py::test_undefined_branch' + 'tests/test_fixture.py::test_leak' + 'tests/test_fixture.py::test_check' + # Fails in portage because of usersandbox; ensure that these pass before bumping! + 'tests/test_basic.py::test_format' + 'tests/test_basic.py::test_fsck' + 'tests/test_basic.py::test_list' + 'tests/test_basic.py::test_list_inodes' + 'tests/test_basic.py::test_list_dirent' + ) + epytest -v -n "$(makeopts_jobs)" +} + +src_install() { + into / + dosbin bcachefs + + dosym bcachefs /sbin/fsck.bcachefs + dosym bcachefs /sbin/mkfs.bcachefs + dosym bcachefs /sbin/mount.bcachefs + + if use fuse; then + dosym bcachefs /sbin/fsck.fuse.bcachefs + dosym bcachefs /sbin/mkfs.fuse.bcachefs + dosym bcachefs /sbin/mount.fuse.bcachefs + fi + + newbashcomp bash.completion bcachefs + newfishcomp fish.completion bcachefs.fish + newzshcomp zsh.completion _bcachefs + + doman bcachefs.8 +} + +pkg_postinst() { + if use fuse; then + ewarn "FUSE support is experimental." + ewarn "Please only use it for development purposes at the risk of losing your data." + ewarn "You have been warned." + fi +} diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild index 09617302a1b5..be2cd55914db 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild @@ -27,14 +27,16 @@ CRATES=" clap_derive@4.4.7 clap_lex@0.6.0 colorchoice@1.0.0 - colored@2.1.0 either@1.9.0 + env_logger@0.10.2 errno-dragonfly@0.1.2 errno@0.2.8 errno@0.3.8 glob@0.3.1 heck@0.4.1 + hermit-abi@0.3.9 home@0.5.9 + is-terminal@0.4.12 itertools@0.12.1 lazy_static@1.4.0 lazycell@1.3.0 @@ -42,7 +44,7 @@ CRATES=" libloading@0.8.1 libudev-sys@0.1.4 linux-raw-sys@0.4.13 - log@0.4.20 + log@0.4.22 memchr@2.7.1 memoffset@0.8.0 minimal-lexical@0.2.1 @@ -56,13 +58,15 @@ CRATES=" regex-automata@0.4.5 regex-syntax@0.8.2 regex@1.10.3 - rpassword@7.3.1 - rtoolbox@0.0.2 rustc-hash@1.1.0 - rustix@0.38.31 + rustix@0.38.34 + rustversion@1.0.17 shlex@1.3.0 strsim@0.10.0 + strum@0.26.2 + strum_macros@0.26.2 syn@2.0.48 + termcolor@1.4.1 terminal_size@0.3.0 udev@0.7.0 unicode-ident@1.0.12 @@ -70,6 +74,7 @@ CRATES=" uuid@1.7.0 which@4.4.2 winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.8 winapi-x86_64-pc-windows-gnu@0.4.0 winapi@0.3.9 windows-sys@0.48.0 @@ -90,12 +95,14 @@ CRATES=" windows_x86_64_gnullvm@0.52.0 windows_x86_64_msvc@0.48.5 windows_x86_64_msvc@0.52.0 + zeroize@1.8.1 + zeroize_derive@1.4.2 " -LLVM_COMPAT=( {16..17} ) -PYTHON_COMPAT=( python3_{10..12} ) +LLVM_COMPAT=( {16..18} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker +inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker DESCRIPTION="Tools for bcachefs" HOMEPAGE="https://bcachefs.org/" @@ -111,8 +118,8 @@ fi LICENSE="Apache-2.0 BSD GPL-2 MIT" SLOT="0" -IUSE="fuse test" -RESTRICT="!test? ( test )" +IUSE="fuse" +RESTRICT="test" DEPEND=" app-arch/lz4:= @@ -134,10 +141,6 @@ BDEPEND=" ${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/docutils[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) ') $(unpacker_src_uri_depends) $(llvm_gen_dep ' @@ -147,12 +150,9 @@ BDEPEND=" virtual/rust " +QA_FLAGS_IGNORED="/sbin/bcachefs" + python_check_deps() { - if use test; then - python_has_version \ - "dev-python/pytest[${PYTHON_USEDEP}]" \ - "dev-python/pytest-xdist[${PYTHON_USEDEP}]" - fi python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" } @@ -166,7 +166,6 @@ src_unpack() { git-r3_src_unpack S="${S}/rust-src" cargo_live_src_unpack else - unpack ${P}.tar.gz cargo_src_unpack fi } @@ -191,36 +190,12 @@ src_compile() { default - use test && emake tests - local shell for shell in bash fish zsh; do ./bcachefs completions ${shell} > ${shell}.completion || die done } -src_test() { - if ! use fuse; then - EPYTEST_IGNORE=( tests/test_fuse.py ) - fi - EPYTEST_DESELECT=( - # Valgrind - 'tests/test_fixture.py::test_read_after_free' - 'tests/test_fixture.py::test_undefined' - 'tests/test_fixture.py::test_write_after_free' - 'tests/test_fixture.py::test_undefined_branch' - 'tests/test_fixture.py::test_leak' - 'tests/test_fixture.py::test_check' - # Fails in portage because of usersandbox; ensure that these pass before bumping! - 'tests/test_basic.py::test_format' - 'tests/test_basic.py::test_fsck' - 'tests/test_basic.py::test_list' - 'tests/test_basic.py::test_list_inodes' - 'tests/test_basic.py::test_list_dirent' - ) - epytest -v -n "$(makeopts_jobs)" -} - src_install() { into / dosbin bcachefs diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest index cab62ad6564b..8f062277fcd9 100644 --- a/sys-fs/bees/Manifest +++ b/sys-fs/bees/Manifest @@ -1,5 +1,8 @@ AUX 0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch 1183 BLAKE2B 784ad6e8150a5d791c839c04060aa1116f72a29c0e2f4d1d790d6e1fb1d56b5a6ced843f38ac56930a63426ed7e9c5506f81c1f7189728937e0ee49f9f5af079 SHA512 29ac086a2c84d7eb89090498849b2e01e99da62c3ce49b5c4d36f071a3a8ff506e15b227a2303c01da25bdc4572e5dc1129767df496897de8ca2bed579dd3017 +AUX 0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch 1500 BLAKE2B c6f6895b92caae4ac8de83931574f87274d7798889c0589859204d73cd41072ee6967ae908c8509e7f5c929f3a4f04c73932b72a27ab3d244cef254ebc15030e SHA512 82e3e8872e4b9943afff883c3ee420a8850b337914fc0b388171f1331c4cd900778c2263b98ff1705f50f7cd3ffe5868d7f88ec48ab68217471a21573a559479 +AUX 0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch 1445 BLAKE2B e1ebe9c50deeaf7eed82c738d172ab332c5048ab192150cc967843ea16f387631ee44c201c43f49c3c0a032a735219f3a08881e5f92fbbf5b85d050eebb1c7f8 SHA512 75655e40084a0f8660773293693d0a214d34c6bb2f861c2e502a4cc5a1576d5c8084b8af87f790155f419affa56886c23eed09532f82c29b2623f553a5c82999 DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3 +EBUILD bees-0.10-r1.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd EBUILD bees-0.10.ebuild 4076 BLAKE2B dad615a8ad7fada7c1cd31a5cffa6fad2cdcbc1cf241cc6e602d927cd9c182289d944663365cbeaa27a2f14f89cd8150e7c7196c19b5bbd4cb2580dae80bc19c SHA512 53a60088a2e078e1dec4899d77961c51976f941ca3952de32ddacdb6c03b4e6350d977f159b7a845ec45901bb4cb77b19ca9aebeec2ef1cc7867740df74adbbb -EBUILD bees-9999.ebuild 4077 BLAKE2B 8208983c244fd03a1c615b485011bb1fefbdffe91b0d1846aec7a13775c9c1da06dd895092f847a9da0ce2e1a88dac10611f0f2a35df1589042e58a70f11b1a4 SHA512 41bc775e23be08cc87fd06da485b1101e3924dca1ab00150e4abbc50bcfc2b892a08bce0560403e9830a70fac9be0ea669f8017c71a78a414ab5cf1f580644e7 +EBUILD bees-9999.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd MISC metadata.xml 529 BLAKE2B 69ea069e33d1af7c2c38aa7f8fc61516f23c586ad162d9581859829b084c8da3ef76278173e1ac3afa1ef432355ab14f2ecc01d07f039f8447c20cc27b22d633 SHA512 cb9ba7a32c6a8269f7303ebd41bf0e21f4325560b40bba10aff08a05d07170f9f0e35e687e688f6793c0abf994c9b23f90a47b9d32544636f2d6b5ab51140bd3 diff --git a/sys-fs/bees/bees-0.10-r1.ebuild b/sys-fs/bees/bees-0.10-r1.ebuild new file mode 100644 index 000000000000..e1d5da90f548 --- /dev/null +++ b/sys-fs/bees/bees-0.10-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent" +HOMEPAGE="https://github.com/Zygo/bees" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Zygo/bees.git" +else + SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +LICENSE="GPL-3" +SLOT="0" + +DEPEND=" + >=sys-apps/util-linux-2.30.2 + >=sys-fs/btrfs-progs-4.20.2 +" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~BTRFS_FS" +ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" + +PATCHES=( + "${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch" + "${FILESDIR}/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if kernel_is -lt 4 11; then + ewarn "With kernel versions below 4.11, bees may severely degrade system performance" + ewarn "and responsiveness. Especially, the kernel may deadlock while bees is" + ewarn "running, it's recommended to run at least kernel 4.11." + ewarn + elif kernel_is -lt 4 14 29; then + ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()" + ewarn "messages in the kernel log. These messages can be ignored and this is fixed" + ewarn "with more recent kernels:" + ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0" + ewarn + elif kernel_is -lt 5 7 0; then + ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system" + ewarn "locks for a long time while at the same time CPU usage increases when bees is" + ewarn "operating. bees tries to avoid this behavior by excluding very common extents" + ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness." + ewarn + fi + if kernel_is -lt 5 1 0; then + ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption" + ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" + ewarn "later kernel, that includes older LTS versions released after 5.0.4:" + ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" + ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" + ewarn + fi + if kernel_is -lt 5 4 19; then + ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running" + ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst" + ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x" + ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force" + ewarn "the device RO without writing corrupted meta-data. More details:" + ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md" + ewarn + fi + if kernel_is -gt 5 15 106; then + if kernel_is -lt 6 3 10; then + ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation" + ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO" + ewarn "latency spikes. This version ships with a work-around at the cost of not" + ewarn "handling highly duplicated filesystems that well. More details:" + ewarn "https://github.com/Zygo/bees/issues/260" + ewarn + fi + fi + + elog "Bees recommends running the latest current kernel for performance and" + elog "reliability reasons, see README.md." + fi +} + +src_prepare() { + default + sed -i 's/ -Werror//' makeflags || die +} + +src_configure() { + tc-export CC CXX AR + cat >localconf <<-EOF || die + ETC_PREFIX="${EPREFIX}/etc" + LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" + PREFIX="${EPREFIX}/usr" + SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" + DEFAULT_MAKE_TARGET=all + EOF + if [[ ${PV} != "9999" ]] ; then + echo BEES_VERSION=v${PV} >>localconf || die + fi +} + +src_compile() { + default + # localconf quotes leak in the systemd unit but are still needed for spaces + sed -i 's/"//g' scripts/beesd@.service || die +} diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index 1b164eb56b08..e1d5da90f548 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.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 @@ -18,7 +18,6 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="" DEPEND=" >=sys-apps/util-linux-2.30.2 @@ -30,7 +29,8 @@ CONFIG_CHECK="~BTRFS_FS" ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" PATCHES=( - "${FILESDIR}/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch" + "${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch" + "${FILESDIR}/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch" ) pkg_pretend() { diff --git a/sys-fs/bees/files/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch b/sys-fs/bees/files/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch new file mode 100644 index 000000000000..387ae7f1100c --- /dev/null +++ b/sys-fs/bees/files/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch @@ -0,0 +1,36 @@ +From fad9230cea8a9970980c36b442b71b864e69ded3 Mon Sep 17 00:00:00 2001 +From: Kai Krakow <kai@kaishome.de> +Date: Sun, 30 Jun 2024 16:27:20 +0200 +Subject: [PATCH 1/2] context: demote "abandoned toxic match" to debug log + level + +This log message creates a overwhelmingly lot of messages in the system +journal, leading to write-back flushing storms under high activity. As +it is a work-around message, it is probably only useful to developers, +thus demote to debug level. + +This fixes latency spikes in desktop usage after adding a lot of new +files, especially since systemd-journal starts to flush caches if it +sees memory pressure. + +Signed-off-by: Kai Krakow <kai@kaishome.de> +--- + src/bees-context.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bees-context.cc b/src/bees-context.cc +index 09ec152..2251783 100644 +--- a/src/bees-context.cc ++++ b/src/bees-context.cc +@@ -471,7 +471,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e) + + // Hash is toxic + if (found_addr.is_toxic()) { +- BEESLOGWARN("WORKAROUND: abandoned toxic match for hash " << hash << " addr " << found_addr << " matching bbd " << bbd); ++ BEESLOGDEBUG("WORKAROUND: abandoned toxic match for hash " << hash << " addr " << found_addr << " matching bbd " << bbd); + // Don't push these back in because we'll never delete them. + // Extents may become non-toxic so give them a chance to expire. + // hash_table->push_front_hash_addr(hash, found_addr); +-- +2.44.2 + diff --git a/sys-fs/bees/files/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch b/sys-fs/bees/files/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch new file mode 100644 index 000000000000..b62957c05291 --- /dev/null +++ b/sys-fs/bees/files/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch @@ -0,0 +1,43 @@ +From 291574986ccfaff8b620f6baa185a567f2f0cfb5 Mon Sep 17 00:00:00 2001 +From: Kai Krakow <kai@kaishome.de> +Date: Sun, 9 Jul 2023 12:24:40 +0200 +Subject: [PATCH 2/2] HACK: crucible: Work around kernel memory fragmentation + +According to @Zygo: + +> This will drastically reduce the number of reflinks bees can handle +> to a single extent, but that size is beyond more than enough for most +> filesystems. Making the buffer smaller may also reduce the size of +> vmallocs which might be aggravating the kernel's memory manager. + +v2: + +According to @Zygo: + +> Lately I've been running with vm.swappiness=0 and +> BEES_MAX_EXTENT_REF_COUNT set to 9999. With those settings there's no +> swapping at all. + +Link: https://github.com/Zygo/bees/issues/260#issuecomment-1627586574 +Link: https://github.com/Zygo/bees/issues/260#issuecomment-2068287231 +Signed-off-by: Kai Krakow <kai@kaishome.de> +--- + src/bees.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bees.h b/src/bees.h +index 4dbc005..a3c3872 100644 +--- a/src/bees.h ++++ b/src/bees.h +@@ -96,7 +96,7 @@ const double BEES_TOO_LONG = 5.0; + const double BEES_TOXIC_SYS_DURATION = 0.1; + + // Maximum number of refs to a single extent +-const size_t BEES_MAX_EXTENT_REF_COUNT = (16 * 1024 * 1024 / 24) - 1; ++const size_t BEES_MAX_EXTENT_REF_COUNT = (10000) - 1; + + // How long between hash table histograms + const double BEES_HASH_TABLE_ANALYZE_INTERVAL = BEES_STATS_INTERVAL; +-- +2.44.2 + diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 1173bade6835..7d7acef166d3 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,3 +1,5 @@ +DIST btrfs-progs-v6.10.tar.sign 566 BLAKE2B 493260b4854616eabce943135b4990de4a724ad00f8cba43e9d864e5c67e5896890831d17c742456d422ed15267a753c4eaf18ac30a4c7c3da0b254b01becf8b SHA512 62d9721702eec6eec2c0e51eee4624324c4604d3bc76016cde1ade0572c22b46ede71fcb3d9e4ca14ea0196e84116ce4ef9222b399f8bbdf8e5259c18f3a82e8 +DIST btrfs-progs-v6.10.tar.xz 2669760 BLAKE2B 24b66cc6f7118da817e9abca69e8de9a9496de1ec4eb6800fa8f6b13b677e37a553d90562a38618a63b68b71457ab10ff72541dd3e0c169a1fe05509fd62402c SHA512 aa5af67f3816dcd1a128b69bc6f4bd83423c6c2289e3dd3abe2a07bdccb6b7d5e49426a5a0ece643709c23cdcb0908ca52b271f058fee3a3d810cdfcb9c36639 DIST btrfs-progs-v6.6.3.tar.sign 566 BLAKE2B 9f8a14405f78c8eb5a92d59f9ca776cd15bfd43bc323a0f5a98cc2d9a6f782e999a792ddb266fef4dfe189e1cb8eebbd021a12b615e22bdd4097a74bf3b277a9 SHA512 07f062cf66c0e5f0bd833f0a1c9901ec06ac4eb258acec8e96ffbb0b85007a67bdc992492b25f6039fcf603352131fca8c57162fa61007e8ccf1f4edf71dab97 DIST btrfs-progs-v6.6.3.tar.xz 2557216 BLAKE2B 274fad52bcab45bd0f6496c1bc10e1736e7b766f53b712790996a8a38f74eedcc570783599bed62cd4f84e5629f2216340a66941d9fbe0c7890f1c56ed66df8a SHA512 93e1defacf0f280fc02e10a20fd2bc3775c52956a0339e30b829cc3bef85629d565cf3f6a9af126e38bbb73e8e9b9a0069abbe0e57957a56ca1a8826f5de624a DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24572e43fef2fdce79f0dbd892b1609876f681bf79de53e6473345f3de8b8fee6aac2d33673e0b080ab33fb935bd32d SHA512 8fad1c2c47356a04434e12621c526603bf651bdcb0a08deb4022d83953d8c501b8aaa2da05cbf94e0bde43b48a4135fff78a5746423466036ff4899dd79b9589 @@ -10,12 +12,13 @@ DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55 DIST btrfs-progs-v6.9.2.tar.xz 2661684 BLAKE2B 38ab189ac8271ba8d68b74e82569159c671cca1cb946f56ccab28b6b206cb6ee5b330d83afc3536b7e0d7399da3fb01e368809c1ef4a64b843ea88796ebd28bd SHA512 1df9d5456d07a035c38c17795996a4fc621eeaa244ef54383d4387205826d2a6e971910e55031d20bb1baf23193efa7439e110312ffd8471f07aaf8c0baca20a DIST btrfs-progs-v6.9.tar.sign 566 BLAKE2B a2e26047775bcc407b8f5aa8b08b0708a01c84a8cd649e50a935e15d04e2ee917010fc98df0dfb80320ee25a8dbfbbbabbb1f155489f32391544100956ba9636 SHA512 1e8304b3df013a841e82a8656361946914d35f680b5bc547c1599fdd98a75b66e2b1f869c8b043d7532182318c2183e699a9d6101ab4b1544618d2c8a25362e1 DIST btrfs-progs-v6.9.tar.xz 2663052 BLAKE2B 9fad691327b6290b3ba0e1a638576b65e4e4d6c8f32549ea0f10188fdb40028315abf5e330976ff7a5efb6a258d0008e7602ae81ba0339888f474dc056791798 SHA512 e97907b377040371f4742a45345ec720e0cb8e0cf9ee5fdc60618ce2bc76f572725ec32e1a178fd57534f73affd3eeb5e6cfebf23734f04583bbbef858d913b2 +EBUILD btrfs-progs-6.10.ebuild 4305 BLAKE2B 8ea7b2432c04e5514c1b275cf78104f28260fd3f5f6ab2f02d160019aedd2da6788119d2e549675ff097e24122166fac69d9fc610ec24ce0aa657bdea632bfaa SHA512 4258654bd418f8e6a7c5ea802287434b9131aa9a72fe6d725ad91d709cf2b02f6e6e6837dddfda14995f9e2bc4e3563919904b2d312ae845777ba972eeb264b1 EBUILD btrfs-progs-6.6.3.ebuild 4599 BLAKE2B 79fd7e385b4ebffb59d0b919cfba46039846d009c3db3bb0c62981c20adfc296d6103cbfe69f62df556effca65f5f8c1120ece2161f158f839693f0858420aea SHA512 d73a464ccac5b57582aa2ada28961cf0285c0285b587059051d0af67ca57bb569d66750deb14cac48bafc82215168ad8c4ca61d9393ded4e19363db788e02efd EBUILD btrfs-progs-6.7.1.ebuild 4599 BLAKE2B 79fd7e385b4ebffb59d0b919cfba46039846d009c3db3bb0c62981c20adfc296d6103cbfe69f62df556effca65f5f8c1120ece2161f158f839693f0858420aea SHA512 d73a464ccac5b57582aa2ada28961cf0285c0285b587059051d0af67ca57bb569d66750deb14cac48bafc82215168ad8c4ca61d9393ded4e19363db788e02efd EBUILD btrfs-progs-6.8.1-r1.ebuild 4403 BLAKE2B dc5b353b713a59e467da06ddb7b0c1e7a67d95d3b4b0f3438e148570d63e82aa87416da77a11264ab8602b9e5278ed4e3e355d0dc8cbde947f3511f5e1a0ce1f SHA512 b68e3aee56f709ef9e529c2b0ac1ec31d11cbed51ce16b9c4cd8470d358acf2f36995a3047fef697e920dbf601335635d4016720289417a70e10f3958b757472 EBUILD btrfs-progs-6.8.1.ebuild 4599 BLAKE2B 2fdbb02df514a9c78b34e6b7df55d266b222b60515ba463e8cdaa4b2dcb5d06c68752218691ff2182b6468edcecd735c3ec39433633de1fd52bc80ac8610bd22 SHA512 8705968998ae1f454051d1dabe7c392311d61d81fb93217e3cc2f39913bbe56cbcbd7de75d452aadde14e905c371f3d543cb9673de34544776fe685dfa9a65ac EBUILD btrfs-progs-6.9.1.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770 -EBUILD btrfs-progs-6.9.2.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770 -EBUILD btrfs-progs-6.9.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770 -EBUILD btrfs-progs-9999.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770 -MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53 +EBUILD btrfs-progs-6.9.2.ebuild 4299 BLAKE2B 773e16ebdd7e86cbda20e75cb3fde2d0084617f94b1b5fc5fb05bd1be36b880b00b64e1264e1f8cb02d5cac607b626e54c124c582e1d2e1b261f9dfda5116a4e SHA512 6548774675c54c3e1c8261d48f6c01e0f5878f0c0da12bf1318aa37cc5d1b137fda0f7cf40672b2da014b63cc99eed18cdbebefe52efefc70db48f49bc901991 +EBUILD btrfs-progs-6.9.ebuild 4170 BLAKE2B 6c2ba7f6bc8ea09f62a8f6b5ada660c8c34fd9e1f861a52049be46dc9961edde57c33b5375fd50a3cfe1f7e314af7efa01ddf144c12686542f788fdd9c6fd660 SHA512 af2cf5d1996c4e3637c313fd0731d8427d3455869758a346742d8781d704290fa2ffd8cc009fb70e0cfdbaf1a266f1eb5e55acb13093ea5d23fdcc55c70ac890 +EBUILD btrfs-progs-9999.ebuild 4305 BLAKE2B 8ea7b2432c04e5514c1b275cf78104f28260fd3f5f6ab2f02d160019aedd2da6788119d2e549675ff097e24122166fac69d9fc610ec24ce0aa657bdea632bfaa SHA512 4258654bd418f8e6a7c5ea802287434b9131aa9a72fe6d725ad91d709cf2b02f6e6e6837dddfda14995f9e2bc4e3563919904b2d312ae845777ba972eeb264b1 +MISC metadata.xml 744 BLAKE2B 6c23644af7f970c93a3c3bd1fd1bf82e5290832afac427bec1da93bfd2694799f779bdce3f51742a171218d6e29460a4986452426ab2239ad8ab6627dc45b81d SHA512 06df1d728d39b92384bdd026d0339a494ce1fe3966376a413a80f8dd85bedd5e5d843db9cdd60a9ab29857b79d5a24de24de2330aab70916a0e57acfc01a2e5d diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild new file mode 100644 index 000000000000..3361fe4d3f1e --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild @@ -0,0 +1,188 @@ +# Copyright 2008-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-python/btrfsutil + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 python-any-r1 udev + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc + inherit verify-sig + + MY_PV="v${PV/_/-}" + MY_P="${PN}-${MY_PV}" + SRC_URI=" + https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz + verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) + " + S="${WORKDIR}"/${PN}-${MY_PV} + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" + +LICENSE="GPL-2" +SLOT="0/0" # libbtrfs soname +IUSE="+convert +man experimental reiserfs static static-libs udev +zstd" +# Could support it with just !systemd => eudev, see mdadm, but let's +# see if someone asks for it first. +REQUIRED_USE="static? ( !udev )" + +# Tries to mount repaired filesystems +RESTRICT="test" + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-5.10 + convert? ( sys-apps/acl ) + static? ( + dev-libs/lzo:2[static-libs(+)] + sys-apps/util-linux:0[static-libs(+)] + sys-libs/zlib:0[static-libs(+)] + convert? ( + sys-fs/e2fsprogs[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd[static-libs(+)] ) + ) +" +BDEPEND=" + virtual/pkgconfig + man? ( + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]') + ) +" + +python_check_deps() { + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" +} + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" +fi + +pkg_setup() { + : # Prevent python-any-r1_python_setup +} + +if [[ ${PV} != 9999 ]]; then + src_unpack() { + # 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 + } +fi + +src_prepare() { + default + + if [[ ${PV} == 9999 ]]; then + local AT_M4DIR=config + eautoreconf + + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + + --enable-lzo + $(use_enable experimental) + --disable-python + $(use_enable convert) + $(use_enable man documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable static-libs static) + $(use_enable udev libudev) + $(use_enable zstd) + + # Could support libgcrypt, libsodium, libkcapi, openssl, botan + --with-crypto=builtin + --with-convert=ext2$(usev reiserfs ',reiserfs') + ) + + export EXTRA_PYTHON_CFLAGS="${CFLAGS}" + export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" + + if use man; then + python_setup + fi + + # bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_test() { + emake V=1 -j1 -C tests test +} + +src_install() { + local makeargs=( + $(usev static install-static) + ) + + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi + + newbashcomp btrfs-completion btrfs +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild index b4d9a3171bef..432b2b58e34d 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild @@ -3,6 +3,8 @@ EAPI=8 +# Please bump with dev-python/btrfsutil + PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 python-any-r1 udev @@ -24,7 +26,7 @@ else S="${WORKDIR}"/${PN}-${MY_PV} if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi fi @@ -33,7 +35,7 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" LICENSE="GPL-2" SLOT="0/0" # libbtrfs soname -IUSE="+convert +man reiserfs static static-libs udev +zstd" +IUSE="+convert +man experimental reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. REQUIRED_USE="static? ( !udev )" @@ -129,7 +131,7 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) --disable-python $(use_enable convert) $(use_enable man documentation) @@ -169,6 +171,11 @@ src_install() { emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi + newbashcomp btrfs-completion btrfs } diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild index b4d9a3171bef..e9d020c16019 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild @@ -24,7 +24,7 @@ else S="${WORKDIR}"/${PN}-${MY_PV} if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index b4d9a3171bef..3361fe4d3f1e 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -3,6 +3,8 @@ EAPI=8 +# Please bump with dev-python/btrfsutil + PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 python-any-r1 udev @@ -33,7 +35,7 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" LICENSE="GPL-2" SLOT="0/0" # libbtrfs soname -IUSE="+convert +man reiserfs static static-libs udev +zstd" +IUSE="+convert +man experimental reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. REQUIRED_USE="static? ( !udev )" @@ -129,7 +131,7 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) --disable-python $(use_enable convert) $(use_enable man documentation) @@ -169,6 +171,11 @@ src_install() { emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi + newbashcomp btrfs-completion btrfs } diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml index e0d9388ce73c..9bd0c43c582b 100644 --- a/sys-fs/btrfs-progs/metadata.xml +++ b/sys-fs/btrfs-progs/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag> + <flag name="experimental">Enable unstable and experimental features and install btrfs-corrupt-block, as needed by xfstests</flag> <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag> <flag name="static">Build static binaries in addition to the dynamic ones</flag> </use> diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest index 33f658270ec1..786d12f829f3 100644 --- a/sys-fs/clamfs/Manifest +++ b/sys-fs/clamfs/Manifest @@ -1,5 +1,7 @@ AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391803189ae614f8d17d0eee6bcd83bfac5b7829dbd5a1ccbbebbf34a4f5033ed87d632f0f9358a SHA512 a49afb1e2684732581c4b6274744be71193e48137d71abf4d12b943d1b91502b52fd077a6124c33182e6796cbdb609c000e0f3c1baa05b9349ab4a38b247280d AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6 DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626 +DIST clamfs-1.3.0.tar.gz 229989 BLAKE2B 05327d8b6fbe7073c5bd70104282a32009f06556fd61267931f4d841378318e29bb1fc7157da6b5ebce80dda35484f5bc2af71fcecdb3739a4dd28507c767054 SHA512 81c234ec631abd49d9a6b940ef727a1eae048b7be12be6082ec176ed4045fcd92d35d1264e7fd48906786af7c07696139fd5bfa0a302fba7ebb2c528315857a1 EBUILD clamfs-1.2.0.ebuild 877 BLAKE2B d1c3ccb6e696591fe76dd8385d5f78cc426bf22ee28aa05530664c2d08e37f57421ef672cb126e52a6344d54c3ba5e7f4797c90367de36f7892ca6456740fbc8 SHA512 95a76dc81a18faff1f614c264f2933c48a7e2b1bfd8eb702ef4927936372128f0de2a9ca92517d7918573bb4949fa03b491468c81a611575032fa6cf5852a6d2 +EBUILD clamfs-1.3.0.ebuild 878 BLAKE2B 87b1c2acda4e6cce8e0b46001ca8b5c585d7e0a066a3d71daf7edb48544d14b65d3ee8cbb60a8ab693d2426f13006139b6e526365765a9838d9908c778fa0e9d SHA512 06e02c1a0394a82404778ccb79ade7c62f9af40da4013057e2ad0a342254e5cb09be2f9ace69757bb4f68730b387f72088bfb66eabf7322eb039cc8515857b85 MISC metadata.xml 563 BLAKE2B 37867dfdb271dde04f1d5b29a78696d792ca429ba7bf3daecb9822eea39c5ab80c3fb47deb35064b3b838ad1ee7d60997168e0feb771dc539980fbf412758858 SHA512 c9c582d533d6e9be80d74943649ee8b025517c13d329ff0e977978c89563134466498e30583affb3414e9c40a0f0e9d124d97c171ce9a9795f8ee0adf70dea22 diff --git a/sys-fs/clamfs/clamfs-1.3.0.ebuild b/sys-fs/clamfs/clamfs-1.3.0.ebuild new file mode 100644 index 000000000000..24f3b99c29a2 --- /dev/null +++ b/sys-fs/clamfs/clamfs-1.3.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="A FUSE-based user-space file system with on-access anti-virus file scanning" +HOMEPAGE="https://github.com/burghardt/clamfs" +SRC_URI="https://github.com/burghardt/clamfs/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-libs/boost + dev-libs/poco + dev-libs/rlog + sys-fs/fuse:3" +RDEPEND="${DEPEND} + app-antivirus/clamav" + +CONFIG_CHECK="~FUSE_FS" + +src_prepare() { + # Do not use Werror ( #754180 ) + sed -i 's/\-Werror//g' configure.ac || die "Sed failed" + default + eautoreconf +} + +src_install() { + default + + insinto /etc/clamfs + doins doc/clamfs.xml + + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + + dodoc AUTHORS ChangeLog NEWS README TODO +} diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index b8c33d16037c..2d23feb0764c 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -7,5 +7,5 @@ AUX cryfs-0.11.4-unbundle-vendored-libs.patch 9924 BLAKE2B b4503d9a9f64fc2b0b0cd DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B 3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391 SHA512 a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea EBUILD cryfs-0.10.3-r1.ebuild 2764 BLAKE2B 926491581856295cc3577ee2e02ae24e7c55fdd4e38ec6c1bd87abab1da07a48a83f9d89a3d97fafbc9c21afccc5160d87fa4bb213bec73ad92c7df773b3dd66 SHA512 b40529a01188897d9b5d977cd3ae8f6dd4db1d9de5aab2c8387169c4af1b31e669e4a1a64eb7e14cd352329f9d4fadae0e00bc4f9d6b7219496e1e4bb343f46e -EBUILD cryfs-0.11.4.ebuild 5743 BLAKE2B 690a22f0b33e81df5dd4dad158ac69d2f7edfe8bc6d4854c472ce738d8ebd3a66513528271ceeae13c66ee2f231326132ec1911b813958476a9baf9f6789dd0a SHA512 89f0d1ad067e8584df2be5571fa628bb0a99357f0d1405e5eccdf2bddf59032dc8ae3d2f1350f461973846a75eb6b1ceeaf1d11a00cf0dd309f150b07577c2c1 +EBUILD cryfs-0.11.4.ebuild 5741 BLAKE2B 4857f9f79b5a8db3730795fca80732d9b1ceca7fca3ca05882e4860502c44d306af8792c696aff3ebf265db9c5e8b291a00e800cb770ab30f531bee91f1ebcbb SHA512 defe7cc27181ea030c2b62ef14dce7c3861971bc7e2f4a1e9647fff5de64bbd0ea01816347ab93da81eba4b565d67f5a2d3cceb883ed128b1edeb62ea4d1942e MISC metadata.xml 496 BLAKE2B 409cff030d8c45472ea6baa2abdcf736fda7d1229b7fc69e7a9280d05fe4b0ca29cb7be9836b862d940af3035cb9f02791407bcd1e176b1ea69dc2038542bc13 SHA512 9308ee717a85ac37a7264269d364ec60eac713bbfbc771019364d6b9ada5691d03d05e34981670e839f4d9a9b5b65268970e18645ab3ccce5cf4f501fe2d147a diff --git a/sys-fs/cryfs/cryfs-0.11.4.ebuild b/sys-fs/cryfs/cryfs-0.11.4.ebuild index ca45e29b9e1b..061236e9d5d0 100644 --- a/sys-fs/cryfs/cryfs-0.11.4.ebuild +++ b/sys-fs/cryfs/cryfs-0.11.4.ebuild @@ -14,7 +14,7 @@ else https://github.com/cryfs/cryfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz " - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" fi DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index d0fa00453770..8385d78ebdab 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -3,7 +3,9 @@ AUX 2.4.3-dmcrypt.rc 9715 BLAKE2B f3ad708c4fd26e197282ca3b3289756e686663dddeed87 DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e SHA512 0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18 DIST cryptsetup-2.7.2.tar.xz 11637316 BLAKE2B 466d7818cf8b6e23f802291ccad205d09f128572c21a85d6ca8e518d2198e49c9d95066c58560ffcb7df5a483aa27592b0e931db1e4daeabd102db9a5543da20 SHA512 06f42f443b91d1f8af8af999dfedd4051ecb12ba5ef291cf2b44b6a5676e2c5cf1e686e19687f5cb6b1fd524dfc1a208cd25a3798367a480d80eac954aa8d6d4 DIST cryptsetup-2.7.3.tar.xz 11689300 BLAKE2B 6de2c5eb4a0e1108eedb9c81c69ef70696b166ee592641927a0f8e11e566d644e0f7db3436b0446d5df33b3fab55af9592b869bb54d5fa94e67c5003404bc9b8 SHA512 08cff21873aeb7cc5b2561abf5d33cdf0fa814eeaabf6a01f858461726ea9faeef651357da33bce7b347ca2f12d6d02bccdb279893f3749cb781ce1fe5c1571c +DIST cryptsetup-2.7.4.tar.xz 11695292 BLAKE2B a7e9397342482e83a21177699aedbd7a59c2f841512cdf9c8fdcec34d8d448056b2aca89cceae55e8d01654cf5a6ea260ec44879fc7b7fd15fe613c0ad95bc6a SHA512 3cc601ab1c4d5fd282f990529d7cb95f59c8aa9beb0ebd11de7ebf78cb35c352bcb8c945a2033cb6c53540b37156fdf2824070d431c752f9f7b029e4ec930c21 EBUILD cryptsetup-2.6.1.ebuild 4152 BLAKE2B b346a276c968b88d55e5ab0ee39f5623e4d06608c228752b37c538876fbd838eebcfede1de9c9d40daa1e308f2f91bc030e727fd7c055c56e05ae6ae9c0c3b3d SHA512 497b7a18f2d7434b35c6980ee8dda270df757bca81782fd166bbf92a079f850227f48dc6bfd373553ede01fb9143a7c79207eb51011de84ec1416c6db9f47326 -EBUILD cryptsetup-2.7.2.ebuild 4174 BLAKE2B bd4151965fba4327cbca825d260c68016bfefa361429fec287e8a6b5495cb14e82587a51b85057249f69b25dce1daf83ccf91525d877fc7f386c4dd56e98873c SHA512 73b1b05e7f6d88821666dea8e483fe2ad0be8e41869b75c439c6ce75a7112644cbabe2cddf9417de176989deae1ea5e2d821c7ed577001bc453f79354283c56b -EBUILD cryptsetup-2.7.3.ebuild 4174 BLAKE2B bd4151965fba4327cbca825d260c68016bfefa361429fec287e8a6b5495cb14e82587a51b85057249f69b25dce1daf83ccf91525d877fc7f386c4dd56e98873c SHA512 73b1b05e7f6d88821666dea8e483fe2ad0be8e41869b75c439c6ce75a7112644cbabe2cddf9417de176989deae1ea5e2d821c7ed577001bc453f79354283c56b +EBUILD cryptsetup-2.7.2.ebuild 4167 BLAKE2B 04572e2a62a8b43af8725191fc10595b838f1877df27539716ee88f2dfc3ce8cf6e7e1d9166433b447f9bd6113a4cea33e706a00c91c36605114ea0b40f11418 SHA512 726c1d8d2cbd2438c1a3ce130fac2369e220b282ed914fc2d647d0aa0d24baf5de577741ee53d74b87f76025206c6e3b45f4771b3b32520f8e0ea38afbc8545f +EBUILD cryptsetup-2.7.3.ebuild 4166 BLAKE2B 281a62f551a229ead602c1513abd38a5b10cf385a99410e22cbcedfd026abb6dde9d857ac8bab28ec10fd7af13812f4653d1923d0b308f4a2d666db38699395a SHA512 54c8f545f840bb62598c260271db6c529c1cfeee2b71727cb69f464980eee323d128e7ffdb0a27202cb0025531cd2d33f6222fd68b9f059496114e75014f48bf +EBUILD cryptsetup-2.7.4.ebuild 4166 BLAKE2B 281a62f551a229ead602c1513abd38a5b10cf385a99410e22cbcedfd026abb6dde9d857ac8bab28ec10fd7af13812f4653d1923d0b308f4a2d666db38699395a SHA512 54c8f545f840bb62598c260271db6c529c1cfeee2b71727cb69f464980eee323d128e7ffdb0a27202cb0025531cd2d33f6222fd68b9f059496114e75014f48bf MISC metadata.xml 1146 BLAKE2B e349364ad14e957f35c1fbe1fdeff46cd6a48535b45363922e071adde6342a60fb30c25e3579b908b6e0c0df80984ef26b319e70d438731d665a57fcc2aa8b81 SHA512 6cec96962ee5da4b2923e1fbce5232d014e25e01ccfdd3ca55d48e23cb8581af592ed9b061f8e24b6408e8c339b9ebfa5e2754c1ead417e41d832f777d4ccb45 diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild index 14f76fc36fb8..143ba8992dd6 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/${P/_/-} LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild index 14f76fc36fb8..71d96dacde92 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild @@ -25,7 +25,7 @@ RESTRICT="!test? ( test )" # bug #496612, bug #832711, bug #843863 REQUIRED_USE=" ^^ ( ${CRYPTO_BACKENDS//+/} ) - static? ( !gcrypt !ssh !udev !fips ) + static? ( !ssh !udev !fips ) fips? ( !kernel !nettle ) " diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild new file mode 100644 index 000000000000..71d96dacde92 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: meson +inherit linux-info tmpfiles + +DESCRIPTION="Tool to setup encrypted devices with dm-crypt" +HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup" +SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" +S="${WORKDIR}"/${P/_/-} + +LICENSE="GPL-2+" +SLOT="0/12" # libcryptsetup.so version +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" +# we don't support nss since it doesn't allow cryptsetup to be built statically +# and it's missing ripemd160 support so it can't provide full backward compatibility +IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality ssh static static-libs test +udev urandom" +RESTRICT="!test? ( test )" +# bug #496612, bug #832711, bug #843863 +REQUIRED_USE=" + ^^ ( ${CRYPTO_BACKENDS//+/} ) + static? ( !ssh !udev !fips ) + fips? ( !kernel !nettle ) +" + +LIB_DEPEND=" + dev-libs/json-c:=[static-libs(+)] + dev-libs/popt[static-libs(+)] + >=sys-apps/util-linux-2.31-r1[static-libs(+)] + argon2? ( app-crypt/argon2:=[static-libs(+)] ) + gcrypt? ( + dev-libs/libgcrypt:0=[static-libs(+)] + dev-libs/libgpg-error[static-libs(+)] + ) + nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) + openssl? ( dev-libs/openssl:0=[static-libs(+)] ) + pwquality? ( dev-libs/libpwquality[static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) + sys-fs/lvm2[static-libs(+)] +" +# We have to always depend on ${LIB_DEPEND} rather than put behind +# !static? () because we provide a shared library which links against +# these other packages. bug #414665 +RDEPEND=" + static-libs? ( ${LIB_DEPEND} ) + ${LIB_DEPEND//\[static-libs\([+-]\)\]} + udev? ( virtual/libudev:= ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +# vim-core needed for xxd in tests +BDEPEND=" + virtual/pkgconfig + test? ( app-editors/vim-core ) +" + +pkg_setup() { + local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" + local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" + local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" + local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" + local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" + check_extra_config +} + +src_prepare() { + default + + sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die +} + +src_configure() { + local myeconfargs=( + --disable-internal-argon2 + --disable-asciidoc + --enable-shared + --sbindir="${EPREFIX}"/sbin + # for later use + --with-default-luks-format=LUKS2 + --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" + --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) + $(use_enable argon2 libargon2) + $(use_enable nls) + $(use_enable pwquality) + $(use_enable !static external-tokens) + $(use_enable static static-cryptsetup) + $(use_enable static-libs static) + $(use_enable udev) + $(use_enable !urandom dev-random) + $(use_enable ssh ssh-token) + $(usev !argon2 '--with-luks2-pbkdf=pbkdf2') + $(use_enable fips) + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + if [[ ! -e /dev/mapper/control ]] ; then + ewarn "No /dev/mapper/control found -- skipping tests" + return 0 + fi + + local p + for p in /dev/mapper /dev/loop* ; do + addwrite ${p} + done + + default +} + +src_install() { + default + + if use static ; then + mv "${ED}"/sbin/cryptsetup{.static,} || die + mv "${ED}"/sbin/veritysetup{.static,} || die + mv "${ED}"/sbin/integritysetup{.static,} || die + + if use ssh ; then + mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die + fi + fi + + find "${ED}" -type f -name "*.la" -delete || die + + dodoc docs/v*ReleaseNotes + + newconfd "${FILESDIR}"/2.4.3-dmcrypt.confd dmcrypt + newinitd "${FILESDIR}"/2.4.3-dmcrypt.rc dmcrypt +} + +pkg_postinst() { + tmpfiles_process cryptsetup.conf + + if use kernel ; then + ewarn "Note that kernel backend is very slow for this type of operation" + ewarn "and is provided mainly for embedded systems wanting to avoid" + ewarn "userspace crypto libraries." + fi +} diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 57086cacb06f..33833ccbed46 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -5,5 +5,5 @@ AUX e2fsprogs-1.47.0-parallel-make.patch 3491 BLAKE2B b3848202f038cc86a07e784bfe DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb EBUILD e2fsprogs-1.47.0-r3.ebuild 4461 BLAKE2B 3ad15e552e74f7d9c49465feb39b00af95fdd60c15ea6020b47269275dcf0750934e6c923aaf5cb5f8eb25f7386802e8c7a855a914102452c55ce80ca5c5fbb5 SHA512 2f2e32e2feca64f58d23f8fe6b64b684fce0e8fba8086ae615259a23c99db8279193df099105e34baf1bcd1f89c5accff5344dc7262b6c1586ce622973818650 -EBUILD e2fsprogs-1.47.1.ebuild 4549 BLAKE2B 69fd8930912877cdf3a4a96a2f34979e2ac40c88e0e06682f2a71a5a0f0ae8c3ae387b387c194583552697cc7a10812cfba641d4bdd7072c16012105f818cb38 SHA512 fc014231141e8701ce4329625f81ff71d3570ae1cabebc132aedbd2de758bab04b5c005c822b2fa9955ae08d3d94eb5641380361d325730b8101daab67fbf1ef +EBUILD e2fsprogs-1.47.1.ebuild 4542 BLAKE2B 1545dc6b8d203ca5f86bf6b3933d21f91bd3090d2a6ef9ab143e1f75d98bc4e43f017fb351a31c3f1e998ad3aa18d4ebdb5c6ad0835da174261999432280a874 SHA512 f46944c36b8e240637fc25953b211b5eaa31c6ce25cd2a60eab19fc80ff19270f189efe2e9147448e762d084f344e3416e6ab8feffa358822d2fc7208dcd15c8 MISC metadata.xml 870 BLAKE2B bf57e8f24b302ed91357fb10dbc9b15656002983281fd287ee241a9a097d00e6af56d4a42de4109728dbb826ea58e58eba26ec1840299e43f7728495b1a133f4 SHA512 fa0ea6b3db855719976d3c627dcf88f62cf7fdacc132686ea06bcdfce03bb9ccef035d9aa674fc43844a0a111198c34921016183966be5f887aabed06bf0f369 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild index 2ccc0b3b1d41..4853a3a74bf5 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" -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" IUSE="archive cron fuse nls static-libs test +tools" RESTRICT="!test? ( test )" diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest index 90805cfa6902..3a0bc34d8528 100644 --- a/sys-fs/erofs-utils/Manifest +++ b/sys-fs/erofs-utils/Manifest @@ -1,7 +1,5 @@ -AUX erofs-utils-1.6-CVE-2023-33551.patch 2204 BLAKE2B d0cf130e455123df3d4961b3f2b292167f189257bfd5d4aec9afb932179fa8642b84d62b891a70480b2d2dd0be52420467b81d1471c27b5d1c0f7c6c6e61f482 SHA512 e8c7ad3f00c6f86a76f3f9f5001939fc878157229f9223796f2dfdb6ea37c2598f4b5d45934a6c5c3171689bbf455f8987f583617b5853fe0eaed7a237c63b8f -AUX erofs-utils-1.6-CVE-2023-33552.patch 3294 BLAKE2B 45a36f7c91dcbbce8a0e25a28727fcccbf1cb9d0f073909e7f883f033de5d2b1ee133a1604cdf4c132624441973432e298d76ae38333259421e0e47096b56b07 SHA512 952eb009d3c0ecde751af1246f9c34bbb16bb692a8664cbc7ac084e41840acc1e082cceb3b44826091f3819b73c0e04e19f051c949c5c7a0145ea3170dc92ada -DIST erofs-utils-1.6.tar.gz 126558 BLAKE2B ad4ce3777c484d485b91f29a97c08499398595d654a4ad63e1cc6a75c176b0476d3af1d7a2bf1ef5f6df996281c1b1bdfdf004be4428c0c168652af68acd83d1 SHA512 1537c5cb60cb70c607b8c00408451f90122fe902d80c9d35dde7b9205588ae3513ddd7cb38d4062e55bb57e37d9b53a668752792e6cba0bc0d78176afed3e502 DIST erofs-utils-1.7.tar.gz 165393 BLAKE2B f22183fbc3346db0632f0fc842586251d0e17ea19e1de3be51cd807dfac4a6150a080d6b81625c3e08eeebc2ae28d7840f8209c905ca87fc70481d3d8c3913ec SHA512 0f204cd40644bde28f9bd0c5c234d93e68db3a3998bb089f43bfb3ce9a9db1e1cc2fa65919205cbd4a484fa4388cffadf5b395bc4363de3882e1a19778c2d62b -EBUILD erofs-utils-1.6-r1.ebuild 989 BLAKE2B 12b5a6b4d33748b0d55034c9ef6fd2d812f37a7ba2410beff7765b8554ad67c4f389055eb051c52c89e3d371833b3b983bd8d54c958d566668a581ffbc72bd86 SHA512 8b4b4c8877d49ceaf3a28515914123b80ddf4948047626cea09644e6694f5c2ed65eb114b89a0a26157650fb42a0dcf0e194eca3ae2d2fb6356879e87b60bd8e +DIST erofs-utils-1.8.1.tar.gz 184385 BLAKE2B 0ecf7ad0d42f3941751511f3ab42e7e25b85dc64849867a221272cf4596f6bfff3cb1c22877a485de79b4445f68eea8e77cb3f8c742a23ee5ad7ce0232b85091 SHA512 b7fe2441e5295680bc683e978ad97ee359785fd842d77fa86ef6bf869b5da87ad613f48782b5f59684995b6cbc5c274938c9ea9067baa537f09c029eabb4cca3 EBUILD erofs-utils-1.7.ebuild 1006 BLAKE2B 362142e2d8da00981233599debae7463c5300571cdab96305e3b1ad7a120857aa84ab774b0807600f14b26a089477556a3e4e15e52a16e763b75aeac45dddc61 SHA512 e5e007b1a4a554b55865ef418dc14ad4eec95de1f5c1f59c8beb07ff74aa748ac9b20b732e249c7ce1e1e82d46ce06ad2e683f8776bdcd79309c76eb8c55b72d -MISC metadata.xml 422 BLAKE2B 9c580f677db0b02904c12e023efd2c1abf0dca9d5dd84776ea55551e3997a968bf23c092b9bfa98e941f7d16009c6e56cdd0120a075872c8e3f84a77899ba556 SHA512 bb5def8dcfe0ecfdc8ce9e6fec61b7c707114abef8e79f2c0f27736341e9c3cca48c053b613d85db762c1632194e76d3ab33386bf0be7ba669a6aaee652b64c1 +EBUILD erofs-utils-1.8.1.ebuild 1258 BLAKE2B f9c180bb0ae7b899db5f16a413b6a45a4951d0cf5c694c5983fd3ad9547de090ec0093bf9b4464050527634de9ba722580db850e51a314dd9ac08ccc6491b972 SHA512 8e7c7ecca451e41e83306d10a7bf2be3a031e7a775467707ede52009c5dc79efd91cd8f7f9c3adf7f72d2f49fa67d8756fcced3dba6b2ca03f36da31a32def08 +MISC metadata.xml 561 BLAKE2B 021bc1323881f1d1e5aaf0ab2c49d393319048c31da034c297e6877a2c23f3e7bbf2392919df7bacfa75289ba11d051c2f896128e954348f3dd6c0850b847262 SHA512 2fb30129b20709a2cff8fa8b9fdb7e04aed0dd6df3c03306058109b0f85203273dbf925a16754a74a08b52f38c11dc1b1881419258e2fe1caa418c63b3c3d25f diff --git a/sys-fs/erofs-utils/erofs-utils-1.6-r1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild index 87fe99420cfd..07c3889f14bb 100644 --- a/sys-fs/erofs-utils/erofs-utils-1.6-r1.ebuild +++ b/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,13 +7,14 @@ inherit autotools DESCRIPTION="Userspace tools for EROFS" HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git" -LICENSE="GPL-2+" SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz" -KEYWORDS="~amd64 ~loong" +LICENSE="GPL-2+" SLOT="0" -IUSE="fuse +lz4 +lzma selinux +uuid" +KEYWORDS="~amd64 ~arm64 ~loong" + +IUSE="fuse libdeflate +lz4 +lzma selinux static-libs +threads +uuid +zlib +zstd" RDEPEND=" fuse? ( sys-fs/fuse:0 ) @@ -21,13 +22,16 @@ RDEPEND=" lzma? ( >=app-arch/xz-utils-5.4.0:0= ) selinux? ( sys-libs/libselinux:0= ) uuid? ( sys-apps/util-linux ) + zlib? ( + libdeflate? ( app-arch/libdeflate:0= ) + !libdeflate? ( sys-libs/zlib:0= ) + ) + zstd? ( app-arch/zstd:0= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-CVE-2023-33551.patch" - "${FILESDIR}/${P}-CVE-2023-33552.patch" ) src_prepare() { @@ -39,10 +43,16 @@ src_configure() { local myeconfargs=( --disable-werror $(use_enable fuse) + $(use_with libdeflate) $(use_enable lz4) $(use_enable lzma) $(use_with selinux) + $(use_enable static-libs static-fuse) + $(use_enable threads multithreading) $(use_with uuid) + $(use_with zlib) + $(use_with zstd libzstd) + --without-qpl # not packaged ) econf "${myeconfargs[@]}" diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33551.patch b/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33551.patch deleted file mode 100644 index ce20d18cb33f..000000000000 --- a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33551.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://git.kernel.org/xiang/erofs-utils/c/27aeef179bf17d5f1d98f827e93d24839a6d4176 -From: Gao Xiang <hsiangkao@linux.alibaba.com> -Date: Fri, 2 Jun 2023 13:52:56 +0800 -Subject: erofs-utils: fsck: block insane long paths when extracting images - -Since some crafted EROFS filesystem images could have insane deep -hierarchy (or may form directory loops) which triggers the -PATH_MAX-sized path buffer OR stack overflow. - -Actually some crafted images cannot be deemed as real corrupted -images but over-PATH_MAX paths are not something that we'd like to -support for now. - -CVE: CVE-2023-33551 -Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33551 -Reported-by: Chaoming Yang <lometsj@live.com> -Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") -Fixes: b11f84f593f9 ("erofs-utils: fsck: convert to use erofs_iterate_dir()") -Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") -Signeo-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> -Link: https://lore.kernel.org/r/20230602055256.18061-1-hsiangkao@linux.alibaba.com ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -680,28 +680,35 @@ again: - static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) - { - int ret; -- size_t prev_pos = fsckcfg.extract_pos; -+ size_t prev_pos, curr_pos; - - if (ctx->dot_dotdot) - return 0; - -- if (fsckcfg.extract_path) { -- size_t curr_pos = prev_pos; -+ prev_pos = fsckcfg.extract_pos; -+ curr_pos = prev_pos; -+ -+ if (prev_pos + ctx->de_namelen >= PATH_MAX) { -+ erofs_err("unable to fsck since the path is too long (%u)", -+ curr_pos + ctx->de_namelen); -+ return -EOPNOTSUPP; -+ } - -+ if (fsckcfg.extract_path) { - fsckcfg.extract_path[curr_pos++] = '/'; - strncpy(fsckcfg.extract_path + curr_pos, ctx->dname, - ctx->de_namelen); - curr_pos += ctx->de_namelen; - fsckcfg.extract_path[curr_pos] = '\0'; -- fsckcfg.extract_pos = curr_pos; -+ } else { -+ curr_pos += ctx->de_namelen; - } -- -+ fsckcfg.extract_pos = curr_pos; - ret = erofsfsck_check_inode(ctx->dir->nid, ctx->de_nid); - -- if (fsckcfg.extract_path) { -+ if (fsckcfg.extract_path) - fsckcfg.extract_path[prev_pos] = '\0'; -- fsckcfg.extract_pos = prev_pos; -- } -+ fsckcfg.extract_pos = prev_pos; - return ret; - } - --- -cgit - diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33552.patch b/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33552.patch deleted file mode 100644 index c53a9b8044fe..000000000000 --- a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33552.patch +++ /dev/null @@ -1,117 +0,0 @@ -https://git.kernel.org/xiang/erofs-utils/c/2145dff03dd3f3f74bcda3b52160fbad37f7fcfe -From: Gao Xiang <hsiangkao@linux.alibaba.com> -Date: Fri, 2 Jun 2023 11:05:19 +0800 -Subject: erofs-utils: fsck: don't allocate/read too large extents - -Since some crafted EROFS filesystem images could have insane large -extents, which causes unexpected bahaviors when extracting data. - -Fix it by extracting large extents with a buffer of a reasonable -maximum size limit and reading multiple times instead. - -Note that only `--extract` option is impacted. - -CVE: CVE-2023-33552 -Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33552 -Reported-by: Chaoming Yang <lometsj@live.com> -Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") -Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> -Link: https://lore.kernel.org/r/20230602030519.117071-1-hsiangkao@linux.alibaba.com ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -392,6 +392,8 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - } - - while (pos < inode->i_size) { -+ unsigned int alloc_rawsize; -+ - map.m_la = pos; - if (compressed) - ret = z_erofs_map_blocks_iter(inode, &map, -@@ -420,10 +422,28 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - if (!(map.m_flags & EROFS_MAP_MAPPED) || !fsckcfg.check_decomp) - continue; - -- if (map.m_plen > raw_size) { -- raw_size = map.m_plen; -- raw = realloc(raw, raw_size); -- BUG_ON(!raw); -+ if (map.m_plen > Z_EROFS_PCLUSTER_MAX_SIZE) { -+ if (compressed) { -+ erofs_err("invalid pcluster size %" PRIu64 " @ offset %" PRIu64 " of nid %" PRIu64, -+ map.m_plen, map.m_la, -+ inode->nid | 0ULL); -+ ret = -EFSCORRUPTED; -+ goto out; -+ } -+ alloc_rawsize = Z_EROFS_PCLUSTER_MAX_SIZE; -+ } else { -+ alloc_rawsize = map.m_plen; -+ } -+ -+ if (alloc_rawsize > raw_size) { -+ char *newraw = realloc(raw, alloc_rawsize); -+ -+ if (!newraw) { -+ ret = -ENOMEM; -+ goto out; -+ } -+ raw = newraw; -+ raw_size = alloc_rawsize; - } - - if (compressed) { -@@ -434,18 +454,27 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - } - ret = z_erofs_read_one_data(inode, &map, raw, buffer, - 0, map.m_llen, false); -+ if (ret) -+ goto out; -+ -+ if (outfd >= 0 && write(outfd, buffer, map.m_llen) < 0) -+ goto fail_eio; - } else { -- ret = erofs_read_one_data(&map, raw, 0, map.m_plen); -- } -- if (ret) -- goto out; -+ u64 p = 0; - -- if (outfd >= 0 && write(outfd, compressed ? buffer : raw, -- map.m_llen) < 0) { -- erofs_err("I/O error occurred when verifying data chunk @ nid %llu", -- inode->nid | 0ULL); -- ret = -EIO; -- goto out; -+ do { -+ u64 count = min_t(u64, alloc_rawsize, -+ map.m_llen); -+ -+ ret = erofs_read_one_data(&map, raw, p, count); -+ if (ret) -+ goto out; -+ -+ if (outfd >= 0 && write(outfd, raw, count) < 0) -+ goto fail_eio; -+ map.m_llen -= count; -+ p += count; -+ } while (map.m_llen); - } - } - -@@ -460,6 +489,12 @@ out: - if (buffer) - free(buffer); - return ret < 0 ? ret : 0; -+ -+fail_eio: -+ erofs_err("I/O error occurred when verifying data chunk @ nid %llu", -+ inode->nid | 0ULL); -+ ret = -EIO; -+ goto out; - } - - static inline int erofs_extract_dir(struct erofs_inode *inode) --- -cgit - diff --git a/sys-fs/erofs-utils/metadata.xml b/sys-fs/erofs-utils/metadata.xml index bcc4b30fe149..eaf0493a8357 100644 --- a/sys-fs/erofs-utils/metadata.xml +++ b/sys-fs/erofs-utils/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="fuse">Builds erofsfuse (requires <pkg>sys-fs/fuse</pkg>).</flag> + <flag name="libdeflate">Use <pkg>app-arch/libdeflate</pkg> rather than <pkg>sys-libs/zlib</pkg> for handling deflate compression.</flag> <flag name="uuid">Enables UUID support via <pkg>sys-apps/util-linux</pkg>.</flag> </use> </pkgmetadata> diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest index 6dd4b1e84708..6e5c197d116f 100644 --- a/sys-fs/exfatprogs/Manifest +++ b/sys-fs/exfatprogs/Manifest @@ -1,8 +1,10 @@ DIST exfatprogs-1.2.2.tar.xz 274552 BLAKE2B 457c2036f07d81193bfb8f23a47410f70ddf125b91f88ddb303874341d5304293cc254e337d820b15ac135c4a96d59a35e6e741f049052065a5f866720516c13 SHA512 51ff77860704a7a4a2986e0090514d46614d6d6ce5ad07ea622e4dd806f06f034959a0c35d7e67689a7eb6836a1de967e302d5ec1c9ca6d33fa80d68d574741e DIST exfatprogs-1.2.3.tar.xz 275976 BLAKE2B 68d6a6d389748f9a0b815bc325696c1c2104a72a6e681888ef98e02e0244c7335e6f4abde40ebbdb28a3a5ac098e894a788e17d378993e59f0d7906f65ab394b SHA512 7ed568fba5bb4d12fcf6d5cf4b8afc1f0d95a28c67dcbe722284d3cab689b668b78a6c87e56a427d93542d6df45bd288794a4f2e60f94e831eab00eae7f097f4 DIST exfatprogs-1.2.4.tar.xz 275696 BLAKE2B 70b60f339affb4236b050bec089395f732965a5e0959eb271f4dd2664536336288cef3103cb123fc33fe32c9c4c51ab17430db5fd169bb61f4afc2c003c51752 SHA512 9073e7643c68f43c948cc7b8a0a75c89375351801ae9e3e015858760663b223f3da32bac64f814a57cbf748e6ce7943ebcac7d8fe885ebca31a2184061d10daa +DIST exfatprogs-1.2.5.tar.xz 364904 BLAKE2B 11909a494d0e6ae3ba938ae6c8511d587037f32c0a07a7775c3da5e1019cd2ca989f42e616da4a44e32551d936db97a935b0074322389cc39b4c336043535bea SHA512 812c070e8b0b87e481081ff7a4d26d99fe0e6aadf3b4cc81c211bd269ebd3e42c419baaaa95335f3967868f8c9f39f6e5a6e951c92b86fa881b9c88b435ed7e3 EBUILD exfatprogs-1.2.2.ebuild 619 BLAKE2B 5044cc0a42ed6aca9a588340c7477cc7ab9091f8e5e35783d93df91a4e63ddd72b26ccecc52f27003151226f727c26ed965271056272bb7ea704ac2cf4df1539 SHA512 3412cd6c1ab4650f658981cdff401f6a78128a71f19aad5320cce4bc35066867e31d949f50fb4a2b49e42873657553b4bf9de2bb364245deab0009008b238766 -EBUILD exfatprogs-1.2.3.ebuild 623 BLAKE2B e041e67fd402c4d0522c2d801fb092c115a9d1f4571a1efc4b26ff69cf232d6072562d49bdf1c28d169133f10b7cc76593ad9f0191fc2252b74defd062cd4ee2 SHA512 e1f1442339751e968c42ad774a2a6c1872087076a0b84ab812bd5f876f85cb71ea47773ae92fcc1ecb977092179d9bcce09d605e0224b9319866b3834c310d8d +EBUILD exfatprogs-1.2.3.ebuild 619 BLAKE2B 5044cc0a42ed6aca9a588340c7477cc7ab9091f8e5e35783d93df91a4e63ddd72b26ccecc52f27003151226f727c26ed965271056272bb7ea704ac2cf4df1539 SHA512 3412cd6c1ab4650f658981cdff401f6a78128a71f19aad5320cce4bc35066867e31d949f50fb4a2b49e42873657553b4bf9de2bb364245deab0009008b238766 EBUILD exfatprogs-1.2.4.ebuild 624 BLAKE2B b2ef42340838d02717ab4a4c9041ecf27deac202e24b7a67fda5ad53c5cb438b6846d2854ceac0319a4e66adf0a41022b13c0944b2edd31c18d1afd477e2f282 SHA512 c93a6d9e4beac3d4cf1f720a1bb92bef6cc7e8409bbcdcee69489645e4f0d841df9dffb29df98897af185e9aed73f66d9969c4ad4d8d642d17acfa55f601cd7c +EBUILD exfatprogs-1.2.5.ebuild 624 BLAKE2B b2ef42340838d02717ab4a4c9041ecf27deac202e24b7a67fda5ad53c5cb438b6846d2854ceac0319a4e66adf0a41022b13c0944b2edd31c18d1afd477e2f282 SHA512 c93a6d9e4beac3d4cf1f720a1bb92bef6cc7e8409bbcdcee69489645e4f0d841df9dffb29df98897af185e9aed73f66d9969c4ad4d8d642d17acfa55f601cd7c EBUILD exfatprogs-9999.ebuild 624 BLAKE2B b2ef42340838d02717ab4a4c9041ecf27deac202e24b7a67fda5ad53c5cb438b6846d2854ceac0319a4e66adf0a41022b13c0944b2edd31c18d1afd477e2f282 SHA512 c93a6d9e4beac3d4cf1f720a1bb92bef6cc7e8409bbcdcee69489645e4f0d841df9dffb29df98897af185e9aed73f66d9969c4ad4d8d642d17acfa55f601cd7c MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild index 9e9981352ba1..64cf3654a575 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild new file mode 100644 index 000000000000..24a35a00a404 --- /dev/null +++ b/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Userspace utilities for the exFAT filesystem (kernel 5.7+)" +HOMEPAGE="https://github.com/exfatprogs/exfatprogs" + +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND="!sys-fs/exfat-utils" + +src_prepare() { + default + + [[ ${PV} == *9999 ]] && eautoreconf +} diff --git a/sys-fs/genimage/Manifest b/sys-fs/genimage/Manifest index 7f85b3cde96a..727ad3f5fbf9 100644 --- a/sys-fs/genimage/Manifest +++ b/sys-fs/genimage/Manifest @@ -1,6 +1,8 @@ DIST genimage-16.tar.gz 87544 BLAKE2B 822c1b5901ed3fa19e33961e6e9e718f961d6c0a2315dcb4301aea3cccad6368a03d48ab5b5713592bdd096e78e7d24c03e8016a1470c7864ace71e3341b16a4 SHA512 7cb079d6ae889a744e2a3596b0eac737f7fdf1734c2024c71bb5ff85b93bff1d8ec26d61ee5b210aad4f0f9137968a6e256492c8c8376bafe2c5da2d12985a73 DIST genimage-17.tar.gz 94853 BLAKE2B 371f35be1f47ecc012adcac5e6138f8bf32b097fd508b599d788d3a1af3fd0ccb9a213d0dc683ecc6e11f762e6376cf3a2683dec3fefd26e70ceebc48e7d2814 SHA512 b02415e030e2ef9ace40b965935e2634c208db4f4d401e1a824aa6dcf06c9656ba060d66e4a3a4306216ec74ce2ddcea4647bb68eb61a3bf4e9aadb1ff0d73ef +DIST genimage-18.tar.gz 98409 BLAKE2B dc73d2cca8166939e803834490fd55de66d235df0bb0dfef0c79810bfd619fc8683715241719b2fa94d19bf3870863c3aacbd6f2dd50cf41200d5990104ffd3d SHA512 70cacbb0ce081bd6e941f79e00e2c92839909e254d2f74b1eddd4e5d5d6d5177f80745df9bc132fa9b0c901e184d37c1c89113238a0b357412704dba0c367211 EBUILD genimage-16.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 EBUILD genimage-17.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 +EBUILD genimage-18.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 EBUILD genimage-9999.ebuild 1113 BLAKE2B 2b9328f8a7d59ab5548b7efea01623d160e8ea354cc062872942e81544e9bcdeff9ae994f8503ac2e5a9ff1c9a935a2b20696b51f4a7d779365fad82e75f5aff SHA512 5d6f06b891ac91a6776f9581f2ec075c3da73dc37e3bdb4a010ad2bb3c50d36d5f73f22ef0f22616390fa22cd6e2f72aa1200f354950221e13189fc7409799ec MISC metadata.xml 333 BLAKE2B 802ffd79e7a01b6caadbbc9e8176b1dfc6657f09ef2ff7e6eaed979b5df4522fb481625bebd3ed1c4ce40017820a62624cb73c4e096144e2778d94b325c6c520 SHA512 402a05c00a4a776f023d46f415df5f4d012e9ee5bedb108e60da6e1b3a1281b7357904611c70da9b75ae598fe7bfef71c658b220efabed5a7b5f8ccc497ec7ef diff --git a/sys-fs/genimage/genimage-18.ebuild b/sys-fs/genimage/genimage-18.ebuild new file mode 100644 index 000000000000..4becc18f6212 --- /dev/null +++ b/sys-fs/genimage/genimage-18.ebuild @@ -0,0 +1,42 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools optfeature + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pengutronix/genimage.git" +else + SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64" +fi + +DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree" +HOMEPAGE="https://github.com/pengutronix/genimage" + +LICENSE="GPL-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/confuse:=" +RDEPEND="${DEPEND}" +BDEPEND="test? ( sys-apps/fakeroot )" + +src_prepare() { + default + eautoreconf +} + +pkg_postinst() { + optfeature "cpio support" app-alternatives/cpio + optfeature "tar support" app-arch/tar + optfeature "qemu support" app-emulation/qemu + optfeature "dosfstools support" sys-fs/dosfstools + optfeature "cramfs support" sys-fs/cramfs + optfeature "genext2fs support" sys-fs/genext2fs + optfeature "jffs, ubifs and ubinize support" sys-fs/mtd-utils + optfeature "squashfs support" sys-fs/squashfs-tools +} diff --git a/sys-fs/linux-apfs-rw/Manifest b/sys-fs/linux-apfs-rw/Manifest index f34f7724f9cb..e1413668d039 100644 --- a/sys-fs/linux-apfs-rw/Manifest +++ b/sys-fs/linux-apfs-rw/Manifest @@ -1,3 +1,3 @@ -DIST linux-apfs-rw-0.3.9.tar.gz 209682 BLAKE2B 663007f1b7c7af6cf4198066b6ba141c3bb625685508fe06f72bb3654438bac03ecc50204227fd724d16a4bb757f0df9ed7d19fb08fece8b98f08da9cfb3c8f5 SHA512 b241044c6faa175c1523f0ba391f9bb9ba336b3c39fd3528f43e0df5e9c6090691ab226091948f9f32f33748e8c435a0881ccc00fed4badca97d195c1982f9a7 -EBUILD linux-apfs-rw-0.3.9.ebuild 795 BLAKE2B 96d4853b6370e0b70de7502037792300e937d9aa72e5102b2544853814cef3da340ae8aa30d420d9fd96ff4cabece4a71001f1a0df29dd251da5f0bda419ec17 SHA512 b18acc3b83ed8b1eeb6fbee32ac7fe55866891954924917a6cf1b7c82ed06046859b2888e4d9e03f945438f8957b8f568c523fa5f9b274ef9772854d82134e32 +DIST linux-apfs-rw-0.3.10.tar.gz 210033 BLAKE2B a7714ed7e0f2334fe8b534cf88cca5c5dba62592046e8c4957171350de17d808fb64cc809facd2b385ef27b7f8c3f6001e675e34437c609daf5b6b2cd9afd1f0 SHA512 cebdbbda67f282edaf00e6b1da9ed4905a068205c2af6a1b723da4007c39c3ea02c2a2935e2e07395b51dda58b6f1ad00beb9547fed81690f77455b96fb9e672 +EBUILD linux-apfs-rw-0.3.10.ebuild 795 BLAKE2B 96d4853b6370e0b70de7502037792300e937d9aa72e5102b2544853814cef3da340ae8aa30d420d9fd96ff4cabece4a71001f1a0df29dd251da5f0bda419ec17 SHA512 b18acc3b83ed8b1eeb6fbee32ac7fe55866891954924917a6cf1b7c82ed06046859b2888e4d9e03f945438f8957b8f568c523fa5f9b274ef9772854d82134e32 MISC metadata.xml 334 BLAKE2B 1ae67bd0e178cd47efd0c8fe5c6119f36bef5379b16e2bb05c5f319b62a1ead04a071849cbf64cc67616817967e9056933b30d4636ef8060739e50386f6c3938 SHA512 350a9048f140aecf169b3ec39f90374797206ecb0ea35911fac40157867540e8a87790d2089001ebff44a62829776a138b28740fd8e001fadeb9239788ce2f73 diff --git a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild index 5d6a55ecd6d9..5d6a55ecd6d9 100644 --- a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild +++ b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index a845bfb0921a..8d311be99ee6 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -10,5 +10,5 @@ DIST lxcfs-6.0.1.tar.gz 105761 BLAKE2B 87255711eccc9833cd321c5d606920edcbf87a2a3 DIST lxcfs-6.0.1.tar.gz.asc 833 BLAKE2B b9a6655650f5720fce4bb2e9dcace2b1c3ec7f0b14b2b23014142a1fce2cd55b3ae7361e7ead9385893068ca9f18cef4151bfb223d005a4c810c5efc40b8fb7a SHA512 d795a18170027d33f94c2bf88d5ad4c6162e066f9a51d7eab79699cc3b04c058e8f1bf00a8242a233727dfae8888050b17cd96a3abb05d02e0da05298b6eb4c4 EBUILD lxcfs-5.0.4-r1.ebuild 1982 BLAKE2B 1f7461b6b9329fe6cadec26c2daf039137df581028fda6941efaf10b18ddef912413e1e6f0d4fa267c1cbf5ef27a8abe5d500640b1d037096d1902c037ebbb8b SHA512 510a79f224d15176e2399e8dfabe759e8ee38308b2ac9f0685fb84c88f8dc433981d9eb5b86694dbcdd06c33ef6b7e3d73632d1112f9199f7acbeb1d85f95060 EBUILD lxcfs-6.0.0.ebuild 1900 BLAKE2B 9bfa072be657bb06aba52a3c43a518038da2086586824a08ba33e98f3a7f4179dde215f3a0c21a13efca33651b24d86feb8c2fa7bfb51191d0323c8321753b68 SHA512 60b06c9936bc1000d6f58eea1e9a684247aa4c33fcfec417c458931d87e1af8f22c43bb1bf5d41565f48c1c35187dae362c9e8ef5911c0052d532e262f5f404b -EBUILD lxcfs-6.0.1.ebuild 1901 BLAKE2B 5cade5e15ed8b8dd5f6dbe9d67e0b377cb20c628910698c0da71a5425892a0cb742003dad9fe308b4063598b733640df5d7814cd48dbcb2801045285365da101 SHA512 35f3af9220b25f0605ab6d3e3fdf846201dfd9d8363cdd84dac4d63854ff9d1ff1d145861e79f739937f275aa457afde89fb38c1e8a057912c4d505af160a368 +EBUILD lxcfs-6.0.1.ebuild 1900 BLAKE2B ab9d548beaeab963ff0f36e47a3999b4aab47c903791fa3338c4882ec793e2a4c6ef30609e495583cb622d2991b7e103e615018e7f69582b7a9542fb3d70aab0 SHA512 481ebdae9cffb7e0ff324e6f32fd83448a25dc1301142d634d1b6a6b531d089af508b59a61ace923dfcfc54de3be3c3bdd6dad80f0a68a3e1043b932aeda67a6 MISC metadata.xml 769 BLAKE2B 2e11677f002a9ac8d0524d2cf280e4a39871bcddf095b37c6a9c6bcbdbbc346a397b9b6e64cecd40539cf96f4155a83d451a3a0e462a5cf0696fd5523b08f430 SHA512 364780d6ed12d98ca62183f90b12363ac581cdb4495bbfde4983321858d3f2d29343e7ac6a8b36c24a3518c868b67e38d5d28f7dee4a6e13aad65fcd9b9b4170 diff --git a/sys-fs/lxcfs/lxcfs-6.0.1.ebuild b/sys-fs/lxcfs/lxcfs-6.0.1.ebuild index c0e7a84ec0f5..e90cf5629f5b 100644 --- a/sys-fs/lxcfs/lxcfs-6.0.1.ebuild +++ b/sys-fs/lxcfs/lxcfs-6.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake meson python-any-r1 systemd verify-sig @@ -14,7 +14,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz LICENSE="Apache-2.0 LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" IUSE="doc test" DEPEND="sys-fs/fuse:3" diff --git a/sys-fs/mount-zip/Manifest b/sys-fs/mount-zip/Manifest index b93635255da0..d4bf8f84e5a8 100644 --- a/sys-fs/mount-zip/Manifest +++ b/sys-fs/mount-zip/Manifest @@ -1,3 +1,3 @@ -DIST mount-zip-1.0.12.tar.gz 723368 BLAKE2B 524d2681a4311975ca7d30362d28776f5258b5eab9fb52e5283ff5a20e17b9fae9aa03d19838424c1ce8a2822f90d2d03870153da654b21acc557400e6040117 SHA512 05608420d8a17d4bd940bb735e6f8bcfb696cbe4a120267b5dde3f9e04094e221b9a67e0a71125df7df02c4fdef102123d71e00fa7dda62dde28bdf57e599aa0 -EBUILD mount-zip-1.0.12.ebuild 689 BLAKE2B ad3dcf8b994aa68226da9a0dc4becd5187eca42238d563c962c6f2ee467b2562cb4e3fc2152801452391756eb13325c88900009954765b8ec76e6ebd280cb52c SHA512 bc323220b3868197d32118fe8933859060c26dda7fc77e70d96f3c3936eb16510d08d4ca9125bb03e1bc193da0db4a3b8fb78eef38b9863d53a7d6cfa9cab642 -MISC metadata.xml 483 BLAKE2B b12e1e62d7ccf3cc0a70c7d57b7a167f7849f25f5eea1d88b4c0f4977ca189eadda953d188d4e1b493c6d3f0ac7e43a2ba5c41020aac757f927f833f182c8bac SHA512 ecc38ef80c2c04651e9921ff7d88b9721791792247469559b3499731f95be818904deb4ed444d6fb4ca2eb7ae86c45336f97545db5722302f200f14adcf0041f +DIST mount-zip-1.0.15.tar.gz 742530 BLAKE2B c328edbef7e28408c39cf7eba311c431793998562bb448796fe0bde1b0b647d4253f1289e6e68d7d9d677b13638e58033146e1f1ec41b3ac370419cdeed54bb5 SHA512 939e051ddf15050f5a3e6c0c0aa22b795dbd77f292a2ae191cb797f7e4cf5581a15178f75228d93d5ab92a1b5e635a030813d4b00148c5533e150eb305288d9f +EBUILD mount-zip-1.0.15.ebuild 689 BLAKE2B ad3dcf8b994aa68226da9a0dc4becd5187eca42238d563c962c6f2ee467b2562cb4e3fc2152801452391756eb13325c88900009954765b8ec76e6ebd280cb52c SHA512 bc323220b3868197d32118fe8933859060c26dda7fc77e70d96f3c3936eb16510d08d4ca9125bb03e1bc193da0db4a3b8fb78eef38b9863d53a7d6cfa9cab642 +MISC metadata.xml 249 BLAKE2B 8cb50d64c543b8445ff5c14c4b57ef85cff9c243e233de41728f21a7460a88f780be7e33420792db6a5242b3365d460830e276fedb2d18ffe102fc8ce23923f1 SHA512 48ab628170f8ab5a5e1aff16c49de53c05b428af98de6480ef02cfb68c34200686e098d8c0e2dd7b73c5d98e7b12728817bd95b8e99aa1ab5fbd9ee8e5e210db diff --git a/sys-fs/mount-zip/metadata.xml b/sys-fs/mount-zip/metadata.xml index 62957e62e7fc..7f06bd526e67 100644 --- a/sys-fs/mount-zip/metadata.xml +++ b/sys-fs/mount-zip/metadata.xml @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>fdegros@chromium.org</email> - <name>François Degros</name> - </maintainer> - - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - + <!-- maintainer-needed --> <upstream> <remote-id type="github">google/mount-zip</remote-id> </upstream> diff --git a/sys-fs/mount-zip/mount-zip-1.0.12.ebuild b/sys-fs/mount-zip/mount-zip-1.0.15.ebuild index 9a3a0c705708..9a3a0c705708 100644 --- a/sys-fs/mount-zip/mount-zip-1.0.12.ebuild +++ b/sys-fs/mount-zip/mount-zip-1.0.15.ebuild diff --git a/sys-fs/mp3fs/Manifest b/sys-fs/mp3fs/Manifest index 5db5995126b6..bf14c63f9b7f 100644 --- a/sys-fs/mp3fs/Manifest +++ b/sys-fs/mp3fs/Manifest @@ -1,4 +1,4 @@ DIST mp3fs-1.1.1.tar.gz 804399 BLAKE2B 9e7f99b923ad744d172fa261315498c7df13d2416a7eca45108d47a7926c40c527e306c1b7d3f0aeded01ad5d32325640358fab5b5327a5c11e0e91d21d4f290 SHA512 b1e4f403666122056f924514a7e63ddd53dc00346d7750e37e8150ad5f13294129595d79398677c69726fb2abf942d4ddb8fdcac3b1312a01ed467475f22592b EBUILD mp3fs-1.1.1-r4.ebuild 694 BLAKE2B 73a251c151a6e06bf05e10298722b06dc8db7cd02a39135be8f6cbdc3b2742a2f8643772cf4a9d1f57e28537fce908a8d01989202347c3438eb83d4e7c9e480a SHA512 5ea9d54ef953f8910346d1322142adf58639c145e09421e56546266e93ea435e9de84c76277e038a55df370f60551cadfeeb44825b7fd945d235e41e08f7c983 EBUILD mp3fs-1.1.1-r5.ebuild 765 BLAKE2B ae341d0a3e6aff563bf9123f9b0881049b9f114055c8e01e1b2eb0d6ea37b09e1f29270d2505f1f8930c7d28c9651e650ccd77b081e95f11c2dcab6b8cdad062 SHA512 46e0664405f8a7eb7e1ee42c896602f961db297b759c63e70d7c006709cea679dde98f9f0af3afe5fa7cbe4a748728710889659be951a9415343a64e1dd25b50 -MISC metadata.xml 327 BLAKE2B 345f8452dabea6d75a6b5b71c0561054435b8f4bb398bed8b3c1456a01787c1aa6ca3ab2205ddf9aa8c34d4fd74ce5a5ee701063f53f00cfdc3b03a3e768eb3a SHA512 76a69ea028b3713bc345a5b69404a439afa588a77ff00a21111de0e67f9608f347ec73e8fb8d20289fcd6b3fa2fb44eee0afd59b882b474e43e988be88bf3469 +MISC metadata.xml 247 BLAKE2B 87297fc47ad3c56068240c805a7ac935851da95034239d6bd85539281bab0efc85fe67d4610180167653451a9a8d197dec3573322e9acffd8899ca76be785a12 SHA512 258c5d3dd8165cb5597630819534112f4e9e4a26d8aab5dec40ca14a09f7b94aec6ae5238fd428ef0a7722ebeaa883105d191bcc2dd7ca4111b6209b03f950b0 diff --git a/sys-fs/mp3fs/metadata.xml b/sys-fs/mp3fs/metadata.xml index 7441425e8bc8..bd0d05b76922 100644 --- a/sys-fs/mp3fs/metadata.xml +++ b/sys-fs/mp3fs/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">khenriks/mp3fs</remote-id> </upstream> diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 364c128e0398..182a317b6c59 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -3,5 +3,5 @@ DIST mtools-4.0.43.tar.bz2 443673 BLAKE2B d000839bbb6bc647eb5a32b08b40b1350cd0a8 DIST mtools-4.0.44.tar.lz 389267 BLAKE2B 1a6a9d257fc07cf27280a535feac873d27690fb02114b293e31d7c8441de6bbdbd57a13f4ba62ce5a5093cd45683776dd8e61ac822b1d3d44eb98cd21f7b9088 SHA512 8977f43b1cd25a0d1052f9f8f140d73d432bd49a7a4737d0b743a9f8ccec5aff6bbbdc07455011ecc49038b1b1dfd6908dda8c46d06389b1511875f9bc654f84 EBUILD mtools-4.0.42.ebuild 1066 BLAKE2B e9962aac85a2cb4f17c35ae286c2191c447c98a83cfbbe681d1683e30f0e4ab83d28030f1912571918120742189ddd10900da13fc0ec9f5631845987e26c3cd7 SHA512 a0eedcc4ee8c2a9e37ca146efc3627dd6984917710269d0066930180490253f27c6e306f853a94949a263eefcd44e6c4a7e723d0dda3df3e6f7462830f4d228b EBUILD mtools-4.0.43.ebuild 1066 BLAKE2B d3ae92c757d6ce0ade4ec430f48c97a7b34933022efc5b8aed1634cb0811b7ac2b361ab2027a5aa1144562b6eeb501347fac0c28d7848ad45d110f4c6417dc2c SHA512 58b05d3155ae5df02468f1b2452122e9fb2269f6e3100485d6b5660d52a5670db488d6ad065f68e78301b3b7c6eba6e1c2a2f821898ebc0bb54edf1d1ecc30cd -EBUILD mtools-4.0.44.ebuild 1119 BLAKE2B bff0deb44dd33209817ec44630eef6623b26b021a79a75cfeca5b507b6d334d7cc0c32c7ac70bba8dd95bf20244fa38e7862bbdf9c52db8b69893d48a93af7e8 SHA512 345744557d78d0885b1a01e465ac5bb455d7cfe2863435a6a6ff2cbb0c647e3cb08420edcb3342bb909c168108c88649fe89bfd820f2cc592180de201ebbe807 +EBUILD mtools-4.0.44.ebuild 1112 BLAKE2B 49efc327b10910d7ba87091209ca46c5356f0a41636bbae934832d2e9e572c6f8135de78ab9cb5f7772c1160fd1a3eb55ea3907306fb3b30357446073e15894a SHA512 c88ecabca5148f3c3525bfec9a626ef6cc771f886a555270e603c17c7ad72b0b816b43c7f1b0721dc407d39997a12c0eb597daced8b6d982d7a9c11043d472c5 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4 diff --git a/sys-fs/mtools/mtools-4.0.44.ebuild b/sys-fs/mtools/mtools-4.0.44.ebuild index 1d70d80df856..ff718fe08490 100644 --- a/sys-fs/mtools/mtools-4.0.44.ebuild +++ b/sys-fs/mtools/mtools-4.0.44.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris" IUSE="gui" RDEPEND=" diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest index 71f8194e8e7a..43c47d97f0b1 100644 --- a/sys-fs/ncdu-bin/Manifest +++ b/sys-fs/ncdu-bin/Manifest @@ -14,6 +14,15 @@ DIST ncdu-2.4-linux-x86.tar.gz 297477 BLAKE2B 2d1b7d4b775bfdfc7c0563d40ecbbd0a6d DIST ncdu-2.4-linux-x86.tar.gz.asc 833 BLAKE2B f13a87ab6ccf98167adfbf98a43e1baad06f6344161ac45911e81ce2bf0637a8b381f22f1bd5ef1ec8aec44e56a4c13a0fceccec613359b44f01044ca39309de SHA512 da3e3b534656fb4d8589937322e2c6cf49227f0ec0ef5d3d00149f60b8c17122b7b026bfcb2a0e0de3893c71cc3adf2f301327782ff28ee94024f584f116c7b2 DIST ncdu-2.4-linux-x86_64.tar.gz 286824 BLAKE2B 0a0c8ffed0b0bda6b77013ca348d43e508aaace419476fd9eaeaddaaa0656e803684bb493552f09ff94e6097e2d4ac8a261d7d64d13022976e1041d49e256338 SHA512 a7e026adf351a23457377f9f6524af709022ef4f3a0646cb875a98abf5dd7487222fd79b538debff66a851eb71135743987ffc8729189698e26e1f1c728136ed DIST ncdu-2.4-linux-x86_64.tar.gz.asc 833 BLAKE2B 5501bbeda29ee15df09a50d64720b72c681f5aec89b05a9362b327d0b28cccb2537d5d9382e188e07a0c19e727fdcad5ddc6ce28937468e98125a18c318f6ac2 SHA512 8a70c1a76a3137c3b91b522cb6a703b566b426338cc794c6389693351cb61bb103af8ce49b5eda2f5732df490ed844fe3898499fc11a63478ee18c5e5c26533d +DIST ncdu-2.5-linux-aarch64.tar.gz 283085 BLAKE2B 28518e20460db8abbdfdfa6b61b61024b9550f5bf34fcea9682f5598d05cd417ad4b8b78b662e6cc6ad35b45f514cdfa2d35ef7677c50338a40345daf0ce4b57 SHA512 973139d158ad71ee80939aabb1a419668c95dd25f7e5d78ede78afa66bf1fe835e7c736ae1ba5b56fe6e0bde6125b46d6102629492582910947778821912d199 +DIST ncdu-2.5-linux-aarch64.tar.gz.asc 833 BLAKE2B ef4e246218a81c10aed27829f68a78fc96f9feb7a84dab6f32631ca400b480dc5ef36c185d6afc830537c15297da02ab7b58720576476509ebd554d0a1a338ae SHA512 d9ff6aee538cfbabfddcd59108baaa949e96df722c9e7f8fe81499640041d361b2a7473982cbd7e9a44ea2c5a1394cefd6a0a9bb05733775c0a354459d870ab1 +DIST ncdu-2.5-linux-arm.tar.gz 278582 BLAKE2B 07ff2c8463ff407c5fcafe65db7d3911215b3dd78ae3e65ee6aef43c57d8eea782eae741cebe83488f9b5b504bc9b8830d6cc586866e3a6fdb10b79c6fcff43b SHA512 7fb2ed31eda1e6e4a7f1749ed341d062aa6f6e4502ccd3e50fcfd5fb2e3f892f201d17d6eca605e281a3f2a6f95938fe0af62750b79bde051917cf40747fc374 +DIST ncdu-2.5-linux-arm.tar.gz.asc 833 BLAKE2B d2353572707b4a54053a0a2cc9a606b90d0d91bd42a12677ac9028e1ff64c41ec812056e734e34ff38ab8aaa5d2120b7aee1d8b14d6a3c1a3031dbfeab7dbf4b SHA512 d017e6f4a3546dad5b08ae3f9c8ff9470fa337955705f19175730415abd6f3032eb201f0a5e8876cde8b363259311524082e3ed6c652e9e5c2789d5eb560b3c8 +DIST ncdu-2.5-linux-x86.tar.gz 299610 BLAKE2B 0f644a185de2bc12a7714dec5f5269dad12f47a8e42399b7f5c579913312e5dc5060e7a12ada4ffd345367661baeea5fea50dbba381a1ee3f36d1048bba5f085 SHA512 88d7b8f42a80ddaa3faa6722c9d78669894b7e768e158ce39576e42d6a926912cc2e0f85c1dff1eeb1471ea4bc4fea69d7aa70b40e22782156c5ef28f59f8d28 +DIST ncdu-2.5-linux-x86.tar.gz.asc 833 BLAKE2B 907beb66a768d9639445539f98069b172fdd0c462b2eeb8872bd8c33bc9607a1cae9ccbb542d33717649e73d413f12a8792835cb89f3e7fdf534a2f69d75cbc8 SHA512 508cc5893cb8b1bd7138dbffe91933f007ecb5ac601c5a08806f5c55f541d0bc89111fd7091d1b9b1ebbc7978ff9d7f896d80e2c19e8e28d8973db3bd3b6ad40 +DIST ncdu-2.5-linux-x86_64.tar.gz 286301 BLAKE2B 92f7f6bdfa3838d657f53e14bb58be92e7b7aa2147f2bdd38fc9ac417bd0ffa14021eae587f0ba22c7277315b4251ce53fb78f8f7dbd1dad42d1805d0babe60e SHA512 2c48dd1ceb34de54cf64fcdabd81fea86a113c7914be2d2a17c9242ddbeffab69bf6ae9a51e1dd82f87c408f1cd61f4b1b32c960f4ab274db6c7fafaaa262e86 +DIST ncdu-2.5-linux-x86_64.tar.gz.asc 833 BLAKE2B 44becd2cef14a4b5e0359810c2d9f867afe282431e203db2f88aa3b21cc703174651cfe23e1f6077de779edb980cc7356a099ce926a4f029049d165dc9311640 SHA512 14636902d8475772d6ed3e3d194ef23a5613fe0bcb43a39a10e5598d392251fcf69b6711904f36fbc5a9c13a6953d7c4bcc02e0fdee2c93b2ef7e6c1597fab60 EBUILD ncdu-bin-2.3.ebuild 1103 BLAKE2B 075ef4fbd0dbc80495cee7ae5143d1d6a158f4e15222cb2ff0534cfb3d35361efab6221d1ec5a2f697f75f86b90bd07a63ed7092e948283ebb3a22923b4af79e SHA512 de6e73136559525dd63fb91c43f9af213eb4f78e5cda79f14174ef89710f137e9ed7b154748cdbc379880f99884ce9d4f438584df3d6adb01a77815c22acaed2 EBUILD ncdu-bin-2.4.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9 +EBUILD ncdu-bin-2.5.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683 diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild new file mode 100644 index 000000000000..76fc2f6bba95 --- /dev/null +++ b/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit verify-sig + +DESCRIPTION="NCurses Disk Usage" +HOMEPAGE="https://dev.yorhel.nl/ncdu" +SRC_URI=" + amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz ) + arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz ) + arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz ) + x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz ) + verify-sig? ( + amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc ) + arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc ) + arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc ) + x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc ) + ) +" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc + +QA_PREBUILT="usr/bin/ncdu-bin" + +src_install() { + newbin ncdu ncdu-bin +} diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest index 6adfcfdd9269..7e7f57714971 100644 --- a/sys-fs/ncdu/Manifest +++ b/sys-fs/ncdu/Manifest @@ -6,8 +6,11 @@ DIST ncdu-2.3.tar.gz 56608 BLAKE2B 9fd73fba83c57195f8ffbad5b954140a776d1cd1d7b3e DIST ncdu-2.3.tar.gz.asc 833 BLAKE2B fd5b6b4b6e14b8bf66f5053c637598c3a0a9ad16d29c20805d62418fb69a22fa1155c8591dac35514d088c57853043c7d6c8b94abdff793a3f7b0a53cb41fd65 SHA512 698d8f1c0a7e0267fdfcfc7823803012ab7faae6eee75af406ecc9a73244463521de851c3f2b116ae7f6d7e567ea17a7ef6aae75e135a8efbb02333525455b20 DIST ncdu-2.4.tar.gz 51648 BLAKE2B cbe2db51b86a6ac624d3a0300bb41337ff0c8ce63165dc0f471872c0fa646406bf190d4f0605130d55d981c0a694a6bbbb9092c8857c45f362dd4bf0016b0617 SHA512 0bbc4400d05831528415c7e22d1e4b5c43cb8682c2bc35439e150763bcbc159664fee887d0fce89d28fb4199378972ffeb54c694e27b5f58d2ddaef890b055a7 DIST ncdu-2.4.tar.gz.asc 833 BLAKE2B a0a0f3c8652242c1b3a7bab2e8eb03901bd0d8a0ecb2079ee914a08aeacda7e7c706eccef70f43a90d7190f32a3bc0eea2e3d46a9b3c29621a9e952328271cb7 SHA512 8eb6be85e7e33b2fcda3ce4c34bc4ff4a0c438b70a8d40ed91fababc728b77f0a83e0e07d70a7528821c774262a6d30cbbf73c56624d61ce3f4e93f27f1d5c31 +DIST ncdu-2.5.tar.gz 56019 BLAKE2B c10fb19f87c3d26334038ee96d857e547f9f6881518a675d9777a6c46cf456748861d84df190c14d6d2582f5ad3998ecdf9d00f0969c996221c0d1d9787570a3 SHA512 f4d499a3ab98a56667c75554c77951e4a42f5acdc1353875c108b0da469665777564405b8fcea5a731de473afacfda9f2c8701ba0ba989de1260119c64d7a9f8 +DIST ncdu-2.5.tar.gz.asc 833 BLAKE2B 86babaf8720898a5bd83a2cc290deb2f0a8041087b9f0afddd2306766b82877bbf51f45ac3622761f231359b2e5f60b8d6c5479963aaf7a6abdf67d24fb18496 SHA512 a28751371f7e7a033379fb5f5dc885c69e716f8b6654b8ee9e5eb023a22b67ca99e3ee813ddc2e335d6e8db9bd5a9a19359910a1b8aad13132f7a8bed1d67d78 EBUILD ncdu-1.19.ebuild 673 BLAKE2B 0d8a2758bb4e30d68b24c20bb6053c177b15dd191378091b618299aeec19f9dcc8a155a3374fd3a7ec90f389ef461d44c06c5f16621fa780da916c8767303a5a SHA512 319a81be8ef82e2c553a74328fa4c619e5ca3c6974f0d73f7772eaaa7a22b5162fcf3a14283856be49a32ca038b99bc7862812a69b4c087b7b5258d50bc3ad0a EBUILD ncdu-1.20.ebuild 664 BLAKE2B cdf9a7bfa92bda9793df816192e56fdb17ecfbf66d745f24e6e06828858d13e5df2e61667b61e7e2fa9b38502d65a374f05bb761c4ed09ade11c3f4c77cec1d0 SHA512 922f69ccb8701600af59dad8abd063b25e40104cd40b918df1aa84ad406da4c86c1a1e7d51804be5682d66871d252de7ad68f27e7e4cff7ccefe1064bdbb308b EBUILD ncdu-2.3.ebuild 2995 BLAKE2B b86cc7995305064cc5673f45b075b1c90033a5cf9bde3edf297f3412f89728088103b7d61876121ffd741eefb5e5e497244153598a37583ba52e4b0f64b5ab63 SHA512 28c36e5307d4483896cd3c3e067a8d050e7e5aa35b8e47fb43d02743f7268b35225d7d8a692be4956153600dd72a11ea074e1f7a611aff168eb951a5ce0c0e21 EBUILD ncdu-2.4.ebuild 2995 BLAKE2B 80698c91f20c43a5ffce2024f3a3b6430effad2788028f2daff737b881df93416926b7c848a9d86ec8f8bb51e6032a8d5fad9dc63ac4ba6bbb3b96fd9186f694 SHA512 51e3fdf31831eedc1cc1354a89d468e3fb892e039fb4157097b5f9269177528749c763c7b18e4419ff0b4e93b1722575c1f2fb99d1744ce19d38da788f0dba4a +EBUILD ncdu-2.5.ebuild 2980 BLAKE2B f1ba3ce44606ba73f9eb1cc7c49ac8b8318d606cf0c35c21e005a2aba10cde8319f8b2ff813b07461e4f95841232d34777e5e22d4f86c83159a582e1b2a884a4 SHA512 90d4cd3f10a7fd8c913db5775fb90cbfbd065312dd8bcc8b3bfb0720d1d8e7d3e58c0cfba49979641aaa31528ab2aa3f2849fee57d8466860119ccad701572e6 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683 diff --git a/sys-fs/ncdu/ncdu-2.5.ebuild b/sys-fs/ncdu/ncdu-2.5.ebuild new file mode 100644 index 000000000000..ae93255d2b4a --- /dev/null +++ b/sys-fs/ncdu/ncdu-2.5.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit verify-sig edo + +DESCRIPTION="NCurses Disk Usage" +HOMEPAGE="https://dev.yorhel.nl/ncdu" +SRC_URI=" + https://dev.yorhel.nl/download/${P}.tar.gz + verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc ) +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +EZIG_MIN="0.12" +EZIG_MAX_EXCLUSIVE="0.14" + +DEPEND="sys-libs/ncurses:=[unicode(+)]" +RDEPEND="${DEPEND}" +BDEPEND=" + || ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} ) + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-yorhel ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc + +# see https://github.com/ziglang/zig/issues/3382 +# For now, Zig doesn't support CFLAGS/LDFLAGS/etc. +QA_FLAGS_IGNORED="usr/bin/ncdu" + +# Many thanks to Florian Schmaus (Flowdalic)! +# Adapted from https://github.com/gentoo/gentoo/pull/28986 +# Set the EZIG environment variable. +zig-set_EZIG() { + [[ -n ${EZIG} ]] && return + + if [[ -n ${EZIG_OVERWRITE} ]]; then + export EZIG="${EZIG_OVERWRITE}" + return + fi + + local candidate selected selected_ver ver + + for candidate in "${BROOT}"/usr/bin/zig-*; do + if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then + continue + fi + + ver=${candidate##*-} + + if [[ -n ${EZIG_EXACT_VER} ]]; then + ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue + + selected="${candidate}" + selected_ver="${ver}" + break + fi + + if [[ -n ${EZIG_MIN} ]] \ + && ver_test "${ver}" -lt "${EZIG_MIN}"; then + # Candidate does not satisfy EZIG_MIN condition. + continue + fi + + if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \ + && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then + # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition. + continue + fi + + if [[ -n ${selected_ver} ]] \ + && ver_test "${selected_ver}" -gt "${ver}"; then + # Candidate is older than the currently selected candidate. + continue + fi + + selected="${candidate}" + selected_ver="${ver}" + done + + if [[ -z ${selected} ]]; then + die "Could not find (suitable) zig installation in ${BROOT}/usr/bin" + fi + + export EZIG="${selected}" + export EZIG_VER="${selected_ver}" +} + +# Invoke zig with the optionally provided arguments. +ezig() { + zig-set_EZIG + + # Unfortunately, we cannot add more args here, since syntax is different + # for every subcommands. Yes, even target/cpu :( f.i. : + # -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build- + # -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build + # (or even none, if hardcoded by upstream so choice is -Drelease=true/false) + # Ofc we can patch this, but still... + + edo "${EZIG}" "${@}" +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + default +} + +src_configure() { + zig-set_EZIG + export ZIG=${EZIG} +} + +src_test() { + ezig build test -Doptimize=ReleaseFast +} + +src_install() { + emake PREFIX="${ED}"/usr install + + dodoc README.md ChangeLog +} diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest index 20a633255ca7..f6f10b17d8aa 100644 --- a/sys-fs/quota/Manifest +++ b/sys-fs/quota/Manifest @@ -4,10 +4,12 @@ AUX ldap-scripts/quota.schema 552 BLAKE2B d9becd7bd0f66ba8a603e3b442bdd36748c059 AUX ldap-scripts/setSystemQuotas.pl 3930 BLAKE2B 728956edd5f3e35939a068c92c5d94606d9b62943a6131502f235647a5251c3737a5307555dcaf98114946b8e9318a8f7c683d7bd066195d24c6542b95462fbd SHA512 8ecdd09500a849c4572411e904dc78ff967ed71f819969e0a27e697ca6607ca17906318784ccf1aca4fe066666dd2a21d800ce6f224478d0751db1a5c276a6ad AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be126ead114e0e0bc19d123c9440604b4941e6d9353e62408155180edd39076d634c5150334f3fbffb649af7dc04eeb9bef SHA512 f046c45b09b8afa88d11b4d55e35877c1c7e6c8e87f41f4c2dfcb063a2bd972cf584f88fdea2b42442cb44e460a48f3c9b12c3f5f3a99f759bbdb4ca95ab8e5b AUX quota-4.09-configure-bashism.patch 719 BLAKE2B 83dbfec4aa5e29fcbf53b3f7328bd9fa98604ee369c1bee63e0f88f7f9ebfea873843fac97f0aff27ae2c4878a81f14311b3e90baf2765e6155a1cd826baf0f9 SHA512 78e3dde6fe19254ea30e821c8f97b9b491c2244d16fa22c7cefde215c4bf8ec61ece7315b51d4fee73019959c6418c4d62861470aea0c8f97ad8c2770522f76a +AUX quota-4.09-fix-building-on-musl.patch 4380 BLAKE2B 0e56d8f1e41fe0b601e59f7ed05b387e645b3054fce93c2544f245a4f72b19f6a5c8fdabfe498c72836069b9d147e988e2811ae7050eb552f73d28112009379a SHA512 350dde28d4672ccbec4b2fb6ef68aa5c0930f6b02d6291dd933cb41b3582083e0cda1da83693d44d9133ede3a82f112642f1f0026bb1799b3697c620be258697 AUX quota-4.09-gettext-version.patch 358 BLAKE2B 2c9c6292416c17395cb8ef18db03820d05dfcfec72bde0fe1ffa0f8c78b03b89f8a6705eda938c76fa14f49584842c5d0c2ab2cf768e19e8a95efc009a4c3dc9 SHA512 6b3fe50a5bff78bebe3fb44216774dbbc1e3ebedef9cf633031b5e94efeefb9e7c95d3cb8705828a04745cbe608ec8f614720037fac33f232cd3fe376741a2d5 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954 DIST quota-4.09.tar.gz 523191 BLAKE2B 30b3828a45dcd7d99ff053f362917c138b1f0bcbde5f6fd3dfc1b48cb12615e5673d852f9276f2b370f9c799a2103e220d91ddf6a770aaaf8944cfb5c1131a74 SHA512 003d45f33543d4c87446e6547079cdae293b8dade01c58cf3626623721a1400ee07681395ad656c23a9ea2a62ab27c6ad24ad55600890e6e25334aba27ab1ad5 +EBUILD quota-4.09-r1.ebuild 1875 BLAKE2B 4b807046be78949155f8795fea0b6fbf72ec44a0400f1c53b48f9d6dbc7a626f18b989720bce759091e1617e65379d6f5e6042c46f037dff81a086c334df1a8d SHA512 e38c350b5f8951dfa813b435e61baa081334a9b1ca988e7d9f8f70ca47f5adb4cfc5430e76f17857fad1da48b44e4a30d5c50c865b58114be93dd324a99d9ac1 EBUILD quota-4.09.ebuild 1815 BLAKE2B 7b17b601b830eb946da450d59c677a44671539b6e0d91eaf64fb80158c81ca1e94f419607a7c6b2c1449da0d232c1dfd9587244b6ca2f3a77174844342bd7a7d SHA512 0e86c4582b4c4353d89b7d1762a5d08c3b1f386aec0fa7924149d324d7896171903cec6053c7017e53c1029131be257f793d5b98aa9fd263d657d971b515538c MISC metadata.xml 483 BLAKE2B a66c5218d5879916eb8d1158e838644b600c79c0285236bb622d4c71d977593c4c95c2e35f52d2be34a3990a0e6ac3a9f6461c541cdf0d704c303ec242a77656 SHA512 0fe78ffe3560e8518ee02f71b7ce3b0ef4963f8d87fd16daac911e42acf269f7f652cd5efa5a498c0e50efa9854c1ba10cd79382b82972aea682510433804614 diff --git a/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch new file mode 100644 index 000000000000..5c8e0fdbb4ad --- /dev/null +++ b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch @@ -0,0 +1,187 @@ +https://sourceforge.net/p/linuxquota/code/ci/e73c5b48e12c3f02e532864a1107cdc8a4feafc3/ +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 14 Jul 2024 07:58:50 +0000 +Subject: [PATCH 1/1] Fix building on musl + +basename(3) is defined in libgen.h in MUSL. Include libgen.h where +basename(3) is used. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +Signed-off-by: Jan Kara <jack@suse.cz> +--- a/convertquota.c ++++ b/convertquota.c +@@ -14,6 +14,7 @@ + #include <fcntl.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + + #include <endian.h> + +--- a/edquota.c ++++ b/edquota.c +@@ -20,6 +20,7 @@ + #include <stdlib.h> + #include <fcntl.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "quotaops.h" +@@ -38,7 +39,7 @@ char *progname; + static int flags, quotatype; + static int fmt = -1; + static char *protoname; +-static char *dirname; ++static char *dir_name; + + static void usage(void) + { +@@ -138,7 +139,7 @@ static int parse_options(int argc, char **argv) + exit(1); + break; + case 'f': +- dirname = optarg; ++ dir_name = optarg; + break; + case 256: + flags |= FL_NUMNAMES; +@@ -176,7 +177,7 @@ static void copy_prototype(int argc, char **argv, struct quota_handle **handles) + protoprivs = getprivs(protoid, handles, 0); + while (argc-- > 0) { + id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL); +- curprivs = getprivs(id, handles, !dirname); ++ curprivs = getprivs(id, handles, !dir_name); + if (!curprivs) + die(1, _("Cannot get quota information for user %s\n"), *argv); + argv++; +@@ -223,7 +224,7 @@ int main(int argc, char **argv) + argv += ret; + + init_kernel_interface(); +- handles = create_handle_list(dirname ? 1 : 0, dirname ? &dirname : NULL, quotatype, fmt, ++ handles = create_handle_list(dir_name ? 1 : 0, dir_name ? &dir_name : NULL, quotatype, fmt, + (flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS, + (flags & FL_REMOTE) ? 0 : MS_LOCALONLY); + if (!handles[0]) { +@@ -296,7 +297,7 @@ int main(int argc, char **argv) + else { + for (; argc > 0; argc--, argv++) { + id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL); +- curprivs = getprivs(id, handles, !dirname); ++ curprivs = getprivs(id, handles, !dir_name); + if (!curprivs) + die(1, _("Cannot get quota information for user %s.\n"), *argv); + if (flags & FL_EDIT_TIMES) { +--- a/quota.c ++++ b/quota.c +@@ -20,6 +20,7 @@ + #include <unistd.h> + #include <limits.h> + #include <ctype.h> ++#include <libgen.h> + #ifdef RPC + #include <rpc/rpc.h> + #include "rquota.h" +--- a/quota_nld.c ++++ b/quota_nld.c +@@ -26,6 +26,7 @@ + #include <fcntl.h> + #include <limits.h> + #include <signal.h> ++#include <libgen.h> + #include <sys/stat.h> + #include <asm/types.h> + +--- a/quotacheck.c ++++ b/quotacheck.c +@@ -19,6 +19,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <errno.h> ++#include <libgen.h> + + #include <sys/stat.h> + #include <sys/types.h> +--- a/quotaon.c ++++ b/quotaon.c +@@ -13,6 +13,7 @@ + #include <string.h> + #include <stdlib.h> + #include <stdarg.h> ++#include <libgen.h> + + #include "quotaon.h" + #include "quota.h" +--- a/quotastats.c ++++ b/quotastats.c +@@ -24,6 +24,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +--- a/quotasync.c ++++ b/quotasync.c +@@ -7,6 +7,7 @@ + #include <string.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +--- a/repquota.c ++++ b/repquota.c +@@ -18,6 +18,7 @@ + #include <pwd.h> + #include <grp.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +--- a/rquota_svc.c ++++ b/rquota_svc.c +@@ -34,6 +34,7 @@ + #include <signal.h> + #include <errno.h> + #include <netconfig.h> ++#include <libgen.h> + #ifdef HOSTS_ACCESS + #include <tcpd.h> + #include <netdb.h> +--- a/setquota.c ++++ b/setquota.c +@@ -18,6 +18,7 @@ + #include <time.h> + #include <ctype.h> + #include <stdlib.h> ++#include <libgen.h> + + #if defined(RPC) + #include "rquota.h" +--- a/warnquota.c ++++ b/warnquota.c +@@ -31,6 +31,7 @@ + #include <time.h> + #include <getopt.h> + #include <locale.h> ++#include <libgen.h> + #ifdef HAVE_NL_LANGINFO + #include <langinfo.h> + #endif +--- a/xqmstats.c ++++ b/xqmstats.c +@@ -8,6 +8,7 @@ + #include <stdio.h> + #include <unistd.h> + #include <string.h> ++#include <libgen.h> + #include "common.h" + #include "pot.h" + +-- +2.45.2 diff --git a/sys-fs/quota/quota-4.09-r1.ebuild b/sys-fs/quota/quota-4.09-r1.ebuild new file mode 100644 index 000000000000..10e3bf5b8c7a --- /dev/null +++ b/sys-fs/quota/quota-4.09-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Linux quota tools" +HOMEPAGE="https://sourceforge.net/projects/linuxquota/" +SRC_URI="https://downloads.sourceforge.net/linuxquota/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="ldap netlink nls rpc selinux tcpd" + +RDEPEND=" + sys-fs/e2fsprogs + ldap? ( >=net-nds/openldap-2.3.35:= ) + netlink? ( + sys-apps/dbus + dev-libs/libnl:3 + ) + rpc? ( + elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) + net-libs/libtirpc:= + net-libs/rpcsvc-proto + ) + tcpd? ( sys-apps/tcp-wrappers ) +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" +PDEPEND="rpc? ( net-nds/rpcbind )" +RDEPEND+=" selinux? ( sec-policy/selinux-quota )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.09-configure-bashism.patch + "${FILESDIR}"/${PN}-4.09-gettext-version.patch + "${FILESDIR}"/${PN}-4.09-fix-building-on-musl.patch +) + +src_prepare() { + default + + # Only needed for bashism patch and stale macros patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ext2direct + $(use_enable nls) + $(use_enable ldap ldapmail) + $(use_enable netlink) + $(use_enable rpc) + $(use_enable rpc rpcsetquota) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc doc/* README.* Changelog + + insinto /etc + insopts -m0644 + doins warnquota.conf quotatab + + newinitd "${FILESDIR}"/quota.rc7 quota + newconfd "${FILESDIR}"/quota.confd quota + + if use rpc ; then + newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad + fi + + if use ldap ; then + insinto /etc/openldap/schema + insopts -m0644 + doins "${FILESDIR}"/ldap-scripts/quota.schema + + exeinto /usr/share/quota/ldap-scripts + doexe "${FILESDIR}"/ldap-scripts/*.pl + doexe "${FILESDIR}"/ldap-scripts/edquota_editor + fi +} diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest index ab5b8fdcbb65..6d34a7474394 100644 --- a/sys-fs/rar2fs/Manifest +++ b/sys-fs/rar2fs/Manifest @@ -1,3 +1,3 @@ DIST rar2fs-1.29.6.tar.gz 269026 BLAKE2B df2b33561898b8e23bd54481f275058442be7b8616d7107614f98e6cc478c400ad764fff35ccab29f4a907ba9ac2afbb58f3093976e5b191b1e844f28a64f6a0 SHA512 c046f51c7047c3d04c3e9d1b69c72c019c32c70f83776f8179b608e8c21a7a3edfd4229434285a4234fd65ad48ffd5cbae3b2fa2d285cecf1a84a3a30ab3c256 EBUILD rar2fs-1.29.6.ebuild 809 BLAKE2B e8d1ba9c1759fa7436957b9f3b6083e49caee764c48ba0f74956d80c34ff10142667801f107fccaf1c19c85ac2538ffdb079a18ae0c37f0e38b5130214e8822d SHA512 dacb09b6ddfd49690e83329a0d15d77c52d79004bf98745ddce1a7a14f0512d1b4700ef68fb27829b47cb037c45c59852afb26c253560dcc4e6193aa61389e90 -MISC metadata.xml 481 BLAKE2B 83faebf349535faf97078ad47e15dba37cd2be7c43c04c9f5da63a73cd49bfe5e2cbb157dc9bdc0d30f35f85774af6e58020d8b6c8f3a625afbbaef02ddb757a SHA512 8f6c9473e99ed14c479ab89bc06b5dde87b9580909f5e11fdaa70fe07ffefd1edad783f93672b3df8bbf7ee8feec48034d644cd2a1e3b6da4727e980e986ad29 +MISC metadata.xml 245 BLAKE2B 7ae3d1c0fdbe4eb3d6a61c0a7f73b2e375842a234932674e39a2898ae0eab4ddb9093e5d750cf3a22ea0611ebc6912b16b423fe5fc9c17924210975c29b6ebd7 SHA512 52c65f932ae93ebb3a9db6ab2553bc3da9b03f8ffdf18a6527506b3089fcb782c8f80049de18e4a5856905288525682348b0b13acb6b8cbfdb23de0012a63638 diff --git a/sys-fs/rar2fs/metadata.xml b/sys-fs/rar2fs/metadata.xml index 0d9bf81a3545..3c6335ede4e5 100644 --- a/sys-fs/rar2fs/metadata.xml +++ b/sys-fs/rar2fs/metadata.xml @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>fdegros@chromium.org</email> - <name>François Degros</name> - </maintainer> - - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - + <!--maintainer-needed--> <upstream> <remote-id type="github">hasse69/rar2fs</remote-id> </upstream> diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest deleted file mode 100644 index 6cbdc99641f4..000000000000 --- a/sys-fs/reiser4progs/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788 -DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27 -EBUILD reiser4progs-2.0.5.ebuild 1363 BLAKE2B 594cc7ad842e31b3154b80d13365dc24eb51c8105e06a13801c69c8abc48562f9dc3d7d4e28329ecfa17063f8f7493b99c4104e2faecc5832aa9a248a4b2b817 SHA512 71c14933342e1c9c97f8650f98249c972e24e7b7414ed8445a6ab06370c01a2d99c8168cb6f32c3d3a783f8b8db9999f113f77f365205a8aa7dfa667500fe126 -MISC metadata.xml 241 BLAKE2B 69c2c526450c3fac8db61a9c83fa92e17f984bccdba1aab9c459dbe33a73482285305799efc2a544d5abee60e89f837bc5ebe431c39fd4acf4864bd5c0803f2d SHA512 11398472089e202d23a52ed08057c7f896a18818ded02333969613b3d6733377b1b5062b690518af2924f1e9c4347522da66994f8de72f0ca9192d0f90ebda16 diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch deleted file mode 100644 index 9de53bd41203..000000000000 --- a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/504472 - -fix building w/readline-6.3 -- the old CPPFunction define has been deleted - ---- a/libmisc/ui.c -+++ b/libmisc/ui.c -@@ -256,8 +256,7 @@ static void _init(void) { - - #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H) - rl_initialize(); -- rl_attempted_completion_function = -- (CPPFunction *)misc_complete; -+ rl_attempted_completion_function = misc_complete; - #endif - - aal_exception_set_handler(misc_exception_handler); diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml deleted file mode 100644 index b350297aa2ec..000000000000 --- a/sys-fs/reiser4progs/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -<upstream> - <remote-id type="sourceforge">reiser4</remote-id> -</upstream> -</pkgmetadata> diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild deleted file mode 100644 index daa7aabd0454..000000000000 --- a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs usr-ldscript - -DESCRIPTION="reiser4progs: mkfs, fsck, etc..." -HOMEPAGE="https://sourceforge.net/projects/reiser4/" -SRC_URI="https://downloads.sourceforge.net/reiser4/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 -sparc x86" -IUSE="debug readline static static-libs" - -LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch ) - -src_prepare() { - printf '#!/bin/sh\ntrue\n' > run-ldconfig - # Delete hardcoded link/compile flags. - sed -i -r \ - -e '/CFLAGS=/s: -static":":' \ - -e '/CFLAGS/s: (-O[123s]|-g)\>::g' \ - configure || die - - default -} - -src_configure() { - local myeconfargs=( - $(use_enable static full-static) - $(use_enable static-libs static) - $(use_enable debug) - $(use_with readline) - --disable-Werror - --enable-libminimal - --sbindir=/sbin - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - gen_usr_ldscript -a reiser4{,-minimal} repair - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest index a49637923aaf..f5042bf03d66 100644 --- a/sys-fs/squashfs-tools-ng/Manifest +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -1,6 +1,4 @@ -DIST squashfs-tools-ng-1.3.0.tar.xz 585800 BLAKE2B 658ff825b2cda63116c29d8c582f54df5bd511a6da98e737527d54720ed95a541edc39b94f61195f4c99d125cbcc8db824ea9d1e2a7a7a557fb647f5e795d623 SHA512 10ddff837464227d97c3c2dabeefa408a63fbab4ddc8ca184f4ecce7288ac47c0c6baf6d10146f7e29e4a845592720e39281f779420f5ba0b1e7736c0dea73d7 DIST squashfs-tools-ng-1.3.1.tar.xz 585916 BLAKE2B 697131ddb9959bed388534f90c93e2e7495ef5aec9facf97e7d17475cff64d7a4badb709a16ae5e6da3ee89b1a1e3a49833bd15b9a0b4b364e15a565bd18e480 SHA512 0a433f7c3633cd5d8646d990744e31ed59c7012d5f8bb4fdb7892b892631f22a8fd0969f7d81de68f53e44670e71cb8e29729cd925a93b98ab3b6942bbc30662 -EBUILD squashfs-tools-ng-1.3.0.ebuild 1209 BLAKE2B 0393b697b8f0e0ae0be5acc95eb55c7e5389a00d88acd5e7da975a456b9803b1ba2a6e124516e1dbe2f67b75f8cd78c4a08d12e0bd973bcb0fe190b1bcbe21db SHA512 ede357152b74cad9d8b680b4cd83b7e46320381df904988e24b0dbf6e8c1b460590a2e24599bdfa9165b67e4569f8ba34de7adc21aacbffb139352b4febe501b -EBUILD squashfs-tools-ng-1.3.1.ebuild 1209 BLAKE2B 0393b697b8f0e0ae0be5acc95eb55c7e5389a00d88acd5e7da975a456b9803b1ba2a6e124516e1dbe2f67b75f8cd78c4a08d12e0bd973bcb0fe190b1bcbe21db SHA512 ede357152b74cad9d8b680b4cd83b7e46320381df904988e24b0dbf6e8c1b460590a2e24599bdfa9165b67e4569f8ba34de7adc21aacbffb139352b4febe501b +EBUILD squashfs-tools-ng-1.3.1.ebuild 1208 BLAKE2B c17ebd789721b702c32d800046b4dc717fe1127da34387f2392617b9d807c627abdd2045ce6ad5c96a4676dff3c547ae105778c845c48bea0859c1d55b39d8e3 SHA512 8b5c64714c81bec7cdb69dda1d2a06898e95f145faa9d09d5d2c59495125798c8ff7b3498b2064a3490b139450006424d974eb4ee28c319cb39f5baa08891292 EBUILD squashfs-tools-ng-9999.ebuild 1210 BLAKE2B c5e8c28d5a83df822396afa52753d405489bfd69cadd05b888b6ff8d80a11aff1dceda98e592023508daceee35de923e73d48ed83e1bc7974a49662e51be30f1 SHA512 c4531ca1f027a2fa4a442722bc6a5de3649b64d0ab6973ba29b0e6311eb3c19042f89688de04a33edc319f4b78ba326ec0d9c0ce4f2f7717141276073f8cab5b MISC metadata.xml 453 BLAKE2B 4bfc83a611fe2b8da5ce57e56c438c671489d0944cbb4b3f82113bac6bee89028091551c1c96953f166959b087d7e776b28ecb6b9290489f007ea5ca33090ebf SHA512 013b8d87af8c6298eaba48b4aa4282a8781321b0a15d1a8745361e389bb6c5ae6957b24af4bb6b88125cff5f9824b0e878051bd395fdeb98c2ae0ef7f2b370a7 diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild deleted file mode 100644 index a4168be5e3b8..000000000000 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A new set of tools for working with SquashFS images" -HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" -if [[ ${PV} = 9999* ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" -else - inherit libtool - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" -fi - -LICENSE="LGPL-3+ BSD-2 MIT tools? ( GPL-3+ )" -SLOT="0" -IUSE="lz4 +lzma lzo selinux +tools zstd" - -DEPEND=" - app-arch/bzip2:= - sys-libs/zlib:= - lz4? ( app-arch/lz4:= ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo:2 ) - selinux? ( sys-libs/libselinux:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - if [[ ${PV} = "9999" ]]; then - eautoreconf - else - elibtoolize - fi -} - -src_configure() { - local myconf=( - --disable-static - $(use_with lz4) - $(use_with lzo) - $(use_with selinux) - $(use_with tools) - $(use_with lzma xz) - $(use_with zstd) - ) - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.1.ebuild index a4168be5e3b8..313023a84cc1 100644 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.1.ebuild +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" else inherit libtool - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" fi diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 6bac97aceb1f..f5f4c3fe7e27 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -8,8 +8,10 @@ DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74 DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d +DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023 EBUILD xfsprogs-6.4.0.ebuild 2414 BLAKE2B b71c91b69eb958bda96f1eea3feed717576397a214343c7474c8530ee7f60c0ca10260d98adf9ba3bc40d46498d1fd13bd71e216a52af08790e66d6d2498d6e0 SHA512 69a5eec472d87155e9343e7a9de65a65e15de3b5d4c831fd43636aa54a6435b708342d93cc4d93b132710db08446b3aab37ae75d37497a2ee8736e12c050a83e EBUILD xfsprogs-6.6.0-r1.ebuild 2668 BLAKE2B 4339af42004b2078553e75cdd1861d840100c7b260218a6c422083cd6e3a4a68bd3c4e304fa5792fe8826fc5ea0067830bd22342e6d7870d1e3ffe0367ffe0c0 SHA512 ddd6f21ea3c07e2d7a8ccfd5005ce45cb69b494ad82a03b844b64556f54a72c2192658e0d3a3c814dc8e8857faf432345689cf7b98c4cefd76294894defa416b EBUILD xfsprogs-6.7.0-r3.ebuild 2655 BLAKE2B 631390af82f532fff724e54110881e7cad750318a2257e4f65200f47316e03a718d9c88ce5b33532dd37ec968df5060d44c4796d4fc909fbbb7eac15226d6f2e SHA512 6c72ab4b71f401805d61d0e1712ba7a59e0704857e92a0757f3a2818e3888dc42174138b1d531cc054fce02304c3c7f4a4f0358ce18d033da05aabf70df7fff9 -EBUILD xfsprogs-6.8.0.ebuild 2603 BLAKE2B 1eea90b91949f344a37ea52e033b18ef626d2aadaf45069e126830061770374b32ebd9c9d4b236b21f092ff65160081a711d750bc54b15fdd1f47fd5e29c654f SHA512 7e79fb75397eb4a0c4c048d70eb52d24271a3f34c7dd80bdd5f8ec689de34eb4888d3bb0c7b9fa190255567d9e5632286e1495056662208b7ce49cafd26bb03b +EBUILD xfsprogs-6.8.0.ebuild 2596 BLAKE2B 768cc65ca0712dbf15104efdf6b6f8e4be233683fad13bda533e8afa1fe1bc9cbd6b5ddb04506cadc8fffb880827acc2813d64f4fc09fe28c020563959378e9d SHA512 640ae8923f2450465aa9da82d76f48517df38a07c2dac2c31f3c3f48462ee608bbeffc4286eeb0993135a1d83f9dab647cb53b204b6d172c73df5dc322b47f14 +EBUILD xfsprogs-6.9.0.ebuild 2603 BLAKE2B 1eea90b91949f344a37ea52e033b18ef626d2aadaf45069e126830061770374b32ebd9c9d4b236b21f092ff65160081a711d750bc54b15fdd1f47fd5e29c654f SHA512 7e79fb75397eb4a0c4c048d70eb52d24271a3f34c7dd80bdd5f8ec689de34eb4888d3bb0c7b9fa190255567d9e5632286e1495056662208b7ce49cafd26bb03b MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild index 1ce476e005a5..d082ee12b4f2 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="icu libedit nls selinux static-libs" RDEPEND=" diff --git a/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild new file mode 100644 index 000000000000..1ce476e005a5 --- /dev/null +++ b/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd udev + +DESCRIPTION="XFS filesystem utilities" +HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="icu libedit nls selinux static-libs" + +RDEPEND=" + dev-libs/inih + dev-libs/userspace-rcu:= + >=sys-apps/util-linux-2.17.2 + icu? ( dev-libs/icu:= ) + libedit? ( dev-libs/libedit ) +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" +RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.3.0-libdir.patch +) + +src_prepare() { + default + + # Fix doc dir + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + include/builddefs.in || die + + # Don't install compressed docs + sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die +} + +src_configure() { + # include/builddefs.in will add FCFLAGS to CFLAGS which will + # unnecessarily clutter CFLAGS (and fortran isn't used) + unset FCFLAGS + + # If set in user env, this breaks configure + unset PLATFORM + + export DEBUG=-DNDEBUG + + # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. + # However, we have to provide an empty value to avoid default + # flags. + export OPTIMIZER=" " + + # Avoid automagic on libdevmapper (bug #709694) + export ac_cv_search_dm_task_create=no + + # bug 903611 + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + + # Build fails with -O3 (bug #712698) + replace-flags -O3 -O2 + + # Upstream does NOT support --disable-static anymore, + # https://www.spinics.net/lists/linux-xfs/msg30185.html + # https://www.spinics.net/lists/linux-xfs/msg30272.html + local myconf=( + --enable-static + # Doesn't do anything beyond adding -flto (bug #930947). + --disable-lto + --with-crond-dir="${EPREFIX}/etc/cron.d" + --with-systemd-unit-dir="$(systemd_get_systemunitdir)" + --with-udev-rule-dir="$(get_udevdir)/rules.d" + $(use_enable icu libicu) + $(use_enable nls gettext) + $(use_enable libedit editline) + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake V=1 +} + +src_install() { + # XXX: There's a missing dep in the install-dev target, so split it + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install + emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev + + if ! use static-libs; then + rm "${ED}/usr/$(get_libdir)/libhandle.a" || die + fi +} + +pkg_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload +} diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index a851095d0777..003ec28f4e78 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -11,11 +11,14 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B f83439aa929609191a048dd326b2a15e0f57c72d2 DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B 86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c SHA512 fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9 DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0 SHA512 1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17 +DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6 +DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060 EBUILD zfs-kmod-2.1.14.ebuild 4188 BLAKE2B 44faf88962fa0f0cae02d9f171b66eb149dc602a4d9edce2993a33279ab9b3a2f330704e76b6295feffb2998f03830b81bf0157aa0430f1c5cac2fb971da5be1 SHA512 62c187ff630dc716187e3018914609f22a7031c5283d21a2f499f2481694270f32ebc62d8e4f97a5e04b723e8161fca6094ce8f142247d4351b1574372801c64 EBUILD zfs-kmod-2.1.15.ebuild 4188 BLAKE2B 5c8a646f0a674f6caf6fb65bcd785af9eb26c47261e764242dcac865f5280c9b6c47ae1f971d8d428c4e712ed75cfd0085e9af302cf2dd2d0d1d1e6e44f1fa71 SHA512 bb60b68a6a9c12dc9064cc831742de64db9bb743134edc0b868f6394e85e39d067915d940580f95ec656d31e46e0771a8fd983fb157dae96e3c2bbbb33ec0901 EBUILD zfs-kmod-2.2.2-r1.ebuild 5612 BLAKE2B def8f4448fdd20096a87f09ffaac4ad8bb7f9744770091bec5fad4cd711b2a8fda0f6b03437286a6b1b506f5b46ff4eb6cd16ca35537489d0bf58b03d57d73e2 SHA512 e08a7caf792a97a28f81587e2d5c9aba6b409b2c20e9b96417a93e48d3ec13969f71b9ccc7911aea5ca3f7b40ac4205dc0d13f0b0561492a1d2586e5f1cdcbca EBUILD zfs-kmod-2.2.2.ebuild 5567 BLAKE2B 7c6a49a817d8429b7e7bb5bffb311df24bce8763b0b7e931244eeca50929d2cca504bf2a266eaa55dd036892929432c00caebecd1c8525df2c0012646ac66690 SHA512 9c9b3e2f45bc4a9982f3540183ed3b1aec0fedbaa5f75e58819eae6bd38b7a62a4e55b8f83d263df13b16e32e508b863adcfb2285e31ddd148dad5ee12e9df9f EBUILD zfs-kmod-2.2.3.ebuild 5523 BLAKE2B 562483c01237a9751705c1a60b4e4a696a3fac3c8da5daf28cd5c3563a654a23532ea833fae2ed5d22a112f21c6ade5c1568b86a4cdcbfeaad495404266de07a SHA512 ffeb010a6a45c4887f465df697e29d9f064ed517a8b468c6a46041953c0bf05d32fe75d46fcb76ee7fb3103023cd2020189389808aad6eff92176a903615fc74 EBUILD zfs-kmod-2.2.4.ebuild 5526 BLAKE2B c57c9be7e51a70a6dd1d15c2a9f81056cca86bac1ac4793d6e915fc1bcbaa9ce4e0050e93ff274210fedf8a39e9980614618c6888aeb17b1d30cdf609dcd35bf SHA512 75a7ee2596294d3983d8b1a15b7ce8ded99050b4c643546b51da30c917109eafec5c6c55a115b31561070337ba3054578224155211bc5f2588e0b0f3d2130045 -EBUILD zfs-kmod-9999.ebuild 5526 BLAKE2B c57c9be7e51a70a6dd1d15c2a9f81056cca86bac1ac4793d6e915fc1bcbaa9ce4e0050e93ff274210fedf8a39e9980614618c6888aeb17b1d30cdf609dcd35bf SHA512 75a7ee2596294d3983d8b1a15b7ce8ded99050b4c643546b51da30c917109eafec5c6c55a115b31561070337ba3054578224155211bc5f2588e0b0f3d2130045 +EBUILD zfs-kmod-2.2.5.ebuild 5526 BLAKE2B f16c47784002820b4aec958b3030babf26faabd65db5a59d21c06ca745f8d1fbf5b5e00527f26214e992f18870c3fa5d448c4fe50a0f5d9484844e958a78d899 SHA512 487cd0a8bdfe1a21744ee066862a29d8717facd31d5a6c840d10024fe7cfd12156b6279bc621def8973fbacad7034698380e93449fce1b26d3bde0869388056f +EBUILD zfs-kmod-9999.ebuild 5526 BLAKE2B f16c47784002820b4aec958b3030babf26faabd65db5a59d21c06ca745f8d1fbf5b5e00527f26214e992f18870c3fa5d448c4fe50a0f5d9484844e958a78d899 SHA512 487cd0a8bdfe1a21744ee066862a29d8717facd31d5a6c840d10024fe7cfd12156b6279bc621def8973fbacad7034698380e93449fce1b26d3bde0869388056f MISC metadata.xml 664 BLAKE2B 50e33d5791fd756ae4566052ecd6d8b1b395f8390b4cbc10c3b32bfc12f0a414f4080bf4102091f0920369f7999f2f94022fd526703ee8e73dc948c1f9d28432 SHA512 dca8e09500fe0e20f11b10df22a61ca36c99b6b3a08c465ea011d921b25f5891be3abaa5e6dbda1a52dbbfad69d1c8bf9fc69f71b3ef73cac428015641aa52d2 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild new file mode 100644 index 000000000000..bf0cdfe58be6 --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://github.com/openzfs/zfs" + +MODULES_KERNEL_MAX=6.9 +MODULES_KERNEL_MIN=3.10 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" + inherit git-r3 + unset MODULES_KERNEL_MAX +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + S="${WORKDIR}/zfs-${MY_PV}" + + ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}" + # Increments minor eg 5.14 -> 5.15, and still supports override. + ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" + fi +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0/${PVR}" +IUSE="custom-cflags debug +rootfs" +RESTRICT="test" + +BDEPEND=" + app-alternatives/awk + dev-lang/perl +" + +if [[ ${PV} != 9999 ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" + + IUSE+=" +dist-kernel-cap" + RDEPEND=" + dist-kernel-cap? ( dist-kernel? ( + <virtual/dist-kernel-${ZFS_KERNEL_DEP} + ) ) + " +fi + +# Used to suggest matching USE, but without suggesting to disable +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.11-gentoo.patch +) + +pkg_pretend() { + use rootfs || return 0 +} + +pkg_setup() { + local CONFIG_CHECK=" + EFI_PARTITION + ZLIB_DEFLATE + ZLIB_INFLATE + !DEBUG_LOCK_ALLOC + !PAX_KERNEXEC_PLUGIN_METHOD_OR + " + use debug && CONFIG_CHECK+=" + DEBUG_INFO + FRAME_POINTER + !DEBUG_INFO_REDUCED + " + use rootfs && CONFIG_CHECK+=" + BLK_DEV_INITRD + DEVTMPFS + " + + kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP" + + if [[ ${PV} != 9999 ]] ; then + local kv_major_max kv_minor_max zcompat + zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + kv_major_max="${zcompat%%.*}" + zcompat="${zcompat#*.}" + kv_minor_max="${zcompat%%.*}" + kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ + "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" + fi + + linux-mod-r1_pkg_setup +} + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != 9999 ]] ; then + # Set module revision number + sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die + fi +} + +src_configure() { + use custom-cflags || strip-flags + filter-ldflags -Wl,* + + local myconf=( + --bindir="${EPREFIX}"/bin + --sbindir="${EPREFIX}"/sbin + --with-config=kernel + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + $(use_enable debug) + + # See gentoo.patch + GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}" + TEST_JOBS="$(makeopts_jobs)" + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake "${MODULES_MAKEARGS[@]}" +} + +src_install() { + emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install + modules_post_process + + dodoc AUTHORS COPYRIGHT META README.md +} + +_old_layout_cleanup() { + # new files are just extra/{spl,zfs}.ko with no subdirs. + local olddir=( + avl/zavl + icp/icp + lua/zlua + nvpair/znvpair + spl/spl + unicode/zunicode + zcommon/zcommon + zfs/zfs + zstd/zzstd + ) + + # kernel/module/Kconfig contains possible compressed extentions. + local kext kextfiles + for kext in .ko{,.{gz,xz,zst}}; do + kextfiles+=( "${olddir[@]/%/${kext}}" ) + done + + local oldfile oldpath + for oldfile in "${kextfiles[@]}"; do + oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}" + if [[ -f "${oldpath}" ]]; then + ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing." + rm -rv "${oldpath}" || die + # we do not remove non-empty directories just for safety in case there's something else. + # also it may fail if there are both compressed and uncompressed modules installed. + rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die + fi + done +} + +pkg_postinst() { + # Check for old module layout before doing anything else. + # only attempt layout cleanup if new .ko location is used. + local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* ) + # We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false. + # if glob expanded -f will do correct file precense check. + [[ -f ${newko[0]} ]] && _old_layout_cleanup + + linux-mod-r1_pkg_postinst + + if use x86 || use arm ; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + if has_version sys-boot/grub ; then + ewarn "This version of OpenZFS includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of OpenZFS. To" + ewarn "create a new pool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -o compatibility=grub2 ..." + ewarn + ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features." + fi +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 79b2c443b06d..bf0cdfe58be6 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -9,7 +9,7 @@ inherit autotools flag-o-matic linux-mod-r1 multiprocessing DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs" -MODULES_KERNEL_MAX=6.8 +MODULES_KERNEL_MAX=6.9 MODULES_KERNEL_MIN=3.10 if [[ ${PV} == 9999 ]] ; then diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 42fba9971776..9eeffb8932ec 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -12,10 +12,13 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B f83439aa929609191a048dd326b2a15e0f57c72d2 DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B 86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c SHA512 fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9 DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0 SHA512 1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17 +DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6 +DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060 EBUILD zfs-2.1.14.ebuild 8907 BLAKE2B ef6fa6ab85907507d146f3ee17c12680226ffcf0b49559d2f2521b95758d5dffe8ae4763d2db2691a09cf1a9d02bda4a58de0ffad205b4ec05201b3f76f85c3e SHA512 6f106cf37a7bc7fc850f86169aa90cea904680b85d5512045b36f7853024d702ca25272bc735eb5b140598581ea5edcd67b4bf027e1b378af2f8559b01d7838d EBUILD zfs-2.1.15.ebuild 8907 BLAKE2B ef6fa6ab85907507d146f3ee17c12680226ffcf0b49559d2f2521b95758d5dffe8ae4763d2db2691a09cf1a9d02bda4a58de0ffad205b4ec05201b3f76f85c3e SHA512 6f106cf37a7bc7fc850f86169aa90cea904680b85d5512045b36f7853024d702ca25272bc735eb5b140598581ea5edcd67b4bf027e1b378af2f8559b01d7838d EBUILD zfs-2.2.2-r1.ebuild 8809 BLAKE2B cbb0a314545e47bae39a40550179a30b7649f76a743a8171fede13557d343da5fd888c2101568f236358e9c9377d71dac844c4e7f6757646922efc9cd627ed1b SHA512 27b8f2c1eaa086b51bce6fdcd733a615843e7b8bd9a134b9c954a3f85796f0a75cfcb056e583c714c59f689dc999e167054a1fd20df9f69ebb90b67e82737495 EBUILD zfs-2.2.3.ebuild 8841 BLAKE2B 038a870598987f28403f579fa6ae4b0a7f8795f765ee5fcfdaa44094b9da0ee6c0abc1f0e4d38c175bd97cbf7a4a235bf1d681d5e31e4234351bcf104a78675d SHA512 a385b01ff07c3245a86b65202cfd5cb0ac1a2d4242147a4da5d9ef8cdf67817646c1fbca268d60e93b772bb9c47ca380b67d9313e147adb08046155384879072 EBUILD zfs-2.2.4.ebuild 8844 BLAKE2B eb9aa0625fb4f58cb31385224347512e4b1fc71ff1ed46537de764911dcc7351e39182d62b167f7cc84c394fdc0abd86efffeeaa21cb55fd45b7bc59095ca13a SHA512 f85f82ab4bf550fa139629dbf1114f6dc1507faf8bd3e469558f2d76a45455f935155938343834b02414582e22fe6b59ef6f088a9ab18ca15b6d8ec0c036ec43 -EBUILD zfs-9999.ebuild 8774 BLAKE2B 687b990541b8458069d9cf37c27fa4948e928858e8c852dae97e46ca975fbff1b26f8311358a943c8c587b59b3277378fc9445d092dc509e00716d99aace3d1b SHA512 b1710a7020598369dad2874391ad91133f89630313f4bdc637f0bf7649722b6a3d857694fc91630a0749ed94198aaeede58defd6c8044d43dacdd265dd1e8de4 +EBUILD zfs-2.2.5.ebuild 8916 BLAKE2B cbf3f148cf51cdf10566ed6054199f87392d118521ad3bb8cdb83535f57e43838bf49df963cd6d5ea55dab3c238aea54c67fea963de9f3a14edabbaeb824ac71 SHA512 4e9c76e3c84c5e6052b926860f940a6e4727e6539acc48773460dc33803d4960456bf50b80259cffc85a71adaa1b28897148e0f0acd785bb9a7f2228b338607d +EBUILD zfs-9999.ebuild 8846 BLAKE2B 72b08de72ca0e3efef220180466f9009204bfe8952bab70c68d3acadfbb672395036a8e885c2d62db0655a2a1edfb67ac2a2ecdad525341353392c35a894eb5c SHA512 b9495470dd27db133d753831d2e03c2a0475d733274fd383dcf372bddb67dab6ec78acc00b7864e5a5239ab711e79cbe16f7d56780c84eed8b2036dfede07926 MISC metadata.xml 2093 BLAKE2B 40f9f693751748deab32cd78bb919483e37d35da74ecaa28b31a183807c25c6a7022226e761dc27f895b142274bd9920e361f45a50b98bcf2a4b701d9e67fb94 SHA512 63d91d33151eea801c854246ea2c4640ecd432e74668b8f4f6ea22d4ae61823848a1608e9ee25821ef463f5f5e8e7e1c8d2aae4f1fee492ea4112214d2d6d1ed diff --git a/sys-fs/zfs/zfs-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild new file mode 100644 index 000000000000..5264247e69af --- /dev/null +++ b/sys-fs/zfs/zfs-2.2.5.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" + S="${WORKDIR}/${MY_P}" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" + fi +fi + +LICENSE="BSD-2 CDDL MIT" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +# see libsoversion_check() below as well +SLOT="0/5" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" + +DEPEND=" + dev-libs/openssl:= + net-libs/libtirpc:= + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) + python? ( + $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') + ) + unwind? ( sys-libs/libunwind:= ) +" + +BDEPEND=" + app-alternatives/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + ${DISTUTILS_DEPS} + || ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/distlib[${PYTHON_USEDEP}] + ) + ) +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" +fi + +# awk is used for some scripts, completions, and the Dracut module +RDEPEND=" + ${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) + !prefix? ( virtual/udev ) + app-alternatives/awk + sys-fs/udev-init-scripts + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-alternatives/cpio + app-misc/pax-utils + ) + selinux? ( sec-policy/selinux-zfs ) + test-suite? ( + app-shells/ksh + sys-apps/kmod[tools] + sys-apps/util-linux + app-alternatives/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set, without suggesting to disable +PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch + "${FILESDIR}"/2.2.2-no-USER_NS.patch + "${FILESDIR}"/2.2.3-musl.patch +) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + if use kernel_linux; then + linux-info_pkg_setup + + if ! linux_config_exists; then + ewarn "Cannot check the linux kernel configuration." + else + if use test-suite; then + if linux_chkconfig_present BLK_DEV_LOOP; then + eerror "The ZFS test suite requires loop device support enabled." + eerror "Please enable it:" + eerror " CONFIG_BLK_DEV_LOOP=y" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +libsoversion_check() { + local bugurl libzfs_sover + bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" + + libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ + | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" + libzfs_sover="${libzfs_sover%%:*}" + + if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then + echo + eerror "BUG BUG BUG BUG BUG BUG BUG BUG" + eerror "ebuild subslot does not match libzfs soversion!" + eerror "libzfs soversion: ${libzfs_sover}" + eerror "ebuild value: $(ver_cut 2 ${SLOT})" + eerror "This is a bug in the ebuild, please use the following URL to report it" + eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" + echo + # we want to abort for releases, but just print a warning for live ebuild + # to keep package installable + [[ ${PV} == "9999" ]] || die + fi +} + +src_prepare() { + default + libsoversion_check + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi + + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + use custom-cflags || strip-flags + use minimal || python_setup + + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" + --with-vendor=gentoo + # Building zfs-mount-generator.c on musl breaks as strndupa + # isn't available. But systemd doesn't support musl anyway, so + # just disable building it. + # UPDATE: it has been fixed since, + # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a + # but we still leave it as this for now. + $(use_enable !elibc_musl systemd) + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_enable python pyzfs) + $(use_with unwind libunwind) + --disable-static + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } + + find "${ED}" -name '*.la' -delete || die + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + use minimal || python_fix_shebang "${ED}/bin" +} + +pkg_postinst() { + udev_reload + + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use rootfs; then + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then + elog "Root on zfs requires an initramfs to boot" + elog "The following packages provide one and are tested on a regular basis:" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" + elog " sys-kernel/genkernel" + fi + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" + einfo "for default zfs systemd service configuration" + else + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ + einfo "You should add zfs-load-key to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." + fi +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 7b38a676beca..d54b8ffe39b1 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -34,7 +34,7 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" DEPEND=" dev-libs/openssl:= @@ -47,6 +47,7 @@ DEPEND=" python? ( $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') ) + unwind? ( sys-libs/libunwind:= ) " BDEPEND=" @@ -220,6 +221,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) + $(use_with unwind libunwind) --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) |