From 03fe09fae632053a09f8cf396787c703fbf50ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 23 Aug 2017 11:55:02 +0200
Subject: [PATCH] 5.2.18 bump

---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 ...tation-and-IPv6-queries-with-libidn2.patch | 50 -------------------
 whois.spec                                    | 28 ++++-------
 4 files changed, 13 insertions(+), 68 deletions(-)
 delete mode 100644 whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch

diff --git a/.gitignore b/.gitignore
index 3439ea2..c904598 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /whois_5.2.15.tar.xz
 /whois_5.2.16.tar.xz
 /whois_5.2.17.tar.xz
+/whois_5.2.18.tar.xz
diff --git a/sources b/sources
index 03d7cf2..0c44702 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (whois_5.2.17.tar.xz) = b65de384ac935518bde0cee42f46f4bf99dc94e94e411b103df8eb73291c317409837adba2a358dfebdae6e1c46d85ccfe8debf86233be64eb91ebfe86a29152
+SHA512 (whois_5.2.18.tar.xz) = dcbfbab0da3b9b5876c7c51bc411ac371a5c33012bf1286a3e6ccfb59fb4fba89eab1c4b812766d2f101a93ca3424ef636214c05add59549b9809621dfb03d73
diff --git a/whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch b/whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch
deleted file mode 100644
index ce87a79..0000000
--- a/whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d6e33ff64742f48f2022980fd4889ec36662cc30 Mon Sep 17 00:00:00 2001
-From: Andreas Stieger <astieger@suse.com>
-Date: Tue, 4 Apr 2017 18:27:37 +0200
-Subject: [PATCH] Fix CIDR notation and IPv6 queries with libidn2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes #50
-Fixes https://bugzilla.opensuse.org/show_bug.cgi?id=1026831
-Signed-off-by: Andreas Stieger <astieger@suse.com>
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- whois.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/whois.c b/whois.c
-index 8f5f1f1..7259c7f 100644
---- a/whois.c
-+++ b/whois.c
-@@ -1172,6 +1172,12 @@ char *normalize_domain(const char *dom)
- 	int prefix_len;
- 
- #ifdef HAVE_LIBIDN2
-+        /* skip CIDR notation */
-+	if (NULL != strchr(domain_start, '/'))
-+            return ret;
-+	/* skip IPv6 */
-+	if (NULL != strchr(domain_start, ':'))
-+            return ret;
- 	if (idn2_lookup_ul(domain_start, &q, IDN2_NONTRANSITIONAL) != IDN2_OK)
- 	    return ret;
- #else
-@@ -1193,6 +1199,12 @@ char *normalize_domain(const char *dom)
- 	char *q;
- 
- #ifdef HAVE_LIBIDN2
-+        /* skip CIDR notation */
-+	if (NULL != strchr(ret, '/'))
-+            return ret;
-+        /* skip IPv6 */
-+	if (NULL != strchr(ret, ':'))
-+            return ret;
- 	if (idn2_lookup_ul(ret, &q, IDN2_NONTRANSITIONAL) != IDN2_OK)
- 	    return ret;
- #else
--- 
-2.7.4
-
diff --git a/whois.spec b/whois.spec
index b6385eb..050386b 100644
--- a/whois.spec
+++ b/whois.spec
@@ -4,25 +4,25 @@
 %{bcond_without whois_enables_libidn2}
 
 Name:       whois       
-Version:    5.2.17
-Release:    2%{?dist}
+Version:    5.2.18
+Release:    1%{?dist}
 Summary:    Improved WHOIS client
 License:    GPLv2+
 URL:        http://www.linux.it/~md/software/
 Source0:    http://ftp.debian.org/debian/pool/main/w/%{name}/%{name}_%{version}.tar.xz
-# Do not pass non-domains to libidn2,
-# <https://github.com/rfc1036/whois/issues/50>,
-# <https://github.com/rfc1036/whois/pull/53>
-Patch0:     whois-5.2.15-Fix-CIDR-notation-and-IPv6-queries-with-libidn2.patch
 BuildRequires:  coreutils
 BuildRequires:  gcc
 BuildRequires:  gettext
 %if %{with whois_enables_idn}
 %if %{with whois_enables_libidn2}
-BuildRequires:  libidn2-devel
+BuildRequires:  pkgconfig(libidn2) >= 2.0.3
 %else
-BuildRequires:  libidn-devel
+BuildRequires:  pkgconfig(libidn)
+BuildConflicts: pkgconfig(libidn2)
 %endif
+%else
+BuildConflicts: pkgconfig(libidn)
+BuildConflicts: pkgconfig(libidn2)
 %endif
 BuildRequires:  make
 BuildRequires:  perl-interpreter
@@ -46,18 +46,9 @@ addresses and network names.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 
 %build
-# libidn2 support is broken <https://github.com/rfc1036/whois/issues/50>
 make CONFIG_FILE="%{_sysconfdir}/%{cfgfile}" \
-%if %{with whois_enables_idn}
-%if %{with whois_enables_libidn2}
-    HAVE_LIBIDN2=1 \
-%else
-    HAVE_LIBIDN=1 \
-%endif
-%endif
     HAVE_ICONV=1 \
     CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="%{__global_ldflags}" %{?_smp_mflags}
 
@@ -98,6 +89,9 @@ fi
 %{_mandir}/man5/%{cfgfile}.5.gz
 
 %changelog
+* Wed Aug 23 2017 Petr Pisar <ppisar@redhat.com> - 5.2.18-1
+- 5.2.18 bump
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild