bump version to 0.6.0

5 files changed, 86 insertions, 116 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f3c4ae079d5..5a7fcab6beb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
-	pkgver = 0.5.1
-	pkgrel = 2
+	pkgver = 0.6.0
+	pkgrel = 1
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -19,9 +19,9 @@ pkgbase = skywire
 	makedepends = go
 	makedepends = musl
 	makedepends = kernel-headers-musl
-	source = https://github.com/skycoin/skywire/archive/refs/tags/v0.5.1.tar.gz
+	source = https://github.com/skycoin/skywire/archive/refs/tags/v0.6.0.tar.gz
 	source = skywire-scripts.tar.gz
-	sha256sums = f76bba50525c2057a9aba5d3a1fe95d1913890a19bc7ad2ff9113b278bf8d489
-	sha256sums = 7b5eb54ceb6e5bff241fa64b702827784d28b3460579195d03fa5fd6ea9ec9d3
+	sha256sums = f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3
+	sha256sums = 9808ca83ba706effe45a23a242e91a24d637979cc5886e59333e8d560fa8682b
 
 pkgname = skywire
diff --git a/PKGBUILD b/PKGBUILD
index c119f91f742f..5e930249d029 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ _pkgname=${pkgname}
 _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
-pkgver=0.5.1
-pkgrel=2
+pkgver=0.6.0
+pkgrel=1
 #pkgrel=2
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
 url="https://${_pkggopath}"
@@ -18,8 +18,8 @@ _scripts=${_pkgname}-scripts
 source=("${url}/archive/refs/tags/v${pkgver}.tar.gz"
 "${_scripts}.tar.gz"
 )
-sha256sums=('f76bba50525c2057a9aba5d3a1fe95d1913890a19bc7ad2ff9113b278bf8d489'
-            '7b5eb54ceb6e5bff241fa64b702827784d28b3460579195d03fa5fd6ea9ec9d3')
+sha256sums=('f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3'
+            '9808ca83ba706effe45a23a242e91a24d637979cc5886e59333e8d560fa8682b')
 prepare() {
 # https://wiki.archlinux.org/index.php/Go_package_guidelines
 mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
@@ -49,32 +49,19 @@ cd ${srcdir}/go/src/${_pkggopath}
 _cmddir=${srcdir}/go/src/${_pkggopath}/cmd
 #static compilation with 'musl' avoids glibc runtime deps
 #which cause binary to fail if correct glibc / libc6 is not found on the system
-
-_msg2 "building skychat binary"
-cd ${_cmddir}/apps/skychat
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS .
-_msg2 "building skysocks binary"
-cd ${_cmddir}/apps/skysocks
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS .
-_msg2 "building skysocks-client binary"
-cd ${_cmddir}/apps/skysocks-client
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS .
-_msg2 "building vpn-client binary"
-cd ${_cmddir}/apps/vpn-client
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS .
-_msg2 "building vpn-server binary"
-cd ${_cmddir}/apps/vpn-server
+cd ${_cmddir}/apps
+_app=$(ls)
+for _i in ${_app}; do
+_msg2 "building ${_i} binary"
+cd ${_cmddir}/apps/${_i}
 go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS .
-_msg2 "building skywire-cli binary"
-cd ${_cmddir}/skywire-cli
-go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN .
+done
 _msg2 "building skywire-visor binary"
 cd ${_cmddir}/skywire-visor
 go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN .
-_msg2 "building setup-node binary"
-cd ${_cmddir}/setup-node
+_msg2 "building skywire-cli binary"
+cd ${_cmddir}/skywire-cli
 go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN .
-
 #binary transparency
 cd $GOBIN
 _msg2 'binary sha256sums'
@@ -83,58 +70,52 @@ cd $_GOAPPS
 sha256sum $(ls)
 }
 
