Update cache mirror (mga#28372)

3 files changed, 121 insertions, 86 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 69496d25b..1c5075e3d 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -480,94 +480,87 @@
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://nl.hideproxy.me/go.php',
-    ),
-    40 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    41 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    47 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    50 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    52 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
@@ -623,22 +616,36 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'New York City',
-      'url' => 'https://eu13.proxysite.com/process.php',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
+      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
     8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
+      'city' => 'Richmond, VA',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    9 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Richmond, VA',
+      'url' => 'http://mageia.jameswhitby.net',
+    ),
+    10 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Richmond, VA',
+      'url' => 'https://mageia.jameswhitby.net',
     ),
   ),
   '_C:OC' => 
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index a9cd2e93f..140cf139c 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -473,100 +473,107 @@
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://nl.hideproxy.me/go.php',
-    ),
-    41 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    53 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
+    53 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
+    ),
+    54 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -609,22 +616,36 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'New York City',
-      'url' => 'https://eu13.proxysite.com/process.php',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
+      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
     7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
+      'city' => 'Richmond, VA',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    8 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Richmond, VA',
+      'url' => 'http://mageia.jameswhitby.net',
+    ),
+    9 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Richmond, VA',
+      'url' => 'https://mageia.jameswhitby.net',
     ),
   ),
   '_C:OC' => 
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 4b95a1c3b..e29533c87 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -487,114 +487,107 @@
     array (
       'zone' => 'NL',
       'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://nl.hideproxy.me/go.php',
-    ),
-    41 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
-    array (
-      'zone' => 'PL',
-      'country' => 'PL',
-      'city' => 'Krakow',
-      'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia',
-    ),
-    47 => 
-    array (
-      'zone' => 'PL',
-      'country' => 'PL',
-      'city' => 'Krakow',
-      'url' => 'http://mirror.onet.pl/pub/mirrors/mageia',
-    ),
-    48 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    55 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
+    53 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
+    ),
+    54 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -651,22 +644,36 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'New York City',
-      'url' => 'https://eu13.proxysite.com/process.php',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
+      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
     9 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
+      'city' => 'Richmond, VA',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    10 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Richmond, VA',
+      'url' => 'http://mageia.jameswhitby.net',
+    ),
+    11 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Richmond, VA',
+      'url' => 'https://mageia.jameswhitby.net',
     ),
   ),
   '_C:OC' =>