Merging upstream version 2.7.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 42 insertions, 28 deletions

diff --git a/data/templates/Debian.mirrors b/data/templates/Debian.mirrors
index fdb09f1..09d0826 100644
--- a/data/templates/Debian.mirrors
+++ b/data/templates/Debian.mirrors
@@ -3,6 +3,7 @@ http://ftp.am.debian.org/debian/
 http://mirrors.asnet.am/debian/
 #LOC:AR
 http://debian.unnoba.edu.ar/debian/
+http://mirror.sitsa.com.ar/debian/
 #LOC:AT
 http://debian.anexia.at/debian/
 http://debian.lagis.at/debian/
@@ -21,12 +22,15 @@ http://mirror.linux.org.au/debian/
 http://mirror.overthewire.com.au/debian/
 http://mirror.realcompute.io/debian/
 http://mirrors.xtom.au/debian/
+#LOC:BD
+http://mirror.xeonbd.com/debian/
 #LOC:BE
 http://ftp.be.debian.org/debian/
 http://ftp.belnet.be/debian/
 http://mirror.as35701.net/debian/
 #LOC:BG
 http://debian.a1.bg/debian/
+http://debian.ipacct.com/debian/
 http://debian.ludost.net/debian/
 http://debian.mnet.bg/debian/
 http://debian.telecoms.bg/debian/
@@ -38,13 +42,14 @@ http://mirrors.netix.net/debian/
 http://alcateia.ufscar.br/debian/
 http://debian.c3sl.ufpr.br/debian/
 http://ftp.br.debian.org/debian/
-http://mirror.uepg.br/debian/
 #LOC:BY
 http://ftp.by.debian.org/debian/
 http://ftp.byfly.by/debian/
 http://mirror.datacenter.by/debian/
 #LOC:CA
 http://debian.mirror.iweb.ca/debian/
+http://debian.mirror.rafal.ca/debian/
+http://ftp.ca.debian.org/debian/
 http://mirror.csclub.uwaterloo.ca/debian/
 http://mirror.dst.ca/debian/
 http://mirror.estone.ca/debian/
@@ -55,6 +60,7 @@ http://debian.ethz.ch/debian/
 http://ftp.ch.debian.org/debian/
 http://mirror.init7.net/debian/
 http://mirror.iway.ch/debian/
+http://mirror.metanet.ch/debian/
 http://mirror.sinavps.ch/debian/
 http://mirror1.infomaniak.com/debian/
 http://mirror2.infomaniak.com/debian/
@@ -67,6 +73,7 @@ http://mirror.insacom.cl/debian/
 http://mirror.ufro.cl/debian/
 #LOC:CN
 http://ftp.cn.debian.org/debian/
+http://mirror.lzu.edu.cn/debian/
 http://mirror.nju.edu.cn/debian/
 http://mirror.nyist.edu.cn/debian/
 http://mirror.sjtu.edu.cn/debian/
@@ -107,6 +114,7 @@ http://ftp-stud.hs-esslingen.de/debian/
 http://ftp.de.debian.org/debian/
 http://ftp.fau.de/debian/
 http://ftp.gwdg.de/debian/
+http://ftp.halifax.rwth-aachen.de/debian/
 http://ftp.hosteurope.de/mirror/ftp.debian.org/debian/
 http://ftp.plusline.net/debian/
 http://ftp.tu-chemnitz.de/debian/
@@ -116,6 +124,7 @@ http://ftp.uni-hannover.de/debian/debian/
 http://ftp.uni-kl.de/debian/
 http://ftp.uni-mainz.de/debian/
 http://ftp.wrz.de/debian/
+http://ftp2.de.debian.org/debian/
 http://mirror.23m.com/debian/
 http://mirror.de.leaseweb.net/debian/
 http://mirror.dogado.de/debian/
@@ -152,6 +161,7 @@ http://ulises.hostalia.com/debian/
 http://ftp.fi.debian.org/debian/
 http://www.nic.funet.fi/debian/
 #LOC:FR
+http://apt.tetaneutral.net/debian/
 http://deb-mir1.naitways.net/debian/
 http://debian.apt-mirror.de/debian/
 http://debian.obspm.fr/debian/
@@ -160,9 +170,6 @@ http://debian.proxad.net/debian/
 http://debian.univ-tlse2.fr/debian/
 http://ftp.ec-m.fr/debian/
 http://ftp.fr.debian.org/debian/
