diff --git a/.gitignore b/.gitignore index a9c198c..bbf09a8 100644 --- a/.gitignore +++ b/.gitignore @@ -343,3 +343,11 @@ /rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz /rust-openssl-cc1c74c1a313ac46b5fa3da602a46cff6fdd06a2.tar.gz /rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz +/rustc-1.53.0-src.tar.xz +/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.52.0-i686-unknown-linux-gnu.tar.xz +/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz +/openssl-0.10.35.crate +/openssl-sys-0.9.65.crate diff --git a/0001-Use-lld-provided-by-system-for-wasm.patch b/0001-Use-lld-provided-by-system-for-wasm.patch index ff126cc..4dcb322 100644 --- a/0001-Use-lld-provided-by-system-for-wasm.patch +++ b/0001-Use-lld-provided-by-system-for-wasm.patch @@ -1,17 +1,17 @@ -From 1a6307bbf7972aa2ce89a213bad6f26b6325a59c Mon Sep 17 00:00:00 2001 +From 3582a262d27fd5a2f8705bad6018241eaca8aadd Mon Sep 17 00:00:00 2001 From: Ivan Mironov Date: Sun, 8 Dec 2019 17:23:08 +0500 Subject: [PATCH] Use lld provided by system for wasm --- - compiler/rustc_target/src/spec/wasm32_base.rs | 3 +-- + compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/compiler/rustc_target/src/spec/wasm32_base.rs b/compiler/rustc_target/src/spec/wasm32_base.rs -index bfef3d37228f..0ecb29248fe2 100644 ---- a/compiler/rustc_target/src/spec/wasm32_base.rs -+++ b/compiler/rustc_target/src/spec/wasm32_base.rs -@@ -97,8 +97,7 @@ pub fn options() -> TargetOptions { +diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs +index b208eb92f8ff..94a701a11c8b 100644 +--- a/compiler/rustc_target/src/spec/wasm_base.rs ++++ b/compiler/rustc_target/src/spec/wasm_base.rs +@@ -98,8 +98,7 @@ pub fn options() -> TargetOptions { // arguments just yet limit_rdylib_exports: false, diff --git a/rust-openssl-300.patch b/rust-openssl-300.patch index b796a05..1490fc0 100644 --- a/rust-openssl-300.patch +++ b/rust-openssl-300.patch @@ -1,13 +1,14 @@ ---- rustc-1.52.0-src/Cargo.lock.orig 2021-05-03 13:57:16.000000000 -0700 -+++ rustc-1.52.0-src/Cargo.lock 2021-05-05 17:33:12.300459810 -0700 -@@ -2402,15 +2402,15 @@ dependencies = [ +--- rustc-1.53.0-src/Cargo.lock.orig 2021-06-16 20:53:50.000000000 -0700 ++++ rustc-1.53.0-src/Cargo.lock 2021-06-22 13:03:34.807302140 -0700 +@@ -2390,15 +2390,15 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.30" -+version = "0.10.33" ++version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" ++checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", - "cfg-if 0.1.10", @@ -19,12 +20,25 @@ "openssl-sys", ] -@@ -2431,7 +2431,7 @@ dependencies = [ +@@ -2419,9 +2419,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.58" -+version = "0.9.61" ++version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" ++checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ + "autocfg", + "cc", +--- /dev/null 2021-06-21 12:38:51.028538978 -0700 ++++ rustc-1.53.0-src/vendor/openssl-0.10.35/.cargo-checksum.json 2021-06-22 13:02:26.569703262 -0700 +@@ -0,0 +1 @@ ++{"files":{"CHANGELOG.md":"621727e374f71be92d94fa64bceb2a0d02715588c41002a81347703963540e29","Cargo.lock":"9ba46c2617d38d7202e4e2ac7bd3a53de884afc38aa6490bbe749581ff7f0e5c","Cargo.toml":"efdbc3060829e8b295c3de0155aa6f6841e8af4b99814f2b022e889935fa74a1","LICENSE":"f3d4287b4a21c5176fea2f9bd4ae800696004e2fb8e05cbc818be513f188a941","README.md":"c5ddde25c2756a1115daaa671fb4297cdc83bf23009c8356ba65b5311d0dd30d","build.rs":"575bf9996eb60039fbe26705983f8ea5f20978308d0bfde8e27f99ed734a162d","examples/mk_certs.rs":"4e45b618298bf9ce736830f860e382e98add8ba9200c14fee6243a73098b3aaf","src/aes.rs":"8031a9f9cf29d71ed8da8318ed6f9e315f65462db2c9db5850c8f8a7f4840a84","src/asn1.rs":"557f70ff01b991e1ab6bb717b02f666733a67bd55e0829faf38c7931e21a9c2b","src/base64.rs":"48a3e924b3b5c17df63f88210d88e726b95da7b825af867f2e2010381194ba72","src/bio.rs":"a8b0d600bd350ffdbf037ce1e293aad8e01eb870697e8776cc720490637da51f","src/bn.rs":"29cc5b26954f24fc5262f0eb708a1030b0fcb81ad184c4476b59fe916cf16f2b","src/cms.rs":"c8fb1c390c2bfc0d46695a5c6e47edb39c70d175a5afb9aee71d779078749620","src/conf.rs":"ba6aca357b1f31114dcf8f05dedc8e143edacad3a05e4e9d5f3aeaa00bbbcf34","src/derive.rs":"e70c2a49e4e32eb1523c7b6c5bfdb9c5c17c284bd5a8a5cec4c26206c0e8fd49","src/dh.rs":"c54a2ffb78b6431c931fa3093f021428d3e6c2e9553547ec379b67ee1f6aa8f9","src/dsa.rs":"cd75a78af674bdd2a570fc87bf5fc68b68432881f2a31e1e92e9e9de14c10b59","src/ec.rs":"5229f2e335be3f77b8701dc5090d2cd5dcb05a1c6db4c40fb7e7ed723b66c367","src/ecdsa.rs":"0e30beee5fff7b681c969554d2860e7f2300b7364ed102e0a3fd48dda8e3ddfb","src/encrypt.rs":"e70efe35edfff0cacf063f0cad31eaaa2a29d73c58629deb77c880cdd12e5959","src/envelope.rs":"e176f98f26b9da7e7fc1716be7d0fcda4bcc100bdf0121b1d1fdc96883cf69a7","src/error.rs":"cced1c5e348c1e3fced8262c3758e3b5afc4154a9f35e427bfea3798f4456875","src/ex_data.rs":"0a58a3a274a4ef2251dadb64cbcd44b43710d252201b137ecfb91cf14373c04f","src/fips.rs":"406722ff95f933af3e862b937f3b51f705a049a7b4a8515a9d8311cc74b1a3de","src/hash.rs":"02bc290edf034baf778fced4adcac83700247d0ffea39fac84e49181b4616045","src/lib.rs":"da51832c9eb768d2b3b6bac81e3895eee651997bba2b2aeed63f1042c83d4a84","src/macros.rs":"29751b6f9b40c8667128cd46ee780b6544c54a34738f1d587042db9de6f24b12","src/memcmp.rs":"2bbdd7d6be3c60e9e3ce44a28b44698e176ce5baaf7be08618d1de63afa3396a","src/nid.rs":"49ee73b89292a93f5d9c9f005b6c0bc5e46c23f00e9d1af3989680eef62131f4","src/ocsp.rs":"e9c36fb63d3a9b9a2d52a11be4123688710e0d126c0c1eb09512be37fed6aaf1","src/pkcs12.rs":"764dbb1a67b09e2da4c326653e9ceeba18591d732f8f0ab1b8228b3e392742ec","src/pkcs5.rs":"2948a418a9218d0347b3072998d01b0b5c5263b5fef69716e9c69fca548ed77c","src/pkcs7.rs":"a0e96577c25af824255e0d40d617a0d0723c2955429b90da7d29e2ed1080261c","src/pkey.rs":"1def26f9af8973b2a2fccd54d15880046a86bd39b3ce348fb901c2d9cab3b509","src/rand.rs":"c7b3fed0d322af7ea950b249430ec2163d2b57fa1b7a3864c9e0a8c8365ad997","src/rsa.rs":"ca2dacc55531088f29465d13a2c5b8f76481f7e0d32488783e3d2cb8cb9440d8","src/sha.rs":"28e6d9205b6e4c8be024de2cc1913cb62d0f0592239a5f97648bd3fa929db62d","src/sign.rs":"7b3211990a07f1b60d2dfc5c60a113ca3bb7eb150368d5eaf8526807f5fd960e","src/srtp.rs":"29a726ed8269567d1a8dcc7ac256501e255a0536d5ce03740ea2274d098218ec","src/ssl/bio.rs":"7d11afcf22b0a6023eaaad953cb392ef8da651c4b4ceaa94b793789792291a96","src/ssl/callbacks.rs":"1f2514a6149347c3df4add8cbae8c74a8f2a255f580a2fa4a62586b4250335c8","src/ssl/connector.rs":"dc1147f2b16de747c15ff9bdab44fc02fe18dcc1b6abe6acba56b69bec99013b","src/ssl/error.rs":"f39ac3e1037a35ae5cccbf5cf5976044614a6368c9ffe3f1b96bead63c0c4231","src/ssl/mod.rs":"7e215ba04963400a82d8c72b0036e97d7ac6d38f6986e4b27c231759de18015e","src/ssl/test/mod.rs":"48ecde6dbb4bf280dcdbba12969ca72a73b472d4b4173c2ed64920026635ee61","src/ssl/test/server.rs":"4276ba970a0fac5c9cae21d7df7af36389c377472f3546ce597678ffc6ad5b38","src/stack.rs":"a7b92ca9208a0190e6dbebf372347639d2058f518a7b637811e2122522952444","src/string.rs":"9cf0c69c03b091b186a846f46698c17c75e55d747fd4154cc9950e8aca54c0dd","src/symm.rs":"cf3a65146434bfb90506bbd766b791943317e97899cace5fc745feb0349454c7","src/util.rs":"76eaa375361e305e020d11b51c6e3adaa68ee2b531b253bbac92eb1bfd03180d","src/version.rs":"ea890383758bbe9a92fab8ee27def2ad759a2346481199e1af30940b25d8aae1","src/x509/extension.rs":"772861b6725c2524911521c0ae4fd58657b739209d6cd9a697d97652d6aadb15","src/x509/mod.rs":"7850e07bef15318c777890d21818ff038334c5600e5e883982ff1b07ed572019","src/x509/store.rs":"7cdcb33018006b3063375cfb87dcc319ac28d200c03d94e281cefb74e2a78879","src/x509/tests.rs":"c92a5a385887d389184daba1e827fbb7203a7f984e8782dfe55485852f0f5937","src/x509/verify.rs":"ad00a223cd1d008fb6fdfe470bb473b5a47a1375ba92cd302aa14790d7e3e58f","test/aia_test_cert.pem":"9eaf52b5d0023f3be7911938d937ed16fc75d43d14dbe41557a800b0a82f4b1b","test/alt_name_cert.pem":"f3cc0a1d21657164918dffab0dac8f1c499fc1cf5717805420a0134b3aee128c","test/cert.pem":"53c8b338be254490c71a6b13da90dc5a59ba596587c548be5673657e04824afb","test/certs.pem":"106d5d22c86e26c3db619b9525567f22333d22de82e4d2850ed379150c638008","test/cms.p12":"d33fc5edd6b9caa672e7570b869135235bb2583580a273f6e88c6a6c68fd5a8a","test/cms_pubkey.der":"03682a732e1fd861f5fa687915a8e6f5c935d10273b0f6f73f3db52a8d71fc6d","test/dhparams.pem":"14d9461949d9ae8ca50a393b008ee2168254f14342b0e17b56c0a62d2905b963","test/dsa.pem":"826d513234205fd3dee0bbbf844f0b6fea501145bdf05ea3b14e14df98cbe090","test/dsa.pem.pub":"721677bebf9ab28b8650f98a0cd27658de0c1acd867a4b6e985fe1df95a8bd37","test/dsaparam.pem":"94a1284bdd7d7566151cfde0c7f245e84f7b99ba840f202e3f27ea0160f82988","test/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","test/key.der":"e8842cd6674b5c77a83e0283cd876a91de404561dfc86d79ce525f6e55b28197","test/key.der.pub":"e559d56bb6ec57ad743dbf972bbcaf263a9fa7d320433baa71b04f849d987060","test/key.pem":"12d9105a92bf39b615ccb4820c5c1e38c61905483cd30be13f9ab99b98af64ed","test/key.pem.pub":"f5d030df843ddbaba5bf316ae18f1434de5a63a955be66442429dd4f16f161ef","test/keystore-empty-chain.p12":"bbea280f6fe10556d7470df7072ef0e4ee3997e2c0b3666197f423430c0e6b61","test/nid_test_cert.pem":"7047e8d317e284c6b698eee4a0f1a629d50cd4615ad7da85fe90a2ffb6c21611","test/nid_uid_test_cert.pem":"a735211f3b40edbde7084337138fb0aea06aea6c78369c52015253e4b7a17d83","test/pkcs1.pem.pub":"4d446864b63c4178ec2c7dc8df9b7121d9271851c1f4701231fccb8b07c94918","test/pkcs8-nocrypt.der":"5590d03cc0d037c6c27d78fafc937f48defb226e9a52cde84d54df68086d0575","test/pkcs8.der":"8719fc002d59313fb97e46e068ae40db4d9acc0e2debd308ac9eb46329bea487","test/root-ca.key":"b37cf88614980c38e43c4329cdf7162bae48cc8af1fafd54db2fe0d17e458e1d","test/root-ca.pem":"59b9200c35e818bf21be4aaa97ba87bb6a18fd780527a9f9c51cc74212c631a0","test/rsa-encrypted.pem":"ea41b0f1816056672de6abbab43d0e8089da047c329ceed14aace5a5bde713f1","test/rsa.pem":"f866a5506ea9a37ed2f73f62f503e1aff32f7e4145be62b023535f4da1c24416","test/rsa.pem.pub":"2c5eeea39708e90396f9f09d920f2af8b7e9f84ace963c1319072224dd3d302b"},"package":"549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"} +\ No newline at end of file +--- /dev/null 2021-06-21 12:38:51.028538978 -0700 ++++ rustc-1.53.0-src/vendor/openssl-sys-0.9.65/.cargo-checksum.json 2021-06-22 13:02:26.570703241 -0700 +@@ -0,0 +1 @@ ++{"files":{"CHANGELOG.md":"6ee4e524e49a4e8cd3164701bf18fbc641c7a014b756b5de6b3ccc11fa588c70","Cargo.toml":"1a6b84bb11588fb0fa8d28741ab548726cef34e546de3dd2280be1d8139f292d","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"c5ddde25c2756a1115daaa671fb4297cdc83bf23009c8356ba65b5311d0dd30d","build/cfgs.rs":"193f81ffdf211f056599072e8910d59c2134d3df85fed9ca693bc59f82cb73d4","build/expando.c":"d6f6f9f7d9f79d03b96740fe378e6d4fd38e9447abf7839e62a5fae3eea49c14","build/find_normal.rs":"b6bc74f91a52bb592e14c085061b477722d7f72eaa33a7590fb01da46cd35b7c","build/find_vendored.rs":"7bf0e59c5646d72ee5a4392ad970fdf5c20288ddaf54dd86a8caff49583b38f5","build/main.rs":"c6e1ba232c3334a726707561c7cb0c87c841c75b1848880ce03c689f5d9b2b69","src/aes.rs":"822bf666db351fe6ef9607c918081d6ad378fc1cedb05290bb746f86980c6088","src/asn1.rs":"801c254afc76b0c29b756bd86a149361609f82ec33c1f1fad39a512fbe4e87ee","src/bio.rs":"3aac4e38ccf8d832b4156908cd3f1ff9c56f84c05d2f07ed7a3e3fccabe965e9","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"1e1500367732915e756ba7dcee4a0691ba4fab770e0cef88267b74111e99e127","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"fa513478e5c4a1e9d54081a9c79d48400f726c7047e776aa3f1adc023d6600be","src/dh.rs":"fb3b539eec4434b448b30df19e2e2ac5ffc3bd11bb817c7fb9090186ec3b0146","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"0477022d5bcf2b7a620c70ece4da08a2958be3eca5a57127c89d79525c692ebd","src/ec.rs":"018a2ab377804bb735206e88d0561ab16098e29007d1a1fd0d565c8e492544c2","src/err.rs":"9e6c84a170dce46db74414a64b9e1855845afbd8180100a2d9412f7509f69284","src/evp.rs":"c947ddf745e4fc761f2b4b7886246f96163f41ff8ccc3c822e46ad38169d2c94","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"19ddf11d94bf469abb3f453a6b38886f6ccea4bc6004477f36b200516f5fee44","src/macros.rs":"7ed99c00c53ee12ea92634d4ace0af84845ebf98819869746e7896c8eaff23db","src/obj_mac.rs":"42019b142e523d7695d8c14ee7f72fa4b5702c07dee98fa12e70ab7dfcc95459","src/object.rs":"9ec1a26968e3efc87b24f287b92331fa38eaca048a3919e6514f48d38c7df9a6","src/ocsp.rs":"614492810c5fadd0c1c4bb5eda165fb7e744eed7b04ae61d582446f5013e733a","src/ossl_typ.rs":"0d8dd0f82ef08672ab3c5059d2335b7eaad2d5afc0a20dbf26c2476c99dcae8e","src/pem.rs":"c92d1d31e6f70f6704f148e370a8b4228d6305b51fd3be907c49014a8bfe14ba","src/pkcs12.rs":"4c3c1cf2e716454c5fc94c3d5e1174922c57b9de796253799437dc13303a68d1","src/pkcs7.rs":"726614946784f919db88fd5282ec66d5b9df2edafc98ade9614758e109176b31","src/rand.rs":"c771057f37c64406aa750f36397fa877caf330a8c725e49356c7081c2b2fdd67","src/rsa.rs":"d45d421339b903b0d33817e93be5e939964431f9caed343e5c4490382cfad5b1","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"16a4c77cbc38926b8f8eee07b0beae8dc12cbdc8cfa599d4db66fa84a7b3871d","src/srtp.rs":"1c4dee9e6c139cc70416207786e385f199321624fb9fbf3cbf39a8160c0c405d","src/ssl.rs":"f0dd56aef28630ba8359e49538664160b54f58e255cca1f5c239f23aa820de1b","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/types.rs":"0b9bafc6f5fd373ec8c01e49339f7fe7ef1d76e44d60cda59f60c06982b4070e","src/x509.rs":"785bcb26166b8f39e616e5ab9a0358814773e96de51b40fd5ae62b45a2edcda6","src/x509_vfy.rs":"e530e2fd91e959715265b40fba95576bb53ddcb4e2c6586c2192098e0e8b1cc1","src/x509v3.rs":"520253195097d134e553c6378c1db2510eae6ccfcab6f6fb08919697bc0f023b"},"package":"7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"} +\ No newline at end of file diff --git a/rust.spec b/rust.spec index d9222c8..7dde413 100644 --- 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.51.0 -%global bootstrap_cargo 1.51.0 -%global bootstrap_channel 1.51.0 -%global bootstrap_date 2021-03-25 +%global bootstrap_rust 1.52.0 +%global bootstrap_cargo 1.52.0 +%global bootstrap_channel 1.52.0 +%global bootstrap_date 2021-05-06 # Only the specified arches will use bootstrap binaries. #global bootstrap_arches %%{rust_arches} @@ -30,7 +30,7 @@ %bcond_with llvm_static # We can also choose to just use Rust's bundled LLVM, in case the system LLVM -# is insufficient. Rust currently requires LLVM 9.0+. +# is insufficient. Rust currently requires LLVM 10.0+. %bcond_with bundled_llvm # Requires stable libgit2 1.1 @@ -61,8 +61,8 @@ %endif Name: rust -Version: 1.52.1 -Release: 4%{?dist} +Version: 1.53.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) @@ -90,18 +90,18 @@ Patch100: rustc-1.48.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.51.0-disable-http2.patch +Patch101: rustc-1.53.0-disable-http2.patch # kernel rh1410097 causes too-small stacks for PIE. # (affects RHEL6 kernels when building for RHEL7) Patch102: rustc-1.51.0-no-default-pie.patch -# Initial support for OpenSSL 3.0.0-alpha16 +# Add support for OpenSSL 3.0.0 +# https://github.com/rust-lang/rust/pull/86529/ # https://github.com/sfackler/rust-openssl/pull/1264 -%global rust_openssl_commit 770ba32702abd2b4cab80727958c27ac3043c3ec -%global rust_openssl rust-openssl-%{rust_openssl_commit} -Source103: https://github.com/sfackler/rust-openssl/archive/%{rust_openssl_commit}/%{rust_openssl}.tar.gz Patch103: rust-openssl-300.patch +Source103: https://crates.io/api/v1/crates/openssl/0.10.35/download#/openssl-0.10.35.crate +Source104: https://crates.io/api/v1/crates/openssl-sys/0.9.65/download#/openssl-sys-0.9.65.crate # Get the Rust triple for any arch. @@ -188,7 +188,7 @@ Provides: bundled(llvm) = 12.0.0 %else BuildRequires: cmake >= 2.8.11 %if 0%{?epel} == 7 -%global llvm llvm9.0 +%global llvm llvm11 %endif %if %defined llvm %global llvm_root %{_libdir}/%{llvm} @@ -196,7 +196,7 @@ BuildRequires: cmake >= 2.8.11 %global llvm llvm %global llvm_root %{_prefix} %endif -BuildRequires: %{llvm}-devel >= 9.0 +BuildRequires: %{llvm}-devel >= 10.0 %if %with llvm_static BuildRequires: %{llvm}-static BuildRequires: libffi-devel @@ -221,6 +221,14 @@ Requires: %{name}-std-static%{?_isa} = %{version}-%{release} # https://github.com/rust-lang/rust/issues/11937 Requires: /usr/bin/cc +%if 0%{?epel} == 7 +%global devtoolset_name devtoolset-9 +BuildRequires: %{devtoolset_name}-gcc +BuildRequires: %{devtoolset_name}-gcc-c++ +%global __cc /opt/rh/%{devtoolset_name}/root/usr/bin/gcc +%global __cxx /opt/rh/%{devtoolset_name}/root/usr/bin/g++ +%endif + # ALL Rust libraries are private, because they don't keep an ABI. %global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.* %global __provides_exclude ^(%{_privatelibs})$ @@ -501,8 +509,10 @@ rm -rf vendor/libgit2-sys/libgit2/ rm -rf vendor/libssh2-sys/ %endif -rm -rf vendor/openssl{,-sys}/* -tar -xf %{SOURCE103} -C vendor/ --strip-components=1 %{rust_openssl}/openssl{,-sys}/ +# Add support for OpenSSL 3.0.0 +rm -rf vendor/openssl{,-sys}/ +tar -xf %{SOURCE103} -C vendor/ +tar -xf %{SOURCE104} -C vendor/ %patch103 -p1 # This only affects the transient rust-installer, but let it use our dynamic xz-libs @@ -574,6 +584,9 @@ fi %configure --disable-option-checking \ --libdir=%{common_libdir} \ --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \ + --set target.%{rust_triple}.linker=%{__cc} \ + --set target.%{rust_triple}.cc=%{__cc} \ + --set target.%{rust_triple}.cxx=%{__cxx} \ --python=%{python} \ --local-rust-root=%{local_rust_root} \ %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \ @@ -815,11 +828,13 @@ end} %changelog +* Tue Jun 22 2021 Josh Stone - 1.53.0-1 +- Update to 1.53.0. +- Update openssl crates to published versions for 3.0 support. + * Tue Jun 15 2021 Mohan Boddu - 1.52.1-4 - Rebuilt for RHEL 9 BETA for openssl 3.0 -Related: rhbz#1971065 - * Mon Jun 07 2021 Josh Stone - 1.52.1-3 - Set rust.codegen-units-std=1 for all targets again. - Add rust-std-static-wasm32-unknown-unknown. diff --git a/rustc-1.51.0-disable-http2.patch b/rustc-1.53.0-disable-http2.patch similarity index 72% rename from rustc-1.51.0-disable-http2.patch rename to rustc-1.53.0-disable-http2.patch index 2517a34..94040b3 100644 --- a/rustc-1.51.0-disable-http2.patch +++ b/rustc-1.53.0-disable-http2.patch @@ -1,6 +1,6 @@ ---- rustc-beta-src/Cargo.lock.orig 2021-03-09 10:30:08.626424998 -0800 -+++ rustc-beta-src/Cargo.lock 2021-03-09 10:32:38.096207704 -0800 -@@ -899,7 +899,6 @@ +--- rustc-beta-src/Cargo.lock.orig 2021-06-04 15:56:04.141227630 -0700 ++++ rustc-beta-src/Cargo.lock 2021-06-04 16:03:04.461396826 -0700 +@@ -885,7 +885,6 @@ dependencies = [ "cc", "libc", @@ -8,8 +8,8 @@ "libz-sys", "openssl-sys", "pkg-config", -@@ -1860,16 +1859,6 @@ - ] +@@ -1904,16 +1903,6 @@ + checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] -name = "libnghttp2-sys" @@ -25,20 +25,20 @@ name = "libz-sys" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2021-03-05 08:34:15.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2021-03-09 10:32:38.096207704 -0800 +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2021-06-04 15:56:04.143227587 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2021-06-04 15:57:56.931857927 -0700 @@ -25,7 +25,7 @@ + cargo-util = { path = "crates/cargo-util", version = "0.1.0" } crates-io = { path = "crates/crates-io", version = "0.33.0" } crossbeam-utils = "0.8" - crypto-hash = "0.3.1" -curl = { version = "0.4.23", features = ["http2"] } +curl = { version = "0.4.23", features = [] } curl-sys = "0.4.22" env_logger = "0.8.1" pretty_env_logger = { version = "0.4", optional = true } ---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-03-05 08:34:15.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2021-03-09 10:32:38.096207704 -0800 -@@ -412,14 +412,8 @@ +--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-05-22 15:22:31.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2021-06-04 16:00:03.903190293 -0700 +@@ -416,14 +416,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 // proxies. @@ -46,7 +46,7 @@ - let multiplexing = config.http_config()?.multiplexing.unwrap_or(true); - multi - .pipelining(false, multiplexing) -- .chain_err(|| "failed to enable multiplexing/pipelining in curl")?; +- .with_context(|| "failed to enable multiplexing/pipelining in curl")?; - - // let's not flood crates.io with connections - multi.set_max_host_connections(2)?; @@ -55,7 +55,7 @@ Ok(PackageSet { packages: package_ids -@@ -592,7 +586,7 @@ +@@ -596,7 +590,7 @@ macro_rules! try_old_curl { ($e:expr, $msg:expr) => { let result = $e; diff --git a/sources b/sources index 2f26af9..5b490ad 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (rustc-1.52.1-src.tar.xz) = 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c -SHA512 (rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz) = 82888c18beafae8cd8122fe91d00fd32c60ab1ed47db4da691ca762b5102eee4cbfcd6f333fcb1769ba1b65b655f726050b1deccdfdf7ec7b21728c51cd2c750 +SHA512 (rustc-1.53.0-src.tar.xz) = 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24 +SHA512 (openssl-0.10.35.crate) = 5ebe4626a894ccc6e5c159cef72357654aa1a20dcc863fdab495f10a574b49b0b9d4e85a069b8b9297544ea0d09fd88a976396c3a8e8faaee9d01d79d943126f +SHA512 (openssl-sys-0.9.65.crate) = 4c14ff5258a35b86e35d352c5702c90e1f70954c8f33d17160694b63305057b97da3ac6846d3e8f8e7293c40f15b76effd1e34fad4be613b8d815b90148406f7 diff --git a/sources-bootstrap b/sources-bootstrap index bbda143..95b868a 100644 --- a/sources-bootstrap +++ b/sources-bootstrap @@ -1,7 +1,8 @@ -SHA512 (rustc-1.52.1-src.tar.xz) = 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c -SHA512 (rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz) = 2af31290e1065a4611f34e6cc8c62ee494c222becfb21ec6707059c119069b0adf0eec23e56bad4a3cc8690b2556309ec58cbd9003a959983689cc46c7c63361 -SHA512 (rust-1.51.0-i686-unknown-linux-gnu.tar.xz) = 05d08e44827dcba8197667deb9a7f3584465085ce1b79a38deb138849a07c716646a70f1cc2cee02b41c45ec7c3a3b7800a3fae62ebe04d6f72f017a5d722bab -SHA512 (rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz) = b53a741d1d75637fb31ddb0364e1f91427c3818ca145f819b906d13c32c638ae77fbaa567a6220b6bf69f38cc00d2b95615778a86f4acadd63efe2e62b1b01ef -SHA512 (rust-1.51.0-s390x-unknown-linux-gnu.tar.xz) = a72ad31c6306f939c4f963133ddc0b3fabc9e506bdff5e318f5275658b7271a675a51d208d306d94fb01739cbcf0f62f018fc7490ca6db54b301852202749d16 -SHA512 (rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = 9f95045119bcd5ef7be54f5b5bdc9ebc6bd6c48437d90762a1cfbc03281882f81087e1877eecae9573ba5e7cd7c11ef5fed979034c57f45b6547cbfeb11eef6d -SHA512 (rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz) = 82888c18beafae8cd8122fe91d00fd32c60ab1ed47db4da691ca762b5102eee4cbfcd6f333fcb1769ba1b65b655f726050b1deccdfdf7ec7b21728c51cd2c750 +SHA512 (rustc-1.53.0-src.tar.xz) = 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24 +SHA512 (rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz) = 7a26e14be6b27c7084c7c85b312341ab991c2df91ea53128f14707a4c725dd03ba7df30b9e9fcef39a509ab4f5d5feb028b99d6d9ffcc059996ed29b83eb90b9 +SHA512 (rust-1.52.0-i686-unknown-linux-gnu.tar.xz) = 10fcf9e891ae8bc6e83b5e71c83b34773c18b024c9e9b580cfae714b4e135d313ba5434fc28c2dffa3db2e50669b3acd07e6874de0cfab89b343db92bfbdff80 +SHA512 (rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz) = 916a3338c850cf804535e25aebc0fdcf6cea8fe9e5df9fed11fbf03ae81fb8220321dc41edd7133f287dfee0dbf19730ff8b020f32322850329865db76bab95e +SHA512 (rust-1.52.0-s390x-unknown-linux-gnu.tar.xz) = 6a91adf7c1947b63db0bf02b4aa4a36fbbfcc5b40d9c18175e4c5efe785b8a17ff21a887476cf76f7e3d3854f2cc362b5d2dc8243493291a4d19a705276e6355 +SHA512 (rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = 27a8db421ae62af92e2c34dcc1fdd617bf7e8de2c68205773a3037be496ccbf21f5549dd18377a9730102e7915519824231218fef9a09abe9d116441d6ce28d2 +SHA512 (openssl-0.10.35.crate) = 5ebe4626a894ccc6e5c159cef72357654aa1a20dcc863fdab495f10a574b49b0b9d4e85a069b8b9297544ea0d09fd88a976396c3a8e8faaee9d01d79d943126f +SHA512 (openssl-sys-0.9.65.crate) = 4c14ff5258a35b86e35d352c5702c90e1f70954c8f33d17160694b63305057b97da3ac6846d3e8f8e7293c40f15b76effd1e34fad4be613b8d815b90148406f7