Change to new repo at github.com/skycoinproject ; implement signature checking of the PKGBUILD

3 files changed, 93 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1175a090bee..f5b3b2e8704b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = skywire
 	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.com
 	pkgver = autogenerated
-	pkgrel = 1
-	url = https://github.com/skycoin/skywire
+	pkgrel = 2
+	url = https://github.com/SkycoinProject/skywire
 	arch = any
 	makedepends = git
 	makedepends = go
 	makedepends = gcc
 	provides = skywire
 	conflicts = skywire-mainnet
-	source = git+https://github.com/skycoin/skywire.git#branch=master
+	source = git+https://github.com/SkycoinProject/skywire.git#branch=master
+	source = https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key
 	sha256sums = SKIP
+	sha256sums = 41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14
 
 pkgname = skywire
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index d5e6926127f1..c427f10076ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,21 @@
 projectname=skycoin
 pkgname=skywire
 pkgname1=skywire
+githuborg=SkycoinProject
 pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.com"
 pkgver='autogenerated'
-pkggopath="github.com/${projectname}/${pkgname1}"
-pkgrel=1
+pkggopath="github.com/${githuborg}/${pkgname1}"
+pkgrel=2
 arch=('any')
 url="https://${pkggopath}"
 license=()
 makedepends=(git go gcc)
 provides=('skywire')
 conflicts=('skywire-mainnet')
-source=("git+${url}.git#branch=${BRANCH:-master}")
-sha256sums=('SKIP')
+source=("git+${url}.git#branch=${BRANCH:-master}"
+"https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key")
+sha256sums=('SKIP'
+'41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14')
 
 export GOOS=linux
 export GOPATH=${srcdir}
