* only include ftp and http mirrors for Ubuntu - LP#99060

* update the debian changelog

3 files changed, 13 insertions, 50 deletions

diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index 5d804a50..01a47881 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -1,13 +1,11 @@
 #LOC:AU
 http://ftp.iinet.net.au/pub/ubuntu
 ftp://ftp.iinet.net.au/pub/ubuntu
-rsync://ftp.iinet.net.au/ubuntu
 http://mirror.optus.net/ubuntu/
 http://mirror.pacific.net.au/linux/ubuntu/
 #LOC:AT
 http://ubuntu.inode.at/ubuntu/
 ftp://ubuntu.inode.at/ubuntu/
-rsync://ubuntu.inode.at/ubuntu/ubuntu/
 http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/
 #LOC:BE
 http://ftp.belnet.be/linux/ubuntu/ubuntu/
@@ -17,20 +15,16 @@ http://archive.ubuntu.com.ba/ubuntu/
 #LOC:BW
 http://bw.archive.ubuntu.com/ubuntu/
 ftp://bw.archive.ubuntu.com/ubuntu
-rsync://bw.releases.ubuntu.com/ubuntu-archive
 #LOC:BR
 http://br.archive.ubuntu.com/ubuntu/
 ftp://br.archive.ubuntu.com/ubuntu
-rsync://br.archive.ubuntu.com/ubuntu/
 http://sft.if.usp.br/ubuntu/
 ftp://sft.if.usp.br/ubuntu/
-rsync://sft.if.usp.br:/ubuntu/
 http://espelhos.edugraf.ufsc.br/ubuntu/
 http://ubuntu.c3sl.ufpr.br/ubuntu/
 #LOC:BG
 http://ubuntu.linux-bg.org/ubuntu/
 ftp://ubuntu.linux-bg.org/ubuntu/
-rsync://ubuntu.linux-bg.org/ubuntu/
 http://ubuntu.ipacct.com/ubuntu/
 ftp://ubuntu.ipacct.com/ubuntu/
 #LOC:CA
@@ -38,7 +32,6 @@ http://gulus.USherbrooke.ca/ubuntu/
 ftp://gulus.USherbrooke.ca/ubuntu/
 http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
 ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
-rsync://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
 ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/
 ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/
 http://mirror.arcticnetwork.ca/pub/ubuntu/packages/
@@ -46,7 +39,6 @@ http://ubuntu.mirror.rafal.ca/ubuntu/
 #LOC:CL
 http://cl.archive.ubuntu.com/ubuntu/
 ftp://cl.archive.ubuntu.com/ubuntu/
-rsync://cl.archive.ubuntu.com/ubuntu/
 #LOC:CN
 http://mirror.lupaworld.com/ubuntu/archive/
 #LOC:CR
@@ -54,7 +46,6 @@ http://ftp.ucr.ac.cr/ubuntu/
 #LOC:HR
 http://hr.archive.ubuntu.com/ubuntu/
 ftp://hr.archive.ubuntu.com/ubuntu
-rsync://hr.archive.ubuntu.com/ubuntu/
 #LOC:CZ
 http://cz.archive.ubuntu.com/ubuntu/
 ftp://cz.archive.ubuntu.com/MIRRORS/archive.ubuntu.com/mirror/ubuntu/
@@ -69,14 +60,12 @@ http://mirrors.dotsrc.org/ubuntu/
 #LOC:FI
 http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/
 ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/
-rsync://rsync.nic.funet.fi/ftp/pub/mirrors/archive.ubuntu.com/
 http://mirrors.nic.funet.fi/ubuntu/
 #LOC:FR
 ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/
 ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/
 http://ftp.crihan.fr/ubuntu/
 ftp://ftp.crihan.fr/ubuntu/
-rsync://ftp.crihan.fr/ubuntu/
 http://ftp.oleane.net/ubuntu/
 ftp://ftp.oleane.net/ubuntu
 http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/
@@ -87,12 +76,9 @@ ftp://ubuntu.univ-nantes.fr/ubuntu/
 http://ubuntu.eriders.ge/ubuntu/
 #LOC:DE
 http://ubuntu.intergenia.de/ubuntu/
