summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers2020-03-24 16:30:48 -0700
committerEric Biggers2020-03-24 16:30:48 -0700
commit85153aad983728f20d6f01c060445eb83b57d061 (patch)
tree64ba4c8926145250f00f1446ce6172eb0705b54a
parent7019dbd30e5b89d7b3efb971e569e5bc5ea76fda (diff)
downloadaur-85153aad983728f20d6f01c060445eb83b57d061.tar.gz
Update to v0.2.7
Also update the PKGBUILD to more closely match the non -git package. Notably, since 'fscrypt' is a modern Go project that uses Go modules, setting up GOPATH is no longer needed.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD37
2 files changed, 20 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dcb15cc074a6..858c2bcd3eb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
pkgbase = fscrypt-git
pkgdesc = A tool for managing Linux filesystem encryption
- pkgver = 0.2.6.0.g43b4079
- pkgrel = 2
+ pkgver = 0.2.7.0.g2b160ae
+ pkgrel = 1
url = https://github.com/google/fscrypt
arch = x86_64
- arch = i686
license = Apache
+ makedepends = go-pie
makedepends = git
- makedepends = go
depends = pam
provides = fscrypt
conflicts = fscrypt
diff --git a/PKGBUILD b/PKGBUILD
index 3e8b4f02a643..e8f407b2330b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,37 @@
# Maintainer: Eric Biggers <ebiggers3 at gmail dot com>
pkgname=fscrypt-git
-pkgver=0.2.6.0.g43b4079
-pkgrel=2
+pkgver=0.2.7.0.g2b160ae
+pkgrel=1
pkgdesc='A tool for managing Linux filesystem encryption'
-arch=('x86_64' 'i686')
+arch=('x86_64')
url='https://github.com/google/fscrypt'
license=('Apache')
-makedepends=('git' 'go')
+makedepends=('go-pie' 'git')
depends=('pam')
conflicts=('fscrypt')
provides=('fscrypt')
-source=('git+https://github.com/google/fscrypt.git' 'pam_config')
+source=('git+https://github.com/google/fscrypt.git'
+ 'pam_config')
sha256sums=('SKIP'
'ae6ceaefc6d936c95a9b7a3f925111ffb946e6fd0152373247f1d40132f05aef')
pkgver() {
- cd "${srcdir}/fscrypt"
- git describe --tags --long | sed 's/^v//' | tr - .
-}
-
-prepare() {
- export GOPATH="${srcdir}/go"
- mkdir -p "${GOPATH}/src/github.com/google"
- ln -sf "${srcdir}/fscrypt" "${GOPATH}/src/github.com/google/"
+ cd fscrypt
+ git describe --tags --long | sed 's/^v//' | tr - .
}
build() {
- export GOPATH="${srcdir}/go"
- cd "${GOPATH}/src/github.com/google/fscrypt"
- make
+ cd fscrypt
+ make
}
package() {
- cd "${srcdir}/fscrypt"
- make PREFIX="${pkgdir}/usr" install
- install -Dm644 README.md "${pkgdir}/usr/share/fscrypt/README.md"
- install -Dm644 ../pam_config "${pkgdir}/etc/pam.d/fscrypt"
+ cd fscrypt
+ make DESTDIR="$pkgdir" PREFIX=/usr install
+ install -Dm644 ../pam_config "${pkgdir}/etc/pam.d/fscrypt"
+ install -Dm644 -t "$pkgdir/usr/share/doc/fscrypt/" README.md
+
+ # Remove Ubuntu-specific PAM file
+ rm -rf "$pkgdir"/usr/share/pam-configs/
}