-http://ftp.lip6.fr/pub/linux/distributions/debian/
-http://ftp.rezopole.net/debian/
-http://ftp.u-picardie.fr/debian/
 http://ftp.u-strasbg.fr/debian/
 http://ftp.univ-pau.fr/linux/mirrors/debian/
 http://miroir.univ-lorraine.fr/debian/
@@ -182,7 +189,6 @@ http://mirror.lchost.net/debian/
 http://mirror.mythic-beasts.com/debian/
 http://mirror.ox.ac.uk/debian/
 http://mirror.positive-internet.com/debian/
-http://mirror.sov.uk.goscomb.net/debian/
 http://mirror.vinehost.net/debian/
 http://mirrors.coreix.net/debian/
 http://mirrorservice.org/sites/ftp.debian.org/debian/
@@ -213,8 +219,7 @@ http://debian.interhost.co.il/debian/
 #LOC:IN
 http://mirrors.iitd.ac.in/debian/
 #LOC:IR
-http://debian.hostiran.ir/debian/
-http://debian.parspack.com/debian/
+http://archive.debian.petiak.ir/debian/
 #LOC:IS
 http://ftp.is.debian.org/debian/
 http://is.mirror.flokinet.net/debian/
@@ -234,17 +239,16 @@ http://ftp.riken.jp/Linux/debian/debian/
 http://mirrors.xtom.jp/debian/
 http://repo.jing.rocks/debian/
 #LOC:KE
-http://debian.mirror.ac.ke/debian/
 http://debian.mirror.liquidtelecom.com/debian/
 #LOC:KR
 http://ftp.kaist.ac.kr/debian/
 http://ftp.kr.debian.org/debian/
+http://ftp.lanet.kr/debian/
 http://mirror.siwoo.org/debian/
 #LOC:KZ
 http://mirror.hoster.kz/debian/
 http://mirror.ps.kz/debian/
 #LOC:LT
-http://debian.balt.net/debian/
 http://debian.mirror.vu.lt/debian/
 http://ftp.lt.debian.org/debian/
 http://mirror.litnet.lt/debian/
@@ -253,9 +257,6 @@ http://mirror.vpsnet.com/debian/
 http://debian.mirror.root.lu/debian/
 #LOC:LV
 http://debian.koyanet.lv/debian/
-http://mirror.cloudhosting.lv/debian/
-#LOC:MA
-http://mirror.marwan.ma/debian/
 #LOC:MD
 http://ftp.md.debian.org/debian/
 http://mirror.as43289.net/debian/
@@ -277,15 +278,11 @@ http://mirror.seedvps.com/debian/
 http://mirrors.hostiserver.com/debian/
 http://mirrors.xtom.nl/debian/
 http://nl.mirrors.clouvider.net/debian/
-#LOC:NO
-http://ftp.no.debian.org/debian/
-http://ftp.uio.no/debian/
 #LOC:NZ
 http://ftp.nz.debian.org/debian/
 http://linux.purple-cat.net/debian/
 http://mirror.fsmg.org.nz/debian/
 #LOC:PL
-http://debian.inhost.pro/debian/
 http://ftp.agh.edu.pl/debian/
 http://ftp.icm.edu.pl/pub/Linux/debian/
 http://ftp.pl.debian.org/debian/
@@ -295,11 +292,11 @@ http://ftp.task.gda.pl/debian/
 http://debian.uevora.pt/debian/
 http://ftp.eq.uc.pt/software/Linux/debian/
 http://ftp.pt.debian.org/debian/
+http://ftp.rnl.tecnico.ulisboa.pt/pub/debian/
 http://mirrors.ptisp.pt/debian/
 http://mirrors.up.pt/debian/
 #LOC:RE
 http://debian.mithril.re/debian/
-http://depot-debian.univ-reunion.fr/debian/
 #LOC:RO
 http://mirror.linux.ro/debian/
 http://mirrors.hostico.ro/debian/
@@ -313,6 +310,7 @@ http://mirror.corbina.net/debian/
 http://mirror.docker.ru/debian/
 http://mirror.hyperdedic.ru/debian/
 http://mirror.mephi.ru/debian/
+http://mirror.truenetwork.ru/debian/
 http://mirrors.powernet.com.ru/debian/
 #LOC:SE
 http://debian.lth.se/debian/
@@ -323,7 +321,7 @@ http://ftpmirror1.infania.net/debian/
 http://mirror.zetup.net/debian/
 http://mirrors.glesys.net/debian/
 #LOC:SG
-http://mirror.coganng.com/debian/
+http://mirror.sg.gs/debian/
 http://ossmirror.mycloud.services/debian/
 #LOC:SI
 http://ftp.si.debian.org/debian/
@@ -341,7 +339,6 @@ http://debian.gnu.gen.tr/debian/
 http://ftp.linux.org.tr/debian/
 http://ftp.tr.debian.org/debian/
 #LOC:TW
-http://debian.cs.nycu.edu.tw/debian/
 http://debian.csie.ntu.edu.tw/debian/
 http://ftp.tku.edu.tw/debian/
 http://ftp.tw.debian.org/debian/
@@ -372,11 +369,12 @@ http://mirror.keystealth.org/debian/
 http://mirror.rustytel.net/debian/
 http://mirror.siena.edu/debian/
 http://mirror.steadfast.net/debian/
+http://mirror.timkevin.us/debian/
 http://mirror.us.leaseweb.net/debian/
 http://mirror.us.oneandone.net/debian/
 http://mirrors.accretive-networks.net/debian/
+http://mirrors.bloomu.edu/debian/
 http://mirrors.lug.mtu.edu/debian/
-http://mirrors.namecheap.com/debian/
 http://mirrors.ocf.berkeley.edu/debian/
 http://mirrors.vcea.wsu.edu/debian/
 http://mirrors.wikimedia.org/debian/
@@ -387,6 +385,7 @@ http://repo.ialab.dsu.edu/debian/
 #LOC:UY
 http://debian.repo.cure.edu.uy/debian/
 #LOC:VN
+http://debian.xtdv.net/debian/
 http://mirror.bizflycloud.vn/debian/
 http://mirrors.bkns.vn/debian/
 #LOC:ZA
diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index 651b069..d1c3896 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -28,9 +28,11 @@ https://ubuntu.mirror.serversaustralia.com.au/ubuntu/
 #LOC:AZ
 http://aze.archive.ubuntu.com/ubuntu/
 http://mirror.datacenter.az/ubuntu/
+https://mirror.yer.az/ubuntu/archive/
 #LOC:BA
 http://archive.ubuntu.mirror.ba/ubuntu/
 #LOC:BD
+http://mirror.dhakacom.com/ubuntu-archive/
 https://mirror.xeonbd.com/ubuntu-archive/
 #LOC:BE
 http://ftp.belnet.be/ubuntu/
@@ -51,7 +53,6 @@ http://ubuntu-archive.locaweb.com.br/ubuntu/
 http://ubuntu.c3sl.ufpr.br/ubuntu/
 http://ubuntu.mti.mt.gov.br/
 https://mirror.uepg.br/ubuntu/
-https://ubuntu.letscloud.io/ubuntu/
 #LOC:BW
 http://mirror.retentionrange.co.bw/ubuntu/
 #LOC:BY
@@ -69,10 +70,10 @@ https://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/
 https://mirror.0xem.ma/ubuntu/
 https://mirror.csclub.uwaterloo.ca/ubuntu/
 https://mirror.digitaloceans.dev/ubuntu/
+https://mirror.esecuredata.com/ubuntu-archive/
 https://mirror.hep.gg/ubuntu/
 https://mirror.it.ubc.ca/ubuntu/
 https://mirror.reenigne.net/ubuntu/
-https://mirror01-pcl-ott1.accuris.ca/ubuntu/
 https://muug.ca/mirror/ubuntu/
 #LOC:CD
 https://mirrors.united.cd/ubuntu/
@@ -85,6 +86,7 @@ https://mirror.init7.net/ubuntu/
 https://mirror.solnet.ch/ubuntu/
 #LOC:CL
 http://mirror.uchile.cl/ubuntu/
+https://elmirror.cl/ubuntu/
 https://mirror.hnd.cl/ubuntu/
 https://mirror.ufro.cl/ubuntu/
 #LOC:CN
@@ -96,6 +98,7 @@ http://mirrors.cqu.edu.cn/ubuntu/
 http://mirrors.huaweicloud.com/repository/ubuntu/
 http://mirrors.sohu.com/ubuntu/
 http://mirrors.yun-idc.com/ubuntu/
+https://mirror.bjtu.edu.cn/ubuntu/
 https://mirror.nju.edu.cn/ubuntu/
 https://mirror.nyist.edu.cn/ubuntu/
 https://mirrors.bfsu.edu.cn/ubuntu/
@@ -111,6 +114,7 @@ https://mirrors.zju.edu.cn/ubuntu/
 https://repo.huaweicloud.com/ubuntu/
 #LOC:CO
 http://mirror.unimagdalena.edu.co/ubuntu/
+http://mirrors.atlas.net.co/ubuntu/
 https://edgeuno-bog2.mm.fcix.net/ubuntu/
 #LOC:CR
 http://ubuntu.ucr.ac.cr/ubuntu/
@@ -147,6 +151,7 @@ http://mirror.eu-fr.kamatera.com/ubuntu/
 http://mirror.funkfreundelandshut.de/ubuntu/
 http://mirror.ipb.de/ubuntu/
 http://mirror.kamp.de/ubuntu/
+http://mirror.liquidrp.de/ubuntu/
 http://mirror.serverloft.eu/ubuntu/ubuntu/
 http://mirror.wtnet.de/ubuntu/
 http://mirror2.tuxinator.org/ubuntu/
@@ -162,6 +167,7 @@ https://mirror.23m.com/ubuntu/
 https://mirror.creoline.net/ubuntu/
 https://mirror.de.leaseweb.net/ubuntu/
 https://mirror.dogado.de/ubuntu/
+https://mirror.fra.macarne.com/ubuntu/
 https://mirror.informatik.tu-freiberg.de/ubuntu/
 https://mirror.kkg.berlin/ubuntu/
 https://mirror.netcologne.de/ubuntu/
@@ -218,7 +224,6 @@ http://mirror.eu-lo.kamatera.com/ubuntu/
 http://mirror.freethought-internet.co.uk/ubuntu/
 http://mirror.mythic-beasts.com/ubuntu/
 http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
-http://mirror.sov.uk.goscomb.net/ubuntu/
 http://mirror.vorboss.net/ubuntu-archive/
 http://mirrors.coreix.net/ubuntu/
 http://mirrors.melbourne.co.uk/ubuntu/
@@ -238,6 +243,7 @@ http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/
 http://ftp.ntua.gr/ubuntu/
 http://ubuntu.otenet.gr/
 #LOC:HK
+http://hk.mirrors.thegigabit.com/ubuntu/
 http://mirror-hk.koddos.net/ubuntu/
 http://mirror.as.kamatera.com/ubuntu/
 https://mirror.xtom.com.hk/ubuntu/
@@ -271,7 +277,6 @@ https://mirror.nevacloud.com/ubuntu/ubuntu-archive/
 https://mirror.papua.go.id/ubuntu/
 https://mirror.repository.id/ubuntu/
 https://mirror.unair.ac.id/ubuntu/
-https://mirrors.idcloudhost.com/ubuntu/
 https://mr.heru.id/ubuntu/
 https://repo.usk.ac.id/ubuntu/
 https://sby.mirror.bignet.id/ubuntu/
@@ -295,6 +300,7 @@ http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/
 http://repos.del.extreme-ix.org/ubuntu/
 https://in.mirror.coganng.com/ubuntu-ports/
 https://in.mirror.coganng.com/ubuntu/
+https://mirror.bharatdatacenter.com/ubuntu/
 https://mirror.nitc.ac.in/ubuntu/
 https://mirrors.nxtgen.com/ubuntu-mirror/ubuntu/
 https://repo.extreme-ix.org/ubuntu/
@@ -331,6 +337,7 @@ http://archive.g4t1.pro/ubuntu/
 http://ftp.jaist.ac.jp/pub/Linux/ubuntu/
 http://ftp.riken.jp/Linux/ubuntu/
 http://ftp.tsukuba.wide.ad.jp/Linux/ubuntu/
+http://mirror.fairway.ne.jp/ubuntu/
 http://ubuntutym.u-toyama.ac.jp/ubuntu/
 http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/
 https://ftp.udx.icscoe.jp/Linux/ubuntu/
@@ -365,6 +372,7 @@ http://mirror.ps.kz/ubuntu/
 http://ftp.litnet.lt/ubuntu/
 http://ubuntu-archive.mirror.serveriai.lt/
 http://ubuntu.mirror.vu.lt/ubuntu/
+https://mirror.bacloud.com/ubuntu-mirror/archive/
 https://mirror.vpsnet.com/ubuntu/
 #LOC:LU
 http://ubuntu.mirror.root.lu/ubuntu/
