From fadb3a4bd61b8d29b59f7df10eba95e6152e5658 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Jul 13 2012 07:43:30 +0000
Subject: Document how to write IDN in whois.conf


---

diff --git a/whois-5.0.17-Document-how-to-write-IDN-in-whois.conf.patch b/whois-5.0.17-Document-how-to-write-IDN-in-whois.conf.patch
new file mode 100644
index 0000000..4ba5baf
--- /dev/null
+++ b/whois-5.0.17-Document-how-to-write-IDN-in-whois.conf.patch
@@ -0,0 +1,43 @@
+From cbe52c7364341f916bbc975e193a6484cebbce49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 13 Jul 2012 09:33:16 +0200
+Subject: [PATCH] Document how to write IDN in whois.conf
+
+The whois.conf parser cannot handle IDN names. Putting the regular
+expressions using ACE notation works.
+---
+ whois.1    |    3 ++-
+ whois.conf |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/whois.1 b/whois.1
+index ec5f86b..ba80b93 100644
+--- a/whois.1
++++ b/whois.1
+@@ -80,7 +80,8 @@ separator (which marks the beginning of the query string).
+ If the \fI/etc/whois.conf\fR config file exists, it will be consulted
+ to find a server before applying the normal rules. Each line of the
+ file should contain a regular expression to be matched against the query
+-text and the whois server to use, separated by white space.
++text and the whois server to use, separated by white space. IDN names
++have to be noted in ACE format. 
+ .P
+ The whois protocol does not specify an encoding for characters which
+ cannot be represented by ASCII and implementations vary wildly.
+diff --git a/whois.conf b/whois.conf
+index 8eada18..33ef7c6 100644
+--- a/whois.conf
++++ b/whois.conf
+@@ -3,7 +3,8 @@
+ # This file can contain details of alternative whois servers to use if
+ # the compiled in servers are not suitable.  Each entry is a single
+ # text line and consists of a regular expression pattern to match and
+-# the whois server to be used for it, separated by blank space. 
++# the whois server to be used for it, separated by blank space.  IDN names
++# have to be noted in ACE format. 
+ #
+ # Eg: 
+ # \.nz$ nz.whois-servers.net
+-- 
+1.7.7.6
+
diff --git a/whois.spec b/whois.spec
index 4dd9eeb..96a4c0c 100644
--- a/whois.spec
+++ b/whois.spec
@@ -9,6 +9,8 @@ URL:        http://www.linux.it/~md/software/
 Source0:    http://ftp.debian.org/debian/pool/main/w/%{name}/%{name}_%{version}.tar.xz
 # Update xn-mgbaam7a8 TLD, bug #839893, submitted to upstream
 Patch0:     whois-5.0.17-.xn-mgbaam7a8-is-handled-by-whois.aeda.net.ae.patch
+# Document IDN in configuration file, bug #839898, submitted to upstream
+Patch1:     whois-5.0.17-Document-how-to-write-IDN-in-whois.conf.patch
 
 BuildRequires:  gettext, libidn-devel, perl
 Requires(post): %{_sbindir}/update-alternatives
@@ -31,6 +33,7 @@ addresses and network names.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .xn-mgbaam7a8
+%patch1 -p1 -b .idnconf
 # Enable NLS
 sed -i -e 's:#\(.*pos\):\1:' Makefile
 
@@ -80,6 +83,7 @@ fi
 %changelog
 * Fri Jul 13 2012 Petr Pisar <ppisar@redhat.com> - 5.0.17-2
 - .xn--mgbaam7a8 is handled by whois.aeda.net.ae (bug #839893)
+- Document how to write IDN in whois.conf (bug #839898)
 
 * Wed Jun 27 2012 Petr Pisar <ppisar@redhat.com> - 5.0.17-1
 - 5.0.17 bump