diff options
Diffstat (limited to 'sys-fs')
46 files changed, 1133 insertions, 122 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 41d70381ead1..5f2415e9779f 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest index 0691478fcecc..2b0b93d9e99a 100644 --- a/sys-fs/bcache-tools/Manifest +++ b/sys-fs/bcache-tools/Manifest @@ -2,6 +2,6 @@ AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dc AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802 DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca -EBUILD bcache-tools-1.1-r1.ebuild 1438 BLAKE2B 1b5e0112d2c167e1627f7aee1f25e6306ffa906f975422171bca068c5c85f98e72ff54285a7ca14b92157304f81585db84bf5c75a80fbb52228ce0d424223952 SHA512 1c2519db9d466a3deb90563025d9b499ea63635e1b61c5acf66a4ae97a92017f98368c82d5cadfde24d1753b0796e892524c4bc6ae8114be49c9158142780cf4 +EBUILD bcache-tools-1.1-r1.ebuild 1454 BLAKE2B 1e184dadd85446f7b98022034df27205b99f59fc29895fcf223aabd5753c1954461cecca5027a0b000e0d8fc3d35df5c7f7f93177b49a135dee1316726ca1558 SHA512 b176a859f2a6e2a8bc67086f7241bd67b96ccac0e74512ecec99b9956c111f6d5baa257652ec29b43a8d034f0632793dcb4827161e903c6709434621472ba176 EBUILD bcache-tools-9999.ebuild 1431 BLAKE2B ed6ab5aa846a1b8d819b99bb4e0d70b97bb66282dcb525f0813f5366876fa628fd080677171e4fb69704954adc12b61794e183696941b2c4b1dd30622e3c8c57 SHA512 7f4f3ba740f5ffe4211adf15cbf1abcdd28b51adcb6fd45f13ceb1fc865339b31f548fd32fa2ced1cc06c72d16251be1a9ecee7f27cfbbe93b60883919b2dd77 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild index e5cb403dba17..596570f7666c 100644 --- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild +++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapsh SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 272dbc65851a..0cec5da59518 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,12 +1,15 @@ AUX 5.15-filesystem-usage-chunks.patch 2797 BLAKE2B f9f0c709fcef2aa33ba404b14f8b68f8a46d07df489d05a5979c662ea20d7dc0dd7d2c39d305b513a85eaa296061f455fa33b6cce9afbd704077f385c3772e0f SHA512 9dfff219943e7d223795e24aeaf9c3f82a1530b5fe7a7b74df27176e3e52f8a3ee30af74f9b1f59689cd0e5acf274b5eeb2e2c14d0d49e23e716fd7042a5beba AUX 5.15-filesystem-usage-data.patch 1381 BLAKE2B cf9f6b87eb75f61ce79441227d7a55e0b3b2e4317a244469f8d1e0d92e1c06b5aebeb867d2d032c5230a47a7737b1d06c58a9d753c1dc0f0537f713ae51c16e6 SHA512 f0216410964f9d15a74fa787ee01c5b7ddd6266626bbeac6e6560cdac7043c5b091dbaf054e4112639d2819744b02fd51a95ac6394702ec1602a49e29c653588 +AUX 5.16-linux-headers-before-5.11.patch 1545 BLAKE2B 2e0f333d8ba42a45cde8089070e7c020d34ccff0ceb80d9ef9caf0db46a9021e61fa97013960d21c3a74a4e5ea6542571f4ab2ac87d67486bab4d4a785420986 SHA512 62b816a18a73efca0886a8a7bf817e672d99475d279ef060cb89617d54975122aaa67e618635b759132d63541dfdccebca01067650e925723d7730a444de4397 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 +DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7 EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 EBUILD btrfs-progs-5.15-r1.ebuild 3183 BLAKE2B fc00b7541d5f2e34cb7934e689ad07f6acc9a1543dfe9f236bb34e216f2afcb8cb38660ccf0804ffc9f2e558ab5a761945dbe16a9d2241f2941f5a38cfb39016 SHA512 523711eeec516e8d2c2e10b79c8cc2c10b5a06e730338e2a2176e0ac8de82c625dfbe19985c8cc81d8a0c46ae11425fb86082d826de9cb977d435795918c0705 EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922 -EBUILD btrfs-progs-9999.ebuild 3021 BLAKE2B a03f82d5b530ecb4bcf5e45302972642433df567f4dd225c49f8a9f8baf1399d331f2bec47587d5d23cb377d397e2a1d341fa383e79cd356f6ff0beaa08b7041 SHA512 6385e0f36d35064bcb04e42a261013b680a788ad9835b1aea4f410357865ec5d39bc3bfb9f99a50a2454a1233a7bd0361f85730949dd653698be6c239bced218 +EBUILD btrfs-progs-5.16.ebuild 3090 BLAKE2B 210cf293d434288818fcd88116ddc2ece4254ab6b6f0d027d0f7e5d777448ae01fe81dd5b1cb31a6690bd6909a29a763d573a49c5ebdca191ebbb7ea84bf986b SHA512 5d2b24a3b9878ac6b51d7f84f6630357f56e6b42f27ef8877df953778fef28ebd6aa693023bfdb1bbfbf1f3146dc13b3c52a9763612138e79140a3288bd0bbc9 +EBUILD btrfs-progs-9999.ebuild 3025 BLAKE2B b79d991e41133ea913d3528d06cdbcc4e4aa93a6f7b21a67442c120ee6fd08e574f0a6728a6b1d78e0547338156747daa5815cb1b67c289c4046823ee213833c SHA512 72c910f37f3d3d8446009af6017ddd70f328ac16ae8d3295af8270cf758598317dc0dc60682761045f2fe44374de8fd9b6e9de445191e82729d4965403cef370 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild new file mode 100644 index 000000000000..015b81367170 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild @@ -0,0 +1,136 @@ +# Copyright 2008-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 python-single-r1 + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + S="${WORKDIR}/${PN}-${MY_PV}" +else + WANT_LIBTOOL=none + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert doc python reiserfs static static-libs +zstd" + +RESTRICT="test" # tries to mount repaired filesystems + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:0=[static-libs(+)?] + sys-libs/zlib:0= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + zstd? ( app-arch/zstd:0= ) +" +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:0[static-libs(+)] ) + ) +" +BDEPEND=" + doc? ( + || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + ) +" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/5.16-linux-headers-before-5.11.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 + $(use_enable convert) + $(use_enable doc documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable zstd) + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +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 + + # install prebuilt subset of manuals + use doc || doman Documentation/*.[58] +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index ffe30a969ded..bfedcff31bd3 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,7 @@ LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" IUSE="+convert doc python reiserfs static static-libs +zstd" -RESTRICT=test # tries to mount repared filesystems +RESTRICT="test" # tries to mount repaired filesystems RDEPEND=" dev-libs/lzo:2= @@ -45,7 +45,7 @@ RDEPEND=" zstd? ( app-arch/zstd:0= ) " DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-5.10 + >=sys-kernel/linux-headers-5.11 convert? ( sys-apps/acl ) python? ( $(python_gen_cond_dep ' @@ -74,7 +74,7 @@ BDEPEND=" " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -91,8 +91,8 @@ src_prepare() { 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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || 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 } @@ -107,6 +107,7 @@ src_configure() { $(use_enable zstd) --with-convert=ext2$(usex reiserfs ',reiserfs' '') ) + econf "${myeconfargs[@]}" } @@ -119,8 +120,11 @@ src_install() { $(usex python install_python '') $(usex static install-static '') ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize # install prebuilt subset of manuals diff --git a/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch new file mode 100644 index 000000000000..184656d96d22 --- /dev/null +++ b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch @@ -0,0 +1,40 @@ +https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58.patch +https://bugs.gentoo.org/831817 + +From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 +From: David Sterba <dsterba@suse.com> +Date: Thu, 13 Jan 2022 14:47:08 +0100 +Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment + macros + +There's still problem left with compilation on musl and kernel < 5.11, +because __ALIGN_KERNEL is not defined anymore: + +../bin/ld: kernel-shared/volumes.o: in function `create_chunk': +volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' + +Due to the entangled includes and unconditional definition of +__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it +eventually (as kerncompat.h is the first include). Instead add local +definitions of the macros and rename them to avoid name clashes. + +Pull-request: #433 +Signed-off-by: David Sterba <dsterba@suse.com> +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -359,7 +359,14 @@ do { \ + + /* Alignment check */ + #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ++ ++/* ++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around ++ * issues caused by moving the definition in 5.12 ++ */ ++#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) ++#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) + + static inline int is_power_of_2(unsigned long n) + { diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest index 2ff825bd6aca..ee552ea0daf8 100644 --- a/sys-fs/compsize/Manifest +++ b/sys-fs/compsize/Manifest @@ -3,6 +3,6 @@ DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a 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 919 BLAKE2B 6050947b62cc7c554bd70088330f35a536aca28a09311d70343d30bb69d83ce02b217217519a517360b6c96293ed0dc275ca1008d00103ac16eba69dec641b1a SHA512 6e9c29a79d7e2472b6f3805cbce271a1a8b7590d34944cb24c56fd7d01793ef1a2543b041183fc4621980a23b1d186fbed6f26cf2c8cb2b027854e544823efc0 -EBUILD compsize-9999.ebuild 921 BLAKE2B 71ec177637d558bf1b13682f61f0a842d711f523c7d762f9a2314d13e27daf9c686d83570799569d69e239add78719e7ebc3e43b3dbd678bc026b8f8333eed2b SHA512 1ff43f6b513bd42131810d6a8ec7b9cfcef922d9b88f76a39d8d0218036576cc8089ebfd3ee87aa64496eb91515b29b429c0655adafa8f63d03b2c4e107f42be +EBUILD compsize-1.5.ebuild 926 BLAKE2B 6f0e8aa2bcfa3bb44c138d80e14d7c6a91a244b98bfca7c438e0d5df0a4f1f29da23863bdc8b730de70e28c3ddbbdfb978a003734163e1e243eafb9532a7b6af SHA512 697983ddada491537e0b4b89ea084a4ea3ba3185f44e648d58904b51f10813b2a65b33bfdb4417a1358476bbaa0cbfcb17585a2f6d22b2548e817f9fa1d58eba +EBUILD compsize-9999.ebuild 928 BLAKE2B d4d28ece9fe5dc19d5c3d73f3649435fa1e5c2c7ddf4760d31459e0e763c46bb9197406df24cacc75c9173d44800f62e96317e7a42522ceb131d6f5cd2baf461 SHA512 37fc6165e87491beaa790d2a2daf5efb17149b8334700fac8d71c5b7333ef1798d7afe96b3e1d75576ecf9cc90eb697d58bcf3dd6ee6d3d426b10b08e675677e MISC metadata.xml 474 BLAKE2B 442dc5f5362971102df052aa03e1339e8e5214005fb89ccf646a7768abd359df4aeff26e24bb67066aa26f8d02af44a4728d8bf27676f2ed9097d897ab7a832e SHA512 3029112b063d14404d9db8c8624691feb1a461fd3463ceff8c05b0c69b1428568271c7efcf49ead94c472c5fee2231950064762218ed1f3b80cae4ea62e971eb diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild index 19890bad1285..8c0a769fa8ad 100644 --- a/sys-fs/compsize/compsize-1.5.ebuild +++ b/sys-fs/compsize/compsize-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then 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 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" fi LICENSE="GPL-2+ GPL-2" diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild index 1fd07df8eb27..8e5c209de18a 100644 --- a/sys-fs/compsize/compsize-9999.ebuild +++ b/sys-fs/compsize/compsize-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then 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 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi LICENSE="GPL-2+ GPL-2" diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index e5984aabdb33..faefe191be0e 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -2,6 +2,8 @@ AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499a AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194 AUX 2.4.0-dmcrypt.confd 4009 BLAKE2B efaf826fc78b60068aeddb6d5fbd9665bcf85e66c5f0b48fa74316d8ad98fb5400ed89f674b6a93e30d76fa1adc3391a209a95936156fcd472b779cf5dbdd8b4 SHA512 131cee054019eed3f1939615386ba849bad2b02e31042075d5839e9a5943c8716431aae01aece25b2193645bcd706e14e6c947ee59f1fab4c2d7e0afc80228be AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f66ba4be5df1a0d29da7c1dadd0e2379a5f4ef35a9b17d4cb11fe2419cce6cad2df63546370b6a1975b SHA512 7f32bd09e22405deb4a7cd8233da0262764233562421a8fb49bd625be591f1dc27154c2204462df480668ab2f1a81aab5a992f426603a8a4fd86cd15a27a6a97 +AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a +AUX 2.4.3-dmcrypt.rc 9693 BLAKE2B a426ad90c9e4540a82873cd3a1594def778063c97278b2f82cfefd79cedecda97f1b6038775ce34433ba25519e3fb565bc0b79eedb39b46080a2fec68d564a99 SHA512 9f2ff42e0ef1ab3046b545c550153e13ae7d2446560b4154c23e32ca2dd8c2871e68b07bf8cc273c18730ad6e13b50b07aadb91ae7f43077ab08bdce01db5323 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf AUX cryptsetup-2.4.1-external-tokens.patch 1015 BLAKE2B ca7b5940caf000cc97742dfcbf8ee38e9fec049a4a3788737b283851dc3fd340664d332aff507f8d9d5962bca66b56a232419902114ac08ace5df76825cccd1a SHA512 23dff40a535ac1d4ccae41cc7a24e0ca53b412e0f6c0fc3e4a8ef7b7255ed28d8010a5684aa5029ec1d5d534196c4fbb83bc2a1ab5794cc6197b19f1a0696bab AUX cryptsetup-2.4.1-fix-static-pwquality-build.patch 5226 BLAKE2B 1dfd8b001e8284d5efd5afe0d67a401d334e9588baf6d0f18f533694dd4a22a782066ee43f22fe5bfaea51fc09beac127e91c77b07fc9a63778b55b25e0d2ebf SHA512 71a3f63b86de72ccfa49c9294db433da7f1fd6366e328f7311051edfd980f630ca3435ef8c5e92c55083eb3b25a3b2bbafa75282de1bf65be6820655b7556f2f @@ -14,5 +16,6 @@ EBUILD cryptsetup-2.3.6-r2.ebuild 3908 BLAKE2B f2b709398da106f2d2b89365d67eee729 EBUILD cryptsetup-2.3.7.ebuild 3916 BLAKE2B 388637eba177bef5223c9177d9eb9b94d7f761a0a1bf36ce0a8e6ae93f13d772b28b0ac1c69a26ce47abece968a2c05c9ba514aba9c631053f9d4334b2c49690 SHA512 e5192bc51873547e8dae79f035b61c624ba3da3e64936ccae39359717f1e5a9ac5c3d5a7bacd38b994f556c81d15a0dc8bdc9aa1d99b66f976706da9095f8161 EBUILD cryptsetup-2.4.1-r1.ebuild 4283 BLAKE2B 599590bf68883aad5e64b6a5affc0a464df4339abd11fe9088ea980fc400ba5bc6e7a5fbbd4792a73f735351ea348d1ade9ed42fb9480c991be5e48753799f3c SHA512 bf6ed2dd41144874931c56c4fb697ae4c3df696fefa11373352921729e9e4b9db4f8cd0f4094ba170ebe7a5e8a61c76673b0bc554857090b61f9e0b6ad61f51e EBUILD cryptsetup-2.4.2-r1.ebuild 4067 BLAKE2B 47d2c7ceb821587d2b5d3940504021a3310838c4fe5233f19c12def4e9a0799f6cb284539f665fc8f2c98457ffa9f72ea8ef4317cd4453d409ce68d208d5e412 SHA512 327ba8aac24198eaf4bbe7a4e8575132679d71f0809c1ede7156f2b89409a1901ce7057dbb9b61cd6237df153ba186c09bf6d98fd559a9f02bdd03fb633c3a31 -EBUILD cryptsetup-2.4.3.ebuild 4166 BLAKE2B a9c6f6624d992b4ce553c8e403ce9b96f0de95d7c4aedb9bfe305155c06dd58ec1196e9143ee265474bb9fbfb455c64aced077561c0f01f2ad596f7a27c860b7 SHA512 3ed1c66542af358f6aef0175e6a854dd3ac013e7c4083afc9a01ba1e7d1abf97f5f88d8a42b83478d6a85e8e8685d54880d689a497f597adf1c3e956a6c4a08f +EBUILD cryptsetup-2.4.3-r1.ebuild 4166 BLAKE2B 2948d53179b21118c836517a331c3953ec841280184f45785007628279b1867690e2fc6f0a27b8a7b04bfe3bba9cbf6caf0f4c7f85a767ecee81bfbe409f4477 SHA512 154551b6479d77b92516f65fe2cec57e912763b4d12e658080f0284d59e935a2e6ae5580e3ce7ae9898e278c6089bcf3535692d8b7a195dc4d57e717e0adc30b +EBUILD cryptsetup-2.4.3.ebuild 4158 BLAKE2B 5741edc9c554116fa4e8b97f0b32092d62a7c3b7eca8b80e41c536f804b0def495ff990bb47b6dc5ae12080b8d42bb0d8a900bf5a07a495a290a57a5de7bcecb SHA512 80e6086898dd01acb12070e4d116863c286298db125ae03a222591ae8bba854fae03d1da1746e8f55ec242e992a9cf6d0f56ab5a64348f9e680675d0d4bdfa5c MISC metadata.xml 1076 BLAKE2B 132b07201bfa3a7d8889d0b2558c15f35829bfa021b31cd5a9cf2cb21de822ceb89fae177b014590f46411cd609b4e44b20165b07c7676483a547987fffcbb9d SHA512 b06b884e0e369022cea4b3634d9df3c7d62d854754969d0c7848a3baf3a3ea69cce2131527539600424c72c539e502378b0627ba7c4fdcbc74e6f7a58b5800a8 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild new file mode 100644 index 000000000000..3337dfaa89a0 --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info tmpfiles + +DESCRIPTION="Tool to setup encrypted devices with dm-crypt" +HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" +SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/12" # libcryptsetup.so version +[[ ${PV} != *_rc* ]] && \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +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 nls pwquality reencrypt ssh static static-libs test +udev urandom" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) + static? ( !gcrypt !udev )" #496612 + +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. #414665 +RDEPEND="static-libs? ( ${LIB_DEPEND} ) + ${LIB_DEPEND//\[static-libs\([+-]\)\]} + udev? ( virtual/libudev:= )" +# vim-core needed for xxd in tests +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( app-editors/vim-core )" +BDEPEND=" + virtual/pkgconfig +" + +S="${WORKDIR}/${P/_/-}" + +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() { + sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die + default +} + +src_configure() { + 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 + + local myeconfargs=( + --disable-internal-argon2 + --enable-shared + --sbindir=/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 reencrypt cryptsetup-reencrypt) + $(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) + $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2') + ) + 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 + if use reencrypt ; then + mv "${ED}"/sbin/cryptsetup-reencrypt{.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 +} diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild index bcaafc0292c5..f1679bbf84ec 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version [[ ${PV} != *_rc* ]] && \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" 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 diff --git a/sys-fs/cryptsetup/files/2.4.3-dmcrypt.confd b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.confd new file mode 100644 index 000000000000..8250e8268ac9 --- /dev/null +++ b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.confd @@ -0,0 +1,120 @@ +# /etc/conf.d/dmcrypt + +# For people who run dmcrypt on top of some other layer (like raid), +# use rc_need to specify that requirement. See the runscript(8) man +# page for more information. + +#-------------------- +# Instructions +#-------------------- + +# Note regarding the syntax of this file. This file is *almost* bash, +# but each line is evaluated separately. Separate swaps/targets can be +# specified. The init-script which reads this file assumes that a +# swap= or target= line starts a new section, similar to lilo or grub +# configuration. + +# Note when using gpg keys and /usr on a separate partition, you will +# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly +# and ensure that gpg has been compiled statically. +# See http://bugs.gentoo.org/90482 for more information. + +# Note that the init-script which reads this file detects whether your +# partition is LUKS or not. No mkfs is run unless you specify a makefs +# option. + +# Global options: +#---------------- + +# How long to wait for each timeout (in seconds). +dmcrypt_key_timeout=1 + +# Max number of checks to perform (see dmcrypt_key_timeout). +#dmcrypt_max_timeout=300 + +# Number of password retries. +dmcrypt_retries=5 + +# Arguments: +#----------- +# target=<name> == Mapping name for partition. +# swap=<name> == Mapping name for swap partition. +# source='<dev>' == Real device for partition. +# Note: You can (and should) specify a tag like UUID +# for blkid (see -t option). This is safer than using +# the full path to the device. +# key='</path/to/keyfile>[:<mode>]' == Fullpath from / or from inside removable media. +# header='</path/to/header>' == Full path to detached LUKS header file. +# remdev='<dev>' == Device that will be assigned to removable media. +# gpg_options='<opts>' == Default are --quiet --decrypt +# options='<opts>' == cryptsetup, for LUKS you can only use --readonly +# loop_file='<file>' == Loopback file. +# Note: If you omit $source, then a free loopback will +# be looked up automatically. +# pre_mount='cmds' == commands to execute before mounting partition. +# post_mount='cmds' == commands to execute after mounting partition. +# wait=5 == wait given amount of seconds for source or +# detached header file appear. +#----------- +# Supported Modes +# gpg == decrypt and pipe key into cryptsetup. +# Note: new-line character must not be part of key. +# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' + +#-------------------- +# dm-crypt examples +#-------------------- + +## swap +# Swap partitions. These should come first so that no keys make their +# way into unencrypted swap. +# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom +# If no makefs is given then mkswap will be assumed +#swap=crypt-swap +#source='/dev/hda2' + +## /home with passphrase +#target=crypt-home +#source='/dev/hda5' + +## /home with regular keyfile +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey' + +## /home with regular keyfile and detached header +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey' +#header='/full/path/to/header/file' + +## /home with gpg protected key +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey:gpg' + +## /home with regular keyfile on removable media(such as usb-stick) +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey' +#remdev='/dev/sda1' + +## /home with gpg protected key on removable media(such as usb-stick) +#target=crypt-home +#source='/dev/hda5' +#key='/full/path/to/homekey:gpg' +#remdev='/dev/sda1' + +## /tmp with regular keyfile +#target=crypt-tmp +#source='/dev/hda6' +#key='/full/path/to/tmpkey' +#pre_mount='/sbin/mkreiserfs -f -f ${dev}' +#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' + +## Loopback file example +#target='crypt-loop-home' +#source='/dev/loop0' +#loop_file='/mnt/crypt/home' + +# The file must be terminated by a newline. Or leave this comment last. diff --git a/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc new file mode 100644 index 000000000000..0903ac5eabd0 --- /dev/null +++ b/sys-fs/cryptsetup/files/2.4.3-dmcrypt.rc @@ -0,0 +1,367 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use modules + before checkfs fsck + + if grep -qs ^swap= "${conf_file}" ; then + before swap + fi +} + +# We support multiple dmcrypt instances based on $SVCNAME +conf_file="/etc/conf.d/${SVCNAME}" + +# Get splash helpers if available. +if [ -e /sbin/splash-functions.sh ] ; then + . /sbin/splash-functions.sh +fi + +# Setup mappings for an individual target/swap +# Note: This relies on variables localized in the main body below. +dm_crypt_execute() { + local dev ret mode foo source_dev + + if [ -z "${target}" -a -z "${swap}" ] ; then + return + fi + + # Set up default values. + : ${dmcrypt_key_timeout:=1} + : ${dmcrypt_max_timeout:=300} + : ${dmcrypt_retries:=5} + : ${wait:=5} + + # Handle automatic look up of the source path. + if [ -z "${source}" -a -n "${loop_file}" ] ; then + source=$(losetup --show -f "${loop_file}") + fi + case ${source} in + *=*) + i=0 + while [ ${i} -lt ${wait} ]; do + if source_dev="$(blkid -l -t "${source}" -o device)"; then + source="${source_dev}" + break + fi + : $((i += 1)) + einfo "waiting for source \"${source}\" for ${target}..." + sleep 1 + done + ;; + esac + if [ -z "${source}" ] || [ ! -e "${source}" ] ; then + ewarn "source \"${source}\" for ${target} missing, skipping..." + return + fi + + if [ -n "${header}" ] ; then + header_opt="--header=${header}" + + i=0 + while [ ! -e "${header}" ] && [ ${i} -lt ${wait} ] ; do + : $((i += 1)) + einfo "Waiting for header ${header} to appear for ${target} ${i}/${dmcrypt_max_timeout} ..." + sleep 1 + done + if [ ${i} -gt ${wait} ] || [ ${i} -eq ${wait} ] ; then + ewarn "Waited ${i} times for header file ${header}. Aborting ${target}." + return + fi + else + header_opt="" + fi + + if [ -n "${target}" ] ; then + # let user set options, otherwise leave empty + : ${options:=' '} + elif [ -n "${swap}" ] ; then + if cryptsetup ${header_opt} isLuks ${source} 2>/dev/null ; then + ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup." + return + fi + target=${swap} + # swap contents do not need to be preserved between boots, luks not required. + # suspend2 users should have initramfs's init handling their swap partition either way. + : ${options:='-c aes -h sha1 -d /dev/urandom'} + : ${pre_mount:='mkswap ${dev}'} + fi + + if [ -n "${loop_file}" ] ; then + dev="/dev/mapper/${target}" + ebegin " Setting up loop device ${source}" + losetup ${source} ${loop_file} + fi + + # cryptsetup: + # open <device> <name> # <device> is $source + # create <name> <device> # <name> is $target + local arg1="create" arg2="${target}" arg3="${source}" + if cryptsetup ${header_opt} isLuks ${source} 2>/dev/null ; then + arg1="open" + arg2="${source}" + arg3="${target}" + fi + + # Older versions reported: + # ${target} is active: + # Newer versions report: + # ${target} is active[ and is in use.] + if cryptsetup ${header_opt} status ${target} | egrep -q ' is active' ; then + einfo "dm-crypt mapping ${target} is already configured" + return + fi + splash svc_input_begin ${SVCNAME} >/dev/null 2>&1 + + # Handle keys + if [ -n "${key}" ] ; then + read_abort() { + # some colors + local ans savetty resettty + [ -z "${NORMAL}" ] && eval $(eval_ecolors) + einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) " + shift + # This is ugly as s**t. But POSIX doesn't provide `read -t`, so + # we end up having to implement our own crap with stty/etc... + savetty=$(stty -g) + resettty='stty ${savetty}; trap - EXIT HUP INT TERM' + trap 'eval "${resettty}"' EXIT HUP INT TERM + stty -icanon + stty min 0 time "$(( $2 * 10 ))" + ans=$(dd count=1 bs=1 2>/dev/null) || ans='' + eval "${resettty}" + if [ -z "${ans}" ] ; then + printf '\r' + else + echo + fi + case ${ans} in + [yY]) return 0;; + *) return 1;; + esac + } + + # Notes: sed not used to avoid case where /usr partition is encrypted. + mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg + key=${key%:*} + case "${mode}" in + gpg|reg) + # handle key on removable device + if [ -n "${remdev}" ] ; then + # temp directory to mount removable device + local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$" + if [ ! -d "${mntrem}" ] ; then + if ! mkdir -p "${mntrem}" ; then + ewarn "${source} will not be decrypted ..." + einfo "Reason: Unable to create temporary mount point '${mntrem}'" + return + fi + fi + i=0 + einfo "Please insert removable device for ${target}" + while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do + foo="" + if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then + # keyfile exists? + if [ ! -e "${mntrem}${key}" ] ; then + umount -n "${mntrem}" + rmdir "${mntrem}" + einfo "Cannot find ${key} on removable media." + read_abort "Abort" ${dmcrypt_key_timeout} && return + else + key="${mntrem}${key}" + break + fi + else + [ -e "${remdev}" ] \ + && foo="mount failed" \ + || foo="mount source not found" + fi + : $((i += 1)) + read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return + done + else # keyfile ! on removable device + if [ ! -e "${key}" ] ; then + ewarn "${source} will not be decrypted ..." + einfo "Reason: keyfile ${key} does not exist." + return + fi + fi + ;; + *) + ewarn "${source} will not be decrypted ..." + einfo "Reason: mode ${mode} is invalid." + return + ;; + esac + else + mode=none + fi + ebegin " ${target} using: ${header_opt} ${options} ${arg1} ${arg2} ${arg3}" + if [ "${mode}" = "gpg" ] ; then + : ${gpg_options:='-q -d'} + # gpg available ? + if command -v gpg >/dev/null ; then + i=0 + while [ ${i} -lt ${dmcrypt_retries} ] ; do + # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected. + # save stdin stdout stderr "values" + timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \ + cryptsetup ${header_opt} --key-file - ${options} ${arg1} ${arg2} ${arg3} + ret=$? + # The timeout command exits 124 when it times out. + [ ${ret} -eq 0 -o ${ret} -eq 124 ] && break + : $(( i += 1 )) + done + eend ${ret} "failure running cryptsetup" + else + ewarn "${source} will not be decrypted ..." + einfo "Reason: cannot find gpg application." + einfo "You have to install app-crypt/gnupg first." + einfo "If you have /usr on its own partition, try copying gpg to /bin ." + fi + else + if [ "${mode}" = "reg" ] ; then + cryptsetup ${header_opt} ${options} -d ${key} ${arg1} ${arg2} ${arg3} + ret=$? + eend ${ret} "failure running cryptsetup" + else + cryptsetup ${header_opt} ${options} ${arg1} ${arg2} ${arg3} + ret=$? + eend ${ret} "failure running cryptsetup" + fi + fi + if [ -d "${mntrem}" ] ; then + umount -n ${mntrem} 2>/dev/null >/dev/null + rmdir ${mntrem} 2>/dev/null >/dev/null + fi + splash svc_input_end ${SVCNAME} >/dev/null 2>&1 + + if [ ${ret} -ne 0 ] ; then + cryptfs_status=1 + else + if [ -n "${pre_mount}" ] ; then + dev="/dev/mapper/${target}" + eval ebegin \"" pre_mount: ${pre_mount}"\" + eval "${pre_mount}" > /dev/null + ewend $? || cryptfs_status=1 + fi + fi +} + +# Lookup optional bootparams +get_bootparam_val() { + # We're given something like: + # foo=bar=cow + # Return the "bar=cow" part. + case $1 in + *=*) + echo "${1#*=}" + ;; + esac +} + +start() { + local print_header=true cryptfs_status=0 + local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev + + local x + for x in $(cat /proc/cmdline) ; do + case "${x}" in + key_timeout=*) + dmcrypt_key_timeout=$(get_bootparam_val "${x}") + ;; + esac + done + + while read targetline <&3 ; do + case ${targetline} in + # skip comments and blank lines + ""|"#"*) continue ;; + # skip service-specific openrc configs #377927 + rc_*) continue ;; + esac + + ${print_header} && ebegin "Setting up dm-crypt mappings" + print_header=false + + # check for the start of a new target/swap + case ${targetline} in + target=*|swap=*) + # If we have a target queued up, then execute it + dm_crypt_execute + + # Prepare for the next target/swap by resetting variables + unset gpg_options key loop_file target options pre_mount post_mount source swap remdev wait header header_opt + ;; + + gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|wait=*|source=*|header=*) + if [ -z "${target}${swap}" ] ; then + ewarn "Ignoring setting outside target/swap section: ${targetline}" + continue + fi + ;; + + dmcrypt_*=*) + # ignore global options + continue + ;; + + *) + ewarn "Skipping invalid line in ${conf_file}: ${targetline}" + ;; + esac + + # Queue this setting for the next call to dm_crypt_execute + eval "${targetline}" + done 3< ${conf_file} + + # If we have a target queued up, then execute it + dm_crypt_execute + + ewend ${cryptfs_status} "Failed to setup dm-crypt devices" +} + +stop() { + local line print_header + + # Break down all mappings + print_header=true + egrep "^(target|swap)=" ${conf_file} | \ + while read line ; do + ${print_header} && einfo "Removing dm-crypt mappings" + print_header=false + + target= swap= + eval ${line} + + [ -n "${swap}" ] && target=${swap} + if [ -z "${target}" ] ; then + ewarn "invalid line in ${conf_file}: ${line}" + continue + fi + + ebegin " ${target}" + cryptsetup ${header_opt} remove ${target} + eend $? + done + + # Break down loop devices + print_header=true + grep '^source=./dev/loop' ${conf_file} | \ + while read line ; do + ${print_header} && einfo "Detaching dm-crypt loop devices" + print_header=false + + source= + eval ${line} + + ebegin " ${source}" + losetup -d "${source}" + eend $? + done + + return 0 +} diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest index 3bee3811aea6..b33dea7ca1a6 100644 --- a/sys-fs/ddrescue/Manifest +++ b/sys-fs/ddrescue/Manifest @@ -1,5 +1,5 @@ -DIST ddrescue-1.24.tar.lz 85244 BLAKE2B e8b5ca5c89a65bed6126737125d78b2af9cdd7fe9b20f1f03636d58249d33dc08cb1907eca35c35d3ff81dd031290177084ae5dcc1cac20e79cb6c182cb894e4 SHA512 2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa DIST ddrescue-1.25.tar.lz 87001 BLAKE2B 45054ecb6ca12f8fe27d6b783f7e339fc11a9a3425160012e0682e39644fd3c91362ecd568a2a0b93f9f0af87fae2415b33a7c3fcd8fff2262898e8474818a00 SHA512 90e344a618e385730836218817588f6854db6d1acdf357bf60bdba04c76382e73041dfc367ba4de60062992ee74b2da58417f6e464ffbeed10ec89fac110f4b8 -EBUILD ddrescue-1.24.ebuild 875 BLAKE2B a483a5cba8aff117f0c22f88bbf3cecde193556d8f6168adee6ee6d2dc57b65246c383104df5060db7a5071ce00175d0d5978088353c05fe894a25a5ce05870f SHA512 a2bd0a8a8373e4bd4fb77c0ce1d01e2e97b69b4cfb9b7fe1451443d14b7ac5e85db4ee9858af78a40c22d9b199091a1a0cf325c0b132cf704980ce9af8288bfb +DIST ddrescue-1.26.tar.lz 91930 BLAKE2B c545499e380587729eb3fcc90a7baf66288348dc88027dfc14401ec72254cc786d8ab7be076a346964327668ff719048dada916c9f1514a765a255f02c5666c7 SHA512 bbe414563d459a1ad1c4e55848214d195e01f8bc455104eddbeff7046623f5bc21d961457d27ace2605d13dff68c7948182706b8afe6755e5c363e8cad86a1cc EBUILD ddrescue-1.25.ebuild 875 BLAKE2B f536aa8813c6c4b848ff13bcb4a0a7c906d1ab657f512bcbc19d551bdb2e1db45b5724c642577af307294e967d9121122fae36ee59ad6b5bf084a85c4b14c000 SHA512 aa48c34785bc64d91efe68cd2e72c97e60da455d3cdfc694e42a075e85140a6b0d85c7b55dc6ce09b5608f6734593e84ee09cda472cebe63516f96754d35a31e +EBUILD ddrescue-1.26.ebuild 879 BLAKE2B fdc43c7c56730fe1b97770f256d91de435d451fb98effff06c8f2b4b5fd178e3f0eb9f071808c149ff668111abb9729673c757d6825304d93ca897b911da05eb SHA512 0b325ece1fbc3ccd2e08cd03c962208376497c72386aae4f7da1030f74cd6bbc8975128cb677c116633b36afd7e702bb063b3003345eb49df0ffb98a4e295ebe MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc diff --git a/sys-fs/ddrescue/ddrescue-1.24.ebuild b/sys-fs/ddrescue/ddrescue-1.26.ebuild index 8654cb69e953..6bfb7ba4f767 100644 --- a/sys-fs/ddrescue/ddrescue-1.24.ebuild +++ b/sys-fs/ddrescue/ddrescue-1.26.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs flag-o-matic unpacker @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="static" DEPEND="$(unpacker_src_uri_depends)" diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest index 71fe504cc25c..5c979d2e29bb 100644 --- a/sys-fs/duperemove/Manifest +++ b/sys-fs/duperemove/Manifest @@ -1,3 +1,3 @@ DIST duperemove-0.11.3.tar.gz 158445 BLAKE2B dff7fdcf8468933c21753a8253067dddc400d2baec4052cd70cd3d94e92ad6e612bb24ffc12ad4a79e356747dcf4ceba15aa3bf6b3fca4a7a0b829f7c2783391 SHA512 0669cbb8a08082b9c2b62aff26759951e3e2c1b2236676ac6d79b9639027f775e4e5a218d1c7930b33ad7cca39726764cce5ac3063dc7d2049eb65fc4431af89 -EBUILD duperemove-0.11.3.ebuild 701 BLAKE2B e97ff112928f733e72f6bdaf1687fe4aa4ea8a8ec3c39a7a8a5393095bb78c841ee3047118ef6bb80b39a30847d433d554b34b6077730e9788021332e6ae4a1d SHA512 6144301b1501f93716df4b59a339658526eb9a0993ce91fba393fe5841e3db7f8ca3641d51d2f0720aba10130c2b921b0c80e61a6871dc733da9ffbd5d6aa6d6 +EBUILD duperemove-0.11.3.ebuild 708 BLAKE2B 969a22f61f7bad682b9d617dffbf4b448883150a483c5ec5d2e5666cdda0701e5c52c2f293a5b7c0366b17b52a39782af317f41dadf58e6a31c7076df6fda08b SHA512 1526f79f327e2106d0884a7e0fddfd91fef122cebdfdcfbe048979d85c4a3e70ec1f52c0c62d4e033673b7719dfe2cf21a80108200d3858e23be61bdcab067f3 MISC metadata.xml 334 BLAKE2B 375ee51b86214e9cc0d3b68727d83314d2694fa25f36758f7af1e691bcbc620896576c4f957809429d527ab0d9e6c6464af4850d13991b7174f8118901fd9985 SHA512 6ff5e136e085723546f070d388e9da22a902461629c799985fb2563c3eb3ca7b05794b4bcc96bedee97dd5a65551b2c74aeadbb3e2880a3ffa6426a9fea05bac diff --git a/sys-fs/duperemove/duperemove-0.11.3.ebuild b/sys-fs/duperemove/duperemove-0.11.3.ebuild index e26abe5c4f9d..2f93aae79038 100644 --- a/sys-fs/duperemove/duperemove-0.11.3.ebuild +++ b/sys-fs/duperemove/duperemove-0.11.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> $ LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="" RDEPEND=" diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest index bb8fc19a7fc9..8cf4fea5fa92 100644 --- a/sys-fs/erofs-utils/Manifest +++ b/sys-fs/erofs-utils/Manifest @@ -1,5 +1,7 @@ +AUX 1.4-dump-fix-de-nid-issues.patch 4849 BLAKE2B 48e29859955f5e7b13af7657a2411bad139de6cc373f17392bcd0b6cde55a83993795ff3f298f87fdfd950a0222c0f70714de161e02e9b2ad32b2afc513d8e4d SHA512 50d734ebbb7a7bd1c16bd90bae59e639213e607b2017cb16e65e1e3c653f604761136309564f77e80573196d7693e6ed90c30f9e35b9d3dafdb8365c38e1b0c3 +AUX 1.4-fsck-add-missing-include.patch 878 BLAKE2B e7d32eced8199a6c282d7398cea068cf560d9715caf035c67127f25fdf7055492fe25c56703e166a683f40cbb7d6ed6723c5d97467bec22f67418bb9b3bcfc5b SHA512 4cffb6faf7e1bb8150347ba8e47e0b05ad1b7d5dd4eb265330a33d6054dc6157e780a38b80a17cb61d3ab1fb2b41f36fcf65c39846f30003bc6013d23028c1fa DIST erofs-utils-1.3.tar.gz 66135 BLAKE2B 1051cf387d059d71b91e0a940c86b819593902606ae4665a7801e9597dd72987385bee997d2d63b186c493557ee22118aff23161e48e25ee8f4859f9f6e46f14 SHA512 6ddd8402dab80b0375b012ed51ff02b40cbeca9a4a1ba250b14ec6aeb97317ab575e315e9d4dc77ed1d7826c202396d9c0775917106ecbd7b4048168aca0fa6c DIST erofs-utils-1.4.tar.gz 93979 BLAKE2B aef1dca8cb95e6104d73a84590319d3c55aba1a4ef5dbdbf470662cb86ee1b66a5707dc1c453470115ec6f2bf1246ee4b6b28aa1cb83b4cb9c8eed45e88668d4 SHA512 ab95d6a7b2d278ee443d1e378c62354db66ce7ab5ce03b3a8d9004cf498c4e43e3e8ced6524444d2ea4871c4db0195489f033180c8a2082c2cba69c46c09692f EBUILD erofs-utils-1.3-r1.ebuild 764 BLAKE2B 5cbead7514b99927f1240a32fbfab4450044cc4ad591350404f34fc675fb4f99f78f1cdb85e17410ebf7f308868bc810009baeda584d6662ef6552dacdaba776 SHA512 7cc5ab682b875e80233971ea3337759ed10311fe9161dd984dcaa5ab8b863856abe10fa0de5c06c41d68f1fb09aef399c58227a6dac1b5fd74f1cef373af3660 -EBUILD erofs-utils-1.4.ebuild 956 BLAKE2B d24d49dc49a6e270ad917efee45512b294558a2f845ed0e925ef0db9d94a316277d3a44b90e865bcb54933fffa2dc8829af137f78811495cbfaa8ed1c6163ddd SHA512 3c6c2623407caf32b8afc578936f06a98b25836fc36a679beb32710b994f10ccf929f519ddcf448ee87490d02abd203d4588fa1b8f6a735787d07b478df59543 +EBUILD erofs-utils-1.4.ebuild 1071 BLAKE2B 23d2283c8dea2b66432dfaaa832c7eeb0767a6b5a60e140499f96aaddb9d826fe7628cce864c5fdf7185b65ca65c554f87e5a6774d00caf16c3f49cf8776f126 SHA512 c83b7acb8abb9a986e078d9713cd4f811fb64c9f6f60c65776b28b56c5c84e609185d8c9ae41913758aac357e71764d652d18ce50128d2eb6083c0247df63ffd MISC metadata.xml 572 BLAKE2B dcc6b6c78cac3161d2b2401f1da18787b5a201009da43978c7ce74c22cbd4141e1cfebd417118b90a34ee42e5290ebb5b5c5974ba770f9c3fd1f9da244a194f1 SHA512 756d65689fc5bdf12160429137b2012ea1dc934c3082b2737c5974006193858681e26d9b89b594bfb2b15176d947d3cf83b5800346365bbc4f45cb03aa57560c diff --git a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild index 1682bcdfb6d0..158c90277a0b 100644 --- a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild +++ b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild @@ -24,6 +24,11 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PV}-dump-fix-de-nid-issues.patch" + "${FILESDIR}/${PV}-fsck-add-missing-include.patch" +) + src_prepare() { default eautoreconf diff --git a/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch b/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch new file mode 100644 index 000000000000..4c833d737fa2 --- /dev/null +++ b/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch @@ -0,0 +1,134 @@ +From 35b15cc9c75cc2d7782f36433bad90326e9cb060 Mon Sep 17 00:00:00 2001 +From: Gao Xiang <xiang@kernel.org> +Date: Mon, 22 Nov 2021 07:48:48 +0800 +Subject: [PATCH 1/2] erofs-utils: dump: fix de->nid issues + +As David Michael reported, " + In file included from main.c:11: + main.c: In function 'erofs_checkdirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | "<E> " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:264:17: note: in expansion of macro 'erofs_err' + 264 | erofs_err("invalid file type %llu", de->nid); + | ^~~~~~~~~ + main.c: In function 'erofs_read_dirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | "<E> " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:303:25: note: in expansion of macro 'erofs_err' + 303 | erofs_err("parse dir nid %llu error occurred\n", + | ^~~~~~~~~ + cc1: all warnings being treated as errors +" + +Also there are many de->nid lacking of endianness handling. +Should fix them together. + +Link: https://lore.kernel.org/r/20211121234848.12663-1-xiang@kernel.org +Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") +Cc: Wang Qi <mpiglet@outlook.com> +Cc: Guo Xuenan <guoxuenan@huawei.com> +Reported-by: David Michael <fedora.dm0@gmail.com> +Signed-off-by: Gao Xiang <xiang@kernel.org> +--- + dump/main.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +diff --git a/dump/main.c b/dump/main.c +index b7560ec..f85903b 100644 +--- a/dump/main.c ++++ b/dump/main.c +@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + { + int dname_len; + unsigned int nameoff = le16_to_cpu(de->nameoff); ++ erofs_nid_t nid = le64_to_cpu(de->nid); + + if (nameoff < sizeof(struct erofs_dirent) || + nameoff >= PAGE_SIZE) { + erofs_err("invalid de[0].nameoff %u @ nid %llu", +- nameoff, de->nid | 0ULL); ++ nameoff, nid | 0ULL); + return -EFSCORRUPTED; + } + +@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + /* a corrupted entry is found */ + if (nameoff + dname_len > maxsize || + dname_len > EROFS_NAME_LEN) { +- erofs_err("bogus dirent @ nid %llu", +- le64_to_cpu(de->nid) | 0ULL); ++ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + if (de->file_type >= EROFS_FT_MAX) { +- erofs_err("invalid file type %llu", de->nid); ++ erofs_err("invalid file type %llu", nid | 0ULL); + return -EFSCORRUPTED; + } + return dname_len; +@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, + { + int err; + erofs_off_t occupied_size = 0; +- struct erofs_inode inode = { .nid = de->nid }; ++ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; + + stats.files++; + stats.file_category_stat[de->file_type]++; +@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, + update_file_size_statatics(occupied_size, inode.i_size); + } + +- if ((de->file_type == EROFS_FT_DIR) +- && de->nid != nid && de->nid != parent_nid) { +- err = erofs_read_dir(de->nid, nid); ++ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && ++ inode.nid != parent_nid) { ++ err = erofs_read_dir(inode.nid, nid); + if (err) { + erofs_err("parse dir nid %llu error occurred\n", +- de->nid); ++ inode.nid | 0ULL); + return err; + } + } +@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) + int ret; + + /* skip "." and ".." dentry */ +- if (de->nid == nid || de->nid == parent_nid) { ++ if (le64_to_cpu(de->nid) == nid || ++ le64_to_cpu(de->nid) == parent_nid) { + de++; + continue; + } +@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, + if (len < 0) + return len; + +- if (de->nid == target) { ++ if (le64_to_cpu(de->nid) == target) { + memcpy(path + pos, dname, len); + path[pos + len] = '\0'; + return 0; + } + + if (de->file_type == EROFS_FT_DIR && +- de->nid != parent_nid && +- de->nid != nid) { ++ le64_to_cpu(de->nid) != parent_nid && ++ le64_to_cpu(de->nid) != nid) { + memcpy(path + pos, dname, len); +- err = erofs_get_pathname(de->nid, nid, +- target, path, pos + len); ++ err = erofs_get_pathname(le64_to_cpu(de->nid), ++ nid, target, path, pos + len); + if (!err) + return 0; + memset(path + pos, 0, len); +-- +2.34.1 + diff --git a/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch b/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch new file mode 100644 index 000000000000..8e4f6ac3d336 --- /dev/null +++ b/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch @@ -0,0 +1,31 @@ +From 2ac662b01de904802da4e84d0738e47bf573efde Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 6 Dec 2021 20:14:03 +0100 +Subject: [PATCH 2/2] fsck/main.c: add missing include + +Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR +definitions. + +Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex@linutronix.de +Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> +--- + fsck/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsck/main.c b/fsck/main.c +index aefa881..ad48e35 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -6,6 +6,7 @@ + #include <stdlib.h> + #include <getopt.h> + #include <time.h> ++#include <sys/stat.h> + #include "erofs/print.h" + #include "erofs/io.h" + #include "erofs/decompress.h" +-- +2.34.1 + diff --git a/sys-fs/fatcat/Manifest b/sys-fs/fatcat/Manifest index 4c0d463bd454..692ecefe8f39 100644 --- a/sys-fs/fatcat/Manifest +++ b/sys-fs/fatcat/Manifest @@ -1,4 +1,6 @@ AUX fatcat-include-getopt.patch 268 BLAKE2B f197d14653e3c738bc096fe1f2865794e1cedffe87c49d62e769b542f6ff85caf2e8079cf17204010d4e5c5438c8df92c12aa780bfbdafb9bdbcd66b994c499b SHA512 71b6970aea57969099deba84bc1c7ad6aca025841140bdcb569d0e2b8f083618022eac84895522c33dc6f5e53bcccb0b21d380eed1ebb251928f17e08486315b DIST fatcat-1.1.0.tar.gz 57104 BLAKE2B 9ff69f576258a39b767db67e6934a35175af218a184516681300c646ce1ec508652cf1113bf61f9e2f628849de2b53152345ca12fe84e8a9a7f51799bb3e13a2 SHA512 f5bcffcb46b77e950241a9f957133083ea5d43f4e0f3e038c84310da926cc017048d22f85f3c8e90a2745ce26f513079997717c5b758649b7090694006be0078 +DIST fatcat-1.1.1.tar.gz 57213 BLAKE2B 095d69d828759860c182a9208e234a90b80656207f3c6ee217adc903f4c75e09f44b9d8a45a37404c904657e787edcc7b3c5969f175414bde2c03b52765b537c SHA512 eb3feca0ee330fc7d3a557ff2ecca96102351105799d89cef64ddfaeaa5bbb5d8815f5f109bbd8f2721538ddbb231bebf3f3515c5b33a6d4093f4c1389000f9e EBUILD fatcat-1.1.0-r2.ebuild 585 BLAKE2B dd97942c347548c64e3cc00d11204e56008a8cab5be81c2bd864cdbcbbcdb554e94c114f3bdd82092bb0c3556e22eb33c256feb0ca9e4b4ae41759b3914b767c SHA512 dec9e061f1130c7fe5bd1502b2f750272648dd27ddf83168624c19882e6eae3a37724f4508ca26d4d5fea49a450749106e9ebe274a9b57495a6424774a68f3ef +EBUILD fatcat-1.1.1.ebuild 585 BLAKE2B 86a956842917f74db369e206965b21862aede6196dbf435fff88662aaeb752b6c3f5bbd679df01c3fe1a30b716657184a63e5fc6b60b7a2f2f8796ea17b65e36 SHA512 9be47bd3fbce7fbcd1e530028f9e06e691752e5f783ac9266323c55783189603de4fb427971b83eaa163d3a3bed1205a7d267ed391df6d315a9bfeee04b2ed01 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7 diff --git a/sys-fs/fatcat/fatcat-1.1.1.ebuild b/sys-fs/fatcat/fatcat-1.1.1.ebuild new file mode 100644 index 000000000000..1cbdeace786e --- /dev/null +++ b/sys-fs/fatcat/fatcat-1.1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2018-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="FAT filesystems explore, extract, repair, and forensic tool" +HOMEPAGE="https://github.com/Gregwar/fatcat" +SRC_URI="https://github.com/Gregwar/fatcat/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="!elibc_glibc? ( sys-libs/argp-standalone )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/fatcat-include-getopt.patch ) + +src_install() { + cmake_src_install + doman man/${PN}.1 + dodoc docs/*.md +} diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index ccc930021297..78282948d72e 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,5 +1,7 @@ DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f5b0cf1f154f12c13850e5c37b30a0ad84122aa06c7f96c3825cd89cc2d26874abecb8ffbf0ad4edec5e0ffc854962944 SHA512 2199f9a5040832537b57792fe361943065c6132d31613bb1f838e931049703011902fca3abc25f6d7136efb2eb5505161f11c252b91dfb19158ac663e1ec15c2 +DIST fuse-overlayfs-1.8.1.tar.gz 103753 BLAKE2B 42ac0b75b563cee9457721dfebe03355d930e074f44cda43d071e853df2d2192266f6b2901c4faa333414de45fb1b95e245a42ae15c52714e311a1aad98deeb6 SHA512 7a63f1f129c100615676bccdb0f7fd83c4e9901786064d98fa3776dd64dbb61c38913f8d0eff428a601cb44b1bfd3261ded5ec5e471b889c7cd28f81a859d8ad DIST fuse-overlayfs-1.8.tar.gz 103726 BLAKE2B 12da116bba60c5833b43d130b24ba6a60fcaabe1248226fa30e8c0b2c2439a438c66b39d28a8d3dd0f65bf353c38811e87f23a2fdbd830982063a7b5df7b4808 SHA512 68a7b6a41fd2c44fbfb194d324cc6869d7f6ce198f7ff3ddf74e91f9679785ffa610634a6e35c2661549e0bb776bf68741be45501d860b1e8dd6814d2b3fb0ab EBUILD fuse-overlayfs-1.7.1.ebuild 570 BLAKE2B 5b4ff524cbe5ade3296faf95f7e781900e35f22d8a2a26773a4718d4c5c061378c5909f31909cdbbf641e6d83d01fc15ec880f938831c2c8ae61d5b1e11913c9 SHA512 135662cfd48682fd582f9328dc7a2553cb93241b97b498f75502b06d85fa10eb38614d929199c3cf3f0b0faf466ad81b2fb371344eb80af5f566e14576cbbd58 +EBUILD fuse-overlayfs-1.8.1.ebuild 572 BLAKE2B cb0cc0292bec9b522917a51f7a8e5d4a7f5449e71b39d3d5cd79f99de66150b45d7677b4ff410aae9ff4fde6acbb0a3fc94782a1ab26828d7d54e7baf8a130d6 SHA512 f2a4cf0a47d0075e93722f9ed8e270264e90b8df89264a47805269658e3b3a48d803ced6f27a61661d6cf73e30d5418d561900ade05c5da47656846d0fa9ca81 EBUILD fuse-overlayfs-1.8.ebuild 572 BLAKE2B 914440d5b4371a8a8cd119a9d55cb921b88499d1125b8bb6ceb3828237de51186e57580975d6ab01a2a6deb823a4a552c6f8ed85a50e6f30a648134c9ebea3c1 SHA512 ab3a027788a4fbc926ef42cdfc1e7754ae70129786425646b1109385b888c4f7fc06b334c3f3ba9062cc0efa425670804416d684ec4a397294dd97335f909bc1 MISC metadata.xml 335 BLAKE2B be5c19676e0ab40869fde84241fc093e7af2ee0eb41844f1a0685bd8b2a828d2899fd130c4b1b40553f2a3e4700cfa2a82e393553cd1022ed4d4b9c10768781f SHA512 31fdf31f0b44eeafc2b32dcbb9b99bee6af7331a7a7f140d4cca92a617933d9be460cafeb65d6dc0096308698eda28e006d31a42a114efe9633d9864d4611b3e diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.1.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.1.ebuild new file mode 100644 index 000000000000..456cd5903e7d --- /dev/null +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="FUSE implementation for overlayfs" +HOMEPAGE="https://github.com/containers/fuse-overlayfs" +EGIT_COMMIT="v${PV}" +SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +RDEPEND=">=sys-fs/fuse-3:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}" + +src_prepare() { + default + eautoreconf +} diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest index 451aff30c0eb..41fa05eb1dfe 100644 --- a/sys-fs/genfstab/Manifest +++ b/sys-fs/genfstab/Manifest @@ -1,3 +1,3 @@ DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661 EBUILD genfstab-24.ebuild 464 BLAKE2B 8157fc8b781e77cab58918e6fc4b5092c14e432809f57a35f2630a1d8312231f536f3bb1592af71688da9363cb5c13b0a02deb61f24fb4f85adedbd87834de13 SHA512 f722595cddfec818b06ded7f353d63d64f2233574b2626b0a3f9d1cf64395294f4ab04e9075b178fa5d6228db362f11438035990cc3f5a352021aec916dc3f3a -MISC metadata.xml 469 BLAKE2B 0fb978bb3a712f8cfa558a3eea0c0ef9e47ad075b92fe309f800624c47bb655387702376a4872c0576dd54c1a2438381a719baceca13e1a4f8cc8110c1d0ebaa SHA512 2c932f4165434dca1d9814dc205f45703d297648c89832b160e310a359d8512d7f1d13c20c4502d55e550ba973f25502deb69152d5226465d83ff5ecb26dfbe1 +MISC metadata.xml 251 BLAKE2B 996d717a2bde6bf8ad5d7adb70bd9535ff45f837b07eb2ab2dd9d3f14fd372fe6dc0a739972af0536a335148b1fde19a80dbcd806b4909ff9fdf5701628c0d64 SHA512 1abfedfb934187618b92cb2353b85edd4d0d3a047c61c8b8fad8611b97b0b4e817855308849515bbd96da8a60b52b4835ed77593f78d4f1521da36008c77968e diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml index d573686a1be1..d85c660dd955 100644 --- a/sys-fs/genfstab/metadata.xml +++ b/sys-fs/genfstab/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>marco@scardovi.com</email> - <name>Marco Scardovi</name> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>mattst88@gentoo.org</email> - <name>Matt Turner</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">scardracs/genfstab</remote-id> </upstream> diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest index 44cedb166510..907230dd4a63 100644 --- a/sys-fs/inotify-tools/Manifest +++ b/sys-fs/inotify-tools/Manifest @@ -1,9 +1,7 @@ -DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881 -DIST inotify-tools-3.21.9.5.tar.gz 91711 BLAKE2B cf6575cdd445a823c8272a9f8394ed241af1cc729784ec363c9dac6cd3c5cf37856076e88d389669d9da768b899e7ecb64c997e25b42cd5fccc2ebbbf145b273 SHA512 d0ae070f4fa3ea261913bba4ed6edf865aa8ddb9235cf5e967d11f54168a78d92739a5110a1afbdedbe3e6f0cbaf395883e2d47a182c9e6847986da184a52a97 DIST inotify-tools-3.21.9.6.tar.gz 91668 BLAKE2B cfb279d69e650b275af03052f4f76522670b7a563aa4e81bd5883b3ff825ecb70382cd4a5d48a9eb50b59930685a60b59a17376958d111d129c61fbced47a6bb SHA512 206eeebfd948499d81e6666b153cd7d9b05df618291fd3ada6479251b0773ce629c19f73117442a9093f028e294c5ba2dfa0aa4cf711510284ab7cad657da21c -EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7 +DIST inotify-tools-3.22.1.0.tar.gz 92922 BLAKE2B 42558ca62f79e2bdf5a6071334a05cee826ec00b0666b1c0971af64d769eb7852cbcd8d6e630f88af68f26f5607ca4ef94ec832fbe2e89d42182120aac4896ce SHA512 53317147af4803b69603839c010a2b0b3fa527f0e32b08126f24805600728c0a9570b2a3d94bf987f0b9a4bfbe7207b5faa9337f0d7add91b062e68de4245548 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57 -EBUILD inotify-tools-3.21.9.5.ebuild 945 BLAKE2B e351e97ad2996da6331e8621ae58dfc31928601c8682d4a7c26331e2b5b574074e5411d69e65a66d69e914f677f6b47346adc46ad6a67923f90c62528806bbd0 SHA512 7e4bcb5e609b2bd20af4ada32e9c8d7bd969f80973c09ef572427e2178a0504e3541e600ac913efd29548cd481793cea5a8e6961c5f761df16b6160f38c6e40c EBUILD inotify-tools-3.21.9.6.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5 +EBUILD inotify-tools-3.22.1.0.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5 MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833 diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild deleted file mode 100644 index 77cf8b46ca1c..000000000000 --- a/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="a set of command-line programs providing a simple interface to inotify" -HOMEPAGE="https://github.com/inotify-tools/inotify-tools" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86" -IUSE="doc" - -BDEPEND="doc? ( app-doc/doxygen )" - -src_prepare() { - default - - # Remove -Werror from CFLAGS (#745069) - find -name "Makefile.am" -print0 \ - | xargs --null sed 's@ -Werror@@' -i || die - - eautoreconf -} - -src_configure() { - # only docs installed are doxygen ones, so use /html - local myeconfargs=( - --disable-static - --docdir='$(datarootdir)'/doc/${PF}/html - $(use_enable doc doxygen) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.1.0.ebuild index f9459bef6394..2d25f84ae71b 100644 --- a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild +++ b/sys-fs/inotify-tools/inotify-tools-3.22.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest index 30d69bdadba8..0d77dca35606 100644 --- a/sys-fs/mergerfs/Manifest +++ b/sys-fs/mergerfs/Manifest @@ -2,6 +2,6 @@ DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f15 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7 SHA512 aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0 EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd -EBUILD mergerfs-2.33.1.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f +EBUILD mergerfs-2.33.1.ebuild 1070 BLAKE2B 37bff1091558136fb4cf57cb044ce091563e084d9aed9e7d996bf2854fb088afcba556f52264c7fb96f6cd917085063361636aee4c02277fe77a9d9940afc3ce SHA512 182888f30b44591fe17e9fa8ad57d9f41b508d901ca571b59482a878be2b5a568af6a69fe41f770137e1ec91bd3acb6ac2a7b658f0eeecd181895891b5c85815 EBUILD mergerfs-2.33.3.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e diff --git a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild index 2600359a9c80..a21ae969d856 100644 --- a/sys-fs/mergerfs/mergerfs-2.33.1.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.33.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ 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 ~x86" +KEYWORDS="amd64 x86" # Vendorized libfuse that's bundled is under LGPL-2.1. LICENSE="ISC LGPL-2.1" diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 16973546503f..85865f0b3aa6 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -9,5 +9,5 @@ DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 08d77d65 DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f SHA512 f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530ef9999d21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969 EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805 EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904 -EBUILD multipath-tools-0.8.8.ebuild 2248 BLAKE2B 234541cfd0620029a6a35dff42454395fb2ce22ca2c53fbd51c85d0c6b225d8d79cf6b5f73f297dcadeb59cbad678356c06787184547e7a28bdb38ad8c712992 SHA512 50cb95b88459cb79a3e0777ee8a7f90e4ad02634ea61432f507064d6b419754c69aa56d4170f4926a3bb9ba9a42082989f4a2473ada9587899b4b1765ce6da88 +EBUILD multipath-tools-0.8.8.ebuild 2255 BLAKE2B 37fede21aa5acc7ccb2bb0a30b1643b5961a50d729cdaee83a3c335d4f25c4f67cd9c5d7f2953eac2b58e529aee1e5f35276570e33f33c9b9fc99838bd8787eb SHA512 7f0c5d91cd0a7826d34292d5015fa9dc6423062a4bdf7e90667cbe33ad6ece7c47c6bd543a96bc511466adf3ab10906268b4d5a0f78925f02764a03b6dea2188 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild index 303eac62b7c9..f0a18e273bed 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.8.8-n LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" IUSE="systemd rbd test" RESTRICT="!test? ( test )" diff --git a/sys-fs/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest index 1e96a1916e7f..0c6ddf503128 100644 --- a/sys-fs/nilfs-utils/Manifest +++ b/sys-fs/nilfs-utils/Manifest @@ -1,3 +1,5 @@ DIST nilfs-utils-2.2.2.tar.bz2 424097 BLAKE2B d38b40e9b70a17bc957a89f5d1551bcc0eaaf396ac5126d47dc2dd0a9e311033beb1164a916fb369b51794d38cb63793ede7917be2d76b8df02a32de11b0a4fc SHA512 2ac0f1f25472d8900732db9f31e6b824e7e591bf306aa18d8b55c5d93807f4f7ceb65ba7e49540a39c7f285ad63c5f4ab795d34b2a04398d91cd2beb5fc6edce +DIST nilfs-utils-2.2.8.tar.bz2 440550 BLAKE2B 05cce6b639856df6d5748bc4045500d801260c46cedff31aa571c743eb7e2c8f3d6101faf9bc90b231425fbae349671f6603d902a3240f1f06ef7fd7fedbe2c6 SHA512 3232390581f63de5ebe7b461b178a40dfbdaa4bc6aa96b218ea8182c5bf81b162a1e632a1c21d9f1e89fdba9393b4e268e001c335a99ce22f645a62ae3154783 EBUILD nilfs-utils-2.2.2-r1.ebuild 739 BLAKE2B 9877d1958e6e4d6ce7e11c8f3390852e831eca135d816b24cf236768f86af85c00064d4421d93cd21536b6ffa02532ef389fa06b58fc2fa0a12bce68df195ee1 SHA512 dcac252a7cc4662de83a1083ea29a4a684758d06eaa086c64e90410d368f8401cc013ac23753ccef9a4da87bf2e3b5aad316d23d132999d22dba468424da79ff +EBUILD nilfs-utils-2.2.8.ebuild 1066 BLAKE2B 3656a6347c4cf67a03a15e7585b8ff54b8743f9ae01a92dc26ad0e269186dcb6a8bde16a0a9dddc3c96dfd116b7837c6852be9a33be53edca11e3545d0f69b2b SHA512 b698a31707d464b6a85359fe2033878cc56e98d9e77101973168bac6acb4bd1f009fde23475b5d4f3c396883aaaf78729845e2cc5183b4cc09279fd6f75ce2f5 MISC metadata.xml 1180 BLAKE2B 949e69e4b635c9124d4f0ab9c46959ff212e72c11ad64af13924c072e033ecf56cef427a29d31680d0acf4a8de5d6e51e584b11e17922267205da11268dcbf49 SHA512 eeed1a4d4a05f652849b4d5683ddab0eccaab9a05b2236f079e76a2c9c5937ebc7defdbe2328430b3ff60019bd44f2008ed41b26db64eb8ca78bc8b39375b199 diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild new file mode 100644 index 000000000000..32eda7e330b0 --- /dev/null +++ b/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="static-libs" + +RDEPEND=" + sys-fs/e2fsprogs + sys-apps/util-linux" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" + +CONFIG_CHECK="~POSIX_MQUEUE" + +src_configure() { + # Always build static libs as nilfs_cleanerd need them + # Bug 669804 + econf \ + --enable-static=yes \ + --libdir="${EPREFIX}"/$(get_libdir) \ + --enable-libmount +} + +src_install() { + default + + if use static-libs; then + local libdir=$(get_libdir) + dodir /usr/${libdir} + mv "${ED}"/${libdir}/*.a "${ED}"/usr/${libdir} || die + gen_usr_ldscript libnilfs.so libnilfscleaner.so libnilfsgc.so + else + find "${ED}" -name '*.a' -delete || die + fi + + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-fs/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest index 48bb2de1446c..e454a11152e9 100644 --- a/sys-fs/ubi_reader/Manifest +++ b/sys-fs/ubi_reader/Manifest @@ -1,5 +1,3 @@ -DIST ubi_reader-0.7.0.tar.gz 30298 BLAKE2B ea9ab8270ed24974a679452840cdb298535e342631fcf3979a0a52c0662bf710729ddc451780227c866bb2a2febffef071a9ddf13a311d2eb766ad0827f548da SHA512 4bf80ab9e0151f3c1ec20965513732846ab32c21d0813c75b4fae8ec2576e224c6406f1c5415fc90bcd4327c7a82bbcc9ab240c9b22b3d0441584208abc89b74 -DIST ubi_reader-0.7.1.tar.gz 42872 BLAKE2B 7c42d0e2cb5966485c719aaaf146aa8063dbd993550bf2d79dbd5688c39411c55fe451ab27fe9ecee14cfaa08a131e1ce6c38bd7a888ba3a3363cca7d10abe8e SHA512 1051f26686f02de562a1f00969e6e04a6ab9c3b695b04ebbc8653414d869fe55286b548b6aca2587dff92644e22a02ea487a231f73ce810d1d1c52466f13daa3 -EBUILD ubi_reader-0.7.0.ebuild 481 BLAKE2B 6dd59b523d2a4e2899430297fffcae2ec55f27808c5a2b9408843fde37fb9309f3c34c127ed652a4abcce9d7a15656def2895111673c052f56970bfa3509ff5f SHA512 dca066f3d0ee0c4d1f067b8aed9bc9b5ed25804e0ced8a29febc164fd0814eaa3424dbc833dc25f87aeffa9aaa0bcd4784d37b890f7f99e66738fedf1598bcae -EBUILD ubi_reader-0.7.1.ebuild 559 BLAKE2B a387c80b03d9fc3fc8579374a209e0757feb35dc4ca2d8366ba54ee69da4e0c4953d9bd87e6379e56c3f9f064c2b7ffd51260bec79ace88dee079e921b2de319 SHA512 9f871707278295584a645fed91d918cb2d6d057cbcffc6ecaa1c27a8ba1e4240826a26e6392223a1a6106c788eab8db1c6e6ac8380cd87381de3069c6fa20628 +DIST ubi_reader-0.7.2.tar.gz 42882 BLAKE2B c3ec72ab9642b7ece61611824f1052c5db1a2e12744c2bb6347f3682c3292dfe78f55c37403c9539556745d308891d0d03eb9f4f329461d2de864f40a941f011 SHA512 fa9193b897f0daf6d8879c8613ad1111137e2e4fcb92043df2f67c820d0da6723da3cece36705ead6afc622a24448a924b5758ed63804acfe703331a0dce60af +EBUILD ubi_reader-0.7.2.ebuild 559 BLAKE2B a387c80b03d9fc3fc8579374a209e0757feb35dc4ca2d8366ba54ee69da4e0c4953d9bd87e6379e56c3f9f064c2b7ffd51260bec79ace88dee079e921b2de319 SHA512 9f871707278295584a645fed91d918cb2d6d057cbcffc6ecaa1c27a8ba1e4240826a26e6392223a1a6106c788eab8db1c6e6ac8380cd87381de3069c6fa20628 MISC metadata.xml 418 BLAKE2B 42a180fe245386ada906cab96f96962dc2f26517eee70a3f6bd0cfa5fba8cd382dd12c3624ae5bd7a949d030a935467d37a164db4d69dffbff87a4aa2b3521cf SHA512 cf62a833bb427fb8435ca5a02d41f9766d8a482da4a9338cd171a302d5181f452ed23d37039364a4d61c0c57c9f1c9c62df09c519094807efa14ac8b10eb6d03 diff --git a/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild b/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild deleted file mode 100644 index 458bf4321eda..000000000000 --- a/sys-fs/ubi_reader/ubi_reader-0.7.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -MY_PN="${PN/_/-}" -DESCRIPTION="Collection of Python scripts for extracting data from UBI and UBIFS images" -HOMEPAGE="https://github.com/jrspruitt/ubi_reader" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-python/python-lzo[${PYTHON_USEDEP}]" diff --git a/sys-fs/ubi_reader/ubi_reader-0.7.1.ebuild b/sys-fs/ubi_reader/ubi_reader-0.7.2.ebuild index 88f0ab7805aa..88f0ab7805aa 100644 --- a/sys-fs/ubi_reader/ubi_reader-0.7.1.ebuild +++ b/sys-fs/ubi_reader/ubi_reader-0.7.2.ebuild diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index b1ca563d9edb..d578453dd70a 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -8,8 +8,8 @@ DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb -EBUILD zfs-0.8.6-r2.ebuild 6559 BLAKE2B 6ae2951143257283909f0d0c9499003cbfa005c9bb59fb5ebd85993296ae5de11f0a9508e9d10cccee5acdcc5be99adc9c61ad9999988845b3d1c167ace3a5b7 SHA512 793fe4a87c1146912fc5e87c243b42e8cc22e8e2a75730c0b317b77811a50d1b4b0620afed1169395044ec90613491dac2e09b785f9facb3e83f0a7b4b3b52ee -EBUILD zfs-2.0.7.ebuild 8467 BLAKE2B 026a5e44ee82c68739e3e7ca6d2ba548a976889dfd901259b20d7d571a10fbdd6c73f8e011745d082d116294c171ad9ca34fef0800bd6d33bd77a33f38202a4f SHA512 9c7ad992b30ec5197338b1bb64cb8e8d7993667110e54c811948eac4f09e002e0a95e3eb48c09e668f64f5e25d277268f09994825204d5edd304c6feb5fb43f7 -EBUILD zfs-2.1.2-r1.ebuild 8643 BLAKE2B 48c23f1ea4d9df51fd80a77ece292542d2d554d6d0f9a4b3b26e780203ad623cd9e46225e00d6c50aa5707bbace6e9335327d11a330eeda3c76e8d6d8f838e3f SHA512 7a520ecef66c62a468e12ee45f10bd5466682511f75fa3e4cb39debe1e504b6585de95226ea3a4177a82784b8a31cdaac2ee21a812a56b4edb7319adb4236a44 -EBUILD zfs-9999.ebuild 8634 BLAKE2B a611d956a49fcb371e223a821e58a101a3671e210a21076428a0f3ae2f3b3a3510ab85fd87f112be5ee340ce0208968f87d887dbb8b527c012f5d71ffa0c8302 SHA512 0d2020a7b34c860bd8b8f285300f9e52879178f3a942461801abc9a01b4c03841100b1a7e76bedae8dea5b3dcb9a3be7b880817febbc63182c98225959c24c2b +EBUILD zfs-0.8.6-r2.ebuild 6527 BLAKE2B ac889061cc532d89d87705f610fa3220d1f0d8ef08a8e948a61c1eeab616ebb4815c1a5abf9bcc2a662a89a2a43cc1d659183b06fc170bf1f7bb716a2fa1dc4e SHA512 b21b4e0ca160a17f7fb3729cebdfc4efcd83898265445ef5cc4dfc1a6fcaf692552a8300f8465bad3b07fda73e78a212a5c868bae702d1896448945f22d4588d +EBUILD zfs-2.0.7.ebuild 8435 BLAKE2B ecb10942cd6d51d0c5cb9c0e8ad5beef3afb580507514478b10dc3d59355262e87b2714c5f641e497bb2b351355400acb31b3aee81b98912c9a4753d7bcf55da SHA512 caeba0a22fefd58d0f7675c50d11d9a71f006e802960bdd810ff1799219526ab73e4d6993e8428af9823629a99d95932494911fcba8e0e6578c0cf697b0ad4e6 +EBUILD zfs-2.1.2-r1.ebuild 8611 BLAKE2B 65f5e13bdf9ed34e248b9d0e6245fb76ee5b829398e0ee40a790b2f049042ea851ef4b35244264ddc899f31b5511e14c8bf9bc6ad77e2e11c811ccd4d8e2290f SHA512 03274ba778d38678cbf818f79b7ed124cd25af8071a00233d9d01fb86d8d8907a3a53a032dd464558fec196245a75dec95f6117a99371900fa4a6fb6fec2bd90 +EBUILD zfs-9999.ebuild 8602 BLAKE2B c3154af855d5e81642f6dd39a846e19c96a9bb7879217a00c675d5b689fd2574ae486bec0682be921374ff20456f4dadc1f88129c185eb0fb095a0d7eeecc5dd SHA512 172c44e8c88613e0713d3647a8ed2e8b0d552a57c5d16c4e34cf0ccaaa7bf438b8cb54953519d1885b46000ba21448973881e3730c6fa1d7e4a0a3634c461f39 MISC metadata.xml 2194 BLAKE2B 57b0d1bcbcd78039d0cfd20f087bdfc339eefebbec3150af3c06d2e1a6dee882c4f8f97a9e470f63d4d628441a10650bda8b1843e33240dcc8d3e2ad55d104ec SHA512 fac8750d64d844b397fbbdcca9b7aea671f7642c64da92b89480439919ced80b9b6292ee3a2cc55e412e3c55dd02c418ef7c056f2973b7eb0f53ee763e099098 diff --git a/sys-fs/zfs/zfs-0.8.6-r2.ebuild b/sys-fs/zfs/zfs-0.8.6-r2.ebuild index 2ac686b80913..46403d3bc9b8 100644 --- a/sys-fs/zfs/zfs-0.8.6-r2.ebuild +++ b/sys-fs/zfs/zfs-0.8.6-r2.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{7,8,9} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd udev usr-ldscript diff --git a/sys-fs/zfs/zfs-2.0.7.ebuild b/sys-fs/zfs/zfs-2.0.7.ebuild index 49a33456ec22..e4ff7efbdefa 100644 --- a/sys-fs/zfs/zfs-2.0.7.ebuild +++ b/sys-fs/zfs/zfs-2.0.7.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript diff --git a/sys-fs/zfs/zfs-2.1.2-r1.ebuild b/sys-fs/zfs/zfs-2.1.2-r1.ebuild index c23eff19402e..d119026f5c74 100644 --- a/sys-fs/zfs/zfs-2.1.2-r1.ebuild +++ b/sys-fs/zfs/zfs-2.1.2-r1.ebuild @@ -4,7 +4,6 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{8,9,10} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index c5b347c4f1a2..cd2bdc26966b 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{8,9,10} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript |