From 6447f66f1a65f4129ec731381f35d1bfbc6693c0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 13 Nov 2020 21:53:46 -0500 Subject: [PATCH] pam_zfscrypt: revbump for zfs, change upstream repo The origninal repo for pam_zfscrypt has disappeared from the Internet, but Project Trident, the Void derivative that uses this module, now maintains a fork. Thanks to @ericonr for cracking the necessary CFLAGS to make this work. --- srcpkgs/pam_zfscrypt/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/pam_zfscrypt/template b/srcpkgs/pam_zfscrypt/template index caf4617a439..ec272c357fe 100644 --- a/srcpkgs/pam_zfscrypt/template +++ b/srcpkgs/pam_zfscrypt/template @@ -1,24 +1,25 @@ # Template file for 'pam_zfscrypt' pkgname=pam_zfscrypt version=0.2.0 -revision=1 +revision=2 wrksrc="zfscrypt-${version}" build_style=gnu-makefile -make_use_env=yes makedepends="pam-devel zfs-devel" depends="pam" short_desc="Automatically decrypt and mount encrypted ZFS home directories" maintainer="Zach Dykstra " license="MIT" -homepage="https://github.com/BenKerry/zfscrypt" -distfiles="https://github.com/BenKerry/zfscrypt/archive/v${version}.tar.gz" +homepage="https://github.com/project-trident/zfscrypt" +distfiles="${homepage}/archive/v${version}.tar.gz" checksum=73244e7e97ab5a47a9ea4a24ac490f07bfe7c1eb0c920e03df202494ea61b650 -CFLAGS="-Iinclude" +CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -Iinclude" -pre_build() { - vsed -e "/ZFSINC :=/s,-isystem/usr/include,-I${XBPS_CROSS_BASE}/usr/include,g" \ - -i Makefile +post_patch() { + if [ "${CROSS_BUILD}" ]; then + vsed -i Makefile \ + -e "/ZFSINC :=/s,-isystem/usr/,-I${XBPS_CROSS_BASE}/usr/,g" + fi } do_install() {