sync with recent mirror changes and list http mirrors here.

looks good to deraadt@

1 files changed, 61 insertions, 3 deletions

diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors
index 285f0999057..8212b36b221 100644
--- a/distrib/notes/mirrors
+++ b/distrib/notes/mirrors
@@ -1,36 +1,51 @@
-dnl	$OpenBSD: mirrors,v 1.77 2010/03/02 09:07:13 sthen Exp $
-This is a list of currently known FTP servers at the time of the OSREV release.
-For a more recent list, please refer to
+dnl	$OpenBSD: mirrors,v 1.78 2010/03/12 20:08:02 sthen Exp $
+This is a list of currently known FTP and HTTP servers at the time
+of the OSREV release.  For a more recent list, please refer to
 
 	http://www.OpenBSD.org/ftp.html
 
 Main server in Canada:
     ftp://ftp.OpenBSD.org/pub/OpenBSD (Alberta)
+    http://ftp.OpenBSD.org/pub/OpenBSD (Alberta)
 
 2nd level mirrors:
     ftp://anga.funkfeuer.at/pub/OpenBSD (Vienna, Austria)
+    http://anga.funkfeuer.at/ftp/pub/OpenBSD (Vienna, Austria)
     ftp://ftp.wu-wien.ac.at/pub/OpenBSD (Vienna, Austria)
+    http://ftp.wu-wien.ac.at/pub/OpenBSD (Vienna, Austria)
     ftp://ftp.eu.openbsd.org/pub/OpenBSD (Stockholm, Sweden)
+    http://ftp.eu.openbsd.org/pub/OpenBSD (Stockholm, Sweden)
     ftp://ftp5.usa.openbsd.org/pub/OpenBSD (Redwood City, CA, USA)
     ftp://ftp3.usa.openbsd.org/pub/OpenBSD (Boulder, CO, USA)
     ftp://obsd.cec.mtu.edu/pub/OpenBSD (Houghton, Michigan, USA)
+    http://obsd.cec.mtu.edu/pub/OpenBSD (Houghton, Michigan, USA)
 
 Argentina:
     ftp://openbsd.noc.jgm.gov.ar/pub/OpenBSD (Buenos Aires)
+    http://openbsd.noc.jgm.gov.ar/pub/OpenBSD (Buenos Aires)
     ftp://mirrors.localhost.net.ar/pub/OpenBSD (Buenos Aires)
     ftp://ftp.openbsd.org.ar/pub/OpenBSD (Buenos Aires)
+    http://openbsd.org.ar/pub/OpenBSD (Buenos Aires)
 
 Australia:
     ftp://ftp.iinet.net.au/pub/OpenBSD (Perth)
+    http://ftp.iinet.net.au/pub/OpenBSD (Perth)
     ftp://mirror.pacific.net.au/OpenBSD (Sydney)
+    http://mirror.pacific.net.au/OpenBSD (Sydney)
     ftp://mirror.internode.on.net/pub/OpenBSD (Adelaide)
+    http://mirror.internode.on.net/pub/OpenBSD (Adelaide)
     ftp://mirror.aarnet.edu.au/pub/OpenBSD (Brisbane)
+    http://mirror.aarnet.edu.au/pub/OpenBSD (Brisbane)
 
 Belgium:
     ftp://ftp.belnet.be/packages/openbsd (Brussels)
+    http://ftp.belnet.be/packages/openbsd (Brussels)
 
 Brazil:
     ftp://ftp.das.ufsc.br/pub/OpenBSD (Florianopolis)
+    http://ftp.das.ufsc.br/pub/OpenBSD (Florianopolis)
+    http://mirrors.uol.com.br/pub/OpenBSD (Sao Paulo)
+    http://ivete.fis.unb.br/mirror/OpenBSD (Brasilia)
 
 Canada:
     ftp://openbsd.arcticnetwork.ca/pub/OpenBSD (Calgary)
@@ -41,22 +56,31 @@ China:
 
 Costa Rica:
     ftp://mirrors.ucr.ac.cr/OpenBSD
+    http://mirrors.ucr.ac.cr/OpenBSD
 
 Denmark:
     ftp://ftp.openbsd.dk/pub/OpenBSD (Aalborg)
+    http://ftp.openbsd.dk/pub/OpenBSD (Aalborg)
     ftp://ftp.dkuug.dk/pub/OpenBSD (Copenhagen)
