rpms/jwhois/devel jwhois-4.0-conf_update.patch, 1.1, 1.2 jwhois.spec, 1.55, 1.56 jwhois-4.0-conf.patch, 1.1, NONE jwhois-4.0-conf_update2.patch, 1.1, NONE jwhois-4.0-conf_update3.patch, 1.1, NONE jwhois-4.0-conf_update4.patch, 1.1, NONE jwhois-4.0-dotster.patch, 1.1, NONE jwhois-4.0-enum.patch, 1.1, NONE jwhois-4.0-gi.patch, 1.1, NONE

vcrhonek vcrhonek at fedoraproject.org
Tue Jun 22 12:00:14 UTC 2010


Author: vcrhonek

Update of /cvs/pkgs/rpms/jwhois/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6815

Modified Files:
	jwhois-4.0-conf_update.patch jwhois.spec 
Removed Files:
	jwhois-4.0-conf.patch jwhois-4.0-conf_update2.patch 
	jwhois-4.0-conf_update3.patch jwhois-4.0-conf_update4.patch 
	jwhois-4.0-dotster.patch jwhois-4.0-enum.patch 
	jwhois-4.0-gi.patch 
Log Message:
Update server options for whois.1api.net, Merge all jwhois.conf updates into one patch

jwhois-4.0-conf_update.patch:
 jwhois.conf |  409 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 321 insertions(+), 88 deletions(-)

