From 8372a7f922592c0a63a60c60879d3a44c52c69d9 Mon Sep 17 00:00:00 2001
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Tue, 24 May 2016 14:52:54 +0200
Subject: [PATCH] download.pl: Rework URLs

Provide HTTPS URL when possible, try to keep 8 mirrors per entry and spread
over several locations of the world. Since most active contributors are in
US/CA and/or EU prioritize mirrors that are within those regions if possible.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
---
 scripts/download.pl | 47 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/scripts/download.pl b/scripts/download.pl
index c31d9bd83fa8..90d50a88622f 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -178,27 +178,37 @@ foreach my $mirror (@ARGV) {
 			push @mirrors, "http://downloads.sourceforge.net/$1";
 		}
 	} elsif ($mirror =~ /^\@APACHE\/(.+)$/) {
-		push @mirrors, "http://ftp.tudelft.nl/apache/$1";
-		push @mirrors, "http://apache.openmirror.de/$1";
-		push @mirrors, "http://mirrors.ocf.berkeley.edu/apache/$1";
-		push @mirrors, "http://mirror.cc.columbia.edu/pub/software/apache/$1";
+		push @mirrors, "https://mirror.netcologne.de/apache.org/$1";
+		push @mirrors, "https://mirror.aarnet.edu.au/pub/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";
+		push @mirrors, "ftp://apache.mirrors.ovh.net/ftp.apache.org/dist/$1";
 	} elsif ($mirror =~ /^\@GITHUB\/(.+)$/) {
 		# give github a few more tries (different mirrors)
 		for (1 .. 5) {
 			push @mirrors, "https://raw.githubusercontent.com/$1";
 		}
 	} elsif ($mirror =~ /^\@GNU\/(.+)$/) {
-		push @mirrors, "http://ftpmirror.gnu.org/$1";
-		push @mirrors, "http://ftp.gnu.org/pub/gnu/$1";
-		push @mirrors, "ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/$1";
-		push @mirrors, "ftp://ftp.mirror.nl/pub/mirror/gnu/$1";
-		push @mirrors, "http://mirror.switch.ch/ftp/mirror/gnu/$1";
+		push @mirrors, "https://mirrors.rit.edu/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://download.xs4all.nl/pub/gnu/";
 	} elsif ($mirror =~ /^\@SAVANNAH\/(.+)$/) {
-		push @mirrors, "http://download.savannah.gnu.org/releases/$1";
+		push @mirrors, "https://mirror.netcologne.de/savannah/$1";
+		push @mirrors, "http://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";
-		push @mirrors, "http://download-mirror.savannah.gnu.org/releases/$1";
+		push @mirrors, "http://public.p-knowledge.co.jp/Savannah-nongnu-mirror/$1";
+		push @mirrors, "ftp://cdimage.debian.org/mirror/gnu.org/savannah/$1";
+		push @mirrors, "ftp://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
 	} elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
 		my @extra = ( $1 );
 		if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) {
@@ -208,13 +218,20 @@ foreach my $mirror (@ARGV) {
 		}		
 		foreach my $dir (@extra) {
 			push @mirrors, "https://cdn.kernel.org/pub/$dir";
-			push @mirrors, "https://www.kernel.org/pub/$dir";
+			push @mirrors, "https://mirror.rackspace.com/kernel.org/$dir";
+			push @mirrors, "http://download.xs4all.nl/ftp.kernel.org/pub/$dir";
+			push @mirrors, "http://mirrors.mit.edu/kernel/$dir";
+			push @mirrors, "http://ftp.nara.wide.ad.jp/pub/kernel.org/$dir";
+			push @mirrors, "http://www.ring.gr.jp/archives/linux/kernel.org/$dir";
+			push @mirrors, "ftp://ftp.riken.jp/Linux/kernel.org/$dir";
+			push @mirrors, "ftp://www.mirrorservice.org/sites/ftp.kernel.org/pub/$dir";
 		}
     } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
-		push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
-		push @mirrors, "http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/$1";
-		push @mirrors, "http://fr2.rpmfind.net/linux/gnome.org/sources/$1";
+		push @mirrors, "http://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";
+		push @mirrors, "http://mirror.internode.on.net/pub/gnome/sources/$1";
 		push @mirrors, "http://ftp.belnet.be/ftp.gnome.org/sources/$1";
 		push @mirrors, "ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/$1";
 		push @mirrors, "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1";
-- 
2.30.2