diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-07 17:57:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-07 17:57:54 +0000 |
commit | bc75b42f7650c33ffdb61e5e29b0b96cb9111932 (patch) | |
tree | 867908c0cf83e6015a5b1544cfdc4e17f1c13753 /sys-fs/btrfs-progs | |
parent | b3fef92e618039dc93153a93176184a49606c74a (diff) |
gentoo auto-resync : 07:03:2023 - 17:57:54
Diffstat (limited to 'sys-fs/btrfs-progs')
-rw-r--r-- | sys-fs/btrfs-progs/Manifest | 3 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild | 165 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch | 44 |
3 files changed, 212 insertions, 0 deletions
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 189b8296247e..f6f12e4a290d 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,14 +1,17 @@ AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719 AUX btrfs-progs-6.1.1-ioctl-fix.patch 3232 BLAKE2B 3c026b66b6289b03c8839a00232b1caa530fc88a165130e04a6fab0d0188927c0061712ff5b37deaf723201f1c5472bc96d09f11c1d85d693c337ad86ae9a6e4 SHA512 58cb8d2f03320d732ae2d2341eccefa1ddac856793ce9fbb138fc9a5f20fcb3016d1ad2a5fffb07caf41b7e190f49a1f64874ec464604f8caea302c4c116aabb +AUX btrfs-progs-6.2.1-blake2-simd.patch 1056 BLAKE2B 3a5d967cb5a362cdd5abe993b3f1006b68898b14f0915c567bceb0de6ebf37d76f9fd323461ba9bbf4e61158b8bc1d176b2cf204c31958d420b9e94812b50936 SHA512 257035a4282138a5b32d99f07b50017983052a77c661ef5519b833652362c4c015aff8043062f09f87ebc71f09b616c851b66b905a3aa8c490e1dd5080bf496c DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624c3f122149af640bc0ca73abfc85ca7bd076976d47ce2d4eab64fb3b9b1309e3446acdd78ba77e5cb583b939710f8b6c SHA512 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3 DIST btrfs-progs-v6.1.1.tar.xz 2329864 BLAKE2B f3f15829af88f83cdabca30b61dd0e53fc0913615028eac9501204adec5a5beb8654b037617a73bac96c901835a83e8c08d478b8b496518512fea3714e604cfc SHA512 996045bebc441eba269eb5159d6d13c7b1471ba88039389ef221f57d03c535647a5716e23e7a17a20efb4012003f58b4b768f66af633abbdc1fe481192ca1ace DIST btrfs-progs-v6.1.2.tar.xz 2329940 BLAKE2B d2c86b0077e0269353ac70d948b948dd2984beec0e4225529adb0099a9cfe5d778a893bedc822168141ce29679f66500e32bdf3af8973bef5696657685ebf712 SHA512 0b02502f9f0902b7db04817fcfbaa4f6155035d47dd908c4c1faa86e4677e302d069756bb0935db7c88f0859c0f9ef87975b2777be7ad7f4d2389d2e95c1ff82 DIST btrfs-progs-v6.1.3.tar.xz 2333984 BLAKE2B 71543f5be282a289fbc92f78b89b25e4162c3cbd2d3cf2e8564791f86c6f933f61c03ba93aeca029689be6284988ff35a47f25a6523f15be47f3e7ce9b5c0c4b SHA512 7c40d8bc3fcef0b2a7bf4be7d52923015b5b11c3f14bfc550ffa95a47d673f640b7deb840fee22fb7cc2743b6098fb12b5caea586fbf0972a1bc9a7606f3f375 +DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169 EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B a879f998fffa1ba80c42f8423416ff05cc23a7cf2bc797d450d2379bb61360ce2333c41d7035dad1219365194b3dd33aa1988b06de845c9d7bef1334a4618d32 SHA512 ef12dacb70e2986e3d974ad150f9d9b2b450f1fffaddb303967195c7a0f95199225fecd74f729b98adca19cffc51ed261c88dbc88ed0bfdfafe4e8b0597078b9 EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59 EBUILD btrfs-progs-6.1.1-r1.ebuild 3371 BLAKE2B 6d1dec5724837eed26ba50d9a4c0bf7f97d4783a07fd6f2ad51e8d83790acd4fce210daa846336d52bf459dfc7485ec90feff9e7005e9f46235c2faebcfcf8bd SHA512 455bc0717e4720ae7b99add5bbdf961258b8d0bd43585f8c68003bad8ee6fbcb9df666a999194c530a3c3d40abe33c39c449449874b32adaf85c69f562c00a30 EBUILD btrfs-progs-6.1.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59 EBUILD btrfs-progs-6.1.3.ebuild 3528 BLAKE2B f8cc1b0065bb23eb24227577593c0546a842a6c46b91b69d4c9b7a0aa80bce6fd4f48d9a353996be4ce2d0a7cbef9c4fac161107b4c0f7475a3f8956db865859 SHA512 5a7bbfc026045c6b0de1bfbd2dc10d4fa690d2fad85d3cb1a1927576944ee8283a776e748b82cb362587fcf418e9c135fa7fb044e6676e51b2280ce81f3f57a1 +EBUILD btrfs-progs-6.2.1.ebuild 3586 BLAKE2B 024a9f9b6b60ed76c12279e3d0e60dd250729379902ba5e4961c049e6dec66e59aecd9e846af7ec7778c62934e93da8ce1a21b5728029539c25202a1db56c9e2 SHA512 ad3209b278ad5c5d5307c3fa28b872fe102edc64ed8162b02ab313b6c19a346eb312d7e29c424639bc51aebb9fcbb367751d9097b4a347039ed4c115b787189f EBUILD btrfs-progs-9999.ebuild 3528 BLAKE2B f8cc1b0065bb23eb24227577593c0546a842a6c46b91b69d4c9b7a0aa80bce6fd4f48d9a353996be4ce2d0a7cbef9c4fac161107b4c0f7475a3f8956db865859 SHA512 5a7bbfc026045c6b0de1bfbd2dc10d4fa690d2fad85d3cb1a1927576944ee8283a776e748b82cb362587fcf418e9c135fa7fb044e6676e51b2280ce81f3f57a1 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53 diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild new file mode 100644 index 000000000000..f89547b3aa45 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild @@ -0,0 +1,165 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit bash-completion-r1 python-single-r1 udev + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + S="${WORKDIR}"/${PN}-${MY_PV} +else + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert python +man reiserfs static static-libs udev +zstd" +# Could support it with just !systemd => eudev, see mdadm, but let's +# see if someone asks for it first. +REQUIRED_USE="static? ( !udev )" + +# Tries to mount repaired filesystems +RESTRICT="test" + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.10 + convert? ( sys-apps/acl ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + static? ( + dev-libs/lzo:2[static-libs(+)] + sys-apps/util-linux:0[static-libs(+)] + sys-libs/zlib:0[static-libs(+)] + convert? ( + sys-fs/e2fsprogs[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd[static-libs(+)] ) + ) +" +BDEPEND="virtual/pkgconfig + man? ( dev-python/sphinx )" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.2.1-blake2-simd.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]]; then + AT_M4DIR="m4" eautoreconf + + mkdir config || die + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + + --enable-lzo + --disable-experimental + $(use_enable convert) + $(use_enable man documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable udev libudev) + $(use_enable zstd) + + # Could support libgcrypt, libsodium, libkcapi + --with-crypto=builtin + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_test() { + default + + 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 + fi +} + +src_install() { + local makeargs=( + $(usex python install_python '') + $(usex static install-static '') + ) + + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + + newbashcomp btrfs-completion btrfs + + use python && python_optimize +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch new file mode 100644 index 000000000000..f2531135c5c4 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-6.2.1-blake2-simd.patch @@ -0,0 +1,44 @@ +https://github.com/kdave/btrfs-progs/issues/589 +https://github.com/kdave/btrfs-progs/pull/591 + +From c7e7e2568b073b6a501eef515f3a4b6402a71211 Mon Sep 17 00:00:00 2001 +From: Tino Mai <mai.tino@gmail.com> +Date: Sun, 5 Mar 2023 18:15:52 +0100 +Subject: [PATCH] btrfs-progs: crypto: fix SSE2/SSE4.1 implementation of BLAKE2 + +--- a/crypto/blake2b-round.h ++++ b/crypto/blake2b-round.h +@@ -136,12 +136,6 @@ + + #endif + +-#if defined(HAVE_SSE41) +-#include "blake2b-load-sse41.h" +-#else +-#include "blake2b-load-sse2.h" +-#endif +- + #define ROUND(r) \ + LOAD_MSG_ ##r ##_1(b0, b1); \ + G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \ +--- a/crypto/blake2b-sse2.c ++++ b/crypto/blake2b-sse2.c +@@ -30,6 +30,7 @@ + #include <x86intrin.h> + #endif + ++#include "blake2b-load-sse2.h" + #include "blake2b-round.h" + + static const uint64_t blake2b_IV[8] = +--- a/crypto/blake2b-sse41.c ++++ b/crypto/blake2b-sse41.c +@@ -34,6 +34,7 @@ + #include <x86intrin.h> + #endif + ++#include "blake2b-load-sse41.h" + #include "blake2b-round.h" + + static const uint64_t blake2b_IV[8] = + |