deterministic build, revised signature checking & dependencies

3 files changed, 64 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa6178530390..2539fe304e16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,13 +6,14 @@ pkgbase = skywire-mainnet
 	arch = any
 	makedepends = git
 	makedepends = go
-	makedepends = gcc
 	provides = skywire
 	conflicts = skywire
-	source = git+https://github.com/SkycoinProject/skywire-mainnet.git#branch=master
-	source = https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key
+	source = git+https://github.com/SkycoinProject/skywire-mainnet.git#branch=milestone2
+	source = PKGBUILD.sig
+	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
+	validpgpkeys = 98F934F04F9334B81DFA3398913BBD5206B19620
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14
 
 pkgname = skywire-mainnet
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 615963f092d8..3e271f865812 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,18 +6,22 @@ pkgname1=skywire
 githuborg=SkycoinProject
 pkgdesc="Skywire: Building a New Internet. Skycoin.com"
 pkgver='autogenerated'
+#pkgver='autogenerated'
 pkggopath="github.com/${githuborg}/${pkgname}"
 pkgrel=2
+#pkgrel=2
 arch=('any')
 url="https://${pkggopath}"
 license=()
-makedepends=(git go gcc)
+makedepends=(git go skycoin-keyring)
 provides=('skywire')
 conflicts=('skywire')
-source=("git+${url}.git#branch=${BRANCH:-master}"
-"https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key")
+source=("git+${url}.git#branch=${BRANCH:-milestone2}"
+"PKGBUILD.sig")
 sha256sums=('SKIP'
-'41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14')
+            'SKIP')
+validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
+                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
 
 export GOOS=linux
 export GOPATH="${srcdir}"
@@ -52,18 +56,19 @@ pkgver() {
 }
 
 prepare() {
-	gpg --import key
+	#gpg --import key
 	#verify PKGBUILD signature
 	gpg --verify ../PKGBUILD.sig ../PKGBUILD
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
-  mkdir -p ${srcdir}/go/src/${pkggopath//${pkgname1}/} "${srcdir}"/go/bin
+	mkdir -p ${srcdir}/go/src/github.com/${githuborg}/ ${srcdir}/go/bin
   ln -rTsf ${srcdir}/${pkgname} ${srcdir}/go/src/${pkggopath}
   cd ${srcdir}/go/src/${pkggopath}/
-  git submodule --quiet update --init --recursive
+  #git submodule --quiet update --init --recursive
   export GOPATH="${srcdir}"/go
   export GOBIN=${GOPATH}/bin
   export PATH=${GOPATH}/bin:${PATH}
   msg2 'installing go dependencies'
+	go mod vendor -v
   #dep init
   #dep ensure
 }
@@ -73,9 +78,44 @@ build() {
   export GOBIN=${GOPATH}/bin
   export PATH=${GOPATH}/bin:${PATH}
   cd ${srcdir}/go/src/${pkggopath}
-  make build
-  make install
-	mv messaging-server ${srcdir}/go/bin/messaging-server
+
+	cmddir=${srcdir}/go/src/${pkggopath}/cmd
+  #using go build for determinism
+	cd ${cmddir}/apps/skychat
+  msg2 'building skychat binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  cd ${cmddir}/apps/helloworld
+  msg2 'building helloworld binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  cd ${cmddir}/apps/skysocks
+  msg2 'building skysocks binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  cd ${cmddir}/apps/skysocks-client
+  msg2 'building skysocks-client binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  cd ${cmddir}/skywire-visor
+  msg2 'building skywire-visor binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  cd ${cmddir}/skywire-cli
+  msg2 'building skywire-cli binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+	cd ${cmddir}/setup-node
+  msg2 'building setup-node binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+	cd ${cmddir}/hypervisor
+  msg2 'building hypervisor binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+	cd ${cmddir}/dmsgpty
+  msg2 'building dmsgpty binary'
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  #binary transparency
+  cd $GOBIN
+  msg2 'binary sha256sums'
+  sha256sum $(ls)
+
+#	make build
+#  make install
+#	mv messaging-server ${srcdir}/go/bin/messaging-server
 }
 
 package() {
@@ -84,9 +124,6 @@ package() {
   mkdir -p ${pkgdir}/usr/bin
   mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
   mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
-  #restate go envs
-  export GOPATH=${pkgdir}/usr/lib/${projectname}/go
-  export GOBIN=${pkgdir}/usr/lib/${projectname}/go/bin
 	#NOT putting the sources in /usr/lib/skycoin/skywire for size considerations
 	#cp -r ${srcdir}/${pkgname1}/ ${pkgdir}/usr/lib/${projectname}/
   msg2 'installing binaries'
@@ -98,4 +135,13 @@ package() {
     ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${i}
     chmod 755 ${pkgdir}/usr/bin/${i}
   done
+#prepend name to the symlinks
+	cd ${pkgdir}/usr/bin/${i}
+	mv dmsgty ${pkgname1}-dmsgpty
+	mv helloworld ${pkgname1}-helloworld
+	mv hypervisor ${pkgname1}-hypervisor
+	mv setup-node ${pkgname1}-setup node
+	mv skychat ${pkgname1}-skychat
+	mv skysocks ${pkgname1}-skysocks
+	mv skysocks-cli ${pkgname1}-skysocks-cli
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index 620f049ad8aa..9b76140c4b8c 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig