diff options
Diffstat (limited to 'sys-fs')
48 files changed, 624 insertions, 916 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 9b3ee162fc42..c175972806fa 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index 2e9737944f28..29cf9d0df63e 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1,8 +1,8 @@ DIST android-file-transfer-linux-3.9.tar.gz 781268 BLAKE2B 63032a39b39cf31b8d051c0069c0357f0b6ed5bd9e592ee5ce1f5e95438ff27571ec7d58789eb865a1896097c3cebf0ec30a89526b62c93694d71ca29e95d415 SHA512 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8 -DIST android-file-transfer-linux-4.0.tar.gz 820094 BLAKE2B 1cb7150647e09a9f3dbe30cdf8ff01e122c9bab5a450c9bbe58fc8e3c8b48de0e2b6d571c8e7fa71de25fff28b803ef60aed7f8a77129919bdf9f482fff975ee SHA512 31083d3f7adb06ba0b5e79738825f5a10f3f4ce7e5b24498f7255224c11a9d978b814749c4b5fd60a5ec2b4c7d06bc85ad4b0cfb6cbcf6b3ff3f7e331c6c03f1 DIST android-file-transfer-linux-4.1.tar.gz 820290 BLAKE2B 598a4ae25cc5110c38534d1b2b49c034f3dee3f8ab9e47835b4543acecf80521c102e0b8cdf89a19801b178a8fdbbd09e866b957b3ab5886700a26e6c00f8a1b SHA512 76151089dcce304fb688a54a4f94ea605fa3d048765119c631a2ff2c8d107678062ed4d485a983dfb0b337c9b4d3639e3f76640b6bcc73e3e6449764e99298ab +DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 EBUILD android-file-transfer-linux-3.9.ebuild 1193 BLAKE2B 8b0d02c8d933b9dcb08cd4d256d2b349694fb4db8a6fc07fff613aad18b217fefe0290a12cb3544dd765c68cf956141b9d1d232571914177bad2461c812235f5 SHA512 fcfc9a94eace56b09890fb2cf4abeece387a9d934c2ae483ec17ba5a62282685dd4609ab59176e51e19b10171d0946b60159d3a9440e0e616d2ef13de0316522 -EBUILD android-file-transfer-linux-4.0.ebuild 1680 BLAKE2B 110607fd5a05b4ddf9db93346220624bd3dbd7f15605fcb35f77095d3eac50c060201f1d446b606791b992bd75878df9fa1a6fda76c02de1362c40a45c88d1e8 SHA512 266e8abcd474e3449f6983f2b7d7d75ebab5a3ced25bffb42f79a725e3948211307da281b6be640920307d4fb35cc44b339ec76e7b1bf094004136c9ff4b66a7 -EBUILD android-file-transfer-linux-4.1.ebuild 1680 BLAKE2B 110607fd5a05b4ddf9db93346220624bd3dbd7f15605fcb35f77095d3eac50c060201f1d446b606791b992bd75878df9fa1a6fda76c02de1362c40a45c88d1e8 SHA512 266e8abcd474e3449f6983f2b7d7d75ebab5a3ced25bffb42f79a725e3948211307da281b6be640920307d4fb35cc44b339ec76e7b1bf094004136c9ff4b66a7 +EBUILD android-file-transfer-linux-4.1.ebuild 1679 BLAKE2B fbde992d703b8e15c7dde79edf09389cb46badad6880357eb33f726ef84adac38f56861a1365aa7db39ec087e7c9a4fd198607aeb95f13586092bc0df577d2ce SHA512 b9ba99fa8ec6cce48bbe6466a083edc4a58c08b346257e2cda1c8a932a2539d054ded13c1962b50c8358b73b2bc28c5f0e6a2e491dcba8a6216a1e4174524a80 +EBUILD android-file-transfer-linux-4.2.ebuild 1680 BLAKE2B e835b49578e4a43fe2f56cfdc03c11369544d83d604490acd67a26e877b7e49ae778645fd102c527f5c1228008b14149d1b7d808e49093aeb3fcd0b3ac8e515e SHA512 827d94524b5a082cb8d7eda7db0373636b9baaada36d61c07b6e1f0d2a00276ba19f82fae06850aa3ce6348136989af1626fd9669a0e91a79243d125a2218984 EBUILD android-file-transfer-linux-9999.ebuild 1680 BLAKE2B 110607fd5a05b4ddf9db93346220624bd3dbd7f15605fcb35f77095d3eac50c060201f1d446b606791b992bd75878df9fa1a6fda76c02de1362c40a45c88d1e8 SHA512 266e8abcd474e3449f6983f2b7d7d75ebab5a3ced25bffb42f79a725e3948211307da281b6be640920307d4fb35cc44b339ec76e7b1bf094004136c9ff4b66a7 MISC metadata.xml 492 BLAKE2B 25383fac13727b68cd34690e79764360dc7bd68720386048ce2c74cbc4292eb5b76d8f296eb6399c520ef562eb10dd574a960b8d04ff048de3918ab9aac6cdc4 SHA512 4c7f31e3255a9afcb94d210b2c4f53068f5919fa6b7f5928479d0c920af62852ef8752e8a72de2e175bbd7606f73795781db54189cbdbbee34868fdb59b36b47 diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild index 3ef7155a7e2c..192cb1d3ccb1 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]] ; then EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git" else SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="LGPL-2.1" diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.0.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild index 3ef7155a7e2c..0070b7afcbbb 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.0.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest index 70608ea5b27c..b53b37f27d3a 100644 --- a/sys-fs/bees/Manifest +++ b/sys-fs/bees/Manifest @@ -1,8 +1,5 @@ AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc -AUX 6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch 1281 BLAKE2B 07eb31ec5abbc62edd8edec111a3f3174f62c587ceeb80736f6cd7992357e41af4976ef528a8668064ddad7e0ccea5ab281f41e8e062bd2606e6cc7c376a90c4 SHA512 ebf16d968acd8a22135c08f4c6e68bebf30651bc93c1e27453b1d7ca35d09d755dd36064b7e42204e6d8fe9b06d6c316cc8c7362df0ff548cff181830e7375ee -AUX 6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch 3250 BLAKE2B 3f6a81bbf00aa528b238b1c54458c369ebcfd890cf5080e640b0e201273cc01f72380fd57b3f63ff02c9ace0c6a7d8ac9c5b684182b5d8957be756107aab24a5 SHA512 827871dfe5d7ddd2dd6afad96b23f25ba4f722d7f73575554d9968f95e22990b36d1d34384406beb72a61050938a1e8910fbac5ea8d68fb41dfdc099d1ed183e -AUX 6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch 3102 BLAKE2B 20319e2791f68201bc7b13471b4192b2124cfd9d16f72ced72e95cd99619d890834d5373b45f620be2375a1a8d3db780d83b95fa855488643035ed244ee16c6c SHA512 1042b4042718061be5bbfe5201000c5098bf63a1eee157ae093c4ff99d72a9a7d74fafa865a1d08eb5e8243116ac1b36e2e1dbb224548c1517def1955ba3fb18 -DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33 -EBUILD bees-0.6.1-r2.ebuild 3530 BLAKE2B bfb723fb4df7bffc3463bb8c102027d33922f6bcddb3d663aec57844846e15d0d91a94076f60390004a93598ac15e5c3a97e5430f2a8a1bac8b13f6500404892 SHA512 01ddc099d86adf73eea46fb447e807ed6b571c6f7bd1f0a3f4b6acaa9d74ec555b89b8ae27ae3f0a9b139b3e4c3edb77bd009b196c2febe30c87a38bb373d221 -EBUILD bees-9999.ebuild 3148 BLAKE2B 05dcb515e076c7572be647d97ed05891a989c290248e119dea54b0f979a09ce3fdacde0b301a6c19c3d8e82d460c438b47ed19189ef816a709cc4f09a7096091 SHA512 e92b472c4f6cc6666638436f1afa8036a2e08c1a7f07ae9870f0a2c7c1312341dce9c8a23e7e548f21b4c93e120da086b940f50987c4e6f4dbd1d83a54963d0f +DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672 +EBUILD bees-0.6.4.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da +EBUILD bees-9999.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20 diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.4.ebuild index 70bf39d08a69..6c38f7b9c91e 100644 --- a/sys-fs/bees/bees-0.6.1-r2.ebuild +++ b/sys-fs/bees/bees-0.6.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,9 +8,9 @@ inherit linux-info systemd DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent" HOMEPAGE="https://github.com/Zygo/bees" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/Zygo/bees.git" +if [[ ${PV} == 9999 ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/Zygo/bees.git" else SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64" @@ -29,21 +29,11 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~BTRFS_FS" ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" -PATCHES=( - "${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch" - "${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch" - "${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch" - "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" -) +PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" ) pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then - if kernel_is -lt 4 4 3; then - ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to" - ewarn "properly operate, so it won't work. It's recommended to run at least" - ewarn "kernel version 4.11 for best performance and reliability." - ewarn - elif kernel_is -lt 4 11; then + if kernel_is -lt 4 11; then ewarn "With kernel versions below 4.11, bees may severely degrade system performance" ewarn "and responsiveness. Especially, the kernel may deadlock while bees is" ewarn "running, it's recommended to run at least kernel 4.11." @@ -55,7 +45,14 @@ pkg_pretend() { ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0" ewarn fi - + if kernel_is -lt 5 1 0; then + ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption" + ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" + ewarn "later kernel, that includes older LTS versions released after 5.0.4:" + ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" + ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" + ewarn + fi if kernel_is -lt 5 3 4; then ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running" ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst" @@ -66,20 +63,16 @@ pkg_pretend() { ewarn fi - if kernel_is -lt 5 0 4; then - ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption" - ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" - ewarn "later kernel, that includes older LTS versions released after 5.0.4:" - ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" - ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" - ewarn - fi - elog "Bees recommends running the latest current kernel for performance and" elog "reliability reasons, see README.md." fi } +src_prepare() { + default + sed -i 's/ -Werror//' makeflags || die +} + src_configure() { cat >localconf <<-EOF || die LIBEXEC_PREFIX=/usr/libexec diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index 0bfb2654d893..6c38f7b9c91e 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit linux-info +inherit linux-info systemd DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent" HOMEPAGE="https://github.com/Zygo/bees" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/Zygo/bees.git" +if [[ ${PV} == 9999 ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/Zygo/bees.git" else SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" fi LICENSE="GPL-3" @@ -29,14 +29,11 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~BTRFS_FS" ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" +PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" ) + pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then - if kernel_is -lt 4 4 3; then - ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to" - ewarn "properly operate, so it won't work. It's recommended to run at least" - ewarn "kernel version 4.11 for best performance and reliability." - ewarn - elif kernel_is -lt 4 11; then + if kernel_is -lt 4 11; then ewarn "With kernel versions below 4.11, bees may severely degrade system performance" ewarn "and responsiveness. Especially, the kernel may deadlock while bees is" ewarn "running, it's recommended to run at least kernel 4.11." @@ -48,7 +45,14 @@ pkg_pretend() { ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0" ewarn fi - + if kernel_is -lt 5 1 0; then + ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption" + ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" + ewarn "later kernel, that includes older LTS versions released after 5.0.4:" + ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" + ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" + ewarn + fi if kernel_is -lt 5 3 4; then ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running" ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst" @@ -59,25 +63,22 @@ pkg_pretend() { ewarn fi - if kernel_is -lt 5 0 4; then - ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption" - ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" - ewarn "later kernel, that includes older LTS versions released after 5.0.4:" - ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" - ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" - ewarn - fi - elog "Bees recommends running the latest current kernel for performance and" elog "reliability reasons, see README.md." fi } +src_prepare() { + default + sed -i 's/ -Werror//' makeflags || die +} + src_configure() { cat >localconf <<-EOF || die LIBEXEC_PREFIX=/usr/libexec PREFIX=/usr - LIBDIR=$(get_libdir) + LIBDIR="$(get_libdir)" + SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" DEFAULT_MAKE_TARGET=all EOF if [[ ${PV} != "9999" ]] ; then diff --git a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch deleted file mode 100644 index 60ab748eb2b6..000000000000 --- a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 566df54a3f7458559b75455a95b1991b515ba6bf Mon Sep 17 00:00:00 2001 -From: Zygo Blaxell <zblaxell@thirteen.furryterror.org> -Date: Wed, 12 Jun 2019 21:27:50 -0400 -Subject: [PATCH 1/2] lib: fix non-local lambda expression cannot have a - capture-default - -We got away with this because GCC 4.8 (and apparently every GCC prior -to 9) didn't notice or care, and because there is nothing referenced -inside the lambda function body that isn't accessible from any other -kind of function body (i.e. the capture wasn't needed at all). - -GCC 9 now enforces what the C++ standard said all along: there is -no need to allow capture-default in this case, so it is not. - -Fix by removing the offending capture-default. - -Fixes: https://github.com/Zygo/bees/issues/112 -Signed-off-by: Zygo Blaxell <bees@furryterror.org> ---- - lib/error.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/error.cc b/lib/error.cc -index f2a6db0..1d16a0a 100644 ---- a/lib/error.cc -+++ b/lib/error.cc -@@ -32,7 +32,7 @@ namespace crucible { - - // FIXME: could probably avoid some of these levels of indirection - static -- function<void(string s)> current_catch_explainer = [&](string s) { -+ function<void(string s)> current_catch_explainer = [](string s) { - cerr << s << endl; - }; - --- -2.23.0 - diff --git a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch deleted file mode 100644 index 6d8d2ea530d5..000000000000 --- a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch +++ /dev/null @@ -1,95 +0,0 @@ -From f731ea8016c570243c783adef96681b535d9c927 Mon Sep 17 00:00:00 2001 -From: Zygo Blaxell <bees@furryterror.org> -Date: Tue, 19 Nov 2019 16:01:31 -0500 -Subject: [PATCH 2/2] context: workaround to prevent LOGICAL_INO and btrfs - balance from running concurrently - -This avoids some kernel bugs. One of them is fixed in 5.3.4 and later: - - efad8a853a "Btrfs: fix use-after-free when using the tree modification log" - -There are apparently others in current kernels, so for now just put bees -on pause until the balance is done. - -At some point we may want to provide an option to disable this -workaround; however, running bees and balance at the same time makes -neither particularly fast, so maybe we'll just leave it this way. - -Signed-off-by: Zygo Blaxell <bees@furryterror.org> ---- - src/bees-context.cc | 31 +++++++++++++++++++++++++++++++ - src/bees.h | 4 ++++ - 2 files changed, 35 insertions(+) - -diff --git a/src/bees-context.cc b/src/bees-context.cc -index 4e0a43e..0665019 100644 ---- a/src/bees-context.cc -+++ b/src/bees-context.cc -@@ -760,11 +760,42 @@ BeesResolveAddrResult::BeesResolveAddrResult() - { - } - -+void -+BeesContext::wait_for_balance() -+{ -+ Timer balance_timer; -+ BEESNOTE("WORKAROUND: waiting for balance to stop"); -+ while (true) { -+ btrfs_ioctl_balance_args args; -+ memset_zero<btrfs_ioctl_balance_args>(&args); -+ const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args); -+ if (ret < 0) { -+ // Either can't get balance status or not running, exit either way -+ break; -+ } -+ -+ if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) { -+ // Balance not running, doesn't matter if paused or cancelled -+ break; -+ } -+ -+ BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop"); -+ sleep(BEES_BALANCE_POLL_INTERVAL); -+ } -+} -+ - BeesResolveAddrResult - BeesContext::resolve_addr_uncached(BeesAddress addr) - { - THROW_CHECK1(invalid_argument, addr, !addr.is_magic()); - THROW_CHECK0(invalid_argument, !!root_fd()); -+ -+ // Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)? -+ // Apparently yes, and more than one. -+ // Wait for the balance to finish before we run LOGICAL_INO -+ wait_for_balance(); -+ -+ // Time how long this takes - Timer resolve_timer; - - // There is no performance benefit if we restrict the buffer size. -diff --git a/src/bees.h b/src/bees.h -index da87d88..5c9375c 100644 ---- a/src/bees.h -+++ b/src/bees.h -@@ -114,6 +114,9 @@ const size_t BEES_TRANSID_FACTOR = 10; - // The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom - const size_t BEES_MAX_EXTENT_REF_COUNT = 2560; - -+// Wait this long for a balance to stop -+const double BEES_BALANCE_POLL_INTERVAL = 60.0; -+ - // Flags - const int FLAGS_OPEN_COMMON = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY; - const int FLAGS_OPEN_DIR = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY; -@@ -708,6 +711,7 @@ class BeesContext : public enable_shared_from_this<BeesContext> { - void set_root_fd(Fd fd); - - BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr); -+ void wait_for_balance(); - - BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e); - void rewrite_file_range(const BeesFileRange &bfr); --- -2.23.0 - diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch deleted file mode 100644 index 9f53e5b37da3..000000000000 --- a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001 -From: Zygo Blaxell <bees@furryterror.org> -Date: Tue, 29 Oct 2019 23:34:36 -0400 -Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In version 2.30 glibc added it's own gettid() function. This resulted in -"error: call of overloaded ‘gettid()’ is ambiguous" because gettid() -now exists in both namespace crucible and std. - -For now, use explicit references to namespace crucible. This continues -to work with new and old libc without having to test specific library -versions. - -At some point, glibc gettid() will be deployed widely enough that we can -remove the crucible version entirely. - -Signed-off-by: Zygo Blaxell <bees@furryterror.org> ---- - include/crucible/lockset.h | 4 ++-- - lib/chatter.cc | 4 ++-- - src/bees.cc | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h -index 856c55e..99500b7 100644 ---- a/include/crucible/lockset.h -+++ b/include/crucible/lockset.h -@@ -117,7 +117,7 @@ namespace crucible { - while (full() || locked(name)) { - m_condvar.wait(lock); - } -- auto rv = m_set.insert(make_pair(name, gettid())); -+ auto rv = m_set.insert(make_pair(name, crucible::gettid())); - THROW_CHECK0(runtime_error, rv.second); - } - -@@ -129,7 +129,7 @@ namespace crucible { - if (full() || locked(name)) { - return false; - } -- auto rv = m_set.insert(make_pair(name, gettid())); -+ auto rv = m_set.insert(make_pair(name, crucible::gettid())); - THROW_CHECK1(runtime_error, name, rv.second); - return true; - } -diff --git a/lib/chatter.cc b/lib/chatter.cc -index cbd5adb..e5a24f9 100644 ---- a/lib/chatter.cc -+++ b/lib/chatter.cc -@@ -69,14 +69,14 @@ namespace crucible { - DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", <m)); - - header_stream << buf; -- header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">"; -+ header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">"; - if (!m_name.empty()) { - header_stream << " " << m_name; - } - } else { - header_stream << "<" << m_loglevel << ">"; - header_stream << (m_name.empty() ? "thread" : m_name); -- header_stream << "[" << gettid() << "]"; -+ header_stream << "[" << crucible::gettid() << "]"; - } - - header_stream << ": "; -diff --git a/src/bees.cc b/src/bees.cc -index 08c3fd7..aa55af0 100644 ---- a/src/bees.cc -+++ b/src/bees.cc -@@ -115,9 +115,9 @@ BeesNote::~BeesNote() - tl_next = m_prev; - unique_lock<mutex> lock(s_mutex); - if (tl_next) { -- s_status[gettid()] = tl_next; -+ s_status[crucible::gettid()] = tl_next; - } else { -- s_status.erase(gettid()); -+ s_status.erase(crucible::gettid()); - } - } - -@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) : - m_prev = tl_next; - tl_next = this; - unique_lock<mutex> lock(s_mutex); -- s_status[gettid()] = tl_next; -+ s_status[crucible::gettid()] = tl_next; - } - - void --- -2.23.0 - diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest index 905abd18efb6..6db974b51589 100644 --- a/sys-fs/cryptmount/Manifest +++ b/sys-fs/cryptmount/Manifest @@ -1,3 +1,3 @@ -DIST cryptmount-5.3.2.tar.gz 545190 BLAKE2B 708c6ba33060c0698361de7bcdc5e0a5932e063c9178c0a6b9cfb1cba9ec236337dbda0664e8755cc017113ee8ef0149c47fc85019a57ac84bf240790d5d798c SHA512 972c7fefadb86bb82cdeb96b185f45bec08ac07d39474a4c7e2a473bc2453624ffcc387b6836a02260dcd0d1176a5a743c45bdf3d7e78d2f519f02a48c62a6b8 -EBUILD cryptmount-5.3.2.ebuild 1702 BLAKE2B 30734735a4ff0e4a59bfd12c84eb004a1defeffd348a0bb05486b0e3982daf56afb51ffbb3309fb5b65ede468d62c459b57c7a6c0c70cea523f931a9aeb447e4 SHA512 ceb28c17908dd268688ee59979a18e134dc55d0ef6f55ec176ba4d2bfe477098adf605c1a3ff51fe3f23c05ba20ac4f271b82a6bb000cb1683881806a4a34c5b +DIST cryptmount-5.3.3.tar.gz 545925 BLAKE2B 7a20d3a3b5805b1fe9ed84aafe6aaebeab4c62652dc8f53ecd70a7e0a0aa993ab5a03d54967910b94e6d8bde28f7ee7bb90a115a2bf101c9d4f4177fee26f90d SHA512 9945630316feee513a64e11dffa61ece77d0dff43a7b611d91fcb0a7c902402effb30ba15266d52c2f5381aa3ab7290a9a0999ca391c3c15cbdb83debe7dcca0 +EBUILD cryptmount-5.3.3.ebuild 1704 BLAKE2B 51bacfeba63318740e24092b71422889af37b188b5f907a5b9e206dc7efe2abebf391259bb36cd53d37d559e70bab14fb37ab93709fecf2cd06e9336336c8035 SHA512 d8b14bcfd5703fd238c4a766714822eef9c88c19a98410f0dd33a8b2c0f8cadf908712d231a5281dc3d4d331c31edbde19d9fae5e80f26504fb05a4eb38fe063 MISC metadata.xml 2145 BLAKE2B 6249f6be21900ffb75bb15d01232626fa43a92894208af23c8e9e50b771fe7f259dfb607a96907c70606da90b35c515d67436a50b83c2627b01aecb8bd07dd41 SHA512 e84164de214f81cf728615e7a68d8c9ac9daf707b585240d2a3c16212cbc0b0fe47f0096d35e6d98ccd8e3f1e984af4e5d820c7508b91625b6d4e356ca9cbde4 diff --git a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild b/sys-fs/cryptmount/cryptmount-5.3.3.ebuild index 95c674a5b8b6..4359dff13dc1 100644 --- a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild +++ b/sys-fs/cryptmount/cryptmount-5.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev" REQUIRED_USE=" luks? ( gcrypt ) diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest index e47b645019cc..64dba4475642 100644 --- a/sys-fs/diskdev_cmds/Manifest +++ b/sys-fs/diskdev_cmds/Manifest @@ -1,8 +1,9 @@ AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c AUX diskdev_cmds-332.14_p1-ldflags.patch 300 BLAKE2B 40b91cc8361b456f4dc62716a122971c1e87d5ca8a20154f2c9fa991db700cff67c5d7436cd38da0f1a83b712c14886ba6fc42e93f9004068379e7de167b7b56 SHA512 aa6c56cc464d18a1dbea3ddb14915605a913c786c882840c8c3b82ebf19bb768a0576aecea38a4d95853415f0756a81d7270636385ae83836ba0b7419448e3b4 +AUX diskdev_cmds-332.14_p1-musl.patch 1768 BLAKE2B 0433d95edd8f24da6bcb3d19fc34f9b32d673673fb019991332ad267cfeb32f7ff997f778ee1b9dbc3a6a53f904bef6f2679bdfa7d52db463b329b5ff6cab970 SHA512 7cfed261abec60032dee4491187f97960b50a7573760ae2f1b0bed81894fb3842c2997b45f4956a4dbb23144cfa175f424d7781231929daf82528ca9aa9790b2 AUX diskdev_cmds-332.14_p1-no-sysctl.patch 235 BLAKE2B 4eebaa367a3c1eef94c82755ddb848958984055b26097b98e078bf162a502632f1c0a29385db17aba61730b9ec28cf7dd46539520eab2a2d8fbf6a5a42106e8f SHA512 2dca72c6d7b82804e6355fe3262762c966dfaa848f5151f97946f4f9d0d29773f43f8f134d6e2dd52cb97430f2d98e02c37066ae8c88ca75c9fb7efb94c4c8c7 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062 -EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1372 BLAKE2B 2572adf06814bd274704ad88e01651d3961d0a2a91d48842801ded31cddd5c994ba9228061d5c0a7ef5f45c3a3f4d9f4516dcaa1962294a068e5ebcd0c4a07e0 SHA512 d20db0f4f5955e468dbeeac670ea09db534820da2a5096e2fd20691dff625ca0853bb306d74b908ea0bd3b263d8fd6c16dddef9b413bd7072524a38a97054675 +EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1403 BLAKE2B fa734cf80dfaa133b4223a847e15859d44b5b1e78e04332cf323f48450e8b4fe7fa42705788038755b0abd433f2fb412f22274ddcfc049ec3ca78a58affb052f SHA512 4746853b5c426a2b35c117577a48c521d98f7f5c44110df9a7c5856ed4863ae3ff02dfe042f3453baebc680f75c1f05a28f883b8dad7503b0d42763e62d37156 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild index 3fe0634bc4f6..16b057b2ea3c 100644 --- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild +++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${P}-AR.patch "${FILESDIR}"/${P}-no-sysctl.patch "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-musl.patch ) src_compile() { diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch new file mode 100644 index 000000000000..7e7c3d1d310e --- /dev/null +++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch @@ -0,0 +1,79 @@ +Port to musl. + +Patch-by: ernsteiswuerfel +Bug: https://bugs.gentoo.org/715862 +--- a/fsck_hfs.tproj/dfalib/CatalogCheck.c ++++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c +@@ -23,6 +23,7 @@ + #include "Scavenger.h" + #include "DecompDataEnums.h" + #include "DecompData.h" ++#include <sys/types.h> + + /* + * information collected when visiting catalog records +--- a/fsck_hfs.tproj/dfalib/SRepair.c ++++ b/fsck_hfs.tproj/dfalib/SRepair.c +@@ -35,6 +35,7 @@ + #include "Scavenger.h" + #include <unistd.h> + #include <sys/stat.h> ++#include <sys/types.h> + #include <stdlib.h> + #include "../cache.h" + +--- a/fsck_hfs.tproj/dfalib/Scavenger.h ++++ b/fsck_hfs.tproj/dfalib/Scavenger.h +@@ -44,7 +44,7 @@ + #include <sys/kauth.h> + #include <sys/syslimits.h> + #endif +-#include <sys/errno.h> ++#include <errno.h> + + #ifdef __cplusplus + extern "C" { +--- a/fsck_hfs.tproj/fsck_hfs.h ++++ b/fsck_hfs.tproj/fsck_hfs.h +@@ -24,6 +24,9 @@ + + #include "cache.h" + ++#ifndef __P ++#define __P(args) args ++#endif + + const extern char *cdevname; /* name of device being checked */ + extern char *progname; +--- a/newfs_hfs.tproj/makehfs.c ++++ b/newfs_hfs.tproj/makehfs.c +@@ -35,7 +35,6 @@ + #include <time.h> + #include "missing.h" + #endif +-#include <sys/errno.h> + #include <sys/stat.h> + #if !LINUX + #include <sys/sysctl.h> +@@ -69,6 +68,9 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b + #include "newfs_hfs.h" + #include "readme.h" + ++#ifndef __P ++#define __P(args) args ++#endif + + #define HFS_BOOT_DATA "/usr/share/hfsprogs/hfsbootdata" + +--- a/newfs_hfs.tproj/newfs_hfs.c ++++ b/newfs_hfs.tproj/newfs_hfs.c +@@ -54,6 +54,9 @@ + #else + #include <varargs.h> + #endif ++#ifndef __P ++#define __P(args) args ++#endif + + #define NOVAL (-1) + #define UMASK (0755) diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 4c95e99b6f7d..611420128b4b 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -7,5 +7,5 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84 EBUILD e2fsprogs-1.45.5.ebuild 3976 BLAKE2B b58d289b7f8549d80492551f99223e01817edee7e42b1eedad53912c7c67a9f746347208bea7e535e8aa3951e89c5741362b3117cea76d507e68b245285003b4 SHA512 24078e17691c1ab62f0ab798abb4b9ee32b70f60dc06ecaeaf12de7579bb42b480a0f10e9b66a660b6be0f5c54613d589e529482d5c96856b9706c05cff6c1bf -EBUILD e2fsprogs-1.45.6.ebuild 3985 BLAKE2B 9c10fde654a047ab4e0d4bf4cb97a8bcede16092d49caa3738b98fbeb3ce0e2a275b22c33633ba28bc0593d819296173a7e3977d1ea5680e6692b46c39c54d68 SHA512 a2b046e4ec510a5411d7c0d79c7779527506d73cb52fc3572c7d4456fc4b04bdf76d7064b384eb3f8ecd28fac6e62c1f947001d92db174609d37ef2b0abf37ea +EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild index 89254a09e7e0..9325951632f0 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cron fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest index f7b0499c8ec3..0ed4d910584f 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 962 BLAKE2B 0a0b54ce7c01509c47bb5849e741789ae52e2e8ac002f265fad69f3acbc4099e66d3b60ea8bacf24baf73c095847cffd50c3c19fcedd4592484bc3a4e88e93da SHA512 056770eab4af507f313f0867d3debe0ce6c0d5101e87d8bcba4de97249eec180029feea35ac38c8c8dcd701a4149c282eb3fe4674794621c3545997fe728023b +EBUILD encfs-1.9.5-r1.ebuild 969 BLAKE2B 9ee94b4a1e0631119e9d46bfe97870562d363f73c65729757689ab34fa60987202eed8f2148dfcdc335a73dcc59fe6f42a18ec8b271e97b7731b02fa6f353420 SHA512 9b43c43731878119e17ebf3c9207a53609736fac38c88fc401e3e02e3b1d88f92a71d6bd4f667c9856e421fce1f44cae2ebd29985d4e5fb040f438f44a7546dd EBUILD encfs-1.9.5.ebuild 953 BLAKE2B fed8b13ebff3766ebe08594437398e541a1a71c373f98dea59b8c78ec584fcfa21d2cec3170b148f251e8cfff315b71f29bdcdeb250637ec0517a500b97b81f2 SHA512 e5d941c595dffe482f08ffd0d276bac80c93828a8dfa71bee1de1cb232e197f65a6b8206086eae407d7cef349173edc3cf6c3379a7390611f2bfc20ace2a99bd MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f diff --git a/sys-fs/encfs/encfs-1.9.5-r1.ebuild b/sys-fs/encfs/encfs-1.9.5-r1.ebuild index c4043c7510d5..4bbb57d57e46 100644 --- a/sys-fs/encfs/encfs-1.9.5-r1.ebuild +++ b/sys-fs/encfs/encfs-1.9.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86" IUSE="libressl nls" RDEPEND=" diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest index f7aec45bdc90..332236a61231 100644 --- a/sys-fs/mergerfs/Manifest +++ b/sys-fs/mergerfs/Manifest @@ -9,6 +9,6 @@ EBUILD mergerfs-2.28.3-r1.ebuild 1050 BLAKE2B 8b5ea7c3cdb6751b706c1a1f7917f3f6cd EBUILD mergerfs-2.29.0.ebuild 963 BLAKE2B 2df7a15e80299d35e0931db932b3af8d74d452e70eae97382fa28a75ac13cec48b62ef1bcfdacfb82fc04d4d3ef7bc3b148da806a6af1120c5ce73e60ab46a54 SHA512 226502ebd8e52f109039c7a3e6ccfd283f5212c1aa29f9b074eeeb4e81a001a004edc355bb7eb3d42e923990fcd260cc5ca9c7b992a2ffebf799f556d8dc0891 EBUILD mergerfs-2.30.0.ebuild 1149 BLAKE2B 2e935754ebac73c65dda54dfe817b00dbff4a2821928572850b59b21f29fd38260538f933325671f4c129005819c21d436aa1da0a0ea6c0dd3e1715cc8b36a86 SHA512 bc919fd0d49a2012bff05ab237728c4126a2fee4b0a3e4a711a0030671cf3322f18231bfd2664cc78ac840febf0b12d8678d55e96152970d9cd56030981aa0e0 EBUILD mergerfs-2.31.0.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c -EBUILD mergerfs-2.32.0.ebuild 1064 BLAKE2B 04d53de6bb618c91a1fa4e662850c385443fa454af159a434eedc8f82f2513f44a30960139a600d394ba0b7218d9537d3883120d50f2ca9e00d539d0d80dffbf SHA512 d3dc43f522ff6cb3741b2123bc3d8a8825e849c629377ed2c55033cd9874f36a0bc3ca72c35bbfc19841440ca4b44b11408a513158e60b00008dd1ef1f8601ad +EBUILD mergerfs-2.32.0.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd EBUILD mergerfs-2.32.1.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496 diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild index 27aeefa5ab58..1a8305d70486 100644 --- a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem" HOMEPAGE="https://github.com/trapexit/mergerfs" SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" # Vendorized libfuse that's bundled is under LGPL-2.1. LICENSE="ISC LGPL-2.1" diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest index f6c6926b52f8..30845575c953 100644 --- a/sys-fs/rar2fs/Manifest +++ b/sys-fs/rar2fs/Manifest @@ -1,8 +1,3 @@ -AUX rar2fs-1.29.1-no-compress-man.patch 312 BLAKE2B 3117878def7fdf738ed666f6662908aa5727ce0db48d5297767acc00de5b030bb9013c1d2e6d88687a40475e3527424d42bf547fd5b7cb285b6280f5e25a1f26 SHA512 4116da0458ca3d1333022e0c6e89463ddf98cf44e48a117b5b09421824806da3ef94e92a0d6aac62ed83b0483f573fee21eec971ad30127a47580bf290c35414 -DIST rar2fs-1.28.0.tar.gz 264753 BLAKE2B 7f1462fae6e869e64a8c75d85c50df2794f4bfd0b057e5c213eb28a8aa48da53961026c5b9fb752090052c25a02ef9bb2a90bc57cfd8c4097b4c3136f20e7fb1 SHA512 e50313d1dae57387f60520ed3ff1d610f4c8448fcff101a9735a4ac1471dc5aa6ac67d0ba5200310caf439cf60ab1e1b8328a7048904970c292f35f700ef5c03 -DIST rar2fs-1.29.0.tar.gz 267351 BLAKE2B cc71c038b32fcc5584234df60dae829486885485e78702bacf6e6da21377b399b65a8b4986a076e84915c65f4f03ff0084678854188b6cef261a66547d8417c1 SHA512 199767cf22a11a7afd53318d471138ed1d82b92dc6d4e0d20094262a2f2d8f9c03ac6b47ceff8318923e01228b33f12684b1664e4b1c28bf43fb0d81f3d044c5 -DIST rar2fs-1.29.1.tar.gz 267860 BLAKE2B 2129dcfb860e56ea91dcea9d5af5e9a5c4513b7153673e366bfe3259ad12e1750507ffdd422ee6bad79afda950e5b08ee91a27012126d16c244dc146aee15a36 SHA512 c0cb4cca59e6adb450350a9730500bf9c569bb9ad835af0726ff05876a7a02c43e905293cc5582239b7a2564bf46bd02e6122934e0ad8c1785c326dbeff9c096 -EBUILD rar2fs-1.28.0.ebuild 809 BLAKE2B 44aa2834fdc6ac61d28b534d33aeb9b67f21b0a884c70176b5d9cacc3c41f27aa3db179f164d480e1de2721c7e15d2efaf08be7cd8de5d57031e1c5d577fb4ec SHA512 bad04944a110f8a9ee5bef4ebcc755e19b9c3d7a2bd89a7aa5ad89197682eb5af17c946c6d65ee2ccbe074f795d337e5d8f8d04878afafd7bba7b3e623ab7930 -EBUILD rar2fs-1.29.0.ebuild 809 BLAKE2B fe60f983d69d29bc33e8f001728e41b07ae0cd79dab8f7af653111964b1994c6a5ca2c61a6e27629ce005a51b2bc210b78da1ac924759ec85b0637046c6e245b SHA512 ff1ad7068e835104abc04b9100c46f1ced6859d6ecf4d080180d29ec08335c0ccf84c6eff4fa947c2f682e6e6e93b5e8029565ef95bc72a42ea2d4a0254cb114 -EBUILD rar2fs-1.29.1.ebuild 932 BLAKE2B 5eed7c95bb4479067dfbf8770f4c5b2c55b0ae5111bc751f024f4e845b9f1c76078d0b134e050201f29779a74cbb1056b01cf023b57fe1a4d9cc6f4a019d837b SHA512 3b2fcea6c201b6466f706f0805b0f22f379cea83e0c35555a45475424b188da45b78082aedea2f3ae7246e210d6f2ce65f29b455c5aef645edc1ca99bd3aed2a +DIST rar2fs-1.29.3.tar.gz 267415 BLAKE2B 269ad7f301595e6c17899fccd926589f883ab14ae43af9d6a024e6e381b2bf64786eba314431b32a1f6c8add315afdef259a1bc24da9ae93378d2ac38d3f3cce SHA512 75def71f088df0d9c9a62009178d0c1682f1ff75708c7b273dd669ecb1406795e53ff8ad0f6323d275f13cb580bebfaf1ca5b5c76026bb9b83360aed2f26935e +EBUILD rar2fs-1.29.3.ebuild 869 BLAKE2B e6e70a39b962f002b111f63449a8fc44910cd71468f12a742f7149a1d635b5d0eb3db124f3eacedb11f896749d31793f4dc3aa37a8cf25cf3362a950f48f6f44 SHA512 31c3521e8a06b1132d54ce84fde7f068609d1b9d2192d890b3cdfbc4eba5ab021416d651e2392a3100c161e0b6583444423732d5ea03ab6b3d61c876780c0317 MISC metadata.xml 450 BLAKE2B 376df33314a93fca46449a3f491c4f6e31111a31fcbdd7be9cb6cd4207a45854ba70d7aeceaddc12c60b5b60d63080df5c4355aeeedff45c88605341f894d48f SHA512 c41759771363256abd1bfa7b1bab8dad7b2bdb721c74c7c2e279d94fda8fb68b98abf3f7a486ede01cf6ed6b7a4f9f048053438f414be5222ffad1542e5cf539 diff --git a/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch b/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch deleted file mode 100644 index dac49db0e0fd..000000000000 --- a/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/m4/m4_ac_prog_gzip.m4 b/m4/m4_ac_prog_gzip.m4 -index 32ffc37..f5589bc 100644 ---- a/m4/m4_ac_prog_gzip.m4 -+++ b/m4/m4_ac_prog_gzip.m4 -@@ -1,5 +1,5 @@ - AC_DEFUN([AC_PROG_GZIP],[ --AC_CHECK_PROGS(gzip,[gzip],no) -+gzip="no" - export gzip; - AM_CONDITIONAL([HAVE_GZIP], [test x$gzip != xno]) - AC_SUBST(gzip) diff --git a/sys-fs/rar2fs/rar2fs-1.28.0.ebuild b/sys-fs/rar2fs/rar2fs-1.28.0.ebuild deleted file mode 100644 index d7d5e5f041b8..000000000000 --- a/sys-fs/rar2fs/rar2fs-1.28.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)" -HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs" -SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -# Note that upstream unrar sometimes breaks ABI without updating the SONAME -# version so try rebuilding rar2fs if it doesn't work following an unrar -# upgrade. -RDEPEND=">=app-arch/unrar-5:= - sys-fs/fuse:0" -DEPEND="${RDEPEND}" - -src_configure() { - export USER_CFLAGS="${CFLAGS}" - - econf \ - --with-unrar="${ESYSROOT}"/usr/include/libunrar \ - --disable-static-unrar \ - $(use_enable debug) -} diff --git a/sys-fs/rar2fs/rar2fs-1.29.0.ebuild b/sys-fs/rar2fs/rar2fs-1.29.0.ebuild deleted file mode 100644 index e7b7be74efd1..000000000000 --- a/sys-fs/rar2fs/rar2fs-1.29.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)" -HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs" -SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -# Note that upstream unrar sometimes breaks ABI without updating the SONAME -# version so try rebuilding rar2fs if it doesn't work following an unrar -# upgrade. -RDEPEND=">=app-arch/unrar-5:= - sys-fs/fuse:0" -DEPEND="${RDEPEND}" - -src_configure() { - export USER_CFLAGS="${CFLAGS}" - - econf \ - --with-unrar="${ESYSROOT}"/usr/include/libunrar \ - --disable-static-unrar \ - $(use_enable debug) -} diff --git a/sys-fs/rar2fs/rar2fs-1.29.1.ebuild b/sys-fs/rar2fs/rar2fs-1.29.3.ebuild index cc417da24599..88a18a26d4e7 100644 --- a/sys-fs/rar2fs/rar2fs-1.29.1.ebuild +++ b/sys-fs/rar2fs/rar2fs-1.29.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,10 +21,6 @@ RDEPEND=">=app-arch/unrar-5:= sys-fs/fuse:0" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-1.29.1-no-compress-man.patch" -) - src_prepare() { default eautoreconf diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest index 210d444fe159..313c9e9c068b 100644 --- a/sys-fs/tmsu/Manifest +++ b/sys-fs/tmsu/Manifest @@ -4,4 +4,4 @@ DIST tmsu-0.7.4.tar.gz 98631 BLAKE2B 4af013de08f43b6ee337259b394aafce0862d3f0811 EBUILD tmsu-0.6.1.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f EBUILD tmsu-0.7.0.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f EBUILD tmsu-0.7.4.ebuild 848 BLAKE2B 73ea7a0136d29c6c0e24cd576b96888b02ab8af284c7b2fb928d7af5188ed164211fd78236b5e21d223c19a0ccf65797d74c407f1d8c46b6c6fcd3a1181221ea SHA512 d70901fe4999ef13483af4ea2996c463c0a96acb522079748d13b04d613c1d902da271159d565b0971d1a649fc5e115070b81f0a57987ee3e0a1de846b37ad01 -MISC metadata.xml 686 BLAKE2B ed1a6520b6f3df2599cd1b9a8f810df2cd0512b30d40a311c9973fa238931ef5d91be575ff6148ecd2ac8b6e96fb07238f4f42547abc420b19d33ad832a20f5c SHA512 6fb27753e24f6de9f3917d48f0d209f5bf05e5ab6d037968a70ba42b51ccb2d2a7bd06c9908d2673d3629a670ef56342cb6f8caa0bf540094cd3c9dc609d334d +MISC metadata.xml 689 BLAKE2B 6cbf6167ef4b57c783e261ddd28d80c3a0fe530b7c8e81e4629c34ab8990b3facc149e6a1498bfdf0558874cbc9ab567ca525abe33e8bf3b398248af98364872 SHA512 a360fbb29b7789f3fe5d43f6e25705d2ee5274903bd58b2dccb6d35bf81aec37af7c397e97a6613a846b68540562fd4143636ba0fef1408a9b0b37d98dcb57c4 diff --git a/sys-fs/tmsu/metadata.xml b/sys-fs/tmsu/metadata.xml index bdcfa508c7d3..2b3f5afc5065 100644 --- a/sys-fs/tmsu/metadata.xml +++ b/sys-fs/tmsu/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>chr@chymera.eu</email> + <email>gentoo@chymera.eu</email> <name>Horea Christian</name> </maintainer> <maintainer type="project"> diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 319cb9118b07..445e12078713 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,11 +1,8 @@ -AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554 -DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172 -EBUILD udev-242.ebuild 9610 BLAKE2B 0dcc6a6952d3c8681ee17710b45366ab9d11e75f57173ed51160b148a038f27fe9def06257ccc070f25777c03eb569febc75bab5bf3b82517de93cea8f7003b6 SHA512 29fe9d4174b70d474e65c7ef67a799ef8a0b3918a3fd811318f119fadf6dc4637c7d24bf9acbe99e4674a461402479c4ca4312babe27beb01a114b79df019944 -EBUILD udev-243-r2.ebuild 9807 BLAKE2B afd9f20de9da69ae4479bfa2c19682555cdce783194ebef1ff56be2e43e6d4df6645653a2e554532a6cf86630f3f6e7dd100e1e98ff437ac2ac962ecd2264247 SHA512 4e6aafea5860f2d9f9b905b093dcdbf1f618dc51c00eca4557aa22ac5acbd765422a962e0d4b5fff14c76f6341df93199689d36477a08046591ab277399b7d6d -EBUILD udev-245.5-r1.ebuild 5851 BLAKE2B 05143f65bf4bcc96e17a40129ea659bda1802e1c6e0cdb45514f970ac6653243b7c7915bb0a5e349e4668c2ee11bfce2cb7555f07d836c581b0aabdf96d8ba00 SHA512 59827cc29d73ec3119fb3ece47c9d3b97a9bc82c88c53b3a3569b4828346b50dbbc05ccc28a17823075c986fcbe9ac5820eff5e403d7a6194061c989d5f8f456 -EBUILD udev-246-r1.ebuild 5850 BLAKE2B afc24f86962029dcf04e3de5f6607364e767a94dc6fde89823419dc5d03dc6b6b8f8d2bbb97bef3dc61c5e83b90236e7be5beaf9e1184c8a450e9266b51c7021 SHA512 de8e68b6580eb27caa9970d0fdce6b4be75301dd7fe79686932fe9acf5ce6e4568e12c5905543422150545e8346449b1bcc9816124545d6895df93129fe76e85 -EBUILD udev-9999.ebuild 5850 BLAKE2B afc24f86962029dcf04e3de5f6607364e767a94dc6fde89823419dc5d03dc6b6b8f8d2bbb97bef3dc61c5e83b90236e7be5beaf9e1184c8a450e9266b51c7021 SHA512 de8e68b6580eb27caa9970d0fdce6b4be75301dd7fe79686932fe9acf5ce6e4568e12c5905543422150545e8346449b1bcc9816124545d6895df93129fe76e85 +EBUILD udev-243-r2.ebuild 9823 BLAKE2B 4eb1fc3edd8f76e556c526828018a16f8c461ecd305abb5a7816296fc4338af724b8063deeb6e85e2d8d168f25f44294cd0a15a1c71db42e6ac76d4ddbed493d SHA512 1c1d0fcc4c12f09b6b4345fdfc29a482ea75c61ddf2e23f996848d89aef4d9cd463dbafcfc69b4ea090d438dd60ddfc4343da2a6a4d4c63b79398332dbfb2126 +EBUILD udev-245.5-r1.ebuild 5927 BLAKE2B 866e2c0d9fd44bc1d49911f45b4980e3a2aaae753ae8fd57567cb66c8d66fa5cff1d73a07c839eb31c98ba7824aab1da6a81e08af5574ab1e25052dd40f34834 SHA512 511cb0a7a8b303e164588ffbb119b3d5e814246322efc3e5cf73151937c0ce83f214096643a6109dd05f2bf01aa028b759bb925b8f356dc5ada38e13191f3f3e +EBUILD udev-246-r1.ebuild 5927 BLAKE2B 986e1d030d43dcced758482f80fcfbb33c77d90118ad25a11563278073cbdc6ec9f396c8ed5b275a01c57ced487107b21a1cd5873314102b23133a006ebeeccb SHA512 9c5dcc2b22501b3230e76efd775e4dc6ad46c39fafa5faa0c9cf84cac6afc1e4f5978cf5674c8410c55cdcfbd6b13f75960af034763dd798b82a930f2f58c3f0 +EBUILD udev-9999.ebuild 5927 BLAKE2B 986e1d030d43dcced758482f80fcfbb33c77d90118ad25a11563278073cbdc6ec9f396c8ed5b275a01c57ced487107b21a1cd5873314102b23133a006ebeeccb SHA512 9c5dcc2b22501b3230e76efd775e4dc6ad46c39fafa5faa0c9cf84cac6afc1e4f5978cf5674c8410c55cdcfbd6b13f75960af034763dd798b82a930f2f58c3f0 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/files/242-gcc-9.patch b/sys-fs/udev/files/242-gcc-9.patch deleted file mode 100644 index e9f690a65be5..000000000000 --- a/sys-fs/udev/files/242-gcc-9.patch +++ /dev/null @@ -1,163 +0,0 @@ -From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Tue, 7 May 2019 13:46:55 +0200 -Subject: [PATCH] network: remove redunant link name in message - -Fixes #12454. - -gcc was complaining that the link->ifname argument is NULL. Adding -assert(link->ifname) right before the call has no effect. It seems that -gcc is confused by the fact that log_link_warning_errno() internally -calls log_object(), with link->ifname passed as the object. log_object() -is also a macro and is does a check whether the passed object is NULL. -So we have a check if something is NULL right next an unconditional use -of it where it cannot be NULL. I think it's a bug in gcc. - -Anyway, we don't need to use link->ifname here. log_object() already prepends -the object name to the message. ---- - src/network/networkd-link.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 533193ac932..6fc82940033 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) { - - r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled); - if (r < 0) -- log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", -- enable_disable(!disabled), link->ifname); -+ log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled)); - else - log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled)); - -From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Wed, 22 May 2019 10:31:01 -0400 -Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno - -Fixes: https://github.com/systemd/systemd/issues/12534 ---- - src/shared/machine-image.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c -index 6b9d8fb97a6..6a6d952b424 100644 ---- a/src/shared/machine-image.c -+++ b/src/shared/machine-image.c -@@ -201,11 +201,13 @@ static int image_make( - Image **ret) { - - _cleanup_free_ char *pretty_buffer = NULL; -+ _cleanup_free_ char *cwd = NULL; - struct stat stbuf; - bool read_only; - int r; - - assert(dfd >= 0 || dfd == AT_FDCWD); -+ assert(path || dfd == AT_FDCWD); - assert(filename); - - /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block -@@ -221,6 +223,9 @@ static int image_make( - st = &stbuf; - } - -+ if (!path) -+ safe_getcwd(&cwd); -+ - read_only = - (path && path_startswith(path, "/usr")) || - (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS); -@@ -359,7 +364,7 @@ static int image_make( - - block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY); - if (block_fd < 0) -- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename); -+ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); - else { - /* Refresh stat data after opening the node */ - if (fstat(block_fd, &stbuf) < 0) -@@ -373,13 +378,13 @@ static int image_make( - int state = 0; - - if (ioctl(block_fd, BLKROGET, &state) < 0) -- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename); -+ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); - else if (state) - read_only = true; - } - - if (ioctl(block_fd, BLKGETSIZE64, &size) < 0) -- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename); -+ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); - - block_fd = safe_close(block_fd); - } -From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Fri, 24 May 2019 10:54:09 +0200 -Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the - first argument is specified - -A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b. ---- - src/shared/machine-image.c | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c -index 6a6d952b424..55e5f08f91e 100644 ---- a/src/shared/machine-image.c -+++ b/src/shared/machine-image.c -@@ -200,8 +200,7 @@ static int image_make( - const struct stat *st, - Image **ret) { - -- _cleanup_free_ char *pretty_buffer = NULL; -- _cleanup_free_ char *cwd = NULL; -+ _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL; - struct stat stbuf; - bool read_only; - int r; -@@ -223,8 +222,12 @@ static int image_make( - st = &stbuf; - } - -- if (!path) -- safe_getcwd(&cwd); -+ if (!path) { -+ if (dfd == AT_FDCWD) -+ (void) safe_getcwd(&parent); -+ else -+ (void) fd_get_path(dfd, &parent); -+ } - - read_only = - (path && path_startswith(path, "/usr")) || -@@ -364,7 +367,7 @@ static int image_make( - - block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY); - if (block_fd < 0) -- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); -+ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename); - else { - /* Refresh stat data after opening the node */ - if (fstat(block_fd, &stbuf) < 0) -@@ -378,13 +381,13 @@ static int image_make( - int state = 0; - - if (ioctl(block_fd, BLKROGET, &state) < 0) -- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); -+ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename); - else if (state) - read_only = true; - } - - if (ioctl(block_fd, BLKGETSIZE64, &size) < 0) -- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename); -+ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename); - - block_fd = safe_close(block_fd); - } diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild deleted file mode 100644 index 6c9973b9a66d..000000000000 --- a/sys-fs/udev/udev-242.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 2003-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - MY_PV=${PV/_/-} - MY_P=systemd-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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" - -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] - sys-libs/libcap[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !<sys-libs/glibc-2.11 - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd" -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=dev-util/intltool-0.50 - >=dev-util/meson-0.40.0 - dev-util/ninja - >=sys-apps/coreutils-8.16 - virtual/os-headers - virtual/pkgconfig - >=sys-kernel/linux-headers-3.9 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -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-fs/lvm2-2.02.103 - !<sec-policy/selinux-base-2.20120725-r10" -PDEPEND=">=sys-apps/hwids-20140304[udev] - >=sys-fs/udev-init-scripts-26" - -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() { - cat <<-EOF > "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - if [[ -d "${WORKDIR}/patches" ]]; then - eapply "${WORKDIR}/patches" - fi - - local PATCHES=( - "${FILESDIR}"/242-gcc-9.patch - ) - - default -} - -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1"; then - echo true - else - echo false - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dacl=$(meson_multilib_native_use acl) - -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) - -Dlink-udev-shared=false - -Dsplit-usr=true - - # Prevent automagic deps - -Dgcrypt=false - -Dlibcryptsetup=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dseccomp=false - -Dlz4=false - -Dxz=false - ) - meson_src_configure -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - multilib-minimal_src_configure -} - -multilib_src_compile() { - # meson creates this link - local libudev=$(readlink src/udev/libudev.so.1) - - local targets=( - src/udev/${libudev} - ) - if multilib_is_native_abi; then - targets+=( - systemd-udevd - udevadm - src/udev/ata_id - src/udev/cdrom_id - src/udev/mtd_probe - src/udev/scsi_id - 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 - ) - fi - eninja "${targets[@]}" -} - -multilib_src_install() { - local libudev=$(readlink src/udev/libudev.so.1) - - into / - dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} - - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - - if multilib_is_native_abi; then - into / - dobin udevadm - - exeinto /lib/systemd - doexe systemd-udevd - - exeinto /lib/udev - doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} - - rm rules/99-systemd.rules || die - insinto /lib/udev/rules.d - doins rules/*.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 - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - doins "${S}"/rules/*.rules - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - - einstalldocs -} - -pkg_postinst() { - mkdir -p "${ROOT%/}"/run - - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 - # So try to remove it here (will only work if empty). - rmdir "${ROOT%/}"/dev/loop 2>/dev/null - if [[ -d ${ROOT%/}/dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - local fstab="${ROOT%/}"/etc/fstab dev path fstype rest - while read -r dev path fstype rest; do - if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then - ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" - ewarn "filesystem. Otherwise udev won't be able to boot." - ewarn "See, https://bugs.gentoo.org/453186" - fi - done < "${fstab}" - - if [[ -d ${ROOT%/}/usr/lib/udev ]]; then - ewarn - ewarn "Please re-emerge all packages on your system which install" - ewarn "rules and helpers in /usr/lib/udev. They should now be in" - ewarn "/lib/udev." - ewarn - ewarn "One way to do this is to run the following command:" - ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" - ewarn "Note that qfile can be found in app-portage/portage-utils" - fi - - local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules - local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules - for old_rules in "${old_cd_rules}" "${old_net_rules}"; do - if [[ -f ${old_rules} ]]; then - ewarn - ewarn "File ${old_rules} is from old udev installation but if you still use it," - ewarn "rename it to something else starting with 70- to silence this deprecation" - ewarn "warning." - fi - done - - elog - elog "Starting from version >= 197 the new predictable network interface names are" - elog "used by default, see:" - elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" - elog - elog "Example command to get the information for the new interface name before booting" - elog "(replace <ifname> with, for example, eth0):" - elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null" - elog - elog "You can use either kernel parameter \"net.ifnames=0\", create empty" - elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" - elog "to disable the feature." - - if has_version 'sys-apps/biosdevname'; then - ewarn - ewarn "You can replace the functionality of sys-apps/biosdevname which has been" - ewarn "detected to be installed with the new predictable network interface names." - fi - - ewarn - ewarn "You need to restart udev as soon as possible to make the upgrade go" - ewarn "into effect." - ewarn "The method you use to do this depends on your init system." - if has_version 'sys-apps/openrc'; then - ewarn "For sys-apps/openrc users it is:" - ewarn "# /etc/init.d/udev --nodeps restart" - fi - - elog - elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" - elog "fixing known issues visit:" - elog "https://wiki.gentoo.org/wiki/Udev" - elog "https://wiki.gentoo.org/wiki/Udev/upgrade" - - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${ROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ ! -e ${net_setup_link} ]]; then - [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes - if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? - fi - - # 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 -} diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild index 34e919e5c634..c294a693ef17 100644 --- a/sys-fs/udev/udev-243-r2.ebuild +++ b/sys-fs/udev/udev-243-r2.ebuild @@ -45,7 +45,8 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-libs/libxslt" + dev-libs/libxslt + ${PYTHON_DEPS}" RDEPEND="${COMMON_DEPEND} acct-group/kmem acct-group/tty diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild index b5b2acbecf9a..d245246d2185 100644 --- a/sys-fs/udev/udev-245.5-r1.ebuild +++ b/sys-fs/udev/udev-245.5-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -18,7 +19,7 @@ else 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" - 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 s390 sparc x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -39,6 +40,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt + ${PYTHON_DEPS} " COMMON_DEPEND=" >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] @@ -142,6 +144,7 @@ multilib_src_configure() { src_configure() { # Prevent conflicts with i686 cross toolchain, bug 559726 tc-export AR CC NM OBJCOPY RANLIB + python_setup multilib-minimal_src_configure } diff --git a/sys-fs/udev/udev-246-r1.ebuild b/sys-fs/udev/udev-246-r1.ebuild index cb14882292b2..cf615425a349 100644 --- a/sys-fs/udev/udev-246-r1.ebuild +++ b/sys-fs/udev/udev-246-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -39,6 +40,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt + ${PYTHON_DEPS} " COMMON_DEPEND=" >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] @@ -142,6 +144,7 @@ multilib_src_configure() { src_configure() { # Prevent conflicts with i686 cross toolchain, bug 559726 tc-export AR CC NM OBJCOPY RANLIB + python_setup multilib-minimal_src_configure } diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index cb14882292b2..cf615425a349 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -39,6 +40,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt + ${PYTHON_DEPS} " COMMON_DEPEND=" >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] @@ -142,6 +144,7 @@ multilib_src_configure() { src_configure() { # Prevent conflicts with i686 cross toolchain, bug 559726 tc-export AR CC NM OBJCOPY RANLIB + python_setup multilib-minimal_src_configure } diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest index 258ca9020e18..6b7cef6a1b2e 100644 --- a/sys-fs/udftools/Manifest +++ b/sys-fs/udftools/Manifest @@ -1,5 +1,7 @@ DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64 DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b +DIST udftools-2.3.tar.gz 581756 BLAKE2B 48b3681509c755249cfabd29fae9a622bcf104aead15e03196acaaa64ad8cab77b928fec7c08be7b9f5753594e1de1c21c9a9c3e863bcf5388d6e2090d04e9a9 SHA512 17304264388ae53e348d6aa870f0d23c29477344fee848236b46886c086221941872073974f804c0735eafd0cf9f7acdac7988132f03c0a87dba37467b5bda95 EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8 -EBUILD udftools-2.2.ebuild 588 BLAKE2B c29176d9459319cb4fc3115e9f2c4965fc894b353978aeb5599338b2d122537e0d8b85e2ae4d7096f0825a9820d8919a2f8d33a532aa004437189849221677d7 SHA512 4d1ee19fea8cb7af3e5b98935b8fb9374263942b4dafe1eb75e93016cb42fca7b48a397dd3ddbe949379361ec03b8f48141224d5af0183a800ca63e81086986e +EBUILD udftools-2.2.ebuild 583 BLAKE2B 6d95826857e7e9de06d16b68a292d669a67f21a88c1959d1bae1d4cfa638fcb054e62860de019ac4b1bef918e29a659e68eb627574fee21aff62f2f2381a16ac SHA512 9eaac92d924ad075005141c321d1928a15c74970510435dc8f72c52722fcfa8a04ba26e8ec4478f98620f3ce71edb1e8efda1f97e72b38371113bd05cf64fccc +EBUILD udftools-2.3.ebuild 588 BLAKE2B af0becf95d4bde20e2f5c713d4cd20e9a48f96de6a2938f6cee418095e9825b057fd92014cdaf30edb5d25308686c9dafb2a09297981fff62e20d6dac21484f0 SHA512 d07cb80c835f1d163654db9445f3b393432221ad0471e2c07eb4e7afc13749fd51d8a035e3bf922f215539e4791370d5e54bec74ee98941df168ac34e33bb5ce MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f diff --git a/sys-fs/udftools/udftools-2.2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild index a57b048c42ec..465de8928243 100644 --- a/sys-fs/udftools/udftools-2.2.ebuild +++ b/sys-fs/udftools/udftools-2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="sys-libs/readline:0=" diff --git a/sys-fs/udftools/udftools-2.3.ebuild b/sys-fs/udftools/udftools-2.3.ebuild new file mode 100644 index 000000000000..df7278f2df9f --- /dev/null +++ b/sys-fs/udftools/udftools-2.3.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem" +HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/" +SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="sys-libs/readline:0=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + virtual/udev +" diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 0a1d51727bc4..22666df567a7 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,5 +1,5 @@ DIST udisks-2.9.0.tar.bz2 1671841 BLAKE2B 5f0f26b203a4a54736875211d8299c1b81a4e2722561028f802200b3a0916fb70baa923b2f7f5474580ccf14581d4e3cf203bf9e864cf01613275d3f1b1935db SHA512 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3 EBUILD udisks-2.9.0.ebuild 3384 BLAKE2B 86fefe57eb435e5d77b734a22aa86f33fe44e410a36a16ea00e9e1b302ddc9d0852a3f524f50e46e1ecec59cd7072ec28f64696dd937a27e9c5ea0569073a12b SHA512 bc22927d295a93bf4d4054344f1cb379ee35a26cd2257931d56e2021035e28413b5f3b6bf848b2efdfa6ae5fdc84526e959d2a3c41ca4eddc5d24c6b6f1705ee -EBUILD udisks-2.9.1.ebuild 3480 BLAKE2B 0536feb36b0240f126381ac5a67070dd8600eb14db6d6bde821c6fdd404c1cace49b743187a65e6274e83283625c03be5cdff907390542790db4992dcce21805 SHA512 aa971030e093510e6c0762a19782e092a1c34ab950b67645b16e860a2a92d8dd98e1396e598915ccd6a9ae3ad5ebc6c1a1e6ab2856b422f480777f3556be68c1 +EBUILD udisks-2.9.1.ebuild 3473 BLAKE2B bacc1690696c7dac9fb2a2d49faa60f15d6478250c1b3a401bdff9ae36fbd9442e1ccc686889bffaf32c7d84f6f7ff03206c82b44f8e3224bedd59f6d152ece3 SHA512 2b962bfcf6c812afcc3e6e9804a1a184e3a85e99747f19829df8c1516ea290254186bac1f57cb63e067dd052d7176d88a5b87dafc6a245ed8928ec724964ec13 MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb diff --git a/sys-fs/udisks/udisks-2.9.1.ebuild b/sys-fs/udisks/udisks-2.9.1.ebuild index a85f499c4a42..213b314c256f 100644 --- a/sys-fs/udisks/udisks-2.9.1.ebuild +++ b/sys-fs/udisks/udisks-2.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram" REQUIRED_USE=" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 1f41508abfed..00eba1a9f615 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -6,7 +6,7 @@ DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e01287 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231 DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1 DIST xfsprogs-5.9.0.tar.xz 1263364 BLAKE2B 0504e06a9b2b664289fec3dbb083508438b4950c623e309f326954b81f2e9ca0e65d9eb0c9fa029c49f6708e7995db2e9cab0bc7f42aa048e7f9feb80fc7ec77 SHA512 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce -EBUILD xfsprogs-5.10.0.ebuild 2318 BLAKE2B fdf4057fe3d3bbe283c8f3873ec85cce69dc55b20ad71f687df67ae980927dcfc1580de437cfacc53b986e906d37fa4e5da96c03f5728334dc1bd600e58f9ab8 SHA512 6d708a25a5f2c61edf2f0381eee32cfa495479018e09bfe6338a3c786d2b17f912e3354366a1c56545365233267eb04673df5cf3d5adab8b9dbb7f0b5012bbe9 +EBUILD xfsprogs-5.10.0-r1.ebuild 2216 BLAKE2B 8b43efe76eceb3bba0435976a9b12c0a4d5b2f9177f36632669fee15fdf954fa41f3f7cdf923d76fc24cd5c748628bb5ec64cc68e2b18adc42b3a7079727f620 SHA512 54dd5582c8e84480d3c84b453d25d26a06652cdd343903d362dd8582dbad89e172e613c514828f49a7145bc1b19997f9f0ab6d612d46f846e8c46b3ae4b12abd EBUILD xfsprogs-5.4.0-r1.ebuild 2848 BLAKE2B eb3bde0412e145bf9b247d41271f2cd1317de1085173a3fa76d02cba4884124d9de76505af4983d60b016e78b33a7000fae73082fa9576814517b12e4325bda2 SHA512 9348ffcf0249b7089c100e6e8c164fd35f967c6a9bcb4242321708c3e1d017c2597a9e3c88879fffdfbb62bab7d67b6eae56a83a5cd51e4fe90fa576f56c35fc EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild index de634d27bdb3..8389e2de7798 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,17 +11,16 @@ 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 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="icu libedit nls" -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - icu? ( dev-libs/icu:=[static-libs(+)] ) - libedit? ( dev-libs/libedit[static-libs(+)] )" -RDEPEND="${LIB_DEPEND//\[static-libs(+)]} +RDEPEND=">=sys-apps/util-linux-2.17.2 + dev-libs/inih + icu? ( dev-libs/icu:= ) + libedit? ( dev-libs/libedit ) !<sys-fs/xfsdump-3" DEPEND="${RDEPEND}" BDEPEND=" - dev-libs/inih nls? ( sys-devel/gettext ) " diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 6105784e505e..102cdc2c8c70 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -2,8 +2,10 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f +DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322 EBUILD zfs-kmod-0.8.6.ebuild 4636 BLAKE2B b3fb6e9f08bdae9c641e350076c3ca9281428510c696932014a72216b7622176471055a32d629c38941f87b92fffb3f895718f87dba1fe36513542aa68beb551 SHA512 3f7b55b7d9c93222997f5ce4f2d45dba5840799ecdb86e99ec35cff4a5f855230355c79ff3c9b6b7fb47aee2355c73ae38f806a1e5c6c6a49f7df1fdd1e11c51 EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89 -EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319 +EBUILD zfs-kmod-2.0.1.ebuild 4317 BLAKE2B 8288eb07f607415f25433fb5b80fc329e9c3063c9a58fd310c536840ed50f5167dc072a5ba782cd20e3ede8db176800fc637cc20b831046916fe8b4c4224157a SHA512 be4dc816b2a7ddd022601cc50e0b7c57192b2138fd8043fdb67d673a9425438a65009e38dcdb41926e1175c688d59d38276b8aab31e0c3858685d08961cca8dd +EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B 8288eb07f607415f25433fb5b80fc329e9c3063c9a58fd310c536840ed50f5167dc072a5ba782cd20e3ede8db176800fc637cc20b831046916fe8b4c4224157a SHA512 be4dc816b2a7ddd022601cc50e0b7c57192b2138fd8043fdb67d673a9425438a65009e38dcdb41926e1175c688d59d38276b8aab31e0c3858685d08961cca8dd MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild new file mode 100644 index 000000000000..4ea7b063affe --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic linux-mod toolchain-funcs + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + MY_PV="${PV/_rc/-rc}" + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64" + S="${WORKDIR}/zfs-${PV%_rc?}" + ZFS_KERNEL_COMPAT="5.10" +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0" +IUSE="custom-cflags debug +rootfs" + +DEPEND="" + +RDEPEND="${DEPEND} + !sys-kernel/spl +" + +BDEPEND=" + dev-lang/perl + virtual/awk +" + +RESTRICT="debug? ( strip ) test" + +DOCS=( AUTHORS COPYRIGHT META README.md ) + +pkg_setup() { + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + EFI_PARTITION + MODULES + !PAX_KERNEXEC_PLUGIN_METHOD_OR + !TRIM_UNUSED_KSYMS + ZLIB_DEFLATE + ZLIB_INFLATE + " + + use debug && CONFIG_CHECK="${CONFIG_CHECK} + FRAME_POINTER + DEBUG_INFO + !DEBUG_INFO_REDUCED + " + + use rootfs && \ + CONFIG_CHECK="${CONFIG_CHECK} + BLK_DEV_INITRD + DEVTMPFS + " + + kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" + + if [[ ${PV} != "9999" ]]; then + local kv_major_max kv_minor_max zcompat + zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" + kv_major_max="${zcompat%%.*}" + zcompat="${zcompat#*.}" + kv_minor_max="${zcompat%%.*}" + kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ + "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" + + fi + + kernel_is -ge 3 10 || die "Linux 3.10 or newer required" + + linux-mod_pkg_setup +} + +src_prepare() { + default + + if [[ ${PV} == "9999" ]]; then + eautoreconf + else + # Set module revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi +} + +src_configure() { + set_arch_to_kernel + + use custom-cflags || strip-flags + + filter-ldflags -Wl,* + + local myconf=( + CROSS_COMPILE="${CHOST}-" + HOSTCC="$(tc-getBUILD_CC)" + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --with-config=kernel + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + $(use_enable debug) + ) + + econf "${myconf[@]}" +} + +src_compile() { + set_arch_to_kernel + + myemakeargs=( + CROSS_COMPILE="${CHOST}-" + HOSTCC="$(tc-getBUILD_CC)" + V=1 + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + set_arch_to_kernel + + myemakeargs+=( + DEPMOD="/bin/true" + DESTDIR="${D}" + INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} + +pkg_postinst() { + linux-mod_pkg_postinst + + # Remove old modules + if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then + ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" + ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" + ewarn "Automatically removing old modules to avoid problems." + rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" + rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" + fi + + if use x86 || use arm; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + ewarn "This version of OpenZFS includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of ZFSOnLinux. To" + ewarn "create a newpool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -d -o feature@async_destroy=enabled " + ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" + ewarn " -o feature@spacemap_histogram=enabled" + ewarn " -o feature@enabled_txg=enabled " + ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" + ewarn " ..." + ewarn + ewarn "GRUB2 support will be updated as soon as either the GRUB2" + ewarn "developers do a tag or the Gentoo developers find time to backport" + ewarn "support from GRUB2 HEAD." +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index e0bcf6bac5bb..4ea7b063affe 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 1961438ef714..0b087c61e94f 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -2,8 +2,10 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f +DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 EBUILD zfs-0.8.5.ebuild 5695 BLAKE2B 05e6a12ea2ab6c7655b2a62d642ed97a9acaa59959f648896a20f9b2336b81af79a60a398e5ad53844b7173abe95705b18fd420362f7e82182896ef0360a637f SHA512 f879e459304b5a2a3a53c5ebb01c0d54d822c3f1f1abb4d26c7a065bc5a184b744aab2777340b7bee9227a855cae4bf44e9cb1ab61b98031b1190d3b387a9367 EBUILD zfs-0.8.6.ebuild 5698 BLAKE2B 383ee1f3311147c39630abdf55a8dd0f9295f54fbcc8203c2bc3f070a1cf9c4cba78d8638f47191d09c13c8be22d9e553a7f7cc3c69de44cb7ae55ad8da0c74b SHA512 2603dd8af0282c186602b0d958ffc00d155a5e1599aa41c542dd292e620f90e308338b1690f891c28be1754e443b14320b6037b47baa14d54a1c498361d1439b EBUILD zfs-2.0.0.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a -EBUILD zfs-9999.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a +EBUILD zfs-2.0.1.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 +EBUILD zfs-9999.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5 diff --git a/sys-fs/zfs/zfs-2.0.1.ebuild b/sys-fs/zfs/zfs-2.0.1.ebuild new file mode 100644 index 000000000000..1d1a3c6ccc7c --- /dev/null +++ b/sys-fs/zfs/zfs-2.0.1.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://github.com/openzfs/zfs" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 linux-mod + EGIT_REPO_URI="https://github.com/openzfs/zfs.git" +else + MY_P="${P/_rc/-rc}" + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64" + S="${WORKDIR}/${P%_rc?}" +fi + +LICENSE="BSD-2 CDDL MIT" +# just libzfs soname major for now. +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. +SLOT="0/4" +IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs" + +DEPEND=" + net-libs/libtirpc[static-libs?] + sys-apps/util-linux[static-libs?] + sys-libs/zlib[static-libs(+)?] + virtual/awk + virtual/libudev[static-libs(-)?] + libressl? ( dev-libs/libressl:0=[static-libs?] ) + !libressl? ( dev-libs/openssl:0=[static-libs?] ) + !minimal? ( ${PYTHON_DEPS} ) + pam? ( sys-libs/pam ) + python? ( + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +BDEPEND="virtual/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" + +RDEPEND="${DEPEND} + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) + !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !<sys-kernel/genkernel-3.5.1.1 + ) + test-suite? ( + sys-apps/kmod[tools] + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) + +pkg_setup() { + if use kernel_linux && use test-suite; then + linux-info_pkg_setup + + if ! linux_config_exists; then + ewarn "Cannot check the linux kernel configuration." + else + if use test-suite; then + if linux_chkconfig_present BLK_DEV_LOOP; then + eerror "The ZFS test suite requires loop device support enabled." + eerror "Please enable it:" + eerror " CONFIG_BLK_DEV_LOOP=y" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " Block devices --->" + eerror " [X] Loopback device support" + fi + fi + fi + fi +} + +src_prepare() { + default + + if [[ ${PV} == "9999" ]]; then + eautoreconf + else + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + use custom-cflags || strip-flags + use minimal || python_setup + + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --enable-systemd + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-vendor=gentoo + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_enable python pyzfs) + $(use_enable static-libs static) + $(usex minimal --without-python --with-python="${EPYTHON}") + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } + + if ! use static-libs; then + find "${ED}/" -name '*.la' -delete || die + fi + + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + use minimal || python_fix_shebang "${ED}/bin" +} + +pkg_postinst() { + if use rootfs; then + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then + elog "root on zfs requires initramfs to boot" + elog "the following packages known to provide one and tested on regular basis:" + elog " sys-kernel/dracut" + elog " sys-kernel/genkernel" + fi + fi + + if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then + einfo "Adding ${P} to the module database to ensure that the" + einfo "kernel modules and userland utilities stay in sync." + update_moduledb + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "for default zfs systemd service configuration" + else + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." + fi +} + +pkg_postrm() { + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then + remove_moduledb + fi +} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 83e1b87f58a5..1d1a3c6ccc7c 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 |