From 26c29cf2de576d7cd105b55af2be7758269ea1bd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 11 Feb 2021 23:32:01 +0000
Subject: [PATCH] extra/rust to 1.50.0-1

---
 extra/rust/PKGBUILD     | 22 ++++++++++++++--------
 extra/rust/libexec.diff | 24 ++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 extra/rust/libexec.diff

diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD
index 3831a64d2..05c6a589f 100644
--- a/extra/rust/PKGBUILD
+++ b/extra/rust/PKGBUILD
@@ -16,10 +16,10 @@ highmem=1
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.49.0
+pkgver=1.50.0
 pkgrel=1
 
-_llvm_ver=11.0.0
+_llvm_ver=11.0.1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
 url='https://www.rust-lang.org/'
@@ -32,13 +32,16 @@ checkdepends=('procps-ng' 'gdb')
 
 options=('!emptydirs' '!strip')
 
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
-
-sha256sums=('b50aefa8df1fdfc9bccafdbf37aee611c8dfe81bf5648d5f43699c50289dc779'
+source=(
+  "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+  "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
+  libexec.diff
+)
+sha256sums=('95978f8d02bb6175ae3238930baf03563c240aedf9a70bebdc3eaa2a8c3c5a5e'
             'SKIP'
-            '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234'
-            'SKIP')
+            '087be3f1116e861cd969c9b0b0903c27028b52eaf45157276f50a9c2500687fc'
+            'SKIP'
+            '9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
@@ -46,6 +49,9 @@ validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag a
 prepare() {
   cd "rustc-$pkgver-src"
 
+  # Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
+  patch -Np1 -i ../libexec.diff
+
   cat >config.toml <<END
 [llvm]
 link-shared = true
diff --git a/extra/rust/libexec.diff b/extra/rust/libexec.diff
new file mode 100644
index 000000000..a1ebe2024
--- /dev/null
+++ b/extra/rust/libexec.diff
@@ -0,0 +1,24 @@
+diff -u -r rustc-1.50.0-src/src/bootstrap/dist.rs rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs
+--- rustc-1.50.0-src/src/bootstrap/dist.rs	2021-02-10 17:36:44.000000000 +0000
++++ rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs	2021-02-11 18:23:36.312495419 +0000
+@@ -980,7 +980,7 @@
+         for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
+             let dirent = dirent.expect("read dir entry");
+             if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
+-                tarball.add_file(&dirent.path(), "libexec", 0o755);
++                tarball.add_file(&dirent.path(), "lib", 0o755);
+             }
+         }
+ 
+diff -u -r rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs
+--- rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs	2021-02-10 17:37:00.000000000 +0000
++++ rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs	2021-02-11 18:24:14.944321464 +0000
+@@ -223,7 +223,7 @@
+         .parent()
+         .and_then(|p| p.parent())
+         .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
+-    let exe = root.join("libexec").join(format!(
++    let exe = root.join("lib").join(format!(
+         "cargo-credential-{}{}",
+         cred_name,
+         std::env::consts::EXE_SUFFIX