git: 591e29117964 - main - bsdconfig, bsdinstall: Refresh mirrors list

From: Danilo G. Baio <dbaio_at_FreeBSD.org>
Date: Mon, 16 Jan 2023 16:50:42 UTC
The branch main has been updated by dbaio (doc, ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=591e29117964248d4bfea639e973a12e27f96ac9

commit 591e29117964248d4bfea639e973a12e27f96ac9
Author:     Danilo G. Baio <dbaio@FreeBSD.org>
AuthorDate: 2023-01-10 01:06:57 +0000
Commit:     Danilo G. Baio <dbaio@FreeBSD.org>
CommitDate: 2023-01-16 16:48:06 +0000

    bsdconfig, bsdinstall: Refresh mirrors list
    
    The mirrors list is in sync with the Handbook / Mirrors section [1],
    which was refreshed a few months ago. Mirrors removed were not
    responding or had duplicated addresses (aliases) with another mirror.
    
    1 - https://docs.freebsd.org/en/books/handbook/mirrors/
    
    Reviewed by:    philip (clusteradm)
    Approved by:    philip
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D38014
---
 usr.sbin/bsdconfig/include/messages.subr |  12 ++--
 usr.sbin/bsdconfig/share/media/ftp.subr  | 118 ++++++++-----------------------
 usr.sbin/bsdinstall/scripts/mirrorselect | 114 ++++++++---------------------
 3 files changed, 66 insertions(+), 178 deletions(-)

diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index 9d910032616d..47ef6876854b 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -75,7 +75,6 @@ msg_cant_start_wpa_supplicant="Can't start wpa_supplicant(8). Please create a wl
 msg_cd_dvd="CD/DVD"
 msg_cdrom="CDROM"
 msg_checking_access_to="Checking access to\n %s"
-msg_china="China"
 msg_chinese_desc="Ported software for the Chinese market."
 msg_choose_a_cd_dvd_type="Choose a CD/DVD type"
 msg_choose_a_dos_partition="Choose a DOS partition"
@@ -200,7 +199,6 @@ msg_ipv6="IPv6"
 msg_ipv6_desc="IPv6-related software."
 msg_ipv6_ready="IPv6 ready"
 msg_irc_desc="Internet Relay Chat utilities."
-msg_ireland="Ireland"
 msg_israel="Israel"
 msg_japan="Japan"
 msg_japanese_desc="Ported software for the Japanese market."
@@ -222,7 +220,7 @@ msg_looking_for_keymap_files="Looking for keymap files..."
 msg_looking_up_host="Looking up host %s"
 msg_mail_desc="Electronic mail packages and utilities."
 msg_main_menu="Main Menu"
-msg_main_site="Main Site"
+msg_main_site="Main Site (GeoDNS)"
 msg_manually_connect="Manually Connect"
 msg_manually_connect_help="Connect to a wireless network that may be unlisted"
 msg_math_desc="Mathematical computation software."
@@ -310,7 +308,7 @@ msg_please_select_a_freebsd_http_distribution_site="Please select a FreeBSD HTTP
 msg_please_select_a_usb_drive="You have more than one USB drive. Please choose which drive\nyou would like to use."
 msg_please_select_dos_partition="FreeBSD can be installed directly from a DOS partition assuming,\nof course, that you have copied the relevant distributions into\nyour DOS partition before starting this installation.  If this is\nnot the case then you should reboot DOS at this time and copy the\ndistributions you wish to install into a \"FREEBSD\" subdirectory\non one of your DOS partitions.  Otherwise, please select the DOS\npartition containing the FreeBSD distribution files."
 msg_please_select_ethernet_device_to_configure="Please select the ethernet or PLIP device to configure."
-msg_please_select_the_site_closest_to_you_or_other="Please select the site closest to you or \"other\" if you'd like to\nspecify a different choice.  Also note that not every site listed here\ncarries more than the base distribution kits. Only Primary sites are\nguaranteed to carry the full range of possible distributions."
+msg_please_select_the_site_closest_to_you_or_other="Please select the best suitable site for you or \"other\" if you want to\nspecify a different choice. The \"Main Site\" directs users to the nearest\nproject managed mirror via GeoDNS (they carry the full range of possible\ndistributions and support both IPv4 and IPv6). All other sites are known\nas \"Community Mirrors\"; not every site listed here carries more than the\nbase distribution kits. Select a site!"
 msg_please_select_ufs_partition="FreeBSD can be installed directly from another FreeBSD partition\nthat is UFS formatted assuming, of course, that you have copied\nthe relevant distributions into said partition before starting\ninstallation."
 msg_please_specify_a_temporary_directory="Please specify a temporary directory with lots of free space:"
 msg_please_specify_the_name_of_the_text_editor="Please specify the name of the text editor you wish to use:"
@@ -324,7 +322,6 @@ msg_ports_mgmt_desc="Utilities for managing ports and packages."
 msg_portuguese_desc="Ported software for the Portuguese market."
 msg_previous_page="Previous page"
 msg_previous_syntax_errors="%s: Not overwriting \`%s' due to previous syntax errors"
-msg_primary="Primary"
 msg_print_desc="Utilities for dealing with printing."
 msg_probing_devices_please_wait_this_can_take_a_while="Probing devices, please wait (this can take a while)..."
 msg_proceed="Proceed"
@@ -362,7 +359,7 @@ msg_secure_mode_requires_root="Secure-mode requires root-access!"
 msg_secure_mode_requires_x11="Secure-mode requires X11 (use \`-X')!"
 msg_security_desc="System security software."
 msg_select="Select"
-msg_select_a_site_thats_close="Select a site that's close!"
+msg_select_a_site_thats_close="Select a site!"
 msg_select_the_configuration_you_would_like="Select the configuration you would like to edit:\nAddional network information displayed in help line."
 msg_select_wlan_interfaces_for="Select wlan interfaces for %s:"
 msg_selected="selected"
@@ -375,7 +372,6 @@ msg_show_configured_help="Show networks configured in wpa_supplicants.conf(5)"
 msg_show_scan_results="Show Scan Results"
 msg_show_scan_results_help="Show wpa_cli(8) scan results"
 msg_skip="Skip"
-msg_slovak_republic="Slovak Republic"
 msg_slovenia="Slovenia"
 msg_sorry_invalid_url="Sorry, %s is an invalid URL!"
 msg_sorry_package_was_not_found_in_the_index="Sorry, package %s was not found in the INDEX."
@@ -386,7 +382,6 @@ msg_spanish_desc="Ported software for the Spanish market."
 msg_specify_some_other_ftp_site="Specify some other ftp site by URL"
 msg_specify_some_other_http_site="Specify some other http site by URL"
 msg_sweden="Sweden"
-msg_switzerland="Switzerland"
 msg_sysutils_desc="Various system utilities."
 msg_taiwan="Taiwan"
 msg_tcl_desc="TCL and packages that depend on it."
@@ -427,6 +422,7 @@ msg_user_is_using_a_slow_pc_or_ethernet_card="User is using a slow PC or Etherne
 msg_username_and_password_to_use="Username and password to use instead of anonymous"
 msg_using_interface="Using interface %s"
 msg_using_usb_device="Using USB device: %s"
+msg_v6="- IPv6"
 msg_vietnamese_desc="Ported software for the Vietnamese market."
 msg_view_set_various_media_options="View/Set various media options"
 msg_warning_no_wireless_devices="WARNING! No wireless devices found."
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr
index 1f6f216eb0a9..5d6cd37ff38f 100644
--- a/usr.sbin/bsdconfig/share/media/ftp.subr
+++ b/usr.sbin/bsdconfig/share/media/ftp.subr
@@ -73,110 +73,54 @@ f_dialog_menu_media_ftp()
 	f_dialog_title_restore
 	local prompt="$msg_please_select_the_site_closest_to_you_or_other"
 	local menu_list="
-		'$msg_main_site'          'ftp.freebsd.org'
-		'URL'                     '$msg_specify_some_other_ftp_site'
-		'IPv6 $msg_main_site'     'ftp.freebsd.org'
-		' IPv6 $msg_france'       'ftp4.fr.freebsd.org'
-		' IPv6 $msg_france #8'    'ftp8.fr.freebsd.org'
-		' IPv6 $msg_ireland'      'ftp3.ie.freebsd.org'
-		' IPv6 $msg_japan'        'ftp2.jp.freebsd.org'
-		' IPv6 $msg_sweden'       'ftp4.se.freebsd.org'
-		' IPv6 $msg_usa'          'ftp4.us.freebsd.org'
-		'$msg_primary'            'ftp1.freebsd.org'
-		' $msg_primary #2'        'ftp2.freebsd.org'
-		' $msg_primary #3'        'ftp3.freebsd.org'
-		' $msg_primary #4'        'ftp4.freebsd.org'
-		' $msg_primary #5'        'ftp5.freebsd.org'
-		' $msg_primary #6'        'ftp6.freebsd.org'
-		' $msg_primary #7'        'ftp7.freebsd.org'
-		' $msg_primary #10'       'ftp10.freebsd.org'
-		' $msg_primary #11'       'ftp11.freebsd.org'
-		' $msg_primary #12'       'ftp12.freebsd.org'
-		' $msg_primary #13'       'ftp13.freebsd.org'
-		' $msg_primary #14'       'ftp14.freebsd.org'
-		'$msg_australia'          'ftp.au.freebsd.org'
-		' $msg_australia #2'      'ftp2.au.freebsd.org'
+		'$msg_main_site'          'download.freebsd.org'
+		'$msg_australia $msg_v6'  'ftp.au.freebsd.org'
 		' $msg_australia #3'      'ftp3.au.freebsd.org'
-		'$msg_austria'            'ftp.at.freebsd.org'
-		'$msg_brazil'             'ftp2.br.freebsd.org'
+		'$msg_austria $msg_v6'    'ftp.at.freebsd.org'
+		'$msg_brazil #2'          'ftp2.br.freebsd.org'
 		' $msg_brazil #3'         'ftp3.br.freebsd.org'
-		' $msg_brazil #4'         'ftp4.br.freebsd.org'
-		'$msg_bulgaria'           'ftp.bg.freebsd.org'
-		'$msg_china'              'ftp.cn.freebsd.org'
-		'$msg_czech_republic'     'ftp.cz.freebsd.org'
-		'$msg_denmark'            'ftp.dk.freebsd.org'
+		'$msg_bulgaria $msg_v6'   'ftp.bg.freebsd.org'
+		'$msg_czech_republic $msg_v6' 'ftp.cz.freebsd.org'
+		'$msg_denmark $msg_v6'    'ftp.dk.freebsd.org'
 		'$msg_finland'            'ftp.fi.freebsd.org'
-		'$msg_france'             'ftp.fr.freebsd.org'
+		'$msg_france $msg_v6'     'ftp.fr.freebsd.org'
 		' $msg_france #3'         'ftp3.fr.freebsd.org'
-		' $msg_france #4'         'ftp4.fr.freebsd.org'
-		' $msg_france #5'         'ftp5.fr.freebsd.org'
 		' $msg_france #6'         'ftp6.fr.freebsd.org'
-		' $msg_france #7'         'ftp7.fr.freebsd.org'
-		' $msg_france #8'         'ftp8.fr.freebsd.org'
-		'$msg_germany'            'ftp.de.freebsd.org'
-		' $msg_germany #2'        'ftp2.de.freebsd.org'
-		' $msg_germany #4'        'ftp4.de.freebsd.org'
-		' $msg_germany #5'        'ftp5.de.freebsd.org'
-		' $msg_germany #7'        'ftp7.de.freebsd.org'
-		' $msg_germany #8'        'ftp8.de.freebsd.org'
-		'$msg_greece'             'ftp.gr.freebsd.org'
-		' $msg_greece #2'         'ftp2.gr.freebsd.org'
-		'$msg_ireland'            'ftp3.ie.freebsd.org'
-		'$msg_japan'              'ftp.jp.freebsd.org'
+		'$msg_germany $msg_v6'     'ftp.de.freebsd.org'
+		' $msg_germany #1 $msg_v6' 'ftp1.de.freebsd.org'
+		' $msg_germany #2 $msg_v6' 'ftp2.de.freebsd.org'
+		' $msg_germany #5 $msg_v6' 'ftp5.de.freebsd.org'
+		' $msg_germany #7 $msg_v6' 'ftp7.de.freebsd.org'
+		'$msg_greece $msg_v6'     'ftp.gr.freebsd.org'
+		' $msg_greece #2 $msg_v6' 'ftp2.gr.freebsd.org'
+		'$msg_japan $msg_v6'      'ftp.jp.freebsd.org'
 		' $msg_japan #2'          'ftp2.jp.freebsd.org'
 		' $msg_japan #3'          'ftp3.jp.freebsd.org'
 		' $msg_japan #4'          'ftp4.jp.freebsd.org'
-		' $msg_japan #5'          'ftp5.jp.freebsd.org'
-		' $msg_japan #6'          'ftp6.jp.freebsd.org'
-		' $msg_japan #7'          'ftp7.jp.freebsd.org'
-		' $msg_japan #8'          'ftp8.jp.freebsd.org'
-		' $msg_japan #9'          'ftp9.jp.freebsd.org'
+		' $msg_japan #6 $msg_v6'  'ftp6.jp.freebsd.org'
 		'$msg_korea'              'ftp.kr.freebsd.org'
 		' $msg_korea #2'          'ftp2.kr.freebsd.org'
 		'$msg_latvia'             'ftp.lv.freebsd.org'
-		'$msg_netherlands'        'ftp.nl.freebsd.org'
+		'$msg_netherlands $msg_v6' 'ftp.nl.freebsd.org'
 		' $msg_netherlands #2'    'ftp2.nl.freebsd.org'
 		'$msg_new_zealand'        'ftp.nz.freebsd.org'
-		'$msg_norway'             'ftp.no.freebsd.org'
-		'$msg_poland'             'ftp.pl.freebsd.org'
-		'$msg_russia'             'ftp.ru.freebsd.org'
+		'$msg_norway $msg_v6'     'ftp.no.freebsd.org'
+		'$msg_poland $msg_v6'     'ftp.pl.freebsd.org'
+		'$msg_russia $msg_v6'     'ftp.ru.freebsd.org'
 		' $msg_russia #2'         'ftp2.ru.freebsd.org'
-		' $msg_russia #5'         'ftp5.ru.freebsd.org'
-		' $msg_russia #6'         'ftp6.ru.freebsd.org'
-		'$msg_slovak_republic'    'ftp.sk.freebsd.org'
-		' $msg_slovak_republic #2' 'ftp2.sk.freebsd.org'
-		'$msg_slovenia'           'ftp.si.freebsd.org'
-		'$msg_south_africa'       'ftp.za.freebsd.org'
-		' $msg_south_africa #2'   'ftp2.za.freebsd.org'
-		' $msg_south_africa #4'   'ftp4.za.freebsd.org'
-		'$msg_sweden'             'ftp.se.freebsd.org'
-		' $msg_sweden #2'         'ftp2.se.freebsd.org'
-		' $msg_sweden #4'         'ftp4.se.freebsd.org'
-		'$msg_switzerland'        'ftp.ch.freebsd.org'
-		'$msg_taiwan'             'ftp.tw.freebsd.org'
-		' $msg_taiwan #2'         'ftp2.tw.freebsd.org'
-		' $msg_taiwan #3'         'ftp3.tw.freebsd.org'
-		' $msg_taiwan #4'         'ftp4.tw.freebsd.org'
-		' $msg_taiwan #6'         'ftp6.tw.freebsd.org'
-		' $msg_taiwan #11'        'ftp11.tw.freebsd.org'
+		'$msg_slovenia $msg_v6'   'ftp.si.freebsd.org'
+		'$msg_south_africa $msg_v6'     'ftp.za.freebsd.org'
+		' $msg_south_africa #2 $msg_v6' 'ftp2.za.freebsd.org'
+		' $msg_south_africa #4'         'ftp4.za.freebsd.org'
+		'$msg_sweden $msg_v6'           'ftp.se.freebsd.org'
+		'$msg_taiwan #4'          'ftp4.tw.freebsd.org'
+		' $msg_taiwan #5'         'ftp5.tw.freebsd.org'
 		'$msg_uk'                 'ftp.uk.freebsd.org'
 		' $msg_uk #2'             'ftp2.uk.freebsd.org'
-		' $msg_uk #3'             'ftp3.uk.freebsd.org'
-		' $msg_uk #4'             'ftp4.uk.freebsd.org'
-		' $msg_uk #5'             'ftp5.uk.freebsd.org'
-		'$msg_ukraine'            'ftp.ua.freebsd.org'
-		'$msg_usa #1'             'ftp1.us.freebsd.org'
-		' $msg_usa #2'            'ftp2.us.freebsd.org'
-		' $msg_usa #3'            'ftp3.us.freebsd.org'
-		' $msg_usa #4'            'ftp4.us.freebsd.org'
-		' $msg_usa #5'            'ftp5.us.freebsd.org'
-		' $msg_usa #6'            'ftp6.us.freebsd.org'
-		' $msg_usa #8'            'ftp8.us.freebsd.org'
-		' $msg_usa #10'           'ftp10.us.freebsd.org'
-		' $msg_usa #11'           'ftp11.us.freebsd.org'
-		' $msg_usa #13'           'ftp13.us.freebsd.org'
+		'$msg_ukraine $msg_v6'    'ftp.ua.freebsd.org'
+		'$msg_usa #5 $msg_v6'     'ftp5.us.freebsd.org'
+		' $msg_usa #11 $msg_v6'   'ftp11.us.freebsd.org'
 		' $msg_usa #14'           'ftp14.us.freebsd.org'
-		' $msg_usa #15'           'ftp15.us.freebsd.org'
 	" # END-QUOTE
 	local hline="$msg_select_a_site_thats_close"
 
diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect
index a613a097e69a..279c5ef47cb6 100755
--- a/usr.sbin/bsdinstall/scripts/mirrorselect
+++ b/usr.sbin/bsdinstall/scripts/mirrorselect
@@ -39,108 +39,56 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 exec 3>&1
 MIRROR=`bsddialog --backtitle "$OSNAME Installer" \
     --title "Mirror Selection" --extra-button --extra-label "Other" \
-    --menu "Please select the site closest to you or \"other\" if you'd like to specify a different choice.  Also note that not every site listed here carries more than the base distribution kits. Only Primary sites are guaranteed to carry the full range of possible distributions. Select a site that's close!" \
+    --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \
     0 0 16 \
-	ftp://ftp.freebsd.org	"Main Site"\
-	ftp://ftp.freebsd.org 	"IPv6 Main Site"\
-	ftp://ftp3.ie.freebsd.org 	"IPv6 Ireland"\
-	ftp://ftp2.jp.freebsd.org 	"IPv6 Japan"\
-	ftp://ftp4.se.freebsd.org	"IPv6 Sweden"\
-	ftp://ftp4.us.freebsd.org 	"IPv6 USA"\
-	ftp://ftp1.freebsd.org 	"Primary"\
-	ftp://ftp2.freebsd.org 	"Primary #2"\
-	ftp://ftp3.freebsd.org 	"Primary #3"\
-	ftp://ftp4.freebsd.org 	"Primary #4"\
-	ftp://ftp5.freebsd.org 	"Primary #5"\
-	ftp://ftp6.freebsd.org 	"Primary #6"\
-	ftp://ftp7.freebsd.org 	"Primary #7"\
-	ftp://ftp10.freebsd.org 	"Primary #10"\
-	ftp://ftp11.freebsd.org 	"Primary #11"\
-	ftp://ftp12.freebsd.org 	"Primary #12"\
-	ftp://ftp13.freebsd.org 	"Primary #13"\
-	ftp://ftp14.freebsd.org 	"Primary #14"\
-	ftp://ftp.au.freebsd.org 	"Australia"\
-	ftp://ftp2.au.freebsd.org 	"Australia #2"\
+	ftp://download.freebsd.org	"Main Site (GeoDNS)"\
+	http://ftp.au.freebsd.org 	"Australia - IPv6"\
 	ftp://ftp3.au.freebsd.org 	"Australia #3"\
-	ftp://ftp.at.freebsd.org 	"Austria"\
+	ftp://ftp.at.freebsd.org 	"Austria - IPv6"\
 	ftp://ftp2.br.freebsd.org 	"Brazil #2"\
 	ftp://ftp3.br.freebsd.org 	"Brazil #3"\
-	ftp://ftp4.br.freebsd.org 	"Brazil #4"\
-	ftp://ftp.bg.freebsd.org 	"Bulgaria"\
-	ftp://ftp.cn.freebsd.org 	"China"\
-	ftp://ftp.cz.freebsd.org 	"Czech Republic"\
-	ftp://ftp.dk.freebsd.org 	"Denmark"\
+	ftp://ftp.bg.freebsd.org 	"Bulgaria - IPv6"\
+	ftp://ftp.cz.freebsd.org 	"Czech Republic - IPv6"\
+	ftp://ftp.dk.freebsd.org 	"Denmark - IPv6"\
 	ftp://ftp.fi.freebsd.org 	"Finland"\
-	ftp://ftp.fr.freebsd.org 	"France"\
+	ftp://ftp.fr.freebsd.org 	"France - IPv6"\
 	ftp://ftp3.fr.freebsd.org 	"France #3"\
-	ftp://ftp4.fr.freebsd.org 	"IPv6 France #4"\
-	ftp://ftp5.fr.freebsd.org 	"France #5"\
 	ftp://ftp6.fr.freebsd.org 	"France #6"\
-	ftp://ftp7.fr.freebsd.org 	"France #7"\
-	ftp://ftp8.fr.freebsd.org 	"IPv6 France #8"\
-	ftp://ftp.de.freebsd.org 	"Germany"\
-	ftp://ftp2.de.freebsd.org 	"Germany #2"\
-	ftp://ftp4.de.freebsd.org 	"Germany #4"\
-	ftp://ftp5.de.freebsd.org 	"Germany #5"\
-	ftp://ftp7.de.freebsd.org 	"Germany #7"\
-	ftp://ftp8.de.freebsd.org 	"Germany #8"\
-	ftp://ftp.gr.freebsd.org 	"Greece"\
-	ftp://ftp2.gr.freebsd.org 	"Greece #2"\
-	ftp://ftp3.ie.freebsd.org 	"Ireland #3"\
-	ftp://ftp.jp.freebsd.org 	"Japan"\
+	ftp://ftp.de.freebsd.org 	"Germany - IPv6"\
+	ftp://ftp1.de.freebsd.org 	"Germany #1 - IPv6"\
+	ftp://ftp2.de.freebsd.org 	"Germany #2 - IPv6"\
+	ftp://ftp5.de.freebsd.org 	"Germany #5 - IPv6"\
+	ftp://ftp7.de.freebsd.org 	"Germany #7 - IPv6"\
+	ftp://ftp.gr.freebsd.org 	"Greece - IPv6"\
+	ftp://ftp2.gr.freebsd.org 	"Greece #2 - IPv6"\
+	ftp://ftp.jp.freebsd.org 	"Japan - IPv6"\
 	ftp://ftp2.jp.freebsd.org 	"Japan #2"\
 	ftp://ftp3.jp.freebsd.org 	"Japan #3"\
 	ftp://ftp4.jp.freebsd.org 	"Japan #4"\
-	ftp://ftp5.jp.freebsd.org 	"Japan #5"\
-	ftp://ftp6.jp.freebsd.org 	"Japan #6"\
-	ftp://ftp7.jp.freebsd.org 	"Japan #7"\
-	ftp://ftp8.jp.freebsd.org 	"Japan #8"\
-	ftp://ftp9.jp.freebsd.org 	"Japan #9"\
+	ftp://ftp6.jp.freebsd.org 	"Japan #6 - IPv6"\
 	ftp://ftp.kr.freebsd.org 	"Korea"\
 	ftp://ftp2.kr.freebsd.org 	"Korea #2"\
 	ftp://ftp.lv.freebsd.org 	"Latvia"\
-	ftp://ftp.nl.freebsd.org 	"Netherlands"\
+	ftp://ftp.nl.freebsd.org 	"Netherlands - IPv6"\
 	ftp://ftp2.nl.freebsd.org 	"Netherlands #2"\
 	ftp://ftp.nz.freebsd.org 	"New Zealand"\
-	ftp://ftp.no.freebsd.org 	"Norway"\
-	ftp://ftp.pl.freebsd.org 	"Poland"\
-	ftp://ftp.ru.freebsd.org 	"Russia"\
+	ftp://ftp.no.freebsd.org 	"Norway - IPv6"\
+	ftp://ftp.pl.freebsd.org 	"Poland - IPv6"\
+	ftp://ftp.ru.freebsd.org 	"Russia - IPv6"\
 	ftp://ftp2.ru.freebsd.org 	"Russia #2"\
-	ftp://ftp5.ru.freebsd.org 	"Russia #5"\
-	ftp://ftp6.ru.freebsd.org 	"Russia #6"\
-	ftp://ftp.sk.freebsd.org 	"Slovak Republic"\
-	ftp://ftp2.sk.freebsd.org 	"Slovak Republic #2"\
-	ftp://ftp.si.freebsd.org 	"Slovenia"\
-	ftp://ftp.za.freebsd.org 	"South Africa"\
-	ftp://ftp2.za.freebsd.org 	"South Africa #2"\
+	ftp://ftp.si.freebsd.org 	"Slovenia - IPv6"\
+	ftp://ftp.za.freebsd.org 	"South Africa - IPv6"\
+	ftp://ftp2.za.freebsd.org 	"South Africa #2 - IPv6"\
 	ftp://ftp4.za.freebsd.org 	"South Africa #4"\
-	ftp://ftp.se.freebsd.org 	"Sweden"\
-	ftp://ftp4.se.freebsd.org 	"Sweden #4"\
-	ftp://ftp.ch.freebsd.org 	"Switzerland"\
-	ftp://ftp.tw.freebsd.org 	"Taiwan"\
-	ftp://ftp2.tw.freebsd.org 	"Taiwan #2"\
-	ftp://ftp3.tw.freebsd.org 	"Taiwan #3"\
+	ftp://ftp.se.freebsd.org 	"Sweden - IPv6"\
 	ftp://ftp4.tw.freebsd.org 	"Taiwan #4"\
-	ftp://ftp6.tw.freebsd.org 	"Taiwan #6"\
-	ftp://ftp11.tw.freebsd.org 	"Taiwan #11"\
-	ftp://ftp.uk.freebsd.org 	"UK"\
-	ftp://ftp2.uk.freebsd.org 	"UK #2"\
-	ftp://ftp3.uk.freebsd.org 	"UK #3"\
-	ftp://ftp4.uk.freebsd.org 	"UK #4"\
-	ftp://ftp5.uk.freebsd.org 	"UK #5"\
-	ftp://ftp.ua.freebsd.org 	"Ukraine"\
-	ftp://ftp1.us.freebsd.org 	"USA #1"\
-	ftp://ftp2.us.freebsd.org 	"USA #2"\
-	ftp://ftp3.us.freebsd.org 	"USA #3"\
-	ftp://ftp4.us.freebsd.org 	"USA #4"\
-	ftp://ftp5.us.freebsd.org 	"USA #5"\
-	ftp://ftp6.us.freebsd.org 	"USA #6"\
-	ftp://ftp8.us.freebsd.org 	"USA #8"\
-	ftp://ftp10.us.freebsd.org 	"USA #10"\
-	ftp://ftp11.us.freebsd.org 	"USA #11"\
-	ftp://ftp13.us.freebsd.org 	"USA #13"\
+	ftp://ftp5.tw.freebsd.org 	"Taiwan #5"\
+	ftp://ftp.uk.freebsd.org 	"UK - IPv6"\
+	ftp://ftp2.uk.freebsd.org 	"UK #2 - IPv6"\
+	ftp://ftp.ua.FreeBSD.org 	"Ukraine - IPv6"\
+	ftp://ftp5.us.freebsd.org 	"USA #5 - IPv6"\
+	ftp://ftp11.us.freebsd.org 	"USA #11 - IPv6"\
 	ftp://ftp14.us.freebsd.org 	"USA #14"\
-	ftp://ftp15.us.freebsd.org 	"USA #15"\
     2>&1 1>&3`
 MIRROR_BUTTON=$?
 exec 3>&-