@@ -391,6 +399,8 @@ http://mirror.datacenter.mn/ubuntu/
 #LOC:MU
 https://ubuntu-mirror.cloud.mu/ubuntu-ports/
 https://ubuntu-mirror.cloud.mu/ubuntu/
+#LOC:MX
+http://mirror.nerdmilio.com/ubuntu/
 #LOC:MY
 http://ubuntu.tuxuri.com/ubuntu/
 https://mirrors.gbnetwork.com/ubuntu/
@@ -436,6 +446,7 @@ http://ubuntu.uib.no/archive/
 https://ubuntu.hi.no/archive/
 #LOC:NP
 http://ntc.net.np/ubuntu/
+http://ubuntu.ntc.net.np/ubuntu/
 #LOC:NZ
 http://ubuntu.mirrors.theom.nz/
 http://ucmirror.canterbury.ac.nz/ubuntu/
@@ -443,10 +454,14 @@ https://mirror.2degrees.nz/ubuntu/
 https://mirror.fsmg.org.nz/ubuntu/
 #LOC:PH
 http://mirror.rise.ph/ubuntu/
+#LOC:PK
+http://mirror.virtury.com/ubuntu/
 #LOC:PL
 http://ftp.agh.edu.pl/ubuntu/
+http://ftp.icm.edu.pl/pub/Linux/ubuntu/
 http://ftp.vectranet.pl/ubuntu/
 http://mirror.chmuri.net/ubuntu/
+http://mirroronet.pl/pub/mirrors/ubuntu/
 http://ubuntu.man.lodz.pl/ubuntu/
 http://ubuntu.task.gda.pl/ubuntu/
 https://ftp.psnc.pl/linux/ubuntu/
@@ -458,6 +473,7 @@ http://cesium.di.uminho.pt/pub/ubuntu-archive/
 http://ftp.rnl.tecnico.ulisboa.pt/pub/ubuntu/archive/
 http://glua.ua.pt/pub/ubuntu/
 http://mirrors.up.pt/ubuntu/
+https://mirror.leitecastro.com/ubuntu/
 https://mirrors.ptisp.pt/ubuntu/
 #LOC:RO
 http://mirrors.nxthost.com/ubuntu/
@@ -486,8 +502,6 @@ https://mirror.hyperdedic.ru/ubuntu/
 https://mirror.linux-ia64.org/ubuntu/
 https://mirror.neftm.ru/ubuntu/
 https://mirror.truenetwork.ru/ubuntu/
-#LOC:SA
-https://mirrors.isu.net.sa/apt-mirror/
 #LOC:SE
 http://ftp.acc.umu.se/ubuntu/
 http://ftp.lysator.liu.se/ubuntu/
@@ -496,7 +510,6 @@ http://ubuntu.mirror.su.se/ubuntu/
 https://ftpmirror1.infania.net/ubuntu/
 https://mirror.bahnhof.net/ubuntu/
 #LOC:SG
-http://cdn.0ms.dev/ubuntu/
 http://download.nus.edu.sg/mirror/ubuntu/
 http://mirror.aktkn.sg/ubuntu/
 http://mirror.sg.gs/ubuntu/
@@ -625,9 +638,9 @@ https://mirror.d.umn.edu/ubuntu/
 https://mirror.dal.nexril.net/ubuntu/
 https://mirror.enzu.com/ubuntu/
 https://mirror.fcix.net/ubuntu/
-https://mirror.hoobly.com/ubuntu/
 https://mirror.lstn.net/ubuntu/
 https://mirror.mia.velocihost.net/ubuntu/
+https://mirror.pilotfiber.com/ubuntu/
 https://mirror.servaxnet.com/ubuntu/
 https://mirror.timkevin.us/ubuntu/
 https://mirror.ubuntu.serverforge.org/
@@ -655,10 +668,12 @@ http://mirror.bizflycloud.vn/ubuntu/
 http://mirror.clearsky.vn/ubuntu/
 http://mirror.vietnix.vn/ubuntu/
 http://mirror.viettelcloud.vn/ubuntu/
+http://mirrors.nhanhoa.com/ubuntu/
 http://mirrors.vhost.vn/ubuntu/
 http://opensource.xtdv.net/ubuntu/
 https://mirror.hostingviet.vn/ubuntu/
 https://mirrors.bkns.vn/ubuntu/
+https://mirrors.tino.org/ubuntu/
 #LOC:ZA
 http://mirror.hostafrica.co.za/ubuntu/
 http://ubuntu.mirror.ac.za/ubuntu/