Imported Debian version 4.7.4

as_del_list

@@ -42,6 +42,7 @@
 18259	18290	whois.nic.ad.jp
 20480	21503	ripe
 23552	24575	apnic
+23552	23601	whois.nic.or.kr
 23612	23643	whois.nic.ad.jp
 24576	25599	ripe
 26592	26623	lacnic
@@ -49,7 +50,8 @@
 28672	29695	ripe
 30720	31743	ripe
 33792	35839	ripe
+36864	37887	afrinic
 
 # catch all: everything else comes from ARIN
-1	35839	arin
+1	37887	arin
 

config.h

@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.7.1"
+#define VERSION "4.7.4"
 
 /* Configurable features */
 

data.h

@@ -9,6 +9,7 @@
 const char *ripe_servers[] = {
     "whois.ripe.net",
     "whois.apnic.net",
+    "whois.afrinic.net",
     "whois.denic.de",
     "rr.arin.net",		/* does not accept the old syntax */
     "whois.6bone.net",		/* 3.0.0b1 */

debian/changelog

@@ -1,3 +1,20 @@
+whois (4.7.4) unstable; urgency=high
+
+  * Implemented the new b, B and G flags of the RIPE server.
+  * Updated the version number. (Closes: #304395)
+  * Updated the .dm, .nf, .tl, .tp TLD servers.
+  * Added new IPv4 and ASN allocations for Afrinic. (Closes: #306525)
+  * Added new IPv6 allocations.
+  * Added the .ja translation, by Satoru SATOH. (Closes: #306300)
+
+ -- Marco d'Itri <md@linux.it>  Fri, 29 Apr 2005 00:55:16 +0200
+
+whois (4.7.3) unstable; urgency=medium
+
+  * Updated the .sk TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Sat,  9 Apr 2005 10:40:08 +0200
+
 whois (4.7.2) unstable; urgency=high
 
   * whois.metu.edu.tr does not accept anymore RIPE-like queries.

ip6_del_list

@@ -34,13 +34,13 @@
 
 2003:0000::/18	ripe
 
-# not yet formally accepted
+2600:0000::/12	arin
-# http://www.ripe.net/ripe/draft-documents/ipv6.html
+#2600:0000::/22	arin
-2400:0000::/6	apnic
+#2604:0000::/22	arin
-2800:0000::/6	afrinic
+#2608:0000::/22	arin
-2A00:0000::/6	arin
+#260C:0000::/22	arin
-3000:0000::/6	lacnic
+
-3400:0000::/6	ripe
+2A00:0000::/21	ripe
 
 3FFE:0000::/16	6bone
 

ip_del_list

@@ -5,6 +5,7 @@
 # customers documented in the whois database.
 #
 24.132.0.0/14	ripe
+41.0.0.0/8	afrinic
 43.0.0.0/8	v6nic
 58.0.0.0/7	apnic
 61.72.0.0/13	whois.nic.or.kr
@@ -44,16 +45,30 @@
 151.64.0.0/11	ripe
 151.96.0.0/14	ripe
 151.100.0.0/16	ripe
+155.232.0.0/13	afrinic
+155.240.0.0/16	afrinic
 160.216.0.0/14	ripe
 160.220.0.0/16	ripe
 160.44.0.0/14	ripe
 160.48.0.0/12	ripe
+160.115.0.0/16	afrinic
+160.116.0.0/14	afrinic
+160.120.0.0/14	afrinic
+160.124.0.0/16	afrinic
 163.156.0.0/14	ripe
 163.160.0.0/12	ripe
+163.195.0.0/16	afrinic
+163.196.0.0/14	afrinic
+163.200.0.0/14	afrinic
 164.0.0.0/11	ripe
 164.32.0.0/13	ripe
 164.40.0.0/16	ripe
 164.128.0.0/12	ripe
+164.146.0.0/15	afrinic
+164.148.0.0/14	afrinic
+165.143.0.0/16	afrinic
+165.144.0.0/14	afrinic
+165.148.0.0/15	afrinic
 169.208.0.0/12	apnic
 171.16.0.0/12	ripe
 171.32.0.0/15	ripe
@@ -65,7 +80,9 @@
 
 ## The C classes space is cleanly delegated and the data here should be complete
 192.71.0.0/16	ripe
-192.72.0.0/16	whois.seed.net.tw	# NETBLK-SEED-NETS
+192.72.253.0/24	arin
+192.72.254.0/24	arin	# how annoying...
+192.72.0.0/16	apnic
 192.106.0.0/16	ripe
 192.114.0.0/15	ripe
 192.116.0.0/15	ripe
@@ -76,7 +93,7 @@
 193.0.0.0/8	ripe
 194.0.0.0/7	ripe
 198.17.117.0/24	ripe
-196.200.0.0/13	ripe
+196.0.0.0/8	afrinic
 196.0.0.0/6	arin
 
 200.17.0.0/16	whois.nic.br

po/Makefile

@@ -3,7 +3,7 @@ INSTALLNLSDIR=$(BASEDIR)/usr/share/locale
 
 PACKAGE = whois
 
-CATALOGS = de.mo el.mo es.mo fr.mo it.mo no.mo pl.mo
+CATALOGS = de.mo el.mo es.mo fr.mo it.mo ja.mo no.mo pl.mo
 
 POTFILES=../whois.c ../mkpasswd.c
 

po/it.po

@@ -196,7 +196,7 @@ msgstr ""
 "[RPSL]\n"
 "-i ATTR[,ATTR]...  fa una ricerca inversa per l'ATTRibuto specificato\n"
 "-T TIPO[,TIPO]...  cerca solo oggetti del TIPO\n"
-"-K                     restituisce solo le chiavi primarie [solo RPSL]\n"
+"-K                 restituisce solo le chiavi primarie [solo RPSL]\n"
 "-r                 disabilita le ricerche ricorsive\n"
 "-R                 mostra la copia locale dell'oggetto domain anche se\n"
 "                   contiene un riferimento\n"

po/ja.po

@@ -0,0 +1,285 @@
+# ja.po for whois
+# Copyright (C) 2005 Marco d'Itri <md@linux.it>
+# This file is distributed under the same license as the whois package.
+# Satoru SATOH <ss@gnome.gr.jp>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 4.7.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-04-23 09:49+0900\n"
+"PO-Revision-Date: 2005-04-26 00:20+0900\n"
+"Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:107
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"バージョン %s.\n"
+"\n"
+"バグ報告は %s へ.\n"
+
+#: ../whois.c:157 ../whois.c:250
+#, c-format
+msgid "Using server %s.\n"
+msgstr "サーバー %s を使用\n"
+
+#: ../whois.c:200
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"この TLD には whois サーバーがありませんが、次のサーバーで whois "
+"データベースにアクセスできます"
+
+#: ../whois.c:208
+msgid "This TLD has no whois server."
+msgstr "この TLD には whois サーバーがありません"
+
+#: ../whois.c:211
+msgid "No whois server is known for this kind of object."
+msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
+
+#: ../whois.c:214
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
+
+#: ../whois.c:218
+msgid "Connecting to whois.crsnic.net."
+msgstr "whois.crsnic.net に接続中"
+
+#: ../whois.c:224
+msgid "Connecting to whois.publicinterestregistry.net."
+msgstr "whois.publicinterestregistry.net に接続中"
+
+#: ../whois.c:230
+msgid "Connecting to whois.nic.cc."
+msgstr "whois.nic.cc に接続中"
+
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:237
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
+"\n"
+
+#: ../whois.c:251
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"問い合わせ文字列: \"%s\"\n"
+"\n"
+
+#: ../whois.c:261
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"%s への照会をみつけました\n"
+"\n"
+
+#: ../whois.c:304 ../whois.c:307
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "この行を解析できません: %s"
+
+#: ../whois.c:444
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
+
+#: ../whois.c:572
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+""
+"破滅的なエラー: 免責条項テキストが変更されました\n"
+"このプログラムをアップグレードして下さい\n"
+
+#: ../whois.c:698
+#, c-format
+msgid "Host %s not found."
+msgstr "ホスト %s はみつかりませんでした"
+
+#: ../whois.c:708
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: 不明なサービス"
+
+#: ../whois.c:727
+msgid "Timeout."
+msgstr "時間切れ"
+
+#: ../whois.c:733
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "シグナル %d が割込み..."
+
+#: ../whois.c:820
+#, c-format
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-l                     one level less specific lookup [RPSL only]\n"
+"-L                     find all Less specific matches\n"
+"-m                     find first level more specific matches\n"
+"-M                     find all More specific matches\n"
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match [RPSL only]\n"
+"-d                     return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-i ATTR[,ATTR]...      do an inverse lookup for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned [RPSL only]\n"
+"-r                     turn off recursive lookups for contact information\n"
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     search all databases\n"
+"-s SOURCE[,SOURCE]...  search the database from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+"-t TYPE                request template for object of TYPE ('all' for a "
+"list)\n"
+"-v TYPE                request verbose template for object of TYPE\n"
+"-q [version|sources|types]  query specified server info [RPSL only]\n"
+"-F                     fast raw output (implies -r)\n"
+"-h HOST                connect to server HOST\n"
+"-p PORT                connect to PORT\n"
+"-H                     hide legal disclaimers\n"
+"      --verbose        explain what is being done\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+msgstr ""
+": whois [OPTION]... OBJECT...\n"
+"\n"
+"-l                     one level less specific lookup [RPSL のみ]\n"
+"-L                     find all Less specific matches\n"
+"-m                     find first level more specific matches\n"
+"-M                     find all More specific matches\n"
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     厳密にマッチ [RPSL のみ]\n"
+"-d                     DNS 逆向き移譲オブジェクトも返す [RPSL のみ]\n"
+"-i ATTR[,ATTR]...      指定属性 ATTR について逆引き\n"
+"-T TYPE[,TYPE]...      TYPE オブジェクトのみについて検索\n"
+"-K                     主キーのみ返す [RPSL のみ]\n"
+"-r                     コンタクト情報について再帰検索しない\n"
+"-R                     照会が含まれていても強制的にドメインオブジェクトの\n"
+"                       ローカルコピーを表示\n"
+"-a                     すべてのデータベースを検索\n"
+"-s SOURCE[,SOURCE]...  SOURCE からデータベースを検索\n"
+"-g SOURCE:FIRST-LAST   SOURCE (シリアル FIRST から LAST まで)から更新を検索\n"
+"-t TYPE                TYPE オブジェクトについてテンプレートを要求 (リストは 'all')\n"
+"-v TYPE                TYPE オブジェクトについて冗長なテンプレートを要求\n"
+"-q [version|sources|types]  指定サーバー情報を問い合わせ [RPSL のみ]\n"
+"-F                     高速直接(ロー)出力 (-r を暗示)\n"
+"-h HOST                サーバー HOST に接続\n"
+"-p PORT                PORT に接続\n"
+"-H                     法的責任棄却声明を表示しない\n"
+"      --verbose        進捗について詳細に説明\n"
+"      --help           このヘルプを表示して終了\n"
+"      --version        バージョン情報を表示して終了\n"
+
+
+#: ../mkpasswd.c:55
+msgid "\tstandard 56 bit DES-based crypt(3)"
+msgstr "\t標準 56 ビット DES ベース暗号(3)"
+
+#: ../mkpasswd.c:97
+#, c-format
+msgid "Invalid hash type '%s'.\n"
+msgstr "不正なハッシュタイプ '%s'\n"
+
+#: ../mkpasswd.c:106
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "不正な数字 '%s'\n"
+
+#: ../mkpasswd.c:124
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "さらなる詳細については '%s --help' を実行\n"
+
+#: ../mkpasswd.c:153
+#, c-format
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
+msgstr "間違ったソルト長: %d バイト(s) (%d を期待)\n"
+
+#: ../mkpasswd.c:159
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "不正なソルト文字 '%c'\n"
+
+#: ../mkpasswd.c:173 ../mkpasswd.c:200
+#, c-format
+msgid "Password: "
+msgstr "パスワード: "
+
+#: ../mkpasswd.c:194
+#, c-format
+msgid "Illegal password character '0x%hhx'.\n"
+msgstr "不正なパスワード文字 '0x%hhx'\n"
+
+#: ../mkpasswd.c:231
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"使い方: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"PASSWORD を crypt(3) で暗号化\n"
+"\n"
+
+#: ../mkpasswd.c:234
+#, c-format
+msgid ""
+"      -H, --hash=TYPE       select hash TYPE\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+"      -P, --password-fd=NUM read the password from file descriptor NUM\n"
+"                            instead of /dev/tty\n"
+"      -s, --stdin           like --password-fd=0\n"
+"      -h, --help            display this help and exit\n"
+"      -V, --version         output version information and exit\n"
+"\n"
+"If PASSWORD is missing then it is asked interactively.\n"
+"If no SALT is specified, a random one is generated.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"      -H, --hash=TYPE       ハッシュ TYPE を選択\n"
+"      -S, --salt=SALT       指定の SALT を選択\n"
+"      -P, --password-fd=NUM /dev/tty の代わりにファイルディスクリプタ\n"
+"                            NUM からパスワードを読み込む\n"
+"      -s, --stdin           --password-fd=0 と同様\n"
+"      -h, --help            このヘルプを表示して終了\n"
+"      -V, --version         バージョン情報を出力して終了\n"
+"\n"
+"PASSWORD が未指定なら対話的に尋ねられます.\n"
+"SALT が未指定ならランダムに生成されたものが用いられます.\n"
+"TYPE が 'help' なら利用可能なアルゴリズムを表示します.\n"
+"\n"
+"バグ報告は %s へ.\n"
+
+#: ../mkpasswd.c:261
+#, c-format
+msgid "Available algorithms:\n"
+msgstr "利用可能なアルゴリズム:\n"

tld_serv_list

@@ -39,7 +39,7 @@
 .ac	whois.nic.ac
 .ad	NONE		# www.nic.ad
 .ae	whois.uaenic.ae
-.af	whois.nic.af	# whois.nic.cx
+.af	whois.nic.af
 .ag	whois.nic.ag
 .ai	WEB http://whois.offshore.ai/
 .al	NONE		# http://www.inima.al/Domains.html
@@ -96,7 +96,7 @@
 .de	whois.denic.de
 .dj	whois.domain.dj
 .dk	whois.dk-hostmaster.dk
-.dm	WEB https://secure.domains.dm/tools/whois.jsp
+.dm	whois.nic.dm
 .do	WEB http://www.nic.do/whois-h.php3
 .dz	WEB http://www.nic.dz/anglais/dom-attr-eng.htm
 .ec	WEB http://www.nic.ec/eng/nicec.htm
@@ -198,7 +198,7 @@
 .na	whois.na-nic.com.na
 .nc	whois.cctld.nc
 #.ne			# NIC? http://www.intnet.ne
-.nf	WEB http://whois.nic.nf/whois.jsp
+.nf	whois.nic.nf
 .ng	NONE		# http://psg.com/dns/ng/
 .ni	NONE		# www.nic.ni
 .nl	whois.domain-registry.nl
@@ -237,7 +237,7 @@
 .sh	whois.nic.sh
 .si	whois.arnes.si
 .sj	NONE		# http://www.norid.no/domenenavnbaser/bv-sj.html
-.sk	whois.ripe.net
+.sk	whois.sk-nic.sk
 #.sl			# NIC? http://www.sierratel.sl/
 .sm	whois.ripe.net
 .sn	NONE		# www.nic.sn
@@ -255,12 +255,11 @@
 .th	whois.thnic.net
 .tj	whois.nic.tj
 .tk	whois.dot.tk
+.tl	whois.nic.tl
 .tm	whois.nic.tm
 .tn	NONE		# http://www.ati.tn/Nic/
 .to	whois.tonic.to
-#.tp	WEB http://cgi.connect.ie/cgi-bin/tplookup.cgi
+.tp	whois.nic.tp
-# also see whois.cocca.cx ALSO RELEVANT FOR .tl
-.tp	WEB http://www.nic.tp/whois.jsp
 .tr	whois.metu.edu.tr
 .tt	WEB http://www.nic.tt/cgi-bin/search.pl
 .tv	whois.tv

whois.c

@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 #endif
 
     while ((ch = GETOPT_LONGISH(argc, argv,
-		"acdFg:h:Hi:KlLmMp:q:rRs:St:T:v:V:x", longopts, 0)) > 0) {
+		"abBcdFg:Gh:Hi:KlLmMp:q:rRs:St:T:v:V:x", longopts, 0)) > 0) {
 	/* RIPE flags */
 	if (strchr(ripeflags, ch)) {
 	    for (p = fstring; *p; p++);

whois.h

@@ -37,6 +37,6 @@ void err_sys(const char *,...);
 
 
 /* flags for RIPE-like servers */
-const char *ripeflags="acdFKlLmMrRSx";
+const char *ripeflags="abBcdFGKlLmMrRSx";
 const char *ripeflagsp="gisTtvq";
 

whois.spec

@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.7.1
+Version: 4.7.4
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>