From a53833eaa6e5254ff9ca95ea53c2d68968e49447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Sun, 23 Aug 2026 03:10:58 +0000 Subject: [PATCH] Backport packages from upstream --- centos-10/SOURCES/zfs-2.2.10.tar.gz | 3 --- centos-10/SOURCES/zfs-2.2.11.tar.gz | 3 +++ centos-10/SPECS/zfs-dkms.spec | 2 +- centos-10/SPECS/zfs.spec | 2 +- centos-9/SOURCES/zfs-2.2.10.tar.gz | 3 --- centos-9/SOURCES/zfs-2.2.11.tar.gz | 3 +++ centos-9/SPECS/zfs-dkms.spec | 2 +- centos-9/SPECS/zfs.spec | 2 +- fedora-43/SOURCES/zfs-2.4.3.tar.gz | 3 --- fedora-43/SOURCES/zfs-2.4.4.tar.gz | 3 +++ fedora-43/SPECS/zfs-dkms.spec | 14 +++++++------- fedora-43/SPECS/zfs.spec | 2 +- fedora-44/SOURCES/zfs-2.4.3.tar.gz | 3 --- fedora-44/SOURCES/zfs-2.4.4.tar.gz | 3 +++ fedora-44/SPECS/zfs-dkms.spec | 14 +++++++------- fedora-44/SPECS/zfs.spec | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 centos-10/SOURCES/zfs-2.2.10.tar.gz create mode 100644 centos-10/SOURCES/zfs-2.2.11.tar.gz delete mode 100644 centos-9/SOURCES/zfs-2.2.10.tar.gz create mode 100644 centos-9/SOURCES/zfs-2.2.11.tar.gz delete mode 100644 fedora-43/SOURCES/zfs-2.4.3.tar.gz create mode 100644 fedora-43/SOURCES/zfs-2.4.4.tar.gz delete mode 100644 fedora-44/SOURCES/zfs-2.4.3.tar.gz create mode 100644 fedora-44/SOURCES/zfs-2.4.4.tar.gz diff --git a/centos-10/SOURCES/zfs-2.2.10.tar.gz b/centos-10/SOURCES/zfs-2.2.10.tar.gz deleted file mode 100644 index 4d8f0cd..0000000 --- a/centos-10/SOURCES/zfs-2.2.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06bb2efe406454b398621db73dee9bac80e31b80ab0df662c4d57f5fca974b41 -size 33883409 diff --git a/centos-10/SOURCES/zfs-2.2.11.tar.gz b/centos-10/SOURCES/zfs-2.2.11.tar.gz new file mode 100644 index 0000000..675913a --- /dev/null +++ b/centos-10/SOURCES/zfs-2.2.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ada19a918cd263ecb2bf319265023c01ee9c1a5dc79deeef0b632c2e1e14af0f +size 33892221 diff --git a/centos-10/SPECS/zfs-dkms.spec b/centos-10/SPECS/zfs-dkms.spec index e675fa9..15db0ca 100644 --- a/centos-10/SPECS/zfs-dkms.spec +++ b/centos-10/SPECS/zfs-dkms.spec @@ -12,7 +12,7 @@ Name: %{module}-dkms -Version: 2.2.10 +Version: 2.2.11 Release: 1%{?dist} Summary: Kernel module(s) (dkms) diff --git a/centos-10/SPECS/zfs.spec b/centos-10/SPECS/zfs.spec index 6154872..a33cf1d 100644 --- a/centos-10/SPECS/zfs.spec +++ b/centos-10/SPECS/zfs.spec @@ -90,7 +90,7 @@ %define __python_sitelib %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib())" 2>/dev/null || %{__python} -Esc "import sysconfig; print(sysconfig.get_path('purelib'))") Name: zfs -Version: 2.2.10 +Version: 2.2.11 Release: 1%{?dist} Summary: Commands to control the kernel modules and libraries diff --git a/centos-9/SOURCES/zfs-2.2.10.tar.gz b/centos-9/SOURCES/zfs-2.2.10.tar.gz deleted file mode 100644 index 310a017..0000000 --- a/centos-9/SOURCES/zfs-2.2.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:988a1e499aedb03d41b9b4b73ffb8162018602a6da40ae9e1b8962c15d8f85dc -size 33868717 diff --git a/centos-9/SOURCES/zfs-2.2.11.tar.gz b/centos-9/SOURCES/zfs-2.2.11.tar.gz new file mode 100644 index 0000000..7b1929e --- /dev/null +++ b/centos-9/SOURCES/zfs-2.2.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce9abeadc5b86ea3d88e7d0a990f6c627aafea7468f8097057f5b8c6b581157a +size 33878187 diff --git a/centos-9/SPECS/zfs-dkms.spec b/centos-9/SPECS/zfs-dkms.spec index e675fa9..15db0ca 100644 --- a/centos-9/SPECS/zfs-dkms.spec +++ b/centos-9/SPECS/zfs-dkms.spec @@ -12,7 +12,7 @@ Name: %{module}-dkms -Version: 2.2.10 +Version: 2.2.11 Release: 1%{?dist} Summary: Kernel module(s) (dkms) diff --git a/centos-9/SPECS/zfs.spec b/centos-9/SPECS/zfs.spec index 6154872..a33cf1d 100644 --- a/centos-9/SPECS/zfs.spec +++ b/centos-9/SPECS/zfs.spec @@ -90,7 +90,7 @@ %define __python_sitelib %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib())" 2>/dev/null || %{__python} -Esc "import sysconfig; print(sysconfig.get_path('purelib'))") Name: zfs -Version: 2.2.10 +Version: 2.2.11 Release: 1%{?dist} Summary: Commands to control the kernel modules and libraries diff --git a/fedora-43/SOURCES/zfs-2.4.3.tar.gz b/fedora-43/SOURCES/zfs-2.4.3.tar.gz deleted file mode 100644 index cf50796..0000000 --- a/fedora-43/SOURCES/zfs-2.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b16152c3c45e8eeaa07e3b07b04d0850f494ddf8d65753cf799a7af149c82a47 -size 34541626 diff --git a/fedora-43/SOURCES/zfs-2.4.4.tar.gz b/fedora-43/SOURCES/zfs-2.4.4.tar.gz new file mode 100644 index 0000000..85d5c7e --- /dev/null +++ b/fedora-43/SOURCES/zfs-2.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a202a40e4863a9ae716453599bb2d9cc29b999e4f59c0aebe90bd1d4dadeea11 +size 34571640 diff --git a/fedora-43/SPECS/zfs-dkms.spec b/fedora-43/SPECS/zfs-dkms.spec index 48f4d95..509cbe9 100644 --- a/fedora-43/SPECS/zfs-dkms.spec +++ b/fedora-43/SPECS/zfs-dkms.spec @@ -12,7 +12,7 @@ Name: %{module}-dkms -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Summary: Kernel module(s) (dkms) @@ -32,12 +32,12 @@ Requires(post): gcc, make, perl, diffutils # Hold back kernel upgrades if kernel is not supported by ZFS %if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version}%{?openEuler} -Requires: kernel-devel >= 4.18, kernel-devel <= 7.0.999 -Requires(post): kernel-devel >= 4.18, kernel-devel <= 7.0.999 -Conflicts: kernel-devel < 4.18, kernel-devel > 7.0.999 -Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 7.0.999 -Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 7.0.999 -Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 7.0.999 +Requires: kernel-devel >= 4.18, kernel-devel <= 7.2.999 +Requires(post): kernel-devel >= 4.18, kernel-devel <= 7.2.999 +Conflicts: kernel-devel < 4.18, kernel-devel > 7.2.999 +Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 7.2.999 +Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 7.2.999 +Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 7.2.999 Obsoletes: spl-dkms <= %{version} %endif diff --git a/fedora-43/SPECS/zfs.spec b/fedora-43/SPECS/zfs.spec index f84efa1..992c7d9 100644 --- a/fedora-43/SPECS/zfs.spec +++ b/fedora-43/SPECS/zfs.spec @@ -102,7 +102,7 @@ sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix}) print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))") Name: zfs -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Summary: Commands to control the kernel modules and libraries diff --git a/fedora-44/SOURCES/zfs-2.4.3.tar.gz b/fedora-44/SOURCES/zfs-2.4.3.tar.gz deleted file mode 100644 index 30492c0..0000000 --- a/fedora-44/SOURCES/zfs-2.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e10e49adaf0519053f9645bccb5a519f17d0a59d992124548e1b43bef9a9fd0 -size 34544830 diff --git a/fedora-44/SOURCES/zfs-2.4.4.tar.gz b/fedora-44/SOURCES/zfs-2.4.4.tar.gz new file mode 100644 index 0000000..bcff309 --- /dev/null +++ b/fedora-44/SOURCES/zfs-2.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ce6edd1d72b0d82dcc1081d4f353c6c52af6b46e6bd07897baaa4de4f9906cd +size 34571501 diff --git a/fedora-44/SPECS/zfs-dkms.spec b/fedora-44/SPECS/zfs-dkms.spec index 48f4d95..509cbe9 100644 --- a/fedora-44/SPECS/zfs-dkms.spec +++ b/fedora-44/SPECS/zfs-dkms.spec @@ -12,7 +12,7 @@ Name: %{module}-dkms -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Summary: Kernel module(s) (dkms) @@ -32,12 +32,12 @@ Requires(post): gcc, make, perl, diffutils # Hold back kernel upgrades if kernel is not supported by ZFS %if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version}%{?openEuler} -Requires: kernel-devel >= 4.18, kernel-devel <= 7.0.999 -Requires(post): kernel-devel >= 4.18, kernel-devel <= 7.0.999 -Conflicts: kernel-devel < 4.18, kernel-devel > 7.0.999 -Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 7.0.999 -Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 7.0.999 -Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 7.0.999 +Requires: kernel-devel >= 4.18, kernel-devel <= 7.2.999 +Requires(post): kernel-devel >= 4.18, kernel-devel <= 7.2.999 +Conflicts: kernel-devel < 4.18, kernel-devel > 7.2.999 +Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 7.2.999 +Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 7.2.999 +Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 7.2.999 Obsoletes: spl-dkms <= %{version} %endif diff --git a/fedora-44/SPECS/zfs.spec b/fedora-44/SPECS/zfs.spec index f84efa1..992c7d9 100644 --- a/fedora-44/SPECS/zfs.spec +++ b/fedora-44/SPECS/zfs.spec @@ -102,7 +102,7 @@ sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix}) print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))") Name: zfs -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Summary: Commands to control the kernel modules and libraries