-rsync://ubuntu.intergenia.de/ubuntu-linux/ubuntu/
 http://de.archive.ubuntu.com/ubuntu/
-rsync://de.archive.ubuntu.com/ubuntu/
 http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
 ftp://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
-rsync://ftp.uni-muenster.de/ubuntu/ubuntu/
 ftp://ftp.fu-berlin.de/linux/ubuntu/
 ftp://ftp.fu-berlin.de/linux/ubuntu/
 http://ftp.halifax.rwth-aachen.de/ubuntu/
@@ -101,13 +87,10 @@ ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
 ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
 http://ftp.stw-bonn.de/ubuntu/
 ftp://ftp.stw-bonn.de/ubuntu/
-rsync://ftp.stw-bonn.de/ubuntu/
 http://ftp.uni-kl.de/pub/linux/ubuntu/
 ftp://ftp.uni-kl.de/pub/linux/ubuntu/
-rsync://ftp.uni-kl.de/pub/linux/ubuntu/
 http://archive.ubuntu.uasw.edu/
 ftp://ftp.uasw.edu/linux/ubuntu/archive/
-rsync://ftp.uasw.edu/ftp/linux/ubuntu/archive/
 http://debian.charite.de/ubuntu/
 http://ftp.hosteurope.de/mirror/archive.ubuntu.com/
 ftp://ftp.hosteurope.de/mirror/archive.ubuntu.com/
@@ -117,7 +100,6 @@ http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/
 #LOC:GR
 http://ftp.duth.gr/pub/ubuntu/
 ftp://ftp.duth.gr/pub/ubuntu/
-rsync://ftp.duth.gr/ubuntu/
 http://ftp.ntua.gr/pub/linux/ubuntu/
 ftp://ftp.ntua.gr/pub/linux/ubuntu/
 http://gr.archive.ubuntu.com/ubuntu/
@@ -131,15 +113,12 @@ http://ubuntu.lhi.is/ubuntu/
 #LOC:IN
 http://ftp.iitm.ac.in/ubuntu
 ftp://ftp.iitm.ac.in/ubuntu
-rsync://ftp.iitm.ac.in/ubuntu
 #LOC:ID
 http://ubuntu.indika.net.id/ubuntu/
 ftp://ubuntu.indika.net.id/ubuntu/
-rsync://ubuntu.indika.net.id/ubuntu/
 #LOC:IE
 http://ie.archive.ubuntu.com/ubuntu/
 ftp://ie.archive.ubuntu.com/ubuntu/
-rsync://ie.archive.ubuntu.com/ubuntu/
 http://ftp.esat.net/mirrors/archive.ubuntu.com/
 http://ftp.heanet.ie/pub/ubuntu/
 #LOC:IT
@@ -147,14 +126,12 @@ http://ubuntu.fastbull.org/ubuntu/
 ftp://ubuntu.fastbull.org/ubuntu/
 http://na.mirror.garr.it/mirrors/ubuntu-archive/
 ftp://na.mirror.garr.it/mirrors/ubuntu-archive/
-rsync://na.mirror.garr.it::ubuntu-archive/
 #LOC:JP
 http://ubuntu.mithril-linux.org/archives
 http://ftp.ecc.u-tokyo.ac.jp/ubuntu/
 #LOC:KR
 http://kr.archive.ubuntu.com/ubuntu/
 ftp://kr.archive.ubuntu.com/ubuntu/
-rsync://kr.archive.ubuntu.com/ubuntu/
 http://ftp.kaist.ac.kr/pub/ubuntu/
 http://mirror.letsopen.com/os/ubuntu/
 #LOC:LV
@@ -167,14 +144,12 @@ ftp://archive.mnosi.org/ubuntu/
 #LOC:NL
 http://nl.archive.ubuntu.com/ubuntu/
 ftp://nl.archive.ubuntu.com/ubuntu/
-rsync://nl.archive.ubuntu.com/ubuntu/
 http://ftp.tiscali.nl/ubuntu/
 ftp://ftp.tiscali.nl/pub/mirror/ubuntu
 ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/
 ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/
 http://ubuntu.tiscali.nl/
 ftp://ubuntu.tiscali.nl/
