updates mirrors list

1 files changed, 369 insertions, 170 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index c80ff8dd5..5fcc2a9a9 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,198 +1,199 @@
 <?php $mirrors = array (
-  'TR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
-    ),
-  ),
-  '_C:AS' => 
+  'DE' => 
   array (
     0 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
     2 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     3 => 
     array (
-      'city' => 'Tsukuba',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     4 => 
     array (
-      'city' => '石川',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
     5 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://srv3.tuxinator.org/mageia',
     ),
     6 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    7 => 
+    array (
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.netcologne.de/mageia',
     ),
   ),
-  'NL' => 
+  '_C:EU' => 
   array (
     0 => 
     array (
-      'city' => 'Enschede',
+      'city' => 'Esslingen',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Enschede',
+      'city' => 'geneva',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
-  ),
-  '_C:EU' => 
-  array (
-    0 => 
+    2 => 
     array (
       'city' => 'Enschede',
       'continent' => 'EU',
       'zone' => 'NL',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    1 => 
+    3 => 
     array (
       'city' => 'Enschede',
       'continent' => 'EU',
       'zone' => 'NL',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'city' => 'Cologne',
       'continent' => 'EU',
       'zone' => 'DE',
       'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
-    3 => 
+    5 => 
+    array (
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    6 => 
     array (
-      'city' => 'Hermsdorf',
+      'city' => 'Esslingen',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    4 => 
+    7 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+    ),
+    8 => 
     array (
-      'city' => 'Hermsdorf',
+      'city' => 'Erlangen',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    5 => 
+    9 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+    ),
+    10 => 
     array (
       'city' => 'Lucern',
       'continent' => 'EU',
       'zone' => 'CH',
       'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
-    6 => 
+    11 => 
     array (
       'city' => 'Paris',
       'continent' => 'EU',
       'zone' => 'FR',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    7 => 
+    12 => 
     array (
       'city' => 'Milan',
       'continent' => 'EU',
       'zone' => 'IT',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    8 => 
+    13 => 
     array (
       'city' => '?',
       'continent' => 'EU',
       'zone' => 'DE',
       'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
-    9 => 
+    14 => 
     array (
       'city' => 'Paris',
       'continent' => 'EU',
       'zone' => 'FR',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    10 => 
+    15 => 
     array (
       'city' => '?',
       'continent' => 'EU',
       'zone' => 'DE',
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
-    11 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
-    ),
-    12 => 
+    16 => 
     array (
-      'city' => '?',
+      'city' => 'Erlangen',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    13 => 
+    17 => 
     array (
       'city' => 'Cologne',
       'continent' => 'EU',
       'zone' => 'DE',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    14 => 
+    18 => 
     array (
       'city' => 'Milan',
       'continent' => 'EU',
       'zone' => 'IT',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    15 => 
+    19 => 
     array (
       'city' => '?',
       'continent' => 'EU',
@@ -200,30 +201,237 @@
       'url' => 'http://mageia.supp.name',
     ),
   ),
+  'CN' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Hefei',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'ftp://mirrors.yun-idc.com/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
+    ),
+  ),
+  '_C:AS' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Hefei',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'http://ftp.linux.org.tr/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Tsukuba',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    5 => 
+    array (
+      'city' => '石川',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
+    ),
+    6 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+    ),
+    7 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'ftp://mirrors.yun-idc.com/mageia',
+    ),
+    8 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
+    ),
+    9 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+    ),
+    10 => 
+    array (
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+  ),
+  'CH' => 
+  array (
+    0 => 
+    array (
+      'city' => 'geneva',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
+    ),
+    1 => 
+    array (
+      'city' => 'Lucern',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+    ),
+  ),
+  'AR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Buenos Aires',
+      'continent' => 'SA',
+      'zone' => 'AR',
+      'url' => 'http://mageia.xfree.com.ar',
+    ),
+  ),
+  '_C:SA' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Buenos Aires',
+      'continent' => 'SA',
+      'zone' => 'AR',
+      'url' => 'http://mageia.xfree.com.ar',
+    ),
+    1 => 
+    array (
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+    2 => 
+    array (
+      'city' => '?',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.c3sl.ufpr.br',
+    ),
+    3 => 
+    array (
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.fis.unb.br/mageia',
+    ),
+    4 => 
+    array (
+      'city' => '?',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    6 => 
+    array (
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+  ),
+  'TR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'http://ftp.linux.org.tr/mageia',
+    ),
+  ),
   'US' => 
   array (
     0 => 
     array (
+      'city' => 'Fremont',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.9nav.com/mageia',
+    ),
+    1 => 
+    array (
       'city' => 'Southfeild',
       'continent' => 'NA',
       'zone' => 'US',
       'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
-    1 => 
+    2 => 
     array (
       'city' => '?',
       'continent' => 'NA',
       'zone' => 'US',
       'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
-    2 => 
+    3 => 
     array (
       'city' => '?',
       'continent' => 'NA',
       'zone' => 'US',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'city' => 'Southfeild',
       'continent' => 'NA',
@@ -235,40 +443,47 @@
   array (
     0 => 
     array (
+      'city' => 'Fremont',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.9nav.com/mageia',
+    ),
+    1 => 
+    array (
       'city' => 'Southfeild',
       'continent' => 'NA',
       'zone' => 'US',
       'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
-    1 => 
+    2 => 
     array (
       'city' => '?',
       'continent' => 'NA',
       'zone' => 'US',
       'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
-    2 => 
+    3 => 
     array (
       'city' => '?',
       'continent' => 'NA',
       'zone' => 'US',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'city' => 'Toronto',
       'continent' => 'NA',
       'zone' => 'CA',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-    4 => 
+    5 => 
     array (
       'city' => 'Toronto',
       'continent' => 'NA',
       'zone' => 'CA',
       'url' => 'http://mageia.webconquest.com',
     ),
-    5 => 
+    6 => 
     array (
       'city' => 'Southfeild',
       'continent' => 'NA',
@@ -276,97 +491,73 @@
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
   ),
-  'BR' => 
+  'NL' => 
   array (
     0 => 
     array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
+      'city' => 'Enschede',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     1 => 
     array (
-      'city' => '?',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'city' => 'Enschede',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
   ),
-  '_C:SA' => 
+  'BR' => 
   array (
     0 => 
     array (
-      'city' => '?',
+      'city' => 'Campinas',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
+      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
     ),
     1 => 
     array (
       'city' => '?',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
-    ),
-  ),
-  'DE' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     2 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.fis.unb.br/mageia',
     ),
     3 => 
     array (
       'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     4 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://srv3.tuxinator.org/mageia',
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.fis.unb.br',
     ),
     5 => 
     array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
-    ),
-    6 => 
-    array (
-      'city' => '?',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    7 => 
-    array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
     ),
   ),
   'TW' => 
@@ -380,32 +571,50 @@
     ),
     1 => 
     array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+    ),
+    3 => 
+    array (
       'city' => 'Taipei',
       'continent' => 'AS',
       'zone' => 'TW',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
   ),
-  'CH' => 
+  'FR' => 
   array (
     0 => 
     array (
-      'city' => 'Lucern',
+      'city' => 'Lyon',
       'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+      'zone' => 'FR',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-  ),
-  'FR' => 
-  array (
-    0 => 
+    1 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+    ),
+    2 => 
     array (
       'city' => 'Paris',
       'continent' => 'EU',
       'zone' => 'FR',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    1 => 
+    3 => 
     array (
       'city' => 'Paris',
       'continent' => 'EU',
@@ -498,16 +707,6 @@
       'url' => 'http://mageia.webconquest.com',
     ),
   ),
-  'CN' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
-    ),
-  ),
   'CZ' => 
   array (
     0 =>