From b4325adefb636549cf68979ae1f0e9c334eacd32 Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Fri, 1 Jul 2016 21:24:56 +0200
Subject: cache list rebuilded

---
 lib/cached.list.php            | 276 +++++++++++++----------------------------
 lib/cached.list_doc.php        | 153 +++++++++++------------
 lib/cached.list_mirrorlist.php | 169 +++++++++++--------------
 3 files changed, 231 insertions(+), 367 deletions(-)

(limited to 'lib')

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 2714bc5a9..c619c0733 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -19,506 +19,436 @@
   '_C:AS' => 
   array (
     0 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'ftp://mirrors.yun-idc.com/mageia',
-    ),
-    1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
       'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-    3 => 
+    1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
       'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
-    4 => 
+    2 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
     ),
-    5 => 
+    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
-    6 => 
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
-    7 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    8 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    9 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    11 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    16 => 
+    12 => 
     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' => 'Taipei',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
-    ),
-    19 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'Taipei',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
-    ),
   ),
   '_C:EU' => 
   array (
     0 => 
-    array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'http://ftp.belnet.be/mageia',
-    ),
-    2 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    3 => 
+    1 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    4 => 
+    2 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    3 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    6 => 
+    4 => 
     array (
       'zone' => 'CH',
       'country' => 'CH',
       'city' => 'geneva',
       'url' => 'http://mageia.unige.ch/mirror',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '?',
       'url' => 'http://mageia.supp.name',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'http://srv4.tuxinator.org/mageia',
     ),
-    14 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Cologne',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
-    ),
-    15 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    16 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    17 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    18 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    19 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    21 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    24 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    25 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU',
-      'url' => 'ftp://ftp.klid.dk/mageia',
-    ),
-    26 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    27 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    25 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+    ),
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    28 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+    ),
+    29 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    33 => 
+    30 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    31 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    35 => 
+    32 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    36 => 
+    33 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    37 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    38 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    39 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    40 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    41 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    43 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -557,78 +487,33 @@
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
     4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
-    ),
-    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Fremont',
       'url' => 'http://mirror.easthsia.com/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Southfeild',
       'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Southfeild',
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'lansing',
-      'url' => 'ftp://mirrors-usa.go-parts.com/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'lansing',
-      'url' => 'http://mirrors-usa.go-parts.com/mageia',
-    ),
-  ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
-      'city' => 'Brisbane',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
   ),
   '_C:SA' => 
   array (
@@ -651,7 +536,7 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
@@ -661,13 +546,20 @@
       'url' => 'http://mageia.fis.unb.br',
     ),
     4 => 
+    array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Campinas',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index c8188940f..0c89f5043 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -33,132 +33,125 @@
       'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
       'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    11 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    19 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+    19 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -267,117 +260,117 @@
       'url' => 'http://srv4.tuxinator.org/mageia',
     ),
     14 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Cologne',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
-    ),
-    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    19 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    21 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    24 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    25 => 
+    24 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    26 => 
+    25 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    27 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
+    29 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+    ),
     30 => 
     array (
       'zone' => 'FR',
@@ -393,139 +386,146 @@
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     32 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+    ),
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    39 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -591,20 +591,6 @@
       'city' => 'Southfeild',
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
-    8 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -644,7 +630,7 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
@@ -654,13 +640,20 @@
       'url' => 'http://mageia.fis.unb.br',
     ),
     4 => 
+    array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Campinas',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index e4d96bcda..f59bbeb7e 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -33,132 +33,125 @@
       'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
       'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
       'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    11 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    19 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+    19 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -253,265 +246,258 @@
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
     12 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Cologne',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
-    ),
-    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    21 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    22 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    23 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU',
-      'url' => 'ftp://ftp.klid.dk/mageia',
-    ),
-    24 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    25 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    26 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    27 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    28 => 
+    25 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+    ),
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    28 => 
+    array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Paris',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+    ),
+    29 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    31 => 
+    30 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    32 => 
+    31 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    33 => 
+    32 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    34 => 
+    33 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    35 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    36 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    37 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    38 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    41 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    42 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    43 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    44 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    45 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    46 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    47 => 
+    46 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    48 => 
+    47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    49 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -584,20 +570,6 @@
       'city' => 'Southfeild',
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
-      'url' => 'http://mageia.jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -637,7 +609,7 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
@@ -647,13 +619,20 @@
       'url' => 'http://mageia.fis.unb.br',
     ),
     4 => 
+    array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Campinas',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
-- 
cgit v1.2.1