-rsync://ubuntu.tiscali.nl/
 ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
 ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
 #LOC:NZ
@@ -182,11 +157,9 @@ http://ftp.citylink.co.nz/ubuntu/
 #LOC:NO
 http://ftp.uninett.no/ubuntu/
 ftp://ftp.uninett.no/ubuntu/
-rsync://ftp.uninett.no/ubuntu/
 #LOC:PL
 http://ftp.vectranet.pl/ubuntu/
 ftp://ftp.vectranet.pl/ubuntu
-rsync://ftp.vectranet.pl/ubuntu/
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
 http://ubuntu.task.gda.pl/ubuntu/
@@ -196,9 +169,7 @@ ftp://ftp.dei.uc.pt/pub/linux/ubuntu/archive/
 http://ubuntu.dcc.fc.up.pt/
 http://ftp.gil.di.uminho.pt/ubuntu/
 ftp://ftp.gil.di.uminho.pt/ubuntu/
-rsync://ftp.gil.di.uminho.pt/ubuntu/
 http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/
-rsync://http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/
 http://neacm.fe.up.pt/ubuntu/
 ftp://neacm.fe.up.pt/pub/ubuntu/
 #LOC:RO
@@ -208,7 +179,6 @@ http://ftp.chg.ru/pub/Linux/ubuntu/archive/
 #LOC:Serbia and Montenegro
 http://yu.archive.ubuntu.com/ubuntu/
 ftp://yu.archive.ubuntu.com/ubuntu
-rsync://yu.archive.ubuntu.com/ubuntu/
 http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
 http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
 #LOC:SK
@@ -218,14 +188,11 @@ http://ubuntuarchive.is.co.za/ubuntu/
 ftp://ubuntuarchive.is.co.za/ubuntu/
 http://ubuntu.mirror.ac.za/ubuntu-archive/
 ftp://ubuntu.mirror.ac.za/ubuntu-archive
-rsync://ubuntu.mirror.ac.za/ubuntu-archive/
 http://ftp.leg.uct.ac.za/pub/linux/ubuntu/
 ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu/
-rsync://ftp.leg.uct.ac.za/pub/linux/ubuntu/
 #LOC:ES
 http://es.archive.ubuntu.com/ubuntu/
 ftp://es.archive.ubuntu.com/ubuntu/
-rsync://es.archive.ubuntu.com/ubuntu/
 http://ftp.dateleco.es/ubuntu/
 ftp://ftp.dateleco.es/ubuntu/
 http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu/
@@ -235,7 +202,6 @@ ftp://ftp.um.es/mirror/ubuntu/
 #LOC:SE
 http://se.archive.ubuntu.com/ubuntu/
 ftp://se.archive.ubuntu.com/ubuntu/
-rsync://se.archive.ubuntu.com/ubuntu/
 http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
 ftp://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
 http://ftp.port80.se/ubuntu/
@@ -253,53 +219,41 @@ http://mirror.nttu.edu.tw/ubuntu/
 ftp://mirror.nttu.edu.tw/ubuntu/
 http://tw.archive.ubuntu.com/ubuntu/
 ftp://tw.archive.ubuntu.com/ubuntu
-rsync://tw.archive.ubuntu.com/ubuntu/
 http://debian.linux.org.tw/ubuntu/
 #LOC:GB
 http://ubuntu-archive.datahop.it/ubuntu/
 ftp://ubuntu-archive.datahop.it/ubuntu/
-rsync://ubuntu-archive.datahop.it/ubuntu/
 http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
 ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
-rsync://rsync.mirrorservice.org/archive.ubuntu.com/ubuntu/
 http://archive.ubuntu.com/ubuntu/
 ftp://archive.ubuntu.com/ubuntu/
-rsync://archive.ubuntu.com/ubuntu/
 http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
 ftp://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
-rsync://ftp0.ticklers.org/archive.ubuntu.org/ubuntu/
 http://ubuntu.virginmedia.com/archive/
 ftp://mirrors.virginmedia.com/mirrors/ubuntu/archive
 #LOC:US
 http://mirror.anl.gov/pub/ubuntu/
 ftp://mirror.anl.gov/pub/ubuntu/
