From 0c8b129592a6b777c8b1e846525e59d67a269616 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Fri, 11 Mar 2022 01:36:29 +0000 Subject: Upstream 2.1.3 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 829ea3a..df0ef38 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,23 @@ pkgbase = zfs-utils pkgdesc = Userspace utilities for the Zettabyte File System. - pkgver = 2.1.2 + pkgver = 2.1.3 pkgrel = 1 url = https://zfsonlinux.org/ arch = i686 arch = x86_64 license = CDDL optdepends = python: for arcstat/arc_summary/dbufstat - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.2/zfs-2.1.2.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.2/zfs-2.1.2.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.3/zfs-2.1.3.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.3/zfs-2.1.3.tar.gz.asc source = zfs.initcpio.install source = zfs.initcpio.hook validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7 + sha256sums = b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd sha256sums = SKIP sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d sha256sums = 9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc - b2sums = ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 + b2sums = b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b b2sums = SKIP b2sums = 570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3 b2sums = e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0 diff --git a/PKGBUILD b/PKGBUILD index 0475faa..8783c6b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-utils -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="Userspace utilities for the Zettabyte File System." arch=("i686" "x86_64") @@ -14,11 +14,11 @@ optdepends=('python: for arcstat/arc_summary/dbufstat') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "zfs.initcpio.install" "zfs.initcpio.hook") -sha256sums=('258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7' +sha256sums=('b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd' 'SKIP' 'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d' '9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc') -b2sums=('ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584' +b2sums=('b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b' 'SKIP' '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3' 'e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0') -- cgit v1.2.1 From d6a7c6d79570a06faf3196b5662befd2890b8b97 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 23 Mar 2022 22:03:14 +0000 Subject: Upstream 2.1.4 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index df0ef38..d233880 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,23 @@ pkgbase = zfs-utils pkgdesc = Userspace utilities for the Zettabyte File System. - pkgver = 2.1.3 + pkgver = 2.1.4 pkgrel = 1 url = https://zfsonlinux.org/ arch = i686 arch = x86_64 license = CDDL optdepends = python: for arcstat/arc_summary/dbufstat - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.3/zfs-2.1.3.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.3/zfs-2.1.3.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz.asc source = zfs.initcpio.install source = zfs.initcpio.hook validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd + sha256sums = 3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6 sha256sums = SKIP sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d sha256sums = 9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc - b2sums = b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b + b2sums = be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 b2sums = SKIP b2sums = 570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3 b2sums = e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0 diff --git a/PKGBUILD b/PKGBUILD index 8783c6b..f575eca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-utils -pkgver=2.1.3 +pkgver=2.1.4 pkgrel=1 pkgdesc="Userspace utilities for the Zettabyte File System." arch=("i686" "x86_64") @@ -14,11 +14,11 @@ optdepends=('python: for arcstat/arc_summary/dbufstat') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "zfs.initcpio.install" "zfs.initcpio.hook") -sha256sums=('b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd' +sha256sums=('3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6' 'SKIP' 'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d' '9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc') -b2sums=('b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b' +b2sums=('be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200' 'SKIP' '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3' 'e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0') -- cgit v1.2.1 From c8148ca3887ff74614d8c35337a126b559926feb Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 25 May 2022 12:52:37 +0100 Subject: Temporarily use 2.1.5 staging branch for kernel 5.18 compatiblity --- .SRCINFO | 9 ++++----- PKGBUILD | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d233880..20980fe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,22 @@ pkgbase = zfs-utils pkgdesc = Userspace utilities for the Zettabyte File System. - pkgver = 2.1.4 + pkgver = 2.1.4+65.r05147319b0 pkgrel = 1 url = https://zfsonlinux.org/ arch = i686 arch = x86_64 + arch = aarch64 license = CDDL + makedepends = git optdepends = python: for arcstat/arc_summary/dbufstat - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz.asc + source = git+https://github.com/openzfs/zfs.git#commit=05147319b0821f61fcff743e20605e191d523906 source = zfs.initcpio.install source = zfs.initcpio.hook validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6 sha256sums = SKIP sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d sha256sums = 9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc - b2sums = be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 b2sums = SKIP b2sums = 570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3 b2sums = e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0 diff --git a/PKGBUILD b/PKGBUILD index f575eca..b6c2d39 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,36 +4,38 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-utils -pkgver=2.1.4 +pkgver=2.1.4+65.r05147319b0 pkgrel=1 pkgdesc="Userspace utilities for the Zettabyte File System." -arch=("i686" "x86_64") +arch=("i686" "x86_64" "aarch64") url="https://zfsonlinux.org/" license=('CDDL') +makedepends=('git') optdepends=('python: for arcstat/arc_summary/dbufstat') -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} +#source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} +source=("git+https://github.com/openzfs/zfs.git#commit=05147319b0821f61fcff743e20605e191d523906" "zfs.initcpio.install" "zfs.initcpio.hook") -sha256sums=('3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6' - 'SKIP' +sha256sums=('SKIP' 'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d' '9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc') -b2sums=('be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200' - 'SKIP' +b2sums=('SKIP' '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3' 'e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf prepare() { - cd "${srcdir}"/zfs-${pkgver} + cd "${srcdir}"/zfs #-${pkgver} # pyzfs is not built, but build system tries to check for python anyway ln -sf /bin/true python3-fake + + autoreconf -fi } build() { - cd "${srcdir}"/zfs-${pkgver} + cd "${srcdir}"/zfs #-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -49,7 +51,7 @@ build() { } package() { - cd "${srcdir}"/zfs-${pkgver} + cd "${srcdir}"/zfs #-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs -- cgit v1.2.1 From 3e1c720717551208dcd52b1e483e1bcd925eb045 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Thu, 16 Jun 2022 12:32:53 +0100 Subject: Update 2.1.5 staging branch for 5.18 compatibliity --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 20980fe..fc8a43d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = zfs-utils pkgdesc = Userspace utilities for the Zettabyte File System. - pkgver = 2.1.4+65.r05147319b0 + pkgver = 2.1.4+88.rfc18fa92c8 pkgrel = 1 url = https://zfsonlinux.org/ arch = i686 @@ -9,7 +9,7 @@ pkgbase = zfs-utils license = CDDL makedepends = git optdepends = python: for arcstat/arc_summary/dbufstat - source = git+https://github.com/openzfs/zfs.git#commit=05147319b0821f61fcff743e20605e191d523906 + source = git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5 source = zfs.initcpio.install source = zfs.initcpio.hook validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 diff --git a/PKGBUILD b/PKGBUILD index b6c2d39..25743c9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-utils -pkgver=2.1.4+65.r05147319b0 +pkgver=2.1.4+88.rfc18fa92c8 pkgrel=1 pkgdesc="Userspace utilities for the Zettabyte File System." arch=("i686" "x86_64" "aarch64") @@ -13,7 +13,7 @@ license=('CDDL') makedepends=('git') optdepends=('python: for arcstat/arc_summary/dbufstat') #source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} -source=("git+https://github.com/openzfs/zfs.git#commit=05147319b0821f61fcff743e20605e191d523906" +source=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5" "zfs.initcpio.install" "zfs.initcpio.hook") sha256sums=('SKIP' -- cgit v1.2.1 From df4386e5ff56e9d99d524e839875d95fae287ae4 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Fri, 24 Jun 2022 00:28:33 +0100 Subject: Upstream 2.1.5 --- .SRCINFO | 8 +++++--- PKGBUILD | 18 +++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fc8a43d..d453134 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,22 +1,24 @@ pkgbase = zfs-utils pkgdesc = Userspace utilities for the Zettabyte File System. - pkgver = 2.1.4+88.rfc18fa92c8 + pkgver = 2.1.5 pkgrel = 1 url = https://zfsonlinux.org/ arch = i686 arch = x86_64 arch = aarch64 license = CDDL - makedepends = git optdepends = python: for arcstat/arc_summary/dbufstat - source = git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5 + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz.asc source = zfs.initcpio.install source = zfs.initcpio.hook validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B + sha256sums = 1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c sha256sums = SKIP sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d sha256sums = 9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc + b2sums = c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 b2sums = SKIP b2sums = 570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3 b2sums = e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0 diff --git a/PKGBUILD b/PKGBUILD index 25743c9..a11aeae 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,29 +4,29 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-utils -pkgver=2.1.4+88.rfc18fa92c8 +pkgver=2.1.5 pkgrel=1 pkgdesc="Userspace utilities for the Zettabyte File System." arch=("i686" "x86_64" "aarch64") url="https://zfsonlinux.org/" license=('CDDL') -makedepends=('git') optdepends=('python: for arcstat/arc_summary/dbufstat') -#source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} -source=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5" +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "zfs.initcpio.install" "zfs.initcpio.hook") -sha256sums=('SKIP' +sha256sums=('1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c' + 'SKIP' 'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d' '9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc') -b2sums=('SKIP' +b2sums=('c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49' + 'SKIP' '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3' 'e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf prepare() { - cd "${srcdir}"/zfs #-${pkgver} + cd "${srcdir}"/zfs-${pkgver} # pyzfs is not built, but build system tries to check for python anyway ln -sf /bin/true python3-fake @@ -35,7 +35,7 @@ prepare() { } build() { - cd "${srcdir}"/zfs #-${pkgver} + cd "${srcdir}"/zfs-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -51,7 +51,7 @@ build() { } package() { - cd "${srcdir}"/zfs #-${pkgver} + cd "${srcdir}"/zfs-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs -- cgit v1.2.1