From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- sys-fs/zfs-kmod/Manifest | 5 +- sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch | 34 ---- sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild | 179 ---------------------- sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild | 2 +- 4 files changed, 2 insertions(+), 218 deletions(-) delete mode 100644 sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch delete mode 100644 sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild (limited to 'sys-fs/zfs-kmod') diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 9c635c1c8555..0c5d2958f63f 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,9 +1,6 @@ -AUX 0.8.2-umask_O_TMPFILE.patch 1188 BLAKE2B 19cb2b42e5ca7e0f29ecb9b0f725375ce60c510961d4744b34e93c7fb323ceb3b5ede85c9bbab4d3b894b111f9ab16d1648677adf73691062c8c552b72e6ca46 SHA512 7290597e0c74c54db09c4c97800bf5fa8744bb4686de65c71ef52e77d6832b245650d580a12c60c5dd04ace5063c156379462f2f6be53976ba0a271c46548dfa DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e -DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496 DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340 -EBUILD zfs-kmod-0.8.2-r2.ebuild 4483 BLAKE2B 6fed0585a7ef9c6d22b0787e7da013cba40c7121ab79eca2ac85b56005bfd34d80d1f635d4c052c7e4f63e19c247ed6d81b77a83bef7ecf5f2bb943c1b431fbe SHA512 946f096ea68965171b55806c1274dfa3935de4850966a8b6a5acd6ea385ca442daab89623697c7a687e41f8a7716622f0c3b234f93921dd7b25cbea22cc6f7d0 -EBUILD zfs-kmod-0.8.3.ebuild 4248 BLAKE2B 9e4dd5fa97530b8c0b2b760526491e006f49213a11264a2cb88a4ee282668cbcec3bbfca070b19a8e5f23f2e94fe0f6e25db81a5774ae8ad4b93f074d5859407 SHA512 75bf45975857a0841c857461948a4243b2aaf491bd8e49b5b0a278a0dd2f795ffbcf2224a5c2f0aadb478b8b7548c11c381b66388f927582355feb18862ea647 +EBUILD zfs-kmod-0.8.3.ebuild 4247 BLAKE2B 7346912021c1aece40acdb2d25f1eaeb64630fbb78c276fa8f76b5a51fd27ca816a5d7f990d7bebe6422648f8c001d4b343d3e0957a831904fc9c11d9eb2a714 SHA512 ab215e7b0ceed0f282022a36ecda3b4e6fe50913ae7684823a4eee987b9a11e11ad7755001cf47a737613216df550de391aef59230859b3ca89c0a48d074263a EBUILD zfs-kmod-9999.ebuild 4248 BLAKE2B 9e4dd5fa97530b8c0b2b760526491e006f49213a11264a2cb88a4ee282668cbcec3bbfca070b19a8e5f23f2e94fe0f6e25db81a5774ae8ad4b93f074d5859407 SHA512 75bf45975857a0841c857461948a4243b2aaf491bd8e49b5b0a278a0dd2f795ffbcf2224a5c2f0aadb478b8b7548c11c381b66388f927582355feb18862ea647 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch b/sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch deleted file mode 100644 index 9252b6e7815c..000000000000 --- a/sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ddb4e69db5eb0ed741dc4e32714af3e0f054086c Mon Sep 17 00:00:00 2001 -From: Tomohiro Kusumi -Date: Sat, 14 Dec 2019 08:02:23 +0900 -Subject: [PATCH] Don't fail to apply umask for O_TMPFILE files - -Apply umask to `mode` which will eventually be applied to inode. -This is needed since VFS doesn't apply umask for O_TMPFILE files. - -(Note that zpl_init_acl() applies `ip->i_mode &= ~current_umask();` -only when POSIX ACL is used.) - -Reviewed-by: Brian Behlendorf -Reviewed-by: Tony Hutter -Signed-off-by: Tomohiro Kusumi -Closes #8997 -Closes #8998 - -diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c -index 264c5d2b1cf..e1c6ce7b705 100644 ---- a/module/zfs/zpl_inode.c -+++ b/module/zfs/zpl_inode.c -@@ -218,6 +218,12 @@ zpl_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) - - crhold(cr); - vap = kmem_zalloc(sizeof (vattr_t), KM_SLEEP); -+ /* -+ * The VFS does not apply the umask, therefore it is applied here -+ * when POSIX ACLs are not enabled. -+ */ -+ if (!IS_POSIXACL(dir)) -+ mode &= ~current_umask(); - zpl_vap_init(vap, dir, mode, cr); - - cookie = spl_fstrans_mark(); diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild deleted file mode 100644 index 961ee269f06b..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info linux-mod toolchain-funcs - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://zfsonlinux.org/" - -if [[ ${PV} == "9999" ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" - S="${WORKDIR}/zfs-${PV}" - ZFS_KERNEL_COMPAT="5.4" -fi - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" - -DEPEND="" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse - !sys-kernel/spl -" - -BDEPEND=" - dev-lang/perl - virtual/awk -" - -RESTRICT="debug? ( strip ) test" - -DOCS=( AUTHORS COPYRIGHT META README.md ) - -PATCHES=( "${FILESDIR}/${PV}-umask_O_TMPFILE.patch" ) - -pkg_setup() { - linux-info_pkg_setup - - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - EFI_PARTITION - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !TRIM_UNUSED_KSYMS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - if use arm64; then - kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT" - fi - - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" - - kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required" - - if [[ ${PV} != "9999" ]]; then - local kv_major_max kv_minor_max zcompat - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - kv_major_max="${zcompat%%.*}" - zcompat="${zcompat#*.}" - kv_minor_max="${zcompat%%.*}" - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" - fi - - check_extra_config -} - -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 - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in -} - -src_configure() { - set_arch_to_kernel - - use custom-cflags || strip-flags - - filter-ldflags -Wl,* - - local myconf=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - - econf "${myconf[@]}" -} - -src_compile() { - set_arch_to_kernel - - myemakeargs=( V=1 ) - - emake "${myemakeargs[@]}" -} - -src_install() { - set_arch_to_kernel - - myemakeargs+=( - DEPMOD="/bin/true" - DESTDIR="${D}" - INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - ) - - emake "${myemakeargs[@]}" install - - einstalldocs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm; then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of ZFSOnLinux. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild index 87090d4d5e0f..ba5f84805265 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="amd64 ~arm64 ~ppc64" S="${WORKDIR}/zfs-${PV}" ZFS_KERNEL_COMPAT="5.4" fi -- cgit v1.2.3