-rsync://mirror.anl.gov/ubuntu/
 http://carroll.cac.psu.edu/pub/linux/distributions/ubuntu/
 ftp://carroll.aset.psu.edu:/pub/linux/distributions/ubuntu
 http://ftp.usf.edu/pub/ubuntu/
 ftp://ftp.usf.edu/pub/ubuntu/
 http://mirrors.cat.pdx.edu/ubuntu/
 ftp://mirrors.cat.pdx.edu/ubuntu/
-rsync://mirrors.cat.pdx.edu/ubuntu/
 http://mirrors.easynews.com/linux/ubuntu/
 ftp://mirrors.easynews.com/linux/ubuntu
-rsync://mirrors.easynews.com:/mirrors/linux/ubuntu/
 http://mirrors.kernel.org/ubuntu/
 ftp://mirrors.kernel.org/ubuntu/
-rsync://mirrors.kernel.org/ubuntu
 http://mirrors.xmission.com/ubuntu/
 ftp://mirrors.xmission.com/ubuntu/
 http://ubuntu.mirrors.tds.net/pub/ubuntu/
 ftp://ubuntu.mirrors.tds.net/pub/ubuntu/
-rsync://ubuntu.mirrors.tds.net/ubuntu/
 http://www.gtlib.gatech.edu/pub/ubuntu/
 ftp://ftp.gtlib.gatech.edu/pub/ubuntu
-rsync://rsync.gtlib.gatech.edu/ubuntu/
 http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
 ftp://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
 http://mirror.imbrandon.com/ubuntu/
 http://mirror.cs.umn.edu/ubuntu/
-rsync://mirror.cs.umn.edu/ubuntu/
 http://mirror.lcsee.wvu.edu/ubuntu/
 http://ubuntu.cs.uaf.edu/ubuntu/
 http://cudlug.cudenver.edu/ubuntu/
@@ -308,7 +262,6 @@ http://ftp.unina.it/pub/linux/distributions/ubuntu/
 http://ftp.ussg.iu.edu/linux/ubuntu/
 http://lug.mtu.edu/ubuntu/
 ftp://lug.mtu.edu/ubuntu/
-rsync://lug.mtu.edu/ubuntu/
 http://mirror.clarkson.edu/pub/distributions/ubuntu/
 http://mirrors.cs.wmich.edu/ubuntu/
 http://ubuntu.cs.utah.edu/ubuntu/
diff --git a/debian/changelog b/debian/changelog
index 17026b3e..2d40777f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-apt (0.6.20ubuntu15) unstable; urgency=low
+
+  [ Sebastian Heinlein ]
+  * Update the mirror lists from Launchpad
+  * Only include http and ftp servers - LP#99060
+
+ -- Sebastian Heinlein <glatzor@ubuntu.com>  Mon, 02 Apr 2007 00:02:53 +0200
+
 python-apt (0.6.20ubuntu14) feisty; urgency=low
 
   [Michael Vogt]
diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py
index 9ffc6389..7d9116f2 100755
--- a/utils/get_ubuntu_mirrors_from_lp.py
+++ b/utils/get_ubuntu_mirrors_from_lp.py
@@ -68,13 +68,15 @@ def find(split):
     country = re.search(r"<strong>(.+?)</strong>", split)
     if not country:
         return
-    urls = re.findall(r'<a href="(?![a-zA-Z:/_\-]+launchpad.+?">)(.+?)">',
-                      split)
     if countries.has_key(country.group(1)):
         lines.append("#LOC:%s" % countries[country.group(1)].upper())
     else:
         lines.append("#LOC:%s" % country.group(1))
-    map(lines.append, urls)
+    # FIXME: currently the protocols are hardcoded: ftp http
+    urls = re.findall(r'<a href="(?![a-zA-Z:/_\-]+launchpad.+?">)'
+                       '(((http)|(ftp)).+?)">',
+                      split)
+    map(lambda u: lines.append(u[0]), urls)
 
 map(find, content_splits)