diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 30 |
2 files changed, 29 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = pivy pkgdesc = Tools for using PIV smartcards/Yubikeys with ssh-agent and disk encryption - pkgver = 0.11.1 + pkgver = 0.11.2 pkgrel = 1 url = https://github.com/arekinath/pivy arch = x86 @@ -19,11 +19,11 @@ pkgbase = pivy optdepends = pam: PAM plugin (pam_pivy.so) source = zfs-pivy.hook source = zfs-pivy.install - source = https://github.com/arekinath/pivy/releases/download/v0.11.1/pivy-0.11.1.tar.gz - source = https://github.com/arekinath/mini-pcsc/archive/v0.2.0.tar.gz + source = https://github.com/arekinath/pivy/releases/download/v0.11.2/pivy-0.11.2.tar.gz + source = https://github.com/arekinath/mini-pcsc/archive/v0.3.1.tar.gz sha256sums = 7925467b71227ae835cc5bf5ebf0b74ea6d740738af5d13be05e0416a78f8acc sha256sums = 8da0bc793ba9b7fb1cb784af1ed066aea478b93715f484e7fb7921184d675b84 - sha256sums = ce5b0fa4ccb364349b9d7a107ab366af5e0759aae2d7b57b78d7ee63411256bf - sha256sums = a2c23b7b9e3dc976b54627a08da68b76fd6194ba45d211959dedf4700879379e + sha256sums = b58fb5a3bc83e0e9699aaa3f76d00e839d8de736e7db579f6050b98304b6871f + sha256sums = 98bb03098ce847d009e1579b0e4ece48ad2e9e7984325e54c8b3edfc4c63fef6 pkgname = pivy @@ -1,6 +1,6 @@ # Maintainer: Alex Wilson <alex at cooperi dot net> pkgname=pivy -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="Tools for using PIV smartcards/Yubikeys with ssh-agent and disk encryption" url="https://github.com/arekinath/pivy" @@ -9,7 +9,7 @@ source=( "zfs-pivy.hook" "zfs-pivy.install" "https://github.com/arekinath/pivy/releases/download/v$pkgver/pivy-$pkgver.tar.gz" - "https://github.com/arekinath/mini-pcsc/archive/v0.2.0.tar.gz") + "https://github.com/arekinath/mini-pcsc/archive/v0.3.1.tar.gz") arch=(x86 x86_64) depends=(libbsd pcsclite libedit) optdepends=('cryptsetup: LUKS encrypted disk support (pivy-luks)' @@ -18,8 +18,8 @@ optdepends=('cryptsetup: LUKS encrypted disk support (pivy-luks)' makedepends=(pkgconf cryptsetup zfs-utils json-c pam) sha256sums=('7925467b71227ae835cc5bf5ebf0b74ea6d740738af5d13be05e0416a78f8acc' '8da0bc793ba9b7fb1cb784af1ed066aea478b93715f484e7fb7921184d675b84' - 'ce5b0fa4ccb364349b9d7a107ab366af5e0759aae2d7b57b78d7ee63411256bf' - 'a2c23b7b9e3dc976b54627a08da68b76fd6194ba45d211959dedf4700879379e') + 'b58fb5a3bc83e0e9699aaa3f76d00e839d8de736e7db579f6050b98304b6871f' + '98bb03098ce847d009e1579b0e4ece48ad2e9e7984325e54c8b3edfc4c63fef6') # Don't use --as-needed when linking, will break pam_pivy LDFLAGS+=" -Wl,--no-as-needed" @@ -27,7 +27,8 @@ LDFLAGS+=" -Wl,--no-as-needed" build() { cd "$pkgname-$pkgver" make prefix=/usr USE_ZFS=yes USE_LUKS=yes USE_PAM=yes USE_JSONC=yes - cd "../mini-pcsc-0.2.0" + make prefix=/usr libpivy.so + cd "../mini-pcsc-0.3.1" make } @@ -35,7 +36,24 @@ package() { cd "$pkgname-$pkgver" make prefix=/usr DESTDIR="$pkgdir/" USE_ZFS=yes USE_LUKS=yes USE_PAM=yes USE_JSONC=yes install - cd "../mini-pcsc-0.2.0" + # install the experimental libpivy + install -o root -g root -m 0755 -d "${pkgdir}/usr/lib" + install -o root -g root -m 0755 libpivy.so.1 "${pkgdir}/usr/lib/libpivy.so.1" + ln -s libpivy.so.1 "${pkgdir}/usr/lib/libpivy.so" + install -o root -g root -m 0755 -d "${pkgdir}/usr/include/pivy" + for x in *.h; do + install -o root -g root -m 0644 ${x} "${pkgdir}/usr/include/pivy/${x}" + done + install -o root -g root -m 0755 -d "${pkgdir}/usr/include/pivy/openssh" + for x in config.h digest.h sshkey.h sshbuf.h ssherr.h; do + install -o root -g root -m 0644 openssh/${x} "${pkgdir}/usr/include/pivy/openssh/${x}" + done + install -o root -g root -m 0755 -d "${pkgdir}/usr/include/pivy/openssl" + for x in asn1.h asn1t.h bio.h bn.h buffer.h cms.h conf.h crypto.h dh.h dsa.h ecdsa.h ec.h err.h evp.h lhash.h objects.h obj_mac.h opensslconf.h opensslfeatures.h opensslv.h ossl_typ.h pkcs7.h rsa.h safestack.h sha.h stack.h x509.h x509v3.h x509_vfy.h; do + install -o root -g root -m 0644 libressl/include/openssl/${x} "${pkgdir}/usr/include/pivy/openssl/${x}" + done + + cd "../mini-pcsc-0.3.1" install -o root -g root -m 0755 -d "${pkgdir}/usr/lib" install -o root -g root -m 0755 libminipcsc.so "${pkgdir}/usr/lib/libminipcsc.so" |