diff options
Diffstat (limited to 'sys-fs')
52 files changed, 1224 insertions, 206 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex bbf72d4f8460..4bff2440e987 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 8675d40332c3..e969329a5553 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 1367 BLAKE2B 4f6f165263f76f3627538e9bd7c1f0eaea376afe70a7e1e47a016652ebc5a60fc52625a03868181823b4b9f941a175a7804a7996597081f535e8940e5dc50b71 SHA512 ddb62c8db7e9e899e3a22a46dc398de4a6449dd82d7a750af636f1890739cfdf05badbfd41a654fd9e24cbc037699fb0cade83facd56dfda16892d38cbffdbbd +EBUILD bcache-tools-1.1-r1.ebuild 1365 BLAKE2B f6bd8859b0ccdbeb5eb60f83b63cdc6c5d6a2659203d86f8b8e183a05e2b7a84e971a6035136a241747d83ae88fd8ccc8fd0a10d2be7fbebd98c615f7221a717 SHA512 a24acb5a0c798878abbc9bb5ff4c4d6905898ce9f817a822cd531362feedcc51580df055ac76a3cc5de136b2d81b3bc898ef583efba9927dc633ae1a2fd212c5 EBUILD bcache-tools-9999.ebuild 1376 BLAKE2B f7030fe6ab27cc5e44fff92b81981ee071b34ce3b34edc8e64764274482a77c61b5a1bfc171575aa55ae5d5d30072f872807250b4e11d6226802eb847c0938b0 SHA512 1dd36af77299cfa5d5e07cfdb88aee661be02a4a9eac49f85277e3e6f95438d8545ba62884ed5172b9d51cbf04ca644992b271d1da2caf1c30a03ace59e3e7f8 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 d675b12de42f..d1da43785931 100644 --- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild +++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild @@ -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 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 3199de3ad3ae..623542fefcfa 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,8 +1,12 @@ +AUX 5.15-filesystem-usage-chunks.patch 2797 BLAKE2B f9f0c709fcef2aa33ba404b14f8b68f8a46d07df489d05a5979c662ea20d7dc0dd7d2c39d305b513a85eaa296061f455fa33b6cce9afbd704077f385c3772e0f SHA512 9dfff219943e7d223795e24aeaf9c3f82a1530b5fe7a7b74df27176e3e52f8a3ee30af74f9b1f59689cd0e5acf274b5eeb2e2c14d0d49e23e716fd7042a5beba +AUX 5.15-filesystem-usage-data.patch 1381 BLAKE2B cf9f6b87eb75f61ce79441227d7a55e0b3b2e4317a244469f8d1e0d92e1c06b5aebeb867d2d032c5230a47a7737b1d06c58a9d753c1dc0f0537f713ae51c16e6 SHA512 f0216410964f9d15a74fa787ee01c5b7ddd6266626bbeac6e6560cdac7043c5b091dbaf054e4112639d2819744b02fd51a95ac6394702ec1602a49e29c653588 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 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.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 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 EBUILD btrfs-progs-9999.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild new file mode 100644 index 000000000000..ec22d07e7854 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 2008-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +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 repared 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 + DEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# https://github.com/kdave/btrfs-progs/issues/422 +PATCHES=( + "${FILESDIR}/${PV}-filesystem-usage-data.patch" + "${FILESDIR}/${PV}-filesystem-usage-chunks.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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${EPREFIX}"/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-5.15.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild index 36548f98db8a..36548f98db8a 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild diff --git a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch new file mode 100644 index 000000000000..be58afc8712c --- /dev/null +++ b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch @@ -0,0 +1,94 @@ +From: Nikolay Borisov <nborisov@suse.com> +To: linux-btrfs@vger.kernel.org +Cc: Nikolay Borisov <nborisov@suse.com> +Subject: [PATCH] Fix calculation of chunk size for RAID1/DUP profiles +Date: Tue, 16 Nov 2021 16:02:06 +0200 +Message-Id: <20211116140206.291252-1-nborisov@suse.com> +List-ID: <linux-btrfs.vger.kernel.org> + +Current formula calculates the stripe size, however that's not what we want +in the case of RAID1/DUP profiles. In those cases since chunkc are mirrored +across devices we want the full size of the chunk. Without this patch the +'btrfs fi usage' output from an fs which is using RAID1 is: + + <snip> + + Data,RAID1: Size:2.00GiB, Used:1.00GiB (50.03%) + /dev/vdc 1.00GiB + /dev/vdf 1.00GiB + + Metadata,RAID1: Size:256.00MiB, Used:1.34MiB (0.52%) + /dev/vdc 128.00MiB + /dev/vdf 128.00MiB + + System,RAID1: Size:8.00MiB, Used:16.00KiB (0.20%) + /dev/vdc 4.00MiB + /dev/vdf 4.00MiB + + Unallocated: + /dev/vdc 8.87GiB + /dev/vdf 8.87GiB + + +So a 2 gigabyte RAID1 chunk actually will take up 4 gigabytes on the actual disks +2 each. In this case this is being miscalculated as taking up 1gb on each device. + +This also leads to erroneously calculated unallocated space. The correct output +in this case is: + + <snip> + + Data,RAID1: Size:2.00GiB, Used:1.00GiB (50.03%) + /dev/vdc 2.00GiB + /dev/vdf 2.00GiB + + Metadata,RAID1: Size:256.00MiB, Used:1.34MiB (0.52%) + /dev/vdc 256.00MiB + /dev/vdf 256.00MiB + + System,RAID1: Size:8.00MiB, Used:16.00KiB (0.20%) + /dev/vdc 8.00MiB + /dev/vdf 8.00MiB + + Unallocated: + /dev/vdc 7.74GiB + /dev/vdf 7.74GiB + + +Fix it by only utilising the chunk formula for profiles which are not RAID1/DUP. + +Signed-off-by: Nikolay Borisov <nborisov@suse.com> +--- + cmds/filesystem-usage.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c +index 6195f633da44..5f2289a9b40d 100644 +--- a/cmds/filesystem-usage.c ++++ b/cmds/filesystem-usage.c +@@ -805,11 +805,17 @@ int load_chunk_and_device_info(int fd, struct chunk_info **chunkinfo, + */ + static u64 calc_chunk_size(struct chunk_info *ci) + { +- u32 div; ++ u32 div = 1; + +- /* No parity + sub_stripes, so order of "-" and "/" does not matter */ +- div = (ci->num_stripes - btrfs_bg_type_to_nparity(ci->type)) / +- btrfs_bg_type_to_sub_stripes(ci->type); ++ /* ++ * The formula doesn't work for RAID1/DUP types, we should just return the ++ * chunk size ++ */ ++ if (!(ci->type & (BTRFS_BLOCK_GROUP_RAID1_MASK|BTRFS_BLOCK_GROUP_DUP))) { ++ /* No parity + sub_stripes, so order of "-" and "/" does not matter */ ++ div = (ci->num_stripes - btrfs_bg_type_to_nparity(ci->type)) / ++ btrfs_bg_type_to_sub_stripes(ci->type); ++ } + + return ci->size / div; + } +-- +2.17.1 + + diff --git a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch new file mode 100644 index 000000000000..f3b43d5c594d --- /dev/null +++ b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch @@ -0,0 +1,37 @@ +From 2f3950c8304fec2aed9bf11b52d073683b137330 Mon Sep 17 00:00:00 2001 +From: Nikolay Borisov <nborisov@suse.com> +Date: Mon, 15 Nov 2021 11:15:42 +0200 +Subject: [PATCH] btrfs-progs: fi usage: don't reset ratio to 1 if we don't + have RAID56 profile + +Commit 80714610f36e ("btrfs-progs: use raid table for ncopies") +slightly broke how raid ratio are being calculated since the resulting +code would always reset ratio to be 1 in case we didn't have RAID56 +profile. The correct behavior is to simply set it to 0 if we have RAID56 +as the calculation is different in this case and leave it intact +otherwise. + +This bug manifests by doing all size-related calculation for 'btrfs +filesystem usage' command as if all block groups are of type SINGLE. Fix +this by only resetting ratio 0 in case of RAID56. + +Issue: #422 +Signed-off-by: Nikolay Borisov <nborisov@suse.com> +Signed-off-by: David Sterba <dsterba@suse.com> +--- + cmds/filesystem-usage.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c +index e22efe3a4..bac0f0fd5 100644 +--- a/cmds/filesystem-usage.c ++++ b/cmds/filesystem-usage.c +@@ -508,8 +508,6 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo, + */ + if (flags & BTRFS_BLOCK_GROUP_RAID56_MASK) + ratio = 0; +- else +- ratio = 1; + + if (ratio > max_data_ratio) + max_data_ratio = ratio; diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index b85c1ce6d01d..848d59137156 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -7,6 +7,8 @@ AUX cryptsetup-2.4.1-external-tokens.patch 1015 BLAKE2B ca7b5940caf000cc97742dfc AUX cryptsetup-2.4.1-fix-static-pwquality-build.patch 5226 BLAKE2B 1dfd8b001e8284d5efd5afe0d67a401d334e9588baf6d0f18f533694dd4a22a782066ee43f22fe5bfaea51fc09beac127e91c77b07fc9a63778b55b25e0d2ebf SHA512 71a3f63b86de72ccfa49c9294db433da7f1fd6366e328f7311051edfd980f630ca3435ef8c5e92c55083eb3b25a3b2bbafa75282de1bf65be6820655b7556f2f DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7 +DIST cryptsetup-2.4.2.tar.xz 11173984 BLAKE2B 33a26ac2f38750171c74cdd827317cd4bba193a6b60cc7250dc52a5117c0feb1d2fca6b52b5ae7926725d77dc6c1ab9d13e85a1c59606e80003294b90578781d SHA512 9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848 EBUILD cryptsetup-2.3.6-r2.ebuild 3908 BLAKE2B f2b709398da106f2d2b89365d67eee7298703035b1c94960fc0819b00dc48231692a6df2bf13322778e3704003bc0637a14d8198343053010b74fd21b1f52050 SHA512 6a9ee5bdd788a51944af30311ec84698d0fcaf19fe5845be4e0758dc89367ba9786c47b861595dfa691e3b9a82e11a239e54b1166fddd4848ec3bf37d5ceb195 EBUILD cryptsetup-2.4.1-r1.ebuild 4283 BLAKE2B 599590bf68883aad5e64b6a5affc0a464df4339abd11fe9088ea980fc400ba5bc6e7a5fbbd4792a73f735351ea348d1ade9ed42fb9480c991be5e48753799f3c SHA512 bf6ed2dd41144874931c56c4fb697ae4c3df696fefa11373352921729e9e4b9db4f8cd0f4094ba170ebe7a5e8a61c76673b0bc554857090b61f9e0b6ad61f51e +EBUILD cryptsetup-2.4.2-r1.ebuild 4067 BLAKE2B 47d2c7ceb821587d2b5d3940504021a3310838c4fe5233f19c12def4e9a0799f6cb284539f665fc8f2c98457ffa9f72ea8ef4317cd4453d409ce68d208d5e412 SHA512 327ba8aac24198eaf4bbe7a4e8575132679d71f0809c1ede7156f2b89409a1901ce7057dbb9b61cd6237df153ba186c09bf6d98fd559a9f02bdd03fb633c3a31 MISC metadata.xml 1076 BLAKE2B 132b07201bfa3a7d8889d0b2558c15f35829bfa021b31cd5a9cf2cb21de822ceb89fae177b014590f46411cd609b4e44b20165b07c7676483a547987fffcbb9d SHA512 b06b884e0e369022cea4b3634d9df3c7d62d854754969d0c7848a3baf3a3ea69cce2131527539600424c72c539e502378b0627ba7c4fdcbc74e6f7a58b5800a8 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild new file mode 100644 index 000000000000..9bfa24d56c8d --- /dev/null +++ b/sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2021 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 +udev urandom" +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:= )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +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.0-dmcrypt.confd dmcrypt + newinitd "${FILESDIR}"/2.4.0-dmcrypt.rc dmcrypt +} + +pkg_postinst() { + tmpfiles_process cryptsetup.conf +} diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index 9362da81e663..6f908ebc13f6 100644 --- a/sys-fs/encfs/Manifest +++ b/sys-fs/encfs/Manifest @@ -1,4 +1,4 @@ DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 -EBUILD encfs-1.9.5-r1.ebuild 909 BLAKE2B c27cecafe99e36b122bb7d113c63d1262812f085f58ccb0a37f7bc5719c070985a60154e86c3a7cbb8763b49bcbd8c62d7f445fbc39d2d69f594a4475f484581 SHA512 2e5ed7cc7343f6d7087afa53768a3849e42bc07443d662b0a08674d0f5c6aa8c3a00c0a1091ad5a9bded5b9d769002a80ce5b8d64e5025116a03a27b8dbba804 +EBUILD encfs-1.9.5-r1.ebuild 906 BLAKE2B 96405f4508df41529a65d6dee3108312b48adce88e146655e72cd9c0bc947beb337e1a8d967517f87cb245e9d1a41b0eb10907145b24c6fdab59f93826332096 SHA512 cab74b159a9a06ec35d7227798e274e131cb3fdf6a7503117f994df7755881f32c7dcc5f5f697d4fb6b1f8235721cb063c754a63ff12b5eafab75bc92514e1ac EBUILD encfs-1.9.5.ebuild 893 BLAKE2B c2d19cc038feb0cca4fa19c8f1bb1aeddd2ca6b1ba14c244e23ebbc07a94d42305418d410a6de2587cf908c385ab9fa8b3d32f931204a5f6e92f12d75067befe SHA512 83726bbfa10744b0260f4a9375ef2fa491c8a4743bc928a2d928ab7686e6e431d9db9c37d5a639c7b70c7583e70d11df05385378f20b9eafdfd06afb32ef73ba MISC metadata.xml 380 BLAKE2B c65338452c25318cbb3f5d2036753661d3c2ac246269f49e5cc51781d5ce0ed2edfb37b74dc53cebddc249b8e0ebf0fc01d5767b70bcc628c8b3254083f36071 SHA512 104847da4091bb323a2ea7f1129cf18d6893ecb000b0ce2d11c09bc8ce7da623dc24312b30bae75b03c7908613f83ecf1ecf88ff5c285ea34a170238e5f6c700 diff --git a/sys-fs/encfs/encfs-1.9.5-r1.ebuild b/sys-fs/encfs/encfs-1.9.5-r1.ebuild index 796b4cd6c826..3d07c9a58501 100644 --- a/sys-fs/encfs/encfs-1.9.5-r1.ebuild +++ b/sys-fs/encfs/encfs-1.9.5-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm ~ppc64 ~sparc x86" IUSE="nls" RDEPEND=" diff --git a/sys-fs/etcd-fs/Manifest b/sys-fs/etcd-fs/Manifest deleted file mode 100644 index 12fe7e792f7b..000000000000 --- a/sys-fs/etcd-fs/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST etcd-fs-0_p20170517.tar.gz 8575 BLAKE2B ea47b3588efd206cd6632dfdc4210b2b08e566603c0fc72cecaa834f675f95ccb6d4907e9e7b00788e939ab4452494a53f3c9bdef16ef7693e0c38ac071e5aac SHA512 1695eeb70895d316db68fca45b0cdcef6f4bb00b39a443bd85a7d457a1437476562d269226f7cc872fbec22555c4f4b94d48617688294400685e1719224fa92f -EBUILD etcd-fs-0_p20170517.ebuild 776 BLAKE2B f3eff70230d0971e020f7ff981d5429cd958214b10487ef54e3f9fddf12626c81cd5bcd4574f16e276c9a3761f4f8251cb0958b5a03c299cfe4667b5ee59f3e5 SHA512 9f4e74804db8bf256b7bf3c68aa64ebd0c3a9995e48d3d44e81c850313a88ddaa1e2afc9bcf2feec7000f20a432feaea5dc6543b0bf2aaba349523c93cd9efc7 -MISC metadata.xml 475 BLAKE2B f098a772c41400b3bc3e02717c634541bd5b44e9453f226229b6c6edde906acedd15f49be8ed81df7b3c062aff0ed42d1dd2b2e6398e16086ccd4e36bda99ba8 SHA512 f3f4b0a611f2b55f3fe23be18579de2afc26b014d8b04db69e387e7960384cee1dcdafe943ac538a29c137051b4dfd16fbdc4d3d6d6bd79cc301c1da10eb96d1 diff --git a/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild b/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild deleted file mode 100644 index 3c7e45f87ac7..000000000000 --- a/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-base - -KEYWORDS="~amd64" -EGO_PN="github.com/xetorthio/${PN}" -DESCRIPTION="Use etcd as a FUSE filesystem" -HOMEPAGE="https://github.com/xetorthio/etcd-fs" -EGIT_COMMIT="1eeace3bc20b15e4347c631a1cf7b45f3852518a" -SRC_URI="https://github.com/xetorthio/etcd-fs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -RESTRICT="test" -DEPEND=" - dev-db/go-etcd:= - dev-libs/go-fuse:=" -RDEPEND="" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -src_compile() { - CGO_CFLAGS=${CFLAGS} GOPATH=${S} \ - go build \ - -x -ldflags="-v -linkmode=external -extldflags '${LDFLAGS}'" \ - etcdfs.go || die -} - -src_install() { - dobin etcdfs - dodoc README.md -} diff --git a/sys-fs/etcd-fs/metadata.xml b/sys-fs/etcd-fs/metadata.xml deleted file mode 100644 index 4e5e96376ff3..000000000000 --- a/sys-fs/etcd-fs/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <bugs-to>https://github.com/xetorthio/etcd-fs/issues</bugs-to> - <changelog>https://github.com/xetorthio/etcd-fs/commits/master</changelog> - <doc>https://github.com/xetorthio/etcd-fs/blob/master/README.md</doc> - <remote-id type="github">xetorthio/etcd-fs</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest index 3efc32a07f2e..bcfcf8b8cf82 100644 --- a/sys-fs/exfatprogs/Manifest +++ b/sys-fs/exfatprogs/Manifest @@ -1,4 +1,6 @@ DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e +DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3 EBUILD exfatprogs-1.1.2.ebuild 617 BLAKE2B a1a86d9e39e1fd4dafb16f7a2c0ba0aa368d36ee343e10d39f0001de8cd2c5b8067835ea9da556b30ed8b9a414ef093d034f59e0b423910200bc1ae353308183 SHA512 a55c4bd6113876be8ab39330bd3e50736a69165728b941359b984853b1ae06f49ba93b0b872a2a6dde16a5997f0abf747154d4f41b2c0e9e53a95745f8e07ec5 -EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a +EBUILD exfatprogs-1.1.3.ebuild 620 BLAKE2B 50d59db1d0365445dc6a1bfff9905e6ccbd7947baaa8d9e6ed4b9587a85816a487ed90afaa3c205a5cf414b891dc9c64d3edb9929985c75d77c90acb5dd54211 SHA512 6afee5e9027be8cc0b9548218dea3c58ab7e674031c8c55a1039c60231510623242f1a379644e446cd36ca3983a7354d7e0d634c63113da4f6547aabb4db218c +EBUILD exfatprogs-9999.ebuild 620 BLAKE2B 50d59db1d0365445dc6a1bfff9905e6ccbd7947baaa8d9e6ed4b9587a85816a487ed90afaa3c205a5cf414b891dc9c64d3edb9929985c75d77c90acb5dd54211 SHA512 6afee5e9027be8cc0b9548218dea3c58ab7e674031c8c55a1039c60231510623242f1a379644e446cd36ca3983a7354d7e0d634c63113da4f6547aabb4db218c MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild new file mode 100644 index 000000000000..bfc512380c67 --- /dev/null +++ b/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)" +HOMEPAGE="https://github.com/exfatprogs/exfatprogs" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +fi +LICENSE="GPL-2" +SLOT="0" + +IUSE="" + +RDEPEND="!sys-fs/exfat-utils" + +src_prepare() { + default + [[ "${PV}" == *9999 ]] && eautoreconf +} diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild index 29a89c2d1f56..bfc512380c67 100644 --- a/sys-fs/exfatprogs/exfatprogs-9999.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild @@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/fscrypt/Manifest b/sys-fs/fscrypt/Manifest index 5aa6cb160167..6324ec7eb861 100644 --- a/sys-fs/fscrypt/Manifest +++ b/sys-fs/fscrypt/Manifest @@ -52,5 +52,5 @@ DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be521 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb EBUILD fscrypt-0.3.0-r1.ebuild 3448 BLAKE2B 34309372795fb8cbdab6eeece5126f8aa2ee90e7e07f9ed1a12dc957f684972d7e4c9f48626ce464af1f607ec3ef4ef47ca817b3dc1f88c33a8cc656baaea825 SHA512 407195243c6dc96016f8d507a180f923d70dd22db91849e904acc6a4f4e3f8cb81d364765d61ae6abaf70c2dbaa87d641a1cbf48ba983cb0aef9ab786d9a5929 -EBUILD fscrypt-0.3.1.ebuild 3489 BLAKE2B 72ba174459257fb49afc3c13cd13b09dc2965d9b1c448759c47d1d7414b4fb7c8f92a0f9dd3ccfcec2473cde9b3a4e3aa84ed0c3a2534d272bab68053a6944f9 SHA512 5fe4cf0869a7697977e5d5a0545c01fba124fe6e76773b3799c4cf05188c1de8b4ae3bebb4cd8768accbfd92df1ec41020478c00024e2d2afcd4083127e0a6d2 +EBUILD fscrypt-0.3.1.ebuild 3488 BLAKE2B c5a0817fccd321446500974a9f2d3dcc02ecc2a790d7c6747ca5214f19947621566222ea41e3dd4c37ac154abee20d1f8dca449bb489b946c33e29ea7c119b2d SHA512 4a27be0dbe0fe4882cec11bf655fdc9dba77003ad81c25664a8594137bd2e19b42ec1f15af74bb375c22baca66b251ba9db372f205a3906f4b8570a3ab6dc0c3 MISC metadata.xml 438 BLAKE2B 24bde9b0773e0504dd06bab9abe25283a2cab7679be2eb6fd1c875c13078ff91b472a1ee989c4469fcd0d6ff21761cace021c5997877a3c41d876dcbb26104cc SHA512 1301f1fbfa2115779879b830274c67496269d12163dd36efa592e52500f21996b3f3adfa3c69a215274b5dd132ed7583fc31fdd898b02386973713fb6e60be8e diff --git a/sys-fs/fscrypt/fscrypt-0.3.1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.1.ebuild index 20fac04c2645..5fda4eb5eb6e 100644 --- a/sys-fs/fscrypt/fscrypt-0.3.1.ebuild +++ b/sys-fs/fscrypt/fscrypt-0.3.1.ebuild @@ -69,7 +69,7 @@ SRC_URI=" # MIT: BurntSushi/toml, kisielk/gotool, kr/*, urfave/cli, honnef.co/go/tools LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND="sys-libs/pam" RDEPEND="${DEPEND}" diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index 3e4822df843e..4c6ed7c24c41 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,3 +1,3 @@ DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f5b0cf1f154f12c13850e5c37b30a0ad84122aa06c7f96c3825cd89cc2d26874abecb8ffbf0ad4edec5e0ffc854962944 SHA512 2199f9a5040832537b57792fe361943065c6132d31613bb1f838e931049703011902fca3abc25f6d7136efb2eb5505161f11c252b91dfb19158ac663e1ec15c2 -EBUILD fuse-overlayfs-1.7.1.ebuild 572 BLAKE2B 914440d5b4371a8a8cd119a9d55cb921b88499d1125b8bb6ceb3828237de51186e57580975d6ab01a2a6deb823a4a552c6f8ed85a50e6f30a648134c9ebea3c1 SHA512 ab3a027788a4fbc926ef42cdfc1e7754ae70129786425646b1109385b888c4f7fc06b334c3f3ba9062cc0efa425670804416d684ec4a397294dd97335f909bc1 +EBUILD fuse-overlayfs-1.7.1.ebuild 570 BLAKE2B 5b4ff524cbe5ade3296faf95f7e781900e35f22d8a2a26773a4718d4c5c061378c5909f31909cdbbf641e6d83d01fc15ec880f938831c2c8ae61d5b1e11913c9 SHA512 135662cfd48682fd582f9328dc7a2553cb93241b97b498f75502b06d85fa10eb38614d929199c3cf3f0b0faf466ad81b2fb371344eb80af5f566e14576cbbd58 MISC metadata.xml 335 BLAKE2B be5c19676e0ab40869fde84241fc093e7af2ee0eb41844f1a0685bd8b2a828d2899fd130c4b1b40553f2a3e4700cfa2a82e393553cd1022ed4d4b9c10768781f SHA512 31fdf31f0b44eeafc2b32dcbb9b99bee6af7331a7a7f140d4cca92a617933d9be460cafeb65d6dc0096308698eda28e006d31a42a114efe9633d9864d4611b3e diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild index f86accf13a28..ac1ce4cae8e2 100644 --- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.7.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="amd64 arm64 ~ppc64" RDEPEND=">=sys-fs/fuse-3:=" DEPEND="${RDEPEND}" diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest index fc8fae985765..3d171d708ba3 100644 --- a/sys-fs/fuse-zip/Manifest +++ b/sys-fs/fuse-zip/Manifest @@ -1,4 +1,6 @@ AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6 DIST fuse-zip-0.7.0.tar.gz 712853 BLAKE2B fd8bdaf30321bfbf897598de0291b1b285171b9b254e21acc1ca9f9d5af2b3a199dcb05696e92983a9b7491b4993b59defa53ec37d0a958d4fb80d2baf322194 SHA512 ea08bee4a7d0e7a0584237c6e9560d0fd2665bea59e87bc020697c3fc6bdc3c4c5c5d4dcdb454eed8cb735c176dd54d7c9bf879a04ac2d5b38bc271cc3128b69 +DIST fuse-zip-0.7.2.tar.gz 713290 BLAKE2B b7cd0ad3dc605434e40f1914424d3da681308ef758d2aa613323eb0e3ca5c32a9f10377e67f8e4577f670ca80ca039963f8a8ffd4166819584fafce9d3cbe9f1 SHA512 9abc34bd75caca125542f7d8ad7356901b25679779926515070650a5167eac28cc88b4545a4f05f5ee8a0ec58205258d33d190942a0e568fb72d02f3c469783e EBUILD fuse-zip-0.7.0.ebuild 691 BLAKE2B ee9f37d3ea5ba2c1f6dcb67dd4d770d1d10ba725675afaee4bb39c0404ea2da396b79f1583ca1c8b396cefd6aae62ba82a158997ca49c843a87cbd0dc1afacd9 SHA512 1b5eb8da3474e28d01cea7b3c988ac4497fd44bb1e1df8a032719cae011932de7468312787440a2ca9c7ce2d9365ce76658675396938f5d5d6d69659b1535255 +EBUILD fuse-zip-0.7.2.ebuild 682 BLAKE2B 6179024e2b84e3dc9974f97de481b6354236113ba977e3f701d0e93bff23ec39fb4dfd0538e36dff28d8a73071c6f2b01ba27e4c34fedd6d76e5489f4f7bf717 SHA512 48323f0248695223c89d198134f7485d3a402f6167f9b436ed6610c43a4883bcf06d40999e4ef5e939f56ef1c46f1395acca5048c577b3d3447c598eb3fe61a2 MISC metadata.xml 306 BLAKE2B 6430b8d23ab5b4108fa9f2dbb1e2732c6c3d03c9b23d7daa0cfe25213f79f364573c95ad01ea93a842b44794c9d53dee320a4dc4b4c401fce0a65224643cdd9e SHA512 60016befbb6e1691bd1f1c8f471b3374e51d02aad68db4a83164f5850c2961903803b03c4553aa10a36524f155271323617976bb3815f36dd61266966395cc06 diff --git a/sys-fs/fuse-zip/fuse-zip-0.7.2.ebuild b/sys-fs/fuse-zip/fuse-zip-0.7.2.ebuild new file mode 100644 index 000000000000..0d37e30e5f07 --- /dev/null +++ b/sys-fs/fuse-zip/fuse-zip-0.7.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="FUSE file system to navigate, extract, create and modify ZIP archives" +HOMEPAGE="https://bitbucket.org/agalanin/fuse-zip" +SRC_URI="https://bitbucket.org/agalanin/${PN}/downloads/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" + +DEPEND=" + dev-libs/libzip:= + sys-fs/fuse:0 +" +RDEPEND="${DEPEND}" + +DOCS=( changelog README.md ) + +PATCHES=( "${FILESDIR}/${PN}-0.4.5-makefile.patch" ) + +src_compile() { + emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" +} + +src_install() { + default + doman fuse-zip.1 +} diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest index c3adb9294b17..451aff30c0eb 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 330 BLAKE2B 5aaf67c3d8749d78c10f4be3062d58de95b441547e78fbda1276370ae7a80f1f2d7aed70888293e9618b7001dd950900f72a4cc8a3f11b585365d250ff80f222 SHA512 54194d7313a9de1ccf6bb0491817384021953e288bd108eaddbdc600373bd037dbe8486b74e56accbed90ef3d20f6ddcf8315b5078ff61fc62bb1c445368ee66 +MISC metadata.xml 469 BLAKE2B 0fb978bb3a712f8cfa558a3eea0c0ef9e47ad075b92fe309f800624c47bb655387702376a4872c0576dd54c1a2438381a719baceca13e1a4f8cc8110c1d0ebaa SHA512 2c932f4165434dca1d9814dc205f45703d297648c89832b160e310a359d8512d7f1d13c20c4502d55e550ba973f25502deb69152d5226465d83ff5ecb26dfbe1 diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml index 60af8645f363..d573686a1be1 100644 --- a/sys-fs/genfstab/metadata.xml +++ b/sys-fs/genfstab/metadata.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <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> diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest index a36ed5172006..e06ad2bbaf7c 100644 --- a/sys-fs/libeatmydata/Manifest +++ b/sys-fs/libeatmydata/Manifest @@ -1,3 +1,3 @@ DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1 -EBUILD libeatmydata-129-r1.ebuild 845 BLAKE2B f053a4f83e42ebab36ab199a86365317f31d83096a7b82b6b672e6c9d644157aefcef9aae5c3e35cff407eefc8d9a781875fe5a1c58f2a6f7ba46717cb71d6d4 SHA512 d81b90984fa1072628a77c20ee7595bfd8bf1b9c1418bf155f866fe80cbc85a760e79015b943e2d1610c37076fd9bc424410ada70d7b08cced7615e881d8b33c +EBUILD libeatmydata-129-r1.ebuild 854 BLAKE2B 930e00459a0b3d9999c52ed112521b091017847e7b53f255e2a3505833f29d3b9aab58db03be88f7eea69053d606ff1c3f3bc35cf51c8eab2cedc620cfa2bd68 SHA512 4489fb2a05892e0554d6674ca69dca708d0a4fe174b38b25622ba8604152dd8ced24b4b3a967af899f8f1567a3758bf8c3f5a53fa5a7e8df6f276ac691204628 MISC metadata.xml 429 BLAKE2B 32b42d894377bd2663efb8e6a896d8e60abf7ff80cae78806d3de0e6ccdb3ad3ca2336754b65a3cade50cb15625dcecce894c48475383c289ddbd277bbcb0830 SHA512 c0f488caaaeaf482961d3b84eda772d9a3283b72b58dda5b9704a5754cd4091943a84b6c5324e86ae3f96de1cc8fd087ebdf46912c3a3d07daa9c660573a9d63 diff --git a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild index 71b725cd15a6..e35d9419d8ab 100644 --- a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild +++ b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 arm arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index fb4b2227463e..98a5589f2ed4 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -33,5 +33,5 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B 1fb4372993e615678e9f5f1a44bcb530ad959ec727a9db5e78bad15bdc32aba31825e75539780987cbede765f16d655d09d1d3cde1e88892fd3b7fa7794056fc SHA512 cb60df19a2ed209c0b47fd50637b1ab18788ac63c865b50e175e6e48b842a8ffa00f53a460305f6554f7a732763c705ba27b1e21e4a2f5a8cb81dbee32946374 -EBUILD lvm2-2.03.14.ebuild 9740 BLAKE2B a7457c9ba8a9f0c0bc31e6670a229f7f4ad27bb1d677650cc9cee3bce083a183ab93737ee7a5c4203b352e8b0a0ec7895ed2fb34e470250d5eee81ec3c0b4d0b SHA512 44722ccf1e9ec4a270a04a187244b267d0ed958dc2de3a1e5fa68318641d570d6f4498923fdb5ec353831b97c0bda2a8130b8d61b2e56fc5ac87eaf6a6e7638a +EBUILD lvm2-2.03.14.ebuild 9747 BLAKE2B a9c90de19733d1a904d68c570a5cc4c22b54bd3e73dc08725e4ffe1011c63f6b40ff547d4d4fdcd6c81986dd91dbe1e9e8cdbbee984fd9408c07af3a9cb7e8c4 SHA512 55f39712b2c56425a2d028049e361aa00b42ddb950a826964d74338799b9eeefd5b9a81f0460ae55a9ea94ca5fcf4ee93a22bb98595075fa4036eaa959c7b72d MISC metadata.xml 1035 BLAKE2B b9a3162e72e1ea09c7530edca817046434186c3948ef763c1a4efedb45aa8f842b7819efdbb09fb40897368e61b26a43896ef28a4a9d1ae554ea3cdb81f88dc7 SHA512 a16653a343d66eab8bd790eb974cc95d75f48321051ebb37eef87b3c7ad9903b2be1f0c70aff4b711b4469fa2715a5fb0c8566c46e6a83173bf998cf182ce964 diff --git a/sys-fs/lvm2/lvm2-2.03.14.ebuild b/sys-fs/lvm2/lvm2-2.03.14.ebuild index d95b20485c02..f27b82cc4ef0 100644 --- a/sys-fs/lvm2/lvm2-2.03.14.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~ IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) - static-libs? ( !udev ) + static-libs? ( static !udev ) systemd? ( udev )" DEPEND_COMMON=" diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index e244f7d55500..1d0ab8d0d47c 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -3,8 +3,5 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf DIST lxcfs-4.0.11.tar.gz 451424 BLAKE2B 8cb1f16ec8f2f5dbcaea9897553c21f2894ce75713c4de7fd9412254ef4e74cef93fbd9c79e259e0caf2426520d9454858bc0f09b652b00305699d52b4240cbf SHA512 60a76b8d3ab8a164ead8424cf2a20cdb616919318881348016299d2b5bff9d221c12b9208b46e6f72a84695632a762292313e0b51579d590ce505cf5b6fec6de DIST lxcfs-4.0.11.tar.gz.asc 833 BLAKE2B f70bcf119588c1e667111fe0e820c1bbd53c912027a94b600ce69713eb824f0b495cee4ab0107cf92bd5f10c0a17e9e5e85833f15f7ff570931c9df454f16bf9 SHA512 a9190c5913d0879c0034b1ff1f06b7755f8b78094270d64c89a371b56737e32c2a14681a58643e8ebde9d654ff2c66959ee9a4f6d5f6a6002f52da1362017d9f -DIST lxcfs-4.0.9.tar.gz 453383 BLAKE2B 06694218d45d93baa9041aeae39e52d827ca1b53d616284d0ee04ddfe98436a15b3cf900c7b58f14e506a0726f30679b0a04e6b5047087201ad2a9c35f0cc09e SHA512 c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe -DIST lxcfs-4.0.9.tar.gz.asc 833 BLAKE2B fa71f7a6a7a35fbc7613ec2d7549197fe0d33c9584aea86fe3db959848eeb1b0e69a75ca2d596578f3c7f3a9deca5cec1badce428b4aa52e6f112cf3fe544b3b SHA512 fd9feac31469db7785c8b486ddc4f5c0431ab2aa52aed715e853fcab322e8c6ee755aa87d9bdee7a969a8030be1956863662f8b2db09bfe4b8ba69ef8f2fbb3e -EBUILD lxcfs-4.0.11.ebuild 1626 BLAKE2B 91cfe24dce500e7605a39bc9c0e0ef0ad1dd9bab086aa88d7af27befa0ce81114696b3ac8cfcd392e1b6e560213d50e2dcb818a41cc09779c5ee3c2f914f3f48 SHA512 1d408ac22d4826a68d802a2f58ff1cb2333b3ca40423d0b743340da67bf01113fa65ffc64e9acd912cad8284b853fb7228cf8809010bfef1fdcbf1009f7b2e77 -EBUILD lxcfs-4.0.9.ebuild 1458 BLAKE2B 6e83b342590504b06cbb32ffeee63fdcbd5d0fd4b5d07ddb3d7d8ea87a87079562f97bee473a37ecd6275440553e0b2a23f639d02040a9d7f414460c56581c34 SHA512 99ce5beb37b0698bb8cbbf9cc733a8b2dab157480d0f13efeaa8e9f2e984e6eddef014eb4042378ca8ba5e5c56580cd7c64614193d015e78dcf11d6367e59953 +EBUILD lxcfs-4.0.11.ebuild 1625 BLAKE2B 70641a3208f28d4f1ffaecc8b3d7aa952c614c30915d0ea1bb63aa13dbfe1aebb74801aec94e316edff25104c5194315748d1f2acffa6246f98288140ea1b3cc SHA512 4c192acb436fc49a7810278ea0fd44c827c473bad5137500cc88c3ef985a672ca0ceb4e0fd7c4d58a8dc8cc7348f313bce0bef0f5f2b873cea3f07757fa4f71c MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab diff --git a/sys-fs/lxcfs/lxcfs-4.0.11.ebuild b/sys-fs/lxcfs/lxcfs-4.0.11.ebuild index 30a16c09be63..b811e340ec91 100644 --- a/sys-fs/lxcfs/lxcfs-4.0.11.ebuild +++ b/sys-fs/lxcfs/lxcfs-4.0.11.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz LICENSE="Apache-2.0 LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv ~x86" RDEPEND="sys-fs/fuse:3" DEPEND="${RDEPEND}" diff --git a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild deleted file mode 100644 index 92a99fe69f2a..000000000000 --- a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd verify-sig - -DESCRIPTION="FUSE filesystem for LXC" -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" -SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~riscv ~x86" - -RDEPEND="dev-libs/glib:2 - sys-fs/fuse:3" -DEPEND="${RDEPEND}" -BDEPEND="sys-apps/help2man - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" - -# Test files need to be updated to fuse:3, #764620 -RESTRICT="test" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Without the localstatedir the filesystem isn't mounted correctly - # Without with-distro ./configure will fail when cross-compiling - econf --localstatedir=/var --with-distro=gentoo --disable-static -} - -src_test() { - cd tests/ || die - emake tests - ./main.sh || die "Tests failed" -} - -src_install() { - default - - newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs - newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs - - # Provide our own service file (copy of upstream) due to paths being different from upstream, - # #728470 - systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 272f528ec6ee..480886c33eb7 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,3 +1,5 @@ DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10 +DIST mtools-4.0.36.tar.bz2 445920 BLAKE2B 753ee3e412452572b36d15805982255f28bc277764ce66a0fe8483e19a3488fbb282b873a6be85e87e82a71bf7fda517e1234e1911f0b7c3f3992e25f8d18322 SHA512 2425ee0e39c06ea201a5303ab09a0aa9f0c59341522e2c15abc4f079320fd3d67d28afeb2870ee508d472bba6904c542e11c02b92652c8eda1bf338bab372d07 EBUILD mtools-4.0.35.ebuild 1051 BLAKE2B bbfb5be0365c8e98d06fb0c0e96b775c38b346dacb93c9a7cd467930d6ae7a4212b20b92095629ddc3dd33c9acbd16bbd05bf9e259b3660ec63f67a24dfd6cb5 SHA512 f754225dfa3a840325d80127123b4095a8dd25f76db0c7fb067805ac06e11f25918f55549aae4fcf7ea26d29a66f01c3a5d2dfecc0bf8a9a14ad569f269324cc +EBUILD mtools-4.0.36.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316 diff --git a/sys-fs/mtools/mtools-4.0.36.ebuild b/sys-fs/mtools/mtools-4.0.36.ebuild new file mode 100644 index 000000000000..3ebdd3b6df91 --- /dev/null +++ b/sys-fs/mtools/mtools-4.0.36.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic + +DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them" +HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools" +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris" +IUSE="X elibc_glibc" + +RDEPEND=" + !elibc_glibc? ( virtual/libiconv ) + X? ( + x11-libs/libICE + x11-libs/libXau + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXt + )" +DEPEND="${RDEPEND}" + +src_configure() { + use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688 + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/mtools + $(use_with X x) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + local -a DOCS=( README* Release.notes ) + default + + insinto /etc/mtools + doins mtools.conf + + # default is fine + sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die +} diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 383d0ede9d52..530c51086905 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,5 +1,3 @@ -DIST squashfs-tools-4.5.tar.gz 250471 BLAKE2B 2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b SHA512 e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0 DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135 -EBUILD squashfs-tools-4.5.ebuild 1315 BLAKE2B 081cb5d1c7826695bdc7324c0e86ee3292db8a6b8ee50f7688d617961e6538b76f2b4b73f008f94acedc51f2245cfe1c0900d4c9e957a500dd75423330b157a6 SHA512 9f8eff369fb146a9f8fbaacdfa9c1d7c2a55b8efa528c2613d66787d6ad60e86ea367780739766a660855288b41ada5bfc7530bf734dcd37e5fff9f6b769ee4b -EBUILD squashfs-tools-4.5_p20210914.ebuild 1508 BLAKE2B 91dda143b0d2f238472fcf299f25a062681209f9a9eafe524546229f51f6ccab0b6060afd56a49db0018bbfa018ff33f0e00444aedc259f659de723e797b90ca SHA512 f059411486b21b14e77b6e12804161c8e691f4ecb4b00c7faf6a9c04bd220d4ea713b99fe00acf2dbd717df943f004d797783cc5c40c152a6fa4a49fe069892f +EBUILD squashfs-tools-4.5_p20210914.ebuild 1501 BLAKE2B e909ffbb86ef8a7dc103f6436a101e31c70d2a1fedca07c697bff192ecba3e42afe9b51272ad9dad9722b78392da1d06a9834240f9747a830abb23dd0962a6ea SHA512 e301da8e5ec3201f27a5847dd876aca3d594390de2b849827260c50435c12b4b34f57f5a7b5c5e1f03815d7184ed689f279db5940a9ad65a99baa6b53e9dd328 MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117 diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild deleted file mode 100644 index c9155aa5e18b..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit flag-o-matic toolchain-funcs - -MY_P=${P/_p/-git.} -DESCRIPTION="tools to create and extract Squashfs filesystems" -HOMEPAGE="https://github.com/plougher/squashfs-tools/" -SRC_URI=" - https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="debug lz4 lzma lzo xattr zstd" - -RDEPEND=" - sys-libs/zlib - lz4? ( app-arch/lz4 ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr ) - zstd? ( app-arch/zstd ) -" -DEPEND=${RDEPEND} - -use10() { usex "${1}" 1 0; } - -src_configure() { - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 lzma) - ZSTD_SUPPORT=$(use10 zstd) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools -} - -src_install() { - dobin squashfs-tools/{mksquashfs,unsquashfs} - dodoc ACKNOWLEDGEMENTS CHANGES README* - dodoc -r RELEASE-READMEs -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild index 66c6618def05..fdbb67149677 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild @@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${MY_COMMIT} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug lz4 lzma lzo xattr zstd" RDEPEND=" diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 20ecc54e48ea..34586f302ef5 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,8 +1,13 @@ AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45 AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f +AUX 249-udev-linux-headers-5-15.patch 828 BLAKE2B 767e5b7ad7320e5fb5e75939bcb4c65ea99d914a9446725da1f1019d088c1830f2760c07d9c16fdd301b92761494b296ee70ac16ee43db4bd4a3307b2f1302bb SHA512 ed88ed1dcd3e18cfc5d19244eeb681bb9091098163f0c93d523f9d180648eace1c05b328285e9980be861655515f89b068d6fe0d05aa09639e1b71bd1db143af AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a -EBUILD udev-249-r3.ebuild 7438 BLAKE2B d00b8eee8ddb7b72f4201f80cd62fd063d8fb30ceeba86e5a931e2b594562239fb15c161f3bedce83ed6ad51e5bd0e16a1187ae68d9dd05bee7d9703ebc238b4 SHA512 959210956e6bda3e08042e382bebf47c853e9760e2f8ab1e4d154eeb2e09f29c4d4f9baceb713880b2e960db20328b8344c59ce2c9f262b57b9b31dba120edfe -EBUILD udev-9999.ebuild 7314 BLAKE2B 6175acd4032a3e96b017ccf4bf03ed0d0f013d353b8f0eff1e520fdd407c4aa87bebbbe744acea35f768fd5695ac134fc11772254778018d1dac780eb41f4cff SHA512 d4c5f81415eb423992df158cfab4d7621720bbc79f31aadcfa42b7561274290f30f054b9214dfd7fb6e167238848edcc19273cac79c004a2d578c9f475be8191 +DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b +DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f +EBUILD udev-249-r3.ebuild 7609 BLAKE2B bdae4a297aa37813ff99a4821822719d51458d12cb8ab246ff89149dd358d36c9df30edafe6dfe51779cc3c4ed21f9e32230677ecad49d3e2917e837c1b523da SHA512 aa1d2a58c28a30ee488a3f9424946240dc08d2e47524250b023326e4bb7ec73630ddcd8ebd01c53280c5bee78ae4e1cb67868b339483625647a0a19aa8413d14 +EBUILD udev-249.6-r1.ebuild 7909 BLAKE2B cf5816429105c796deb6cfb8554dbc198163cee2df6df4b68b4302e07066b9c45501d3bf8050ec7e9a6bbb8d2fe96db700b106667def63568b3f821896225083 SHA512 c33cc650e8b8726caca8f65161d947c68b6ec37d11ec0dfe12576355f0e37b0499aeb9b6d074dfae1e0e82737aa62aa48bb7fe29fb877ef79a0ea0089512be0b +EBUILD udev-249.6.ebuild 7771 BLAKE2B 0f5657c096483c9ddab5f749c2b250c64c4a7e7cb5df7e5dd8f45dbf76ccf181871a2ccff06ed807d5cd56fa581233ae7486ae78b095b6fb17dbc8051e1e7450 SHA512 c0ae5006e6bef8a035884e067f9d277761dac0883fe93842ddd999ccd24c0c90f4984ab99e5120e06e1121a75b1346b218e13318992db3fab73106dac044e616 +EBUILD udev-9999.ebuild 7905 BLAKE2B 2763c80b9a7d744744be9c626184693dada5ee2313265e099f22e94d523c532bd06940cbf06c3c76d36ae0692ba62f58249d702d90ea02d69b224fa84fe62b0c SHA512 442bc35901b2df59e68fae8fff3fb2a04c3e241c516ca3fe62cbe4a6a070cc7d95a15024285ab2cb480301853848ab9a0b2c4d489d7284d72d225088ee8f9299 MISC metadata.xml 475 BLAKE2B 51db3fcfdcb7942e2bfa6e3e9fac08f9a0de6018e08a04da65920d1c1e83af6620ef73dfff201f1feff31580a0a6341814a8182e43b2c07f9da7577252010ad1 SHA512 65c1345e9c0707248f12bbf436f9b0ccb6160eb86d6c22f3e62b34791879621df59eb195e4c4c95b5cf9440b052bdc7c2b5847789a44cc9fb13b6cd4867f580e diff --git a/sys-fs/udev/files/249-udev-linux-headers-5-15.patch b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch new file mode 100644 index 000000000000..844099b72819 --- /dev/null +++ b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch @@ -0,0 +1,22 @@ +https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch +https://bugs.gentoo.org/821550 + +From: Chris Packham <chris.packham@alliedtelesis.co.nz> +Date: Fri, 10 Sep 2021 09:51:36 +1200 +Subject: [PATCH 1/2] basic/linux: Sync if_arp.h with Linux 5.14 + +ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition + +Fixes #20694 + +(cherry picked from commit 7c5b9952c4f6e2b72f90edbe439982528b7cf223) +--- a/src/basic/linux/if_arp.h ++++ b/src/basic/linux/if_arp.h +@@ -54,6 +54,7 @@ + #define ARPHRD_X25 271 /* CCITT X.25 */ + #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */ + #define ARPHRD_CAN 280 /* Controller Area Network */ ++#define ARPHRD_MCTP 290 + #define ARPHRD_PPP 512 + #define ARPHRD_CISCO 513 /* Cisco HDLC */ + #define ARPHRD_HDLC ARPHRD_CISCO diff --git a/sys-fs/udev/udev-249-r3.ebuild b/sys-fs/udev/udev-249-r3.ebuild index 2e1601d89e08..84fa631f0f66 100644 --- a/sys-fs/udev/udev-249-r3.ebuild +++ b/sys-fs/udev/udev-249-r3.ebuild @@ -116,6 +116,7 @@ src_prepare() { # backport from 250 to silence musl warnings "${FILESDIR}/249-sys-include-posix.patch" "${FILESDIR}/249-libudev-static.patch" + "${FILESDIR}/249-udev-linux-headers-5-15.patch" ) use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) @@ -294,5 +295,6 @@ pkg_postinst() { ewarn ewarn "If you wish to disable this, please see the above documentation, or set" ewarn "net.ifnames=0 on the kernel command line." + ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" fi } diff --git a/sys-fs/udev/udev-249.6-r1.ebuild b/sys-fs/udev/udev-249.6-r1.ebuild new file mode 100644 index 000000000000..7d3033099db3 --- /dev/null +++ b/sys-fs/udev/udev-249.6-r1.ebuild @@ -0,0 +1,310 @@ +# Copyright 2003-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript + +if [[ ${PV} = 9999* ]] ; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]] ; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + + MY_PV="${PV/_/-}" + MY_P="${MY_PN}-${MY_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + + # musl patches taken from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + MUSL_PATCHSET="249.5-r1" + SRC_URI+=" + elibc_musl? ( + https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-util/gperf + sys-devel/gettext + >=sys-apps/coreutils-8.16 + virtual/pkgconfig + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + test? ( + app-text/tree + dev-lang/perl + ) +" +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-15 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.9 +" +RDEPEND="${COMMON_DEPEND} + acct-group/kmem + acct-group/tty + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/lp + acct-group/render + acct-group/tape + acct-group/video + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd + !sys-apps/hwids[udev] +" +PDEPEND=" + >=sys-fs/udev-init-scripts-34 +" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]] ; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ } ; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7 ; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + local PATCHES=( + ) + use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) + + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool acl) + -Defi=false + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Didn=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dp11kit=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + use elibc_musl && emesonargs+=( + -Dgshadow=false + -Dsmack=false + -Dutmp=false + ) + + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + python_setup + + use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 + + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink libudev.so.1) + + local targets=( + ${libudev} + src/libudev/libudev.pc + ) + if multilib_is_native_abi; then + targets+=( + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/fido_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/udev.pc + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + hwdb.d/60-autosuspend-chromiumos.hwdb + rules.d/50-udev-default.rules + rules.d/64-btrfs.rules + ) + fi + eninja "${targets[@]}" +} + +src_test() { + # The testsuite is *very* finicky. Don't try running it in + # containers or anything but a full VM or on bare metal. + # udev calls 'mknod' a number of times, and this interacts + # badly with kernel namespaces. + + if [[ ! -w /dev ]]; then + ewarn "udev tests needs full access to /dev" + ewarn "Skipping tests" + else + meson-multilib_src_test + fi +} + +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" + + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die + + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die +} + +multilib_src_install() { + local libudev=$(readlink libudev.so.1) + + dolib.so {${libudev},libudev.so.1,libudev.so} + gen_usr_ldscript -a udev + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi ; then + into / + dobin udevadm + + dosym ../../bin/udevadm /lib/systemd/systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + + # Install generated rules (${BUILD_DIR}/rules.d/*.rules) + insinto /lib/udev/rules.d + doins rules.d/*.rules + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # Install static rules (${S}/rules.d/*.rules) + insinto /lib/udev/rules.d + doins rules.d/*.rules + doins "${FILESDIR}"/40-gentoo.rules + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_preinst() { + has_version 'sys-fs/eudev' && HAD_EUDEV=1 +} + +pkg_postinst() { + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]' ; then + udevadm hwdb --update --root="${ROOT}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi + + if [[ ${HAD_EUDEV} -eq 1 ]] ; then + ewarn + ewarn "${P} defaults to predictable interface renaming, as described in the URL below:" + ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "If you wish to disable this, please see the above documentation, or set" + ewarn "net.ifnames=0 on the kernel command line." + ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi + fi +} diff --git a/sys-fs/udev/udev-249.6.ebuild b/sys-fs/udev/udev-249.6.ebuild new file mode 100644 index 000000000000..513cbfac6257 --- /dev/null +++ b/sys-fs/udev/udev-249.6.ebuild @@ -0,0 +1,303 @@ +# Copyright 2003-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript + +if [[ ${PV} = 9999* ]] ; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]] ; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + + MY_PV="${PV/_/-}" + MY_P="${MY_PN}-${MY_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + + # musl patches taken from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + MUSL_PATCHSET="249.5-r1" + SRC_URI+=" + elibc_musl? ( + https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz + )" + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-util/gperf + sys-devel/gettext + >=sys-apps/coreutils-8.16 + virtual/pkgconfig + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + test? ( + app-text/tree + dev-lang/perl + ) +" +COMMON_DEPEND=" + >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-15 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.9 +" +RDEPEND="${COMMON_DEPEND} + acct-group/kmem + acct-group/tty + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/lp + acct-group/render + acct-group/tape + acct-group/video + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd +" +PDEPEND=">=sys-apps/hwids-20140304[udev] + >=sys-fs/udev-init-scripts-34" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]] ; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ } ; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7 ; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + local PATCHES=( + ) + use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) + + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool acl) + -Defi=false + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Didn=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dp11kit=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + use elibc_musl && emesonargs+=( + -Dgshadow=false + -Dsmack=false + -Dutmp=false + ) + + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + python_setup + + use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 + + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink libudev.so.1) + + local targets=( + ${libudev} + src/libudev/libudev.pc + ) + if multilib_is_native_abi; then + targets+=( + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/fido_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/udev.pc + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + rules.d/50-udev-default.rules + rules.d/64-btrfs.rules + ) + fi + eninja "${targets[@]}" +} + +src_test() { + # The testsuite is *very* finicky. Don't try running it in + # containers or anything but a full VM or on bare metal. + # udev calls 'mknod' a number of times, and this interacts + # badly with kernel namespaces. + + if [[ ! -w /dev ]]; then + ewarn "udev tests needs full access to /dev" + ewarn "Skipping tests" + else + meson-multilib_src_test + fi +} + +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" + + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die + + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die +} + +multilib_src_install() { + local libudev=$(readlink libudev.so.1) + + dolib.so {${libudev},libudev.so.1,libudev.so} + gen_usr_ldscript -a udev + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi ; then + into / + dobin udevadm + + dosym ../../bin/udevadm /lib/systemd/systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + + # Install generated rules (${BUILD_DIR}/rules.d/*.rules) + insinto /lib/udev/rules.d + doins rules.d/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # Install static rules (${S}/rules.d/*.rules) + insinto /lib/udev/rules.d + doins rules.d/*.rules + doins "${FILESDIR}"/40-gentoo.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_preinst() { + has_version 'sys-fs/eudev' && HAD_EUDEV=1 +} + +pkg_postinst() { + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]' ; then + udevadm hwdb --update --root="${ROOT}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi + + if [[ ${HAD_EUDEV} -eq 1 ]] ; then + ewarn + ewarn "${P} defaults to predictable interface renaming, as described in the URL below:" + ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "If you wish to disable this, please see the above documentation, or set" + ewarn "net.ifnames=0 on the kernel command line." + ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 0479fe245547..49ee2cd44c17 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -23,13 +23,14 @@ else # musl patches taken from: # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + MUSL_PATCHSET="${PV}" SRC_URI+=" elibc_musl? ( - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz + https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSE}.tar.xz + https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -82,9 +83,11 @@ RDEPEND="${COMMON_DEPEND} acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd + !sys-apps/hwids[udev] +" +PDEPEND=" + >=sys-fs/udev-init-scripts-34 " -PDEPEND=">=sys-apps/hwids-20140304[udev] - >=sys-fs/udev-init-scripts-34" python_check_deps() { has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" @@ -184,6 +187,7 @@ multilib_src_compile() { man/udev.7 man/systemd-udevd.service.8 man/udevadm.8 + hwdb.d/60-autosuspend-chromiumos.hwdb rules.d/50-udev-default.rules rules.d/64-btrfs.rules ) @@ -238,6 +242,8 @@ multilib_src_install() { # Install generated rules (${BUILD_DIR}/rules.d/*.rules) insinto /lib/udev/rules.d doins rules.d/*.rules + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb insinto /usr/share/pkgconfig doins src/udev/udev.pc @@ -262,6 +268,8 @@ multilib_src_install_all() { insinto /lib/udev/rules.d doins rules.d/*.rules doins "${FILESDIR}"/40-gentoo.rules + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb dobashcomp shell-completion/bash/udevadm @@ -291,5 +299,12 @@ pkg_postinst() { ewarn ewarn "If you wish to disable this, please see the above documentation, or set" ewarn "net.ifnames=0 on the kernel command line." + ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi fi } diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest index 1678c1bb22d5..3011b2bedef9 100644 --- a/sys-fs/udiskie/Manifest +++ b/sys-fs/udiskie/Manifest @@ -1,4 +1,5 @@ DIST udiskie-2.3.3.tar.gz 92133 BLAKE2B 515673182297f02761f8c354ab9450b04b4533b8165035322c104cbc9aa41da83898dc7e2c371da47dcc8c5dc7ef6adbe5b05f913d77b395d5d8457f9260e845 SHA512 0b0b37dba437fd4af45d0344f36b36ccf0626d18fc29e020270cd567d4912fe1362182a28b55f3dfe1a23922d416cc8d952555e350c7b2d90fb49702dc497ebb -EBUILD udiskie-2.3.3-r1.ebuild 1046 BLAKE2B 615c10d88d76a439c90d62b13507b13f632abc36e6f0c4ab89147176df3b8812e394a7369fa829c5f2a808c5b26e3e843c4fa1309122fa4a2d6f2005bb0cc2ad SHA512 c3efb0edaadd1b8192af58abfc006829038807772c2f0a73dbae41b99e1cd4ba287d374250e262808b0b51d17a78e39f648f1dd758f07145ea7836f1ab7d3158 +DIST udiskie-2.4.0.tar.gz 94008 BLAKE2B 23c062aa79cb2ffd6377f8cdf3eea1c8398b56743054c701e878dd6070bd1ee14e3f1aab9a791d4b6d44b1ddab68cc69f92eb3dd711c9598d3d770d90a43e7d7 SHA512 3f2d3d37996442b21d8c167929eb2e6f2fcb864b313334954407b03d913c83671dd25960226bafc68e463ab0ea38cfb6947467dd8bf51bbee7f072e4bdf19d7a EBUILD udiskie-2.3.3.ebuild 1004 BLAKE2B 9f34d757a24e3b6580e4030ee6c73a49d8a4357121dde2b5368175ebaa560961207a6f81d2cc339a14c41b3ae2dc682ab9e5c88cbc05b5299fb57b5833adf942 SHA512 d51f8e3e5edbf842b2d5ff040d310b9d516eb58be78806c0cb4af7d0ec5258d70d7e66883186b7c4ae6782d61b6589faca23fd190904ddafcbe647f8b7b3f8bc +EBUILD udiskie-2.4.0.ebuild 1051 BLAKE2B 231dd87235f49bf5222ecd9b93ceeceab6d128ea2b1f80278126e70832fb03224d79a662d54b69be17271a26dd2df5b1f9ed275885cec8016aea5abc686c7e46 SHA512 1398fb275131de52120b21a80f75e635b5f26510ba6215a5e9261e44d4d3b2cf19491707a4ec54ff36d86e2a0e7b137ef0074e1cc9c9a0c54133f66cfdc01394 MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39 diff --git a/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild b/sys-fs/udiskie/udiskie-2.4.0.ebuild index d467cf5a6f4d..b4ee4d3380e7 100644 --- a/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild +++ b/sys-fs/udiskie/udiskie-2.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="" RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 2615c70b3737..fc6c294a3c2f 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,9 +1,9 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd -DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343232c99ed514fda50ea9afa828ea8f8ecc753249b211037c2635b45bfbcc849f90fe277102e4745e6b4f13fc6fc20 SHA512 d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7 -DIST xfsprogs-5.13.0.tar.xz 1301112 BLAKE2B 49e2b8535ef778362e68d45b1fb6f01be354dbee48d346c018e75ca1a5bc8761f47e65199bb62ffc4962faf8e185f3579e34e0562fab346d9839810727110665 SHA512 8e21bc43fb5cd49dccd6415b86f9e146d29c265a5d908f6898673290d6a2ac4a00bd25440fd7fab5ba080237d4bd54f56855ae64cdb32e59edae100b96155ca8 -EBUILD xfsprogs-5.10.0-r1.ebuild 2203 BLAKE2B 073c507b054b2c2b1df6c4f76812660c7aab91bcae093164182c85f3ff42c3081f26aa0234f8c898c54eedf941a542477d078aa63431cab7d3beddb2bc1335f8 SHA512 7fd4cdded8725491a2e72854c651b9d44782b62bca71bd2c1908fad706517994bc313874c72bd46798e020074693711c97fbb0e5bfab7ec502e6d75f7398368d -EBUILD xfsprogs-5.12.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb -EBUILD xfsprogs-5.13.0.ebuild 2218 BLAKE2B 1a5b59e6b2d044d70757b9c94c15499b9aa55b73ea60d71ef4f218c83de982cb1f0f360e23257e66d194651b125df05abceaca044c14f7a39895768beb213485 SHA512 69a10464151996b387eee4d2812df2ce3622a9127508db857aee41c33b334f172dde04194fa58abdbcb8389668b8d38420958afe80f553a64d759d4aea4a0fd8 +DIST xfsprogs-5.14.0.tar.xz 1307332 BLAKE2B d2177f10d677e28439cef1db3ca6a2adb93f89f1f415b2b564ec694d80a0b981ebd283d33ea21573ce2e7405da8235bad48df3ca43d37a4294de60ca95380ed1 SHA512 dc87840c05bbd3f6ba64bb61f95499d58eff1d4bb2309ed223048ca0e475f5bb139f03c47f415a997576e5bf85cf06b1a040e022397d6f0bcd5ba60b36d8b0a2 +DIST xfsprogs-5.14.1.tar.xz 1308968 BLAKE2B fda20f824a030113717cc46de1920696dc8f9eed13b54809e6b21275cf4f8673385e8bbb1c1c668ba2592ab43fb230c9d46edf4c0e5abe59a9572cc9a90ae5da SHA512 5bb79fff45048bebee2fde85ec788658dd8dc8d5ddac222b1f74c6cd525e1239d920814e8e713f045e38398a785321bf0a7421ff1c690cd0be5dbb224f8dafea +EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431 +EBUILD xfsprogs-5.14.0.ebuild 2298 BLAKE2B f62894f6091ed43dda4817ff2259b02c544acbca123de22fbe89504f0e4805db0c4589369b24da35218b075f11d0b47313d9859df34ab45f6c187bbb178d299a SHA512 6612895c549b250197061517c54b69ad57a5c4fabce96b1d917e71804a5dfc3d0aab5431d1414dff6784a30c1eb936d387e39cfc80cad4e8e6b3e414ce78318b +EBUILD xfsprogs-5.14.1.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild index 132fc31c0142..09adcd120083 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="icu libedit nls" +IUSE="icu libedit nls selinux" RDEPEND=">=sys-apps/util-linux-2.17.2 dev-libs/inih @@ -23,6 +23,7 @@ DEPEND="${RDEPEND}" BDEPEND=" nls? ( sys-devel/gettext ) " +RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( "${FILESDIR}"/${PN}-4.15.0-docdir.patch diff --git a/sys-fs/xfsprogs/xfsprogs-5.13.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild index 545c377884f7..069e9cb903a7 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.13.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild @@ -12,10 +12,11 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="icu libedit nls" +IUSE="icu libedit nls selinux" RDEPEND=">=sys-apps/util-linux-2.17.2 dev-libs/inih + dev-libs/userspace-rcu icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) " @@ -23,6 +24,7 @@ DEPEND="${RDEPEND}" BDEPEND=" nls? ( sys-devel/gettext ) " +RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( "${FILESDIR}"/${PN}-4.15.0-docdir.patch diff --git a/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.1.ebuild index 030c8acbec7d..f1ec2e50d05c 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs systemd usr-ldscript +inherit flag-o-matic systemd usr-ldscript DESCRIPTION="xfs filesystem utilities" HOMEPAGE="https://xfs.wiki.kernel.org/" @@ -11,11 +11,12 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="icu libedit nls" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="icu libedit nls selinux" RDEPEND=">=sys-apps/util-linux-2.17.2 dev-libs/inih + dev-libs/userspace-rcu icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) " @@ -23,6 +24,7 @@ DEPEND="${RDEPEND}" BDEPEND=" nls? ( sys-devel/gettext ) " +RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( "${FILESDIR}"/${PN}-4.15.0-docdir.patch diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 5319dff6c58e..d2ced19c7f9a 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -8,6 +8,6 @@ DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7 DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94 EBUILD zfs-kmod-0.8.6.ebuild 5749 BLAKE2B 867ba8d060dc08eae4027d8c6e17f8ed31f429c87cc0ad9faa88aab0ee60d91e0a2a1d0b9dc59974d3c406a6266d4a4f752dab9e909a0df18ddf5c65152e6e13 SHA512 3f7303584c5324ed8715cd5a473344564ce2862b3e730722ac128a758f2750c1cb3ab2521185eae6e237ec1aa5dda82b8780009a51fc6798e27fc45b18c96f6a EBUILD zfs-kmod-2.0.6.ebuild 6045 BLAKE2B 02a899203203caf05268bebd5e275aefdfb6ebdf71feecc9df9c3e5d861f635d8b0632afb51edf62450b2c82cf58396d3df812b721fd40906655c16aa7280b67 SHA512 d25e34726710e9b2bfda4467f03df4376cce9eb988c4449d54aeee47c7d7c717326e9e56d58fb69d8bfff47fb6a0a1f69d4cb8ca5cf28a7efa29f76f8caccf83 -EBUILD zfs-kmod-2.1.1-r3.ebuild 5584 BLAKE2B 29b6b8e78b9f9cbe872977ada4ae2a10cf2ae31dd02077065c2b383f87829a552ad6e06363a7734934d1edc6758fbe068e5a8e90b44a7427110c66f67e1eee1b SHA512 1f5723a243e4d39bce5e57e132b540b5ac83371ae1262e641996f5a19eabbbe077e4f1756a9db465db01009f776578c54ef56cbabfa166355ea3f76979198ce2 +EBUILD zfs-kmod-2.1.1-r4.ebuild 5584 BLAKE2B 5bf13cef8d82620b31498044dccbaee43dca00df521dc12a37d1d2f43262b6d0ce0be61b765c51a9423dee04697826b214c6e304ee84fa52767aafbb13fc6e32 SHA512 0ec9a83429c4833fbb569e251ba0ba940b9791360847618fceabf4f4597d815cb718e7368ca4db8d112186dbea4c095dfc289043cda5797995fdf403b558aec3 EBUILD zfs-kmod-9999.ebuild 5243 BLAKE2B fb00deb56979862a3249a9be33dc438153945dc38384473c6d24534d9cbde56fc17b5dde81c110239dd8945079417a912f614f611be1b036106201fde4028125 SHA512 a3ade0ec20a34b0e28f8af9a674c3124c283097b405b222d4518122e81cf6a215aa1eacfed1d6beea04c782af3b8a2c9b8763188dfd94f9a94f10e6a6ebb0199 MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.1-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.1-r4.ebuild index ea61ad1dc0a9..2592c0607571 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.1-r3.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.1-r4.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.14" + ZFS_KERNEL_COMPAT="5.15" # increments minor eg 5.14 -> 5.15, and still supports override. ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" |