diff options
author | shattered <shattered> | 2009-01-09 16:20:20 +0000 |
---|---|---|
committer | shattered <shattered> | 2009-01-09 16:20:20 +0000 |
commit | c73e67318683b7fccb7e642d93ec41d400ac5ac4 (patch) | |
tree | 4c14e94dfc0a537428cc24bc1386a0819a586cd5 /net/jwhois/patches/patch-aa | |
parent | 466eb56a24c17064e90f79d3cb6fb2cb1ca826ee (diff) | |
download | pkgsrc-c73e67318683b7fccb7e642d93ec41d400ac5ac4.tar.gz |
Update to 4.0, from PR 38500. Changes:
* Many WHOIS data updates and translation updates; 4 new translations
* Reset euid and egid to uid and gid before calling the user specified browser
* Added support for libidn
* Added patch to support conversion of whois server output to local charset.
* Changed to GNU GPL v3
Local change: WHOIS servers for some geographical subdomains in .ru and .su TLDs.
OK by wiz@.
Diffstat (limited to 'net/jwhois/patches/patch-aa')
-rw-r--r-- | net/jwhois/patches/patch-aa | 187 |
1 files changed, 42 insertions, 145 deletions
diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa index 4ddeeaa1765..dee46181494 100644 --- a/net/jwhois/patches/patch-aa +++ b/net/jwhois/patches/patch-aa @@ -1,148 +1,45 @@ -$NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $ +$NetBSD: patch-aa,v 1.12 2009/01/09 16:20:20 shattered 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 +--- example/jwhois.conf.orig 2007-03-26 09:12:08.000000000 +0000 ++++ example/jwhois.conf +@@ -94,6 +96,7 @@ whois-servers { + "\\.no\\.com$" = "whois.centralnic.net"; + "\\.qc\\.com$" = "whois.centralnic.net"; + "\\.ru\\.com$" = "whois.centralnic.net"; ++ "\\.ru\\.net$" = "whois.relcom.ru"; + "\\.sa\\.com$" = "whois.centralnic.net"; + "\\.se\\.com$" = "whois.centralnic.net"; + "\\.se\\.net$" = "whois.centralnic.net"; +@@ -244,6 +256,9 @@ whois-servers { + "\\.pw$" = "whois.nic.pw"; + "\\.re$" = "whois.nic.re"; + "\\.ro$" = "whois.rotld.ro"; ++ "\\.int.ru$" = "whois.int.ru"; ++ "\\.msk.ru$" = "whois.relcom.ru"; ++ "\\.spb.ru$" = "whois.relcom.ru"; + "\\.ru$" = "whois.ripn.net"; + "\\.rw$" = "www.nic.rw"; + "\\.sa$" = "saudinic.net.sa"; +@@ -256,6 +271,8 @@ whois-servers { + "\\.sm$" = "whois.ripe.net"; + "\\.sr$" = "whois.register.sr"; + "\\.st$" = "whois.nic.st"; ++ "\\.msk.su$" = "whois.relcom.ru"; ++ "\\.spb.su$" = "whois.relcom.ru"; + "\\.su$" = "whois.ripn.net"; + "\\.tc$" = "whois.adamsnames.tc"; + "\\.tf$" = "whois.afnic.fr"; +@@ -490,6 +507,8 @@ cidr-blocks { + "158.190.0.0/15" = "whois.ripe.net"; + "158.192.0.0/14" = "whois.ripe.net"; + "158.196.0.0/15" = "whois.ripe.net"; ++ "158.248.0.0/15" = "whois.ripe.net"; ++ "158.250.0.0/16" = "whois.ripe.net"; + "159.147.0.0/16" = "whois.ripe.net"; + "159.148.0.0/15" = "whois.ripe.net"; + "160.216.0.0/14" = "whois.ripe.net"; +@@ -947,7 +970,7 @@ server-options { + # By default, the location of the database is /usr/local/var/jwhois.db and the # default expire time is 7 days, but you can change those below. # -#cachefile = "/var/lib/jwhois.db"; @@ -150,7 +47,7 @@ $NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $ # # This is the time after which an entry expires from the cache in hours. -@@ -743,7 +799,7 @@ +@@ -963,7 +986,7 @@ server-options { # # Path to the browser to use for HTTP servers. # |