rpms/jwhois/devel jwhois-3.2.2-arin.patch, 1.1, 1.2 jwhois-3.2.2-config-cvs.patch, 1.1, 1.2 jwhois.spec, 1.12, 1.13 jwhois-3.2.2-typos.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 23 17:21:03 UTC 2005
- Previous message (by thread): rpms/mozilla/FC-2 mozilla.spec,1.18,1.19
- Next message (by thread): rpms/elfutils/devel elfutils-portability.patch, NONE, 1.1 elfutils.spec, 1.15, 1.16 elfutils-0.101-bswap.patch, 1.1, NONE elfutils-0.101-portability.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14051
Modified Files:
jwhois-3.2.2-arin.patch jwhois-3.2.2-config-cvs.patch
jwhois.spec
Removed Files:
jwhois-3.2.2-typos.patch
Log Message:
* Wed Mar 23 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-12
- Update to upstream CVS config as of Mar 23 2005 (#151900)
Remove now unnecessary typos.patch
jwhois-3.2.2-arin.patch:
jwhois.conf | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: jwhois-3.2.2-arin.patch
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois-3.2.2-arin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jwhois-3.2.2-arin.patch 13 Sep 2004 18:07:37 -0000 1.1
+++ jwhois-3.2.2-arin.patch 23 Mar 2005 17:20:59 -0000 1.2
@@ -1,11 +1,11 @@
---- jwhois-3.2.2/example/jwhois.conf.arin 2004-09-13 19:49:58.542882128 +0200
-+++ jwhois-3.2.2/example/jwhois.conf 2004-09-13 19:50:03.757089448 +0200
-@@ -508,6 +508,8 @@
+--- jwhois-3.2.2/example/jwhois.conf.arin 2005-03-23 18:06:59.565864920 +0100
++++ jwhois-3.2.2/example/jwhois.conf 2005-03-23 18:07:32.256895128 +0100
+@@ -607,7 +607,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 = "ReferralServer: r?whois://\\([^:]*\\)";
-+ whois-redirect = "ReferralServer: r?whois://\\(.*\\):\\([0-9]*\\)";
+- whois-redirect = ".* r?whois://\\(.*\\):?\\([0-9]*\\)?/?";
++ whois-redirect = ".* r?whois://\\([^:]*\\):?\\([0-9]*\\)?/?";
}
"whois\\.ncst\\.ernet\\.in" {
jwhois-3.2.2-config-cvs.patch:
jwhois.conf | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 120 insertions(+), 17 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jwhois-3.2.2-config-cvs.patch 20 Feb 2005 22:22:57 -0000 1.1
+++ jwhois-3.2.2-config-cvs.patch 23 Mar 2005 17:20:59 -0000 1.2
@@ -2,10 +2,10 @@
===================================================================
RCS file: /cvsroot/jwhois/jwhois/example/jwhois.conf,v
retrieving revision 1.99
-retrieving revision 1.106
-diff -u -r1.99 -r1.106
+retrieving revision 1.114
+diff -u -r1.99 -r1.114
--- example/jwhois.conf 30 Jun 2003 17:17:24 -0000 1.99
-+++ example/jwhois.conf 10 Feb 2005 06:54:16 -0000 1.106
++++ example/jwhois.conf 23 Mar 2005 13:29:35 -0000 1.114
@@ -55,7 +55,40 @@
"^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br";
@@ -56,7 +56,7 @@
"\\.no\\.com$" = "whois.centralnic.net";
"\\.qc\\.com$" = "whois.centralnic.net";
"\\.ru\\.com$" = "whois.centralnic.net";
-@@ -94,6 +128,7 @@
+@@ -94,10 +128,12 @@
"\\.uk\\.net$" = "whois.centralnic.net";
"\\.us\\.com$" = "whois.centralnic.net";
"\\.uy\\.com$" = "whois.centralnic.net";
@@ -64,7 +64,12 @@
"\\.za\\.com$" = "whois.centralnic.net";
"\\.ac$" = "whois.nic.ac";
-@@ -138,7 +173,7 @@
+ "\\.ae$" = "whois.uaenic.ae";
++ "\\.aero$" = "whois.aero";
+ "\\.ag$" = "whois.nic.ag";
+ "\\.ai$" = "whois.offshore.ai";
+ "\\.al$" = "whois.ripe.net";
+@@ -138,7 +174,7 @@
"\\.cx$" = "whois.nic.cx";
"\\.cy$" = "whois.ripe.net";
"\\.cz$" = "whois.nic.cz";
@@ -73,7 +78,7 @@
"\\.dk$" = "whois.dk-hostmaster.dk";
"\\.do$" = "whois.nic.do";
"\\.dz$" = "whois.ripe.net";
-@@ -147,7 +182,7 @@
+@@ -147,7 +183,7 @@
"\\.ee$" = "whois.eenet.ee";
"\\.eg$" = "whois.ripe.net";
"\\.es$" = "www.nic.es";
@@ -82,7 +87,7 @@
"\\.fj$" = "whois.usp.ac.fj";
"\\.fm$" = "www.dot.fm";
"\\.fo$" = "whois.ripe.net";
-@@ -176,7 +211,7 @@
+@@ -176,7 +212,7 @@
"\\.it$" = "whois.nic.it";
"\\.je$" = "whois.isles.net";
"\\.jp$" {
@@ -91,22 +96,52 @@
query-format = "$* /e";
}
"\\.kg$" = "whois.domain.kg";
-@@ -363,7 +398,10 @@
+@@ -191,14 +227,14 @@
+ "\\.lv$" = "whois.nic.lv";
+ "\\.ma$" = "whois.ripe.net";
+ "\\.mil$" = "whois.nic.mil";
+- "\\.mk$" = "whios.ripe.net";
++ "\\.mk$" = "whois.ripe.net";
+ "\\.mm$" = "whois.nic.mm";
+ "\\.ms$" = "whois.adamsnames.tc";
+ "\\.mt$" = "www.um.edu.mt";
+ "\\.museum$" = "whois.museum";
+ "\\.mw$" = "www.tarsus.net";
+ "\\.mx$" = "whois.nic.mx";
+- "\\.my$" = "whois.mynic.net";
++ "\\.my$" = "whois.mynic.net.my";
+ "\\.na$" = "whois.na-nic.com.na";
+ "\\.name$" = "whois.nic.name";
+ "\\.net$" {
+@@ -346,7 +382,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
+- "210.136.0.0/13" = "whios.nic.ad.jp";
++ "210.136.0.0/13" = "whois.nic.ad.jp";
+ "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 +399,64 @@
"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";
+ "219.96.0.0/11" = "whois.nic.ad.jp";
++ "220.104.0.0/13" = "whois.nic.ad.jp";
+ "220.208.0.0/12" = "whois.nic.ad.jp";
+ "24.132.0.0/16" = "whois.ripe.net";
"24.232.0.0/16" = "whois.lacnic.net";
"43.0.0.0/8" = "whois.v6nic.net";
++ "59.0.0.0/8" = "whois.apnic.net";
"61.0.0.0/8" = "whois.apnic.net";
-@@ -371,6 +409,49 @@
+ "62.0.0.0/8" = "whois.ripe.net";
"80.0.0.0/8" = "whois.ripe.net";
++ "81.192.0.0/16" = "whois.afrinic.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.36.0.0/17" = "whois.afrinic.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";
@@ -152,7 +187,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 +462,12 @@
+@@ -381,6 +467,12 @@
"151.64.0.0/11" = "whois.ripe.net";
"151.96.0.0/14" = "whois.ripe.net";
"151.100.0.0/16" = "whois.ripe.net";
@@ -165,7 +200,7 @@
"160.216.0.0/14" = "whois.ripe.net";
"160.220.0.0/16" = "whois.ripe.net";
"163.13.0.0/16" = "whois.apnic.net";
-@@ -392,6 +479,13 @@
+@@ -392,6 +484,14 @@
"164.0.0.0/11" = "whois.ripe.net";
"164.32.0.0/13" = "whois.ripe.net";
"164.40.0.0/16" = "whois.ripe.net";
@@ -174,12 +209,40 @@
+ "164.160.0.0/14" = "whois.apnic.net";
+ "164.164.0.0/16" = "whois.apnic.net";
+ "165.21.0.0/16" = "whois.apnic.net";
++ "168.95.0.0/16" = "whois.apnic.net";
+ "168.126.0.0/16" = "whois.apnic.net";
+ "168.187.0.0/16" = "whois.ripe.net";
"169.208.0.0/16" = "whois.apnic.net";
"171.16.0.0/12" = "whois.ripe.net";
"171.32.0.0/15" = "whois.ripe.net";
-@@ -647,7 +741,7 @@
+@@ -403,6 +503,7 @@
+ "193.0.0.0/8" = "whois.ripe.net";
+ "194.0.0.0/8" = "whois.ripe.net";
+ "195.0.0.0/8" = "whois.ripe.net";
++ "196.200.0.0/13" = "whois.afrinic.net";
+ "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 +512,9 @@
+ "203.0.0.0/8" = "whois.apnic.net";
+ "210.0.0.0/8" = "whois.apnic.net";
+ "211.0.0.0/8" = "whois.apnic.net";
++ "212.22.160.0/19" = "whois.afrinic.net";
+ "212.0.0.0/8" = "whois.ripe.net";
++ "213.154.64.0/19" = "whois.afrinic.net";
+ "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 +607,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\\.ncst\\.ernet\\.in" {
+@@ -647,7 +750,7 @@
"www\\.noc\\.uz" {
http = "true";
http-method = "POST";
@@ -188,7 +251,7 @@
form-element = "dname";
}
-@@ -693,14 +787,6 @@
+@@ -693,14 +796,6 @@
form-element = "whois";
}
@@ -203,7 +266,7 @@
"whois\\.lacnic\\.net" {
whois-redirect = ".*\\(whois.nic.br\\)";
whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -720,6 +806,14 @@
+@@ -720,6 +815,14 @@
http-action = "/consultas/consdom.html";
form-element = "nombre";
}
Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jwhois.spec 4 Mar 2005 19:43:18 -0000 1.12
+++ jwhois.spec 23 Mar 2005 17:20:59 -0000 1.13
@@ -1,14 +1,13 @@
Name: jwhois
Version: 3.2.2
-Release: 11
+Release: 12
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-typos.patch
-Patch2: jwhois-3.2.2-arin.patch
-Patch3: jwhois-3.2.2-doublefree.patch
-Patch4: jwhois-3.2.2-update_2004.patch
-Patch5: jwhois-3.2.2-webbased.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
License: GPL
Group: Applications/Internet
Summary: Internet whois/nicname client.
@@ -22,11 +21,10 @@
%prep
%setup -q
%patch0 -p0 -b .config
-%patch1 -p1 -b .typos
-%patch2 -p1 -b .arin
-%patch3 -p1 -b .doublefree
-%patch4 -p1 -b .update_2004
-%patch5 -p1 -b .webbased
+%patch1 -p1 -b .arin
+%patch2 -p1 -b .doublefree
+%patch3 -p1 -b .update_2004
+%patch4 -p1 -b .webbased
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 +66,10 @@
[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
%changelog
+* Wed Mar 23 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-12
+- Update to upstream CVS config as of Mar 23 2005 (#151900)
+ Remove now unnecessary typos.patch
+
* Fri Mar 4 2005 Miloslav Trmac <mitr at redhat.com> - 3.2.2-11
- Rebuild with gcc 4
--- jwhois-3.2.2-typos.patch DELETED ---
- Previous message (by thread): rpms/mozilla/FC-2 mozilla.spec,1.18,1.19
- Next message (by thread): rpms/elfutils/devel elfutils-portability.patch, NONE, 1.1 elfutils.spec, 1.15, 1.16 elfutils-0.101-bswap.patch, 1.1, NONE elfutils-0.101-portability.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list