update to 2.0.30

4 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bbe20c024ee..0d44d3263b4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = trezor-bridge-bin
 	pkgdesc = Communication daemon for TREZOR
-	pkgver = 2.0.27
+	pkgver = 2.0.30
 	pkgrel = 1
 	url = https://trezor.io/
 	install = trezor-bridge-bin.install
@@ -8,10 +8,16 @@ pkgbase = trezor-bridge-bin
 	arch = x86_64
 	license = LGPL3
 	depends = systemd
-	source_i686 = https://wallet.trezor.io/data/bridge/2.0.27/trezor-bridge_2.0.27_i386.deb
-	sha256sums_i686 = fe750c227e4a7593142b959e29c41368a354fac25a9986158dfdd4fa7630a001
-	source_x86_64 = https://wallet.trezor.io/data/bridge/2.0.27/trezor-bridge_2.0.27_amd64.deb
-	sha256sums_x86_64 = ed7edb5cb33210af6faaf8a10f219525d8a1e551ea6f886cc6654b427f91e397
+	provides = trezor-bridge
+	provides = trezord
+	conflicts = trezord-git
+	conflicts = trezord-go
+	conflicts = trezor-udev
+	conflicts = trezor-suite-appimage
+	source_i686 = https://wallet.trezor.io/data/bridge/2.0.30/trezor-bridge_2.0.30_i386.deb
+	sha256sums_i686 = 70a3d2f68a6796014ed495a0138612518e681cb3ae91260d74651af8bf836438
+	source_x86_64 = https://wallet.trezor.io/data/bridge/2.0.30/trezor-bridge_2.0.30_amd64.deb
+	sha256sums_x86_64 = 5b61650044b0a0aad8d1a7a611f4393bfa43ef3622c09600a0f5eee87d84017b
 
 pkgname = trezor-bridge-bin
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8143bff9a087
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.deb
+*.tar.xz
+*.zst
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index da0c18e9501c..4f7a4af421cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Jakub Trnka <jakub.trnka@chainanalytics.net>
+# Maintainer: Andrea Callea <gacallea@mailfence.com>
+# Contributor: Jakub Trnka <jakub.trnka@chainanalytics.net>
 # Contributor: Sebastian Jug <seb@stianj.ug>
 
 pkgname=trezor-bridge-bin
-pkgver=2.0.27
+pkgver=2.0.30
 pkgrel=1
 pkgdesc="Communication daemon for TREZOR"
 arch=('i686' 'x86_64')
@@ -10,20 +11,22 @@ url="https://trezor.io/"
 license=('LGPL3')
 depends=('systemd')
 makedepends=()
+provides=('trezor-bridge' 'trezord')
+conflicts=('trezord-git' 'trezord-go' 'trezor-udev' 'trezor-suite-appimage')
 options=()
-install=$pkgname.install
+install="${pkgname}.install"
 source_i686=("https://wallet.trezor.io/data/bridge/${pkgver}/trezor-bridge_${pkgver}_i386.deb")
 source_x86_64=("https://wallet.trezor.io/data/bridge/${pkgver}/trezor-bridge_${pkgver}_amd64.deb")
-sha256sums_i686=('fe750c227e4a7593142b959e29c41368a354fac25a9986158dfdd4fa7630a001')
-sha256sums_x86_64=('ed7edb5cb33210af6faaf8a10f219525d8a1e551ea6f886cc6654b427f91e397')
+sha256sums_i686=('70a3d2f68a6796014ed495a0138612518e681cb3ae91260d74651af8bf836438')
+sha256sums_x86_64=('5b61650044b0a0aad8d1a7a611f4393bfa43ef3622c09600a0f5eee87d84017b')
 
 package() {
-    msg2 "Extracting the data..."
+    echo "Extracting the data..."
     bsdtar -xf data.tar.gz -C "$pkgdir/"
 
-    msg2 "Fixing file structure..."
+    echo "Fixing file structure..."
     mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
     
-    msg2 "Cleaning up..."
+    echo "Cleaning up..."
     rm -r "$pkgdir"/lib/
 }
diff --git a/trezor-bridge-bin.install b/trezor-bridge-bin.install
index 35808b3ae764..921aaa610e36 100644
--- a/trezor-bridge-bin.install
+++ b/trezor-bridge-bin.install
@@ -1,13 +1,7 @@
-# Trezor-bridge-bin install script
-
-pre_install() {
+pre_install(){
     getent group trezord >/dev/null || groupadd -r trezord
     getent group plugdev >/dev/null || groupadd -r plugdev
-    getent passwd trezord >/dev/null || useradd -r -g trezord -d /var -s /usr/bin/nologin -c "TREZOR Bridge" trezord
-    usermod -a -G plugdev trezord
-    touch /var/log/trezord.log
-    chown trezord:trezord /var/log/trezord.log
-    chmod 660 /var/log/trezord.log
+    getent passwd trezord >/dev/null || useradd -r -g trezord -G plugdev -M -s /usr/bin/nologin -c "TREZOR Bridge" trezord
 }
 
 post_install() {
@@ -28,3 +22,8 @@ pre_remove() {
     systemctl stop trezord.service
     systemctl disable trezord.service
 }
+
+post_remove() {
+    getent passwd trezord >/dev/null && userdel trezord
+    getent group trezord >/dev/null && groupdel trezord
+}