-
-
 package() {
   _msg2 'creating dirs'
+  _pkgdir=${pkgdir}
 #create directory trees or the visor might make them with weird permissions
 _skydir="opt/skywire"
 _skyapps="${_skydir}/apps"
-_skyscripts="${_skydir}/scripts"
-_systemddir="etc/systemd/system"
 _skybin="${_skydir}/bin"
-mkdir -p ${pkgdir}/usr/bin
-mkdir -p ${pkgdir}/${_skydir}/bin
-mkdir -p ${pkgdir}/${_skydir}/apps
-mkdir -p ${pkgdir}/${_skydir}/ssl
-mkdir -p ${pkgdir}/${_skydir}/local
-mkdir -p ${pkgdir}/${_skydir}/dmsgpty
-mkdir -p ${pkgdir}/${_skydir}/${_pkgname}
-mkdir -p ${pkgdir}/${_skydir}/${_pkgname}-save
-mkdir -p ${pkgdir}/${_skydir}/transport_logs
-mkdir -p ${pkgdir}/${_skydir}/skycache
-mkdir -p ${pkgdir}/${_skydir}/hypervisorkey
-mkdir -p ${pkgdir}/${_skydir}/scripts
+_skyscripts="${_skydir}/scripts"
+_systemddir="usr/lib/systemd/system"
+mkdir -p ${_pkgdir}/usr/bin
+mkdir -p ${_pkgdir}/${_skydir}/bin
+mkdir -p ${_pkgdir}/${_skydir}/apps
+mkdir -p ${_pkgdir}/${_skydir}/local
+mkdir -p ${_pkgdir}/${_skydir}/scripts
 
 _msg2 'installing binaries'
-_skywirebins=$( ls ${srcdir}/go/bin )
-for i in ${_skywirebins}; do
-  _install2 ${srcdir}/go/bin/${i} ${_skybin}
+_binaries=("${_pkgname}-cli" "${_pkgname}-visor")
+for i in ${_binaries[@]}; do
+_msg3 "${i}"
+ install -Dm755 ${GOBIN}/${i} ${_pkgdir}/${_skybin}/${i}
+ ln -rTsf ${_pkgdir}/${_skybin}/${i} ${_pkgdir}/usr/bin/${i}
 done
-_msg2 'installing apps'
-_skywireapps=$( ls ${srcdir}/go/apps )
-for i in ${_skywireapps}; do
-  _install2 ${srcdir}/go/apps/${i} ${_skyapps}
+_msg2 'installing app binaries'
+_apps=${srcdir}/apps
+_appbinaries=$( ls "${_GOAPPS}" )
+for i in ${_appbinaries}; do
+  _msg3 "${i}"
+  install -Dm755 ${_GOAPPS}/${i} ${_pkgdir}/${_skyapps}/${i}
+  ln -rTsf ${_pkgdir}/${_skyapps}/${i} ${_pkgdir}/usr/bin/${i}
 done
+
 _msg2 'installing scripts'
-_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} )
+_scripts1=${srcdir}/${_scripts}/${_pkgname}
+_skywirescripts=$( ls ${_scripts1} )
 for i in ${_skywirescripts}; do
-  _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts}
+  _install2 ${_scripts1}/${i} ${_skyscripts}
 done
 
-#rename visor to skywire - matche the skycoin / skycoin-cli of the skycoin wallet
-[[ -f ${pkgdir}/usr/bin/${_pkgname}-visor ]] && mv ${pkgdir}/usr/bin/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname}
+ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
 
-#install the patched system.d services
+#install the system.d services
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${pkgdir}/${_systemddir}/${_pkgname}.service
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${pkgdir}/${_systemddir}/${_pkgname}-visor.service
-
-#tls key and certificate generation
-install -Dm755 ${srcdir}/${_scripts}/ssl/generate.sh ${pkgdir}/${_skydir}/ssl/generate.sh
-ln -rTsf ${pkgdir}/${_skydir}/ssl/generate.sh ${pkgdir}/usr/bin/${_pkgname}-tls-gen
-install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/static/${_pkgname}-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
 }
 
