From a3f5504adccd58d562ef2d299586b71cd8b40aec Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Thu, 7 May 2020 20:07:15 +0200
Subject: refreshed cached lists for DL

---
 lib/cached.list.php            | 67 +++++++++++++++++++++++++-------------
 lib/cached.list_doc.php        | 72 +++++++++++++++++++++++-----------------
 lib/cached.list_mirrorlist.php | 74 +++++++++++++++++++++++++-----------------
 3 files changed, 131 insertions(+), 82 deletions(-)

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 78910042b..655cb99da 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -33,97 +33,111 @@
       'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -411,58 +425,65 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     40 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -511,14 +532,14 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'ruchmond',
+      'city' => 'Richmond',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
     6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'ruchmond',
+      'city' => 'Richmond',
       'url' => 'http://mageia.jameswhitby.net',
     ),
   ),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 39c57e7de..1bf5fb572 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -33,97 +33,111 @@
       'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -411,63 +425,63 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     40 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    45 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
     46 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
     47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.vn.ua',
+      'url' => 'http://mageia.ip-connect.vn.ua',
     ),
   ),
   '_C:NA' => 
@@ -504,14 +518,14 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'ruchmond',
+      'city' => 'Richmond',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'ruchmond',
+      'city' => 'Richmond',
       'url' => 'http://mageia.jameswhitby.net',
     ),
   ),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 5682f0533..7388d1524 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -33,104 +33,118 @@
       'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
       'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -418,63 +432,63 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     40 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    45 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
     46 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
     47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
-      'url' => 'https://mageia.ip-connect.vn.ua',
+      'url' => 'http://mageia.ip-connect.vn.ua',
     ),
   ),
   '_C:NA' => 
@@ -518,14 +532,14 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'ruchmond',
+      'city' => 'Richmond',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
     6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'ruchmond',
+      'city' => 'Richmond',
       'url' => 'http://mageia.jameswhitby.net',
     ),
   ),
-- 
cgit v1.2.1