Update to 1.59.0.

Revert to libgit2 1.3.x
2022-02-24 11:40:26 -08:00 · 2022-02-24 11:40:26 -08:00 · e605359b2b
parent a929a38db9
commit e605359b2b
6 changed files with 49 additions and 36 deletions
--- a/.gitignore
+++ b/.gitignore
@ -391,3 +391,10 @@
 /rust-1.57.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz
 /rustc-1.58.1-src.tar.xz
+/rustc-1.59.0-src.tar.xz
+/rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.58.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.58.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz
--- a/rust.spec
+++ b/rust.spec
@ -9,10 +9,10 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.57.0
-%global bootstrap_cargo 1.57.0
-%global bootstrap_channel 1.57.0
-%global bootstrap_date 2021-12-02
+%global bootstrap_rust 1.58.0
+%global bootstrap_cargo 1.58.0
+%global bootstrap_channel 1.58.0
+%global bootstrap_date 2022-01-13

 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@ -46,8 +46,10 @@
 %global bundled_llvm_version 13.0.0
 %bcond_with bundled_llvm

-# Requires stable libgit2 1.3
+# Requires stable libgit2 1.3, and not the next minor soname change.
+# This needs to be consistent with the bindings in vendor/libgit2-sys.
 %global min_libgit2_version 1.3.0
+%global next_libgit2_version 1.4.0~
 %global bundled_libgit2_version 1.3.0
 %if 0%{?fedora} >= 36
 %bcond_with bundled_libgit2
@ -78,8 +80,8 @@
 %endif

 Name:           rust
-Version:        1.58.1
-Release:        2%{?dist}
+Version:        1.59.0
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@ -101,11 +103,11 @@ Patch1:         0001-Use-lld-provided-by-system-for-wasm.patch
 ### RHEL-specific patches below ###

 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.56.0-disable-libssh2.patch
+Patch100:       rustc-1.59.0-disable-libssh2.patch

 # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
 # will try to build it statically -- instead we turn off the feature.
-Patch101:       rustc-1.58.0-disable-http2.patch
+Patch101:       rustc-1.59.0-disable-http2.patch

 # kernel rh1410097 causes too-small stacks for PIE.
 # (affects RHEL6 kernels when building for RHEL7)
@ -179,7 +181,7 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)

 %if %{without bundled_libgit2}
-BuildRequires:  pkgconfig(libgit2) >= %{min_libgit2_version}
+BuildRequires:  (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version})
 %endif

 %if %{without disabled_libssh2}
@ -970,6 +972,10 @@ end}


 %changelog
+* Thu Feb 24 2022 Josh Stone <jistone@redhat.com> - 1.59.0-1
+- Update to 1.59.0.
+- Revert to libgit2 1.3.x
+
 * Sun Feb 20 2022 Igor Raits <igor.raits@gmail.com> - 1.58.1-2
 - Rebuild for libgit2 1.4.x

