Imported Debian version 5.0.17

This commit is contained in:
Marco d'Itri 2012-06-25 03:34:36 +02:00
parent 0e2b2133dd
commit 2d381497c0
11 changed files with 31 additions and 84 deletions

View File

@ -63,10 +63,10 @@ all: Makefile.depend whois mkpasswd pos
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
whois: $(whois_OBJECTS)
$(CC) $(LDFLAGS) -o $@ $^ $(whois_LDADD) $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(whois_LDADD) $(LIBS)
mkpasswd: $(mkpasswd_OBJECTS)
$(CC) $(LDFLAGS) -o $@ $^ $(mkpasswd_LDADD) $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(mkpasswd_LDADD) $(LIBS)
##############################################################################
as_del.h: as_del_list make_as_del.pl
@ -109,8 +109,8 @@ distclean: clean
rm -f po/whois.pot
clean:
rm -f Makefile.depend as_del.h ip_del.h ip6_del.h tld_serv.h \
servers_charset.h *.o whois mkpasswd
rm -f Makefile.depend as_del.h as32_del.h ip_del.h ip6_del.h \
tld_serv.h servers_charset.h *.o whois mkpasswd
rm -f po/*.mo
pos:

View File

@ -1,5 +0,0 @@
{ 131072, 196607, "whois.apnic.net" }, /* 2.0 2.65535 */
{ 196608, 262143, "whois.ripe.net" }, /* 3.0 3.65535 */
{ 262144, 327679, "whois.lacnic.net" }, /* 4.0 4.65535 */
{ 327680, 393215, "whois.afrinic.net" }, /* 5.0 5.65535 */
{ 393216, 458751, "whois.arin.net" }, /* 6.0 6.65535 */

View File

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

2
data.h
View File

