aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2021-01-06 23:52:35 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2021-01-07 15:05:37 +0000
commit0114d980979232104aeb64ddb3f052d394528d2e (patch)
tree7fed922522ff3495c02ee6df58a77511aec9c020
parent42c6733553798740f1313c0f820107d069daf141 (diff)
downloadaports-0114d980979232104aeb64ddb3f052d394528d2e.tar.gz
aports-0114d980979232104aeb64ddb3f052d394528d2e.tar.bz2
aports-0114d980979232104aeb64ddb3f052d394528d2e.tar.xz
main/zfs: upgrade to 2.0.1
- 0001-etc.....patch no longer needed with https://github.com/openzfs/zfs/commit/38e2e9ce8327284b2d516874308300aa96102fe9 - fix-check-for-sec....patch no longer needed with https://github.com/openzfs/zfs/commit/49ba502f9960cb26d4cf552777f0ccdff1a94848
-rw-r--r--main/zfs/0001-etc-zfs-Makefile.am-set-initconfdir.patch30
-rw-r--r--main/zfs/APKBUILD13
-rw-r--r--main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch29
3 files changed, 4 insertions, 68 deletions
diff --git a/main/zfs/0001-etc-zfs-Makefile.am-set-initconfdir.patch b/main/zfs/0001-etc-zfs-Makefile.am-set-initconfdir.patch
deleted file mode 100644
index 08d2d519dd..0000000000
--- a/main/zfs/0001-etc-zfs-Makefile.am-set-initconfdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 40f96f46434633aedd1820980a4c84097cfb7ea7 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com>
-Date: Thu, 28 May 2020 00:22:19 +0000
-Subject: [PATCH] etc/zfs/Makefile.am: set initconfdir
-
-The initconfdir variable is not defined in etc/zfs/Makefile,
-so the sed code does not perform the correct replacement.
-
-Reviewed-by: Richard Yao <ryao@gentoo.org>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-Issue #10375
-Closes #10376
----
- etc/zfs/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am
-index 81567a4fa..5370f41bd 100644
---- a/etc/zfs/Makefile.am
-+++ b/etc/zfs/Makefile.am
-@@ -1,4 +1,5 @@
- pkgsysconfdir = $(sysconfdir)/zfs
-+initconfdir = $(DEFAULT_INITCONF_DIR)
-
- pkgsysconf_DATA = \
- vdev_id.conf.alias.example \
---
-2.29.1
-
diff --git a/main/zfs/APKBUILD b/main/zfs/APKBUILD
index 46e63eb4e9..6962bad613 100644
--- a/main/zfs/APKBUILD
+++ b/main/zfs/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zfs
-pkgver=2.0.0
+pkgver=2.0.1
pkgrel=0
pkgdesc="ZFS for Linux"
-url="http://zfsonlinux.org"
+url="https://zfsonlinux.org"
arch="all !armhf !armv7"
license="CDDL-1.0"
provides="spl" # Mitigate upgrade conflicts
@@ -13,10 +13,7 @@ makedepends="$depends_dev automake autoconf libtool linux-headers python3-dev py
options="!check" # need to be run on live system w/ ZFS loaded.
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-libs $pkgname-dracut::noarch
$pkgname-udev $pkgname-scripts $pkgname-utils-py:utils_py:noarch py3-pyzfs:pyzfs:noarch"
-source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz
- 0001-etc-zfs-Makefile.am-set-initconfdir.patch
- fix-check-for-sed--in-place-with-busybox-mktemp.patch
- "
+source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz"
prepare() {
default_prepare
@@ -80,6 +77,4 @@ pyzfs() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib
}
-sha512sums="2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f zfs-2.0.0.tar.gz
-ba46770660f1e0cac3c6d621185036b9cf3274c655b373a398f6a8420194d39e53c72a32155064b1998635d754f2ad4641ab6b74c7adeeedd9105e124dd40f9d 0001-etc-zfs-Makefile.am-set-initconfdir.patch
-ffee593eefb9472c0dd783b822dfb66938ccbb56f211b361c0d5bb61e36926a4f3d02ac50d0e4102168ab577b5aba6719a8ff918ae6bb3f4211a920300721590 fix-check-for-sed--in-place-with-busybox-mktemp.patch"
+sha512sums="7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 zfs-2.0.1.tar.gz"
diff --git a/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch b/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
deleted file mode 100644
index c65aa93fb6..0000000000
--- a/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cc5f362cbf927d5b7f902c3a582f11ceb3f789ad Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 3 Dec 2020 11:16:47 +0100
-Subject: [PATCH] Fix check for sed --in-place with busybox mktemp
-
-Fix build on Alpine Linux which uses busybox, and busybox mktemp
-requires 6 trailing Xes.
-
-Fixes commit 4313a5b4c51e (Detect if sed supports --in-place)
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
-Closes #11274
----
- config/always-sed.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/always-sed.m4 b/config/always-sed.m4
-index 19633e118ae..3d7ae285ba1 100644
---- a/config/always-sed.m4
-+++ b/config/always-sed.m4
-@@ -4,7 +4,7 @@ dnl #
- AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [
- AC_REQUIRE([AC_PROG_SED])dnl
- AC_CACHE_CHECK([for sed --in-place], [ac_cv_inplace], [
-- tmpfile=$(mktemp conftest.XXX)
-+ tmpfile=$(mktemp conftest.XXXXXX)
- echo foo >$tmpfile
- AS_IF([$SED --in-place 's#foo#bar#' $tmpfile 2>/dev/null],
- [ac_cv_inplace="--in-place"],