sync with mirrors.dat updates, requested by deraadt@

1 files changed, 50 insertions, 47 deletions

diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors
index 62496e90f21..270029cc41d 100644
--- a/distrib/notes/mirrors
+++ b/distrib/notes/mirrors
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: mirrors,v 1.69 2007/08/20 15:28:03 grunk Exp $
+dnl	$OpenBSD: mirrors,v 1.70 2009/10/03 00:10:47 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
 
@@ -8,108 +8,101 @@ Main server in Canada:
     ftp://ftp.OpenBSD.org/pub/OpenBSD (Alberta)
 
 2nd level mirrors:
-    ftp://spargel.kd85.com/pub/OpenBSD (Vienna)
-    ftp://openbsd.informatik.uni-erlangen.de/pub/OpenBSD (Erlangen)
-    ftp://ftp.stacken.kth.se/pub/OpenBSD (Stockholm)
-    ftp://ftp5.usa.openbsd.org/pub/OpenBSD (Redwood City, CA)
-    ftp://ftp3.usa.openbsd.org/pub/OpenBSD (Boulder, CO)
-    ftp://rt.fm/pub/OpenBSD (Lake in the Hills, IL)
+    ftp://anga.funkfeuer.at/pub/OpenBSD/ (Vienna, Austria)
+    ftp://ftp.wu-wien.ac.at/pub/OpenBSD/ (Vienna, Austria)
+    ftp://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)
 
 Argentina:
-    ftp://ftp.openbsd.md5.com.ar/pub/OpenBSD (Buenos Aires)
+    ftp://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)
 
 Australia:
-    ftp://ftp.it.net.au/mirrors/OpenBSD (Perth)
-
-Austria:
-    ftp://playboy.wu-wien.ac.at/pub/OpenBSD (Vienna)
+    ftp://ftp.iinet.net.au/pub/OpenBSD (Perth)
+    ftp://mirror.pacific.net.au/OpenBSD (Sydney)
+    ftp://mirror.internode.on.net/pub/OpenBSD (Adelaide)
+    ftp://mirror.aarnet.edu.au/pub/OpenBSD (Brisbane)
 
 Belgium:
-    ftp://ftp.scarlet.be/pub/openbsd (Brussels)
     ftp://ftp.belnet.be/packages/openbsd (Brussels)
 
 Brazil:
-    ftp://ftp.das.ufsc.br/pub/OpenBSD (Florianopolis, Santa Catarina)
-
-Bulgaria:
-    ftp://ftp.bg.openbsd.org/pub/OpenBSD (Plovdiv)
+    ftp://ftp.das.ufsc.br/pub/OpenBSD (Florianopolis)
 
 Canada:
-    ftp://mirror.arcticnetwork.ca/pub/OpenBSD (Calgary)
+    ftp://openbsd.arcticnetwork.ca/pub/OpenBSD (Calgary)
     ftp://ftp.ca.openbsd.org/pub/OpenBSD (Edmonton)
     ftp://gulus.usherbrooke.ca/pub/distro/OpenBSD (Quebec)
 
 China:
     ftp://ftp.freebsdchina.org/pub/OpenBSD (Shanghai)
 
+Costa Rica:
+    ftp://mirrors.ucr.ac.cr/OpenBSD
+
 Denmark:
-    ftp://mirrors.dotsrc.org/openbsd (Aalborg)
+    ftp://ftp.openbsd.dk/pub/OpenBSD (Aalborg)
     ftp://ftp.dkuug.dk/pub/OpenBSD (Copenhagen)
 
 Estonia:
     ftp://ftp.aso.ee/pub/OpenBSD (Tallinn)
+    ftp://ftp.estpak.ee/pub/OpenBSD (Tallinn)
 
 Finland:
     ftp://mirrors.nic.funet.fi/pub/OpenBSD (Espoo)
     ftp://ftp.jyu.fi/pub/OpenBSD (Jyvaskyla)
 
 France:
+    ftp://ftp.fr.openbsd.org/pub/OpenBSD (Paris)
     ftp://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)
 
 Germany:
     ftp://openbsd.ftp.fu-berlin.de/pub/OpenBSD (Berlin)
     ftp://ftp.spline.de/pub/OpenBSD (Berlin)
-    ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD (Duesseldorf)
+    ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD (Dusseldorf)
     ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD (Esslingen)
-    ftp://mirror.roothell.org/pub/OpenBSD (Nuremberg)
+    ftp://mirror.roothell.org/pub/OpenBSD (Nurnberg)
     ftp://ftp.bytemine.net/pub/OpenBSD (Oldenburg)
+    ftp://openbsd.bsdforen.de/pub/OpenBSD (Nurnberg)
 
 Greece:
-    ftp://filoktitis.noc.uoa.gr/pub/OpenBSD (Athens)
-    ftp://ftp.physics.auth.gr/pub/mirrors/OpenBSD/OpenBSD (Thessaloniki)
     ftp://ftp.duth.gr/pub/OpenBSD (Thrace)
     ftp://ftp.cc.uoc.gr/mirrors/OpenBSD (Heraklion)
 
 Hungary:
     ftp://ftp.fsn.hu/pub/OpenBSD (Budapest)
 
