$NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $

--- example/jwhois.conf.orig	2003-06-30 19:16:45.000000000 +0200
+++ example/jwhois.conf	2005-05-24 09:40:34.000000000 +0200
@@ -55,7 +55,54 @@
 	"^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br";
  
 	#
-	# Redirect IPv6 numbers to the correct host
+	# Sub-TLA Assignments
+	# see http://www.iana.org/assignments/ipv6-tla-assignments
+	#
+	"^2001:0?[01][A-F0-9][A-F0-9]:.+" = "whois.iana.org";
+	"^2001:0?[23][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	"^2001:0?[45][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	"^2001:0?[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:0?[89][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:0?[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:0?[CD][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	"^2001:0?[EF][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	"^2001:1[23][A-F0-9][A-F0-9]:.+" = "whois.lacnic.net";
+	"^2001:1[45][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:1[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:1[89][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	"^2001:1[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:1[CD][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:1[EF][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:2[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:3[A-B0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:4[01][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:4[23][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	"^2001:4[45][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	"^2001:4[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:4[89][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	"^2001:4[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	"^2001:4[CD][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	# ...
+	"^2001:5[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	# ...
+	"^2001:[89][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# ...
+	"^2003:[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	# ...
+	"^2400:[0?1][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# ...
+	"^2600:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# ...
+	"^2604:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# ...
+	"^2608:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# ...
+	"^260C:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# ...
+	"^2A00:0[0-7][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+
+	#
+	# Historical IPv6 catch-all
 	#
 	".*:.*" = "whois.6bone.net";
 
@@ -147,7 +194,7 @@
 	"\\.ee$" = "whois.eenet.ee";
 	"\\.eg$" = "whois.ripe.net";
 	"\\.es$" = "www.nic.es";
-	"\\.fi$" = "cgi.ficora.fi";
+	"\\.fi$" = "whois.ficora.fi";
 	"\\.fj$" = "whois.usp.ac.fj";
 	"\\.fm$" = "www.dot.fm";
 	"\\.fo$" = "whois.ripe.net";
@@ -176,7 +223,7 @@
 	"\\.it$" = "whois.nic.it";
 	"\\.je$" = "whois.isles.net";
 	"\\.jp$" {
-		whois-server = "whois.nic.ad.jp";
+		whois-server = "whois.jprs.jp";
 		query-format = "$* /e";
 	}
 	"\\.kg$" = "whois.domain.kg";
@@ -242,7 +289,7 @@
 	"\\.to$" = "whois.tonic.to";
 	"\\.tr$" = "whois.metu.edu.tr";
 	"\\.tt$" = "www.nic.tt";
-	"\\.tv$" = "whois.tv";
+	"\\.tv$" = "whois.nic.tv";
 	"\\.tw$" = "whois.twnic.net";
 	"\\.ua$" = "whois.com.ua";
 	"\\.ug$" = "whois.co.ug";
@@ -365,12 +412,25 @@
 	"211.192.0.0/13" = "whois.nic.or.kr";
 
 	"24.232.0.0/16" = "whois.lacnic.net";
+	"41.0.0.0/8" = "whois.afrinic.net";
 	"43.0.0.0/8" = "whois.v6nic.net";
+	"58.0.0.0/8" = "whois.apnic.net";
+	"59.0.0.0/8" = "whois.apnic.net";
+	"60.0.0.0/8" = "whois.apnic.net";
 	"61.0.0.0/8" = "whois.apnic.net";
 	"62.0.0.0/8" = "whois.ripe.net";
 	"80.0.0.0/8" = "whois.ripe.net";
 	"81.0.0.0/8" = "whois.ripe.net";
 	"82.0.0.0/8" = "whois.ripe.net";
+	"83.0.0.0/8" = "whois.ripe.net";
+	"84.0.0.0/8" = "whois.ripe.net";
+	"85.0.0.0/8" = "whois.ripe.net";
+	"86.0.0.0/8" = "whois.ripe.net";
+	"87.0.0.0/8" = "whois.ripe.net";
+	"88.0.0.0/8" = "whois.ripe.net";
+	"124.0.0.0/8" = "whois.apnic.net";
+	"125.0.0.0/8" = "whois.apnic.net";
+	"126.0.0.0/8" = "whois.apnic.net";
 	"150.217.0.0/16" = "whois.ripe.net";
 	"151.3.0.0/16" = "whois.ripe.net";
 	"151.4.0.0/15" = "whois.ripe.net";
@@ -491,6 +551,10 @@
 		whois-redirect = ".*Whois Server: \\(.*\\)";
 	}
 
+	"whois\\.nic\\.tv" {
+		whois-redirect = ".*Whois Server: \\(.*\\)";
+	}
+
 	"whois\\.apnic\\.net" {
 		whois-redirect = ".*http://\\(whois\\.nic\\.or\\.kr\\)/";
 		whois-redirect = ".*at \\([Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\)";
@@ -693,14 +757,6 @@
 		form-element = "whois";
 	}
 
-	"cgi\\.ficora\\.fi" {
-		http = "true";
-		http-method = "GET";
-		http-action = "/wwwbin/domains.pl";
-		form-element = "search";
-		form-extra = "language=eng";
-	}
-
 	"whois\\.lacnic\\.net" {
 		whois-redirect = ".*\\(whois.nic.br\\)";
 		whois-redirect = ".*\\(whois.registro.br\\)";
@@ -724,10 +780,10 @@
 
 #
 # The cache feature is used to provide a local cache with Whois information.
-# By default, the location of the database is /usr/local/var/jwhois.db and the
+# By default, the location of the database is /var/db/jwhois.db and the
 # default expire time is 7 days, but you can change those below.
 #
-#cachefile = "/var/lib/jwhois.db";
+#cachefile = "/var/db/jwhois.db";
 
 #
 # This is the time after which an entry expires from the cache in hours.
@@ -743,7 +799,7 @@
 #
 # Path to the browser to use for HTTP servers.
 #
-browser-pathname = "/usr/bin/lynx";
+browser-pathname = "/usr/pkg/bin/lynx";
 
 #
 # Command line argument to browser to get output on stdout.