zfs: update to 2.0.0.
Thanks to @zdykstra for looking into the built-in PAM module.
This commit is contained in:
parent
e1a5087d8e
commit
231bc646a3
3 changed files with 28 additions and 17 deletions
|
@ -3911,11 +3911,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
|
|||
libtss2-rc.so.0 tpm2-tss-2.3.1_1
|
||||
libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
|
||||
libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
|
||||
libzfs.so.2 zfs-0.8.2_1
|
||||
libnvpair.so.1 zfs-0.8.2_1
|
||||
libzfs_core.so.1 zfs-0.8.3_1
|
||||
libzpool.so.2 zfs-0.8.3_1
|
||||
libuutil.so.1 zfs-0.8.3_1
|
||||
libzfsbootenv.so.1 zfs-2.0.0_1
|
||||
libzfs.so.4 zfs-2.0.0_1
|
||||
libuutil.so.3 zfs-2.0.0_1
|
||||
libzpool.so.4 zfs-2.0.0_1
|
||||
libzfs_core.so.3 zfs-2.0.0_1
|
||||
libnvpair.so.3 zfs-2.0.0_1
|
||||
libgmio.so gmio-0.4.1_1
|
||||
libjsonnet.so.0 jsonnet-0.14.0_2
|
||||
libjsonnet++.so.0 jsonnet-0.14.0_2
|
||||
|
|
1
srcpkgs/zfs-pam
Symbolic link
1
srcpkgs/zfs-pam
Symbolic link
|
@ -0,0 +1 @@
|
|||
zfs
|
|
@ -1,27 +1,27 @@
|
|||
# Template file for 'zfs'
|
||||
pkgname=zfs
|
||||
version=0.8.5
|
||||
version=2.0.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
|
||||
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
|
||||
--with-dracutdir=/usr/lib/dracut --with-tirpc"
|
||||
hostmakedepends="dracut libtool pkg-config python3 automake"
|
||||
makedepends="zlib-devel libuuid-devel libblkid-devel libtirpc-devel attr-devel"
|
||||
makedepends="pam-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel attr-devel"
|
||||
depends="dkms>=2.2.0.3_9 perl python3"
|
||||
conf_files="/etc/zfs/zed.d/zed.rc"
|
||||
short_desc="Z File System -- userland, pyzfs, and kernel modules (using DKMS)"
|
||||
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
|
||||
license="CDDL-1.0"
|
||||
homepage="https://zfsonlinux.org/"
|
||||
distfiles="https://github.com/zfsonlinux/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
|
||||
checksum=dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d
|
||||
homepage="https://openzfs.github.io/openzfs-docs/"
|
||||
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
|
||||
checksum=3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311
|
||||
|
||||
patch_args="-Np1"
|
||||
|
||||
replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
|
||||
|
||||
dkms_modules="zfs ${version}"
|
||||
depends="dkms>=2.2.0.3_9 perl python3 bash"
|
||||
|
||||
post_patch() {
|
||||
# When collecting a "clean" tree for DKMS, don't leave patches in place
|
||||
|
@ -35,9 +35,6 @@ pre_configure() {
|
|||
export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/tirpc/"
|
||||
autoreconf -fi
|
||||
|
||||
# configure relies on bashism to redirect stdout/stderr when building tests
|
||||
vsed -e '1 s@^#!\s*/bin/sh$@#!/bin/bash@' -i configure
|
||||
|
||||
tar czf ../clean.tar.gz .
|
||||
}
|
||||
|
||||
|
@ -51,9 +48,6 @@ post_install() {
|
|||
vmkdir usr/src/${pkgname}-${version}
|
||||
tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version}
|
||||
scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs
|
||||
sed -i -e 's/test "${PYTHON_VERSION:0:2}" = "3."/test "${PYTHON_VERSION##3.*}" = ""/' \
|
||||
-e 's/test "${PYTHON_VERSION:0:2}" = "2."/test "${PYTHON_VERSION##2.*}" = ""/' \
|
||||
${DESTDIR}/usr/src/${pkgname}-${version}/configure # This is necessary because of https://github.com/zfsonlinux/zfs/issues/8827
|
||||
|
||||
# Remove init and service control pieces not used in Void
|
||||
rm -rf ${DESTDIR}/usr/lib/systemd
|
||||
|
@ -62,6 +56,12 @@ post_install() {
|
|||
rm -rf ${DESTDIR}/etc/default
|
||||
rm -f ${DESTDIR}/etc/zfs/zfs-functions
|
||||
|
||||
# Remove pam config framework file not used in Void
|
||||
rm -f ${DESTDIR}/usr/share/pam-configs/zfs_key
|
||||
|
||||
# zfs-mount-generator is a systemd helper, no need for its man page
|
||||
rm -f ${DESTDIR}/usr/share/man/man8/zfs-mount-generator.8
|
||||
|
||||
# Contains ELF binaries. Remove it until upstream has a way to move this
|
||||
# into /usr/libexec or similiar.
|
||||
rm -rf ${DESTDIR}/usr/share/zfs/zfs-tests
|
||||
|
@ -78,6 +78,15 @@ zfs-devel_package() {
|
|||
}
|
||||
}
|
||||
|
||||
zfs-pam_package() {
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
short_desc="Z File System -- PAM integration"
|
||||
pkg_install() {
|
||||
vmove usr/lib/security/pam_zfs_key.so
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
do_clean() {
|
||||
rm -f ../clean.tar.gz
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue