From 514c3f6c94e93d57937caeabf40586742113c3a4 Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Tue, 16 Feb 2021 23:18:00 +0100
Subject: Update cache for mirrors

---
 lib/cached.list.php            | 120 ++++++++++++++---------------------------
 lib/cached.list_doc.php        | 105 ++++++++++++------------------------
 lib/cached.list_mirrorlist.php | 109 +++++++++++++------------------------
 3 files changed, 111 insertions(+), 223 deletions(-)

diff --git a/lib/cached.list.php b/lib/cached.list.php
index a52af0fd6..69496d25b 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -421,174 +421,153 @@
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
     31 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    32 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    33 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'https://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    34 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    35 => 
+    32 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/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' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    41 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://nl.hideproxy.me/go.php',
     ),
-    43 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    44 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    45 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    55 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
@@ -627,68 +606,40 @@
       'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'https://distro.ibiblio.org/mageia',
-    ),
-    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'New York City',
       'url' => 'https://eu13.proxysite.com/process.php',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    12 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -721,51 +672,58 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     2 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'https://mageia.fis.unb.br',
+      'url' => 'http://mageia.fis.unb.br',
     ),
     3 => 
+    array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'https://mageia.fis.unb.br',
+    ),
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'https://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'New York',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'New York',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 9d98248d2..a9cd2e93f 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -414,174 +414,153 @@
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
     32 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    33 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    34 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'https://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    35 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    36 => 
+    33 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    37 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    38 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    39 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    41 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    42 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://nl.hideproxy.me/go.php',
     ),
-    44 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    45 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    46 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    53 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    53 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
@@ -647,27 +626,6 @@
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    8 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -707,51 +665,58 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     2 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'https://mageia.fis.unb.br',
+      'url' => 'http://mageia.fis.unb.br',
     ),
     3 => 
+    array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'https://mageia.fis.unb.br',
+    ),
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'https://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'New York',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'New York',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index d21421148..4b95a1c3b 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -428,188 +428,167 @@
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
     32 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    33 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    34 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => 'Heraklion',
-      'url' => 'https://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    35 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    36 => 
+    33 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    37 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    38 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    39 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    40 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    41 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    42 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://nl.hideproxy.me/go.php',
     ),
-    44 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'http://mirror.serverion.com/mageia',
     ),
-    45 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Den Haag',
       'url' => 'https://mirror.serverion.com/mageia',
     ),
-    46 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Krakow',
       'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Krakow',
       'url' => 'http://mirror.onet.pl/pub/mirrors/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    50 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    52 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    53 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    57 => 
+    54 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    58 => 
+    55 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
@@ -689,27 +668,6 @@
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    12 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -749,51 +707,58 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     2 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'https://mageia.fis.unb.br',
+      'url' => 'http://mageia.fis.unb.br',
     ),
     3 => 
+    array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'https://mageia.fis.unb.br',
+    ),
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'https://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'New York',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'New York',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
-- 
cgit v1.2.1