Update to 1.13.0 and add missing files

3 files changed, 27 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92aa5a16d7ea..be2b34ec1304 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = solana
 	pkgdesc = A fast, secure, and censorship resistant blockchain.
-	pkgver = 1.10.38
-	pkgrel = 2
+	pkgver = 1.13.0
+	pkgrel = 1
 	url = https://www.solana.com
 	install = solana.install
 	arch = x86_64
@@ -13,10 +13,12 @@ pkgbase = solana
 	conflicts = solana-bin
 	conflicts = spl-token-cli
 	noextract = perf-libs-0.19.3.tar.gz
-	source = solana-1.10.38.tar.gz::https://github.com/solana-labs/solana/archive/v1.10.38.tar.gz
+	source = cargo-build-bpf
+	source = solana-1.13.0.tar.gz::https://github.com/solana-labs/solana/archive/v1.13.0.tar.gz
 	source = spl-token-cli-2.0.17.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/token-cli-v2.0.17.tar.gz
 	source = perf-libs-0.19.3.tar.gz::https://github.com/solana-labs/solana-perf-libs/releases/download/v0.19.3/solana-perf.tgz
-	sha256sums = 276a5a7e12208770954e9bfa86339f49943767e9ad869fe6dd20bd7a4dfc4ea4
+	sha256sums = 9aa39d566ffcd248c6061b62cd9d32c21e9d5e3b644f3247b98675fc7bd8ca22
+	sha256sums = ce2c7ae830bbf79bce81d2267a7267651a58d3a4dade0269533bf023ecd7c578
 	sha256sums = c17d42533fb666392cd577ecbc67eddad950ab8b911fa8e82e9c03dceaf37862
 	sha256sums = 5850dc8ba63017cdb0c97357cc0e26e60f445abc1ef3c95a61b88e59afae71a4
 
diff --git a/PKGBUILD b/PKGBUILD
index c45f5ef764e9..7cc2ce97a4f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Ivan Marquesi Lerner <ivanmlerner@protonmail.com>
 pkgname=solana  
-pkgver=1.10.38
+pkgver=1.13.0
 _tokenver=2.0.17
 _perflibsver=0.19.3
 _rustver=1.59.0
-pkgrel=2
+pkgrel=1
 pkgdesc="A fast, secure, and censorship resistant blockchain."
 url="https://www.solana.com"
 arch=('x86_64')
@@ -14,19 +14,21 @@ makedepends=("rustup" "clang")
 conflicts=("solana-bin" "spl-token-cli")
 provides=("spl-token")
 install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/solana-labs/$pkgname/archive/v$pkgver.tar.gz"
+source=("cargo-build-bpf"
+	"$pkgname-$pkgver.tar.gz::https://github.com/solana-labs/$pkgname/archive/v$pkgver.tar.gz"
         "spl-token-cli-$_tokenver.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/token-cli-v$_tokenver.tar.gz"
         "perf-libs-$_perflibsver.tar.gz::https://github.com/solana-labs/solana-perf-libs/releases/download/v$_perflibsver/solana-perf.tgz")
-sha256sums=('276a5a7e12208770954e9bfa86339f49943767e9ad869fe6dd20bd7a4dfc4ea4'
+sha256sums=('9aa39d566ffcd248c6061b62cd9d32c21e9d5e3b644f3247b98675fc7bd8ca22'
+            'ce2c7ae830bbf79bce81d2267a7267651a58d3a4dade0269533bf023ecd7c578'
             'c17d42533fb666392cd577ecbc67eddad950ab8b911fa8e82e9c03dceaf37862'
             '5850dc8ba63017cdb0c97357cc0e26e60f445abc1ef3c95a61b88e59afae71a4')
 noextract=("perf-libs-$_perflibsver.tar.gz")
 
 prepare() {
   mkdir -p "$srcdir/$pkgname-$pkgver/target/perf-libs"
-  tar -x -f "perf-libs-$_perflibsver.tar.gz" -C "$srcdir/$pkgname-$pkgver/target/perf-libs"
-  sed -i '43a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .parent()\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .expect("Unable to get parent directory")' $srcdir/$pkgname-$pkgver/sdk/cargo-build-bpf/src/main.rs
-  sed -i '46a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .join("lib")\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .join("solana")' $srcdir/$pkgname-$pkgver/sdk/cargo-build-bpf/src/main.rs
+  tar -x -f "$srcdir/perf-libs-$_perflibsver.tar.gz" -C "$srcdir/$pkgname-$pkgver/target/perf-libs"
+#  sed -i '43a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .parent()\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .expect("Unable to get parent directory")' $srcdir/$pkgname-$pkgver/sdk/cargo-build-bpf/src/main.rs
+#  sed -i '46a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .join("lib")\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .join("solana")' $srcdir/$pkgname-$pkgver/sdk/cargo-build-bpf/src/main.rs
   rustup toolchain install $_rustver
   cd "$srcdir/$pkgname-$pkgver"
   cargo +$_rustver fetch --locked --target "$CARCH-unknown-linux-gnu"
@@ -86,7 +88,6 @@ package() {
     solana-sys-tuner
     solana-validator
     rbpf-cli
-    cargo-build-bpf
     cargo-test-bpf
     solana-dos
     solana-install-init
@@ -99,7 +100,13 @@ package() {
   
   for bin in "${BINS[@]}"; do
      install -Dm755 -t $pkgdir/usr/bin $srcdir/$pkgname-$pkgver/target/release/$bin
-  done  
+  done
   install -Dm755 -t $pkgdir/usr/bin $srcdir/solana-program-library-token-cli-v$_tokenver/target/release/spl-token
+  install -Dm755 -t $pkgdir/usr/lib/$pkgname $srcdir/$pkgname-$pkgver/target/release/cargo-build-bpf
+  install -Dm755 -t $pkgdir/usr/bin $srcdir/cargo-build-bpf
   cp -a $srcdir/$pkgname-$pkgver/sdk/bpf/* $pkgdir/usr/lib/$pkgname/sdk/bpf
+  cp -a $srcdir/$pkgname-$pkgver/target/perf-libs $pkgdir/usr/lib/$pkgname/
+  for dep in $srcdir/$pkgname-$pkgver/target/release/deps/libsolana*program.*; do
+    install -Dm755 -t $pkgdir/usr/lib/$pkgname/deps $dep
+  done
 }
diff --git a/cargo-build-bpf b/cargo-build-bpf
new file mode 100755
index 000000000000..0ec222070023
--- /dev/null
+++ b/cargo-build-bpf
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+pushd /usr/lib/solana/
+./cargo-build-bpf "$@"
+popd
\ No newline at end of file