@@ -45,51 +48,55 @@ pkgver() {
 }
 
 prepare() {
-# https://wiki.archlinux.org/index.php/Go_package_guidelines
-mkdir -p ${srcdir}/go/src/${pkggopath//$pkgname1/} ${srcdir}/go/bin
-ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/${pkggopath}
-cd ${srcdir}/go/src/${pkggopath}/cmd
-git checkout master
-git submodule --quiet update --init --recursive
-
-export GOPATH="${srcdir}"/go
-export GOBIN=${GOPATH}/bin
-export PATH=${GOPATH}/bin:${PATH}
-msg2 'installing go dependencies'
-#dep init
-#dep ensure
+	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/github.com/${projectname}/ ${srcdir}/go/bin
+	ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/github.com/${projectname}/${pkgname1}
+	cd ${srcdir}/go/src/github.com/${projectname}/${pkgname1}/cmd
+	git checkout master
+	git submodule --quiet update --init --recursive
+
+	export GOPATH="${srcdir}"/go
+	export GOBIN=${GOPATH}/bin
+	export PATH=${GOPATH}/bin:${PATH}
+	msg2 'installing go dependencies'
+	#dep init
+	#dep ensure
 }
 
 build() {
-export GOPATH=${srcdir}/go
-export GOBIN=${GOPATH}/bin
-export PATH=${GOPATH}/bin:${PATH}
-cd ${srcdir}/go/src/${pkggopath}/cmd
-go install \
-  -gcflags "all=-trimpath=${GOPATH}" \
-  -asmflags "all=-trimpath=${GOPATH}" \
-  -ldflags "-extldflags ${LDFLAGS}" \
-  -v ./...
-
-msg 2 'creating launcher scripts for skywire'
-mkdir -p ${srcdir}/go/${pkgname1}-scripts
-cd ${srcdir}/go/${pkgname1}-scripts
-
-echo -e '#!/bin/bash
+	export GOPATH=${srcdir}/go
+	export GOBIN=${GOPATH}/bin
+	export PATH=${GOPATH}/bin:${PATH}
+	cd ${srcdir}/go/src/github.com/${projectname}/${pkgname1}/cmd
+	go install \
+	-gcflags "all=-trimpath=${GOPATH}" \
+	-asmflags "all=-trimpath=${GOPATH}" \
+	-ldflags "-extldflags ${LDFLAGS}" \
+	-v ./...
+
+	msg 2 'creating launcher scripts for skywire'
+	mkdir -p ${srcdir}/go/${pkgname1}-scripts
+	cd ${srcdir}/go/${pkgname1}-scripts
+
+	echo -e '#!/bin/bash
 #launch skywire manager with nohup using new discovery server: discovery.skycoin.com
 skywire-manager-nohup
 skywire-node-nohup
 echo "skywire has started"' > ${pkgname1}
-chmod +x ${pkgname1}
+ chmod +x ${pkgname1}
 
-echo -e '#!/bin/bash
+ echo -e '#!/bin/bash
 #launch skywire manager with nohup
 export GOBIN=/usr/lib/skycoin/go/bin
 export GOPATH=/usr/lib/skycoin/go
 nohup skywire-manager -web-dir /usr/lib/skycoin/skywire/static/skywire-manager/ > /dev/null 2>&1 &sleep 3
 echo "skywire-manager has started"' > ${pkgname1}-manager-nohup
-chmod +x ${pkgname1}-manager-nohup
-echo -e '#!/bin/bash
+ chmod +x ${pkgname1}-manager-nohup
+
+  echo -e '#!/bin/bash
 #launch skywire node with nohup & discovery server: discovery.skycoin.com
 export GOBIN=/usr/lib/skycoin/go/bin
 export GOPATH=/usr/lib/skycoin/go
@@ -106,13 +113,14 @@ echo "skywire-node has started"' > ${pkgname1}-node-miner
   chmod +x ${pkgname1}-node-miner
 
 	echo -e '#!/bin/bash
-	#launch skywire qubes node with nohup  & discovery server: discovery.skycoin.com
-	export GOBIN=/usr/lib/skycoin/go/bin
-	export GOPATH=/usr/lib/skycoin/go
-	nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
-	echo "skywire-node has started"' > ${pkgname1}-node-qubes
-	  chmod +x ${pkgname1}-node-qubes
-#script to set a custom manager IP address at runtime
+#launch skywire qubes node with nohup  & discovery server: discovery.skycoin.com
+export GOBIN=/usr/lib/skycoin/go/bin
+export GOPATH=/usr/lib/skycoin/go
+nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3
+echo "skywire-node has started"' > ${pkgname1}-node-qubes
+  chmod +x ${pkgname1}-node-qubes
+
+	#script to set a custom manager IP address at runtime
 	echo -e '#!/bin/bash
 #launch skywire official node with nohup and a custom IP
 read -p "Skywire Manager IP:" SKYMGRIP
@@ -190,41 +198,41 @@ WantedBy=multi-user.target ' > ${pkgname1}-node-envip.service
 }
 
 package() {
-options=(!strip staticlibs)
-#create directory trees
-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
-#install binaries & symlink to /usr/bin
-msg2 'installing binaries'
-skybins=${srcdir}/go/bin
-skybins1=${pkgdir}/usr/lib/${projectname}/go/bin/
-#collect the binaries & install
-skywirebins=$( ls "$skybins")
-for i in ${skywirebins}; do
-  install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
-	ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${pkgname1}-${i}
-	chmod 755 ${pkgdir}/usr/bin/${pkgname1}-${i}
-done
-mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-manager ${pkgdir}/usr/bin/${pkgname1}-manager
-chmod 755 ${pkgdir}/usr/bin/${pkgname1}-manager
-mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-node ${pkgdir}/usr/bin/${pkgname1}-node
-chmod 755 ${pkgdir}/usr/bin/${pkgname1}-node
-#install the web dir
-cp -r ${srcdir}/${pkgname1}/static ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
-mkdir -p ${pkgdir}/usr/share/doc/${projectname}/${pkgname1}
-#install the docs
-cp -r ${srcdir}/${pkgname1}/docs/api ${pkgdir}/usr/share/doc/${projectname}/${pkgname1}-manager
-#install the scripts
-skywirescripts=$( ls ${srcdir}/go/${pkgname1}-scripts )
-for i in ${skywirescripts}; do
-  cp ${srcdir}/go/${pkgname1}-scripts/${i} ${pkgdir}/usr/bin/${i}
-done
-#install the system.d service
-install -Dm644 ${srcdir}/go/${pkgname1}-manager.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-manager.service
-install -Dm644 ${srcdir}/go/${pkgname1}-node.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node.service
-install -Dm644 ${srcdir}/go/${pkgname1}-node-envip.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node-envip.service
+	options=(!strip staticlibs)
+	#create directory trees
+	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
+	#install binaries & symlink to /usr/bin
+	msg2 'installing binaries'
+	skybins=${srcdir}/go/bin
+	skybins1=${pkgdir}/usr/lib/${projectname}/go/bin/
+	#collect the binaries & install
+	skywirebins=$( ls "$skybins")
+	for i in ${skywirebins}; do
+		install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
+		ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${pkgname1}-${i}
+		chmod 755 ${pkgdir}/usr/bin/${pkgname1}-${i}
+	done
+	mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-manager ${pkgdir}/usr/bin/${pkgname1}-manager
+	chmod 755 ${pkgdir}/usr/bin/${pkgname1}-manager
+	mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-node ${pkgdir}/usr/bin/${pkgname1}-node
+	chmod 755 ${pkgdir}/usr/bin/${pkgname1}-node
+	#install the web dir
+	cp -r ${srcdir}/${pkgname1}/static ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
+	mkdir -p ${pkgdir}/usr/share/doc/${projectname}/${pkgname1}
+	#install the docs
+	cp -r ${srcdir}/${pkgname1}/docs/api ${pkgdir}/usr/share/doc/${projectname}/${pkgname1}-manager
+	#install the scripts
+	skywirescripts=$( ls ${srcdir}/go/${pkgname1}-scripts )
+	for i in ${skywirescripts}; do
+		cp ${srcdir}/go/${pkgname1}-scripts/${i} ${pkgdir}/usr/bin/${i}
+	done
+	#install the system.d service
+	install -Dm644 ${srcdir}/go/${pkgname1}-manager.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-manager.service
+	install -Dm644 ${srcdir}/go/${pkgname1}-node.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node.service
+	install -Dm644 ${srcdir}/go/${pkgname1}-node-envip.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node-envip.service
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
new file mode 100644
index 000000000000..77571bf44022
--- /dev/null
+++ b/PKGBUILD.sig