+    http://ftp.dkuug.dk/pub/OpenBSD (Copenhagen)
 
 Estonia:
     ftp://ftp.aso.ee/pub/OpenBSD (Tallinn)
+    http://ftp.aso.ee/pub/OpenBSD (Tallinn)
     ftp://ftp.estpak.ee/pub/OpenBSD (Tallinn)
+    http://ftp.estpak.ee/pub/OpenBSD (Tallinn)
 
 Finland:
     ftp://mirrors.nic.funet.fi/pub/OpenBSD (Espoo)
+    http://mirrors.nic.funet.fi/pub/OpenBSD (Espoo)
     ftp://ftp.jyu.fi/pub/OpenBSD (Jyvaskyla)
+    http://ftp.jyu.fi/ftp/pub/OpenBSD (Jyvaskyla)
 
 France:
     ftp://ftp.fr.openbsd.org/pub/OpenBSD (Paris)
+    http://ftp.fr.openbsd.org/pub/OpenBSD (Paris)
     ftp://ftp.arcane-networks.fr/pub/OpenBSD (Paris)
+    http://ftp.arcane-networks.fr/pub/OpenBSD (Paris)
     ftp://ftp.crans.org/pub/OpenBSD (Paris)
     ftp://ftp.irisa.fr/pub/OpenBSD (Rennes)
     ftp://ftp2.fr.openbsd.org/pub/OpenBSD (Paris)
@@ -66,11 +90,15 @@ Germany:
     ftp://ftp.spline.de/pub/OpenBSD (Berlin)
     ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD (Dusseldorf)
     ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD (Esslingen)
+    http://ftp-stud.fht-esslingen.de/pub/OpenBSD (Esslingen)
     ftp://mirror.roothell.org/pub/OpenBSD (Nurnberg)
+    http://mirror.roothell.org/pub/OpenBSD (Nurnberg)
     ftp://ftp.bytemine.net/pub/OpenBSD (Oldenburg)
+    http://artfiles.org/openbsd (Hamburg)
 
 Greece:
     ftp://ftp.cc.uoc.gr/mirrors/OpenBSD (Heraklion)
+    http://ftp.cc.uoc.gr/mirrors/OpenBSD (Heraklion)
 
 Hungary:
     ftp://ftp.fsn.hu/pub/OpenBSD (Budapest)
@@ -80,18 +108,23 @@ Indonesia:
 
 Ireland:
     ftp://ftp.esat.net/pub/OpenBSD (Dublin)
+    http://ftp.esat.net/pub/OpenBSD (Dublin)
     ftp://ftp.heanet.ie/pub/OpenBSD (Dublin)
+    http://ftp.heanet.ie/pub/OpenBSD (Dublin)
 
 Japan:
     ftp://ftp.jaist.ac.jp/pub/OpenBSD (Ishikawa)
+    http://ftp.jaist.ac.jp/pub/OpenBSD (Ishikawa)
     ftp://ftp.kddlabs.co.jp/OpenBSD (Tokyo)
 
 Korea:
     ftp://ftp.kaist.ac.kr/pub/OpenBSD (Daejeon)
+    http://ftp.kaist.ac.kr/pub/OpenBSD (Daejeon)
 
 The Netherlands:
     ftp://ftp.nluug.nl/pub/OpenBSD (Utrecht)
     ftp://mirror.hostfuss.com/pub/OpenBSD (Amsterdam)
+    http://mirror.hostfuss.com/pub/OpenBSD (Amsterdam)
 
 Norway:
     ftp://ftp.inet.no/pub/OpenBSD (Oslo)
@@ -99,7 +132,9 @@ Norway:
 
 Poland:
     ftp://ftp.task.gda.pl/pub/OpenBSD (Gdansk)
+    http://ftp.task.gda.pl/pub/OpenBSD (Gdansk)
     ftp://ftp.piotrkosoft.net/pub/OpenBSD (Oswiecim)
+    http://piotrkosoft.net/pub/OpenBSD (Oswiecim)
     ftp://ftp.tpnet.pl/pub/OpenBSD (Warsaw)
 
 Russia:
@@ -108,49 +143,72 @@ Russia:
 
 Saudi Arabia:
     ftp://mirrors.isu.net.sa/pub/ftp.openbsd.org (Riyadh)