+
 _install2() {
 _binname="${1##*/}"
 _binname="${_binname%%.*}"
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index dfd7e99b2316..047a2cfdbaa6 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -1,33 +1,30 @@
-# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 _projectname=skycoin
 pkgname=skywire
 _pkgname=${pkgname}
 _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Debian package; cross-compile."
+_pkggopath="github.com/${_githuborg}/${_pkgname}"
+pkgver=0.6.0
+pkgrel=1
+#pkgrel=2
+arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
+url="https://${_pkggopath}"
+license=()
 #set to native architecture with dpkg
 _pkgarch=$(dpkg --print-architecture)
 _pkgarches=('armhf' 'arm64' 'amd64')
 arch=('any')
-#manually version for now
-pkgver='0.5.1'
 _pkgver=${_pkgver}
-pkgrel=2
 _pkgrel=${_pkgrel}
-_pkggopath="github.com/${_githuborg}/${_pkgname}"
-url="https://${_pkggopath}"
-license=()
-#make deps for every architecture are included here..
 makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') # 'arm-linux-gnueabihf-binutils' 'aarch64-binutils') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring')
-depends=()
 _debdeps=""
-#_debdeps="reprepro"
+install=skywire.install
 _scripts="skywire-deb-scripts"
-source=( "${url}/archive/refs/tags/v${pkgver}.tar.gz"
-"${_scripts}.tar.gz"  )
-sha256sums=('f76bba50525c2057a9aba5d3a1fe95d1913890a19bc7ad2ff9113b278bf8d489'
-            'e47b816303ab824960feb74e205299c067a104c33f7ef59328e88931e92081f9')
-
+source=("${url}/archive/refs/tags/v${pkgver}.tar.gz"
+"${_scripts}.tar.gz"
+)
+sha256sums=('f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3'
+            'fa42fb88711391d6fbf29ab457e3c6044735155707332af03afc77f506693fdc')
 #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts
 #updpkgsums deb.PKGBUILD
 
@@ -35,7 +32,6 @@ prepare() {
   for i in ${_pkgarches[@]}; do
   _msg2 "$i"
 done
-
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
 	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarches[@]} ${srcdir}/go/apps.${_pkgarches[@]}
   ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
@@ -58,17 +54,7 @@ build() {
     [[ $_pkgarch == "amd64" ]] && export GOARCH=amd64 && export CC=musl-gcc
     [[ $_pkgarch == "arm64" ]] && export GOARCH=arm64 && export CC=aarch64-linux-musl-gcc
     [[ $_pkgarch == "armhf" ]] && export GOARCH=arm && export GOARM=6 && export CC=arm-linux-gnueabihf-musl-gcc
-
     #_ldflags=('-linkmode external -extldflags "-static" -buildid=')
-
-    #${_defaults} ${_goarch}
-    #create read only cache binary
-    #go build -trimpath -o $GOBIN/ ${srcdir}/${_scripts}/skycache.go
-    cd ${srcdir}/${_scripts}/skycache
-    _msg2 'building skycache binary'
-    go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go
-    go build -trimpath --ldflags '-s -w -buildid=' -o $GOBIN/ skycache.go
-
     #create the skywire binaries
     cd ${srcdir}/go/src/${_pkggopath}
     _cmddir=${srcdir}/go/src/${_pkggopath}/cmd
@@ -109,10 +95,8 @@ _GOHERE=$2  #target bin dir
 _binpath=$3   #find the binary here- expecting 'apps/' or empty
 _binname=$1 #which binary to build
 _msg2 "building ${_binname} binary"
-if [[ ! -f ${_GOHERE}/${_binname} ]] ; then #don't waste time rebuilding existing bins
 	cd ${_cmddir}/${_binpath}${_binname}
   go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o ${_GOHERE}/${_binname} .
-fi
 }
 
 
@@ -126,21 +110,14 @@ _debpkgdir="${_pkgname}-${pkgver}-${_pkgrel}-${_pkgarch}"
 _pkgdir="${pkgdir}/${_debpkgdir}"
 _skydir="opt/skywire"
 _skyapps="${_skydir}/apps"
+_skybin="${_skydir}/bin"
 _skyscripts="${_skydir}/scripts"
 _systemddir="etc/systemd/system"
-_skybin="${_skydir}/bin"
 [[ -d ${_pkgdir} ]] && rm -rf ${_pkgdir}
 mkdir -p ${_pkgdir}/usr/bin
