diff options
| -rw-r--r-- | as_del_list | 4 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | ip_del_list | 8 | ||||
| -rw-r--r-- | po/fr.po | 45 | ||||
| -rw-r--r-- | whois.1 | 28 | ||||
| -rw-r--r-- | whois.c | 13 | ||||
| -rw-r--r-- | whois.spec | 2 |
8 files changed, 70 insertions, 43 deletions
diff --git a/as_del_list b/as_del_list index 6e327be..58c0179 100644 --- a/as_del_list +++ b/as_del_list @@ -48,8 +48,8 @@ 27648 28671 lacnic 28672 29695 ripe 30720 31743 ripe -33792 34815 ripe +33792 35839 ripe # catch all: everything else comes from ARIN -1 34815 arin +1 35839 arin @@ -1,6 +1,6 @@ /* Program version */ /* not for the inetutils version */ -#define VERSION "4.7.0" +#define VERSION "4.7.1" /* Configurable features */ diff --git a/debian/changelog b/debian/changelog index 812c721..cd88607 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +whois (4.7.1) unstable; urgency=medium + + * Added new ASN allocations. + * Updated the IPv4 allocations. (Closes: #289459) + * Updated the French translation, by Mohammed Adnène Trojette. + (Closes: #298005) + * Added another workaround for DENIC brokeness, flags will not be + automatically added for *any* query which has flags. (Closes: #295353) + + -- Marco d'Itri <md@linux.it> Fri, 4 Mar 2005 00:58:31 +0100 + whois (4.7.0) unstable; urgency=medium * Updated the .af, .ar, .cf, .dm, .ec, .es, .ga, .gu, .ky, .lt, .sb, .wf diff --git a/ip_del_list b/ip_del_list index a1e8f62..1cc7452 100644 --- a/ip_del_list +++ b/ip_del_list @@ -5,6 +5,7 @@ # customers documented in the whois database. # 24.132.0.0/14 ripe +43.0.0.0/8 v6nic 58.0.0.0/7 apnic 61.72.0.0/13 whois.nic.or.kr 61.80.0.0/14 whois.nic.or.kr @@ -14,12 +15,11 @@ 61.208.0.0/13 whois.nic.ad.jp # => 61.215.255.255 60.0.0.0/7 apnic 62.0.0.0/8 ripe -80.0.0.0/5 ripe # => 87.255.255.254 +80.0.0.0/5 ripe # => 87.255.255.255 88.0.0.0/8 ripe -124.0.0.0/8 apnic -125.0.0.0/8 apnic +124.0.0.0/7 apnic 126.0.0.0/8 apnic -96.0.0.0/3 UNALLOCATED # 96 -> 127 reserved +96.0.0.0/3 UNALLOCATED # => 127.215.255.255 0.0.0.0/1 arin # all other A classes are managed by ARIN 133.0.0.0/8 whois.nic.ad.jp 139.20.0.0/14 ripe @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: whois 4.6.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2003-12-01 18:31+0100\n" -"PO-Revision-Date: 2003-06-13 04:16+0200\n" -"Last-Translator: William Steve Applegate <wsapplegate@est.un.goret.info>\n" -"Language-Team: French <fr@li.org>\n" +"PO-Revision-Date: 2005-02-22 20:06+0100\n" +"Last-Translator: Mohammed Adnène Trojette <adn+deb@diwi.org>\n" +"Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,7 +23,7 @@ msgid "" msgstr "" "Version %s.\n" "\n" -"Rapportez les bugs à %s.\n" +"Veuillez rapporter les bogues à %s.\n" #: ../whois.c:151 ../whois.c:240 #, c-format @@ -94,6 +94,9 @@ msgid "" "Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" "\n" msgstr "" +"\n" +"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 6to4.\n" +"\n" #: ../whois.c:249 #, c-format @@ -101,18 +104,18 @@ msgid "" "Query string: \"%s\"\n" "\n" msgstr "" -"Requête : \"%s\"\n" +"Requête : \"%s\"\n" "\n" #: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" -msgstr "Impossible d'interpréter la ligne : %s" +msgstr "Impossible d'interpréter la ligne : %s" #: ../whois.c:446 msgid "Warning: RIPE flags used with a traditional server." msgstr "" -"Avertissement : des options RIPE ont été utilisées avec un serveur classique." +"Avertissement : des options RIPE ont été utilisées avec un serveur classique." #: ../whois.c:503 #, c-format @@ -124,7 +127,7 @@ msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" msgstr "" -"Erreur catastrophique : le texte de déni de responsabilité a changé.\n" +"Erreur catastrophique : le texte de déni de responsabilité a changé.\n" "Veuillez mettre à jour ce programme.\n" #: ../whois.c:639 @@ -135,7 +138,7 @@ msgstr "L'hôte %s est introuvable." #: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" -msgstr "%s/tcp : service inconnu" +msgstr "%s/tcp : service inconnu" #: ../whois.c:661 msgid "Timeout." @@ -182,7 +185,7 @@ msgid "" msgstr "" "Usage: whois [OPTION]... OBJET...\n" "\n" -"-l réduit d'un niveau la spécificité de la recherche " +"-l réduire d'un niveau la spécificité de la recherche " "[RPSL seulement]\n" "-L trouver toutes les occurrences moins spécifiques\n" "-m trouver les occurrences de premier niveau plus " @@ -224,7 +227,7 @@ msgstr "" #: ../mkpasswd.c:55 msgid "\tstandard 56 bit DES-based crypt(3)" -msgstr "\tfonction crypt(3) standard, cryptage DES à 56 bits" +msgstr "\tfonction crypt(3) standard, chiffrement DES à 56 bits" #: ../mkpasswd.c:96 #, c-format @@ -239,22 +242,22 @@ msgstr "Le nombre '%s' est invalide.\n" #: ../mkpasswd.c:123 #, c-format msgid "Try '%s --help' for more information.\n" -msgstr "Tapez '%s --help' pour plus d'informations.\n" +msgstr "Veuillez taper '%s --help' pour plus d'informations.\n" # : ../mkpasswd.c:152 #: ../mkpasswd.c:152 #, c-format msgid "Wrong salt length: %d byte(s) when %d expected.\n" -msgstr "Mauvaise taille de graine : %d octet(s) au lieu de %d.\n" +msgstr "Mauvaise taille d'aléa : %d octet(s) au lieu de %d.\n" #: ../mkpasswd.c:158 #, c-format msgid "Illegal salt character '%c'.\n" -msgstr "Le caractère '%c' est invalide dans la graine.\n" +msgstr "Le caractère '%c' est invalide dans l'aléa.\n" #: ../mkpasswd.c:172 ../mkpasswd.c:199 msgid "Password: " -msgstr "Mot de passe : " +msgstr "Mot de passe : " #: ../mkpasswd.c:193 #, c-format @@ -267,8 +270,8 @@ msgid "" "Crypts the PASSWORD using crypt(3).\n" "\n" msgstr "" -"Usage : mkpasswd [OPTIONS]... [MOT DE PASSE [GRAINE]]\n" -"Crypte le MOT DE PASSE à l'aide de la fonction crypt(3).\n" +"Usage : mkpasswd [OPTIONS]... [MOT DE PASSE [ALÉA]]\n" +"Chiffre le MOT DE PASSE à l'aide de la fonction crypt(3).\n" "\n" #: ../mkpasswd.c:233 @@ -289,7 +292,7 @@ msgid "" "Report bugs to %s.\n" msgstr "" " -H, --hash=TYPE sélectionner ce TYPE de hachage\n" -" -S, --salt=GRAINE utiliser cette GRAINE\n" +" -S, --salt=ALÉA utiliser cette ALÉA\n" " -P, --password-fd=NUM lire le mot de passe depuis le descripteur de " "fichier NUM\n" " au lieu de /dev/tty\n" @@ -298,11 +301,11 @@ msgstr "" " -V, --version afficher les informations de version et sortir\n" "\n" "Si le MOT DE PASSE est manquant, il est demandé interactivement.\n" -"Si aucune GRAINE n'est spécifiée, une graine aléatoire est générée.\n" +"Si aucune ALÉA n'est spécifiée, un aléa aléatoire est générée.\n" "Si le TYPE est manquant, les algorithmes disponibles sont affichés.\n" "\n" -"Rapportez les bugs à %s.\n" +"Veuillez rapporter les bogues à %s.\n" #: ../mkpasswd.c:260 msgid "Available algorithms:\n" -msgstr "Algorithmes disponibles :\n" +msgstr "Algorithmes disponibles :\n" @@ -1,4 +1,4 @@ -.TH "WHOIS" "1" "27 November 2004" "Marco d'Itri" "Debian GNU/Linux" +.TH "WHOIS" "1" "4 March 2005" "Marco d'Itri" "Debian GNU/Linux" .SH "NAME" whois \- client for the whois directory service .SH "SYNOPSIS" @@ -25,8 +25,8 @@ whois \- client for the whois directory service This version of the whois client tries to guess the right server to ask for the specified object. If no guess can be made it will connect -to whois.networksolutions.com for nic handles or whois.arin.net for -IPv4 addresses and network names. +to \fIwhois.networksolutions.com\fP for NIC handles or \fIwhois.arin.net\fP +for IPv4 addresses and network names. .PP .SH "OPTIONS" .TP 8 @@ -45,7 +45,7 @@ Be verbose. .B \-\-help Display online help. .TP 8 -Other options are flags understood by RIPE\-like servers. +Other options are flags understood by RIPE-like servers. .SH "NOTES" Please remember that \fIwhois.networksolutions.com\fP by default will only search in the domains database. If you want to search for NIC handles @@ -56,17 +56,27 @@ When querying \fIwhois.nic.mil\fP for AS numbers, the program will automatically convert the request in the appropriate format, inserting a space after the string \fIAS\fP. .P -When querying \fIwhois.denic.de\fP for domain names, the program will -automatically add the flags \fI-T dn,ace -C US-ASCII\fP. +If the program is compiled with IDN support, when querying +\fIwhois.denic.de\fP for domain names it will automatically add the flags +\fI\-T dn,ace \-C US\-ASCII\fP if no flags have been specified by the user. +The domain name will \fBalways\fP be IDN-encoded. .P -When querying \fIwhois.corenic.net\fP, machine readable output is requested. +When querying \fIwhois.corenic.net\fP, the program will automatically +request machine-readable output. .P -RIPE\-specific options are ignored when querying non\-RIPE servers. +RIPE-specific command line options are ignored when querying non-RIPE +servers. This may or may not be the behaviour intended by the user. +When querying a non-standard server, command line options which are not +to be interpreted by the client should always follow the \fI\-\-\fP +separator (which marks the beginning of the query string). .P If the \fI/etc/whois.conf\fR config file exists, it will be consulted to find a server before applying the normal rules. Each line of the file should contain a regular expression to be matched against the query text and the whois server to use, separated by white space. +.P +Command line arguments will always be interpreted accordingly to the +current system locale and converted to the IDN ASCII Compatible Encoding. .SH "Files" /etc/whois.conf .SH "ENVIRONMENT" @@ -102,4 +112,4 @@ Kessens of QWest for the 6bone server. .SH "AUTHOR" .B Whois and this man page were written by Marco d'Itri <\fImd@linux.it\fP> -and are licensed under the GPL. +and are licensed under the terms of the GNU General Public License. @@ -71,8 +71,8 @@ int main(int argc, char *argv[]) textdomain(NLS_CAT_NAME); #endif - while ((ch = GETOPT_LONGISH(argc, argv, "acdFg:h:Hi:KlLmMp:q:rRs:St:T:v:V:x", - longopts, 0)) > 0) { + while ((ch = GETOPT_LONGISH(argc, argv, + "acdFg:h:Hi:KlLmMp:q:rRs:St:T:v:V:x", longopts, 0)) > 0) { /* RIPE flags */ if (strchr(ripeflags, ch)) { for (p = fstring; *p; p++); @@ -447,13 +447,16 @@ char *queryformat(const char *server, const char *flags, const char *query) strcat(buf, flags); } +#ifdef HAVE_LIBIDN /* why, oh why DENIC had to make whois "user friendly"? - * I hope that adding -T dn,ace will not break some queries. + * Do this only if the user did not use any flag. */ if (isripe && strcmp(server, "whois.denic.de") == 0 && domcmp(query, ".de") - && !strchr(query, ' ')) + && !strchr(query, ' ') && !*flags) sprintf(buf, "-T dn,ace -C US-ASCII %s", query); - else if (!isripe && (strcmp(server, "whois.nic.mil") == 0 || + else +#endif + if (!isripe && (strcmp(server, "whois.nic.mil") == 0 || strcmp(server, "whois.nic.ad.jp") == 0) && strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2])) /* FIXME: /e is not applied to .JP ASN */ @@ -1,6 +1,6 @@ Summary: Enhanced WHOIS client Name: whois -Version: 4.7.0 +Version: 4.7.1 Release: 1 License: GPL Vendor: Marco d'Itri <md@linux.it> |