Index: jwhois-4.0-conf_update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jwhois/devel/jwhois-4.0-conf_update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jwhois-4.0-conf_update.patch	27 Feb 2009 09:59:07 -0000	1.1
+++ jwhois-4.0-conf_update.patch	22 Jun 2010 12:00:13 -0000	1.2
@@ -1,7 +1,19 @@
-diff -up jwhois-4.0/example/jwhois.conf.conf_update jwhois-4.0/example/jwhois.conf
---- jwhois-4.0/example/jwhois.conf.conf_update	2009-02-27 10:17:01.000000000 +0100
-+++ jwhois-4.0/example/jwhois.conf	2009-02-27 10:57:26.000000000 +0100
-@@ -32,6 +32,7 @@ whois-servers {
+diff -up jwhois-4.0/example/jwhois.conf.orig jwhois-4.0/example/jwhois.conf
+--- jwhois-4.0/example/jwhois.conf.orig	2007-03-26 11:12:08.000000000 +0200
++++ jwhois-4.0/example/jwhois.conf	2010-06-22 13:49:51.542598491 +0200
+@@ -17,6 +17,11 @@ whois-servers {
+ 	type = regex;
+ 
+ 	#
++	# Catch ENUM domains
++	#
++	"\\([0-9]\\.\\)+e164\\.arpa" = "struct enum-blocks";
++
++	#
+ 	# You can use the special value `struct' to redirect the query
+ 	# to another block which optionally can use another type of matching.
+ 	# Here we use it to have IPv4 numbers matched using CIDR blocks instead
+@@ -27,6 +32,7 @@ whois-servers {
  	"^CORE-[0-9]+$" = "struct handles";
  	"^CO[CH]O-[0-9]+$" = "struct handles";
  	".*-[A-Z]+$" = "struct handles";
@@ -9,7 +21,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  
  	#
  	# Catch AS numbers
-@@ -86,6 +87,7 @@ whois-servers {
+@@ -81,6 +87,7 @@ whois-servers {
  	# Pseudo-ccTLDs must be listed above gTLDs
  	#
   	"\\.ae\\.org$" = "whois.centralnic.net";
@@ -17,7 +29,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.br\\.com$" = "whois.centralnic.net";
  	"\\.cn\\.com$" = "whois.centralnic.net";
  	"\\.de\\.com$" = "whois.centralnic.net";
-@@ -108,17 +110,21 @@ whois-servers {
+@@ -103,17 +110,22 @@ whois-servers {
  	"\\.uy\\.com$" = "whois.centralnic.net";
  	"\\.web\\.com$" = "whois.centralnic.net";
  	"\\.za\\.com$" = "whois.centralnic.net";
@@ -32,9 +44,11 @@ diff -up jwhois-4.0/example/jwhois.conf.
 +	"\\.af$" = "whois.cocca.cx";
  	"\\.ag$" = "whois.nic.ag";
 -	"\\.ai$" = "whois.offshore.ai";
+-	"\\.al$" = "whois.ripe.net";
 +	"\\.ai$" = "whois.ai";
- 	"\\.al$" = "whois.ripe.net";
++	"\\.al$" = "www.ert.gov.al";
  	"\\.am$" = "whois.amnic.net";
++	"\\.edu\\.ar$" = "www.riu.edu.ar";
  	"\\.ar$" = "www.nic.ar";
 +	"\\.arpa$" = "whois.iana.org";
  	"\\.as$" = "whois.nic.as";
@@ -42,7 +56,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.at$" = "whois.nic.at";
  	"\\.asn\\.au$" = "whois.ausregistry.net.au";
  	"\\.com\\.au$" = "whois.ausregistry.net.au";
-@@ -130,25 +136,33 @@ whois-servers {
+@@ -125,30 +137,40 @@ whois-servers {
  	"\\.ba$" = "whois.ripe.net";
  	"\\.be$" = "whois.dns.be";
  	"\\.bg$" = "whois.register.bg";
@@ -54,8 +68,10 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.bm$" = "rwhois.ibl.bm 4321";
 +	"\\.bo$" = "whois.nic.bo";
  	"\\.br$" = "whois.nic.br";
++	"\\.bs$" = "www.register.bs";
  	"\\.bv$" = "whois.ripe.net";
- 	"\\.by$" = "whois.ripe.net";
+-	"\\.by$" = "whois.ripe.net";
++	"\\.by$" = "www.domain.by";
  	"\\.bz$" = "whois.belizenic.bz";
 +	"\\.co\\.ca$" = "whois.co.ca";
  	"\\.ca$" = "whois.cira.ca";
@@ -80,21 +96,38 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.com$" {
  		whois-server = "whois.verisign-grs.com";
  		query-format = "domain $*";
-@@ -166,7 +180,7 @@ whois-servers {
+ 	}
+ 	"\\.coop$" = "whois.nic.coop";
++	"\\.cu$" = "www.nic.cu";
+ 	"\\.cx$" = "whois.nic.cx";
+ 	"\\.cy$" = "whois.ripe.net";
+ 	"\\.cz$" = "whois.nic.cz";
+@@ -156,12 +178,15 @@ whois-servers {
+ 		whois-server = "whois.denic.de";
+ 		query-format = "-C UTF-8 -T dn,ace $*";
+ 	}
+-	"\\.dk$" = "whois.dk-hostmaster.dk";
++	"\\.dk$" {
++		whois-server = "whois.dk-hostmaster.dk";
++		query-format = "--show-handles $*";
++	}
+ 	"\\.dm$" = "whois.nic.dm";
  	"\\.do$" = "whois.nic.do";
- 	"\\.dz$" = "whois.ripe.net";
+-	"\\.dz$" = "whois.ripe.net";
++	"\\.dz$" = "www.nic.dz";
  	"\\.ec$" = "www.nic.ec";
 -	"\\.edu$" = "whois.educause.net";
 +	"\\.edu$" = "whois.educause.edu";
  	"\\.ee$" = "whois.eenet.ee";
  	"\\.eg$" = "whois.ripe.net";
  	"\\.es$" = "www.nic.es";
-@@ -176,17 +190,20 @@ whois-servers {
+@@ -171,17 +196,20 @@ whois-servers {
  	"\\.fm$" = "www.dot.fm";
  	"\\.fo$" = "whois.ripe.net";
  	"\\.fr$" = "whois.nic.fr";
+-	"\\.gi$" = "www.nic.gi";
 +	"\\.gd$" = "whois.adamsnames.com";
- 	"\\.gi$" = "whois2.afilias-grs.net";
++	"\\.gi$" = "whois2.afilias-grs.net";
  	"\\.gov$" = "whois.nic.gov";
 -	"\\.gg$" = "whois.isles.net";
 +	"\\.gg$" = "whois.gg";
@@ -113,7 +146,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.hu$" = "whois.nic.hu";
  	"\\.id$" = "whois.idnic.net.id";
  	"\\.ie$" = "whois.domainregistry.ie";
-@@ -200,29 +217,39 @@ whois-servers {
+@@ -195,69 +223,94 @@ whois-servers {
  	"\\.is$" = "whois.isnic.is";
  	"\\.it$" = "whois.nic.it";
  	"\\.je$" = "whois.isles.net";
@@ -157,24 +190,36 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.mu$" = "whois.nic.mu";
  	"\\.museum$" = "whois.museum";
  	"\\.mw$" = "www.tarsus.net";
-@@ -234,31 +261,37 @@ whois-servers {
+ 	"\\.mx$" = "whois.nic.mx";
+-	"\\.my$" = "whois.mynic.net.my";
++	"\\.my$" = "whois.domainregistry.my";
+ 	"\\.na$" = "whois.na-nic.com.na";
+-	"\\.name$" = "whois.nic.name";
++	"\\.name$" {
++		whois-server = "whois.nic.name";
++		query-format = "domain = $*";
++		}
+ 	"\\.net$" {
  		whois-server = "whois.verisign-grs.com";
  		query-format = "domain $*";
  	}
+-	"\\.ng$" = "whois.rg.net";
 +	"\\.nf$" = "whois.cocca.cx";
- 	"\\.ng$" = "whois.rg.net";
++	"\\.ng$" = "whois.nic.net.ng";
  	"\\.nl$" = "whois.domain-registry.nl";
  	"\\.no$" = "whois.norid.no";
  	"\\.nu$" = "whois.nic.nu";
  	"\\.nz$" = "whois.srs.net.nz";
  	"\\.org$" = "whois.publicinterestregistry.net";
 -	"\\.pe$" = "whois.nic.pe";
++	"\\.pa$" = "www.nic.pa";
 +	"\\.pe$" = "kero.yachay.pe";
  	"\\.pk$" = "pknic.net.pk";
  	"\\.pl$" = "whois.dns.pl";
  	"\\.pm$" = "whois.nic.pm";
 +	"\\.pr$" = "whois.nic.pr";
  	"\\.pro$" = "whois.registrypro.pro";
++	"\\.ps$" = "www.nic.ps";
  	"\\.pt$" = "whois.dns.pt";
  	"\\.pw$" = "whois.nic.pw";
  	"\\.re$" = "whois.nic.re";
@@ -186,18 +231,27 @@ diff -up jwhois-4.0/example/jwhois.conf.
 +	"\\.sb$" = "whois.nic.sb";
 +	"\\.sc$" = "whois2.afilias-grs.net";
  	"\\.se$" = "whois.iis.se";
- 	"\\.sg$" = "whois.nic.net.sg";
+-	"\\.sg$" = "whois.nic.net.sg";
++	"\\.sg$" = "whois.sgnic.sg";
  	"\\.sh$" = "whois.nic.sh";
  	"\\.si$" = "whois.arnes.si";
  	"\\.sj$" = "whois.ripe.net";
 -	"\\.sk$" = "whois.ripe.net";
 +	"\\.sk$" = "whois.sk-nic.sk";
++	"\\.sl$" = "whois.nic.sl";
  	"\\.sm$" = "whois.ripe.net";
 +	"\\.sn$" = "whois.nic.sn";
++	"\\.so$" = "whois.nic.so";
  	"\\.sr$" = "whois.register.sr";
  	"\\.st$" = "whois.nic.st";
  	"\\.su$" = "whois.ripn.net";
-@@ -273,8 +306,12 @@ whois-servers {
++	"\\.sv$" = "www.svnet.org.sv";
+ 	"\\.tc$" = "whois.adamsnames.tc";
++	"\\.tel$" = "whois.nic.tel";
+ 	"\\.tf$" = "whois.afnic.fr";
+ 	"\\.tg$" = "www.nic.tg";
+ 	"\\.th$" = "whois.thnic.net";
+@@ -268,8 +321,12 @@ whois-servers {
  	"\\.tn$" = "whois.ripe.net";
  	"\\.to$" = "whois.tonic.to";
  	"\\.tr$" = "whois.nic.tr";
@@ -211,11 +265,13 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.tw$" = "whois.twnic.net";
  	"\\.ua$" = "whois.com.ua";
  	"\\.ug$" = "whois.co.ug";
-@@ -285,8 +322,11 @@ whois-servers {
+@@ -279,9 +336,12 @@ whois-servers {
+ 	"\\.fed\\.us$" = "whois.nic.gov";
  	"\\.us$" = "whois.nic.us";
  	"\\.com\\.uy$" = "dns.antel.net.uy";
- 	"\\.uy$" = "www.rau.edu.uy"; # is a whois server
+-	"\\.uy$" = "www.rau.edu.uy"; # is a whois server
 -	"\\.uz$" = "www.noc.uz";
++	"\\.uy$" = "whois.nic.org.uy";
 +	"\\.co\\.uz$" = "whois.reg.uz";
 +	"\\.com\\.uz$" = "whois.reg.uz";
 +	"\\.uz$" = "whois.cctld.uz";
@@ -224,15 +280,39 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"\\.ve$" = "whois.nic.ve";
  	"\\.vi$" = "www.nic.vi";
  	"\\.vg$" = "whois.adamsnames.tc";
-@@ -299,6 +339,7 @@ whois-servers {
+@@ -290,11 +350,13 @@ whois-servers {
+ 	"\\.wf$" = "whois.nic.wf";
+ 	"\\.ws$" = "whois.worldsite.ws";
+ 	"\\.yt$" = "whois.nic.yt";
+-	"\\.yu$" = "whois.ripe.net";
++	"\\.yu$" = "www.nic.yu";
  	"\\.ac\\.za$" = "whois.ac.za";
  	"\\.org\\.za$" = "rwhois.org.za 4321";
  	"\\.co\\.za$" = "whois.co.za";
 +	"\\.nom\\.za$" = "www.nom.za";
  	# "\\.za$" = "whois.frd.ac.za";
++	"\\.co\\.zw$" = "www.zispa.co.zw";
  
  	#
-@@ -594,7 +635,7 @@ cidr-blocks {
+ 	# Specify different port numbers to connect to by postfixing the IP
+@@ -311,6 +373,16 @@ whois-servers {
+ }
+ 
+ #
++# enum-blocks
++#
++enum-blocks {
++	type = regex;
++
++	"\\.9\\.4\\.e164\\.arpa$" = "whois.enum.denic.de";
++	"\\.1\\.6\\.e164\\.arpa$" = "whois-check.enum.com.au";
++}
++
++#
+ # cidr-blocks contains a list of all known CIDR blocks assigned to
+ # RIPE or APNIC. Default all queries to ARIN which has most other blocks.
+ #
+@@ -580,7 +652,7 @@ cidr-blocks {
  cidr6-blocks {
  	type = cidr6;
  
@@ -241,15 +321,24 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"2001:0200::/23" = "whois.apnic.net";
  	"2001:0400::/23" = "whois.arin.net";
  	"2001:0600::/23" = "whois.ripe.net";
-@@ -611,6 +652,7 @@ cidr6-blocks {
+@@ -593,13 +665,13 @@ cidr6-blocks {
+ 	"2001:1600::/23" = "whois.ripe.net";
+ 	"2001:1800::/23" = "whois.arin.net";
+ 	"2001:1A00::/23" = "whois.ripe.net";
+-	"2001:1C00::/23" = "whois.ripe.net";
+-	"2001:1E00::/23" = "whois.ripe.net";
++	"2001:1C00::/22" = "whois.ripe.net";
  	"2001:2000::/20" = "whois.ripe.net";
  	"2001:3000::/21" = "whois.ripe.net";
  	"2001:3800::/22" = "whois.ripe.net";
 +	"2001:3C00::/22" = "whois.arin.net"; # not correct, but shows better information
  	"2001:4000::/23" = "whois.ripe.net";
- 	"2001:4200::/23" = "whois.afrinic.net";
+-	"2001:4200::/23" = "whois.arin.net";
++	"2001:4200::/23" = "whois.afrinic.net";
  	"2001:4400::/23" = "whois.apnic.net";
-@@ -623,6 +665,8 @@ cidr6-blocks {
+ 	"2001:4600::/23" = "whois.ripe.net";
+ 	"2001:4800::/23" = "whois.arin.net";
+@@ -610,23 +682,47 @@ cidr6-blocks {
  	"2001:A000::/20" = "whois.apnic.net";
  	"2001:B000::/20" = "whois.apnic.net";
  
@@ -257,11 +346,29 @@ diff -up jwhois-4.0/example/jwhois.conf.
 +
  	"2003:0000::/18" = "whois.ripe.net";
  
- 	"2400:0000::/12" = "whois.apnic.net";
-@@ -636,6 +680,34 @@ cidr6-blocks {
- 	"2C00:0000::/12" = "whois.afrinic.net";
+-	"2400:0000::/19" = "whois.apnic.net";
+-	"2400:2000::/19" = "whois.apnic.net";
+-	"2400:4000::/21" = "whois.apnic.net";
+-	"2404:0000::/23" = "whois.apnic.net";
+-
+-	"2600:0000::/22" = "whois.arin.net";
+-	"2604:0000::/22" = "whois.arin.net";
+-	"2608:0000::/22" = "whois.arin.net";
+-	"260C:0000::/22" = "whois.arin.net";
++	"2400:0000::/12" = "whois.apnic.net";
++
++	"2600:0000::/12" = "whois.arin.net";
+ 	"2610:0000::/23" = "whois.arin.net";
++	"2620:0000::/23" = "whois.arin.net";
++
++	"2800:0000::/12" = "whois.lacnic.net";
  
- 	#
+-	"2800:0000::/23" = "whois.lacnic.net";
++	"2C00:0000::/12" = "whois.afrinic.net";
+ 
+-	"2A00:0000::/21" = "whois.ripe.net";
+-	"2A01:0000::/16" = "whois.ripe.net";
++	#
 +	# IPv6 blocks by carriers used for SixXS;
 +	# see e.g. http://www.sixxs.net/pops/
 +	#
@@ -288,12 +395,19 @@ diff -up jwhois-4.0/example/jwhois.conf.
 +	"2001:4428::/32" = "whois.sixxs.net";
 +	"2A01:0198::/32" = "whois.sixxs.net";
 +	"2A01:0348::/32" = "whois.sixxs.net";
-+
-+	#
- 	# Experimental IPv6 network 6bone (RFC2471)
- 	# Phaseout at Jun, 6 2006 (RFC3701)
+ 
  	#
-@@ -678,6 +750,33 @@ handles {
+ 	# Experimental IPv6 network 6bone (RFC2471)
+@@ -662,7 +758,7 @@ handles {
+ 	".*-NICAT$" = "whois.nic.at";
+ 	".*-CZ$" = "whois.nic.cz";
+ 	".*-NICIR$" = "whois.nic.ir";
+-	".*-UYNIC$" = "www.rau.edu.uy";
++	".*-UYNIC$" = "whois.nic.org.uy";
+ 	".*-ITNIC$" = "whois.nic.it";
+ 	".*-FRNIC$" = "whois.nic.fr";
+ 	".*-LACNIC$" = "whois.lacnic.net";
+@@ -671,6 +767,49 @@ handles {
  		whois-server = "saudinic.net.sa";
  		query-format = "PERSON $*";
  	}
@@ -324,10 +438,26 @@ diff -up jwhois-4.0/example/jwhois.conf.
 +		whois-server = "whois.nic.coop";
 +		query-format = "CONTACT $*";
 +	}
++	".*CONTACT-NAME$" {
++		whois-server = "whois.nic.name";
++		query-format = "contact = $*";
++	}
++	".*REGISTRAR-NAME$" {
++		whois-server = "whois.nic.name";
++		query-format = "registrar = $*";
++	}
++	"^C[0-9]+-AERO$" {
++		whois-server = "whois.aero";
++		query-format = "CONTACT ID $*";
++	}
++	"^D[0-9]+-AERO$" {
++		whois-server = "whois.aero";
++		query-format = "DOMAIN ID $*";
++	}
  }
  
  #
-@@ -685,11 +784,6 @@ handles {
+@@ -678,11 +817,6 @@ handles {
  # each host. 
  #
  server-options {
@@ -339,7 +469,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"rwhois\\.exodus\\.net" {
  		rwhois = true;
  	}
-@@ -761,13 +855,6 @@ server-options {
+@@ -754,13 +888,6 @@ server-options {
  		form-element = "name";
  	}
  
@@ -353,7 +483,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"www\\.gt" {
  		http = "true";
  		http-method = "GET";
-@@ -784,13 +871,6 @@ server-options {
+@@ -777,13 +904,6 @@ server-options {
  		query-format = "Upit=${+2}"; # All but last domain segment
  	}
  
@@ -367,7 +497,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"www\\.io\\.io" {
  		http = "true";
  		http-method = "GET";
-@@ -820,11 +900,12 @@ server-options {
+@@ -813,11 +933,12 @@ server-options {
  		form-element = "query";
  	}
  
@@ -385,7 +515,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	}
  
  	"www\\.nic\\.cg" {
-@@ -855,13 +936,6 @@ server-options {
+@@ -848,13 +969,6 @@ server-options {
  		form-element = "name";
  	}
  
@@ -399,7 +529,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	"www\\.nic\\.vi" {
  		http = "true";
  		http-method = "POST";
-@@ -885,9 +959,9 @@ server-options {
+@@ -878,9 +992,9 @@ server-options {
  
  	"www\\.nic\\.tg" {
  		http = "true";
@@ -412,7 +542,7 @@ diff -up jwhois-4.0/example/jwhois.conf.
  	}
  
  	"cgi\\.aub\\.edu\\.lb" {
-@@ -917,38 +991,60 @@ server-options {
+@@ -910,33 +1024,152 @@ server-options {
  		form-element = "nombre";
  	}
  
@@ -429,11 +559,11 @@ diff -up jwhois-4.0/example/jwhois.conf.
  		answer-charset = "UTF-8";
  	}
 +
- 	"whois\\.enum\\.denic\\.de" {
- 		whois-server = "whois.enum.denic.de";
- 		query-format = "-C UTF-8 -T dn $*";
- 		answer-charset = "UTF-8";
- 	}
++	"whois\\.enum\\.denic\\.de" {
++		whois-server = "whois.enum.denic.de";
++		query-format = "-C UTF-8 -T dn $*";
++		answer-charset = "UTF-8";
++	}
 +
  	"whois\\.nic\\.ad\\.jp" {
  		query-format = "$*/e";
@@ -477,6 +607,98 @@ diff -up jwhois-4.0/example/jwhois.conf.
 +		http-action = "/do.php";
 +		query-format = "chkDomain=${+3}&chkAvail=Check";
 +	}
++
++	"www\\.nic\\.pa" {
++		http = "true";
++		http-method = "GET";
++		http-action = "/egh/whois.php";
++		form-element = "nombre_d";
++	}
++
++	"www\\.nic\\.dz" {
++		http = "true";
++		http-method = "POST";
++		http-action = "/index.php?option=com_content&task=view&id=37&Itemid=51";
++		form-element = "domain_name";
++	}
++
++	"www\\.nic\\.yu" {
++		http = "true";
++		http-method = "GET";
++		http-action = "/cgi-bin/checkavail.cgi";
++		form-element = "domain";
++	}
++
++	"whois\\.dotster\\.com" {
++		answer-charset = "UTF-8";
++	}
++
++	"www\\.ert\\.gov\\.al" {
++		http = "true";
++		http-method = "POST";
++		http-action = "/ert_eng/domain_res.html";
++		query-format = "Domain=${+2}";
++	}
++
++	"www\\.nic\\.cu" {
++		http = "true";
++		http-method = "GET";
++		http-action = "/dom_det.php";
++		form-element = "domsrch";
++	}
++
++	"www\\.nic\\.ps" {
++		http = "true";
++		http-method = "GET";
++		http-action = "/whois/domain_whois.php";
++		form-element = "dname";
++	}
++
++	"www\\.svnet\\.org\\.sv" {
++		http = "true";
++		http-method = "POST";
++		http-action = "/registro/consultas/whois.php";
++		form-element = "subdominio";
++	}
++
++	"www\\.zispa\\.co\\.zw" {
++		http = "true";
++		http-method = "GET";
++		http-action = "/cgi-bin/search";
++		form-element = "domain";
++	}
++
++	"www\\.riu\\.edu\\.ar" {
++		http = "true";
++		http-method = "POST";
++		http-action = "/cgi-bin/verdom.pl.nuevo";
++		query-format = "username=${+3}";
++	}
++
++	"www\\.register\\.bs" {
++		http = "true";
++		http-method = "POST";
++		http-action = "/cgi-bin/search.pl";
++		form-element = "name";
++	}
++
++	"www\\.domain\\.by" {
++		http = "true";
++		http-method = "POST";
++		http-action = "/cgi-bin/registry.cgi";
++		query-format = "domain=${+2}&lang=e&mode=slquest";
++	}
++
++	"www\\.nic\\.ac" {
++		http = "true";
++		http-method = "GET";
++		http-action = "/cgi-bin/whois";
++		form-element = "textfield";
++	}
++
++	"whois\\.1api\\.net" {
++		answer-charset = "UTF-8";
++	}
  }
  
  #


Index: jwhois.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- jwhois.spec	22 Apr 2010 13:11:36 -0000	1.55
+++ jwhois.spec	22 Jun 2010 12:00:13 -0000	1.56
@@ -2,21 +2,14 @@
 
 Name: jwhois
 Version: 4.0
-Release: 20%{?dist}
+Release: 21%{?dist}
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Patch0: jwhois-4.0-connect.patch
 Patch1: jwhois-4.0-ipv6match.patch
-Patch2: jwhois-4.0-conf.patch
-Patch3: jwhois-4.0-gi.patch
-Patch4: jwhois-4.0-enum.patch
-Patch5: jwhois-4.0-fclose.patch
-Patch6: jwhois-4.0-conf_update.patch
-Patch7: jwhois-4.0-conf_update2.patch
-Patch8: jwhois-4.0-dotster.patch
-Patch9: jwhois-4.0-conf_update3.patch
-Patch10: jwhois-4.0-conf_update4.patch
-Patch11: jwhois-4.0-select.patch
+Patch2: jwhois-4.0-fclose.patch
+Patch3: jwhois-4.0-select.patch
+Patch4: jwhois-4.0-conf_update.patch
 License: GPLv3
 Group: Applications/Internet
 Summary: Internet whois/nicname client
@@ -35,16 +28,9 @@ A whois client that accepts both traditi
 %setup -q
 %patch0 -p1 -b .connect
 %patch1 -p1 -b .ipv6match
-%patch2 -p1 -b .conf
-%patch3 -p1 -b .gi
-%patch4 -p1 -b .enum
-%patch5 -p1 -b .fclose
-%patch6 -p1 -b .conf_update
-%patch7 -p1 -b .conf_update2
-%patch8 -p1 -b .dotster
-%patch9 -p1 -b .conf_update3
-%patch10 -p1 -b .conf_update4
-%patch11 -p1 -b .select
+%patch2 -p1 -b .fclose
+%patch3 -p1 -b .select
+%patch4 -p1 -b .conf_update
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -110,6 +96,11 @@ fi
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jun 22 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-21
+- Update server options for whois.1api.net
+  Resolves: #600096
+- Merge all jwhois.conf updates into one patch
+
 * Thu Apr 22 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-20
 - Modify spec file to make easy possible to enable cache
   Resolves: #551131


--- jwhois-4.0-conf.patch DELETED ---


--- jwhois-4.0-conf_update2.patch DELETED ---


--- jwhois-4.0-conf_update3.patch DELETED ---


--- jwhois-4.0-conf_update4.patch DELETED ---


--- jwhois-4.0-dotster.patch DELETED ---


--- jwhois-4.0-enum.patch DELETED ---


--- jwhois-4.0-gi.patch DELETED ---



More information about the scm-commits mailing list