diff options
Diffstat (limited to 'sys-fs')
250 files changed, 5000 insertions, 3931 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 385bf990317b..0436695656fa 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index 7add54191981..5910b11a3af3 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1,5 +1,7 @@ AUX android-file-transfer-linux-4.2-gcc13.patch 641 BLAKE2B 5e3b17588a1d1822fc8eef582aa1abcc821691b3ccaefc4a2b6ef6aee46eac86846ead67614aa624a7d4f7c4a35739f40c3b28ce2507b3ae6718614e29c15aaf SHA512 066f5a7d60c7c26af3e7608111da305c60cc4029ad95e24fb27dc2fd25e9b151b077e611163f9425646acc73bb2025db45895a758f327159741a309ee062eaee DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 -EBUILD android-file-transfer-linux-4.2.ebuild 1577 BLAKE2B c34b9657d09b2e37654525af29a3167dcb8d7bc8394062449d3b03359f5374517912a25eb6296fb2743c69330ca1281f6004f4cba448ab08b477739d8af4432b SHA512 5a99730a6f5beef2c0d1264d92b156bdc477fababe0f8277c28935c3eef87f721968e3143e545a4f6727d2278e7e0642fed31b251347e479afa98b289c8517ef -EBUILD android-file-transfer-linux-9999.ebuild 1528 BLAKE2B 2a9cc10eb1a72f6a30eb8c08b72709db16772edfebcb4471f35397ad5cdd481c79db5d1968585d01325916c5cf515f6f8ffb0f227bca77f2dee33e03cabdeba8 SHA512 923328d98652bfc3d75f5e729b719580a908f3dc670e3a1bf3a19bf17b413ec7dcdcaf8a7c3a9e1408180ca8df18539884657c2e7b51b4bdbf08089705576b4f -MISC metadata.xml 404 BLAKE2B 09a744466822e45ff378269c52b5aea8192b203bb1a6364de5e23690994ee57906ebeb28be99f8a3569f62ebfdfdc07497cdd28809cfc21014c67fb80b755e42 SHA512 7650fb9e5b3b86aa0233a2429ccc65bd144065e3e349fa1f1147570377a4f33b3663fffcc73a42416453e317bbf2c7bbd33baabc497a838cc91c705999b97497 +DIST android-file-transfer-linux-4.3.tar.gz 827232 BLAKE2B 3737b804cc9c7a2883d7a9a1e4a65379d53f89104dc4f0d82959ed8eba35ffa1998677a4ef441f2c35389dec9e3b31822e8843994ad7d7669cc49e4593b41fe9 SHA512 f5e51ad1532be44916df51dda5f6f7423a5b0d8ebd733a0a3f0424f684b9f84fc5996fb5effd45009eb1c60d873f79e8ecc47a9dc09ff429b4a458807a79ca8c +EBUILD android-file-transfer-linux-4.2.ebuild 1578 BLAKE2B 0fef85680683eafd6f72fb3091162187677d0bba661aaf2a023e85bdf22ef148bbec92795d49636b77d19b2f27e5342921d58923dfa14fdc208e6e00ee49cada SHA512 cbfd7a874d1b5f86b2cc0f10a24886a183de04871218585443e9420703fed2dd19a1f8d01f93107d4077f9c44ad91817a0de8d28fadfa1cf3d480c3fb654c37f +EBUILD android-file-transfer-linux-4.3.ebuild 1529 BLAKE2B 1e7a0eba880f48100f10fd43107e84b98bad3a2ac17cfafabe802ed36f1c1b79820dcc7647110f401b77dc986a9a47644faec5f8618249e358f219aba8857640 SHA512 d43c339ff942d6c3a917b422ca010feca6cafb6b26d3bdc754746ce3bc88d260f41206f7d182171adcf56a57e844493ef4f4c1b5fafc9301ae14cd33b4ab32cc +EBUILD android-file-transfer-linux-9999.ebuild 1528 BLAKE2B 716e98ba2d90a229458eed6e6069e762365423d19f8c7fe2f707fcd44fcbcb6c0894da678dbbe94e6d9d8ad1bf5eefb0fdda1b86e94cc1905c6d324255d495f1 SHA512 d3ec23c3d4ce500b712199d1e301ac5ae2a2a762dfbb5e50a0c088d15ed5a1d6edb7f7b6b4199ae5d105ec29d4c745e5fb2b6e3ef1f2483ed42b123c6f4e2d45 +MISC metadata.xml 646 BLAKE2B 83f126f158295a2d70be8d70dec4d5846e258a60660d8e3c76acb9f103d3c2fbdd149ab327135eeace0334812c311194faa611863aba431601a35a725dfdeeb0 SHA512 598733dd286ba4f69f329b8d35c78906bfb2817aa77ddbe12e22654973fdd1ff8f71533dd5daf777c32ced75963f3e0dd84881f4e4a69b6bc16f4e95ad767f3a diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild index 33a9407c95aa..ae4c96bbe345 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 xdg diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild new file mode 100644 index 000000000000..21dd11557c46 --- /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 6e72c38e8220..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 @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 xdg @@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]] ; then EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git" else SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="LGPL-2.1" 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/apfsprogs/Manifest b/sys-fs/apfsprogs/Manifest new file mode 100644 index 000000000000..7f029630d8a0 --- /dev/null +++ b/sys-fs/apfsprogs/Manifest @@ -0,0 +1,3 @@ +DIST apfsprogs-0_pre20240521.tar.gz 202087 BLAKE2B e0fabc489b8719522e2da3ce8ca1f3ed1f1d9bef7ea1b1935f09d250adba2e6369e9df84bed2e883846bd0eb152deed9de5ab801482817ac65538501627ca6ff SHA512 ad49350464abbdc6c0ca899135265fc6dffe96865d378e8c6105f17ec75e1f3bca2ddfc40ab2b838cd129357607aa33e92e12e30c82a6a1361a343844773d593 +EBUILD apfsprogs-0_pre20240521.ebuild 751 BLAKE2B 8d0b1ec4c8eaecbf34e1ea623527b29dbd8cd0865a2c86cc3138835a962f6a79b40308cd9a1edc5e2cdf4fb9b4fc4f8a0572a997a317df4279adc7919918562e SHA512 17a13b134cb58025fbe299417f0ec2f80ae759cfaaea31b2d507a4e913a39c28728c52bd941c6275d432e1dbe77473408ba6db5a629b485844be5e94b55eda77 +MISC metadata.xml 330 BLAKE2B d0acdebe9bff20f0dbb1fd142dbfb2c7f92c31a0bb627085fe983a19a58ce07d19bb9b0cb1305601b0f29dc32b75c50314fa72ec2a7864c4b42e7572f47f5e36 SHA512 9b1105879c319d5e02135e1b83e2452907edc071e1a281c6d18a375549f912961503642e3e33e94cae92344cde185d3663eb0a138cf37fffed83c70bb03af75e diff --git a/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild b/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild new file mode 100644 index 000000000000..13019944cdb4 --- /dev/null +++ b/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild @@ -0,0 +1,29 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +EGIT_COMMIT="28c0053dcb77efc267b57013702c17007c21d942" +SRC_URI="https://github.com/linux-apfs/apfsprogs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${EGIT_COMMIT} +KEYWORDS="~amd64" +DESCRIPTION="Experimental APFS tools for linux" +HOMEPAGE="https://github.com/linux-apfs/apfsprogs" +LICENSE="GPL-2" +SLOT="0" +APFSPROGS=(apfs-snap apfsck mkapfs) + +src_compile() { + local prog + emake -C lib || die + for prog in "${APFSPROGS[@]}"; do + emake -C "${prog}" || die + done +} + +src_install() { + local prog + for prog in "${APFSPROGS[@]}"; do + emake -C "${prog}" install DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man/man8 + done +} diff --git a/sys-fs/apfsprogs/metadata.xml b/sys-fs/apfsprogs/metadata.xml new file mode 100644 index 000000000000..9153843468c1 --- /dev/null +++ b/sys-fs/apfsprogs/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">linux-apfs/apfsprogs</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-fs/arm-fdisk/Manifest b/sys-fs/arm-fdisk/Manifest index facedc8efe0c..49f7f11d032b 100644 --- a/sys-fs/arm-fdisk/Manifest +++ b/sys-fs/arm-fdisk/Manifest @@ -1,4 +1,4 @@ DIST acorn-fdisk_3.0.6-6.2.diff.gz 5580 BLAKE2B d4c70c874cb60b02403edadd51a2547781f78efe7a09f3d776c1ce3a135a07f1c856e640f5cf0e2a1308ff80541f9a0c68cadfa44f10000bd81f576fc823ce2a SHA512 076587945548f10fef92a93910aee670927a2de9b1b32fd1b4ab72b1cfc26440177745f09b62f9b903987e3802060f4e278e1647ee12b7e2f29a0fd7b36ff188 DIST arm-fdisk-3.0.6.tar.gz 62266 BLAKE2B e9554325562fd8fa03b896927fd9dca4cd61b86a4dd1a9d0bcc8aff638e0f0d1a9bca5c5b4bdf7bc9f1799f712497c8677af74f5204646bd505bc107818dfecf SHA512 954c1112c8108da676a0c4223de3a7b0320a37286b0ed099f3000bf4777ebb483b0b62eb0a5dd480f775c503020e7d9ed6ef737ef7bbc5bce858ae68aa471a3f -EBUILD arm-fdisk-3.0.6-r1.ebuild 938 BLAKE2B e1ab3bf63e3600befd18ceeb0a51a544d10437e111c6869b23092ef6628ac6723d57387b60d9db72689feb533952e891a34302a307bd833dd81e4bfb87dd676e SHA512 dd9e40480347954906230717391d14e563f5f25568c980f0deaa601609e33cc2e5a118d0d638ff17908acfb316dcd896a041211a92603b941b5099b7baf49d12 +EBUILD arm-fdisk-3.0.6-r1.ebuild 932 BLAKE2B 3548c47639d138969bd58964fbda17514b9c6af0e0e199a70bf8dffd639b41705ca6428d6d88bda98478a854b6ec83e8352e0d2989c070e170c1de653ed636ce SHA512 16b3b8f1b718c5dd461492b73079f6d3b01cbd67c1b8ff322ead21178d72f040895bb4aa88cee6d51306d56cd63a18222a910706540c7fd098bcb289fe3aa372 MISC metadata.xml 249 BLAKE2B 1cef6fb3a8037811fdb17d0dfdbd4ce3c0b2b73344a0e33dd82d42bf7c8579f6a1cc8dbb1d9bc456ac9b6b9ba5939a2eb84682c53536476ce0bf63922dcb77b2 SHA512 2100a45ba6aeaf11dd920bcf900f8792974c5752e4df2b741d65532b548dccea06eef5be0e9c382789a132c0a768213836d7376a81acd9186f80d68c0ed48344 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/atari-fdisk/Manifest b/sys-fs/atari-fdisk/Manifest index 07d437a6aadc..b357e219c2b8 100644 --- a/sys-fs/atari-fdisk/Manifest +++ b/sys-fs/atari-fdisk/Manifest @@ -2,6 +2,6 @@ AUX atari-fdisk-0.7.1.5.4-gcc-5-inline.patch 722 BLAKE2B 8c1e0697b77c34aeb90d6d0 AUX atari-fdisk-0.7.1.5.4-globals.patch 738 BLAKE2B 1fff18d8a260e1fb932a2f3b4d77627c92dede478a9dbd15aa6bc7d4d9a75b2dec05b037a02feb9dd57f18643a70dad11a79557c195c44f49c48779440f6f813 SHA512 f58f9b2cbaa5f09734c54c50ee8f4e949354a04fc07d4e815d926783b784b9c605c54cc80a4b1c0f5d1f20977c2edf6672687a9814b4e7c7419d31a009528252 AUX atari-fdisk-0.7.1.5.4-prompt-logic.patch 495 BLAKE2B 4c4224850c10cefaa0d85f14f6f12d048808ad75314cff755785bec07d12e123b2f4520533c61c60d5c06d52137309c4e08ae9ccfff2fe9cd0e546611b2aba6b SHA512 7be32b061f2aaea03579282e9df5b78d207b823551ffeb91a20a96bd28fc57969e21b7e54da2af15bd0c74ea346ef904dee798405b61a593bd9149064b9bbec5 DIST atari-fdisk_0.7.1-5.4.tar.gz 47576 BLAKE2B 42154c48399a47aafbbddfe6bacfdb9997b2b6d93f7548c60e8b614fbc3abbef448ea514a168b39590c1c907a5b7d881ce58fa8c25fa41d24680d1786ca4bc15 SHA512 014be9a92b19f81901f814308b0f380df77de712f1e3f69438cf7ae7c57c53111cfc39f60899facd04af8b5457e980fdc689bfbfe2a91e5c2a0de8446a724961 -EBUILD atari-fdisk-0.7.1.5.4-r1.ebuild 1146 BLAKE2B 55e0c5180255f990d7fa251ef2cb5450a7c9acd29d841c056a103e9ddeefdbf78d760ab36349e8a07af06ebd0f86645c5c2d6bc29c916949250e6c008903f0fe SHA512 2f794e7630ae380818e69708ca7663306884c8472b673a93e2f5b9c5ed742b99a1ee8be312ab67e11eb9b21dc5d835456849bdebc2e8098a26d23ee9513dc3c1 +EBUILD atari-fdisk-0.7.1.5.4-r1.ebuild 1145 BLAKE2B b557610452ffd5e1f091a6864a1a7252684914cb535d667e58ff2c3f850b509277b4b5d9a679a462be5f8154d21d4666b32cb4b4e2357f80c41a69e611879968 SHA512 af091481c36786f4464daf70484bd6d1bc017d12a55e64e4383020cd8f5f8610e4e27e6f0803406be5929a8d157c3ed2c3aecb9d7f687239cdcc477e32266d2e EBUILD atari-fdisk-0.7.1.5.4.ebuild 1157 BLAKE2B a0d6560c4c5a6514eb82a198e2a79c33fb71114b688939ee26c2a944b308690b4e027550dba3cb2a1921f2514112785e102b397838bec24763607e54c26d82ba SHA512 4dc4c2e2853d8f9584e5cfa1933a8d6eb747a6e95d1e2db60fcc5d4ccf6844fb58affcdea0f4173b0e2d5cbff3c436f4a29b8a51c4da3dfb82a8ac28b746f36e MISC metadata.xml 251 BLAKE2B fd40ac2ea8ddd78c9fbf3fdb366a69fc0c5880716c27ae23a479b0705878758f6d23cf57df64d1adbdee9c28a50405f744cf86f36f61f3438408108cc768d529 SHA512 a646a60836bf9e244ff4def00389cb0d8188108f41848a38f92fab71a90fb8400f4d1213e386af9f06b7653a63db2c68ecf657846902149e021b24d20ab2db48 diff --git a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4-r1.ebuild b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4-r1.ebuild index 1486e93742cc..7a680bdaa217 100644 --- a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4-r1.ebuild +++ b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" # Note: The code assumes sizeof(long) == 4 everywhere. 64-bit platforms need to # build a 32-bit binary below to avoid memory corruption issues. -KEYWORDS="~amd64 ~m68k ~x86" +KEYWORDS="~amd64 ~m68k x86" PATCHES=( "${FILESDIR}"/${PN}-0.7.1.5.4-prompt-logic.patch diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest index 897c81f3a059..e6ce9a429d69 100644 --- a/sys-fs/avfs/Manifest +++ b/sys-fs/avfs/Manifest @@ -1,5 +1,5 @@ -DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 DIST avfs-1.1.4.tar.bz2 614657 BLAKE2B a742f2e7fd4f97f2a3207cfe95d9358cfd895e4c047c39bbbf3ac0a35e1702542339f46199ba5f92868ceb48f009736a513431c0467ba49d9aacf73a667956ec SHA512 5caa7050e6b9cdce0b5ccd515af8233dc1e9226a97cdf3a3284ced5edd44fbde426049b4ce500ce1daf020d085f9f0a9f81eff339657e92ff2d09b1dec6e4267 -EBUILD avfs-1.1.3.ebuild 1625 BLAKE2B 42f6913b2c4ddce0a036d685d55d5050aa3d9d5f2d65e7909644bcaf62a05a475196acfe568466c5725b4f99d5a95eeba28bc4f85d11878cfe33234a374ff034 SHA512 93b3f4c34a4774418c5960e2f418436f3e9f276e08bba920c263f287d4ed5a42931eb499629221aaa5a23bf2d058a9e8c9d45b6013640eb5ede23392602a0919 +DIST avfs-1.1.5.tar.bz2 623927 BLAKE2B 3b4c3f1d510019c82c5c0f954f9ed35e6aebd0cd108ac33f5b89b3dc6e5ffb1ef88102c11351eea84f57922e377257e2e256f4e0fbe436efde669259f5b6c0d5 SHA512 03e9abbda17d7976f9c6e4f8a426ff0b85f626ba2942cb2ec17aff3239476d6de385d7d709d7f0b23e31fbde5bcf131e512d38354f78f7fdc04d4b6d0d593e1b EBUILD avfs-1.1.4.ebuild 1677 BLAKE2B 26b198c60a8161a8563519176a93ee973ba01f5633ed66a46575c5ffa50d0891aa0a06ded9cfcdf82628d5a141126d07f7809e1e2c849dcbe9cd9436b9cd3ade SHA512 a3b33bcb64790ec768c2e502c45a5b544288ce4b880e7f872ac9a971646431bf582eb3c30d97aa1b80b19c8a1febc324cf649bf64e7975896d00d56e9aa8c4e6 +EBUILD avfs-1.1.5.ebuild 1687 BLAKE2B 9cdf833da3c6329c95c10b799b85e08752e8b6276ab541b8c47aced6df69312883c521b45baf12c7640620ab9d75d586b0e62fb23879410c371c3038ed50560a SHA512 7a4caf35e58bca54d8b2581d7bccf9e4ba139f63bc2d702ddcf6b8b2dafb7cc27b9f01276e14435516df88617f572f8ffa959bebb6d0782f982fd8056f1dba14 MISC metadata.xml 422 BLAKE2B 5720c903e0e80fb62aa958a2827d912156187d2ea7c792bfa9f939419c5406d93ac136b177f5b3edf745fb584a533163c44a7218afe5c0b84857439d46ad1517 SHA512 73d2e76af54657a28041c64d078d55aa9da46265f0c1837cd7872e66152508bc1fe6dfb6fd18dac34a738c7cf6c12339975c3f0eefcb3f5c07684ef223ace50d diff --git a/sys-fs/avfs/avfs-1.1.3.ebuild b/sys-fs/avfs/avfs-1.1.5.ebuild index 0fdd72de754f..dfa4e6aa441a 100644 --- a/sys-fs/avfs/avfs-1.1.3.ebuild +++ b/sys-fs/avfs/avfs-1.1.5.ebuild @@ -1,42 +1,47 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files" +DESCRIPTION="Virtual filesystem that allows browsing of compressed files" HOMEPAGE="https://sourceforge.net/projects/avf/" SRC_URI="https://downloads.sourceforge.net/avf/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="+lzma webdav +zstd" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86" +IUSE="lzip +lzma webdav +zstd" -BDEPEND=" - dev-build/libtool - virtual/pkgconfig -" RDEPEND=" app-arch/bzip2:= >=sys-fs/fuse-2.4:0 sys-libs/zlib + lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils ) webdav? ( net-libs/neon:= ) zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/libtool + virtual/pkgconfig +" src_configure() { - econf \ - --enable-fuse \ - --enable-library \ - --enable-shared \ - --with-system-zlib \ - --with-system-bzlib \ - --disable-static \ - $(use_enable webdav dav) \ - $(use_with lzma xz) \ + myeconfargs=( + --enable-fuse + --enable-library + --enable-shared + --with-system-zlib + --with-system-bzlib + --disable-static + $(use_enable webdav dav) + $(use_with lzip) + $(use_with lzma xz) $(use_with zstd) + ) + + econf "${myeconfargs[@]}" } src_install() { diff --git a/sys-fs/bashmount/Manifest b/sys-fs/bashmount/Manifest index 629c997ebfc0..fad034f0bead 100644 --- a/sys-fs/bashmount/Manifest +++ b/sys-fs/bashmount/Manifest @@ -1,3 +1,4 @@ DIST bashmount-4.3.2.tar.gz 47450 BLAKE2B 0dc45580b62aa55872753de17ee50e77e716e87498193c8dab0998f5a70994ad5cc9434c104bc1d6cc77d75d63688afae8be8e0e8ee4344249ded5f1719051c5 SHA512 ac18d76dc27099524f4051299dc5421e1e5811e943df21d64a1405b5cdf6401189d78571596f27c89c0d76ab40874392c0c90756ef5fa9c036f447ac884ee062 EBUILD bashmount-4.3.2-r1.ebuild 617 BLAKE2B c03165b40a492feb0ab5fb0600fb58594a361dc452d966ed0f23823cc38a9166be509e83399161700a1536f6190e40b12b5ad5929d81e46332f598bf44f7923b SHA512 f044eed2a7762dbfa649859301ccfeef0e65784d3b5082bf970402d782c11b3f799a1d7373b9661b7461c3b50c0f577b3b8dfe5bd58ed2dcc6f391212ac8e966 +EBUILD bashmount-4.3.2-r2.ebuild 620 BLAKE2B 768d905023dfc299b984305983ece75656ad1a77c64d054c68c9fb8de9fc64e91b15bb7159ae31494496d21d9b939b2dcdceeb8dad14638a9205da3826a86c33 SHA512 69fd195314574b3ab12ebf996bb8c611cc9c2f7ca00c3c7aa586db81628d927be574a2bb437b35bcbb0d38c66b677b94aafc5bf98915aa5b06f48205f5659ef1 MISC metadata.xml 327 BLAKE2B 8cac6be6f6e1547ec7db00b20b3c5b050c14983f0f1c6cdc2589584db58dceef0801563e32ea07b9486557666c9d5cd8e9f0fe1640e585612830f728eb9ab77b SHA512 6f2d50b1abe2e4997f65d7e1616bc3e4e6bd76aea7a5e0d9a52cfd59500b3d4b8e8ef67dcfc14436b9cc00abbffcddadc5f57f1afce774f654d873a5c3c88466 diff --git a/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild new file mode 100644 index 000000000000..834ce078e693 --- /dev/null +++ b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Bash script that uses udisks to mount removable devices without GUI" +HOMEPAGE="https://github.com/jamielinux/bashmount" +SRC_URI="https://github.com/jamielinux/bashmount/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +# sys-apps/util-linux -> lsblk +RDEPEND=" + app-shells/bash:* + sys-apps/dbus + sys-apps/util-linux + sys-fs/udisks:2 +" +DEPEND="${RDEPEND}" + +src_install() { + dobin ${PN} + insinto /etc + doins ${PN}.conf + doman ${PN}.1 + dodoc NEWS +} diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index 33bfc57eb1a6..0925054cd628 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -1,132 +1,84 @@ -AUX bcachefs-tools-1.4.0-fix-clang-musl.patch 755 BLAKE2B 546364ad0729910aab6a27ae6b7db1e242f5630c69653140a23dfd55c11a49743b45b7b57f9a8af71bd5f11f2ac23e1f5786194eb1647dd3795beb1ca52b1ea0 SHA512 f38bd27a87b38f7d47bcb61e25341a7a36717ba90879cf1431643e24378d39b42c9b077ff267dc6de69a58d6fe659fee6f6516150ae58959a088d99e8be68bc2 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c -DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8 DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 -DIST anstyle-1.0.2.crate 13983 BLAKE2B 4274b101d1cab2b62f9bb7637dab35f4b16e8c08a080355a2ea53e2b7b353ff230aa77fb3a244e0d6ff0dcd27abe5895eb306c630aa0822d0c608f041d4abfea SHA512 09220abfc844192ca698589897845752e02666b4ecd6529af4cde9f260ef36694e6e631c7503fc0e438ac72c88c419043b78399385cb248e789e86404503935a 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-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 -DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a 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-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 -DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 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.7.0.tar.gz 1103425 BLAKE2B 952310999035465a4e8621e8e3ef65e5a3ba50d40a0ca76a3ca8b7265bab2f33c40981d2ca83ef3ecc70a5da9cff0d002d2f9676aa6355d1717a0dad968828af SHA512 5f7934997c0cd6b893c67a87e9cb5060cdd37857d6761356bdb1c96572b67ea3a2c03c43fcbd8beb01b0cf9c30da3297d082ef40bb312f5ca40c85faa46cdd3a +DIST bcachefs-tools-1.9.4.tar.gz 1132203 BLAKE2B 447881b52dcaa3990a4c233523bf8c2b3faf4755f3a0fad315ca17fa900e2192b9a2168f22a3ac8c59ad2756999f8a6792b732a527510361044b541fec6ce26b SHA512 8a6a2896620c4e1aa3abd26a2e59087d417b5d546ee6dc1130a59e06c8e8561e8de29edeb1d5dd3c5223be8338a8b4265ad3e753c830f475413ed83a0d968dd8 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 -DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 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 clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9 -DIST clap_builder-4.3.24.crate 162489 BLAKE2B befbbc2f379d8b6bfe538cf86a0f27927a4f9ed73e7224df980241c2ad6acbf79a56cab74b3f337d09ce26a5b0c9e9f60226ecce58b6b2ae0dcbdd49a3df6ccc SHA512 e81d73bd3bef181c945856bd2402ec52a100d38ffc223bf485186c4618076d38c277dd85b21e2391471de463dbe3f2fcdf59e115576be8dbef330d888fdc05e9 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_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b -DIST clap_derive-4.3.12.crate 29052 BLAKE2B 501fb22eddca5b21456bd9911ad1f90ee5d5c918eedd08e2615d22ce58bb0fa5dd626b51a734f20b78411b9a4492ae63629131e0c2e1bd0f3eee21e5da3fb37f SHA512 a58e948fddf45321f0fcfe9d9afbeff42849da472fc4e4b15c31f46ffe55a0dba34d2c1d14e342530c1e4080c43de790595e4f3dca06cbb6a8a60f9e3cab3abc 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_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 -DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb SHA512 c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1 -DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d 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 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.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966 +DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f 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 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 libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab 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 log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e -DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 +DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 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 owo-colors-4.0.0.crate 30984 BLAKE2B fa64a9097745eff2b00d8587ca119a3f4163c43265dcfe75162be09ffd556b132c24aa5217b99c3b10feddb365e71b01006a62a664ad8968d4bf6a716291148f SHA512 25a606e9e6a17a4ec21b9298707478d904ba1f30862ce855f4223b3273fb3d0323540b6b628c067edc0c9291cd7c370beb298ec000cd679068624031ac9e66ce 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 pkg-config-0.3.29.crate 20563 BLAKE2B ed0559b0073890911fb47742743b2586123bf9e9b594aa0d5b2c419c6768cd37e25b546c21077ea6cc02823a679b302aeaaca6c7fcaf9aeec615dd08f53a1f6f SHA512 bac7dafc0e10bef40e427c1fc0271d1a26acb2f5b1cf7cc7a128f4d4f1f3110529e45057b71cea7b0f6ddff26945fe08962285ddeb22b54639e44a2e43af698f 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 proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 -DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c 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 regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d -DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 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-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 -DIST rpassword-4.0.5.crate 10731 BLAKE2B b52325990109ad9b275429c3c2f098eeed631e3a41b02ff0decacf55d66e1b66df98d13c169b8eed727fbc523fa1cb770d206dfcbcc86a6c08f52029233296d5 SHA512 f1d3a76318687f9e5b218a936e43afc144f4a48647d55324409651cd5a39fc07b23732766433bd8a4d3a5370ceedf5bd2dad3007f0ba1d75bf8ac610e684c19d 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 shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f +DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f +DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 -DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d -DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3 +DIST strum_macros-0.26.2.crate 27056 BLAKE2B c9df13a91dd08f8bba0dfeec4fc03b59cd74eafaace7d2d228b8636264a9ea11137d0be741a936f7290e09525586818726000f07ed84a5ae711b89d61f52e89e SHA512 519bc654adcf131d85d1ef83f62be2429f7472df25cf962fdc1cf5070d33c39dfe71f08fbf296df9b85fdfcda95cf2fea27e8e52e9ae93de27bb8fc4a5b55dd1 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 -DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a -DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed +DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a 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 udev-0.7.0.crate 17980 BLAKE2B ef62bfc3bebdea9fbc30d8c0de6989b0310da2b7efa65345e991b5ac85d39578a5cc9bf97558786f09806c790eae4a99ca7be29d35b8793a92c71bed07a9b91a SHA512 87aa3182c028911b23c6820408879f901dd674ff6fe95c8382ecdec3d4da9f3e19dc03b2435c72e7cf299af083d5de9a6b83a84a75de4c2483c97ea9c1950393 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 -DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55 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 +DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 @@ -146,9 +98,10 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 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 -EBUILD bcachefs-tools-1.4.0.ebuild 5642 BLAKE2B e36cd889bee4e0dbc8cb2cb42e07636aa9c79de0df23995e073006e6c478efdd91bcb91786e06e49137bbb677a15a65ced5be5eeea0e9d2aca8f68e236343268 SHA512 15699d44fe9adafe68ac50b17ae2bc3ddbeb0dddf8d7aa74277da8a8c8b682e4799f7567cc276041bb712ba4c127e84f58647cdd62198f712bf96a685341365a -EBUILD bcachefs-tools-1.4.1.ebuild 5563 BLAKE2B 4011b46e0e0f4d2fb7b5b3125c3ad258cf59c8768950a2415ed78bef96dedcbfec202df3ff0bdd9f4426f9f471bf3e7564adc0d225b3befd099321bb457a19a6 SHA512 f00a0571e93e8da12637e9f98b506f02b47f41ef2c223525e08058ee6758534362228f1ce68c2fda891ac7170e322049c07160abae1cdcc4e93e3b7e93711752 -EBUILD bcachefs-tools-1.6.4-r1.ebuild 5241 BLAKE2B 1fb30d4d2ae8deabbe02c5d1db7d20adf2787da35bbcea37cbcde629b0c58610beb056986afb493948f35fab436e1e1e590413d860c7f7334a6aee4e978f6813 SHA512 3df29ecaba769f0f15f904c18b0630eb90f3e9de9813158f5753723eee54eeeb0b7978d89016ff508f4b0bf7b741da21b3224f9cffafded3c3fc2c1eb18760e9 -EBUILD bcachefs-tools-1.7.0.ebuild 5277 BLAKE2B 268a300e477bbcabe90120b22d05c6fd8e7b97e95367e612b014383aa3bf2e4074299ea2d6ef30bcd3a7cb3fd9fd9ddb6a70537258ab69a3767464f5e4f14a18 SHA512 2629e41033dd6b1983a29a7be510880de92a342efb14b6f1458c0f9d99f1f5c68c6bcca625046628073b624d0de10e3f1aeb065024b9c74001a114b849c4710d -EBUILD bcachefs-tools-9999.ebuild 5242 BLAKE2B fd962577af482a9c6c1c83480eab65e9bd949c21e2560fb5c03c350ff63e0e81b3fc31f48725d38faf2ec28a250e753949e058d4c3e75bf4dd57e3d4938b8c98 SHA512 8a634605a38375893a9aa65c8ce9ab79aaa4a6b77f298bd4aa67175f94b254921acccdd4f9401e61bd9ef61bc9162d86c44216f9defaeb154e46f45fb744b22b -MISC metadata.xml 751 BLAKE2B 58fb2ebb3092cb1056b36a5389d486faf4fb3fc6c107f5aeb65d1002722f7f238f776df5698bfceb4e2bf6b0ee4f1aa04d3015784c95141d300f6f82654525bd SHA512 5a6a46cfb145160a0871bf7a591238470d08744552870b54b9c7c78afac860a256fbd6765972a77ca81b78239695850b26c04acc1b24d1a4b35f52d6ef9e2501 +DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe +DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226 +EBUILD bcachefs-tools-1.11.0.ebuild 4391 BLAKE2B 129b036c305fda0136e2605ab171493b3afb03a26ebce2cb703607e1149006532b5d8e7b7cbcf83fb37be455dff5be002a6eee512e4eb954e7edc7613c5ca847 SHA512 5d75ebc5755ba833024c2b0c0af991f16e887381928507c9388bbbab46ac79bffb098f7afa3c38ae6b524827543686638ab4fd542ce801a5b20db57355594352 +EBUILD bcachefs-tools-1.7.0.ebuild 5276 BLAKE2B 898d087a1a1503dab6cc088117a55514d7bb77ba0874156d930f112f07298714071d2143614777308a10c8a9901c0ba1aa353ab00b6bc291c979e297ba42a9bb SHA512 0df8db9e271820259c546442b785e06ddb7c674a406fbe9006d4ed7ef3310e8123cecf4c6dd8f6dfb01c09c430b2e9d58ed21263fae25cd55fc9c295165589ac +EBUILD bcachefs-tools-1.9.4.ebuild 5391 BLAKE2B 09b6ded11eff9aa12b42091517b36851bafa55a62f497f22dc7de6039b7547785e75cb463292c3642fc91bbfd6e5623843780704b4f3dfd6dd24d1f785ef3ac1 SHA512 76da98bd713559e706c037d9cbb2a7b6e8bd2d09c2779feb41dc4ef25d328b44da8718d11ef4e302c71cc25bc9c6b734de377177f72f245b647af0f8fdded5bd +EBUILD bcachefs-tools-9999.ebuild 4412 BLAKE2B cbb050d6d6fa74d5c4febb700a27e3c19d5a44adfcbe7396232901cf9e206223a7fc4aa859c9667d4d9f48457c86b5d84ae132fa8a920fcd9d5ab367e1530053 SHA512 1d9d98f845f277fd115b1101a3137705e9aed9893686865c8b514e437d2c3701aeef274af6525e712720e2c7e2a448f052c097d42abc1f534eed2c4e3297c23f +MISC metadata.xml 679 BLAKE2B 54420caf5bda8ff5df2fcb25891b6a1e97df49051dfd8eb93538a886bce92ab4ed874bb5e09d8975cbddc26f5bbba08e751e82249cfd8e324e7fe685d2991c26 SHA512 de1478152acc6a27ca83dcdd7a77fde5e3720a5d8da19b2df5156ed4dc62f832fb8c0f89faefce8aefd60148a499c08a454b5eec94ef1b19d9b3871c225315d9 diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild new file mode 100644 index 000000000000..566129b51e44 --- /dev/null +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.1.2 + anstream@0.6.11 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + anstyle@1.0.6 + anyhow@1.0.79 + autocfg@1.1.0 + bindgen@0.69.4 + bitfield@0.14.0 + bitflags@1.3.2 + bitflags@2.4.2 + byteorder@1.5.0 + cc@1.0.83 + cexpr@0.6.0 + cfg-if@1.0.0 + clang-sys@1.7.0 + clap@4.4.18 + clap_builder@4.4.18 + clap_complete@4.4.10 + clap_derive@4.4.7 + clap_lex@0.6.0 + colorchoice@1.0.0 + either@1.9.0 + env_logger@0.10.2 + errno-dragonfly@0.1.2 + errno@0.2.8 + errno@0.3.8 + glob@0.3.1 + heck@0.4.1 + home@0.5.9 + itertools@0.12.1 + lazy_static@1.4.0 + lazycell@1.3.0 + libc@0.2.153 + libloading@0.8.1 + libudev-sys@0.1.4 + linux-raw-sys@0.4.13 + log@0.4.22 + memchr@2.7.1 + memoffset@0.8.0 + minimal-lexical@0.2.1 + nom@7.1.3 + once_cell@1.19.0 + owo-colors@4.0.0 + paste@1.0.14 + pkg-config@0.3.29 + prettyplease@0.2.16 + proc-macro2@1.0.78 + quote@1.0.35 + regex-automata@0.4.5 + regex-syntax@0.8.2 + regex@1.10.3 + rustc-hash@1.1.0 + rustix@0.38.34 + rustversion@1.0.17 + shlex@1.3.0 + strsim@0.10.0 + strum@0.26.2 + strum_macros@0.26.2 + syn@2.0.48 + terminal_size@0.3.0 + udev@0.7.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.7.0 + which@4.4.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + zeroize@1.8.1 + zeroize_derive@1.4.2 +" + +LLVM_COMPAT=( {16..18} ) +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cargo flag-o-matic llvm-r1 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/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" +RESTRICT="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}] + ') + $(unpacker_src_uri_depends) + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + ') + elibc_musl? ( >=sys-libs/musl-1.2.5 ) + virtual/pkgconfig + virtual/rust +" + +QA_FLAGS_IGNORED="/sbin/bcachefs" + +python_check_deps() { + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" +} + +pkg_setup() { + llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + S="${S}/rust-src" cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + tc-export CC + + # Version sed needed because the Makefile hasn't been bumped yet + # Check if it is no longer before bumping + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g::' \ + -i Makefile || die + append-lfs-flags +} + +src_compile() { + use fuse && export BCACHEFS_FUSE=1 + export BUILD_VERBOSE=1 + export VERSION=${PV} + + default + + local shell + for shell in bash fish zsh; do + ./bcachefs completions ${shell} > ${shell}.completion || die + done +} + +src_install() { + into / + dosbin bcachefs + + dosym bcachefs /sbin/fsck.bcachefs + dosym bcachefs /sbin/mkfs.bcachefs + dosym bcachefs /sbin/mount.bcachefs + + if use fuse; then + dosym bcachefs /sbin/fsck.fuse.bcachefs + dosym bcachefs /sbin/mkfs.fuse.bcachefs + dosym bcachefs /sbin/mount.fuse.bcachefs + fi + + newbashcomp bash.completion bcachefs + newfishcomp fish.completion bcachefs.fish + newzshcomp zsh.completion _bcachefs + + doman bcachefs.8 +} + +pkg_postinst() { + if use fuse; then + ewarn "FUSE support is experimental." + ewarn "Please only use it for development purposes at the risk of losing your data." + ewarn "You have been warned." + fi +} diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-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.7.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0.ebuild index e71c60bba299..ca3cca9c03ae 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0.ebuild @@ -106,7 +106,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-1.6.4-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild index 5763dd2e492e..7e5aa241533f 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.6.4-r1.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild @@ -27,14 +27,16 @@ CRATES=" clap_derive@4.4.7 clap_lex@0.6.0 colorchoice@1.0.0 - colored@2.1.0 either@1.9.0 + env_logger@0.10.2 errno-dragonfly@0.1.2 errno@0.2.8 errno@0.3.8 glob@0.3.1 heck@0.4.1 + hermit-abi@0.3.9 home@0.5.9 + is-terminal@0.4.12 itertools@0.12.1 lazy_static@1.4.0 lazycell@1.3.0 @@ -42,7 +44,7 @@ CRATES=" libloading@0.8.1 libudev-sys@0.1.4 linux-raw-sys@0.4.13 - log@0.4.20 + log@0.4.22 memchr@2.7.1 memoffset@0.8.0 minimal-lexical@0.2.1 @@ -56,13 +58,15 @@ CRATES=" regex-automata@0.4.5 regex-syntax@0.8.2 regex@1.10.3 - rpassword@7.3.1 - rtoolbox@0.0.2 rustc-hash@1.1.0 - rustix@0.38.31 + rustix@0.38.34 + rustversion@1.0.17 shlex@1.3.0 strsim@0.10.0 + strum@0.26.2 + strum_macros@0.26.2 syn@2.0.48 + termcolor@1.4.1 terminal_size@0.3.0 udev@0.7.0 unicode-ident@1.0.12 @@ -70,6 +74,7 @@ CRATES=" uuid@1.7.0 which@4.4.2 winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.8 winapi-x86_64-pc-windows-gnu@0.4.0 winapi@0.3.9 windows-sys@0.48.0 @@ -90,10 +95,12 @@ CRATES=" windows_x86_64_gnullvm@0.52.0 windows_x86_64_msvc@0.48.5 windows_x86_64_msvc@0.52.0 + zeroize@1.8.1 + zeroize_derive@1.4.2 " -LLVM_COMPAT=( {16..17} ) -PYTHON_COMPAT=( python3_{10..12} ) +LLVM_COMPAT=( {16..18} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker @@ -106,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" @@ -147,6 +154,8 @@ BDEPEND=" virtual/rust " +QA_FLAGS_IGNORED="/sbin/bcachefs" + python_check_deps() { if use test; then python_has_version \ @@ -166,7 +175,6 @@ src_unpack() { git-r3_src_unpack S="${S}/rust-src" cargo_live_src_unpack else - unpack ${P}.tar.gz cargo_src_unpack fi } diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild index 09617302a1b5..be2cd55914db 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild @@ -27,14 +27,16 @@ CRATES=" clap_derive@4.4.7 clap_lex@0.6.0 colorchoice@1.0.0 - colored@2.1.0 either@1.9.0 + env_logger@0.10.2 errno-dragonfly@0.1.2 errno@0.2.8 errno@0.3.8 glob@0.3.1 heck@0.4.1 + hermit-abi@0.3.9 home@0.5.9 + is-terminal@0.4.12 itertools@0.12.1 lazy_static@1.4.0 lazycell@1.3.0 @@ -42,7 +44,7 @@ CRATES=" libloading@0.8.1 libudev-sys@0.1.4 linux-raw-sys@0.4.13 - log@0.4.20 + log@0.4.22 memchr@2.7.1 memoffset@0.8.0 minimal-lexical@0.2.1 @@ -56,13 +58,15 @@ CRATES=" regex-automata@0.4.5 regex-syntax@0.8.2 regex@1.10.3 - rpassword@7.3.1 - rtoolbox@0.0.2 rustc-hash@1.1.0 - rustix@0.38.31 + rustix@0.38.34 + rustversion@1.0.17 shlex@1.3.0 strsim@0.10.0 + strum@0.26.2 + strum_macros@0.26.2 syn@2.0.48 + termcolor@1.4.1 terminal_size@0.3.0 udev@0.7.0 unicode-ident@1.0.12 @@ -70,6 +74,7 @@ CRATES=" uuid@1.7.0 which@4.4.2 winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.8 winapi-x86_64-pc-windows-gnu@0.4.0 winapi@0.3.9 windows-sys@0.48.0 @@ -90,12 +95,14 @@ CRATES=" windows_x86_64_gnullvm@0.52.0 windows_x86_64_msvc@0.48.5 windows_x86_64_msvc@0.52.0 + zeroize@1.8.1 + zeroize_derive@1.4.2 " -LLVM_COMPAT=( {16..17} ) -PYTHON_COMPAT=( python3_{10..12} ) +LLVM_COMPAT=( {16..18} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker +inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker DESCRIPTION="Tools for bcachefs" HOMEPAGE="https://bcachefs.org/" @@ -111,8 +118,8 @@ fi LICENSE="Apache-2.0 BSD GPL-2 MIT" SLOT="0" -IUSE="fuse test" -RESTRICT="!test? ( test )" +IUSE="fuse" +RESTRICT="test" DEPEND=" app-arch/lz4:= @@ -134,10 +141,6 @@ BDEPEND=" ${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/docutils[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) ') $(unpacker_src_uri_depends) $(llvm_gen_dep ' @@ -147,12 +150,9 @@ BDEPEND=" virtual/rust " +QA_FLAGS_IGNORED="/sbin/bcachefs" + python_check_deps() { - if use test; then - python_has_version \ - "dev-python/pytest[${PYTHON_USEDEP}]" \ - "dev-python/pytest-xdist[${PYTHON_USEDEP}]" - fi python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" } @@ -166,7 +166,6 @@ src_unpack() { git-r3_src_unpack S="${S}/rust-src" cargo_live_src_unpack else - unpack ${P}.tar.gz cargo_src_unpack fi } @@ -191,36 +190,12 @@ src_compile() { default - use test && emake tests - local shell for shell in bash fish zsh; do ./bcachefs completions ${shell} > ${shell}.completion || die done } -src_test() { - if ! use fuse; then - EPYTEST_IGNORE=( tests/test_fuse.py ) - fi - EPYTEST_DESELECT=( - # Valgrind - 'tests/test_fixture.py::test_read_after_free' - 'tests/test_fixture.py::test_undefined' - 'tests/test_fixture.py::test_write_after_free' - 'tests/test_fixture.py::test_undefined_branch' - 'tests/test_fixture.py::test_leak' - 'tests/test_fixture.py::test_check' - # Fails in portage because of usersandbox; ensure that these pass before bumping! - 'tests/test_basic.py::test_format' - 'tests/test_basic.py::test_fsck' - 'tests/test_basic.py::test_list' - 'tests/test_basic.py::test_list_inodes' - 'tests/test_basic.py::test_list_dirent' - ) - epytest -v -n "$(makeopts_jobs)" -} - src_install() { into / dosbin bcachefs diff --git a/sys-fs/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/bees/Manifest b/sys-fs/bees/Manifest index cab62ad6564b..8f062277fcd9 100644 --- a/sys-fs/bees/Manifest +++ b/sys-fs/bees/Manifest @@ -1,5 +1,8 @@ AUX 0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch 1183 BLAKE2B 784ad6e8150a5d791c839c04060aa1116f72a29c0e2f4d1d790d6e1fb1d56b5a6ced843f38ac56930a63426ed7e9c5506f81c1f7189728937e0ee49f9f5af079 SHA512 29ac086a2c84d7eb89090498849b2e01e99da62c3ce49b5c4d36f071a3a8ff506e15b227a2303c01da25bdc4572e5dc1129767df496897de8ca2bed579dd3017 +AUX 0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch 1500 BLAKE2B c6f6895b92caae4ac8de83931574f87274d7798889c0589859204d73cd41072ee6967ae908c8509e7f5c929f3a4f04c73932b72a27ab3d244cef254ebc15030e SHA512 82e3e8872e4b9943afff883c3ee420a8850b337914fc0b388171f1331c4cd900778c2263b98ff1705f50f7cd3ffe5868d7f88ec48ab68217471a21573a559479 +AUX 0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch 1445 BLAKE2B e1ebe9c50deeaf7eed82c738d172ab332c5048ab192150cc967843ea16f387631ee44c201c43f49c3c0a032a735219f3a08881e5f92fbbf5b85d050eebb1c7f8 SHA512 75655e40084a0f8660773293693d0a214d34c6bb2f861c2e502a4cc5a1576d5c8084b8af87f790155f419affa56886c23eed09532f82c29b2623f553a5c82999 DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3 +EBUILD bees-0.10-r1.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd EBUILD bees-0.10.ebuild 4076 BLAKE2B dad615a8ad7fada7c1cd31a5cffa6fad2cdcbc1cf241cc6e602d927cd9c182289d944663365cbeaa27a2f14f89cd8150e7c7196c19b5bbd4cb2580dae80bc19c SHA512 53a60088a2e078e1dec4899d77961c51976f941ca3952de32ddacdb6c03b4e6350d977f159b7a845ec45901bb4cb77b19ca9aebeec2ef1cc7867740df74adbbb -EBUILD bees-9999.ebuild 4077 BLAKE2B 8208983c244fd03a1c615b485011bb1fefbdffe91b0d1846aec7a13775c9c1da06dd895092f847a9da0ce2e1a88dac10611f0f2a35df1589042e58a70f11b1a4 SHA512 41bc775e23be08cc87fd06da485b1101e3924dca1ab00150e4abbc50bcfc2b892a08bce0560403e9830a70fac9be0ea669f8017c71a78a414ab5cf1f580644e7 +EBUILD bees-9999.ebuild 4151 BLAKE2B d0b2ddea9523905f3a5620aa6e0da3c595a405afd34a9ab5488a20e7b1f5c77130d9b56b3856a236004982d6069f213ddacf28a9234f3498cc805b4f9a980f56 SHA512 35d51de04f606c5fe35bd0dd071c58e435398dc304f0520e307974a2436bc358856580f35f1611a8e45b6e1d16b4b67d050308ac61dfb8ea8c60872c616f47cd MISC metadata.xml 529 BLAKE2B 69ea069e33d1af7c2c38aa7f8fc61516f23c586ad162d9581859829b084c8da3ef76278173e1ac3afa1ef432355ab14f2ecc01d07f039f8447c20cc27b22d633 SHA512 cb9ba7a32c6a8269f7303ebd41bf0e21f4325560b40bba10aff08a05d07170f9f0e35e687e688f6793c0abf994c9b23f90a47b9d32544636f2d6b5ab51140bd3 diff --git a/sys-fs/bees/bees-0.10-r1.ebuild b/sys-fs/bees/bees-0.10-r1.ebuild new file mode 100644 index 000000000000..e1d5da90f548 --- /dev/null +++ b/sys-fs/bees/bees-0.10-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent" +HOMEPAGE="https://github.com/Zygo/bees" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Zygo/bees.git" +else + SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +LICENSE="GPL-3" +SLOT="0" + +DEPEND=" + >=sys-apps/util-linux-2.30.2 + >=sys-fs/btrfs-progs-4.20.2 +" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~BTRFS_FS" +ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" + +PATCHES=( + "${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch" + "${FILESDIR}/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if kernel_is -lt 4 11; then + ewarn "With kernel versions below 4.11, bees may severely degrade system performance" + ewarn "and responsiveness. Especially, the kernel may deadlock while bees is" + ewarn "running, it's recommended to run at least kernel 4.11." + ewarn + elif kernel_is -lt 4 14 29; then + ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()" + ewarn "messages in the kernel log. These messages can be ignored and this is fixed" + ewarn "with more recent kernels:" + ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0" + ewarn + elif kernel_is -lt 5 7 0; then + ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system" + ewarn "locks for a long time while at the same time CPU usage increases when bees is" + ewarn "operating. bees tries to avoid this behavior by excluding very common extents" + ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness." + ewarn + fi + if kernel_is -lt 5 1 0; then + ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption" + ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" + ewarn "later kernel, that includes older LTS versions released after 5.0.4:" + ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" + ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" + ewarn + fi + if kernel_is -lt 5 4 19; then + ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running" + ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst" + ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x" + ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force" + ewarn "the device RO without writing corrupted meta-data. More details:" + ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md" + ewarn + fi + if kernel_is -gt 5 15 106; then + if kernel_is -lt 6 3 10; then + ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation" + ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO" + ewarn "latency spikes. This version ships with a work-around at the cost of not" + ewarn "handling highly duplicated filesystems that well. More details:" + ewarn "https://github.com/Zygo/bees/issues/260" + ewarn + fi + fi + + elog "Bees recommends running the latest current kernel for performance and" + elog "reliability reasons, see README.md." + fi +} + +src_prepare() { + default + sed -i 's/ -Werror//' makeflags || die +} + +src_configure() { + tc-export CC CXX AR + cat >localconf <<-EOF || die + ETC_PREFIX="${EPREFIX}/etc" + LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" + PREFIX="${EPREFIX}/usr" + SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" + DEFAULT_MAKE_TARGET=all + EOF + if [[ ${PV} != "9999" ]] ; then + echo BEES_VERSION=v${PV} >>localconf || die + fi +} + +src_compile() { + default + # localconf quotes leak in the systemd unit but are still needed for spaces + sed -i 's/"//g' scripts/beesd@.service || die +} diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index 1b164eb56b08..e1d5da90f548 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,6 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="" DEPEND=" >=sys-apps/util-linux-2.30.2 @@ -30,7 +29,8 @@ CONFIG_CHECK="~BTRFS_FS" ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" PATCHES=( - "${FILESDIR}/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch" + "${FILESDIR}/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch" + "${FILESDIR}/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch" ) pkg_pretend() { diff --git a/sys-fs/bees/files/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch b/sys-fs/bees/files/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch new file mode 100644 index 000000000000..387ae7f1100c --- /dev/null +++ b/sys-fs/bees/files/0001-context-demote-abandoned-toxic-match-to-debug-log-le.patch @@ -0,0 +1,36 @@ +From fad9230cea8a9970980c36b442b71b864e69ded3 Mon Sep 17 00:00:00 2001 +From: Kai Krakow <kai@kaishome.de> +Date: Sun, 30 Jun 2024 16:27:20 +0200 +Subject: [PATCH 1/2] context: demote "abandoned toxic match" to debug log + level + +This log message creates a overwhelmingly lot of messages in the system +journal, leading to write-back flushing storms under high activity. As +it is a work-around message, it is probably only useful to developers, +thus demote to debug level. + +This fixes latency spikes in desktop usage after adding a lot of new +files, especially since systemd-journal starts to flush caches if it +sees memory pressure. + +Signed-off-by: Kai Krakow <kai@kaishome.de> +--- + src/bees-context.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bees-context.cc b/src/bees-context.cc +index 09ec152..2251783 100644 +--- a/src/bees-context.cc ++++ b/src/bees-context.cc +@@ -471,7 +471,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e) + + // Hash is toxic + if (found_addr.is_toxic()) { +- BEESLOGWARN("WORKAROUND: abandoned toxic match for hash " << hash << " addr " << found_addr << " matching bbd " << bbd); ++ BEESLOGDEBUG("WORKAROUND: abandoned toxic match for hash " << hash << " addr " << found_addr << " matching bbd " << bbd); + // Don't push these back in because we'll never delete them. + // Extents may become non-toxic so give them a chance to expire. + // hash_table->push_front_hash_addr(hash, found_addr); +-- +2.44.2 + diff --git a/sys-fs/bees/files/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch b/sys-fs/bees/files/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch new file mode 100644 index 000000000000..b62957c05291 --- /dev/null +++ b/sys-fs/bees/files/0002-HACK-crucible-Work-around-kernel-memory-fragmentatio_v2.patch @@ -0,0 +1,43 @@ +From 291574986ccfaff8b620f6baa185a567f2f0cfb5 Mon Sep 17 00:00:00 2001 +From: Kai Krakow <kai@kaishome.de> +Date: Sun, 9 Jul 2023 12:24:40 +0200 +Subject: [PATCH 2/2] HACK: crucible: Work around kernel memory fragmentation + +According to @Zygo: + +> This will drastically reduce the number of reflinks bees can handle +> to a single extent, but that size is beyond more than enough for most +> filesystems. Making the buffer smaller may also reduce the size of +> vmallocs which might be aggravating the kernel's memory manager. + +v2: + +According to @Zygo: + +> Lately I've been running with vm.swappiness=0 and +> BEES_MAX_EXTENT_REF_COUNT set to 9999. With those settings there's no +> swapping at all. + +Link: https://github.com/Zygo/bees/issues/260#issuecomment-1627586574 +Link: https://github.com/Zygo/bees/issues/260#issuecomment-2068287231 +Signed-off-by: Kai Krakow <kai@kaishome.de> +--- + src/bees.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bees.h b/src/bees.h +index 4dbc005..a3c3872 100644 +--- a/src/bees.h ++++ b/src/bees.h +@@ -96,7 +96,7 @@ const double BEES_TOO_LONG = 5.0; + const double BEES_TOXIC_SYS_DURATION = 0.1; + + // Maximum number of refs to a single extent +-const size_t BEES_MAX_EXTENT_REF_COUNT = (16 * 1024 * 1024 / 24) - 1; ++const size_t BEES_MAX_EXTENT_REF_COUNT = (10000) - 1; + + // How long between hash table histograms + const double BEES_HASH_TABLE_ANALYZE_INTERVAL = BEES_STATS_INTERVAL; +-- +2.44.2 + diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 6a58bcb0d1cb..554ab4954ddb 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,15 +1,14 @@ -AUX btrfs-progs-6.8-musl-1.2.5.patch 6548 BLAKE2B 6c49be6ca93f12772a98b109c13c70b66e52837f037a019d79aa56a3fc7863a8971319ee61215626873ec8e1704ddd69777922a53afe72577e1bd2e181747106 SHA512 d662d5d19bfa2458dc26c8b3fec3819b10a2f1192458f9ba036b50fad120da2ad3c65e85e69e8738d9d3747a65166b04548a0ad47ce8104f21925df5a00c5d7b -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.8.tar.sign 566 BLAKE2B 2f063015b515980a88980d02ac359363506d8445bf6ebffccd0f224b09b457b9d859ec7ae1371d3dcb04cfcb29ceee75ec8f73c2adee4765ca8287a79929234c SHA512 d858033046af03d9f7bedb492eadaaae92c8d3dde451e52fc78a8a1c4dbf57078e8d907dbd3344f1414b4dad9646aef616ddec0c0fefaf65340411e84c36c96f -DIST btrfs-progs-v6.8.tar.xz 2587804 BLAKE2B 0f4cc83fa896bc932fdcd34fffae72b0fad44424ac0b5e2b7bde44dd91fcef33f2fa2ef36eb77299de753e4d4b47794cabad5d84760b9d34a9b6765a834d15b7 SHA512 adce7c15ef5a19c4fc513f1743b4f65f2c72aa4490703d36c93230abb305c576bd69a32c4bcf19c2b58aee5b5755e0d54fb82fe649a5fe021366eb0d89af4261 -EBUILD btrfs-progs-6.6.3.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9 -EBUILD btrfs-progs-6.7.1.ebuild 4581 BLAKE2B c5fd9d72bfe270bf54838e0b0eff08cb9405711792cdd1775f21ff853a6202ba0f7ccff8a043f39da02d8cdcd36a253d03c53812ad293f64b6ce26df9e1c505e SHA512 a8af6e0941002d70cebef2fd96838c1bf630ad95bd4871e83097fd552ec5f01d253f675c05551f56c92871d5a40acae697c1f69e194c1cc9b915bb9acdb1cdc9 -EBUILD btrfs-progs-6.8.1.ebuild 4587 BLAKE2B 56fdeba0f5693caac717e63dba5c5cc62068f4b0a013c07c5407b1c19c114c8a2697ded9bcd4974e8fddb87631c8d324150e076eb7e744e4ddb650eb4684ef40 SHA512 a71b38d90bb773e5beafadae60411815f18e33c561e31c5c089d574043e7332a28968486a35fcab24893876728bceb10006b0f772bd7fdc55776afc7c9484ba7 -EBUILD btrfs-progs-6.8.ebuild 4664 BLAKE2B 0b4ecbac2a6303d8d58434c438f585c2f429ee0ee73fa1dc3e1662bdb8197cdf9d24b31c246dbfbb2f2835398c12be332f8dfb264faa1e64b29858f5443ed731 SHA512 96aff43e2b197f568cf72e17eaa17b2289024804d1c2a5aef2cff4ffde92c6db8e20752df7de9cb53df1548b29e71eb7bb5d058ebd36868359d5bbb560f4a3b6 -EBUILD btrfs-progs-9999.ebuild 4587 BLAKE2B 56fdeba0f5693caac717e63dba5c5cc62068f4b0a013c07c5407b1c19c114c8a2697ded9bcd4974e8fddb87631c8d324150e076eb7e744e4ddb650eb4684ef40 SHA512 a71b38d90bb773e5beafadae60411815f18e33c561e31c5c089d574043e7332a28968486a35fcab24893876728bceb10006b0f772bd7fdc55776afc7c9484ba7 -MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53 +DIST btrfs-progs-v6.10.1.tar.sign 566 BLAKE2B dc18c0048716e422475c6630c26c74e09b3595fb8c5c1a1826464eb837d16edfe7d5fa1f418631ae4d380b24bc3fb91fa79ba1e9b1d42a2534838558362ddc18 SHA512 a8a1805ab22feda9f0535841d44120200e48d6d3762ae98f3323be09c9bd7905ff69f21066a8de1fe5cb34a3113879b73ae030a74ccc74737f06dafb32093375 +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.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 +EBUILD btrfs-progs-6.10.1.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b +EBUILD btrfs-progs-6.10.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b +EBUILD btrfs-progs-6.11.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b +EBUILD btrfs-progs-6.9.2.ebuild 4296 BLAKE2B a14b133468950215981cd242f0849735f5a05a486a07921988515582be143be06c571a8b1d9c62a9ec5e3c469fb67e2a030cec331215dcf457f521b2c7b17817 SHA512 b0ba9e958221ac8a213f56c3d7b46892e9fc37a6d06bdff28e9d4c0ea3af2428185b3d51c4c8c007c9876266e100274395f248909b6b9924b5d2242a06937985 +EBUILD btrfs-progs-9999.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b +MISC metadata.xml 744 BLAKE2B 6c23644af7f970c93a3c3bd1fd1bf82e5290832afac427bec1da93bfd2694799f779bdce3f51742a171218d6e29460a4986452426ab2239ad8ab6627dc45b81d SHA512 06df1d728d39b92384bdd026d0339a494ce1fe3966376a413a80f8dd85bedd5e5d843db9cdd60a9ab29857b79d5a24de24de2330aab70916a0e57acfc01a2e5d diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild index 565618d2fca3..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild @@ -3,8 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev +# Please bump with dev-python/btrfsutil + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 python-any-r1 udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" @@ -18,13 +20,13 @@ else MY_PV="v${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI=" - https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) + 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -33,10 +35,10 @@ 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" +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 ) python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="static? ( !udev )" # Tries to mount repaired filesystems RESTRICT="test" @@ -51,7 +53,6 @@ RDEPEND=" >=sys-fs/reiserfsprogs-3.6.27 ) ) - python? ( ${PYTHON_DEPS} ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) " @@ -59,11 +60,6 @@ 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(+)] @@ -80,11 +76,16 @@ DEPEND=" BDEPEND=" virtual/pkgconfig man? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme + $(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 @@ -92,40 +93,30 @@ else fi pkg_setup() { - use python && python-single-r1_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 - +if [[ ${PV} != 9999 ]]; then + src_unpack() { # 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 -} + 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 -xf -)) + assert "Unpack failed" + else + default + fi + } +fi src_prepare() { default if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf + local AT_M4DIR=config + eautoreconf - mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -140,11 +131,11 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) + --disable-python $(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) @@ -157,7 +148,11 @@ src_configure() { export EXTRA_PYTHON_CFLAGS="${CFLAGS}" export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 + 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[@]}" } @@ -167,26 +162,21 @@ src_compile() { 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 + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi - use python && python_optimize + newbashcomp btrfs-completion btrfs } pkg_postinst() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild index 565618d2fca3..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild @@ -3,8 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev +# Please bump with dev-python/btrfsutil + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 python-any-r1 udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" @@ -18,13 +20,13 @@ else MY_PV="v${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI=" - https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) + 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -33,10 +35,10 @@ 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" +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 ) python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="static? ( !udev )" # Tries to mount repaired filesystems RESTRICT="test" @@ -51,7 +53,6 @@ RDEPEND=" >=sys-fs/reiserfsprogs-3.6.27 ) ) - python? ( ${PYTHON_DEPS} ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) " @@ -59,11 +60,6 @@ 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(+)] @@ -80,11 +76,16 @@ DEPEND=" BDEPEND=" virtual/pkgconfig man? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme + $(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 @@ -92,40 +93,30 @@ else fi pkg_setup() { - use python && python-single-r1_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 - +if [[ ${PV} != 9999 ]]; then + src_unpack() { # 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 -} + 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 -xf -)) + assert "Unpack failed" + else + default + fi + } +fi src_prepare() { default if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf + local AT_M4DIR=config + eautoreconf - mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -140,11 +131,11 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) + --disable-python $(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) @@ -157,7 +148,11 @@ src_configure() { export EXTRA_PYTHON_CFLAGS="${CFLAGS}" export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 + 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[@]}" } @@ -167,26 +162,21 @@ src_compile() { 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 + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi - use python && python_optimize + newbashcomp btrfs-completion btrfs } pkg_postinst() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.11.ebuild index c9770f5998ae..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.11.ebuild @@ -3,8 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev +# Please bump with dev-python/btrfsutil + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 python-any-r1 udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" @@ -18,13 +20,13 @@ else MY_PV="v${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI=" - https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) + 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -33,10 +35,10 @@ 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" +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 ) python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="static? ( !udev )" # Tries to mount repaired filesystems RESTRICT="test" @@ -51,7 +53,6 @@ RDEPEND=" >=sys-fs/reiserfsprogs-3.6.27 ) ) - python? ( ${PYTHON_DEPS} ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) " @@ -59,11 +60,6 @@ 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(+)] @@ -80,11 +76,16 @@ DEPEND=" BDEPEND=" virtual/pkgconfig man? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme + $(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 @@ -92,40 +93,30 @@ else fi pkg_setup() { - use python && python-single-r1_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 - +if [[ ${PV} != 9999 ]]; then + src_unpack() { # 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 -} + 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 -xf -)) + assert "Unpack failed" + else + default + fi + } +fi src_prepare() { default if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf + local AT_M4DIR=config + eautoreconf - mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -140,11 +131,11 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) + --disable-python $(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) @@ -157,7 +148,11 @@ src_configure() { export EXTRA_PYTHON_CFLAGS="${CFLAGS}" export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 + 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[@]}" } @@ -167,26 +162,21 @@ src_compile() { 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 + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi - use python && python_optimize + newbashcomp btrfs-completion btrfs } pkg_postinst() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild index 1f531bde0013..89de2ab69fa8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.8.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild @@ -3,8 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev +# Please bump with dev-python/btrfsutil + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 python-any-r1 udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" @@ -18,13 +20,13 @@ else MY_PV="v${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI=" - https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) + 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" + KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi fi @@ -33,10 +35,10 @@ 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" +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 ) python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="static? ( !udev )" # Tries to mount repaired filesystems RESTRICT="test" @@ -51,7 +53,6 @@ RDEPEND=" >=sys-fs/reiserfsprogs-3.6.27 ) ) - python? ( ${PYTHON_DEPS} ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) " @@ -59,11 +60,6 @@ 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(+)] @@ -80,11 +76,16 @@ DEPEND=" BDEPEND=" virtual/pkgconfig man? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme + $(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 @@ -92,43 +93,30 @@ else fi pkg_setup() { - use python && python-single-r1_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 - +if [[ ${PV} != 9999 ]]; then + src_unpack() { # 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 -} + 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 -xf -)) + assert "Unpack failed" + else + default + fi + } +fi src_prepare() { default - # bug 926288 - use elibc_musl && eapply "${FILESDIR}/${P}-musl-1.2.5.patch" - if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf + local AT_M4DIR=config + eautoreconf - mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -143,11 +131,11 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) + --disable-python $(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) @@ -160,7 +148,11 @@ src_configure() { export EXTRA_PYTHON_CFLAGS="${CFLAGS}" export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 + 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[@]}" } @@ -170,26 +162,21 @@ src_compile() { 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 + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi - use python && python_optimize + newbashcomp btrfs-completion btrfs } pkg_postinst() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index c9770f5998ae..757755270ab8 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -3,8 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev +# Please bump with dev-python/btrfsutil + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 python-any-r1 udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" @@ -18,13 +20,13 @@ else MY_PV="v${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI=" - https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) + 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -33,10 +35,10 @@ 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" +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 ) python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="static? ( !udev )" # Tries to mount repaired filesystems RESTRICT="test" @@ -51,7 +53,6 @@ RDEPEND=" >=sys-fs/reiserfsprogs-3.6.27 ) ) - python? ( ${PYTHON_DEPS} ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) " @@ -59,11 +60,6 @@ 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(+)] @@ -80,11 +76,16 @@ DEPEND=" BDEPEND=" virtual/pkgconfig man? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme + $(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 @@ -92,40 +93,30 @@ else fi pkg_setup() { - use python && python-single-r1_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 - +if [[ ${PV} != 9999 ]]; then + src_unpack() { # 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 -} + 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 -xf -)) + assert "Unpack failed" + else + default + fi + } +fi src_prepare() { default if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf + local AT_M4DIR=config + eautoreconf - mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -140,11 +131,11 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) + --disable-python $(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) @@ -157,7 +148,11 @@ src_configure() { export EXTRA_PYTHON_CFLAGS="${CFLAGS}" export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 + 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[@]}" } @@ -167,26 +162,21 @@ src_compile() { 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 + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi - use python && python_optimize + newbashcomp btrfs-completion btrfs } pkg_postinst() { diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch deleted file mode 100644 index 19737515b616..000000000000 --- a/sys-fs/btrfs-progs/files/btrfs-progs-6.8-musl-1.2.5.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 45ca77f9e4cfe5fd5814d553502ef99877c9e972 Mon Sep 17 00:00:00 2001 -From: David Sterba <dsterba@suse.com> -Date: Thu, 18 Apr 2024 18:57:08 +0200 -Subject: [PATCH] btrfs-progs: add basename wrappers for unified semantics - -What basename(3) does with the argument depends on _GNU_SOURCE and -inclusion of libgen.h. This is problematic on Musl (1.2.5) as reported. - -We want the GNU semantics that does not modify the argument. Common way -to make it portable is to add own helper. This is now implemented in -path_basename() that does not use the libc provided basename but preserves -the semantics. The path_dirname() is just for parity, otherwise same as -dirname(). - -Sources: -- https://bugs.gentoo.org/926288 -- https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Issue: #778 -Signed-off-by: David Sterba <dsterba@suse.com> ---- - cmds/subvolume.c | 26 +++++++++++++------------- - common/device-utils.c | 4 ++-- - common/path-utils.c | 28 ++++++++++++++++++++++++++++ - common/path-utils.h | 2 ++ - 4 files changed, 45 insertions(+), 15 deletions(-) - -diff --git a/cmds/subvolume.c b/cmds/subvolume.c -index 5d53efe6f..869d7077d 100644 ---- a/cmds/subvolume.c -+++ b/cmds/subvolume.c -@@ -24,7 +24,6 @@ - #include <string.h> - #include <unistd.h> - #include <errno.h> --#include <libgen.h> - #include <getopt.h> - #include <dirent.h> - #include <stdbool.h> -@@ -149,7 +148,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in - int fddst = -1; - char *dupname = NULL; - char *dupdir = NULL; -- char *newname; -+ const char *newname; - char *dstdir; - - ret = path_is_dir(dst); -@@ -170,7 +169,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in - ret = -ENOMEM; - goto out; - } -- newname = basename(dupname); -+ newname = path_basename(dupname); - - dupdir = strdup(dst); - if (!dupdir) { -@@ -178,7 +177,7 @@ static int create_one_subvolume(const char *dst, struct btrfs_qgroup_inherit *in - ret = -ENOMEM; - goto out; - } -- dstdir = dirname(dupdir); -+ dstdir = path_dirname(dupdir); - - if (!test_issubvolname(newname)) { - error("invalid subvolume name: %s", newname); -@@ -364,7 +363,8 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a - int res, ret = 0; - int cnt; - int fd = -1; -- char *dname, *vname, *cpath; -+ char *dname, *cpath; -+ const char *vname; - char *dupdname = NULL; - char *dupvname = NULL; - char *path = NULL; -@@ -482,9 +482,9 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a - goto out; - } - dupdname = strdup(cpath); -- dname = dirname(dupdname); -+ dname = path_dirname(dupdname); - dupvname = strdup(cpath); -- vname = basename(dupvname); -+ vname = path_basename(dupvname); - free(cpath); - - /* When subvolid is passed, <path> will point to the mount point */ -@@ -670,7 +670,7 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char * - bool readonly = false; - char *dupname = NULL; - char *dupdir = NULL; -- char *newname; -+ const char *newname; - char *dstdir; - enum btrfs_util_error err; - struct btrfs_ioctl_vol_args_v2 args; -@@ -727,13 +727,13 @@ static int cmd_subvolume_snapshot(const struct cmd_struct *cmd, int argc, char * - - if (res > 0) { - dupname = strdup(subvol); -- newname = basename(dupname); -+ newname = path_basename(dupname); - dstdir = dst; - } else { - dupname = strdup(dst); -- newname = basename(dupname); -+ newname = path_basename(dupname); - dupdir = strdup(dst); -- dstdir = dirname(dupdir); -+ dstdir = path_dirname(dupdir); - } - - if (!test_issubvolname(newname)) { -@@ -1557,7 +1557,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg - struct btrfs_util_subvolume_iterator *iter; - struct btrfs_util_subvolume_info subvol; - char *subvol_path = NULL; -- char *subvol_name = NULL; -+ const char *subvol_name = NULL; - enum btrfs_util_error err; - struct btrfs_qgroup_stats stats; - unsigned int unit_mode; -@@ -1669,7 +1669,7 @@ static int cmd_subvolume_show(const struct cmd_struct *cmd, int argc, char **arg - subvol_path = strdup("/"); - subvol_name = "<FS_TREE>"; - } else { -- subvol_name = basename(subvol_path); -+ subvol_name = path_basename(subvol_path); - } - - if (bconf.output_format == CMD_FORMAT_JSON) { -diff --git a/common/device-utils.c b/common/device-utils.c -index 36108ec4e..d086e9ea2 100644 ---- a/common/device-utils.c -+++ b/common/device-utils.c -@@ -343,14 +343,14 @@ static u64 device_get_partition_size_sysfs(const char *dev) - char path[PATH_MAX] = {}; - char sysfs[PATH_MAX] = {}; - char sizebuf[128] = {}; -- char *name = NULL; -+ const char *name = NULL; - int sysfd; - unsigned long long size = 0; - - name = realpath(dev, path); - if (!name) - return 0; -- name = basename(path); -+ name = path_basename(path); - - ret = path_cat3_out(sysfs, "/sys/class/block", name, "size"); - if (ret < 0) -diff --git a/common/path-utils.c b/common/path-utils.c -index 181737c4d..929e5c8fa 100644 ---- a/common/path-utils.c -+++ b/common/path-utils.c -@@ -28,6 +28,11 @@ - #include <string.h> - #include <errno.h> - #include <ctype.h> -+/* -+ * For dirname() and basename(), but never use basename directly, there's -+ * path_basename() with unified GNU behaviour regardless of the includes and -+ * conditional defines. See basename(3) for more. -+ */ - #include <libgen.h> - #include <limits.h> - #include "common/path-utils.h" -@@ -482,3 +487,26 @@ int test_issubvolname(const char *name) - strcmp(name, ".") && strcmp(name, ".."); - } - -+/* -+ * Unified GNU semantics basename helper, never changing the argument. Always -+ * use this instead of basename(). -+ */ -+const char *path_basename(const char *path) -+{ -+ const char *tmp = strrchr(path, '/'); -+ -+ /* Special case when the whole path is just "/". */ -+ if (path[0] == '/' && path[1] == 0) -+ return path; -+ -+ return tmp ? tmp + 1 : path; -+} -+ -+/* -+ * Return dirname component of path, may change the argument. -+ * Own helper for parity with path_basename(). -+ */ -+char *path_dirname(char *path) -+{ -+ return dirname(path); -+} -diff --git a/common/path-utils.h b/common/path-utils.h -index 08ae0ff10..697fa6b48 100644 ---- a/common/path-utils.h -+++ b/common/path-utils.h -@@ -39,6 +39,8 @@ int path_is_dir(const char *path); - int is_same_loop_file(const char *a, const char *b); - int path_is_reg_or_block_device(const char *filename); - int path_is_in_dir(const char *parent, const char *path); -+const char *path_basename(const char *path); -+char *path_dirname(char *path); - - int test_issubvolname(const char *name); - diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml index e0d9388ce73c..9bd0c43c582b 100644 --- a/sys-fs/btrfs-progs/metadata.xml +++ b/sys-fs/btrfs-progs/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag> + <flag name="experimental">Enable unstable and experimental features and install btrfs-corrupt-block, as needed by xfstests</flag> <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag> <flag name="static">Build static binaries in addition to the dynamic ones</flag> </use> diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest index b822c6c87227..680bfb17e486 100644 --- a/sys-fs/btrfsmaintenance/Manifest +++ b/sys-fs/btrfsmaintenance/Manifest @@ -1,5 +1,8 @@ -DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233 +AUX btrfsmaintenance-0.5.1-script-fix.patch 422 BLAKE2B ae70f1af682c3dc1782a7e9a465467ea467c28b472bd2e3ae2987b926bb27114a0bfd241b39b3c4b02268a7b98b71197ed5c638831826c65f61107ab92be4740 SHA512 e685ddda9c44c46fa241b5cf3ebc740844c4663e2fb3ecdffed7d476d4afa08f68c93825e5ff0d49108983031c5851fecc54e2bf3efb5920d34dde0a526b8249 +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 -EBUILD btrfsmaintenance-0.4.2.ebuild 2021 BLAKE2B aafe845606849b31bfb01576d3d8b4f2c5dd4a5fa4e932a6ac87839b8570e8476ee497ffbdaa4d259ed6a6174642777a9119124cf94d7b83f0ea642325a438f6 SHA512 fe248dd01ed07b350660a6d1d22ae7fad466faf76650868601649c304d243ead48a6d9d11e97810c60d75d4873e1aa5853651ee322ccb2ca23c4bda9db4d80ab +EBUILD btrfsmaintenance-0.5.1-r1.ebuild 2228 BLAKE2B 9496a89d635947d2c188b8b9910596ff2ef8315ced26521dd880b113a1afdd5c80500466f8fc434b87532f56a572a1afc703e800c0914f43d201095aa861f845 SHA512 faf2ba2eabce72aaf439465c2d3e72c39e7b348492b2d9d8154e773c65be0405adf92036e84f43e81a7b0bc810bad6530514813f5fd2d1c41f312c83e2ff6a3b +EBUILD btrfsmaintenance-0.5.2.ebuild 2183 BLAKE2B d67ed6ba12000334909ce05281e94051715c316d913184abc2143debd30f25536c169e03839b0e779cf20c6c50ba877205b845a3e07572a737dd529937acc5f6 SHA512 bcb095d8406b3872b28cea83011e984fbc6141ade09caee52b4b52b0afb7c1d3fbef72b1361172da26ff3dbf8d66eaddafeaf98838e8e09feea3f2de06e19258 EBUILD btrfsmaintenance-0.5.ebuild 2180 BLAKE2B dea3d0da1d630ada178c3d0a82bf268dae3bf8abe681b3ef4819e7e41ee3061dcb0121ccf40a5ca3f9f1c8819e38d5d940af70c902575019476a38db2d341b73 SHA512 3bb517b257ee7e83a61850a2fca6cf8276f7826235b325c6bb8700e79f6ed404a3148c6a29205a23f150314ac64ac489907f6ab531fd338aa189ff140e1f4d73 MISC metadata.xml 595 BLAKE2B e37fd5ba56f1d30747d847927e50b29314b84851c35cc911e0648af421b0130166300fbdf71ee316b32fdc91927a1f5c411eb18ff0cc2d3da67364d71da12af0 SHA512 92834a34c01a8b8a0feddf89d75f2eecfb45027157070e49de765ab61acfee6900a4fe7a12ed42b1204142a12a7309e5134ddfc69dfc8c108bc02a83e443d861 diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild new file mode 100644 index 000000000000..78aafedd39ec --- /dev/null +++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild @@ -0,0 +1,66 @@ +# 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 ) +" +PATCHES=( "${FILESDIR}/${P}-script-fix.patch" ) + +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/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild index ca54be1b39df..82b7ba58cf41 100644 --- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild +++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -11,10 +11,12 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +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 ) @@ -22,8 +24,9 @@ RDEPEND=" src_prepare() { # Fix config path into watching service - sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \ + 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 } diff --git a/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch b/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch new file mode 100644 index 000000000000..f546a417feb3 --- /dev/null +++ b/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch @@ -0,0 +1,12 @@ +https://github.com/kdave/btrfsmaintenance/pull/119 +--- a/btrfsmaintenance-functions ++++ b/btrfsmaintenance-functions +@@ -101,7 +101,7 @@ + else + # Flock older than 2.27 does not support --verbose option, check + # if it's available as we'd like to log the information +- if /usr/bin/flock --help 2>&1 | grep -q -- --verbose; ++ if /usr/bin/flock --help 2>&1 | grep -q -- --verbose; then + verbose="--verbose" + fi + diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest index 33f658270ec1..1666cb25b197 100644 --- a/sys-fs/clamfs/Manifest +++ b/sys-fs/clamfs/Manifest @@ -1,5 +1,5 @@ AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391803189ae614f8d17d0eee6bcd83bfac5b7829dbd5a1ccbbebbf34a4f5033ed87d632f0f9358a SHA512 a49afb1e2684732581c4b6274744be71193e48137d71abf4d12b943d1b91502b52fd077a6124c33182e6796cbdb609c000e0f3c1baa05b9349ab4a38b247280d AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6 -DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626 -EBUILD clamfs-1.2.0.ebuild 877 BLAKE2B d1c3ccb6e696591fe76dd8385d5f78cc426bf22ee28aa05530664c2d08e37f57421ef672cb126e52a6344d54c3ba5e7f4797c90367de36f7892ca6456740fbc8 SHA512 95a76dc81a18faff1f614c264f2933c48a7e2b1bfd8eb702ef4927936372128f0de2a9ca92517d7918573bb4949fa03b491468c81a611575032fa6cf5852a6d2 +DIST clamfs-1.3.0.tar.gz 229989 BLAKE2B 05327d8b6fbe7073c5bd70104282a32009f06556fd61267931f4d841378318e29bb1fc7157da6b5ebce80dda35484f5bc2af71fcecdb3739a4dd28507c767054 SHA512 81c234ec631abd49d9a6b940ef727a1eae048b7be12be6082ec176ed4045fcd92d35d1264e7fd48906786af7c07696139fd5bfa0a302fba7ebb2c528315857a1 +EBUILD clamfs-1.3.0.ebuild 878 BLAKE2B 87b1c2acda4e6cce8e0b46001ca8b5c585d7e0a066a3d71daf7edb48544d14b65d3ee8cbb60a8ab693d2426f13006139b6e526365765a9838d9908c778fa0e9d SHA512 06e02c1a0394a82404778ccb79ade7c62f9af40da4013057e2ad0a342254e5cb09be2f9ace69757bb4f68730b387f72088bfb66eabf7322eb039cc8515857b85 MISC metadata.xml 563 BLAKE2B 37867dfdb271dde04f1d5b29a78696d792ca429ba7bf3daecb9822eea39c5ab80c3fb47deb35064b3b838ad1ee7d60997168e0feb771dc539980fbf412758858 SHA512 c9c582d533d6e9be80d74943649ee8b025517c13d329ff0e977978c89563134466498e30583affb3414e9c40a0f0e9d124d97c171ce9a9795f8ee0adf70dea22 diff --git a/sys-fs/clamfs/clamfs-1.2.0.ebuild b/sys-fs/clamfs/clamfs-1.3.0.ebuild index 6b8945a4342a..24f3b99c29a2 100644 --- a/sys-fs/clamfs/clamfs-1.2.0.ebuild +++ b/sys-fs/clamfs/clamfs-1.3.0.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools linux-info DESCRIPTION="A FUSE-based user-space file system with on-access anti-virus file scanning" diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest index 03ce8f96c90f..5a7d384af544 100644 --- a/sys-fs/compsize/Manifest +++ b/sys-fs/compsize/Manifest @@ -1,8 +1,4 @@ -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 -EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7 -EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366 -EBUILD compsize-1.5.ebuild 926 BLAKE2B 6f0e8aa2bcfa3bb44c138d80e14d7c6a91a244b98bfca7c438e0d5df0a4f1f29da23863bdc8b730de70e28c3ddbbdfb978a003734163e1e243eafb9532a7b6af SHA512 697983ddada491537e0b4b89ea084a4ea3ba3185f44e648d58904b51f10813b2a65b33bfdb4417a1358476bbaa0cbfcb17585a2f6d22b2548e817f9fa1d58eba -EBUILD compsize-9999.ebuild 928 BLAKE2B d4d28ece9fe5dc19d5c3d73f3649435fa1e5c2c7ddf4760d31459e0e763c46bb9197406df24cacc75c9173d44800f62e96317e7a42522ceb131d6f5cd2baf461 SHA512 37fc6165e87491beaa790d2a2daf5efb17149b8334700fac8d71c5b7333ef1798d7afe96b3e1d75576ecf9cc90eb697d58bcf3dd6ee6d3d426b10b08e675677e +EBUILD compsize-1.5.ebuild 926 BLAKE2B f8b4a81536ebcce43b6f9fb7e5156d45e59a2d0c0ca0e3992b5b6c9160491bb26d930558cd448e5808946f5356cd7e87b9e64cfff9e2bf065f03fb597d08f055 SHA512 ee5b993faaa94359c545aed3237ece35f8e6de65f3bdab3df3a7b7d1c0e9df408f4884e8724f4e17acd3c12f21af2f6d8ee5ad0e6ce149a3226e4bab97dc6c72 +EBUILD compsize-9999.ebuild 928 BLAKE2B 8fc33041687cfdbce6d4d6fc783a205ee1cb44adf73d116e4902076e5c6a8ecb4c5a9243f08ad6bf45498500855fad582dd5f1640a8c387a49eae9a4abd3e7a8 SHA512 e3c8c59c8bd9aae6365e773b1fe319adb7b4239166d8802c2b545c0ec531b6f1a442fc3fb9d7f92c3555accdc5435d031d41aa187f2fb054d3141d22c364f282 MISC metadata.xml 250 BLAKE2B 22af94e4a12e43f1a8972d561c2db3ae9f5b27af5e6c089400b02221af6822ae6e9293bb674fbed2fdf85a96256f044e4863d82b7b579b88b31cca25ec07e793 SHA512 c1e552a74229f0d6c896d91f6814bc39a1a4325bb900c73bc6b5683f7b62dfc5e38a0eceb2c8fab7e456d9f49024a1ec53d30852594a8f2868fb4b4ced59d06a 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 2ffbdc3d23b9..bc6e41d37830 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -1,8 +1,4 @@ -AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680db38359f3e004ca0b08d8caf9ce6febde0cb816000d284696c76df84510f4ab64ee53821cd960311f8b66463ecf36ffdaec0 SHA512 cadf30d9d4228db4da6e5122bf1bb4daefce3ddfb2bc2c2d830d9d10c3d6b368c9dced69fe8675f5d9fda186725e489f819e934310f2a6040911b87b8e1f789d -AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c -AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2 -AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085 -AUX cryfs-0.10.3-gcc13.patch 258 BLAKE2B ca97032f8545c83ba717efc12a3563a8efa8353c478fe600cb94480fc0d358bad0482432283f9192824ba3c444bafba7f9b94109ec20007a687c6fb52303ecf2 SHA512 aaf0dd6698c833598b212c07e6c954d245f20da23a3edc967b0615504d83ea18994e446cf29cd3b5c08590f25bf8c9d4115e164f8ea0472a17ab897793fa2dc1 -DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 -EBUILD cryfs-0.10.3-r1.ebuild 2764 BLAKE2B 727aa45a06a9f3a89018c9d20574872fbf89a9ca26eec83cd9c27e020301895436ce27248a9bbea429195f763c5d8f087a63bfea530c671caf009fa6486c7d52 SHA512 9278576bcfb6c98a18fdaca566cacb78cce39724d7e5e70acb0d3146485126cc964de1bec9be225502894b4418af3a2e855a838855e3ee3ce2c1ab45a12bd69c -MISC metadata.xml 496 BLAKE2B 409cff030d8c45472ea6baa2abdcf736fda7d1229b7fc69e7a9280d05fe4b0ca29cb7be9836b862d940af3035cb9f02791407bcd1e176b1ea69dc2038542bc13 SHA512 9308ee717a85ac37a7264269d364ec60eac713bbfbc771019364d6b9ada5691d03d05e34981670e839f4d9a9b5b65268970e18645ab3ccce5cf4f501fe2d147a +AUX cryfs-0.11.4-unbundle-vendored-libs.patch 9924 BLAKE2B b4503d9a9f64fc2b0b0cd2dddc22df0227b882e7b1e09447fb3f0c8ef42f137f616121c004f08d512b4d1b28d951bc51379b8abdf8cad57b268831a5f7adb844 SHA512 dc7db5ace13837f2254377b97418b3fe77577fc6dcb6121e3f3b276a10e3644f5315047853f2b3f35f6b3c99b5d726abe22e5c62b4dc470865b24bf587fa79a5 +DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B 3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391 SHA512 a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea +EBUILD cryfs-0.11.4.ebuild 5740 BLAKE2B 8c714b948468892749e70e062cf5480ce0303d34af40143a6df29e84ad2a93190f617e86eb280f4fc3b0627fe760b904cea351305f1add427485f03d261114ab SHA512 513b1720afa151ece26c9d62571d0184b1adcaa42c367714111d70a4580e3c24a89000ce9fa1b13d1569f5c771c4852b54b3e1f786c992566b82b32d5a68409d +MISC metadata.xml 249 BLAKE2B 2230f6378ef384909010a34f5e61fe48a1093f098ab6642338dc80fd493dcee049eb66920ba7baaada1589a6263ce354e55a54ac22d0dbe98b03422664dca4e1 SHA512 1c52230475aa50e70a2d47b830a5bdf1af00ff0cb2c70f07f94df8a13824c30994c69f53bea0367f987c1aa587fd7d480b8fa8fcfdcc01461b8d2b27ed4a11d2 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 066345cf8c48..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..11} ) -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 new file mode 100644 index 000000000000..367de758b356 --- /dev/null +++ b/sys-fs/cryfs/cryfs-0.11.4.ebuild @@ -0,0 +1,171 @@ +# 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 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/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz + " + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" +fi + +DESCRIPTION="Encrypted FUSE filesystem that conceals metadata" +HOMEPAGE="https://www.cryfs.org/" + +LICENSE="LGPL-3 MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boost:= + dev-libs/crypto++:= + dev-libs/libfmt:= + dev-libs/spdlog:= + net-misc/curl + >=sys-fs/fuse-2.8.6:0 +" +DEPEND=" + ${RDEPEND} + dev-cpp/range-v3 + test? ( + dev-cpp/gtest + ) +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + $(python_gen_any_dep ' + dev-python/versioneer[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + # TODO: upstream: + "${FILESDIR}"/cryfs-0.11.4-unbundle-vendored-libs.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 + + # Hook up ctest properly for better maintainer quality of life + sed -i -e '/option(BUILD_TESTING/aenable_testing()' CMakeLists.txt || die + sed -i -e '/BUILD_TESTING/a include(GoogleTest)' test/CMakeLists.txt || die + sed -i -e 's/add_test/gtest_discover_tests/' test/*/CMakeLists.txt || die +} + +src_configure() { + # ODR violations (bug #880563) + # ./CMakeLists.txt + # """ + # We don't use LTO because crypto++ has problems with it, + # see https://github.com/weidai11/cryptopp/issues/1031 and + # https://www.cryptopp.com/wiki/Link_Time_Optimization + # """ + filter-lto + + local mycmakeargs=( + # Upstream inconsistently specifies their libraries as STATIC + # Leading to issues when static libraries without PIC are linked + # with PIC shared libraries. + -DBUILD_SHARED_LIBS=OFF + -DBUILD_TESTING=$(usex test) + -DCRYFS_UPDATE_CHECKS=OFF + -DUSE_SYSTEM_LIBS=ON + # Upstream offered method of using system packages for packages installed via conan + # This only affects those fetched via Conan not those bundled in /vendor. + # "Note that this is only provided as an example and not officially supported." + # bug #631196 + -DDEPENDENCY_CONFIG="${S}/cmake-utils/DependenciesFromLocalSystem.cmake" + ) + + append-cppflags -DNDEBUG + + # bug 907096 + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + + cmake_src_configure +} + +src_test() { + local TMPDIR="${T}" + + local CMAKE_SKIP_TESTS=( + # Breaks network sanbox + CurlHttpClientTest + FakeHttpClientTest + # Filesystem did not call onMounted callback, probably wasn't successfully mounted. + # bug #808849 + CliTest.WorksWithCommasInBasedir + CliTest_IntegrityCheck.givenIncorrectFilesystemId_thenFails + CliTest_IntegrityCheck.givenIncorrectFilesystemKey_thenFails + CliTest_Setup.AutocreateBasedir + CliTest_Setup.AutocreateMountpoint + CliTest_Setup.ConfigfileGiven + CliTest_Setup.ExistingLogfileGiven + CliTest_Setup.NoSpecialOptions + CliTest_Setup.NotexistingLogfileGiven + CliTest_Unmount.givenMountedFilesystem_whenUnmounting_thenSucceeds + RunningInForeground/CliTest_WrongEnvironment.BaseDir_AllPermissions + RunningInForeground/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create + RunningInForeground/CliTest_WrongEnvironment.MountDir_AllPermissions + RunningInForeground/CliTest_WrongEnvironment.MountDir_DoesntExist_Create + RunningInForeground/CliTest_WrongEnvironment.NoErrorCondition + RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.BaseDir_AllPermissions + RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create + RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.MountDir_AllPermissions + RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.MountDir_DoesntExist_Create + RunningInForeground_ExternalConfigfile/CliTest_WrongEnvironment.NoErrorCondition + RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_AllPermissions + RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create + RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_AllPermissions + RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_DoesntExist_Create + RunningInForeground_ExternalConfigfile_LogIsNotStderr/CliTest_WrongEnvironment.NoErrorCondition + RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_AllPermissions + RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.BaseDir_DoesntExist_Create + RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_AllPermissions + RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.MountDir_DoesntExist_Create + RunningInForeground_LogIsNotStderr/CliTest_WrongEnvironment.NoErrorCondition + # Filesystem did not call onMounted callback, probably wasn't successfully mounted. + # fuse: failed to open /dev/fuse: Permission denied + CliTest_IntegrityCheck.givenFilesystemWithRolledBackBasedir_whenMounting_thenFails + CliTest_IntegrityCheck.whenRollingBackBasedirWhileMounted_thenUnmounts + # Tests that hang due being unable to open fuse + # bug #699044 + # fuse: failed to open /dev/fuse: Permission denied + Fuse* + ) + + cmake_src_test +} + +src_install() { + cmake_src_install + doman doc/man/cryfs.1 +} 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/files/cryfs-0.11.4-unbundle-vendored-libs.patch b/sys-fs/cryfs/files/cryfs-0.11.4-unbundle-vendored-libs.patch new file mode 100644 index 000000000000..352d15042144 --- /dev/null +++ b/sys-fs/cryfs/files/cryfs-0.11.4-unbundle-vendored-libs.patch @@ -0,0 +1,315 @@ +https://bugs.gentoo.org/631196 + +From 00ddc58b11ec76641f6f9b96584de1b0c2b57390 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Mon, 3 Jun 2024 15:05:01 +0300 +Subject: [PATCH] Add USE_SYSTEM_LIBS option to build without bundled libs + +* Based on a patch by Andreas Sturmlechner. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ require_clang_version(7.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") +@@ -46,7 +47,20 @@ endif() + + include(${DEPENDENCY_CONFIG}) + +-add_subdirectory(vendor EXCLUDE_FROM_ALL) ++if(USE_SYSTEM_LIBS) ++ include(FindPkgConfig) ++ pkg_check_modules(CRYPTOPP REQUIRED libcryptopp>=8.2) ++ if(BUILD_TESTING) ++ find_package(GTest CONFIG REQUIRED) ++ set(GOOGLETEST_LIBS GTest::gtest GTest::gmock) ++ endif() ++ ++ add_definitions(-DUSE_SYSTEM_LIBS) ++else() ++ add_subdirectory(vendor EXCLUDE_FROM_ALL) ++ set(GOOGLETEST_LIBS googletest) ++endif() ++ + add_subdirectory(src) + add_subdirectory(doc) + add_subdirectory(test) +--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp ++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp +@@ -1,5 +1,9 @@ + #include "Gzip.h" ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/gzip.h> ++#else + #include <vendor_cryptopp/gzip.h> ++#endif + + using cpputils::Data; + +--- a/src/cpp-utils/crypto/hash/Hash.cpp ++++ b/src/cpp-utils/crypto/hash/Hash.cpp +@@ -1,6 +1,10 @@ + #include "Hash.h" + #include <cpp-utils/random/Random.h> ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/sha.h> ++#else + #include <vendor_cryptopp/sha.h> ++#endif + + using cpputils::Random; + using CryptoPP::SHA512; +--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp ++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp +@@ -1,5 +1,9 @@ + #include "Scrypt.h" ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/scrypt.h> ++#else + #include <vendor_cryptopp/scrypt.h> ++#endif + + using std::string; + +--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h ++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h +@@ -6,7 +6,11 @@ + #include "../../data/Data.h" + #include "../../random/Random.h" + #include <boost/optional.hpp> ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/modes.h> ++#else + #include <vendor_cryptopp/modes.h> ++#endif + #include "Cipher.h" + #include "EncryptionKey.h" + +--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h ++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h +@@ -3,7 +3,12 @@ + #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_ + + #include "AEAD_Cipher.h" ++ ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/gcm.h> ++#else + #include <vendor_cryptopp/gcm.h> ++#endif + + namespace cpputils { + +--- a/src/cpp-utils/crypto/symmetric/ciphers.h ++++ b/src/cpp-utils/crypto/symmetric/ciphers.h +@@ -2,12 +2,21 @@ + #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ + #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ + ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/aes.h> ++#include <cryptopp/twofish.h> ++#include <cryptopp/serpent.h> ++#include <cryptopp/cast.h> ++#include <cryptopp/mars.h> ++#include <cryptopp/chachapoly.h> ++#else + #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 <vendor_cryptopp/chachapoly.h> ++#endif + #include "GCM_Cipher.h" + #include "CFB_Cipher.h" + +--- a/src/cpp-utils/data/Data.cpp ++++ b/src/cpp-utils/data/Data.cpp +@@ -1,6 +1,10 @@ + #include "Data.h" + #include <stdexcept> ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/hex.h> ++#else + #include <vendor_cryptopp/hex.h> ++#endif + + using std::istream; + using std::ofstream; +--- a/src/cpp-utils/data/FixedSizeData.h ++++ b/src/cpp-utils/data/FixedSizeData.h +@@ -2,7 +2,11 @@ + #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ + #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ + ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/hex.h> ++#else + #include <vendor_cryptopp/hex.h> ++#endif + #include <string> + #include <array> + #include <cstring> +--- a/src/cpp-utils/random/OSRandomGenerator.h ++++ b/src/cpp-utils/random/OSRandomGenerator.h +@@ -3,7 +3,11 @@ + #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H + + #include "RandomGenerator.h" ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/osrng.h> ++#else + #include <vendor_cryptopp/osrng.h> ++#endif + + namespace cpputils { + class OSRandomGenerator final : public RandomGenerator { +--- a/src/cpp-utils/random/RandomGeneratorThread.h ++++ b/src/cpp-utils/random/RandomGeneratorThread.h +@@ -4,7 +4,11 @@ + + #include "../thread/LoopThread.h" + #include "ThreadsafeRandomDataBuffer.h" ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/osrng.h> ++#else + #include <vendor_cryptopp/osrng.h> ++#endif + + namespace cpputils { + //TODO Test +--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp ++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp +@@ -1,7 +1,11 @@ + #include "BasedirMetadata.h" + #include <boost/property_tree/ptree.hpp> + #include <boost/property_tree/json_parser.hpp> ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/sha.h> ++#else + #include <vendor_cryptopp/sha.h> ++#endif + #include <boost/filesystem/operations.hpp> + #include "LocalStateDir.h" + #include <cpp-utils/logging/logging.h> +--- 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}) +--- 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}) +--- a/test/cpp-utils/CMakeLists.txt ++++ b/test/cpp-utils/CMakeLists.txt +@@ -71,7 +71,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}) + +--- 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}) +--- 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}) +--- a/test/cryfs/impl/config/CompatibilityTest.cpp ++++ b/test/cryfs/impl/config/CompatibilityTest.cpp +@@ -2,7 +2,11 @@ + #include <vector> + #include <boost/filesystem.hpp> + #include <cpp-utils/data/Data.h> ++#if defined(USE_SYSTEM_LIBS) ++#include <cryptopp/hex.h> ++#else + #include <vendor_cryptopp/hex.h> ++#endif + #include <cpp-utils/crypto/symmetric/ciphers.h> + #include <cpp-utils/tempfile/TempFile.h> + #include <cryfs/impl/config/CryConfigFile.h> +--- a/test/fspp/CMakeLists.txt ++++ b/test/fspp/CMakeLists.txt +@@ -103,7 +103,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}) +--- 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}) +--- 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 .) + +--- 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.45.2 + 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 34d98a21f297..521d83bbe34c 100644 --- a/sys-fs/cryptmount/Manifest +++ b/sys-fs/cryptmount/Manifest @@ -1,3 +1,3 @@ -DIST cryptmount-6.2.0.tar.gz 548497 BLAKE2B 45602d86624464c8c1c2ad9cf3ffc4bf311d60ae16c2294111b1fc98bb0e02952c69c767a1c583428c3d8eb0ade2caddb17d3187f4dd34d780772b299ea1a6c0 SHA512 005d9333792a567515ce6d487d2dfa18f19cb077a64d9c356562acefc1947581d2d0f584ad623e0aab8aed1b34f1614af3a42f0c582d31e0831cdb8eb22bb7ce -EBUILD cryptmount-6.2.0.ebuild 1646 BLAKE2B 7fa9fb2c8c0204636f1dd55ef59f9ae46fe31ecad2fcf7eef69c8b178dc1e1f9fc9fc55a1f82ec042eae4d8847809feb252ea7d486b9eef32c3fd10006d13100 SHA512 0665a0e0ddd46f74f8cef513c346cd421b389e015b92b714dee203282aaa3cf915a4ede17d9d41285568c057359a256bbb0c385baf74af17b5809bfa355b88a8 -MISC metadata.xml 2146 BLAKE2B 9547e66f62ddf51455e742a6c6f5b350eb8cb4ff62cc4f605607f8970714587758dff8e9437d355e1781a2ce2e25e38e184730de0c39cd5d191b8459bc540c3a SHA512 09d3385123051712f2a264f5c2793f1d99090ed095af17b4753ad925f73e0af85c355fc985966f7fc3cb8b8225dbb9fab23e254308d29633a73bcb6173dde029 +DIST cryptmount-6.3.0.tar.gz 373196 BLAKE2B b59127f9944f4bf267d4272bc026909b704f474b2fd2a20baf9125f9b32b33ecfd5523c6ef05098e6467e9b7e938daba55685dc47a3317a4913aef4c517f66f2 SHA512 15f19a1ff7409b35be2cde3d791c8d476c98ffcaf3dd9217076703b0e0baafe999a0608a88cc51039ba2e9c26cb297261128a5efeacd1a6397c5d3300886ac4d +EBUILD cryptmount-6.3.0.ebuild 1577 BLAKE2B 438f0aa809474ae08be7028da0a7e80fc5a3d0354ff76c6c5fee17742125f56088b72672de45a80c301431c39c1cb91ee935cc2e4a9a48dbed327b611317ab56 SHA512 b7f71d67951bc839b97f7dcb218cfbaed0237f306236b0087eedcefca881fb42d39acb2ea0f6048524b2dad17e8a025e65d2ac3fa7f6b5a2852c5f1a033a866b +MISC metadata.xml 2205 BLAKE2B e8db36615800db96d3857ad16f4daaccbc1354c3aa1c55f2385b07a6abe9831a0bb691672a452291ede20ea0ed4a49de26e7e45417297a37436273fdcf17c01b SHA512 631f74f0e6c1e83a0471595db1b63604d785410f1f0fc684ddd8114ea29ea42a24dd42251b0618685e376b8b7b910eee42211938494d95164cc0e5ce392c27e4 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 ab6fbb687bbb..824b1a3399a6 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -1,5 +1,13 @@ AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a AUX 2.4.3-dmcrypt.rc 9715 BLAKE2B f3ad708c4fd26e197282ca3b3289756e686663dddeed87d0cdf973e485828141a50a1eb519ce0f32e44aeb6a3675ea71e8bae31bfda97ffc5558a8c017a5cf08 SHA512 a5355f870a018d516d50152b1a09243be28ddca0578347a1bbf21f4bfd495331a1571d11922360274b07d1344b4107e9eb937bc9fcedee47d0b733ab7d6f47de DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e SHA512 0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18 -EBUILD cryptsetup-2.6.1.ebuild 4152 BLAKE2B b346a276c968b88d55e5ab0ee39f5623e4d06608c228752b37c538876fbd838eebcfede1de9c9d40daa1e308f2f91bc030e727fd7c055c56e05ae6ae9c0c3b3d SHA512 497b7a18f2d7434b35c6980ee8dda270df757bca81782fd166bbf92a079f850227f48dc6bfd373553ede01fb9143a7c79207eb51011de84ec1416c6db9f47326 +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 +EBUILD cryptsetup-2.6.1.ebuild 4146 BLAKE2B 23460c085e6bbde61a42de529440591a74a5f16167d5889037fea97cc589764c2af1b93953e9458cde22fb93a5d347fa8ca80b8d823f34cd871e89c02031422c SHA512 5fc69b8da5b053d95a8fe55cb67d999d022e7e8012dd44dc5bc2ea235eb4b2ebc37fa2e4e2d2f532ba6f3076c040538c79409803c81cfb23acd0aa48ceb795cb +EBUILD cryptsetup-2.7.2.ebuild 4161 BLAKE2B c2cc271963d87c13487074d0d3ff1abde76d0bc3f3a65d13ad9b5e8250bae8d6c35d8012cc266761ef58bae13c40e047d6dd551a597d80828e5aa1407774a0c3 SHA512 0b041e8967e87ff383f3c044c325c2f14d7ebd43f9d434fb01b5be2dd52b20c607e37939d56c392eb55b521333d5cba636eb8c3dac4e00e5b9920a7c7793931f +EBUILD cryptsetup-2.7.3.ebuild 4160 BLAKE2B f6959b6ba10257943c2885e3f9d1d00dff3e3ed8f3aa320bd1038572f5e9832f09c74c5967f0c45f36704c2c7128f7020c063f2f0fb6ed91f3823d304a253cd2 SHA512 eb0404b40636ffa1271628057de2c06a6bd1b005f929bc6a3e01172618d598aff6e515c804963a0b193515f21d3127ad03faa1e51b3263bf47f7d892b06cd56b +EBUILD cryptsetup-2.7.4.ebuild 4160 BLAKE2B f6959b6ba10257943c2885e3f9d1d00dff3e3ed8f3aa320bd1038572f5e9832f09c74c5967f0c45f36704c2c7128f7020c063f2f0fb6ed91f3823d304a253cd2 SHA512 eb0404b40636ffa1271628057de2c06a6bd1b005f929bc6a3e01172618d598aff6e515c804963a0b193515f21d3127ad03faa1e51b3263bf47f7d892b06cd56b +EBUILD cryptsetup-2.7.5.ebuild 4154 BLAKE2B b52e02a63b4f7b3674d262e4cdf7f48a1f2636897278ee4ab49747154d5700471405afb4fa93e0c5014cdc0ca0185c4899afc5926073e5bef2dc3639607bdaf1 SHA512 685ee4e03b42cd5e951687402f42c9de307dbf4071e69f2a51e65e7b5c489216dc6bcb6e728c59b81f5b4b423f6c132919e71c80172b543fc2c798cc9265dde4 MISC metadata.xml 1146 BLAKE2B e349364ad14e957f35c1fbe1fdeff46cd6a48535b45363922e071adde6342a60fb30c25e3579b908b6e0c0df80984ef26b319e70d438731d665a57fcc2aa8b81 SHA512 6cec96962ee5da4b2923e1fbce5232d014e25e01ccfdd3ca55d48e23cb8581af592ed9b061f8e24b6408e8c339b9ebfa5e2754c1ead417e41d832f777d4ccb45 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 new file mode 100644 index 000000000000..10ac2ba5d833 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.7.2.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? ( !gcrypt !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/cryptsetup/cryptsetup-2.7.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild new file mode 100644 index 000000000000..729d59ff8f6d --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.7.3.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/cryptsetup/cryptsetup-2.7.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild new file mode 100644 index 000000000000..729d59ff8f6d --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: meson +inherit linux-info tmpfiles + +DESCRIPTION="Tool to setup encrypted devices with dm-crypt" +HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup" +SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" +S="${WORKDIR}"/${P/_/-} + +LICENSE="GPL-2+" +SLOT="0/12" # libcryptsetup.so version +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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/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 8fcf6f241cdc..058bd0a85949 100644 --- a/sys-fs/ddrescue/Manifest +++ b/sys-fs/ddrescue/Manifest @@ -1,5 +1,5 @@ DIST ddrescue-1.27.tar.lz 93496 BLAKE2B a8957819dec2255e446504c822331ae13a86193f4655cbe6d559a498db9daf8c0f8066355e395cfd44f08b2f15d831820003bdfde6fc59c8434a695f95bdbe21 SHA512 b9a8b462536c5ec29db69e3a5f70b0bce160d5c58373cb519f6d54aba2fc0c4907e74fbcd11d49291306dc29c76f1992575aef7cfff41f34748bbd96e33b745a DIST ddrescue-1.28.tar.lz 93823 BLAKE2B 8c212f0d495e0df8e0398b97730c812ea9ccb77bd42e730198222e9918e3652fc52d932449b1e0dc9bdd453a123e2450c962e33e98d9845ce81b9a934a5bbdaa SHA512 ad3df2361b3b0228e2875792e0f6b301dc4d9cefd3f4fcdbce180a53c32924ee026bd27397b8efc94f40ee10f5f9d453fa72bd19203b6cb90208881e287e2c46 -EBUILD ddrescue-1.27.ebuild 879 BLAKE2B 51cdfdc49157caceebb54d29cb74560e0b5d7e761d8a968b78a6ae4ae0a4d0876f90dbfaec8e290127f0d4c78a46193b0a75cbd767c4b908263cc4be217026d7 SHA512 f46a55ecd8ce7a1a4e8d2bc31155763f69a6b2f50bafe0102e7a2276cab14d7c320ac23f6af4a51c227a59d541b18cac0751a1f0edc658088150167ff3db02e5 -EBUILD ddrescue-1.28.ebuild 883 BLAKE2B 86646edd9c0b7c74c16d6e9e54c5c3064bbb1f63664a862d4941178216b478102534cb27891a84944f4918728caded84bce2817a4fc23673a406263720d0f1b3 SHA512 e0587e80d3ef8e20f7fa526cabdcace1e77a20cabc1b8e73a144fcc63d004ce10419e9b124b51a794fe5991e470ce116e59326a63de72ee27dde47e036a96042 -MISC metadata.xml 331 BLAKE2B 3bc259d88e09ebe602e8a983da993ec81aa730a4926ad656ae296370f0dd4107d347120160f4de3a0ce1e049ec2e582697028df9b17e7250a3a183a47e79fff6 SHA512 2ea82a90930c6e48240abfa005e31e07a83357122dbe29189c4e3ab22c7c1c039673a9a072d94f19e2ceb32e6e183fb7bddb5808f8d9a2f6d8d85ceaf2344113 +EBUILD ddrescue-1.27.ebuild 873 BLAKE2B 1263e39601d1ed8eee1773ee7d52b98acb54fef7cda2c041f4b5ab8828de15ff43373bc3df25b6dfef80f41f2cc6b3479144e9c3aaca42db2ef99680f4684235 SHA512 042a8f23efb845faa5d89716b86a592dffd40fe02a55b5fdaef2a35debf4df869aa824b69e1d39fd69eade72616c7cef1d65d8e246ec6ee86f293449d385c283 +EBUILD ddrescue-1.28.ebuild 873 BLAKE2B 6cf6b7377468b69f9d5672dce487b362270a26b4c156db3ced17149413da6c8b5c76904009489c01f027313ad377bdb1aa8dcc130978a96521b9ceebca2141a5 SHA512 425e5e62875f4884f2e6eb9f11c3903b11f03acb35f5ced67a420ee7b989387e4c91e0b638e6a98998317c533b2347e8f1e247bc83889ca7999884bf91d75fe3 +MISC metadata.xml 248 BLAKE2B d546a4f313351d01b4958fc189e5d65c4d48dd594229b225dcc95699d59264603a69493d508379020ae71b93dac0232dc125fc248e2cb4a9514f8b5ac512e988 SHA512 ae5861a52294abb1e2c67f89872689f0f279b21b0a79989f43ba564429efcdc50e4a96249562fc71b1d3b2c5b31ebe3cb3bccb8bc9f0403adfe49493ad502838 diff --git a/sys-fs/ddrescue/ddrescue-1.27.ebuild b/sys-fs/ddrescue/ddrescue-1.27.ebuild index 8bf8cf8643e1..56e199a7b459 100644 --- a/sys-fs/ddrescue/ddrescue-1.27.ebuild +++ b/sys-fs/ddrescue/ddrescue-1.27.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/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/ddrescue/metadata.xml b/sys-fs/ddrescue/metadata.xml index 2bdb11292283..327749f52384 100644 --- a/sys-fs/ddrescue/metadata.xml +++ b/sys-fs/ddrescue/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="savannah">ddrescue</remote-id> </upstream> diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest index 4790f4d9e05b..88faeb929936 100644 --- a/sys-fs/dmraid/Manifest +++ b/sys-fs/dmraid/Manifest @@ -5,5 +5,5 @@ AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d31 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e -EBUILD dmraid-1.0.0_rc16-r7.ebuild 3492 BLAKE2B 9a049a0f065271a6d98d8108b366f28070601c4ce0319f71d0f965b63de7f33e33361dba13b44afb16429c7498038902456b8c9af0c240a76e6535977a4d356e SHA512 eb6c9c761c2000e99c49bbe9c5b2480f0657e4393764cb208058b0a7c87bd25c5025ec879e22cf90da1e72cfb9845ade95ecc033fbf90c92f239a49c18c62a33 +EBUILD dmraid-1.0.0_rc16-r7.ebuild 3486 BLAKE2B 6ee291c5ea0a9d676f2daa823bc5802029353cba7567fc32ffdc331c97c1691c44c84f148dfe77e76eecc3f1e597661f07d07d7976cb7e435d64d7b13f0e898b SHA512 5917ca7797f973e2be28d54f3d56cd551b728a5277b907f08853034e29ed640605276f96eee15116e4456308f4479a20726d064fd6943ccfff7acc708df2135c MISC metadata.xml 545 BLAKE2B 553f9f750bf8dcefcf578834d023404ca9dbcbc57749984e89b35ffce2964688515b69ef1ca26c45e4236296f562c8ba512cff70c9059c4f5a233c8d0df15a1b SHA512 0642718eb176d604d2fc91a4ad843d114044e1136b22e999bf1c59ca92e19b0f970e7618680f2147233bc64103e51604f363890e5d5479d7a808e85ca42c40a7 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/Manifest b/sys-fs/dosfstools/Manifest index 3ca874504015..e8d935fd81f3 100644 --- a/sys-fs/dosfstools/Manifest +++ b/sys-fs/dosfstools/Manifest @@ -1,3 +1,3 @@ DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 -EBUILD dosfstools-4.2.ebuild 930 BLAKE2B 1ea42c850cbbd29b66f1069bb48f072c5c4329040e0b8c33b8d9a30c26504dd8b8fb96ddb70ff82d76bfa66369a0f44ed53007daab4fe0808804e70eae937f3d SHA512 8d6ab0320f4cf0a077b282f549d8d6a4297f7804faeb90d59800e18b05a16c2b05ef35b0440a660a8a1ec8909b9d1dbfacc2d91473323e6514b0f8fb3661dde2 +EBUILD dosfstools-4.2.ebuild 924 BLAKE2B ec0083ec696234b6c97646248200cab3da94982c538ba4e9d048528121cddf2a3d927f69dcf7f485147edbf9998d369c192a7ab031895c7d0c3323ae3e7a4d10 SHA512 55641d0a151f0db174dc739b8e299d419a37e7f6c0f7ba2b92522ee163d78d3985a28e7874cf5809a2846ed912124c9852e9a19b694becf87544781f9c12c1f8 MISC metadata.xml 497 BLAKE2B c2133e8e9cacc48ae4cad373a4414ab5b3884b640eac5ffd7bf88b08ee8c741c43dcfd9a8c339cbdeb37354e424580beb058b79c58440ce85d1b1ce53a94b57b SHA512 b8e2647a85edd7cffbe3fd91560ad8c0c6f4aaf66b67db9d41268ec17001ded8da4a9e7aefdcae00737e7ece5f7cd1e47f9101dc3323d4679d059043c1d686d4 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/Manifest b/sys-fs/e2fsprogs/Manifest index 57b46b5bca95..5a28145b8537 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -3,5 +3,7 @@ AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68 AUX e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch 1140 BLAKE2B bd454a4cf073db6e2e102ad814065e3a0c9a81282db932a2259a615417a9dea5879e53ca6d4bd41537147e7706edc88ecbd06ad71dc57305e8b0b835c2b15ae9 SHA512 90afefd47bbec59537cd646515dc320eac7b6e0f89ce5100b0d518d2386f8f57f84cf182f62130a7530e9a78132fc971e3195f4cef1836a8175261ddb1beaf11 AUX e2fsprogs-1.47.0-parallel-make.patch 3491 BLAKE2B b3848202f038cc86a07e784bfeff266096f241e38cd96eec176aa05423cc1286b30b879b202bec103851c3b59394ea4f894b03e1b4868dd035fb47679f984cc3 SHA512 08764ccb47b8790c390f47440082ce0dcd844bb3bddada647c63cc176d3daab29f8815380ddb65ed8a60b91b6a5af9c0bc32d32029c39b2c2c996a6026992121 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec -EBUILD e2fsprogs-1.47.0-r3.ebuild 4461 BLAKE2B 3ad15e552e74f7d9c49465feb39b00af95fdd60c15ea6020b47269275dcf0750934e6c923aaf5cb5f8eb25f7386802e8c7a855a914102452c55ce80ca5c5fbb5 SHA512 2f2e32e2feca64f58d23f8fe6b64b684fce0e8fba8086ae615259a23c99db8279193df099105e34baf1bcd1f89c5accff5344dc7262b6c1586ce622973818650 -MISC metadata.xml 715 BLAKE2B 7a5d2ea0cd9b404d7ac0916648edd979852fc477513f55ed887b2198ec14f78cc42e13c52f7851605e16a0ac1a717484f2cd7ac6f953dd5ceec18a9738eba2c1 SHA512 286aedab5c877c6b3de25bc4764bb92e1f95d41a996003f86cd5050a122eb59d1bd6f06a6a5e27ff42d404c14baa1e71cf450e7a3aaeecb17f6db067eebf1c3f +DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb +EBUILD e2fsprogs-1.47.0-r3.ebuild 4455 BLAKE2B d7e9e8db1092f3fe831694282f768233e53665f7879eb29bf445a1f36e2ca6fc468cbd5e0bb8447ce40ccce7f0bedc5a1fdd49c1b9933395b608bcf496b663b7 SHA512 beeb0dcca050765f805b9f8f53badac4c8a2d32d076581ae8b775195abe33a82c4291384922185060a3d071d670968db8b18de3498299580aed3b08acef28afe +EBUILD e2fsprogs-1.47.1.ebuild 4636 BLAKE2B abd56dcbbae17dc7b2ef32db25c843e2d273f09f3dfd482b8e663157d9acd895b6b82d60c2c8e9a5b91b0be125fe58df6043010ce68319dd20537070b0bd2746 SHA512 d92898fb7ba51ecc42ccf79d007e577ccd028fc575956f4aa2eb537f83703440368e1f728b39d607da33952898a477fb7ed47a0cdc1266efe873cde04af5d851 +MISC metadata.xml 870 BLAKE2B bf57e8f24b302ed91357fb10dbc9b15656002983281fd287ee241a9a097d00e6af56d4a42de4109728dbb826ea58e58eba26ec1840299e43f7728495b1a133f4 SHA512 fa0ea6b3db855719976d3c627dcf88f62cf7fdacc132686ea06bcdfce03bb9ccef035d9aa674fc43844a0a111198c34921016183966be5f887aabed06bf0f369 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 new file mode 100644 index 000000000000..c3852f07fa8b --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal systemd toolchain-funcs udev + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2 BSD" +SLOT="0" +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 )" + +RDEPEND=" + !sys-libs/${PN}-libs + archive? ( app-arch/libarchive:= ) + cron? ( sys-fs/lvm2[lvm] ) + fuse? ( sys-fs/fuse:3 ) + nls? ( virtual/libintl ) + tools? ( sys-apps/util-linux ) +" +# For testing lib/ext2fs, lib/support/libsupport.a is required, which +# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux. +DEPEND=" + ${RDEPEND} + test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) +" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ext2fs/ext2_types.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854 + # We can drop this metadata patch after 6 months or so to let initramfses + # upgrade. See bug #904093 and bug #904048. + "${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch + + # Upstream patches (can usually removed with next version bump) +) + +src_prepare() { + default + + cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" + + # Get rid of doc -- we don't use them. This also prevents a sandbox + # violation due to mktexfmt invocation + rm -r doc || die "Failed to remove doc dir" + + cat <<-'EOF' > tests/m_rootdir_acl/script || die + echo "$test_name: $test_description: skipped (bgo#905221, fails on btrfs)" + return 0 + EOF + + # Prevent included intl cruft from building, bug #81096 + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + MCONFIG.in || die 'intl cruft' +} + +multilib_src_configure() { + # Keep the package from doing silly things, bug #261411 + export VARTEXFONTS="${T}/fonts" + + local myeconfargs=( + --with-root-prefix="${EPREFIX}" + $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") + --with-systemd-unit-dir="$(systemd_get_systemunitdir)" + --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" + --enable-symlink-install + --enable-elf-shlibs + $(tc-has-tls || echo --disable-tls) + $(multilib_native_use_with archive libarchive direct) + $(multilib_native_use_enable fuse fuse2fs) + $(use_enable nls) + $(multilib_native_use_enable tools e2initrd-helper) + --disable-fsck + --disable-uuidd + --disable-lto + --with-pthread + --enable-largefile + ) + + # We use blkid/uuid from util-linux now + if use kernel_linux ; then + export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes + myeconfargs+=( --disable-lib{blkid,uuid} ) + fi + + ac_cv_path_LDCONFIG=: \ + ECONF_SOURCE="${S}" \ + CC="$(tc-getCC)" \ + BUILD_CC="$(tc-getBUILD_CC)" \ + BUILD_LD="$(tc-getBUILD_LD)" \ + econf "${myeconfargs[@]}" + + if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then + eerror "INTL sanity check failed, aborting build." + eerror "Please post your ${S}/config.log file as an" + eerror "attachment to https://bugs.gentoo.org/81096" + die "Preventing included intl cruft from building" + fi +} + +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 + emake -C lib/et V=1 + emake -C lib/ss V=1 + emake -C lib/ext2fs V=1 + emake -C lib/e2p V=1 + fi +} + +multilib_src_test() { + if multilib_is_native_abi && use tools ; then + emake V=1 check + else + # Required by lib/ext2fs's check target + emake -C lib/support V=1 + + # For non-native, there's no binaries to test. Just libraries. + emake -C lib/et V=1 check + emake -C lib/ss V=1 check + emake -C lib/ext2fs V=1 check + emake -C lib/e2p V=1 check + fi +} + +multilib_src_install() { + if multilib_is_native_abi && use tools ; then + emake STRIP=':' V=1 DESTDIR="${D}" install + else + emake -C lib/et V=1 DESTDIR="${D}" install + emake -C lib/ss V=1 DESTDIR="${D}" install + emake -C lib/ext2fs V=1 DESTDIR="${D}" install + emake -C lib/e2p V=1 DESTDIR="${D}" install + fi + + # configure doesn't have an option to disable static libs + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi +} + +multilib_src_install_all() { + einstalldocs + + if use tools ; then + insinto /etc + doins "${FILESDIR}"/e2fsck.conf + fi +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml index 3030299059ee..972d0ac8f30c 100644 --- a/sys-fs/e2fsprogs/metadata.xml +++ b/sys-fs/e2fsprogs/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Base System</name> </maintainer> <use> + <flag name="archive">Add support for mke2fs to read a tarball as input. This allows not needing privileges. Needs <pkg>app-arch/libarchive</pkg>.</flag> <flag name="cron">Install e2scrub_all cron script</flag> <flag name="fuse">Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag> <flag name="tools">Build extfs tools (mke2fs, e2fsck, tune2fs, etc.)</flag> diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest index 90805cfa6902..3a0bc34d8528 100644 --- a/sys-fs/erofs-utils/Manifest +++ b/sys-fs/erofs-utils/Manifest @@ -1,7 +1,5 @@ -AUX erofs-utils-1.6-CVE-2023-33551.patch 2204 BLAKE2B d0cf130e455123df3d4961b3f2b292167f189257bfd5d4aec9afb932179fa8642b84d62b891a70480b2d2dd0be52420467b81d1471c27b5d1c0f7c6c6e61f482 SHA512 e8c7ad3f00c6f86a76f3f9f5001939fc878157229f9223796f2dfdb6ea37c2598f4b5d45934a6c5c3171689bbf455f8987f583617b5853fe0eaed7a237c63b8f -AUX erofs-utils-1.6-CVE-2023-33552.patch 3294 BLAKE2B 45a36f7c91dcbbce8a0e25a28727fcccbf1cb9d0f073909e7f883f033de5d2b1ee133a1604cdf4c132624441973432e298d76ae38333259421e0e47096b56b07 SHA512 952eb009d3c0ecde751af1246f9c34bbb16bb692a8664cbc7ac084e41840acc1e082cceb3b44826091f3819b73c0e04e19f051c949c5c7a0145ea3170dc92ada -DIST erofs-utils-1.6.tar.gz 126558 BLAKE2B ad4ce3777c484d485b91f29a97c08499398595d654a4ad63e1cc6a75c176b0476d3af1d7a2bf1ef5f6df996281c1b1bdfdf004be4428c0c168652af68acd83d1 SHA512 1537c5cb60cb70c607b8c00408451f90122fe902d80c9d35dde7b9205588ae3513ddd7cb38d4062e55bb57e37d9b53a668752792e6cba0bc0d78176afed3e502 DIST erofs-utils-1.7.tar.gz 165393 BLAKE2B f22183fbc3346db0632f0fc842586251d0e17ea19e1de3be51cd807dfac4a6150a080d6b81625c3e08eeebc2ae28d7840f8209c905ca87fc70481d3d8c3913ec SHA512 0f204cd40644bde28f9bd0c5c234d93e68db3a3998bb089f43bfb3ce9a9db1e1cc2fa65919205cbd4a484fa4388cffadf5b395bc4363de3882e1a19778c2d62b -EBUILD erofs-utils-1.6-r1.ebuild 989 BLAKE2B 12b5a6b4d33748b0d55034c9ef6fd2d812f37a7ba2410beff7765b8554ad67c4f389055eb051c52c89e3d371833b3b983bd8d54c958d566668a581ffbc72bd86 SHA512 8b4b4c8877d49ceaf3a28515914123b80ddf4948047626cea09644e6694f5c2ed65eb114b89a0a26157650fb42a0dcf0e194eca3ae2d2fb6356879e87b60bd8e +DIST erofs-utils-1.8.1.tar.gz 184385 BLAKE2B 0ecf7ad0d42f3941751511f3ab42e7e25b85dc64849867a221272cf4596f6bfff3cb1c22877a485de79b4445f68eea8e77cb3f8c742a23ee5ad7ce0232b85091 SHA512 b7fe2441e5295680bc683e978ad97ee359785fd842d77fa86ef6bf869b5da87ad613f48782b5f59684995b6cbc5c274938c9ea9067baa537f09c029eabb4cca3 EBUILD erofs-utils-1.7.ebuild 1006 BLAKE2B 362142e2d8da00981233599debae7463c5300571cdab96305e3b1ad7a120857aa84ab774b0807600f14b26a089477556a3e4e15e52a16e763b75aeac45dddc61 SHA512 e5e007b1a4a554b55865ef418dc14ad4eec95de1f5c1f59c8beb07ff74aa748ac9b20b732e249c7ce1e1e82d46ce06ad2e683f8776bdcd79309c76eb8c55b72d -MISC metadata.xml 422 BLAKE2B 9c580f677db0b02904c12e023efd2c1abf0dca9d5dd84776ea55551e3997a968bf23c092b9bfa98e941f7d16009c6e56cdd0120a075872c8e3f84a77899ba556 SHA512 bb5def8dcfe0ecfdc8ce9e6fec61b7c707114abef8e79f2c0f27736341e9c3cca48c053b613d85db762c1632194e76d3ab33386bf0be7ba669a6aaee652b64c1 +EBUILD erofs-utils-1.8.1.ebuild 1258 BLAKE2B f9c180bb0ae7b899db5f16a413b6a45a4951d0cf5c694c5983fd3ad9547de090ec0093bf9b4464050527634de9ba722580db850e51a314dd9ac08ccc6491b972 SHA512 8e7c7ecca451e41e83306d10a7bf2be3a031e7a775467707ede52009c5dc79efd91cd8f7f9c3adf7f72d2f49fa67d8756fcced3dba6b2ca03f36da31a32def08 +MISC metadata.xml 561 BLAKE2B 021bc1323881f1d1e5aaf0ab2c49d393319048c31da034c297e6877a2c23f3e7bbf2392919df7bacfa75289ba11d051c2f896128e954348f3dd6c0850b847262 SHA512 2fb30129b20709a2cff8fa8b9fdb7e04aed0dd6df3c03306058109b0f85203273dbf925a16754a74a08b52f38c11dc1b1881419258e2fe1caa418c63b3c3d25f diff --git a/sys-fs/erofs-utils/erofs-utils-1.6-r1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild index 87fe99420cfd..07c3889f14bb 100644 --- a/sys-fs/erofs-utils/erofs-utils-1.6-r1.ebuild +++ b/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,13 +7,14 @@ inherit autotools DESCRIPTION="Userspace tools for EROFS" HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git" -LICENSE="GPL-2+" SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz" -KEYWORDS="~amd64 ~loong" +LICENSE="GPL-2+" SLOT="0" -IUSE="fuse +lz4 +lzma selinux +uuid" +KEYWORDS="~amd64 ~arm64 ~loong" + +IUSE="fuse libdeflate +lz4 +lzma selinux static-libs +threads +uuid +zlib +zstd" RDEPEND=" fuse? ( sys-fs/fuse:0 ) @@ -21,13 +22,16 @@ RDEPEND=" lzma? ( >=app-arch/xz-utils-5.4.0:0= ) selinux? ( sys-libs/libselinux:0= ) uuid? ( sys-apps/util-linux ) + zlib? ( + libdeflate? ( app-arch/libdeflate:0= ) + !libdeflate? ( sys-libs/zlib:0= ) + ) + zstd? ( app-arch/zstd:0= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-CVE-2023-33551.patch" - "${FILESDIR}/${P}-CVE-2023-33552.patch" ) src_prepare() { @@ -39,10 +43,16 @@ src_configure() { local myeconfargs=( --disable-werror $(use_enable fuse) + $(use_with libdeflate) $(use_enable lz4) $(use_enable lzma) $(use_with selinux) + $(use_enable static-libs static-fuse) + $(use_enable threads multithreading) $(use_with uuid) + $(use_with zlib) + $(use_with zstd libzstd) + --without-qpl # not packaged ) econf "${myeconfargs[@]}" diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33551.patch b/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33551.patch deleted file mode 100644 index ce20d18cb33f..000000000000 --- a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33551.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://git.kernel.org/xiang/erofs-utils/c/27aeef179bf17d5f1d98f827e93d24839a6d4176 -From: Gao Xiang <hsiangkao@linux.alibaba.com> -Date: Fri, 2 Jun 2023 13:52:56 +0800 -Subject: erofs-utils: fsck: block insane long paths when extracting images - -Since some crafted EROFS filesystem images could have insane deep -hierarchy (or may form directory loops) which triggers the -PATH_MAX-sized path buffer OR stack overflow. - -Actually some crafted images cannot be deemed as real corrupted -images but over-PATH_MAX paths are not something that we'd like to -support for now. - -CVE: CVE-2023-33551 -Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33551 -Reported-by: Chaoming Yang <lometsj@live.com> -Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") -Fixes: b11f84f593f9 ("erofs-utils: fsck: convert to use erofs_iterate_dir()") -Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") -Signeo-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> -Link: https://lore.kernel.org/r/20230602055256.18061-1-hsiangkao@linux.alibaba.com ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -680,28 +680,35 @@ again: - static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) - { - int ret; -- size_t prev_pos = fsckcfg.extract_pos; -+ size_t prev_pos, curr_pos; - - if (ctx->dot_dotdot) - return 0; - -- if (fsckcfg.extract_path) { -- size_t curr_pos = prev_pos; -+ prev_pos = fsckcfg.extract_pos; -+ curr_pos = prev_pos; -+ -+ if (prev_pos + ctx->de_namelen >= PATH_MAX) { -+ erofs_err("unable to fsck since the path is too long (%u)", -+ curr_pos + ctx->de_namelen); -+ return -EOPNOTSUPP; -+ } - -+ if (fsckcfg.extract_path) { - fsckcfg.extract_path[curr_pos++] = '/'; - strncpy(fsckcfg.extract_path + curr_pos, ctx->dname, - ctx->de_namelen); - curr_pos += ctx->de_namelen; - fsckcfg.extract_path[curr_pos] = '\0'; -- fsckcfg.extract_pos = curr_pos; -+ } else { -+ curr_pos += ctx->de_namelen; - } -- -+ fsckcfg.extract_pos = curr_pos; - ret = erofsfsck_check_inode(ctx->dir->nid, ctx->de_nid); - -- if (fsckcfg.extract_path) { -+ if (fsckcfg.extract_path) - fsckcfg.extract_path[prev_pos] = '\0'; -- fsckcfg.extract_pos = prev_pos; -- } -+ fsckcfg.extract_pos = prev_pos; - return ret; - } - --- -cgit - diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33552.patch b/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33552.patch deleted file mode 100644 index c53a9b8044fe..000000000000 --- a/sys-fs/erofs-utils/files/erofs-utils-1.6-CVE-2023-33552.patch +++ /dev/null @@ -1,117 +0,0 @@ -https://git.kernel.org/xiang/erofs-utils/c/2145dff03dd3f3f74bcda3b52160fbad37f7fcfe -From: Gao Xiang <hsiangkao@linux.alibaba.com> -Date: Fri, 2 Jun 2023 11:05:19 +0800 -Subject: erofs-utils: fsck: don't allocate/read too large extents - -Since some crafted EROFS filesystem images could have insane large -extents, which causes unexpected bahaviors when extracting data. - -Fix it by extracting large extents with a buffer of a reasonable -maximum size limit and reading multiple times instead. - -Note that only `--extract` option is impacted. - -CVE: CVE-2023-33552 -Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33552 -Reported-by: Chaoming Yang <lometsj@live.com> -Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") -Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> -Link: https://lore.kernel.org/r/20230602030519.117071-1-hsiangkao@linux.alibaba.com ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -392,6 +392,8 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - } - - while (pos < inode->i_size) { -+ unsigned int alloc_rawsize; -+ - map.m_la = pos; - if (compressed) - ret = z_erofs_map_blocks_iter(inode, &map, -@@ -420,10 +422,28 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - if (!(map.m_flags & EROFS_MAP_MAPPED) || !fsckcfg.check_decomp) - continue; - -- if (map.m_plen > raw_size) { -- raw_size = map.m_plen; -- raw = realloc(raw, raw_size); -- BUG_ON(!raw); -+ if (map.m_plen > Z_EROFS_PCLUSTER_MAX_SIZE) { -+ if (compressed) { -+ erofs_err("invalid pcluster size %" PRIu64 " @ offset %" PRIu64 " of nid %" PRIu64, -+ map.m_plen, map.m_la, -+ inode->nid | 0ULL); -+ ret = -EFSCORRUPTED; -+ goto out; -+ } -+ alloc_rawsize = Z_EROFS_PCLUSTER_MAX_SIZE; -+ } else { -+ alloc_rawsize = map.m_plen; -+ } -+ -+ if (alloc_rawsize > raw_size) { -+ char *newraw = realloc(raw, alloc_rawsize); -+ -+ if (!newraw) { -+ ret = -ENOMEM; -+ goto out; -+ } -+ raw = newraw; -+ raw_size = alloc_rawsize; - } - - if (compressed) { -@@ -434,18 +454,27 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) - } - ret = z_erofs_read_one_data(inode, &map, raw, buffer, - 0, map.m_llen, false); -+ if (ret) -+ goto out; -+ -+ if (outfd >= 0 && write(outfd, buffer, map.m_llen) < 0) -+ goto fail_eio; - } else { -- ret = erofs_read_one_data(&map, raw, 0, map.m_plen); -- } -- if (ret) -- goto out; -+ u64 p = 0; - -- if (outfd >= 0 && write(outfd, compressed ? buffer : raw, -- map.m_llen) < 0) { -- erofs_err("I/O error occurred when verifying data chunk @ nid %llu", -- inode->nid | 0ULL); -- ret = -EIO; -- goto out; -+ do { -+ u64 count = min_t(u64, alloc_rawsize, -+ map.m_llen); -+ -+ ret = erofs_read_one_data(&map, raw, p, count); -+ if (ret) -+ goto out; -+ -+ if (outfd >= 0 && write(outfd, raw, count) < 0) -+ goto fail_eio; -+ map.m_llen -= count; -+ p += count; -+ } while (map.m_llen); - } - } - -@@ -460,6 +489,12 @@ out: - if (buffer) - free(buffer); - return ret < 0 ? ret : 0; -+ -+fail_eio: -+ erofs_err("I/O error occurred when verifying data chunk @ nid %llu", -+ inode->nid | 0ULL); -+ ret = -EIO; -+ goto out; - } - - static inline int erofs_extract_dir(struct erofs_inode *inode) --- -cgit - diff --git a/sys-fs/erofs-utils/metadata.xml b/sys-fs/erofs-utils/metadata.xml index bcc4b30fe149..eaf0493a8357 100644 --- a/sys-fs/erofs-utils/metadata.xml +++ b/sys-fs/erofs-utils/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="fuse">Builds erofsfuse (requires <pkg>sys-fs/fuse</pkg>).</flag> + <flag name="libdeflate">Use <pkg>app-arch/libdeflate</pkg> rather than <pkg>sys-libs/zlib</pkg> for handling deflate compression.</flag> <flag name="uuid">Enables UUID support via <pkg>sys-apps/util-linux</pkg>.</flag> </use> </pkgmetadata> diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest index eefaadfc740c..d7b97defd34f 100644 --- a/sys-fs/exfat-utils/Manifest +++ b/sys-fs/exfat-utils/Manifest @@ -1,5 +1,5 @@ DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e DIST exfat-utils-1.4.0.tar.gz 203422 BLAKE2B cfff22c64c7dc7c4db49ee1a1c60879983223afd8534002a0afac1b8fe57e865515f39e1b8caa3ed4670923e44e7397872587eadc78fded719dae64ada5823f3 SHA512 789cb6b6264971606af9a2cd96f8445a9d813f7362ede51206fae3e2d6db4f115101475e73b12f2caafad1b117e3f1bea292f9aad62310a05ada3056687d4af7 -EBUILD exfat-utils-1.3.0.ebuild 623 BLAKE2B 5605a3bf5b40bd0af6faa8335b49813f0aac71ea03a6f08724731171758f7513728aee99df55b1b989731e74d086978f15e1b2ad7106d711ee308908e79728d0 SHA512 6fcb2679f9edde16ca26d0fea80d6eeff5939e13d2c902145b981429a4318e1dbed3412b78b6fe0a6c4813d436975dd4b5e58291ecfb55ca0b8e01d5fc3c6473 -EBUILD exfat-utils-1.4.0.ebuild 630 BLAKE2B 43bdaf84133d3505a7972962b858c79d73e10c437e79d3e14126355b254a7b0733d9ca59671ce32fec9aa92fac8099eff0160e6ec8b6f90838e76a20d3d6cee2 SHA512 83ba253f23c1eee8f155303ca4c2b37e354a3532178b07c41f2ae84fcfea332bce28a2d97325eb7e2ee94594ef509b0f09f34ec64435a924dd99d24b0c1b93ff +EBUILD exfat-utils-1.3.0.ebuild 617 BLAKE2B 1885f5700efd52dc455c753fd048cfea5fae606a8138f9f1282b66263e1a51dc3eccf81f67dd99c9fbe9d34b2bfabe52ecb82d7c62e23fd7ade34ee2232d22dc SHA512 685b5faf0cc25ce5fba18bb438bdae19254ef1efd3ea639b3be5e0d292085212417ed0a5afbc0fefeb11e09ed7148c684c1be42940a548394e4f6f1092c19991 +EBUILD exfat-utils-1.4.0.ebuild 624 BLAKE2B 5e3040c3fb0d807468b562b9bfa00b86680ca57bd37f54330780ffadeb457ab78cbd8ab58360362dc3312916a96220ef2e534f4a7ac50ed3925d51c14cc03863 SHA512 0977d7934ac1f4a670a3fb747162b00aa99c55241ca65e961063c4ad4df4ffb917945c721ae8d1919b9667d427b289dfa054e672bd061d272089d7c08d005dd4 MISC metadata.xml 438 BLAKE2B 8e9a08139e7f5fe750dd1360945dfb0f8862a6829759cbed3123fe7ca6e2719fed051a766139510742c3f651dd397e4a07a2f0a1bf412c87cdbba8bd0e3b5c48 SHA512 73bb5c084e7a0a63e68977826256acfb18777ff987b8568a64eedd78f7888e90ccde8fb42d9d352182460d5ae9c08dd9fd5838f93b10df1aceb1ce2a01d7fc21 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/Manifest b/sys-fs/exfatprogs/Manifest index d67c7209dd4f..6bd099bb2c45 100644 --- a/sys-fs/exfatprogs/Manifest +++ b/sys-fs/exfatprogs/Manifest @@ -1,10 +1,10 @@ -DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3 -DIST exfatprogs-1.2.0.tar.xz 272716 BLAKE2B d8b4188ee2fd96b4b0abab52540e894f55279e3031596081f8077a45a2ad5737870298a0658feee177818dbf02ae036e035c350437c3ea4b7ab7100f46fc8772 SHA512 61a78af024e1ff7e12f2d7449c3ee2ff9476c8746269e29c453c77dbc73d3f52af7ca8fc3e1bd85d6a75b6ed8b7712b5f80e5cc1dffc5ff00fb63455a57ca9bf -DIST exfatprogs-1.2.1.tar.xz 274108 BLAKE2B 8c505c7e0cfd7c2e64c1923f058031bba86e909ae2f22db0acfc9feee9d510087b87c259e7707b761d3ed0cfaa8471527a1d90723486b94d1910b515ba06e832 SHA512 5ddc327e5257389e9cd11f6b16978a91dbc1d4096575fe1ccc77851310639e464537ea750c304821e078557fd1a8c4ce8f1cc47d6ab238ee0d7ad98b4ff0061f DIST exfatprogs-1.2.2.tar.xz 274552 BLAKE2B 457c2036f07d81193bfb8f23a47410f70ddf125b91f88ddb303874341d5304293cc254e337d820b15ac135c4a96d59a35e6e741f049052065a5f866720516c13 SHA512 51ff77860704a7a4a2986e0090514d46614d6d6ce5ad07ea622e4dd806f06f034959a0c35d7e67689a7eb6836a1de967e302d5ec1c9ca6d33fa80d68d574741e -EBUILD exfatprogs-1.1.3.ebuild 623 BLAKE2B 0a18440e3d1b53f3b8da000793db3de0cd5792dc225394fd9a522b618d332be16096240b61cada89b3153ba61fa2388d66283a6c988d101d485e133219e3bc7c SHA512 1201ba29fdd440594cccc4330f3764ef3e7263f690311ab39fbd80d1fb8eae415de0c205bdbf0cff2dfd6efb2caffe07ce2b39ef0d60dd9e0049c9f69866ada7 -EBUILD exfatprogs-1.2.0.ebuild 619 BLAKE2B 4bacee75d18dc5a60b85082de9bb3264ace66425d1874c47f802a77ff38098c96f5eae357fca42489df6b8ccebaff759d0b43c16b339fcd05f2e1461b5a96f66 SHA512 98f50ae22ec440cd2f795e12e48178432a1bbf0e4adba917322dcaa8487d6ff115feb05bfcd755462dc9a6b94d1e769c452f61b42b8b83a81d63716fac004b65 -EBUILD exfatprogs-1.2.1.ebuild 619 BLAKE2B 4bacee75d18dc5a60b85082de9bb3264ace66425d1874c47f802a77ff38098c96f5eae357fca42489df6b8ccebaff759d0b43c16b339fcd05f2e1461b5a96f66 SHA512 98f50ae22ec440cd2f795e12e48178432a1bbf0e4adba917322dcaa8487d6ff115feb05bfcd755462dc9a6b94d1e769c452f61b42b8b83a81d63716fac004b65 +DIST exfatprogs-1.2.3.tar.xz 275976 BLAKE2B 68d6a6d389748f9a0b815bc325696c1c2104a72a6e681888ef98e02e0244c7335e6f4abde40ebbdb28a3a5ac098e894a788e17d378993e59f0d7906f65ab394b SHA512 7ed568fba5bb4d12fcf6d5cf4b8afc1f0d95a28c67dcbe722284d3cab689b668b78a6c87e56a427d93542d6df45bd288794a4f2e60f94e831eab00eae7f097f4 +DIST exfatprogs-1.2.4.tar.xz 275696 BLAKE2B 70b60f339affb4236b050bec089395f732965a5e0959eb271f4dd2664536336288cef3103cb123fc33fe32c9c4c51ab17430db5fd169bb61f4afc2c003c51752 SHA512 9073e7643c68f43c948cc7b8a0a75c89375351801ae9e3e015858760663b223f3da32bac64f814a57cbf748e6ce7943ebcac7d8fe885ebca31a2184061d10daa +DIST exfatprogs-1.2.5.tar.xz 364904 BLAKE2B 11909a494d0e6ae3ba938ae6c8511d587037f32c0a07a7775c3da5e1019cd2ca989f42e616da4a44e32551d936db97a935b0074322389cc39b4c336043535bea SHA512 812c070e8b0b87e481081ff7a4d26d99fe0e6aadf3b4cc81c211bd269ebd3e42c419baaaa95335f3967868f8c9f39f6e5a6e951c92b86fa881b9c88b435ed7e3 EBUILD exfatprogs-1.2.2.ebuild 619 BLAKE2B 5044cc0a42ed6aca9a588340c7477cc7ab9091f8e5e35783d93df91a4e63ddd72b26ccecc52f27003151226f727c26ed965271056272bb7ea704ac2cf4df1539 SHA512 3412cd6c1ab4650f658981cdff401f6a78128a71f19aad5320cce4bc35066867e31d949f50fb4a2b49e42873657553b4bf9de2bb364245deab0009008b238766 -EBUILD exfatprogs-9999.ebuild 623 BLAKE2B fd60956a2805a0fac3657504fc0096db94087a8f357f061fc4e755cd5c17cbdecf81026c2818a6dc762be7d8df2243e3d714fef2651af1b08fe1e7c9daf03dea SHA512 92313904d1bda952a5ec17cf49b1e49d0a5449b8d5e17cd6959ae73d99513fe3c8c66e428be95bf9eb4a9d338d20a8b09407f05d812cf5f93501419cbe6d9b24 +EBUILD exfatprogs-1.2.3.ebuild 619 BLAKE2B 5044cc0a42ed6aca9a588340c7477cc7ab9091f8e5e35783d93df91a4e63ddd72b26ccecc52f27003151226f727c26ed965271056272bb7ea704ac2cf4df1539 SHA512 3412cd6c1ab4650f658981cdff401f6a78128a71f19aad5320cce4bc35066867e31d949f50fb4a2b49e42873657553b4bf9de2bb364245deab0009008b238766 +EBUILD exfatprogs-1.2.4.ebuild 620 BLAKE2B 202064bfe5034cc2cf2a1c55979d6ff6e5ff7c60b7e8fc14e98cbe084ae0a99de1215616557d2061a953ea3a895b8a0b88adf9692b2e7a3cdedddf4479d490e8 SHA512 d810071aac4d60771a4d46331a022307cf12513b6919f12fe91b5fa731868678759440f9a267285f7f45d612a7b791d8b4eceb1f2aea3675e381447d055fada0 +EBUILD exfatprogs-1.2.5.ebuild 624 BLAKE2B b2ef42340838d02717ab4a4c9041ecf27deac202e24b7a67fda5ad53c5cb438b6846d2854ceac0319a4e66adf0a41022b13c0944b2edd31c18d1afd477e2f282 SHA512 c93a6d9e4beac3d4cf1f720a1bb92bef6cc7e8409bbcdcee69489645e4f0d841df9dffb29df98897af185e9aed73f66d9969c4ad4d8d642d17acfa55f601cd7c +EBUILD exfatprogs-9999.ebuild 624 BLAKE2B b2ef42340838d02717ab4a4c9041ecf27deac202e24b7a67fda5ad53c5cb438b6846d2854ceac0319a4e66adf0a41022b13c0944b2edd31c18d1afd477e2f282 SHA512 c93a6d9e4beac3d4cf1f720a1bb92bef6cc7e8409bbcdcee69489645e4f0d841df9dffb29df98897af185e9aed73f66d9969c4ad4d8d642d17acfa55f601cd7c MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.3.ebuild index d48989b37991..64cf3654a575 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.2.3.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 diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.1.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild index d48989b37991..502d109228b8 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.2.1.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)" +DESCRIPTION="Userspace utilities for the exFAT filesystem (kernel 5.7+)" HOMEPAGE="https://github.com/exfatprogs/exfatprogs" if [[ ${PV} == *9999 ]] ; then @@ -13,6 +13,7 @@ else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86" fi + LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild index 41a8cfd16696..24a35a00a404 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.2.5.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)" +DESCRIPTION="Userspace utilities for the exFAT filesystem (kernel 5.7+)" HOMEPAGE="https://github.com/exfatprogs/exfatprogs" -if [[ "${PV}" == *9999 ]] ; then + +if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi + LICENSE="GPL-2" SLOT="0" -IUSE="" - RDEPEND="!sys-fs/exfat-utils" src_prepare() { default - [[ "${PV}" == *9999 ]] && eautoreconf + + [[ ${PV} == *9999 ]] && eautoreconf } diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild index 38c4ccbcd880..24a35a00a404 100644 --- a/sys-fs/exfatprogs/exfatprogs-9999.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)" +DESCRIPTION="Userspace utilities for the exFAT filesystem (kernel 5.7+)" HOMEPAGE="https://github.com/exfatprogs/exfatprogs" if [[ ${PV} == *9999 ]] ; then @@ -13,6 +13,7 @@ else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi + LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest index 9e1b2f91fcd3..0211776d6e07 100644 --- a/sys-fs/fuse-common/Manifest +++ b/sys-fs/fuse-common/Manifest @@ -1,4 +1,4 @@ AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6 -EBUILD fuse-common-3.10.4.ebuild 808 BLAKE2B 3cfb1ca5ecc0d9553cee6c63c7aa96cc80767838efe22f0dea90f2b9341b87b82d10a4620efb5a61084a504e5d827a286481b48a1d35916663da55f76350ea0f SHA512 f79420ab6fcfc6c19dfde4453b7e3c94e4b1b102d865b7428b89ada1a749eefbb1875fb7e3a9695ec6b16451ff69f2911cf13882ab541801d435bd861a5b81df +EBUILD fuse-common-3.10.4.ebuild 802 BLAKE2B bf021c9dbed9af68ab89ebd73e99f6fd879e0f2533e07e142181d7d033dde14bd04feaca797cff900f7baa21f70fb67ac34f26cee0adb0773e28fbbd77654ac0 SHA512 3fe2fc68bf76705f6d39e48120d5b5dc68efdadb2bdcd4d0ed3e0e0bb2a24d3acb8289832360ca17ba60e6c0d0f276a05ed067b66a0282740646833c9f7e0e44 MISC metadata.xml 371 BLAKE2B ebe12df265f438371efedf8c2561e014ef59eb3336d82db5df5443002ddb659e2d511f7954c5b6de78be5370206f785c1166f0a0b33446e1b9ef68fdacec3ee9 SHA512 459403cf66b81970a73785df1079c6a93c52b4f9855e85462faff2b8dec915fd012b82affe7dfa5a0793965692a8d3ea8db3b348ce3b672613f9511bf096ec1f 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/Manifest b/sys-fs/fuse-exfat/Manifest index d8a1511c4e66..85c38c25fc01 100644 --- a/sys-fs/fuse-exfat/Manifest +++ b/sys-fs/fuse-exfat/Manifest @@ -1,5 +1,5 @@ DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3 DIST fuse-exfat-1.4.0.tar.gz 167536 BLAKE2B b277a6cce725d5dde83fe8ebba9cb2899cf41bfbb600f0044e45da9af06681b5fe7440456a73865739e4bcca525f33de06aedc8935d0de88d7d8a37dc1123fc6 SHA512 9285d17786cdbb50f531a7f35795dbf3b650b33c6fd81619174791516c0ef5743fb6450d1d898900cfc142c088eccf8fc44ea1ccbbe1af07e2cbd1d65c73a174 -EBUILD fuse-exfat-1.3.0.ebuild 717 BLAKE2B 25ad3696126ecb59889b5435b742796008f9a36f7e2df82c9c6aafae3896d2834abc26131d691bdd2778d0378e2afb65ecb65d2e914183cadd72bc3c5248152e SHA512 d4f5ddce19d6b3bf3ad4060051df85bcf76f189fc12f0a8741f9b293836f2025b0d6445340c532299296e0e7ed99b67a5929a56cc6f8d959f4a44098567c9920 -EBUILD fuse-exfat-1.4.0.ebuild 717 BLAKE2B 5ba5ffa7beaa9c9f93dccc3f58029addb67683e5d6dd9fb9bab02629af279a3eb2b3147fbbba480f74c3be2816425f9c4cbfd947d4a2bc371b66a8a32ca174d3 SHA512 457f946074ac2a9d265aed693d82775e6bfc121f5abe06a75c36231cf5cb4e7579553c0dd9ee4bebb0999270eb9009415b7d5d10998f81c99171eb2d4dcd35f4 +EBUILD fuse-exfat-1.3.0.ebuild 711 BLAKE2B 385ea266435381963a493332fa785f68fe9b360bc0ad273c3d1fe3614cfcb5e83ee1aa29c2bd1030e0772ccaa3dec29f5d91fadc1a901504bf699eb316780227 SHA512 5396a6a1601b50173f7a309ca45c8e2ec0a28f11a32d2f0fa514d0b6593b3035784fc825712b5939ce3e5d44065578f32ff4b15fc924a2db74b2e19a55cc24a2 +EBUILD fuse-exfat-1.4.0.ebuild 711 BLAKE2B e9e6c105c681336a006580dd4766fccbccfe726be404a9a91a0760affd8ca37c265856f4115ab042e8453f6cb03d8d5e3d0f6a1791695f7e017aa406ec473984 SHA512 979afb4ec49358c86a5e40d8c66355474c95f6459052a1d38faa5740ffd4b783f0eb79332981720543e262f8ced527cd10dc59030edd2f947221e4e8f54705c8 MISC metadata.xml 438 BLAKE2B f13ae2b005f785ce6066a3ea03d27e32793ef0d5ac3242d83eb053647c95e61e69e3f9d4232482383e2cd32f0ff1f153ad53a758fdc8e69591b5e36435b1b4bf SHA512 3309f242c4342b7a75dd762d3e36c06a9c829966408794baaaa720acd029efa23f4de0d0e5d5e2e6e8e31100d98334f4dbbbddd7783cd81fde269b3a41eafc8f 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 ef7aa9d03962..4b1f0a261e41 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,5 +1,7 @@ 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 EBUILD fuse-overlayfs-1.12.ebuild 504 BLAKE2B 584f9cdd21a7f956f6e34c2afc935feeae031dff27b816fef1c79bbd6a229bd22cfe72b305f564bfa79d2a182278140e3da6afd9ea45db38aeada2b065ab64ad SHA512 6e64dc415bfa62b85e763fbaf6c5d8eb216e9fefc167a687c34f9723540125b99a19d60c5c24250d0d99213c9fdf3abc341d457c58bccc8b738c8ac0926609b6 -EBUILD fuse-overlayfs-1.13.ebuild 608 BLAKE2B 38b3ec559ab03b3bc4f3e68d59be97a8114d10c50234f0029cb93e95287f1fcc1f389039d4f3e123d6dedc34854c07f342fd0fde485650733d09d21b50051b96 SHA512 3a8ad8df9b456d6d133a018467082380d2eeab8e5c60a78cb11bba1d0e2eb48c8a5d51a1339560ddf1564acf32040350dac1bf17efedcd83bde21a5afdd8e2ba +EBUILD fuse-overlayfs-1.13.ebuild 615 BLAKE2B d85046330296a86c1c2a64f6e70e266dcb3a6e3ce366f6b6853b172db0f1b716071e7da70d4c68b8c1676833e138602576f6de58b4dc407479cd735dd3e51b11 SHA512 50ea9e80a2a9464cd9fc73fc1c8b0942b6ea8c9626aad6df3e2058a53e5413f1a43290e579e984aec6afcb90a2ba0b98e05e440c5a489a4cf5c27c30e2cfa795 +EBUILD fuse-overlayfs-1.14.ebuild 617 BLAKE2B 85f109f3e2157571f8f0856e95666dcc2047510e7a2b9c8ab06c6e3785b69f909f4513f5697c044cc305482bf5e641e09d3f0845190fda2aa67305eec0abbd82 SHA512 92c6db4297cf40f5f4b0c13004cfefe70eadd68a2ac8dbca47e6941358ccfd0888f33bca695ba8d86609ca9b5ce57edf4e0263a8fadce6f504971de52adcdbb9 MISC metadata.xml 588 BLAKE2B 5871bf7c5b838fc87673fbe00610b2aee63be3140af6cc46050f98dc299e922096bdc9928d6700d9779f4ff3bb9212258e7a86d27d764a623b9b53047078b2dc SHA512 aea63b5ea32b83fb24ee7422bd5df24e4f1250f8a33b7281d381531df3d230d2a9c257c3a5d0e379a252c82a82f490b448f6bd2f416d766cd6e000e354408438 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/Manifest b/sys-fs/fuse/Manifest index b91405a60cce..79f4786fa1c9 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -4,6 +4,6 @@ AUX fuse-2.9.9-closefrom-glibc-2-34.patch 1649 BLAKE2B 6697ecfd16ca8a71ec10c0caa DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 DIST fuse-3.16.2.tar.gz 14165836 BLAKE2B 04f0037f924ef7b7cc90cb4c26afd1e942da69efebd93f3114774f2101550729379a0256ba190d7c99249fbce4ead5902133c01b29d8d75f41777d148540f521 SHA512 3e8889863cd67dada67271f095f694dc9e5aaf2561fd1e2285aee95b5a54e692bb195ab8fce57fc2bdf08d0ea17b6d56ca4967b4e4371d639d6133907b2370d3 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55 -EBUILD fuse-2.9.9-r2.ebuild 2141 BLAKE2B 92bedf477999e4b306f48194f211769747f1c0955efa944421c5afbfd95f0d2f731b1b0ccc33dd403a8083a915c3c73081b332ea9c08629084923fcc470d0ca5 SHA512 808807cdd2daef32aa9923beb6317e4c13b9a70205899537aecf1c31ad88a7b1945f5b5242edb1869db9d0e56ade86a1fc2b65633c64b02236f9358bae9aafe3 -EBUILD fuse-3.16.2.ebuild 2017 BLAKE2B bd080724feb7eddb13f4a55059e658a156d593c1463532b48ebb0a4aeb53e5d4af0bb542c94479928bf0bc5e9eaf43acbbc684d260aaaefa5b64205a366676ad SHA512 4645da1cdb7f53c20b7aec9a37bb7b9c2357ade4be3f6b4b676b4c53ba4dd87f384ccccf391e10d06df7d1afcf96b73ef15fb4fa7906f30f6fec20896883970a +EBUILD fuse-2.9.9-r2.ebuild 2135 BLAKE2B c5eacd598362de6dec72d402bf3d7343ded2a617a2e8e87b8a140f80e2a7b04630a47144d58bee332fbe2e50078cff6bdd8b8c0292c22668495f5933b4a8914d SHA512 94918361132cca1a1def8a899533bb90c2d428f18b63b689ad7339104452990b13c7305441b23a3bc445955fcef0b341c0c97e266b1198fb27a2ca4210c99ee8 +EBUILD fuse-3.16.2.ebuild 2011 BLAKE2B bd2fdeba3bfa9e6c0cceb903282c7e3673b878dd4d9a5ed938b8dd03ee0896342bcfc38435d92165719c7879d527dd26145513db1517beab04224a5033c123a1 SHA512 14bb8304da408c5b501ca657573a43b038a50d071f39678bd974c434944f7bb7d789bbb132f6d96c72df4eda99454ae1d52166368768013e36f140566b1e3a2c MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e 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 7f85b3cde96a..eeed702f2fd4 100644 --- a/sys-fs/genimage/Manifest +++ b/sys-fs/genimage/Manifest @@ -1,6 +1,4 @@ -DIST genimage-16.tar.gz 87544 BLAKE2B 822c1b5901ed3fa19e33961e6e9e718f961d6c0a2315dcb4301aea3cccad6368a03d48ab5b5713592bdd096e78e7d24c03e8016a1470c7864ace71e3341b16a4 SHA512 7cb079d6ae889a744e2a3596b0eac737f7fdf1734c2024c71bb5ff85b93bff1d8ec26d61ee5b210aad4f0f9137968a6e256492c8c8376bafe2c5da2d12985a73 -DIST genimage-17.tar.gz 94853 BLAKE2B 371f35be1f47ecc012adcac5e6138f8bf32b097fd508b599d788d3a1af3fd0ccb9a213d0dc683ecc6e11f762e6376cf3a2683dec3fefd26e70ceebc48e7d2814 SHA512 b02415e030e2ef9ace40b965935e2634c208db4f4d401e1a824aa6dcf06c9656ba060d66e4a3a4306216ec74ce2ddcea4647bb68eb61a3bf4e9aadb1ff0d73ef -EBUILD genimage-16.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 -EBUILD genimage-17.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 -EBUILD genimage-9999.ebuild 1113 BLAKE2B 2b9328f8a7d59ab5548b7efea01623d160e8ea354cc062872942e81544e9bcdeff9ae994f8503ac2e5a9ff1c9a935a2b20696b51f4a7d779365fad82e75f5aff SHA512 5d6f06b891ac91a6776f9581f2ec075c3da73dc37e3bdb4a010ad2bb3c50d36d5f73f22ef0f22616390fa22cd6e2f72aa1200f354950221e13189fc7409799ec +DIST genimage-18.tar.gz 98409 BLAKE2B dc73d2cca8166939e803834490fd55de66d235df0bb0dfef0c79810bfd619fc8683715241719b2fa94d19bf3870863c3aacbd6f2dd50cf41200d5990104ffd3d SHA512 70cacbb0ce081bd6e941f79e00e2c92839909e254d2f74b1eddd4e5d5d6d5177f80745df9bc132fa9b0c901e184d37c1c89113238a0b357412704dba0c367211 +EBUILD genimage-18.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 +EBUILD genimage-9999.ebuild 1125 BLAKE2B 382fe05f98f2297da412474a47b395c13390b92bf635fc0b695ca4bc94188a4908d19de43b8e616de2fd14f284acf5cb1354f6a0d2a2ba626f49f09acc9dba41 SHA512 5df410435f43f411a0613f914a0504505f972175044bf75762617bf8e4ae25ed00acd20011a8205f16e52888afd3160b497f77ace19f60d4b63d404d460d5170 MISC metadata.xml 333 BLAKE2B 802ffd79e7a01b6caadbbc9e8176b1dfc6657f09ef2ff7e6eaed979b5df4522fb481625bebd3ed1c4ce40017820a62624cb73c4e096144e2778d94b325c6c520 SHA512 402a05c00a4a776f023d46f415df5f4d012e9ee5bedb108e60da6e1b3a1281b7357904611c70da9b75ae598fe7bfef71c658b220efabed5a7b5f8ccc497ec7ef 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-16.ebuild b/sys-fs/genimage/genimage-18.ebuild index 4becc18f6212..4becc18f6212 100644 --- a/sys-fs/genimage/genimage-16.ebuild +++ b/sys-fs/genimage/genimage-18.ebuild 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/Manifest b/sys-fs/growpart/Manifest index cbb8e6cfb337..cafddc7e1738 100644 --- a/sys-fs/growpart/Manifest +++ b/sys-fs/growpart/Manifest @@ -1,3 +1,3 @@ DIST growpart-0.0.32.gz 9525 BLAKE2B a7c7ca27ae237eb7d6e43decb16cba2c8a26b63bcfe1b1f74f63b116a9cc23fc5e54394df846c13de6caeb8433a4ad7e76046f2f4311e6fe7cb069fce588b6e3 SHA512 baa9e59581d2d9685d4b0e7563e6582130064881f6f9b9fcd3250a4bdceb7d03bcd1ce346218ce4395f82de948f85fd59339cc30417377feb61d5b444f3dde23 -EBUILD growpart-0.0.32-r1.ebuild 501 BLAKE2B 28e745dcc557820a29eac8ea31d244a3d468bebcc85f304cb1636015b8d3178672227f931896451c69d08858013c27efc8a938e6cb407fc6ccae7836d80a83d8 SHA512 f06b5ce7e6b637dd7e19fa25589f67170293ad458841b8de02f95e797ae9d7a4b418ed7cfd25952368f5c02938ced7cbc157708c45ab5a8a3f02ca6744e86d9e +EBUILD growpart-0.0.32-r1.ebuild 508 BLAKE2B 7de7c0f825b9dae5e7790b164d35a8d844690e896ddf0ef9211f6bcf74726ed13c22f3837c59a06920855b4b93eee6c05a2afa6b73835394b6d0cad0361b0f26 SHA512 dae0a079cf4ef210228defa7b6371e2409252f686d2a1467ab6c27c5a147396389b2c06407106e9be92e21e48941b99731fcdc211e3823c0af225e8bd3a60e50 MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e 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/Manifest b/sys-fs/jfsutils/Manifest index a6a2466a019c..18a56bad8311 100644 --- a/sys-fs/jfsutils/Manifest +++ b/sys-fs/jfsutils/Manifest @@ -5,5 +5,5 @@ AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8 AUX jfsutils-1.1.15-musl-fix-includes.patch 542 BLAKE2B 3d9a7e88611685a8000d2a2395edcbf0671a10e1e49e826b1f87e919161eab30889f3236cf6d0b68c070fb2c26e4ad4fe9742f82bf4429ee226d42dc28f532c1 SHA512 3e1e0f83059f685b087b5d2d2a4b2c190d02b675bc826f3aee25a4a158e75544a27383251f5b2634d1d8f67fe70c5c9e4aa9c192b7a9bf01df1370d7ec64d0f1 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858 -EBUILD jfsutils-1.1.15-r2.ebuild 1362 BLAKE2B 713a1d344f560a7052833a8b5a41a20d9f94e079286dd061d4bb356b0f3924f7f0e45f1bd114adc519ffe307090dd2b688f8b5ae73c09990ad0496ed740a47c3 SHA512 bd7c98744e68ac6649fa233a641417159e0f79eb1452000b7d5acd4589abfed618309b42c59a96665084e9f4c44b2da43a74e5410c80849f62ddc73d0991bd4e +EBUILD jfsutils-1.1.15-r2.ebuild 1356 BLAKE2B 253d5df8a965d9d4199564ddb9a0a223f40161e96eb22f3317a7fdf8a89af6f1ef5f9385a892baeb20b0074b53f3232e57d399151a7eb95cef5b0809d2cb7e7e SHA512 f46711a3466d35757b13f9e47e7d8c17d51abac7e17b4865db2f9e77839d6e3686d39734d2f99ec650878b0ad4ed62b5b83d5c01ea37d0f699d52099f898939b MISC metadata.xml 600 BLAKE2B c46a9aacd96887980123e08a895435ceed6fee8ee66c77ca5cbe35dc6401c1bab800502c7718de580d6a4ea0f6c4550f961efd66513f84f318d943bc8b706811 SHA512 33e857b758682c2259d51ea1dfd3ba6b27a1fe5191822001070e468f6c6f82eb880ca71e0f2970571c6d60e7fc08f3685f5a0ac3b79c27e8b7b79e00394e5009 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/linux-apfs-rw/Manifest b/sys-fs/linux-apfs-rw/Manifest new file mode 100644 index 000000000000..e1413668d039 --- /dev/null +++ b/sys-fs/linux-apfs-rw/Manifest @@ -0,0 +1,3 @@ +DIST linux-apfs-rw-0.3.10.tar.gz 210033 BLAKE2B a7714ed7e0f2334fe8b534cf88cca5c5dba62592046e8c4957171350de17d808fb64cc809facd2b385ef27b7f8c3f6001e675e34437c609daf5b6b2cd9afd1f0 SHA512 cebdbbda67f282edaf00e6b1da9ed4905a068205c2af6a1b723da4007c39c3ea02c2a2935e2e07395b51dda58b6f1ad00beb9547fed81690f77455b96fb9e672 +EBUILD linux-apfs-rw-0.3.10.ebuild 795 BLAKE2B 96d4853b6370e0b70de7502037792300e937d9aa72e5102b2544853814cef3da340ae8aa30d420d9fd96ff4cabece4a71001f1a0df29dd251da5f0bda419ec17 SHA512 b18acc3b83ed8b1eeb6fbee32ac7fe55866891954924917a6cf1b7c82ed06046859b2888e4d9e03f945438f8957b8f568c523fa5f9b274ef9772854d82134e32 +MISC metadata.xml 334 BLAKE2B 1ae67bd0e178cd47efd0c8fe5c6119f36bef5379b16e2bb05c5f319b62a1ead04a071849cbf64cc67616817967e9056933b30d4636ef8060739e50386f6c3938 SHA512 350a9048f140aecf169b3ec39f90374797206ecb0ea35911fac40157867540e8a87790d2089001ebff44a62829776a138b28740fd8e001fadeb9239788ce2f73 diff --git a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild new file mode 100644 index 000000000000..5d6a55ecd6d9 --- /dev/null +++ b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild @@ -0,0 +1,40 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="APFS module for linux, with experimental write support" +HOMEPAGE="https://github.com/linux-apfs/linux-apfs-rw" +SRC_URI="https://github.com/linux-apfs/linux-apfs-rw/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +CONFIG_CHECK="LIBCRC32C" + +pkg_setup() { + linux-mod-r1_pkg_setup +} + +src_prepare() { + default + sed -e "s/GIT_COMMIT=.*/GIT_COMMIT=${PV}/" -i genver.sh || die +} + +src_compile() { + local modlist=( apfs=extra ) + local modargs=( KERNEL_DIR=${KV_OUT_DIR} KERNELRELEASE=${KV_FULL} ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst +} diff --git a/sys-fs/linux-apfs-rw/metadata.xml b/sys-fs/linux-apfs-rw/metadata.xml new file mode 100644 index 000000000000..313f7d9cb420 --- /dev/null +++ b/sys-fs/linux-apfs-rw/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">linux-apfs/linux-apfs-rw</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest index 1581e942a535..236191166ed7 100644 --- a/sys-fs/loop-aes/Manifest +++ b/sys-fs/loop-aes/Manifest @@ -1,4 +1,11 @@ AUX loop-aes-3.7w-build-initrd_explicit-losetup.patch 944 BLAKE2B 1fe676ac40df6a08c2e75769fba02fd627ac3411e1657ece64bcf368111b5e9180c9ee5fc392dc3a0bd58299dbffd18cd49a1ba4738bf798915869594f4749ca SHA512 d4f04cec3c39885464e3254366d1c0959ed778c8f60b4353669061b5fecb03c0bc23ecfb9b8cdfc8d143ff5e386d935183e9bb68942d526822ab4f0ebacd06a4 +AUX loop-aes-3.8c-build-initrd_nvme.patch 561 BLAKE2B 373ec8d0445c0776621c04cbf195e4cd1bcf04657a08bb6342a6ebdbbbfe6dd9569224560c9412f96fc037b35b245febc2289301539b669d6f9ecce3f1d181cb SHA512 c14dbbb60267b0f686fcd2a200b40a2edff58f616e8a62c88acca51d11c1dbcb4565fc0fbee4988bd755c05c44d40f65bb3af6fe5a9fda1ffba4db8eb50bb82e DIST loop-AES-v3.8b.tar.bz2 411795 BLAKE2B 51e2c4ddd25f288c5cc5cbbbe20d79951d68bc2b7ecc91fe6eddbb829b297fe6946590512f423efcf5be3c4a1c9ce450c0cf49ed44ac6ad8eb2568468570d48f SHA512 8143649cc9616735cb9a9c8cb8b5c8a709b139e8b41aec444d56c85ef7852d103f657d0d702ffb04783963f0d0e919a6fe4e10b31cd373cd326e546caad90661 -EBUILD loop-aes-3.8b.ebuild 1622 BLAKE2B ec8452f7b6364ad52f331e6835fc5b62b02d850240a0d353d7c5ccd37261f9c257111eed308f2527c2d6a3f401d52e3bae663f07516d6c35d814accf06f1c466 SHA512 228ec5d84da815817a0cdb256a1cd32768d2df9e484b732532370b68b5253e8b4eafcad560dc7047b783803fb8c8a44c04e7403bf89524c1a9331e1b1511bbbd +DIST loop-AES-v3.8c.tar.bz2 419257 BLAKE2B dd7fe8e4fbc3b58e11ef5440ea81b65d9a1e92e71a81020b9664ae2387dd36da327fddab85bfc27b23ac2f546b7622526ded1424e2c6cd3659e8998f914151db SHA512 d22b4773f42d47a8f499e3234f64a880248ea6a2c7e96b598ec11d3d674fca09d989ef9bbee254b384c9fe17adb009115bcfb932081a326400120c1c4c828779 +DIST loop-AES-v3.8c.tar.bz2.sig 861 BLAKE2B aa6c3e2b1e0ab604d92ae6c09fed992f629c7f61b7b62e6d073600f72973ace430e5e0964174a40b63eb703ede4f53098c6deb8af13d663e0bb147a2138a6635 SHA512 44ca990fdf55e8c03e85139dfc07dde5ad1cbd3944060ee2c15b3ce54656b7836e7a8839d237a53361c3ba7bdafda39cbbab0f03bd1952e679d1a3a3c2f0930b +DIST loop-AES-v3.8d.tar.bz2 419860 BLAKE2B 67362b54d031df928080c97e5143eb80b6b3f2b89c4b2b318794bfa1cf79e9092d312e0dd42a70599b5b4684643f18477203a8ed901ebc13d77dcfbc0f625801 SHA512 10abb0e2719225f74fc01c443cf5fa741dc40548ba342158e5fdaf40934dd50db0b624125073eab04084b8d2245ccd353bf5d1027509e251566940f99576fce0 +DIST loop-AES-v3.8d.tar.bz2.sig 861 BLAKE2B 7835b504cf507a9b70c0fc75ae2a052223f6b8077f6b616a4c0ecf4158ff9cdaf91ca407098195b8bff487db3208519220fd9270b75a75c2b2a037714fedab28 SHA512 57f8da54e3138a3bbc34b312df8efca9346de54e17299ad3308b4b3a859925e19c15eed7e6727c28a5214274e4d48acf8ac4748666032ca0133d0088b9ee3990 +EBUILD loop-aes-3.8b.ebuild 1623 BLAKE2B d361fa2bd4ed04337d1e05a19ea3c1125d2483c3c28792c621a9524351fa1849e7a230df8fa4b618a468cbb10d6295e59c95f6c3dc33a19c96b85e31ddb9ab49 SHA512 61acb688ea1f59c06834bc6723ab0593f35e7b68557ea7d95fdd40d3945011b9251213933d8a5a6f6d31ee4f51d2d188d2f63705adc0cf084f2bf3fea6f25291 +EBUILD loop-aes-3.8c.ebuild 1925 BLAKE2B 33318eab9a119997b02788218b468fc1d9736a7d6b296ddf0874df7c261ddfb82fc5d3accc3cc6a020056d70b5f17ff831957ebc50f68eec782d7406243b86ff SHA512 0dcb70bc622bdc914b0671a0bd2d91117a60922a476edc859ce17ab4b017aee33c3b407faa19cb8f8bc6843481bc02010931b87c3cd166b6ebbb5215b79af308 +EBUILD loop-aes-3.8d.ebuild 1925 BLAKE2B 33318eab9a119997b02788218b468fc1d9736a7d6b296ddf0874df7c261ddfb82fc5d3accc3cc6a020056d70b5f17ff831957ebc50f68eec782d7406243b86ff SHA512 0dcb70bc622bdc914b0671a0bd2d91117a60922a476edc859ce17ab4b017aee33c3b407faa19cb8f8bc6843481bc02010931b87c3cd166b6ebbb5215b79af308 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4 diff --git a/sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch b/sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch new file mode 100644 index 000000000000..4f0293be6686 --- /dev/null +++ b/sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch @@ -0,0 +1,12 @@ +--- loop-AES-v3.7z.orig/build-initrd.sh.orig 2023-02-27 11:08:09.965971977 -0700 ++++ loop-AES-v3.7z/build-initrd.sh 2023-04-17 18:46:32.940350628 -0600 +@@ -967,6 +967,9 @@ + maybeMakeDiskNode idac0d2p 72 32 0 + maybeMakeDiskNode idac0d3p 72 48 0 + maybeMakeDiskNode mmcblk0p 179 0 0 ++ maybeMakeDiskNode nvme0n1p 249 0 "" ++ maybeMakeDiskNode nvme1n1p 249 8 "" ++ maybeMakeDiskNode nvme2n1p 249 16 "" + + if [ ${mknodCount} != ${mknodRefCount} ] ; then + echo "*****************************************************************" diff --git a/sys-fs/loop-aes/loop-aes-3.8b.ebuild b/sys-fs/loop-aes/loop-aes-3.8b.ebuild index e74a90959434..9fe025f69c78 100644 --- a/sys-fs/loop-aes/loop-aes-3.8b.ebuild +++ b/sys-fs/loop-aes/loop-aes-3.8b.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 @@ -9,7 +9,7 @@ MY_P="${PN/aes/AES}-v${PV}" DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher" HOMEPAGE="https://sourceforge.net/projects/loop-aes/" -SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2" +SRC_URI="https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/loop-aes/loop-aes-3.8c.ebuild b/sys-fs/loop-aes/loop-aes-3.8c.ebuild new file mode 100644 index 000000000000..03ca24a9e59c --- /dev/null +++ b/sys-fs/loop-aes/loop-aes-3.8c.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/jariruusu.asc" +inherit linux-mod-r1 verify-sig + +MY_P="${PN/aes/AES}-v${PV}" + +DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher" +HOMEPAGE="https://sourceforge.net/projects/loop-aes/" +SRC_URI=" + https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2 + verify-sig? ( + https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2.sign + -> ${MY_P}.tar.bz2.sig + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" +IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock" + +DEPEND="app-crypt/loop-aes-losetup" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jariruusu )" + +PATCHES=( + "${FILESDIR}"/loop-aes-3.7w-build-initrd_explicit-losetup.patch + "${FILESDIR}"/loop-aes-3.8c-build-initrd_nvme.patch +) + +pkg_setup() { + linux-mod-r1_pkg_setup + + CONFIG_CHECK="!BLK_DEV_LOOP" +} + +src_compile() { + local modlist=( loop=block::tmp-d-kbuild:all ) + local modargs=( VAR="${KV_OUT_DIR}" + LINUX_SOURCE="${KERNEL_DIR}" + KBUILD_OUTPUT="${KBUILD_OUTPUT}" + USE_KBUILD=y MODINST=n RUNDM=n ) + + if use extra-ciphers; then + modlist+=( + loop_blowfish=block::tmp-d-kbuild:all + loop_serpent=block::tmp-d-kbuild:all + loop_twofish=block::tmp-d-kbuild:all ) + modargs+=( EXTRA_CIPHERS=y ) + fi + + use cpu_flags_x86_aes && modargs+=( INTELAES=y ) + use keyscrub && modargs+=( KEYSCRUB=y ) + use cpu_flags_x86_padlock && modargs+=( PADLOCK=y ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + dodoc README + dodoc ChangeLog + dobin loop-aes-keygen + doman loop-aes-keygen.1 + + into / + dosbin build-initrd.sh +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + + einfo + einfo "For more instructions take a look at examples in README at:" + einfo "'${EPREFIX}/usr/share/doc/${PF}'" + einfo +} diff --git a/sys-fs/loop-aes/loop-aes-3.8d.ebuild b/sys-fs/loop-aes/loop-aes-3.8d.ebuild new file mode 100644 index 000000000000..03ca24a9e59c --- /dev/null +++ b/sys-fs/loop-aes/loop-aes-3.8d.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/jariruusu.asc" +inherit linux-mod-r1 verify-sig + +MY_P="${PN/aes/AES}-v${PV}" + +DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher" +HOMEPAGE="https://sourceforge.net/projects/loop-aes/" +SRC_URI=" + https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2 + verify-sig? ( + https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2.sign + -> ${MY_P}.tar.bz2.sig + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" +IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock" + +DEPEND="app-crypt/loop-aes-losetup" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jariruusu )" + +PATCHES=( + "${FILESDIR}"/loop-aes-3.7w-build-initrd_explicit-losetup.patch + "${FILESDIR}"/loop-aes-3.8c-build-initrd_nvme.patch +) + +pkg_setup() { + linux-mod-r1_pkg_setup + + CONFIG_CHECK="!BLK_DEV_LOOP" +} + +src_compile() { + local modlist=( loop=block::tmp-d-kbuild:all ) + local modargs=( VAR="${KV_OUT_DIR}" + LINUX_SOURCE="${KERNEL_DIR}" + KBUILD_OUTPUT="${KBUILD_OUTPUT}" + USE_KBUILD=y MODINST=n RUNDM=n ) + + if use extra-ciphers; then + modlist+=( + loop_blowfish=block::tmp-d-kbuild:all + loop_serpent=block::tmp-d-kbuild:all + loop_twofish=block::tmp-d-kbuild:all ) + modargs+=( EXTRA_CIPHERS=y ) + fi + + use cpu_flags_x86_aes && modargs+=( INTELAES=y ) + use keyscrub && modargs+=( KEYSCRUB=y ) + use cpu_flags_x86_padlock && modargs+=( PADLOCK=y ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + dodoc README + dodoc ChangeLog + dobin loop-aes-keygen + doman loop-aes-keygen.1 + + into / + dosbin build-initrd.sh +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + + einfo + einfo "For more instructions take a look at examples in README at:" + einfo "'${EPREFIX}/usr/share/doc/${PF}'" + einfo +} diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest index 93634e59ce66..2fa02f39b9f2 100644 --- a/sys-fs/lsscsi/Manifest +++ b/sys-fs/lsscsi/Manifest @@ -1,3 +1,3 @@ DIST lsscsi-0.32.tar.gz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145 -EBUILD lsscsi-0.32-r1.ebuild 353 BLAKE2B cdb113ba23a97ef2b980b3b4d139513f134db3fa6bcdec2f313d66beb679583de5063742ace8c096c0c5fbe0ae2c084ff66be8d8199bb21573651a545bde2816 SHA512 48ab5557af4e99ca603b88df718292048d5c1500d12d83339cdd204e896be1f99000f47eac5199042d97a47a61a9857d0283d6775f8b0d892755f3c0f428ee7b +EBUILD lsscsi-0.32-r1.ebuild 347 BLAKE2B bad872d55e625c37091413009489e8c8caa675d35aa4178c93c6ca2d9f0ffb5e720f6a54b0f92a731347b136056eebc273c12d68d451bdca35cad96903b531f9 SHA512 6dea6b36f5c9e96d1a7e250d12b0b32463da0d753b02abea035e3c25526c273403477f81f39c9c794e485f80d396e42aaf3777349b56a00a5291ff36719cfb32 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c 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/Manifest b/sys-fs/lvm2/Manifest index 2074732bacb6..cf9fa721ca32 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -15,7 +15,7 @@ AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff -EBUILD lvm2-2.03.21-r1.ebuild 8618 BLAKE2B a478bb8b532477c39360aa74b1146f2088677a67dd142f175a2b7790958c37b650adfc0085ed1ed27157d4160cc157dece2e3eaf6ce7afde042d303e1a9bf355 SHA512 1e43152e35dd95600c7abf695db590d5bc7dccd929d0186cb2bc24fdfb60fe37ba9b92e92d8501006b1507537c30ddbd1250fdcfafdd98128ed819213003f42f -EBUILD lvm2-2.03.22-r1.ebuild 8578 BLAKE2B 6e751837605606ad1e4ccd4058eafe1d73f96f121b7a7ffc5cc9d1107723ae24912ba0d684f1c86a954919da37b14beb580ac64a8dc0ddcb6ea6a723bd7c0707 SHA512 a8cdbef887549d58df4b5d1654761c5c06c0943b97f6ef5147ba47cdc4cb05c531eda9d1a38db8366b171b0b09e11398469818981bbc42cbb831ddbe2475c494 -EBUILD lvm2-2.03.22-r5.ebuild 8661 BLAKE2B 598011bebdaba76b992f2358bb883ccfcea781aa862cb83c5d69eee40514cec44ef14dec922d79b4fd9d8c7070fba41ca1da9f3b32951305446349041755c706 SHA512 d5cb3109b989b733e5c7e059a26bb0bb76ef2846bbf94021de6713941b90185645512ac67d31f275802c8a3d3c4316fd1e202c5294e6dbe1a728f93d46599d9a +EBUILD lvm2-2.03.21-r1.ebuild 8612 BLAKE2B a5adec8263b994e58610e51c17ecef378d0da54c5f9ee83de959c7d53e67850afc8b74297f342915d4ccc6138f35630e7b4c832e0d7d198f0a040c052b4f9157 SHA512 b589a726b5dfe66bf2861e48ece483d774a86d373ee58859b393114c719a9511c418d5fd24204ab1674e4ae88f393bf342ee6e83f282f1356f35a192693d8ed7 +EBUILD lvm2-2.03.22-r1.ebuild 8572 BLAKE2B b03926843eb2baaed25fcf7b4f607163b18a2a8bfac59a2707b09d80ac49704ea737e40c9d083905b7fb02bad2de35aee853eee9c3423fb5d0fa7a6f6c052ba5 SHA512 993ad760ff582b8776c92f910c0eab3f015460240ec5ee77af743a4c9741c572ec2540af286287fc252b52c0f2950e5433af51d3e1ae616c3445c0a10464f7d4 +EBUILD lvm2-2.03.22-r5.ebuild 8655 BLAKE2B 0fcaa6d47dfb7eac0ba23f4b9afff97f1326c250697ba77077d9c9968be09da81684690ff26ffd8edb0f58a7f50c709c4d1898533b0e00d0fbe5235f34c9dd9d SHA512 acb9e341826506b3331bc06aa39eee05792baf0ffc2c5ba917f3ed65cd2162f42b1ddba44e95cf1e8af5df21635849f90aaeee1864b7ed29540e7227240403e5 MISC metadata.xml 831 BLAKE2B c34345ee897004b3776da0cb65cb1165156ecaf1802926f1b8d77eb25c836cebbb1833fadb0af3580b127c7852ac561ac20c877bcfd0cc80ea3b6283ed1ce975 SHA512 0be91bba800fc1db6dbad68e36b7d882a6bd41124a10e759322ccc661d123a689a2c0ea5f3fa2dfa40ae197c36b3171cb99d6630967805d57aa220543f0a1623 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 baad9f1df1e0..136979360783 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -4,8 +4,11 @@ AUX lxcfs-5.0.2.service 428 BLAKE2B effef16bfac727f703b9adfdaa5faf2ce76ac7efef61 AUX lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch 662 BLAKE2B 63ef53897cc254a58dea5eb4c892b1b6f8c49da04b45bf760acb82ca8dbcef9e8ccec54be98f1665ca9dac2d5dcb291c4c75f8a648243c82e8841e02c2eb4512 SHA512 6ecb89e94afc483ca628ca6c6e3e2d1afe0087bd14f917b29be1f60bd31df23e5f48169a9930020e4b8cf1e6366282995ec067ee930d7c0676b48adb45fb295b 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 EBUILD lxcfs-5.0.4-r1.ebuild 1982 BLAKE2B 1f7461b6b9329fe6cadec26c2daf039137df581028fda6941efaf10b18ddef912413e1e6f0d4fa267c1cbf5ef27a8abe5d500640b1d037096d1902c037ebbb8b SHA512 510a79f224d15176e2399e8dfabe759e8ee38308b2ac9f0685fb84c88f8dc433981d9eb5b86694dbcdd06c33ef6b7e3d73632d1112f9199f7acbeb1d85f95060 -EBUILD lxcfs-6.0.0.ebuild 1900 BLAKE2B 9bfa072be657bb06aba52a3c43a518038da2086586824a08ba33e98f3a7f4179dde215f3a0c21a13efca33651b24d86feb8c2fa7bfb51191d0323c8321753b68 SHA512 60b06c9936bc1000d6f58eea1e9a684247aa4c33fcfec417c458931d87e1af8f22c43bb1bf5d41565f48c1c35187dae362c9e8ef5911c0052d532e262f5f404b +EBUILD lxcfs-6.0.1.ebuild 1900 BLAKE2B ab9d548beaeab963ff0f36e47a3999b4aab47c903791fa3338c4882ec793e2a4c6ef30609e495583cb622d2991b7e103e615018e7f69582b7a9542fb3d70aab0 SHA512 481ebdae9cffb7e0ff324e6f32fd83448a25dc1301142d634d1b6a6b531d089af508b59a61ace923dfcfc54de3be3c3bdd6dad80f0a68a3e1043b932aeda67a6 +EBUILD lxcfs-6.0.2.ebuild 1901 BLAKE2B 3c060894c2d180ddc260fd45faddf9bf5d4a0eb84d6919ed2887aaac413ccdc1801e6693d7da83e98cc3c9012721369f039d755f46541741c739990cbdc576cc SHA512 72f88dace02a0d51fffea3a420c1fbeedd8dcf8db0072038b34d800c6f742c3231dd995130dc95fbee126a717fecc6c6c38efbe0c7db3723a536c4b0021d2774 MISC metadata.xml 769 BLAKE2B 2e11677f002a9ac8d0524d2cf280e4a39871bcddf095b37c6a9c6bcbdbbc346a397b9b6e64cecd40539cf96f4155a83d451a3a0e462a5cf0696fd5523b08f430 SHA512 364780d6ed12d98ca62183f90b12363ac581cdb4495bbfde4983321858d3f2d29343e7ac6a8b36c24a3518c868b67e38d5d28f7dee4a6e13aad65fcd9b9b4170 diff --git a/sys-fs/lxcfs/lxcfs-6.0.0.ebuild b/sys-fs/lxcfs/lxcfs-6.0.1.ebuild index 2cdd634fb322..e90cf5629f5b 100644 --- a/sys-fs/lxcfs/lxcfs-6.0.0.ebuild +++ b/sys-fs/lxcfs/lxcfs-6.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake meson python-any-r1 systemd verify-sig diff --git a/sys-fs/lxcfs/lxcfs-6.0.2.ebuild b/sys-fs/lxcfs/lxcfs-6.0.2.ebuild new file mode 100644 index 000000000000..3325c391425a --- /dev/null +++ b/sys-fs/lxcfs/lxcfs-6.0.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +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/mdadm/Manifest b/sys-fs/mdadm/Manifest index 627318f36873..09b47f6f77bf 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -15,7 +15,7 @@ DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a423 DIST mdadm-4.3.tar.xz 465820 BLAKE2B 3b6955339adb6c254a69d698e3b807838f8840e37f7f94280f4a1fbffb082ee694309f4b6f9adc8edfa2071fde324bf00ae0493d5b2e6c8d87796783dfa3ee1c SHA512 e44977f2f80d2471cb313803a60c92dafe8282ac06bbbfd41ae90ca493c64a3da94db924538788d045fd7f0667333912dabedb0b070f9abf5c0540b32e0fa08f DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6 DIST mdadm_4.3-1.debian.tar.xz 86972 BLAKE2B 52af9ddacc402d8c3318bac31b4cd5ac3045e564832546146ba0a18d6a43866ae2c21270ac15f48df98c4f76af0eeae41679ea9e0e265dad44914bd58f27d689 SHA512 1c5203523f0c7fe271d850ab4ad376a449e870f8f1549dc4460adede1f59a1a364e741562954297e7848bae19d1cfe273a31f1bfaf739dd37559a0666abd8517 -EBUILD mdadm-4.2-r2.ebuild 2674 BLAKE2B f44db51fb6c836fbb71b3c8f892d5c9ed26b64b0a150a7c9c1b5b0073daa3353d9be0927fcbf90185af03963a105a37e2d08a302c2e83d12cba4dc5ee5603008 SHA512 1034d0120646bab24cea2d7d44c67871f19324a59af9396534a2bace2634e125b933e592f0a8898b2ebc4faf2101ad1cbd944878b85e4b6753fcc87f840f091a -EBUILD mdadm-4.2-r3.ebuild 2767 BLAKE2B 5bed65dc0965d392f4859d5323ffa7189855df3ce2d8c4eb012a02ebf42652a9a02459a442e668f14161557b50a75787b4f3cdd7a40553318dc3112475426aff SHA512 4579962cf63df282d5e9d941f848a323011de4177e942924c107a26a091957cd55f9c5fe2fa6bd037083bc3e149906c873b119f1bfb33bdbca6abf594c89e3ed -EBUILD mdadm-4.3.ebuild 3480 BLAKE2B e09ce77690acaeb3dbefc5f8c1246c02ccffd611bb22c784f7bdefbf2e1296ed0312bdf36aae0ddf68fda33ef92e93dfd143ee3aff9e513dbaaae3f38589dbd2 SHA512 0a3d1b4b55b166d2c1da461f9b5b3526704e91ac660a81d72c2a2d1c9e63e070bee5584003addd78dc43f090a6f7b25411e400a4b4d13e3cbf657efbfbf8877e +EBUILD mdadm-4.2-r3.ebuild 2755 BLAKE2B 357a4ce0b9984794d58d3166ac86a5bbf12bb6023bca09bf9110679ed98fd2e77023abb958669539248a0cadbedabe24b5df70cd8249163af5775ecb4eb8b337 SHA512 fbd1eee99aabf7f10a8c9487a0e6752bf2c461d48b9ee358b9bd91374a7f3527a1fa14925bcddde68c8ecc644d340246abd6a9e27941feb6f75c1f3b98895d5d +EBUILD mdadm-4.3-r1.ebuild 3444 BLAKE2B d59d2d7c2bb587760f4a24ff8e80126668e100483120601f729089bb5c3cc5d334c79fbdd9818fdb0b4de7c6110ca1921363d76cadf1413cb74d8dc85f354e9c SHA512 4ffb891f009f735d1e4d460d85839190b8c2343d99a90204ca7037528903e39e0e61e62fb5038a346bbf38ece2c1d01d7210303438a72abbbbfe94870a8a03b7 +EBUILD mdadm-4.3.ebuild 3468 BLAKE2B 74e6729c7e8206417186705de2ea9bd948f9976522a8329aff54cc4575d62f66b32720b6624f4ca1319400fe899a7a49621f2896a83ca1f8dc715c06edf1363d SHA512 6f09c484979142d741e3175b667fdf8512bb4109f9ee0499e71fa61aeec47d5d759ff1a969e71be789c47b87f96ea8f162048576a8da5757ef6636e8c27072b0 MISC metadata.xml 418 BLAKE2B de9c0675d188ad6ad98f008b9d07967018bc9b97e28f30681693f3003a3b99e46d10af48944034fc5e6c401d0ac662473b20cd369f53ab38b80c2d2839604ff7 SHA512 a3889c19874875d1e511fbf192ef69b870da79e0e1a60026d135c2b45a5f7aa26456bc22a2fd8d4167fc968f08f1c297d4dbbe1cb21c68f61976534675f38c3b 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-tools/Manifest b/sys-fs/mergerfs-tools/Manifest index 9ced628d3717..ce59313a2295 100644 --- a/sys-fs/mergerfs-tools/Manifest +++ b/sys-fs/mergerfs-tools/Manifest @@ -1,3 +1,5 @@ DIST mergerfs-tools-0_p20210502.gh.tar.gz 15575 BLAKE2B 0b111c8a37c7679cb5a331d942f11ad8315eb58d0e686a53ddf6ce9262fb04cde69654d6d8c597d94fba48914b5b7fc4fc35d0b6413bd817e587e1d8e70ad1b6 SHA512 8f0fefe65b277d01aa893bd8af3dad5618b403126817982740a59c7997af33480ee858158b430775d63f0aa5ade854a71d88ab99ee0d7eac8cc4cb95933204f2 +DIST mergerfs-tools-0_p20230912.gh.tar.gz 15573 BLAKE2B 3af6fe712697c3855e67282e9f0a287b71db88368d161db72569e5382325fe7b3b43b9ce20d92789e0f8295586d4b52f4fb649dd82a8fe164cc1d3ff83674e6e SHA512 1e8ce355bfa3783dedaf035b9f39b4aa4a7ec1e4280afe1f0fc761aecd0357a416de1f9d870480ac941104410824da5713fbb80b804abb13589fa0251c62ae14 EBUILD mergerfs-tools-0_p20210502-r4.ebuild 730 BLAKE2B 19befc5f77ee47de69c9ab3b683f5f28d3976e9b82e02bdb1a06e905106eb288753019b3f2b5a9b6ce9ea4aedebe5274474582518b7b49031b275df9002ea525 SHA512 14b422412db01016828089cc5bef7665abb96eecad7294c7a287d996d9e17f10f85c63814adb993bb2d5eede2b8196f433d852b18d474f1714c610268fa07606 +EBUILD mergerfs-tools-0_p20230912.ebuild 792 BLAKE2B f75d7c1b2d013de00589ed4ca0a3e729b68603f84125f7b084789e751ae8c440396b51e365ebb33f0803cd7082a163ef25256576d34a78377ac48cc7bb180c8a SHA512 53af73ae1d9b6ba8dd4121d8b0d0085e89a96ac55cf3e619918aa2d84c73c4b35d4fe2b4adc15930e6d6f98c3eb959287bee2e090cb5fc99910a725ebbe30d98 MISC metadata.xml 256 BLAKE2B b261be947390837c70e604761d31e7322ee4a45e4ddd910cb628aacd192312253ac1e6e635473c135615abeba9a30e57e11291ad54bfb00fd4557876fd05efde SHA512 41d6bd432d9c75fa0303b14a1948e53dc14f0fb135e016e8222ae52b8b77d5b8b82b848cbe64f3b16dc756a45291b14a3e37e669b07fb2aed6f3a8cd2b6426fe diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20230912.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20230912.ebuild new file mode 100644 index 000000000000..137700575d1f --- /dev/null +++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20230912.ebuild @@ -0,0 +1,32 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-single-r1 + +MY_COMMIT="80d6c9511da554009415d67e7c0ead1256c1fc41" + +DESCRIPTION="Optional tools to help manage data in a mergerfs pool" +HOMEPAGE="https://github.com/trapexit/mergerfs-tools" +SRC_URI="https://github.com/trapexit/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RDEPEND="${PYTHON_DEPS}" + +src_compile() { + # no build system. + true +} + +src_install() { + # Explicit INSTALL= to avoid `which` + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr INSTALL=install install + python_fix_shebang "${ED}" +} diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest index 19daebdd07ae..9bff5c6cd703 100644 --- a/sys-fs/mergerfs/Manifest +++ b/sys-fs/mergerfs/Manifest @@ -1,5 +1,5 @@ -DIST mergerfs-2.35.1.tar.gz 669100 BLAKE2B 25b442f0451b525509bd908ac1cd2e70ab33db599aab58e2baeca47eeb3a0d0b93f7fddb880e8fdbf1b6928d40c650e0df23c116741cad279cdf169cea000768 SHA512 09de354ae7a7c69f6e873145a754c3ed8a840d59ccc455c8913f2562babbe8787c7eb929c0ea2571b5292928e3cee7b547b0a52cdd833b03e679e11191b4a5b5 DIST mergerfs-2.36.0.tar.gz 680473 BLAKE2B c0380834c7610724f058bd13b073622082ad8bdf4fe32815cf8a5450d1f962478a6ba3d0033d0ade446861786db6c8d3ae3dbacd6a61a526a79d849b6c7b40e7 SHA512 f20879aa5fb9ab56b1e7bba0e08aacda7e26af7e1fdcf3d57b77a2dce70fda8aa15c20e947dde6ffab3dfae8698005c9d8383c9ab2402cc4ce5de0810ce1298d -EBUILD mergerfs-2.35.1.ebuild 1077 BLAKE2B 5416ad8a60a26e808614064c4dfa45be6552e0dfeab16d4c0c203fe39196a5cdd3390f6f9ebd76838267d7a9beb75d51e429a0bd45841eb70f8ddd0cabc4bde1 SHA512 ed5f77c414351d64620b82a93ee4038204656e4afb2104f75f95a3847d99e406d419d841b87de3180219f03a66e43fb5f4fef568e927b4d1ffa2b0bec2399e3f +DIST mergerfs-2.40.2.tar.gz 743230 BLAKE2B c248397288465a0acb735040777504a9deca51c5d6b92753bc7ca1dc078bbba69867b93f94c049d5ae1aa75b77410bc228d270267e3550cb3b67226395337dc9 SHA512 b491007ef14ebd9c9193e730cccd7a178fb7d96426066d5a61cc654eae0b81824a3bf25258b1fafd248f4454ebe55787653f3d906cdc2e89a5cd0884db534876 EBUILD mergerfs-2.36.0.ebuild 1077 BLAKE2B 5416ad8a60a26e808614064c4dfa45be6552e0dfeab16d4c0c203fe39196a5cdd3390f6f9ebd76838267d7a9beb75d51e429a0bd45841eb70f8ddd0cabc4bde1 SHA512 ed5f77c414351d64620b82a93ee4038204656e4afb2104f75f95a3847d99e406d419d841b87de3180219f03a66e43fb5f4fef568e927b4d1ffa2b0bec2399e3f +EBUILD mergerfs-2.40.2.ebuild 1061 BLAKE2B ab303840588c4f520a0ac18f13f567b17b00f762667cf3e95d347a235f03699b3ba9f92a189237c8cada71c3f4b99483444b726ebc7a8049ef02965c13435f94 SHA512 7f77636b84139fd6048ca80af42dc2dd277cde06971acf8ff54743f4485c815ac2cb875c31f4680254469b8f2c0835e4be914a2287eb7fe03a96fd5e6161281c MISC metadata.xml 250 BLAKE2B 468e37e94b1911acd9d0623757a3d00c0e9437893e4962b4e56ae03abbbed0b26d30fb832f855805be3aeec08bd7b543452253bd1adcc06deffa0ac6e2af37ce SHA512 ad5b1a555e5ebf2b604ef1fa16c8b7a630b6c6733d9404adca0def5d01bc43819fc59a0bb7c433a265311ea19288aded36d70a23c711e838ad1ba47889d0002a diff --git a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild index a534d6068490..12c52da625d1 100644 --- a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild @@ -1,39 +1,38 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="A featureful union filesystem" HOMEPAGE="https://github.com/trapexit/mergerfs" - SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~riscv x86" # Vendorized libfuse that's bundled is under LGPL-2.1. LICENSE="ISC LGPL-2.1" SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="+xattr" DEPEND=" xattr? ( sys-apps/attr ) " - RDEPEND="${DEPEND}" - BDEPEND="sys-devel/gettext" src_prepare() { default - # Hand made build system at it's finest. - echo -e "#!/bin/sh\ntrue" >tools/update-version || die - echo "#pragma once" >src/version.hpp || die - echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die + # Hand made build system at its finest. + echo -e "#!/bin/sh\ntrue" > buildtools/update-version || die + cat <<-EOF > src/version.hpp || die + #pragma once + static const char MERGERFS_VERSION[] = "${PV}"; + EOF if ! use xattr; then - sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die + sed -i -e 's%USE_XATTR = 1%USE_XATTR = 0%g' Makefile || die fi } diff --git a/sys-fs/mhddfs/Manifest b/sys-fs/mhddfs/Manifest index c9b0a85739bf..64ca3722a824 100644 --- a/sys-fs/mhddfs/Manifest +++ b/sys-fs/mhddfs/Manifest @@ -4,4 +4,4 @@ AUX mhddfs-0.1.39-xattr.patch 498 BLAKE2B e0a1a72c2883135956f885e974473fb3df10f4 AUX mhddfs-respect-compiler-vars.patch 1545 BLAKE2B 0767a923ce691bfc5b94980f6a3aa16c1e4f4b3c87930316ae54073d12adc18609d2208819d9dbd5546a33037a64575daab780bf68a90e1b447fa9136bda891e SHA512 426994f2ccbfe099657fd0dda09aa9925a91aaf054121bfdf9806dedbe8bc0f7539b4417758e2c561574c94824a87b8f4bef8ed485e2834b2d7f7c8cffe5d6e4 DIST mhddfs_0.1.39.tar.gz 40665 BLAKE2B 5f7fa51d606985085fdb6346af5fdc6526d6f236b93a4deaad8143ac870cc3e85b5a6d9c94150567e2b34fd8ab0edaf4e0dfbf9c1cfc503f29386998bf84ed2d SHA512 cf1952e665e82a92ccfef9215d4faf78cd235566b67e6ebc3a60ab53089d9391bc41a08e6b203ad052e4a08bdd14428f2d9abe48f341aeb0c80ae1da80f83f89 EBUILD mhddfs-0.1.39-r2.ebuild 1182 BLAKE2B 1f33d2d8f192e13ece49babd3bd60ed74150cea4bcf2c36a49c2cae17476be90d936c7e3409cfd20cb2b997a989b387c1fc447f8bc6ea42e475f0160ecd0f0e3 SHA512 20215462c07d922e79d074c8d1682cda8c86da1b67e9d0fceff681505830b297daf42864b3b7a1cfab9cee456c6df44eefd508108b0de458aa732b7283f8a90a -MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93 +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/sys-fs/mhddfs/metadata.xml b/sys-fs/mhddfs/metadata.xml index a3862b8ec2fc..115e9d64a669 100644 --- a/sys-fs/mhddfs/metadata.xml +++ b/sys-fs/mhddfs/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sys-fs/mount-zip/Manifest b/sys-fs/mount-zip/Manifest index b93635255da0..d4bf8f84e5a8 100644 --- a/sys-fs/mount-zip/Manifest +++ b/sys-fs/mount-zip/Manifest @@ -1,3 +1,3 @@ -DIST mount-zip-1.0.12.tar.gz 723368 BLAKE2B 524d2681a4311975ca7d30362d28776f5258b5eab9fb52e5283ff5a20e17b9fae9aa03d19838424c1ce8a2822f90d2d03870153da654b21acc557400e6040117 SHA512 05608420d8a17d4bd940bb735e6f8bcfb696cbe4a120267b5dde3f9e04094e221b9a67e0a71125df7df02c4fdef102123d71e00fa7dda62dde28bdf57e599aa0 -EBUILD mount-zip-1.0.12.ebuild 689 BLAKE2B ad3dcf8b994aa68226da9a0dc4becd5187eca42238d563c962c6f2ee467b2562cb4e3fc2152801452391756eb13325c88900009954765b8ec76e6ebd280cb52c SHA512 bc323220b3868197d32118fe8933859060c26dda7fc77e70d96f3c3936eb16510d08d4ca9125bb03e1bc193da0db4a3b8fb78eef38b9863d53a7d6cfa9cab642 -MISC metadata.xml 483 BLAKE2B b12e1e62d7ccf3cc0a70c7d57b7a167f7849f25f5eea1d88b4c0f4977ca189eadda953d188d4e1b493c6d3f0ac7e43a2ba5c41020aac757f927f833f182c8bac SHA512 ecc38ef80c2c04651e9921ff7d88b9721791792247469559b3499731f95be818904deb4ed444d6fb4ca2eb7ae86c45336f97545db5722302f200f14adcf0041f +DIST mount-zip-1.0.15.tar.gz 742530 BLAKE2B c328edbef7e28408c39cf7eba311c431793998562bb448796fe0bde1b0b647d4253f1289e6e68d7d9d677b13638e58033146e1f1ec41b3ac370419cdeed54bb5 SHA512 939e051ddf15050f5a3e6c0c0aa22b795dbd77f292a2ae191cb797f7e4cf5581a15178f75228d93d5ab92a1b5e635a030813d4b00148c5533e150eb305288d9f +EBUILD mount-zip-1.0.15.ebuild 689 BLAKE2B ad3dcf8b994aa68226da9a0dc4becd5187eca42238d563c962c6f2ee467b2562cb4e3fc2152801452391756eb13325c88900009954765b8ec76e6ebd280cb52c SHA512 bc323220b3868197d32118fe8933859060c26dda7fc77e70d96f3c3936eb16510d08d4ca9125bb03e1bc193da0db4a3b8fb78eef38b9863d53a7d6cfa9cab642 +MISC metadata.xml 249 BLAKE2B 8cb50d64c543b8445ff5c14c4b57ef85cff9c243e233de41728f21a7460a88f780be7e33420792db6a5242b3365d460830e276fedb2d18ffe102fc8ce23923f1 SHA512 48ab628170f8ab5a5e1aff16c49de53c05b428af98de6480ef02cfb68c34200686e098d8c0e2dd7b73c5d98e7b12728817bd95b8e99aa1ab5fbd9ee8e5e210db diff --git a/sys-fs/mount-zip/metadata.xml b/sys-fs/mount-zip/metadata.xml index 62957e62e7fc..7f06bd526e67 100644 --- a/sys-fs/mount-zip/metadata.xml +++ b/sys-fs/mount-zip/metadata.xml @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>fdegros@chromium.org</email> - <name>François Degros</name> - </maintainer> - - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - + <!-- maintainer-needed --> <upstream> <remote-id type="github">google/mount-zip</remote-id> </upstream> diff --git a/sys-fs/mount-zip/mount-zip-1.0.12.ebuild b/sys-fs/mount-zip/mount-zip-1.0.15.ebuild index 9a3a0c705708..9a3a0c705708 100644 --- a/sys-fs/mount-zip/mount-zip-1.0.12.ebuild +++ b/sys-fs/mount-zip/mount-zip-1.0.15.ebuild diff --git a/sys-fs/mp3fs/Manifest b/sys-fs/mp3fs/Manifest index 5db5995126b6..062550011802 100644 --- a/sys-fs/mp3fs/Manifest +++ b/sys-fs/mp3fs/Manifest @@ -1,4 +1,3 @@ DIST mp3fs-1.1.1.tar.gz 804399 BLAKE2B 9e7f99b923ad744d172fa261315498c7df13d2416a7eca45108d47a7926c40c527e306c1b7d3f0aeded01ad5d32325640358fab5b5327a5c11e0e91d21d4f290 SHA512 b1e4f403666122056f924514a7e63ddd53dc00346d7750e37e8150ad5f13294129595d79398677c69726fb2abf942d4ddb8fdcac3b1312a01ed467475f22592b -EBUILD mp3fs-1.1.1-r4.ebuild 694 BLAKE2B 73a251c151a6e06bf05e10298722b06dc8db7cd02a39135be8f6cbdc3b2742a2f8643772cf4a9d1f57e28537fce908a8d01989202347c3438eb83d4e7c9e480a SHA512 5ea9d54ef953f8910346d1322142adf58639c145e09421e56546266e93ea435e9de84c76277e038a55df370f60551cadfeeb44825b7fd945d235e41e08f7c983 -EBUILD mp3fs-1.1.1-r5.ebuild 765 BLAKE2B ae341d0a3e6aff563bf9123f9b0881049b9f114055c8e01e1b2eb0d6ea37b09e1f29270d2505f1f8930c7d28c9651e650ccd77b081e95f11c2dcab6b8cdad062 SHA512 46e0664405f8a7eb7e1ee42c896602f961db297b759c63e70d7c006709cea679dde98f9f0af3afe5fa7cbe4a748728710889659be951a9415343a64e1dd25b50 -MISC metadata.xml 327 BLAKE2B 345f8452dabea6d75a6b5b71c0561054435b8f4bb398bed8b3c1456a01787c1aa6ca3ab2205ddf9aa8c34d4fd74ce5a5ee701063f53f00cfdc3b03a3e768eb3a SHA512 76a69ea028b3713bc345a5b69404a439afa588a77ff00a21111de0e67f9608f347ec73e8fb8d20289fcd6b3fa2fb44eee0afd59b882b474e43e988be88bf3469 +EBUILD mp3fs-1.1.1-r5.ebuild 763 BLAKE2B 7154991184e9a84287186ab15d6f57233166fc71962ca57ae42d392649f4d54efc85747eb964518211e2ce65b32215420b3f83c6a578ddadd2fa635efd81f121 SHA512 84d9dc3eb7d38961e8eb1e349f6370bfff4764405714df97df0ca91f280246dac85cf5f34d69f96035e4c1fd6436d4a56656fabe05d7cbc9b42725d2f4b728a2 +MISC metadata.xml 247 BLAKE2B 87297fc47ad3c56068240c805a7ac935851da95034239d6bd85539281bab0efc85fe67d4610180167653451a9a8d197dec3573322e9acffd8899ca76be785a12 SHA512 258c5d3dd8165cb5597630819534112f4e9e4a26d8aab5dec40ca14a09f7b94aec6ae5238fd428ef0a7722ebeaa883105d191bcc2dd7ca4111b6209b03f950b0 diff --git a/sys-fs/mp3fs/metadata.xml b/sys-fs/mp3fs/metadata.xml index 7441425e8bc8..bd0d05b76922 100644 --- a/sys-fs/mp3fs/metadata.xml +++ b/sys-fs/mp3fs/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">khenriks/mp3fs</remote-id> </upstream> diff --git a/sys-fs/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 e626caeb9011..897d5d02b0d5 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -1,4 +1,6 @@ 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 EBUILD mtd-utils-2.1.6-r1.ebuild 1150 BLAKE2B fe66d7e1b4e3249054b092b00595111280a98d5e4a3b2d859f2a53ca1e87391a14b4c3aa822691416256af3d6c5eed6d1b0b8af360033278c33ae0f7dca095a3 SHA512 03d5c04a9221d9e94d0b35851583d5d0c02483f2962abce39dca5477dab02cf3cbdfab778122b01fec63e3d485ab0a6ddc61b84e0d6a955f707a3f8a23271596 EBUILD mtd-utils-2.1.6-r2.ebuild 1253 BLAKE2B 704c0f38a35acec3ec830a74ebec39e43a001804ba8dcbb8da1f33369c4906b67ddd6ec33e250c343e1a807df86f9bc2365d4a1b76100e510cd776c40283b65a SHA512 42147e96f4c880785c30d28e9e90ca8a0fee848c0156c1e54b0b6608b591b0617eaf3c328f9abb208b1bc25248575d081b0fa2c79ea1e818a653973593c28a93 -MISC metadata.xml 475 BLAKE2B 49a145f678fd3e79eb6f39a371e4e477926f7429673a3d5fecab6cefb054d7273676c22fb4be0769e755405dc5e990b46947eee4bc8ae7a145fe8eb6325aeddf SHA512 2a2069e74ad519e19d364a980ef281eb7f4624a44f6e8a73e360212f40069e9252041eebb37b2228316747d95e574b93886ed2f679a4a862a627616e19b2b5c4 +EBUILD mtd-utils-2.2.1-r1.ebuild 1460 BLAKE2B def53ff2ee09a31927d70a2fcda048f858d6490d9aacca43ffcfadff04acf921b101cdec54ab2871e20a94de9b284961bc9a0fe1c8960a4fe82976200d7e93f1 SHA512 8bd77032a3394a5863c954e8b194db98ef68c6dc45fc561cdc83f32a5cd2a56ace0e6f27804b8d44362705d2af59dbeecbdf1ea7b3a01d0ff6cce086f77ad485 +MISC metadata.xml 539 BLAKE2B 8dcf3fe2b682d8091f41fb2278f8a830ce60c0646fa96b578fa76fde0df7088839ee0ce550a38787dd5b8adb2384a47d1d15f9336496ebf5cc6824920f220c50 SHA512 3f2f99b0d4499c2c2d26a9931748dec3d43e98f89af584f9c38c956f86e9b078bebdd0c2d110df3a56bbdf47399aba7352afd14d0f74fa752da0db1a081d9f44 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.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 3e4c56c55f2f..9eec5a45565d 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,5 +1,7 @@ DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811 DIST mtools-4.0.43.tar.bz2 443673 BLAKE2B d000839bbb6bc647eb5a32b08b40b1350cd0a85fd564f0705ecbfe20f8f4ef21bf2d59cd0ccd7a159c829c019c6c2f3cbdef82ff3f4a9e8828cc13d44ddabd1d SHA512 b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410 -EBUILD mtools-4.0.42.ebuild 1066 BLAKE2B e9962aac85a2cb4f17c35ae286c2191c447c98a83cfbbe681d1683e30f0e4ab83d28030f1912571918120742189ddd10900da13fc0ec9f5631845987e26c3cd7 SHA512 a0eedcc4ee8c2a9e37ca146efc3627dd6984917710269d0066930180490253f27c6e306f853a94949a263eefcd44e6c4a7e723d0dda3df3e6f7462830f4d228b -EBUILD mtools-4.0.43.ebuild 1066 BLAKE2B d3ae92c757d6ce0ade4ec430f48c97a7b34933022efc5b8aed1634cb0811b7ac2b361ab2027a5aa1144562b6eeb501347fac0c28d7848ad45d110f4c6417dc2c SHA512 58b05d3155ae5df02468f1b2452122e9fb2269f6e3100485d6b5660d52a5670db488d6ad065f68e78301b3b7c6eba6e1c2a2f821898ebc0bb54edf1d1ecc30cd +DIST mtools-4.0.44.tar.lz 389267 BLAKE2B 1a6a9d257fc07cf27280a535feac873d27690fb02114b293e31d7c8441de6bbdbd57a13f4ba62ce5a5093cd45683776dd8e61ac822b1d3d44eb98cd21f7b9088 SHA512 8977f43b1cd25a0d1052f9f8f140d73d432bd49a7a4737d0b743a9f8ccec5aff6bbbdc07455011ecc49038b1b1dfd6908dda8c46d06389b1511875f9bc654f84 +EBUILD mtools-4.0.42.ebuild 1060 BLAKE2B d92adedc56a0e1546c388ec7131c11e2c9a14b5fee3fd9d30be1da012d04479b440f56ed410ad598e020b85562ef18aba787e876ba380a05127fe9ae0cc1feef SHA512 a54c3be439cccb4393e965be0f50b23608f338ae611d2f6d3a4b411032638318f178b05198623c8bab2d537ccda40bfac4ac70d4d48353b3ed0409b61384047e +EBUILD mtools-4.0.43.ebuild 1060 BLAKE2B f26d54fc0f2584f27560d2160efc8d527a70ecd317727adfb051e04bd20bd53ef32568ad96e3a8420256f1416d6c2b52203a5830d25c09bb267cbe58968b3c8c SHA512 852d8572c2f89299ee51e8608ef1d0f500bdc4308fd6d637f3ba4201034158b5c1266b5eab7e64d4e9a9b01845bea1b68327606333d265f86012e7618f8b2304 +EBUILD mtools-4.0.44.ebuild 1106 BLAKE2B 19e50766eebc08fe10b45f1ebabce0cc3b5b9e1e640ab12462c0b41acb3a7f95467447c07bcff1a414700c22ae69ee9d8258e68944e6f5a89e88a4501b359fe7 SHA512 ee30772edcbc8df7a5595b9408bfcb9b48f67adc8f74f20061427d4df6e23a2ddadc54e1b46d61b758ad33708421ef8092aacebe5f31124133a43939282a2af3 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4 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 new file mode 100644 index 000000000000..ada3bde4563a --- /dev/null +++ b/sys-fs/mtools/mtools-4.0.44.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 304af1213024..ba64d3d98b36 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -4,7 +4,7 @@ AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e 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 -EBUILD multipath-tools-0.9.7-r1.ebuild 2237 BLAKE2B bbf947a3f88413768453d3e74b904a18b8d7f8be53009dd613cac5c94e12a28ce900235ca6bbbc4d60cc4f961b9d13307b0be5d48baa71dcbabd8db06819d219 SHA512 6dbde9c1741628d5d1b966baea73bc38d175ecbc5a33d5897572a94d7b6a59c850d648baa1625258ea9118f3a6ad08523338ac48b86a08a54655f07351eb9e1c -EBUILD multipath-tools-0.9.7.ebuild 2167 BLAKE2B 91b105a2d870974f2e2cce2e859e98c9759447535e3574e395b817c6e013634aa1b8916abea842965c279586ed06350f101386aba369aef72a4b10311fed2b30 SHA512 a893eca34df5609be18bb7cdbc12d92370b04ff7f6916d907d84d548748afb9ef10242cfb9e70a08a12c7eb4d72a608c38e6b783f849622ae22cfd92ded3e88e -EBUILD multipath-tools-0.9.8.ebuild 2167 BLAKE2B 91b105a2d870974f2e2cce2e859e98c9759447535e3574e395b817c6e013634aa1b8916abea842965c279586ed06350f101386aba369aef72a4b10311fed2b30 SHA512 a893eca34df5609be18bb7cdbc12d92370b04ff7f6916d907d84d548748afb9ef10242cfb9e70a08a12c7eb4d72a608c38e6b783f849622ae22cfd92ded3e88e +EBUILD multipath-tools-0.9.7-r1.ebuild 2231 BLAKE2B 35f559f272887bcca520c136518b48bc155b3b1cfa0a2c21fc278ed278eba1966f380fc51ecd6791f0a027470ca8d7c2746382af22f748c32cafb2ab0870bd9a SHA512 72731173e43c61909bcd50710131bbd46e5a22f6088fc6ec59d48f86bb00d7df82ed2c4f57837a6a7d6693fc51b163b8dd5f9fc0b20564106df514a50736847f +EBUILD multipath-tools-0.9.7.ebuild 2161 BLAKE2B 85e956ed1f3d397895d11b4957aece99044427536ceb26a812ce455afa89a2a125344e3cbc1c3b8d1ca47621df082aef74669a4e89df29bec1707ea2f858312f SHA512 8e0d436a224c8da5db01c89fbff40d07bec1c32f195f516e7f67648c30b20a988e73043bc3f798d8282f81ea4f0a371a98ed2c5e052ddd4a865e9dac38bdfda8 +EBUILD multipath-tools-0.9.8.ebuild 2161 BLAKE2B 85e956ed1f3d397895d11b4957aece99044427536ceb26a812ce455afa89a2a125344e3cbc1c3b8d1ca47621df082aef74669a4e89df29bec1707ea2f858312f SHA512 8e0d436a224c8da5db01c89fbff40d07bec1c32f195f516e7f67648c30b20a988e73043bc3f798d8282f81ea4f0a371a98ed2c5e052ddd4a865e9dac38bdfda8 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e 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 index af967fb2c612..fce73a60728c 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.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/multipath-tools/multipath-tools-0.9.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild index 6e3559c6b390..e85965ca2f8d 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.9.7.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/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 f82ef68cb524..5b39e81535aa 100644 --- a/sys-fs/ncdu-bin/Manifest +++ b/sys-fs/ncdu-bin/Manifest @@ -1,10 +1,10 @@ -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 -EBUILD ncdu-bin-2.3.ebuild 1103 BLAKE2B 075ef4fbd0dbc80495cee7ae5143d1d6a158f4e15222cb2ff0534cfb3d35361efab6221d1ec5a2f697f75f86b90bd07a63ed7092e948283ebb3a22923b4af79e SHA512 de6e73136559525dd63fb91c43f9af213eb4f78e5cda79f14174ef89710f137e9ed7b154748cdbc379880f99884ce9d4f438584df3d6adb01a77815c22acaed2 +DIST ncdu-2.5-linux-aarch64.tar.gz 283085 BLAKE2B 28518e20460db8abbdfdfa6b61b61024b9550f5bf34fcea9682f5598d05cd417ad4b8b78b662e6cc6ad35b45f514cdfa2d35ef7677c50338a40345daf0ce4b57 SHA512 973139d158ad71ee80939aabb1a419668c95dd25f7e5d78ede78afa66bf1fe835e7c736ae1ba5b56fe6e0bde6125b46d6102629492582910947778821912d199 +DIST ncdu-2.5-linux-aarch64.tar.gz.asc 833 BLAKE2B ef4e246218a81c10aed27829f68a78fc96f9feb7a84dab6f32631ca400b480dc5ef36c185d6afc830537c15297da02ab7b58720576476509ebd554d0a1a338ae SHA512 d9ff6aee538cfbabfddcd59108baaa949e96df722c9e7f8fe81499640041d361b2a7473982cbd7e9a44ea2c5a1394cefd6a0a9bb05733775c0a354459d870ab1 +DIST ncdu-2.5-linux-arm.tar.gz 278582 BLAKE2B 07ff2c8463ff407c5fcafe65db7d3911215b3dd78ae3e65ee6aef43c57d8eea782eae741cebe83488f9b5b504bc9b8830d6cc586866e3a6fdb10b79c6fcff43b SHA512 7fb2ed31eda1e6e4a7f1749ed341d062aa6f6e4502ccd3e50fcfd5fb2e3f892f201d17d6eca605e281a3f2a6f95938fe0af62750b79bde051917cf40747fc374 +DIST ncdu-2.5-linux-arm.tar.gz.asc 833 BLAKE2B d2353572707b4a54053a0a2cc9a606b90d0d91bd42a12677ac9028e1ff64c41ec812056e734e34ff38ab8aaa5d2120b7aee1d8b14d6a3c1a3031dbfeab7dbf4b SHA512 d017e6f4a3546dad5b08ae3f9c8ff9470fa337955705f19175730415abd6f3032eb201f0a5e8876cde8b363259311524082e3ed6c652e9e5c2789d5eb560b3c8 +DIST ncdu-2.5-linux-x86.tar.gz 299610 BLAKE2B 0f644a185de2bc12a7714dec5f5269dad12f47a8e42399b7f5c579913312e5dc5060e7a12ada4ffd345367661baeea5fea50dbba381a1ee3f36d1048bba5f085 SHA512 88d7b8f42a80ddaa3faa6722c9d78669894b7e768e158ce39576e42d6a926912cc2e0f85c1dff1eeb1471ea4bc4fea69d7aa70b40e22782156c5ef28f59f8d28 +DIST ncdu-2.5-linux-x86.tar.gz.asc 833 BLAKE2B 907beb66a768d9639445539f98069b172fdd0c462b2eeb8872bd8c33bc9607a1cae9ccbb542d33717649e73d413f12a8792835cb89f3e7fdf534a2f69d75cbc8 SHA512 508cc5893cb8b1bd7138dbffe91933f007ecb5ac601c5a08806f5c55f541d0bc89111fd7091d1b9b1ebbc7978ff9d7f896d80e2c19e8e28d8973db3bd3b6ad40 +DIST ncdu-2.5-linux-x86_64.tar.gz 286301 BLAKE2B 92f7f6bdfa3838d657f53e14bb58be92e7b7aa2147f2bdd38fc9ac417bd0ffa14021eae587f0ba22c7277315b4251ce53fb78f8f7dbd1dad42d1805d0babe60e SHA512 2c48dd1ceb34de54cf64fcdabd81fea86a113c7914be2d2a17c9242ddbeffab69bf6ae9a51e1dd82f87c408f1cd61f4b1b32c960f4ab274db6c7fafaaa262e86 +DIST ncdu-2.5-linux-x86_64.tar.gz.asc 833 BLAKE2B 44becd2cef14a4b5e0359810c2d9f867afe282431e203db2f88aa3b21cc703174651cfe23e1f6077de779edb980cc7356a099ce926a4f029049d165dc9311640 SHA512 14636902d8475772d6ed3e3d194ef23a5613fe0bcb43a39a10e5598d392251fcf69b6711904f36fbc5a9c13a6953d7c4bcc02e0fdee2c93b2ef7e6c1597fab60 +EBUILD ncdu-bin-2.5.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683 diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild index 557f5c9250f3..76fc2f6bba95 100644 --- a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild +++ b/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest index 47b7453290f6..21bc4ed83188 100644 --- a/sys-fs/ncdu/Manifest +++ b/sys-fs/ncdu/Manifest @@ -1,7 +1,7 @@ -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-2.3.tar.gz 56608 BLAKE2B 9fd73fba83c57195f8ffbad5b954140a776d1cd1d7b3e458f832255ee9c07eb8af9888a23ed3c671f508d6ba3795e2361f79e64b4b24630d744470efc5bfaded SHA512 283f78761b225883e090c4d0d1325bffc70049477087df3e8d1afcebc3136930c2636b2bba4aa6e43d53626668519c26a1528ba5c75489d3b5924e8974184e47 -DIST ncdu-2.3.tar.gz.asc 833 BLAKE2B fd5b6b4b6e14b8bf66f5053c637598c3a0a9ad16d29c20805d62418fb69a22fa1155c8591dac35514d088c57853043c7d6c8b94abdff793a3f7b0a53cb41fd65 SHA512 698d8f1c0a7e0267fdfcfc7823803012ab7faae6eee75af406ecc9a73244463521de851c3f2b116ae7f6d7e567ea17a7ef6aae75e135a8efbb02333525455b20 -EBUILD ncdu-1.19.ebuild 673 BLAKE2B 0d8a2758bb4e30d68b24c20bb6053c177b15dd191378091b618299aeec19f9dcc8a155a3374fd3a7ec90f389ef461d44c06c5f16621fa780da916c8767303a5a SHA512 319a81be8ef82e2c553a74328fa4c619e5ca3c6974f0d73f7772eaaa7a22b5162fcf3a14283856be49a32ca038b99bc7862812a69b4c087b7b5258d50bc3ad0a -EBUILD ncdu-2.3.ebuild 2995 BLAKE2B b86cc7995305064cc5673f45b075b1c90033a5cf9bde3edf297f3412f89728088103b7d61876121ffd741eefb5e5e497244153598a37583ba52e4b0f64b5ab63 SHA512 28c36e5307d4483896cd3c3e067a8d050e7e5aa35b8e47fb43d02743f7268b35225d7d8a692be4956153600dd72a11ea074e1f7a611aff168eb951a5ce0c0e21 +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.5.tar.gz 56019 BLAKE2B c10fb19f87c3d26334038ee96d857e547f9f6881518a675d9777a6c46cf456748861d84df190c14d6d2582f5ad3998ecdf9d00f0969c996221c0d1d9787570a3 SHA512 f4d499a3ab98a56667c75554c77951e4a42f5acdc1353875c108b0da469665777564405b8fcea5a731de473afacfda9f2c8701ba0ba989de1260119c64d7a9f8 +DIST ncdu-2.5.tar.gz.asc 833 BLAKE2B 86babaf8720898a5bd83a2cc290deb2f0a8041087b9f0afddd2306766b82877bbf51f45ac3622761f231359b2e5f60b8d6c5479963aaf7a6abdf67d24fb18496 SHA512 a28751371f7e7a033379fb5f5dc885c69e716f8b6654b8ee9e5eb023a22b67ca99e3ee813ddc2e335d6e8db9bd5a9a19359910a1b8aad13132f7a8bed1d67d78 +EBUILD ncdu-1.20.ebuild 659 BLAKE2B 54817c34a87475b07af98fb846b7774b36f71384d33ff5eb31b87813dac43f6de72d84333b6a9ed172ab13a521ec9134bbd7c6e8d2269fee9c5e546a0eb20db1 SHA512 4cf3010ebd4db6ec1b79da28745c39093c8d76955fc6760fa9392f86ecb71bde0132abc7520f8a9f3f849d5feded9758e6ddb5fa525815f4546f179c6877b306 +EBUILD ncdu-2.5-r1.ebuild 2980 BLAKE2B be80dae11d1e919b970c52bd1a8ad9705995831973e6dc4370b4434ad62c6203d49b48191d40a6ff1b2fb4c4be44d61cafbaec9c231d023d895647271c2ac217 SHA512 b77bfc1bd658e39edc1f10a99726f5fdd23d4f7e2855f1e9319c534d53a830873ff9eb547470e853478e89ed57cf73771b53815779e8a054246f1c1bd03f5acc MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683 diff --git a/sys-fs/ncdu/ncdu-1.19.ebuild b/sys-fs/ncdu/ncdu-1.20.ebuild index 1f64c46bbaa6..5430ea4d92e1 100644 --- a/sys-fs/ncdu/ncdu-1.19.ebuild +++ b/sys-fs/ncdu/ncdu-1.20.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 @@ -14,13 +14,12 @@ 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}" BDEPEND=" virtual/pkgconfig - dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-yorhel ) " diff --git a/sys-fs/ncdu/ncdu-2.3.ebuild b/sys-fs/ncdu/ncdu-2.5-r1.ebuild index ac0e6228b984..bd4cb00fd75a 100644 --- a/sys-fs/ncdu/ncdu-2.3.ebuild +++ b/sys-fs/ncdu/ncdu-2.5-r1.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 @@ -16,15 +16,14 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -EZIG_MIN="0.11" -EZIG_MAX_EXCLUSIVE="0.12" +EZIG_MIN="0.13" +EZIG_MAX_EXCLUSIVE="0.14" DEPEND="sys-libs/ncurses:=[unicode(+)]" RDEPEND="${DEPEND}" BDEPEND=" || ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} ) virtual/pkgconfig - dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-yorhel ) " diff --git a/sys-fs/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest index d3d03ed83466..fac38febdad2 100644 --- a/sys-fs/nilfs-utils/Manifest +++ b/sys-fs/nilfs-utils/Manifest @@ -1,3 +1,3 @@ DIST nilfs-utils-2.2.9.tar.bz2 439514 BLAKE2B 0908e0180a2af074e97be99fa0a390e926e934fea79a40d792fc0dc1ef820c4a4ecee3696ddaf0d8f8d5c434daed77ea66f37591b05f7a6437e9a3c1a12f5758 SHA512 dd8ab20ee0d6750a6d81f86fe4d1ad94a8a71aa53ee7cd38550ea32fffcc9527db1c75d34f732f0f8f6379a808249f8eec2619e54c595566a3fc434a87d9e66d -EBUILD nilfs-utils-2.2.9.ebuild 1059 BLAKE2B 9cc9c5a2defe05ca67bf993f7259bf723bebd9816c149ceda57805d21c42309ad90ca84d2886d36a3e116a3c2e43565d61e7aa29882df363ce9481dd2f61cfcd SHA512 a2313725f9e41ed5acb238d6b2e920622180a895e28dd2038d57e59734f40d5cc4e5677208aedabbc3a82476f10d9b27c826536a05f4e29235caf0bb1b443730 +EBUILD nilfs-utils-2.2.9.ebuild 1061 BLAKE2B 919f841b744b769eb6aadab800a50c69c6df43ae0902bef2ec25bd6596796982a3748e0360c863cb65a0ac73fbb65e22611ec577b55c96178dc38103f597b71e SHA512 24ffd906fbcdbf952e145469b29aaf997aa7d74de8c4bac9cbdfc736b607d9ab7f4707004d90e160dd15a1eee8c4fd63501a729736a7a908b647d03fbac55960 MISC metadata.xml 1208 BLAKE2B 5164f144bb71bd558a24bb0b7030bc109a4ed6ea2e5ee8ade9b10ed28ea85db5426d9a7b07559f63756274459f3f82c48f011d1887d40c6749c48d29ae0e7eb9 SHA512 e1e742daa9b7fa4c082c6e5b7ce3a42dbf260a11e7ef9103c1f083a9788a0dc2f9667edb0ae758f46cf8100a0bdc06a0111e011a92fc567b39de3a70e3022893 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/Manifest b/sys-fs/progsreiserfs/Manifest index eb674c8237be..469ef11f9952 100644 --- a/sys-fs/progsreiserfs/Manifest +++ b/sys-fs/progsreiserfs/Manifest @@ -2,6 +2,6 @@ AUX progsreiserfs-0.3.1_rc8-autotools.patch 275 BLAKE2B 74893b9f8bb59af8cc6dc385 AUX progsreiserfs-0.3.1_rc8-c99-configure.patch 2049 BLAKE2B c20970703063cc8ccf7e047501662d989d3c3fbe1929c51613e7f7e83161081c28359ef35828d3a2ad4be241c75516a3d6c59495e030949f83deacc708f710b3 SHA512 6c555cc75515ecd5cb12eaea4aa3caef29538fd023a8f72119a25cc08190c2bf1d51c8e73a9eac2927eee00ca794bb7f1cf2295204a31048c67efd9e2c8f614a AUX progsreiserfs-0.3.1_rc8-musl-getopt_internal-fix.patch 1064 BLAKE2B efacb997fa18236b20a589e7e210048d1051dabfc90f400c437c72998d91cbe474739340c16b94018082a8fb0bcfcbbd99343903156b62b0156da17b103612ac SHA512 3769a855b765e97ef48a8e22bee6c9f78e7c9cd679b0c794229712e337e6793c154a36b044011fbb15a39a5ca895841430615f7348dfda11d9329a57f1fe04b7 DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 BLAKE2B 536d18ce186c9a3b796c01cdad5f622befdffcc975a82ad24d0f2dbbc3b3bac8530231bd51d460033f9ab0bf1577d533faf17f4ea5548b175a708ddc924c50f0 SHA512 65266ab5a598b2073e6893da6554bdfe43796be3bd608eb7c4f687c3ef6ed395ce67def49b62d2b3705dfdeb38bd5f5d1c91fec6ad7323788d490058b015c26d -EBUILD progsreiserfs-0.3.1_rc8-r1.ebuild 1446 BLAKE2B 849a92925319b5a0a4e8560e31d046c703d3e0c6f9be57d8f35cbd4c64a6f6488e19e0c3afabaca7d3c18292c65a4bbdca8ba09255bfb93230bd766aec8dce6a SHA512 cbe687441135f4ea8ce950aa1f14d2d5f5f1134e6862229b0d708757bc8646349f1c66cb06fbd3336c7c66b4c7c2c9dda77b817a03d65a525924ed14a863d263 -EBUILD progsreiserfs-0.3.1_rc8.ebuild 1330 BLAKE2B 29d2401fe6d0a48bcf3b4cc0a1695c09f5665e4238b9d96660ee3ed458ddf414e1efe001088268b459bd17d7445bb0180fa23e9ea99e12b62fafde52d3b2f8bd SHA512 b907c2b50bff8632dc4894dd5c22de9808f7c5fac6cde45f2b92ab5079e064937cd156a47a5744e36c072eac1e5942ba8fcde9e3669f19295a5bdd1e66d8f06f +EBUILD progsreiserfs-0.3.1_rc8-r1.ebuild 1437 BLAKE2B 272e9c980ba0d3de70e3d2261604bdd749a20088e74958fb333e5e8dd98cf82a496bc6e980a34492d85f999b9a7fb9cf09b1ae18431745908b0502f5d968dcaa SHA512 b9e31feebc4427e9d8ca66e38f6fd17936074cae9b70655a98891a7bbbdc025d7ac8cae01a5eec3bee750bfa6af23624f4a2cb0b4895370ee00e41fb4dfafe77 +EBUILD progsreiserfs-0.3.1_rc8.ebuild 1324 BLAKE2B 8e4f671c0f1b319b1d366f936b3074afbf327f7e2a929e5aef8caba72eb7230a2a2cf070bd5447ccd378503e38e49c53b6f49716279ee50a2178d42a9f31a9fa SHA512 5af9d72560df00ab7f37f81722bc4d4f8f0f273ecb30250ea0e9de64f9720f8996cef345947238a6fd465b78f51b64e033016aeef6889f34fb9b560941748d92 MISC metadata.xml 426 BLAKE2B e8542ac08694bf7893d92fb0fc133b3f1bfa231990dcbce1159140a3d49180440fb90ee5779da91f86f9db16a5748c7013ea70908e80ec5a67e0b350bdabaa2f SHA512 3dddd37daef3dcfc975dec6f52b971a8d4d7346888263d5e6908e98740481f80ce042921771d1889cd1b49f5c6621928da760124d42b1a351beb43fd7c4c4b07 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 7032c07d8a37..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 index 50a1759d6ee0..491a39d0e011 100644 --- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild +++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.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/quota/Manifest b/sys-fs/quota/Manifest index 20a633255ca7..6c65e1e4dd36 100644 --- a/sys-fs/quota/Manifest +++ b/sys-fs/quota/Manifest @@ -4,10 +4,12 @@ AUX ldap-scripts/quota.schema 552 BLAKE2B d9becd7bd0f66ba8a603e3b442bdd36748c059 AUX ldap-scripts/setSystemQuotas.pl 3930 BLAKE2B 728956edd5f3e35939a068c92c5d94606d9b62943a6131502f235647a5251c3737a5307555dcaf98114946b8e9318a8f7c683d7bd066195d24c6542b95462fbd SHA512 8ecdd09500a849c4572411e904dc78ff967ed71f819969e0a27e697ca6607ca17906318784ccf1aca4fe066666dd2a21d800ce6f224478d0751db1a5c276a6ad AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be126ead114e0e0bc19d123c9440604b4941e6d9353e62408155180edd39076d634c5150334f3fbffb649af7dc04eeb9bef SHA512 f046c45b09b8afa88d11b4d55e35877c1c7e6c8e87f41f4c2dfcb063a2bd972cf584f88fdea2b42442cb44e460a48f3c9b12c3f5f3a99f759bbdb4ca95ab8e5b AUX quota-4.09-configure-bashism.patch 719 BLAKE2B 83dbfec4aa5e29fcbf53b3f7328bd9fa98604ee369c1bee63e0f88f7f9ebfea873843fac97f0aff27ae2c4878a81f14311b3e90baf2765e6155a1cd826baf0f9 SHA512 78e3dde6fe19254ea30e821c8f97b9b491c2244d16fa22c7cefde215c4bf8ec61ece7315b51d4fee73019959c6418c4d62861470aea0c8f97ad8c2770522f76a +AUX quota-4.09-fix-building-on-musl.patch 4380 BLAKE2B 0e56d8f1e41fe0b601e59f7ed05b387e645b3054fce93c2544f245a4f72b19f6a5c8fdabfe498c72836069b9d147e988e2811ae7050eb552f73d28112009379a SHA512 350dde28d4672ccbec4b2fb6ef68aa5c0930f6b02d6291dd933cb41b3582083e0cda1da83693d44d9133ede3a82f112642f1f0026bb1799b3697c620be258697 AUX quota-4.09-gettext-version.patch 358 BLAKE2B 2c9c6292416c17395cb8ef18db03820d05dfcfec72bde0fe1ffa0f8c78b03b89f8a6705eda938c76fa14f49584842c5d0c2ab2cf768e19e8a95efc009a4c3dc9 SHA512 6b3fe50a5bff78bebe3fb44216774dbbc1e3ebedef9cf633031b5e94efeefb9e7c95d3cb8705828a04745cbe608ec8f614720037fac33f232cd3fe376741a2d5 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954 DIST quota-4.09.tar.gz 523191 BLAKE2B 30b3828a45dcd7d99ff053f362917c138b1f0bcbde5f6fd3dfc1b48cb12615e5673d852f9276f2b370f9c799a2103e220d91ddf6a770aaaf8944cfb5c1131a74 SHA512 003d45f33543d4c87446e6547079cdae293b8dade01c58cf3626623721a1400ee07681395ad656c23a9ea2a62ab27c6ad24ad55600890e6e25334aba27ab1ad5 -EBUILD quota-4.09.ebuild 1815 BLAKE2B 7b17b601b830eb946da450d59c677a44671539b6e0d91eaf64fb80158c81ca1e94f419607a7c6b2c1449da0d232c1dfd9587244b6ca2f3a77174844342bd7a7d SHA512 0e86c4582b4c4353d89b7d1762a5d08c3b1f386aec0fa7924149d324d7896171903cec6053c7017e53c1029131be257f793d5b98aa9fd263d657d971b515538c +EBUILD quota-4.09-r1.ebuild 1869 BLAKE2B 28dfa6c45ffd31919d0ede27d2418640a95a3c6b085bd068316185478c97d1e0ec039897b463e510033e7321c5072bfb4440ad5913d0652cad9af559e6053ba5 SHA512 b9940d561434f1e816c1fed701d955a038300b13720d1c35a8c29370fed6e3efee70cd4ba6034956feed1be7b8a008f9a01c29aea2d90b0034446c036229ad54 +EBUILD quota-4.09.ebuild 1809 BLAKE2B 3b92bbc6985fc83aef9e95490f3cfaf88514df3b7b4016dfd42f5ec625af7edeecb0431d292259f3b103ad59ca8b4a37687e3435810b72233cd7674c15b442ea SHA512 6d68412c3b9a5db35e0186e52dea6c76afddb4633e9119663a0b8b14fe43b65c687255fcf01274cb0c56497804e53d9e4a5d48213b454cf6e49a66844c1301e6 MISC metadata.xml 483 BLAKE2B a66c5218d5879916eb8d1158e838644b600c79c0285236bb622d4c71d977593c4c95c2e35f52d2be34a3990a0e6ac3a9f6461c541cdf0d704c303ec242a77656 SHA512 0fe78ffe3560e8518ee02f71b7ce3b0ef4963f8d87fd16daac911e42acf269f7f652cd5efa5a498c0e50efa9854c1ba10cd79382b82972aea682510433804614 diff --git a/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch new file mode 100644 index 000000000000..5c8e0fdbb4ad --- /dev/null +++ b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch @@ -0,0 +1,187 @@ +https://sourceforge.net/p/linuxquota/code/ci/e73c5b48e12c3f02e532864a1107cdc8a4feafc3/ +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 14 Jul 2024 07:58:50 +0000 +Subject: [PATCH 1/1] Fix building on musl + +basename(3) is defined in libgen.h in MUSL. Include libgen.h where +basename(3) is used. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +Signed-off-by: Jan Kara <jack@suse.cz> +--- a/convertquota.c ++++ b/convertquota.c +@@ -14,6 +14,7 @@ + #include <fcntl.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + + #include <endian.h> + +--- a/edquota.c ++++ b/edquota.c +@@ -20,6 +20,7 @@ + #include <stdlib.h> + #include <fcntl.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "quotaops.h" +@@ -38,7 +39,7 @@ char *progname; + static int flags, quotatype; + static int fmt = -1; + static char *protoname; +-static char *dirname; ++static char *dir_name; + + static void usage(void) + { +@@ -138,7 +139,7 @@ static int parse_options(int argc, char **argv) + exit(1); + break; + case 'f': +- dirname = optarg; ++ dir_name = optarg; + break; + case 256: + flags |= FL_NUMNAMES; +@@ -176,7 +177,7 @@ static void copy_prototype(int argc, char **argv, struct quota_handle **handles) + protoprivs = getprivs(protoid, handles, 0); + while (argc-- > 0) { + id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL); +- curprivs = getprivs(id, handles, !dirname); ++ curprivs = getprivs(id, handles, !dir_name); + if (!curprivs) + die(1, _("Cannot get quota information for user %s\n"), *argv); + argv++; +@@ -223,7 +224,7 @@ int main(int argc, char **argv) + argv += ret; + + init_kernel_interface(); +- handles = create_handle_list(dirname ? 1 : 0, dirname ? &dirname : NULL, quotatype, fmt, ++ handles = create_handle_list(dir_name ? 1 : 0, dir_name ? &dir_name : NULL, quotatype, fmt, + (flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS, + (flags & FL_REMOTE) ? 0 : MS_LOCALONLY); + if (!handles[0]) { +@@ -296,7 +297,7 @@ int main(int argc, char **argv) + else { + for (; argc > 0; argc--, argv++) { + id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL); +- curprivs = getprivs(id, handles, !dirname); ++ curprivs = getprivs(id, handles, !dir_name); + if (!curprivs) + die(1, _("Cannot get quota information for user %s.\n"), *argv); + if (flags & FL_EDIT_TIMES) { +--- a/quota.c ++++ b/quota.c +@@ -20,6 +20,7 @@ + #include <unistd.h> + #include <limits.h> + #include <ctype.h> ++#include <libgen.h> + #ifdef RPC + #include <rpc/rpc.h> + #include "rquota.h" +--- a/quota_nld.c ++++ b/quota_nld.c +@@ -26,6 +26,7 @@ + #include <fcntl.h> + #include <limits.h> + #include <signal.h> ++#include <libgen.h> + #include <sys/stat.h> + #include <asm/types.h> + +--- a/quotacheck.c ++++ b/quotacheck.c +@@ -19,6 +19,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <errno.h> ++#include <libgen.h> + + #include <sys/stat.h> + #include <sys/types.h> +--- a/quotaon.c ++++ b/quotaon.c +@@ -13,6 +13,7 @@ + #include <string.h> + #include <stdlib.h> + #include <stdarg.h> ++#include <libgen.h> + + #include "quotaon.h" + #include "quota.h" +--- a/quotastats.c ++++ b/quotastats.c +@@ -24,6 +24,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +--- a/quotasync.c ++++ b/quotasync.c +@@ -7,6 +7,7 @@ + #include <string.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +--- a/repquota.c ++++ b/repquota.c +@@ -18,6 +18,7 @@ + #include <pwd.h> + #include <grp.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +--- a/rquota_svc.c ++++ b/rquota_svc.c +@@ -34,6 +34,7 @@ + #include <signal.h> + #include <errno.h> + #include <netconfig.h> ++#include <libgen.h> + #ifdef HOSTS_ACCESS + #include <tcpd.h> + #include <netdb.h> +--- a/setquota.c ++++ b/setquota.c +@@ -18,6 +18,7 @@ + #include <time.h> + #include <ctype.h> + #include <stdlib.h> ++#include <libgen.h> + + #if defined(RPC) + #include "rquota.h" +--- a/warnquota.c ++++ b/warnquota.c +@@ -31,6 +31,7 @@ + #include <time.h> + #include <getopt.h> + #include <locale.h> ++#include <libgen.h> + #ifdef HAVE_NL_LANGINFO + #include <langinfo.h> + #endif +--- a/xqmstats.c ++++ b/xqmstats.c +@@ -8,6 +8,7 @@ + #include <stdio.h> + #include <unistd.h> + #include <string.h> ++#include <libgen.h> + #include "common.h" + #include "pot.h" + +-- +2.45.2 diff --git a/sys-fs/quota/quota-4.09-r1.ebuild b/sys-fs/quota/quota-4.09-r1.ebuild new file mode 100644 index 000000000000..47c0029fea4a --- /dev/null +++ b/sys-fs/quota/quota-4.09-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Linux quota tools" +HOMEPAGE="https://sourceforge.net/projects/linuxquota/" +SRC_URI="https://downloads.sourceforge.net/linuxquota/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="ldap netlink nls rpc selinux tcpd" + +RDEPEND=" + sys-fs/e2fsprogs + ldap? ( >=net-nds/openldap-2.3.35:= ) + netlink? ( + sys-apps/dbus + dev-libs/libnl:3 + ) + rpc? ( + elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) + net-libs/libtirpc:= + net-libs/rpcsvc-proto + ) + tcpd? ( sys-apps/tcp-wrappers ) +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" +PDEPEND="rpc? ( net-nds/rpcbind )" +RDEPEND+=" selinux? ( sec-policy/selinux-quota )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.09-configure-bashism.patch + "${FILESDIR}"/${PN}-4.09-gettext-version.patch + "${FILESDIR}"/${PN}-4.09-fix-building-on-musl.patch +) + +src_prepare() { + default + + # Only needed for bashism patch and stale macros patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ext2direct + $(use_enable nls) + $(use_enable ldap ldapmail) + $(use_enable netlink) + $(use_enable rpc) + $(use_enable rpc rpcsetquota) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc doc/* README.* Changelog + + insinto /etc + insopts -m0644 + doins warnquota.conf quotatab + + newinitd "${FILESDIR}"/quota.rc7 quota + newconfd "${FILESDIR}"/quota.confd quota + + if use rpc ; then + newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad + fi + + if use ldap ; then + insinto /etc/openldap/schema + insopts -m0644 + doins "${FILESDIR}"/ldap-scripts/quota.schema + + exeinto /usr/share/quota/ldap-scripts + doexe "${FILESDIR}"/ldap-scripts/*.pl + doexe "${FILESDIR}"/ldap-scripts/edquota_editor + fi +} diff --git a/sys-fs/quota/quota-4.09.ebuild b/sys-fs/quota/quota-4.09.ebuild index bc985c48f1d8..2dc0e69a0ec8 100644 --- a/sys-fs/quota/quota-4.09.ebuild +++ b/sys-fs/quota/quota-4.09.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/quotatool/Manifest b/sys-fs/quotatool/Manifest index b4a3654dc92c..d78ba6d2482b 100644 --- a/sys-fs/quotatool/Manifest +++ b/sys-fs/quotatool/Manifest @@ -5,7 +5,9 @@ AUX quotatool-1.6.2-warnings.patch 1612 BLAKE2B 6a3f69a5b44afddc4684069f181aa065 DIST quotatool-1.6.2.tar.gz 147691 BLAKE2B 22eb1f5012b0dd19d52a795a493e7a51e9bab0d6e71b10d632a4f61faf6b54db5b0b6096fdc38b0fdd2879ebc2a4cb44e7279e735e09436a9def5018814b3478 SHA512 882bdc43e49ef69b1b2899da01faf7853524f67585b716bba195ea89a250a90a7796a225b7d141b68bf45c7524d9fe506000998e6e7dc113b559f95e6ed21e2c DIST quotatool-1.6.3.gh.tar.gz 105408 BLAKE2B aad673bab49071122c3ddb64a6f9e3006b2fa2b958e00be35decf13b4cf8fb0d6e2f06278287275a90ae04a31e48e492e2be9f7abbc8522e9c454b86aaaa5271 SHA512 d21f41bf4d45116241885b9ba249ad49cd55043773ca1b6663b0d7ad2ad531d7411bc812338973e82b50c402987bf3910edd455ab83a8fd66c2b369c22297693 DIST quotatool-1.6.4.gh.tar.gz 108459 BLAKE2B 78b547e70e94aebcd7355fb88c2d8ddbde539a9f6b8737d27947e88990808b59b8dad0f81eb4de5888a4d10127f9a87bf60dddd9fbeaf9c9acdd864b124434e3 SHA512 ba753085235909a6eb11332eb704cd8b1816f74e9552b77b1b34833432b95ff5f92881ea60c36be3dbe09e6b39446c575993cfe51263ea3b664852e3d023b70a +DIST quotatool-1.6.5.gh.tar.gz 108551 BLAKE2B 709d239b3157fd3751305b68374e4fd3ff4196aba268a8e134ef0d7794e2e3b8c9cfc81f44573fded3fac26089aa654023850b34dfa7a7801cdb9a144f19d073 SHA512 b22278445b5c2c0c71277f95a7d79862e96da4b644679efdfd99f18bc74780e88ae732f8e1dba81d50a97f132e6111b0000e34c2e1d1b1a05735654967a56268 EBUILD quotatool-1.6.2-r1.ebuild 774 BLAKE2B 492129dc61626e384a3c6ddfe8a8a9575c19b301c1cd176636b14dad461654b873b082ae7a4b5962d691a9f741899742b10a58ebd0428f0b90419b5778d48154 SHA512 45d4046fce9151538fff8eaf6323584061b710f026391342daf0e8ef208a9063667c43fcdbb66749fd02dfb99523b4f60b0dd5bbfea0d588ff2c53408a84b830 EBUILD quotatool-1.6.3.ebuild 519 BLAKE2B ae99f8f09573b265baf26893c79e8756ff0a51f22905d27a0484dc033b8dbbeda3d738b3ca6f7fdc88bcac5ad4dde21218dba9fc5959c90d40e2de4cbd02d086 SHA512 22d25a8300992002ea36c743ff81322f43c819ca95a9fbcda6030a9d10527a2066c6eee3affc6dc8f63fab245997eeb7141520d9b20af03b051a9bfccfbddb08 -EBUILD quotatool-1.6.4.ebuild 522 BLAKE2B 4de23dfdb41918603ad3092f434e02deb00de66caa55579a5dc12f0361f47ddc29ab42e448964dcbc2af493d876a6c949d5147b17bc260f641ff158093e5d113 SHA512 1681a74fa117c03d380e9acad5ffac18d825ae12b53f327847f3c1b3c26de54ae9aa18b334da07cb89d5efb8bdddd9d2145feb00f578cc6f45419b493ea7d643 +EBUILD quotatool-1.6.4.ebuild 519 BLAKE2B 1e14dbc0a01dcfcce8f9336ccfa7de80850a52e2d58620c8109ed25d906467d3680381e783f6807dded9e5ace1b38e2d424e5470bb9bd085b81cc193d5aced29 SHA512 49e074bec482802ae1f7ba3836fd62a60b44fcbaf525d7bd55a1310058d4e5b1b624495233f57f0d0b78d1202150980985b3f49958a42e52b4a500c158931eae +EBUILD quotatool-1.6.5.ebuild 612 BLAKE2B 3f3b5468331e6882ef54774229839973693a9a914168117eceffaef5da74b02fe308f9185310c5a681b640ccddf525311004f62dcdf61da0e8598e7089f0d36c SHA512 326f315600ff75238cbe035b2c2be4c53227f34c57d886eac7d5c06bd8215d30059f2be163d45e03ebe9f2ee47187984085285a3037517dc90d5d9544786bf09 MISC metadata.xml 341 BLAKE2B 1bf0dc2eaf87efd6d1d578e0c9d3a0743b8fd9b3610238386a1bdc1bf7cc040dc9f08261cb2bc3d1e006773b9c3d314406b66559aa33590c3ca416fa49572348 SHA512 77c0761e2ca47085ef0bd734d126e44b30a7fca25c636d5b3dbf7de8b4bcf686078f076cf86d1c868c2e557f372b87afbd97f4f47719b15710175fd55d7ae921 diff --git a/sys-fs/quotatool/quotatool-1.6.4.ebuild b/sys-fs/quotatool/quotatool-1.6.4.ebuild index aef0f3146b06..77e6eb008c1f 100644 --- a/sys-fs/quotatool/quotatool-1.6.4.ebuild +++ b/sys-fs/quotatool/quotatool-1.6.4.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/quotatool/quotatool-1.6.5.ebuild b/sys-fs/quotatool/quotatool-1.6.5.ebuild new file mode 100644 index 000000000000..ed451075ad74 --- /dev/null +++ b/sys-fs/quotatool/quotatool-1.6.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Command-line utility for filesystem quotas" +HOMEPAGE="https://quotatool.ekenberg.se/" +#SRC_URI="https://quotatool.ekenberg.se/${P}.tar.gz" +SRC_URI="https://github.com/ekenberg/quotatool/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" + +RDEPEND="sys-fs/quota" + +src_prepare() { + default + sed -e 's/gcc/${CC}/' -i tools/depend.sh || die # bug 931077 +} + +src_configure() { + tc-export CC + default +} diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest index ab5b8fdcbb65..6d34a7474394 100644 --- a/sys-fs/rar2fs/Manifest +++ b/sys-fs/rar2fs/Manifest @@ -1,3 +1,3 @@ DIST rar2fs-1.29.6.tar.gz 269026 BLAKE2B df2b33561898b8e23bd54481f275058442be7b8616d7107614f98e6cc478c400ad764fff35ccab29f4a907ba9ac2afbb58f3093976e5b191b1e844f28a64f6a0 SHA512 c046f51c7047c3d04c3e9d1b69c72c019c32c70f83776f8179b608e8c21a7a3edfd4229434285a4234fd65ad48ffd5cbae3b2fa2d285cecf1a84a3a30ab3c256 EBUILD rar2fs-1.29.6.ebuild 809 BLAKE2B e8d1ba9c1759fa7436957b9f3b6083e49caee764c48ba0f74956d80c34ff10142667801f107fccaf1c19c85ac2538ffdb079a18ae0c37f0e38b5130214e8822d SHA512 dacb09b6ddfd49690e83329a0d15d77c52d79004bf98745ddce1a7a14f0512d1b4700ef68fb27829b47cb037c45c59852afb26c253560dcc4e6193aa61389e90 -MISC metadata.xml 481 BLAKE2B 83faebf349535faf97078ad47e15dba37cd2be7c43c04c9f5da63a73cd49bfe5e2cbb157dc9bdc0d30f35f85774af6e58020d8b6c8f3a625afbbaef02ddb757a SHA512 8f6c9473e99ed14c479ab89bc06b5dde87b9580909f5e11fdaa70fe07ffefd1edad783f93672b3df8bbf7ee8feec48034d644cd2a1e3b6da4727e980e986ad29 +MISC metadata.xml 245 BLAKE2B 7ae3d1c0fdbe4eb3d6a61c0a7f73b2e375842a234932674e39a2898ae0eab4ddb9093e5d750cf3a22ea0611ebc6912b16b423fe5fc9c17924210975c29b6ebd7 SHA512 52c65f932ae93ebb3a9db6ab2553bc3da9b03f8ffdf18a6527506b3089fcb782c8f80049de18e4a5856905288525682348b0b13acb6b8cbfdb23de0012a63638 diff --git a/sys-fs/rar2fs/metadata.xml b/sys-fs/rar2fs/metadata.xml index 0d9bf81a3545..3c6335ede4e5 100644 --- a/sys-fs/rar2fs/metadata.xml +++ b/sys-fs/rar2fs/metadata.xml @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>fdegros@chromium.org</email> - <name>François Degros</name> - </maintainer> - - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - + <!--maintainer-needed--> <upstream> <remote-id type="github">hasse69/rar2fs</remote-id> </upstream> diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest deleted file mode 100644 index 6cbdc99641f4..000000000000 --- a/sys-fs/reiser4progs/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788 -DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27 -EBUILD reiser4progs-2.0.5.ebuild 1363 BLAKE2B 594cc7ad842e31b3154b80d13365dc24eb51c8105e06a13801c69c8abc48562f9dc3d7d4e28329ecfa17063f8f7493b99c4104e2faecc5832aa9a248a4b2b817 SHA512 71c14933342e1c9c97f8650f98249c972e24e7b7414ed8445a6ab06370c01a2d99c8168cb6f32c3d3a783f8b8db9999f113f77f365205a8aa7dfa667500fe126 -MISC metadata.xml 241 BLAKE2B 69c2c526450c3fac8db61a9c83fa92e17f984bccdba1aab9c459dbe33a73482285305799efc2a544d5abee60e89f837bc5ebe431c39fd4acf4864bd5c0803f2d SHA512 11398472089e202d23a52ed08057c7f896a18818ded02333969613b3d6733377b1b5062b690518af2924f1e9c4347522da66994f8de72f0ca9192d0f90ebda16 diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch deleted file mode 100644 index 9de53bd41203..000000000000 --- a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/504472 - -fix building w/readline-6.3 -- the old CPPFunction define has been deleted - ---- a/libmisc/ui.c -+++ b/libmisc/ui.c -@@ -256,8 +256,7 @@ static void _init(void) { - - #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H) - rl_initialize(); -- rl_attempted_completion_function = -- (CPPFunction *)misc_complete; -+ rl_attempted_completion_function = misc_complete; - #endif - - aal_exception_set_handler(misc_exception_handler); diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml deleted file mode 100644 index b350297aa2ec..000000000000 --- a/sys-fs/reiser4progs/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -<upstream> - <remote-id type="sourceforge">reiser4</remote-id> -</upstream> -</pkgmetadata> diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild deleted file mode 100644 index daa7aabd0454..000000000000 --- a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs usr-ldscript - -DESCRIPTION="reiser4progs: mkfs, fsck, etc..." -HOMEPAGE="https://sourceforge.net/projects/reiser4/" -SRC_URI="https://downloads.sourceforge.net/reiser4/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 -sparc x86" -IUSE="debug readline static static-libs" - -LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch ) - -src_prepare() { - printf '#!/bin/sh\ntrue\n' > run-ldconfig - # Delete hardcoded link/compile flags. - sed -i -r \ - -e '/CFLAGS=/s: -static":":' \ - -e '/CFLAGS/s: (-O[123s]|-g)\>::g' \ - configure || die - - default -} - -src_configure() { - local myeconfargs=( - $(use_enable static full-static) - $(use_enable static-libs static) - $(use_enable debug) - $(use_with readline) - --disable-Werror - --enable-libminimal - --sbindir=/sbin - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - gen_usr_ldscript -a reiser4{,-minimal} repair - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest index 58a5d54f6aaf..9fe4e0dd5396 100644 --- a/sys-fs/reiserfsprogs/Manifest +++ b/sys-fs/reiserfsprogs/Manifest @@ -1,5 +1,5 @@ AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8e21aecd042dc8a8ba5d3a807dc59534b9b47e727ca668741fd8a82c811a744706348c3ea88c39837af891a2c711437f5c3 SHA512 29419b64f7749612ab2883da91ac97831a2ba8aee819b6e0e8b781b34594541e59b6b7a3841e9967e4623fb9772e4be81b13970c86d61497222789ffa8b4e20e AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c -EBUILD reiserfsprogs-3.6.27-r1.ebuild 1342 BLAKE2B 305898c226e23c704fe3c97c8f4f51ac0d3d3c56dae1226e468988d0f16d7bcc51a79ab16cc3f4e53fac0feaf47123327ec528d9edba5d121f469a572bdc0b7c SHA512 4fdb88700c5201412965a2d91319f2d6efb60b97d41ddf5afb260cd1fcb27ee7d518114516b09f343ee88e21004d5728e56ffaa38ae9eff79046f906822b46dd +EBUILD reiserfsprogs-3.6.27-r1.ebuild 1336 BLAKE2B 428ed9f12976b37509978e1d29332b631b680c61fd3760b6e7f7250473982215d0ef96df46a85790d58e1d3aca628b15f6388f3ee11b66c1fbe4201057574628 SHA512 725d68d2d04cf856589552fdf1abdb1264e0be254079656a87c8b5aa744731484570784ae5a9e3e185433dac200b02c9aba00ae7f95c3a61570f595ee948a95e MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c 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/sandboxfs/Manifest b/sys-fs/sandboxfs/Manifest deleted file mode 100644 index 62d9ced99b67..000000000000 --- a/sys-fs/sandboxfs/Manifest +++ /dev/null @@ -1,69 +0,0 @@ -DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b -DIST arc-swap-0.4.6.crate 48658 BLAKE2B dfd3bc53d96ce508b4e7b500d412b106920551e2f75938c6425fb5d17dd248ba7e809c66dd6ba7158c764f0522cfb618a4d4117e9ce7b96f44eee99074edc39f SHA512 bc26f55054c4bd0a5d49a1ab3c00d84c6309604824b16b36d5323f5db06e0797ed0f1ad6fa4774472338e82a8d2f8c16d782b7ca32cf4ec6f38324998d772cbf -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST backtrace-0.3.46.crate 68107 BLAKE2B 9fbca6a008b9e27366b918e9e6ce103ace3ebeb8f94e2c73839408f16a2f079f4dc59cef56a449786f7feffa5f9284dd6125be6b27f2c197dd71c6c0e171507c SHA512 bf0e58e50a1dbb621803fafceee9a2b8c3ab8970cbdf1396b3091142474cb57be541ed94983b87f2d955480ea37a0ef29e9e4a6a0df47f5e33bf88ae88edbd4e -DIST backtrace-sys-0.1.37.crate 635202 BLAKE2B 13829d28f5b20bb35cf57f0eeef087bfc3fa475b1fec339ccc6ecee7d01cd99517d27bcafc9338044eefa051b178cc6dd582851a2a6742c66cad90e5b990fc58 SHA512 894aebe85ce49e93f389db5ba23ecc15e7c0c43d1065e9911392b844ccbe7bb42fdb08ede3b252137dee9e0555a42acd42bcc61c6845a1eb39a2f259c09ac366 -DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b -DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90 -DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 -DIST cpuprofiler-0.0.4.crate 97586 BLAKE2B a1bdbcd35a65e7f26236cf773dfbbb8cd429c4139c7cf8a9279f9529beb3eabf61e58e1f154d059f6af978062f1f36b5d7c8c756373ee1d81b1c33b122734431 SHA512 20d1cb071a54dc90863d9d93f1c3084718923a2413c111b4eb6f5738ae19e548dd24f640bd2ca3d9191a3322303e0f72b1c5af914f96d83f60612d9545719530 -DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99 -DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4 -DIST failure-0.1.7.crate 37416 BLAKE2B 0a7371a6d22b485716b21ba8c9fed5517b7c7b75c63f10a398be46be77c4284cc43d1007615d61784b477e373eb57eccb8ef93dfb5ab90d2c8a009e05b371c47 SHA512 b088365f05c32343af04a4e0cdc73ba066d7173be0b3fafdeef6185c43466c0fe018fc26165c802c25d666028f77a2b8ce26d4317d7bbb02c873165541ec1286 -DIST failure_derive-0.1.7.crate 4902 BLAKE2B bf069077cfa8de60e745b53ca83bb39de5bfd5c7d65a34a1a7894536a1605734f33e0bad5dab5cc308d0378eb71ed0b357e5e21c55c4b0ae0565f13db2080e66 SHA512 edc802cdca3814aa742de29cbde14992efe00b02f6dc27de5b51ba1c2246bc0aa5a5eb89f7f35c2c46c962eee28c1c00e7cf21909b3156d18e4348ba89c815b5 -DIST fuse-0.3.1.crate 25001 BLAKE2B a8a0b2933f31308736fc13acaefe094a1aa010feb65c9ea8c0a13374533b43e9e5fee306ee1085640c2da9df528d6c50418ae571793621ee05baa503b5afe7c5 SHA512 bffebbffd400f417911f7c7b271abf9091cfa53e0562c08dcc9b7c7132fde4be57615cd79ece1b7978382b7f62c75ac38f08a8e0e7ff513e2b1183b846c48655 -DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f -DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957 -DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2 -DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da -DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3 -DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6 -DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f -DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b -DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248 -DIST nix-0.12.1.crate 173207 BLAKE2B 23502a802d6ab83929db6cd5fdd8909ef78a3671d73265261934e05baf1e2d3c6807a4a4a0e6f7dd6dbe0ae6aead0aa679ed2e3d1a1ced0d82916f93da55a4b6 SHA512 63c3173b91e3b566f0b67c5be4ea372b8dbb924130635044a23b25a298d3b3e80e7675e234a92a685e58dd7887b88878f8981dd5079bacff61bc5e1bfe741829 -DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f -DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc -DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d -DIST proc-macro2-1.0.12.crate 35819 BLAKE2B b4207a6e1baa1a5bccbe61e898eb97f7ff874fa4db13cd4657def82d6120f65c151ffc4accc7036204dd32bbf4d065ebfc8b37675d99647b7b6782612656338d SHA512 4918cf60005aa322ad7afcdf2f6352f95414f5652a85742334bfd8f246a9f5438b5e4a1ae8d7f04fd07d2a1ac3eb18e118fc49367a91183778c74814704d5715 -DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 -DIST quote-1.0.4.crate 22965 BLAKE2B 6cb3471e1024134e70044195f1c776be1835e0a5bb17a8428d5c4aab41013ee173fb8f4b3ad22de020a30e61185e966116079b9f14db177281b0515299a09c08 SHA512 cf729bdf4eabc81d92529394c6bb9e7a3d05a449d3a306c1e536e0ec9bee789d0bf0c0d3158c58b7a995a7f3c1044cd746bac84efc087cf8fd740a98a25a97be -DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e -DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84 -DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf -DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 -DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 -DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69 -DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f -DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd -DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063 -DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703 -DIST sandboxfs-0.2.0.crate 122326 BLAKE2B 85d3b70f0b09cdebc7d9c968b1c0dcd9377b8084e55329798320c82779f6a90c21d5d8031c445f494672ee3024f0f00daa089320efd6b3124deb9e1b4aedb408 SHA512 75361bc82c44b41228633be7bf53f7e64680a7ad1982ff2faac98b5c0de973708dff40df7d2a2a00b2c7395746f025bfb79955fca59e8f81134d546d94cb831c -DIST sandboxfs-0.2.0.tar.gz 118702 BLAKE2B f9d9a37f35bb6b229f7a951dcbce23a7a2973fae862e3d3ea9d2e92176d335816a6e8298cfd781936b335c0b43b1b2980cd182b760200a688f731f00359fba83 SHA512 db9f18e687e38a0383238c4e382d2deaae83efc8f49f81a25e0f64d8c425e3ab19085b5555b1643359d192fe670a6099d5efb761e9d32544eafde3ea726bac86 -DIST serde-1.0.106.crate 73343 BLAKE2B f2d8478f457e4416971bb0daa405a3b9c9d3176c314d512ff810f61b3baf80fd0966ea14194dd093ab9bf61d1d2cc860bb8fed753e1532ca74d028734f27705f SHA512 4d60918d9ed0d4d4706b0d0a9257583aa8f150b846b0603ebfa5bf70e02b728dbe1a1ebb08220a6996f764f6461f8cbdd85f74633f2223fbcc0722f0c3175313 -DIST serde_derive-1.0.106.crate 49719 BLAKE2B ae97ada2d0f6f101fb6b901af36763fee1877a53023a21ef4d7f8deeb25d7cfdda33deca34c12735fc109640fe1ed0efba56b007b98e6b9d2c5b291af0d85e3f SHA512 7ac2a3336f1d1d3c37a345cafc66995926edbb3532784589a54b755b601b8948ffea22bf9d860a97e5c2c7a1fd6700995ccfb0ff348bdfff4e80a13daa79e03e -DIST serde_json-1.0.52.crate 73135 BLAKE2B 58d6150e0a198089e532445f5e78e16c322acd344b1e883f119ac1256490eb90da570f82b334b2e3daedcb6ef9a35fd3d057a307fdb0dde9a8400ec9db3a0bae SHA512 70bf27a8328cd57f0e995a57db97135610cd025c654555e51314309ad2f1b8968c559fa1bb5ca590df138429d0362c6a70a61e17e3aac3c4d7fd02ae4aca4558 -DIST signal-hook-0.1.14.crate 26880 BLAKE2B 833d4835c4c8698a2b3354e0f1d03df7732d220b3c8a94030f91ddfc5734d419f9554abaf3553fb2b5e1fa71d28b78c88e70357966d5c395d02c11f81d0cfb68 SHA512 873279e2d5b20f07e789520ae1b9fc8d910540fd3e85fa1ec0ffbc516c6165a72209d48a12cf7237b9806509a2477181ecec13db4d71f9d4ea648a3ef0b980d7 -DIST signal-hook-registry-1.2.0.crate 14490 BLAKE2B 52c56376f5572787d78d4691201d51d219c623d2eedf912625128d6da8fb01f6930dbecbc5e5c021de098fb0a194fd6b35a9452f92a484095e9606ce96fac135 SHA512 f4552fbeb50f66a2ee1d9826fd74a8ecb3e6d242913c20ca7099d165afb55ecd359a44427b8c3eb73bfc4e3c887d972853b49a842472389454988060dd4aaa07 -DIST syn-1.0.18.crate 198434 BLAKE2B 3fd86539b73fbc7564bfd5640ec6a2dbb4bb3156b7233919b7d20b4de0711dc32ebb9af19b3e0f9d0ddb72cb9797fefc63fc3332343c18baecc2d8ec442464fd SHA512 1169614a2d75b70ebdf455c827a9bdc4dbc18e85a1ab1b82e76e15ae1ea94b06d464390341534ca0ad03adf206e19656bfa31604d048891c4ce6c47fcb4c67a2 -DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59 -DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 -DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702 -DIST thread-scoped-1.0.2.crate 4321 BLAKE2B 5eb578dfb6c7ca839774886cacee33a790061b4c8e72bb960fa39ee53c03d2094ed12563c500e523b7fef63979da355745bc25d1aecf7b6ee28c2a13dc923771 SHA512 bc478838e9192b81e66f45024a6f80db360fc32cb508a9d6b44f77e2964789f097635fba06d13cf4353f138d38494013bfae9b0b9f51045958587bb56ec71172 -DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b -DIST threadpool-1.8.0.crate 14424 BLAKE2B f5f0c334a95fffb4540da1bf11fd03e1c68bce465d9629bfb462af41d31c147563c852ec300da74e8fdd504655e55026a7356bcf946a96f4db54d99a8413e389 SHA512 82d7e9b847103533da47695b668125b9c4133e408e4a2776a8b3f48b5c80981a185c0ad2ab8a53e97192b4c094702fd9face0c84f39c53af30124801f384817a -DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25 -DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 -DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 -DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a -DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf -DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 -DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47 -DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 -DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd -DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab -EBUILD sandboxfs-0.2.0.ebuild 1946 BLAKE2B eec3de1a2edfe9159deb7425a343048b66b4a5c60e9614d58071eca3f54c2691ad511f85b40361c83bd1dd413ed94ae9f5ddbf7968ae41a92c85e6b860fb68e2 SHA512 2568f1cf556c9a0e11d47dd7b20143107ab0e76b0cad5fdebe9ed13d1ef99f46e2a1814a5d1845cacb249eb81fa0ac17e30ff86cd36a45c457334268cde1077c -MISC metadata.xml 793 BLAKE2B d9d8f643784d7d42ff317dcff01be37dea2deb59ce12b165098fc1dd9c230a5472b601b1869bf87edf5d0013b9065a53e81e5d70cc2289ea538547ee80485d57 SHA512 5f09aa152b950322663abf38ca4ceda7b5644d84450ab32f9020d59cc311e16bb10c243b69c8c839f787f57107385a555ae678c69bb2c18e5bdd9c60dfab9a40 diff --git a/sys-fs/sandboxfs/metadata.xml b/sys-fs/sandboxfs/metadata.xml deleted file mode 100644 index d70761354a91..000000000000 --- a/sys-fs/sandboxfs/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">bazelbuild/sandboxfs</remote-id> - </upstream> - <longdescription> - sandboxfs is a FUSE file system that exposes a combination of multiple files and directories from - the host's file system in the form of a virtual tree with an arbitrary layout. - You can think of a sandbox as an arbitrary view into the host's file system with different access privileges per directory. - - sandboxfs is designed to allow running commands with limited access to the file system by using the virtual tree - as their new root, and to do so consistently across a variety of platforms. - </longdescription> -</pkgmetadata> diff --git a/sys-fs/sandboxfs/sandboxfs-0.2.0.ebuild b/sys-fs/sandboxfs/sandboxfs-0.2.0.ebuild deleted file mode 100644 index 4f84031cfe03..000000000000 --- a/sys-fs/sandboxfs/sandboxfs-0.2.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -aho-corasick-0.7.10 -arc-swap-0.4.6 -atty-0.2.14 -backtrace-0.3.46 -backtrace-sys-0.1.37 -bitflags-1.2.1 -cc-1.0.52 -cfg-if-0.1.10 -cpuprofiler-0.0.4 -env_logger-0.5.13 -error-chain-0.12.2 -failure-0.1.7 -failure_derive-0.1.7 -fuse-0.3.1 -getopts-0.2.21 -getrandom-0.1.14 -hermit-abi-0.1.12 -humantime-1.3.0 -itoa-0.4.5 -lazy_static-1.4.0 -libc-0.2.69 -log-0.3.9 -log-0.4.8 -memchr-2.3.3 -nix-0.12.1 -num_cpus-1.13.0 -pkg-config-0.3.17 -ppv-lite86-0.2.6 -proc-macro2-1.0.12 -quick-error-1.2.3 -quote-1.0.4 -rand-0.7.3 -rand_chacha-0.2.2 -rand_core-0.5.1 -rand_hc-0.2.0 -redox_syscall-0.1.56 -regex-1.3.7 -regex-syntax-0.6.17 -remove_dir_all-0.5.2 -rustc-demangle-0.1.16 -ryu-1.0.4 -sandboxfs-0.2.0 -serde-1.0.106 -serde_derive-1.0.106 -serde_json-1.0.52 -signal-hook-0.1.14 -signal-hook-registry-1.2.0 -syn-1.0.18 -synstructure-0.12.3 -tempfile-3.1.0 -termcolor-1.1.0 -thread-scoped-1.0.2 -thread_local-1.0.1 -threadpool-1.8.0 -time-0.1.43 -unicode-width-0.1.7 -unicode-xid-0.2.0 -users-0.9.1 -version_check-0.9.1 -void-1.0.2 -wasi-0.9.0+wasi-snapshot-preview1 -winapi-0.3.8 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -xattr-0.2.2 -" - -inherit cargo - -DESCRIPTION="A virtual file system for sandboxing" -HOMEPAGE="https://github.com/bazelbuild/sandboxfs" -SRC_URI="https://github.com/bazelbuild/sandboxfs/archive/${P}.tar.gz - $(cargo_crate_uris ${CRATES})" - -LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="profile" - -DEPEND=" - sys-fs/fuse:0 - profile? ( dev-util/google-perftools ) -" - -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -QA_FLAGS_IGNORED="/usr/bin/sandboxfs" - -S="${WORKDIR}/${PN}-${P}" - -src_configure() { - local myfeatures=( $(usex profile profiling '') ) - cargo_src_configure -} - -src_install() { - mv man _man || die - cargo_src_install - doman _man/"${PN}.1" - einstalldocs -} diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest index f2015e130840..b86149ba5ec3 100644 --- a/sys-fs/simple-mtpfs/Manifest +++ b/sys-fs/simple-mtpfs/Manifest @@ -1,3 +1,4 @@ DIST simple-mtpfs-0.4.0.tar.gz 36234 BLAKE2B ec5739625286b63dc6285fb83a4c71f5ed9bb8ed757eab111e543e15efbc45a5fc3a2609382f01cf18d4c6160258800963c349b6d64b2648257cde99f9359432 SHA512 6f213f9df792f33cd3842357aecf444cdc8030c89e4abc19b56a2c60f58213b5545b3d7857b0d46cdd237d0c24d5d6eb3cbe59ba9fc3c32f91396c5724ac86d7 +EBUILD simple-mtpfs-0.4.0-r1.ebuild 616 BLAKE2B a6aa11f22724e0e97c38c990f54aef2426dd8b00662c6dbd2c73f5e61a8a4e8fa220cb321c58f35118a5c30cd18ad52f96e7033d0871d29388ea2800e0e80f93 SHA512 4da9cebe68f168573f6babaf2fde6d18cd1e09f90bdb3051251586ec0c41d5350d533dc6d2de31450778bed001d7613ce943fac332ef1e2abf379576ba13663e EBUILD simple-mtpfs-0.4.0.ebuild 613 BLAKE2B af4bbc6c6a3297bab7a5885bbb6a58f1de6e84afff9110d27d7c419140ae71e6e984fa314d4f6971a0fcab98fd5bc4f75980a67a81831a9f8efe2036d2cdfe65 SHA512 750ec138321bb2de7400e710334c63d074e596ee86365dd71c2590941766ef013c0e0dab0f27afd9905bff189eeddf0ba0347ea363ceeb42db169eecf1288fbe MISC metadata.xml 882 BLAKE2B 0e3e9fe17ed59c0aa1158e3cead024273d280a56a05b00268f2f981bc9cf96181b3296fe8b4ba85cf7f022c3d20773bc2f7d05695b06e1708eeba153da65c672 SHA512 9460fef344fdae709e10fb2d2164656d4ab9244d5881c75e23ff05f00cfc662c096679ddda841e2a0cf800fb6c36eb6eabe0c168a72a5db3e3f9e1166893b750 diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild new file mode 100644 index 000000000000..d915d61c898d --- /dev/null +++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Simple MTP fuse filesystem driver" +HOMEPAGE="https://github.com/phatina/simple-mtpfs" +SRC_URI="https://github.com/phatina/simple-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libmtp + sys-fs/fuse:0" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +src_prepare() { + default + + # The tarball doesn't contain ./configure, only configure.ac and + # autogen.sh. + eautoreconf +} diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest index a29c08f1c71d..2d17af93c51e 100644 --- a/sys-fs/snapraid/Manifest +++ b/sys-fs/snapraid/Manifest @@ -1,5 +1,5 @@ -DIST snapraid-11.6.tar.gz 744142 BLAKE2B 300350e355298e972b0f2c83cc0cfdc212c01d67206b752a69a715e48e429a8fc8dc779820cca761ce4ff2bf29c61a2ab280b5b929de2b64c2ef84b82d65a67e SHA512 abe606c09ff933166cf386270d638a3da5a7edff914a486cfa97bdfe878d152a636d271968b92d14ad3eca873bca68dbcad63565067b0b4e887a1176afb14525 DIST snapraid-12.2.tar.gz 745755 BLAKE2B dde099a18eddc5dcec178b46c41e8ef828ad214667c0414891dc9ebdb509567233170df2a6483284e0b44f8b8e71ef6ca8a35f845b501b8d8cf4dff97d080bb6 SHA512 2c19c0e336e6e42c8b44bd3f3ccfdc4dfae901f166b0825deb471919dc22f98e92a6d64557b6fed3648b332d4432735db7998656d60bf173925a91c90b099bad -EBUILD snapraid-11.6.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338 +DIST snapraid-12.3.tar.gz 746308 BLAKE2B b654861bd9d0b632af3c942e8b4403240c6e229df69bfe330add2f1250999d8f0ec3bae29a96d98b53f77f680108d4cff703131bd6e751d9ce24b9dfd52e9b99 SHA512 c1e364326354940abdb27c7d7528f8d2d324bfc926d134be5a7046b1e3ada7703c7c9e3bec3ba4120dcd717e6cb325f2cce4d9387576add4781f6122537a7f1b EBUILD snapraid-12.2.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338 +EBUILD snapraid-12.3.ebuild 518 BLAKE2B 71ce817b86022ad2d756c51f72437f3d6bc8e8a679cf3db5a62a461212da3e17106872dcd8c060bf4c2b81648b366a153698610eba83a11eb87bc3201f12f953 SHA512 b688079f923dfdb79ae6467eef46c7d09f681a7ed5c648a24dcfc523efd7834f67143b91d56f07601e25799eba3973ea6851c354ca474b8b55258251f9472dee MISC metadata.xml 304 BLAKE2B 7b9b89803c220914245900818045d963814287804bd8308ffd3743f4073152d595c64201115d35e688f0b91fd6ee82f606e55a28c0a04f7ecfc832a95e7d26b3 SHA512 2271ece2afc03e1f7b9e9bba98ef35f406bf446617a0d1a3a42b20d0bb13a8a133ae8068e472c302674d024ff8118c26b3fae4fc2d37e65ec8c45b8a6618790d 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 0f1784761869..de2d7bc19ce0 100644 --- a/sys-fs/squashfs-tools-ng/Manifest +++ b/sys-fs/squashfs-tools-ng/Manifest @@ -1,6 +1,6 @@ -DIST squashfs-tools-ng-1.3.0.tar.xz 585800 BLAKE2B 658ff825b2cda63116c29d8c582f54df5bd511a6da98e737527d54720ed95a541edc39b94f61195f4c99d125cbcc8db824ea9d1e2a7a7a557fb647f5e795d623 SHA512 10ddff837464227d97c3c2dabeefa408a63fbab4ddc8ca184f4ecce7288ac47c0c6baf6d10146f7e29e4a845592720e39281f779420f5ba0b1e7736c0dea73d7 DIST squashfs-tools-ng-1.3.1.tar.xz 585916 BLAKE2B 697131ddb9959bed388534f90c93e2e7495ef5aec9facf97e7d17475cff64d7a4badb709a16ae5e6da3ee89b1a1e3a49833bd15b9a0b4b364e15a565bd18e480 SHA512 0a433f7c3633cd5d8646d990744e31ed59c7012d5f8bb4fdb7892b892631f22a8fd0969f7d81de68f53e44670e71cb8e29729cd925a93b98ab3b6942bbc30662 -EBUILD squashfs-tools-ng-1.3.0.ebuild 1209 BLAKE2B 0393b697b8f0e0ae0be5acc95eb55c7e5389a00d88acd5e7da975a456b9803b1ba2a6e124516e1dbe2f67b75f8cd78c4a08d12e0bd973bcb0fe190b1bcbe21db SHA512 ede357152b74cad9d8b680b4cd83b7e46320381df904988e24b0dbf6e8c1b460590a2e24599bdfa9165b67e4569f8ba34de7adc21aacbffb139352b4febe501b -EBUILD squashfs-tools-ng-1.3.1.ebuild 1210 BLAKE2B c5e8c28d5a83df822396afa52753d405489bfd69cadd05b888b6ff8d80a11aff1dceda98e592023508daceee35de923e73d48ed83e1bc7974a49662e51be30f1 SHA512 c4531ca1f027a2fa4a442722bc6a5de3649b64d0ab6973ba29b0e6311eb3c19042f89688de04a33edc319f4b78ba326ec0d9c0ce4f2f7717141276073f8cab5b -EBUILD squashfs-tools-ng-9999.ebuild 1210 BLAKE2B c5e8c28d5a83df822396afa52753d405489bfd69cadd05b888b6ff8d80a11aff1dceda98e592023508daceee35de923e73d48ed83e1bc7974a49662e51be30f1 SHA512 c4531ca1f027a2fa4a442722bc6a5de3649b64d0ab6973ba29b0e6311eb3c19042f89688de04a33edc319f4b78ba326ec0d9c0ce4f2f7717141276073f8cab5b +DIST squashfs-tools-ng-1.3.2.tar.xz 585380 BLAKE2B 43e8e7c189a9e3a23964a9ae17666eba7ff362d7ed011ee09e342d9ef777de2ce8e326cd38fa0932ace33929cf75bab81786ca56411053c08041300459262076 SHA512 6f14d90875ef3f3d36d3cd38932ade6b0da7284922c914bd655e3f0a4abb17ba75d4bc052a1d4244c1b4ff96b3798d83d5a7b3263b8e1b96c112f4cdf967400f +EBUILD squashfs-tools-ng-1.3.1.ebuild 1202 BLAKE2B 165800a2c038c2db19d92b223632838b760253c0007f307b3a7ed6022719369c0bb0ecf7619e77ccab20f168e7a33a2a2b93f3679d91a58aedac86ee28b4fec7 SHA512 822bc8b4b244574035669e6f3c11d18887ad5defca3842ca8ca29073899000caec607dc443b68d644cf6e350d7c85fcfdd418bec3a9ea34d8405443524c4754e +EBUILD squashfs-tools-ng-1.3.2.ebuild 1204 BLAKE2B b8b54ade8c7e6992480634256f78e71bb76effa373d02f608ad1725047013d099d38e1460a41b3d77ad8e10844c8066c5fa02890c44b71b59145d6ab600f2828 SHA512 89b3ef25cdce77a9a503f7c7e6194b6b111765c3f3ac0c6453c6803a15f16b27b0aaf6f4c426f4c36ae71dd698ae464377e71b94702bd0c00a29d73522c6875b +EBUILD squashfs-tools-ng-9999.ebuild 1204 BLAKE2B b8b54ade8c7e6992480634256f78e71bb76effa373d02f608ad1725047013d099d38e1460a41b3d77ad8e10844c8066c5fa02890c44b71b59145d6ab600f2828 SHA512 89b3ef25cdce77a9a503f7c7e6194b6b111765c3f3ac0c6453c6803a15f16b27b0aaf6f4c426f4c36ae71dd698ae464377e71b94702bd0c00a29d73522c6875b MISC metadata.xml 453 BLAKE2B 4bfc83a611fe2b8da5ce57e56c438c671489d0944cbb4b3f82113bac6bee89028091551c1c96953f166959b087d7e776b28ecb6b9290489f007ea5ca33090ebf SHA512 013b8d87af8c6298eaba48b4aa4282a8781321b0a15d1a8745361e389bb6c5ae6957b24af4bb6b88125cff5f9824b0e878051bd395fdeb98c2ae0ef7f2b370a7 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 f936c78e267e..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.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.2.ebuild index a4168be5e3b8..e768bb9ae947 100644 --- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild +++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.2.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-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/Manifest b/sys-fs/squashfs-tools/Manifest index 33af0c5e4928..4da53bfb620b 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,7 +1,7 @@ DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896 DIST squashfs-tools-4.6.1.tar.gz 286848 BLAKE2B 05e38681de219413573e8b1a7f36d2f7e87734f68a929ecdeb5ae6017076fbfd67b897448980e047689ef4b154d2dcd1a90162367a6a5babab45f1ef36f09325 SHA512 10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb DIST squashfs-tools-4.6.tar.gz 286409 BLAKE2B 1c04a8f6149863667151e76b3c1ecfdd5e9a181b305bea694af1d4968ac361114c9e926b351dcee2647796a21bc8cfc55b3d95f020ad88c3388007460de26053 SHA512 3a9effb9a5cf46fbb9f393e58bd938874dc4121828b77c67d659117ee84643917998a8503d629f46f1eff1826f6d7ae59ac2d803a5cdc3cfb1006ef2b3abf8c8 -EBUILD squashfs-tools-4.5.1-r1.ebuild 1361 BLAKE2B 0845f4a351fee8f6fd2982b345c9b04112720a2e00230ed5962a2e72ccab87a9c05f8505efb44f15ccbc5c2fddab46732ae2840052b6cdca9375b4a7f5bdd674 SHA512 210e4d6bcc71c16e6cd76a877869bd911ef5ecc792c8c9db7a259d8bb681c7f3441ced29725774b1b81efef1d1f358445941c6b0d732c91a72d66090e8567e20 -EBUILD squashfs-tools-4.6.1.ebuild 1291 BLAKE2B 3965cd7fa49b2a29c63dfad7fb69bcf2ae3f06da7a785e87967cdaf3845f6707b3448c8cd262897317e14d40992cdbab6dd797840dd86e1fbdf82bda3c20cc95 SHA512 4e13cb802e434b72ac4db15e7260707015b81f33670bd86e9ad52bfea0c5c3e3c64d226b6a7942edf4ec05c87cfec09d90fa84e32ee9ce48cba7f8ef67dd772e -EBUILD squashfs-tools-4.6.ebuild 1298 BLAKE2B 1095d80ba3e79f4b1c79548f7d9dd77ee46421dcfd1697d489d279d346562fc793a4faeebb695d1d1a0f5268280f8d081ce0d4b89a99d7002ba068af955d31b0 SHA512 e156b30e59f180378287d79b544421cb7e3065bd5775c23701aef0bcc0daa10377e5b57c6cc49e65d2d01ef393f985f5f87925c0854978905337cd1019e01fd6 +EBUILD squashfs-tools-4.5.1-r1.ebuild 1355 BLAKE2B 2ae8e3f36932ce5d402436112a6dc853dfc74a873ed1a7f2c54ab5b9ef585db38b6503f77c5f1dbef339d35b7a831bda3b79031db34faccbd01c8c39a3e44243 SHA512 c66af314400b4c58ad5ba47a50069dcbf7ede9a7a704b0a4534cf1222e27ab5de4f4cd086f8c05bd39a0fe2fde21a3fdaf3ca813198b6002d54e855c5482c819 +EBUILD squashfs-tools-4.6.1.ebuild 1285 BLAKE2B 46fbbb01e0565f8353053f8cefe50120a358ee04695ae9e0bba8f0edbfb8a7f38403346337378b1b64ab999379378742c38899a66d095f7988a2b03e2e2da01a SHA512 2c8313562c6120c399e656018811500dfd4463a5f8edc391f25dd151f45f774ad03da2259db0d8b487d37c6980f3a528358eecdff8ba662f460b2da361bbdbe4 +EBUILD squashfs-tools-4.6.ebuild 1292 BLAKE2B b69fb5b677d8c5612ec11c5d3d041fd205fe23900357ca93c4aa6b3f2f2c4f7c97c676300c3856dc24d6aafca0a76e030145a4acafc75926f582dacd45eb7384 SHA512 0a59ce3e00a8b3202a16ea558e956f3068fda553c01061e04da498fdb1d36b1723d74327b3564587b96b39d32a4fe4223cc9aa7b69265a099e0687d2ce10dfb6 MISC metadata.xml 470 BLAKE2B ea3c5a4885d847583383f4115dc33c5b75a7c239f989db1153bf32b1ecf144c34c3b8dbf8c58f53cd9bf8ca482870a12b3aab9e5490b97168a10f53d3cc4c3d8 SHA512 2312b79e19f28efb6298175024c3f787cfba83779fe67882cc467dec7d9f1df79639a45273780446915267c94d8b93aaadd727a8189dfb930005da4e3ca77e7f 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 459cfb762603..d1cefe1b3050 100644 --- a/sys-fs/squashfuse/Manifest +++ b/sys-fs/squashfuse/Manifest @@ -1,5 +1,5 @@ -DIST squashfuse-0.1.103.tar.gz 399524 BLAKE2B 985ce64052c55a03d4889674682cf8b3bf6fab96de18d38b5b6125a6b2bdf0ec40e9f18a13bb77ea1a963fd0e7debf08d5f4819c543a62a818389b5fa7884815 SHA512 bc640898a5756ceed3260d9dea61dcb54588381b787a50c0fbfce35658fdf7d2788babf4882c369d1981ff853a91f043de8c68727aedc33646c26db4fb0ab2c0 DIST squashfuse-0.1.105.tar.gz 65644 BLAKE2B 209808164a2803d1f4dedad048f29a809d92e5260193ff2db6a4eed4d887273f6b0b2a673123b9c460e587b9f9884c4115e2323f8de7f26535abcfe4de99ea20 SHA512 6bf18575fd4732f3b0e4530902f2556859c2efbbd781a31bdbf97fe6601412dc750a80354a8ab08a3132d4f8680ea5ff0dd04440f29243906f1017aa6c70bede -EBUILD squashfuse-0.1.103.ebuild 1179 BLAKE2B e5a24855ecf274a960377b603e1e5d83d6b6c725bb77a2e03aed3191a8f75cd87d40a0fd08295c0e9bcc2d0aa1d06aa19088b11f8abe292bf31087e200265cbb SHA512 c9477b02ef4582b431c850da4914c8e3d089ec939836c675fb7a6b29aa16766d9c1bdf04c6fa5100ea5cbc7f3b695480a2fe92fefaca63b15fae093ffbb29a14 +DIST squashfuse-0.5.2.tar.gz 75404 BLAKE2B bb0005395ad993932d27eccbf0aa57d587af19054e16cb2cb4cce13f9d97be011b70c3cffa5b21c4fbef294686b64dfa45e941e8a0fa10a6bea1e9264abf6b8b SHA512 4380d73afa47105e2188a4eebc6b54c5961a2ba38e5986865b7fd762ed0aea7d24b0d9f5b674abd9c29f73a336bd69142db7869a548560723f60559859cdd7f3 EBUILD squashfuse-0.1.105.ebuild 1262 BLAKE2B 2da5d5550eb07bed068e308692badb4c8971fd11cb5789acfb7466a97dbb933988a9a41ac97717312f8addad94ea9fd2bf4f164215107244cd8a3287942f099a SHA512 08617ac90ec1f11502840184e44efcbe5271bf1af9339e08625cccc2fd18c8244ec57b2880fd6dd051fcd2d768b4505d5a9f4c9da4a3f3664d5a5990d87df9e4 +EBUILD squashfuse-0.5.2.ebuild 1267 BLAKE2B 5dc854ffe2a1db07bf38b05b5539ac68c171ea5432e3b6a81fea7ec6c4d0fed14bf97f0db7ac5e62ea9c6221dc41fd01bfdd9d5811eb8a34df2be5c80cc30ef3 SHA512 4e7dc86e33178a69ba4a8fa707f21125d02266cf681a9ce927fc7808f76497a3df6f79ee59491355741b3bd137577a7ba66570872867dcac92b2c4c6c91520e5 MISC metadata.xml 513 BLAKE2B 0347d4259cc2e4fb927e569ed6ab9c656ded56368b5fe9efba757aba8bedb8ca6da50a6486023c92aedf6de669d73e6be46e9d92a1723b484f815f908d5c2771 SHA512 2b897a8696706e91dc149011274f0b4512f2adc37bfa774ab5bae6991bf8a8a4055e8aa5f9d5291076ead46f607b03adeb724e0380ffe3d863d6943d60179763 diff --git a/sys-fs/squashfuse/squashfuse-0.1.103.ebuild b/sys-fs/squashfuse/squashfuse-0.5.2.ebuild index 05f7adf773dd..5f803e6982ab 100644 --- a/sys-fs/squashfuse/squashfuse-0.1.103.ebuild +++ b/sys-fs/squashfuse/squashfuse-0.5.2.ebuild @@ -1,20 +1,22 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic +EAPI=8 + +inherit autotools flag-o-matic DESCRIPTION="FUSE filesystem to mount squashfs archives" HOMEPAGE="https://github.com/vasi/squashfuse" -SRC_URI="https://github.com/vasi/squashfuse/releases/download/${PV}/${P}.tar.gz" +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" +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. -COMMON_DEPEND=" +DEPEND=" >=sys-fs/fuse-2.8.6:0= lzma? ( >=app-arch/xz-utils-5.0.4:= ) zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) @@ -22,9 +24,13 @@ COMMON_DEPEND=" lz4? ( >=app-arch/lz4-0_p106:= ) zstd? ( app-arch/zstd:= ) " -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND}" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} src_configure() { filter-lto @@ -44,5 +50,5 @@ src_configure() { src_install() { default - find "${ED}" -name "*.la" -delete || die + find "${ED}" -name "*.la" -type f -delete || die } diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest index 353297481a63..376a469d64ff 100644 --- a/sys-fs/static-dev/Manifest +++ b/sys-fs/static-dev/Manifest @@ -1,3 +1,3 @@ -EBUILD static-dev-0.1-r2.ebuild 1105 BLAKE2B 9e650825bfb3cbf7758ece6ab9422c7c3bad3755bc19500499ac07ae65f604185b2c18e54ced1dba36e4c795eb6dede328e1db7735d2b229aa37463eb1ec8a32 SHA512 a023956ddfdd4fd9d90f9e8d6ffd17dd7f58be8d575e71f7ba6a530aa4e7402c0c4d6af0bb04936b7b5e651202c3ff838ce417ff76f6f01fb73118806b747282 -EBUILD static-dev-0.1-r3.ebuild 1105 BLAKE2B 3d2cb0bb36958c0e7d1e73c0ec6e4592898aaa1e87dc2d4338d2f4c8d8a2fd5b40a6a12ae687f94e3b350312949aa9a98008e4b61292c1d7900aa486eb80e97a SHA512 675913bf6f0c3aa5a9bcda0b057b94a045630f21fe857a8198d7288034f01936eb33c1bbf8c46e59cbcfd3d79c6d65e5f32ae0b2450ee9fc51f241f7f24db336 +EBUILD static-dev-0.1-r2.ebuild 1099 BLAKE2B bc2d931cb4593cd43b6b4c19423e5cd5053bca49c5cbd6029bda143db5b48df12287beacee03683b86a2326d54e39b6173167e252b51a8a731d2e3f55193b212 SHA512 120df9ff41d2334a5748919b5813125a6a78b1b3c6457c307a847ff206252a0cb01fe188aab9292804d0fc8d361acb013f3d61c2cd1e7732bbcc0706c112c600 +EBUILD static-dev-0.1-r3.ebuild 1099 BLAKE2B 4d84c304345cedabc35820e9c98531321b4d65a039665fc53865f4cb7f3cdd2cbe0874cafbfbe2ba6fd44f2a618a0b633ec5a3187ac76f9a4508c34071c1cfdc SHA512 b5629cc4afddf793b306eda38d2e3af878fd1145c9115e3f84054b96c821ad411ca90ae724ff38e9ba4ed977b314cb0709905f490f9d864a83877dc92f81b474 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c 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/Manifest b/sys-fs/sysfsutils/Manifest index 70f7f773547b..65e47afa91cd 100644 --- a/sys-fs/sysfsutils/Manifest +++ b/sys-fs/sysfsutils/Manifest @@ -1,3 +1,3 @@ DIST sysfsutils-2.1.1.tar.gz 78823 BLAKE2B 2249a9b7b95bd63be14d60fc3f38d569ee40624885d04391e1fd1d3927abc0695977f456d76214efacaa5149fd860ae1bf4ed0de8d33ea2aa047b446904195bd SHA512 7e1c8535be3c29dec8e23e8b6e8d3ec794bbdc696f161fa38731844c82cc1d37ff04f94c8b0ec0cf8da7147fc696dad0086262641984fa67378ffd2f162dc358 -EBUILD sysfsutils-2.1.1.ebuild 870 BLAKE2B 8f9cb43706aa05db871633b0ec19e37edbac5eea6aef6574d4f43c8af1ea73d9a19c00db4c74465677c309ef0a0eb9d9891c0889d7957396b4148e364766a860 SHA512 e20b1e27ba72275ce16bf85859036a217daf6f290b8340f5f10915974332313afd22b4937f3e0f7af63ebc0c3f8d5dd614cc537a205e2b8c13cce03365d7d010 +EBUILD sysfsutils-2.1.1.ebuild 864 BLAKE2B f95951ab1f722cd9d8ce6a0d76a05a19dd1be11674acdbd3a0401dea5d6f61bf69ce5f1a9c16dad355d72f3091f6050f5e844f91383a70ca097a7561ca703a81 SHA512 de3725374847d0d4688ddba199e091d3e7ad95c1ca74e6fbeaf08b9eec1dccef1f17afa1eff3d5d987763e4d3f128e74423ba8244990edd0f5916bc8a1d26c46 MISC metadata.xml 390 BLAKE2B a5f379bd985452eeb7b480d3af1efc30ea29e897cb208dbbcad57c24466c2430446d0706b77c1db37353dfab3806e2f12b926867475cd3f0bc9d834bdd14ce6e SHA512 a7c111d6e2fef4b2f09bef40722498fad4208e9677673abf58cfd32c23290ebc7a6b1d0e0461dda7f8accbf3f9664df357d8d384ba35c86c2d941a3bbca58141 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/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest index b190419e259d..c628e347b4a1 100644 --- a/sys-fs/ubi_reader/Manifest +++ b/sys-fs/ubi_reader/Manifest @@ -1,3 +1,3 @@ DIST ubi_reader-0.8.5.tar.gz 43237 BLAKE2B c55bc689af0a32a0e65aa6f860617131654d11ad5e6f7f1e37b4e048718c061f352965f9793595dc16162df0c08ce32d4db2d6bfaee9366110028f7fe61a5c98 SHA512 14e02c8b8c5fe0fe6316f0dabea21dbb6ef6a865ef2b176fc6e26f36bd54a981cb89fccee2ac476b042909cdd5946b1325f792ac159d7e6bd2c5a6f7f4b14062 -EBUILD ubi_reader-0.8.5-r1.ebuild 590 BLAKE2B 456601ac88a37cd3295de368bf839f4271064648904ef58fd36d2436b0950e0e1279386d90c173ed54a10332b45cab25c3ed85919d7cbd6652d10b04f2352208 SHA512 093e24056c8d9bfd26b9e1158775b85dfb2ec7d187c13d989e74828b3b9513fbede353501b3dfd3686179a5a14339ed07426367140db04745120cdac5ba53148 -MISC metadata.xml 418 BLAKE2B 42a180fe245386ada906cab96f96962dc2f26517eee70a3f6bd0cfa5fba8cd382dd12c3624ae5bd7a949d030a935467d37a164db4d69dffbff87a4aa2b3521cf SHA512 cf62a833bb427fb8435ca5a02d41f9766d8a482da4a9338cd171a302d5181f452ed23d37039364a4d61c0c57c9f1c9c62df09c519094807efa14ac8b10eb6d03 +EBUILD ubi_reader-0.8.5-r1.ebuild 591 BLAKE2B bc7c450cc7750031ddbef6cdfb4ded92c5f2a8f687bfbcb4cef32bec6c76b33ceb1616d15482b615d1dad962a1d2c00494561b20169439bbe9a49951ef39372f SHA512 6004d4b0977ef62f15951ef7a48efcf87ccc6771abdf63ab31f51e610a8bbe31a3e48192fbe3782d778c74f744a4a141556ded821fe481b3060e77ae87b40822 +MISC metadata.xml 333 BLAKE2B a4adf1ba56af470a304ddd6721e7c3468f789cf231930dc19f961d028f048530c63b82046c34f295c820f6a0f34abb77f0d21a7c0608a15b409b3cfc12a1ef72 SHA512 ca998b9ec98ec5d05ad4fa7fd3ad1041073b0e00f1da0e88c6d3c5d9de09f678a8dd4eefda5d90ed7df8af639d41ec7c2bb5040e4296296a307b9cca081c3a10 diff --git a/sys-fs/ubi_reader/metadata.xml b/sys-fs/ubi_reader/metadata.xml index 8c2cd705bbe0..aa8464b07989 100644 --- a/sys-fs/ubi_reader/metadata.xml +++ b/sys-fs/ubi_reader/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> + <!-- maintainer-needed --> <stabilize-allarches/> <upstream> <remote-id type="github">jrspruitt/ubi_reader</remote-id> diff --git a/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild index ea7eb78871bb..f1dda6d4ddcf 100644 --- a/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild +++ b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 MY_PN="${PN/_/-}" diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest index 0dac298e14fe..1feb57012280 100644 --- a/sys-fs/udev-init-scripts/Manifest +++ b/sys-fs/udev-init-scripts/Manifest @@ -1,4 +1,4 @@ DIST udev-init-scripts-35.tar.gz 3666 BLAKE2B fddae466428605ea930519e8a47e0ea91f89f9eacc1fd97c137d175142125b12c3d045aec68db35a463de444ac6d8c037cca55f9628f10576c968259d566a9e4 SHA512 da9d2093149967e2e1b9bc7190ddfd55a87c9ae2177e3216f7cb2694fc9b64037eb6f2599ad8a4b7594ef32ced88fbb319c92904bc72a81ea5404945f8a8378a -EBUILD udev-init-scripts-35.ebuild 1508 BLAKE2B de078bd095235a0cdc0158bde166ce2d626ec8263dbba7e5ef34d766d4bcbcdbd1a8f2679c7f4bb9e1123d10a340a164f19f92833d8658048459ef9b545848d7 SHA512 2e99ef27a93607521bc37ee2eb4ba89fb0fdc3ae69064f79abceb6cf6cb34088692243769a55aecf84d5a8793ee847c5c30564ed6e781bfa5aaa36ad5fc8b090 -EBUILD udev-init-scripts-9999.ebuild 1509 BLAKE2B be8bda34c2d2a5b5c4d8eb03492e46799ee615535fa0587ef566d74e352472738a51dd13edf176708f817ed3ee1035b3afbc904c4707c64e77e172b0a3f742c5 SHA512 1129416686d69c0cf4fe9172ff4fd369444c86ec83718d94e222fb24a782161888c91218a2b68c80d317115055724f060a88458f99576b70e2356eaa6268aad1 +EBUILD udev-init-scripts-35.ebuild 1502 BLAKE2B 08e03cf070a3d514c7c1377a796575226c567b78f64e35d26ad1770d18ad3eab6aa9978bc8cf0aa1f2336598c4205a71b36d889efce500f38182fc02ea9dc0dc SHA512 b5c99c91448139689f63b5ab099bcc0feaf99c1536b1c418b3336bd83846cd621dba4b3bfcd8159bcee1e3a21dd4acc937b3de81d2c09ab36bad914243c6b831 +EBUILD udev-init-scripts-9999.ebuild 1503 BLAKE2B cf0b5ff9b4313c9ad8ffc7928b1af33d50d191879ff860b645266515344a99f40e9d77c8c5b0d22262435b3ad3cee21ffe6ad607ed96828e179facacb1fab7d6 SHA512 030b8a7872d2e387c46ffc86f244f48759bdf3393a12560e97d1bae3c8c207f8df15b9b65a14dabdf676d9492d617a9982b7f7743797ddd859df3e7b3b929a78 MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc 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/udiskie/Manifest b/sys-fs/udiskie/Manifest index 0ea7cee82ff0..a0c2172c626f 100644 --- a/sys-fs/udiskie/Manifest +++ b/sys-fs/udiskie/Manifest @@ -7,5 +7,5 @@ EBUILD udiskie-2.4.2-r2.ebuild 1111 BLAKE2B 2cef3f18c3eb97ad3f14dd4ece9ea21577a3 EBUILD udiskie-2.5.0-r1.ebuild 1113 BLAKE2B 43431f40c443ec2e0e69bf627dcf17443f30ec8835a6be9814e591aa718a21be9dc4e2f47958d0b8025f734421357076b011d62359f1cf39d09c747f1e8f1fb2 SHA512 588223f262e4bf2ac95f74a07cf8bf75a9af6484e759d9e4e698c6aa55d8f3b69fbfa67b2374cc89ce8a0461fb4bbd1ddcf25c2c3702d161ed2e79a22a1a3b1e EBUILD udiskie-2.5.1.ebuild 1113 BLAKE2B 43431f40c443ec2e0e69bf627dcf17443f30ec8835a6be9814e591aa718a21be9dc4e2f47958d0b8025f734421357076b011d62359f1cf39d09c747f1e8f1fb2 SHA512 588223f262e4bf2ac95f74a07cf8bf75a9af6484e759d9e4e698c6aa55d8f3b69fbfa67b2374cc89ce8a0461fb4bbd1ddcf25c2c3702d161ed2e79a22a1a3b1e EBUILD udiskie-2.5.2.ebuild 1149 BLAKE2B 4d4a0aed3214eb7ca7c679b3e13aef080edbbfff7456f0231e49d2026a09cbbbf31b78753f368d7a86f3a0fdd52180fa20e530ea8c22bab3b6992794f624372b SHA512 dd57ace8094cbacd0de8a5155979c0e569e6a358edfe2c5b7b8ccafdd7dfb41fe071c9fd38acef9a8bd3efa48ecaaadc7d25609067b1eb8f9e434a127de44473 -EBUILD udiskie-2.5.3.ebuild 1151 BLAKE2B 42b181191fe6859d6a744860e0af9fe3e1b02e6333cb637159dd1d8531ac2e730e9031e4f1cd090660ff3524f16494fae9904c4cbfe70eb416ffda639b373772 SHA512 6c983653dd7ee3d8bd4c2671af98f35a7be04b13a9ba622c1c466a8264473ba6e6fb92b4e77f84fc7f6b8a09f1d295fd15f617f548a5bbc69e5756131a484236 +EBUILD udiskie-2.5.3.ebuild 1149 BLAKE2B 0b18fe8747f769ecfcd3da3eda8d5c4cc90c6ddabdb029bd627ad07cdadc4af8e290e4ae2b4cfc9afe336cb9f19999e32e6b8e1b5ae1a2063dea17e873a01a6f SHA512 ca99ee1e93dfb62b260986dfbcac0ee1d715118afe431f8a2bcc58272f1356c242388ecbaaf51f5d76eee0a20dbffd3f3b82b45d567d6d2f3793881311aacabd MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39 diff --git a/sys-fs/udiskie/udiskie-2.5.3.ebuild b/sys-fs/udiskie/udiskie-2.5.3.ebuild index 685b5edb92a8..d38cc7c34411 100644 --- a/sys-fs/udiskie/udiskie-2.5.3.ebuild +++ b/sys-fs/udiskie/udiskie-2.5.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi xdg-utils @@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="libnotify" RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 814b3c49ee94..fb6ac592bf99 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,8 +1,11 @@ +AUX udisks-2.10.1-BLKRRPART_harder.patch 1903 BLAKE2B 4c45c74ea5d5715d8d821b4042288ce1a88ba07b46583e92540d918bce1be5aae70e711863d97d04a7472c124b7ffd9fdfd43a0169028f167634614d243bd642 SHA512 dece2c2768903f05555f87479818a2658dd1208841178a51750d75f823867afd873e8d3ebbff8ca66ba06fc18b0115e1012028815a8642f508d983644d04ac97 +AUX udisks-2.10.1-targetcli_config.json_netif_timeout.patch 1427 BLAKE2B 3916bfb9e0ad43151dbd11f1b27a294879967c464707d78b53ceb753c63f648e6ad316141f2e132e3c61c6bde120713455eb9a28e095388533594cfc6775058d SHA512 84626e7733ded2b9c9e92ee15f7fef780b39e93c8a3154164a53890fcfa4c879a19e73165b7b8cf8362ef451726f6a15c5ff89afb71d3b931993b17750532474 +AUX udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch 1023 BLAKE2B 550f327d4495ff7f30fc7194327ead64cd498f3c629d33fc753cea0c9d7fad19c3430c3cd6837a4b825efa405efd3801d8a30fc574014ee86aec75b96df28d07 SHA512 da69edf84733283b0c5feeb702988893bd5e2ffa2eae195232657bb332a525da519ea8076f0551391d4b478abe7e3337284e32ce1eff045fb6458c001a40b9b1 +AUX udisks-2.10.1-udiskslinuxmanager_use_after_free.patch 5722 BLAKE2B 954e9e2ef09e88b10ce26e479b82e240e7d95ab963ecc2ecbd5bc7e9ff47f94a988ec945f0348649e7ca3b57d8cf5858548e0815f39aa63515a41db2ebce1e7e SHA512 81d2afcb97d247186bef32d6340cd261e3e436340e9f61e7c4a69d918bc9b09df79bc537f08f4e203e9a491bd79474708f43b6db01fa1636f1ceb70f7dd9a59b AUX udisks-2.9.4-undefined.patch 6251 BLAKE2B 1c2eb5b5448686dcd343fd582e5e79ecb38bbfae4108a56c5b27de9c446a49b7ec1e22f7f55778f7ace7f309b4d2bb7bae99932411917abbefbc58b62fd7dae0 SHA512 103cf151084dd239baa40554cfc2396281e478d8ca9e73c848cd4af42716d7677a50a7dd1b18d8a84a3f97210c695f392ea3556104ed03b50640d0cca96303cd -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 -EBUILD udisks-2.10.0.ebuild 3676 BLAKE2B 8695bd8aecfe755d4022090ff06ce895cccb00a852ab8e207940d3049704c09c0c0d3f0288ac85e4a37a0d25a710f5282ea7191ffe05fc7a45f1871c3f35e6a2 SHA512 58091fc48e370b5325815492b260dc6f5c7dd8aad7e0cadbf883d8ff5179b0d8a53fbd9191e0251003fceaa81debcb56598386bb7fd9bc969c62af89ca3790f1 -EBUILD udisks-2.10.1.ebuild 3677 BLAKE2B 23a136b71109443fce615ef60d9664e0a531fa0b76ebc3fa8e2d99f29a016efecc67035af9742a1713799c1d8b2524067e841a0ff3c535cfba73ddbae9c84b11 SHA512 f661facea23401b082dec81733da2bf3b7546d7aa357be590d43a1427b3bc25772efae84b35b6c91179dd4155e91e8c70685defae5cac733f63dd03c0d7e07e0 -EBUILD udisks-2.9.4-r3.ebuild 3954 BLAKE2B 6a16a5d24357d773e252cd756d9c920694e4f328f02928db75ec14c1d8deb353c2ebef494ba78853223485099d9f01e3772a050970cb5cb040801a4869e30b1b SHA512 d546d0b3a57c777413f79ce561181f3f013a702d7150c6bafec21e995a24cbde1a6da886c0590196bf25fca9cfc023f3b39358f5bd19b776f382308eb85bd3f2 +EBUILD udisks-2.10.1-r1.ebuild 3919 BLAKE2B dab1912909d4ff984778ca65e729642a6b5657d5bd960385472b864c90a26df2797e5d4f1372e926187f080db426bf68e03e6f457f5013101deedcb460d49736 SHA512 94980330d160a53c1df2ad31f62b58a8711465b2ab021b372ab7cea50be29b5e830940e1580517f02e8f3257467497823aecd058a0e67d8ae391de02da8c1988 +EBUILD udisks-2.10.1.ebuild 3671 BLAKE2B b45d2bf42443b312721e7d5bce0cb2b950d67d62a2c429cff89e03d0797a1aa7862a2886e35b84ddefbbb781772a670dd28f16145f9aa9550e31f4afc697ac72 SHA512 6e515a8b9ef0301e73b5188a62955258b370e5e64b1c9c29ce1aa1fcc2d53a7113d57d2ce6063fc1dad7a718f0038433f2e132860a7e3c91ebfd1a842f17edb5 +EBUILD udisks-2.9.4-r3.ebuild 3948 BLAKE2B d6078b200453793cc925d605e6a60ef8ae3cf714099bbc28c3ad58c1894dafe3bbe4d5c9c18d1d0e9f2f6587b096a9ca8c68346024c3e7b5c8252c7d224e150b SHA512 68c827b6ad5b2f3b1b368e0a18e9cf7fd043b8c19102d1d3e3fc2b08e03447409ccd3b2a305b4e92c879b8042ca9ec980d5480b0a6528a40f01c753bc254e6ce MISC metadata.xml 817 BLAKE2B 8de63b889a0237db873c61e20fd4c03e0b3cba0e76af124ccc6ce8240557c6cb60b15e566918a358714a7c9c981fba2581c155a22fc8ca81bfc363012426b000 SHA512 26df20e075b5f6f23d78ee21c52908c54bd499502208570b575227464f4105044d08421c01e025cbd15fb5d003190f72ded2ea905bc037746b3df452a50999df 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/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest index bfdbc1f0299e..94592914575d 100644 --- a/sys-fs/unionfs-fuse/Manifest +++ b/sys-fs/unionfs-fuse/Manifest @@ -1,4 +1,6 @@ DIST unionfs-fuse-3.4.tar.gz 54122 BLAKE2B 8d578a1bd88814acf5e2d437b06a5f400f38e61ea7c998fe38bb7ca536c9092f07872c4b4ccffc9db834eb8430f3e98c543a66920afab2b2371451c17c247d2c SHA512 fb719c8548ab1fa43f236d5c3207d7e8e7a7dc45efed453e447e29452a7c4d03483c84b00fd615bac115781b333c8171d811b87a0227172010a2ab34224150f7 +DIST unionfs-fuse-3.5.tar.gz 54906 BLAKE2B e9fb236fda184766affec0640127d5d2ba4c9f964e8882570f069f83fb8f35b551f3198dd4f252242287bb92a5ddea396f62975d1ecf5b9b002fe0a7fe9c85a8 SHA512 4f9d08a9ac7f374f15aa31bf2d8cc5e37b35f9a63bcbba50c6d805fb66ea019737b4aa2236b425317e638b6275659c4260ff8e1fecdee038079dc64797ab6013 EBUILD unionfs-fuse-3.4-r1.ebuild 1025 BLAKE2B 3494e617dea6d62aa927db8c6adf0d8a0cf1714a200e66feb8a0505a23d75e7491c9872cd997247001471ca0f5a6f2642ba494acbf59f70cca7cfba2825376e2 SHA512 8e659c99da89ed545fb05b69cfd4ddd3f9565078ec2356bf4a6a3d5632edd02dc0d8b2253b6ca99cc11d908ef9183a56dd217dd44da614debab28c0344c371a5 +EBUILD unionfs-fuse-3.5.ebuild 1025 BLAKE2B 4f8f3a7c2c8263e9f95abe22387cc75d4ffc07a5de3d07871f1abff06321d2e89e5fe2dd834033ec51183211f237486ce86add0f7c836238411770616cd3a5a6 SHA512 80c94677072203aee3783f4800353ece2a6a235eea2f10c755c64c1ceba2fbc9fddd890fa1eaf0ff3b62c7506cae13ee80b535ab283e06e6629fe597a141c61f EBUILD unionfs-fuse-9999.ebuild 978 BLAKE2B 1cf37386909950bdabffbabd242cbd3a13ce22ef3d6957e181578d143f226a496152cc4d62ed8cf2cd9b8100eb44f8a56cdd962827731c0b9e7e612ddc2b742c SHA512 93e70f656eacf2e6b3bae5ac15b434dd1845fd1415d3a05863b7fe7aea6b1ee75f57c6ae4924144ccc59e41e012e9e67fbeb7299f7c95fb952a62c1b9fc98886 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7 diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.5.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.5.ebuild new file mode 100644 index 000000000000..70e1efca79a6 --- /dev/null +++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.5.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{9..12} ) +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="Self-syncing tree-merging file system based on FUSE" +HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse" +SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-fs/fuse:3" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +python_check_deps() { + use test || return 0 + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + +src_compile() { + emake AR="$(tc-getAR)" CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} + +src_test() { + [[ -e /dev/fuse ]] || return 0 + addwrite /dev/fuse + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest index 1f458305338b..d3a113bbbef4 100644 --- a/sys-fs/vhba/Manifest +++ b/sys-fs/vhba/Manifest @@ -1,3 +1,5 @@ DIST vhba-module-20240202.tar.xz 16168 BLAKE2B 7974f60b73c634528afdd44e94c6da34bdc481d874f19845efc0464435a7e560494dd703b0fb1df34c96fce5f1afb300a1e6e2b3b9730e91c956816905eb2f44 SHA512 fdb9b79feb870bb22ed2182216103c8b87d1b5a471d02def24bdf5782cc2bee2333f1d78e1428b042c3df5a33ff8e07b1d61cbe11414a27db18034f3fbbe2612 +DIST vhba-module-20240917.tar.xz 16204 BLAKE2B 1e6dd176d40e86363eacddf3f97231b07b7428178b6e1792cf3abd15e42f2350db66557b3499c204c47678b4967955670a8839f8b50549614bd6a8ba204b9bb7 SHA512 aa94f88e501f11fe1de9dc9eb315f720947fafa23a12789c8b674b1f7d578cc351c2c1524ea1165b893cb50c7188d016da548006e7a1795c99eeacc92e1ab0de EBUILD vhba-20240202.ebuild 1086 BLAKE2B d473e5deb1503059962c9ea2e806805577bbb3aae95996b19a0bf3350c3d4b8c07ff105558762eba2cfcdd7c38ddd33c447ef98060cbb10ae9d962ae1d73a681 SHA512 67133950d564026373ad288bd5e8bf841e538b40320ba5c9da08d36a3db9bd5dd72a575242bebc53c8feb952ef70e598ee08388aca29414a0aafe00d9d6a9fcf +EBUILD vhba-20240917.ebuild 1088 BLAKE2B 41caec15924e0cee276f78183f3912de23099695dec2c72034efeeaa2dbec7d63cfa54edcb20d43b1c638986e1b2ade6c7028970967fb5743149259698e3868e SHA512 213f02109b6de84b55bd8c7325a35a90bf7ef35c72abd18b71cef628898fcb4bf591bfc57a2e52e6fe03dadbbf882d5275a7d780b8c27893edc5a22fbd6dbc3f MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129 diff --git a/sys-fs/vhba/vhba-20240917.ebuild b/sys-fs/vhba/vhba-20240917.ebuild new file mode 100644 index 000000000000..4c97a5404e45 --- /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/Manifest b/sys-fs/vzquota/Manifest index 430ce1bd2ce3..9b1c72b3c4e5 100644 --- a/sys-fs/vzquota/Manifest +++ b/sys-fs/vzquota/Manifest @@ -1,3 +1,3 @@ DIST vzquota-3.1.tar.bz2 46848 BLAKE2B ae347ecf3c1d537901b0055f635839e1d65f3801507ffd986aa5c857a1df98336a4ada2065c72e94885266c5a95b070e89cfc2e3da95ab31a6dd0d8deab424b5 SHA512 e2289df9235149c8d511a6b2846f672574622fb39ca5cd8f5780af9a4cc204ce12f1a2ecd0382143c04eca93e64ce6851caab0782e8ad178352954ca599ffaac -EBUILD vzquota-3.1.ebuild 816 BLAKE2B 6aaa5ff15a18b8260afbbcd5171d8e4399c8c3ea028332c5d5ab5aa744f16939dcfb2b80206f1d45a1b2e2b4e1ad10d9814518e0d9cb868d26300f6f8ba65436 SHA512 ab2d0a23491a35339ff8876f29cba4dcb269395f31255128dd3f2f89f4a5053060787227af7561a638da143526ced070b6997b682b0e0cb12abae03ade09a945 +EBUILD vzquota-3.1.ebuild 810 BLAKE2B 8027d11d8818ef40d84d115beb8f4ba0c73043a817b9ce7f6ad5b9dc4f062b94f1790fd083e954d0409e3d36f05e8242b9dfc4387e2699df06464ad97827c080 SHA512 2e8b08b58af35b5be73edd9eb78aa02d4e34f1570b63cadfc19e128c3a07c904f6f521a8322d43c870b29de0d479d6ec99658425f017c3fd82432cee21a4fb51 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 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 64ae3b6c875a..8d79e46b5339 100644 --- a/sys-fs/xfsdump/Manifest +++ b/sys-fs/xfsdump/Manifest @@ -4,5 +4,7 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d DIST xfsdump-3.1.12.tar.xz 609500 BLAKE2B 2cd39e9f66459d75e9a254c3409279fecb95883468fc933d4d8326d00e89422ce433472c98073aa2aef8c6c4a3a1ed7e5ef94584993eb4087b2a4667187c6aee SHA512 803a3b639aef35ec882f40faeaabf381973ba2636ce0c9d06568361f5398c3c6842ffe184fc01441bf51bb1ed1b9e40b012715c09c8cc942484cc031a8eb1757 -EBUILD xfsdump-3.1.12.ebuild 1768 BLAKE2B 6d33a31281398774780983f45ffe8be7dae75bb4f6c598b50d278e3207336b761b6282e5c0f20ae29e47611e13fd37f4c4636226ea4ad1d6b75b04f9c15139f9 SHA512 a6ab6fd8d359071e0b603a8c0a99e461bcbe325f07158611dca241176ec2e0236dc86754f122bdb9d1dc3b7544c13c416c18e9319b54db59cde4c816c41ebf95 +DIST xfsdump-3.2.0.tar.xz 615312 BLAKE2B 2971608b1ae3e280cba31ffefc379995211088338926f9c3f1679c825742b585bb1ab875b3da2afd48f6cd2bad04831e5e61d0251f018e2bebf72af4009ef764 SHA512 339317a92d7fda3e63b292db5e8a6d4a107a7f2ec269d54c109b6ade2f76cd823fb53db7a3a7e8a6c4883d6ce5626c7bc85fef6741f44699a4a8dfecfaa5231f +EBUILD xfsdump-3.1.12.ebuild 1761 BLAKE2B c1903af38d83a89b9a85e10949ea6907dcfb945c07e637f0c2f95fc0f24678dcab92ed47e17d1bb04d37c7701143c89644d3e44500e348cc49b249b41e257c13 SHA512 abaeac65069d018a8a0bb7194fc126f6c4d657ac384c4f01e2be5bcd247699af8e465fd1b1ee976ba46469ddd7b7c52e7ce5da623748bb47d54de55962ed7b22 +EBUILD xfsdump-3.2.0.ebuild 1935 BLAKE2B e5583fd8f45dbc236588116b9554b45f9810943230c9582b097f94628d109b7b9bc111c5d07f575b1b51eb4c177b77436db8ee6eb3106df3106fc129f3527010 SHA512 25725d491a8946310a5f249a4540344418b2e194f3a262134df55f1670c41e6bea57258b3c95157cb8a1d6fe0318755f579d276e341e3992cd4cdf463f78b869 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/xfsdump/xfsdump-3.1.12.ebuild b/sys-fs/xfsdump/xfsdump-3.1.12.ebuild index 94c12cefa75a..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..836118ef68b7 --- /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 80104d361fb4..7fbd6e0b1d09 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,15 +1,12 @@ -AUX 0001-Remove-use-of-LFS64-interfaces.patch 15619 BLAKE2B 9d2dfa2e81182466b81bdee612649145a20900497ed25886320564ef0798e7e381ceb23d84ff7a958ca68d72a681ed33af89a0cca59daf359c5c9df3039e3310 SHA512 0a4485e85041e276462de91c70708748acc98caf82aea0f4baddb18393b8cedce15c5cc4b04ae09656da32f2219be900ce1c7516705994bc8629685ac5229c97 -AUX 0002-io-Adapt-to-64-bit-time_t.patch 1641 BLAKE2B 51a74717f974b24543e8a9151a0b0dcda59a01acd7620f5d00bf3659899ac6cb1b7bc481b5c32aac9482f72932a2ec377980fd4c71d73689a6e1f4cc7f3cb188 SHA512 66794967658cf6406240cef596c4e64c71eaf9bbe4091a94e236170fe17b4045e95d1627a65a973aa77cce9032fff9a933d19e11669440661dd99c713dc6dad5 -AUX 0003-build-Request-64-bit-time_t-where-possible.patch 1297 BLAKE2B 2e2a379aef0fc803cfb319919f19c51917e2084fe13ad72f9c62f97cd7561a0262fd192cc7625a0ac52c9bbc4611eb31e61984edfb1b52788fa2346f236eb56b SHA512 022267f15c044d595b6a52e91e0802b98ae2f3b4b8b921b64fc79dadec498473f3053ba19c6fb44766fe4ff8bdd85df577c77030523524c8079ed47e4d06bd51 AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa -AUX xfsprogs-6.7.0-fix-porting-to-6.7.patch 6103 BLAKE2B 4dae3812b6c40892ed7a8605cd46f117997c4dcf0d02c2402670c5294a2e5d6a0cac11743d90b0578d7544906d1d25da7ca6da6baf2cae76a995b8acad734cd1 SHA512 36b576afe505173f71b4848c064e6b9a4031ec831df32cf3b9726544941408a03a8f64cdd3aedfb9a264213705850e72258cef6ab542c4278c087f338d8d5905 -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 +AUX xfsprogs-6.10.0-c++-void.patch 1651 BLAKE2B dafb054348f0b2362976d74c55821a2440ac98a80197af532facb4b65bb8947fa77ec52795b90a58196b77778078b2bf887b7b9d05d420c26193c8e63b98fe4d SHA512 09df6b846621c0bea65628e38c286935eb1fc2d7d1a3a08877c3121cc012df9345a53dc12e4ec43785500d890767d02e5e9ba144c2bfb67d2bf5812ba2987bcf +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.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d -EBUILD xfsprogs-6.4.0.ebuild 2414 BLAKE2B b71c91b69eb958bda96f1eea3feed717576397a214343c7474c8530ee7f60c0ca10260d98adf9ba3bc40d46498d1fd13bd71e216a52af08790e66d6d2498d6e0 SHA512 69a5eec472d87155e9343e7a9de65a65e15de3b5d4c831fd43636aa54a6435b708342d93cc4d93b132710db08446b3aab37ae75d37497a2ee8736e12c050a83e -EBUILD xfsprogs-6.6.0-r1.ebuild 2669 BLAKE2B f40fffb2885c1099dc8e1f9ff6ce104f892361a60b62a2c59b985d9f98c0022035dd3532109c23e2155a61f93e86fb462a791fd93361230b4dfdeae3fdd4ac7c SHA512 cf4997080768a9252c4b40f1c58427ecabfb21324798e7f1242632a8e9e90415eed484a5b2a1624a0c8381118cb8bfb5d90afe823bef1c1c2d7247bd0449fc7c -EBUILD xfsprogs-6.7.0-r3.ebuild 2655 BLAKE2B 631390af82f532fff724e54110881e7cad750318a2257e4f65200f47316e03a718d9c88ce5b33532dd37ec968df5060d44c4796d4fc909fbbb7eac15226d6f2e SHA512 6c72ab4b71f401805d61d0e1712ba7a59e0704857e92a0757f3a2818e3888dc42174138b1d531cc054fce02304c3c7f4a4f0358ce18d033da05aabf70df7fff9 -EBUILD xfsprogs-6.8.0.ebuild 2603 BLAKE2B 1eea90b91949f344a37ea52e033b18ef626d2aadaf45069e126830061770374b32ebd9c9d4b236b21f092ff65160081a711d750bc54b15fdd1f47fd5e29c654f SHA512 7e79fb75397eb4a0c4c048d70eb52d24271a3f34c7dd80bdd5f8ec689de34eb4888d3bb0c7b9fa190255567d9e5632286e1495056662208b7ce49cafd26bb03b +DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023 +EBUILD xfsprogs-6.10.0-r2.ebuild 2859 BLAKE2B 527366c51df7a215fce8b0e7d2d366e6d587dc37b86b379488aaa31e668eb495af757af8baf6d436a2ef760affd6fe7b2d47afe8a6088f5b6d130c9cbc098cd0 SHA512 9b8d76a07e4d5ffb26453b58f18f8739d95d4e9c3f6ff89d9e7222fbd7aa261570c63b7f1af49a5e001bc337c7e90ec2fca019ef429eae0bd617f82d25d8040c +EBUILD xfsprogs-6.10.1.ebuild 2803 BLAKE2B 4fbe8eeb2394c091fe1325cc7d5c44c9e7133c51bce00cfd354c002edefc54d5f29bad76e037e29b2340aa4ce8443ba27828bdb8dbf7d4000968bc7d6108e001 SHA512 ce765292785775fff276ba2f5f113e9e7398b2208a83d48c31ddd925921fefcc4712bd0d1acef6b00b7b8dcf9207c3292d992e06b68d87ca8779019728da2e82 +EBUILD xfsprogs-6.8.0.ebuild 2589 BLAKE2B 724a51c203639b6ef3a1e60e04705ca46084acf58c59bed0ae8615fdfe60b8ba473092eb33b72b1276ca86b81a9dcdfcbda613a4c0643b061e1877ea139600d8 SHA512 9c2a1aadc1a5122e48768cbe60d6179c1e172960a92218767fcdf03adcf5a64b694798591c620e5045d131da61058a8651333607abe6ae237b607bddf8d1a5e7 +EBUILD xfsprogs-6.9.0.ebuild 2597 BLAKE2B 38ba299dc0db1edac052fa0336a4723f395e0c7a1372c66269f0c012a2ccc17e11c929f050d1dab935bb976ff5702cfc4f9399893aa322a347ad73fa2651911f SHA512 29071b95a57a12e68fdcfb0641d5fb0a357aff1b77aebe607f777e6ded28d1472764f6bcb01987dcd3296cef20c50bce820cc1f166255650adfae6ebe834e9a2 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d 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-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.4.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild index a82129f2ccf9..7e71209b2ef8 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.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 @@ -26,8 +26,7 @@ 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 + "${FILESDIR}"/${PN}-6.10.0-c++-void.patch ) src_prepare() { @@ -71,11 +70,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) @@ -89,8 +90,25 @@ 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() { + udev_reload +} + +pkg_postinst() { + udev_reload } diff --git a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.1.ebuild index 6d8a45f9081c..30de84a18b56 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.10.1.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 @@ -25,13 +25,6 @@ DEPEND="${RDEPEND}" 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 -) - src_prepare() { default @@ -73,9 +66,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 +86,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.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild index 1ce476e005a5..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.7.0-r3.ebuild b/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild index e5ba87bba74e..48fe18a4a712 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.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=" @@ -27,7 +27,6 @@ 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() { diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index a851095d0777..0abe5b3bc671 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -11,11 +11,17 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B f83439aa929609191a048dd326b2a15e0f57c72d2 DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B 86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c SHA512 fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9 DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0 SHA512 1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17 +DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6 +DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060 +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 EBUILD zfs-kmod-2.1.14.ebuild 4188 BLAKE2B 44faf88962fa0f0cae02d9f171b66eb149dc602a4d9edce2993a33279ab9b3a2f330704e76b6295feffb2998f03830b81bf0157aa0430f1c5cac2fb971da5be1 SHA512 62c187ff630dc716187e3018914609f22a7031c5283d21a2f499f2481694270f32ebc62d8e4f97a5e04b723e8161fca6094ce8f142247d4351b1574372801c64 EBUILD zfs-kmod-2.1.15.ebuild 4188 BLAKE2B 5c8a646f0a674f6caf6fb65bcd785af9eb26c47261e764242dcac865f5280c9b6c47ae1f971d8d428c4e712ed75cfd0085e9af302cf2dd2d0d1d1e6e44f1fa71 SHA512 bb60b68a6a9c12dc9064cc831742de64db9bb743134edc0b868f6394e85e39d067915d940580f95ec656d31e46e0771a8fd983fb157dae96e3c2bbbb33ec0901 EBUILD zfs-kmod-2.2.2-r1.ebuild 5612 BLAKE2B def8f4448fdd20096a87f09ffaac4ad8bb7f9744770091bec5fad4cd711b2a8fda0f6b03437286a6b1b506f5b46ff4eb6cd16ca35537489d0bf58b03d57d73e2 SHA512 e08a7caf792a97a28f81587e2d5c9aba6b409b2c20e9b96417a93e48d3ec13969f71b9ccc7911aea5ca3f7b40ac4205dc0d13f0b0561492a1d2586e5f1cdcbca EBUILD zfs-kmod-2.2.2.ebuild 5567 BLAKE2B 7c6a49a817d8429b7e7bb5bffb311df24bce8763b0b7e931244eeca50929d2cca504bf2a266eaa55dd036892929432c00caebecd1c8525df2c0012646ac66690 SHA512 9c9b3e2f45bc4a9982f3540183ed3b1aec0fedbaa5f75e58819eae6bd38b7a62a4e55b8f83d263df13b16e32e508b863adcfb2285e31ddd148dad5ee12e9df9f EBUILD zfs-kmod-2.2.3.ebuild 5523 BLAKE2B 562483c01237a9751705c1a60b4e4a696a3fac3c8da5daf28cd5c3563a654a23532ea833fae2ed5d22a112f21c6ade5c1568b86a4cdcbfeaad495404266de07a SHA512 ffeb010a6a45c4887f465df697e29d9f064ed517a8b468c6a46041953c0bf05d32fe75d46fcb76ee7fb3103023cd2020189389808aad6eff92176a903615fc74 -EBUILD zfs-kmod-2.2.4.ebuild 5526 BLAKE2B c57c9be7e51a70a6dd1d15c2a9f81056cca86bac1ac4793d6e915fc1bcbaa9ce4e0050e93ff274210fedf8a39e9980614618c6888aeb17b1d30cdf609dcd35bf SHA512 75a7ee2596294d3983d8b1a15b7ce8ded99050b4c643546b51da30c917109eafec5c6c55a115b31561070337ba3054578224155211bc5f2588e0b0f3d2130045 -EBUILD zfs-kmod-9999.ebuild 5526 BLAKE2B c57c9be7e51a70a6dd1d15c2a9f81056cca86bac1ac4793d6e915fc1bcbaa9ce4e0050e93ff274210fedf8a39e9980614618c6888aeb17b1d30cdf609dcd35bf SHA512 75a7ee2596294d3983d8b1a15b7ce8ded99050b4c643546b51da30c917109eafec5c6c55a115b31561070337ba3054578224155211bc5f2588e0b0f3d2130045 +EBUILD zfs-kmod-2.2.4.ebuild 5523 BLAKE2B 971d928835ce11d70b4a6c00c189f9a00b3133bbdb929feb8f76d7f17a317b65492cc051253f2ceefbcec1896338e8cec41028c6cc93e82415ae28a124bb14f3 SHA512 4ea9a114999388025a02d7bad54e5fc695e09e44a4a0a691a0d0c968ccf10ba2360218b50001a46cfb3499c24828972651aa9431061ffc03e15154871ddf2661 +EBUILD zfs-kmod-2.2.5.ebuild 5523 BLAKE2B bb672c18784633c6d1605eb0d46018a015f73853e217a92922043b1183c36ebacc0292708f361b3379b19668f74ebaa6b63019faf9f78bb9e967754d1d0732cd SHA512 198f84fc9946a0f580c8b5b8176ef15aaa7fd6c1c04aff4f75f24a0f1851c1d8ba98b6fa343c6b8c62d96832b4d17b2ece2e20e6dff46803846f605e2cf03885 +EBUILD zfs-kmod-2.2.6.ebuild 5527 BLAKE2B adf536ab3827f6568fdd565c828e4ffc1baee7f2138642058c9d1265b3ab7c5b0dec68da365a85e0b95fbdd6ff8ecef55f522d65920e652ca17eec6eb4a72762 SHA512 76e8d5657b07c7258c1877bdd951346d97b9f23560bcadd449919a6929fec1dcf44e7df40a6f1376f5a5a92c0fecf78376c322fcad09ec59010758288905e15a +EBUILD zfs-kmod-9999.ebuild 5527 BLAKE2B adf536ab3827f6568fdd565c828e4ffc1baee7f2138642058c9d1265b3ab7c5b0dec68da365a85e0b95fbdd6ff8ecef55f522d65920e652ca17eec6eb4a72762 SHA512 76e8d5657b07c7258c1877bdd951346d97b9f23560bcadd449919a6929fec1dcf44e7df40a6f1376f5a5a92c0fecf78376c322fcad09ec59010758288905e15a MISC metadata.xml 664 BLAKE2B 50e33d5791fd756ae4566052ecd6d8b1b395f8390b4cbc10c3b32bfc12f0a414f4080bf4102091f0920369f7999f2f94022fd526703ee8e73dc948c1f9d28432 SHA512 dca8e09500fe0e20f11b10df22a61ca36c99b6b3a08c465ea011d921b25f5891be3abaa5e6dbda1a52dbbfad69d1c8bf9fc69f71b3ef73cac428015641aa52d2 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild index 79b2c443b06d..c3bb25d6fc53 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.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.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild new file mode 100644 index 000000000000..1eb122934d00 --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://github.com/openzfs/zfs" + +MODULES_KERNEL_MAX=6.9 +MODULES_KERNEL_MIN=3.10 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" + inherit git-r3 + unset MODULES_KERNEL_MAX +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + S="${WORKDIR}/zfs-${MY_PV}" + + ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}" + # Increments minor eg 5.14 -> 5.15, and still supports override. + ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" + fi +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0/${PVR}" +IUSE="custom-cflags debug +rootfs" +RESTRICT="test" + +BDEPEND=" + app-alternatives/awk + dev-lang/perl +" + +if [[ ${PV} != 9999 ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" + + IUSE+=" +dist-kernel-cap" + RDEPEND=" + dist-kernel-cap? ( dist-kernel? ( + <virtual/dist-kernel-${ZFS_KERNEL_DEP} + ) ) + " +fi + +# Used to suggest matching USE, but without suggesting to disable +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.11-gentoo.patch +) + +pkg_pretend() { + use rootfs || return 0 +} + +pkg_setup() { + local CONFIG_CHECK=" + EFI_PARTITION + ZLIB_DEFLATE + ZLIB_INFLATE + !DEBUG_LOCK_ALLOC + !PAX_KERNEXEC_PLUGIN_METHOD_OR + " + use debug && CONFIG_CHECK+=" + DEBUG_INFO + FRAME_POINTER + !DEBUG_INFO_REDUCED + " + use rootfs && CONFIG_CHECK+=" + BLK_DEV_INITRD + DEVTMPFS + " + + kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP" + + if [[ ${PV} != 9999 ]] ; then + local kv_major_max kv_minor_max zcompat + zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + kv_major_max="${zcompat%%.*}" + zcompat="${zcompat#*.}" + kv_minor_max="${zcompat%%.*}" + kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ + "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" + fi + + linux-mod-r1_pkg_setup +} + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != 9999 ]] ; then + # Set module revision number + sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die + fi +} + +src_configure() { + use custom-cflags || strip-flags + filter-ldflags -Wl,* + + local myconf=( + --bindir="${EPREFIX}"/bin + --sbindir="${EPREFIX}"/sbin + --with-config=kernel + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + $(use_enable debug) + + # See gentoo.patch + GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}" + TEST_JOBS="$(makeopts_jobs)" + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake "${MODULES_MAKEARGS[@]}" +} + +src_install() { + emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install + modules_post_process + + dodoc AUTHORS COPYRIGHT META README.md +} + +_old_layout_cleanup() { + # new files are just extra/{spl,zfs}.ko with no subdirs. + local olddir=( + avl/zavl + icp/icp + lua/zlua + nvpair/znvpair + spl/spl + unicode/zunicode + zcommon/zcommon + zfs/zfs + zstd/zzstd + ) + + # kernel/module/Kconfig contains possible compressed extentions. + local kext kextfiles + for kext in .ko{,.{gz,xz,zst}}; do + kextfiles+=( "${olddir[@]/%/${kext}}" ) + done + + local oldfile oldpath + for oldfile in "${kextfiles[@]}"; do + oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}" + if [[ -f "${oldpath}" ]]; then + ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing." + rm -rv "${oldpath}" || die + # we do not remove non-empty directories just for safety in case there's something else. + # also it may fail if there are both compressed and uncompressed modules installed. + rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die + fi + done +} + +pkg_postinst() { + # Check for old module layout before doing anything else. + # only attempt layout cleanup if new .ko location is used. + local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* ) + # We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false. + # if glob expanded -f will do correct file precense check. + [[ -f ${newko[0]} ]] && _old_layout_cleanup + + linux-mod-r1_pkg_postinst + + if use x86 || use arm ; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + if has_version sys-boot/grub ; then + ewarn "This version of OpenZFS includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of OpenZFS. To" + ewarn "create a new pool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -o compatibility=grub2 ..." + ewarn + ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features." + fi +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild new file mode 100644 index 000000000000..8f1c08d298b6 --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_INITRAMFS_IUSE=+initramfs +inherit autotools flag-o-matic linux-mod-r1 multiprocessing + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://github.com/openzfs/zfs" + +MODULES_KERNEL_MAX=6.10 +MODULES_KERNEL_MIN=3.10 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" + inherit git-r3 + unset MODULES_KERNEL_MAX +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + S="${WORKDIR}/zfs-${MY_PV}" + + ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}" + # Increments minor eg 5.14 -> 5.15, and still supports override. + ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" + fi +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0/${PVR}" +IUSE="custom-cflags debug +rootfs" +RESTRICT="test" + +BDEPEND=" + app-alternatives/awk + dev-lang/perl +" + +if [[ ${PV} != 9999 ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" + + IUSE+=" +dist-kernel-cap" + RDEPEND=" + dist-kernel-cap? ( dist-kernel? ( + <virtual/dist-kernel-${ZFS_KERNEL_DEP} + ) ) + " +fi + +# Used to suggest matching USE, but without suggesting to disable +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.11-gentoo.patch +) + +pkg_pretend() { + use rootfs || return 0 +} + +pkg_setup() { + local CONFIG_CHECK=" + EFI_PARTITION + ZLIB_DEFLATE + ZLIB_INFLATE + !DEBUG_LOCK_ALLOC + !PAX_KERNEXEC_PLUGIN_METHOD_OR + " + use debug && CONFIG_CHECK+=" + DEBUG_INFO + FRAME_POINTER + !DEBUG_INFO_REDUCED + " + use rootfs && CONFIG_CHECK+=" + BLK_DEV_INITRD + DEVTMPFS + " + + kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP" + + if [[ ${PV} != 9999 ]] ; then + local kv_major_max kv_minor_max zcompat + zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + kv_major_max="${zcompat%%.*}" + zcompat="${zcompat#*.}" + kv_minor_max="${zcompat%%.*}" + kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ + "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" + fi + + linux-mod-r1_pkg_setup +} + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != 9999 ]] ; then + # Set module revision number + sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die + fi +} + +src_configure() { + use custom-cflags || strip-flags + filter-ldflags -Wl,* + + local myconf=( + --bindir="${EPREFIX}"/bin + --sbindir="${EPREFIX}"/sbin + --with-config=kernel + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + $(use_enable debug) + + # See gentoo.patch + GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}" + TEST_JOBS="$(makeopts_jobs)" + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake "${MODULES_MAKEARGS[@]}" +} + +src_install() { + emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install + modules_post_process + + dodoc AUTHORS COPYRIGHT META README.md +} + +_old_layout_cleanup() { + # new files are just extra/{spl,zfs}.ko with no subdirs. + local olddir=( + avl/zavl + icp/icp + lua/zlua + nvpair/znvpair + spl/spl + unicode/zunicode + zcommon/zcommon + zfs/zfs + zstd/zzstd + ) + + # kernel/module/Kconfig contains possible compressed extentions. + local kext kextfiles + for kext in .ko{,.{gz,xz,zst}}; do + kextfiles+=( "${olddir[@]/%/${kext}}" ) + done + + local oldfile oldpath + for oldfile in "${kextfiles[@]}"; do + oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}" + if [[ -f "${oldpath}" ]]; then + ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing." + rm -rv "${oldpath}" || die + # we do not remove non-empty directories just for safety in case there's something else. + # also it may fail if there are both compressed and uncompressed modules installed. + rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die + fi + done +} + +pkg_postinst() { + # Check for old module layout before doing anything else. + # only attempt layout cleanup if new .ko location is used. + local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* ) + # We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false. + # if glob expanded -f will do correct file precense check. + [[ -f ${newko[0]} ]] && _old_layout_cleanup + + linux-mod-r1_pkg_postinst + + if use x86 || use arm ; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + if has_version sys-boot/grub ; then + ewarn "This version of OpenZFS includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of OpenZFS. To" + ewarn "create a new pool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -o compatibility=grub2 ..." + ewarn + ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features." + fi +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 79b2c443b06d..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.8 +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 42fba9971776..d3f3f23e8f01 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -12,10 +12,16 @@ DIST zfs-2.2.3.tar.gz 33854765 BLAKE2B f83439aa929609191a048dd326b2a15e0f57c72d2 DIST zfs-2.2.3.tar.gz.asc 836 BLAKE2B 86e1adc393d1f4643a6fd8c188b555e9dc0fdf7e25690f37ff0a04ff8826eb4fe3c125b54f0c5b9ab33f1daff43c4b44373ee9a4df506f6714f98d77782e6c3c SHA512 fe23ddb9bde78416776411d66a56aa662fa051c8544b4be01ba238b8c1a85ccde1c55329f228fe8ab2681b54a4e4cb08d4e927c597c117242f0b536a40921dc9 DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0 SHA512 1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17 +DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6 +DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060 +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 EBUILD zfs-2.1.14.ebuild 8907 BLAKE2B ef6fa6ab85907507d146f3ee17c12680226ffcf0b49559d2f2521b95758d5dffe8ae4763d2db2691a09cf1a9d02bda4a58de0ffad205b4ec05201b3f76f85c3e SHA512 6f106cf37a7bc7fc850f86169aa90cea904680b85d5512045b36f7853024d702ca25272bc735eb5b140598581ea5edcd67b4bf027e1b378af2f8559b01d7838d EBUILD zfs-2.1.15.ebuild 8907 BLAKE2B ef6fa6ab85907507d146f3ee17c12680226ffcf0b49559d2f2521b95758d5dffe8ae4763d2db2691a09cf1a9d02bda4a58de0ffad205b4ec05201b3f76f85c3e SHA512 6f106cf37a7bc7fc850f86169aa90cea904680b85d5512045b36f7853024d702ca25272bc735eb5b140598581ea5edcd67b4bf027e1b378af2f8559b01d7838d EBUILD zfs-2.2.2-r1.ebuild 8809 BLAKE2B cbb0a314545e47bae39a40550179a30b7649f76a743a8171fede13557d343da5fd888c2101568f236358e9c9377d71dac844c4e7f6757646922efc9cd627ed1b SHA512 27b8f2c1eaa086b51bce6fdcd733a615843e7b8bd9a134b9c954a3f85796f0a75cfcb056e583c714c59f689dc999e167054a1fd20df9f69ebb90b67e82737495 EBUILD zfs-2.2.3.ebuild 8841 BLAKE2B 038a870598987f28403f579fa6ae4b0a7f8795f765ee5fcfdaa44094b9da0ee6c0abc1f0e4d38c175bd97cbf7a4a235bf1d681d5e31e4234351bcf104a78675d SHA512 a385b01ff07c3245a86b65202cfd5cb0ac1a2d4242147a4da5d9ef8cdf67817646c1fbca268d60e93b772bb9c47ca380b67d9313e147adb08046155384879072 -EBUILD zfs-2.2.4.ebuild 8844 BLAKE2B eb9aa0625fb4f58cb31385224347512e4b1fc71ff1ed46537de764911dcc7351e39182d62b167f7cc84c394fdc0abd86efffeeaa21cb55fd45b7bc59095ca13a SHA512 f85f82ab4bf550fa139629dbf1114f6dc1507faf8bd3e469558f2d76a45455f935155938343834b02414582e22fe6b59ef6f088a9ab18ca15b6d8ec0c036ec43 -EBUILD zfs-9999.ebuild 8774 BLAKE2B 687b990541b8458069d9cf37c27fa4948e928858e8c852dae97e46ca975fbff1b26f8311358a943c8c587b59b3277378fc9445d092dc509e00716d99aace3d1b SHA512 b1710a7020598369dad2874391ad91133f89630313f4bdc637f0bf7649722b6a3d857694fc91630a0749ed94198aaeede58defd6c8044d43dacdd265dd1e8de4 +EBUILD zfs-2.2.4.ebuild 8841 BLAKE2B 038a870598987f28403f579fa6ae4b0a7f8795f765ee5fcfdaa44094b9da0ee6c0abc1f0e4d38c175bd97cbf7a4a235bf1d681d5e31e4234351bcf104a78675d SHA512 a385b01ff07c3245a86b65202cfd5cb0ac1a2d4242147a4da5d9ef8cdf67817646c1fbca268d60e93b772bb9c47ca380b67d9313e147adb08046155384879072 +EBUILD zfs-2.2.5.ebuild 8913 BLAKE2B f5cc15db3c737b46e1bc34ea9b0043e1a0cca7cf146efa1bfd9639ebba8fb64a3707ccb74780765892aeac4d9000868ec8ddad721ddbb5d65b1d5c8e2b3beba2 SHA512 511a673be6fa6db212129e6056208ac218dd64c2488c46ba2633c11f1c7008189548749c47b20b75d42887e965c8186cea2b8b815af7b083c5f9ff841328d1ee +EBUILD zfs-2.2.6.ebuild 8916 BLAKE2B cbf3f148cf51cdf10566ed6054199f87392d118521ad3bb8cdb83535f57e43838bf49df963cd6d5ea55dab3c238aea54c67fea963de9f3a14edabbaeb824ac71 SHA512 4e9c76e3c84c5e6052b926860f940a6e4727e6539acc48773460dc33803d4960456bf50b80259cffc85a71adaa1b28897148e0f0acd785bb9a7f2228b338607d +EBUILD zfs-9999.ebuild 8846 BLAKE2B 72b08de72ca0e3efef220180466f9009204bfe8952bab70c68d3acadfbb672395036a8e885c2d62db0655a2a1edfb67ac2a2ecdad525341353392c35a894eb5c SHA512 b9495470dd27db133d753831d2e03c2a0475d733274fd383dcf372bddb67dab6ec78acc00b7864e5a5239ab711e79cbe16f7d56780c84eed8b2036dfede07926 MISC metadata.xml 2093 BLAKE2B 40f9f693751748deab32cd78bb919483e37d35da74ecaa28b31a183807c25c6a7022226e761dc27f895b142274bd9920e361f45a50b98bcf2a4b701d9e67fb94 SHA512 63d91d33151eea801c854246ea2c4640ecd432e74668b8f4f6ea22d4ae61823848a1608e9ee25821ef463f5f5e8e7e1c8d2aae4f1fee492ea4112214d2d6d1ed diff --git a/sys-fs/zfs/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.4.ebuild index 71e2889ab794..950fccc9ba5f 100644 --- a/sys-fs/zfs/zfs-2.2.4.ebuild +++ b/sys-fs/zfs/zfs-2.2.4.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.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild new file mode 100644 index 000000000000..962beb163214 --- /dev/null +++ b/sys-fs/zfs/zfs-2.2.5.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" + S="${WORKDIR}/${MY_P}" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" + fi +fi + +LICENSE="BSD-2 CDDL MIT" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +# see libsoversion_check() below as well +SLOT="0/5" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" + +DEPEND=" + dev-libs/openssl:= + net-libs/libtirpc:= + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) + python? ( + $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') + ) + unwind? ( sys-libs/libunwind:= ) +" + +BDEPEND=" + app-alternatives/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + ${DISTUTILS_DEPS} + || ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/distlib[${PYTHON_USEDEP}] + ) + ) +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" +fi + +# awk is used for some scripts, completions, and the Dracut module +RDEPEND=" + ${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) + !prefix? ( virtual/udev ) + app-alternatives/awk + sys-fs/udev-init-scripts + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-alternatives/cpio + app-misc/pax-utils + ) + selinux? ( sec-policy/selinux-zfs ) + test-suite? ( + app-shells/ksh + sys-apps/kmod[tools] + sys-apps/util-linux + app-alternatives/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set, without suggesting to disable +PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch + "${FILESDIR}"/2.2.2-no-USER_NS.patch + "${FILESDIR}"/2.2.3-musl.patch +) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + if use kernel_linux; then + linux-info_pkg_setup + + if ! linux_config_exists; then + ewarn "Cannot check the linux kernel configuration." + else + if use test-suite; then + if linux_chkconfig_present BLK_DEV_LOOP; then + eerror "The ZFS test suite requires loop device support enabled." + eerror "Please enable it:" + eerror " CONFIG_BLK_DEV_LOOP=y" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +libsoversion_check() { + local bugurl libzfs_sover + bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" + + libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ + | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" + libzfs_sover="${libzfs_sover%%:*}" + + if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then + echo + eerror "BUG BUG BUG BUG BUG BUG BUG BUG" + eerror "ebuild subslot does not match libzfs soversion!" + eerror "libzfs soversion: ${libzfs_sover}" + eerror "ebuild value: $(ver_cut 2 ${SLOT})" + eerror "This is a bug in the ebuild, please use the following URL to report it" + eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" + echo + # we want to abort for releases, but just print a warning for live ebuild + # to keep package installable + [[ ${PV} == "9999" ]] || die + fi +} + +src_prepare() { + default + libsoversion_check + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi + + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + use custom-cflags || strip-flags + use minimal || python_setup + + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" + --with-vendor=gentoo + # Building zfs-mount-generator.c on musl breaks as strndupa + # isn't available. But systemd doesn't support musl anyway, so + # just disable building it. + # UPDATE: it has been fixed since, + # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a + # but we still leave it as this for now. + $(use_enable !elibc_musl systemd) + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_enable python pyzfs) + $(use_with unwind libunwind) + --disable-static + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } + + find "${ED}" -name '*.la' -delete || die + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + use minimal || python_fix_shebang "${ED}/bin" +} + +pkg_postinst() { + udev_reload + + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use rootfs; then + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then + elog "Root on zfs requires an initramfs to boot" + elog "The following packages provide one and are tested on a regular basis:" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" + elog " sys-kernel/genkernel" + fi + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" + einfo "for default zfs systemd service configuration" + else + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ + einfo "You should add zfs-load-key to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." + fi +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild new file mode 100644 index 000000000000..5264247e69af --- /dev/null +++ b/sys-fs/zfs/zfs-2.2.6.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc + inherit verify-sig + + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" + S="${WORKDIR}/${MY_P}" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" + fi +fi + +LICENSE="BSD-2 CDDL MIT" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +# see libsoversion_check() below as well +SLOT="0/5" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" + +DEPEND=" + dev-libs/openssl:= + net-libs/libtirpc:= + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) + python? ( + $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') + ) + unwind? ( sys-libs/libunwind:= ) +" + +BDEPEND=" + app-alternatives/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + ${DISTUTILS_DEPS} + || ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/distlib[${PYTHON_USEDEP}] + ) + ) +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" +fi + +# awk is used for some scripts, completions, and the Dracut module +RDEPEND=" + ${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) + !prefix? ( virtual/udev ) + app-alternatives/awk + sys-fs/udev-init-scripts + dist-kernel? ( virtual/dist-kernel:= ) + rootfs? ( + app-alternatives/cpio + app-misc/pax-utils + ) + selinux? ( sec-policy/selinux-zfs ) + test-suite? ( + app-shells/ksh + sys-apps/kmod[tools] + sys-apps/util-linux + app-alternatives/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set, without suggesting to disable +PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch + "${FILESDIR}"/2.2.2-no-USER_NS.patch + "${FILESDIR}"/2.2.3-musl.patch +) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +pkg_setup() { + if use kernel_linux; then + linux-info_pkg_setup + + if ! linux_config_exists; then + ewarn "Cannot check the linux kernel configuration." + else + if use test-suite; then + if linux_chkconfig_present BLK_DEV_LOOP; then + eerror "The ZFS test suite requires loop device support enabled." + eerror "Please enable it:" + eerror " CONFIG_BLK_DEV_LOOP=y" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +libsoversion_check() { + local bugurl libzfs_sover + bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" + + libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ + | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" + libzfs_sover="${libzfs_sover%%:*}" + + if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then + echo + eerror "BUG BUG BUG BUG BUG BUG BUG BUG" + eerror "ebuild subslot does not match libzfs soversion!" + eerror "libzfs soversion: ${libzfs_sover}" + eerror "ebuild value: $(ver_cut 2 ${SLOT})" + eerror "This is a bug in the ebuild, please use the following URL to report it" + eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" + echo + # we want to abort for releases, but just print a warning for live ebuild + # to keep package installable + [[ ${PV} == "9999" ]] || die + fi +} + +src_prepare() { + default + libsoversion_check + + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi + + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + use custom-cflags || strip-flags + use minimal || python_setup + + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" + --with-vendor=gentoo + # Building zfs-mount-generator.c on musl breaks as strndupa + # isn't available. But systemd doesn't support musl anyway, so + # just disable building it. + # UPDATE: it has been fixed since, + # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a + # but we still leave it as this for now. + $(use_enable !elibc_musl systemd) + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_enable python pyzfs) + $(use_with unwind libunwind) + --disable-static + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } + + find "${ED}" -name '*.la' -delete || die + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + use minimal || python_fix_shebang "${ED}/bin" +} + +pkg_postinst() { + udev_reload + + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + + if use rootfs; then + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then + elog "Root on zfs requires an initramfs to boot" + elog "The following packages provide one and are tested on a regular basis:" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" + elog " sys-kernel/genkernel" + fi + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" + einfo "for default zfs systemd service configuration" + else + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ + einfo "You should add zfs-load-key to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." + fi +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 7b38a676beca..d54b8ffe39b1 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -34,7 +34,7 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" DEPEND=" dev-libs/openssl:= @@ -47,6 +47,7 @@ DEPEND=" python? ( $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') ) + unwind? ( sys-libs/libunwind:= ) " BDEPEND=" @@ -220,6 +221,7 @@ src_configure() { $(use_enable nls) $(use_enable pam) $(use_enable python pyzfs) + $(use_with unwind libunwind) --disable-static $(usex minimal --without-python --with-python="${EPYTHON}") ) |