-#this was done at my discretion for tls autoconfig
-mkdir -p ${_pkgdir}/${_skydir}/ssl
-#the skeleton of the hyperviorkey package; created with a script run on target machines
-mkdir -p ${_pkgdir}/${_skydir}/hypervisorkey/opt/${_pkgname}
-#other dirs must be created or the visor will create them at runtime with weird permissions
+mkdir -p ${_pkgdir}/${_skydir}/bin
+mkdir -p ${_pkgdir}/${_skydir}/apps
 mkdir -p ${_pkgdir}/${_skydir}/local
-mkdir -p ${_pkgdir}/${_skydir}/dmsgpty
-mkdir -p ${_pkgdir}/${_skydir}/${_pkgname}    #needed?
-mkdir -p ${_pkgdir}/${_skydir}/skycache    #local package repository
-mkdir -p ${_pkgdir}/${_skydir}/transport_logs
 mkdir -p ${_pkgdir}/${_skydir}/scripts
 
 cd $_pkgdir
@@ -162,29 +139,35 @@ for i in ${_skywireapps}; do
 done
 
 _msg2 'installing scripts'
-_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} )
+_scripts1=${srcdir}/${_scripts}/${_pkgname}
+_skywirescripts=$( ls "${_scripts1}" )
 for i in ${_skywirescripts}; do
-  _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts}
+  _install2 ${_scripts1}/${i} ${_skyscripts}
 done
 
-_msg2 'renaming skywire-visor to skywire'
-mv ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
+_msg2 'Correcting symlink names'
+ln -rTsf ${_pkgdir}/${_skybin}/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
+
+#make sure everything is executable
+chmod +x ${_pkgdir}/usr/bin/*
 
-_msg2 'installing skywire systemd services'
+#install dmsghttp-config.json
+install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
+
+_msg2 'installing systemd services'
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
 install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service
+#this is to overwrites any previous file not provided by this package
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}-hypervisor.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-autoconfig.service ${_pkgdir}/${_systemddir}/${_pkgname}-autoconfig.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-autoconfig-remote.service ${_pkgdir}/${_systemddir}/${_pkgname}-autoconfig-remote.service
 
-_msg2 'installing tls key and certificate generation scripts'
-#install -Dm755 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/generate-1.sh ${pkgdir}/${_skydir}/ssl/generate.sh
-install -Dm755 ${srcdir}/${_scripts}/ssl/generate.sh ${_pkgdir}/${_skydir}/ssl/generate.sh
-ln -rTsf ${_pkgdir}/${_skydir}/ssl/generate.sh ${_pkgdir}/usr/bin/skywire-tls-gen
-install -Dm644 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
-#install -Dm644 ${srcdir}/${_scripts}/ssl/certificate.cnf ${_pkgdir}/${_skydir}/ssl/certificate.cnf
-
-_msg2 'installing skywire control file, postinst & postrm scripts'
+_msg2 'installing control file and install scripts'
 install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control
+#install -Dm755 ${srcdir}/${_scripts}/preinst.sh ${_pkgdir}/DEBIAN/preinst
 install -Dm755 ${srcdir}/${_scripts}/postinst.sh ${_pkgdir}/DEBIAN/postinst
-install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm
+install -Dm755 ${srcdir}/${_scripts}/prerm.sh ${_pkgdir}/DEBIAN/prerm
+#install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm
 
 _msg2 'creating the debian package'
 #create the debian package!
@@ -209,3 +192,9 @@ _msg2() {
 	local mesg=$1; shift
 	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
 }
+
+_msg3() {
+(( QUIET )) && return
+local mesg=$1; shift
+printf "${BLUE}  -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
+}
diff --git a/skywire-deb-scripts.tar.gz b/skywire-deb-scripts.tar.gz
index 65825cf2e922..ff4c3ffc2437 100644
--- a/skywire-deb-scripts.tar.gz
+++ b/skywire-deb-scripts.tar.gz
diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz
index af2d6719d584..e9d4791d8678 100644
--- a/skywire-scripts.tar.gz
+++ b/skywire-scripts.tar.gz