From 503ea5165eeebc882f155cb259d29d287e41b54e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Jan 2025 12:05:13 +0000 Subject: sys-fs/zfs : version bump --- sys-fs/zfs-utils/Manifest | 2 +- sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch | 39 --------- sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild | 112 -------------------------- sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild | 111 +++++++++++++++++++++++++ sys-fs/zfs/zfs-2.2.7.ebuild | 17 ---- sys-fs/zfs/zfs-2.3.0.ebuild | 17 ++++ 6 files changed, 129 insertions(+), 169 deletions(-) delete mode 100644 sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild create mode 100644 sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild delete mode 100644 sys-fs/zfs/zfs-2.2.7.ebuild create mode 100644 sys-fs/zfs/zfs-2.3.0.ebuild (limited to 'sys-fs') diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 31a404de..cb4f42d9 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271 +DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b diff --git a/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch b/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch deleted file mode 100644 index b132db9d..00000000 --- a/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/openzfs/zfs/issues/15241 -https://github.com/openzfs/zfs/pull/15560 - -From e0a7ec29d91b79adfd81073f229241351ed0ae21 Mon Sep 17 00:00:00 2001 -From: Ilkka Sovanto -Date: Wed, 22 Nov 2023 20:24:47 +0200 -Subject: [PATCH] Fix zoneid when USER_NS is disabled - -getzoneid() should return GLOBAL_ZONEID instead of 0 when USER_NS is disabled. - -Signed-off-by: Ilkka Sovanto ---- a/lib/libspl/os/linux/zone.c -+++ b/lib/libspl/os/linux/zone.c -@@ -42,20 +42,20 @@ getzoneid(void) - int c = snprintf(path, sizeof (path), "/proc/self/ns/user"); - /* This API doesn't have any error checking... */ - if (c < 0 || c >= sizeof (path)) -- return (0); -+ return (GLOBAL_ZONEID); - - ssize_t r = readlink(path, buf, sizeof (buf) - 1); - if (r < 0) -- return (0); -+ return (GLOBAL_ZONEID); - - cp = strchr(buf, '['); - if (cp == NULL) -- return (0); -+ return (GLOBAL_ZONEID); - cp++; - - unsigned long n = strtoul(cp, NULL, 10); - if (n == ULONG_MAX && errno == ERANGE) -- return (0); -+ return (GLOBAL_ZONEID); - zoneid_t z = (zoneid_t)n; - - return (z); - diff --git a/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild deleted file mode 100644 index 2ef8e142..00000000 --- a/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript - -MY_PN="zfs" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" -KEYWORDS="~amd64" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="debug nls pam test-suite unwind" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:= - pam? ( sys-libs/pam ) - unwind? ( sys-libs/libunwind:= ) -" - -BDEPEND="app-alternatives/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -RDEPEND="${DEPEND} - app-alternatives/awk - virtual/udev - sys-fs/udev-init-scripts - test-suite? ( - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch - "${FILESDIR}"/2.2.2-no-USER_NS.patch -) - -src_prepare() { - default - - # Run unconditionally (bug #792627) - eautoreconf - - # Tries to use /etc/conf.d which we reserve for OpenRC - sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --disable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-vendor=redcore - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_with unwind libunwind) - --disable-pyzfs - --disable-static - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - dodir etc/conf.d - insinto etc/conf.d - doins "${S}"/etc/default/zfs - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs -} diff --git a/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild b/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild new file mode 100644 index 00000000..ab207679 --- /dev/null +++ b/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript + +MY_PN="zfs" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Userland utilities for ZFS Linux kernel module" +HOMEPAGE="https://zfsonlinux.org/" + +SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" +KEYWORDS="~amd64" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD-2 CDDL MIT" +SLOT="0" +IUSE="debug nls pam test-suite unwind" + +DEPEND=" + net-libs/libtirpc:= + sys-apps/util-linux + sys-libs/zlib + virtual/libudev:= + dev-libs/openssl:= + pam? ( sys-libs/pam ) + unwind? ( sys-libs/libunwind:= ) +" + +BDEPEND="app-alternatives/awk + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND="${DEPEND} + app-alternatives/awk + virtual/udev + sys-fs/udev-init-scripts + test-suite? ( + sys-apps/kmod[tools] + sys-apps/util-linux + sys-devel/bc + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch +) + +src_prepare() { + default + + # Run unconditionally (bug #792627) + eautoreconf + + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + + # prevent errors showing up on zfs-mount stop, #647688 + # openrc will unmount all filesystems anyway. + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die +} + +src_configure() { + local myconf=( + --bindir="${EPREFIX}/bin" + --enable-shared + --disable-systemd + --enable-sysvinit + --localstatedir="${EPREFIX}/var" + --sbindir="${EPREFIX}/sbin" + --with-config=user + --with-dracutdir="${EPREFIX}/usr/lib/dracut" + --with-udevdir="$(get_udevdir)" + --with-pamconfigsdir="${EPREFIX}/unwanted_files" + --with-pammoduledir="$(getpam_mod_dir)" + --with-vendor=redcore + $(use_enable debug) + $(use_enable nls) + $(use_enable pam) + $(use_with unwind libunwind) + --disable-pyzfs + --disable-static + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool + dobashcomp contrib/bash_completion.d/zfs + bashcomp_alias zfs zpool + dodir etc/conf.d + insinto etc/conf.d + doins "${S}"/etc/default/zfs + use pam && { rm -rv "${ED}/unwanted_files" || die ; } + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } + + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs +} diff --git a/sys-fs/zfs/zfs-2.2.7.ebuild b/sys-fs/zfs/zfs-2.2.7.ebuild deleted file mode 100644 index bdcb914c..00000000 --- a/sys-fs/zfs/zfs-2.2.7.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=7 - -DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="~sys-fs/zfs-utils-${PV} - ~sys-kernel/zfs-dkms-${PV}" -RDEPEND="${DEPEND}" diff --git a/sys-fs/zfs/zfs-2.3.0.ebuild b/sys-fs/zfs/zfs-2.3.0.ebuild new file mode 100644 index 00000000..bdcb914c --- /dev/null +++ b/sys-fs/zfs/zfs-2.3.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=7 + +DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="~sys-fs/zfs-utils-${PV} + ~sys-kernel/zfs-dkms-${PV}" +RDEPEND="${DEPEND}" -- cgit v1.2.3