summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authora8212020-11-30 12:38:18 +0100
committera8212020-11-30 12:42:14 +0100
commit5167d77ae20b1cb37eb935e55162070c8e695735 (patch)
tree0d301fbd50e8ae17ff9f387bd5a6a654d5ca3b85
parentba4fcb1e4125c4d6f247e90716ef47d19700daa6 (diff)
downloadaur-5167d77ae20b1cb37eb935e55162070c8e695735.tar.gz
Fix PKGBUILD: adapted from official repo
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD47
2 files changed, 32 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71f7ede5080..cde57da6170 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,18 @@
pkgbase = gopass-git
pkgdesc = The slightly more awesome standard unix password manager for teams.
- pkgver = r24.bddd1e0
+ pkgver = 1.10.1.r32.g93539afc
pkgrel = 1
- url = https://github.com/justwatchcom/gopass
+ url = https://github.com/gopasspw/gopass
arch = x86_64
arch = i686
arch = armv6h
arch = armv7h
license = MIT
- makedepends = go>=1.7
+ makedepends = go
makedepends = git
- makedepends = make
- depends = bash
- depends = git
- depends = gnupg
- depends = xclip
- provides = gopass=r24.bddd1e0
- source = git://github.com/justwatchcom/gopass.git
+ provides = gopass
+ conflicts = gopass
+ source = git+https://github.com/gopasspw/gopass
sha256sums = SKIP
pkgname = gopass-git
diff --git a/PKGBUILD b/PKGBUILD
index cb44e8d4e67..326d437c2ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,42 @@
-# Maintainer: Matthias Loibl <mail at matthiasloibl dot com>
+# Maintainer: a821
+# Contributor: Matthias Loibl <mail at matthiasloibl dot com>
+# Contributor: Morten Linderud <foxboron@archlinux.org>
-_pkgname=gopass
-_gourl="github.com/justwatchcom"
pkgname=gopass-git
-pkgver=r24.bddd1e0
+pkgver=1.10.1.r32.g93539afc
pkgrel=1
pkgdesc="The slightly more awesome standard unix password manager for teams."
arch=('x86_64' 'i686' 'armv6h' 'armv7h')
-url="https://github.com/justwatchcom/gopass"
+url="https://github.com/gopasspw/gopass"
license=('MIT')
-depends=('bash' 'git' 'gnupg' 'xclip')
-makedepends=('go>=1.7' 'git' 'make')
-provides=("gopass=${pkgver}")
-source=('git://github.com/justwatchcom/gopass.git')
+makedepends=('go' 'git')
+provides=("gopass")
+conflicts=("gopass")
+source=("git+${url}")
sha256sums=('SKIP')
pkgver() {
- cd "${srcdir}/${_pkgname}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ cd gopass
+ git describe --long --tags | sed -e 's/^v//;s/-/.r/;s/-/./g'
}
-build() {
- mkdir -p "${srcdir}/go/src/${_gourl}/${_pkgname}"
- mv "${srcdir}/${_pkgname}" "${srcdir}/go/src/${_gourl}"
-
- export GOPATH="$srcdir/go"
+prepare() {
+ cd gopass
+ sed -i 's|-gcflags="-trimpath=$(GOPATH)" -asmflags="-trimpath=$(GOPATH)"||' Makefile
+}
- cd ${srcdir}/go/src/${_gourl}/${_pkgname}
- LDFLAGS='' make build
+build() {
+ cd gopass
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+ make
}
package() {
- export GOOS=$(go version | cut -d' ' -f4 | cut -d'/' -f1)
- export GOARCH=$(go version | cut -d' ' -f4 | cut -d'/' -f2)
- install -Dm755 "${srcdir}/go/src/${_gourl}/${_pkgname}/${_pkgname}-${GOOS}-${GOARCH}" "${pkgdir}/usr/bin/${_pkgname}"
+ cd gopass
+ make DESTDIR="${pkgdir}" PREFIX="/usr" install
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}