Update to 1.6.22

2 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 787c7f79b62d..5f43ea47a7fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = solana
 	pkgdesc = A fast, secure, and censorship resistant blockchain.
-	pkgver = 1.6.14
+	pkgver = 1.6.22
 	pkgrel = 1
 	url = https://www.solana.com
 	arch = i686
@@ -9,9 +9,9 @@ pkgbase = solana
 	makedepends = rustup
 	provides = solana
 	conflicts = solana-bin
-	source = solana-1.6.14.tar.gz::https://github.com/solana-labs/solana/archive/v1.6.14.tar.gz
-	source = spl-token-0.1.6.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/@solana/spl-token@v0.1.6.tar.gz
-	md5sums = acf79592f6b92cac7c6270f608b27b71
-	md5sums = 83a7a13aa3b28d89859ee74fb6ff2fcf
+	source = solana-1.6.22.tar.gz::https://github.com/solana-labs/solana/archive/v1.6.22.tar.gz
+	source = spl-token-0.1.8.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/@solana/spl-token@v0.1.8.tar.gz
+	md5sums = 7d10e24c58fbc7f65cfebe1a8cb51df0
+	md5sums = d2a25d5b510bcc796ef955f71884581e
 
 pkgname = solana
diff --git a/PKGBUILD b/PKGBUILD
index 7fa2588da27b..05ac232b9e89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ivan Marquesi Lerner <ivanmlerner@protonmail.com>
 pkgname=solana  
-pkgver=1.6.14
-_splver=0.1.6
+pkgver=1.6.22
+_splver=0.1.8
 pkgrel=1
 pkgdesc="A fast, secure, and censorship resistant blockchain."
 url="https://www.solana.com"
@@ -13,8 +13,8 @@ conflicts=("solana-bin")
 provides=("solana")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/solana-labs/$pkgname/archive/v$pkgver.tar.gz"
         "spl-token-$_splver.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/@solana/spl-token@v$_splver.tar.gz")
-md5sums=('acf79592f6b92cac7c6270f608b27b71'
-         '83a7a13aa3b28d89859ee74fb6ff2fcf')
+md5sums=('7d10e24c58fbc7f65cfebe1a8cb51df0'
+         'd2a25d5b510bcc796ef955f71884581e')
 
 prepare() {
   rustup update stable
@@ -40,7 +40,6 @@ build() {
     solana-dos
     solana-install-init
     solana-stake-accounts
-    solana-stake-monitor
     solana-stake-o-matic
     solana-test-validator
     solana-tokens
@@ -51,9 +50,9 @@ build() {
   for bin in "${BINS[@]}"; do
     binargs+=(--bin "$bin")
   done
-  cargo build --release "${binargs[@]}"
+  cargo build --release --locked "${binargs[@]}"
   cd "$srcdir/solana-program-library--solana-spl-token-v$_splver"
-  cargo build --release --bin spl-token
+  cargo build --release --locked --bin spl-token
 }
 
 package() {
@@ -76,7 +75,6 @@ package() {
     solana-dos
     solana-install-init
     solana-stake-accounts
-    solana-stake-monitor
     solana-stake-o-matic
     solana-test-validator
     solana-tokens
@@ -87,4 +85,10 @@ package() {
      install -Dm755 $srcdir/$pkgname-$pkgver/target/release/$bin $pkgdir/usr/bin
   done
   install -Dm755 $srcdir/solana-program-library--solana-spl-token-v$_splver/target/release/spl-token $pkgdir/usr/bin
+
+##  mkdir -p $pkgdir/usr/bin/sdk
+##  cp -a $srcdir/$pkgname-$pkgver/sdk/bpf $pkgdir/usr/bin/sdk
+
+##  mkdir -p $pkgdir/usr/bin/deps
+##  cp -a $srcdir/$pkgname-$pkgver/target/release/deps/libsolana*program.* $pkgdir/usr/bin/deps
 }