+    http://mirrors.isu.net.sa/pub/ftp.openbsd.org (Riyadh)
 
 Slovenia:
     ftp://ftp.obsd.si/pub/OpenBSD (Ljubljana)
+    http://www.obsd.si/pub/OpenBSD (Ljubljana)
 
 South Africa:
     ftp://ftp.is.co.za/mirror/ftp.openbsd.org (Johannesburg)
 
 Spain:
     ftp://ftp.rediris.es/pub/OpenBSD (Madrid)
+    http://sunsite.rediris.es/pub/OpenBSD (Madrid)
     ftp://ftp.udc.es/pub/OpenBSD (A Coruna)
+    http://ftp.udc.es/OpenBSD (A Coruna)
     ftp://mirror.cdmon.com/pub/OpenBSD (Barcelona)
 
 Sweden:
     ftp://ftp.df.lth.se/pub/OpenBSD (Lund)
     ftp://ftp.netbsd.se/OpenBSD (Stockholm)
+    http://ftp.netbsd.se/OpenBSD (Stockholm)
 
 Switzerland:
     ftp://mirror.switch.ch/pub/OpenBSD (Zurich)
+    http://mirror.switch.ch/ftp/pub/OpenBSD (Zurich)
 
 Taiwan:
     ftp://ftp.tw.openbsd.org/pub/OpenBSD (Hsinchu)
     ftp://ftp.tcc.edu.tw/pub/OpenBSD (TaiChung)
+    http://ftp.tcc.edu.tw/pub/OpenBSD (TaiChung)
     ftp://ftp.cs.pu.edu.tw/BSD/OpenBSD (Taichung)
+    http://openbsd.cs.pu.edu.tw (Taichung)
 
 Turkey:
     ftp://ftp.ulak.net.tr/OpenBSD
 
 United Kingdom:
     ftp://ftp.mirrorservice.org/pub/OpenBSD (Kent)
+    http://www.mirrorservice.org/pub/OpenBSD (Kent)
+    ftp://mirror.bytemark.co.uk/pub/OpenBSD (Manchester)
+    http://mirror.bytemark.co.uk/pub/OpenBSD (Manchester)
     ftp://ftp.plig.net/pub/OpenBSD (London)
+    http://ftp.plig.net/pub/OpenBSD (London)
 
 USA:
+    http://openbsd.berkeley.edu/pub/OpenBSD (Berkeley, CA)
     ftp://mirror.planetunix.net/pub/OpenBSD (Los Angeles, CA)
+    http://mirror.planetunix.net/pub/OpenBSD (Los Angeles, CA)
     ftp://mirror.iawnet.sandia.gov/pub/OpenBSD (Albuquerque, NM)
     ftp://ftp.cse.buffalo.edu/pub/OpenBSD (Buffalo, NY)
     ftp://mirrors.24-7-solutions.net/pub/OpenBSD (New York, NY)
+    http://mirrors.24-7-solutions.net/pub/OpenBSD (New York, NY)
     ftp://openbsd.mirrors.pair.com (Pittsburgh, PA)
+    http://openbsd.mirrors.pair.com/ftp (Pittsburgh, PA)
     ftp://carroll.cac.psu.edu/pub/OpenBSD (PA)
+    http://carroll.cac.psu.edu/pub/OpenBSD (PA)
+    http://openbsd.mirrors.hoobly.com (Pittsburgh, PA)
     ftp://openbsd.mirrors.tds.net/pub/OpenBSD (Madison, WI)
+    http://openbsd.mirrors.tds.net/pub/OpenBSD (Madison, WI)
     ftp://filedump.se.rit.edu/pub/OpenBSD (Rochester, NY)
+    http://filedump.se.rit.edu/pub/OpenBSD (Rochester, NY)
     ftp://mirror.rit.edu/pub/OpenBSD (Rochester, NY)
+    http://mirror.rit.edu/pub/OpenBSD (Rochester, NY)
     ftp://openbsd.mirror.frontiernet.net/pub/OpenBSD (Rochester, NY)
+    http://openbsd.mirror.frontiernet.net/pub/OpenBSD (Rochester, NY)
     ftp://ftp.lambdaserver.com/pub/OpenBSD (Chicago, Illinois)
+    http://ftp.lambdaserver.com/pub/OpenBSD (Chicago, Illinois)
 
 
 Additionally, the file ftp://ftp.OpenBSD.org/pub/OpenBSD/ftplist