scripts/download.pl: Adjust URLs

Internet2 isn't considered a trusted issuer meaning that https links to
rit.edu will fail.

The host mirror.csclub.uwaterloo.ca has a trusted SSL cert and peering
is good so it can replace rit.edu without performance issues.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
[Jo-Philipp Wich: rewrapped commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 99c429512622566ee2bbde69fa8efb0f2bcda33e)

diff --git a/scripts/download.pl b/scripts/download.pl
index 5c9397b93259958f6dcf534d412846566a7c137c..645ac8546c44d033ea10e93f8662e98e32ec902c 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -195,8 +195,8 @@ foreach my $mirror (@ARGV) {
        } elsif ($mirror =~ /^\@APACHE\/(.+)$/) {
                push @mirrors, "https://mirror.netcologne.de/apache.org/$1";
                push @mirrors, "https://mirror.aarnet.edu.au/pub/apache/$1";
+               push @mirrors, "https://mirror.csclub.uwaterloo.ca/apache/$1";
                push @mirrors, "http://mirror.cogentco.com/pub/apache/$1";
-               push @mirrors, "http://mirror.csclub.uwaterloo.ca/apache/$1";
                push @mirrors, "http://mirror.navercorp.com/apache/$1";
                push @mirrors, "http://ftp.jaist.ac.jp/pub/apache/$1";
                push @mirrors, "ftp://apache.cs.utah.edu/apache.org/$1";
@@ -207,17 +207,17 @@ foreach my $mirror (@ARGV) {
                        push @mirrors, "https://raw.githubusercontent.com/$1";
                }
        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
-               push @mirrors, "https://mirrors.rit.edu/gnu/$1";
+               push @mirrors, "https://mirror.csclub.uwaterloo.ca/gnu/$1";
                push @mirrors, "https://mirror.netcologne.de/gnu/$1";
                push @mirrors, "http://ftp.kddilabs.jp/GNU/gnu/$1";
                push @mirrors, "http://www.nic.funet.fi/pub/gnu/gnu/$1";
                push @mirrors, "http://mirror.internode.on.net/pub/gnu/$1";
                push @mirrors, "http://mirror.navercorp.com/gnu/$1";
-               push @mirrors, "ftp://mirror.csclub.uwaterloo.ca/gnu/$1";
+               push @mirrors, "ftp://mirrors.rit.edu/gnu/$1";
                push @mirrors, "ftp://download.xs4all.nl/pub/gnu/";
        } elsif ($mirror =~ /^\@SAVANNAH\/(.+)$/) {
                push @mirrors, "https://mirror.netcologne.de/savannah/$1";
-               push @mirrors, "http://mirror.csclub.uwaterloo.ca/nongnu/$1";
+               push @mirrors, "https://mirror.csclub.uwaterloo.ca/nongnu/$1";
                push @mirrors, "http://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
                push @mirrors, "http://nongnu.uib.no/$1";
                push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1";
@@ -242,7 +242,7 @@ foreach my $mirror (@ARGV) {
                        push @mirrors, "ftp://www.mirrorservice.org/sites/ftp.kernel.org/pub/$dir";
                }
     } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
-               push @mirrors, "http://mirror.csclub.uwaterloo.ca/gnome/sources/$1";
+               push @mirrors, "https://mirror.csclub.uwaterloo.ca/gnome/sources/$1";
                push @mirrors, "http://ftp.acc.umu.se/pub/GNOME/sources/$1";
                push @mirrors, "http://ftp.kaist.ac.kr/gnome/sources/$1";
                push @mirrors, "http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/$1";