Hello community,
here is the log from the commit of package whois
checked in at Thu Mar 6 02:26:24 CET 2008.
--------
--- whois/whois.changes 2007-07-31 10:22:23.000000000 +0200
+++ whois/whois.changes 2008-03-05 17:23:37.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Mar 5 17:16:49 CET 2008 - anosek@suse.cz
+
+- updated to version 4.7.24
+ * Added new ASN allocations.
+ * Added new IPv4 allocations.
+ * Added the .asia, .kp and .mq TLD servers. (Closes: #445747)
+ * Fixed myinet_aton to not reject CIDR networks.
+ * Added support for ASN32.
+ * Added the za.net and za.org pseudo-TLD servers.
+ * Added new IPv4 allocations.
+ * Added new ASN allocations.
+ * Updated the .jobs, .ai and .tn TLD and za.net servers.
+ * Added the za.net server. (Closes: #423549)
+ * Stop misparsing <as-set>:<hierarchical-name> as an IPv6 address.
+ * Stop mangling IDN queries with in-query flags. (Closes: #422895)
+
+-------------------------------------------------------------------
Old:
----
whois-4.7.21-nb.patch
whois_4.7.21.tar.bz2
New:
----
whois-4.7.24-nb.patch
whois_4.7.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ whois.spec ++++++
--- /var/tmp/diff_new_pack.WT4236/_old 2008-03-06 02:25:59.000000000 +0100
+++ /var/tmp/diff_new_pack.WT4236/_new 2008-03-06 02:25:59.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package whois (Version 4.7.21)
+# spec file for package whois (Version 4.7.24)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,14 +10,15 @@
# norootforbuild
+
Name: whois
BuildRequires: libidn-devel
License: GPL v2 or later
Group: Productivity/Networking/Other
Provides: ripe-whois-tools
-Autoreqprov: on
-URL: http://www.linux.it/~md/software/
-Version: 4.7.21
+AutoReqProv: on
+Url: http://www.linux.it/~md/software/
+Version: 4.7.24
Release: 1
Summary: whois Client Program
Source: %{name}_%{version}.tar.bz2
@@ -61,7 +62,21 @@
/usr/share/locale/*/*/*
%changelog
-* Tue Jul 31 2007 - anosek@suse.cz
+* Wed Mar 05 2008 anosek@suse.cz
+- updated to version 4.7.24
+ * Added new ASN allocations.
+ * Added new IPv4 allocations.
+ * Added the .asia, .kp and .mq TLD servers. (Closes: #445747)
+ * Fixed myinet_aton to not reject CIDR networks.
+ * Added support for ASN32.
+ * Added the za.net and za.org pseudo-TLD servers.
+ * Added new IPv4 allocations.
+ * Added new ASN allocations.
+ * Updated the .jobs, .ai and .tn TLD and za.net servers.
+ * Added the za.net server. (Closes: #423549)
+ * Stop misparsing <as-set>:<hierarchical-name> as an IPv6 address.
+ * Stop mangling IDN queries with in-query flags. (Closes: #422895)
+* Tue Jul 31 2007 anosek@suse.cz
- updated to version 4.7.21
* Improved myinet_aton to not parse addresses with trailing junk
* Added APNIC and RIPE allocations.
@@ -69,7 +84,7 @@
* Removed references to whois.nic.mil, which apparently is gone.
* Removed whois.nic.it from ripe_servers, because it does not even
pretend to be one anymore.
-* Mon Feb 05 2007 - anosek@suse.cz
+* Mon Feb 05 2007 anosek@suse.cz
- updated to version 4.7.20
* Added more krnic allocations.
* Added support for -sixxs NIC handles.
@@ -80,96 +95,96 @@
Denis-Courmont. (Closes: #384373)
* Updated the .mobi and .gs TLD servers.(Closes: #389880, 391447)
* Added the .gd TLD server.
-* Wed Sep 20 2006 - anosek@suse.cz
+* Wed Sep 20 2006 anosek@suse.cz
- updated to version 4.7.17
* Added new IPv4 and IPv6 allocations.
* Strip the CIDR prefix length from queries to whois.arin.net.
-* Thu Aug 03 2006 - mmarek@suse.cz
+* Thu Aug 03 2006 mmarek@suse.cz
- updated to version 4.7.15
* TLD server list updates
* new translations
- no need to patch top level Makefile
-* Fri Apr 14 2006 - mmarek@suse.cz
+* Fri Apr 14 2006 mmarek@suse.cz
- updated the tld_serv_list file to include .eu and other new TLDs
[#165904] (tld_serv_list-4.7.13.patch)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Sep 09 2005 - schwab@suse.de
+* Fri Sep 09 2005 schwab@suse.de
- Add libidn, libidn-devel to nfb.
- Compile with -DHAVE_LIBIDN, needed for DENIC workaround.
-* Fri Jul 29 2005 - anicka@suse.cz
+* Fri Jul 29 2005 anicka@suse.cz
- update to 4.7.5
-* Thu Jan 13 2005 - postadal@suse.cz
+* Thu Jan 13 2005 postadal@suse.cz
- updated to version 4.6.26
-* Wed Oct 20 2004 - ro@suse.de
+* Wed Oct 20 2004 ro@suse.de
- locale rename: no -> nb
-* Thu Aug 19 2004 - postadal@suse.cz
+* Thu Aug 19 2004 postadal@suse.cz
- updated to version 4.6.20u
-* Fri Aug 06 2004 - postadal@suse.cz
+* Fri Aug 06 2004 postadal@suse.cz
- updated to version 4.6.19
-* Wed Feb 11 2004 - postadal@suse.cz
+* Wed Feb 11 2004 postadal@suse.cz
- updated to version 4.6.9
- added changelog and copyright files
- removed obsoleted patch buffoverflow-fix
-* Thu Oct 30 2003 - schwab@suse.de
+* Thu Oct 30 2003 schwab@suse.de
- Fix for 64 bit platforms.
-* Thu Aug 28 2003 - postadal@suse.cz
+* Thu Aug 28 2003 postadal@suse.cz
- fixed buffer overflow [#29511]
-* Thu Jul 24 2003 - postadal@suse.cz
+* Thu Jul 24 2003 postadal@suse.cz
- updated to version 4.6.6
* added .dj TLD
* fixed netsol disclaimer strings
* updated PIR server parser
-* Mon Feb 03 2003 - postadal@suse.cz
+* Mon Feb 03 2003 postadal@suse.cz
- updated to version 4.6.2
-* Mon Aug 12 2002 - postadal@suse.cz
+* Mon Aug 12 2002 postadal@suse.cz
- update to 4.5.29:
* updated LANIC and telstra IP allocations
* updated mkpasswd
* fixes
-* Fri Jan 18 2002 - nadvornik@suse.cz
+* Fri Jan 18 2002 nadvornik@suse.cz
- update to 4.5.19:
- updated .aero, .coop, .name, .pro, .dk and .edu TLD servers
-* Mon Dec 10 2001 - nadvornik@suse.cz
+* Mon Dec 10 2001 nadvornik@suse.cz
- update to 4.5.15:
- updated translations
- bugfixes
-* Thu Jul 26 2001 - nadvornik@suse.cz
+* Thu Jul 26 2001 nadvornik@suse.cz
- update to 4.5.6
-* Tue Mar 27 2001 - nadvornik@suse.cz
+* Tue Mar 27 2001 nadvornik@suse.cz
- update to 4.5.4
-* Thu Dec 07 2000 - uli@suse.de
+* Thu Dec 07 2000 uli@suse.de
- update -> 4.5.1 (doesn't segfault)
-* Mon Oct 09 2000 - nadvornik@suse.cz
+* Mon Oct 09 2000 nadvornik@suse.cz
- fixed Copyright
-* Fri May 19 2000 - nadvornik@suse.cz
+* Fri May 19 2000 nadvornik@suse.cz
- update to 4.4.13
- changed group
-* Thu Mar 30 2000 - nadvornik@suse.cz
+* Thu Mar 30 2000 nadvornik@suse.cz
- update to 4.4.12
- added BuildRoot
- added %%{_mandir} macro
-* Fri Mar 03 2000 - uli@suse.de
+* Fri Mar 03 2000 uli@suse.de
- moved man pages to /usr/share
-* Mon Feb 21 2000 - mha@suse.de
+* Mon Feb 21 2000 mha@suse.de
- completely new, different version from
http://www.linux.it/~md/software/
Quote README of the new version:
"Why another whois client? Because the RIPE client is a mess of
hacks and #ifdefs and more complex programs lack features or
are bloated."
-* Mon Nov 29 1999 - kukuk@suse.de
+* Mon Nov 29 1999 kukuk@suse.de
- fixed for SPARC
-* Tue Sep 21 1999 - uli@suse.de
+* Tue Sep 21 1999 uli@suse.de
- fixed for PPC
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Wed Feb 03 1999 - ro@suse.de
+* Wed Feb 03 1999 ro@suse.de
- use libcrypt on alpha
- no m486 on alpha
-* Fri Oct 02 1998 - ro@suse.de
+* Fri Oct 02 1998 ro@suse.de
- defined _BSD_SOURCE
- dont redeclare gethostname
- link with -crypt where needed
-* Tue May 27 1997 - florian@suse.de
+* Tue May 27 1997 florian@suse.de
- first version of ripe-whois 2.2
++++++ whois-4.7.21-nb.patch -> whois-4.7.24-nb.patch ++++++
++++++ whois_4.7.21.tar.bz2 -> whois_4.7.24.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/as32_del.h new/whois-4.7.24/as32_del.h
--- old/whois-4.7.21/as32_del.h 1970-01-01 01:00:00.000000000 +0100
+++ new/whois-4.7.24/as32_del.h 2007-09-13 03:19:06.000000000 +0200
@@ -0,0 +1,5 @@
+{ 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 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/as32_del_list new/whois-4.7.24/as32_del_list
--- old/whois-4.7.21/as32_del_list 1970-01-01 01:00:00.000000000 +0100
+++ new/whois-4.7.24/as32_del_list 2007-09-13 03:05:29.000000000 +0200
@@ -0,0 +1,10 @@
+# http://www.iana.org/assignments/as-numbers
+
+# actually I listed here also the unallocated space reserved for each RIR
+
+2.0 2.65535 apnic
+3.0 3.65535 ripe
+4.0 4.65535 lacnic
+5.0 5.65535 afrinic
+6.0 6.65535 arin
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/as_del_list new/whois-4.7.24/as_del_list
--- old/whois-4.7.21/as_del_list 2006-05-16 16:15:50.000000000 +0200
+++ new/whois-4.7.24/as_del_list 2007-09-18 13:33:02.000000000 +0200
@@ -58,7 +58,7 @@
36864 37887 afrinic
37888 38911 apnic
38912 39935 ripe
-40960 41983 ripe
+40960 45055 ripe
# catch all: everything else comes from ARIN
1 40959 arin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/config.h new/whois-4.7.24/config.h
--- old/whois-4.7.21/config.h 2007-04-02 04:26:39.000000000 +0200
+++ new/whois-4.7.24/config.h 2007-10-30 11:07:08.000000000 +0100
@@ -1,6 +1,6 @@
/* Program version */
/* not for the inetutils version */
-#define VERSION "4.7.21"
+#define VERSION "4.7.24"
/* Configurable features */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/data.h new/whois-4.7.24/data.h
--- old/whois-4.7.21/data.h 2007-04-02 04:23:29.000000000 +0200
+++ new/whois-4.7.24/data.h 2007-09-13 03:02:12.000000000 +0200
@@ -117,6 +117,17 @@
{ 0, 0, NULL }
};
+struct as32_del {
+ const unsigned long first;
+ const unsigned long last;
+ const char *serv;
+};
+
+const struct as32_del as32_assign[] = {
+#include "as32_del.h"
+ { 0, 0, NULL }
+};
+
const char *tld_serv[] = {
#include "tld_serv.h"
NULL, NULL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/debian/changelog new/whois-4.7.24/debian/changelog
--- old/whois-4.7.21/debian/changelog 2007-04-02 04:24:19.000000000 +0200
+++ new/whois-4.7.24/debian/changelog 2007-10-30 11:06:30.000000000 +0100
@@ -1,3 +1,31 @@
+whois (4.7.24) unstable; urgency=medium
+
+ * Added new ASN allocations.
+ * Added new IPv4 allocations.
+ * Added the .asia, .kp and .mq TLD servers. (Closes: #445747)
+
+ -- Marco d'Itri Tue, 30 Oct 2007 11:06:25 +0100
+
+whois (4.7.23) unstable; urgency=medium
+
+ * Fixed myinet_aton to not reject CIDR networks.
+ * Added support for ASN32.
+ * Added the za.net and za.org pseudo-TLD servers.
+
+ -- Marco d'Itri Thu, 13 Sep 2007 03:28:21 +0200
+
+whois (4.7.22) unstable; urgency=medium
+
+ * Added new IPv4 allocations.
+ * Added new ASN allocations.
+ * Updated the Polish translation.
+ * Updated the .jobs, .ai and .tn TLD and za.net servers.
+ * Added the za.net server. (Closes: #423549)
+ * Stop misparsing <as-set>:<hierarchical-name> as an IPv6 address.
+ * Stop mangling IDN queries with in-query flags. (Closes: #422895)
+
+ -- Marco d'Itri Sat, 28 Jul 2007 23:53:00 +0200
+
whois (4.7.21) unstable; urgency=medium
* Improved myinet_aton to not parse addresses with trailing junk
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/debian/rules new/whois-4.7.24/debian/rules
--- old/whois-4.7.21/debian/rules 2006-07-15 19:38:23.000000000 +0200
+++ new/whois-4.7.24/debian/rules 2007-09-13 03:33:35.000000000 +0200
@@ -18,7 +18,7 @@
clean:
dh_testdir
-rm -f build
- -$(MAKE) distclean
+ $(MAKE) distclean
dh_clean
binary-arch: checkroot build
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/debian/substvars new/whois-4.7.24/debian/substvars
--- old/whois-4.7.21/debian/substvars 2004-10-21 14:21:57.000000000 +0200
+++ new/whois-4.7.24/debian/substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libidn11 (>= 0.5.2)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/ip6_del_list new/whois-4.7.24/ip6_del_list
--- old/whois-4.7.21/ip6_del_list 2006-11-24 09:33:28.000000000 +0100
+++ new/whois-4.7.24/ip6_del_list 2007-07-27 12:53:01.000000000 +0200
@@ -34,7 +34,7 @@
2003:0000::/18 ripe
-2400:0000::/20 kornet
+2400:0000::/20 whois.nic.or.kr
2400:0000::/12 apnic
2600:0000::/12 arin
2610:0000::/23 arin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/ip_del_list new/whois-4.7.24/ip_del_list
--- old/whois-4.7.21/ip_del_list 2007-04-02 04:22:02.000000000 +0200
+++ new/whois-4.7.24/ip_del_list 2007-10-30 09:25:59.000000000 +0100
@@ -22,18 +22,17 @@
62.0.0.0/8 ripe
77.0.0.0/8 ripe
78.0.0.0/7 ripe
-80.0.0.0/5 ripe # => 87.255.255.255
-88.0.0.0/6 ripe # => 91.255.255.254
-92.0.0.0/7 ripe
+80.0.0.0/4 ripe # => 95.255.255.255
+96.0.0.0/6 arin
+114.0.0.0/7 apnic
116.0.0.0/6 apnic
121.128.0.0/10 whois.nic.or.kr
125.128.0.0/11 whois.nic.or.kr
120.0.0.0/6 apnic
124.0.0.0/7 apnic
126.0.0.0/8 apnic
-96.0.0.0/6 arin
96.0.0.0/3 UNALLOCATED # => 127.215.255.255
-0.0.0.0/1 arin # all other A classes are managed by ARIN
+0.0.0.0/1 arin # all other A class addresses are managed by ARIN
133.0.0.0/8 whois.nic.ad.jp
139.20.0.0/14 ripe
139.24.0.0/14 ripe
@@ -84,7 +83,8 @@
169.208.0.0/12 apnic
171.16.0.0/12 ripe
171.32.0.0/15 ripe
-# 173 -> 187 reserved
+# 173 -> 185 reserved
+186.0.0.0/7 lacnic
188.0.0.0/8 ripe # transferred from ARIN to to RIPE
189.0.0.0/8 lacnic
190.0.0.0/8 lacnic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/make_as32_del.pl new/whois-4.7.24/make_as32_del.pl
--- old/whois-4.7.21/make_as32_del.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/whois-4.7.24/make_as32_del.pl 2007-09-13 03:19:01.000000000 +0200
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+
+while (<STDIN>) {
+ chomp;
+ s/^\s*(.+)\s*$/$1/;
+ s/\s*#.*$//;
+ next if /^$/;
+
+ my ($fh, $fl, $lh, $ll, $s) = /^(\d+)\.(\d+)\s+(\d+)\.(\d+)\s+([\w\.-]+)$/;
+ die "format error: $_" unless $s;
+
+ my $f = ($fh << 16) + $fl;
+ my $l = ($lh << 16) + $ll;
+ my $server = ($s =~ /\./) ? $s : "whois.$s.net";
+
+ print qq({ $f, $l,\t"$server" },\t/* $fh.$fl $lh.$ll */\n);
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/Makefile new/whois-4.7.24/Makefile
--- old/whois-4.7.21/Makefile 2005-11-13 12:21:08.000000000 +0100
+++ new/whois-4.7.24/Makefile 2007-09-18 15:05:34.000000000 +0200
@@ -1,4 +1,4 @@
-prefix ?= /usr/local
+prefix = /usr/local
OPTS := -O2
@@ -28,7 +28,8 @@
all: whois #pos
-whois: whois.c whois.h config.h data.h as_del.h ip_del.h ip6_del.h tld_serv.h
+whois: whois.c whois.h config.h data.h \
+ as_del.h as32_del.h ip_del.h ip6_del.h tld_serv.h
$(CC) $(CFLAGS) $(whois_CFLAGS) $(OPTS) whois.c -o whois \
$(LDFLAGS) $(whois_LDADD)
@@ -37,23 +38,30 @@
$(LDFLAGS) $(mkpasswd_LDADD)
as_del.h: as_del_list make_as_del.pl
- $(PERL) -w make_as_del.pl < as_del_list > as_del.h
+ $(PERL) -w make_as_del.pl < as_del_list > $@
+
+as32_del.h: as32_del_list make_as32_del.pl
+ $(PERL) -w make_as32_del.pl < as32_del_list > $@
ip_del.h: ip_del_list make_ip_del.pl
- $(PERL) -w make_ip_del.pl < ip_del_list > ip_del.h
+ $(PERL) -w make_ip_del.pl < ip_del_list > $@
ip6_del.h: ip6_del_list make_ip6_del.pl
- $(PERL) -w make_ip6_del.pl < ip6_del_list > ip6_del.h
+ $(PERL) -w make_ip6_del.pl < ip6_del_list > $@
tld_serv.h: tld_serv_list make_tld_serv.pl
- $(PERL) -w make_tld_serv.pl < tld_serv_list > tld_serv.h
+ $(PERL) -w make_tld_serv.pl < tld_serv_list > $@
install: whois
+ install -d $(BASEDIR)$(prefix)/bin/
+ install -d $(BASEDIR)$(prefix)/share/man/man1/
install -m 0755 whois $(BASEDIR)$(prefix)/bin/
install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
cd po && $(MAKE) $@
install-mkpasswd: mkpasswd
+ install -d $(BASEDIR)$(prefix)/bin/
+ install -d $(BASEDIR)$(prefix)/share/man/man1/
install -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
install -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/po/pl.po new/whois-4.7.24/po/pl.po
--- old/whois-4.7.21/po/pl.po 2006-07-15 19:18:46.000000000 +0200
+++ new/whois-4.7.24/po/pl.po 2007-07-29 00:04:15.000000000 +0200
@@ -1,21 +1,21 @@
# Polish translation for whois.
# Micha� 'CeFeK' Nazarewicz , 1999
# Przemys�aw Knycz , 2003
-# Jakub Bogusz , 2003-2004
+# Jakub Bogusz , 2003-2007
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.6.24\n"
+"Project-Id-Version: whois 4.7.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
-"PO-Revision-Date: 2004-11-28 15:09+0100\n"
+"POT-Creation-Date: 2007-04-07 14:31+0200\n"
+"PO-Revision-Date: 2007-04-07 14:32+0200\n"
"Last-Translator: Jakub Bogusz \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:114
+#: ../whois.c:117
#, c-format
msgid ""
"Version %s.\n"
@@ -26,42 +26,42 @@
"\n"
"B��dy prosz� zg�asza� na adres %s.\n"
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:266
#, c-format
msgid "Using server %s.\n"
msgstr "U�ycie serwera %s.\n"
-#: ../whois.c:206
+#: ../whois.c:209
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:214
+#: ../whois.c:217
msgid "This TLD has no whois server."
msgstr "Ta g��wna domena nie ma serwera whois."
-#: ../whois.c:217
+#: ../whois.c:220
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:223
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nieznany numer AS lub sie� IP. Prosz� uaktualni� ten program."
-#: ../whois.c:224
+#: ../whois.c:227
msgid "Connecting to whois.crsnic.net."
msgstr "��czenie z whois.crsnic.net."
-#: ../whois.c:230
+#: ../whois.c:233
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "��czenie z whois.publicinterestregistry.net."
-#: ../whois.c:236
+#: ../whois.c:239
msgid "Connecting to whois.nic.cc."
msgstr "��czenie z whois.nic.cc."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:246
#, c-format
msgid ""
"\n"
@@ -72,7 +72,18 @@
"Pytanie o zako�czenie IPv4 %s adresu IPv6 typu 6to4.\n"
"\n"
-#: ../whois.c:258
+#: ../whois.c:253
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Pytanie o zako�czenie IPv4 %s adresu IPv6 Teredo.\n"
+"\n"
+
+#: ../whois.c:267
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +92,7 @@
"Zapytanie: \"%s\"\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -94,16 +105,16 @@
"Znaleziono odniesienie do %s.\n"
"\n"
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:320 ../whois.c:323
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Nie mo�na przeanalizowa� tej linii: %s"
-#: ../whois.c:451
+#: ../whois.c:460
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Uwaga: u�yto flag RIPE ze starszym serwerem."
-#: ../whois.c:586
+#: ../whois.c:598
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,26 +122,26 @@
"Katastrofa! Tekst o�wiadczenia zosta� zmieniony.\n"
"Prosz� uaktualni� ten program.\n"
-#: ../whois.c:713
+#: ../whois.c:725
#, c-format
msgid "Host %s not found."
msgstr "Serwer %s nie zosta� znaleziony."
-#: ../whois.c:723
+#: ../whois.c:735
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: us�uga nieznana"
-#: ../whois.c:742
+#: ../whois.c:754
msgid "Timeout."
msgstr "Up�yn�� limit czasu."
-#: ../whois.c:748
+#: ../whois.c:760
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Przerwano sygna�em %d..."
-#: ../whois.c:860
+#: ../whois.c:888
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/README new/whois-4.7.24/README
--- old/whois-4.7.21/README 2002-02-14 19:46:15.000000000 +0100
+++ new/whois-4.7.24/README 2007-09-13 02:43:55.000000000 +0200
@@ -25,8 +25,8 @@
- http://www.uninett.no/navn/domreg.html
- http://www.iahc.org/dns-refs/registry.html
- http://www.iana.org/root-whois/xx.htm
-- http://www.afrinic.org
-- http://www.aftld.org
+- http://www.afrinic.net/
+- http://www.aftld.org/
Marco d'Itri
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/tld_serv_list new/whois-4.7.24/tld_serv_list
--- old/whois-4.7.21/tld_serv_list 2007-04-02 04:23:10.000000000 +0200
+++ new/whois-4.7.24/tld_serv_list 2007-10-30 11:06:18.000000000 +0100
@@ -1,6 +1,7 @@
# NIC? means I have not been able to find the registry
# UPR means the TLD is managed by UPR, but I could not find any info
#
+
.br.com whois.centralnic.net
.cn.com whois.centralnic.net
.de.com whois.centralnic.net
@@ -21,33 +22,43 @@
.za.com whois.centralnic.net
.jpn.com whois.centralnic.net
.web.com whois.centralnic.net
-.eu.org whois.eu.org
+
.com CRSNIC
+
+.za.net whois.za.net
.net CRSNIC
+
+.eu.org whois.eu.org
+.za.org whois.za.org
.org PIR
+
.edu whois.educause.net
.gov whois.nic.gov
.int whois.iana.org
.mil NONE
-.aero whois.information.aero
+
e164.arpa whois.ripe.net
.arpa whois.iana.org
+
+.aero whois.information.aero
+.asia whois.nic.asia
.biz whois.nic.biz
.cat whois.cat
.coop whois.nic.coop
.info whois.afilias.info
-.jobs whois.jobs
+.jobs jobswhois.verisign-grs.com
.mobi whois.dotmobiregistry.net
.museum whois.museum
.name whois.nic.name
.pro whois.registrypro.pro
.travel whois.nic.travel
+
.ac whois.nic.ac
.ad NONE # www.nic.ad
.ae whois.uaenic.ae
.af whois.nic.af
.ag whois.nic.ag
-.ai WEB http://whois.offshore.ai/
+.ai whois.ai
.al NONE # http://www.inima.al/Domains.html
.am whois.nic.am
.an NONE # http://www.una.net/an_domreg/
@@ -138,7 +149,7 @@
.gs whois.nic.gs
.gt WEB http://www.gt/whois.htm
.gu WEB http://gadao.gov.gu/domainsearch.htm
-#.gw # no NIC?
+.gw NONE # www.nic.gw
.gy NONE # http://www.uog.edu.gy/domain/cit.html
.hk whois.hkdnr.net.hk
.hm whois.registry.hm
@@ -166,7 +177,7 @@
.ki WEB http://www.ki/dns/
.km NONE # NO NIC
#.kn # NO NIC (UPR)
-#.kp
+.kp whois.kcce.kp
.kr whois.nic.or.kr
.kw WEB http://www.kw/
.ky WEB http://kynseweb.messagesecure.com/kywebadmin/ # http://www.icta.ky/
@@ -194,7 +205,7 @@
.mn whois.nic.mn
.mo WEB http://www.monic.net.mo/
.mp NONE # www.nic.mp
-#.mq # www.nic.mq broken
+.mq whois.nic.mq
.mr NONE # http://www.univ-nkc.mr/nic_mr.html www.nic.mr ?
.ms whois.adamsnames.tc
.mt WEB http://www.nic.org.mt/dir/home.html
@@ -307,6 +318,7 @@
.za NONE # http://www.internet.org.za/slds.html many more SLD...
.zm NONE # NIC? http://www.zamnet.zm/
.zw NONE # http://www.zispa.co.zw/
+
-dom whois.networksolutions.com
-org whois.networksolutions.com
-hst whois.networksolutions.com
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/whois.c new/whois-4.7.24/whois.c
--- old/whois-4.7.21/whois.c 2007-01-08 00:35:00.000000000 +0100
+++ new/whois-4.7.24/whois.c 2007-09-13 03:23:55.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright 1999-2003 by Marco d'Itri .
+/* Copyright 1999-2007 by Marco d'Itri .
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -355,7 +355,7 @@
*/
const char *whichwhois(const char *s)
{
- unsigned long ip;
+ unsigned long ip, as32;
unsigned int i;
char *colon;
@@ -363,9 +363,13 @@
if ((colon = strchr(s, ':'))) {
unsigned long v6prefix, v6net;
- /* RPSL hierarchical objects like AS8627:fltr-TRANSIT-OUT */
- if (strncasecmp(s, "as", 2) == 0 && isasciidigit(s[2]))
- return whereas(atoi(s + 2));
+ /* RPSL hierarchical objects */
+ if (strncasecmp(s, "as", 2) == 0) {
+ if (isasciidigit(s[2]))
+ return whereas(atoi(s + 2));
+ else
+ return "";
+ }
v6prefix = strtol(s, NULL, 16);
@@ -389,9 +393,6 @@
/* no dot and no hyphen means it's a NSI NIC handle or ASN (?) */
if (!strpbrk(s, ".-")) {
- const char *p;
-
- for (p = s; *p; p++); /* go to the end of s */
if (strncasecmp(s, "as", 2) == 0 && /* it's an AS */
(isasciidigit(s[2]) || s[2] == ' '))
return whereas(atoi(s + 2));
@@ -401,6 +402,11 @@
return "\x05"; /* probably a unknown kind of nic handle */
}
+ /* ASN32? */
+ if (strncasecmp(s, "as", 2) == 0 && s[2] &&
+ (as32 = asn32_to_long(s + 2)) != 0)
+ return whereas32(as32);
+
/* smells like an IP? */
if ((ip = myinet_aton(s))) {
for (i = 0; ip_assign[i].serv; i++)
@@ -429,6 +435,16 @@
return "\x05";
}
+const char *whereas32(const unsigned long asn)
+{
+ int i;
+
+ for (i = 0; as32_assign[i].serv; i++)
+ if (asn >= as32_assign[i].first && asn <= as32_assign[i].last)
+ return as32_assign[i].serv;
+ return "\x06";
+}
+
const char *whereas(const unsigned short asn)
{
int i;
@@ -778,23 +794,49 @@
char *normalize_domain(const char *dom)
{
char *p, *ret;
+ char *domain_start = NULL;
ret = strdup(dom);
for (p = ret; *p; p++); p--; /* move to the last char */
- for (; *p == '.' || p == ret; p--) /* eat trailing dots */
+ /* eat trailing dots and blanks */
+ for (; *p == '.' || *p == ' ' || *p == '\t' || p == ret; p--)
*p = '\0';
#ifdef HAVE_LIBIDN
- if (idna_to_ascii_lz(ret, &p, 0) != IDNA_SUCCESS) {
+ /* find the start of the last word if there are spaces in the query */
+ for (p = ret; *p; p++)
+ if (*p == ' ')
+ domain_start = p + 1;
+
+ if (domain_start) {
+ char *q, *r;
+ int prefix_len;
+
+ if (idna_to_ascii_lz(domain_start, &q, 0) != IDNA_SUCCESS)
+ return ret;
+
+ /* reassemble the original query in a new buffer */
+ prefix_len = domain_start - ret;
+ r = malloc(prefix_len + strlen(q) + 1);
+ strncpy(r, ret, prefix_len);
+ r[prefix_len] = '\0';
+ strcat(r, q);
+
+ free(q);
free(ret);
- return ret;
- }
+ return r;
+ } else {
+ char *q;
- free(ret);
- ret = p;
-#endif
+ if (idna_to_ascii_lz(ret, &q, 0) != IDNA_SUCCESS)
+ return ret;
+ free(ret);
+ return q;
+ }
+#else
return ret;
+#endif
}
/* server and port have to be freed by the caller */
@@ -865,17 +907,33 @@
unsigned long myinet_aton(const char *s)
{
unsigned long a, b, c, d;
+ int elements;
char junk;
if (!s)
return 0;
- if (sscanf(s, "%lu.%lu.%lu.%lu%c", &a, &b, &c, &d, &junk) != 4)
+ elements = sscanf(s, "%lu.%lu.%lu.%lu%c", &a, &b, &c, &d, &junk);
+ if (!(elements == 4 || (elements == 5 && junk == '/')))
return 0;
if (a > 255 || b > 255 || c > 255 || d > 255)
return 0;
return (a << 24) + (b << 16) + (c << 8) + d;
}
+unsigned long asn32_to_long(const char *s)
+{
+ unsigned long a, b;
+ char junk;
+
+ if (!s)
+ return 0;
+ if (sscanf(s, "%lu.%lu%c", &a, &b, &junk) != 2)
+ return 0;
+ if (a > 65535 || b > 65535)
+ return 0;
+ return (a << 16) + b;
+}
+
int isasciidigit(const char c) {
return (c >= '0' && c <= '9') ? 1 : 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/whois.h new/whois-4.7.24/whois.h
--- old/whois-4.7.21/whois.h 2006-10-06 18:29:54.000000000 +0200
+++ new/whois-4.7.24/whois.h 2007-09-13 03:01:00.000000000 +0200
@@ -12,6 +12,7 @@
const char *whichwhois(const char *);
const char *match_config_file(const char *);
const char *whereas(const unsigned short);
+const char *whereas32(const unsigned long);
char *queryformat(const char *, const char *, const char *);
int hide_line(int *hiding, const char *const line);
const char *do_query(const int, const char *);
@@ -22,6 +23,7 @@
void alarm_handler(int);
void sighandler(int);
unsigned long myinet_aton(const char *);
+unsigned long asn32_to_long(const char *);
int isasciidigit(const char);
int domcmp(const char *, const char *);
int domfind(const char *, const char *[]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/whois-4.7.21/whois.spec new/whois-4.7.24/whois.spec
--- old/whois-4.7.21/whois.spec 2007-04-02 04:26:36.000000000 +0200
+++ new/whois-4.7.24/whois.spec 2007-10-30 11:07:10.000000000 +0100
@@ -1,6 +1,6 @@
Summary: Enhanced WHOIS client
Name: whois
-Version: 4.7.21
+Version: 4.7.24
Release: 1
License: GPL
Vendor: Marco d'Itri
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org