From owner-freebsd-bugs@FreeBSD.ORG Wed Sep 17 03:20:02 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30BE01065674 for ; Wed, 17 Sep 2008 03:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 029C48FC21 for ; Wed, 17 Sep 2008 03:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8H3K1b3097330 for ; Wed, 17 Sep 2008 03:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8H3K1nr097329; Wed, 17 Sep 2008 03:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 17 Sep 2008 03:20:01 GMT Resent-Message-Id: <200809170320.m8H3K1nr097329@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF111106567E for ; Wed, 17 Sep 2008 03:13:40 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail5out.barnet.com.au (mail5.barnet.com.au [202.83.178.78]) by mx1.freebsd.org (Postfix) with ESMTP id 4E2C78FC1C for ; Wed, 17 Sep 2008 03:13:40 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: by mail5out.barnet.com.au (Postfix, from userid 1001) id A912F2218CE1; Wed, 17 Sep 2008 13:13:38 +1000 (EST) Received: from mail5auth.barnet.com.au (mail5.barnet.com.au [202.83.178.78]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mail5auth.barnet.com.au", Issuer "*.barnet.com.au" (verified OK)) by mail5.barnet.com.au (Postfix) with ESMTP id 5761121B5B44 for ; Wed, 17 Sep 2008 13:13:38 +1000 (EST) Received: from k7.mavetju (ppp121-44-125-22.lns10.syd6.internode.on.net [121.44.125.22]) by mail5auth.barnet.com.au (Postfix) with ESMTP id D1A322218CD4 for ; Wed, 17 Sep 2008 13:13:37 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id 5C42336E; Wed, 17 Sep 2008 13:13:40 +1000 (EST) Message-Id: <20080917031340.5C42336E@k7.mavetju> Date: Wed, 17 Sep 2008 13:13:40 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: conf/127429: [patch] update share/misc/iso3166 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2008 03:20:02 -0000 >Number: 127429 >Category: conf >Synopsis: [patch] update share/misc/iso3166 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Sep 17 03:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 7.0-RELEASE-p1 i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #2: Wed May 28 08:12:56 EST 2008 edwin@k7.mavetju:/usr/src/sys/i386/compile/k7 i386 >Description: Sync with the data in http://www.iso.org/iso/list-en1-semic-2.txt and ftp://ftp.ripe.net/iso3166-countrycodes.txt >How-To-Repeat: >Fix: Index: iso3166 =================================================================== --- iso3166 (revision 183065) +++ iso3166 (working copy) @@ -13,8 +13,20 @@ # been deleted unless necessary to distinguish two countries. # # The ISO3166 Maintenance Agency can be found at: -# http://www.iso.ch/iso/en/prods-services/iso3166ma/index.html +# http://www.iso.org/iso/country_codes +# http://www.iso.org/iso/list-en1-semic-2.txt # +# The three letter abbrevations can be found at: +# ftp://ftp.ripe.net/iso3166-countrycodes.txt +# + +# +# Download the files ftp://ftp.ripe.net/iso3166-countrycodes.txt and +# http://www.iso.org/iso/list-en1-semic-2.txt and run +# head/tools/tools/iso/check-iso3166.pl to see if everything is up +# to date. +# + # two three number name AF AFG 004 Afghanistan AL ALB 008 Albania @@ -43,7 +55,7 @@ BM BMU 060 Bermuda BT BTN 064 Bhutan BO BOL 068 Bolivia -BA BIH 070 Bosnia and Herzegowina +BA BIH 070 Bosnia and Herzegovina BW BWA 072 Botswana BV BVT 074 Bouvet Island BR BRA 076 Brazil @@ -65,8 +77,8 @@ CC CCK 166 Cocos (Keeling) Islands CO COL 170 Colombia KM COM 174 Comoros -CG COG 178 Congo (Rep.) -CD COD 180 Congo (Dem. Rep.) +CG COG 178 Congo +CD COD 180 Congo, the Democratic Republic of the CK COK 184 Cook Islands CR CRI 188 Costa Rica CI CIV 384 Cote d'Ivoire @@ -86,7 +98,7 @@ ER ERI 232 Eritrea EE EST 233 Estonia ET ETH 231 Ethiopia -FK FLK 238 Falkland Islands +FK FLK 238 Falkland Islands (Malvinas) FO FRO 234 Faroe Islands FJ FJI 242 Fiji FI FIN 246 Finland @@ -111,17 +123,17 @@ GW GNB 624 Guinea-Bissau GY GUY 328 Guyana HT HTI 332 Haiti -HM HMD 334 Heard and McDonald Islands +HM HMD 334 Heard Island and McDonald Islands HN HND 340 Honduras HK HKG 344 Hong Kong HU HUN 348 Hungary IS ISL 352 Iceland IN IND 356 India ID IDN 360 Indonesia -IR IRN 364 Iran +IR IRN 364 Iran, Islamic Republic of IQ IRQ 368 Iraq IE IRL 372 Ireland -IM IMN 833 Isle of Man +IM IMM 833 Isle of Man IL ISR 376 Israel IT ITA 380 Italy JM JAM 388 Jamaica @@ -131,8 +143,8 @@ KZ KAZ 398 Kazakhstan KE KEN 404 Kenya KI KIR 296 Kiribati -KP PRK 408 Korea (Democratic People's Republic of) -KR KOR 410 Korea (Republic of) +KP PRK 408 Korea, Democratic People's Republic of +KR KOR 410 Korea, Republic of KW KWT 414 Kuwait KG KGZ 417 Kyrgyzstan LA LAO 418 Lao People's Democratic Republic @@ -145,7 +157,7 @@ LT LTU 440 Lithuania LU LUX 442 Luxembourg MO MAC 446 Macao -MK MKD 807 Macedonia (The Former Yugoslav Republic of) +MK MKD 807 Macedonia, the Former Yugoslav Republic of MG MDG 450 Madagascar MW MWI 454 Malawi MY MYS 458 Malaysia @@ -158,8 +170,8 @@ MU MUS 480 Mauritius YT MYT 175 Mayotte MX MEX 484 Mexico -FM FSM 583 Micronesia (Federated States of) -MD MDA 498 Moldova +FM FSM 583 Micronesia, Federated States of +MD MDA 498 Moldova, Republic of MC MCO 492 Monaco MN MNG 496 Mongolia ME MNE 499 Montenegro @@ -184,9 +196,9 @@ OM OMN 512 Oman PK PAK 586 Pakistan PW PLW 585 Palau -PS PSE 275 Occupied Palestinian Territory +PS PSE 275 Palestinian Territory, Occupied PA PAN 591 Panama -PG PNG 598 Papua-New Guinea +PG PNG 598 Papua New Guinea PY PRY 600 Paraguay PE PER 604 Peru PH PHL 608 Philippines @@ -202,7 +214,7 @@ BL BLM 652 Saint Barthelemy KN KNA 659 Saint Kitts and Nevis LC LCA 662 Saint Lucia -MF MAF 663 Saint Martin (French part) +MF MAF 663 Saint Martin VC VCT 670 Saint Vincent and the Grenadines WS WSM 882 Samoa SM SMR 674 San Marino @@ -221,18 +233,18 @@ GS SGS 239 South Georgia and the South Sandwich Islands ES ESP 724 Spain LK LKA 144 Sri Lanka -SH SHN 654 St. Helena -PM SPM 666 St. Pierre and Miquelon +SH SHN 654 Saint Helena +PM SPM 666 Saint Pierre and Miquelon SD SDN 736 Sudan SR SUR 740 Suriname -SJ SJM 744 Svalbard and Jan Mayen Islands +SJ SJM 744 Svalbard and Jan Mayen SZ SWZ 748 Swaziland SE SWE 752 Sweden CH CHE 756 Switzerland SY SYR 760 Syrian Arab Republic -TW TWN 158 Taiwan +TW TWN 158 Taiwan, Province of China TJ TJK 762 Tajikistan -TZ TZA 834 Tanzania +TZ TZA 834 Tanzania, United Republic of TH THA 764 Thailand TG TGO 768 Togo TK TKL 772 Tokelau @@ -252,16 +264,17 @@ UY URY 858 Uruguay UZ UZB 860 Uzbekistan VU VUT 548 Vanuatu -VA VAT 336 Vatican City State +VA VAT 336 Holy See (Vatican City State) VE VEN 862 Venezuela VN VNM 704 Viet Nam -VG VGB 092 Virgin Islands (British) -VI VIR 850 Virgin Islands (U.S.) -WF WLF 876 Wallis and Futuna Islands +VG VGB 092 Virgin Islands, British +VI VIR 850 Virgin Islands, U.S. +WF WLF 876 Wallis and Futuna EH ESH 732 Western Sahara YE YEM 887 Yemen ZM ZMB 894 Zambia ZW ZWE 716 Zimbabwe + # # Revision history: # >Release-Note: >Audit-Trail: >Unformatted: