track PKGBUILD.sig, add skycoin-keyring dependancy, other minor changes

1 files changed, 22 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 473c467e4e42..eb9acdbe3453 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,27 @@ pkgname1=skywire
 githuborg=SkycoinProject
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.com"
 pkgver='autogenerated'
+#pkgver='autogenerated'
 pkggopath="github.com/${githuborg}/${pkgname1}"
-pkgrel=4
+pkgrel=6
+#pkgrel=6
 arch=('any')
 url="https://${pkggopath}"
 license=()
-makedepends=(git go gcc)
+makedepends=(git go skycoin-keyring)
 provides=('skywire')
 conflicts=('skywire-mainnet')
 source=("git+${url}.git#branch=${BRANCH:-master}"
-"https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key"
 "skywire-scripts.tar.gz"
-"skywire-systemd.tar.gz")
+"skywire-systemd.tar.gz"
+"PKGBUILD.sig")
 sha256sums=('SKIP'
-            '41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14'
             'ba2d150094f3cc9c182c051532bc2848b0d8f32276dced6a4a15201bb67db665'
-            '5b110b1ce7544d46f52934b742fcb819dbfc50c78702e93a1efa3246d14af45b')
+            '5b110b1ce7544d46f52934b742fcb819dbfc50c78702e93a1efa3246d14af45b'
+            'SKIP')
+validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
+                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
+
 #tar -czvf skywire-scripts.tar.gz skywire-scripts
 #tar -czvf skywire-systemd.tar.gz skywire-systemd
 export GOOS=linux
@@ -53,9 +58,8 @@ pkgver() {
 }
 
 prepare() {
-	gpg --import key
 	#verify PKGBUILD signature
-	gpg --verify ../PKGBUILD.sig ../PKGBUILD
+	gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
 	# https://wiki.archlinux.org/index.php/Go_package_guidelines
 	mkdir -p ${srcdir}/go/src/github.com/${githuborg}/ ${srcdir}/go/bin
 	ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}
@@ -71,17 +75,27 @@ build() {
   cmddir=${srcdir}/go/src/github.com/${githuborg}/${pkgname1}/cmd
   #using go build for determinism
 	cd ${cmddir}/skywire-manager
+  msg2 'building skywire-manager binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   cd ${cmddir}/skywire-node
+  msg2 'building skywire-node binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   cd ${cmddir}/socks/socksc
+  msg2 'building skywire-socksc binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   cd ${cmddir}/socks/sockss
+  msg2 'building skywire-sockss binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   cd ${cmddir}/ssh/sshc
+  msg2 'building skywire-sshc binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   cd ${cmddir}/ssh/sshs
+  msg2 'building skywire-sshs binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  #binary transparency
+  cd $GOBIN
+  msg2 'binary sha256sums'
+  sha256sum $(ls)
 }
 
 package() {
@@ -120,9 +134,4 @@ package() {
 	#install the system.d services
 	install -Dm644 ${srcdir}/${pkgname1}-systemd/${pkgname1}-manager.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-manager.service
 	install -Dm644 ${srcdir}/${pkgname1}-systemd/${pkgname1}-node.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node.service
-
-  msg2 'script and binary sha256 sums:'
-  #build determinism check
-  cd ${GOBIN}
-  sha256sum $(ls)
 }