update to 2.0.31

4 files changed, 45 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 907337e97c22..bd9d48953792 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = trezord-go
 	pkgdesc = TREZOR Communication Daemon aka TREZOR Bridge (written in Go)
-	pkgver = 2.0.30
+	pkgver = 2.0.31
 	pkgrel = 1
 	url = https://github.com/trezor/trezord-go
-	install = trezord-go.install
 	arch = x86_64
 	arch = i686
-	license = MIT
-	makedepends = go
+	license = LGPL3
+	makedepends = go>=1.12
+	depends = glibc
 	conflicts = trezord-git
 	conflicts = trezor-bridge-bin
 	conflicts = trezord
-	options = !strip
 	options = !emptydirs
+	source = trezord-go-2.0.31.tar.gz::https://github.com/trezor/trezord-go/archive/v2.0.31.tar.gz
+	source = sysusers.d.conf
+	sha256sums = fd834a5bf04417cc50ed4a418d40de4c257cbc86edca01b07aa01a9cf818e60e
+	sha256sums = a9a6c343814b94e9ad3665c971cc33825794e8a8e46e1076819b63c548c89abf
 
 pkgname = trezord-go
-
diff --git a/PKGBUILD b/PKGBUILD
index a85d16beca4f..8902268f31b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,49 @@
-# Maintainer: Plague-doctor <plague <at>> privacyrequired <<dot>> com >
+# Maintainer: Luis Martinez <luis dot martinez at tuta dot io>
+# Contributor: Plague-doctor <plague <at>> privacyrequired <<dot>> com >
 
 pkgname=trezord-go
-pkgver=2.0.30
+pkgver=2.0.31
 pkgrel=1
 pkgdesc="TREZOR Communication Daemon aka TREZOR Bridge (written in Go)"
 arch=('x86_64' 'i686')
 url="https://github.com/trezor/trezord-go"
-license=('MIT')
-makedepends=('go')
+license=('LGPL3')
+depends=('glibc')
+makedepends=('go>=1.12')
 conflicts=('trezord-git' 'trezor-bridge-bin' 'trezord')
-options=('!strip' '!emptydirs')
-_gourl=github.com/trezor/trezord-go
-
-install="${pkgname}.install"
+options=('!emptydirs')
+install=trezord-go.install
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+       'sysusers.d.conf')
+sha256sums=('fd834a5bf04417cc50ed4a418d40de4c257cbc86edca01b07aa01a9cf818e60e'
+            'a9a6c343814b94e9ad3665c971cc33825794e8a8e46e1076819b63c548c89abf')
 
 build() {
-    export GOPATH="$srcdir"
-    go get -d -fix -v -x ${_gourl}
-    cd $srcdir/src/github.com/trezor/trezord-go
-    git checkout v$pkgver
-    go build ./trezord.go
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
+	cd "$pkgname-$pkgver"
+	go build -o trezord
 }
 
 check() {
-    GOPATH="$GOPATH:$srcdir" go test -v -x ${_gourl}
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
+	cd "$pkgname-$pkgver"
+	go test ./...
 }
 
 package() {
-    mkdir -p "$pkgdir/usr/bin"
-    install -p -m755 "$srcdir/src/github.com/trezor/trezord-go/trezord" "$pkgdir/usr/bin/trezord"
-
-    mkdir -p "$pkgdir/usr/lib/systemd/system"
-    install -p -m644 "$srcdir/src/github.com/trezor/trezord-go/release/linux/trezord.service" \
-        "$pkgdir/usr/lib/systemd/system/trezord.service"
-
-    mkdir -p "$pkgdir/etc/udev/rules.d"
-    install -p -m644 "$srcdir/src/github.com/trezor/trezord-go/release/linux/trezor.rules" \
-        "$pkgdir/etc/udev/rules.d"
+	cd "$pkgname-$pkgver"
+	install -Dm 755 trezord -t "$pkgdir/usr/bin/"
+	install -Dm 644 release/linux/trezord.service -t "$pkgdir/usr/lib/systemd/system/"
+	install -Dm 644 release/linux/trezor.rules -t "$pkgdir/etc/udev/rules.d/"
+	install -Dm 644 "$srcdir/sysusers.d.conf" "$pkgdir/usr/lib/sysusers.d/trezord.conf"
 }
-
-
-
-
-
diff --git a/sysusers.d.conf b/sysusers.d.conf
new file mode 100644
index 000000000000..2065555a11ff
--- /dev/null
+++ b/sysusers.d.conf
@@ -0,0 +1,3 @@
+u trezord - "TREZOR Bridge"
+g plugdev - -
+m trezord plugdev
diff --git a/trezord-go.install b/trezord-go.install
index 865e475b099d..63887fc84bc3 100644
--- a/trezord-go.install
+++ b/trezord-go.install
@@ -1,29 +1,3 @@
-pre_install(){
-    getent group trezord >/dev/null || groupadd -r trezord
-    getent group plugdev >/dev/null || groupadd -r plugdev
-    getent group trezord >/dev/null && useradd -r -g trezord -M -s /sbin/nologin -c "TREZOR Bridge" trezord
-    getent passwd trezord >/dev/null && usermod -a -G plugdev trezord
-}
-
 post_install() {
-    systemctl enable trezord.service
-    systemctl start trezord.service
-}
-
-pre_upgrade() {
-    systemctl stop trezord.service
-}
-
-post_upgrade() {
-    systemctl daemon-reload
-    systemctl start trezord.service
-}
-
-pre_remove() {
-    systemctl stop trezord.service
-}
-
-post_remove() {
-    getent passwd trezord >/dev/null && userdel trezord
-    getent group trezord >/dev/null && groupdel trezord
+	echo ":: To enable trezord with systemd, use 'systemctl enable trezord'"
 }