From 548793b0a4bb4006db12dc1e4d86b7e7ce2fcd9a Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 1 Dec 2003 18:58:54 +0100 Subject: [PATCH] Imported Debian version 4.6.9 --- Makefile | 9 +++++-- as_del_list | 8 +++--- config.h | 2 +- debian/changelog | 19 +++++++++++++- debian/control | 2 +- debian/rules | 4 ++- ip_del_list | 7 ++---- po/de.po | 53 ++++++++++++++++++++++----------------- po/el.po | 53 ++++++++++++++++++++++----------------- po/es.po | 53 ++++++++++++++++++++++----------------- po/fr.po | 64 ++++++++++++++++++++++++++++-------------------- po/it.po | 56 +++++++++++++++++++++++++----------------- po/no.po | 53 ++++++++++++++++++++++----------------- po/pl.po | 53 ++++++++++++++++++++++----------------- tld_serv_list | 11 ++++----- whois.c | 60 ++++++++++++++++++++++++++++++++++++++------- whois.h | 1 + whois.spec | 2 +- 18 files changed, 320 insertions(+), 190 deletions(-) diff --git a/Makefile b/Makefile index f6bc87f..7e28a62 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -prefix=/usr/local +prefix ?= /usr/local OPTS=-O2 @@ -15,10 +15,15 @@ OPTS=-O2 # OS/2 EMX #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp +ifdef HAVE_LIBIDN +LIBIDN += -lidn +CFLAGS += -DHAVE_LIBIDN +endif + all: whois #pos whois: whois.c whois.h config.h data.h as_del.h ip_del.h tld_serv.h - $(CC) $(CFLAGS) $(OPTS) whois.c -o whois $(LDFLAGS) + $(CC) $(CFLAGS) $(OPTS) whois.c -o whois $(LDFLAGS) $(LIBIDN) mkpasswd: mkpasswd.c $(CC) $(CFLAGS) $(OPTS) mkpasswd.c -o mkpasswd -lcrypt diff --git a/as_del_list b/as_del_list index 9a564ab..212c52b 100644 --- a/as_del_list +++ b/as_del_list @@ -47,11 +47,9 @@ 26592 26623 lacnic 27648 28671 lacnic 28672 29695 ripe -#29696 30719 arin +29696 30719 arin +30720 31743 ripe # catch all: everything else comes from ARIN -0 30719 arin - -# EOL marker -0 0 . +1 31743 arin diff --git a/config.h b/config.h index 09d6649..79e73b2 100644 --- a/config.h +++ b/config.h @@ -1,6 +1,6 @@ /* Program version */ /* not for the inetutils version */ -#define VERSION "4.6.6" +#define VERSION "4.6.9" /* Configurable features */ diff --git a/debian/changelog b/debian/changelog index 912c511..64038c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +whois (4.6.9) unstable; urgency=medium + + * Removed .ac.cn SLD. (Closes: #219883) + * Added support for 6to4 IPv6 addresses. (Closes: #219028) + * Updated 145/8 after ERX transfer. (Closes: #220400) + * Added IDN support. + + -- Marco d'Itri Mon, 1 Dec 2003 18:58:54 +0100 + +whois (4.6.8) unstable; urgency=medium + + * Update the version number. (Closes: #211550) + * Updated .cr, .fi, .ly and .md TLDs. + * Added new ASN block for APNIC. + + -- Marco d'Itri Fri, 24 Oct 2003 22:37:22 +0200 + whois (4.6.7) unstable; urgency=medium * Updated .hk, .sg TLDs. @@ -67,7 +84,7 @@ whois (4.6.0) unstable; urgency=medium * Added .ai .bo, .bt, .dz, .gi, .pn, .tp and .uz TLDs. * Updated .ae, .ar, .at, .bi, .co, .cu, .do, .fm, .ge, .jo, .kr, .lu, .lv, .mt, .mu, .mw, .nr, .ph, .pk, .sa, .sb, .ua, .uy, .vi, .vu TLDs - (courtesy of Frιdιric L. W. Meunier). + (courtesy of FrΓ©dΓ©ric L. W. Meunier). * Rewritten the IPv6-matching code. Fixed a few bugs there too. * Generalized and deuglyfied some parts of the code. * Added support for RPSL objects like AS8627:fltr-TRANSIT-OUT. diff --git a/debian/control b/debian/control index aa2f376..54aa4d4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: standard Maintainer: Marco d'Itri Standards-Version: 3.6.1 -Build-Depends: debhelper, gettext +Build-Depends: debhelper, gettext, libidn9-dev Package: whois Architecture: any diff --git a/debian/rules b/debian/rules index 1bd700b..0e6c9ea 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,9 @@ SHELL+= -e build: $(checkdir) - make whois mkpasswd OPTS="-O2 -g -DCONFIG_FILE=\\\"/etc/whois.conf\\\"" + make whois mkpasswd \ + OPTS="-O2 -g -DCONFIG_FILE=\\\"/etc/whois.conf\\\"" \ + HAVE_LIBIDN=1 touch build clean: diff --git a/ip_del_list b/ip_del_list index 1c5380c..b7eea55 100644 --- a/ip_del_list +++ b/ip_del_list @@ -26,11 +26,7 @@ 141.64.0.0/12 ripe 141.80.0.0/14 ripe 141.84.0.0/15 ripe -145.224.0.0/12 ripe -145.240.0.0/13 ripe -145.248.0.0/14 ripe -145.252.0.0/15 ripe -145.254.0.0/16 ripe +145.0.0.0/8 ripe 146.48.0.0/16 ripe 149.202.0.0/15 ripe 149.204.0.0/16 ripe @@ -76,6 +72,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/6 arin 200.17.0.0/16 whois.nic.br diff --git a/po/de.po b/po/de.po index 1115df5..0a13de5 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.4.13\n" -"POT-Creation-Date: 2003-05-05 18:21+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-01 18:31+0100\n" "PO-Revision-Date: 2001-07-04 15:15+01:00\n" "Last-Translator: Simon Richter \n" "Language-Team: German \n" @@ -24,30 +25,30 @@ msgstr "" "\n" "Senden sie Bugreports an %s.\n" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "Benutze Server %s.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "Benutze voreingestellten Server %s.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" msgstr "Diese TLD hat keinen whois-Server, aber eine whois-Datenbank unter" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "Diese TLD hat keinen whois-Server." -#: ../whois.c:185 +#: ../whois.c:186 #, fuzzy msgid "Connecting to whois.crsnic.net." msgstr "Verbinde zu whois.internic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, fuzzy, c-format msgid "" "\n" @@ -58,17 +59,17 @@ msgstr "" "InterNIC verweist auf %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 #, fuzzy msgid "Connecting to whois.nic.cc." msgstr "Verbinde zu whois.internic.net." -#: ../whois.c:207 +#: ../whois.c:208 #, fuzzy msgid "Connecting to whois.publicinterestregistry.net." msgstr "Verbinde zu whois.internic.net." -#: ../whois.c:213 +#: ../whois.c:214 #, fuzzy, c-format msgid "" "\n" @@ -79,16 +80,24 @@ msgstr "" "InterNIC verweist auf %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "" -#: ../whois.c:220 +#: ../whois.c:221 #, fuzzy msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "Unbekannte AS-Nummer. Bitte upgraden Sie dieses Programm." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -97,22 +106,22 @@ msgstr "" "Suche nach: \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "" -#: ../whois.c:428 +#: ../whois.c:446 #, fuzzy msgid "Warning: RIPE flags used with a traditional server." msgstr "Warnung: RIPE-Flags wurden ignoriert (\"traditioneller\" Server)." -#: ../whois.c:489 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Verweis auf %s gefunden bei %s.\n" -#: ../whois.c:506 +#: ../whois.c:520 msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" @@ -120,26 +129,26 @@ msgstr "" "Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n" "Bitte upgraden sie dieses Programm.\n" -#: ../whois.c:624 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "Host %s nicht gefunden." -#: ../whois.c:634 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: unbekannter Dienst" -#: ../whois.c:646 +#: ../whois.c:661 msgid "Timeout." msgstr "" -#: ../whois.c:652 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Erhielt Signal %d, unterbrochen..." -#: ../whois.c:701 +#: ../whois.c:728 #, fuzzy msgid "" "Usage: whois [OPTION]... OBJECT...\n" diff --git a/po/el.po b/po/el.po index 78bc2bc..6fe95fa 100644 --- a/po/el.po +++ b/po/el.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.5.3\n" -"POT-Creation-Date: 2003-05-05 18:21+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-01 18:31+0100\n" "PO-Revision-Date: 2001-02-23 16:07:57+0900\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -24,32 +25,32 @@ msgstr "" "\n" "Αναφέρατε σφάλματα στο %s.\n" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "Χρήση εξ' ορισμού εξυπηρετητή %s.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" msgstr "" "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την " "βάση whois στο" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois." -#: ../whois.c:185 +#: ../whois.c:186 #, fuzzy msgid "Connecting to whois.crsnic.net." msgstr "Γίνεται σύνδεση στο whois.internic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, fuzzy, c-format msgid "" "\n" @@ -60,17 +61,17 @@ msgstr "" "Βρέθηκε αναφορά από το InterNIC στο %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 #, fuzzy msgid "Connecting to whois.nic.cc." msgstr "Γίνεται σύνδεση στο whois.internic.net." -#: ../whois.c:207 +#: ../whois.c:208 #, fuzzy msgid "Connecting to whois.publicinterestregistry.net." msgstr "Γίνεται σύνδεση στο whois.internic.net." -#: ../whois.c:213 +#: ../whois.c:214 #, fuzzy, c-format msgid "" "\n" @@ -81,16 +82,24 @@ msgstr "" "Βρέθηκε αναφορά από το InterNIC στο %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "" -#: ../whois.c:220 +#: ../whois.c:221 #, fuzzy msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "¶γνωστος αριθμός AS. Παρακαλώ ενημερώστε αυτό το πρόγραμμα." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -99,23 +108,23 @@ msgstr "" "Αλφαριθμητικό ερώτησης: \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "" -#: ../whois.c:428 +#: ../whois.c:446 #, fuzzy msgid "Warning: RIPE flags used with a traditional server." msgstr "" "Προειδοποίηση: Η σημαίες του RIPE αγνοούνται σε έναν παραδοσιακό εξυπηρετητή." -#: ../whois.c:489 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Ανιχνεύθηκε αναφορά του %s στο %s.\n" -#: ../whois.c:506 +#: ../whois.c:520 msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" @@ -123,26 +132,26 @@ msgstr "" "Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n" "Παρακαλώ αναβαθμίστε το πρόγραμμα.\n" -#: ../whois.c:624 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "Το σύστημα %s δε βρέθηκε." -#: ../whois.c:634 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: άγνωστη υπηρεσία" -#: ../whois.c:646 +#: ../whois.c:661 msgid "Timeout." msgstr "" -#: ../whois.c:652 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Διακοπή από το σήμα %d..." -#: ../whois.c:701 +#: ../whois.c:728 #, fuzzy msgid "" "Usage: whois [OPTION]... OBJECT...\n" diff --git a/po/es.po b/po/es.po index da0e6d8..bc83dde 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.5.29\n" -"POT-Creation-Date: 2003-05-05 18:21+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-01 18:31+0100\n" "PO-Revision-Date: 2002-08-24 16:22+0200\n" "Last-Translator: Francisco Monteagudo \n" "Language-Team: Spanish \n" @@ -24,31 +25,31 @@ msgstr "" "\n" "Informar de bugs a %s.\n" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "Usando el servidor %s.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "Usando el servidor predefinido %s.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" msgstr "" "Este TLD no dispone de servidor whois, pero puede acceder a la informacion " "de whois en" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "No existe servidor whois para este TLD." -#: ../whois.c:185 +#: ../whois.c:186 msgid "Connecting to whois.crsnic.net." msgstr "Conectando a whois.crsnic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, fuzzy, c-format msgid "" "\n" @@ -59,17 +60,17 @@ msgstr "" "Se ha encontrado en crsnic una referencia a %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 #, fuzzy msgid "Connecting to whois.nic.cc." msgstr "Conectando a whois.crsnic.net." -#: ../whois.c:207 +#: ../whois.c:208 #, fuzzy msgid "Connecting to whois.publicinterestregistry.net." msgstr "Conectando a whois.crsnic.net." -#: ../whois.c:213 +#: ../whois.c:214 #, fuzzy, c-format msgid "" "\n" @@ -80,16 +81,24 @@ msgstr "" "Se ha encontrado en crsnic una referencia a %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "" -#: ../whois.c:220 +#: ../whois.c:221 #, fuzzy msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "Numero AS desconocido. Por favor, actualice este programa." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -98,23 +107,23 @@ msgstr "" "Consulta: \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "No puedo procesar esta linea: %s" -#: ../whois.c:428 +#: ../whois.c:446 #, fuzzy msgid "Warning: RIPE flags used with a traditional server." msgstr "" "Atencion: Los flags RIPE son ignorados por los servidores tradicionales." -#: ../whois.c:489 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Detectada una referencia a %s en %s.\n" -#: ../whois.c:506 +#: ../whois.c:520 msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" @@ -122,26 +131,26 @@ msgstr "" "Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n" "Actualize este programa.\n" -#: ../whois.c:624 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "Host %s no encontrado." -#: ../whois.c:634 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: servicio desconocido" -#: ../whois.c:646 +#: ../whois.c:661 msgid "Timeout." msgstr "" -#: ../whois.c:652 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Interrumpido por la seρal %d..." -#: ../whois.c:701 +#: ../whois.c:728 #, fuzzy msgid "" "Usage: whois [OPTION]... OBJECT...\n" diff --git a/po/fr.po b/po/fr.po index 8c8caed..0babae6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.6.5\n" -"POT-Creation-Date: 2003-05-05 18:21+0200\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 \n" "Language-Team: French \n" @@ -24,29 +25,31 @@ msgstr "" "\n" "Rapportez les bugs ΰ %s.\n" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "Le serveur %s est sιlectionnι.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "Le serveur par dιfaut %s est sιlectionnι.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" -msgstr "Ce TLD n'a pas de serveur whois, mais vous pouvez accιder ΰ la base de donnιes ΰ" +msgstr "" +"Ce TLD n'a pas de serveur whois, mais vous pouvez accιder ΰ la base de " +"donnιes ΰ" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "Ce TLD n'a pas de serveur whois." -#: ../whois.c:185 +#: ../whois.c:186 msgid "Connecting to whois.crsnic.net." msgstr "Connexion ΰ whois.crsnic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, c-format msgid "" "\n" @@ -57,15 +60,15 @@ msgstr "" "Renvoi trouvι vers %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 msgid "Connecting to whois.nic.cc." msgstr "Connexion ΰ whois.nic.cc." -#: ../whois.c:207 +#: ../whois.c:208 msgid "Connecting to whois.publicinterestregistry.net." msgstr "Connexion ΰ whois.publicinterestregistry.net." -#: ../whois.c:213 +#: ../whois.c:214 #, c-format msgid "" "\n" @@ -76,15 +79,23 @@ msgstr "" "Renvoi trouvι vers %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "Aucun serveur whois n'est connu pour ce type d'objet." -#: ../whois.c:220 +#: ../whois.c:221 msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "Numιro d'AS ou rιseau IP inconnu. Veuillez mettre ΰ jour ce programme." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -93,21 +104,22 @@ msgstr "" "Requκte : \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "Impossible d'interprιter la ligne : %s" -#: ../whois.c:428 +#: ../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." +msgstr "" +"Avertissement : des options RIPE ont ιtι utilisιes avec un serveur classique." -#: ../whois.c:489 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Renvoi trouvι vers %s depuis %s.\n" -#: ../whois.c:506 +#: ../whois.c:520 msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" @@ -115,26 +127,26 @@ msgstr "" "Erreur catastrophique : le texte de dιni de responsabilitι a changι.\n" "Veuillez mettre ΰ jour ce programme.\n" -#: ../whois.c:624 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "L'hτte %s est introuvable." -#: ../whois.c:634 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp : service inconnu" -#: ../whois.c:646 +#: ../whois.c:661 msgid "Timeout." msgstr "Temps limite dιpassι." -#: ../whois.c:652 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Interruption par le signal %d..." -#: ../whois.c:701 +#: ../whois.c:728 msgid "" "Usage: whois [OPTION]... OBJECT...\n" "\n" @@ -186,8 +198,8 @@ msgstr "" "-T TYPE[,TYPE]... chercher seulement les objets de ce TYPE\n" "-K seules les clιs primaires sont renvoyιes [RPSL " "seulement]\n" -"-r dιsactiver la recherche rιcursive des informations " -"de contact\n" +"-r dιsactiver la recherche rιcursive des informations de " +"contact\n" "-R forcer l'affichage de la copie locale de l'objet de " "domaine,\n" " mκme s'il contient un renvoi\n" diff --git a/po/it.po b/po/it.po index c9e00d1..2c5b371 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.4.13\n" -"POT-Creation-Date: 2003-05-05 18:21+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-01 18:31+0100\n" "PO-Revision-Date: 2003-05-05 18:21+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -24,30 +25,30 @@ msgstr "" "\n" "Segnalare i bug a %s.\n" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "Uso il server %s.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "Uso il server predefinito %s.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" msgstr "" "Questo TLD non ha un server whois, ma si puς accedere al database tramite" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "Per questo TLD non esiste un server whois." -#: ../whois.c:185 +#: ../whois.c:186 msgid "Connecting to whois.crsnic.net." msgstr "Mi sto connettendo a whois.crsnic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, c-format msgid "" "\n" @@ -58,15 +59,15 @@ msgstr "" "Trovato un riferimento a %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 msgid "Connecting to whois.nic.cc." msgstr "Mi sto connettendo a whois.nic.cc." -#: ../whois.c:207 +#: ../whois.c:208 msgid "Connecting to whois.publicinterestregistry.net." msgstr "Mi sto connettendo a whois.publicinterestregistry.net." -#: ../whois.c:213 +#: ../whois.c:214 #, c-format msgid "" "\n" @@ -77,16 +78,27 @@ msgstr "" "Trovato un riferimento a %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "Non θ noto alcun server whois per questo tipo di oggetto." -#: ../whois.c:220 +#: ../whois.c:221 msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "" "Numero dell'AS o della rete IP sconosciuto. Per favore aggiorna il programma." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" +"\n" +"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n" +"\n" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -95,21 +107,21 @@ msgstr "" "Richiesta: \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "Impossibile interpretare questa riga: %s" -#: ../whois.c:428 +#: ../whois.c:446 msgid "Warning: RIPE flags used with a traditional server." msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale." -#: ../whois.c:489 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Trovato un riferimento a %s su %s.\n" -#: ../whois.c:506 +#: ../whois.c:520 msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" @@ -117,26 +129,26 @@ msgstr "" "Errore catastrofico: il testo di avvertenze θ cambiato.\n" "Aggiorna questo programma.\n" -#: ../whois.c:624 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "Host %s non trovato." -#: ../whois.c:634 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: servizio sconosciuto" -#: ../whois.c:646 +#: ../whois.c:661 msgid "Timeout." msgstr "Tempo scaduto." -#: ../whois.c:652 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Interrotto dal segnale %d..." -#: ../whois.c:701 +#: ../whois.c:728 msgid "" "Usage: whois [OPTION]... OBJECT...\n" "\n" diff --git a/po/no.po b/po/no.po index e33496e..8c53855 100644 --- a/po/no.po +++ b/po/no.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.4.5\n" -"POT-Creation-Date: 2003-05-05 18:21+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-01 18:31+0100\n" "PO-Revision-Date: 1999-12-18 14:00:00\n" "Last-Translator: Egil Kvaleberg \n" "Language-Team: Norwegian \n" @@ -22,30 +23,30 @@ msgid "" "Report bugs to %s.\n" msgstr "" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "Bruker tjener %s.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "Bruker standardtjener %s.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" msgstr "" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "" -#: ../whois.c:185 +#: ../whois.c:186 #, fuzzy msgid "Connecting to whois.crsnic.net." msgstr "Kobler opp mot whois.internic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, fuzzy, c-format msgid "" "\n" @@ -56,17 +57,17 @@ msgstr "" "Fant InterNIC-referanse til %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 #, fuzzy msgid "Connecting to whois.nic.cc." msgstr "Kobler opp mot whois.internic.net." -#: ../whois.c:207 +#: ../whois.c:208 #, fuzzy msgid "Connecting to whois.publicinterestregistry.net." msgstr "Kobler opp mot whois.internic.net." -#: ../whois.c:213 +#: ../whois.c:214 #, fuzzy, c-format msgid "" "\n" @@ -77,16 +78,24 @@ msgstr "" "Fant InterNIC-referanse til %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "" -#: ../whois.c:220 +#: ../whois.c:221 #, fuzzy msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "Ukjent AS-nummer. Vennligst oppdater programmet." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -95,22 +104,22 @@ msgstr "" "Forespψrsel: \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "" -#: ../whois.c:428 +#: ../whois.c:446 #, fuzzy msgid "Warning: RIPE flags used with a traditional server." msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener." -#: ../whois.c:489 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Referanse til %s vedrψrende %s.\n" -#: ../whois.c:506 +#: ../whois.c:520 #, fuzzy msgid "" "Catastrophic error: disclaimer text has been changed.\n" @@ -119,26 +128,26 @@ msgstr "" "Alvorlig feil: INTERNIC har endret standardtekst.\n" "Vennligst oppdater programmet.\n" -#: ../whois.c:624 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "Finner ikke verten %s." -#: ../whois.c:634 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: ukjent port" -#: ../whois.c:646 +#: ../whois.c:661 msgid "Timeout." msgstr "" -#: ../whois.c:652 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Avbrudt av signal %d..." -#: ../whois.c:701 +#: ../whois.c:728 #, fuzzy msgid "" "Usage: whois [OPTION]... OBJECT...\n" diff --git a/po/pl.po b/po/pl.po index 6365674..84dab79 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: whois 4.6.5\n" -"POT-Creation-Date: 2003-05-10 08:39+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-01 18:31+0100\n" "PO-Revision-Date: 2003-05-10 08:40+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -27,30 +28,30 @@ msgstr "" "\n" "B³κdy proszκ zg³aszaζ na adres %s.\n" -#: ../whois.c:151 ../whois.c:224 +#: ../whois.c:151 ../whois.c:240 #, c-format msgid "Using server %s.\n" msgstr "UΏycie serwera %s.\n" -#: ../whois.c:172 +#: ../whois.c:173 #, c-format msgid "Using default server %s.\n" msgstr "UΏycie domy¶lnego serwera %s.\n" -#: ../whois.c:175 +#: ../whois.c:176 msgid "This TLD has no whois server, but you can access the whois database at" msgstr "" "Ta g³σwna domena nie ma serwera whois, ale moΏna uΏyζ bazy danych whois pod" -#: ../whois.c:181 +#: ../whois.c:182 msgid "This TLD has no whois server." msgstr "Ta g³σwna domena nie ma serwera whois." -#: ../whois.c:185 +#: ../whois.c:186 msgid "Connecting to whois.crsnic.net." msgstr "£±czenie z whois.crsnic.net." -#: ../whois.c:191 ../whois.c:202 +#: ../whois.c:192 ../whois.c:203 #, c-format msgid "" "\n" @@ -61,15 +62,15 @@ msgstr "" "Znaleziono odniesienie do %s.\n" "\n" -#: ../whois.c:196 +#: ../whois.c:197 msgid "Connecting to whois.nic.cc." msgstr "£±czenie z whois.nic.cc." -#: ../whois.c:207 +#: ../whois.c:208 msgid "Connecting to whois.publicinterestregistry.net." msgstr "£±czenie z whois.publicinterestregistry.net." -#: ../whois.c:213 +#: ../whois.c:214 #, c-format msgid "" "\n" @@ -80,15 +81,23 @@ msgstr "" "Znaleziono odniesienie do %s.\n" "\n" -#: ../whois.c:217 +#: ../whois.c:218 msgid "No whois server is known for this kind of object." msgstr "Dla tego rodzaju obiektu nie jest znany Ώaden serwer whois." -#: ../whois.c:220 +#: ../whois.c:221 msgid "Unknown AS number or IP network. Please upgrade this program." msgstr "Nieznany numer AS lub sieζ IP. Proszκ uaktualniζ ten program." -#: ../whois.c:233 +#: ../whois.c:228 +#, c-format +msgid "" +"\n" +"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n" +"\n" +msgstr "" + +#: ../whois.c:249 #, c-format msgid "" "Query string: \"%s\"\n" @@ -97,21 +106,21 @@ msgstr "" "Zapytanie: \"%s\"\n" "\n" -#: ../whois.c:286 ../whois.c:289 +#: ../whois.c:302 ../whois.c:305 #, c-format msgid "Cannot parse this line: %s" msgstr "Nie moΏna przeanalizowaζ tej linii: %s" -#: ../whois.c:428 +#: ../whois.c:446 msgid "Warning: RIPE flags used with a traditional server." msgstr "Uwaga: uΏyto flag RIPE ze starszym serwerem." -#: ../whois.c:487 +#: ../whois.c:503 #, c-format msgid "Detected referral to %s on %s.\n" msgstr "Wykryto odniesienie do %s na %s.\n" -#: ../whois.c:504 +#: ../whois.c:520 msgid "" "Catastrophic error: disclaimer text has been changed.\n" "Please upgrade this program.\n" @@ -119,26 +128,26 @@ msgstr "" "Katastrofa! Tekst o¶wiadczenia zosta³ zmieniony.\n" "Proszκ uaktualniζ ten program.\n" -#: ../whois.c:622 +#: ../whois.c:639 #, c-format msgid "Host %s not found." msgstr "Serwer %s nie zosta³ znaleziony." -#: ../whois.c:632 +#: ../whois.c:649 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: us³uga nieznana" -#: ../whois.c:644 +#: ../whois.c:661 msgid "Timeout." msgstr "Up³yn±³ limit czasu." -#: ../whois.c:650 +#: ../whois.c:667 #, c-format msgid "Interrupted by signal %d..." msgstr "Przerwano sygna³em %d..." -#: ../whois.c:699 +#: ../whois.c:728 msgid "" "Usage: whois [OPTION]... OBJECT...\n" "\n" diff --git a/tld_serv_list b/tld_serv_list index c9a51d0..9f11ab4 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -69,7 +69,7 @@ #.bh NONE # NIC? www.inet.com.bh .bi WEB http://www.nic.bi/Nic_search.asp #.bj # NIC? www.opt.bj -.bm WEB http://www.bermudanic.bm/cgi-bin/BermudaNIC/rwhois_query.pl # rwhois.bermudanic.bm:4321 +.bm WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO #.bn NONE # NIC? www.brunet.bn .bo WEB http://www.nic.bo/ .br whois.nic.br @@ -89,12 +89,11 @@ .ck whois.nic.ck .cl whois.nic.cl .cm NONE # http://info.intelcam.cm -.ac.cn whois.cnc.ac.cn .edu.cn whois.edu.cn .cn whois.cnnic.net.cn .uk.co whois.uk.co .co WEB https://www.nic.co/ -.cr WEB http://www.nic.cr/consulta-dns.html +.cr WEB http://www.nic.cr/servlet/niccr?tid=TWhois&Lng=5&Act=NEW .cu WEB http://www.nic.cu/consult.html #.cv # NIC? dns.cv? .cx whois.nic.cx @@ -113,7 +112,7 @@ .er NONE # NO NIC http://www.afridns.org/er/ .es WEB http://www.nic.es/cgi-bin/consulta.whois #.et NONE # NIC? www.telecom.net.et -.fi WEB http://cgi.ficora.fi/wwwbin/domains.pl?language=eng +.fi WEB https://domain.ficora.fi/fiDomain/aca.aspx .fj whois.usp.ac.fj .fk NONE # http://www.fidc.org.fk/domain-registration/home.htm .fm WEB http://www.dot.fm/whois.html @@ -180,10 +179,10 @@ .lt whois.ripe.net .lu whois.dns.lu .lv whois.nic.lv -.ly WEB http://www.lydomains.com/whois.asp +.ly WEB http://www.lydomains.com/ #.ma # NIC? http://www.anrt.net.ma/nic/ .mc whois.ripe.net -.md WEB http://www.nic.md/search.html +.md WEB http://www.dns.md/whois.html .mg NONE # www.nic.mg .mh NONE # www.nic.net.mh #.mk # NIC? http://www.mpt.com.mk diff --git a/whois.c b/whois.c index db3accd..2405e1f 100644 --- a/whois.c +++ b/whois.c @@ -11,12 +11,6 @@ #include #include #include "config.h" -#ifdef HAVE_GETOPT_LONG -#include -#endif -#ifdef HAVE_REGEXEC -#include -#endif #include #include #include @@ -25,6 +19,15 @@ #include #include #include +#ifdef HAVE_GETOPT_LONG +#include +#endif +#ifdef HAVE_REGEXEC +#include +#endif +#ifdef HAVE_LIBIDN +#include +#endif /* Application-specific */ #include "data.h" @@ -161,9 +164,11 @@ int main(int argc, char *argv[]) char *tmp; tmp = normalize_domain(qstring); - server = whichwhois(tmp); - free(tmp); + free(qstring); + qstring = tmp; + server = whichwhois(qstring); +retry: switch (server[0]) { case 0: if (!(server = getenv("WHOIS_SERVER"))) @@ -219,6 +224,21 @@ int main(int argc, char *argv[]) case 6: puts(_("Unknown AS number or IP network. Please upgrade this program.")); exit(0); + case 0x0A: + { + char *tmp6 = convert_6to4(qstring); + free(qstring); + qstring = tmp6; + printf(_("\nQuerying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n\n"), qstring); + server = whichwhois(qstring); + /* + * This code sucks enough that I can afford to use goto... + * Some day whichwhois() and queryformat() will be merged + * and will return a struct with status code, server name + * and query string. + */ + goto retry; + } default: if (verb) printf(_("Using server %s.\n"), server); @@ -330,6 +350,8 @@ const char *whichwhois(const char *s) if (v6net == ip6_assign[i].net) return ip6_assign[i].serv; return "\x06"; /* unknown allocation */ + } else if (strncmp(s, "2002:", 5) == 0) { + return "\x0A"; } else if (strncasecmp(s, "3ffe:", 5) == 0) return "whois.6bone.net"; /* RPSL hierarchical object like AS8627:fltr-TRANSIT-OUT */ @@ -588,7 +610,7 @@ const char *query_pir(const int sock, const char *query) int openconn(const char *server, const char *port) { - int fd; + int fd = -1; #ifdef HAVE_GETADDRINFO int err; struct addrinfo hints, *res, *ai; @@ -672,9 +694,29 @@ char *normalize_domain(const char *dom) for (p = ret; *p; p++); p--; /* move to the last char */ for (; *p == '.' || p == ret; p--) /* eat trailing dots */ *p = '\0'; + +#ifdef HAVE_LIBIDN + if (idna_to_ascii_from_locale(ret, &p, 0, 0) != IDNA_SUCCESS) + return ret; + + free(ret); + ret = p; +#endif return ret; } +char *convert_6to4(const char *s) +{ + char *new = malloc(sizeof("255.255.255.255")); + unsigned int a, b; + + if (sscanf(s, "2002:%x:%x:", &a, &b) != 2) + return (char *) "0.0.0.0"; + + sprintf(new, "%d.%d.%d.%d", a >> 8, a & 0xff, b >> 8, b & 0xff); + return new; +} + unsigned long myinet_aton(const char *s) { int a, b, c, d; diff --git a/whois.h b/whois.h index 05db1b4..f22fb53 100644 --- a/whois.h +++ b/whois.h @@ -22,6 +22,7 @@ int isasciidigit(const char); int domcmp(const char *, const char *); int domfind(const char *, const char *[]); char *normalize_domain(const char *); +char *convert_6to4(const char *); void err_quit(const char *,...); void err_sys(const char *,...); diff --git a/whois.spec b/whois.spec index 849966d..45aadfa 100644 --- a/whois.spec +++ b/whois.spec @@ -1,6 +1,6 @@ Summary: Enhanced WHOIS client Name: whois -Version: 4.6.7 +Version: 4.6.8 Release: 1 License: GPL Vendor: Marco d'Itri