From d18a65fd9a14156cdd04ef29e0bb682a92607c19 Mon Sep 17 00:00:00 2001 From: kleink Date: Tue, 19 Apr 2005 21:05:27 +0000 Subject: Upgrade to jwhois-3.2.2nb17, incorporating today's allocations: 2A00:0000::/21 RIPE NCC 2600:0000::/22 ARIN 2604:0000::/22 ARIN 2608:0000::/22 ARIN 260C:0000::/22 ARIN --- net/jwhois/Makefile | 4 ++-- net/jwhois/distinfo | 4 ++-- net/jwhois/patches/patch-aa | 32 +++++++++++++++++++++----------- 3 files changed, 25 insertions(+), 15 deletions(-) (limited to 'net/jwhois') diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index ca0cce2e770..7578defb73a 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2005/04/13 23:03:59 kleink Exp $ +# $NetBSD: Makefile,v 1.53 2005/04/19 21:05:27 kleink Exp $ # DISTNAME= jwhois-3.2.2 -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNU:=jwhois/} diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo index 2ef2c342432..27f09c1a148 100644 --- a/net/jwhois/distinfo +++ b/net/jwhois/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.27 2005/04/13 23:03:59 kleink Exp $ +$NetBSD: distinfo,v 1.28 2005/04/19 21:05:27 kleink Exp $ SHA1 (jwhois-3.2.2.tar.gz) = ca69b017e19d378affd7cdc3a980f2209cb1caab RMD160 (jwhois-3.2.2.tar.gz) = 5fac4e9e03ded5618b5d58d38d72e8863518ba2f Size (jwhois-3.2.2.tar.gz) = 385390 bytes -SHA1 (patch-aa) = 8358c9ed83d1217f667ba0745436d3c7e6c88c58 +SHA1 (patch-aa) = 4848f9d5930e8fcc98e835caff0f9bc9330f828e SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b SHA1 (patch-ac) = 1ff97afeaab96982f52597216db449e86bbd0444 diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa index d47cc6bfaf0..e5c09c5bcaf 100644 --- a/net/jwhois/patches/patch-aa +++ b/net/jwhois/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ +$NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $ --- example/jwhois.conf.orig 2003-06-30 19:16:45.000000000 +0200 -+++ example/jwhois.conf 2005-04-14 01:00:39.000000000 +0200 -@@ -55,7 +55,42 @@ ++++ example/jwhois.conf 2005-04-19 22:59:57.000000000 +0200 +@@ -55,7 +55,52 @@ "^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br"; # @@ -40,13 +40,23 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ + "^2001:[89A][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"; ++ # ... ++ "^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 +182,7 @@ +@@ -147,7 +192,7 @@ "\\.ee$" = "whois.eenet.ee"; "\\.eg$" = "whois.ripe.net"; "\\.es$" = "www.nic.es"; @@ -55,7 +65,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ "\\.fj$" = "whois.usp.ac.fj"; "\\.fm$" = "www.dot.fm"; "\\.fo$" = "whois.ripe.net"; -@@ -176,7 +211,7 @@ +@@ -176,7 +221,7 @@ "\\.it$" = "whois.nic.it"; "\\.je$" = "whois.isles.net"; "\\.jp$" { @@ -64,7 +74,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ query-format = "$* /e"; } "\\.kg$" = "whois.domain.kg"; -@@ -242,7 +277,7 @@ +@@ -242,7 +287,7 @@ "\\.to$" = "whois.tonic.to"; "\\.tr$" = "whois.metu.edu.tr"; "\\.tt$" = "www.nic.tt"; @@ -73,7 +83,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ "\\.tw$" = "whois.twnic.net"; "\\.ua$" = "whois.com.ua"; "\\.ug$" = "whois.co.ug"; -@@ -365,12 +400,25 @@ +@@ -365,12 +410,25 @@ "211.192.0.0/13" = "whois.nic.or.kr"; "24.232.0.0/16" = "whois.lacnic.net"; @@ -99,7 +109,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ "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 +539,10 @@ +@@ -491,6 +549,10 @@ whois-redirect = ".*Whois Server: \\(.*\\)"; } @@ -110,7 +120,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ "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 +745,6 @@ +@@ -693,14 +755,6 @@ form-element = "whois"; } @@ -125,7 +135,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ "whois\\.lacnic\\.net" { whois-redirect = ".*\\(whois.nic.br\\)"; whois-redirect = ".*\\(whois.registro.br\\)"; -@@ -724,10 +768,10 @@ +@@ -724,10 +778,10 @@ # # The cache feature is used to provide a local cache with Whois information. @@ -138,7 +148,7 @@ $NetBSD: patch-aa,v 1.9 2005/04/13 23:03:59 kleink Exp $ # # This is the time after which an entry expires from the cache in hours. -@@ -743,7 +787,7 @@ +@@ -743,7 +797,7 @@ # # Path to the browser to use for HTTP servers. # -- cgit v1.2.3