+Indonesia:
+    ftp://ftp.openbsd.or.id/pub/OpenBSD (Jakarta)
+
 Ireland:
     ftp://ftp.esat.net/pub/OpenBSD (Dublin)
     ftp://ftp.heanet.ie/pub/OpenBSD (Dublin)
 
-Israel:
-    ftp://mirror.inter.net.il/pub/OpenBSD (Petach Tiqwa)
-
-Italy:
-    ftp://ftp.unina.it/pub/OpenBSD (Napoli)
-
 Japan:
     ftp://ftp.jaist.ac.jp/pub/OpenBSD (Ishikawa)
-    ftp://ftp.nara.wide.ad.jp/pub/OpenBSD (Nara)
-    ftp://ftp.jp.openbsd.org/pub/OpenBSD (Tokyo)
     ftp://ftp.kddlabs.co.jp/OpenBSD (Tokyo)
 
 Korea:
     ftp://ftp.kaist.ac.kr/pub/OpenBSD (Daejeon)
 
-Latvia:
-    ftp://ftp.secure.lv/pub/OpenBSD (Riga)
-    ftp://ftp.bsd.lv/pub/OpenBSD (Riga)
-
 The Netherlands:
-    ftp://ftp.calyx.nl/pub/OpenBSD (Amsterdam)
     ftp://ftp.nluug.nl/pub/OpenBSD (Utrecht)
     ftp://mirror.hostfuss.com/pub/OpenBSD (Amsterdam)
 
 Norway:
     ftp://ftp.inet.no/pub/OpenBSD (Oslo)
     ftp://ftp.uninett.no/pub/OpenBSD (Oslo)
-    ftp://jane.tihlde.org/pub/OpenBSD (Trondheim)
 
 Poland:
     ftp://ftp.task.gda.pl/pub/OpenBSD (Gdansk)
+    ftp://ftp.piotrkosoft.net/pub/OpenBSD (Oswiecim)
 
 Portugal:
     ftp://ftp.fmed.uc.pt/pub/OpenBSD (Coimbra)
@@ -117,40 +110,50 @@ Portugal:
 Russia:
     ftp://ftp.chg.ru/pub/OpenBSD (Chernogolovka-Moscow)
     ftp://ftp.gamma.ru/pub/OpenBSD (Moscow)
+    ftp://mirror.corbina.net/pub/OpenBSD (Moscow)
 
 Slovenia:
     ftp://ftp.obsd.si/pub/OpenBSD (Ljubljana)
 
+South Africa:
+    ftp://ftp.is.co.za/mirror/ftp.openbsd.org (Johannesburg)
+
 Spain:
-    ftp://ftp.rediris.es/mirror/OpenBSD (Madrid)
+    ftp://ftp.rediris.es/pub/OpenBSD (Madrid)
     ftp://ftp.udc.es/pub/OpenBSD (A Coruna)
+    ftp://mirror.cdmon.com/pub/OpenBSD (Barcelona)
 
 Sweden:
-    ftp://ftp.su.se/pub/OpenBSD (Stockholm)
-    ftp://ftp.btradianz.se/pub/OpenBSD (Stockholm)
+    ftp://ftp.df.lth.se/pub/OpenBSD (Lund)
+    ftp://ftp.netbsd.se/OpenBSD (Stockholm)
 
 Switzerland:
     ftp://mirror.switch.ch/pub/OpenBSD (Zurich)
 
-Turkey:
-    ftp://ftp.enderunix.org/pub/OpenBSD (Istanbul)
+Taiwan:
+    ftp://ftp.tw.openbsd.org/pub/OpenBSD (Hsinchu)
+    ftp://ftp.tcc.edu.tw/pub/OpenBSD (TaiChung)
+    ftp://ftp.cs.pu.edu.tw/BSD/OpenBSD (Taichung)
 
-Ukraine:
-    ftp://gaia.colocall.net/pub/OpenBSD (Kiev)
+Turkey:
+    ftp://ftp.ulak.net.tr/OpenBSD
 
 United Kingdom:
-    ftp://ftp.public-internet.co.uk/pub/OpenBSD (London)
+    ftp://mirror.public-internet.co.uk/pub/OpenBSD (London)
     ftp://ftp.mirrorservice.org/pub/OpenBSD (Kent)
+    ftp://ftp.plig.net/pub/OpenBSD (London)
 
 USA:
-    ftp://mirror.planetunix.net/pub/OpenBSD (Chicago, IL)
-    ftp://osmirrors.cerias.purdue.edu/pub/OpenBSD (West Lafayette, IN)
+    ftp://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)
     ftp://openbsd.mirrors.pair.com (Pittsburgh, PA)
     ftp://carroll.cac.psu.edu/pub/OpenBSD (PA)
     ftp://openbsd.mirrors.tds.net/pub/OpenBSD (Madison, WI)
+    ftp://filedump.se.rit.edu/pub/OpenBSD (Rochester, NY)
+    ftp://mirror.rit.edu/pub/OpenBSD (Rochester, NY)
+    ftp://openbsd.mirror.frontiernet.net/pub/OpenBSD (Rochester, NY)
 
 
 Additionally, the file ftp://ftp.OpenBSD.org/pub/OpenBSD/ftplist