Skip to content

Commit

Permalink
Release 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
weppos committed Dec 26, 2009
1 parent cd7d4dc commit 084b904
Show file tree
Hide file tree
Showing 16 changed files with 623 additions and 311 deletions.
32 changes: 23 additions & 9 deletions src/Makefile
Expand Up @@ -5,17 +5,25 @@ CFLAGS = -g -O2
PERL = perl
INSTALL = install

whois_OBJECTS := whois.o utils.o
mkpasswd_OBJECTS := mkpasswd.o utils.o

##############################################################################
# Solaris
#whois_LDADD += -lnsl -lsocket
#whois_LDADD += -lnsl -lsocket -liconv

# FreeBSD
#whois_LDADD += -liconv
#LIBS += -L/usr/local/lib -lintl
#INCLUDES += -I/usr/local/include

# OS/2 EMX
#whois_LDADD += -lsocket
#LDFLAGS += -Zexe -Dstrncasecmp=strnicmp

# OS X
#whois_LDADD += -liconv

ifdef CONFIG_FILE
DEFS += -DCONFIG_FILE=\"$(CONFIG_FILE)\"
endif
Expand All @@ -29,18 +37,21 @@ whois_LDADD += -lidn
DEFS += -DHAVE_LIBIDN
endif

ifdef HAVE_ICONV
whois_OBJECTS += simple_recode.o
DEFS += -DHAVE_ICONV
endif

ifdef HAVE_XCRYPT
mkpasswd_LDADD += -lxcrypt
DEFS += -DHAVE_XCRYPT
else
mkpasswd_LDADD += -lcrypt
endif

##############################################################################
all: Makefile.depend whois mkpasswd #pos

whois_OBJECTS := whois.o utils.o
mkpasswd_OBJECTS := mkpasswd.o utils.o

##############################################################################
%.o: %.c
$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -c $<
Expand All @@ -53,19 +64,22 @@ mkpasswd: $(mkpasswd_OBJECTS)

##############################################################################
as_del.h: as_del_list make_as_del.pl
$(PERL) -w make_as_del.pl < as_del_list > $@
$(PERL) -w make_as_del.pl < $< > $@

as32_del.h: as32_del_list make_as32_del.pl
$(PERL) -w make_as32_del.pl < as32_del_list > $@
$(PERL) -w make_as32_del.pl < $< > $@

ip_del.h: ip_del_list make_ip_del.pl
$(PERL) -w make_ip_del.pl < ip_del_list > $@
$(PERL) -w make_ip_del.pl < $< > $@

ip6_del.h: ip6_del_list make_ip6_del.pl
$(PERL) -w make_ip6_del.pl < ip6_del_list > $@
$(PERL) -w make_ip6_del.pl < $< > $@

tld_serv.h: tld_serv_list make_tld_serv.pl
$(PERL) -w make_tld_serv.pl < tld_serv_list > $@
$(PERL) -w make_tld_serv.pl < $< > $@

servers_charset.h: servers_charset_list make_servers_charset.pl
$(PERL) -w make_servers_charset.pl < $< > $@

##############################################################################
install: install-whois install-mkpasswd #install-pos
Expand Down
2 changes: 1 addition & 1 deletion src/config.h
@@ -1,5 +1,5 @@
/* Program version */
#define VERSION "4.7.37"
#define VERSION "5.0.0"

/* Configurable features */

Expand Down
21 changes: 15 additions & 6 deletions src/data.h
Expand Up @@ -21,8 +21,10 @@ const char *ripe_servers[] = {
"whois.arnes.si",
"www.registry.co.ug",
"whois.nic.ir",
"whois.pandi.or.id",
"whois.nic.ck",
"whois.ra.net",
"whois.bgpmon.net",
NULL
};

