sys-fs/zfs{,-utils} && sys-kernel/zfs-dkms : version bump

12 files changed, 81 insertions, 29 deletions

diff --git a/metadata/md5-cache/sys-fs/zfs-2.2.4 b/metadata/md5-cache/sys-fs/zfs-2.2.6
index 220976c1..2a774057 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.2.4
+++ b/metadata/md5-cache/sys-fs/zfs-2.2.6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DEPEND=~sys-fs/zfs-utils-2.2.4 ~sys-kernel/zfs-dkms-2.2.4
+DEPEND=~sys-fs/zfs-utils-2.2.6 ~sys-kernel/zfs-dkms-2.2.6
 DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild)
 EAPI=7
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=~sys-fs/zfs-utils-2.2.4 ~sys-kernel/zfs-dkms-2.2.4
+RDEPEND=~sys-fs/zfs-utils-2.2.6 ~sys-kernel/zfs-dkms-2.2.6
 SLOT=0
 _md5_=e55b835fd30a4e79085053c624251ca7
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.2.4 b/metadata/md5-cache/sys-fs/zfs-utils-2.2.4
deleted file mode 100644
index 67682654..00000000
--- a/metadata/md5-cache/sys-fs/zfs-utils-2.2.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://zfsonlinux.org/
-INHERIT=bash-completion-r1 flag-o-matic pam toolchain-funcs udev
-IUSE=debug nls pam test-suite
-KEYWORDS=~amd64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) 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
-SLOT=0
-SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.2.4/zfs-2.2.4.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	udev	3b4170e9c327a8ed17097484a016c0c8
-_md5_=d57fd45904d9765be3b700129afcec01
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.2.6 b/metadata/md5-cache/sys-fs/zfs-utils-2.2.6
new file mode 100644
index 00000000..afebea87
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-utils-2.2.6
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:= pam? ( sys-libs/pam ) unwind? ( sys-libs/libunwind:= )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://zfsonlinux.org/
+INHERIT=autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript
+IUSE=debug nls pam test-suite unwind split-usr
+KEYWORDS=~amd64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:= pam? ( sys-libs/pam ) unwind? ( sys-libs/libunwind:= ) 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
+SLOT=0
+SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.2.6/zfs-2.2.6.tar.gz
+_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	bash-completion-r1	3047612be964ffd4a549447fc4289f12	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	multilib	7e1347c006a76bb812f3a9f663b79991	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	udev	3b4170e9c327a8ed17097484a016c0c8	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
+_md5_=3f5136e6a091af53b0864f79c9f80a60
diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.4-r1 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.6
index 72942119..2a587e45 100644
--- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.4-r1
+++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.6
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=sys-kernel/dkms
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.6/zfs-2.2.6.tar.gz
 _md5_=8dab2841d2ca48635d73941d7dabcd9c
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 809047df..1c22eec8 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -59,8 +59,8 @@ sys-boot/unetbootin-static 625-r5: Universal Netboot Installer creates Live USB
 sys-fs/cryptsetup 2.6.1-r5: Tool to setup encrypted devices with dm-crypt
 sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
 sys-fs/vhba 20240202-r1: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-sys-fs/zfs 2.2.4: ZFS meta-package (Gentoo compatibility ebuild)
-sys-fs/zfs-utils 2.2.4: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs 2.2.6: ZFS meta-package (Gentoo compatibility ebuild)
+sys-fs/zfs-utils 2.2.6: Userland utilities for ZFS Linux kernel module
 sys-kernel/bcmwl-dkms 6.30.223.271-r12: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r4: Dynamic Kernel Module Support
 sys-kernel/dracut 059-r15: Generic initramfs generation tool
@@ -72,7 +72,7 @@ sys-kernel/nvidia-drivers-dkms 390.157-r7 470.239.06-r1 535.171.04-r1: NVIDIA dr
 sys-kernel/tp_smapi-dkms 0.44-r2: IBM ThinkPad SMAPI BIOS driver sources
 sys-kernel/vhba-dkms 20240202-r2: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
 sys-kernel/virtualbox-modules-dkms 7.0.20-r1: Kernel Modules source for Virtualbox
-sys-kernel/zfs-dkms 2.2.4-r1: ZFS sources for linux
+sys-kernel/zfs-dkms 2.2.6: ZFS sources for linux
 sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards
 virtual/libudev 314.1337-r1: Virtual for libudev providers
 virtual/linux-sources 314.1337-r1: Virtual for Linux kernel sources
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index f9b51cff..c17ea78f 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0 SHA512 1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
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
new file mode 100644
index 00000000..b132db9d
--- /dev/null
+++ b/sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch
@@ -0,0 +1,39 @@
+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 <github@ilkka.kapsi.fi>
+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 <github@ilkka.kapsi.fi>
+--- 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.4.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild
index 0545a209..2ef8e142 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.2.4.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit bash-completion-r1 flag-o-matic pam toolchain-funcs udev
+inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript
 
 MY_PN="zfs"
 MY_P="${MY_PN}-${PV}"
@@ -17,15 +17,16 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="debug nls pam test-suite"
+IUSE="debug nls pam test-suite unwind"
 
 DEPEND="
 	net-libs/libtirpc:=
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libudev:=
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	pam? ( sys-libs/pam )
+	unwind? ( sys-libs/libunwind:= )
 "
 
 BDEPEND="app-alternatives/awk
@@ -34,6 +35,7 @@ BDEPEND="app-alternatives/awk
 "
 
 RDEPEND="${DEPEND}
+	app-alternatives/awk
 	virtual/udev
 	sys-fs/udev-init-scripts
 	test-suite? (
@@ -51,11 +53,18 @@ 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
@@ -78,6 +87,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable nls)
 		$(use_enable pam)
+		$(use_with unwind libunwind)
 		--disable-pyzfs
 		--disable-static
 	)
@@ -96,4 +106,7 @@ src_install() {
 	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.4.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
index bdcb914c..bdcb914c 100644
--- a/sys-fs/zfs/zfs-2.2.4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index f9b51cff..c17ea78f 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0 SHA512 1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index 10d2f791..f1b534fc 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -1,8 +1,8 @@
 PACKAGE_NAME="zfs-dkms"
-PACKAGE_VERSION="2.2.4"
+PACKAGE_VERSION="2.2.6"
 PACKAGE_CONFIG="/etc/sysconfig/zfs"
 NO_WEAK_MODULES="yes"
-BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-8]\.)" # only build for kernels v5.x.x up to and including v6.8.x
+BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-0]\.)" # only build for kernels v5.x.x up to and including v6.10.x
 PRE_BUILD="configure
   --prefix=/usr
   --with-config=kernel
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.2.4-r1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.2.6.ebuild
index ac8c3303..ac8c3303 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-2.2.4-r1.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-2.2.6.ebuild