diff options
-rw-r--r-- | metadata/md5-cache/sys-fs/zfs-2.3.0 (renamed from metadata/md5-cache/sys-fs/zfs-2.2.7) | 4 | ||||
-rw-r--r-- | metadata/md5-cache/sys-fs/zfs-utils-2.3.0 (renamed from metadata/md5-cache/sys-fs/zfs-utils-2.2.7) | 4 | ||||
-rw-r--r-- | metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 (renamed from metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7) | 2 | ||||
-rw-r--r-- | metadata/pkg_desc_index | 6 | ||||
-rw-r--r-- | sys-fs/zfs-utils/Manifest | 2 | ||||
-rw-r--r-- | sys-fs/zfs-utils/files/2.2.2-no-USER_NS.patch | 39 | ||||
-rw-r--r-- | sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild) | 1 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-2.3.0.ebuild (renamed from sys-fs/zfs/zfs-2.2.7.ebuild) | 0 | ||||
-rw-r--r-- | sys-kernel/zfs-dkms/Manifest | 2 | ||||
-rw-r--r-- | sys-kernel/zfs-dkms/files/dkms.conf | 2 | ||||
-rw-r--r-- | sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild) | 0 |
11 files changed, 11 insertions, 51 deletions
diff --git a/metadata/md5-cache/sys-fs/zfs-2.2.7 b/metadata/md5-cache/sys-fs/zfs-2.3.0 index daeeb7b3..8d87eaf3 100644 --- a/metadata/md5-cache/sys-fs/zfs-2.2.7 +++ b/metadata/md5-cache/sys-fs/zfs-2.3.0 @@ -1,9 +1,9 @@ DEFINED_PHASES=- -DEPEND=~sys-fs/zfs-utils-2.2.7 ~sys-kernel/zfs-dkms-2.2.7 +DEPEND=~sys-fs/zfs-utils-2.3.0 ~sys-kernel/zfs-dkms-2.3.0 DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild) EAPI=7 KEYWORDS=amd64 LICENSE=GPL-2 -RDEPEND=~sys-fs/zfs-utils-2.2.7 ~sys-kernel/zfs-dkms-2.2.7 +RDEPEND=~sys-fs/zfs-utils-2.3.0 ~sys-kernel/zfs-dkms-2.3.0 SLOT=0 _md5_=e55b835fd30a4e79085053c624251ca7 diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.2.7 b/metadata/md5-cache/sys-fs/zfs-utils-2.3.0 index e01e4db5..8aced4e4 100644 --- a/metadata/md5-cache/sys-fs/zfs-utils-2.2.7 +++ b/metadata/md5-cache/sys-fs/zfs-utils-2.3.0 @@ -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:= 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.7/zfs-2.2.7.tar.gz +SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.3.0/zfs-2.3.0.tar.gz _eclasses_=autotools 7d91cc798a8afd8f4e0c6e9587296ebe bash-completion-r1 767861f3744f589ee5291c1698b1c082 flag-o-matic f14aba975c94ccaa9f357a27e3b17ffe gnuconfig ddeb9f8caff1b5f71a09c75b7534df79 libtool 6b28392a775f807c8be5fc7ec9a605b9 multilib b2a329026f2e404e9e371097dda47f96 pam b56d0c9c20fc5b553f13c8ae165a10a5 toolchain-funcs 14648d8795f7779e11e1bc7cf08b7536 udev f3d9a4376ebd22131726a68e1a0a058f usr-ldscript ff03a5d223e97515fa25b5cae97ebda9 -_md5_=3f5136e6a091af53b0864f79c9f80a60 +_md5_=8bcd4dffeec9930c4dda3265f34c2cf8 diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 index 97230b21..89d7decf 100644 --- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.7 +++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.3.0 @@ -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.7/zfs-2.2.7.tar.gz +SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.3.0/zfs-2.3.0.tar.gz _md5_=8dab2841d2ca48635d73941d7dabcd9c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index b3893e35..b5174390 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -62,8 +62,8 @@ sys-devel/gcc 13.2.1_p20240210-r5: The GNU Compiler Collection 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 20240917: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite -sys-fs/zfs 2.2.7: ZFS meta-package (Gentoo compatibility ebuild) -sys-fs/zfs-utils 2.2.7: Userland utilities for ZFS Linux kernel module +sys-fs/zfs 2.3.0: ZFS meta-package (Gentoo compatibility ebuild) +sys-fs/zfs-utils 2.3.0: Userland utilities for ZFS Linux kernel module sys-kernel/bcmwl-dkms 6.30.223.271-r14: 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 @@ -75,7 +75,7 @@ sys-kernel/nvidia-drivers-dkms 390.157-r8 470.256.02 550.142: NVIDIA driver sour sys-kernel/tp_smapi-dkms 0.44-r4: IBM ThinkPad SMAPI BIOS driver sources sys-kernel/vhba-dkms 20240917-r1: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources sys-kernel/virtualbox-modules-dkms 7.1.4-r2: Kernel Modules source for Virtualbox -sys-kernel/zfs-dkms 2.2.7: ZFS sources for linux +sys-kernel/zfs-dkms 2.3.0: 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 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 <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.7.ebuild b/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild index 2ef8e142..ab207679 100644 --- a/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild +++ b/sys-fs/zfs-utils/zfs-utils-2.3.0.ebuild @@ -53,7 +53,6 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch - "${FILESDIR}"/2.2.2-no-USER_NS.patch ) src_prepare() { diff --git a/sys-fs/zfs/zfs-2.2.7.ebuild b/sys-fs/zfs/zfs-2.3.0.ebuild index bdcb914c..bdcb914c 100644 --- a/sys-fs/zfs/zfs-2.2.7.ebuild +++ b/sys-fs/zfs/zfs-2.3.0.ebuild diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest index 31a404de..cb4f42d9 100644 --- a/sys-kernel/zfs-dkms/Manifest +++ b/sys-kernel/zfs-dkms/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-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index aaf7a576..f468d99f 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.2.7" +PACKAGE_VERSION="2.3.0" PACKAGE_CONFIG="/etc/sysconfig/zfs" NO_WEAK_MODULES="yes" BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-2]\.)" # only build for kernels v5.x.x up to and including v6.12.x diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild index ac8c3303..ac8c3303 100644 --- a/sys-kernel/zfs-dkms/zfs-dkms-2.2.7.ebuild +++ b/sys-kernel/zfs-dkms/zfs-dkms-2.3.0.ebuild |