Expand Down Expand Up @@ -74,12 +76,6 @@ const char *nic_handles[] = {
"poem-", "whois.ripe.net",
"form-", "whois.ripe.net",
"pgpkey-", "whois.ripe.net",
#if 0
// commented until somebody will explain the query format for these
"coco-", "whois.corenic.net",
"coho-", "whois.corenic.net",
"core-", "whois.corenic.net",
#endif
"denic-", "whois.denic.de",
/* RPSL objects */
"as-", "whois.ripe.net",
Expand Down Expand Up @@ -139,3 +135,16 @@ const char *tld_serv[] = {
NULL, NULL
};

#ifdef HAVE_ICONV
struct server_charset {
const char *name;
const char *charset;
const char *options;
};

const struct server_charset servers_charset[] = {
#include "servers_charset.h"
{ NULL, NULL, NULL }
};
#endif

13 changes: 13 additions & 0 deletions src/debian/changelog
@@ -1,3 +1,16 @@
whois (5.0.0) unstable; urgency=low

* Added optional support for automatically transcoding the output of
servers. (Closes: #363366, #402356)
* Automatically add --show-handles to queries for .dk domains.
* Normalize the querystring and convert it to punycode even if a server
is specified on the command line.
* Updated the .id, .is, .my, .sb and .tj TLD servers.
* Removed the .mm, .pw, .sr and .tp TLD servers.
* Cleaned up the horrible strings manipulation code. (Closes: #131924)

-- Marco d'Itri <md@linux.it> Sun, 20 Dec 2009 03:01:40 +0100

whois (4.7.37) unstable; urgency=medium

* Added new ASN allocations.
Expand Down
2 changes: 1 addition & 1 deletion src/debian/rules
Expand Up @@ -9,7 +9,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -n 's/\+.*$$//; /^Version/s/.* //p'

build:
dh_testdir
$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1
$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1 HAVE_ICONV=1
cd po && $(MAKE) whois.pot
touch $@

Expand Down
21 changes: 21 additions & 0 deletions src/make_servers_charset.pl
@@ -0,0 +1,21 @@
#!/usr/bin/perl

use warnings;
use strict;

while (<>) {
chomp;
s/#.*$//;
s/^\s+//; s/\s+$//;
next if /^$/;

die "format error: $_" unless
(my ($a, $b, $c) = /^([a-z0-9.-]+)\s+([a-z0-9-]+)(?:\s+(.+))?$/);
if ($c) {
print qq( { "$a",\t"$b",\t"$c" },\n);
} else {
print qq( { "$a",\t"$b",\tNULL },\n);
}
}
34 changes: 34 additions & 0 deletions src/servers_charset.h
@@ -0,0 +1,34 @@
{ "whois.corenic.net", "utf-8", "-C UTF-8" },
{ "whois.cat", "utf-8", "-C UTF-8" },
{ "whois.museum", "utf-8", "-C UTF-8" },
{ "whois.nic.br", "iso-8859-1", NULL },
{ "whois.cira.ca", "iso-8859-1", NULL },
{ "whois.nic.ch", "utf-8", NULL },
{ "whois.nic.cl", "iso-8859-1", NULL },
{ "whois.cnnic.net.cn", "utf-8", NULL },
{ "whois.nic.cz", "utf-8", NULL },
{ "whois.denic.de", "utf-8", NULL },
{ "whois.enum.denic.de", "utf-8", NULL },
{ "whois.dk-hostmaster.dk", "utf-8", "--charset=utf-8" },
{ "whois.eenet.ee", "iso-8859-1", NULL },
{ "whois.eu", "utf-8", NULL },
{ "whois.ficora.fi", "iso-8859-1", NULL },
{ "whois.nic.fr", "iso-8859-1", NULL },
{ "whois.hkdnr.net.hk", "utf-8", NULL },
{ "whois.nic.hu", "iso-8859-1", NULL },
{ "whois.isnic.is", "iso-8859-1", NULL },
{ "whois.jprs.jp", "iso-2022-jp", NULL },
{ "whois.nic.ad.jp", "iso-2022-jp", NULL },
{ "whois.nic.or.kr", "euc-kr", NULL },
{ "whois.nic.li", "utf-8", NULL },
{ "whois.domreg.lt", "utf-8", NULL },
{ "whois.dns.lu", "iso-8859-1", NULL },
{ "whois.nic.mu", "utf-8", NULL },
{ "whois.norid.no", "iso-8859-1", NULL },
{ "whois.nic.nu", "utf-8", NULL },
{ "whois.dns.pt", "iso-8859-1", NULL },
{ "whois.nic-se.se", "utf-8", NULL },
{ "whois.nic.tr", "utf-8", NULL },
{ "whois.twnic.net", "utf-8", NULL },
{ "whois.net.ua", "koi8-u", NULL },
{ "whois.nic.org.uy", "utf-8", NULL },
37 changes: 37 additions & 0 deletions src/servers_charset_list
@@ -0,0 +1,37 @@
# server name charset optional parameters
whois.corenic.net utf-8 -C UTF-8
whois.cat utf-8 -C UTF-8
whois.museum utf-8 -C UTF-8

whois.nic.br iso-8859-1
whois.cira.ca iso-8859-1
whois.nic.ch utf-8
whois.nic.cl iso-8859-1
whois.cnnic.net.cn utf-8
whois.nic.cz utf-8
whois.denic.de utf-8
whois.enum.denic.de utf-8
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.fr iso-8859-1
whois.hkdnr.net.hk utf-8
whois.nic.hu iso-8859-1
whois.isnic.is iso-8859-1
whois.jprs.jp iso-2022-jp
whois.nic.ad.jp iso-2022-jp
whois.nic.or.kr euc-kr
whois.nic.li utf-8
whois.domreg.lt utf-8
whois.dns.lu iso-8859-1
whois.nic.mu utf-8
whois.norid.no iso-8859-1
whois.nic.nu utf-8
whois.dns.pt iso-8859-1
whois.nic-se.se utf-8
whois.nic.tr utf-8
whois.twnic.net utf-8
whois.net.ua koi8-u
whois.nic.org.uy utf-8

0 comments on commit 084b904

Please sign in to comment.