rpms/jwhois/devel jwhois-4.0-enum.patch, NONE, 1.1 jwhois-4.0-fclose.patch, NONE, 1.1 jwhois.spec, 1.44, 1.45

[Vitezslav Crhonek]

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28683

Modified Files:
	jwhois.spec 
Added Files:
	jwhois-4.0-enum.patch jwhois-4.0-fclose.patch 
Log Message:
fclose, enum domains support

jwhois-4.0-enum.patch:

--- NEW FILE jwhois-4.0-enum.patch ---
diff -up jwhois-4.0/example/jwhois.conf.enum jwhois-4.0/example/jwhois.conf
--- jwhois-4.0/example/jwhois.conf.enum	2009-01-27 13:39:48.000000000 +0100
+++ jwhois-4.0/example/jwhois.conf	2009-01-27 13:42:09.000000000 +0100
@@ -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
@@ -311,6 +316,15 @@ whois-servers {
 }
 
 #
+# enum-blocks
+#
+enum-blocks {
+	type = regex;
+
+	"\\.9\\.4\\.e164\\.arpa$" = "whois.enum.denic.de";
+}
+
+#
 # 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.
 #
@@ -915,6 +929,11 @@ server-options {
 		query-format = "-C UTF-8 -T dn,ace $*";
 		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";
 	}

jwhois-4.0-fclose.patch:

--- NEW FILE jwhois-4.0-fclose.patch ---
diff -up jwhois-4.0/src/init.c_old jwhois-4.0/src/init.c
--- jwhois-4.0/src/init.c_old	2007-06-26 08:59:17.000000000 +0200
+++ jwhois-4.0/src/init.c	2009-01-27 15:49:35.000000000 +0100
@@ -283,6 +283,8 @@ parse_args(int *argc, char ***argv)
   if (in)
     jconfig_parse_file(in);
 
+  fclose(in);
+
   if (verbose>1)
     {
       printf("[Debug: Cache = %s]\n", cache?"On":"Off");


Index: jwhois.spec
===================================================================
RCS file: /cvs/extras/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- jwhois.spec	23 Jan 2009 12:21:04 -0000	1.44
+++ jwhois.spec	4 Feb 2009 12:31:53 -0000	1.45
@@ -1,12 +1,14 @@
 Name: jwhois
 Version: 4.0
-Release: 9%{?dist}
+Release: 10%{?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
 License: GPLv3
 Group: Applications/Internet
 Summary: Internet whois/nicname client
@@ -24,6 +26,8 @@
 %patch1 -p1 -b .ipv6match
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .gi
+%patch4 -p1 -b .enum
+%patch5 -p1 -b .fclose
 
 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
@@ -63,6 +67,11 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-10
+- Close config file descriptor when finished reading the config file
+- Add support for ENUM domains into jwhois.conf
+  Resolves: #465182
+
 * Fri Jan 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-9
 - Change the server used for .gi domains