diff options
Diffstat (limited to 'sys-fs')
189 files changed, 1404 insertions, 6220 deletions
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index d50d223a791e..a2e492cb8720 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1 +1,2 @@ DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 +DIST android-file-transfer-linux-4.3.tar.gz 827232 BLAKE2B 3737b804cc9c7a2883d7a9a1e4a65379d53f89104dc4f0d82959ed8eba35ffa1998677a4ef441f2c35389dec9e3b31822e8843994ad7d7669cc49e4593b41fe9 SHA512 f5e51ad1532be44916df51dda5f6f7423a5b0d8ebd733a0a3f0424f684b9f84fc5996fb5effd45009eb1c60d873f79e8ecc47a9dc09ff429b4a458807a79ca8c diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild new file mode 100644 index 000000000000..83e13978794a --- /dev/null +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cmake python-single-r1 xdg + +DESCRIPTION="Android File Transfer for Linux" +HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux" + +if [[ "${PV}" = *9999 ]] ; then + inherit git-r3 + 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" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +IUSE="fuse python qt5 taglib zune" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-apps/file + sys-libs/readline:0= + fuse? ( sys-fs/fuse:0 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + ') + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + ) + taglib? ( media-libs/taglib ) + zune? ( + dev-libs/openssl:0= + ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + qt5? ( dev-qt/linguist-tools:5 ) +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_FUSE="$(usex fuse)" + -DBUILD_MTPZ="$(usex zune)" + -DBUILD_PYTHON="$(usex python)" + -DBUILD_QT_UI="$(usex qt5)" + -DBUILD_SHARED_LIB="ON" + -DBUILD_TAGLIB="$(usex taglib)" + # Upstream recommends to keep this off as libusb is broken + -DUSB_BACKEND_LIBUSB="OFF" + $(usev qt5 '-DDESIRED_QT_VERSION=5') + ) + cmake_src_configure +} 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 ae4c96bbe345..83e13978794a 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 @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 xdg @@ -54,10 +54,6 @@ 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/android-file-transfer-linux/metadata.xml b/sys-fs/android-file-transfer-linux/metadata.xml index 3b18b9d156bb..69e283855cc3 100644 --- a/sys-fs/android-file-transfer-linux/metadata.xml +++ b/sys-fs/android-file-transfer-linux/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>johnmh@johnmh.me</email> + <name>John M. Harris, Jr.</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">whoozle/android-file-transfer-linux</remote-id> </upstream> diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild index 41d8d411cee0..b7a537409048 100644 --- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild +++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.arm.linux.org.uk/pub/armlinux/source/other/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ~s390 sparc x86" IUSE="" src_prepare() { diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest index d81d86f29597..a70a64892205 100644 --- a/sys-fs/avfs/Manifest +++ b/sys-fs/avfs/Manifest @@ -1,3 +1,2 @@ -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 diff --git a/sys-fs/avfs/avfs-1.1.3.ebuild b/sys-fs/avfs/avfs-1.1.3.ebuild deleted file mode 100644 index 0fdd72de754f..000000000000 --- a/sys-fs/avfs/avfs-1.1.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="AVFS is a 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="+lzma webdav +zstd" - -BDEPEND=" - dev-build/libtool - virtual/pkgconfig -" -RDEPEND=" - app-arch/bzip2:= - >=sys-fs/fuse-2.4:0 - sys-libs/zlib - lzma? ( app-arch/xz-utils ) - webdav? ( net-libs/neon:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - --enable-fuse \ - --enable-library \ - --enable-shared \ - --with-system-zlib \ - --with-system-bzlib \ - --disable-static \ - $(use_enable webdav dav) \ - $(use_with lzma xz) \ - $(use_with zstd) -} - -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/avfs/avfs-1.1.5.ebuild b/sys-fs/avfs/avfs-1.1.5.ebuild index acd4104c3756..dfa4e6aa441a 100644 --- a/sys-fs/avfs/avfs-1.1.5.ebuild +++ b/sys-fs/avfs/avfs-1.1.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/avf/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86" IUSE="lzip +lzma webdav +zstd" RDEPEND=" diff --git a/sys-fs/bashmount/bashmount-4.3.2-r1.ebuild b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild index 8e32a9ab3a4d..c2bfc0a4645f 100644 --- a/sys-fs/bashmount/bashmount-4.3.2-r1.ebuild +++ b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Bash script that uses udisks to mount removable devices without GUI" HOMEPAGE="https://github.com/jamielinux/bashmount" @@ -16,7 +16,8 @@ RDEPEND=" app-shells/bash:* sys-apps/dbus sys-apps/util-linux - sys-fs/udisks:2" + sys-fs/udisks:2 +" DEPEND="${RDEPEND}" src_install() { diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index c3d340869b19..9d14fffa4d7c 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -1,139 +1,127 @@ DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c -DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8 +DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 -DIST anstyle-1.0.2.crate 13983 BLAKE2B 4274b101d1cab2b62f9bb7637dab35f4b16e8c08a080355a2ea53e2b7b353ff230aa77fb3a244e0d6ff0dcd27abe5895eb306c630aa0822d0c608f041d4abfea SHA512 09220abfc844192ca698589897845752e02666b4ecd6529af4cde9f260ef36694e6e631c7503fc0e438ac72c88c419043b78399385cb248e789e86404503935a +DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa -DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176 +DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69 DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 -DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a +DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc -DIST anstyle-wincon-1.0.2.crate 11712 BLAKE2B 68215a76e44cbe0e69c4111eaf7cd818d0e743883aec01f99f6d96e863d8d36bea67ed112db715a3a0daa348535f3db50547d8a0ab5e4572975d68937c49aa86 SHA512 8bda8b79785d201cda90c8d3544f5cead955c25749a4b828bc897e4bb132acbbcc50ac90ee07323ae3077af3e4c613264871366d70e5211200d119f4ddb63b0b +DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 -DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 +DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6 DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST anyhow-1.0.89.crate 47078 BLAKE2B fc824e72891bff0cc7aa3b538adfb9af7dc843ab6ed12b8b04eb70e62d32aae1decb9090621d3245dbe89841e73080d2d86973b4aee50873e798956da9b3faa6 SHA512 3c09317089ed78601a56c626700d12c0b49396e25fed9a9f05a2dbfbd6f91ad426c430633006a4043decd1f70a85c161c4f8dd7de0e4c00b82a169b89dda8da0 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f -DIST bcachefs-tools-1.4.0.tar.gz 1060158 BLAKE2B c972de13e305b07910ab4acdfea05df85bfe70ed350dea5fb578a150a9e116f054dc99bf6dd185aa26dab799832939276a6248203717b918c1d7e0e9f2e0fdd9 SHA512 f374c3b2ec1836ea79ed37f188aaf9c98d6d217b2b05c050304467068a1e042e2e5ea99f2e67d546cd68f3e39be065e62bae73ff13e92ceb29a15df9fe63e4e2 -DIST bcachefs-tools-1.4.1.tar.gz 1069244 BLAKE2B 7be0a343758a221a39dad5eca1c11c74d049e208712d30ffdfd919c97ef87e561983b85b2fbefa932cb69ef50418dce761a9c01afe0114f67b8ddd55b5d62a2c SHA512 65d0f182982d942d1263d60cf435a1142393b9dcf1e7dbea53a873925a82954b47422ade04bbc5b69c955de80ef820e9eeefcfed47aaab3bcc27d3916a94ff4a -DIST bcachefs-tools-1.6.4.tar.gz 1083811 BLAKE2B 656b1545ccf41dd35e3e6f656a9b5280fe0b5fa43a0ea86243c6693033d986b091fdd3d79ab2ff5c1c9402bce6f4ee33f49e070f6aebd5bba355df7a82d8fc21 SHA512 3e73ee15673eac771393859132146f1c23f4250f68bf8753b5214e88e854959c56efabdaeff4a8ad883287bd289abe08c5c37f6ef7220b984fa679a90c578e57 +DIST bcachefs-tools-1.11.0.tar.gz 1131076 BLAKE2B 27b506c004528f3bedb2fddd19bc1d94acacd34152d13870df3be582baaa8843ac505b48b901c829c35789c5c4a09313ddee4a858d3e32d2130e1205f2042760 SHA512 87ca789f1557a026b53469571e5a84d1f6a64e3e3378cc344485d95fae8883eb512a8e3f478d89c6265dd203419412fdce9c396ea805f898b67b9cebec0e4f19 +DIST bcachefs-tools-1.13.0.tar.sign 833 BLAKE2B 5163a07570a0c1e12617d07def63c721540e586eb6312a51642683d7008d08c3029c562dc6dddb6dd7bc0443369331544b272c2253d26b2e3789c328bbdad7ac SHA512 950498dfc3ea062803140378a715820e54c0b46c66d77a160040b432c8c5b55141b611b2687bf33bffbd5dc04e18f1f35b40229c664c7841475323f8d2b32267 +DIST bcachefs-tools-1.13.0.tar.zst 1136771 BLAKE2B 1ab2d1805d8e18a709f2684785dcbd0cffd27f292eb4f785d4f8187403363db001969200bcf18994827cd11ecb679d6939f02fc6ead069daeef43c7974540433 SHA512 0e79642712db07f92d65c92621ed964695756e3cdaf6214f4787afd0047bde26ad9707c86e14131ad694f6c455f33cd845d720b3b62c57fc9916bdce57decefb 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 bindgen-0.69.5.crate 221128 BLAKE2B b89edbf883e1bc11a074c2f37f84bb966749823a6408b9765d6a61ee1179451d67dadde41d27838e8ddc6172dee9c342429f42fbe6959ff9fd7dcbc73d7506ea SHA512 b232b906af7535f8b87198f0a4037a0f09af367e0c913575f3d16453a2c272e7d76033cb3fd12d4223ebda4a0f8130629e67c5883e026a2422db3e0659ed3c3f DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 -DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214 +DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cc-1.1.28.crate 84424 BLAKE2B 9d617066957c9aa8d3ae86943be8494551624e34d8b1060d86959751fc3f874ef6d83c78235a7905e12ed72c16bfc45666fb36172708c3a53639c99342d34edf SHA512 98571ba96e7967579b70988d9308c8d3616cb1940b84c0d7dbeae837bf31c5a62731fa369b8b9d968ca843638efc7a9791ab76c3cf06deed4348d9d853ddacba DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 -DIST clang-sys-1.6.1.crate 41346 BLAKE2B b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b SHA512 a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81 -DIST clap-4.3.24.crate 55026 BLAKE2B c49987221905f7a39d6628fd755524b2395130f0b55f984067238fe73ee7e71faf2532e990198ece793ca8aa03043108b638a618c30ff8c0a3e10b68a3f8d0e7 SHA512 4c45cce4ade8058e6e7131ebc7754da5974e5965128ef5be1a6d327e0ac5f7151ab6a0494024d89404e1743efbb8891de76322d3e44abff76cf2123fcb4534f7 +DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125 DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9 -DIST clap_builder-4.3.24.crate 162489 BLAKE2B befbbc2f379d8b6bfe538cf86a0f27927a4f9ed73e7224df980241c2ad6acbf79a56cab74b3f337d09ce26a5b0c9e9f60226ecce58b6b2ae0dcbdd49a3df6ccc SHA512 e81d73bd3bef181c945856bd2402ec52a100d38ffc223bf485186c4618076d38c277dd85b21e2391471de463dbe3f2fcdf59e115576be8dbef330d888fdc05e9 +DIST clap-4.5.20.crate 56376 BLAKE2B 8efa9c3e171ef38c98a25c526f528629e7e72850c6ec27e7e89a212403ee90d7d005b00750769e4335423ecec1d86abb35c19b0bf7f2c063bc7c6a8bd59d6804 SHA512 e432a118a2ec15b273a404c3cb75bbe579b11034ba55def1823d4670c6553e3d8611074a24f50a0f4adc8bda184213b06106c44c68a19d267342c53e345351d4 DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2 -DIST clap_complete-4.3.2.crate 34104 BLAKE2B 8ac5d031536f3917755642cb69cb80a70138871505f7f3b346c66163c6295b94c6981c9ec6291dcac4f6f675bcbcd507a9264c44dba42e6403090a32844a0a7a SHA512 8eecccc5ecb24983bad0c0f7118d632b466e6bad2f2efe1d6695bb53616fbc2ee382e1105252fe587d534a5120a985efe07922447e2168cb3d28e9c72704bc4e +DIST clap_builder-4.5.20.crate 163812 BLAKE2B 689110f2e4f46e8c4c779b6c39cb5f5758c3a32ea5bbfa1faaa6642da7d650cac0827a3e5b503c5054a85e0e7dbf04e7c53d65991a45f3be90c75070cc9c200a SHA512 e914c8b6592f9d230b4f4290cf4b4d73d0160c12a1fa3976c74bad21ff16da532d6af792f0a33fa472166f1cd551291b5d1d71fe8b359040040418694ec52000 DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b -DIST clap_derive-4.3.12.crate 29052 BLAKE2B 501fb22eddca5b21456bd9911ad1f90ee5d5c918eedd08e2615d22ce58bb0fa5dd626b51a734f20b78411b9a4492ae63629131e0c2e1bd0f3eee21e5da3fb37f SHA512 a58e948fddf45321f0fcfe9d9afbeff42849da472fc4e4b15c31f46ffe55a0dba34d2c1d14e342530c1e4080c43de790595e4f3dca06cbb6a8a60f9e3cab3abc +DIST clap_complete-4.5.33.crate 47470 BLAKE2B 7d97949397aab211f786a0141c6d6f40268c03c2ecea5032522aff980c217224a25c0139e1345e6b3dc67670fc090d7ddf7a53129b06d281ee6fb144ec8ff43c SHA512 71aab57a9c80ab6169250d056cc2177e2392d2caab1cf123eb36faa39d83656f306c43afdd00b95f6ea39a1d471549d1422be51694fcbe3cb9bb1e77e4d6308d DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 -DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c4c38f7440d91cb4c58ec887940f0cf500c4c3949c2191399aac3f5cb1ce44868eac587cde90211d3e467b9a2 SHA512 0149ed7c2438a19b4857f895767550d783711078f07bfa9ac8ca531e06f51c7388110f4d558e30bf503536367cc370cb581e8deb6fe51f9b5460a334963daacd +DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 -DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0 +DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e +DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322 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 +DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 -DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 -DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65 -DIST gag-1.0.0.crate 5495 BLAKE2B eeb524092cb26486e10e939147f348d4cb687ded09fbb3623d6e65e623bcdee9be90a765a07d1af94f8d1e92139d61ef01104eb9a52b6c4e7abe65a694ee0186 SHA512 16f540d2075d1c9ede9ba5f579dd03271b38b940422f0cc605f7c72fc972ee0e696ea5e46b05c38b510ae247cca1a12e28c803bdfe835439d6d7f23e32609286 -DIST getset-0.1.2.crate 8831 BLAKE2B b1408f4c0b2ece039d06180e3e2990db2a4ca3c74575be3b4d3df562fc48a43ee8feda42cd957786aa481fc77a554a8e944f34a6a718c07012aea153a1c299c0 SHA512 54f162d0d072253abcf26c8779a9d8eb423db9df85716da13a785edb4c61757cf0c03f3563dde5de4534be9d4d50498c03b8337dcaafeaefc29c9c836dff1371 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b 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 heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76 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 is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 -DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d -DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libc-0.2.159.crate 755366 BLAKE2B 70f46eb6228b4a8958dfbee00cdfa3c7d218f30d66c8591f4ccc9c5d8eda411d83ce9450552384ac4bc29deb2869561a2111dd157c9f228f617baf8f6b537bc4 SHA512 c803939ceea5ad9bdfdd122726c7a5f12ffd8b0cb66cf0bc62c9670e1e5904a504def388c1e043c520f4ece484addf6dac465aebd58578aa6b79995077bbdf9f DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab +DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074 DIST libudev-sys-0.1.4.crate 6177 BLAKE2B c513b5cd68fc60a7a33ba281e4fc4f9a5896946aeb1fe31abb8af22d279c39c3d781fd34109f98fd010fe8aa817b9d91726887f0ee8bf0f66a3bf313b01c9ff3 SHA512 185bd84a729a5dda6fb274584c7a731652418da9435d844870a9d09662918c9230287f4ad002273599d0a3e9709a36ae06d59a6686dfba978fb7cd1c51bbc2c7 -DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375 -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 linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 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 memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad -DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e -DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c -DIST parse-display-0.1.2.crate 3535 BLAKE2B 01554ef911b973cc8e16be5dce205693e5cc74b8e886b4d9a9a26dc6c9a6cb2e29569ebecfb73daf14047f5d0ca01ae52ff9bb1778a0c7062ed3d1819bc47ad8 SHA512 271b32c088b23f945d33e1d4d8693dc37a4bab9aa1661f63a5a373d1cd55ab62e1a8d1fd0fb27c6d1d3b0fd639fd72540cbe2a641bd42a45bf06a751a07498a0 -DIST parse-display-derive-0.1.2.crate 10820 BLAKE2B a9261c11c7768791a69e11d6f074031dc229094a686a8e314229a5dd94e22f218beba6be67089129aaaaa98606715499c089e579058094a135208effe44c5884 SHA512 a9f3099f318e44330cd3478a4cc576beaa2ea70edc6621a46ecd452e9fc28874a7d7967fa0e0b2b7a1d7145565e62979692dcdf3c3fed0f3ac8feee0eebec000 +DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 +DIST owo-colors-4.0.0.crate 30984 BLAKE2B fa64a9097745eff2b00d8587ca119a3f4163c43265dcfe75162be09ffd556b132c24aa5217b99c3b10feddb365e71b01006a62a664ad8968d4bf6a716291148f SHA512 25a606e9e6a17a4ec21b9298707478d904ba1f30862ce855f4223b3273fb3d0323540b6b628c067edc0c9291cd7c370beb298ec000cd679068624031ac9e66ce +DIST owo-colors-4.1.0.crate 31414 BLAKE2B 4c936531a6eca2c77bf54e77b1bfbf63bd957299e6b604f97de59bd8e06aee90187045197fe2a5ba607548245035e644b40981e5020113b7122f5a36785f4cbb SHA512 e514520ebd86f92be6f893727a71b68faddbda77763a4f5d5a907c2becbf032c629362cb4c27c184a98aad27963449da8dae38d1fe35741b0fef11ce61235fd0 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee -DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721 -DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4 DIST pkg-config-0.3.29.crate 20563 BLAKE2B ed0559b0073890911fb47742743b2586123bf9e9b594aa0d5b2c419c6768cd37e25b546c21077ea6cc02823a679b302aeaaca6c7fcaf9aeec615dd08f53a1f6f SHA512 bac7dafc0e10bef40e427c1fc0271d1a26acb2f5b1cf7cc7a128f4d4f1f3110529e45057b71cea7b0f6ddff26945fe08962285ddeb22b54639e44a2e43af698f +DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 DIST prettyplease-0.2.16.crate 57630 BLAKE2B b3548f37a41d1bf46d58e84297142e8d3addf6134e39c07b7fca809cd2f72004947c31bcf7ee2aeef548bc200dfcb9c888e090d3a96f63289bc15aebe1085075 SHA512 f542640f809de6aa77d34d92d9a4454ef2a92153dba38ab41782d9a3fb73cbae2569c3163c21938b908e666303631ca9393ea1166c7ad5e5970145f26238c79e -DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db -DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495 -DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1 +DIST prettyplease-0.2.22.crate 58169 BLAKE2B 74b78f69b167d253643780b007726afde3a272c68b334b2b610d14bca1a2b02ece1b92f793341990a401b71357a858c4c9bf6c0bf965c61bc22a0a2cce84903e SHA512 bd3a3ed1395fb1e2eaff6231a9c54ce68ddd4be2cc30a6a871e32c943f7201b5c0956b16b3c478872daa521b92424060012d90be9bb45199e19e0b65860e7c18 DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 -DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST proc-macro2-1.0.87.crate 49121 BLAKE2B 4a5136e28b5174c1382037d294dfec51cd7211eb7876c06a98600768d071915e76c81a7958a780cb7b843b98d9df4bd4e01d4f280db226d241bf84de348593f2 SHA512 32ce9c8b5bad55cfae537882c3fffc4d56824f6214ea97aede89ad460e3f66956b52af4a268496fc95c2c0eda0baeaaed4b12cd98df2efab24837e23b48b1f0e DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 -DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d -DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05 DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d -DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 -DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 -DIST rpassword-4.0.5.crate 10731 BLAKE2B b52325990109ad9b275429c3c2f098eeed631e3a41b02ff0decacf55d66e1b66df98d13c169b8eed727fbc523fa1cb770d206dfcbcc86a6c08f52029233296d5 SHA512 f1d3a76318687f9e5b218a936e43afc144f4a48647d55324409651cd5a39fc07b23732766433bd8a4d3a5370ceedf5bd2dad3007f0ba1d75bf8ac610e684c19d +DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 DIST rpassword-7.3.1.crate 8164 BLAKE2B 60e89fc36d78a64d9441bd902866500872f4ddbd28ffe4bc5c26b5882ec1dd9bcf50dc06105c87f5fef8c51b327bb9af1a324831cb6396796afab3cb7f4a2288 SHA512 28905b33e5fa26d9a7bc0d682b94edc6119b2d8c2a6826c89d61fa86033230707c54f3ed8047ee3f5da4393c119c70f102ff61efdc1d4bac38e583c04e3b4382 DIST rtoolbox-0.0.2.crate 9179 BLAKE2B 4cc9faea86aaf0f9e9ed95269d0fa8c633d7c05d539a435bbfcadc563ad5fd0d3f06bc33f83a24432a53da483bc7771edca21e6237888254b1d000f7af1ee41c SHA512 2e239e821d0bdb171ff9d03d3b8df2fbb561ae67ed653f66096ca32b2a83badc7d1b74b4ed1f0f41f141ff2a383fd06618f4f7740a03514b256eca4db0699d42 -DIST rust-bindgen-bcachefs-f773267b090bf16b9e8375fcbdcd8ba5e88806a8.gl.tar.gz 2289197 BLAKE2B 9a767f7341617fe80a59ad3e4583ed14f112a9575f9596547d92b4ee88e1951b123cdd78208446d7876141028449abe9f4cf22d9abe47e96e59d8e72c9aadde0 SHA512 7d1db015f66b47ff07d244247832cc6ea3e9af4f4ae650bf4d3785ebf60390ff966b8664ebb463235f0ad3d40967cd58a299eb540fda733f26548d771275b25a DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 -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 rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619 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 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3 +DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a8a28cc7c8a72a0aef20569c6ab22a8a8d26c2d9272f18d000e4ce94858a6647194f0a7b86d812d52b05a9 SHA512 62f116d5bbc6167a6ac68b049f8045bc660901f1ce1252f8bdcd91cb28bef821aad8098905369db6c2fe74c134a5d549e55ddd28e383d7d78f7175258924b268 DIST strum_macros-0.26.2.crate 27056 BLAKE2B c9df13a91dd08f8bba0dfeec4fc03b59cd74eafaace7d2d228b8636264a9ea11137d0be741a936f7290e09525586818726000f07ed84a5ae711b89d61f52e89e SHA512 519bc654adcf131d85d1ef83f62be2429f7472df25cf962fdc1cf5070d33c39dfe71f08fbf296df9b85fdfcda95cf2fea27e8e52e9ae93de27bb8fc4a5b55dd1 -DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d -DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 -DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a +DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433 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 -DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9 +DIST terminal_size-0.4.0.crate 10036 BLAKE2B 2f910a6ecd80a3fba12811eff425fe2d1a7c474d8db7f673037c1088ef468e96d41fd13fd3175c84c20da12195a07bbd4354767bdbc64d757feef86f86e384ec SHA512 b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897 DIST udev-0.7.0.crate 17980 BLAKE2B ef62bfc3bebdea9fbc30d8c0de6989b0310da2b7efa65345e991b5ac85d39578a5cc9bf97558786f09806c790eae4a99ca7be29d35b8793a92c71bed07a9b91a SHA512 87aa3182c028911b23c6820408879f901dd674ff6fe95c8382ecdec3d4da9f3e19dc03b2435c72e7cf299af083d5de9a6b83a84a75de4c2483c97ea9c1950393 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 -DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55 +DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 +DIST uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b DIST uuid-1.7.0.crate 42627 BLAKE2B 493f6a3a643d3493a2bd7e0e92a1ccfb7bd722e3a1fc8deb7df0ddc875a822daead1cdd35dc3ac6f26346844100a671318d71e5ad760c9587471d4f05bbb0c69 SHA512 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856 -DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 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 @@ -141,21 +129,31 @@ DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35cee 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 +DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 +DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226 diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild index 23f03911c2e6..566129b51e44 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild @@ -27,8 +27,8 @@ 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 @@ -42,12 +42,13 @@ 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 nom@7.1.3 once_cell@1.19.0 + owo-colors@4.0.0 paste@1.0.14 pkg-config@0.3.29 prettyplease@0.2.16 @@ -56,10 +57,8 @@ 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 @@ -98,15 +97,15 @@ CRATES=" " LLVM_COMPAT=( {16..18} ) -PYTHON_COMPAT=( python3_{10..12} ) +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/" if [[ ${PV} == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git" + EGIT_REPO_URI="https://evilpiepirate.org/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}" @@ -116,8 +115,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:= @@ -139,15 +138,12 @@ 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} ') + elibc_musl? ( >=sys-libs/musl-1.2.5 ) virtual/pkgconfig virtual/rust " @@ -155,11 +151,6 @@ BDEPEND=" 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}]" } @@ -197,36 +188,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/bcachefs-tools/bcachefs-tools-1.6.4-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.13.0.ebuild index 5763dd2e492e..004251f02079 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.6.4-r1.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.13.0.ebuild @@ -4,98 +4,93 @@ 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 + aho-corasick@1.1.3 + anstream@0.6.15 + anstyle-parse@0.2.5 + anstyle-query@1.1.1 + anstyle-wincon@3.0.4 + anstyle@1.0.8 + anyhow@1.0.89 + bindgen@0.69.5 bitfield@0.14.0 bitflags@1.3.2 - bitflags@2.4.2 - byteorder@1.5.0 - cc@1.0.83 + bitflags@2.6.0 + cc@1.1.28 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 - colored@2.1.0 - either@1.9.0 + clang-sys@1.8.1 + clap@4.5.20 + clap_builder@4.5.20 + clap_complete@4.5.33 + clap_derive@4.5.18 + clap_lex@0.7.2 + colorchoice@1.0.2 + either@1.13.0 + env_logger@0.10.2 errno-dragonfly@0.1.2 errno@0.2.8 - errno@0.3.8 + errno@0.3.9 glob@0.3.1 - heck@0.4.1 + heck@0.5.0 home@0.5.9 + is_terminal_polyfill@1.70.1 itertools@0.12.1 - lazy_static@1.4.0 + lazy_static@1.5.0 lazycell@1.3.0 - libc@0.2.153 - libloading@0.8.1 + libc@0.2.159 + libloading@0.8.5 libudev-sys@0.1.4 - linux-raw-sys@0.4.13 - log@0.4.20 - memchr@2.7.1 - memoffset@0.8.0 + linux-raw-sys@0.4.14 + log@0.4.22 + memchr@2.7.4 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 - rpassword@7.3.1 - rtoolbox@0.0.2 + once_cell@1.20.2 + owo-colors@4.1.0 + paste@1.0.15 + pkg-config@0.3.31 + prettyplease@0.2.22 + proc-macro2@1.0.87 + quote@1.0.37 + regex-automata@0.4.8 + regex-syntax@0.8.5 + regex@1.11.0 rustc-hash@1.1.0 - rustix@0.38.31 + rustix@0.38.37 + rustversion@1.0.17 shlex@1.3.0 - strsim@0.10.0 - syn@2.0.48 - terminal_size@0.3.0 + strsim@0.11.1 + strum@0.26.3 + strum_macros@0.26.4 + syn@2.0.79 + terminal_size@0.4.0 udev@0.7.0 - unicode-ident@1.0.12 - utf8parse@0.2.1 - uuid@1.7.0 + unicode-ident@1.0.13 + utf8parse@0.2.2 + uuid@1.10.0 which@4.4.2 winapi-i686-pc-windows-gnu@0.4.0 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 + windows-sys@0.59.0 + windows-targets@0.52.6 + windows_aarch64_gnullvm@0.52.6 + windows_aarch64_msvc@0.52.6 + windows_i686_gnu@0.52.6 + windows_i686_gnullvm@0.52.6 + windows_i686_msvc@0.52.6 + windows_x86_64_gnu@0.52.6 + windows_x86_64_gnullvm@0.52.6 + windows_x86_64_msvc@0.52.6 + zeroize@1.8.1 + zeroize_derive@1.4.2 " -LLVM_COMPAT=( {16..17} ) -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker +LLVM_COMPAT=( {16..18} ) +PYTHON_COMPAT=( python3_{10..13} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc +inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker verify-sig DESCRIPTION="Tools for bcachefs" HOMEPAGE="https://bcachefs.org/" @@ -103,16 +98,17 @@ 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 + SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst ${CARGO_CRATE_URIS}" + SRC_URI+=" verify-sig? ( https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )" S="${WORKDIR}/${P}" - KEYWORDS="amd64 ~arm64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="Apache-2.0 BSD GPL-2 MIT" SLOT="0" -IUSE="fuse test" -RESTRICT="!test? ( test )" +IUSE="fuse verify-sig" +RESTRICT="test" DEPEND=" app-arch/lz4:= @@ -134,25 +130,20 @@ 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} ') + elibc_musl? ( >=sys-libs/musl-1.2.5 ) virtual/pkgconfig virtual/rust + verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 ) " +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 +157,7 @@ src_unpack() { git-r3_src_unpack S="${S}/rust-src" cargo_live_src_unpack else - unpack ${P}.tar.gz + unpacker ${P}.tar.zst cargo_src_unpack fi } @@ -191,7 +182,10 @@ src_compile() { default - use test && emake tests + # This version mangles the symbolic link, + # please check if this can be removed before bumping + rm "${S}"/bcachefs + ln -s "${S}"/target/release/bcachefs bcachefs local shell for shell in bash fish zsh; do @@ -199,28 +193,6 @@ src_compile() { 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/bcachefs-tools/bcachefs-tools-1.4.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild deleted file mode 100644 index a2e67f190904..000000000000 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# 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.3.2 - anstyle-parse@0.2.1 - anstyle-query@1.0.0 - anstyle-wincon@1.0.2 - anstyle@1.0.2 - anyhow@1.0.75 - atty@0.2.14 - autocfg@1.1.0 - bitfield@0.14.0 - bitflags@1.3.2 - bitflags@2.4.1 - byteorder@1.5.0 - cc@1.0.83 - cexpr@0.6.0 - cfg-if@1.0.0 - chrono@0.4.31 - clang-sys@1.6.1 - clap_builder@4.3.24 - clap_complete@4.3.2 - clap_derive@4.3.12 - clap_lex@0.5.0 - clap@4.3.24 - colorchoice@1.0.0 - colored@2.0.4 - either@1.9.0 - errno-dragonfly@0.1.2 - errno@0.2.8 - errno@0.3.7 - fastrand@2.0.1 - filedescriptor@0.8.2 - gag@1.0.0 - getset@0.1.2 - glob@0.3.1 - heck@0.4.1 - hermit-abi@0.1.19 - hermit-abi@0.3.3 - io-lifetimes@1.0.11 - is-terminal@0.4.9 - itertools@0.9.0 - lazy_static@1.4.0 - lazycell@1.3.0 - libc@0.2.150 - libudev-sys@0.1.4 - linux-raw-sys@0.3.8 - linux-raw-sys@0.4.11 - log@0.4.20 - memchr@2.6.4 - memoffset@0.8.0 - minimal-lexical@0.2.1 - nom@7.1.3 - num-traits@0.2.17 - once_cell@1.18.0 - parse-display-derive@0.1.2 - parse-display@0.1.2 - paste@1.0.14 - peeking_take_while@0.1.2 - pkg-config@0.3.27 - proc-macro-error-attr@1.0.4 - proc-macro-error@1.0.4 - proc-macro2@1.0.69 - quote@1.0.33 - redox_syscall@0.4.1 - regex-automata@0.4.3 - regex-syntax@0.6.29 - regex-syntax@0.8.2 - regex@1.10.2 - rpassword@4.0.5 - rustc-hash@1.1.0 - rustix@0.37.27 - rustix@0.38.25 - shlex@1.2.0 - strsim@0.10.0 - syn@1.0.109 - syn@2.0.39 - tempfile@3.8.1 - terminal_size@0.2.6 - thiserror-impl@1.0.50 - thiserror@1.0.50 - udev@0.7.0 - unicode-ident@1.0.12 - utf8parse@0.2.1 - uuid@1.6.1 - version_check@0.9.4 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_msvc@0.48.5 - windows_i686_gnu@0.48.5 - windows_i686_msvc@0.48.5 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_msvc@0.48.5 - windows-sys@0.48.0 - windows-targets@0.48.5 -" - -# Upstream have a fork of bindgen and use cgit -declare -A GIT_CRATES=( - [bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen" -) - -LLVM_MAX_SLOT=17 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cargo flag-o-matic llvm multiprocessing python-any-r1 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) - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)) - virtual/pkgconfig - virtual/rust -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.0-fix-clang-musl.patch -) - -llvm_check_deps() { - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - -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_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 - unpack ${P}.tar.gz - cargo_src_unpack - fi -} - -src_prepare() { - default - tc-export CC - sed \ - -e '/^CFLAGS/s:-O2::' \ - -e '/^CFLAGS/s:-g::' \ - -i Makefile || die - # Patch our cargo-ebuild patch definition to pretend that our GIT_CRATE is upstream's URI. - if ! [[ ${PV} == "9999" ]]; then - sed -e 's https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs https://evilpiepirate.org/git/rust-bindgen.git ' \ - -i "${WORKDIR}/cargo_home/config" || die - fi - append-lfs-flags -} - -src_compile() { - use fuse && export BCACHEFS_FUSE=1 - export BUILD_VERBOSE=1 - export VERSION=${PV} - - default - - use test && emake tests -} - -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 - - 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-1.4.1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild deleted file mode 100644 index 5e14d8dc33f4..000000000000 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# 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.3.2 - anstyle-parse@0.2.1 - anstyle-query@1.0.0 - anstyle-wincon@1.0.2 - anstyle@1.0.2 - anyhow@1.0.75 - atty@0.2.14 - autocfg@1.1.0 - bitfield@0.14.0 - bitflags@1.3.2 - bitflags@2.4.1 - byteorder@1.5.0 - cc@1.0.83 - cexpr@0.6.0 - cfg-if@1.0.0 - chrono@0.4.31 - clang-sys@1.6.1 - clap_builder@4.3.24 - clap_complete@4.3.2 - clap_derive@4.3.12 - clap_lex@0.5.0 - clap@4.3.24 - colorchoice@1.0.0 - colored@2.0.4 - either@1.9.0 - errno-dragonfly@0.1.2 - errno@0.2.8 - errno@0.3.7 - fastrand@2.0.1 - filedescriptor@0.8.2 - gag@1.0.0 - getset@0.1.2 - glob@0.3.1 - heck@0.4.1 - hermit-abi@0.1.19 - hermit-abi@0.3.3 - io-lifetimes@1.0.11 - is-terminal@0.4.9 - lazy_static@1.4.0 - lazycell@1.3.0 - libc@0.2.150 - libudev-sys@0.1.4 - linux-raw-sys@0.3.8 - linux-raw-sys@0.4.11 - log@0.4.20 - memchr@2.6.4 - memoffset@0.8.0 - minimal-lexical@0.2.1 - nom@7.1.3 - num-traits@0.2.17 - once_cell@1.18.0 - parse-display-derive@0.1.2 - parse-display@0.1.2 - paste@1.0.14 - peeking_take_while@0.1.2 - pkg-config@0.3.27 - proc-macro-error-attr@1.0.4 - proc-macro-error@1.0.4 - proc-macro2@1.0.69 - quote@1.0.33 - redox_syscall@0.4.1 - regex-automata@0.4.3 - regex-syntax@0.6.29 - regex-syntax@0.8.2 - regex@1.10.2 - rpassword@4.0.5 - rustc-hash@1.1.0 - rustix@0.37.27 - rustix@0.38.25 - shlex@1.2.0 - strsim@0.10.0 - syn@1.0.109 - syn@2.0.39 - tempfile@3.8.1 - terminal_size@0.2.6 - thiserror-impl@1.0.50 - thiserror@1.0.50 - udev@0.7.0 - unicode-ident@1.0.12 - utf8parse@0.2.1 - uuid@1.6.1 - version_check@0.9.4 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_msvc@0.48.5 - windows_i686_gnu@0.48.5 - windows_i686_msvc@0.48.5 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_msvc@0.48.5 - windows-sys@0.48.0 - windows-targets@0.48.5 -" - -# Upstream have a fork of bindgen and use cgit -declare -A GIT_CRATES=( - [bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen" -) - -LLVM_MAX_SLOT=17 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cargo flag-o-matic llvm multiprocessing python-any-r1 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) - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)) - virtual/pkgconfig - virtual/rust -" - -llvm_check_deps() { - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - -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_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 - unpack ${P}.tar.gz - cargo_src_unpack - fi -} - -src_prepare() { - default - tc-export CC - sed \ - -e '/^CFLAGS/s:-O2::' \ - -e '/^CFLAGS/s:-g::' \ - -i Makefile || die - # Patch our cargo-ebuild patch definition to pretend that our GIT_CRATE is upstream's URI. - if ! [[ ${PV} == "9999" ]]; then - sed -e 's https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs https://evilpiepirate.org/git/rust-bindgen.git ' \ - -i "${WORKDIR}/cargo_home/config" || die - fi - append-lfs-flags -} - -src_compile() { - use fuse && export BCACHEFS_FUSE=1 - export BUILD_VERBOSE=1 - export VERSION=${PV} - - default - - use test && emake tests -} - -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 - - 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-1.9.4.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild index dd482ce9dcf3..7e5aa241533f 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild @@ -113,7 +113,7 @@ 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" + KEYWORDS="amd64 arm64" fi LICENSE="Apache-2.0 BSD GPL-2 MIT" diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild index be2cd55914db..0d04e49d8739 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild @@ -4,105 +4,93 @@ 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 + aho-corasick@1.1.3 + anstream@0.6.15 + anstyle-parse@0.2.5 + anstyle-query@1.1.1 + anstyle-wincon@3.0.4 + anstyle@1.0.8 + anyhow@1.0.89 + bindgen@0.69.5 bitfield@0.14.0 bitflags@1.3.2 - bitflags@2.4.2 - byteorder@1.5.0 - cc@1.0.83 + bitflags@2.6.0 + cc@1.1.28 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 + clang-sys@1.8.1 + clap@4.5.20 + clap_builder@4.5.20 + clap_complete@4.5.33 + clap_derive@4.5.18 + clap_lex@0.7.2 + colorchoice@1.0.2 + either@1.13.0 env_logger@0.10.2 errno-dragonfly@0.1.2 errno@0.2.8 - errno@0.3.8 + errno@0.3.9 glob@0.3.1 - heck@0.4.1 - hermit-abi@0.3.9 + heck@0.5.0 home@0.5.9 - is-terminal@0.4.12 + is_terminal_polyfill@1.70.1 itertools@0.12.1 - lazy_static@1.4.0 + lazy_static@1.5.0 lazycell@1.3.0 - libc@0.2.153 - libloading@0.8.1 + libc@0.2.159 + libloading@0.8.5 libudev-sys@0.1.4 - linux-raw-sys@0.4.13 + linux-raw-sys@0.4.14 log@0.4.22 - memchr@2.7.1 - memoffset@0.8.0 + memchr@2.7.4 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 + once_cell@1.20.2 + owo-colors@4.1.0 + paste@1.0.15 + pkg-config@0.3.31 + prettyplease@0.2.22 + proc-macro2@1.0.87 + quote@1.0.37 + regex-automata@0.4.8 + regex-syntax@0.8.5 + regex@1.11.0 rustc-hash@1.1.0 - rustix@0.38.34 + rustix@0.38.37 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 + strsim@0.11.1 + strum@0.26.3 + strum_macros@0.26.4 + syn@2.0.79 + terminal_size@0.4.0 udev@0.7.0 - unicode-ident@1.0.12 - utf8parse@0.2.1 - uuid@1.7.0 + unicode-ident@1.0.13 + utf8parse@0.2.2 + uuid@1.10.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 + windows-sys@0.59.0 + windows-targets@0.52.6 + windows_aarch64_gnullvm@0.52.6 + windows_aarch64_msvc@0.52.6 + windows_i686_gnu@0.52.6 + windows_i686_gnullvm@0.52.6 + windows_i686_msvc@0.52.6 + windows_x86_64_gnu@0.52.6 + windows_x86_64_gnullvm@0.52.6 + windows_x86_64_msvc@0.52.6 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 python-any-r1 shell-completion toolchain-funcs unpacker +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc +inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker verify-sig DESCRIPTION="Tools for bcachefs" HOMEPAGE="https://bcachefs.org/" @@ -110,15 +98,16 @@ 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 + SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst ${CARGO_CRATE_URIS}" + SRC_URI+=" verify-sig? ( https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )" S="${WORKDIR}/${P}" KEYWORDS="~amd64 ~arm64" fi LICENSE="Apache-2.0 BSD GPL-2 MIT" SLOT="0" -IUSE="fuse" +IUSE="fuse verify-sig" RESTRICT="test" DEPEND=" @@ -146,8 +135,10 @@ BDEPEND=" $(llvm_gen_dep ' sys-devel/clang:${LLVM_SLOT} ') + elibc_musl? ( >=sys-libs/musl-1.2.5 ) virtual/pkgconfig virtual/rust + verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 ) " QA_FLAGS_IGNORED="/sbin/bcachefs" @@ -166,6 +157,7 @@ src_unpack() { git-r3_src_unpack S="${S}/rust-src" cargo_live_src_unpack else + unpacker ${P}.tar.zst cargo_src_unpack fi } diff --git a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch deleted file mode 100644 index b011ca1de422..000000000000 --- a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -Bug: https://bugs.gentoo.org/921564 -From https://github.com/koverstreet/bcachefs-tools/commit/8e56da27fd23c169395b3b266b15a1c093aba849 - -diff --git a/libbcachefs.c b/libbcachefs.c -index 68b750a..ec6b272 100644 ---- a/libbcachefs.c -+++ b/libbcachefs.c -@@ -445,6 +445,7 @@ struct bchfs_handle bcache_fs_open(const char *path) - */ - struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx) - { -+ struct bch_opts opts = bch2_opts_empty(); - char buf[1024], *uuid_str; - - struct stat stat = xstat(path); -@@ -469,8 +470,6 @@ struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx) - uuid_str = p + 1; - } else { - read_super: -- struct bch_opts opts = bch2_opts_empty(); -- - opt_set(opts, noexcl, true); - opt_set(opts, nochanges, true); - diff --git a/sys-fs/bcachefs-tools/metadata.xml b/sys-fs/bcachefs-tools/metadata.xml index 48e79cd6a8f8..7f5d051e8f0e 100644 --- a/sys-fs/bcachefs-tools/metadata.xml +++ b/sys-fs/bcachefs-tools/metadata.xml @@ -18,6 +18,5 @@ </use> <upstream> <remote-id type="github">koverstreet/bcachefs-tools</remote-id> - <remote-id type="gitlab">Matt.Jolly/rust-bindgen-bcachefs</remote-id> </upstream> </pkgmetadata> diff --git a/sys-fs/bindfs/bindfs-1.17.7.ebuild b/sys-fs/bindfs/bindfs-1.17.7.ebuild index e72e4409e14b..88b99e251069 100644 --- a/sys-fs/bindfs/bindfs-1.17.7.ebuild +++ b/sys-fs/bindfs/bindfs-1.17.7.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://bindfs.org/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug" RDEPEND=">=sys-fs/fuse-3.10.2:3" diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index b413b3038333..a606681f00a3 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -2,15 +2,7 @@ DIST btrfs-progs-v6.10.1.tar.sign 566 BLAKE2B dc18c0048716e422475c6630c26c74e09b DIST btrfs-progs-v6.10.1.tar.xz 2670604 BLAKE2B 7a2631b8462bb02be0936861a42b868907bd4f4e365293f9c95744b963e769b81248ba0a290fca517d689ff9f93d8709cc37e217264b2dac1469a47349f97e8c SHA512 cd10747d1f5f9377abfdf209b517791d3eb13b417c0be65fd5c0c044b01063125b4176c178345387bb3deda7a3a379953f31d46d7834854455a5dbfbf967aa97 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 -DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 SHA512 8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc -DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09 -DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46 -DIST btrfs-progs-v6.9.1.tar.sign 566 BLAKE2B 4735411485669e37558adda62e168f22a09c11d085dd4adc5db4cfe932745c746b373763cb70b31219908886de52544854a3e9dee0b61bbf32d5d7bf4325d2c9 SHA512 c484845ad47b1ebee666f76e5f0421f640391e205158c14e83ef960506df6b0b6d34244bdcd254e2ac47b3d758e515ffec523a773b7f6081d8b47b856bbbe09b -DIST btrfs-progs-v6.9.1.tar.xz 2662768 BLAKE2B ed26da2c3c07082df7f1a3d2dc43981ac5375e23de44d0068d91075c8f75e03e75eef4ec5175a0c72d57511b4b9474ff3383f07f14db22e97b2b175578f1cd40 SHA512 5a6b6bbcf2d2624ba12f877485c8137d1601ed9b17bd7f05993cccbc46ff0546f8a0aaf4e221e6cb3aaaa0cec53222edc723f787b317aa551b7f4469456d9a3a +DIST btrfs-progs-v6.11.tar.sign 566 BLAKE2B 15db44b5db3265eff9d5195ad4842cef5d001c46e1170f219784fca8d049756dccbc1bd95f20fc343fbdf1078c610a166921c043828cdc5f64c0f465323ca0e4 SHA512 a2fdd9100ad3ddd30cb923a72a2b4f70634277e5fbbf0d2cf912c00dc876dad6cd2c24e624f41dbb83aabdda4e3c08aea9c0ae39084bb3481700491df3d47fd5 +DIST btrfs-progs-v6.11.tar.xz 2695752 BLAKE2B 6dec219394e39a821f29858eddf1d501537d3cebad2dc83f0cea6d88d0b0e94c4fe2e660a48a27942ccfb6f3ac0630d5930f44e083168de65b60af36e895b2af SHA512 fad3c7e908e2020a3983f9737a7e87367023e2ad35aea14197e2bfa71c1e0435bc3da3f7e6ef463de47c033323163f8b1b7933013042c6fcea673d0f4723ade1 DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55683008b1585a26f38aef6cceb1afd5e80c9611518d6bd92dc1167798d4012c4bcab2f9bda752c459d94cfa6f3c477 SHA512 3fb04e1894e231abde388a39d2f0c90f43c1a1494622c2158fab9b94bb340e064404bcf96e24d913c60aaf5e06ade42fbb91a479949109b329682bb089f66bf2 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 diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild index 3361fe4d3f1e..89de2ab69fa8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild @@ -26,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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi fi @@ -102,7 +102,7 @@ if [[ ${PV} != 9999 ]]; then 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)) + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) assert "Unpack failed" else default diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild index 3361fe4d3f1e..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild @@ -26,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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -102,7 +102,7 @@ if [[ ${PV} != 9999 ]]; then 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)) + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) assert "Unpack failed" else default diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.11.ebuild index b4d9a3171bef..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.11.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 ~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 )" @@ -100,7 +102,7 @@ if [[ ${PV} != 9999 ]]; then 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)) + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) assert "Unpack failed" else default @@ -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.6.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild deleted file mode 100644 index d2a13b5804d9..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-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 python +man 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 ) python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - ) - ) - python? ( ${PYTHON_DEPS} ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - 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? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme - ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf - - mkdir config || die - 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 - --disable-experimental - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(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}" - - # bash as a tepmorary 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 - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild deleted file mode 100644 index d2a13b5804d9..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-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 python +man 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 ) python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - ) - ) - python? ( ${PYTHON_DEPS} ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - 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? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme - ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf - - mkdir config || die - 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 - --disable-experimental - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(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}" - - # bash as a tepmorary 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 - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild deleted file mode 100644 index d73ee523de14..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 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 -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if [[ ${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 - --disable-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[@]}" - - newbashcomp btrfs-completion btrfs -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild deleted file mode 100644 index d91dc0aada03..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-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 python +man 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 ) python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - ) - ) - python? ( ${PYTHON_DEPS} ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - 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? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme - ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf - - mkdir config || die - 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 - --disable-experimental - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(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}" - - # 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 - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -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 432b2b58e34d..89de2ab69fa8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild @@ -26,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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi fi @@ -102,7 +102,7 @@ if [[ ${PV} != 9999 ]]; then 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)) + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) assert "Unpack failed" else default diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild deleted file mode 100644 index e9d020c16019..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 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 - --disable-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[@]}" - - newbashcomp btrfs-completion btrfs -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 3361fe4d3f1e..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -26,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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -102,7 +102,7 @@ if [[ ${PV} != 9999 ]]; then 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)) + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) assert "Unpack failed" else default diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest index 0ffc19e8d126..fb353a4999f9 100644 --- a/sys-fs/btrfsmaintenance/Manifest +++ b/sys-fs/btrfsmaintenance/Manifest @@ -1,2 +1,3 @@ DIST btrfsmaintenance-0.5.1.tar.gz 26835 BLAKE2B 22cbde3208c7652bc341014785e61d5904b0696cb864edb9ff1563fc277cde14cfa990895a85a98071bdb9b7e4562d0ea9b981a23d1a6511dfda7390ac110f22 SHA512 9ac40c166ff2692373d28107bc4956e78d76090fefb21b8305feb3f936d98a7f94f1bc62b36529a882dbf93083402c48ac94c30a05eab7bd1f9eda13d410ef41 +DIST btrfsmaintenance-0.5.2.tar.gz 27071 BLAKE2B e2585bcf911cb0cbe3847dd3d6d6054cdea84d6f2c5ab51e47ec8b75adcb2a59d5ab904500fd8875e2eed11f4ba3b165eb20626f252fce179bfeb70700448f40 SHA512 eb20ee15851841d0216f0ec68b1cfc966a7c70892544a57e71e4dbae87d96e4f7f0677d89e6352106006541f5203676fb7fe13d71071778fc31bce8e55251320 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41 diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild index e26232645159..78aafedd39ec 100644 --- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild +++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" IUSE="systemd" RDEPEND=" diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild new file mode 100644 index 000000000000..3c0ba7a64299 --- /dev/null +++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag" +HOMEPAGE="https://github.com/kdave/btrfsmaintenance" +SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" +IUSE="systemd" + +RDEPEND=" + app-shells/bash + sys-apps/util-linux + sys-fs/btrfs-progs + systemd? ( sys-apps/systemd ) + !systemd? ( virtual/cron ) +" + +src_prepare() { + # Fix config path into watching service + sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || + die "Unable to patch btrfsmaintenance-refresh.*" + rm btrfs-defrag-plugin.sh || die "cannot remove btrfs-defrag-plugin.sh" # not necessary on gentoo systems + default +} + +src_install() { + dodoc README.md CONTRIBUTING.md CHANGES.md + insinto /etc/default + newins sysconfig.btrfsmaintenance btrfsmaintenance + insinto /usr/share/btrfsmaintenance + doins btrfsmaintenance-functions + exeinto /usr/share/btrfsmaintenance + doexe btrfs*.sh + systemd_dounit *.service *.timer *.path +} + +pkg_postinst() { + elog "Installing default btrfsmaintenance scripts" + if use systemd; then + "${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die + else + "${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die + fi + elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance " + elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to" + elog "update cron symlinks or run" + elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer" + elog "to update systemd timers." + elog "You can also enable btrfsmaintenance-refresh.path service in order to" + elog "monitor the config files changes and update systemd timers accordly." +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} ]] ; then + elog "Removing symlinks from btrfsmaintenance cron tasks" + "${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die + fi +} diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest index 59ddc6b49069..34c44356036d 100644 --- a/sys-fs/clamfs/Manifest +++ b/sys-fs/clamfs/Manifest @@ -1,2 +1 @@ -DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626 DIST clamfs-1.3.0.tar.gz 229989 BLAKE2B 05327d8b6fbe7073c5bd70104282a32009f06556fd61267931f4d841378318e29bb1fc7157da6b5ebce80dda35484f5bc2af71fcecdb3739a4dd28507c767054 SHA512 81c234ec631abd49d9a6b940ef727a1eae048b7be12be6082ec176ed4045fcd92d35d1264e7fd48906786af7c07696139fd5bfa0a302fba7ebb2c528315857a1 diff --git a/sys-fs/clamfs/clamfs-1.2.0.ebuild b/sys-fs/clamfs/clamfs-1.2.0.ebuild deleted file mode 100644 index 6b8945a4342a..000000000000 --- a/sys-fs/clamfs/clamfs-1.2.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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/compsize/Manifest b/sys-fs/compsize/Manifest index 8b32b0fbfb0d..8280cdd6f5a4 100644 --- a/sys-fs/compsize/Manifest +++ b/sys-fs/compsize/Manifest @@ -1,3 +1 @@ -DIST compsize-1.3.tar.gz 14782 BLAKE2B 738ff0e2b936f5974064759914284e495c895d22d95b705e1b8fac4b3189891771b0e5be7e0eeac0883dd92f9cef276400bb7ee79840fd7db14a5269e7f78f11 SHA512 411b92651fdc3d03deccbf38f72936fee95cf80c67d6368efbc0dafacfe9793815a23ef0d02f7feadf31391e415df3d90cd19fb3acc8cce94f37cb3e4eed623d -DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a817767e48eb857de9678a1915d304d25b454afafec867ea6a028d99d9182087d3229ddae55d8305fe6b174c SHA512 c07081721f87d8a59e724a62a0a6d6724434292e6bb3ffb71acd7c47e21727db8f02f4df296cb6094c0e80d3cd555018e492616747ce69055d21302a6617ca54 DIST compsize-1.5.tar.gz 15015 BLAKE2B 1a7fc676ffaeb69fd410a834eab54ef63c5fa11e428bd0567ab5dec5dc27fe1b4901fdd47760c07a7fb26375b81ba997528c0aa83409eb364a3b9f2cb1942cc8 SHA512 25d6f1973e8a0a86bd857dc1e1ba99760451cf388f3bd3ede6a6ef35351ff63f100646d313010aff3de9e70b2c68866a31c4ea31d9c6df9254648cd1bd0272fa diff --git a/sys-fs/compsize/compsize-1.3.ebuild b/sys-fs/compsize/compsize-1.3.ebuild deleted file mode 100644 index fc78e5b437fd..000000000000 --- a/sys-fs/compsize/compsize-1.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files" -HOMEPAGE="https://github.com/kilobyte/compsize" - -if [[ ${PV} = 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kilobyte/compsize.git" -else - SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+ GPL-2" -IUSE="debug" -SLOT="0" - -DEPEND="sys-fs/btrfs-progs" - -src_prepare() { - default - # Don't try to install a gzipped manfile during emake install - sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die -} - -src_configure() { - # Used in upstream Makefile, but clobbered by portage's CFLAGS - append-cflags -Wall -std=gnu90 - use debug && append-cflags -DDEBUG -g - default -} - -src_install() { - emake PREFIX="${D}" install - dodoc "README.md" -} diff --git a/sys-fs/compsize/compsize-1.4.ebuild b/sys-fs/compsize/compsize-1.4.ebuild deleted file mode 100644 index f00e46619d53..000000000000 --- a/sys-fs/compsize/compsize-1.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files" -HOMEPAGE="https://github.com/kilobyte/compsize" - -if [[ ${PV} = 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kilobyte/compsize.git" -else - SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+ GPL-2" -IUSE="debug" -SLOT="0" - -DEPEND="sys-fs/btrfs-progs" - -src_prepare() { - default - # Don't try to install a gzipped manfile during emake install - sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die -} - -src_configure() { - use debug && append-cflags -Wall -DDEBUG -g - default -} - -src_install() { - emake PREFIX="${ED}/usr" install - einstalldocs -} diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild index 8c0a769fa8ad..2f5223f474b9 100644 --- a/sys-fs/compsize/compsize-1.5.ebuild +++ b/sys-fs/compsize/compsize-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,8 +17,8 @@ else fi LICENSE="GPL-2+ GPL-2" -IUSE="debug" SLOT="0" +IUSE="debug" DEPEND="sys-fs/btrfs-progs" diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild index 8e5c209de18a..bc837c25a0d7 100644 --- a/sys-fs/compsize/compsize-9999.ebuild +++ b/sys-fs/compsize/compsize-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,8 +17,8 @@ else fi LICENSE="GPL-2+ GPL-2" -IUSE="debug" SLOT="0" +IUSE="debug" DEPEND="sys-fs/btrfs-progs" diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index d181c0076570..44cb16c6f3c8 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,2 +1 @@ -DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B 3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391 SHA512 a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild deleted file mode 100644 index 80309d474e3f..000000000000 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic linux-info python-any-r1 - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cryfs/cryfs" -else - SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - S="${WORKDIR}" -fi - -DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" -HOMEPAGE="https://www.cryfs.org/" - -LICENSE="LGPL-3 MIT" -SLOT="0" -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:= - >=dev-libs/crypto++-8.2.0:= - net-misc/curl:= - >=sys-fs/fuse-2.8.6:0 - dev-libs/openssl:= -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/versioneer[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - # TODO upstream: - "${FILESDIR}/${PN}-0.10.2-unbundle-libs.patch" - "${FILESDIR}/${PN}-0.10.2-install-targets.patch" - "${FILESDIR}/${PN}-0.10.3-gcc13.patch" - # From upstream - "${FILESDIR}/${PN}-0.10.3-gcc11.patch" - "${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch" -) - -python_check_deps() { - python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]" -} - -pkg_setup() { - local CONFIG_CHECK="~FUSE_FS" - local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support." - - check_extra_config - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # don't install compressed manpage - cmake_comment_add_subdirectory doc - - # We use the package instead for >=py3.12 compat, bug #908997 - rm src/gitversion/versioneer.py || die - - # remove tests that require internet access to comply with Gentoo policy - sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \ - -i test/cpp-utils/CMakeLists.txt || die - - # /dev/fuse access denied - sed -e "/CliTest_IntegrityCheck/d" \ - -i test/cryfs-cli/CMakeLists.txt || die -} - -src_configure() { - # ODR violations (bug #880563) - filter-lto - - local mycmakeargs=( - -DBoost_USE_STATIC_LIBS=OFF - -DCRYFS_UPDATE_CHECKS=OFF - -DBUILD_SHARED_LIBS=OFF - -DUSE_SYSTEM_LIBS=ON - -DBUILD_TESTING=$(usex test) - ) - - use debug || append-flags -DNDEBUG - - # bug 907096 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - cmake_src_configure -} - -src_test() { - local TMPDIR="${T}" - local tests_failed=() - - # fspp fuse tests hang, bug # 699044 - for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do - "${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" ) - done - - if [[ -n ${tests_failed[@]} ]] ; then - eerror "The following tests failed:" - eerror "${tests_failed[@]}" - die "At least one test failed" - fi -} - -src_install() { - cmake_src_install - doman doc/man/cryfs.1 -} diff --git a/sys-fs/cryfs/cryfs-0.11.4.ebuild b/sys-fs/cryfs/cryfs-0.11.4.ebuild index 061236e9d5d0..367de758b356 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/cryfs/files/cryfs-0.10.2-install-targets.patch b/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch deleted file mode 100644 index 0c666448cc01..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/cryfs/cryfs/pull/396 - -From 18503b00bd16d95dd2cf8a9047446f8be7289082 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 16 Jun 2019 19:35:49 +0200 -Subject: [PATCH 3/3] Don't limit install on Release/Debug/RelWithDebInfo - CONFIGURATIONS - ---- - src/cryfs-cli/CMakeLists.txt | 1 - - src/cryfs-unmount/CMakeLists.txt | 3 +-- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt -index 90edb227..e8c03916 100644 ---- a/src/cryfs-cli/CMakeLists.txt -+++ b/src/cryfs-cli/CMakeLists.txt -@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_NAME}_bin) - target_activate_cpp14(${PROJECT_NAME}_bin) - - install(TARGETS ${PROJECT_NAME}_bin -- CONFIGURATIONS Debug Release RelWithDebInfo - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) -diff --git a/src/cryfs-unmount/CMakeLists.txt b/src/cryfs-unmount/CMakeLists.txt -index 0a246a7f..c5f096ab 100644 ---- a/src/cryfs-unmount/CMakeLists.txt -+++ b/src/cryfs-unmount/CMakeLists.txt -@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_NAME}_bin) - target_activate_cpp14(${PROJECT_NAME}_bin) - - install(TARGETS ${PROJECT_NAME}_bin -- CONFIGURATIONS Debug Release RelWithDebInfo -- DESTINATION ${CMAKE_INSTALL_BINDIR} -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.22.0 diff --git a/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch b/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch deleted file mode 100644 index 65d72a99ac89..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch +++ /dev/null @@ -1,409 +0,0 @@ -From b78c249ce3e048d481d11347c98a86e6669ff5bb Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 16 Jun 2019 10:59:46 +0200 -Subject: [PATCH 1/3] Add USE_SYSTEM_LIBS option to build without bundled libs - -headers: s/vendor_cryptopp/cryptopp/ - -Only gtest and crypto++ are being unbundled. In release/0.10 branch, -bundled spdlog version is too old for Gentoo to satisfy with system-lib. ---- - CMakeLists.txt | 15 ++++++++++++++- - .../compressing/compressors/Gzip.cpp | 2 +- - src/cpp-utils/CMakeLists.txt | 6 +++++- - src/cpp-utils/crypto/cryptopp_byte.h | 2 +- - src/cpp-utils/crypto/hash/Hash.cpp | 2 +- - src/cpp-utils/crypto/kdf/Scrypt.cpp | 2 +- - src/cpp-utils/crypto/symmetric/CFB_Cipher.h | 2 +- - src/cpp-utils/crypto/symmetric/GCM_Cipher.h | 2 +- - src/cpp-utils/crypto/symmetric/ciphers.h | 10 +++++----- - src/cpp-utils/data/Data.cpp | 2 +- - src/cpp-utils/data/FixedSizeData.h | 2 +- - src/cpp-utils/random/OSRandomGenerator.h | 2 +- - src/cpp-utils/random/RandomGeneratorThread.h | 2 +- - src/cryfs/localstate/BasedirMetadata.cpp | 2 +- - test/blobstore/CMakeLists.txt | 2 +- - test/blockstore/CMakeLists.txt | 2 +- - test/cpp-utils/CMakeLists.txt | 2 +- - test/cryfs-cli/CMakeLists.txt | 2 +- - test/cryfs/CMakeLists.txt | 2 +- - test/cryfs/config/CompatibilityTest.cpp | 2 +- - test/fspp/CMakeLists.txt | 2 +- - test/gitversion/CMakeLists.txt | 2 +- - test/my-gtest-main/CMakeLists.txt | 2 +- - test/parallelaccessstore/CMakeLists.txt | 2 +- - 24 files changed, 45 insertions(+), 28 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdbff715..9797d1ee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,7 @@ require_clang_version(4.0) - option(BUILD_TESTING "build test cases" OFF) - option(CRYFS_UPDATE_CHECKS "let cryfs check for updates and security vulnerabilities" ON) - option(DISABLE_OPENMP "allow building without OpenMP libraries. This will cause performance degradations." OFF) -+option(USE_SYSTEM_LIBS "build with system libs instead of bundled libs" OFF) - - # The following options are helpful for development and/or CI - option(USE_WERROR "build with -Werror flag") -@@ -48,7 +49,19 @@ if(MSVC) - add_definitions(/bigobj) - endif() - --add_subdirectory(vendor EXCLUDE_FROM_ALL) -+if(USE_SYSTEM_LIBS) -+ include(FindPkgConfig) -+ pkg_check_modules(CRYPTOPP REQUIRED libcryptopp>=8.2) -+ add_subdirectory(vendor/spdlog EXCLUDE_FROM_ALL) -+ if(BUILD_TESTING) -+ find_package(GTest CONFIG REQUIRED) -+ set(GOOGLETEST_LIBS GTest::gtest GTest::gmock) -+ endif() -+else() -+ add_subdirectory(vendor EXCLUDE_FROM_ALL) -+ set(GOOGLETEST_LIBS googletest) -+endif() -+ - add_subdirectory(src) - add_subdirectory(doc) - add_subdirectory(test) -diff --git a/src/blockstore/implementations/compressing/compressors/Gzip.cpp b/src/blockstore/implementations/compressing/compressors/Gzip.cpp -index 67b7f49a..64f13e97 100644 ---- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp -+++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp -@@ -1,6 +1,6 @@ - #include "cpp-utils/crypto/cryptopp_byte.h" - #include "Gzip.h" --#include <vendor_cryptopp/gzip.h> -+#include <cryptopp/gzip.h> - - using cpputils::Data; - -diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt -index f66f99f8..b57e02ba 100644 ---- a/src/cpp-utils/CMakeLists.txt -+++ b/src/cpp-utils/CMakeLists.txt -@@ -89,7 +89,11 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT}) - - target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}) - --target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp) -+if(USE_SYSTEM_LIBS) -+ target_link_libraries(${PROJECT_NAME} PUBLIC spdlog ${CRYPTOPP_LIBRARIES}) -+else() -+ target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp) -+endif() - - target_add_boost(${PROJECT_NAME} filesystem system thread chrono) - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/src/cpp-utils/crypto/cryptopp_byte.h b/src/cpp-utils/crypto/cryptopp_byte.h -index e00cf7cf..363990e9 100644 ---- a/src/cpp-utils/crypto/cryptopp_byte.h -+++ b/src/cpp-utils/crypto/cryptopp_byte.h -@@ -2,7 +2,7 @@ - #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H - #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H - --#include <vendor_cryptopp/cryptlib.h> -+#include <cryptopp/cryptlib.h> - - // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet. - // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP). -diff --git a/src/cpp-utils/crypto/hash/Hash.cpp b/src/cpp-utils/crypto/hash/Hash.cpp -index 696cdeaf..e07d28da 100644 ---- a/src/cpp-utils/crypto/hash/Hash.cpp -+++ b/src/cpp-utils/crypto/hash/Hash.cpp -@@ -1,6 +1,6 @@ - #include "Hash.h" - #include <cpp-utils/random/Random.h> --#include <vendor_cryptopp/sha.h> -+#include <cryptopp/sha.h> - - using cpputils::Random; - using CryptoPP::SHA512; -diff --git a/src/cpp-utils/crypto/kdf/Scrypt.cpp b/src/cpp-utils/crypto/kdf/Scrypt.cpp -index f97d6940..e26db8db 100644 ---- a/src/cpp-utils/crypto/kdf/Scrypt.cpp -+++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp -@@ -1,5 +1,5 @@ - #include "Scrypt.h" --#include <vendor_cryptopp/scrypt.h> -+#include <cryptopp/scrypt.h> - - using std::string; - -diff --git a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -index 217111d9..0ea6355c 100644 ---- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -+++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -@@ -7,7 +7,7 @@ - #include "../../data/Data.h" - #include "../../random/Random.h" - #include <boost/optional.hpp> --#include <vendor_cryptopp/modes.h> -+#include <cryptopp/modes.h> - #include "Cipher.h" - #include "EncryptionKey.h" - -diff --git a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -index 87404c8f..385f399f 100644 ---- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -+++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -@@ -6,7 +6,7 @@ - #include "../../data/FixedSizeData.h" - #include "../../data/Data.h" - #include "../../random/Random.h" --#include <vendor_cryptopp/gcm.h> -+#include <cryptopp/gcm.h> - #include "Cipher.h" - #include "EncryptionKey.h" - -diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h b/src/cpp-utils/crypto/symmetric/ciphers.h -index 7a8f8d45..61a6a25a 100644 ---- a/src/cpp-utils/crypto/symmetric/ciphers.h -+++ b/src/cpp-utils/crypto/symmetric/ciphers.h -@@ -2,11 +2,11 @@ - #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ - #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ - --#include <vendor_cryptopp/aes.h> --#include <vendor_cryptopp/twofish.h> --#include <vendor_cryptopp/serpent.h> --#include <vendor_cryptopp/cast.h> --#include <vendor_cryptopp/mars.h> -+#include <cryptopp/aes.h> -+#include <cryptopp/twofish.h> -+#include <cryptopp/serpent.h> -+#include <cryptopp/cast.h> -+#include <cryptopp/mars.h> - #include "GCM_Cipher.h" - #include "CFB_Cipher.h" - -diff --git a/src/cpp-utils/data/Data.cpp b/src/cpp-utils/data/Data.cpp -index c8a3a25b..3a6d41eb 100644 ---- a/src/cpp-utils/data/Data.cpp -+++ b/src/cpp-utils/data/Data.cpp -@@ -1,6 +1,6 @@ - #include "Data.h" - #include <stdexcept> --#include <vendor_cryptopp/hex.h> -+#include <cryptopp/hex.h> - #include <cpp-utils/crypto/cryptopp_byte.h> - - using std::istream; -diff --git a/src/cpp-utils/data/FixedSizeData.h b/src/cpp-utils/data/FixedSizeData.h -index 832a96ee..e45127a4 100644 ---- a/src/cpp-utils/data/FixedSizeData.h -+++ b/src/cpp-utils/data/FixedSizeData.h -@@ -2,7 +2,7 @@ - #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ - #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ - --#include <vendor_cryptopp/hex.h> -+#include <cryptopp/hex.h> - #include <string> - #include <cstring> - #include "../assert/assert.h" -diff --git a/src/cpp-utils/random/OSRandomGenerator.h b/src/cpp-utils/random/OSRandomGenerator.h -index 18a8002d..8c8dc6f5 100644 ---- a/src/cpp-utils/random/OSRandomGenerator.h -+++ b/src/cpp-utils/random/OSRandomGenerator.h -@@ -4,7 +4,7 @@ - - #include "cpp-utils/crypto/cryptopp_byte.h" - #include "RandomGenerator.h" --#include <vendor_cryptopp/osrng.h> -+#include <cryptopp/osrng.h> - - namespace cpputils { - class OSRandomGenerator final : public RandomGenerator { -diff --git a/src/cpp-utils/random/RandomGeneratorThread.h b/src/cpp-utils/random/RandomGeneratorThread.h -index 593750ed..103c00d7 100644 ---- a/src/cpp-utils/random/RandomGeneratorThread.h -+++ b/src/cpp-utils/random/RandomGeneratorThread.h -@@ -4,7 +4,7 @@ - - #include "../thread/LoopThread.h" - #include "ThreadsafeRandomDataBuffer.h" --#include <vendor_cryptopp/osrng.h> -+#include <cryptopp/osrng.h> - - namespace cpputils { - //TODO Test -diff --git a/src/cryfs/localstate/BasedirMetadata.cpp b/src/cryfs/localstate/BasedirMetadata.cpp -index d32ced93..3de2d3ad 100644 ---- a/src/cryfs/localstate/BasedirMetadata.cpp -+++ b/src/cryfs/localstate/BasedirMetadata.cpp -@@ -1,7 +1,7 @@ - #include "BasedirMetadata.h" - #include <boost/property_tree/ptree.hpp> - #include <boost/property_tree/json_parser.hpp> --#include <vendor_cryptopp/sha.h> -+#include <cryptopp/sha.h> - #include <boost/filesystem/operations.hpp> - #include "LocalStateDir.h" - #include <cpp-utils/logging/logging.h> -diff --git a/test/blobstore/CMakeLists.txt b/test/blobstore/CMakeLists.txt -index 05e98b8d..342d5626 100644 ---- a/test/blobstore/CMakeLists.txt -+++ b/test/blobstore/CMakeLists.txt -@@ -27,7 +27,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blobstore) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} blobstore) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/blockstore/CMakeLists.txt b/test/blockstore/CMakeLists.txt -index ca63acce..6dc5f505 100644 ---- a/test/blockstore/CMakeLists.txt -+++ b/test/blockstore/CMakeLists.txt -@@ -42,7 +42,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blockstore) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} blockstore) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt -index 02cc9d5d..55f367eb 100644 ---- a/test/cpp-utils/CMakeLists.txt -+++ b/test/cpp-utils/CMakeLists.txt -@@ -70,7 +70,7 @@ target_activate_cpp14(${PROJECT_NAME}_exit_signal) - target_link_libraries(${PROJECT_NAME}_exit_signal cpp-utils) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cpp-utils) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cpp-utils) - add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_exit_status ${PROJECT_NAME}_exit_signal) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - -diff --git a/test/cryfs-cli/CMakeLists.txt b/test/cryfs-cli/CMakeLists.txt -index 2d0b38c5..76fd75bc 100644 ---- a/test/cryfs-cli/CMakeLists.txt -+++ b/test/cryfs-cli/CMakeLists.txt -@@ -16,7 +16,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs-cli cryfs-unmount fspp-fuse) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cryfs-cli cryfs-unmount fspp-fuse) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/cryfs/CMakeLists.txt b/test/cryfs/CMakeLists.txt -index 77a025f4..71c74310 100644 ---- a/test/cryfs/CMakeLists.txt -+++ b/test/cryfs/CMakeLists.txt -@@ -24,7 +24,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cryfs) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/cryfs/config/CompatibilityTest.cpp b/test/cryfs/config/CompatibilityTest.cpp -index 36c1871c..a1d5f22b 100644 ---- a/test/cryfs/config/CompatibilityTest.cpp -+++ b/test/cryfs/config/CompatibilityTest.cpp -@@ -3,7 +3,7 @@ - #include <vector> - #include <boost/filesystem.hpp> - #include <cpp-utils/data/Data.h> --#include <vendor_cryptopp/hex.h> -+#include <cryptopp/hex.h> - #include <cpp-utils/crypto/symmetric/ciphers.h> - #include <cpp-utils/tempfile/TempFile.h> - #include <cryfs/config/CryConfigFile.h> -diff --git a/test/fspp/CMakeLists.txt b/test/fspp/CMakeLists.txt -index dabff1f1..c3949206 100644 ---- a/test/fspp/CMakeLists.txt -+++ b/test/fspp/CMakeLists.txt -@@ -102,7 +102,7 @@ set(SOURCES - testutils/OpenFileHandle.cpp testutils/OpenFileHandle.h) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest fspp-interface fspp-fuse) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} fspp-interface fspp-fuse) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/gitversion/CMakeLists.txt b/test/gitversion/CMakeLists.txt -index 51a5ccc1..396289fa 100644 ---- a/test/gitversion/CMakeLists.txt -+++ b/test/gitversion/CMakeLists.txt -@@ -6,7 +6,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest gitversion) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} gitversion) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) -diff --git a/test/my-gtest-main/CMakeLists.txt b/test/my-gtest-main/CMakeLists.txt -index 1d1e7e08..de4fd107 100644 ---- a/test/my-gtest-main/CMakeLists.txt -+++ b/test/my-gtest-main/CMakeLists.txt -@@ -5,7 +5,7 @@ set(SOURCES - ) - - add_library(${PROJECT_NAME} STATIC ${SOURCES}) --target_link_libraries(${PROJECT_NAME} PUBLIC googletest cpp-utils) -+target_link_libraries(${PROJECT_NAME} PUBLIC ${GOOGLETEST_LIBS} cpp-utils) - target_add_boost(${PROJECT_NAME} filesystem system) - target_include_directories(${PROJECT_NAME} PUBLIC .) - -diff --git a/test/parallelaccessstore/CMakeLists.txt b/test/parallelaccessstore/CMakeLists.txt -index 16170d17..97379304 100644 ---- a/test/parallelaccessstore/CMakeLists.txt -+++ b/test/parallelaccessstore/CMakeLists.txt -@@ -6,7 +6,7 @@ set(SOURCES - ) - - add_executable(${PROJECT_NAME} ${SOURCES}) --target_link_libraries(${PROJECT_NAME} my-gtest-main googletest parallelaccessstore) -+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} parallelaccessstore) - add_test(${PROJECT_NAME} ${PROJECT_NAME}) - - target_enable_style_warnings(${PROJECT_NAME}) --- -2.22.0 - - -From 6d5b1dd6f040dbdf3e330962a174c91281b19472 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 16 Jun 2019 15:17:16 +0200 -Subject: [PATCH 2/3] Use FeatureSummary - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9797d1ee..9e37b2e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,7 @@ project(cryfs) - - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake-utils) - include(utils) -+include(FeatureSummary) - - require_gcc_version(5.0) - require_clang_version(4.0) -@@ -66,3 +67,5 @@ add_subdirectory(src) - add_subdirectory(doc) - add_subdirectory(test) - add_subdirectory(cpack) -+ -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.22.0 - diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch b/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch deleted file mode 100644 index a9252e729fb6..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/cryfs/cryfs/pull/395 - -From dcc072d51d0bbb56c9d8709214ce49f8bd6de73c Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 13 Aug 2021 18:46:55 +0100 -Subject: [PATCH] Add missing memory.h include for std::shared_ptr - ---- - src/fspp/fuse/Fuse.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/fspp/fuse/Fuse.h b/src/fspp/fuse/Fuse.h -index 0b384d8..2ed98da 100644 ---- a/src/fspp/fuse/Fuse.h -+++ b/src/fspp/fuse/Fuse.h -@@ -11,6 +11,7 @@ - #include <boost/optional.hpp> - #include <cpp-utils/macros.h> - #include <atomic> -+#include <memory> - #include "stat_compatibility.h" - - namespace fspp { --- -2.32.0 - diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch deleted file mode 100644 index 9a7252ba506b..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch +++ /dev/null @@ -1,271 +0,0 @@ -https://github.com/cryfs/cryfs/commit/27587ea1acec5f939a31217f1c43953378f18821.patch -https://bugs.gentoo.org/786459 - -From 27587ea1acec5f939a31217f1c43953378f18821 Mon Sep 17 00:00:00 2001 -From: Sebastian Messmer <messmer@cryfs.org> -Date: Sat, 8 May 2021 14:44:27 -0700 -Subject: [PATCH] Fixed an issue when compiling with GCC 11, see - https://github.com/cryfs/cryfs/issues/389 - ---- ---- a/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h -+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h -@@ -67,7 +67,7 @@ class DataNodeView final { - - static DataNodeView create(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { - ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node"); -- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data)); -+ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data)); - ASSERT(serialized.size() == layout.blocksizeBytes(), "Wrong block size"); - auto block = blockStore->create(serialized); - return DataNodeView(std::move(block)); -@@ -75,7 +75,7 @@ class DataNodeView final { - - static DataNodeView initialize(cpputils::unique_ref<blockstore::Block> block, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { - ASSERT(data.size() <= DataNodeLayout(block->size()).datasizeBytes(), "Data is too large for node"); -- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data)); -+ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data)); - ASSERT(serialized.size() == block->size(), "Block has wrong size"); - block->write(serialized.data(), 0, serialized.size()); - return DataNodeView(std::move(block)); -@@ -83,7 +83,7 @@ class DataNodeView final { - - static DataNodeView overwrite(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, const blockstore::BlockId &blockId, cpputils::Data data) { - ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node"); -- cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data)); -+ cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data)); - auto block = blockStore->overwrite(blockId, std::move(serialized)); - return DataNodeView(std::move(block)); - } -@@ -143,7 +143,7 @@ class DataNodeView final { - } - - private: -- static cpputils::Data _serialize(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { -+ static cpputils::Data serialize_(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) { - cpputils::Data result(layout.blocksizeBytes()); - cpputils::serialize<uint16_t>(result.dataOffset(layout.FORMAT_VERSION_OFFSET_BYTES), formatVersion); - cpputils::serialize<uint8_t>(result.dataOffset(layout.DEPTH_OFFSET_BYTES), depth); ---- a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp -+++ b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp -@@ -11,55 +11,55 @@ namespace cryfs { - - namespace { - template<typename DataType> -- size_t _serialize(void* dst, const DataType& obj) { -+ size_t serialize_(void* dst, const DataType& obj) { - cpputils::serialize<DataType>(dst, obj); - return sizeof(DataType); - } - - template<typename DataType> -- DataType _deserialize(const char** src) { -+ DataType deserialize_(const char** src) { - DataType result = cpputils::deserialize<DataType>(*src); - *src += sizeof(DataType); - return result; - } - -- constexpr size_t _serializedTimeValueSize() { -+ constexpr size_t serializedTimeValueSize_() { - return sizeof(uint64_t) + sizeof(uint32_t); - } - -- unsigned int _serializeTimeValue(uint8_t *dest, timespec value) { -+ unsigned int serializeTimeValue_(uint8_t *dest, timespec value) { - unsigned int offset = 0; -- offset += _serialize<uint64_t>(dest + offset, value.tv_sec); -- offset += _serialize<uint32_t>(dest + offset, value.tv_nsec); -- ASSERT(offset == _serializedTimeValueSize(), "serialized to wrong size"); -+ offset += serialize_<uint64_t>(dest + offset, value.tv_sec); -+ offset += serialize_<uint32_t>(dest + offset, value.tv_nsec); -+ ASSERT(offset == serializedTimeValueSize_(), "serialized to wrong size"); - return offset; - } - -- timespec _deserializeTimeValue(const char **pos) { -+ timespec deserializeTimeValue_(const char **pos) { - timespec value{}; -- value.tv_sec = _deserialize<uint64_t>(pos); -- value.tv_nsec = _deserialize<uint32_t>(pos); -+ value.tv_sec = deserialize_<uint64_t>(pos); -+ value.tv_nsec = deserialize_<uint32_t>(pos); - return value; - } - -- unsigned int _serializeString(uint8_t *dest, const string &value) { -+ unsigned int serializeString_(uint8_t *dest, const string &value) { - std::memcpy(dest, value.c_str(), value.size()+1); - return value.size() + 1; - } - -- string _deserializeString(const char **pos) { -+ string deserializeString_(const char **pos) { - size_t length = strlen(*pos); - string value(*pos, length); - *pos += length + 1; - return value; - } - -- unsigned int _serializeBlockId(uint8_t *dest, const BlockId &blockId) { -+ unsigned int serializeBlockId_(uint8_t *dest, const BlockId &blockId) { - blockId.ToBinary(dest); - return blockId.BINARY_LENGTH; - } - -- BlockId _deserializeBlockId(const char **pos) { -+ BlockId deserializeBlockId_(const char **pos) { - BlockId blockId = BlockId::FromBinary(*pos); - *pos += BlockId::BINARY_LENGTH; - return blockId; -@@ -75,35 +75,35 @@ namespace cryfs { - _mode.hasDirFlag()) + ", " + std::to_string(_mode.hasSymlinkFlag()) + ", " + std::to_string(static_cast<uint8_t>(_type)) - ); - unsigned int offset = 0; -- offset += _serialize<uint8_t>(dest + offset, static_cast<uint8_t>(_type)); -- offset += _serialize<uint32_t>(dest + offset, _mode.value()); -- offset += _serialize<uint32_t>(dest + offset, _uid.value()); -- offset += _serialize<uint32_t>(dest + offset, _gid.value()); -- offset += _serializeTimeValue(dest + offset, _lastAccessTime); -- offset += _serializeTimeValue(dest + offset, _lastModificationTime); -- offset += _serializeTimeValue(dest + offset, _lastMetadataChangeTime); -- offset += _serializeString(dest + offset, _name); -- offset += _serializeBlockId(dest + offset, _blockId); -+ offset += serialize_<uint8_t>(dest + offset, static_cast<uint8_t>(_type)); -+ offset += serialize_<uint32_t>(dest + offset, _mode.value()); -+ offset += serialize_<uint32_t>(dest + offset, _uid.value()); -+ offset += serialize_<uint32_t>(dest + offset, _gid.value()); -+ offset += serializeTimeValue_(dest + offset, _lastAccessTime); -+ offset += serializeTimeValue_(dest + offset, _lastModificationTime); -+ offset += serializeTimeValue_(dest + offset, _lastMetadataChangeTime); -+ offset += serializeString_(dest + offset, _name); -+ offset += serializeBlockId_(dest + offset, _blockId); - ASSERT(offset == serializedSize(), "Didn't write correct number of elements"); - } - - const char *DirEntry::deserializeAndAddToVector(const char *pos, vector<DirEntry> *result) { -- fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(_deserialize<uint8_t>(&pos)); -- fspp::mode_t mode = fspp::mode_t(_deserialize<uint32_t>(&pos)); -- fspp::uid_t uid = fspp::uid_t(_deserialize<uint32_t>(&pos)); -- fspp::gid_t gid = fspp::gid_t(_deserialize<uint32_t>(&pos)); -- timespec lastAccessTime = _deserializeTimeValue(&pos); -- timespec lastModificationTime = _deserializeTimeValue(&pos); -- timespec lastMetadataChangeTime = _deserializeTimeValue(&pos); -- string name = _deserializeString(&pos); -- BlockId blockId = _deserializeBlockId(&pos); -+ fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(deserialize_<uint8_t>(&pos)); -+ fspp::mode_t mode = fspp::mode_t(deserialize_<uint32_t>(&pos)); -+ fspp::uid_t uid = fspp::uid_t(deserialize_<uint32_t>(&pos)); -+ fspp::gid_t gid = fspp::gid_t(deserialize_<uint32_t>(&pos)); -+ timespec lastAccessTime = deserializeTimeValue_(&pos); -+ timespec lastModificationTime = deserializeTimeValue_(&pos); -+ timespec lastMetadataChangeTime = deserializeTimeValue_(&pos); -+ string name = deserializeString_(&pos); -+ BlockId blockId = deserializeBlockId_(&pos); - - result->emplace_back(type, name, blockId, mode, uid, gid, lastAccessTime, lastModificationTime, lastMetadataChangeTime); - return pos; - } - - size_t DirEntry::serializedSize() const { -- return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*_serializedTimeValueSize() + ( -+ return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*serializedTimeValueSize_() + ( - _name.size() + 1) + _blockId.BINARY_LENGTH; - } - } ---- a/src/cryfs/localstate/LocalStateMetadata.cpp -+++ b/src/cryfs/localstate/LocalStateMetadata.cpp -@@ -30,10 +30,10 @@ LocalStateMetadata::LocalStateMetadata(uint32_t myClientId, Hash encryptionKeyHa - - LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath, const Data& encryptionKey, bool allowReplacedFilesystem) { - auto metadataFile = statePath / "metadata"; -- auto loaded = _load(metadataFile); -+ auto loaded = load_(metadataFile); - if (loaded == none) { - // If it couldn't be loaded, generate a new client id. -- return _generate(metadataFile, encryptionKey); -+ return generate_(metadataFile, encryptionKey); - } - - if (!allowReplacedFilesystem && loaded->_encryptionKeyHash.digest != cpputils::hash::hash(encryptionKey, loaded->_encryptionKeyHash.salt).digest) { -@@ -42,22 +42,22 @@ LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath, - return *loaded; - } - --optional<LocalStateMetadata> LocalStateMetadata::_load(const bf::path &metadataFilePath) { -+optional<LocalStateMetadata> LocalStateMetadata::load_(const bf::path &metadataFilePath) { - ifstream file(metadataFilePath.string()); - if (!file.good()) { - // State file doesn't exist - return none; - } -- return _deserialize(file); -+ return deserialize_(file); - } - --void LocalStateMetadata::_save(const bf::path &metadataFilePath) const { -+void LocalStateMetadata::save_(const bf::path &metadataFilePath) const { - ofstream file(metadataFilePath.string(), std::ios::trunc); -- _serialize(file); -+ serialize_(file); - } - - namespace { --uint32_t _generateClientId() { -+uint32_t generateClientId_() { - uint32_t result; - do { - result = cpputils::deserialize<uint32_t>(Random::PseudoRandom().getFixedSize<sizeof(uint32_t)>().data()); -@@ -82,8 +82,8 @@ optional<uint32_t> _tryLoadClientIdFromLegacyFile(const bf::path &metadataFilePa - #endif - } - --LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePath, const Data& encryptionKey) { -- uint32_t myClientId = _generateClientId(); -+LocalStateMetadata LocalStateMetadata::generate_(const bf::path &metadataFilePath, const Data& encryptionKey) { -+ uint32_t myClientId = generateClientId_(); - #ifndef CRYFS_NO_COMPATIBILITY - // In the old format, this was stored in a "myClientId" file. If that file exists, load it from there. - optional<uint32_t> legacy = _tryLoadClientIdFromLegacyFile(metadataFilePath); -@@ -93,11 +93,11 @@ LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePat - #endif - - LocalStateMetadata result(myClientId, cpputils::hash::hash(encryptionKey, cpputils::hash::generateSalt())); -- result._save(metadataFilePath); -+ result.save_(metadataFilePath); - return result; - } - --void LocalStateMetadata::_serialize(ostream& stream) const { -+void LocalStateMetadata::serialize_(ostream& stream) const { - ptree pt; - pt.put<uint32_t>("myClientId", myClientId()); - pt.put<string>("encryptionKey.salt", _encryptionKeyHash.salt.ToString()); -@@ -106,7 +106,7 @@ void LocalStateMetadata::_serialize(ostream& stream) const { - write_json(stream, pt); - } - --LocalStateMetadata LocalStateMetadata::_deserialize(istream& stream) { -+LocalStateMetadata LocalStateMetadata::deserialize_(istream& stream) { - try { - ptree pt; - read_json(stream, pt); ---- a/src/cryfs/localstate/LocalStateMetadata.h -+++ b/src/cryfs/localstate/LocalStateMetadata.h -@@ -20,11 +20,11 @@ class LocalStateMetadata final { - const uint32_t _myClientId; - const cpputils::hash::Hash _encryptionKeyHash; - -- static boost::optional<LocalStateMetadata> _load(const boost::filesystem::path &metadataFilePath); -- static LocalStateMetadata _deserialize(std::istream& stream); -- static LocalStateMetadata _generate(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey); -- void _save(const boost::filesystem::path &metadataFilePath) const; -- void _serialize(std::ostream& stream) const; -+ static boost::optional<LocalStateMetadata> load_(const boost::filesystem::path &metadataFilePath); -+ static LocalStateMetadata deserialize_(std::istream& stream); -+ static LocalStateMetadata generate_(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey); -+ void save_(const boost::filesystem::path &metadataFilePath) const; -+ void serialize_(std::ostream& stream) const; - - LocalStateMetadata(uint32_t myClientId, cpputils::hash::Hash encryptionKey); - }; diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch deleted file mode 100644 index 33b6e95d1cea..000000000000 --- a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/890847 ---- a/src/cpp-utils/thread/LeftRight.h -+++ b/src/cpp-utils/thread/LeftRight.h -@@ -2,6 +2,7 @@ - #include <functional> - #include <mutex> - #include <thread> -+#include <stdexcept> - #include <cpp-utils/macros.h> - #include <array> - diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml index dce6d653fddc..bc16b23e5ab2 100644 --- a/sys-fs/cryfs/metadata.xml +++ b/sys-fs/cryfs/metadata.xml @@ -1,14 +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>nickaristocrates@gmail.com</email> - <name>Nicholas Meyer</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">cryfs/cryfs</remote-id> </upstream> diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest index f80e1e8ced04..75820c88c16d 100644 --- a/sys-fs/cryptmount/Manifest +++ b/sys-fs/cryptmount/Manifest @@ -1 +1 @@ -DIST cryptmount-6.2.0.tar.gz 548497 BLAKE2B 45602d86624464c8c1c2ad9cf3ffc4bf311d60ae16c2294111b1fc98bb0e02952c69c767a1c583428c3d8eb0ade2caddb17d3187f4dd34d780772b299ea1a6c0 SHA512 005d9333792a567515ce6d487d2dfa18f19cb077a64d9c356562acefc1947581d2d0f584ad623e0aab8aed1b34f1614af3a42f0c582d31e0831cdb8eb22bb7ce +DIST cryptmount-6.3.0.tar.gz 373196 BLAKE2B b59127f9944f4bf267d4272bc026909b704f474b2fd2a20baf9125f9b32b33ecfd5523c6ef05098e6467e9b7e938daba55685dc47a3317a4913aef4c517f66f2 SHA512 15f19a1ff7409b35be2cde3d791c8d476c98ffcaf3dd9217076703b0e0baafe999a0608a88cc51039ba2e9c26cb297261128a5efeacd1a6397c5d3300886ac4d diff --git a/sys-fs/cryptmount/cryptmount-6.2.0.ebuild b/sys-fs/cryptmount/cryptmount-6.3.0.ebuild index 7a17b776c0b9..a1c60b150253 100644 --- a/sys-fs/cryptmount/cryptmount-6.2.0.ebuild +++ b/sys-fs/cryptmount/cryptmount-6.3.0.ebuild @@ -3,16 +3,16 @@ EAPI=8 -inherit linux-info +inherit autotools linux-info DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems" HOMEPAGE="http://cryptmount.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/rwpenney/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm64 x86" -IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev" +IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl systemd" REQUIRED_USE=" luks? ( gcrypt ) openssl? ( gcrypt ) @@ -26,7 +26,6 @@ RDEPEND=" luks? ( sys-fs/cryptsetup ) openssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) - udev? ( virtual/udev ) " DEPEND=" @@ -48,10 +47,10 @@ ERROR_BLK_DEV_DM=" src_prepare() { default - # Since SELinux is hardcoded, remove it on disabled SELinux profile - if ! use selinux; then - sed -e '/selinux/d' -i dmutils.c || die - fi + # Fix doc directory + sed -e 's/doc\/cryptmount/doc\/${PF}/g' -i Makefile.am || die + + eautoreconf } src_configure() { @@ -67,8 +66,6 @@ src_configure() { $(use_enable luks) $(use_enable openssl openssl-compat) $(use_with systemd) - $(use_enable udev libudev) - ) econf "${myeconf[@]}" diff --git a/sys-fs/cryptmount/metadata.xml b/sys-fs/cryptmount/metadata.xml index 04afce0bebc0..36c2b7762024 100644 --- a/sys-fs/cryptmount/metadata.xml +++ b/sys-fs/cryptmount/metadata.xml @@ -34,6 +34,7 @@ </use> <upstream> <bugs-to>https://sourceforge.net/p/cryptmount/bugs/</bugs-to> + <remote-id type="github">rwpenney/cryptmount</remote-id> <remote-id type="sourceforge">cryptmount</remote-id> </upstream> </pkgmetadata> diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 3494e32bbc0a..9bbd8064cf17 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -2,3 +2,4 @@ DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B efd7a64d89d863876de68ff3e89d8c94ad 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 +DIST cryptsetup-2.7.5.tar.xz 11697476 BLAKE2B 7df7b53f74cbf1a009d2804b8d85c9fea27be994bb4171e1ded70e3666635fd8f265819321bee0d1977548626029ebf75b87225a68cb38b3b79910f991c813dd SHA512 13eca93cdb00a143d2ca60b6f66ede5adc4072ca0c4bfebd8454a3541e69d269fcdb4afc97ad799e87a999b2bd46c1f31fa924a3d616d72a3337970b1e718d55 diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild index 07d4351b691c..12b1d328736f 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild @@ -13,7 +13,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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild index 143ba8992dd6..10ac2ba5d833 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 ~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 71d96dacde92..729d59ff8f6d 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.3.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild index 71d96dacde92..729d59ff8f6d 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.4.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild new file mode 100644 index 000000000000..d09dd78f2b65 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.7.5.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 ~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/ddrescue/Manifest b/sys-fs/ddrescue/Manifest index 0bb770634960..9333a2af998c 100644 --- a/sys-fs/ddrescue/Manifest +++ b/sys-fs/ddrescue/Manifest @@ -1,2 +1 @@ -DIST ddrescue-1.27.tar.lz 93496 BLAKE2B a8957819dec2255e446504c822331ae13a86193f4655cbe6d559a498db9daf8c0f8066355e395cfd44f08b2f15d831820003bdfde6fc59c8434a695f95bdbe21 SHA512 b9a8b462536c5ec29db69e3a5f70b0bce160d5c58373cb519f6d54aba2fc0c4907e74fbcd11d49291306dc29c76f1992575aef7cfff41f34748bbd96e33b745a DIST ddrescue-1.28.tar.lz 93823 BLAKE2B 8c212f0d495e0df8e0398b97730c812ea9ccb77bd42e730198222e9918e3652fc52d932449b1e0dc9bdd453a123e2450c962e33e98d9845ce81b9a934a5bbdaa SHA512 ad3df2361b3b0228e2875792e0f6b301dc4d9cefd3f4fcdbce180a53c32924ee026bd27397b8efc94f40ee10f5f9d453fa72bd19203b6cb90208881e287e2c46 diff --git a/sys-fs/ddrescue/ddrescue-1.27.ebuild b/sys-fs/ddrescue/ddrescue-1.27.ebuild deleted file mode 100644 index 8bf8cf8643e1..000000000000 --- a/sys-fs/ddrescue/ddrescue-1.27.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic unpacker - -DESCRIPTION="Copy data from one file or block device to another with read-error recovery" -HOMEPAGE="https://www.gnu.org/software/ddrescue/ddrescue.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux" -IUSE="static" - -BDEPEND="$(unpacker_src_uri_depends)" - -src_configure() { - use static && append-ldflags -static - - # not a normal configure script - econf \ - --prefix="${EPREFIX}"/usr \ - CXX="$(tc-getCXX)" \ - CPPFLAGS="${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_test() { - ./testsuite/check.sh "${S}"/testsuite || die -} - -src_install() { - emake DESTDIR="${D}" install install-man - einstalldocs -} diff --git a/sys-fs/ddrescue/ddrescue-1.28.ebuild b/sys-fs/ddrescue/ddrescue-1.28.ebuild index 0ba725b13aff..8078214b0f51 100644 --- a/sys-fs/ddrescue/ddrescue-1.28.ebuild +++ b/sys-fs/ddrescue/ddrescue-1.28.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux" IUSE="static" BDEPEND="$(unpacker_src_uri_depends)" diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r7.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r7.ebuild index 9b4b3388e2d2..8cde1ac36db2 100644 --- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r7.ebuild +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r7.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}/${MY_PV}/${PN}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="intel-led led mini static" RDEPEND=">=sys-fs/lvm2-2.02.45[lvm(+)]" diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild index 7cb014173b17..5a0b8a79dbd7 100644 --- a/sys-fs/dosfstools/dosfstools-4.2.ebuild +++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}. LICENSE="GPL-3" 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="compat +iconv test" RESTRICT="!test? ( test )" diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild index 3bf3b866da64..3450bc2f5860 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cron fuse nls static-libs test +tools" RESTRICT="!test? ( test )" diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild index 4853a3a74bf5..c3852f07fa8b 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 ~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 )" @@ -113,6 +113,10 @@ multilib_src_configure() { } multilib_src_compile() { + # Parallel make issue #936493 + emake -C lib/et V=1 compile_et + emake -C lib/ext2fs V=1 ext2_err.h + if multilib_is_native_abi && use tools ; then emake V=1 else diff --git a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild index a44748716942..967da0358108 100644 --- a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild +++ b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" src_install() { default diff --git a/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild b/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild index 60000fa9c1c7..f0a75f33bad1 100644 --- a/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild +++ b/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" src_install() { default diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild index 24a35a00a404..502d109228b8 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.2.4.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" diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild index 24a35a00a404..502d109228b8 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.2.5.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" diff --git a/sys-fs/fuse-common/fuse-common-3.10.4.ebuild b/sys-fs/fuse-common/fuse-common-3.10.4.ebuild index 8fd9d127f571..663e4c8549f6 100644 --- a/sys-fs/fuse-common/fuse-common-3.10.4.ebuild +++ b/sys-fs/fuse-common/fuse-common-3.10.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${ LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" BDEPEND="virtual/pkgconfig" RDEPEND="!<sys-fs/fuse-2.9.7-r1:0" diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild index 22434af0ade1..6cfc3a780505 100644 --- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild +++ b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" IUSE="suid" RDEPEND="sys-fs/fuse:0" diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.4.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.4.0.ebuild index 7e1430ddb19b..419efa5ef131 100644 --- a/sys-fs/fuse-exfat/fuse-exfat-1.4.0.ebuild +++ b/sys-fs/fuse-exfat/fuse-exfat-1.4.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" IUSE="suid" RDEPEND="sys-fs/fuse:3" diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index 59c692404d23..44214881f131 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,2 +1,3 @@ DIST fuse-overlayfs-1.12.tar.gz 99684 BLAKE2B e7ef075c043738d506efcf973ecef7eb321e9f2b2812b318a4087d2a913f022240ed4b0d46e47463daff6976dd99fb587a5819a22c7e58dd52029930e92abffc SHA512 f113ac20b389d2f1c5e5ff160a60c308017e74c9c85d74a7200bab81a4cfa30335a64740c173f17c91ab4feddffb138ca4378e92894645a67eea5ac73d42890f DIST fuse-overlayfs-1.13.tar.gz 99775 BLAKE2B 7a0643a5ef029db7f3d1009e9dd4e7a647bf936205723fc3656dfd6d14d622e98f9df15590783492f056ab3f151fd658b6fe65f7177f9499532d02411138ac7c SHA512 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b +DIST fuse-overlayfs-1.14.tar.gz 102564 BLAKE2B 9c4960bb82be68d545989adffda3c95d06a809692827ad2cf6e0eaa646860bb49ba2e91af88f634740714acb75f2f154b3781cfdd154003d4976e8cc123ed797 SHA512 e0c50abffb7b71248ed4d7b8663f21bab4bf358682dece3a0c9f1480f142532471e139f041759dd8bd24807c7369537a5d86efc01617a17172463bd1c3870623 diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild index 4bbe7b857e53..3178b8e1c7a8 100644 --- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> $ LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv" DEPEND="sys-fs/fuse:3" RDEPEND="${DEPEND}" diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild new file mode 100644 index 000000000000..c235a29f536f --- /dev/null +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild @@ -0,0 +1,27 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="FUSE implementation for overlayfs" +HOMEPAGE="https://github.com/containers/fuse-overlayfs" +SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" + +DEPEND="sys-fs/fuse:3" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + kernel_is -lt 4 18 && eerror "Linux Kernel > v4.18.0 is required" && die +} + +src_prepare() { + default + eautoreconf +} diff --git a/sys-fs/fuse/fuse-2.9.9-r2.ebuild b/sys-fs/fuse/fuse-2.9.9-r2.ebuild index 93b3e2a8d0d4..79723ce8723c 100644 --- a/sys-fs/fuse/fuse-2.9.9-r2.ebuild +++ b/sys-fs/fuse/fuse-2.9.9-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2" LICENSE="GPL-2" 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples static-libs" BDEPEND="sys-devel/gettext diff --git a/sys-fs/fuse/fuse-3.16.2.ebuild b/sys-fs/fuse/fuse-3.16.2.ebuild index 2997ce0cf204..c839a828a712 100644 --- a/sys-fs/fuse/fuse-3.16.2.ebuild +++ b/sys-fs/fuse/fuse-3.16.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+suid test" RESTRICT="test" PROPERTIES="test_privileged" diff --git a/sys-fs/genimage/Manifest b/sys-fs/genimage/Manifest index 765e3a0efa63..9ed8a66b2ba0 100644 --- a/sys-fs/genimage/Manifest +++ b/sys-fs/genimage/Manifest @@ -1,3 +1 @@ -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 diff --git a/sys-fs/genimage/genimage-16.ebuild b/sys-fs/genimage/genimage-16.ebuild deleted file mode 100644 index 4becc18f6212..000000000000 --- a/sys-fs/genimage/genimage-16.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# 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/genimage/genimage-17.ebuild b/sys-fs/genimage/genimage-17.ebuild deleted file mode 100644 index 4becc18f6212..000000000000 --- a/sys-fs/genimage/genimage-17.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# 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/genimage/genimage-9999.ebuild b/sys-fs/genimage/genimage-9999.ebuild index 498034c2ce2a..4becc18f6212 100644 --- a/sys-fs/genimage/genimage-9999.ebuild +++ b/sys-fs/genimage/genimage-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then 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" + KEYWORDS="~amd64 ~arm ~arm64" fi DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree" diff --git a/sys-fs/growpart/growpart-0.0.32-r1.ebuild b/sys-fs/growpart/growpart-0.0.32-r1.ebuild index a2d6df9f568d..1ac1e2ea3b99 100644 --- a/sys-fs/growpart/growpart-0.0.32-r1.ebuild +++ b/sys-fs/growpart/growpart-0.0.32-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ S="${WORKDIR}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" RDEPEND="sys-apps/gptfdisk" diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild index 4ec1f3ba3c98..8c85d64bfc29 100644 --- a/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild +++ b/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="static" LIB_DEPEND="sys-apps/util-linux:=[static-libs]" diff --git a/sys-fs/lsscsi/lsscsi-0.32-r1.ebuild b/sys-fs/lsscsi/lsscsi-0.32-r1.ebuild index 1007c26f9bac..e51ca4e91676 100644 --- a/sys-fs/lsscsi/lsscsi-0.32-r1.ebuild +++ b/sys-fs/lsscsi/lsscsi-0.32-r1.ebuild @@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" diff --git a/sys-fs/lvm2/lvm2-2.03.21-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.21-r1.ebuild index 83c4b4bbc058..5db75e4d886e 100644 --- a/sys-fs/lvm2/lvm2-2.03.21-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.21-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}" LICENSE="GPL-2" 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind" REQUIRED_USE=" static? ( !systemd !udev ) diff --git a/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild index 2a2c7314d210..525b2fc69873 100644 --- a/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}" LICENSE="GPL-2" 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind" REQUIRED_USE=" static? ( !systemd !udev ) diff --git a/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild index 5b95dd0b2940..e0a1e2d36d8c 100644 --- a/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind" REQUIRED_USE=" static? ( !systemd !udev ) diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 94edd76b41ce..a3f15d173fec 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -1,6 +1,4 @@ DIST lxcfs-5.0.4.tar.gz 104249 BLAKE2B 83a7b861136c34da8a24dd525fd0767193f2bbd92b40e3b9fd5e42d7645465411792e65e95797ab13b33330299d12b19bdd5786352875ed88ac0097b72b711a9 SHA512 b404045dbabe23e1d1f1d74c1648d2596bb70aaa9f9e46f9f5635b0a02d0c451f68b2559920bbefc5b889e908cf1da0a33c148b26bdce3e45c3d0cbdff710604 DIST lxcfs-5.0.4.tar.gz.asc 833 BLAKE2B aff883d24b374b296ea3678670e5e82c723fd0e35cfd7fed555aabbd811a104becc0b741331b4aa4a5129c9fff4dc88c6a86e7d64a89fe86aea81718f5d432dd SHA512 56b639597dbaf3008fe030147ea37192bd465c467a79e11ce139bcaa6bca1625b4bb9c4eda6ea1877446769f0fad9b4c5a3513d4f4415b841db96d5da8325ddc -DIST lxcfs-6.0.0.tar.gz 103369 BLAKE2B 9261ab7d932d315117361a548372930c37129d3c1b3d5aa00bbce6bac923a94e69b0fa223632b1ef22938b047e6ebec7416cf187e76c72680e4d86db173d199a SHA512 fab5569da66a742a51c9f249c3f0256d1ea17dc0a1e7c2d5563d993cd0d236ae664a53809e65fbec2467f5d255dfd867327a28d9465ffe180d240ca131331c59 -DIST lxcfs-6.0.0.tar.gz.asc 833 BLAKE2B cfc6a8e574aeb1c9e3fec322df5254c431878f0109ea43ee1069e8213467ed16fedbe137befa47a2557d8c055591a9f00c99f221d482f715d5cdc678d79c5fa5 SHA512 019178b37045c3c2c4d8be7c417abb4ed8b7ce011bce805b220f6213d7940f164c45632a5ce02ea29451c8148f782d6b7ece7699da7f3ef7306bd437d40fe537 -DIST lxcfs-6.0.1.tar.gz 105761 BLAKE2B 87255711eccc9833cd321c5d606920edcbf87a2a380cb2993efeb08040e22ab6bda408429fe02b731e60b293da946c1c44f6aad6f82db871e49b2bfeb2c34172 SHA512 3e5ab8af0fd81b1b0ac83ce781b20a55c1c1277a01edbca07106534043a0070291331775b7fa4e1c005b54d24d690ad9abe9b208de749a70dcff853741d02fd4 -DIST lxcfs-6.0.1.tar.gz.asc 833 BLAKE2B b9a6655650f5720fce4bb2e9dcace2b1c3ec7f0b14b2b23014142a1fce2cd55b3ae7361e7ead9385893068ca9f18cef4151bfb223d005a4c810c5efc40b8fb7a SHA512 d795a18170027d33f94c2bf88d5ad4c6162e066f9a51d7eab79699cc3b04c058e8f1bf00a8242a233727dfae8888050b17cd96a3abb05d02e0da05298b6eb4c4 +DIST lxcfs-6.0.2.tar.gz 105748 BLAKE2B d6f5d74db46346a0c9fd365652990a79aec209910a698af40a6b30f2c28618f5a618e9dfb1ff6c11bc2b93b2da001dc110400cd121f71446a7184d7b617774de SHA512 4f01793495889f129dc97e140df7649ed1809bf52ad2f6e2786721b389a9a748e75987ea704529c40d76623b90030d9c0ee1e66338e7e1c24330e96118db5aa3 +DIST lxcfs-6.0.2.tar.gz.asc 833 BLAKE2B 47db49320a530c649174410c63a07214d003e68c1980274a6c08dcaf6c8ec3ab59a1e34fddfc78d881b5fbb1ea6720f807be1c6eec73822f878b79fd4a1a45c3 SHA512 564f47dbbc1ee8e718c2c740ae3c0a5574040509a0463434aa236ba2e945a23cf18014ac1d4668c7f3bd6ce656ca4120d464c130f6ceeb1e0fb22996675d8c5c diff --git a/sys-fs/lxcfs/lxcfs-6.0.0.ebuild b/sys-fs/lxcfs/lxcfs-6.0.0.ebuild deleted file mode 100644 index 2cdd634fb322..000000000000 --- a/sys-fs/lxcfs/lxcfs-6.0.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake meson python-any-r1 systemd verify-sig - -DESCRIPTION="FUSE filesystem for LXC" -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" -SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" - -LICENSE="Apache-2.0 LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" -IUSE="doc test" - -DEPEND="sys-fs/fuse:3" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - $(python_gen_any_dep ' - dev-python/jinja[${PYTHON_USEDEP}] - ') - doc? ( sys-apps/help2man ) - verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" - -# Needs some black magic to work inside container/chroot. -RESTRICT="test" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc - -python_check_deps() { - python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - # Fix python shebangs for python-exec[-native-symlinks], #851480 - local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) - python_fix_shebang -q ${shebangs[*]} -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}/var" - - $(meson_use doc docs) - $(meson_use test tests) - - -Dfuse-version=3 - -Dinit-script="" - -Dwith-init-script="" - ) - - meson_src_configure -} - -src_test() { - cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory." - ./main.sh || die -} - -src_install() { - meson_src_install - - newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs - newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs - - # Provide our own service file (copy of upstream) due to paths being different from upstream, - # #728470 - systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service -} diff --git a/sys-fs/lxcfs/lxcfs-6.0.1.ebuild b/sys-fs/lxcfs/lxcfs-6.0.2.ebuild index e90cf5629f5b..e90cf5629f5b 100644 --- a/sys-fs/lxcfs/lxcfs-6.0.1.ebuild +++ b/sys-fs/lxcfs/lxcfs-6.0.2.ebuild diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild index 271f26fff8bc..55ff5a471b66 100644 --- a/sys-fs/mdadm/mdadm-4.2-r3.ebuild +++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="static systemd +udev" REQUIRED_USE="static? ( !udev )" diff --git a/sys-fs/mdadm/mdadm-4.2-r2.ebuild b/sys-fs/mdadm/mdadm-4.3-r1.ebuild index 99bbc83b039d..65917537ec28 100644 --- a/sys-fs/mdadm/mdadm-4.2-r2.ebuild +++ b/sys-fs/mdadm/mdadm-4.3-r1.ebuild @@ -1,27 +1,27 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic systemd toolchain-funcs udev DESCRIPTION="Tool for running RAID systems - replacement for the raidtools" HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/" -DEB_PF="4.2~rc2-7" +DEB_PF="4.3-1" SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="static systemd +udev" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="static systemd +udev corosync" REQUIRED_USE="static? ( !udev )" -BDEPEND="app-arch/xz-utils - virtual/pkgconfig" -DEPEND="udev? ( virtual/libudev:= )" +BDEPEND="virtual/pkgconfig" +DEPEND="udev? ( virtual/libudev:= ) + corosync? ( sys-cluster/corosync )" RDEPEND="${DEPEND} >=sys-apps/util-linux-2.16" @@ -30,20 +30,29 @@ RDEPEND="${DEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188 - "${FILESDIR}/${PN}"-4.2-in_initrd-collision.patch #830461 + #"${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188 # upstream has it later in the list of includes as of 4.3. + "${FILESDIR}/${PN}"-4.3-in_initrd-collision.patch #830461 + "${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968 + "${FILESDIR}/${PN}"-4.3-ldflags.patch + "${FILESDIR}/${PN}"-4.3-no-udev.patch + "${FILESDIR}/${PN}"-4.3-musl125-1.patch + "${WORKDIR}/debian/patches/debian/0001-fix-manpages.patch" + "${WORKDIR}/debian/patches/debian/0003-host-name-in-default-mailfrom.patch" + "${WORKDIR}/debian/patches/debian/0004-exit-gracefully-when-md-device-not-found.patch" + "${WORKDIR}/debian/patches/debian/0007-no-Werror.patch" ) mdadm_emake() { - # We should probably make corosync & libdlm into USE flags. #573782 + # We should probably make libdlm into USE flags. #573782 local args=( PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" - CWFLAGS="-Wall" + CWFLAGS="-Wall -fPIE" CXFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" UDEVDIR="$(get_udevdir)" SYSTEMD_DIR="$(systemd_get_systemunitdir)" - COROSYNC="-DNO_COROSYNC" + COROSYNC="$(usex corosync '' -DNO_COROSYNC)" DLM="-DNO_DLM" # https://bugs.gentoo.org/732276 @@ -76,6 +85,11 @@ src_install() { mdadm_emake DESTDIR="${D}" install install-systemd dodoc ChangeLog INSTALL TODO README* ANNOUNCE-* + # install mdcheck_start.service + # needed for systemd units https://bugs.gentoo.org/833000 + exeinto /usr/share/mdadm/ + doexe misc/mdcheck + insinto /etc newins mdadm.conf-example mdadm.conf newinitd "${FILESDIR}"/mdadm.rc mdadm @@ -85,8 +99,8 @@ src_install() { # From the Debian patchset into /usr - dodoc "${WORKDIR}"/debian/README.checkarray - dosbin "${WORKDIR}"/debian/checkarray + dodoc "${WORKDIR}"/debian/local/doc/README.checkarray + dosbin "${WORKDIR}"/debian/local/bin/checkarray insinto /etc/default newins "${FILESDIR}"/etc-default-mdadm mdadm @@ -95,6 +109,7 @@ src_install() { } pkg_postinst() { + udev_reload if ! systemd_is_booted; then if [[ -z ${REPLACING_VERSIONS} ]] ; then # Only inform people the first time they install. @@ -104,3 +119,7 @@ pkg_postinst() { fi fi } + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild index f132d354e746..e503b5875f57 100644 --- a/sys-fs/mdadm/mdadm-4.3.ebuild +++ b/sys-fs/mdadm/mdadm-4.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="static systemd +udev corosync" REQUIRED_USE="static? ( !udev )" diff --git a/sys-fs/mergerfs/mergerfs-2.40.2.ebuild b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild index 12c52da625d1..a25fd57c4c17 100644 --- a/sys-fs/mergerfs/mergerfs-2.40.2.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.g # Vendorized libfuse that's bundled is under LGPL-2.1. LICENSE="ISC LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="+xattr" DEPEND=" diff --git a/sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild b/sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild deleted file mode 100644 index 11f67b814bad..000000000000 --- a/sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read" -HOMEPAGE="https://khenriks.github.io/mp3fs/" -SRC_URI="https://github.com/khenriks/mp3fs/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+flac vorbis" - -REQUIRED_USE="|| ( flac vorbis )" -RESTRICT="test" - -DEPEND=" - media-libs/libid3tag:= - media-sound/lame - sys-fs/fuse:0= - flac? ( >=media-libs/flac-1.1.4:=[cxx] ) - vorbis? ( >=media-libs/libvorbis-1.3.0 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_with flac) \ - $(use_with vorbis) -} diff --git a/sys-fs/mp3fs/mp3fs-1.1.1-r5.ebuild b/sys-fs/mp3fs/mp3fs-1.1.1-r5.ebuild index f8a75766501d..d2156c74df7b 100644 --- a/sys-fs/mp3fs/mp3fs-1.1.1-r5.ebuild +++ b/sys-fs/mp3fs/mp3fs-1.1.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/khenriks/mp3fs/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+flac vorbis" REQUIRED_USE="|| ( flac vorbis )" diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest index 4719fe93cf9b..b89a103ace37 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -1 +1,2 @@ DIST mtd-utils-2.1.6.tar.bz2 458333 BLAKE2B 799c19fbee1a690fa695edfa7e2ab1691e37fccb3f83685065e93b5ceea96e550eecdba4576b7d1a58a1b0ce06e3e551ee635fe9ed16521952fc85986f74ae6f SHA512 470902475b9e583d3a12801c1cab5492c671ec3ccf853cc3336c4e2b8771eac489d67b1414b9f1e827c42ebdba0fe2cdc681297477d67a796af04d81160442bd +DIST mtd-utils-2.2.1.tar.bz2 476562 BLAKE2B 81403a5c6a94ad9147cda56a3f821d6b46b2718d7b1e084aa5236802c22e6b75223c68073abdd35f2ceb8b4857880e923dd49274c6ba3e9fce0ec1a0314fef22 SHA512 ef1cf4d6fa5219b8bbe4728282d0d73fd3234c36743cdfb901908269632f55a7993fdbeb22cc2b6841add1a9f320c4504a42980f5856626e259401e8e2f17f7d diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml index 85989de1c9ac..1a40eb3fdbdb 100644 --- a/sys-fs/mtd-utils/metadata.xml +++ b/sys-fs/mtd-utils/metadata.xml @@ -12,4 +12,7 @@ <upstream> <remote-id type="cpe">cpe:/a:mtd-utils_project:mtd-utils</remote-id> </upstream> + <use> + <flag name="ubifs">Build UBIFS tools</flag> + </use> </pkgmetadata> diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild index b3cd6fa4e221..ba87d410b5ae 100644 --- a/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild +++ b/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="+lzo +ssl test xattr +zstd" RESTRICT="!test? ( test )" diff --git a/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild new file mode 100644 index 000000000000..cedbe3c1639e --- /dev/null +++ b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" +HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary" +SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="+lzo +ssl test xattr +zstd ubifs" +REQUIRED_USE="ubifs? ( lzo ssl xattr zstd )" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-apps/util-linux:= + sys-libs/zlib:= + lzo? ( dev-libs/lzo:= ) + ssl? ( dev-libs/openssl:0= ) + xattr? ( sys-apps/acl ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-util/cmocka )" + +DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README ) + +src_prepare() { + default + sed -i '/if test.*then/s: == : = :' configure || die +} + +src_configure() { + # --with-tests is for test programs that are installed; was --enable-tests in earlier versions + local myeconfargs=( + --with-tests + --with-zlib + --enable-ubihealthd + --with-lsmtd + --with-jffs + $(use_enable test unit-tests) + $(use_with lzo) + $(use_with xattr) + $(use_with zstd) + $(use_with ubifs) + $(use_with ubifs crypto) # UBIFS-specific crypto support + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + doman \ + jffsX-utils/mkfs.jffs2.1 \ + ubi-utils/ubinize.8 +} diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 139158789bc5..5623d72c5317 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,3 +1,4 @@ DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811 DIST mtools-4.0.43.tar.bz2 443673 BLAKE2B d000839bbb6bc647eb5a32b08b40b1350cd0a85fd564f0705ecbfe20f8f4ef21bf2d59cd0ccd7a159c829c019c6c2f3cbdef82ff3f4a9e8828cc13d44ddabd1d SHA512 b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410 DIST mtools-4.0.44.tar.lz 389267 BLAKE2B 1a6a9d257fc07cf27280a535feac873d27690fb02114b293e31d7c8441de6bbdbd57a13f4ba62ce5a5093cd45683776dd8e61ac822b1d3d44eb98cd21f7b9088 SHA512 8977f43b1cd25a0d1052f9f8f140d73d432bd49a7a4737d0b743a9f8ccec5aff6bbbdc07455011ecc49038b1b1dfd6908dda8c46d06389b1511875f9bc654f84 +DIST mtools-4.0.45.tar.lz 389733 BLAKE2B bb23b310fea5d10e5f0c0ed543e0f8cbac9ba4177128419b6e05fb4a06896a64ddccb27c932eb41c339a0167706e729c2f209837874fe4ac4d165a534802031c SHA512 dd5869fee6f376deab2beb3d5168045a6abc7bbfdea35a274369420c99771ee89477629364a8c677dfba56e0df5c7d2760b6cbfba2d425a89a7b8c21f2b6e538 diff --git a/sys-fs/mtools/mtools-4.0.42.ebuild b/sys-fs/mtools/mtools-4.0.42.ebuild index affe33edeb48..7ced3a0a5905 100644 --- a/sys-fs/mtools/mtools-4.0.42.ebuild +++ b/sys-fs/mtools/mtools-4.0.42.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" 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 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris" IUSE="gui" RDEPEND=" diff --git a/sys-fs/mtools/mtools-4.0.43.ebuild b/sys-fs/mtools/mtools-4.0.43.ebuild index 1ed92576168b..525c9a7b8aa5 100644 --- a/sys-fs/mtools/mtools-4.0.43.ebuild +++ b/sys-fs/mtools/mtools-4.0.43.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" 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 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris" IUSE="gui" RDEPEND=" diff --git a/sys-fs/mtools/mtools-4.0.44.ebuild b/sys-fs/mtools/mtools-4.0.44.ebuild index ff718fe08490..ada3bde4563a 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 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris" IUSE="gui" RDEPEND=" diff --git a/sys-fs/mtools/mtools-4.0.45.ebuild b/sys-fs/mtools/mtools-4.0.45.ebuild new file mode 100644 index 000000000000..95a421fafd18 --- /dev/null +++ b/sys-fs/mtools/mtools-4.0.45.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic unpacker + +DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them" +HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris" +IUSE="gui" + +RDEPEND=" + virtual/libiconv + gui? ( + x11-libs/libICE + x11-libs/libXau + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${RDEPEND}" +BDEPEND="$(unpacker_src_uri_depends)" + +src_configure() { + if ! use elibc_glibc && ! use elibc_musl ; then + # bug #447688 + append-libs "-liconv" + fi + + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/mtools + $(use_with gui x) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + local -a DOCS=( README* Release.notes ) + + default + + insinto /etc/mtools + doins mtools.conf + + # Default is fine + sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die +} diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 4be7fb5a794c..8a61ea0267a9 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,2 +1 @@ -DIST multipath-tools-0.9.7.tar.gz 570416 BLAKE2B ed3f47d648685f691a69d83ad36f39b279f3a5b1cf1cb15151841ea26d629df3a33ab9a186bbf6922264805cc3bc37d09f22e611215f1972e33b26e08ff71bc2 SHA512 0f4c97179a3de5a0c77893fec229eb183293fed8e5e01a9945b261845ccf5d13f8ef2c2ff0c17c9345217d236275caed4765422ec95aed80821f11658bf96e26 DIST multipath-tools-0.9.8.tar.gz 580531 BLAKE2B 66bc6b78795c08b4fe5f4bc718330be51b073dddb597998f384ccaf746c0b9e53e21d674623df03ed7f9ccd9800fe988add8068e0eaaeace076c00395453ba0a SHA512 4d73bcf6bce769a829c306c609b206ddba65a708620f458106e406dd18d12f9a9d97f400662daa8e6a75c9fdf7decb6dcbda92cb807b6c53522c7b4b2795b627 diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch deleted file mode 100644 index 0210563bd7c0..000000000000 --- a/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fc8b102c666d7fbad9242dea43a64941399a1c0d Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Tue, 16 Jan 2024 20:19:11 -0500 -Subject: [PATCH] multipathd: fix null pointer dereference in uev_update_path - -The Auto-resize code added a check that deferences pp->mpp without -checking that it's non-NULL. Fix it. - -Fixes: 981b83ad1 ("multipathd: Add auto_resize config option") -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> -Reviewed-by: Martin Wilck <mwilck@suse.com> ---- - multipathd/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/multipathd/main.c b/multipathd/main.c -index 74f6cd92..fbc3f8da 100644 ---- a/multipathd/main.c -+++ b/multipathd/main.c -@@ -1630,7 +1630,7 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) - } - } - } -- if (auto_resize != AUTO_RESIZE_NEVER && -+ if (auto_resize != AUTO_RESIZE_NEVER && mpp && - !mpp->wait_for_udev) { - struct pathgroup *pgp; - struct path *pp2; diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild deleted file mode 100644 index af967fb2c612..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info systemd tmpfiles toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" -IUSE="systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - sys-libs/readline:= - >=virtual/libudev-232-r3 - systemd? ( sys-apps/systemd ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) -" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.7-remove-Werror.patch - "${FILESDIR}"/${P}-null-pointer-dereference-in-uev_update_path.patch -) - -myemake() { - local myemakeargs=( - prefix="${EPREFIX}" - usr_prefix="${EPREFIX}/usr" - LIB="$(get_libdir)" - RUN=run - plugindir="${EPREFIX}/$(get_libdir)/multipath" - unitdir="$(systemd_get_systemunitdir)" - libudevdir="${EPREFIX}$(get_udevdir)" - GENTOO_CFLAGS="${CFLAGS}" - GENTOO_CPPFLAGS="${CPPFLAGS}" - FORTIFY_OPT= - OPTFLAGS= - FAKEVAR=1 - V=1 - ) - - emake "${myemakeargs[@]}" "$@" -} - -src_prepare() { - default - - sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ - "${S}"/Makefile.inc || die -} - -src_compile() { - tc-export CC - # Breaks with always_inline - filter-flags -fno-semantic-interposition - # Breaks because of use of wrapping (-Wl,-wrap, wrap_*) - # https://github.com/opensvc/multipath-tools/issues/18 - filter-lto - myemake -} - -src_test() { - myemake test -} - -src_install() { - dodir /sbin - - myemake DESTDIR="${ED}" install - - einstalldocs - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild deleted file mode 100644 index 6e3559c6b390..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info systemd tmpfiles toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" -IUSE="systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - sys-libs/readline:= - >=virtual/libudev-232-r3 - systemd? ( sys-apps/systemd ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) -" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.7-remove-Werror.patch -) - -myemake() { - local myemakeargs=( - prefix="${EPREFIX}" - usr_prefix="${EPREFIX}/usr" - LIB="$(get_libdir)" - RUN=run - plugindir="${EPREFIX}/$(get_libdir)/multipath" - unitdir="$(systemd_get_systemunitdir)" - libudevdir="${EPREFIX}$(get_udevdir)" - GENTOO_CFLAGS="${CFLAGS}" - GENTOO_CPPFLAGS="${CPPFLAGS}" - FORTIFY_OPT= - OPTFLAGS= - FAKEVAR=1 - V=1 - ) - - emake "${myemakeargs[@]}" "$@" -} - -src_prepare() { - default - - sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ - "${S}"/Makefile.inc || die -} - -src_compile() { - tc-export CC - # Breaks with always_inline - filter-flags -fno-semantic-interposition - # Breaks because of use of wrapping (-Wl,-wrap, wrap_*) - # https://github.com/opensvc/multipath-tools/issues/18 - filter-lto - myemake -} - -src_test() { - myemake test -} - -src_install() { - dodir /sbin - - myemake DESTDIR="${ED}" install - - einstalldocs - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild index 6e3559c6b390..e85965ca2f8d 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.9.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="systemd test" RESTRICT="!test? ( test )" diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest index 9fbeef410e50..f4cab492aa89 100644 --- a/sys-fs/ncdu-bin/Manifest +++ b/sys-fs/ncdu-bin/Manifest @@ -1,19 +1,3 @@ -DIST ncdu-2.3-linux-aarch64.tar.gz 286044 BLAKE2B 12961a4ddfef4b240d0a379b8efa733e104d5179645f57512a68ff4e523c002085cdcff3b8533c7575c9201c0f9aa4063227b3953f7a9826f2cdcd6604e9f36f SHA512 6b37d1b9f9ccc18eac118cd94faf808a7173111157f0e06c97de73c349ee4a853bc832b7f8b3e5d116862f93987278504781c36431106a9bb870cf64f428c8f0 -DIST ncdu-2.3-linux-aarch64.tar.gz.asc 833 BLAKE2B cee39dbf98a17f678a6335a86e310291a957de5083818bc266e1e4ba3a562e3f3a0afb666b15b0c10348dab3214d8c02bc55f7d0d134d67673d7d781df51d389 SHA512 1b98c7d673e0a1b1467aba4699ad217388e95e1bb89200ccf59a567cf0512d3d46a067798a8ece55ca76e66c1712748843540d0c1441331e07117dfec533edbc -DIST ncdu-2.3-linux-arm.tar.gz 281221 BLAKE2B aa381e1d227689430168cc0eb7c762556da733b246fedb26b5adaee94f5c141a1dfdafa11518babfdad3c5c8a8040a6f6e398d78357935ed36df4dc027c8a492 SHA512 336e898ec393ae3d2d962b60083d1214fff32da0204d9aed52894488681ff11b223afdfb089d528d679da73e8580da25b3a857dcce9a2c6799ce9a4e6c4643d5 -DIST ncdu-2.3-linux-arm.tar.gz.asc 833 BLAKE2B ea3b427a516a0edf06dd29ec93df04daaa2e3a0659ad357370b58e95977d6ac881ea8104646f9a82b9905af12d18c3f51bba17f2a9d3b6db5b208050581d0ea8 SHA512 d5f484da3d45a52d97f65e25f4bbcfac3500b8871eceb4b5f5d2a8eda7e3f4b175cea544ba56ff4a7e86de7dfe4ccc054979f3755c1ca87b72b12e851cb12a1a -DIST ncdu-2.3-linux-x86.tar.gz 315771 BLAKE2B 10319febbb8cd9c88e0c0677eb53be9a9340106c542b9b7e888944ada52ccb9371b38aacac4d8374bd1c150cfa9939fcda20c5513885015569328fdfd5e69f78 SHA512 c77dd79d13b428d2c85f5a73b3638b6e71229fe924e6d4a3beb9b4765febbcb1d0c29e816fa3354b0e2c0b88c599b2f1fd03eeb87a73cccd296a2fb0225e0d98 -DIST ncdu-2.3-linux-x86.tar.gz.asc 833 BLAKE2B b4dcb755252287556019f15677b02922a0597baa20c176c105a4a47831b82365ee88d82f2f807dda43ce3c25e07e6510b96867e4b2fc2db4eab7b91af9ddc703 SHA512 e618db337ab4afa9dcd0cc743430af3ff17393d9cde9d1623667767e15b32d97310664507dbcc783008d5bb9842c6a6474c21bfce08a19241e5992da863840ea -DIST ncdu-2.3-linux-x86_64.tar.gz 293280 BLAKE2B 871f9c1f6860d83fe3c8ad8e7ffd2157389427b98d3232aaffc9ce983c4b98b9d562d39e94adb667ffaa4745aa4fb1caedd1f9f9b3ca5a756db922a8229f22b7 SHA512 9a1c17a971dc422342e5f42d4f6be4195239411bd529f81d0b0225bdef27e3112561cb1b8c699fb805bd766fb074fc0d93331d83af79d95235533899ac90de5a -DIST ncdu-2.3-linux-x86_64.tar.gz.asc 833 BLAKE2B 85d09c438c3a51fceb0e81252ccd184e3b7b7a1770c423b61efceb3728b1bfa68c26ef852084231a6fbd88d147ccaad655135007cdd8d850bb34aede465c3ab8 SHA512 a130f2f4d623cff7f0256437443fcdf8c0fc073f6c7bd27cc924e3a464dea5ea17f717cc2c700bc67356578d4e7eab342c444926cb14a6610f6e9be329d781f7 -DIST ncdu-2.4-linux-aarch64.tar.gz 278214 BLAKE2B 77429a554b05b1873012817c917b282f78fb3946d1521aa3a1c90362db1c4bfc9f8355e87b46dc795effb46312fa81297ec0b4777bcfb8f54a40df556c884b8f SHA512 3caaae21f4de4185da01ab55d466a2fb4321608ffed044688240a590a53753473719050777d48015703914769b7c60b59d2b218e96fd3f7c7655f5315b8daf96 -DIST ncdu-2.4-linux-aarch64.tar.gz.asc 833 BLAKE2B e00328f455a31fc4b5915afca6a98e3817ae94f92e7e4eca0655dc4db6dda3fdeb9d7aa6a5b6e20c9f39cba12cb9666ae3462e4f0caaef5415112afa80e6a602 SHA512 9b5a4b55afaf541763e9992a6f15de18cc7cb52b8004e3833b5e75ec0e79787c3693e924b326451caa6c9014d7c3b49eeed36eb9c120ca4aec96f5af9a8d94d6 -DIST ncdu-2.4-linux-arm.tar.gz 273717 BLAKE2B 599fdd716d72009d01e2b9f3022440760772471ebcd75e15c43eff382fa178065154e5d58710f6d16cff02a75f18f7d82239cd43da9d448f14a3fcb43c9353f1 SHA512 70a48564480d861ff3ea4be5bed650163444d34b1e7ed834f0d769e90fea3b69df8c3348273efe34f3fc052384288effad1ed69ff6b995afa92fc930a9f39f0a -DIST ncdu-2.4-linux-arm.tar.gz.asc 833 BLAKE2B 1af1cd305e86bce890e527dd50673e6d4572cf7983be249ed6d9ded97927b14045a46f20dfee54029a821e9a4754190074dcef6ec1ba523ab68a804b744551eb SHA512 b2bb42714cb1c07916581702b83cc64db663b0bc6342549d5350213beab608307ab34ace0cc8fab9bb9a0949a044cf3d9a46e39813046ff7f50735dc785d8ea1 -DIST ncdu-2.4-linux-x86.tar.gz 297477 BLAKE2B 2d1b7d4b775bfdfc7c0563d40ecbbd0a6d91ef40a49093c6c732d5cc07d5046cb295271d4552cb9ed629646f6dccd4a41c1ce3077b82f8e143e40027c42c51cf SHA512 f52878e302448a10e5720bc572dcb981a8be63b7b4e81c1e03371d89e0fb4075e2c9e2eacd3d6d2a173ed07ec2dd0d4a3d27660bd0f3038884262e2797e602f8 -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 @@ -22,3 +6,11 @@ DIST ncdu-2.5-linux-x86.tar.gz 299610 BLAKE2B 0f644a185de2bc12a7714dec5f5269dad1 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 +DIST ncdu-2.6-linux-aarch64.tar.gz 365642 BLAKE2B 721841435e89ea747db547a781a6bf277dde3fdb20231774b658ba3282b211010f672be9d7aa1f4d4d12bbf7e2e22e96859379c34108a43aab52da8bb47dd7da SHA512 f56622e2b3697129b4b12d5429bdb2f5b1ee175977952a532f6cea0ea0e85c8a6f036b247a3e6f28da5da3d568a8554ad39921238261519bd6953b8b1878a6af +DIST ncdu-2.6-linux-aarch64.tar.gz.asc 833 BLAKE2B c025836c1b4cf30e02d8b4e12df33d4bee638372a79511f0337529b48b3d1943756cc81cfaaf4bd81fc68432e7d6c8c2778e314dcd8725e087350474c80085be SHA512 443607b81a97a2f1a3b59630c0638c67d91688e87a67d67c0616412e4898802bc1bd1695f2db761b55a4e1de11014aaaabad9e6ed4c6fd8703b922ebb23c1415 +DIST ncdu-2.6-linux-arm.tar.gz 366584 BLAKE2B 3cd6c34ab8a4089e9e15e80dd4983a8693a6fd65c2b6651fa2a52990455eb1c0c02b83e7ff399a9041f59c99634342c6830db72e09cbe7a3c6881abcc9729aef SHA512 5e673a49c454a37871c097bbe19e6cb990b3099bb7f0c97c75e39791e48127233e58db708aa1d022778f9b67966bc03eb29ed60cd532ca16434fda5fd6ff56be +DIST ncdu-2.6-linux-arm.tar.gz.asc 833 BLAKE2B db6ef016e69f0b4366e22106a646d9af33002ffd7e14d75a1a43b622f0bdec7e3c01546b0d633d7a362d781522bd0d9b32dcd57d24760b2ee1f9a1cfb4897518 SHA512 10f81f2e23074a279b648da9e241c256f9dacdc9dd1b093ccf44ad1c15e0cbd0e8f5befe290ab9ee794d2bebdec32191e49bddc77f60f74c32b875f1f02ed8c2 +DIST ncdu-2.6-linux-x86.tar.gz 363591 BLAKE2B fe2aa16b151c9a61a000f8fa860410bc91d7cbbd26631cd51c93db1d7c5268c7f90873771143f508494cec243c941904b2ec7d08e16ea27008203ffc8f9b5a96 SHA512 07ae22a19f88021fbf2bc07fc346e0b80915ca70ebd1ad8d29c53e4306e300fea24ad9c132fc18d15c3a10105b53409a93a61742e064367989c9bd6d9527947e +DIST ncdu-2.6-linux-x86.tar.gz.asc 833 BLAKE2B 4391519e861694752c0fc3d72fb3ca5f19f45663cc0061d72924be4e145f024385fcfa24627458a175eaf45067bb43a2ee9c46a3e99de1b69f24a63bfafa6d7f SHA512 b6ff15431462f89ba03cc6bc1c21178956a48ac2535b1fa62f6edf4244c5b704ecf1e80735747a19a72ba3dc6e21f583eb15715959e16221feb6633926763aad +DIST ncdu-2.6-linux-x86_64.tar.gz 348874 BLAKE2B 0cbbf2f4ce109e0f0c7aeddec044de86854facdc94153e04e11519d4c5d4d6af534678dea8ab1b343abc0cd681f5e29e9a9c3b04c104ef3405c7fcae8fba5556 SHA512 fd7a284165ffc19c7a3fabcad28ab17b30ed4d3117d045ca34fa144432d6a8fb051ebc9e4647a3ba8b1e3979864bd49924d0f3d9e9546b7bc19d99b8ba560ca9 +DIST ncdu-2.6-linux-x86_64.tar.gz.asc 833 BLAKE2B d05e8c3a277c6c7e9d6a23db47b333cc712d8a2d33c31864d669d6993b55e9cf1b314539bf3a3f4d523346b919c4cb5678ab26170ad4d7b6a2ed8ba14f73eb94 SHA512 d51c5cf8716cc3ceb4922625bca98308772f63cde88ce24a12e9f3ab0e631edf9452c64019b42d9de164f796401b7cc3a91a20683f484df5f00a13652fb6b30d diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild deleted file mode 100644 index 557f5c9250f3..000000000000 --- a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2022-2023 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-bin/ncdu-bin-2.4.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild index 76fc2f6bba95..76fc2f6bba95 100644 --- a/sys-fs/ncdu-bin/ncdu-bin-2.4.ebuild +++ b/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest index f88a58eadaf0..3609e01cf375 100644 --- a/sys-fs/ncdu/Manifest +++ b/sys-fs/ncdu/Manifest @@ -1,10 +1,6 @@ -DIST ncdu-1.19.tar.gz 159917 BLAKE2B 0f2022c031b4e00129525c0f4f800ed8feb8d3de3ae2c4baf06050886fb16ad4381c5439b64868abfdb66907d36e38a87ec3c8ddcd16f756da75439dc08ae6e6 SHA512 2bbfe2bab101f92674e13bef5260a39b32c127a310ae59c045f3684aaa8dab6f767c0162dc8f868d8adfaa17d597d0b3d2c134fe97bbaf205da0f8272e96c5d6 -DIST ncdu-1.19.tar.gz.asc 833 BLAKE2B ede22114375b31deb9a00de55982f145a1d1eaa911ef205e3c1a61a6382a9ea9d42977b5c1c41e3aafbfaec29e473d0ed428bb50f2e3cf799e204415b0ad2bf7 SHA512 2fb0d23c59b4f98b0080617792853de08380f769de13398f7649c082de330a4c917b6bbd846e3175f20eadbc9e4acf03d959ab828e3707ef1a9992be40b2b4ce DIST ncdu-1.20.tar.gz 150835 BLAKE2B 0bb6576ecbb3df281c67a48409db2118521760f378defd9c082f732519c9828451b77897ca49e777674ae73a5aac0fd975b94d5a95b1689cd552b5840ac3b5de SHA512 af9a45cc27bb3cdee7fd65236b9b48cb604f9e54208a762ed7b3b18333e07e87a8ae5a4cd0071496e7e382c60a7760734cad1f68fb69423a79fa3f050d2c09bb DIST ncdu-1.20.tar.gz.asc 833 BLAKE2B 487e3b4b1e83a2211e91307ff1ca1778059cc3f923e04b57bc5d4780d0108589a062861a25bafa58c357ad4495edce814a58eeb24087e06b958d8e23a02bbf22 SHA512 168bcc4255bbb7a576af39422797804726f84134dc342f59abfc825f93c5ee4e9fcaa9e0c18626ee87b96b2d19a7c57beaa8e1b3dc57eff2bd659add18027140 -DIST ncdu-2.3.tar.gz 56608 BLAKE2B 9fd73fba83c57195f8ffbad5b954140a776d1cd1d7b3e458f832255ee9c07eb8af9888a23ed3c671f508d6ba3795e2361f79e64b4b24630d744470efc5bfaded SHA512 283f78761b225883e090c4d0d1325bffc70049477087df3e8d1afcebc3136930c2636b2bba4aa6e43d53626668519c26a1528ba5c75489d3b5924e8974184e47 -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 +DIST ncdu-2.6.tar.gz 72088 BLAKE2B 21d45bb428a56a040083165b9d467a526cd83eaa05b6f88b90a0b5dac0fa70dc4fd7e37ff52debc619b06103a95dad8ddc26fc9e77b6118eeb39aa97bfa0fd0e SHA512 e94612a56db3831d993d6ffd8c69a4cc2418ebf4b9a810e28444c103225ccc1f53ae31e448b94d40ccf2ab7d3a0af6e8ee02bc700123aca872b3bb35108e3d14 +DIST ncdu-2.6.tar.gz.asc 833 BLAKE2B 110bbb6e2db221316004d4491f174c40cdf8fca44e91290f7ea87fc6788de20c3fd6d90bd4b55e4e720736514509af87bcc5b6533b37a2889e20c023939776e6 SHA512 478afe4a51244bc11dfbea2c12fb217392186c1efe1403b44309e0f0e3d431393173282ebae32ceeca32f4ec3a93f35ca19ac962728cd3d7f06f26bccd56169b diff --git a/sys-fs/ncdu/ncdu-1.19.ebuild b/sys-fs/ncdu/ncdu-1.19.ebuild deleted file mode 100644 index 1f64c46bbaa6..000000000000 --- a/sys-fs/ncdu/ncdu-1.19.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 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=" - https://dev.yorhel.nl/download/${P}.tar.gz - verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc ) -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -DEPEND="sys-libs/ncurses:=[unicode(+)]" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - dev-lang/perl - verify-sig? ( sec-keys/openpgp-keys-yorhel ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc diff --git a/sys-fs/ncdu/ncdu-1.20.ebuild b/sys-fs/ncdu/ncdu-1.20.ebuild index 4b1045a565df..5430ea4d92e1 100644 --- a/sys-fs/ncdu/ncdu-1.20.ebuild +++ b/sys-fs/ncdu/ncdu-1.20.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" DEPEND="sys-libs/ncurses:=[unicode(+)]" RDEPEND="${DEPEND}" diff --git a/sys-fs/ncdu/ncdu-2.3.ebuild b/sys-fs/ncdu/ncdu-2.3.ebuild deleted file mode 100644 index ac0e6228b984..000000000000 --- a/sys-fs/ncdu/ncdu-2.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2023 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.11" -EZIG_MAX_EXCLUSIVE="0.12" - -DEPEND="sys-libs/ncurses:=[unicode(+)]" -RDEPEND="${DEPEND}" -BDEPEND=" - || ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} ) - virtual/pkgconfig - dev-lang/perl - 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/ncdu/ncdu-2.5.ebuild b/sys-fs/ncdu/ncdu-2.5-r1.ebuild index ae93255d2b4a..bd4cb00fd75a 100644 --- a/sys-fs/ncdu/ncdu-2.5.ebuild +++ b/sys-fs/ncdu/ncdu-2.5-r1.ebuild @@ -16,7 +16,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -EZIG_MIN="0.12" +EZIG_MIN="0.13" EZIG_MAX_EXCLUSIVE="0.14" DEPEND="sys-libs/ncurses:=[unicode(+)]" diff --git a/sys-fs/ncdu/ncdu-2.4.ebuild b/sys-fs/ncdu/ncdu-2.6.ebuild index 2ee5dced948e..fdcf0d107cab 100644 --- a/sys-fs/ncdu/ncdu-2.4.ebuild +++ b/sys-fs/ncdu/ncdu-2.6.ebuild @@ -16,15 +16,17 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -EZIG_MIN="0.12" -EZIG_MAX_EXCLUSIVE="0.13" +EZIG_MIN="0.13" +EZIG_MAX_EXCLUSIVE="0.14" -DEPEND="sys-libs/ncurses:=[unicode(+)]" +DEPEND=" + app-arch/zstd + sys-libs/ncurses:=[unicode(+)] +" RDEPEND="${DEPEND}" BDEPEND=" || ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} ) virtual/pkgconfig - dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-yorhel ) " diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild index ed1cb42de5ec..619f6eda8978 100644 --- a/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild +++ b/sys-fs/nilfs-utils/nilfs-utils-2.2.9.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 @@ -6,8 +6,8 @@ EAPI=8 inherit linux-info usr-ldscript DESCRIPTION="A New Implementation of a Log-structured File System for Linux" -HOMEPAGE="http://nilfs.sourceforge.net/" -SRC_URI="http://nilfs.sourceforge.net/download/${P}.tar.bz2" +HOMEPAGE="https://nilfs.sourceforge.net/" +SRC_URI="https://nilfs.sourceforge.net/download/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild index 4a708ff932ae..096e9f38d020 100644 --- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild +++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~sparc x86" IUSE="debug examples nls static-libs" DEPEND=" diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild deleted file mode 100644 index 50a1759d6ee0..000000000000 --- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic libtool - -MY_P=${PN}-${PV/_/-} - -DESCRIPTION="Library for accessing and manipulating reiserfs partitions" -HOMEPAGE="http://reiserfs.linux.kiev.ua/" -SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86" -IUSE="debug examples nls static-libs" - -DEPEND=" - sys-apps/util-linux - nls? ( - sys-devel/gettext - virtual/libintl - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-autotools.patch -) - -src_prepare() { - default - - elibtoolize -} - -src_configure() { - filter-lfs-flags - - econf \ - $(use_enable static-libs static) \ - --disable-Werror \ - $(use_enable nls) \ - $(use_enable debug) -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc demos/*.c - fi - - find "${ED}" -name '*.la' -delete || die - - rm -r "${ED}"/usr/{sbin,share/man} || die -} - -pkg_postinst() { - ewarn "progsreiserfs has been proven dangerous in the past, generating bad" - ewarn "partitions and destroying data on resize/cpfs operations." - ewarn "Because of this, we do NOT provide their binaries, but only their" - ewarn "libraries instead, as these are needed for other applications." -} diff --git a/sys-fs/quota/quota-4.09-r1.ebuild b/sys-fs/quota/quota-4.09-r1.ebuild index 10e3bf5b8c7a..d2b9b2e8851d 100644 --- a/sys-fs/quota/quota-4.09-r1.ebuild +++ b/sys-fs/quota/quota-4.09-r1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" IUSE="ldap netlink nls rpc selinux tcpd" RDEPEND=" diff --git a/sys-fs/quota/quota-4.09.ebuild b/sys-fs/quota/quota-4.09.ebuild deleted file mode 100644 index bc985c48f1d8..000000000000 --- a/sys-fs/quota/quota-4.09.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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 -) - -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/quotatool/quotatool-1.6.5.ebuild b/sys-fs/quotatool/quotatool-1.6.5.ebuild index ed451075ad74..667fdde6d922 100644 --- a/sys-fs/quotatool/quotatool-1.6.5.ebuild +++ b/sys-fs/quotatool/quotatool-1.6.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ekenberg/quotatool/archive/refs/tags/v${PV}.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" RDEPEND="sys-fs/quota" diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild index 1dee26cee9b8..d59a9886653b 100644 --- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild +++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" PATCHES=( diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild index 9b362016703e..26ba290026cd 100644 --- a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild +++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -19,7 +19,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" dev-build/autoconf-archive - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { default diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest index 680283467886..4ffe77463cb3 100644 --- a/sys-fs/snapraid/Manifest +++ b/sys-fs/snapraid/Manifest @@ -1,2 +1 @@ -DIST snapraid-11.6.tar.gz 744142 BLAKE2B 300350e355298e972b0f2c83cc0cfdc212c01d67206b752a69a715e48e429a8fc8dc779820cca761ce4ff2bf29c61a2ab280b5b929de2b64c2ef84b82d65a67e SHA512 abe606c09ff933166cf386270d638a3da5a7edff914a486cfa97bdfe878d152a636d271968b92d14ad3eca873bca68dbcad63565067b0b4e887a1176afb14525 -DIST snapraid-12.2.tar.gz 745755 BLAKE2B dde099a18eddc5dcec178b46c41e8ef828ad214667c0414891dc9ebdb509567233170df2a6483284e0b44f8b8e71ef6ca8a35f845b501b8d8cf4dff97d080bb6 SHA512 2c19c0e336e6e42c8b44bd3f3ccfdc4dfae901f166b0825deb471919dc22f98e92a6d64557b6fed3648b332d4432735db7998656d60bf173925a91c90b099bad +DIST snapraid-12.3.tar.gz 746308 BLAKE2B b654861bd9d0b632af3c942e8b4403240c6e229df69bfe330add2f1250999d8f0ec3bae29a96d98b53f77f680108d4cff703131bd6e751d9ce24b9dfd52e9b99 SHA512 c1e364326354940abdb27c7d7528f8d2d324bfc926d134be5a7046b1e3ada7703c7c9e3bec3ba4120dcd717e6cb325f2cce4d9387576add4781f6122537a7f1b diff --git a/sys-fs/snapraid/snapraid-12.2.ebuild b/sys-fs/snapraid/snapraid-12.2.ebuild deleted file mode 100644 index d9c8f45f3452..000000000000 --- a/sys-fs/snapraid/snapraid-12.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="a backup program for disk array for home media centers" -HOMEPAGE="http://snapraid.it/" -SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" ) - -src_prepare() { - default - eautoreconf -} diff --git a/sys-fs/snapraid/snapraid-11.6.ebuild b/sys-fs/snapraid/snapraid-12.3.ebuild index d9c8f45f3452..7f66e0deea5f 100644 --- a/sys-fs/snapraid/snapraid-11.6.ebuild +++ b/sys-fs/snapraid/snapraid-12.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="a backup program for disk array for home media centers" -HOMEPAGE="http://snapraid.it/" +HOMEPAGE="https://www.snapraid.it/" SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-3" diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest index a635a3c7f3d5..d8111034d345 100644 --- a/sys-fs/squashfs-tools-ng/Manifest +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -1 +1,2 @@ DIST squashfs-tools-ng-1.3.1.tar.xz 585916 BLAKE2B 697131ddb9959bed388534f90c93e2e7495ef5aec9facf97e7d17475cff64d7a4badb709a16ae5e6da3ee89b1a1e3a49833bd15b9a0b4b364e15a565bd18e480 SHA512 0a433f7c3633cd5d8646d990744e31ed59c7012d5f8bb4fdb7892b892631f22a8fd0969f7d81de68f53e44670e71cb8e29729cd925a93b98ab3b6942bbc30662 +DIST squashfs-tools-ng-1.3.2.tar.xz 585380 BLAKE2B 43e8e7c189a9e3a23964a9ae17666eba7ff362d7ed011ee09e342d9ef777de2ce8e326cd38fa0932ace33929cf75bab81786ca56411053c08041300459262076 SHA512 6f14d90875ef3f3d36d3cd38932ade6b0da7284922c914bd655e3f0a4abb17ba75d4bc052a1d4244c1b4ff96b3798d83d5a7b3263b8e1b96c112f4cdf967400f 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 313023a84cc1..9342b6bd6847 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" fi diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.2.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.2.ebuild new file mode 100644 index 000000000000..9342b6bd6847 --- /dev/null +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.2.ebuild @@ -0,0 +1,57 @@ +# 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 ~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-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild index f936c78e267e..e768bb9ae947 100644 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" fi diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.1-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.1-r1.ebuild index 9badfed28888..adcf7a0fcf83 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.5.1-r1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug lz4 lzma lzo xattr zstd" RDEPEND=" diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.6.1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.6.1.ebuild index 861b18754f99..95d1dda4567f 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.6.1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.6.1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug lz4 lzma lzo xattr zstd" DEPEND=" diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.6.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.6.ebuild index 896db57a6f33..dfe949c3f701 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.6.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.6.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="debug lz4 lzma lzo xattr zstd" DEPEND=" diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest index 7d4e49e41992..1cfe976f0a6b 100644 --- a/sys-fs/squashfuse/Manifest +++ b/sys-fs/squashfuse/Manifest @@ -1,2 +1 @@ -DIST squashfuse-0.1.105.tar.gz 65644 BLAKE2B 209808164a2803d1f4dedad048f29a809d92e5260193ff2db6a4eed4d887273f6b0b2a673123b9c460e587b9f9884c4115e2323f8de7f26535abcfe4de99ea20 SHA512 6bf18575fd4732f3b0e4530902f2556859c2efbbd781a31bdbf97fe6601412dc750a80354a8ab08a3132d4f8680ea5ff0dd04440f29243906f1017aa6c70bede DIST squashfuse-0.5.2.tar.gz 75404 BLAKE2B bb0005395ad993932d27eccbf0aa57d587af19054e16cb2cb4cce13f9d97be011b70c3cffa5b21c4fbef294686b64dfa45e941e8a0fa10a6bea1e9264abf6b8b SHA512 4380d73afa47105e2188a4eebc6b54c5961a2ba38e5986865b7fd762ed0aea7d24b0d9f5b674abd9c29f73a336bd69142db7869a548560723f60559859cdd7f3 diff --git a/sys-fs/squashfuse/squashfuse-0.1.105.ebuild b/sys-fs/squashfuse/squashfuse-0.1.105.ebuild deleted file mode 100644 index da1bd6c31fb1..000000000000 --- a/sys-fs/squashfuse/squashfuse-0.1.105.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2016-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="FUSE filesystem to mount squashfs archives" -HOMEPAGE="https://github.com/vasi/squashfuse" -SRC_URI="https://github.com/vasi/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="lz4 lzma lzo static-libs +zlib zstd" -REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )" - -COMMON_DEPEND=" - >=sys-fs/fuse-2.8.6:0= - lzma? ( >=app-arch/xz-utils-5.0.4:= ) - zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) - lzo? ( >=dev-libs/lzo-2.06:= ) - lz4? ( >=app-arch/lz4-0_p106:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" -# Tests require access to /dev/fuse. -RESTRICT+=" test" - -src_configure() { - filter-lto - filter-flags -fwhole-program -fno-common - eautoreconf - - local econfargs=( - $(use_enable static-libs static) - $(use lz4 || echo --without-lz4) - $(use lzma || echo --without-xz) - $(use lzo || echo --without-lzo) - $(use zlib || echo --without-zlib) - $(use zstd || echo --without-zstd) - ) - - econf "${econfargs[@]}" -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/sys-fs/squashfuse/squashfuse-0.5.2.ebuild b/sys-fs/squashfuse/squashfuse-0.5.2.ebuild index 5f803e6982ab..ddfa5dec4784 100644 --- a/sys-fs/squashfuse/squashfuse-0.5.2.ebuild +++ b/sys-fs/squashfuse/squashfuse-0.5.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vasi/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.ta LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="lz4 lzma lzo static-libs +zlib zstd" REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )" RESTRICT="test" # Tests require access to /dev/fuse. diff --git a/sys-fs/static-dev/static-dev-0.1-r2.ebuild b/sys-fs/static-dev/static-dev-0.1-r2.ebuild index c915e4e6bc45..b7679f37e63e 100644 --- a/sys-fs/static-dev/static-dev-0.1-r2.ebuild +++ b/sys-fs/static-dev/static-dev-0.1-r2.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://bugs.gentoo.org/107875" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" RDEPEND="sys-apps/makedev" diff --git a/sys-fs/static-dev/static-dev-0.1-r3.ebuild b/sys-fs/static-dev/static-dev-0.1-r3.ebuild index 9d274185752f..0a9efa808515 100644 --- a/sys-fs/static-dev/static-dev-0.1-r3.ebuild +++ b/sys-fs/static-dev/static-dev-0.1-r3.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://bugs.gentoo.org/107875" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" IDEPEND="sys-apps/makedev" diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild index 8d76371cff85..d361f578e266 100644 --- a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild +++ b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" src_prepare() { diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild index 8ec6bbae2c4f..582d066209a9 100644 --- a/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild +++ b/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild @@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then else SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${OLD_P}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="udev startup scripts for openrc" diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild index 972e55411f09..6a7f0d673f66 100644 --- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild +++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild @@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then else SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${OLD_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="udev startup scripts for openrc" diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 5ab345ba851b..4c50596133ca 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,3 +1,2 @@ -DIST udisks-2.10.0.tar.bz2 1784010 BLAKE2B a3923433408ab87448ea0b6dcafcf329b1392f5810ca6d1bcb52da90aad02578f9e533041a5ad62258c485e43b834a60b28fc66ade0aa241c1cdfafdb130bf65 SHA512 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed DIST udisks-2.10.1.tar.bz2 1896207 BLAKE2B 41282e4dbbd93e6bda2a10a6ff2f2fb82bfc83b3ccbed9450cca7888c634cde9300fcd0b7d055e0d8e4c8fc0b431a75d5612a24132ea9b2677d194529732178d SHA512 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5 diff --git a/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch b/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch new file mode 100644 index 000000000000..39af1e0fe5b3 --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch @@ -0,0 +1,55 @@ +From eb1d4a2bcbb8744074d17553bd0d55ffbd76bdeb Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Tue, 14 Nov 2023 13:16:39 +0000 +Subject: [PATCH] udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder + +For some reason even after acquiring a voluntary BSD lock on +the device the BLKRRPART ioctl still fails with EBUSY. Wait +a couple of msec and everything is fine. + +So try harder, several attempts, if busy. There might be number +of things going on in the system and it's out of our control +even when holding a lock. +--- + src/udiskslinuxblockobject.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/udiskslinuxblockobject.c b/src/udiskslinuxblockobject.c +index d5da4bc4d9..33604df841 100644 +--- a/src/udiskslinuxblockobject.c ++++ b/src/udiskslinuxblockobject.c +@@ -1098,23 +1098,31 @@ udisks_linux_block_object_reread_partition_table (UDisksLinuxBlockObject *objec + } + else + { +- gint num_tries = 0; ++ gint num_tries; + + /* acquire an exclusive BSD lock to prevent udev probes. + * See also https://systemd.io/BLOCK_DEVICE_LOCKING + */ ++ num_tries = 10; + while (flock (fd, LOCK_EX | LOCK_NB) != 0) + { + g_usleep (100 * 1000); /* microseconds */ +- if (num_tries++ > 5) ++ if (num_tries-- < 0) + break; + } + +- if (ioctl (fd, BLKRRPART) != 0) ++ num_tries = 5; ++ while (ioctl (fd, BLKRRPART) != 0) + { ++ if (errno == EBUSY && num_tries-- >= 0) ++ { ++ g_usleep (200 * 1000); /* microseconds */ ++ continue; ++ } + g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), + "Error re-reading partition table (BLKRRPART ioctl) on %s: %m", device_file); + ret = FALSE; ++ break; + } + close (fd); + } diff --git a/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch b/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch new file mode 100644 index 000000000000..e40f136dfe2d --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch @@ -0,0 +1,38 @@ +From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Fri, 3 Nov 2023 16:40:54 +0100 +Subject: [PATCH] tests: Fix targetcli_config.json + +Not all attributes are available anymore in newer kernel versions. +--- + src/tests/dbus-tests/targetcli_config.json | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json +index 3be9eac2be..f50bf7d4d2 100644 +--- a/src/tests/dbus-tests/targetcli_config.json ++++ b/src/tests/dbus-tests/targetcli_config.json +@@ -331,7 +331,6 @@ + "demo_mode_write_protect": 0, + "generate_node_acls": 1, + "login_timeout": 15, +- "netif_timeout": 2, + "prod_mode_write_protect": 0, + "t10_pi": 0, + "tpg_enabled_sendtargets": 1 +@@ -393,7 +392,6 @@ + "demo_mode_write_protect": 1, + "generate_node_acls": 0, + "login_timeout": 15, +- "netif_timeout": 2, + "prod_mode_write_protect": 0, + "t10_pi": 0, + "tpg_enabled_sendtargets": 1 +@@ -479,7 +477,6 @@ + "demo_mode_write_protect": 1, + "generate_node_acls": 0, + "login_timeout": 15, +- "netif_timeout": 2, + "prod_mode_write_protect": 0, + "t10_pi": 0, + "tpg_enabled_sendtargets": 1 diff --git a/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch new file mode 100644 index 000000000000..9acd8bd10331 --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch @@ -0,0 +1,32 @@ +From 8f62f7c6888659f3b66d5861d46fb9b3a34ff169 Mon Sep 17 00:00:00 2001 +From: Marius Vollmer <mvollmer@redhat.com> +Date: Thu, 22 Feb 2024 16:49:24 +0200 +Subject: [PATCH] udiskslinuxblock: Survive a missing /etc/fstab + +This is similar to b79f6840ca82551e672156153b7e13328f0ba19d, which +solved the same problem for /etc/crypttab. +--- + src/udiskslinuxblock.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c +index 829dd5f78..a3fa183be 100644 +--- a/src/udiskslinuxblock.c ++++ b/src/udiskslinuxblock.c +@@ -1541,7 +1541,15 @@ add_remove_fstab_entry (UDisksBlock *block, + &contents, + NULL, + error)) +- goto out; ++ { ++ if (g_error_matches (*error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) ++ { ++ contents = g_strdup (""); ++ g_clear_error (error); ++ } ++ else ++ goto out; ++ } + + lines = g_strsplit (contents, "\n", 0); + diff --git a/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch new file mode 100644 index 000000000000..3157b10f8c87 --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch @@ -0,0 +1,112 @@ +From 3dc036fb5045fc068c6abfbe4e62d0871d7ca82a Mon Sep 17 00:00:00 2001 +From: xinpeng wang <wangxinpeng@uniontech.com> +Date: Thu, 21 Sep 2023 13:57:40 +0800 +Subject: [PATCH] udiskslinuxmanager:use dbus interface after free + +In handle_get_block_devices, call get_block_objects to obtain iface_block_device +of all current UDisksLinuxBlockObject, and then obtain the corresponding +UDisksLinuxBlockObject's object_path through iface_block_device.iface_block_device +is a GDBusInterfaceSkeleton, which saves the object through +g_dbus_interface_skeleton_set_object. g_object_add_weak_pointer is used here. This +function is not thread-safe.At this time, if other threads are releasing the object, +the program will crash. +This scene can be reproduced by quickly plugging and unplugging the USB disk. +The core is as follows (the redundant stack is omitted): +When accessing object in thread 1, the object is released by thread 2 +info threads + Id Target Id Frame +* 1 Thread 0x7f80979e70 (LWP 24559) 0x0000007f8a48dda0 in +g_dbus_object_get_object_path (object=0x0) at ../../../gio/gdbusobject.c:109 + 2 Thread 0x7f88a43010 (LWP 1159) 0x0000007f8a0a6ae8 in __GI___libc_free +(mem=0x556a919c80) at malloc.c:3093 + +thread 1 +(gdb) bt +0 0x0000007f8a48dda0 in g_dbus_object_get_object_path (object=0x0) at +../../../gio/gdbusobject.c:109 +1 0x000000556a56911c in handle_get_block_devices (object=0x7f7c007ed0, invocation= +0x7f74016f20 [GDBusMethodInvocation], arg_options=<optimized out>) + at udiskslinuxmanager.c:1063 + +(gdb) p ((GObject*)(blocks_p->data))->ref_count +$3 = 1 +(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data)) +$6 = {parent_instance = {g_type_instance = {g_class = 0x556a64e740 +[g_type: UDisksLinuxBlock/UDisksBlockSkeleton/GDBusInterfaceSkeleton]}, ref_count = 1, +qdata = 0x0}, priv = 0x7f7c004ac0} +(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))->priv +$7 = {lock = {p = 0x0, i = {0, 0}}, object = 0x0, +flags = G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD, +connections = 0x0, object_path = 0x0, hooked_vtable = 0x556a62b9f0} + +thread 2 +(gdb) bt +0 0x0000007f8a0a6ae8 in __GI___libc_free (mem=0x556a919c80) at malloc.c:3093 +1 0x0000007f89ff1224 in () at /lib/aarch64-linux-gnu/libudev.so.1 +2 0x0000007f89ff1348 in () at /lib/aarch64-linux-gnu/libudev.so.1 +3 0x0000007f89ff5520 in () at /lib/aarch64-linux-gnu/libudev.so.1 +4 0x0000007f89fff878 in udev_device_unref () at /lib/aarch64-linux-gnu/libudev.so.1 +5 0x0000007f8a7aeb74 in () at /lib/aarch64-linux-gnu/libgudev-1.0.so.0 +6 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at +../../../gobject/gobject.c:3346 +7 0x0000007f8a3193f8 in g_object_unref (_object=0x7f680038a0) at +../../../gobject/gobject.c:3238 +8 0x000000556a57700c in udisks_linux_device_finalize (object=0x7f5c005730 +[UDisksLinuxDevice]) at udiskslinuxdevice.c:75 +9 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at +../../../gobject/gobject.c:3346 +10 0x0000007f8a3193f8 in g_object_unref (_object=0x7f5c005730) at +../../../gobject/gobject.c:3238 +11 0x000000556a55d0fc in udisks_linux_drive_object_uevent + (object=object@entry=0x556a5df370 [UDisksLinuxDriveObject], +action=action@entry=0x556a87b120 +"remove",device=device@entry=0x7f74007610 [UDisksLinuxDevice]) + at udiskslinuxdriveobject.c:715 +12 0x000000556a54840c in handle_block_uevent_for_drive + (provider=provider@entry=0x556a5c8200 [UDisksLinuxProvider], +action=action@entry=0x556a87b120 "remove",device=device@entry=0x7f74007610 +[UDisksLinuxDevice]) at udiskslinuxprovider.c:1035 +13 0x000000556a548ab8 in handle_block_uevent (device=0x7f74007610 [UDisksLinuxDevice], +action=0x556a87b120 "remove", provider=0x556a5c8200 [UDisksLinuxProvider]) at +udiskslinuxprovider.c:1349 +14 0x000000556a548ab8 in udisks_linux_provider_handle_uevent + (provider=0x556a5c8200 [UDisksLinuxProvider], action=0x556a87b120 "remove", +device=0x7f74007610 [UDisksLinuxDevice]) at udiskslinuxprovider.c:1399 +15 0x000000556a548cac in on_idle_with_probed_uevent (user_data=0x556a7e65a0) at +udiskslinuxprovider.c:230 +--- + src/udiskslinuxmanager.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c +index 5bfeec103..491edb92b 100644 +--- a/src/udiskslinuxmanager.c ++++ b/src/udiskslinuxmanager.c +@@ -1196,8 +1196,11 @@ handle_get_block_devices (UDisksManager *object, + blocks = get_block_objects (object, &num_blocks); + block_paths = g_new0 (const gchar *, num_blocks + 1); + +- for (i = 0,blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next, i++) +- block_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data))); ++ for (blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next) { ++ GDBusObject * block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data)); ++ if (block_object) ++ block_paths[i++] = g_dbus_object_get_object_path (block_object); ++ } + + udisks_manager_complete_get_block_devices (object, + invocation, +@@ -1284,9 +1287,11 @@ handle_resolve_device (UDisksManager *object, + } + + ret_paths = g_new0 (const gchar *, num_found + 1); +- for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next, i++) ++ for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next) + { +- ret_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data))); ++ GDBusObject *block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data)); ++ if (block_object) ++ ret_paths[i++] = g_dbus_object_get_object_path (block_object); + } + + udisks_manager_complete_resolve_device (object, diff --git a/sys-fs/udisks/udisks-2.10.0.ebuild b/sys-fs/udisks/udisks-2.10.1-r1.ebuild index b7ec7275b635..d2f4f213c1bb 100644 --- a/sys-fs/udisks/udisks-2.10.0.ebuild +++ b/sys-fs/udisks/udisks-2.10.1-r1.ebuild @@ -61,6 +61,13 @@ BDEPEND=" DOCS=( AUTHORS HACKING NEWS README.md ) +PATCHES=( + "${FILESDIR}"/${P}-BLKRRPART_harder.patch + "${FILESDIR}"/${P}-targetcli_config.json_netif_timeout.patch + "${FILESDIR}"/${P}-udiskslinuxmanager_use_after_free.patch + "${FILESDIR}"/${P}-udiskslinuxblock_survive_missing_fstab.patch +) + pkg_setup() { # Listing only major arch's here to avoid tracking kernel's defconfig if use amd64 || use arm || use ppc || use ppc64 || use x86; then diff --git a/sys-fs/udisks/udisks-2.10.1.ebuild b/sys-fs/udisks/udisks-2.10.1.ebuild index 11bf7f211661..a9eb67d39bd7 100644 --- a/sys-fs/udisks/udisks-2.10.1.ebuild +++ b/sys-fs/udisks/udisks-2.10.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86" IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd" REQUIRED_USE=" diff --git a/sys-fs/udisks/udisks-2.9.4-r3.ebuild b/sys-fs/udisks/udisks-2.9.4-r3.ebuild index a33ed2e0ecce..62c47f6d28cd 100644 --- a/sys-fs/udisks/udisks-2.9.4-r3.ebuild +++ b/sys-fs/udisks/udisks-2.9.4-r3.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram" REQUIRED_USE=" diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest index 7323586a6b60..32909deef612 100644 --- a/sys-fs/vhba/Manifest +++ b/sys-fs/vhba/Manifest @@ -1 +1,2 @@ DIST vhba-module-20240202.tar.xz 16168 BLAKE2B 7974f60b73c634528afdd44e94c6da34bdc481d874f19845efc0464435a7e560494dd703b0fb1df34c96fce5f1afb300a1e6e2b3b9730e91c956816905eb2f44 SHA512 fdb9b79feb870bb22ed2182216103c8b87d1b5a471d02def24bdf5782cc2bee2333f1d78e1428b042c3df5a33ff8e07b1d61cbe11414a27db18034f3fbbe2612 +DIST vhba-module-20240917.tar.xz 16204 BLAKE2B 1e6dd176d40e86363eacddf3f97231b07b7428178b6e1792cf3abd15e42f2350db66557b3499c204c47678b4967955670a8839f8b50549614bd6a8ba204b9bb7 SHA512 aa94f88e501f11fe1de9dc9eb315f720947fafa23a12789c8b674b1f7d578cc351c2c1524ea1165b893cb50c7188d016da548006e7a1795c99eeacc92e1ab0de diff --git a/sys-fs/vhba/vhba-20240917.ebuild b/sys-fs/vhba/vhba-20240917.ebuild new file mode 100644 index 000000000000..96b907d400e4 --- /dev/null +++ b/sys-fs/vhba/vhba-20240917.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 udev + +MY_P=vhba-module-${PV} +DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" +HOMEPAGE="https://cdemu.sourceforge.io/" +SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + virtual/udev +" +DEPEND=" + ${RDEPEND} +" + +CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" + +src_compile() { + local modlist=( vhba ) + local modargs=( KDIR="${KV_OUT_DIR}" ) + + linux-mod-r1_src_compile +} + +src_prepare() { + default + # Avoid -Werror problems + sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed" +} + +src_install() { + linux-mod-r1_src_install + + einfo "Generating udev rules ..." + udev_newrules - 69-vhba.rules <<-EOF + # do not edit this file, it will be overwritten on update + # + KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" + EOF +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/vzquota/vzquota-3.1.ebuild b/sys-fs/vzquota/vzquota-3.1.ebuild index cddea014503f..d910b7c7c08a 100644 --- a/sys-fs/vzquota/vzquota-3.1.ebuild +++ b/sys-fs/vzquota/vzquota-3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~ppc64 ~sparc x86" src_prepare() { default diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest index 36ae26c8d448..ccb2ec6018e5 100644 --- a/sys-fs/xfsdump/Manifest +++ b/sys-fs/xfsdump/Manifest @@ -1 +1,2 @@ DIST xfsdump-3.1.12.tar.xz 609500 BLAKE2B 2cd39e9f66459d75e9a254c3409279fecb95883468fc933d4d8326d00e89422ce433472c98073aa2aef8c6c4a3a1ed7e5ef94584993eb4087b2a4667187c6aee SHA512 803a3b639aef35ec882f40faeaabf381973ba2636ce0c9d06568361f5398c3c6842ffe184fc01441bf51bb1ed1b9e40b012715c09c8cc942484cc031a8eb1757 +DIST xfsdump-3.2.0.tar.xz 615312 BLAKE2B 2971608b1ae3e280cba31ffefc379995211088338926f9c3f1679c825742b585bb1ab875b3da2afd48f6cd2bad04831e5e61d0251f018e2bebf72af4009ef764 SHA512 339317a92d7fda3e63b292db5e8a6d4a107a7f2ec269d54c109b6ade2f76cd823fb53db7a3a7e8a6c4883d6ce5626c7bc85fef6741f44699a4a8dfecfaa5231f diff --git a/sys-fs/xfsdump/xfsdump-3.1.12.ebuild b/sys-fs/xfsdump/xfsdump-3.1.12.ebuild index 324aa478f2d0..c9a1d66eba9e 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.12.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.12.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 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="ncurses nls" RDEPEND=" diff --git a/sys-fs/xfsdump/xfsdump-3.2.0.ebuild b/sys-fs/xfsdump/xfsdump-3.2.0.ebuild new file mode 100644 index 000000000000..8b5bdb19a696 --- /dev/null +++ b/sys-fs/xfsdump/xfsdump-3.2.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="XFS dump/restore utilities" +HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsdump-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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +IUSE="ncurses nls" + +RDEPEND=" + >=sys-apps/attr-2.4.19 + sys-apps/util-linux + sys-fs/e2fsprogs + >=sys-fs/xfsprogs-3.2.0 + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ncurses? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # bug #335115 + "${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch + # bug #311881 + "${FILESDIR}"/${PN}-3.1.9-no-symlink.patch + # bug #561664 + "${FILESDIR}"/${PN}-3.1.6-linguas.patch + + "${FILESDIR}"/${PN}-3.1.9-fix-docs.patch + "${FILESDIR}"/${PN}-3.1.9-skip-inventory-debian-subfolder.patch +) + +src_prepare() { + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + include/builddefs.in \ + || die + + # bug #605852 + sed -i \ + -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \ + -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \ + configure || die + + default +} + +src_configure() { + # bug #184564 + unset PLATFORM + + # bug 925234 + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + + # lto-type-mismatch warnings but xfsdump is on life support + filter-lto + + export OPTIMIZER="${CFLAGS}" + # Pass CFLAGS here too per GCC documentation for LTO + export LDFLAGS="${CFLAGS} ${LDFLAGS}" + export DEBUG=-DNDEBUG + + local myeconfargs=( + $(use_enable nls gettext) + --libdir="${EPREFIX}/$(get_libdir)" + --libexecdir="${EPREFIX}/usr/$(get_libdir)" + --sbindir="${EPREFIX}/sbin" + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # Enable verbose build + emake V=1 +} diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 99c7de42f2bd..39c772ded7d7 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,5 +1,5 @@ -DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f -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.10.0.tar.xz 1449872 BLAKE2B dc02fb14cd07e20d618070358700003a0990125ce3d8b15fa0248c6d494a89bbfb51c267583fc863edeee0d84069c7016f7992e750faa357618cd0d7f5748d2e SHA512 ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce +DIST xfsprogs-6.10.1.tar.xz 1449932 BLAKE2B e9ed15b2d4a9026e0079adfb38578721e13498290a5d9590edae1fd41c9ee0338f9b823568677394952709d82bdc8ade36905a2266ffe64803901adbadfa5643 SHA512 b9fd7b7eaf038772ee4a9602bf38f714db7077731ec8904e0959d28b0103d443be8ae67720869012b90737c1ff440fbce44b3b23b662939c9a90c6d3be3fab08 +DIST xfsprogs-6.11.0.tar.xz 1457084 BLAKE2B 846b25ad36477d71f8f2091ad16699356416f09befbb4250335081d2a8fd78011e9100fbabfb727acdb65520a38c912d9bb9e33b17c222c97de88fd00ab004a9 SHA512 209b479e510e5d5c558430b523bebd90f34b2effeac46f783aad4ec45a9f39998ca1efc67155c54c22e778859968f4b275b0ca6f225603f17ae4cc5c7596a4ca DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023 diff --git a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch b/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch deleted file mode 100644 index a0b32f714d9c..000000000000 --- a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch +++ /dev/null @@ -1,652 +0,0 @@ -https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/ - -From a162f061dc8c2145ae006461d661a03e986c4bf7 Mon Sep 17 00:00:00 2001 -From: Violet Purcell <vimproved@inventati.org> -Date: Sat, 22 Jul 2023 21:12:59 -0400 -Subject: [PATCH 1/3] Remove use of LFS64 interfaces - -LFS64 interfaces are non-standard and are being removed in the upcoming musl -1.2.5. Setting _FILE_OFFSET_BITS=64 (which is currently being done) makes all -interfaces on glibc 64-bit by default, so using the LFS64 interfaces is -redundant. This commit replaces all occurences of off64_t with off_t, -stat64 with stat, and fstat64 with fstat. - -Link: https://bugs.gentoo.org/907039 -Cc: Felix Janda <felix.janda@posteo.de> -Reviewed-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Violet Purcell <vimproved@inventati.org> -Signed-off-by: Sam James <sam@gentoo.org> ---- a/copy/xfs_copy.c -+++ b/copy/xfs_copy.c -@@ -881,7 +881,7 @@ main(int argc, char **argv) - } - } else { - char *lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE); -- off64_t off; -+ off_t off; - ssize_t len; - - /* ensure device files are sufficiently large */ ---- a/fsr/xfs_fsr.c -+++ b/fsr/xfs_fsr.c -@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, - struct dioattr dio; - static xfs_swapext_t sx; - struct xfs_flock64 space; -- off64_t cnt, pos; -+ off_t cnt, pos; - void *fbuf = NULL; - int ct, wc, wc_b4; - char ffname[SMBUFSZ]; ---- a/io/bmap.c -+++ b/io/bmap.c -@@ -257,7 +257,7 @@ bmap_f( - #define FLG_BSW 0000010 /* Not on begin of stripe width */ - #define FLG_ESW 0000001 /* Not on end of stripe width */ - int agno; -- off64_t agoff, bbperag; -+ off_t agoff, bbperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w; - char rbuf[32], bbuf[32], abuf[32]; - int sunit, swidth; -@@ -267,8 +267,8 @@ bmap_f( - if (is_rt) - sunit = swidth = bbperag = 0; - else { -- bbperag = (off64_t)fsgeo.agblocks * -- (off64_t)fsgeo.blocksize / BBSIZE; -+ bbperag = (off_t)fsgeo.agblocks * -+ (off_t)fsgeo.blocksize / BBSIZE; - sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE; - swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; - } ---- a/io/copy_file_range.c -+++ b/io/copy_file_range.c -@@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) - return 0; - } - --static off64_t -+static off_t - copy_src_filesize(int fd) - { - struct stat st; -@@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv) - } - - if (!len_specified) { -- off64_t sz; -+ off_t sz; - - sz = copy_src_filesize(fd); - if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { ---- a/io/cowextsize.c -+++ b/io/cowextsize.c -@@ -50,10 +50,10 @@ static int - set_cowextsize(const char *path, int fd, long extsz) - { - struct fsxattr fsx; -- struct stat64 stat; -+ struct stat stat; - -- if (fstat64(fd, &stat) < 0) { -- perror("fstat64"); -+ if (fstat(fd, &stat) < 0) { -+ perror("fstat"); - exitcode = 1; - return 0; - } ---- a/io/fadvise.c -+++ b/io/fadvise.c -@@ -39,7 +39,7 @@ fadvise_f( - int argc, - char **argv) - { -- off64_t offset = 0, length = 0; -+ off_t offset = 0, length = 0; - int c, range = 0, advise = POSIX_FADV_NORMAL; - - while ((c = getopt(argc, argv, "dnrsw")) != EOF) { ---- a/io/fiemap.c -+++ b/io/fiemap.c -@@ -234,9 +234,9 @@ fiemap_f( - int tot_w = 5; /* 5 since its just one number */ - int flg_w = 5; - __u64 last_logical = 0; /* last extent offset handled */ -- off64_t start_offset = 0; /* mapping start */ -- off64_t length = -1LL; /* mapping length */ -- off64_t range_end = -1LL; /* mapping end*/ -+ off_t start_offset = 0; /* mapping start */ -+ off_t length = -1LL; /* mapping length */ -+ off_t range_end = -1LL; /* mapping end*/ - size_t fsblocksize, fssectsize; - struct stat st; - ---- a/io/fsmap.c -+++ b/io/fsmap.c -@@ -170,7 +170,7 @@ dump_map_verbose( - unsigned long long i; - struct fsmap *p; - int agno; -- off64_t agoff, bperag; -+ off_t agoff, bperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w, own_w; - int nr_w, dev_w; - char rbuf[40], bbuf[40], abuf[40], obuf[40]; -@@ -183,8 +183,8 @@ dump_map_verbose( - dev_w = 3; - nr_w = 4; - tot_w = MINTOT_WIDTH; -- bperag = (off64_t)fsgeo->agblocks * -- (off64_t)fsgeo->blocksize; -+ bperag = (off_t)fsgeo->agblocks * -+ (off_t)fsgeo->blocksize; - sunit = (fsgeo->sunit * fsgeo->blocksize); - swidth = (fsgeo->swidth * fsgeo->blocksize); - ---- a/io/io.h -+++ b/io/io.h -@@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); - typedef struct mmap_region { - void *addr; /* address of start of mapping */ - size_t length; /* length of mapping */ -- off64_t offset; /* start offset into backing file */ -+ off_t offset; /* start offset into backing file */ - int prot; /* protection mode of the mapping */ - int flags; /* MAP_* flags passed to mmap() */ - char *name; /* name of backing file */ -@@ -63,13 +63,13 @@ extern mmap_region_t *maptable; /* mmap'd region array */ - extern int mapcount; /* #entries in the mapping table */ - extern mmap_region_t *mapping; /* active mapping table entry */ - extern int maplist_f(void); --extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int); -+extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int); - - /* - * Various xfs_io helper routines/globals - */ - --extern off64_t filesize(void); -+extern off_t filesize(void); - extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t, - struct fs_path *); - extern int addfile(char *, int , struct xfs_fsop_geom *, int, -@@ -84,9 +84,9 @@ extern size_t io_buffersize; - extern int vectors; - extern struct iovec *iov; - extern int alloc_buffer(size_t, int, unsigned int); --extern int read_buffer(int, off64_t, long long, long long *, -+extern int read_buffer(int, off_t, long long, long long *, - int, int); --extern void dump_buffer(off64_t, ssize_t); -+extern void dump_buffer(off_t, ssize_t); - - extern void attr_init(void); - extern void bmap_init(void); ---- a/io/madvise.c -+++ b/io/madvise.c -@@ -39,7 +39,7 @@ madvise_f( - int argc, - char **argv) - { -- off64_t offset, llength; -+ off_t offset, llength; - size_t length; - void *start; - int advise = MADV_NORMAL, c; ---- a/io/mincore.c -+++ b/io/mincore.c -@@ -17,7 +17,7 @@ mincore_f( - int argc, - char **argv) - { -- off64_t offset, llength; -+ off_t offset, llength; - size_t length; - size_t blocksize, sectsize; - void *start; ---- a/io/mmap.c -+++ b/io/mmap.c -@@ -63,11 +63,11 @@ print_mapping( - void * - check_mapping_range( - mmap_region_t *map, -- off64_t offset, -+ off_t offset, - size_t length, - int pagealign) - { -- off64_t relative; -+ off_t relative; - - if (offset < mapping->offset) { - printf(_("offset (%lld) is before start of mapping (%lld)\n"), -@@ -155,7 +155,8 @@ mmap_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; -+ - ssize_t length = 0, length2 = 0; - void *address = NULL; - char *filename; -@@ -308,7 +309,7 @@ msync_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - ssize_t length; - void *start; - int c, flags = 0; -@@ -401,7 +402,7 @@ mread_f( - int argc, - char **argv) - { -- off64_t offset, tmp, dumpoffset, printoffset; -+ off_t offset, tmp, dumpoffset, printoffset; - ssize_t length; - size_t dumplen, cnt = 0; - char *bp; -@@ -566,7 +567,7 @@ mwrite_f( - int argc, - char **argv) - { -- off64_t offset, tmp; -+ off_t offset, tmp; - ssize_t length; - void *start; - char *sp; ---- a/io/pread.c -+++ b/io/pread.c -@@ -116,7 +116,7 @@ alloc_buffer( - static void - __dump_buffer( - void *buf, -- off64_t offset, -+ off_t offset, - ssize_t len) - { - int i, j; -@@ -141,7 +141,7 @@ __dump_buffer( - - void - dump_buffer( -- off64_t offset, -+ off_t offset, - ssize_t len) - { - int i, l; -@@ -164,7 +164,7 @@ dump_buffer( - static ssize_t - do_preadv( - int fd, -- off64_t offset, -+ off_t offset, - long long count) - { - int vecs = 0; -@@ -199,7 +199,7 @@ do_preadv( - static ssize_t - do_pread( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - size_t buffer_size) - { -@@ -212,13 +212,13 @@ do_pread( - static int - read_random( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - unsigned int seed, - int eof) - { -- off64_t end, off, range; -+ off_t end, off, range; - ssize_t bytes; - int ops = 0; - -@@ -259,12 +259,12 @@ read_random( - static int - read_backward( - int fd, -- off64_t *offset, -+ off_t *offset, - long long *count, - long long *total, - int eof) - { -- off64_t end, off = *offset; -+ off_t end, off = *offset; - ssize_t bytes = 0, bytes_requested; - long long cnt = *count; - int ops = 0; -@@ -319,7 +319,7 @@ read_backward( - static int - read_forward( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int verbose, -@@ -353,7 +353,7 @@ read_forward( - int - read_buffer( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int verbose, -@@ -368,7 +368,7 @@ pread_f( - char **argv) - { - size_t bsize; -- off64_t offset; -+ off_t offset; - unsigned int zeed = 0; - long long count, total, tmp; - size_t fsblocksize, fssectsize; ---- a/io/pwrite.c -+++ b/io/pwrite.c -@@ -54,7 +54,7 @@ pwrite_help(void) - static ssize_t - do_pwritev( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - int pwritev2_flags) - { -@@ -97,7 +97,7 @@ do_pwritev( - static ssize_t - do_pwrite( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - size_t buffer_size, - int pwritev2_flags) -@@ -110,13 +110,13 @@ do_pwrite( - - static int - write_random( -- off64_t offset, -+ off_t offset, - long long count, - unsigned int seed, - long long *total, - int pwritev2_flags) - { -- off64_t off, range; -+ off_t off, range; - ssize_t bytes; - int ops = 0; - -@@ -155,12 +155,12 @@ write_random( - - static int - write_backward( -- off64_t offset, -+ off_t offset, - long long *count, - long long *total, - int pwritev2_flags) - { -- off64_t end, off = offset; -+ off_t end, off = offset; - ssize_t bytes = 0, bytes_requested; - long long cnt = *count; - int ops = 0; -@@ -214,11 +214,11 @@ write_backward( - - static int - write_buffer( -- off64_t offset, -+ off_t offset, - long long count, - size_t bs, - int fd, -- off64_t skip, -+ off_t skip, - long long *total, - int pwritev2_flags) - { -@@ -253,7 +253,7 @@ write_buffer( - - static int - write_once( -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int pwritev2_flags) -@@ -275,7 +275,7 @@ pwrite_f( - char **argv) - { - size_t bsize; -- off64_t offset, skip = 0; -+ off_t offset, skip = 0; - long long count, total, tmp; - unsigned int zeed = 0, seed = 0xcdcdcdcd; - size_t fsblocksize, fssectsize; ---- a/io/reflink.c -+++ b/io/reflink.c -@@ -98,7 +98,7 @@ dedupe_f( - int argc, - char **argv) - { -- off64_t soffset, doffset; -+ off_t soffset, doffset; - long long count, total; - char *infile; - int condensed, quiet_flag; -@@ -226,7 +226,7 @@ reflink_f( - int argc, - char **argv) - { -- off64_t soffset, doffset; -+ off_t soffset, doffset; - long long count = 0, total; - char *infile = NULL; - int condensed, quiet_flag; ---- a/io/seek.c -+++ b/io/seek.c -@@ -63,8 +63,8 @@ static void - seek_output( - int startflag, - char *type, -- off64_t start, -- off64_t offset) -+ off_t start, -+ off_t offset) - { - if (offset == -1) { - if (errno == ENXIO) { -@@ -92,7 +92,7 @@ seek_f( - int argc, - char **argv) - { -- off64_t offset, start; -+ off_t offset, start; - size_t fsblocksize, fssectsize; - int c; - int current; /* specify data or hole */ ---- a/io/sendfile.c -+++ b/io/sendfile.c -@@ -34,12 +34,12 @@ sendfile_help(void) - - static int - send_buffer( -- off64_t offset, -+ off_t offset, - size_t count, - int fd, - long long *total) - { -- off64_t off = offset; -+ off_t off = offset; - ssize_t bytes, bytes_remaining = count; - int ops = 0; - -@@ -66,7 +66,7 @@ sendfile_f( - int argc, - char **argv) - { -- off64_t offset = 0; -+ off_t offset = 0; - long long count, total; - size_t blocksize, sectsize; - struct timeval t1, t2; ---- a/io/stat.c -+++ b/io/stat.c -@@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; - static cmdinfo_t statfs_cmd; - static cmdinfo_t statx_cmd; - --off64_t -+off_t - filesize(void) - { - struct stat st; ---- a/io/sync_file_range.c -+++ b/io/sync_file_range.c -@@ -30,7 +30,7 @@ sync_range_f( - int argc, - char **argv) - { -- off64_t offset = 0, length = 0; -+ off_t offset = 0, length = 0; - int c, sync_mode = 0; - size_t blocksize, sectsize; - ---- a/io/truncate.c -+++ b/io/truncate.c -@@ -16,7 +16,7 @@ truncate_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - size_t blocksize, sectsize; - - init_cvtnum(&blocksize, §size); ---- a/libxfs/rdwr.c -+++ b/libxfs/rdwr.c -@@ -576,7 +576,7 @@ libxfs_balloc( - - - static int --__read_buf(int fd, void *buf, int len, off64_t offset, int flags) -+__read_buf(int fd, void *buf, int len, off_t offset, int flags) - { - int sts; - -@@ -638,7 +638,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) - - buf = bp->b_addr; - for (i = 0; i < bp->b_nmaps; i++) { -- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); -+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); - int len = BBTOB(bp->b_maps[i].bm_len); - - error = __read_buf(fd, buf, len, offset, flags); -@@ -797,7 +797,7 @@ err: - } - - static int --__write_buf(int fd, void *buf, int len, off64_t offset, int flags) -+__write_buf(int fd, void *buf, int len, off_t offset, int flags) - { - int sts; - -@@ -863,7 +863,7 @@ libxfs_bwrite( - void *buf = bp->b_addr; - - for (i = 0; i < bp->b_nmaps; i++) { -- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); -+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); - int len = BBTOB(bp->b_maps[i].bm_len); - - bp->b_error = __write_buf(fd, buf, len, offset, ---- a/mdrestore/xfs_mdrestore.c -+++ b/mdrestore/xfs_mdrestore.c -@@ -160,7 +160,7 @@ verify_device_size( - } else { - /* ensure device is sufficiently large enough */ - char lb[XFS_MAX_SECTORSIZE] = { 0 }; -- off64_t off; -+ off_t off; - - off = nr_blocks * blocksize - sizeof(lb); - if (pwrite(dev_fd, lb, sizeof(lb), off) < 0) ---- a/repair/prefetch.c -+++ b/repair/prefetch.c -@@ -475,7 +475,7 @@ pf_batch_read( - { - struct xfs_buf *bplist[MAX_BUFS]; - unsigned int num; -- off64_t first_off, last_off, next_off; -+ off_t first_off, last_off, next_off; - int len, size; - int i; - int inode_bufs; ---- a/scrub/spacemap.c -+++ b/scrub/spacemap.c -@@ -97,11 +97,11 @@ scan_ag_rmaps( - struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; - struct scan_blocks *sbx = arg; - struct fsmap keys[2]; -- off64_t bperag; -+ off_t bperag; - int ret; - -- bperag = (off64_t)ctx->mnt.fsgeom.agblocks * -- (off64_t)ctx->mnt.fsgeom.blocksize; -+ bperag = (off_t)ctx->mnt.fsgeom.agblocks * -+ (off_t)ctx->mnt.fsgeom.blocksize; - - memset(keys, 0, sizeof(struct fsmap) * 2); - keys->fmr_device = ctx->fsinfo.fs_datadev; ---- a/spaceman/freesp.c -+++ b/spaceman/freesp.c -@@ -62,7 +62,7 @@ static void - addtohist( - xfs_agnumber_t agno, - xfs_agblock_t agbno, -- off64_t len) -+ off_t len) - { - long i; - -@@ -152,7 +152,7 @@ scan_ag( - struct fsmap *l, *h; - struct fsmap *p; - struct xfs_fd *xfd = &file->xfd; -- off64_t aglen; -+ off_t aglen; - xfs_agblock_t agbno; - unsigned long long freeblks = 0; - unsigned long long freeexts = 0; ---- a/spaceman/trim.c -+++ b/spaceman/trim.c -@@ -26,7 +26,7 @@ trim_f( - struct xfs_fd *xfd = &file->xfd; - struct xfs_fsop_geom *fsgeom = &xfd->fsgeom; - xfs_agnumber_t agno = 0; -- off64_t offset = 0; -+ off_t offset = 0; - ssize_t length = 0; - ssize_t minlen = 0; - int aflag = 0; --- -2.43.0 - diff --git a/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch b/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch deleted file mode 100644 index 405f2eb8a288..000000000000 --- a/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/ - -From 37495c1600002551badb5eb16ff244b0c5ffd3b0 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 15 Dec 2023 00:40:26 +0000 -Subject: [PATCH 2/3] io: Adapt to >= 64-bit time_t - -We now require (at least) 64-bit time_t, so we need to adjust some printf -specifiers accordingly. - -Unfortunately, we've stumbled upon a ridiculous C mmoment whereby there's -no neat format specifier (not even one of the inttypes ones) for time_t, so -we cast to intmax_t and use %jd. - -Reviewed-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Sam James <sam@gentoo.org> ---- a/io/stat.c -+++ b/io/stat.c -@@ -66,11 +66,11 @@ dump_raw_stat(struct stat *st) - printf("stat.ino = %llu\n", (unsigned long long)st->st_ino); - printf("stat.size = %lld\n", (long long)st->st_size); - printf("stat.blocks = %lld\n", (long long)st->st_blocks); -- printf("stat.atime.tv_sec = %ld\n", st->st_atim.tv_sec); -+ printf("stat.atime.tv_sec = %jd\n", (intmax_t)st->st_atim.tv_sec); - printf("stat.atime.tv_nsec = %ld\n", st->st_atim.tv_nsec); -- printf("stat.ctime.tv_sec = %ld\n", st->st_ctim.tv_sec); -+ printf("stat.ctime.tv_sec = %jd\n", (intmax_t)st->st_ctim.tv_sec); - printf("stat.ctime.tv_nsec = %ld\n", st->st_ctim.tv_nsec); -- printf("stat.mtime.tv_sec = %ld\n", st->st_mtim.tv_sec); -+ printf("stat.mtime.tv_sec = %jd\n", (intmax_t)st->st_mtim.tv_sec); - printf("stat.mtime.tv_nsec = %ld\n", st->st_mtim.tv_nsec); - printf("stat.rdev_major = %u\n", major(st->st_rdev)); - printf("stat.rdev_minor = %u\n", minor(st->st_rdev)); --- -2.43.0 - diff --git a/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch b/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch deleted file mode 100644 index 21c2d07821e8..000000000000 --- a/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/ - -From 98e6a32ebe3b1b0e643c27f1bbee0058c9edc047 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 11 Nov 2023 08:22:22 +0000 -Subject: [PATCH 3/3] build: Request 64-bit time_t where possible - -Suggested by Darrick during LFS review. We take the same approach as in -5c0599b721d1d232d2e400f357abdf2736f24a97 ('Fix building xfsprogs on 32-bit platforms') -to avoid autoconf hell - just take the tried & tested approach which is working -fine for us with LFS already. - -Reviewed-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Sam James <sam@gentoo.org> ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -13,8 +13,8 @@ OPTIMIZER = @opt_build@ - MALLOCLIB = @malloc_lib@ - LOADERFLAGS = @LDFLAGS@ - LTLDFLAGS = @LDFLAGS@ --CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -Wno-address-of-packed-member --BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 -+CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wno-address-of-packed-member -+BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 - - # make sure we don't pick up whacky LDFLAGS from the make environment and - # only use what we calculate from the configured options above. --- -2.43.0 - diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch deleted file mode 100644 index 480f44cf6079..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scrub/Makefile -+++ b/scrub/Makefile -@@ -25,7 +25,7 @@ - CRONTABS = xfs_scrub_all.cron - OPTIONAL_TARGETS += $(CRONTABS) - # Don't enable the crontab by default for now --CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME) -+CROND_DIR = $(PKG_DOC_DIR) - endif - - endif # scrub_prereqs diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch new file mode 100644 index 000000000000..04b71ff89fc0 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/938569 +https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/ + +From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001 +Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org> +From: "Darrick J. Wong" <djwong@kernel.org> +Date: Tue, 27 Aug 2024 16:33:58 -0700 +Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h + +Several people reported C++ compilation errors due to things that C +compilers allow but C++ compilers do not. Fix both of these problems, +and hope there aren't more of these brown paper bags in 2 months when we +finally get these fixes through the process into a released xfsprogs. + +Reported-by: kernel@mattwhitlock.name +Reported-by: sam@gentoo.org +Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203 +Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls") +Signed-off-by: Darrick J. Wong <djwong@kernel.org> +--- + libxfs/xfs_fs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h +index 454b63ef..2b8e1f4f 100644 +--- a/libxfs/xfs_fs.h ++++ b/libxfs/xfs_fs.h +@@ -906,13 +906,13 @@ static inline struct xfs_getparents_rec * + xfs_getparents_next_rec(struct xfs_getparents *gp, + struct xfs_getparents_rec *gpr) + { +- void *next = ((void *)gpr + gpr->gpr_reclen); ++ void *next = ((char *)gpr + gpr->gpr_reclen); + void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize); + + if (next >= end) + return NULL; + +- return next; ++ return (struct xfs_getparents_rec *)next; + } + + /* Iterate through this file handle's directory parent pointers. */ +-- +2.46.0 + diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch deleted file mode 100644 index fcc30d170a8c..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch +++ /dev/null @@ -1,157 +0,0 @@ -https://lore.kernel.org/linux-xfs/171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs/ - -From mboxrd@z Thu Jan 1 00:00:00 1970 -Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EBA128387 - for <linux-xfs@vger.kernel.org>; Tue, 26 Mar 2024 02:59:42 +0000 (UTC) -Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 -ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; - t=1711421982; cv=none; b=BWaXePO42YIrz9dUA7DXc3SL5MWIoC+liDfJkd/1AM/cv7gR6JRGHa5e5W3sXZFsI6S6pH/fKSEijUigTR0kiRGPFWbeCiDWEGQdq6y4AChFbZMTfQSg4Jei7pONholMK08CyBQ/K4UutICyqbos2cdxAGKKjNPTIOtdQdkiHdc= -ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; - s=arc-20240116; t=1711421982; c=relaxed/simple; - bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=; - h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: - MIME-Version:Content-Type; b=O5h4CVWF9TsE/Yho55MGUjmR7zhvoPO0EhXK59BWm/HSUFB3D7vD+ozThDlpENzz0iLrKzdR6aPYBS78cRpOzAszO4ZnMf0HPbFlLmlsIHK/ha5XFPO2qrmLgOGUkKKZepgXIROIA9knDYpxuvlWHnOptPf9birJvyR0gztAEyw= -ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkgsPgmY; arc=none smtp.client-ip=10.30.226.201 -Authentication-Results: smtp.subspace.kernel.org; - dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dkgsPgmY" -Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A482C433C7; - Tue, 26 Mar 2024 02:59:42 +0000 (UTC) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; - s=k20201202; t=1711421982; - bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=; - h=Date:Subject:From:To:Cc:In-Reply-To:References:From; - b=dkgsPgmYjqxxC1yEflpaDSaicJ6J1MpL6wH2GNkbwb7jHMXma/nM8+TuJ7ITuHQGY - WXTMKAQFvTq29s+IWJaQZtuCfgH6cDQ3JTkRcjvg/OgSTo0X+aqxadBBnAjO4AP5/P - hX4gszw3hlZ8oDjMvW9Wl6nLyDmR82rshZOTF4hZfQ8mkbU3Vzcsg2QiPQQzzKgfon - 3c/GxXIQ7V2jg37MBrPpNRYPvqBXWn1X/EkR0wuFiUtw9fTJ6Wyt0Vr6/vemAf2U+S - gwHkISopsTOE3k8cCYYf7LXqmtU3PLOOqWBDol6TkWe6OgIOMSljoytIkFq1up/zhz - LHrtnfD5yRlLg== -Date: Mon, 25 Mar 2024 19:59:41 -0700 -Subject: [PATCH 01/13] libxfs: fix incorrect porting to 6.7 -From: "Darrick J. Wong" <djwong@kernel.org> -To: cem@kernel.org, djwong@kernel.org -Cc: Christoph Hellwig <hch@lst.de>, Bill O'Donnell <bodonnel@redhat.com>, - linux-xfs@vger.kernel.org -Message-ID: <171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs> -In-Reply-To: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs> -References: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs> -User-Agent: StGit/0.19 -Precedence: bulk -X-Mailing-List: linux-xfs@vger.kernel.org -List-Id: <linux-xfs.vger.kernel.org> -List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org> -List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -From: Darrick J. Wong <djwong@kernel.org> - -Userspace libxfs is supposed to match the kernel libxfs except for the -preprocessor include directives. Fix a few discrepancies that came up -for whatever reason. - -To fix the build errors resulting from CONFIG_XFS_RT not being defined, -add it to libxfs.h and alter the Makefile to track xfs_rtbitmap.h. - -Signed-off-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Reviewed-by: Bill O'Donnell <bodonnel@redhat.com> ---- - db/check.c | 1 - - include/libxfs.h | 4 ++++ - libxfs/Makefile | 1 + - libxfs/xfs_rtbitmap.c | 2 +- - libxfs/xfs_rtbitmap.h | 3 --- - repair/rt.c | 1 - - 6 files changed, 6 insertions(+), 6 deletions(-) - - -diff --git a/db/check.c b/db/check.c -index 9d5576c333b2..a47a5d9cb5b4 100644 ---- a/db/check.c -+++ b/db/check.c -@@ -20,7 +20,6 @@ - #include "init.h" - #include "malloc.h" - #include "dir2.h" --#include "xfs_rtbitmap.h" - - typedef enum { - IS_USER_QUOTA, IS_PROJECT_QUOTA, IS_GROUP_QUOTA, -diff --git a/include/libxfs.h b/include/libxfs.h -index 9cec394ca407..aeec2bc76126 100644 ---- a/include/libxfs.h -+++ b/include/libxfs.h -@@ -7,6 +7,9 @@ - #ifndef __LIBXFS_H__ - #define __LIBXFS_H__ - -+/* For userspace XFS_RT is always defined */ -+#define CONFIG_XFS_RT -+ - #include "libxfs_api_defs.h" - #include "platform_defs.h" - #include "xfs.h" -@@ -80,6 +83,7 @@ struct iomap; - #include "xfs_refcount_btree.h" - #include "xfs_refcount.h" - #include "xfs_btree_staging.h" -+#include "xfs_rtbitmap.h" - - #ifndef ARRAY_SIZE - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 010ee68e2292..6f688c0ad25a 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -50,6 +50,7 @@ HFILES = \ - xfs_refcount_btree.h \ - xfs_rmap.h \ - xfs_rmap_btree.h \ -+ xfs_rtbitmap.h \ - xfs_sb.h \ - xfs_shared.h \ - xfs_trans_resv.h \ -diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c -index 8f313339e97f..fb083499070c 100644 ---- a/libxfs/xfs_rtbitmap.c -+++ b/libxfs/xfs_rtbitmap.c -@@ -931,7 +931,7 @@ xfs_rtcheck_alloc_range( - */ - int - xfs_rtfree_extent( -- xfs_trans_t *tp, /* transaction pointer */ -+ struct xfs_trans *tp, /* transaction pointer */ - xfs_rtxnum_t start, /* starting rtext number to free */ - xfs_rtxlen_t len) /* length of extent freed */ - { -diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h -index db2f8c924b05..c0637057d69c 100644 ---- a/libxfs/xfs_rtbitmap.h -+++ b/libxfs/xfs_rtbitmap.h -@@ -6,9 +6,6 @@ - #ifndef __XFS_RTBITMAP_H__ - #define __XFS_RTBITMAP_H__ - --/* For userspace XFS_RT is always defined */ --#define CONFIG_XFS_RT -- - struct xfs_rtalloc_args { - struct xfs_mount *mp; - struct xfs_trans *tp; -diff --git a/repair/rt.c b/repair/rt.c -index abe58b569c0c..9f3bc8d53ec6 100644 ---- a/repair/rt.c -+++ b/repair/rt.c -@@ -13,7 +13,6 @@ - #include "protos.h" - #include "err_protos.h" - #include "rt.h" --#include "xfs_rtbitmap.h" - - #define xfs_highbit64 libxfs_highbit64 /* for XFS_RTBLOCKLOG macro */ - diff --git a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild index 71c81d84f6ec..7e71209b2ef8 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic systemd udev usr-ldscript +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/" @@ -11,8 +11,8 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="icu libedit nls selinux static-libs" RDEPEND=" dev-libs/inih @@ -26,10 +26,7 @@ BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( - "${FILESDIR}"/${PN}-5.3.0-libdir.patch - "${FILESDIR}"/0001-Remove-use-of-LFS64-interfaces.patch - "${FILESDIR}"/0002-io-Adapt-to-64-bit-time_t.patch - "${FILESDIR}"/0003-build-Request-64-bit-time_t-where-possible.patch + "${FILESDIR}"/${PN}-6.10.0-c++-void.patch ) src_prepare() { @@ -73,9 +70,10 @@ src_configure() { # https://www.spinics.net/lists/linux-xfs/msg30272.html local myconf=( --enable-static - --enable-blkid # Doesn't do anything beyond adding -flto (bug #930947). --disable-lto + # The default value causes double 'lib' + --localstatedir="${EPREFIX}/var" --with-crond-dir="${EPREFIX}/etc/cron.d" --with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-udev-rule-dir="$(get_udevdir)/rules.d" @@ -92,10 +90,19 @@ src_compile() { } 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 - gen_usr_ldscript -a handle + # Not actually used but --localstatedir causes this empty dir + # to be installed. + rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die + + if ! use static-libs; then + rm "${ED}/usr/$(get_libdir)/libhandle.a" || die + fi + + find "${ED}" -name '*.la' -delete || die } pkg_postrm() { diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.1.ebuild index e5ba87bba74e..30de84a18b56 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.10.1.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="icu libedit nls selinux static-libs" RDEPEND=" @@ -25,11 +25,6 @@ DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" -PATCHES=( - "${FILESDIR}"/${PN}-5.3.0-libdir.patch - "${FILESDIR}"/${PN}-6.7.0-fix-porting-to-6.7.patch -) - src_prepare() { default @@ -73,6 +68,8 @@ src_configure() { --enable-static # Doesn't do anything beyond adding -flto (bug #930947). --disable-lto + # The default value causes double 'lib' + --localstatedir="${EPREFIX}/var" --with-crond-dir="${EPREFIX}/etc/cron.d" --with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-udev-rule-dir="$(get_udevdir)/rules.d" @@ -93,9 +90,15 @@ src_install() { emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev + # Not actually used but --localstatedir causes this empty dir + # to be installed. + rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die + if ! use static-libs; then rm "${ED}/usr/$(get_libdir)/libhandle.a" || die fi + + find "${ED}" -name '*.la' -delete || die } pkg_postrm() { diff --git a/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild index a82129f2ccf9..ce66faf7bc7b 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic systemd usr-ldscript +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/" @@ -11,8 +11,8 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="icu libedit nls selinux static-libs" RDEPEND=" dev-libs/inih @@ -25,11 +25,6 @@ DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" -PATCHES=( - "${FILESDIR}"/${PN}-5.3.0-libdir.patch - "${FILESDIR}"/${PN}-5.18.0-docdir.patch -) - src_prepare() { default @@ -71,11 +66,13 @@ src_configure() { # https://www.spinics.net/lists/linux-xfs/msg30272.html local myconf=( --enable-static - --enable-blkid # Doesn't do anything beyond adding -flto (bug #930947). --disable-lto + # The default value causes double 'lib' + --localstatedir="${EPREFIX}/var" --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) @@ -85,12 +82,31 @@ src_configure() { } src_compile() { - emake V=1 + # -j1 for: + # gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'. Stop. + emake V=1 -j1 } 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 - gen_usr_ldscript -a handle + # Not actually used but --localstatedir causes this empty dir + # to be installed. + rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die + + if ! use static-libs; then + rm "${ED}/usr/$(get_libdir)/libhandle.a" || die + fi + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload } diff --git a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild index d082ee12b4f2..7863115e61b6 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 ~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 index 1ce476e005a5..48fe18a4a712 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.9.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="icu libedit nls selinux static-libs" RDEPEND=" diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 99794d263e7a..9b9fdd0b90e2 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,12 +1,8 @@ -DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469 SHA512 4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8 -DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df SHA512 be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926 DIST zfs-2.1.15.tar.gz 35209038 BLAKE2B 61f9e14c54d43d1c51269917bb3ffde0530166126ea0467103ff1171dffc537315fd21c270d12f73d677e121b8094af39dd0a1fe3f80986bb42dc16d627dff52 SHA512 24096f2a6ecb3cc51f3d2f11cc69ad134d6fc33667007277c50cf798be2b19b6ddfa9be6923ca53d8b09f0bebae14c44d74811ec776e5aaf4ea0e810844c1f3d DIST zfs-2.1.15.tar.gz.asc 836 BLAKE2B 897c05a8870cd0418493b42fe854ef5b28f9a31513ac262a25631089defa59190808b51bd31e43412b01171bcac0dff0608d417dfdacfeee0b0f067e0627d48f SHA512 a6c5a9d214070a220716075455eb1cb85a53fb20b5fe4319f112cde0653a25f87b66d0f0bcf0ca641e3ac38239759cb9df6ed7f4700056a2732cc8c1ccd9ce05 -DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332 -DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625 SHA512 110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b -DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b SHA512 e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d -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 +DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745 +DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4 +DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463 +DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809 diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch deleted file mode 100644 index 54121adcdca3..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-arm64-neon.patch +++ /dev/null @@ -1,100 +0,0 @@ -https://bugs.gentoo.org/904657 -https://github.com/openzfs/zfs/issues/14555 -https://github.com/openzfs/zfs/commit/976bf9b6a61919638d42ed79cd207132785d128a - -From 976bf9b6a61919638d42ed79cd207132785d128a Mon Sep 17 00:00:00 2001 -From: Shengqi Chen <harry-chen@outlook.com> -Date: Tue, 9 Jan 2024 08:05:24 +0800 -Subject: [PATCH] Linux 6.2 compat: add check for kernel_neon_* availability - -This patch adds check for `kernel_neon_*` symbols on arm and arm64 -platforms to address the following issues: - -1. Linux 6.2+ on arm64 has exported them with `EXPORT_SYMBOL_GPL`, so - license compatibility must be checked before use. -2. On both arm and arm64, the definitions of these symbols are guarded - by `CONFIG_KERNEL_MODE_NEON`, but their declarations are still - present. Checking in configuration phase only leads to MODPOST - errors (undefined references). - -Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> -Signed-off-by: Shengqi Chen <harry-chen@outlook.com> -Closes #15711 -Closes #14555 -Closes: #15401 ---- a/config/kernel-fpu.m4 -+++ b/config/kernel-fpu.m4 -@@ -79,6 +79,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [ - __kernel_fpu_end(); - ], [], [ZFS_META_LICENSE]) - -+ ZFS_LINUX_TEST_SRC([kernel_neon], [ -+ #include <asm/neon.h> -+ ], [ -+ kernel_neon_begin(); -+ kernel_neon_end(); -+ ], [], [ZFS_META_LICENSE]) - ]) - - AC_DEFUN([ZFS_AC_KERNEL_FPU], [ -@@ -105,9 +111,20 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [ - AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1, - [kernel exports FPU functions]) - ],[ -- AC_MSG_RESULT(internal) -- AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1, -- [kernel fpu internal]) -+ dnl # -+ dnl # ARM neon symbols (only on arm and arm64) -+ dnl # could be GPL-only on arm64 after Linux 6.2 -+ dnl # -+ ZFS_LINUX_TEST_RESULT([kernel_neon_license],[ -+ AC_MSG_RESULT(kernel_neon_*) -+ AC_DEFINE(HAVE_KERNEL_NEON, 1, -+ [kernel has kernel_neon_* functions]) -+ ],[ -+ # catch-all -+ AC_MSG_RESULT(internal) -+ AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1, -+ [kernel fpu internal]) -+ ]) - ]) - ]) - ]) ---- a/include/os/linux/kernel/linux/simd_aarch64.h -+++ b/include/os/linux/kernel/linux/simd_aarch64.h -@@ -71,9 +71,15 @@ - #define ID_AA64PFR0_EL1 sys_reg(3, 0, 0, 1, 0) - #define ID_AA64ISAR0_EL1 sys_reg(3, 0, 0, 6, 0) - -+#if (defined(HAVE_KERNEL_NEON) && defined(CONFIG_KERNEL_MODE_NEON)) - #define kfpu_allowed() 1 - #define kfpu_begin() kernel_neon_begin() - #define kfpu_end() kernel_neon_end() -+#else -+#define kfpu_allowed() 0 -+#define kfpu_begin() do {} while (0) -+#define kfpu_end() do {} while (0) -+#endif - #define kfpu_init() (0) - #define kfpu_fini() do {} while (0) - ---- a/include/os/linux/kernel/linux/simd_arm.h -+++ b/include/os/linux/kernel/linux/simd_arm.h -@@ -53,9 +53,15 @@ - #include <asm/elf.h> - #include <asm/hwcap.h> - -+#if (defined(HAVE_KERNEL_NEON) && defined(CONFIG_KERNEL_MODE_NEON)) - #define kfpu_allowed() 1 - #define kfpu_begin() kernel_neon_begin() - #define kfpu_end() kernel_neon_end() -+#else -+#define kfpu_allowed() 0 -+#define kfpu_begin() do {} while (0) -+#define kfpu_end() do {} while (0) -+#endif - #define kfpu_init() (0) - #define kfpu_fini() do {} while (0) - - diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch b/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch deleted file mode 100644 index 6d72389fdb25..000000000000 --- a/sys-fs/zfs-kmod/files/zfs-kmod-2.2.2-autotrim.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/923745 -https://github.com/openzfs/zfs/issues/15453 -https://github.com/openzfs/zfs/pull/15781 -https://github.com/openzfs/zfs/pull/15789 - -From a0aa7a2ee3b56d7b6d69c2081034ec8293a6d605 Mon Sep 17 00:00:00 2001 -From: Kevin Jin <33590050+jxdking@users.noreply.github.com> -Date: Wed, 17 Jan 2024 12:03:58 -0500 -Subject: [PATCH] Autotrim High Load Average Fix - -Switch from cv_wait() to cv_wait_idle() in vdev_autotrim_wait_kick(), -which should mitigate the high load average while waiting. - -Reviewed-by: Brian Atkinson <batkinson@lanl.gov> -Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> -Reviewed-by: Alexander Motin <mav@FreeBSD.org> -Signed-off-by: jxdking <lostking2008@hotmail.com> -Closes #15781 ---- a/module/zfs/vdev_trim.c -+++ b/module/zfs/vdev_trim.c -@@ -194,7 +194,8 @@ vdev_autotrim_wait_kick(vdev_t *vd, int num_of_kick) - for (int i = 0; i < num_of_kick; i++) { - if (vd->vdev_autotrim_exit_wanted) - break; -- cv_wait(&vd->vdev_autotrim_kick_cv, &vd->vdev_autotrim_lock); -+ cv_wait_idle(&vd->vdev_autotrim_kick_cv, -+ &vd->vdev_autotrim_lock); - } - boolean_t exit_wanted = vd->vdev_autotrim_exit_wanted; - mutex_exit(&vd->vdev_autotrim_lock); - diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild deleted file mode 100644 index 5b5d9f647ee9..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.14.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# 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.5 -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-${PV%_rc?}" - - 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 ppc64 ~riscv ~sparc" - fi -fi - -LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0/${PVR}" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -BDEPEND=" - dev-lang/perl - app-alternatives/awk -" - -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 -} - -pkg_postinst() { - 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-2.2.2-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild deleted file mode 100644 index 6f4cf5107e3f..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2-r1.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# 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.6 -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 - "${FILESDIR}"/${PN}-2.2.2-arm64-neon.patch - "${FILESDIR}"/${PN}-2.2.2-autotrim.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-2.2.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild deleted file mode 100644 index b46dea36c184..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.2.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# 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.6 -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 - "${FILESDIR}"/${PN}-2.2.2-arm64-neon.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-2.2.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild index bf0cdfe58be6..1eb122934d00 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild @@ -31,7 +31,7 @@ else ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" + KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" fi fi diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild index 79b2c443b06d..8f1c08d298b6 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.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.10 MODULES_KERNEL_MIN=3.10 if [[ ${PV} == 9999 ]] ; then diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc1.ebuild index 903e8e571c0f..25ff548135e4 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.3.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc1.ebuild @@ -9,8 +9,8 @@ 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.7 -MODULES_KERNEL_MIN=3.10 +MODULES_KERNEL_MAX=6.11 +MODULES_KERNEL_MIN=4.18 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/openzfs/zfs.git" @@ -31,7 +31,7 @@ else ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" fi fi diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index bf0cdfe58be6..8f1c08d298b6 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.9 +MODULES_KERNEL_MAX=6.10 MODULES_KERNEL_MIN=3.10 if [[ ${PV} == 9999 ]] ; then diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 99794d263e7a..9b9fdd0b90e2 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,12 +1,8 @@ -DIST zfs-2.1.14.tar.gz 35167471 BLAKE2B a7b22eaf05e4fbf416ebe4d7b884c515942fc9375c1dd322cefa00c19c550b9318a4192d6a909d49d58523c8f1a6eaf00189dd58e6543fae17cf8cc35042f469 SHA512 4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8 -DIST zfs-2.1.14.tar.gz.asc 836 BLAKE2B f01bc58bf6c3d367c494ed4ea9f3fb1141f3aafdbf4f913b9e0d60d31557076d5ae0e25ca93b013f5fd85e21ba5ae9f61e1a03af54bb0c743869c0ce3d5519df SHA512 be0f386cce952b4047dc2448e356078668e8d4392802dd3bb1a426741f15f4d9fb689cd1cb09972bdbc9fe2e4e782ec4b4754fe811c5657bc1f5308bd38e3926 DIST zfs-2.1.15.tar.gz 35209038 BLAKE2B 61f9e14c54d43d1c51269917bb3ffde0530166126ea0467103ff1171dffc537315fd21c270d12f73d677e121b8094af39dd0a1fe3f80986bb42dc16d627dff52 SHA512 24096f2a6ecb3cc51f3d2f11cc69ad134d6fc33667007277c50cf798be2b19b6ddfa9be6923ca53d8b09f0bebae14c44d74811ec776e5aaf4ea0e810844c1f3d DIST zfs-2.1.15.tar.gz.asc 836 BLAKE2B 897c05a8870cd0418493b42fe854ef5b28f9a31513ac262a25631089defa59190808b51bd31e43412b01171bcac0dff0608d417dfdacfeee0b0f067e0627d48f SHA512 a6c5a9d214070a220716075455eb1cb85a53fb20b5fe4319f112cde0653a25f87b66d0f0bcf0ca641e3ac38239759cb9df6ed7f4700056a2732cc8c1ccd9ce05 -DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332 -DIST zfs-2.2.2.tar.gz.asc 836 BLAKE2B bdc86492b2bf45d329e34e89ea7796f5cbf518d32ab114c909321b1d0d8040b9ce4e25b3b85fcbc5ea62ee10a2d716b5b27e37c2c005b307c0b593815c49d625 SHA512 110be1aa90f4749106717165a3cb5116379e2d170146a2b3d2601f04212450da9327e028d6e1e5de7f8a46c6bb7a15e2bcdd09e3e760590fbc695f9562f1440b -DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b SHA512 e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d -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 +DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745 +DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4 +DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463 +DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809 diff --git a/sys-fs/zfs/zfs-2.1.14.ebuild b/sys-fs/zfs/zfs-2.1.14.ebuild deleted file mode 100644 index 5dcfd94d6ae2..000000000000 --- a/sys-fs/zfs/zfs-2.1.14.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# 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..11} ) - -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}/${P%_rc?}" - - if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 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" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:0= - !minimal? ( ${PYTHON_DEPS} ) - pam? ( sys-libs/pam ) - python? ( - $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') - ) -" - -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 ) - sys-fs/udev-init-scripts - app-alternatives/awk - 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=( - # bug #854333 - "${FILESDIR}"/2.1.5-r2-dracut-non-root.patch - - "${FILESDIR}"/2.1.5-dracut-zfs-missing.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 - - # 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 - - # All the same issue: - # Segfaults w/ GCC 12 and 'zfs send' - # bug #856373 - # https://github.com/openzfs/zfs/issues/13620 - # https://github.com/openzfs/zfs/issues/13605 - append-flags -fno-tree-vectorize - - 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) - --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-2.1.15.ebuild b/sys-fs/zfs/zfs-2.1.15.ebuild index 5dcfd94d6ae2..aae1320ceadd 100644 --- a/sys-fs/zfs/zfs-2.1.15.ebuild +++ b/sys-fs/zfs/zfs-2.1.15.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +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 diff --git a/sys-fs/zfs/zfs-2.2.2-r1.ebuild b/sys-fs/zfs/zfs-2.2.2-r1.ebuild deleted file mode 100644 index 80914d259c33..000000000000 --- a/sys-fs/zfs/zfs-2.2.2-r1.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# 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..11} ) - -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" - -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*') - ) -" - -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 -) - -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) - --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-2.2.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild index 5264247e69af..962beb163214 100644 --- a/sys-fs/zfs/zfs-2.2.5.ebuild +++ b/sys-fs/zfs/zfs-2.2.5.ebuild @@ -25,7 +25,7 @@ else S="${WORKDIR}/${MY_P}" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" + KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" fi fi diff --git a/sys-fs/zfs/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild index 71e2889ab794..5264247e69af 100644 --- a/sys-fs/zfs/zfs-2.2.4.ebuild +++ b/sys-fs/zfs/zfs-2.2.6.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=" @@ -222,6 +223,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}") ) diff --git a/sys-fs/zfs/zfs-2.2.3.ebuild b/sys-fs/zfs/zfs-2.3.0_rc1.ebuild index 950fccc9ba5f..f0e4486cb2ec 100644 --- a/sys-fs/zfs/zfs-2.2.3.ebuild +++ b/sys-fs/zfs/zfs-2.3.0_rc1.ebuild @@ -25,7 +25,7 @@ else S="${WORKDIR}/${MY_P}" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" fi fi @@ -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=" @@ -105,7 +106,6 @@ 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 ) @@ -222,6 +222,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}") ) diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index d54b8ffe39b1..53bc008f5132 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -33,7 +33,7 @@ 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" +SLOT="0/6" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" DEPEND=" |