Auto merge of rust-lang#110784 - cuviper:build-gcc-https, r=jyn514

bors · bors · commit 70540d512750 · 2023-04-26T04:53:49.000Z
Revert "Download the GCC sources insecurely" This reverts commit 3da037f. This workaround was added after TLS problems with Debian 6 were noted in <rust-lang#86586 (comment)>, but we should be well past that since rust-lang#95026, where our oldest images are now based on CentOS 7.
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh
@@ -22,8 +22,7 @@ cd gcc-$GCC
 # latter host is presented to `wget`! Therefore, we choose to download from the insecure HTTP server
 # instead here.
 #
-# FIXME: use HTTPS (see https://github.com/rust-lang/rust/pull/86586#issuecomment-868355356)
-sed -i'' 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
+sed -i'' 's|ftp://gcc\.gnu\.org/|https://gcc.gnu.org/|g' ./contrib/download_prerequisites
 
 ./contrib/download_prerequisites
 mkdir ../gcc-build

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ cd gcc-$GCC`
`22`	`22`	# latter host is presented to `wget`! Therefore, we choose to download from the insecure HTTP server
`23`	`23`	`# instead here.`
`24`	`24`	`#`
`25`		`-# FIXME: use HTTPS (see https://github.com/rust-lang/rust/pull/86586#issuecomment-868355356)`
`26`		`-sed -i'' 's\|ftp://gcc\.gnu\.org/\|http://gcc.gnu.org/\|g' ./contrib/download_prerequisites`
	`25`	`+sed -i'' 's\|ftp://gcc\.gnu\.org/\|https://gcc.gnu.org/\|g' ./contrib/download_prerequisites`
`27`	`26`
`28`	`27`	`./contrib/download_prerequisites`
`29`	`28`	`mkdir ../gcc-build`