summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metadata/md5-cache/sys-fs/zfs-2.1.9 (renamed from metadata/md5-cache/sys-fs/zfs-2.1.7)4
-rw-r--r--metadata/md5-cache/sys-fs/zfs-utils-2.1.9 (renamed from metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2)4
-rw-r--r--metadata/md5-cache/sys-kernel/zfs-dkms-2.1.9 (renamed from metadata/md5-cache/sys-kernel/zfs-dkms-2.1.7)2
-rw-r--r--metadata/pkg_desc_index6
-rw-r--r--sys-fs/zfs-utils/Manifest2
-rw-r--r--sys-fs/zfs-utils/files/2.1.5-dracut-mount.patch29
-rw-r--r--sys-fs/zfs-utils/files/2.1.6-fgrep.patch53
-rw-r--r--sys-fs/zfs-utils/files/2.1.7-dracut-include-systemd-overrides.patch44
-rw-r--r--sys-fs/zfs-utils/files/2.1.7-systemd-zed-restart-always.patch27
-rw-r--r--sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild)4
-rw-r--r--sys-fs/zfs/zfs-2.1.9.ebuild (renamed from sys-fs/zfs/zfs-2.1.7.ebuild)0
-rw-r--r--sys-kernel/zfs-dkms/Manifest2
-rw-r--r--sys-kernel/zfs-dkms/files/dkms.conf2
-rw-r--r--sys-kernel/zfs-dkms/zfs-dkms-2.1.9.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-2.1.7.ebuild)0
14 files changed, 11 insertions, 168 deletions
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.7 b/metadata/md5-cache/sys-fs/zfs-2.1.9
index 10d184c1..4ea611d2 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.7
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.9
@@ -1,9 +1,9 @@
DEFINED_PHASES=-
-DEPEND=~sys-fs/zfs-utils-2.1.7 ~sys-kernel/zfs-dkms-2.1.7
+DEPEND=~sys-fs/zfs-utils-2.1.9 ~sys-kernel/zfs-dkms-2.1.9
DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild)
EAPI=7
KEYWORDS=amd64
LICENSE=GPL-2
-RDEPEND=~sys-fs/zfs-utils-2.1.7 ~sys-kernel/zfs-dkms-2.1.7
+RDEPEND=~sys-fs/zfs-utils-2.1.9 ~sys-kernel/zfs-dkms-2.1.9
SLOT=0
_md5_=e55b835fd30a4e79085053c624251ca7
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.9
index 3cc5da7f..b58ed988 100644
--- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2
+++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.9
@@ -11,6 +11,6 @@ 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.1.7/zfs-2.1.7.tar.gz
+SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz
_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 pam 01b77091d5b6560b0aeafa7fbb1bd818 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 6001248ef162a5fa2a21ce132a212f6b udev eec0bbab06977f1cfc5597269c1fa152 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=9adec237add2c9fdac6d00c5386fb4a4
+_md5_=27776d288b50458b24048939836a7f87
diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.7 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.9
index 8b4eaf73..84051c84 100644
--- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.7
+++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.9
@@ -8,6 +8,6 @@ KEYWORDS=amd64
LICENSE=GPL-2
RDEPEND=sys-kernel/dkms
SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=c99b139394da5f09fe55671b0f12322c
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 864299c6..456894b4 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -55,8 +55,8 @@ sys-devel/libtool 2.4.7-r1: A shared library tool for developers
sys-fs/cryptsetup 2.3.4-r10: Tool to setup encrypted devices with dm-crypt
sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-sys-fs/zfs 2.1.7: ZFS meta-package (Gentoo compatibility ebuild)
-sys-fs/zfs-utils 2.1.7-r2: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs 2.1.9: ZFS meta-package (Gentoo compatibility ebuild)
+sys-fs/zfs-utils 2.1.9: Userland utilities for ZFS Linux kernel module
sys-kernel/bcmwl-dkms 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
sys-kernel/dkms 2.3-r2: Dynamic Kernel Module Support
sys-kernel/dracut 056-r10: Generic initramfs generation tool
@@ -68,7 +68,7 @@ sys-kernel/linux-sources-redcore-lts 5.10.172 5.15.98 6.1.15: Redcore Linux LTS
sys-kernel/nvidia-drivers-dkms 390.157-r1 470.161.03-r1 515.86.01-r1 525.85.05: NVIDIA driver sources for linux
sys-kernel/vhba-dkms 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
sys-kernel/virtualbox-modules-dkms 7.0.6: Kernel Modules source for Virtualbox
-sys-kernel/zfs-dkms 2.1.7: ZFS sources for linux
+sys-kernel/zfs-dkms 2.1.9: ZFS sources for linux
sys-libs/binutils-libs 2.39-r4: Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
sys-libs/glibc 2.36-r5: GNU libc C library
sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index f4e493fb..214a2c30 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
+DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
diff --git a/sys-fs/zfs-utils/files/2.1.5-dracut-mount.patch b/sys-fs/zfs-utils/files/2.1.5-dracut-mount.patch
deleted file mode 100644
index 758f4b3a..00000000
--- a/sys-fs/zfs-utils/files/2.1.5-dracut-mount.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/openzfs/zfs/commit/07f2793e869196fcbcd5057d9ada377674262fe3
-https://bugs.gentoo.org/857228
-
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 29 Jun 2022 15:33:38 -0700
-Subject: [PATCH] dracut: fix typo in mount-zfs.sh.in
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Format the `zpool get` command correctly. The -o option must
-be followed by "all" or the requested field name.
-
-Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #13602
---- a/contrib/dracut/90zfs/mount-zfs.sh.in
-+++ b/contrib/dracut/90zfs/mount-zfs.sh.in
-@@ -82,7 +82,7 @@ ZFS_DATASET="${ZFS_DATASET:-${root}}"
- ZFS_POOL="${ZFS_DATASET%%/*}"
-
-
--if ! zpool get -Ho name "${ZFS_POOL}" > /dev/null 2>&1; then
-+if ! zpool get -Ho value name "${ZFS_POOL}" > /dev/null 2>&1; then
- info "ZFS: Importing pool ${ZFS_POOL}..."
- # shellcheck disable=SC2086
- if ! zpool import -N ${ZPOOL_IMPORT_OPTS} "${ZFS_POOL}"; then
-
diff --git a/sys-fs/zfs-utils/files/2.1.6-fgrep.patch b/sys-fs/zfs-utils/files/2.1.6-fgrep.patch
deleted file mode 100644
index 2e47c5bc..00000000
--- a/sys-fs/zfs-utils/files/2.1.6-fgrep.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485
-
-From d30577c9dd811688f2609ad532b011b99bceb485 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
-Date: Sat, 12 Mar 2022 00:26:46 +0100
-Subject: [PATCH] fgrep -> grep -F
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: John Kennedy <john.kennedy@delphix.com>
-Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
-Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Closes #13259
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
- utsrelease1=$kernelbuild/include/linux/version.h
- utsrelease2=$kernelbuild/include/linux/utsrelease.h
- utsrelease3=$kernelbuild/include/generated/utsrelease.h
-- AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
-+ AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
- utsrelease=$utsrelease1
-- ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
-+ ], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
- utsrelease=$utsrelease2
-- ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
-+ ], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
- utsrelease=$utsrelease3
- ])
-
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
- ])
-
- AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
-- AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
-+ AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
- [enable_invariants="yes"],
- [enable_invariants="no"])
- ])
---- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-@@ -120,5 +120,5 @@ function check_while_waiting
- # Whether any vdev in the given pool is initializing
- function is_vdev_initializing # pool
- {
-- zpool status -i "$1" | grep 'initialized, started' >/dev/null
-+ zpool status -i "$1" | grep -q 'initialized, started'
- }
-
diff --git a/sys-fs/zfs-utils/files/2.1.7-dracut-include-systemd-overrides.patch b/sys-fs/zfs-utils/files/2.1.7-dracut-include-systemd-overrides.patch
deleted file mode 100644
index 2a50dc65..00000000
--- a/sys-fs/zfs-utils/files/2.1.7-dracut-include-systemd-overrides.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b10f73f78eb223dd799a87474c537a69113edee1 Mon Sep 17 00:00:00 2001
-From: Vince van Oosten <techhazard@codeforyouand.me>
-Date: Sun, 23 Oct 2022 10:55:46 +0200
-Subject: [PATCH] include systemd overrides to zfs-dracut module
-
-If a user that uses systemd and dracut wants to overide certain
-settings, they typically use `systemctl edit [unit]` or place a file in
-`/etc/systemd/system/[unit].d/override.conf` directly.
-
-The zfs-dracut module did not include those overrides however, so this
-did not have any effect at boot time.
-
-For zfs-import-scan.service and zfs-import-cache.service, overrides are
-now included in the dracut initramfs image.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Vince van Oosten <techhazard@codeforyouand.me>
-Closes #14075
-Closes #14076
----
- contrib/dracut/90zfs/module-setup.sh.in | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
-index 81d7d2abe49..b16529de905 100755
---- a/contrib/dracut/90zfs/module-setup.sh.in
-+++ b/contrib/dracut/90zfs/module-setup.sh.in
-@@ -86,6 +86,16 @@ install() {
- "zfs-import-cache.service"; do
- inst_simple "${systemdsystemunitdir}/${_service}"
- systemctl -q --root "${initdir}" add-wants zfs-import.target "${_service}"
-+
-+ # Add user-provided unit overrides
-+ # - /etc/systemd/system/zfs-import-{scan,cache}.service
-+ # - /etc/systemd/system/zfs-import-{scan,cache}.service.d/overrides.conf
-+ # -H ensures they are marked host-only
-+ # -o ensures there is no error upon absence of these files
-+ inst_multiple -o -H \
-+ "${systemdsystemconfdir}/${_service}" \
-+ "${systemdsystemconfdir}/${_service}.d/"*.conf
-+
- done
-
- for _service in \
diff --git a/sys-fs/zfs-utils/files/2.1.7-systemd-zed-restart-always.patch b/sys-fs/zfs-utils/files/2.1.7-systemd-zed-restart-always.patch
deleted file mode 100644
index 2d4b92d5..00000000
--- a/sys-fs/zfs-utils/files/2.1.7-systemd-zed-restart-always.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f505cd53fd9cb6e6efb1e23a9d77e38bba754695 Mon Sep 17 00:00:00 2001
-From: George Melikov <mail@gmelikov.ru>
-Date: Fri, 16 Dec 2022 01:11:02 +0300
-Subject: [PATCH] systemd: set restart=always for zfs-zed.service
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: George Melikov <mail@gmelikov.ru>
-Co-authored-by: Attila Fülöp <attila@fueloep.org>
----
- etc/systemd/system/zfs-zed.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index 73a83e59e51..be2fc67348f 100644
---- a/etc/systemd/system/zfs-zed.service.in
-+++ b/etc/systemd/system/zfs-zed.service.in
-@@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/module/zfs
- [Service]
- EnvironmentFile=-@initconfdir@/zfs
- ExecStart=@sbindir@/zed -F
--Restart=on-abort
-+Restart=always
-
- [Install]
- Alias=zed.service
diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild
index 38c87723..5919c1b7 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.1.9.ebuild
@@ -52,10 +52,6 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
- "${FILESDIR}"/2.1.5-dracut-mount.patch
- "${FILESDIR}"/2.1.6-fgrep.patch
- "${FILESDIR}"/2.1.7-dracut-include-systemd-overrides.patch
- "${FILESDIR}"/2.1.7-systemd-zed-restart-always.patch
)
src_prepare() {
diff --git a/sys-fs/zfs/zfs-2.1.7.ebuild b/sys-fs/zfs/zfs-2.1.9.ebuild
index bdcb914c..bdcb914c 100644
--- a/sys-fs/zfs/zfs-2.1.7.ebuild
+++ b/sys-fs/zfs/zfs-2.1.9.ebuild
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index f4e493fb..214a2c30 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
+DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index 1e806a2c..450f7865 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -1,5 +1,5 @@
PACKAGE_NAME="zfs-dkms"
-PACKAGE_VERSION="2.1.7"
+PACKAGE_VERSION="2.1.9"
PACKAGE_CONFIG="/etc/sysconfig/zfs"
NO_WEAK_MODULES="yes"
PRE_BUILD="configure
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.1.7.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.1.9.ebuild
index cec96ca3..cec96ca3 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-2.1.7.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-2.1.9.ebuild