diff options
Diffstat (limited to 'sys-fs')
67 files changed, 1023 insertions, 447 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex b869a1ca0291..38fc5291339a 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 01087fa58d40..e7e1ef37d8c2 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -3,6 +3,6 @@ DIST android-file-transfer-linux-4.1.tar.gz 820290 BLAKE2B 598a4ae25cc5110c38534 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.1.ebuild 1618 BLAKE2B 75fa5b09fda33f3da136c2d9f3ce0b25487c497960bf25a670d4467dad218ea4c3344bf619e161763f687e2806808c21be6c8d1c67b90457b0719e3605e20156 SHA512 eda8652e4d63e02b9455e738082d1fd67973325ba670ce828dc4ff2c837138d848f0f053c967a05b7a95abcec976d0b50a8f57873325c90ca75be82fb0bd3b61 -EBUILD android-file-transfer-linux-4.2.ebuild 1619 BLAKE2B d2c20b866a5ba6ae8b6ef770d8598b895b1d2fe122c4db50240f915bc6878b79eab67c9dd59cdcfa3dde46501a4a3bb7504af45824519ae4e024ab1f15b09836 SHA512 a98a46314c68346616eb7539d0e11cf50de49246e49ab3987f02b03e3bc3c68fff74aee1824cb4e6e8c77a65bcea9890de0a3a097403dc1d1aa14f68dddd9f50 +EBUILD android-file-transfer-linux-4.2.ebuild 1618 BLAKE2B 75fa5b09fda33f3da136c2d9f3ce0b25487c497960bf25a670d4467dad218ea4c3344bf619e161763f687e2806808c21be6c8d1c67b90457b0719e3605e20156 SHA512 eda8652e4d63e02b9455e738082d1fd67973325ba670ce828dc4ff2c837138d848f0f053c967a05b7a95abcec976d0b50a8f57873325c90ca75be82fb0bd3b61 EBUILD android-file-transfer-linux-9999.ebuild 1619 BLAKE2B d2c20b866a5ba6ae8b6ef770d8598b895b1d2fe122c4db50240f915bc6878b79eab67c9dd59cdcfa3dde46501a4a3bb7504af45824519ae4e024ab1f15b09836 SHA512 a98a46314c68346616eb7539d0e11cf50de49246e49ab3987f02b03e3bc3c68fff74aee1824cb4e6e8c77a65bcea9890de0a3a097403dc1d1aa14f68dddd9f50 MISC metadata.xml 492 BLAKE2B 25383fac13727b68cd34690e79764360dc7bd68720386048ce2c74cbc4292eb5b76d8f296eb6399c520ef562eb10dd574a960b8d04ff048de3918ab9aac6cdc4 SHA512 4c7f31e3255a9afcb94d210b2c4f53068f5919fa6b7f5928479d0c920af62852ef8752e8a72de2e175bbd7606f73795781db54189cbdbbee34868fdb59b36b47 diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild index 344d6b2e6548..0b38a78cc13e 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild @@ -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/aufs-util/Manifest b/sys-fs/aufs-util/Manifest index fd63fee286cf..592fbb450d3b 100644 --- a/sys-fs/aufs-util/Manifest +++ b/sys-fs/aufs-util/Manifest @@ -1,3 +1,3 @@ DIST aufs-util-4.14_p20190603.tar.xz 104096 BLAKE2B 901c7405866cc8db490248b86e45e57375ea5d8db11505c0c15fd49f5bd9e7ea5a6c3d272bd8f001ac3db11665a9c3607565c7eb5be8cd5f45acf4b5f994ceb9 SHA512 803ce51a77c3e4942d3b8817be638c5e2440821088eeb58742eb0395b9c83f68975ed64a0410b6155b18edf0af47ef9df916be07d912fdb2bd4e94987a037fa7 -EBUILD aufs-util-4.14_p20190603.ebuild 1071 BLAKE2B 85a030937ab92dd37dc8d2f10da101c60ac1a75fa73fd3563a7c524fed5ea60a31f0433c5bed46434d243a7d444339a0d198d1599a9caac93b8c07b699847230 SHA512 c040caad3d02811f95cfae7c42df7dc879da0cd5c93c7e375fc70cf442f33d86af3e9f3968f2f42d373ec723b1d99527386d2041c40ec5ed3d25afe0b5ae8ab0 +EBUILD aufs-util-4.14_p20190603.ebuild 1051 BLAKE2B 040fc77c4aadd6add47ca89caa4ff209f6a325163de05bc5426f35a027ba4b0fd92820d7c29fffe3dac754b9929ea39778f38568efaf7dd58d2c2eff843f6816 SHA512 cbe27f86b772cad092f0eea51bac510f7513ca381993878ca78de9447a0c947517e0cd55e73d19155ed7b637814611607447c941a109bdc254373a2ffb1e452c MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild index 966a157684f5..65c39b7f1043 100644 --- a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild +++ b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic linux-info multilib toolchain-funcs +inherit linux-info multilib toolchain-funcs DESCRIPTION="Utilities are always necessary for aufs" HOMEPAGE="http://aufs.sourceforge.net/" @@ -12,9 +12,8 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" # xz -ve9 *.tar SLOT="0" -LICENSE="GPL-2" +LICENSE="GPL-2+" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" !sys-fs/aufs2 diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest index ad4f6e176e11..73bbe16ec243 100644 --- a/sys-fs/compsize/Manifest +++ b/sys-fs/compsize/Manifest @@ -3,6 +3,6 @@ DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a DIST compsize-1.5.tar.gz 15015 BLAKE2B 1a7fc676ffaeb69fd410a834eab54ef63c5fa11e428bd0567ab5dec5dc27fe1b4901fdd47760c07a7fb26375b81ba997528c0aa83409eb364a3b9f2cb1942cc8 SHA512 25d6f1973e8a0a86bd857dc1e1ba99760451cf388f3bd3ede6a6ef35351ff63f100646d313010aff3de9e70b2c68866a31c4ea31d9c6df9254648cd1bd0272fa EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7 EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366 -EBUILD compsize-1.5.ebuild 921 BLAKE2B 71ec177637d558bf1b13682f61f0a842d711f523c7d762f9a2314d13e27daf9c686d83570799569d69e239add78719e7ebc3e43b3dbd678bc026b8f8333eed2b SHA512 1ff43f6b513bd42131810d6a8ec7b9cfcef922d9b88f76a39d8d0218036576cc8089ebfd3ee87aa64496eb91515b29b429c0655adafa8f63d03b2c4e107f42be +EBUILD compsize-1.5.ebuild 919 BLAKE2B 6050947b62cc7c554bd70088330f35a536aca28a09311d70343d30bb69d83ce02b217217519a517360b6c96293ed0dc275ca1008d00103ac16eba69dec641b1a SHA512 6e9c29a79d7e2472b6f3805cbce271a1a8b7590d34944cb24c56fd7d01793ef1a2543b041183fc4621980a23b1d186fbed6f26cf2c8cb2b027854e544823efc0 EBUILD compsize-9999.ebuild 921 BLAKE2B 71ec177637d558bf1b13682f61f0a842d711f523c7d762f9a2314d13e27daf9c686d83570799569d69e239add78719e7ebc3e43b3dbd678bc026b8f8333eed2b SHA512 1ff43f6b513bd42131810d6a8ec7b9cfcef922d9b88f76a39d8d0218036576cc8089ebfd3ee87aa64496eb91515b29b429c0655adafa8f63d03b2c4e107f42be MISC metadata.xml 474 BLAKE2B 93fb6451e4aea9bace615da2fc15b996aa88e286201f6b95d7e3029f55dc97d189291a64033b87fde42d61db60524244777fc280d2bc0e4225ac8a3dc3a80e55 SHA512 6faacdb272a6c0aa8c19c4970c6eb00d15ffab23a0c6c20178503f3fe0de77747d0b43d63f558e5063b03fc2456456dbb4471976fa4ef5c5ab942b649ac7c4b0 diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild index 1fd07df8eb27..19890bad1285 100644 --- a/sys-fs/compsize/compsize-1.5.ebuild +++ b/sys-fs/compsize/compsize-1.5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then EGIT_REPO_URI="https://github.com/kilobyte/compsize.git" else SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="GPL-2+ GPL-2" diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index fb49a8fb0fb3..2d65da7e56bc 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -2,9 +2,7 @@ AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499a AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d -DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665 EBUILD cryptsetup-2.3.4-r1.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6 -EBUILD cryptsetup-2.3.5-r1.ebuild 3861 BLAKE2B ed75ff27bee5a82bf54418413b62a291ed1d62ef41d3dab5830a6c5388f784dfebb42a45967fb5e7e676f3ec1b818dc5e63cfd741ea51d9069b01b6a2d7fefa1 SHA512 d12da1446da7911ee11ec5fc89c406f07890eb6913479fe3cfb0150f3da412dc09e95f1896501181d4e7b68335c41e07822e3d296e616284a455f0dd9d06a589 EBUILD cryptsetup-2.3.6.ebuild 3861 BLAKE2B ed75ff27bee5a82bf54418413b62a291ed1d62ef41d3dab5830a6c5388f784dfebb42a45967fb5e7e676f3ec1b818dc5e63cfd741ea51d9069b01b6a2d7fefa1 SHA512 d12da1446da7911ee11ec5fc89c406f07890eb6913479fe3cfb0150f3da412dc09e95f1896501181d4e7b68335c41e07822e3d296e616284a455f0dd9d06a589 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41 diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild deleted file mode 100644 index 72a0baf8cb90..000000000000 --- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info - -DESCRIPTION="Tool to setup encrypted devices with dm-crypt" -HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" -SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/12" # libcryptsetup.so version -[[ ${PV} != *_rc* ]] && \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" -# we don't support nss since it doesn't allow cryptsetup to be built statically -# and it's missing ripemd160 support so it can't provide full backward compatibility -IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom" -REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) - static? ( !gcrypt )" #496612 - -LIB_DEPEND=" - dev-libs/json-c:=[static-libs(+)] - dev-libs/libgpg-error[static-libs(+)] - dev-libs/popt[static-libs(+)] - >=sys-apps/util-linux-2.31-r1[static-libs(+)] - argon2? ( app-crypt/argon2:=[static-libs(+)] ) - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) - openssl? ( dev-libs/openssl:0=[static-libs(+)] ) - pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - sys-fs/lvm2[static-libs(+)] - udev? ( virtual/libudev[static-libs(-)] )" -# We have to always depend on ${LIB_DEPEND} rather than put behind -# !static? () because we provide a shared library which links against -# these other packages. #414665 -RDEPEND="static-libs? ( ${LIB_DEPEND} ) - ${LIB_DEPEND//\[static-libs\([+-]\)\]}" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -BDEPEND=" - virtual/pkgconfig -" - -S="${WORKDIR}/${P/_/-}" - -PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch ) - -pkg_setup() { - local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" - local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" - local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" - local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" - local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" - check_extra_config -} - -src_prepare() { - sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die - default - eautoreconf -} - -src_configure() { - if use kernel ; then - ewarn "Note that kernel backend is very slow for this type of operation" - ewarn "and is provided mainly for embedded systems wanting to avoid" - ewarn "userspace crypto libraries." - fi - - local myeconfargs=( - --disable-internal-argon2 - --enable-shared - --sbindir=/sbin - # for later use - --with-default-luks-format=LUKS2 - --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" - --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) - $(use_enable argon2 libargon2) - $(use_enable nls) - $(use_enable pwquality) - $(use_enable reencrypt cryptsetup-reencrypt) - $(use_enable static static-cryptsetup) - $(use_enable static-libs static) - $(use_enable udev) - $(use_enable !urandom dev-random) - $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2') - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if [[ ! -e /dev/mapper/control ]] ; then - ewarn "No /dev/mapper/control found -- skipping tests" - return 0 - fi - - local p - for p in /dev/mapper /dev/loop* ; do - addwrite ${p} - done - - default -} - -src_install() { - default - - if use static ; then - mv "${ED}"/sbin/cryptsetup{.static,} || die - mv "${ED}"/sbin/veritysetup{.static,} || die - if use reencrypt ; then - mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die - fi - fi - find "${ED}" -type f -name "*.la" -delete || die - - dodoc docs/v*ReleaseNotes - - newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt - newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt -} diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 135b726d46cd..0ded602e7c95 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -5,6 +5,6 @@ AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab5 AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d -EBUILD dd-rescue-1.99.11.ebuild 2375 BLAKE2B 63d85595e0f095a9e18f754a71e3811a68ca6f8914fe325f8bb1de8e7aa7838a58c1fa88db71ff622e0204b68314fe1fa78384c91bfbe95865c4b34ecc45ca4d SHA512 58146f2a87f6ff6b244a2289f74554f6b48811bce9211ef871a4195bb04593888adbb0b9e25ecab491dee530b39ed41c99933e551a911fcf29764fd6e1d00e81 +EBUILD dd-rescue-1.99.11.ebuild 2374 BLAKE2B fdff6926987018a00f43f04d60e979c96e2023221eceff4f6075f5ecc03a7801c2dcf02e5bd0f8e7cd852ced215a4a26e22c9013a2785f19dd020d851aad77f9 SHA512 5882cdde9a0f693446400ae53d0c9105d496f8fff2e17c66e1e0a24b5b6b26c61e2995fcbb41c9cb6ceb025daebdde21456a52fb5e8b186372f503cb9f310db4 EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild index f4c2898623cf..8a52492e4e00 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" RDEPEND="lzo? ( dev-libs/lzo ) diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest index adbbf6cf19a5..96c52bf81d3a 100644 --- a/sys-fs/dmraid/Manifest +++ b/sys-fs/dmraid/Manifest @@ -5,5 +5,5 @@ AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d31 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e -EBUILD dmraid-1.0.0_rc16-r5.ebuild 3386 BLAKE2B 451c7548c24f60ca32d2b99c0ae56a5109c6a1401489f939c4c69dbe5613a97ab5aa0eaeb2b859705ee598ef4b89e9ec02851fbfdb9613fa8d2a54688ae67981 SHA512 de1d6a4489dc5f16fbd1d3fa25b0d5d12a121e33b5f825bd93016f9f8c4ce8a0597a3304b83dca51ac7a7d75916760128dd8920447e136832040e614606b5358 +EBUILD dmraid-1.0.0_rc16-r5.ebuild 3373 BLAKE2B f99592578bf19d358fddbee013d95ed6c3b8b8c114f34c7ef0195bcd4ac50e925338af94b4441a532fc43e372471532adb09f7b7c57bf3f22dee6c2157eaacb3 SHA512 4662255b18607c09ab924aa81ed59abfd2e274ec7a53fecf13d3b9a1f764594ec3e20942135961f1cb8d613e06e05b7e17f567683aac7b2957984c2a5a4d290d MISC metadata.xml 544 BLAKE2B 8a100ed92851488b9a8c722769ea1d5a443ebf1220698b8de3de05f2b6cb282d4cf1d9849d5f86ceabfc6f70fab0d610853b084f8adaf938c48625be5db87191 SHA512 002f647c3c87349f1d56a1180e90e5746c5e94dc1b2e118aa2737b5d5b1dd72b4c3dbe808cdb56c2db6d47a6eb224784542ae7b005f100818979177c7e1d1898 diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild index 0d180f48c84a..3032982b79b5 100644 --- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools linux-info flag-o-matic +inherit autotools linux-info MY_PV=${PV/_/.}-3 diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest index 2d90f6d6cd64..7cd63178944b 100644 --- a/sys-fs/exfatprogs/Manifest +++ b/sys-fs/exfatprogs/Manifest @@ -1,6 +1,6 @@ DIST exfatprogs-1.1.1.tar.xz 261632 BLAKE2B 92d05cf94b5d7a65cef2b5fd97a25401f130a9e649246ed3c1f2240f33a586787ad17ebc41f476eb1ea1e3441c66ffd53408f4024f397fc2de14d76bf94b3f2b SHA512 faeed51a8292d17e71e2f5061dbc530dced75048380d6ca835f19a4e3845de86a9970598222670c38e452cfd6952f3963d8f84086c79172d3c0058957a549755 DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e EBUILD exfatprogs-1.1.1.ebuild 605 BLAKE2B cd769a5353114714ccb85af96d6b10cfb0cdae507e2e44cf2fec60e6f4829979bc41b843ce60458010f60ce1e0babce2a20e243f28d6dbdcbb759262d78d5b60 SHA512 bffa94490b25ea092392caef07a55a486ea0d47443dbb5449ff40ffe2e803ea792dcd52e45332c9812b0cf85132c3b0f4afcaf8649e1715d149945730ef129cc -EBUILD exfatprogs-1.1.2.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a +EBUILD exfatprogs-1.1.2.ebuild 613 BLAKE2B b139efdd123384cfd357c41bf84aeb09973a101dcbe409503fc95facf5b93b3ddfb6150f376166d64ffaea1f3c7d0584485ec9a92737d092097e4145c0f30f1f SHA512 7c353f33b63fdb4b5155aab54b390cb9176f1cf5333276a5fef5e037e49989ccc3765b74b406c396537a211fa28166e67cec772f422880d828944ed51817a9c0 EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a MISC metadata.xml 343 BLAKE2B 76c85c7abf0d2244304b72aad5f78ab1ed278b01c943b3380ff5fbd5cb104284accbc33b1b620309f1f9034625e98e0424e89ba4d1d13887c07502b6fd8efb63 SHA512 ca7a2f710812f1e5ee73b4faeadf9628274b1130e96f60af6155388746e0d14559a5e18262191ba50fcc1255cddeb88acf6c2d40df2af48548ce676a7a2fb91e diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild index 29a89c2d1f56..66c4fee56cbc 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild @@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest index b42a706c83c2..e41c048da11f 100644 --- a/sys-fs/fatsort/Manifest +++ b/sys-fs/fatsort/Manifest @@ -1,3 +1,3 @@ DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53 -EBUILD fatsort-1.6.3.622.ebuild 713 BLAKE2B 2713553a05a7084d80ab4d1e4172fcd710cb929a74eb1ef535e7a32b447fffb6e48d27424725009b29abd51568a8faba5e2b79f15323870164c10c42d7a52270 SHA512 d86118e29d272cc39d857c74303ae0e65cf6f95f1d83147ef9f69533f238e2c89bc95113e35fc0b31fe2a1a3a419fc04ccbefedd0742a01e2c5126fe7f066a16 +EBUILD fatsort-1.6.3.622.ebuild 709 BLAKE2B c55f68dad837981f511e25ac7d2dc5071a5efb025022fc8a9ccb54c231fc91db94e1ce3f8a438d44293071a7f0f52d207f7950d0e43ca57fb6ffd43c4cdadca0 SHA512 4eb71498be5f0667a82f8b0be259c6a7c599b9e34c13c26b408165a38b41e31aa3e6eb8e657e8b0ae27cb1eb2b4d792cd0a781c922ca3199cd46d3065078ccf6 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228 diff --git a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild index f04b31692aa8..c843233d12b1 100644 --- a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild +++ b/sys-fs/fatsort/fatsort-1.6.3.622.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 @@ -17,13 +17,14 @@ src_prepare() { default sed -i -e 's|/usr/local|/usr|g' \ - $(find ./ -name Makefile) || die + $(find ./ -name Makefile || die) || die } src_compile() { - emake CC=$(tc-getCC) LD=$(tc-getCC) \ + emake \ + CC=$(tc-getCC) LD=$(tc-getCC) \ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - DESTDIR="${D}" man + man } src_test() { diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest index 879761b22470..a89b3d5a3043 100644 --- a/sys-fs/fuse-common/Manifest +++ b/sys-fs/fuse-common/Manifest @@ -1,7 +1,7 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302 -DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942 +DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6 EBUILD fuse-common-3.10.1.ebuild 878 BLAKE2B a2275fd6482b8aaf40bfab299a6eb33cb1ebe865dd5a01f84582b4801dc9723365220d08897d8def8e118559181c8f60ae1eb80fbf93b44e51c0e19b83b63784 SHA512 6adfb6411779c662921f4c62de70a8d94560d393a6ea6ca4807fdcd0e36d94c4293f5c7019fe0e11ef89865fc8cc47f0013c6a4b984cdd2232d99071240c6d1b -EBUILD fuse-common-3.10.3.ebuild 886 BLAKE2B bbadd747c68c3e4030450d79edfa527f02b0318cf88c68f39b8c66a7e19d79ba82fcba2383d6bd97b7d15e2f215aa1ee151dc5c164ba4d0063ce433ad599c670 SHA512 29d67cda528d72db976918a179735158ee7131452a8373ae97a074d541cf101a3004c1bc55605720735da6262dafeef41927fdff42cbf39f105cebc6815a94b2 +EBUILD fuse-common-3.10.4.ebuild 886 BLAKE2B bbadd747c68c3e4030450d79edfa527f02b0318cf88c68f39b8c66a7e19d79ba82fcba2383d6bd97b7d15e2f215aa1ee151dc5c164ba4d0063ce433ad599c670 SHA512 29d67cda528d72db976918a179735158ee7131452a8373ae97a074d541cf101a3004c1bc55605720735da6262dafeef41927fdff42cbf39f105cebc6815a94b2 MISC metadata.xml 407 BLAKE2B 037af22bfc4bf2f29d8875a5dd0e9884597553b5a9d6a8853dfb30e69220c310118c6959440d2d619b40c6b14a3077b2e7b19351596af7d2795f37a0522705cb SHA512 5d4c0f0c1fee3610133de2cc7bd075c63de6dfe48782c10a882f8dcc2827ffe7b089b743ae5a5099fa47666f65b9f10cd3a3b41481f3f1090f0e67efd4268991 diff --git a/sys-fs/fuse-common/fuse-common-3.10.3.ebuild b/sys-fs/fuse-common/fuse-common-3.10.4.ebuild index fc73e95dfc94..fc73e95dfc94 100644 --- a/sys-fs/fuse-common/fuse-common-3.10.3.ebuild +++ b/sys-fs/fuse-common/fuse-common-3.10.4.ebuild diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index 9654b4274df0..4e401473d3bb 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,7 +1,3 @@ -DIST fuse-overlayfs-1.3.0.tar.gz 102059 BLAKE2B 30564f9a06ed04f7716170ee864bffeb899f8fc6b411cc95dbe920632dcb2ea2d9d7a9472b35fa33ddca86570978913f8651c35e3544bd650a95c52ca0d4d3ff SHA512 c374b5dd4d369ab0134f66ff021c8efbc35f173a2d53a7212d5ec459c5083cd0fb5fc93b68696db5903891aa33c719be7eb3beedcaab043459f8b506d7cf5c0d -DIST fuse-overlayfs-1.4.0.tar.gz 102363 BLAKE2B cc614173b5f06b761c31ceb538b6322071dadc2328f92899988c6ff26549cfabd7e4a4bb18207bc4564f2bc26d3cd4b01dfed991f92a8b1f5afa4fc756e6517f SHA512 8ee42e0b11540c40200102b066a4a3009af81d5a5c120449b9f3291034a679602e476f42486c039215085eef0291d2b9390888e97f213d8399a5e8762d3fcd17 DIST fuse-overlayfs-1.5.0.tar.gz 102992 BLAKE2B 847aafff7c82c88edd3e76a0e90e290a2fcf2e372cbdb816ee84d98841506ad8f87e4c0c201d5b26abfa08beab6051a74939755287c8c1c33d6183814f2ec5cb SHA512 8b902284c5306e9ee2c3e9e62aacc795828d27a86cc91d5e40a013b000662f3ee0896ef94b6bffb8c4919c04573cddefbd185394d66eb429f7e9e2a727bee4fa -EBUILD fuse-overlayfs-1.3.0.ebuild 565 BLAKE2B 6cad51a1921aa1c48f25baa727c28c51c5876c83944be93529c8639bfa75f90adfed39c7247768b0beef5cbd612e4087485078c9a4508a1ddd8d982fb9797c9b SHA512 60da39f950d584bac0c032f2ecdd8a479875916816459083c7fb21888fd912d6cf4b78c4419a8f30f909473a52818aa60cd75d140cc771352677c30b88ddb65d -EBUILD fuse-overlayfs-1.4.0.ebuild 565 BLAKE2B 681cdb253cf99c8509bd62f033cf3918be316fdcf8b6bfaa7be42097afe8cf053396f844b4fe68b9fe9d31e97bc8aa5e8e11db3d26f812310cb74739bbc25fdc SHA512 e7c802a3c44182c144d6ec417a3f7bb8154b17abe7c247c5a6ac930a490c2614e45a4f9924a70b6f19b91bdb743243677dcd1dd81f5d39d91b0ab122b6c14cc7 EBUILD fuse-overlayfs-1.5.0.ebuild 565 BLAKE2B 681cdb253cf99c8509bd62f033cf3918be316fdcf8b6bfaa7be42097afe8cf053396f844b4fe68b9fe9d31e97bc8aa5e8e11db3d26f812310cb74739bbc25fdc SHA512 e7c802a3c44182c144d6ec417a3f7bb8154b17abe7c247c5a6ac930a490c2614e45a4f9924a70b6f19b91bdb743243677dcd1dd81f5d39d91b0ab122b6c14cc7 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5 diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild deleted file mode 100644 index ca9d3f24ac43..000000000000 --- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="FUSE implementation for overlayfs" -HOMEPAGE="https://github.com/containers/fuse-overlayfs" -EGIT_COMMIT="v${PV}" -SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RDEPEND=">=sys-fs/fuse-3:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}" - -src_prepare() { - default - eautoreconf -} diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.4.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.4.0.ebuild deleted file mode 100644 index 1f39c42d5751..000000000000 --- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.4.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="FUSE implementation for overlayfs" -HOMEPAGE="https://github.com/containers/fuse-overlayfs" -EGIT_COMMIT="v${PV}" -SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RDEPEND=">=sys-fs/fuse-3:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}" - -src_prepare() { - default - eautoreconf -} diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index aed5019adf82..b953fbe83cc5 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -1,8 +1,10 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942 +DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26 EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8 -EBUILD fuse-3.10.3.ebuild 1827 BLAKE2B 8e1e37c8d9b7f80ebb2e4347e79957aab2da8593df1077d6c8e870115fb58704293fd585d255f9ce7887a3975c029f13a85dc9080ae60ed5068eb098a7a02aae SHA512 0e99a19d507815000bd3156f3cd5e679b4f1951becf64963ad970d527f513c639c7cc8f1d5d716a5c7825e1cfbcd3379494d3c996a597ed5f3df226b64f3a8c7 -EBUILD fuse-3.9.3.ebuild 1949 BLAKE2B a2fc08eaed1f03dc4c838b735e493b0389ae8c9f0b6246f4ffd5fe3e4bae4f718fda10e1b9112c41558d441d3b19dc5b978a73a9f34df824976c961683c27b83 SHA512 4e72cec5c86803545305f82cf3541d94673fc7666b3bebbb48eab9dc3c45d4e4047ef7ffd6451a53b706ad2d6fff9c0461c02d110129dbb34fb7add9df6eae96 +EBUILD fuse-3.10.3.ebuild 1695 BLAKE2B ddaf9bde9834b4ff02d8155a2ba77e055fb959430f1bf763de42517062d1642ca44a0288448e676b8f8eb289e972430d95dc37d9fc3ba17f0f917eace3de3ef7 SHA512 9485425a10811c4a2a41bfa448b71e1f4333eb85d34e551b85c8c19d1187c675907498e625b5ce9f8c7a5d553653f0e29af51fca6cd271075508268a196bf456 +EBUILD fuse-3.10.4.ebuild 1701 BLAKE2B e1cbb0c3638b0728802ce85204a3ef59584e31ea3d582f62ebee24b21c43d6e6ddf4278bbb1e0f7f2e5aed427419105db9a0e8f5b7c2f40f1cfb090e08a9096c SHA512 aec0d76ee17b84495df8de1a9e92ad2554f9b6d33500ba0c15b0ffc53e9bbe2cac4295e39f439f5df8fb43b4cb198961cd7a1f7c9c9280b2af41fc98b172a2e1 +EBUILD fuse-3.9.3.ebuild 1823 BLAKE2B d4d0cc3939d07ecfa08c4c10fd21c8969e73d588043af680961765e09482d4cb6d5b6453a6fba8af1ddfe08f88932247015bb8317e4fcfdff298e61271efb79b SHA512 68f13b2185461fef0f8a1f804df628c7c668c9e78cf3f06ba5d92eaf85f8ada69d15fbe07bb5d8dd802716d313fbaa02a889b9cefd8d3abcad2b03c9d2079ec6 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586 diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild index 5af77ebc394a..dd6b9a769ba5 100644 --- a/sys-fs/fuse/fuse-3.10.3.ebuild +++ b/sys-fs/fuse/fuse-3.10.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson multilib-minimal udev python-any-r1 +inherit meson-multilib udev python-any-r1 DESCRIPTION="An interface for filesystems implemented in userspace" HOMEPAGE="https://github.com/libfuse/libfuse" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+suid test" RESTRICT="!test? ( test )" @@ -35,17 +35,13 @@ pkg_setup() { multilib_src_configure() { local emesonargs=( - -Dexamples=$(usex test true false) + $(meson_use test examples) -Duseroot=false -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" ) meson_src_configure } -multilib_src_compile() { - eninja -} - src_test() { if [[ ${EUID} != 0 ]]; then ewarn "Running as non-root user, skipping tests" @@ -60,13 +56,7 @@ multilib_src_test() { ${EPYTHON} -m pytest test || die } -multilib_src_install() { - DESTDIR="${D}" eninja install -} - multilib_src_install_all() { - einstalldocs - # installed via fuse-common rm -r "${ED}"/{etc,$(get_udevdir)} || die diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.10.4.ebuild new file mode 100644 index 000000000000..e3f0349a01b3 --- /dev/null +++ b/sys-fs/fuse/fuse-3.10.4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit meson-multilib udev python-any-r1 + +DESCRIPTION="An interface for filesystems implemented in userspace" +HOMEPAGE="https://github.com/libfuse/libfuse" +SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+suid test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + )" +RDEPEND=">=sys-fs/fuse-common-3.3.0-r1" + +DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt ) + +python_check_deps() { + has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python_setup +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use test examples) + -Duseroot=false + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + ) + meson_src_configure +} + +src_test() { + if [[ ${EUID} != 0 ]]; then + ewarn "Running as non-root user, skipping tests" + elif has sandbox ${FEATURES}; then + ewarn "Sandbox enabled, skipping tests" + else + multilib-minimal_src_test + fi +} + +multilib_src_test() { + ${EPYTHON} -m pytest test || die +} + +multilib_src_install_all() { + # installed via fuse-common + rm -r "${ED}"/{etc,$(get_udevdir)} || die + + # useroot=false prevents the build system from doing this. + use suid && fperms u+s /usr/bin/fusermount3 + + # manually install man pages to respect compression + rm -r "${ED}"/usr/share/man || die + doman doc/{fusermount3.1,mount.fuse3.8} +} diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild index 5e10d166e389..e5d07d2d9696 100644 --- a/sys-fs/fuse/fuse-3.9.3.ebuild +++ b/sys-fs/fuse/fuse-3.9.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8} ) -inherit meson multilib-minimal flag-o-matic udev python-any-r1 +inherit meson-multilib flag-o-matic udev python-any-r1 DESCRIPTION="An interface for filesystems implemented in userspace" HOMEPAGE="https://github.com/libfuse/libfuse" @@ -42,17 +42,13 @@ src_prepare() { multilib_src_configure() { local emesonargs=( - -Dexamples=$(usex test true false) + $(meson_use test examples) -Duseroot=false -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" ) meson_src_configure } -multilib_src_compile() { - eninja -} - src_test() { if [[ ${EUID} != 0 ]]; then ewarn "Running as non-root user, skipping tests" @@ -67,13 +63,7 @@ multilib_src_test() { ${EPYTHON} -m pytest test || die } -multilib_src_install() { - DESTDIR="${D}" eninja install -} - multilib_src_install_all() { - einstalldocs - # installed via fuse-common rm -r "${ED}"/{etc,$(get_udevdir)} || die diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest new file mode 100644 index 000000000000..5d50e37347c3 --- /dev/null +++ b/sys-fs/genfstab/Manifest @@ -0,0 +1,3 @@ +DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661 +EBUILD genfstab-24.ebuild 467 BLAKE2B a452279d1c7895a6891460d9b38e38d520ce44154183e8a1766e3457918f2407d778bf3a822796801b077c86e816ef0cea59d54db79ac9c0e6c999eb62dec70b SHA512 d928efdc32706251c4d7851b26eb573140d4aef02ff90e074d528280eef3ab1821a3601186e213143f050e8883e5c29b1041ccde2f3fd0a8c51bf8b444c9b136 +MISC metadata.xml 468 BLAKE2B b299a989190e27686497f3aad1f8b3ee071ab3bc488e4d3669f945057c604dd3aaf1679f4c51e44fc5739557325ce22f5bf2df4a0c75e1775d9d5c11969141e4 SHA512 935bab43b088e8bd1fcf4995616dabcea498f8e8e8483dc6f3bcd67e7114400b91eed55a05d47e907efac8c81c0e13560effae85bcac19d01f24b01f3b97b11d diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild new file mode 100644 index 000000000000..7773f1880dce --- /dev/null +++ b/sys-fs/genfstab/genfstab-24.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Genfstab - generate output suitable for addition to an fstab file" +HOMEPAGE="https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8" +SRC_URI="https://github.com/scardracs/genfstab/releases/download/${PV}/${P}.tar.gz" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +BDEPEND="app-text/asciidoc" diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml new file mode 100644 index 000000000000..a45016676e49 --- /dev/null +++ b/sys-fs/genfstab/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>marco@scardovi.com</email> + <name>Marco Scardovi</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>mattst88@gentoo.org</email> + <name>Matt Turner</name> + </maintainer> + <upstream> + <remote-id type="github">scardracs/genfstab</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-fs/growpart/Manifest b/sys-fs/growpart/Manifest index bd2c70d08ac2..68c5284a7461 100644 --- a/sys-fs/growpart/Manifest +++ b/sys-fs/growpart/Manifest @@ -1,3 +1,5 @@ DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58 +DIST growpart-0.0.32.gz 9525 BLAKE2B a7c7ca27ae237eb7d6e43decb16cba2c8a26b63bcfe1b1f74f63b116a9cc23fc5e54394df846c13de6caeb8433a4ad7e76046f2f4311e6fe7cb069fce588b6e3 SHA512 baa9e59581d2d9685d4b0e7563e6582130064881f6f9b9fcd3250a4bdceb7d03bcd1ce346218ce4395f82de948f85fd59339cc30417377feb61d5b444f3dde23 EBUILD growpart-0.0.30.ebuild 512 BLAKE2B b9121f0240fb8b2eee6cf9e2b33ab2e678610a74c1bd295e06096b52b38d654cea9d82212a330cc48a1eafcb6350c546ccaca93f16710b226469fa6e7e28a6f8 SHA512 14148542f813a66c27c9a5b3fe5b2e3cc9a0a2fc1db0b773e9b091d8135a543023acd05a5e173fe43d9c42d0503b6dc2b4ffe667784a030c9c479d33ad6fafea +EBUILD growpart-0.0.32.ebuild 516 BLAKE2B 97f06e399cf85e6522ccba6806043147badb6b5fee8bdd341beee5ff16b912dcb1868ad0fa54948b7cf604dba641f13d3165f1caf1c34cfffda9e7906fd93544 SHA512 dc21471f392fb18673a5fe149bdde03ea953f073be325e05b8a305eb6ccc91505cfcbe7074ae1f61695c1ef27eaad6e20c4087a25507694a6640c8c77d1fcc9a MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 diff --git a/sys-fs/growpart/growpart-0.0.32.ebuild b/sys-fs/growpart/growpart-0.0.32.ebuild new file mode 100644 index 000000000000..aa8ac8c42c28 --- /dev/null +++ b/sys-fs/growpart/growpart-0.0.32.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="A script that can grow your rootfs on first boot" +HOMEPAGE="http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html" +SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.gz" +S="${WORKDIR}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="sys-apps/gptfdisk" + +src_install() { + exeinto /usr/sbin/ + newexe "growpart-${PV}" growpart +} diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest index acf91c6e096f..ec502aa8b4da 100644 --- a/sys-fs/libeatmydata/Manifest +++ b/sys-fs/libeatmydata/Manifest @@ -1,4 +1,3 @@ -AUX libeatmydata-105-undpkg.patch 308 BLAKE2B a6ad730f191ae342217dd7f881bab503ae662d3fcc9d8f782e23765e9b2385ab5d8f30a3ffdb0180d2ef22f22f327b7c6b3189674d65ac1aaacf68a4466e8620 SHA512 1f90cd5637babf47139c30f0b3a1c96e4dfaceaba7617108b76ef68f69a47287e509284e318cbbe1c0c62fc4f2fb5792b0d0ad0dd977388fd90f3ed54ba35e28 -DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4 -EBUILD libeatmydata-105-r2.ebuild 706 BLAKE2B 14ee75e1d57bb91db40cdc3061941e6dffea7500056eb8dd65ac6865ad2e437f692e719c02e2741e8962fac26c3a52d27b41c7f89258997097ae3eabd6e6c1b9 SHA512 5dbf29d6f85a32561cbf005074fe53c2f928f82edbdfcfa0057434d73f4d15273b7b855e81b179ed692926b7da1b953e6935a51c114af6421be946a40d2b3a4f +DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1 +EBUILD libeatmydata-129-r1.ebuild 845 BLAKE2B f053a4f83e42ebab36ab199a86365317f31d83096a7b82b6b672e6c9d644157aefcef9aae5c3e35cff407eefc8d9a781875fe5a1c58f2a6f7ba46717cb71d6d4 SHA512 d81b90984fa1072628a77c20ee7595bfd8bf1b9c1418bf155f866fe80cbc85a760e79015b943e2d1610c37076fd9bc424410ada70d7b08cced7615e881d8b33c MISC metadata.xml 512 BLAKE2B 549d76a933090ccaf7100a6ae03b8a1f0c1c68454764018360184bcdce4e6628a38ac499bd8a568fc43240fa13596a6f0b4e108fff1c742d4e229aad59049b10 SHA512 4b436b230dfafd7554ffe9ef222fda5aa4e4132768f945c34cde4fed9359f2782e0f371617ecf52b55339f278fbd51f28fe58bf50ec600bef8644c82f594d363 diff --git a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch deleted file mode 100644 index 41362d1c2531..000000000000 --- a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch +++ /dev/null @@ -1,12 +0,0 @@ -Don't rely on debian's way to multilib/multiarch. - -https://bugs.gentoo.org/550344 ---- a/eatmydata.in -+++ b/eatmydata.in -@@ -17,5 +17,4 @@ - --export `dpkg-architecture|grep DEB_BUILD_MULTIARCH` -+shlib="@libexecdir@/eatmydata.sh" - --shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh" - if [ -f "$shlib" ]; then diff --git a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild deleted file mode 100644 index 0d1428d550b4..000000000000 --- a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP" -HOMEPAGE="https://launchpad.net/libeatmydata/" -SRC_URI="https://launchpad.net/${PN}/trunk/release-${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# sandbox fools LD_PRELOAD and libeatmydata does not get control -# feature of sandbox -#DEPEND="test? ( dev-util/strace )" -RESTRICT=test - -PATCHES=( - "${FILESDIR}"/${PN}-105-undpkg.patch -) - -ECONF_SOURCE="${S}" - -multilib_src_install_all() { - find "${D}" -name '*.la' -type f -delete || die - - dodoc AUTHORS README -} diff --git a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild new file mode 100644 index 000000000000..71b725cd15a6 --- /dev/null +++ b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP" +HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/" +SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-util/strace )" + +ECONF_SOURCE="${S}" + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf --disable-static +} + +multilib_src_test() { + # sandbox fools LD_PRELOAD and libeatmydata does not get control + # feature of sandbox + SANDBOX_ON=0 LD_PRELOAD= emake -k check +} + +multilib_src_install_all() { + find "${D}" -name '*.la' -type f -delete || die + + dodoc AUTHORS README.md +} diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest index 4e3e8c846428..a8a7e24f8274 100644 --- a/sys-fs/lsscsi/Manifest +++ b/sys-fs/lsscsi/Manifest @@ -1,5 +1,3 @@ -DIST lsscsi-0.31.tgz 191650 BLAKE2B 0bd9b72356cc8f9a7f83bf5bdebdc7d3093efa09b1c72e79b45f6e6dacedb6c80e085fce8ce734e298d03c959bc4428f7a4faeeaace3cdeaa3b2d6bfc4b547cc SHA512 e76a011b79657fb138e88d37ff38d83b6bbe2e28330fb621ca5972ba4ffb0131a5e67c8afeb0292c002eaf91e1b69c8f051d48849e5ed822e8705365092a53ba DIST lsscsi-0.32.tgz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145 -EBUILD lsscsi-0.31.ebuild 337 BLAKE2B 9f95dd2bdd6564e06ce6b7b59c52abb8fdea702e81feb761bcc260b67c5a5148f15bc32eb9b47a0b3351b7bc74c6aa01cb9a98a674fe4775c71b505f190487eb SHA512 20657225b9f362abe93ca048c7de67f04f057bd14bdb779a82b58881b0a3ff8a999a3efd1ca911b996528b7ec09469f992d79dc90a1285e50a709519f71b1a97 -EBUILD lsscsi-0.32.ebuild 344 BLAKE2B 629e03414064e2146113671745ee4b3aa284c438424096f2dd18e2054b8f982ec34b4ed6fb87bbe74cf93b63a2e1be0f9373228aa19c957f181dc35da7faa4e4 SHA512 be83e650bea75fdb9c9de957143f85e8122e2eab72ac8ebf1eb44f1bf6f5c84c0176a3befcf29e99b70de34a2cdef6278833008ca1a77f726c4e7c5dfe2d384e +EBUILD lsscsi-0.32.ebuild 337 BLAKE2B 5d9bc16d60a7e7a919f09e4fad84d3f9e817d99c6b6fd77163003883dbf0daf84062989ed9e789376ac3ab961ed43f22b1ef9fd41413e00d1cbc887d777ce5ba SHA512 637059ba47e7a3c10d40eb94e859005ea7a7e96f7710388621cb741bda85103bb0b3c3065ff14fb28ee67b07cf76be6587d9c9ba3603375876278e02038c91b4 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild deleted file mode 100644 index eb792c163557..000000000000 --- a/sys-fs/lsscsi/lsscsi-0.31.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="SCSI sysfs query tool" -HOMEPAGE="http://sg.danny.cz/scsi/lsscsi.html" -SRC_URI="http://sg.danny.cz/scsi/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" diff --git a/sys-fs/lsscsi/lsscsi-0.32.ebuild b/sys-fs/lsscsi/lsscsi-0.32.ebuild index 2c9193a14d94..a356a24dda48 100644 --- a/sys-fs/lsscsi/lsscsi-0.32.ebuild +++ b/sys-fs/lsscsi/lsscsi-0.32.ebuild @@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 2076f0cbe20d..ca308963ef47 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -1,10 +1,7 @@ AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf -DIST lxcfs-4.0.7.tar.gz 454108 BLAKE2B 8af5a9177089d0629ef05b6f28b9945dcf6f1102bbc3c5458fd71959912201d24b9ea31fc4b4dc51dca388d59ba1ad2a4494561108632abe8b90f1bef4a2e85f SHA512 ab66d4278f8a5e0bb0e7495badcd587ef5fa48fb6271d8682cdca8b0f7c5c4b5f889ca43a86520e6aa28d6824be20f050707169bbed5921e3e4f7eaa0be7a1d5 -DIST lxcfs-4.0.7.tar.gz.asc 833 BLAKE2B 26cb25e41471257925600fcab5a01933076c1ab304e14f71defc21c5b7563e2c0acd832051def79f277322e47a0efe76eb41121293a9b796e486e8a7747f5e2f SHA512 3e9ff48197caca2776665171167805627a421741c02ee4a30e22b3c4ff8e9e58d71997302f45772c58de831ba5315fd335e8856553cfbfcbae1909ad8625f505 DIST lxcfs-4.0.8.tar.gz 458975 BLAKE2B 19ac81c36c3aad0ee3301eda73aa29399304dff1c827041678be73c4134181667a4d92b3efa37a44b2853b825031fef2e07e7cbfcaf552676a01f5f9faedf9c3 SHA512 830a4a25583a645b59c75327701af24c239323bfe822180c2cb7cb7cc284f50e8bb7c38e771ea869b4449370af1ab1a4fed9611c6495883d193f5a0f6f71380e DIST lxcfs-4.0.8.tar.gz.asc 833 BLAKE2B da4ef0f8d6dea59d83f708b6aa7c1835773537e3111d8e9aaf4a7c111d21a0b57486cc9828919bea55ea06ee6bf3e03eeae89eb26199e287066b309d6d798c8d SHA512 f8fc10e52472fff599df7e008d34346489754d64347d005794a4b280949130bb0370ade0d65c9eb182914cae3a6c55f9872bc38481b0b64ea1218c8d1640a74f -EBUILD lxcfs-4.0.7.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76 -EBUILD lxcfs-4.0.8.ebuild 1447 BLAKE2B e5711cb3ae0d93591afede59b97bafe863486c18d7f6b314905f3c991e08f6764b7fe69005f33ed07bef49a68ecedafd7b1c377a137fd83d97b8a53cab09fb09 SHA512 88fb2e45a0931820bdb1c94e0275a87bbe2989d3ea6f7851dd6adb587936991db178ce388a5cf22341f0dc8a1c3bd48d99aefdd21ece01799b16d4b426710e05 +EBUILD lxcfs-4.0.8.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c diff --git a/sys-fs/lxcfs/lxcfs-4.0.7.ebuild b/sys-fs/lxcfs/lxcfs-4.0.7.ebuild deleted file mode 100644 index b652ae461b57..000000000000 --- a/sys-fs/lxcfs/lxcfs-4.0.7.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd verify-sig - -DESCRIPTION="FUSE filesystem for LXC" -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" -SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" - -RDEPEND="dev-libs/glib:2 - sys-fs/fuse:3" -DEPEND="${RDEPEND}" -BDEPEND="sys-apps/help2man - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" - -# Test files need to be updated to fuse:3, #764620 -RESTRICT="test" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Without the localstatedir the filesystem isn't mounted correctly - # Without with-distro ./configure will fail when cross-compiling - econf --localstatedir=/var --with-distro=gentoo --disable-static -} - -src_test() { - cd tests/ || die - emake tests - ./main.sh || die "Tests failed" -} - -src_install() { - default - - newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs - newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs - - # Provide our own service file (copy of upstream) due to paths being different from upstream, - # #728470 - systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-fs/lxcfs/lxcfs-4.0.8.ebuild b/sys-fs/lxcfs/lxcfs-4.0.8.ebuild index 61b57c9974a8..b652ae461b57 100644 --- a/sys-fs/lxcfs/lxcfs-4.0.8.ebuild +++ b/sys-fs/lxcfs/lxcfs-4.0.8.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND="dev-libs/glib:2 sys-fs/fuse:3" diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index f5052390fb78..5ff9dd9dafda 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,5 +1,5 @@ DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c -DIST mtools-4.0.28.tar.bz2 435433 BLAKE2B e837aaccbd733ec7d8f305fc9748533168e25c7bd9c6fe0a0fe46c30f8bac95bdaf28d3799e4f83618aa0c302fb230a6e3e6734ed469c80b087e9006dd3a0642 SHA512 732aee8f83a7af0fdc4c2af75053f559357caa56eb73d46f7a2c8b13b8366d3521aff9a49c89f5896502267d96bb9176de05043934c0bf4a6bb8d46a5722571a +DIST mtools-4.0.29.tar.bz2 440446 BLAKE2B b448fad8f5669230dc4fe32442c3a8b0ee570e1b084ac6b99b3239fa16fa97ba0ac5263aee34fefcb8726999178829a9ad6ed0444f41361518e5d24cfb3de083 SHA512 3671fa835bf7b410b33acbe0e4694da1609f284a99268e7c64ebdbf3ce9fc9e78cc5594d06eae5487e380b983ead190098d01a9fc1bc88b4eda324046172e62e EBUILD mtools-4.0.27.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a -EBUILD mtools-4.0.28.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931 +EBUILD mtools-4.0.29.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d diff --git a/sys-fs/mtools/mtools-4.0.28.ebuild b/sys-fs/mtools/mtools-4.0.29.ebuild index 3ebdd3b6df91..3ebdd3b6df91 100644 --- a/sys-fs/mtools/mtools-4.0.28.ebuild +++ b/sys-fs/mtools/mtools-4.0.29.ebuild diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest index 5955fd5e9e92..0a2159a3bd54 100644 --- a/sys-fs/reiser4progs/Manifest +++ b/sys-fs/reiser4progs/Manifest @@ -4,5 +4,5 @@ DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27 EBUILD reiser4progs-1.2.1.ebuild 1288 BLAKE2B 0b7ca382987ce89c562872041157c2cd3eeffee56efb8fb7ee0cb1ba895caeb0e9421e4e071f10dd46f453fefe0a1be21661bc13ea3e5e28d9d26d87b1e8b575 SHA512 425f5935fae4b159a56717e611df6bb2abcab657058ed96326d7858370554aafe37bc1c4b0744e7dd368aaa6423b1e2f481917d6bf5735b5a7adabb1cd7d4975 EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246 -EBUILD reiser4progs-2.0.5.ebuild 1348 BLAKE2B 0cc2709ae7e786fc83c57d3b48fe6afa644851068318b6d569be48fa98a4f14e5ca98662c7eb213dbb6be9d806096a27ba76a550d9d30caa21595eeea0e47885 SHA512 463266de436ad30c3eca89b4b109be2b8f3f1fdf8508a47e4442c8ed38381ab4ba2c510dbced86792038818b7b7a722747ff89b72d1c9acc0311e20dfc8508c9 +EBUILD reiser4progs-2.0.5.ebuild 1343 BLAKE2B 096b9fb491117f98c6e4026b00f1e29037c526913d0c24ed8c6fcb8b45f532652b6338bf0f0e6440c3e4be9d869812c985be6956381228fad8140ac468010340 SHA512 5069c930aadb2de9cbe4e59c4905c876f1bfc9d1114f1dfd3150b9decedb58d6a75326317a56da292a381c04b33adb8fe9dfbf68e88a9ae4f7048fd13f978497 MISC metadata.xml 240 BLAKE2B 0d7e3f2595807ed2a0e8708c7769497a8cd181b9256b3d5c15e41fef923bb9748d799325a038679fe78867ec4ae788c95a02d7ff178d8f5c095b866122b4acd5 SHA512 59f5b3dfcd9b7df8447be8b098b57a611e1e29e3fe023f531585f157c5f89508ec6e185dbb4e856aca651f88070f99c3c9c581ec3a1368ee4a9ae35af1aed43d diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild index 2381c45ae855..bc2336496e29 100644 --- a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild +++ b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" +KEYWORDS="amd64 arm ~arm64 ppc ppc64 -sparc x86" IUSE="debug readline static static-libs" LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)] diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest index 501830426d8c..43394d7edc39 100644 --- a/sys-fs/static-dev/Manifest +++ b/sys-fs/static-dev/Manifest @@ -1,2 +1,2 @@ -EBUILD static-dev-0.1-r1.ebuild 1103 BLAKE2B ee9a36d0bc1fd9b9c6d3f608b8fff157266f91c0e5283085a51136804d998c72fe010fa097b775cc13e71d6cfabddd6e202e4a55a1eb47f3f256776d9cac396b SHA512 9c6d4f600407f487f537de931aa2371807b9c5ed0c1030d3eeec087fbcb10ca1512fc4490858216a0b08d9db99197f86b4e0a86669c03a36795933d6cc4caaf9 +EBUILD static-dev-0.1-r2.ebuild 1099 BLAKE2B 961b2608f87573543f6288936b43ae68ed054f1cf68e0bf8031c38dffae4436e76202776ad750bc2ed2ed48ddaaddc78b9accbcb165ac6696d36bfe8f9ed9408 SHA512 b436183c35aaf1a0e91bd254f3dbc407adb5b4d8d91a784ba173f65d1187bf092a798cabf679e07266af0e4de67cbff6b49bef336d316f5b40bea49763df69a0 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/static-dev/static-dev-0.1-r1.ebuild b/sys-fs/static-dev/static-dev-0.1-r2.ebuild index 42c60e497de4..ca46b76ab1e5 100644 --- a/sys-fs/static-dev/static-dev-0.1-r1.ebuild +++ b/sys-fs/static-dev/static-dev-0.1-r2.ebuild @@ -30,7 +30,7 @@ pkg_pretend() { fi # We also want to not clobber newer devtmpfs setups. - if [[ ${ROOT} == "/" ]] && \ + if [[ -z ${ROOT} ]] && \ ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then abort fi diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 53447609ca45..13d0a2fdcf14 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -6,6 +6,6 @@ DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102 EBUILD udev-245.5-r1.ebuild 5928 BLAKE2B 5fc1655db3633cd1a7459bc05d2065a0878a43e8cf48ac6a5957a71b662f9ddce8dd18c906de8707fdf411378ffe82e71b6217f2d6e8ea0136830718af125af3 SHA512 4450cd68fcebc939de12f641f4404570e48b6cb623a4ccc8536dad9d3ca92534d5d2b44b68fa723baf24446b034193788ca4e32ade975f2e4c7413cea3f99092 EBUILD udev-246-r1.ebuild 5927 BLAKE2B a8830dbfefdb6c12fa7e8d6034bcb9c94b0eb81eee871655e8f57bb3732d693b345588ab6e3f1c211695fdd15e7402bea08ac097c7721998f9625a77ca725430 SHA512 a113458cf68bff8881e0b1c7ff80bc4ff4dbe715dcec7f4f83b264e8f5f0f4c0153a6365ce3e1105d1dbbe8144016d94c1c530397e3ae768f9bc2bb3030428a9 EBUILD udev-247.2.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a -EBUILD udev-248.ebuild 5626 BLAKE2B a01e3a54a543dfb4767f20d7ee66b1366b8360d8ed7addd4aec1905ad917d86bdf28eb7d37f146ea552a163d0a395741868df55aaeece9a86f467f4658c803bb SHA512 b9173e54339135bb0150dbf721d22a157478f3e3cdc81b1d6d608f215275e4a718da019fe780c0a876a1e150bbe76ed6487d76c7577b128ead7ac88b950b31cf -EBUILD udev-9999.ebuild 5626 BLAKE2B a01e3a54a543dfb4767f20d7ee66b1366b8360d8ed7addd4aec1905ad917d86bdf28eb7d37f146ea552a163d0a395741868df55aaeece9a86f467f4658c803bb SHA512 b9173e54339135bb0150dbf721d22a157478f3e3cdc81b1d6d608f215275e4a718da019fe780c0a876a1e150bbe76ed6487d76c7577b128ead7ac88b950b31cf +EBUILD udev-248.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2 +EBUILD udev-9999.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild index 177412dc751e..676b5a0be4e7 100644 --- a/sys-fs/udev/udev-248.ebuild +++ b/sys-fs/udev/udev-248.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]] ; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -99,24 +99,16 @@ src_prepare() { 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) + $(meson_native_use_bool acl) -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) -Dlink-udev-shared=false -Dsplit-usr=true -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dstatic-libudev=$(usex static-libs true false) + $(meson_use static-libs static-libudev) # Prevent automagic deps -Dgcrypt=false diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 177412dc751e..676b5a0be4e7 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]] ; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -99,24 +99,16 @@ src_prepare() { 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) + $(meson_native_use_bool acl) -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) -Dlink-udev-shared=false -Dsplit-usr=true -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dstatic-libudev=$(usex static-libs true false) + $(meson_use static-libs static-libudev) # Prevent automagic deps -Dgcrypt=false diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index cf8f2d2cf26c..4331a049675c 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,10 +1,17 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 +AUX zfs-8.0.4_5.12_compat_bio_max_segs.patch 3134 BLAKE2B cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2 SHA512 c8a9893bfee7622fe9ebf61d311fd3701311d3e037cb0d69667b80a7e4d1ddb84e614b3631f2ae768223ea12fafa653f11ed99acdb973b487bdc98e143fe882d +AUX zfs-8.0.4_5.12_compat_iov_iter_advance.patch 1357 BLAKE2B c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878 SHA512 85d6cae52d088789930e130b5f62f9e9955e7b2e3e60f8624cf9cfe8b4b032a951ea605dbff5ed8164ec5eef66efa119238ddb9e5c64351b81dccebef94b8787 +AUX zfs-8.0.4_5.12_compat_tmpfile.patch 3013 BLAKE2B b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872 SHA512 a981aa41fdf4c377f031d312c3f480152e80976f3ffa9e85f07918c599e3d5d70fb8310a0f1da0a0ebadf123408993134ef599d2750e16ea82e16dd060f198f8 +AUX zfs-8.0.4_5.12_compat_userns.patch 5612 BLAKE2B 556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e SHA512 b80f0e836db9008d5d0779ca8640c6cf0f6798cde66913391083236402e70907809c7f64f70008e53d5517e764c3f5678fadeb538ef30c98fc1f90e863deb400 +AUX zfs-8.0.4_spl_kmem_cache_slab_limit_16K.patch 2770 BLAKE2B f56051e4b2411fb7864989db6dd0dc56b09365b9326f131dc7d79d050ac18668d1c1e403c5d51471a0b65bf53954bf6f03b0c8b2b497b79cbc2b36abf58b144e SHA512 edf2be80a5d331181ffc3cfe32eaed20975181d63f9a68f1cea006f7d12f946c7e04003fc5062d34eef81079ae777e50e0ee533707b20a49e2411e3286d6c140 +AUX zfs-8.0.4_stream_resume.patch 1263 BLAKE2B 4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4 SHA512 074b633a39930030ca45d49d1ea0c97a8e70a7b63feaabb010e8fc724940ae5989c1feae67affb03b7d6aafe68537afea032688f4b57ec2663848aaa93340710 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b -DIST zfs-2.1.0-rc6.tar.gz 34777294 BLAKE2B 0080b03a9cf9717ae2bc7674e340dffafd923467368d8941df9be5a21f081e88745297e1a8b2ac5059e9f346949bbeb759a5fc8bcdb60c3be49b0645389ec8b1 SHA512 696d525c1c738a508d04366f8ffd0142aebe4498efbf129c9d38fa7c67dbec83554f55a2c4a5d7647a03ca0df173c2720fe85edbc859195f4ca19e04d2adf143 -DIST zfs-2.1.0-rc6.tar.gz.asc 195 BLAKE2B a1267b8faffc75ac70082e261c6053b2070cbad014c92051ebc82af56b21bbe2e72e01e44c0701ed255a3201330bb56b5e1a72e12c1ae9f15f72883b53c17ec6 SHA512 afc0eb839de6b0b21b3d781dd74dce9f6f668b7b9fc079ea764666e28d4d3228b8a80641b6d0084851bffedfc3406dc0f829242f6b4247d192f554ba45ce3a4c -EBUILD zfs-kmod-0.8.6.ebuild 4796 BLAKE2B ddb58b4223966078cd38b461d9dcc48f485a240ffc4b154abc58805f1c2f5d750d07854da9e1f736c103142cab13e2667b1d526c98782b821208a93815b4b368 SHA512 7dd5cba7330973fd1afc588d2673e958aabeaa9af80e8df09eca35283cae4fda228d32d7a300ec8732e30a32ad6bf5fb6867f34bcad9c7975290d8014fdfcfdf -EBUILD zfs-kmod-2.0.4.ebuild 4480 BLAKE2B 3351d47b9fe97cbe8de7e12f86d0ee8a66c83094ffc66fe9d551f2bbd83a5a935580f8bdf3a55811b7e554d3a24b9c60f798bdd528ecf25321137fd5b62ef981 SHA512 dd42188466bfbec8af4ac9a968cb15f82b691bb1d5ea09bcd1cc9e86d6b7eed1ff6e1cd8fdc6c121c5be488efc1cb225cb024e3b2b701e7dc7325f888554755f -EBUILD zfs-kmod-2.1.0_rc6.ebuild 4803 BLAKE2B 9a43d72668c6dd3093baa138f5c9d76f0fb891fe80b0523898be43cbb102790a0e779cf84cd1dd19ba65a31ed39113e2fdc795d86d927d93b9153905cc16fb00 SHA512 410f7ff768cbafb95bef27ef8d5c8f31daa6c8c37bb990978dbf49406be8a4273e1492af5afca1aa579ae4fe4c76144dd5d9a22ad3d158713816e9685b84b32f -EBUILD zfs-kmod-9999.ebuild 4803 BLAKE2B 9a43d72668c6dd3093baa138f5c9d76f0fb891fe80b0523898be43cbb102790a0e779cf84cd1dd19ba65a31ed39113e2fdc795d86d927d93b9153905cc16fb00 SHA512 410f7ff768cbafb95bef27ef8d5c8f31daa6c8c37bb990978dbf49406be8a4273e1492af5afca1aa579ae4fe4c76144dd5d9a22ad3d158713816e9685b84b32f +DIST zfs-2.1.0-rc7.tar.gz 34800406 BLAKE2B a645c3e19f521a7abb606cbcd619ea019abeb7810bd6476ecddcd76c7c801d6f1e3f197d49199eac72497db5c529b22bcd605b2e7ec2c236aec5216dc99b7dc1 SHA512 4e1cb1cc83454d92cac58110c219fca28dcf8361a5ea27dca955a5c88434b6e9ccd68892d93bf14d773056760f1907e004e65cc5d653308dd8996692ecba61f1 +DIST zfs-2.1.0-rc7.tar.gz.asc 195 BLAKE2B b772bba2f64bec51f11b5c51564a1449cd37d5e8e5c90eee1eb5c357193cab187bdeceef299c95622aed9c03601c1b5d67a941de12003c01e0af9ad68e82bfa2 SHA512 6c48eeab7658db1e9bac54da2f73087b1a58046504c507c94e58478f03f3b37336af254947964dbf9383575dc2cb3019640c7286ab0dfa5d5d9f55df96b34864 +DIST zfs-8.0.4_5.12_compat_idmapped_mounts.patch 41410 BLAKE2B 49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf SHA512 1554d74a7024c106a3f4814895a64914f2e3d627f7edff3c8f415b419c6a596454862f8c0984a6e2f96e340851f1a9222a4c472ebd6d5db7dc0aa108dc2dca6c +EBUILD zfs-kmod-0.8.6.ebuild 5334 BLAKE2B abaa4b20899db464246d9c445ba55d938ba1982a2686a2c6b22fcc213e76551d2a28a59709760dd5e15af6cfdc8e4999713ae4d1efd3275c02a85f1dfc5b3275 SHA512 f67b1c4483f2a985256c18dcaf232c47219726f67c9fa95b184be6e608dc997b2beab18bd5863d32afcc92da0bad5c3ef8337a8878cf060d45b3931e8e736b77 +EBUILD zfs-kmod-2.0.4-r1.ebuild 5500 BLAKE2B 00a6b354c212eb2435588480e931aa343f37060e9d37a898b2bee95cb8a0760e348b10e92b138f0b7d06819d96433b3f94e4e4c0ae99af76d0902d765034053a SHA512 f97ee0af77cc8a7ed932984dd8d2709293f7df2f438806647ffbaa3edc5de0c9309e6340cb5912e95840bf3b20d6a8cb06a15726c107b02e3a89ceca5ee2a63f +EBUILD zfs-kmod-2.1.0_rc7.ebuild 5372 BLAKE2B 98ce65e9b1196d12763608697436fe2b02790f2e987370bb4b9ad2f312f6a723a7a425e64aa31e447ccc7d80581ca97e47348b3ec007fe66b0ff0f334c539cdc SHA512 b121a44505341681c7b3f2de8bf03e3135e5f5a55aa71f6010f91610f14d03ec606bf6c7dfb018198c4fe1985824ac5478a6f1cf2e16a7e0c3a2795a177e95bf +EBUILD zfs-kmod-9999.ebuild 5372 BLAKE2B 98ce65e9b1196d12763608697436fe2b02790f2e987370bb4b9ad2f312f6a723a7a425e64aa31e447ccc7d80581ca97e47348b3ec007fe66b0ff0f334c539cdc SHA512 b121a44505341681c7b3f2de8bf03e3135e5f5a55aa71f6010f91610f14d03ec606bf6c7dfb018198c4fe1985824ac5478a6f1cf2e16a7e0c3a2795a177e95bf MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b diff --git a/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_bio_max_segs.patch b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_bio_max_segs.patch new file mode 100644 index 000000000000..33f9a344e2f2 --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_bio_max_segs.patch @@ -0,0 +1,91 @@ +From 77352db228c07ce8ba50478b9029820ca69c6c1b Mon Sep 17 00:00:00 2001 +From: Coleman Kane <ckane@colemankane.org> +Date: Sat, 20 Mar 2021 01:33:42 -0400 +Subject: [PATCH] Linux 5.12 update: bio_max_segs() replaces BIO_MAX_PAGES + +The BIO_MAX_PAGES macro is being retired in favor of a bio_max_segs() +function that implements the typical MIN(x,y) logic used throughout the +kernel for bounding the allocation, and also the new implementation is +intended to be signed-safe (which the former was not). + +Reviewed-by: Tony Hutter <hutter2@llnl.gov> +Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Coleman Kane <ckane@colemankane.org> +Closes #11765 +(cherry picked from commit ffd6978ef59cfe2773e984bf03de2f0b93b03f5c) +Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev> +--- + config/kernel-bio_max_segs.m4 | 23 +++++++++++++++++++++++ + config/kernel.m4 | 2 ++ + module/os/linux/zfs/vdev_disk.c | 5 +++++ + 3 files changed, 30 insertions(+) + create mode 100644 config/kernel-bio_max_segs.m4 + +diff --git a/config/kernel-bio_max_segs.m4 b/config/kernel-bio_max_segs.m4 +new file mode 100644 +index 00000000000..a90d75455c1 +--- /dev/null ++++ b/config/kernel-bio_max_segs.m4 +@@ -0,0 +1,23 @@ ++dnl # ++dnl # 5.12 API change removes BIO_MAX_PAGES in favor of bio_max_segs() ++dnl # which will handle the logic of setting the upper-bound to a ++dnl # BIO_MAX_PAGES, internally. ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_MAX_SEGS], [ ++ ZFS_LINUX_TEST_SRC([bio_max_segs], [ ++ #include <linux/bio.h> ++ ],[ ++ bio_max_segs(1); ++ ]) ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_BIO_MAX_SEGS], [ ++ AC_MSG_CHECKING([whether bio_max_segs() exists]) ++ ZFS_LINUX_TEST_RESULT([bio_max_segs], [ ++ AC_MSG_RESULT(yes) ++ ++ AC_DEFINE([HAVE_BIO_MAX_SEGS], 1, [bio_max_segs() is implemented]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) ++]) +diff --git a/config/kernel.m4 b/config/kernel.m4 +index 51c7fb926ec..b8d53490a4a 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -127,6 +127,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ + ZFS_AC_KERNEL_SRC_GENERIC_FILLATTR_USERNS + ZFS_AC_KERNEL_SRC_MKNOD + ZFS_AC_KERNEL_SRC_SYMLINK ++ ZFS_AC_KERNEL_SRC_BIO_MAX_SEGS + + AC_MSG_CHECKING([for available kernel interfaces]) + ZFS_LINUX_TEST_COMPILE_ALL([kabi]) +@@ -227,6 +228,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ + ZFS_AC_KERNEL_GENERIC_FILLATTR_USERNS + ZFS_AC_KERNEL_MKNOD + ZFS_AC_KERNEL_SYMLINK ++ ZFS_AC_KERNEL_BIO_MAX_SEGS + ]) + + dnl # +diff --git a/module/os/linux/zfs/vdev_disk.c b/module/os/linux/zfs/vdev_disk.c +index 08c33313407..aaaf4105979 100644 +--- a/module/os/linux/zfs/vdev_disk.c ++++ b/module/os/linux/zfs/vdev_disk.c +@@ -593,9 +593,14 @@ __vdev_disk_physio(struct block_device *bdev, zio_t *zio, + } + + /* bio_alloc() with __GFP_WAIT never returns NULL */ ++#ifdef HAVE_BIO_MAX_SEGS ++ dr->dr_bio[i] = bio_alloc(GFP_NOIO, bio_max_segs( ++ abd_nr_pages_off(zio->io_abd, bio_size, abd_offset))); ++#else + dr->dr_bio[i] = bio_alloc(GFP_NOIO, + MIN(abd_nr_pages_off(zio->io_abd, bio_size, abd_offset), + BIO_MAX_PAGES)); ++#endif + if (unlikely(dr->dr_bio[i] == NULL)) { + vdev_disk_dio_free(dr); + return (SET_ERROR(ENOMEM)); diff --git a/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_iov_iter_advance.patch b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_iov_iter_advance.patch new file mode 100644 index 000000000000..95ecda34652c --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_iov_iter_advance.patch @@ -0,0 +1,40 @@ +From 3e0bc63e1b0ca03493b936e92e871ca7ae451a0a Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Date: Tue, 1 Jun 2021 14:58:08 -0400 +Subject: [PATCH] Remove iov_iter_advance() for iter_write + +The additional iter advance is incorrect, as copy_from_iter() has +already done the right thing. This will result in the following +warning being printed to the console as of the 5.12 kernel. + + Attempted to advance past end of bvec iter + +This change should have been included with #11378 when a +similar change was made on the read side. + +Suggested-by: @siebenmann +Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Rich Ercolani <rincebrain@gmail.com> +Issue #11378 +Closes #12041 +Closes #12155 +(cherry picked from commit 3f81aba7668143c6ca6fc44983d4c880606dea8f) +Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev> +--- + module/os/linux/zfs/zpl_file.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c +index 08bf97ff338..e20c1dd413c 100644 +--- a/module/os/linux/zfs/zpl_file.c ++++ b/module/os/linux/zfs/zpl_file.c +@@ -342,9 +342,6 @@ zpl_iter_write(struct kiocb *kiocb, struct iov_iter *from) + ssize_t wrote = count - uio.uio_resid; + kiocb->ki_pos += wrote; + +- if (wrote > 0) +- iov_iter_advance(from, wrote); +- + return (wrote); + } + diff --git a/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_tmpfile.patch b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_tmpfile.patch new file mode 100644 index 000000000000..08acee821489 --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_tmpfile.patch @@ -0,0 +1,89 @@ +From 6eced028dbbc2a44e32c4c0a76234ac2da9a365a Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Date: Thu, 20 May 2021 19:02:36 -0400 +Subject: [PATCH] Update tmpfile() existence detection + +Linux changed the tmpfile() signature again in torvalds/linux@6521f89, +which in turn broke our HAVE_TMPFILE detection in configure. + +Update that macro to include the new case, and change the signature of +zpl_tmpfile as appropriate. + +Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Rich Ercolani <rincebrain@gmail.com> +Closes: #12060 +Closes: #12087 +--- + config/kernel-tmpfile.m4 | 28 ++++++++++++++++++++++++---- + module/os/linux/zfs/zpl_inode.c | 5 +++++ + 2 files changed, 29 insertions(+), 4 deletions(-) + +diff --git a/config/kernel-tmpfile.m4 b/config/kernel-tmpfile.m4 +index f510bfe6ba0..45c2e6ceea5 100644 +--- a/config/kernel-tmpfile.m4 ++++ b/config/kernel-tmpfile.m4 +@@ -3,23 +3,43 @@ dnl # 3.11 API change + dnl # Add support for i_op->tmpfile + dnl # + AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [ +- ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [ ++ dnl # ++ dnl # 5.11 API change ++ dnl # add support for userns parameter to tmpfile ++ dnl # ++ ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_userns], [ + #include <linux/fs.h> +- int tmpfile(struct inode *inode, struct dentry *dentry, ++ int tmpfile(struct user_namespace *userns, ++ struct inode *inode, struct dentry *dentry, + umode_t mode) { return 0; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .tmpfile = tmpfile, + }; + ],[]) ++ ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [ ++ #include <linux/fs.h> ++ int tmpfile(struct inode *inode, struct dentry *dentry, ++ umode_t mode) { return 0; } ++ static struct inode_operations ++ iops __attribute__ ((unused)) = { ++ .tmpfile = tmpfile, ++ }; ++ ],[]) + ]) + + AC_DEFUN([ZFS_AC_KERNEL_TMPFILE], [ + AC_MSG_CHECKING([whether i_op->tmpfile() exists]) +- ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [ ++ ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile_userns], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists]) ++ AC_DEFINE(HAVE_TMPFILE_USERNS, 1, [i_op->tmpfile() has userns]) + ],[ +- AC_MSG_RESULT(no) ++ ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) + ]) + ]) +diff --git a/module/os/linux/zfs/zpl_inode.c b/module/os/linux/zfs/zpl_inode.c +index 364b9fbef24..ab0373ef9ba 100644 +--- a/module/os/linux/zfs/zpl_inode.c ++++ b/module/os/linux/zfs/zpl_inode.c +@@ -218,7 +218,12 @@ zpl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, + + #ifdef HAVE_TMPFILE + static int ++#ifdef HAVE_TMPFILE_USERNS ++zpl_tmpfile(struct user_namespace *userns, struct inode *dir, ++ struct dentry *dentry, umode_t mode) ++#else + zpl_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) ++#endif + { + cred_t *cr = CRED(); + struct inode *ip; diff --git a/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_userns.patch b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_userns.patch new file mode 100644 index 000000000000..1d8530ec8c6c --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-8.0.4_5.12_compat_userns.patch @@ -0,0 +1,173 @@ +From b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585 Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Date: Thu, 27 May 2021 11:55:49 -0400 +Subject: [PATCH] Bend zpl_set_acl to permit the new userns* parameter + +Just like #12087, the set_acl signature changed with all the bolted-on +*userns parameters, which disabled set_acl usage, and caused #12076. + +Turn zpl_set_acl into zpl_set_acl and zpl_set_acl_impl, and add a +new configure test for the new version. + +Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Rich Ercolani <rincebrain@gmail.com> +Closes #12076 +Closes #12093 +--- + config/kernel-acl.m4 | 25 +++++++++++++++++++++-- + include/os/linux/zfs/sys/zpl.h | 5 +++++ + module/os/linux/zfs/zpl_xattr.c | 35 ++++++++++++++++++++++----------- + 3 files changed, 51 insertions(+), 14 deletions(-) + +diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 +index e02ce665323..c6da4df24eb 100644 +--- a/config/kernel-acl.m4 ++++ b/config/kernel-acl.m4 +@@ -189,7 +189,22 @@ dnl # + dnl # 3.14 API change, + dnl # Check if inode_operations contains the function set_acl + dnl # ++dnl # 5.12 API change, ++dnl # set_acl() added a user_namespace* parameter first ++dnl # + AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [ ++ ZFS_LINUX_TEST_SRC([inode_operations_set_acl_userns], [ ++ #include <linux/fs.h> ++ ++ int set_acl_fn(struct user_namespace *userns, ++ struct inode *inode, struct posix_acl *acl, ++ int type) { return 0; } ++ ++ static const struct inode_operations ++ iops __attribute__ ((unused)) = { ++ .set_acl = set_acl_fn, ++ }; ++ ],[]) + ZFS_LINUX_TEST_SRC([inode_operations_set_acl], [ + #include <linux/fs.h> + +@@ -205,11 +220,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [ + + AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL], [ + AC_MSG_CHECKING([whether iops->set_acl() exists]) +- ZFS_LINUX_TEST_RESULT([inode_operations_set_acl], [ ++ ZFS_LINUX_TEST_RESULT([inode_operations_set_acl_userns], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SET_ACL, 1, [iops->set_acl() exists]) ++ AC_DEFINE(HAVE_SET_ACL_USERNS, 1, [iops->set_acl() takes 4 args]) + ],[ +- AC_MSG_RESULT(no) ++ ZFS_LINUX_TEST_RESULT([inode_operations_set_acl], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_SET_ACL, 1, [iops->set_acl() exists, takes 3 args]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) + ]) + ]) + +diff --git a/include/os/linux/zfs/sys/zpl.h b/include/os/linux/zfs/sys/zpl.h +index 21825d1f378..54f3fa0fdb0 100644 +--- a/include/os/linux/zfs/sys/zpl.h ++++ b/include/os/linux/zfs/sys/zpl.h +@@ -63,7 +63,12 @@ extern int zpl_xattr_security_init(struct inode *ip, struct inode *dip, + const struct qstr *qstr); + #if defined(CONFIG_FS_POSIX_ACL) + #if defined(HAVE_SET_ACL) ++#if defined(HAVE_SET_ACL_USERNS) ++extern int zpl_set_acl(struct user_namespace *userns, struct inode *ip, ++ struct posix_acl *acl, int type); ++#else + extern int zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type); ++#endif /* HAVE_SET_ACL_USERNS */ + #endif /* HAVE_SET_ACL */ + extern struct posix_acl *zpl_get_acl(struct inode *ip, int type); + extern int zpl_init_acl(struct inode *ip, struct inode *dir); +diff --git a/module/os/linux/zfs/zpl_xattr.c b/module/os/linux/zfs/zpl_xattr.c +index 5e35f90df85..89ba9de14f6 100644 +--- a/module/os/linux/zfs/zpl_xattr.c ++++ b/module/os/linux/zfs/zpl_xattr.c +@@ -926,11 +926,8 @@ xattr_handler_t zpl_xattr_security_handler = { + * attribute implemented by filesystems in the kernel." - xattr(7) + */ + #ifdef CONFIG_FS_POSIX_ACL +-#ifndef HAVE_SET_ACL +-static +-#endif +-int +-zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type) ++static int ++zpl_set_acl_impl(struct inode *ip, struct posix_acl *acl, int type) + { + char *name, *value = NULL; + int error = 0; +@@ -1002,6 +999,19 @@ zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type) + return (error); + } + ++#ifdef HAVE_SET_ACL ++int ++#ifdef HAVE_SET_ACL_USERNS ++zpl_set_acl(struct user_namespace *userns, struct inode *ip, ++ struct posix_acl *acl, int type) ++#else ++zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type) ++#endif /* HAVE_SET_ACL_USERNS */ ++{ ++ return (zpl_set_acl_impl(ip, acl, type)); ++} ++#endif /* HAVE_SET_ACL */ ++ + struct posix_acl * + zpl_get_acl(struct inode *ip, int type) + { +@@ -1083,7 +1093,7 @@ zpl_init_acl(struct inode *ip, struct inode *dir) + umode_t mode; + + if (S_ISDIR(ip->i_mode)) { +- error = zpl_set_acl(ip, acl, ACL_TYPE_DEFAULT); ++ error = zpl_set_acl_impl(ip, acl, ACL_TYPE_DEFAULT); + if (error) + goto out; + } +@@ -1093,8 +1103,10 @@ zpl_init_acl(struct inode *ip, struct inode *dir) + if (error >= 0) { + ip->i_mode = mode; + zfs_mark_inode_dirty(ip); +- if (error > 0) +- error = zpl_set_acl(ip, acl, ACL_TYPE_ACCESS); ++ if (error > 0) { ++ error = zpl_set_acl_impl(ip, acl, ++ ACL_TYPE_ACCESS); ++ } + } + } + out: +@@ -1121,7 +1133,7 @@ zpl_chmod_acl(struct inode *ip) + + error = __posix_acl_chmod(&acl, GFP_KERNEL, ip->i_mode); + if (!error) +- error = zpl_set_acl(ip, acl, ACL_TYPE_ACCESS); ++ error = zpl_set_acl_impl(ip, acl, ACL_TYPE_ACCESS); + + zpl_posix_acl_release(acl); + +@@ -1250,8 +1262,7 @@ __zpl_xattr_acl_set_access(struct inode *ip, const char *name, + } else { + acl = NULL; + } +- +- error = zpl_set_acl(ip, acl, type); ++ error = zpl_set_acl_impl(ip, acl, type); + zpl_posix_acl_release(acl); + + return (error); +@@ -1291,7 +1302,7 @@ __zpl_xattr_acl_set_default(struct inode *ip, const char *name, + acl = NULL; + } + +- error = zpl_set_acl(ip, acl, type); ++ error = zpl_set_acl_impl(ip, acl, type); + zpl_posix_acl_release(acl); + + return (error); diff --git a/sys-fs/zfs-kmod/files/zfs-8.0.4_spl_kmem_cache_slab_limit_16K.patch b/sys-fs/zfs-kmod/files/zfs-8.0.4_spl_kmem_cache_slab_limit_16K.patch new file mode 100644 index 000000000000..3448f76a8012 --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-8.0.4_spl_kmem_cache_slab_limit_16K.patch @@ -0,0 +1,59 @@ +From 783784582225e8ddfbf07993d9fc278bf08025c5 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf <behlendorf1@llnl.gov> +Date: Thu, 3 Jun 2021 13:37:45 -0700 +Subject: [PATCH] Linux: Set spl_kmem_cache_slab_limit when page size !4K + +For small objects the kernel's slab implementation is very fast and +space efficient. However, as the allocation size increases to +require multiple pages performance suffers. The SPL kmem cache +allocator was designed to better handle these large allocation +sizes. Therefore, on Linux the kmem_cache_* compatibility wrappers +prefer to use the kernel's slab allocator for small objects and +the custom SPL kmem cache allocator for larger objects. + +This logic was effectively disabled for all architectures using +a non-4K page size which caused all kmem caches to only use the +SPL implementation. Functionally this is fine, but the SPL code +which calculates the target number of objects per-slab does not +take in to account that __vmalloc() always returns page-aligned +memory. This can result in a massive amount of wasted space when +allocating tiny objects on a platform using large pages (64k). + +To resolve this issue we set the spl_kmem_cache_slab_limit cutoff +to 16K for all architectures. + +This particular change does not attempt to update the logic used +to calculate the optimal number of pages per slab. This remains +an issue which should be addressed in a future change. + +Reviewed-by: Matthew Ahrens <mahrens@delphix.com> +Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #12152 +Closes #11429 +Closes #11574 +Closes #12150 +--- + module/os/linux/spl/spl-kmem-cache.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/module/os/linux/spl/spl-kmem-cache.c b/module/os/linux/spl/spl-kmem-cache.c +index 3699b6a159a..2151ef008fd 100644 +--- a/module/os/linux/spl/spl-kmem-cache.c ++++ b/module/os/linux/spl/spl-kmem-cache.c +@@ -100,13 +100,10 @@ MODULE_PARM_DESC(spl_kmem_cache_max_size, "Maximum size of slab in MB"); + * For small objects the Linux slab allocator should be used to make the most + * efficient use of the memory. However, large objects are not supported by + * the Linux slab and therefore the SPL implementation is preferred. A cutoff +- * of 16K was determined to be optimal for architectures using 4K pages. ++ * of 16K was determined to be optimal for architectures using 4K pages and ++ * to also work well on architecutres using larger 64K page sizes. + */ +-#if PAGE_SIZE == 4096 + unsigned int spl_kmem_cache_slab_limit = 16384; +-#else +-unsigned int spl_kmem_cache_slab_limit = 0; +-#endif + module_param(spl_kmem_cache_slab_limit, uint, 0644); + MODULE_PARM_DESC(spl_kmem_cache_slab_limit, + "Objects less than N bytes use the Linux slab"); diff --git a/sys-fs/zfs-kmod/files/zfs-8.0.4_stream_resume.patch b/sys-fs/zfs-kmod/files/zfs-8.0.4_stream_resume.patch new file mode 100644 index 000000000000..196fab65f4ab --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-8.0.4_stream_resume.patch @@ -0,0 +1,33 @@ +From ee2a9d2c771657168652e058477b81389c662b5e Mon Sep 17 00:00:00 2001 +From: Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Date: Fri, 14 May 2021 00:46:14 -0400 +Subject: [PATCH] Fix dmu_recv_stream test for resumable + +Use dsl_dataset_has_resume_receive_state() +not dsl_dataset_is_zapified() to check if +stream is resumable. + +Reviewed-by: Matthew Ahrens <mahrens@delphix.com> +Reviewed-by: Alek Pinchuk <apinchuk@axcient.com> +Reviewed-by: Ryan Moeller <ryan@ixsystems.com> +Signed-off-by: Paul Zuchowski <pzuchowski@datto.com> +Closes #12034 +--- + module/zfs/dmu_recv.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/module/zfs/dmu_recv.c b/module/zfs/dmu_recv.c +index b5414749f7f..f44b397853f 100644 +--- a/module/zfs/dmu_recv.c ++++ b/module/zfs/dmu_recv.c +@@ -2878,8 +2878,8 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, offset_t *voffp) + int err = 0; + struct receive_writer_arg *rwa = kmem_zalloc(sizeof (*rwa), KM_SLEEP); + +- if (dsl_dataset_is_zapified(drc->drc_ds)) { +- uint64_t bytes; ++ if (dsl_dataset_has_resume_receive_state(drc->drc_ds)) { ++ uint64_t bytes = 0; + (void) zap_lookup(drc->drc_ds->ds_dir->dd_pool->dp_meta_objset, + drc->drc_ds->ds_object, DS_FIELD_RESUME_BYTES, + sizeof (bytes), 1, &bytes); diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild index f63c737f2af0..68776243c4fb 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" +SLOT="0/${PVR}" IUSE="custom-cflags debug +rootfs" DEPEND="" @@ -33,10 +33,25 @@ BDEPEND=" virtual/awk " +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + # https://github.com/openzfs/zfs/pull/11371 PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" ) diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.4-r1.ebuild index 32715c6f6a94..18391c3ffa91 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.4-r1.ebuild @@ -13,14 +13,15 @@ if [[ ${PV} == "9999" ]]; then 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" + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz + https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch -> zfs-8.0.4_5.12_compat_idmapped_mounts.patch" KEYWORDS="~amd64 ~arm64 ~ppc64" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.11" + ZFS_KERNEL_COMPAT="5.12" fi LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0" +SLOT="0/${PVR}" IUSE="custom-cflags debug +rootfs" DEPEND="" @@ -34,10 +35,35 @@ BDEPEND=" virtual/awk " +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + +PATCHES=( + "${DISTDIR}"/zfs-8.0.4_5.12_compat_idmapped_mounts.patch + "${FILESDIR}"/zfs-8.0.4_5.12_compat_bio_max_segs.patch + "${FILESDIR}"/zfs-8.0.4_5.12_compat_tmpfile.patch + "${FILESDIR}"/zfs-8.0.4_5.12_compat_userns.patch + "${FILESDIR}"/zfs-8.0.4_5.12_compat_iov_iter_advance.patch + "${FILESDIR}"/zfs-8.0.4_stream_resume.patch + "${FILESDIR}"/zfs-8.0.4_spl_kmem_cache_slab_limit_16K.patch +) + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC @@ -81,13 +107,9 @@ 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 + eautoreconf + # Set module revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" } src_configure() { diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc7.ebuild index f57ff9699ac8..27cf80ed4300 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc7.ebuild @@ -27,7 +27,7 @@ else fi LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0" +SLOT="0/${PVR}" IUSE="custom-cflags debug +rootfs" RDEPEND="${DEPEND} @@ -43,10 +43,25 @@ if [[ ${PV} != "9999" ]] ; then BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" fi +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC @@ -91,9 +106,10 @@ pkg_setup() { src_prepare() { default - if [[ ${PV} == "9999" ]]; then - eautoreconf - else + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then # Set module revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index f57ff9699ac8..27cf80ed4300 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -27,7 +27,7 @@ else fi LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0" +SLOT="0/${PVR}" IUSE="custom-cflags debug +rootfs" RDEPEND="${DEPEND} @@ -43,10 +43,25 @@ if [[ ${PV} != "9999" ]] ; then BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" fi +# PDEPEND in this form is needed to trick portage suggest +# enabling dist-kernel if only 1 package have it set +PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" + RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC @@ -91,9 +106,10 @@ pkg_setup() { src_prepare() { default - if [[ ${PV} == "9999" ]]; then - eautoreconf - else + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then # Set module revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index a6cc74d5c66d..b43e93e3b2e6 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,10 +1,11 @@ +AUX 2.0.4-scrub-timers.patch 2873 BLAKE2B 40986e258ddc3c5b4dfdebc8c2126fbb2c0ff9ac947700fa30c547795612fb98b2778f364ee10ec47c05a6837c4d4129918a6efe7cf3ab5854910e1892a3e348 SHA512 0e557974fe8992a7b0e6c15e46fac55d265e469aa13f85e85b0abe449b5fe2e8c51cf56510863fa2e33c060f2b38c0c43a910a740172ef1d4c42c0aa85e04ab9 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b -DIST zfs-2.1.0-rc6.tar.gz 34777294 BLAKE2B 0080b03a9cf9717ae2bc7674e340dffafd923467368d8941df9be5a21f081e88745297e1a8b2ac5059e9f346949bbeb759a5fc8bcdb60c3be49b0645389ec8b1 SHA512 696d525c1c738a508d04366f8ffd0142aebe4498efbf129c9d38fa7c67dbec83554f55a2c4a5d7647a03ca0df173c2720fe85edbc859195f4ca19e04d2adf143 -DIST zfs-2.1.0-rc6.tar.gz.asc 195 BLAKE2B a1267b8faffc75ac70082e261c6053b2070cbad014c92051ebc82af56b21bbe2e72e01e44c0701ed255a3201330bb56b5e1a72e12c1ae9f15f72883b53c17ec6 SHA512 afc0eb839de6b0b21b3d781dd74dce9f6f668b7b9fc079ea764666e28d4d3228b8a80641b6d0084851bffedfc3406dc0f829242f6b4247d192f554ba45ce3a4c -EBUILD zfs-0.8.6.ebuild 5653 BLAKE2B 38774df7573b4aa50fa6aae5bba143514b6e48d018d8e1a5b112181d7ef2f8048b044ad234b00bd44a8b2f311f72e3ae57a55765c25239779ef618ce65a05290 SHA512 8a49d24c53bff99af55ee3581ec935875fa050aded7b8efc8bc7ecd9f73a342023d23f498e9e0c8730b6b516e2aa510fb64d7680d49aa30a6d4e385ede733f0f -EBUILD zfs-2.0.4.ebuild 5975 BLAKE2B 9f1a03496e6b18542a85778a02b625ccfa8c9de9dc15c45100c921100f0b9da34884a56ff9117ef014c5364ef96de538f5416f335c10be611f114d323354b53f SHA512 6c9e3cd0717465d4cbc49a53d63f8e4e4d91e97cb5fe2154f83592f41b7b777cb8a13fa81936f9265d8c577c01a8a4715b37f82149a1826f13511dd506d83150 -EBUILD zfs-2.1.0_rc6.ebuild 7259 BLAKE2B 411c348dd7dffbc27453b76eb5b7a378f4181f3f5ed6d50ab27f5e62e822536185afa6e39930ab7837608c28b6c48e29061b8826237aecc6ccea852e58b1cac5 SHA512 b470cf358316366de94d7f4555702459847739b225527b99a77fbde65303ab2874a34feb0c2d00fe8eb24e246e63fe68303cc274ba8c4e60883d9fd6b4b4efbe -EBUILD zfs-9999.ebuild 7259 BLAKE2B 411c348dd7dffbc27453b76eb5b7a378f4181f3f5ed6d50ab27f5e62e822536185afa6e39930ab7837608c28b6c48e29061b8826237aecc6ccea852e58b1cac5 SHA512 b470cf358316366de94d7f4555702459847739b225527b99a77fbde65303ab2874a34feb0c2d00fe8eb24e246e63fe68303cc274ba8c4e60883d9fd6b4b4efbe +DIST zfs-2.1.0-rc7.tar.gz 34800406 BLAKE2B a645c3e19f521a7abb606cbcd619ea019abeb7810bd6476ecddcd76c7c801d6f1e3f197d49199eac72497db5c529b22bcd605b2e7ec2c236aec5216dc99b7dc1 SHA512 4e1cb1cc83454d92cac58110c219fca28dcf8361a5ea27dca955a5c88434b6e9ccd68892d93bf14d773056760f1907e004e65cc5d653308dd8996692ecba61f1 +DIST zfs-2.1.0-rc7.tar.gz.asc 195 BLAKE2B b772bba2f64bec51f11b5c51564a1449cd37d5e8e5c90eee1eb5c357193cab187bdeceef299c95622aed9c03601c1b5d67a941de12003c01e0af9ad68e82bfa2 SHA512 6c48eeab7658db1e9bac54da2f73087b1a58046504c507c94e58478f03f3b37336af254947964dbf9383575dc2cb3019640c7286ab0dfa5d5d9f55df96b34864 +EBUILD zfs-0.8.6.ebuild 6466 BLAKE2B 1826a984e3bcafa84585869df35eb86d77e713f6f909ae5bdef3a3bce10e78fbf3aaa9ace7d3e0d096ddfd926f75b164020f570864c868224551f2c16eece2ca SHA512 f9241fb89ecef5ba2ecd118dc6ac856614a9afd2b247e87c71a67a136736d77e79d28ad2dab0a019beeb241238424c9e58958704f9435de320e9b97e26f26a62 +EBUILD zfs-2.0.4-r1.ebuild 6779 BLAKE2B 345bebffe2dc50a00d093de5234a6fbd1902af4ffc604886902fbe361ccd2111fe2afbea3a24e941ef8b208e261d5f70c34b16d6265d822cd533ebb5092c3256 SHA512 273302767f0d9cfcc1948ae13113b9ac797a19852c39a680f02cac7309a5a52263cf6766e3b001b7e5f48a88e821ba9baf400409429b6d98305e4c4644e1a8ba +EBUILD zfs-2.1.0_rc7.ebuild 8086 BLAKE2B 33003e0e3bbef3018b2f7ea7eab8ac19c6ee5e91ea81cddcfd406f867cb14cd461d5a7c428a3f42d058c60e9970e5fde18e0fae309d8dd47b41b8232ccf2b9d0 SHA512 26849e6fccd79abf48e2b94e5fa739eefbbfe860979421ef5d9aef8174c39726d27fc7b758e63f714d1210f0d666ca83f31069ccfcd9d1cdb5a4662bfcfb64d3 +EBUILD zfs-9999.ebuild 8086 BLAKE2B 33003e0e3bbef3018b2f7ea7eab8ac19c6ee5e91ea81cddcfd406f867cb14cd461d5a7c428a3f42d058c60e9970e5fde18e0fae309d8dd47b41b8232ccf2b9d0 SHA512 26849e6fccd79abf48e2b94e5fa739eefbbfe860979421ef5d9aef8174c39726d27fc7b758e63f714d1210f0d666ca83f31069ccfcd9d1cdb5a4662bfcfb64d3 MISC metadata.xml 1000 BLAKE2B 1f3e75ef73d5680d5863f0fda415931a6af19ab1a535c9795c417526ccce2a826ede05abee88ff27c2ec99f1f23aa06cce02cd3cb6d49b2952e90eb94ab95a6b SHA512 f8b30ce788d80c8f65db738f251fe5ebdc4d3ec7206dc78e0b9e53c2cf92153b90e20f6799b2a36bf8e616147b28f9660421bbc2ad17e7dbd804d47f430f6e40 diff --git a/sys-fs/zfs/files/2.0.4-scrub-timers.patch b/sys-fs/zfs/files/2.0.4-scrub-timers.patch new file mode 100644 index 000000000000..6aae1e4de596 --- /dev/null +++ b/sys-fs/zfs/files/2.0.4-scrub-timers.patch @@ -0,0 +1,97 @@ +From e23d7e03637e377591a480d87630b746cdaa377f Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sat, 22 May 2021 22:27:39 -0700 +Subject: [PATCH] systemd: add weekly and monthly scrub timers + +timers can be enabled as follows: + +systemctl enable zfs-scrub-weekly@rpool.timer --now +systemctl enable zfs-scrub-monthly@datapool.timer --now + +Each timer will pull in zfs-scrub@${poolname}.service, which is not +schedule-specific. + +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + etc/systemd/system/Makefile.am | 5 ++++- + etc/systemd/system/zfs-scrub-monthly@.timer.in | 12 ++++++++++++ + etc/systemd/system/zfs-scrub-weekly@.timer.in | 12 ++++++++++++ + etc/systemd/system/zfs-scrub@.service.in | 12 ++++++++++++ + 4 files changed, 40 insertions(+), 1 deletion(-) + create mode 100644 etc/systemd/system/zfs-scrub-monthly@.timer.in + create mode 100644 etc/systemd/system/zfs-scrub-weekly@.timer.in + create mode 100644 etc/systemd/system/zfs-scrub@.service.in + +diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am +index c374a52ac..5e65e1db4 100644 +--- a/etc/systemd/system/Makefile.am ++++ b/etc/systemd/system/Makefile.am +@@ -12,7 +12,10 @@ systemdunit_DATA = \ + zfs-volume-wait.service \ + zfs-import.target \ + zfs-volumes.target \ +- zfs.target ++ zfs.target \ ++ zfs-scrub-monthly@.timer \ ++ zfs-scrub-weekly@.timer \ ++ zfs-scrub@.service + + SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA) + +diff --git a/etc/systemd/system/zfs-scrub-monthly@.timer.in b/etc/systemd/system/zfs-scrub-monthly@.timer.in +new file mode 100644 +index 000000000..4c585f45f +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub-monthly@.timer.in +@@ -0,0 +1,12 @@ ++[Unit] ++Description=Monthly zpool scrub timer for %i ++Documentation=man:zpool-scrub(8) ++ ++[Timer] ++OnCalendar=monthly ++AccuracySec=1h ++Persistent=true ++Unit=zfs-scrub@%i.service ++ ++[Install] ++WantedBy=timers.target +diff --git a/etc/systemd/system/zfs-scrub-weekly@.timer.in b/etc/systemd/system/zfs-scrub-weekly@.timer.in +new file mode 100644 +index 000000000..b2454be2c +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub-weekly@.timer.in +@@ -0,0 +1,12 @@ ++[Unit] ++Description=Weekly zpool scrub timer for %i ++Documentation=man:zpool-scrub(8) ++ ++[Timer] ++OnCalendar=weekly ++AccuracySec=1h ++Persistent=true ++Unit=zfs-scrub@%i.service ++ ++[Install] ++WantedBy=timers.target +diff --git a/etc/systemd/system/zfs-scrub@.service.in b/etc/systemd/system/zfs-scrub@.service.in +new file mode 100644 +index 000000000..720901165 +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub@.service.in +@@ -0,0 +1,12 @@ ++[Unit] ++Description=zpool scrub on %i ++Documentation=man:zpool-scrub(8) ++Requires=zfs.target ++After=zfs.target ++ConditionPathIsDirectory=/sys/module/zfs ++ ++[Service] ++Nice=19 ++IOSchedulingClass=idle ++KillSignal=SIGINT ++ExecStart=@sbindir@/zpool scrub %i +-- +2.31.1 + diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6.ebuild index fbe500b2f8d9..54845ae75568 100644 --- a/sys-fs/zfs/zfs-0.8.6.ebuild +++ b/sys-fs/zfs/zfs-0.8.6.ebuild @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1 DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd toolchain-funcs udev usr-ldscript DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="https://github.com/openzfs/zfs" @@ -22,7 +22,7 @@ fi LICENSE="BSD-2 CDDL MIT" SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair -IUSE="custom-cflags debug kernel-builtin minimal nls python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" DEPEND=" net-libs/libtirpc[static-libs?] @@ -46,9 +46,11 @@ BDEPEND="virtual/awk " RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts + virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils @@ -77,8 +79,19 @@ PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + pkg_setup() { - if use kernel_linux && use test-suite; then + if use kernel_linux; then linux-info_pkg_setup if ! linux_config_exists; then @@ -185,6 +198,15 @@ src_install() { } pkg_postinst() { + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use rootfs; then if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then elog "root on zfs requires initramfs to boot" diff --git a/sys-fs/zfs/zfs-2.0.4.ebuild b/sys-fs/zfs/zfs-2.0.4-r1.ebuild index 597374f40d48..e6152b9eb7e4 100644 --- a/sys-fs/zfs/zfs-2.0.4.ebuild +++ b/sys-fs/zfs/zfs-2.0.4-r1.ebuild @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1 DISTUTILS_USE_SETUPTOOLS=manual 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 +inherit autotools bash-completion-r1 dist-kernel-utils 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" @@ -26,7 +26,7 @@ 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 minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" DEPEND=" net-libs/libtirpc[static-libs?] @@ -51,9 +51,11 @@ BDEPEND="virtual/awk " RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts + virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils @@ -78,10 +80,24 @@ REQUIRED_USE=" RESTRICT="test" -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) +PATCHES=( + "${FILESDIR}/bash-completion-sudo.patch" + "${FILESDIR}/2.0.4-scrub-timers.patch" +) + +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} pkg_setup() { - if use kernel_linux && use test-suite; then + if use kernel_linux; then linux-info_pkg_setup if ! linux_config_exists; then @@ -104,13 +120,9 @@ pkg_setup() { 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 + eautoreconf + # Set revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" if use python; then pushd contrib/pyzfs >/dev/null || die @@ -194,6 +206,15 @@ src_install() { } pkg_postinst() { + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use rootfs; then if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then elog "root on zfs requires initramfs to boot" diff --git a/sys-fs/zfs/zfs-2.1.0_rc6.ebuild b/sys-fs/zfs/zfs-2.1.0_rc7.ebuild index 621ef35d32be..957b611b7ef5 100644 --- a/sys-fs/zfs/zfs-2.1.0_rc6.ebuild +++ b/sys-fs/zfs/zfs-2.1.0_rc7.ebuild @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1 DISTUTILS_USE_SETUPTOOLS=manual 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 +inherit autotools bash-completion-r1 dist-kernel-utils 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" @@ -34,7 +34,7 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" DEPEND=" net-libs/libtirpc[static-libs?] @@ -63,10 +63,11 @@ fi # awk is used for some scripts, completions, and the Dracut module RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils @@ -91,8 +92,19 @@ REQUIRED_USE=" RESTRICT="test" +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + pkg_setup() { - if use kernel_linux && use test-suite; then + if use kernel_linux; then linux-info_pkg_setup if ! linux_config_exists; then @@ -141,9 +153,10 @@ src_prepare() { default libsoversion_check - if [[ ${PV} == "9999" ]]; then - eautoreconf - else + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then # Set revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi @@ -230,6 +243,15 @@ src_install() { } pkg_postinst() { + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use rootfs; then if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then elog "Root on zfs requires an initramfs to boot" diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 621ef35d32be..957b611b7ef5 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1 DISTUTILS_USE_SETUPTOOLS=manual 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 +inherit autotools bash-completion-r1 dist-kernel-utils 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" @@ -34,7 +34,7 @@ LICENSE="BSD-2 CDDL MIT" # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well SLOT="0/5" -IUSE="custom-cflags debug kernel-builtin minimal nls pam python +rootfs test-suite static-libs" +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs" DEPEND=" net-libs/libtirpc[static-libs?] @@ -63,10 +63,11 @@ fi # awk is used for some scripts, completions, and the Dracut module RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk + dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils @@ -91,8 +92,19 @@ REQUIRED_USE=" RESTRICT="test" +pkg_pretend() { + use rootfs || return 0 + + if has_version virtual/dist-kernel && ! use dist-kernel; then + ewarn "You have virtual/dist-kernel installed, but" + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" + ewarn "It's recommended to globally enable dist-kernel USE flag" + ewarn "to auto-trigger initrd rebuilds with kernel updates" + fi +} + pkg_setup() { - if use kernel_linux && use test-suite; then + if use kernel_linux; then linux-info_pkg_setup if ! linux_config_exists; then @@ -141,9 +153,10 @@ src_prepare() { default libsoversion_check - if [[ ${PV} == "9999" ]]; then - eautoreconf - else + # Run unconditionally (bug #792627) + eautoreconf + + if [[ ${PV} != "9999" ]]; then # Set revision number sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" fi @@ -230,6 +243,15 @@ src_install() { } pkg_postinst() { + # we always need userspace utils in sync with zfs-kmod + # so force initrd update for userspace as well, to avoid + # situation when zfs-kmod trigger initrd rebuild before + # userspace component is rebuilt + # KV_* variables are provided by linux-info.eclass + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use rootfs; then if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then elog "Root on zfs requires an initramfs to boot" |