Merging upstream version 2.8.0.

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

2 files changed, 50 insertions, 20 deletions

diff --git a/data/templates/Debian.mirrors b/data/templates/Debian.mirrors
index 09d0826..1551a71 100644
--- a/data/templates/Debian.mirrors
+++ b/data/templates/Debian.mirrors
@@ -1,6 +1,3 @@
-#LOC:AM
-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/
@@ -14,6 +11,7 @@ http://ftp.tu-graz.ac.at/mirror/debian/
 http://mirror.alwyzon.net/debian/
 #LOC:AU
 http://debian.mirror.digitalpacific.com.au/debian/
+http://debian.mirror.serversaustralia.com.au/debian/
 http://ftp.au.debian.org/debian/
 http://mirror.aarnet.edu.au/debian/
 http://mirror.amaze.com.au/debian/
@@ -23,6 +21,7 @@ http://mirror.overthewire.com.au/debian/
 http://mirror.realcompute.io/debian/
 http://mirrors.xtom.au/debian/
 #LOC:BD
+http://mirror.limda.net/debian/
 http://mirror.xeonbd.com/debian/
 #LOC:BE
 http://ftp.be.debian.org/debian/
@@ -47,6 +46,7 @@ http://ftp.by.debian.org/debian/
 http://ftp.byfly.by/debian/
 http://mirror.datacenter.by/debian/
 #LOC:CA
+http://debian.linux.n0c.ca/debian/
 http://debian.mirror.iweb.ca/debian/
 http://debian.mirror.rafal.ca/debian/
 http://ftp.ca.debian.org/debian/
@@ -66,13 +66,14 @@ http://mirror1.infomaniak.com/debian/
 http://mirror2.infomaniak.com/debian/
 http://pkg.adfinis.com/debian/
 #LOC:CL
-http://debian.redlibre.cl/debian/
+http://elmirror.cl/debian/
 http://ftp.cl.debian.org/debian/
 http://mirror.hnd.cl/debian/
 http://mirror.insacom.cl/debian/
 http://mirror.ufro.cl/debian/
 #LOC:CN
 http://ftp.cn.debian.org/debian/
+http://mirror.bjtu.edu.cn/debian/
 http://mirror.lzu.edu.cn/debian/
 http://mirror.nju.edu.cn/debian/
 http://mirror.nyist.edu.cn/debian/
@@ -84,16 +85,15 @@ http://mirrors.jlu.edu.cn/debian/
 http://mirrors.neusoft.edu.cn/debian/
 http://mirrors.tuna.tsinghua.edu.cn/debian/
 http://mirrors.ustc.edu.cn/debian/
-http://mirrors.zju.edu.cn/debian/
 #LOC:CR
 http://debianmirror.una.ac.cr/debian/
+http://mirrors.ucr.ac.cr/debian/
 #LOC:CZ
 http://debian.mirror.web4u.cz/
 http://debian.superhosting.cz/debian/
 http://ftp.cvut.cz/debian/
 http://ftp.cz.debian.org/debian/
 http://ftp.debian.cz/debian/
-http://ftp.sh.cvut.cz/debian/
 http://ftp.zcu.cz/debian/
 http://merlin.fit.vutbr.cz/debian/
 http://mirror-prg.webglobe.com/debian/
@@ -105,11 +105,10 @@ http://artfiles.org/debian/
 http://de.mirrors.clouvider.net/debian/
 http://debian.charite.de/debian/
 http://debian.inf.tu-dresden.de/debian/
-http://debian.intergenia.de/debian/
 http://debian.mirror.iphh.net/debian/
 http://debian.mirror.lrz.de/debian/
 http://debian.netcologne.de/debian/
-http://debian.tu-bs.de/debian/
+http://drmirror.physi.uni-heidelberg.de/debian/
 http://ftp-stud.hs-esslingen.de/debian/
 http://ftp.de.debian.org/debian/
 http://ftp.fau.de/debian/
@@ -129,6 +128,7 @@ http://mirror.23m.com/debian/
 http://mirror.de.leaseweb.net/debian/
 http://mirror.dogado.de/debian/
 http://mirror.eu.oneandone.net/debian/
+http://mirror.fra.macarne.com/debian/
 http://mirror.informatik.tu-freiberg.de/debian/
 http://mirror.ipb.de/debian/
 http://mirror.netzwerge.de/debian/
@@ -148,7 +148,6 @@ http://mirrors.xtom.ee/debian/
 #LOC:ES
 http://debian.grn.cat/debian/
 http://debian.redimadrid.es/debian/
-http://debian.redparra.com/debian/
 http://debian.uvigo.es/debian/
 http://ftp.caliu.cat/debian/
 http://ftp.cica.es/debian/
@@ -170,6 +169,7 @@ 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.u-strasbg.fr/debian/
 http://ftp.univ-pau.fr/linux/mirrors/debian/
 http://miroir.univ-lorraine.fr/debian/
@@ -186,6 +186,7 @@ http://ftp.ticklers.org/debian/
 http://ftp.uk.debian.org/debian/
 http://mirror.cov.ukservers.com/debian/
 http://mirror.lchost.net/debian/
+http://mirror.lon.macarne.com/debian/
 http://mirror.mythic-beasts.com/debian/
 http://mirror.ox.ac.uk/debian/
 http://mirror.positive-internet.com/debian/
@@ -220,6 +221,8 @@ http://debian.interhost.co.il/debian/
 http://mirrors.iitd.ac.in/debian/
 #LOC:IR
 http://archive.debian.petiak.ir/debian/
+http://mirror.aminidc.com/debian/
+http://mirror.iranserver.com/debian/
 #LOC:IS
 http://ftp.is.debian.org/debian/
 http://is.mirror.flokinet.net/debian/
@@ -232,6 +235,8 @@ http://giano.com.dist.unige.it/debian/
 http://mirror.units.it/debian/
 #LOC:JP
 http://debian-mirror.sakura.ne.jp/debian/
+http://dennou-k.gfd-dennou.org/debian/
+http://dennou-q.gfd-dennou.org/debian/
 http://ftp.jp.debian.org/debian/
 http://ftp.kddilabs.jp/pub/debian/
 http://ftp.nara.wide.ad.jp/debian/
@@ -239,7 +244,10 @@ 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:KH
+http://mirror.sabay.com.kh/debian/
 #LOC:KR
 http://ftp.kaist.ac.kr/debian/
 http://ftp.kr.debian.org/debian/
@@ -257,6 +265,9 @@ 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/
@@ -272,12 +283,16 @@ http://debian.snt.utwente.nl/debian/
 http://ftp.nl.debian.org/debian/
 http://mirror.duocast.net/debian/
 http://mirror.i3d.net/debian/
+http://mirror.nforce.com/debian/
 http://mirror.nl.datapacket.com/debian/
 http://mirror.nl.leaseweb.net/debian/
 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/
@@ -294,11 +309,12 @@ 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.hosterion.ro/debian/
 http://mirrors.hostico.ro/debian/
 http://mirrors.nav.ro/debian/
 http://mirrors.nxthost.com/debian/
@@ -312,6 +328,7 @@ http://mirror.hyperdedic.ru/debian/
 http://mirror.mephi.ru/debian/
 http://mirror.truenetwork.ru/debian/
 http://mirrors.powernet.com.ru/debian/
+http://repository.su/debian/
 #LOC:SE
 http://debian.lth.se/debian/
 http://debian.mirror.su.se/debian/
@@ -321,8 +338,8 @@ http://ftpmirror1.infania.net/debian/
 http://mirror.zetup.net/debian/
 http://mirrors.glesys.net/debian/
 #LOC:SG
+http://mirror.djvg.sg/debian/
 http://mirror.sg.gs/debian/
-http://ossmirror.mycloud.services/debian/
 #LOC:SI
 http://ftp.si.debian.org/debian/
 #LOC:SK
@@ -339,6 +356,8 @@ 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.ncku.edu.tw/debian/
 http://debian.csie.ntu.edu.tw/debian/
 http://ftp.tku.edu.tw/debian/
 http://ftp.tw.debian.org/debian/
@@ -347,7 +366,6 @@ http://tw1.mirror.blendbyte.net/debian/
 #LOC:UA
 http://debian.netforce.hosting/debian/
 http://debian.volia.net/debian/
-http://fastmirror.pp.ua/debian/
 http://mirror.mirohost.net/debian/
 http://mirror.ukrnames.com/debian/
 #LOC:US
@@ -361,7 +379,6 @@ http://debian.osuosl.org/debian/
 http://debian.uchicago.edu/debian/
 http://ftp.us.debian.org/debian/
 http://la.mirrors.clouvider.net/debian/
-http://mirror.0x626b.com/debian/
 http://mirror.clarkson.edu/debian/
 http://mirror.cogentco.com/debian/
 http://mirror.dal.nexril.net/debian/
@@ -373,8 +390,10 @@ 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.advancedhosters.com/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/
diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index d1c3896..bc2690c 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -64,7 +64,7 @@ http://mirror.ca-tr.kamatera.com/ubuntu/
 http://mirror.its.dal.ca/ubuntu/
 http://mirror.rcg.sfu.ca/mirror/ubuntu/
 http://mirrors.layeronline.com/ubuntu/
-http://ubuntu.mirror.globo.tech/
+http://ubuntu.linux.n0c.ca/ubuntuarchive/
 http://ubuntu.mirror.rafal.ca/ubuntu/
 https://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/
 https://mirror.0xem.ma/ubuntu/
@@ -84,6 +84,7 @@ http://pkg.adfinis.com/ubuntu/
 http://ubuntu.ethz.ch/ubuntu/
 https://mirror.init7.net/ubuntu/
 https://mirror.solnet.ch/ubuntu/
+https://pkg.adfinis-on-exoscale.ch/ubuntu/
 #LOC:CL
 http://mirror.uchile.cl/ubuntu/
 https://elmirror.cl/ubuntu/
@@ -96,6 +97,7 @@ http://mirrors.aliyun.com/ubuntu/
 http://mirrors.cn99.com/ubuntu/
 http://mirrors.cqu.edu.cn/ubuntu/
 http://mirrors.huaweicloud.com/repository/ubuntu/
+http://mirrors.njupt.edu.cn/ubuntu/
 http://mirrors.sohu.com/ubuntu/
 http://mirrors.yun-idc.com/ubuntu/
 https://mirror.bjtu.edu.cn/ubuntu/
@@ -180,12 +182,14 @@ http://ftp.klid.dk/ftp/ubuntu/
 http://mirror.one.com/ubuntu/
 http://mirrors.dotsrc.org/ubuntu/
 https://mirror.asergo.com/ubuntu/
+https://mirror.group.one/ubuntu/
 https://mirror.netsite.dk/ubuntu/archive/
 https://mirrors.c0urier.net/linux/ubuntu/
 #LOC:EC
 http://mirror.cedia.org.ec/ubuntu/
 http://mirror.espol.edu.ec/ubuntu/
 #LOC:EE
+https://archive.ubuntu.apiversa.com/
 https://mirrors.xtom.ee/ubuntu/
 #LOC:ES
 http://dafi.inf.um.es/ubuntu/
@@ -201,6 +205,7 @@ https://ubuntu.uvigo.es/
 #LOC:FI
 http://mirrors.nic.funet.fi/ubuntu/
 https://mirror.5i.fi/ubuntu/
+https://ubuntu.web.trex.fi/ubuntu/
 #LOC:FR
 http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/
 http://miroir.univ-lorraine.fr/ubuntu/
@@ -231,8 +236,8 @@ http://mirrors.ukfast.co.uk/sites/archive.ubuntu.com/
 http://ubuntu.mirrors.uk2.net/ubuntu/
 http://ubuntu.positive-internet.com/ubuntu/
 http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
+https://mirror.lon.macarne.com/ubuntu/
 https://mirror.vinehost.net/ubuntu/
-https://mirrors.gethosted.online/ubuntu/
 https://uk.mirrors.clouvider.net/ubuntu/
 #LOC:GE
 http://ubuntu.grena.ge/ubuntu/
@@ -379,7 +384,7 @@ http://ubuntu.mirror.root.lu/ubuntu/
 #LOC:LV
 http://mirror.cloudhosting.lv/ubuntu/
 http://ubuntu-arch.linux.edu.lv/ubuntu/
-http://ubuntu.koyanet.lv/ubuntu/
+https://ubuntu.koyanet.lv/ubuntu/
 #LOC:MA
 https://mirror.marwan.ma/ubuntu/
 #LOC:MD
@@ -402,6 +407,7 @@ https://ubuntu-mirror.cloud.mu/ubuntu/
 #LOC:MX
 http://mirror.nerdmilio.com/ubuntu/
 #LOC:MY
+http://my.mirrors.thegigabit.com/ubuntu/
 http://ubuntu.tuxuri.com/ubuntu/
 https://mirrors.gbnetwork.com/ubuntu/
 https://mirrors.ipserverone.com/ubuntu/
@@ -461,10 +467,10 @@ 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/
+https://mirroronet.pl/pub/mirrors/ubuntu/
 #LOC:PR
 http://mirrors.upr.edu/ubuntu/
 #LOC:PT
@@ -502,6 +508,8 @@ 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/
@@ -510,7 +518,9 @@ http://ubuntu.mirror.su.se/ubuntu/
 https://ftpmirror1.infania.net/ubuntu/
 https://mirror.bahnhof.net/ubuntu/
 #LOC:SG
+http://0ms.dev/mirrors/ubuntu/
 http://download.nus.edu.sg/mirror/ubuntu/
+http://kambing.uu.sg/ubuntu/
 http://mirror.aktkn.sg/ubuntu/
 http://mirror.sg.gs/ubuntu/
 http://ossmirror.mycloud.services/os/linux/ubuntu/
@@ -552,6 +562,8 @@ http://ubuntu.cs.nctu.edu.tw/ubuntu/
 https://ftp.tc.edu.tw/Linux/ubuntu/
 https://ftp.ubuntu-tw.net/ubuntu/
 https://mirror.ossplanet.net/ubuntu/
+https://mirror.twds.com.tw/ubuntu-ports/
+https://mirror.twds.com.tw/ubuntu/
 https://tw1.mirror.blendbyte.net/ubuntu/
 https://ubuntu.ccns.ncku.edu.tw/ubuntu/
 #LOC:TZ
@@ -559,11 +571,9 @@ http://deb-mirror.habari.co.tz/ubuntu/
 http://mirror.aptus.co.tz/pub/ubuntuarchive/
 #LOC:UA
 http://mirror.mirohost.net/ubuntu/
-http://ubuntu.colocall.net/ubuntu/
 http://ubuntu.mirrors.omnilance.com/ubuntu/
 http://ubuntu.org.ua/ubuntu/
 http://ubuntu.volia.net/ubuntu-archive/
-https://ubuntu.ip-connect.vn.ua/
 https://ubuntu.netforce.hosting/ubuntu/
 #LOC:UG
 http://mirror.renu.ac.ug/ubuntu/
@@ -601,7 +611,6 @@ http://mirrors.arpnetworks.com/Ubuntu/
 http://mirrors.cat.pdx.edu/ubuntu/
 http://mirrors.cmich.edu/ubuntu/
 http://mirrors.codec-cluster.org/ubuntu/
-http://mirrors.gigenet.com/ubuntuarchive/
 http://mirrors.liquidweb.com/ubuntu/
 http://mirrors.lug.mtu.edu/ubuntu/
 http://mirrors.maine.edu/ubuntu/
@@ -638,6 +647,7 @@ 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/
@@ -647,6 +657,7 @@ https://mirror.ubuntu.serverforge.org/
 https://mirror.us.leaseweb.net/ubuntu/
 https://mirrors.bloomu.edu/ubuntu/
 https://mirrors.egr.msu.edu/ubuntu/
+https://mirrors.gigenet.com/ubuntu/
 https://mirrors.iu13.net/ubuntu/
 https://mirrors.ocf.berkeley.edu/ubuntu-ports/
 https://mirrors.sarak.as/ubuntu/