summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD15
-rw-r--r--cc.deb.PKGBUILD12
-rw-r--r--deb.PKGBUILD11
-rw-r--r--dev.PKGBUILD9
-rw-r--r--git.PKGBUILD10
-rwxr-xr-xupdates.sh8
7 files changed, 35 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4074098a0ef1..4ff04ff88250 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,11 +15,12 @@ pkgbase = skywire
arch = armhf
arch = armel
arch = arm
+ license = license-free
makedepends = git
makedepends = go
makedepends = musl
makedepends = kernel-headers-musl
- source = https://github.com/skycoin/skywire/archive/refs/tags/v1.1.0-pr1.tar.gz
+ source = https://github.com/skycoin/skywire/archive/refs/tags/v1.1.0.tar.gz
source = skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin
source = com.skywire.Skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywire.Skywire.desktop?h=skywire-bin
source = com.skywirevpn.SkywireVPN.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywirevpn.SkywireVPN.desktop?h=skywire-bin
@@ -27,10 +28,10 @@ pkgbase = skywire
source = skywire.png::https://aur.archlinux.org/cgit/aur.git/plain/skywire.png?h=skywire-bin
source = skywire.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire.service?h=skywire-bin
source = skywire-autoconfig.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig.service?h=skywire-bin
- sha256sums = 40b74f7251672e83f72fa0a3d359a9aae26e65c58fae538e1507bfd415b3970b
- sha256sums = 38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150
+ sha256sums = 2f50904749231ffddf8ca348214491289d1ca099192caf0c9d0a9a7409f9a7ff
+ sha256sums = 08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316
sha256sums = f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65
- sha256sums = e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539
+ sha256sums = 0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8
sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e
sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495
sha256sums = 19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18
diff --git a/PKGBUILD b/PKGBUILD
index f8c61bd0a17d..4ed2fc2c1abf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
- # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
+# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
_projectname=skycoin
pkgname=skywire
_pkgname=${pkgname}
@@ -9,15 +8,15 @@ _pkggopath="github.com/${_githuborg}/${_pkgname}"
pkgver='1.1.0'
pkgrel=1
#pkgrel=1
-_rc='-pr1'
+_rc=''
+#_rc='-pr1'
_pkgver="${pkgver}${_rc}"
_tag_ver="v${_pkgver}"
arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
url="https://${_pkggopath}"
-license=()
+license=('license-free')
makedepends=('git' 'go' 'musl' 'kernel-headers-musl')
install=skywire.install
-_scripts=${_pkgname}-scripts
source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz"
"skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin"
"com.skywire.Skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywire.Skywire.desktop?h=skywire-bin"
@@ -27,10 +26,10 @@ source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz"
"skywire.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire.service?h=skywire-bin"
"skywire-autoconfig.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig.service?h=skywire-bin"
)
-sha256sums=('40b74f7251672e83f72fa0a3d359a9aae26e65c58fae538e1507bfd415b3970b'
- '38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150'
+sha256sums=('2f50904749231ffddf8ca348214491289d1ca099192caf0c9d0a9a7409f9a7ff'
+ '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
- 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539'
+ '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index f0e8330eb698..6b0875323b80 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -1,3 +1,4 @@
+
_projectname=skycoin
pkgname=skywire
_pkgname=${pkgname}
@@ -7,13 +8,13 @@ _pkggopath="github.com/${_githuborg}/${_pkgname}"
pkgver='1.1.0'
pkgrel=1
#pkgrel=1
-_rc='-pr1'
+_rc=''
_pkgver="${pkgver}${_rc}"
_tag_ver="v${_pkgver}"
_pkgrel=${pkgrel}
arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
url="https://${_pkggopath}"
-license=()
+license=('license-free')
#set to native architecture with dpkg
_pkgarch=$(dpkg --print-architecture)
_pkgarches=('armhf' 'arm64' 'amd64')
@@ -21,7 +22,6 @@ arch=('any')
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')
_debdeps=""
install=skywire.install
-_scripts="skywire-scripts"
source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz"
"skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin"
"com.skywire.Skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywire.Skywire.desktop?h=skywire-bin"
@@ -33,10 +33,10 @@ source=("${url}/archive/refs/tags/${_tag_ver}.tar.gz"
"postinst.sh::https://aur.archlinux.org/cgit/aur.git/plain/postinst.sh?h=skywire-bin"
"prerm.sh::https://aur.archlinux.org/cgit/aur.git/plain/prerm.sh?h=skywire-bin"
)
-sha256sums=('40b74f7251672e83f72fa0a3d359a9aae26e65c58fae538e1507bfd415b3970b'
- '38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150'
+sha256sums=('2f50904749231ffddf8ca348214491289d1ca099192caf0c9d0a9a7409f9a7ff'
+ '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
- 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539'
+ '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index 6191ca7dbbeb..4d9d8d72b2cf 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -1,5 +1,4 @@
# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
_projectname=skycoin
pkgname=skywire
_pkgname=${pkgname}
@@ -11,7 +10,7 @@ _pkgarch=$(dpkg --print-architecture)
arch=('any')
pkgver='1.1.0'
pkgrel=1
-_rc='-pr1'
+_rc=''
_pkgver="${pkgver}${_rc}"
_tag_ver="v${_pkgver}"
_pkgrel=${pkgrel}
@@ -21,7 +20,7 @@ license=()
makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl')
depends=()
_debdeps=""
-_scripts="skywire-scripts"
+license=('license-free')
source=( "${url}/archive/refs/tags/${_tag_ver}.tar.gz"
"skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin"
"com.skywire.Skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywire.Skywire.desktop?h=skywire-bin"
@@ -33,10 +32,10 @@ source=( "${url}/archive/refs/tags/${_tag_ver}.tar.gz"
"postinst.sh::https://aur.archlinux.org/cgit/aur.git/plain/postinst.sh?h=skywire-bin"
"prerm.sh::https://aur.archlinux.org/cgit/aur.git/plain/prerm.sh?h=skywire-bin"
)
-sha256sums=('40b74f7251672e83f72fa0a3d359a9aae26e65c58fae538e1507bfd415b3970b'
- '38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150'
+sha256sums=('2f50904749231ffddf8ca348214491289d1ca099192caf0c9d0a9a7409f9a7ff'
+ '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
- 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539'
+ '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
diff --git a/dev.PKGBUILD b/dev.PKGBUILD
index c407106bc58d..f335d91800ae 100644
--- a/dev.PKGBUILD
+++ b/dev.PKGBUILD
@@ -1,5 +1,4 @@
- # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
+# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
_projectname=skycoin
pkgname=skywire
_pkgname=${pkgname}
@@ -19,7 +18,7 @@ makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl')
depends=()
_debdeps=""
install=skywire.install
-_scripts="skywire-scripts"
+license=('license-free')
source=("git+${url}.git#branch=develop"
"skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin"
"com.skywire.Skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywire.Skywire.desktop?h=skywire-bin"
@@ -32,9 +31,9 @@ source=("git+${url}.git#branch=develop"
"prerm.sh::https://aur.archlinux.org/cgit/aur.git/plain/prerm.sh?h=skywire-bin"
)
sha256sums=('SKIP'
- '38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150'
+ '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
- 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539'
+ '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
diff --git a/git.PKGBUILD b/git.PKGBUILD
index 3844ff7e0610..4a8e1389b96c 100644
--- a/git.PKGBUILD
+++ b/git.PKGBUILD
@@ -1,5 +1,4 @@
- # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
+# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
_projectname=skycoin
pkgname=skywire
_pkgname=${pkgname}
@@ -11,10 +10,9 @@ pkgrel=1
#pkgrel=1
arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
url="https://${_pkggopath}"
-license=()
+license=('license-free')
makedepends=('git' 'go' 'musl' 'kernel-headers-musl')
install=skywire.install
-_scripts=${_pkgname}-scripts
source=("git+${url}.git#branch=develop"
"skywire-autoconfig::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig?h=skywire-bin"
"com.skywire.Skywire.desktop::https://aur.archlinux.org/cgit/aur.git/plain/com.skywire.Skywire.desktop?h=skywire-bin"
@@ -25,9 +23,9 @@ source=("git+${url}.git#branch=develop"
"skywire-autoconfig.service::https://aur.archlinux.org/cgit/aur.git/plain/skywire-autoconfig.service?h=skywire-bin"
)
sha256sums=('SKIP'
- '38d3727b36415db682be48025cdc6ea3d3c5cf331893dd59089a562468cab150'
+ '08f0c625a3ae8810f0468a45aa2e463425ec307441f71f6ba48114bda2055316'
'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65'
- 'e6ea2c7471bcf5bc83e8fd831c047ba61b98eab58ca7c055475714dcf6066539'
+ '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8'
'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'19b74f7a9b245a96617f31d1fef7ce1e0231b2359d6525dd3f35d2b2a9d10d18'
diff --git a/updates.sh b/updates.sh
index 71e40acba1e2..32f0df02e11d 100755
--- a/updates.sh
+++ b/updates.sh
@@ -13,10 +13,10 @@ _version=${_version//v/}
# _vrc="-${_vrc##*-}"
#fi
#get release candidate version from source repo
-_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -pr)
-if [[ $_vrc != "" ]]; then
- _vrc="-${_vrc##*-}"
-fi
+#_vrc=$(git ls-remote --tags --refs --sort="version:refname" https://github.com/skycoin/skywire.git | tail -n1 | grep -- -pr)
+#if [[ $_vrc != "" ]]; then
+# _vrc="-${_vrc##*-}"
+#fi
echo ${_version}
echo ${_vrc}
echo "updating checksums and version for PKGBUILD"