@ -31,7 +31,7 @@ const char *ripe_servers[] = {
const char *hide_strings[] = {
"NOTICE AND TERMS OF USE: You", "", /* NetSol */
"TERMS OF USE: You are not", "", /* crsnic */
"NOTICE: Access to .ORG WHOIS", "",
"Access to .ORG WHOIS information", "",
"NOTICE: Access to the .aero", "",
"This Registry database contains ONLY .EDU", "type: help", /* edu */
"% .eu Whois Server", "% of the database",

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
whois (5.0.17) unstable; urgency=medium
* Updated the .bi, .fo, .gr and .gt TLD servers.
* Changed the version check in debian/rules to support Ubuntu backports.
(Closes: #671097)
* Removed support for recursion of .org queries, it has been a thick
registry since 2005. (Closes: #678734)
-- Marco d'Itri <md@linux.it> Mon, 25 Jun 2012 03:34:36 +0200
whois (5.0.16) unstable; urgency=medium
* Added the .xn--80ao21a (.ҚАЗ, Kazakhstan) TLD server.

4
debian/rules vendored
View File

@ -4,9 +4,9 @@ SHELL+= -e
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
D := $(shell pwd)/debian/whois
D := $(CURDIR)/debian/whois
VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*$$//; s/\+.*$$//; /^Version/s/.* //p')
VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
build:
dh_testdir

View File

@ -15,7 +15,6 @@ while (<>) {
$b =~ s/^W(?:EB)?\s+/\\x01/;
$b =~ s/^VERISIGN\s+/\\x04/;
$b = "\\x03" if $b eq 'NONE';
$b = "\\x07" if $b eq 'PIR';
$b = "\\x08" if $b eq 'AFILIAS';
$b = "\\x0C" if $b eq 'ARPA';
print qq( "$a",\t"$b",\n);

View File

@ -17,6 +17,7 @@ whois.dk-hostmaster.dk utf-8 --charset=utf-8
whois.eenet.ee iso-8859-1
whois.eu utf-8
whois.ficora.fi iso-8859-1
whois.nic.fo utf-8
whois.nic.fr iso-8859-1
whois.hkirc.hk utf-8
whois.nic.hr utf-8

View File

@ -30,7 +30,7 @@
.eu.org whois.eu.org
.za.org whois.za.org
.org PIR
.org whois.pir.org
.edu whois.educause.net
.gov whois.nic.gov
@ -79,10 +79,10 @@
.bb WEB http://whois.telecoms.gov.bb/search_domain.php
.bd WEB http://whois.btcl.net.bd/
.be whois.dns.be
.bf NONE # http://www.artel.bf/ http://www.onatel.bf/internet/domaine.htm
.bf NONE # http://www.arce.bf/ http://www.onatel.bf/internet/domaine.htm
.bg whois.register.bg
.bh NONE # www.inet.com.bh
.bi WEB http://whois.nic.bi/register/whois.hei # whois.nic.bi wrong referral?
.bi WEB https://whois.nic.bi/whois.php # whois.nic.bi wrong referral?
.bj whois.nic.bj
#.bl
.bm WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO
@ -94,7 +94,7 @@
.bt WEB http://www.nic.bt/
.bv NONE # http://www.norid.no/domenenavnbaser/bv-sj.html
.by WEB http://www.tld.by/indexeng.html
.bw NONE # NIC? btc.bw www.info.bw/resource/local/index.shtml
.bw NONE # NIC? http://www.info.bw/services/index.shtml
.bz AFILIAS
.co.ca whois.co.ca
.ca whois.cira.ca
@ -130,13 +130,13 @@
#.eh
.er NONE # http://www.afridns.org/er/tld_er.txt
.es WEB https://www.nic.es/
.et NONE # http://www.telecom.net.et/EthioInternet/domainname.html
.et NONE # http://www.ethionet.et/
.eu whois.eu
.fi whois.ficora.fi
.fj whois.usp.ac.fj
.fk NONE # http://www.fidc.co.fk/
.fm WEB http://www.dot.fm/whois.html
.fo whois.ripe.net # www.nic.fo
.fo whois.nic.fo
.fr whois.nic.fr
.ga NONE # www.nic.ga
.gb NONE
@ -151,11 +151,11 @@
.gn NONE # http://www.psg.com/dns/gn/
.gp WEB https://www.dom-enic.com/whois.html
.gq NONE # NO NIC http://www.getesa.gq/
.gr WEB https://grweb.ics.forth.gr/whois_en.jsp
.gr WEB https://grweb.ics.forth.gr/Whois?lang=en
.gs whois.nic.gs
.gt WEB http://www.gt/whois.html
.gt WEB http://www.gt/who_is.html
.gu WEB http://gadao.gov.gu/domainsearch.htm
.gw NONE # NIC? www.nic.gw www.gwregister.com
.gw NONE # NIC? www.nic.gw no registry
.gy whois.registry.gy
.hk whois.hkirc.hk
.hm whois.registry.hm
@ -169,7 +169,7 @@
.im whois.nic.im
.in whois.registry.in # afilias
.io whois.nic.io
.iq NONE # http://www.cmc.iq/english/iq/iqregister1.htm
.iq NONE # http://www.cmc.iq/en/iq.html
.ir whois.nic.ir
.is whois.isnic.is
.it whois.nic.it
@ -207,7 +207,7 @@
.mg whois.nic.mg
.mh NONE # www.nic.net.mh
.mk WEB http://dns.marnet.net.mk/registar.php
.ml NONE # NIC? www.sotelma.ml
.ml NONE # NIC? nic.ml www.sotelma.ml
.mm NONE # www.nic.mm
.mn AFILIAS
.mo WEB http://www.monic.net.mo/ # whois.monic.mo is restricted

58
whois.c
View File

@ -254,13 +254,6 @@ int handle_query(const char *hserver, const char *hport,
sockfd = openconn(server + 1, NULL);
server = query_crsnic(sockfd, query);
break;
case 7:
if (verb)
printf(_("Using server %s.\n"),
"whois.publicinterestregistry.net");
sockfd = openconn("whois.publicinterestregistry.net", NULL);
server = query_pir(sockfd, query);
break;
case 8:
if (verb)
printf(_("Using server %s.\n"), "whois.afilias-grs.info");
@ -733,57 +726,6 @@ const char *query_crsnic(const int sock, const char *query)
return referral_server;
}
const char *query_pir(const int sock, const char *query)
{
char *temp, *p, buf[2000];
FILE *fi;
int hide = hide_discl;
char *referral_server = NULL;
int state = 0;
temp = malloc(strlen(query) + 5 + 2 + 1);
strcpy(temp, "FULL ");
strcat(temp, query);
strcat(temp, "\r\n");
fi = fdopen(sock, "r");
if (write(sock, temp, strlen(temp)) < 0)
err_sys("write");
free(temp);
while (fgets(buf, sizeof(buf), fi)) {
/* If there are multiple matches only the server of the first record
is queried */
if (state == 0 &&
strneq(buf, "Registrant Name:SEE SPONSORING REGISTRAR", 40))
state = 1;
if (state == 1 &&
strneq(buf, "Registrant Street1:Whois Server:", 32)) {
for (p = buf; *p != ':'; p++); /* skip until colon */
for (p++; *p != ':'; p++); /* skip until 2nd colon */
for (p++; *p == ' '; p++); /* skip colon and spaces */
referral_server = strdup(p);
if ((p = strpbrk(referral_server, "\r\n")))
*p = '\0';
state = 2;
}
if (hide_line(&hide, buf))
continue;
if ((p = strpbrk(buf, "\r\n")))
*p = '\0';
recode_fputs(buf, stdout);
fputc('\n', stdout);
}
if (ferror(fi))
err_sys("fgets");
fclose(fi);
return referral_server;
}
const char *query_afilias(const int sock, const char *query)
{
char *temp, *p, buf[2000];

View File

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