Update mirror cache with Mageia 9 iso and last RPM (currently kernel.org out of sync)

4 files changed, 204 insertions, 567 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index 0f75304e2..69a0e38ad 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -239,10 +239,10 @@ class Downloads
                     if ($documentation) {
                         $test_file = $item['url'].'/doc/mga8/date.txt';
                     } else if ($mirrorlist) {
-                        $test_file = $item['url'].'/distrib/8/x86_64/media/core/updates/repodata/repomd.xml'; // when changing, please change $common_patern too
+                        $test_file = $item['url'].'/distrib/9/x86_64/media/core/updates/repodata/repomd.xml'; // when changing, please change $common_patern too
+                        $test_file = $item['url'].'/distrib/9/x86_64/media/core/release/meta-task-9-2.mga9.noarch.rpm'; // when changing, please change $common_patern too
                     } else {
                         $test_file = $item['url'].'/iso/9/torrents/Mageia-9-Live-Xfce-i586.torrent';
-                        $test_file = $item['url'].'/iso/cauldron/torrents/Mageia-9-beta2-Live-Xfce-i586.torrent';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 22a90e20f..b79fcab63 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,149 +1,34 @@
 <?php $mirrors = array (
-  '_C:AF' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'https://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
-    ),
-  ),
   '_C:AS' => 
   array (
     0 => 
     array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'http://mirrors.nju.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'https://mirrors.nju.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
-    ),
-    8 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    10 => 
-    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    11 => 
+    1 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    12 => 
+    2 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    13 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    14 => 
+    3 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    16 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'https://free.nchc.org.tw/mageia',
-    ),
   ),
   '_C:EU' => 
   array (
@@ -317,164 +202,164 @@
     ),
     24 => 
     array (
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU, Lyngby',
+      'url' => 'http://ftp.klid.dk/ftp/mageia',
+    ),
+    25 => 
+    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    25 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    26 => 
+    27 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Ons-en-Bray',
+      'url' => 'ftp://geex.freeboxos.fr',
+    ),
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'http://geex.freeboxos.fr',
     ),
-    27 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'https://geex.freeboxos.fr',
     ),
-    28 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    35 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    36 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    37 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    38 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    39 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => '-',
       'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
     ),
-    38 => 
+    40 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    39 => 
+    41 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    40 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    43 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    42 => 
+    44 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    43 => 
+    45 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    44 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    45 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
     46 => 
     array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'MC',
+      'country' => 'MC',
+      'city' => 'Monaco',
+      'url' => 'http://mirrors.qontinuum.space/mageia',
     ),
     47 => 
     array (
@@ -546,41 +431,6 @@
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
-    ),
-    58 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    59 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.info',
-    ),
-    60 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-    61 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.info',
-    ),
   ),
   '_C:NA' => 
   array (
@@ -588,37 +438,9 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => '-',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => '-',
-      'url' => 'https://mirrors.kernel.org/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    3 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'richmond',
-      'url' => 'http://jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -627,13 +449,6 @@
       'zone' => 'AU',
       'country' => 'AU',
       'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
@@ -641,47 +456,61 @@
   array (
     0 => 
     array (
+      'zone' => 'AR',
+      'country' => 'AR',
+      'city' => 'Buenos Aires',
+      'url' => 'http://mageia.zero.com.ar',
+    ),
+    1 => 
+    array (
+      'zone' => 'AR',
+      'country' => 'AR',
+      'city' => 'Buenos Aires',
+      'url' => 'https://mageia.zero.com.ar',
+    ),
+    2 => 
+    array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => '-',
       'url' => 'http://mageia.c3sl.ufpr.br',
     ),
-    1 => 
+    3 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
       'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
       'url' => 'http://mageia.fis.unb.br',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
       'url' => 'https://mageia.fis.unb.br',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index e2646ac41..f35fa63ba 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -57,87 +57,101 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'http://mirrors.nju.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'https://mirrors.nju.edu.cn/mageia',
+    ),
+    6 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -317,270 +331,256 @@
     ),
     24 => 
     array (
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU, Lyngby',
+      'url' => 'http://ftp.klid.dk/ftp/mageia',
+    ),
+    25 => 
+    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    25 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    26 => 
+    27 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Ons-en-Bray',
+      'url' => 'ftp://geex.freeboxos.fr',
+    ),
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'http://geex.freeboxos.fr',
     ),
-    27 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'https://geex.freeboxos.fr',
     ),
-    28 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    35 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    36 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    37 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    38 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    39 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => '-',
       'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
     ),
-    38 => 
+    40 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    39 => 
+    41 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    40 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    43 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    42 => 
+    44 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    43 => 
+    45 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    44 => 
+    46 => 
+    array (
+      'zone' => 'MC',
+      'country' => 'MC',
+      'city' => 'Monaco',
+      'url' => 'http://mirrors.qontinuum.space/mageia',
+    ),
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    45 => 
+    48 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    47 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    52 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    55 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    57 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    59 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
-    ),
-    58 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.info',
-    ),
-    59 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
-    60 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.info',
-    ),
-    61 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.vn.ua',
-    ),
   ),
   '_C:NA' => 
   array (
@@ -612,13 +612,6 @@
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'richmond',
-      'url' => 'http://jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -627,13 +620,6 @@
       'zone' => 'AU',
       'country' => 'AU',
       'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 37761da99..b79fcab63 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -1,163 +1,34 @@
 <?php $mirrors = array (
-  '_C:AF' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'https://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
-    ),
-  ),
   '_C:AS' => 
   array (
     0 => 
     array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'http://mirrors.nju.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'https://mirrors.nju.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
-    ),
-    8 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-    12 => 
-    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    1 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    2 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    16 => 
+    3 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    18 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'https://free.nchc.org.tw/mageia',
-    ),
   ),
   '_C:EU' => 
   array (
@@ -331,249 +202,235 @@
     ),
     24 => 
     array (
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU, Lyngby',
+      'url' => 'http://ftp.klid.dk/ftp/mageia',
+    ),
+    25 => 
+    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    25 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    26 => 
+    27 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Ons-en-Bray',
+      'url' => 'ftp://geex.freeboxos.fr',
+    ),
+    28 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Ons-en-Bray',
+      'url' => 'http://geex.freeboxos.fr',
+    ),
+    29 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Ons-en-Bray',
+      'url' => 'https://geex.freeboxos.fr',
+    ),
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    27 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    28 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    29 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    31 => 
+    35 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    36 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    33 => 
+    37 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    38 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    39 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => '-',
       'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
     ),
-    36 => 
+    40 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    37 => 
+    41 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    38 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    39 => 
+    43 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    40 => 
+    44 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    41 => 
+    45 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    42 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    43 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    44 => 
+    46 => 
     array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'MC',
+      'country' => 'MC',
+      'city' => 'Monaco',
+      'url' => 'http://mirrors.qontinuum.space/mageia',
     ),
-    45 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    48 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    50 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    51 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    53 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    54 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    55 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    54 => 
+    56 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    55 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
-    ),
-    56 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.info',
-    ),
-    57 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.info',
-    ),
-    58 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.vn.ua',
-    ),
   ),
   '_C:NA' => 
   array (
@@ -581,37 +438,9 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => '-',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => '-',
-      'url' => 'https://mirrors.kernel.org/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    3 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'richmond',
-      'url' => 'http://jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -620,13 +449,6 @@
       'zone' => 'AU',
       'country' => 'AU',
       'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),