community/rust: upgrade to 1.30.0

4 files changed, 16 insertions, 61 deletions

diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index f00d1517de..d6a4bc3d23 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -3,10 +3,10 @@
 # Contributor: Jeizsm <jeizsm@gmail.com>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=rust
-pkgver=1.29.0
+pkgver=1.30.0
 # TODO: bump to 6 as soon as we add llvm6
 _llvmver=5
-_bootver=1.28.0
+_bootver=1.29.0
 pkgrel=0
 pkgdesc="The Rust Programming Language"
 url="http://www.rust-lang.org"
@@ -69,7 +69,6 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz
 	alpine-target.patch
 	install-template-shebang.patch
 	bootstrap-tool-respect-tool-config.patch
-	cargo-tests-fix-build-auth-http_auth_offered.patch
 	cargo-tests-ignore-resolving_minimum_version_with_transitive_deps.patch
 	check-rustc
 	"
@@ -270,18 +269,17 @@ _mv() {
 	mv $@
 }
 
-sha512sums="3c6b79cce5a42553bc4360591c6e6b42b36f035243b8cb688a0d4b08c10793e59d257bf9e781c9345c92f765a63a9e161e3e3346f02ddc733e4b401cb5aeb302  rustc-1.29.0-src.tar.gz
+sha512sums="a4737727818397a26974449e9e7ddc09ae7430a08102ae05729317b19675fa89ad82a8f5bc5b7c913d894866a30dfe3c539c80e29c2b0ade6ecde06db8216981  rustc-1.30.0-src.tar.gz
 6713d0d0ccac6b17ed47e486c6d74d1f913887bf88d42527576188fa98063a33a1ea903967847d52126b996f965577f1311344d6e57063b1625221847290a0ed  musl-fix-static-linking.patch
 3615b815cfb4eae60f3291dc07a292e1be6048eeddcb21c595bddbe8cca6a622e5b76be72a76f6b65b4d33abdc34a792ce010b024b2818a4d73bce3f85b3eb2b  musl-fix-linux_musl_base.patch
 e40d41a6dc5d400d6672f1836cd5b9e00391f7beb52e872d87db76bc95a606ce6aaae737a0256a1e5fba77c83bb223818d214dbe87028d47be65fb43c101595c  llvm-with-ffi.patch
 9fe4c230165a29ffc5557952d20e62b42e0c384a874e2584fa227239b44d20079878a740e525a51a1262d5a2194b2efe0b4e2e846fe317ea4c496d5fc1834671  static-pie.patch
 487d479a15b43c3e1ee28c111206a4f488be933309f3c6571be7ec33da4e955cc1ee907b7729b4228cb292ca7b3324eb6ba4f32a01abc3d04573a0d96982569a  need-rpath.patch
 5e8557e72b250b8726b821541dc7d0e40d8179220cfdacd6d74ed19c756ffb214d9f882e82856acb4fbfbfe5c70f1c6de6813db3ba92a2c0e2e425bb5eb620ba  minimize-rpath.patch
-0c0aa7eeddeb578c320a94696a4437fbf083ef4d6f8049512de82548285f37ec4460b5d04f087dc303a5f62a09b5d13b7f0c4fbbdb0b321147ae030e7282ac07  alpine-move-py-scripts-to-share.patch
+35e0619672843d9dd41df4a086404a59b57c12fa014e42d06102bc3856a96ed021e716f9d581ec5c89444acbaedd3edcd2b8a85576df3bb4451c0edde3afbba5  alpine-move-py-scripts-to-share.patch
 61aa415d754e9e01236481a1f3c9d5242f2d633e6f11b998e9ffcc07bf5c182d87c0c973dab6f10e4bb3ab4b4a4857bf9ed8dd664c49a65f6175d27db2774db1  alpine-change-rpath-to-rustlib.patch
-a688b4bc2420bf05c6ae724c9a4e6821267716032f69a9a44cb395407276df7fb37fc145f8d274b5fa03e7173c338871c9d2294a90726ef16bd087fbe6a77b66  alpine-target.patch
+a69b2ae7ffddbacee4b400645a829fbc7f5313f2ebf796c2a5aa4f93d5f2eb62993c201fc0241684ad23e6b3a929a4674ee9b8ec98468ecfaae35cc34a941fdb  alpine-target.patch
 7d59258d4462eba0207739a5c0c8baf1f19d9a396e5547bb4d59d700eb94d50ba6add2e523f3e94e29e993821018594625ea4ac86304fb58f7f8c82622a26ab0  install-template-shebang.patch
 c2ccab15d48c11cc3af549a3944ca0d29cb3790345468f4f3779e5ac931554dea603e5523281fc391ba4a555ee468b516961c4cb8ecee007eadacf114f3d8758  bootstrap-tool-respect-tool-config.patch
-332a6af59edc507baa73eda1de60591dd4202f540541769ac1bcbc731267f4523ea309d2c3b1f5a9dc3db32831942a5d3d40b81882dad0bf0b5ee7f74f1d6477  cargo-tests-fix-build-auth-http_auth_offered.patch
 3d6f027088e1ec189ce864bf5ed150ccad8be5d9fc0973f1b4d202eec6eab865834403335a9f0765bbfa54638aed7f5d5f2183ba9dfeab9f5bc4ef48111a8427  cargo-tests-ignore-resolving_minimum_version_with_transitive_deps.patch
 c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125  check-rustc"
diff --git a/community/rust/alpine-move-py-scripts-to-share.patch b/community/rust/alpine-move-py-scripts-to-share.patch
index 261e62a84a..44d3320b39 100644
--- a/community/rust/alpine-move-py-scripts-to-share.patch
+++ b/community/rust/alpine-move-py-scripts-to-share.patch
@@ -11,12 +11,12 @@
  # Set the environment variable `RUST_GDB` to overwrite the call to a
 --- a/src/etc/rust-lldb
 +++ b/src/etc/rust-lldb
-@@ -33,7 +33,7 @@
- RUSTC_SYSROOT=`rustc --print sysroot`
+@@ -35,7 +35,7 @@
+ fi
  
- # Write the LLDB script to the tempfile
--echo "command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" >> $TMPFILE
-+echo "command script import \"$RUSTC_SYSROOT/share/rust/etc/lldb_rust_formatters.py\"" >> $TMPFILE
- echo "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" >> $TMPFILE
- echo "type category enable Rust" >> $TMPFILE
+ # Prepare commands that will be loaded before any file on the command line has been loaded
+-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\""
++script_import="command script import \"$RUSTC_SYSROOT/share/rust/etc/lldb_rust_formatters.py\""
+ category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust"
+ category_enable="type category enable Rust"
  
diff --git a/community/rust/alpine-target.patch b/community/rust/alpine-target.patch
index b9f22b02f2..d25da5b584 100644
--- a/community/rust/alpine-target.patch
+++ b/community/rust/alpine-target.patch
@@ -9,10 +9,10 @@ and distribution-specific quirks instead of polluting the main musl target of
 
 --- a/src/librustc_target/spec/mod.rs
 +++ b/src/librustc_target/spec/mod.rs
-@@ -239,6 +239,11 @@
-     ("armv7-unknown-cloudabi-eabihf", armv7_unknown_cloudabi_eabihf),
-     ("i686-unknown-cloudabi", i686_unknown_cloudabi),
-     ("x86_64-unknown-cloudabi", x86_64_unknown_cloudabi),
+@@ -412,6 +412,11 @@
+     ("riscv32imac-unknown-none-elf", riscv32imac_unknown_none_elf),
+ 
+     ("aarch64-unknown-none", aarch64_unknown_none),
 +
 +    ("i586-alpine-linux-musl", i586_alpine_linux_musl),
 +    ("x86_64-alpine-linux-musl", x86_64_alpine_linux_musl),
diff --git a/community/rust/cargo-tests-fix-build-auth-http_auth_offered.patch b/community/rust/cargo-tests-fix-build-auth-http_auth_offered.patch
deleted file mode 100644
index d141082856..0000000000
--- a/community/rust/cargo-tests-fix-build-auth-http_auth_offered.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Thu, 13 Aug 2016 14:47:00 +0200
-Last-Updated: Sun, 20 May 2018 16:28:00 +0200
-Subject: [PATCH] Fix test build-auth:http_auth_offered
-
-The test fails because of hard-coded libgit2 version, that may not be
-the same as actually used libgit2...
-
---- a/src/tools/cargo/tests/testsuite/build_auth.rs
-+++ b/src/tools/cargo/tests/testsuite/build_auth.rs
-@@ -17,7 +17,7 @@
-     let addr = server.local_addr().unwrap();
- 
-     fn headers(rdr: &mut BufRead) -> HashSet<String> {
--        let valid = ["GET", "Authorization", "Accept", "User-Agent"];
-+        let valid = ["GET", "Authorization", "Accept"];
-         rdr.lines()
-             .map(|s| s.unwrap())
-             .take_while(|s| s.len() > 2)
-@@ -29,7 +29,6 @@
-     let t = thread::spawn(move || {
-         let mut conn = BufStream::new(server.accept().unwrap().0);
-         let req = headers(&mut conn);
--        let user_agent = "User-Agent: git/2.0 (libgit2 0.27.0)";
-         conn.write_all(
-             b"\
-             HTTP/1.1 401 Unauthorized\r\n\
-@@ -42,7 +41,6 @@
-             vec![
-                 "GET /foo/bar/info/refs?service=git-upload-pack HTTP/1.1",
-                 "Accept: */*",
--                user_agent,
-             ].into_iter()
-                 .map(|s| s.to_string())
-                 .collect()
-@@ -64,7 +62,6 @@
-                 "GET /foo/bar/info/refs?service=git-upload-pack HTTP/1.1",
-                 "Authorization: Basic Zm9vOmJhcg==",
-                 "Accept: */*",
--                user_agent,
-             ].into_iter()
-                 .map(|s| s.to_string())
-                 .collect()