Update list of mirror

with pkg updates from 15/08

3 files changed, 137 insertions, 148 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index a208f9bf0..71f34be15 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -36,122 +36,101 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    6 => 
+    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    7 => 
-    array (
-      'zone' => 'IL',
-      'country' => 'IL',
-      'city' => '?',
-      'url' => 'ftp://mirror.isoc.org.il/pub/mageia',
-    ),
-    8 => 
+    4 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '?',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    9 => 
+    5 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
+    6 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    11 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
+    8 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    10 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    11 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    16 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    18 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    16 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -383,21 +362,21 @@
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
     32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
-      'city' => 'Rennes',
-      'url' => 'http://magie.remi.lu',
+      'city' => 'Paris',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
     34 => 
     array (
@@ -563,6 +542,30 @@
       'city' => 'Southfeild',
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
+    4 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
+    ),
+  ),
+  '_C:OC' => 
+  array (
+    0 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
   ),
   '_C:SA' => 
   array (
@@ -585,23 +588,16 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Brasilia',
       'url' => 'http://mageia.fis.unb.br',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 66bb45170..baf49b8d5 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -44,78 +44,78 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
       'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    10 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    11 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    12 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
+    13 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
     14 => 
     array (
       'zone' => 'TW',
@@ -369,21 +369,21 @@
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
     31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
-      'city' => 'Rennes',
-      'url' => 'http://magie.remi.lu',
+      'city' => 'Paris',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
     33 => 
     array (
@@ -549,6 +549,20 @@
       'city' => 'Southfeild',
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
+    4 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
+    ),
   ),
   '_C:OC' => 
   array (
@@ -559,6 +573,13 @@
       'city' => 'Adelaide',
       'url' => 'http://mirror.internode.on.net/pub/mageia',
     ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
   ),
   '_C:SA' => 
   array (
@@ -581,23 +602,16 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Brasilia',
       'url' => 'http://mageia.fis.unb.br',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 7f80e629a..12b0a236c 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -36,129 +36,108 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    6 => 
+    3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    7 => 
-    array (
-      'zone' => 'IL',
-      'country' => 'IL',
-      'city' => '?',
-      'url' => 'ftp://mirror.isoc.org.il/pub/mageia',
-    ),
-    8 => 
+    4 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '?',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    9 => 
+    5 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
+    6 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    11 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
+    8 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    10 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    12 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+    17 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -397,21 +376,21 @@
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
     33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
-      'city' => 'Rennes',
-      'url' => 'http://magie.remi.lu',
+      'city' => 'Paris',
+      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
     35 => 
     array (
@@ -560,36 +539,36 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
     ),
     2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Lenoir',
-      'url' => 'http://mirror.dacentec.com/mageia',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
+      'city' => 'Southfeild',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
     4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'lansing',
-      'url' => 'http://mirrors-usa.go-parts.com/mageia',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
   '_C:OC' => 
@@ -601,6 +580,13 @@
       'city' => 'Adelaide',
       'url' => 'http://mirror.internode.on.net/pub/mageia',
     ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
   ),
   '_C:SA' => 
   array (
@@ -623,23 +609,16 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Brasilia',
       'url' => 'http://mageia.fis.unb.br',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',