Imported Debian version 4.7.37

as_del_list

@@ -64,6 +64,7 @@
 45056	46079	apnic
 47104	52223	ripe
 52224	53247	lacnic
+55296	56319	apnic
 
 # catch all: everything else comes from ARIN
 1	47103	arin

config.h

@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "4.7.36"
+#define VERSION "4.7.37"
 
 /* Configurable features */
 

data.h

@@ -45,7 +45,7 @@ const char *hide_strings[] = {
     "Access to America Online", "time. By accessing",		/* AOL */
     "% Access and use restricted", "",				/* GANDI */
     "% The data in the WHOIS database of Schlund", "",
-    "NeuStar, Inc., the Registry", "rules.  For details",	/* us */
+    "NeuStar, Inc., the Registry", "OF THE AVAILABILITY",	/* us */
     "The data in this whois database is", "",			/* enom */
     "By submitting a WHOIS query, you agree you will", "LACK OF A DOMAIN",		/* directNIC */
     "The Data in Moniker.Com", "",

debian/changelog

@@ -1,3 +1,15 @@
+whois (4.7.37) unstable; urgency=medium
+
+  * Added new ASN allocations.
+  * Added new IPv4 allocations.
+  * Fixed the disclaimer suppression data for .biz. (Closes: #551299)
+  * Added Chinese translation contributed by Feng Liu.
+  * Added the .cm and .kn TLD servers.
+  * Updated the .bi, .ge, .gf, .ki, .ls, .np and .tr TLD servers.
+  * Removed the .mq TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 07 Dec 2009 22:47:26 +0100
+
 whois (4.7.36) unstable; urgency=medium
 
   * Fixed the whois server for 182.0.0.0/7 added in 4.7.35.

debian/control

@@ -2,7 +2,7 @@ Source: whois
 Section: net
 Priority: standard
 Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5), gettext, libidn11-dev
 
 Package: whois

ip_del_list

@@ -6,9 +6,11 @@
 #
 # http://www.iana.org/assignments/ipv4-address-space
 #
+2.0.0.0/8	ripe
 24.132.0.0/14	ripe
 41.0.0.0/8	afrinic
 43.0.0.0/8	v6nic
+46.0.0.0/8	ripe
 51.0.0.0/8	ripe
 # whois -r -K -h whois.apnic.net -i admin-c IM76-AP
 59.0.0.0/11	whois.nic.or.kr

po/Makefile

@@ -6,7 +6,7 @@ INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale
 
 PACKAGE = whois
 
-CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo fi.mo
+CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo zh_CN.po
 
 POTFILES=../whois.c ../mkpasswd.c
 

po/zh_CN.po

@@ -0,0 +1,294 @@
+# Chinese (China) translation for whois
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the whois package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois\n"
+"Report-Msgid-Bugs-To: Feng Liu <maximliu@gmail.com>\n"
+"POT-Creation-Date: 2009-10-18 10:45+0000\n"
+"PO-Revision-Date: 2009-10-24 03:59+0000\n"
+"Last-Translator: Feng Liu(Maxim)\n"
+"Language-Team: Chinese (China) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 02:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../whois.c:120
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"版本 %s。\n"
+"\n"
+"将 bugs 提交到 %s。\n"
+
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#, c-format
+msgid "Using server %s.\n"
+msgstr "使用服务器 %s。\n"
+
+#: ../whois.c:209
+msgid ""
+"This TLD has no whois server, but you can access the whois database at"
+msgstr "此顶级域名没有 whois 服务器，但您可在这里访问 whois 数据库："
+
+#: ../whois.c:214
+msgid "This TLD has no whois server."
+msgstr "此顶级域名没有对应的 whois 服务器。"
+
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
+msgstr "无针对此类对象的 whois 服务器。"
+
+#: ../whois.c:220
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "未知的 AS 号码或 IP 地址。请升级此程序。"
+
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:244
+#, 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 ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"查询一个Teredo IPv6 地址相对应的 IPv4 终端 %s。\n"
+"\n"
+
+#: ../whois.c:269
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"查询字符串: \"%s\"\n"
+"\n"
+
+#: ../whois.c:279
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"发现一个到 %s 的引用。\n"
+"\n"
+
+#: ../whois.c:322 ../whois.c:325
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "不能分析该行：%s"
+
+#: ../whois.c:480
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "警告: 对传统服务器使用了 RIPE 标志。"
+
+#: ../whois.c:618 ../whois.c:753
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"严重错误: 声明(disclaimer)文本已经被改变。\n"
+"请升级此程序。\n"
+
+#: ../whois.c:805
+#, c-format
+msgid "Host %s not found."
+msgstr "没有找到主机 %s。"
+
+#: ../whois.c:815
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: 未知服务"
+
+#: ../whois.c:890
+msgid "Timeout."
+msgstr "超时。"
+
+#: ../whois.c:896
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "被信号 %d 中断..."
+
+#: ../whois.c:1100
+#, 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 [选项]... 对象...\n"
+"\n"
+"-l                     将精确度降低一级的查询 [仅 RPSL]\n"
+"-L                     找到所有低精确度匹配\n"
+"-m                     找到第一级较高精确度匹配\n"
+"-M                     找到所有较高精确度匹配\n"
+"-c                     找到最小的包含一个 mnt-irt 属性的匹配\n"
+"-x                     精确匹配 [仅 RPSL]\n"
+"-d                     同时返回 DNS 反向查询的代理对象[仅 RPSL]\n"
+"-i ATTR[,ATTR]...      为指定的属性(ATTRibutes)进行一次反向查询\n"
+"-T TYPE[,TYPE]...      仅查找指定类型(TYPE)的对象\n"
+"-K                     只返回主键(primary keys) [RPSL only]\n"
+"-r                     查询联系信息(contact information)时关闭递归查询\n"
+"-R                     强制显示本地域名对象(domain object)副本\n"
+"                       即使它包含转介(referral)\n"
+"-a                     搜寻所有数据库\n"
+"-s SOURCE[,SOURCE]...  从指定 SOURCE 中搜寻数据库\n"
+"-g SOURCE:FIRST-LAST   从 SOURCE 中查找更新，按照从开始到结束的序列\n"
+"-t TYPE                为指定类型(TYPE)对象请求模板(template) ('all'为一个列表)\n"
+"-v TYPE                为指定类型(TYPE)对象请求冗余信息模板(verbose template) \n"
+"-q [version|sources|types]  查询特定的服务器信息[仅 RPSL]\n"
+"-F                     快速输出原始数据(raw) (隐含 -r)\n"
+"-h HOST                连接到指定 HOST 服务器\n"
+"-p PORT                连接到指定 PORT 端口\n"
+"-H                     隐藏法律声明内容\n"
+"      --verbose        输出冗余的处理信息\n"
+"      --help           显示这个帮助并退出\n"
+"      --version        输出版本信息并退出\n"
+
+#: ../mkpasswd.c:80
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "以标准56位DES为基础的 crypt(3)"
+
+#: ../mkpasswd.c:159
+#, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "无效方式 '%s'。\n"
+
+#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "无效的数字 '%s'。\n"
+
+#: ../mkpasswd.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "尝试用 '%s --help' 获取更多的信息。\n"
+
+#: ../mkpasswd.c:237
+#, c-format
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
+msgstr "错误的 salt 长度: 当前为 %d 字节，预期长度为 %d 字节。\n"
+
+#: ../mkpasswd.c:241
+#, c-format
+msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
+msgstr "错误的 salt 长度: 当前为 %d 字节，预期长度范围为 %d <= n <= %d 字节。\n"
+
+#: ../mkpasswd.c:251
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "非法的 salt 字符 '%c'。\n"
+
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#, c-format
+msgid "Password: "
+msgstr "密码: "
+
+#: ../mkpasswd.c:317
+#, c-format
+msgid "Illegal password character '0x%hhx'.\n"
+msgstr "非法的密码字符 '0x%hhx'。\n"
+
+#: ../mkpasswd.c:339
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr "不被 crypt(3) 支持的方法。\n"
+
+#: ../mkpasswd.c:417
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"用法： mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"用 crypt(3) 加密 PASSWORD。\n"
+"\n"
+
+#: ../mkpasswd.c:420
+#, c-format
+msgid ""
+"      -m, --method=TYPE     select method TYPE\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\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 methods are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"      -m, --method=TYPE 	选择使用 TYPE 的方法\n"
+"      -S, --salt=SALT 		使用指定 SALT\n"
+"      -R, --rounds=NUMBER 	使用指定的循环次数\n"
+"      -P, --password-fd=NUM 	从文件描述符 NUM 中读取密码来\n"
+"				替代从 /dev/tty 中获取密码\n"     	
+"      -s, --stdin 		同 --password-fd=0\n"
+"      -h, --help 		显示帮助信息并退出\n"
+"      -V, --version 		输出版本信息并退出\n"
+"\n"
+"如果密码不存在，将会要求输入密码。\n"
+"如果未指定，将会随机生成一个SALT。\n"
+"如果类型是 'help'，显示所有可用的方式。\n"
+"\n"
+"请将BUGS提交给 %s。\n"
+
+#: ../mkpasswd.c:448
+#, c-format
+msgid "Available methods:\n"
+msgstr "可用方式：\n"