rust: bump to 1.41.0

5 files changed, 14 insertions, 64 deletions

diff --git a/extra/rust/build b/extra/rust/build
index 674d1700..f918b150 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -5,15 +5,15 @@
 # connection requirement per build further enabling checksums
 # and signature verification by KISS.
 {
-    cache_dir=build/cache/2019-11-07
+    cache_dir=build/cache/2019-12-19
     mkdir -p "$cache_dir"
 
-    for tarball in *.tar.gz\?no-extract; do
+    for tarball in *.tar.xz\?no-extract; do
         mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
     done
 }
 
-patch -p1 < musl-libressl.patch
+patch -p1 < musl.patch
 
 # 'rust' checksums files in 'vendor/', but we patch a few files.
 for vendor in libc openssl-sys; do
diff --git a/extra/rust/checksums b/extra/rust/checksums
index b67e0616..70c8ff17 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,5 +1,5 @@
-dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad  rustc-1.40.0-src.tar.gz
-9c6b49e161e53c174b4fd46825a96b78854cfbcd0971ce846d4edd33c2b5f275  rust-std-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract
-07a9705dd77c6859ef921389dc6a958a297030e53571fe015163c79aa93d1e43  rustc-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract
-c3a04bfe988f84dc4bffd8b4fef29f2ad461483fd22e4bf329d2189e16213d0c  cargo-0.40.0-x86_64-unknown-linux-musl.tar.gz?no-extract
-bc6a567b76c3186ac868c13831c402c595015ad48e047387b32f833af460f7fa  musl-libressl.patch
+38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f  rustc-1.41.0-src.tar.xz
+c647bb7f399b3d18e345b2dab1fb073470582a9298e83d8648f6661544df7279  rust-std-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+769b9e31557fcc0ea2a661f88b679d3dbd62b537807c7b3c75ac6816a1be4fa3  rustc-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+848646326474392bdac70a5bfa06efda4c36e2bbbf088f07456f98c7575844e1  cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+bb6f561f1a6ddd15b32126a024f3b0a4f66555797c1ebd6d1d17b7d604a083ae  musl.patch
diff --git a/extra/rust/patches/musl-libressl.patch b/extra/rust/patches/musl.patch
index 33402597..6cb1c83e 100644
--- a/extra/rust/patches/musl-libressl.patch
+++ b/extra/rust/patches/musl.patch
@@ -76,53 +76,3 @@ index 721d24116..26bf271cd 100644
          #[cfg_attr(feature = "rustc-dep-of-std",
                     link(name = "c", kind = "static",
                          cfg(target_feature = "crt-static")))]
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
-index 02b93b90a..27deca5fe 100644
---- a/vendor/openssl-sys/build/main.rs
-+++ b/vendor/openssl-sys/build/main.rs
-@@ -183,27 +183,30 @@ See rust-openssl README for more information:
-     if let Some(libressl_version) = libressl_version {
-         println!("cargo:libressl_version_number={:x}", libressl_version);
-
-+        let major = (libressl_version >> 28) as u8;
-         let minor = (libressl_version >> 20) as u8;
-         let fix = (libressl_version >> 12) as u8;
--        let (minor, fix) = match (minor, fix) {
--            (5, 0) => ('5', '0'),
--            (5, 1) => ('5', '1'),
--            (5, 2) => ('5', '2'),
--            (5, _) => ('5', 'x'),
--            (6, 0) => ('6', '0'),
--            (6, 1) => ('6', '1'),
--            (6, 2) => ('6', '2'),
--            (6, _) => ('6', 'x'),
--            (7, _) => ('7', 'x'),
--            (8, 0) => ('8', '0'),
--            (8, 1) => ('8', '1'),
--            (8, _) => ('8', 'x'),
--            (9, 0) => ('9', '0'),
-+        let (major, minor, fix) = match (major, minor, fix) {
-+            (2, 5, 0) => ('2', '5', '0'),
-+            (2, 5, 1) => ('2', '5', '1'),
-+            (2, 5, 2) => ('2', '5', '2'),
-+            (2, 5, _) => ('2', '5', 'x'),
-+            (2, 6, 0) => ('2', '6', '0'),
-+            (2, 6, 1) => ('2', '6', '1'),
-+            (2, 6, 2) => ('2', '6', '2'),
-+            (2, 6, _) => ('2', '6', 'x'),
-+            (2, 7, _) => ('2', '7', 'x'),
-+            (2, 8, 0) => ('2', '8', '0'),
-+            (2, 8, 1) => ('2', '8', '1'),
-+            (3, 0, _) => ('3', '0', 'x'),
-+            (2, 9, 0) => ('2', '9', '0'),
-+            (2, 9, _) => ('2', '9', 'x'),
-+            (3, 0, 0) => ('3', '0', '0'),
-             _ => version_error(),
-         };
-
-         println!("cargo:libressl=true");
--        println!("cargo:libressl_version=2{}{}", minor, fix);
-+        println!("cargo:libressl_version={}{}{}", major, minor, fix);
-         println!("cargo:version=101");
-         Version::Libressl
-     } else {
diff --git a/extra/rust/sources b/extra/rust/sources
index a6e7cb5d..0ca17083 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,5 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.gz
-https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract
-https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract
-https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-x86_64-unknown-linux-musl.tar.gz?no-extract
-patches/musl-libressl.patch
+https://static.rust-lang.org/dist/rustc-1.41.0-src.tar.xz
+https://static.rust-lang.org/dist/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+patches/musl.patch
diff --git a/extra/rust/version b/extra/rust/version
index 08770197..bab56fdc 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.40.0 1
+1.41.0 1