--- a/rustc-1.59.0-disable-http2.patch
+++ b/rustc-1.59.0-disable-http2.patch
@ -1,5 +1,5 @@
--- rustc-1.58.0-src/Cargo.lock.orig	2022-01-11 16:13:10.125323813 -0800
-+++ rustc-1.58.0-src/Cargo.lock	2022-01-11 16:22:54.313011908 -0800
+--- rustc-1.59.0-src/Cargo.lock.orig	2022-02-22 10:19:00.330367749 -0800
+++ rustc-1.59.0-src/Cargo.lock	2022-02-22 10:19:00.332367706 -0800
@@ -909,7 +909,6 @@
 dependencies = [
  "cc",
@ -8,7 +8,7 @@
  "libz-sys",
  "openssl-sys",
  "pkg-config",
-@@ -1927,16 +1926,6 @@
+@@ -1957,16 +1956,6 @@
 checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
 
 [[package]]
@ -25,19 +25,19 @@
 name = "libz-sys"
 version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
--- rustc-1.58.0-src/src/tools/cargo/Cargo.toml.orig	2022-01-11 16:13:10.127323771 -0800
-+++ rustc-1.58.0-src/src/tools/cargo/Cargo.toml	2022-01-11 16:14:50.721203730 -0800
+--- rustc-1.59.0-src/src/tools/cargo/Cargo.toml.orig	2022-02-22 10:19:00.332367706 -0800
+++ rustc-1.59.0-src/src/tools/cargo/Cargo.toml	2022-02-22 10:19:54.029231795 -0800
@@ -22,7 +22,7 @@
- cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
- crates-io = { path = "crates/crates-io", version = "0.33.0" }
+ cargo-util = { path = "crates/cargo-util", version = "0.1.2" }
+ crates-io = { path = "crates/crates-io", version = "0.33.1" }
 crossbeam-utils = "0.8"
 -curl = { version = "0.4.41", features = ["http2"] }
 +curl = { version = "0.4.41", features = [] }
 curl-sys = "0.4.50"
 env_logger = "0.9.0"
 pretty_env_logger = { version = "0.4", optional = true }
--- rustc-1.58.0-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-01-11 03:18:44.000000000 -0800
-+++ rustc-1.58.0-src/src/tools/cargo/src/cargo/core/package.rs	2022-01-11 16:13:10.127323771 -0800
+--- rustc-1.59.0-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-02-21 18:48:53.000000000 -0800
+++ rustc-1.59.0-src/src/tools/cargo/src/cargo/core/package.rs	2022-02-22 10:19:00.332367706 -0800
@@ -419,14 +419,8 @@
         // Also note that pipelining is disabled as curl authors have indicated
         // that it's buggy, and we've empirically seen that it's buggy with HTTP
--- a/rustc-1.59.0-disable-libssh2.patch
+++ b/rustc-1.59.0-disable-libssh2.patch
@ -1,6 +1,6 @@
--- rustc-1.56.0-src/Cargo.lock.orig	2021-10-18 02:52:36.000000000 -0700
-+++ rustc-1.56.0-src/Cargo.lock	2021-10-19 18:00:47.999793566 -0700
-@@ -1895,7 +1895,6 @@
+--- rustc-1.59.0-src/Cargo.lock.orig	2022-02-21 18:48:37.000000000 -0800
+++ rustc-1.59.0-src/Cargo.lock	2022-02-22 10:16:10.381962862 -0800
+@@ -1935,7 +1935,6 @@
 dependencies = [
  "cc",
  "libc",
@ -8,14 +8,14 @@
  "libz-sys",
  "openssl-sys",
  "pkg-config",
-@@ -1918,20 +1917,6 @@
+@@ -1968,20 +1967,6 @@
 ]
 
 [[package]]
 -name = "libssh2-sys"
-version = "0.2.19"
+-version = "0.2.23"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
+-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
 -dependencies = [
 - "cc",
 - "libc",
@ -29,9 +29,9 @@
 name = "libz-sys"
 version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
--- rustc-1.56.0-src/vendor/git2/Cargo.toml.orig	2021-10-18 04:05:54.000000000 -0700
-+++ rustc-1.56.0-src/vendor/git2/Cargo.toml	2021-10-19 17:57:37.960500359 -0700
-@@ -52,7 +52,7 @@
+--- rustc-1.59.0-src/vendor/git2/Cargo.toml.orig	2022-02-21 20:14:37.000000000 -0800
+++ rustc-1.59.0-src/vendor/git2/Cargo.toml	2022-02-22 10:12:23.021772490 -0800
+@@ -51,7 +51,7 @@
 version = "0.1.39"
 
 [features]
--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (rustc-1.58.1-src.tar.xz) = eff3279d2e519343cea542a9ae2daab592e44f35af344e33ff43ed55fc7c824511790d1991dd36a603d12465de8c3688e7194c2b9557f288c587ffa04738c2ce
+SHA512 (rustc-1.59.0-src.tar.xz) = acace866871d13a55d365f65d7e15c192c3cd33096862571df6317e066b7474d668b95ae281e0244967778c05f1e33966c3c55616218bd25d3770a2b2d4f0365
 SHA512 (wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz) = 04cb3a25fef7949bf77f262bd939102f5b36e2ae85f28cdbfcd8a8984425fba54fae68049b777974bdbad96882fab383b44203e8f19a776d8a56a55475c4aab6
--- a/14
+++ b/14
@ -1,8 +1,8 @@
-SHA512 (rustc-1.58.1-src.tar.xz) = eff3279d2e519343cea542a9ae2daab592e44f35af344e33ff43ed55fc7c824511790d1991dd36a603d12465de8c3688e7194c2b9557f288c587ffa04738c2ce
+SHA512 (rustc-1.59.0-src.tar.xz) = acace866871d13a55d365f65d7e15c192c3cd33096862571df6317e066b7474d668b95ae281e0244967778c05f1e33966c3c55616218bd25d3770a2b2d4f0365
 SHA512 (wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz) = 04cb3a25fef7949bf77f262bd939102f5b36e2ae85f28cdbfcd8a8984425fba54fae68049b777974bdbad96882fab383b44203e8f19a776d8a56a55475c4aab6
-SHA512 (rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz) = 71d32e1ed3fc4a2eaf3594112b3b43ab82bd28b35e547542f6c1ed006175d7cf805be373a4da8b962762962dd32fe951c8ca7c0a424addad5d4e828441d5386c
-SHA512 (rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz) = 667d8f6fb56408782c7a9e0c5086013d0350d6161d52ca4cd948ea39a02ebdf657dd45cb0a135ade8bc1e856c0962040969416fa1762e3bb55a03574fff3b1d1
-SHA512 (rust-1.57.0-i686-unknown-linux-gnu.tar.xz) = 9dc7d650bbe35d3967a883e91bfd2a3dcad633c41c00a41d9ca78bc336b1e3262bbb4100a76d42169700dc3b15d4066fa065e785aed1c0a46df4736dfd00d7c6
-SHA512 (rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz) = 7e0809b66086f1c9dde14df5bd9f08757e32bb58041b74150415f798d81cb4ca01a6d69d529efe8a93026f251aa8f1711520defa8d86de64f20d9055ee1568e5
-SHA512 (rust-1.57.0-s390x-unknown-linux-gnu.tar.xz) = 4cc63e93bbafcbba2122a862200bf1dd241fe84f526778e1877c14237984fdeccdd3d2b3dfe73428b1b97bd253c1ddf98f4302f40709abbdd52ec721d5ccdb6e
-SHA512 (rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz) = 54016b58fe85208c0d98e61cb52f2549bbb9731d7d631b4964663c91c91b7ea0ff4c224c3d29a770de433e6a0bcd92d2fe757563bf68e224a20c1cec6d031a7e
+SHA512 (rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz) = 6ab276db164b400953b540f2c0f5884e44a16cb847a157dec1103e09b22e379f77d8561bf360c05f0bf2d085d4b3670b51675ae80aac05732310621bb2d9b597
+SHA512 (rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz) = c676cc1518e38fc36e62519bb9d4d356be689f9fcdeb56d5722bd3437879dfe9a30340c053ec75bd5b709d83b98faa647c46720df36a00daef1fd7680f4c900f
+SHA512 (rust-1.58.0-i686-unknown-linux-gnu.tar.xz) = 23dd0c0a7700acee233e93d779733bb94788edff4a64df62b8e4ac55b58bc640ed72b0cfd9e1b8cfa5190e429ced6b2a6b0a75676c51e72351edb96b44b00e59
+SHA512 (rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz) = bd87ed72427102a1ce08e61d74ad8d34fcbde93e30b2597f9db29e49d53337c1d2e9794f2ce0209273b59c6c8be743870657a2da5eb1dc4d238adf2b548d0ce7
+SHA512 (rust-1.58.0-s390x-unknown-linux-gnu.tar.xz) = 2bee2fed7d13d9fd5f10bb071ea8b91bff650d223b5e78fa8068fd841e3f757a4358befc26298c5477c2f9a4fe9e2e77c8f5911ed2630f8ff311491fb842fba3
+SHA512 (rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz) = 382a1b3ac5874a9e3f162ba06196074df703b0422dac70c9c38dd0770e86b7fbfbf0380ee1b520a6ef92d3f52c865e901d106f5beaf966fa036fba88f7912da9