rpms/jwhois/devel jwhois-3.2.2-config-cvs.patch, 1.3, 1.4 jwhois.spec, 1.15, 1.16 jwhois-3.2.2-arin.patch, 1.2, NONE jwhois-3.2.2-update_2004.patch, 1.2, NONE jwhois-3.2.2-webbased.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jun 11 12:50:40 UTC 2005
Author: mitr
Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7291
Modified Files:
jwhois-3.2.2-config-cvs.patch jwhois.spec
Removed Files:
jwhois-3.2.2-arin.patch jwhois-3.2.2-update_2004.patch
jwhois-3.2.2-webbased.patch
Log Message:
* Sat Jun 11 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-15
- Update to upstream config as of Jun 11 2005, remove patches accepted upstream
jwhois-3.2.2-config-cvs.patch:
jwhois.conf | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 166 insertions(+), 24 deletions(-)
Index: jwhois-3.2.2-config-cvs.patch
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois-3.2.2-config-cvs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jwhois-3.2.2-config-cvs.patch 10 Apr 2005 22:44:21 -0000 1.3
+++ jwhois-3.2.2-config-cvs.patch 11 Jun 2005 12:50:37 -0000 1.4
@@ -2,10 +2,10 @@
===================================================================
RCS file: /cvsroot/jwhois/jwhois/example/jwhois.conf,v
retrieving revision 1.99
-retrieving revision 1.115
-diff -u -r1.99 -r1.115
+retrieving revision 1.117
+diff -u -r1.99 -r1.117
--- example/jwhois.conf 30 Jun 2003 17:17:24 -0000 1.99
-+++ example/jwhois.conf 4 Apr 2005 18:46:51 -0000 1.115
++++ example/jwhois.conf 4 May 2005 20:55:27 -0000 1.117
@@ -53,9 +53,47 @@
# Catch Registro .BR ownerid records
#
@@ -76,7 +76,15 @@
"\\.ag$" = "whois.nic.ag";
"\\.ai$" = "whois.offshore.ai";
"\\.al$" = "whois.ripe.net";
-@@ -138,7 +179,7 @@
+@@ -124,6 +165,7 @@
+ "\\.bz$" = "whois.belizenic.bz";
+ "\\.ca$" = "whois.cira.ca";
+ "\\.cc$" = "whois.nic.cc";
++ "\\.cd$" = "whois.nic.cd";
+ "\\.cg$" = "www.nic.cg";
+ "\\.ch$" = "whois.nic.ch";
+ "\\.ck$" = "whois.nic.ck";
+@@ -138,7 +180,7 @@
"\\.cx$" = "whois.nic.cx";
"\\.cy$" = "whois.ripe.net";
"\\.cz$" = "whois.nic.cz";
@@ -85,7 +93,7 @@
"\\.dk$" = "whois.dk-hostmaster.dk";
"\\.do$" = "whois.nic.do";
"\\.dz$" = "whois.ripe.net";
-@@ -147,7 +188,7 @@
+@@ -147,12 +189,12 @@
"\\.ee$" = "whois.eenet.ee";
"\\.eg$" = "whois.ripe.net";
"\\.es$" = "www.nic.es";
@@ -94,7 +102,13 @@
"\\.fj$" = "whois.usp.ac.fj";
"\\.fm$" = "www.dot.fm";
"\\.fo$" = "whois.ripe.net";
-@@ -176,7 +217,7 @@
+ "\\.fr$" = "whois.nic.fr";
+- "\\.gi$" = "whois.gibnet.gi";
++ "\\.gi$" = "www.nic.gi";
+ "\\.gov$" = "whois.nic.gov";
+ "\\.gg$" = "whois.isles.net";
+ "\\.gm$" = "whois.ripe.net";
+@@ -176,7 +218,7 @@
"\\.it$" = "whois.nic.it";
"\\.je$" = "whois.isles.net";
"\\.jp$" {
@@ -103,7 +117,7 @@
query-format = "$* /e";
}
"\\.kg$" = "whois.domain.kg";
-@@ -191,14 +232,14 @@
+@@ -191,14 +233,14 @@
"\\.lv$" = "whois.nic.lv";
"\\.ma$" = "whois.ripe.net";
"\\.mil$" = "whois.nic.mil";
@@ -120,7 +134,16 @@
"\\.na$" = "whois.na-nic.com.na";
"\\.name$" = "whois.nic.name";
"\\.net$" {
-@@ -346,7 +387,7 @@
+@@ -214,7 +256,7 @@
+ "\\.pe$" = "whois.nic.pe";
+ "\\.pk$" = "pknic.net.pk";
+ "\\.pl$" = "whois.dns.pl";
+- "\\.pro$" = "whois.nic.pro";
++ "\\.pro$" = "whois.registrypro.pro";
+ "\\.pt$" = "whois.dns.pt";
+ "\\.pw$" = "whois.nic.pw";
+ "\\.ro$" = "whois.rotld.ro";
+@@ -346,7 +388,7 @@
"203.178.0.0/15" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP
"203.180.0.0/14" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP
"210.128.0.0/11" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP
@@ -129,7 +152,7 @@
"210.160.0.0/12" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP
"210.188.0.0/14" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP
"210.196.0.0/14" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP
-@@ -363,14 +404,71 @@
+@@ -363,14 +405,73 @@
"211.172.0.0/14" = "whois.nic.or.kr";
"211.176.0.0/12" = "whois.nic.or.kr";
"211.192.0.0/13" = "whois.nic.or.kr";
@@ -140,6 +163,7 @@
+ "24.132.0.0/16" = "whois.ripe.net";
"24.232.0.0/16" = "whois.lacnic.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";
@@ -156,6 +180,7 @@
+ "86.0.0.0/8" = "whois.ripe.net";
+ "87.0.0.0/8" = "whois.ripe.net";
+ "88.0.0.0/8" = "whois.ripe.net";
++ "129.132.0.0/16" = "whois.ripe.net";
+ "129.177.0.0/16" = "whois.ripe.net";
+ "129.187.0.0/16" = "whois.ripe.net";
+ "130.225.0.0/16" = "whois.ripe.net";
@@ -201,7 +226,7 @@
"150.217.0.0/16" = "whois.ripe.net";
"151.3.0.0/16" = "whois.ripe.net";
"151.4.0.0/15" = "whois.ripe.net";
-@@ -381,6 +479,12 @@
+@@ -381,8 +482,16 @@
"151.64.0.0/11" = "whois.ripe.net";
"151.96.0.0/14" = "whois.ripe.net";
"151.100.0.0/16" = "whois.ripe.net";
@@ -213,8 +238,12 @@
+ "159.148.0.0/15" = "whois.ripe.net";
"160.216.0.0/14" = "whois.ripe.net";
"160.220.0.0/16" = "whois.ripe.net";
++ "161.110.0.0/15" = "whois.ripe.net";
++ "161.112.0.0/16" = "whois.ripe.net";
"163.13.0.0/16" = "whois.apnic.net";
-@@ -392,6 +496,15 @@
+ "163.14.0.0/15" = "whois.apnic.net";
+ "163.16.0.0/12" = "whois.apnic.net";
+@@ -392,6 +501,16 @@
"164.0.0.0/11" = "whois.ripe.net";
"164.32.0.0/13" = "whois.ripe.net";
"164.40.0.0/16" = "whois.ripe.net";
@@ -223,6 +252,7 @@
+ "164.160.0.0/14" = "whois.apnic.net";
+ "164.164.0.0/16" = "whois.apnic.net";
+ "165.21.0.0/16" = "whois.apnic.net";
++ "165.76.0.0/16" = "whois.apnic.net";
+ "165.228.0.0/15" = "whois.apnic.net";
+ "168.95.0.0/16" = "whois.apnic.net";
+ "168.126.0.0/16" = "whois.apnic.net";
@@ -230,7 +260,7 @@
"169.208.0.0/16" = "whois.apnic.net";
"171.16.0.0/12" = "whois.ripe.net";
"171.32.0.0/15" = "whois.ripe.net";
-@@ -399,10 +512,28 @@
+@@ -399,10 +518,28 @@
"192.114.0.0/15" = "whois.ripe.net";
"192.116.0.0/15" = "whois.ripe.net";
"192.118.0.0/16" = "whois.ripe.net";
@@ -259,7 +289,7 @@
"200.17.0.0/16" = "whois.nic.br";
"200.128.0.0/9" = "whois.nic.br";
"200.0.0.0/8" = "whois.lacnic.net";
-@@ -411,7 +542,10 @@
+@@ -411,7 +548,10 @@
"203.0.0.0/8" = "whois.apnic.net";
"210.0.0.0/8" = "whois.apnic.net";
"211.0.0.0/8" = "whois.apnic.net";
@@ -270,16 +300,49 @@
"213.0.0.0/8" = "whois.ripe.net";
"217.0.0.0/8" = "whois.ripe.net";
"218.0.0.0/8" = "whois.apnic.net";
-@@ -504,7 +638,7 @@
+@@ -419,7 +559,6 @@
+ "220.0.0.0/8" = "whois.apnic.net";
+ "221.0.0.0/8" = "whois.apnic.net";
+ "222.0.0.0/8" = "whois.apnic.net";
+- "223.0.0.0/8" = "whois.apnic.net";
+
+ default = "whois.arin.net";
+ }
+@@ -504,7 +643,7 @@
#
whois-redirect = ".*at \\([Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\)";
whois-redirect = ".* \\([Rr]+[Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\) \\([0-9]*\\)";
- whois-redirect = ".* rwhois://\\(.*\\):\\([0-9]*\\)/";
-+ whois-redirect = ".* r?whois://\\(.*\\):?\\([0-9]*\\)?/?";
++ whois-redirect = ".* r?whois://\\([^:]*\\):?\\([0-9]*\\)?/?";
}
"whois\\.ncst\\.ernet\\.in" {
-@@ -647,7 +781,7 @@
+@@ -582,9 +721,9 @@
+
+ "www\\.io\\.io" {
+ http = "true";
+- http-method = "POST";
++ http-method = "GET";
+ http-action = "/cgi-bin/whois";
+- form-element = "W1";
++ form-element = "query";
+ }
+
+ "www\\.nic\\.ec" {
+@@ -594,10 +733,10 @@
+ form-element = "dominio";
+ }
+
+- "whois\\.gibnet\\.gi" {
++ "www\\.nic\\.gi" {
+ http = "true"; # At least, I can't connect on port 43
+ http-method = "POST";
+- http-action = "/";
++ http-action = "/whois/";
+ form-element = "lookup";
+ }
+
+@@ -647,7 +786,7 @@
"www\\.noc\\.uz" {
http = "true";
http-method = "POST";
@@ -288,7 +351,7 @@
form-element = "dname";
}
-@@ -693,14 +827,6 @@
+@@ -693,14 +832,6 @@
form-element = "whois";
}
@@ -303,7 +366,7 @@
"whois\\.lacnic\\.net" {
whois-redirect = ".*\\(whois.nic.br\\)";
whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -720,6 +846,17 @@
+@@ -720,6 +851,17 @@
http-action = "/consultas/consdom.html";
form-element = "nombre";
}
Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jwhois.spec 30 Apr 2005 17:46:23 -0000 1.15
+++ jwhois.spec 11 Jun 2005 12:50:37 -0000 1.16
@@ -1,14 +1,11 @@
Name: jwhois
Version: 3.2.2
-Release: 14
+Release: 15
URL: http://www.gnu.org/software/jwhois/
Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
Patch0: jwhois-3.2.2-config-cvs.patch
-Patch1: jwhois-3.2.2-arin.patch
-Patch2: jwhois-3.2.2-doublefree.patch
-Patch3: jwhois-3.2.2-update_2004.patch
-Patch4: jwhois-3.2.2-webbased.patch
-Patch5: jwhois-3.2.2-afrinic.patch
+Patch1: jwhois-3.2.2-doublefree.patch
+Patch2: jwhois-3.2.2-afrinic.patch
License: GPL
Group: Applications/Internet
Summary: Internet whois/nicname client.
@@ -22,11 +19,8 @@
%prep
%setup -q
%patch0 -p0 -b .config
-%patch1 -p1 -b .arin
-%patch2 -p1 -b .doublefree
-%patch3 -p1 -b .update_2004
-%patch4 -p1 -b .webbased
-%patch5 -p1 -b .afrinic
+%patch1 -p1 -b .doublefree
+%patch2 -p1 -b .afrinic
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
@@ -68,6 +62,9 @@
[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
%changelog
+* Sat Jun 11 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-15
+- Update to upstream config as of Jun 11 2005, remove patches accepted upstream
+
* Sat Apr 30 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-14
- Add an AfriNIC range (#156178)
--- jwhois-3.2.2-arin.patch DELETED ---
--- jwhois-3.2.2-update_2004.patch DELETED ---
--- jwhois-3.2.2-webbased.patch DELETED ---
More information about the fedora-cvs-commits
mailing list