enable PGP checking via git signed tags

3 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5be0b78cae10..a7950b81f3c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = qubes-usb-proxy
 	pkgdesc = The Qubes service for proxying USB devices
 	pkgver = 1.0.24
 	pkgrel = 1
-	url = https://qubes-os.org
+	url = https://www.qubes-os.org/doc/usb-devices/
 	arch = x86_64
 	license = GPL
 	makedepends = pkg-config
@@ -11,8 +11,11 @@ pkgbase = qubes-usb-proxy
 	depends = sh
 	depends = qubes-vm-core
 	depends = usbutils
-	source = https://github.com/QubesOS/qubes-app-linux-usb-proxy/archive/v1.0.24.tar.gz
-	sha512sums = 109885b4a44b2834318fe1a33abe39367642166202aad5d2c1170cd8b7ad056d89b329ba670523f244f6e3291404661c565be8015b38b8be5e493c91370e9d61
+	source = qubes-usb-proxy::git+https://github.com/QubesOS/qubes-app-linux-usb-proxy.git?signed#tag=v1.0.24
+	validpgpkeys = 0AF64C3B1F1214B38C8C57861FA2DBE674387CC3
+	validpgpkeys = 0064428F455451B3EBE78A7F063938BA42CFA724
+	validpgpkeys = 427F11FD0FAA4B080123F01CDDFA1A3E36879494
+	sha512sums = SKIP
 
 pkgname = qubes-usb-proxy
 
diff --git a/Makefile b/Makefile
index bc020699b674..7ab0b208affa 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ help:
 	@echo "clean - clean this repository"
 
 clean:
-	rm -rfv ./src ./pkg ./v*.tar.gz ./qubes-usb-proxy-*.pkg.tar.xz
+	rm -rfv ./src ./pkg ./v*.tar.gz ./qubes-usb-proxy-*.pkg.tar.xz qubes-usb-proxy
diff --git a/PKGBUILD b/PKGBUILD
index 8e04ccba9c27..15e405e24fa0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,24 @@
 # Ref.: https://github.com/QubesOS/qubes-app-linux-usb-proxy/blob/master/archlinux/PKGBUILD
 
 pkgname=qubes-usb-proxy
+_gitname=${pkgname%-git*}
 pkgver=1.0.24
 pkgrel=1
 pkgdesc="The Qubes service for proxying USB devices"
 arch=("x86_64")
-url="https://qubes-os.org"
+url="https://www.qubes-os.org/doc/usb-devices/"
 license=('GPL')
 depends=('sh' 'qubes-vm-core' 'usbutils')
-makedepends=(pkg-config make gcc)
+makedepends=('pkg-config' 'make' 'gcc')
+validpgpkeys=('0AF64C3B1F1214B38C8C57861FA2DBE674387CC3'  # Otto Sabart
+              '0064428F455451B3EBE78A7F063938BA42CFA724'  # Marek Marczykowski-Górecki
+              '427F11FD0FAA4B080123F01CDDFA1A3E36879494'  # Qubes Master Signing Key
+)
 
-source=(https://github.com/QubesOS/qubes-app-linux-usb-proxy/archive/v${pkgver}.tar.gz)
-sha512sums=('109885b4a44b2834318fe1a33abe39367642166202aad5d2c1170cd8b7ad056d89b329ba670523f244f6e3291404661c565be8015b38b8be5e493c91370e9d61')
-
-_srcname=qubes-app-linux-usb-proxy-${pkgver}
+source=("$_gitname::git+https://github.com/QubesOS/qubes-app-linux-usb-proxy.git?signed#tag=v${pkgver}")
+sha512sums=('SKIP')
 
 package() {
-    cd "$srcdir/$_srcname/"
-    make install-vm DESTDIR=$pkgdir
+    cd "${srcdir}/${_gitname}/"
+    make install-vm DESTDIR="$pkgdir"
 }