From 31bbc35fba8e69813f64e32db972ebfc4e31ff55 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Apr 16 2018 20:12:37 +0000
Subject: Switch from libidn to libidn2


https://pagure.io/certmonger/issue/102

Signed-off-by: Rob Crittenden <rcritten@redhat.com>

---

diff --git a/certmonger.spec b/certmonger.spec
index 1cc0931..745994e 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -37,7 +37,7 @@ Source0:	http://releases.pagure.org/certmonger/certmonger-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	openldap-devel
-BuildRequires:	dbus-devel, nspr-devel, nss-devel, openssl-devel, libidn-devel
+BuildRequires:	dbus-devel, nspr-devel, nss-devel, openssl-devel, libidn2-devel
 BuildRequires:	autoconf, automake, gcc, gettext-devel
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 BuildRequires:  libuuid-devel
@@ -243,6 +243,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Apr  2 2018 Rob Crittenden <rcritten@redhat.com> 0.79.5-2
+- Switch from libidn to libidn2 for better IDNA2008 support
+
 * Fri Sep  1 2017 Rob Crittenden <rcritten@redhat.com> 0.79.5-1
 - update to 0.79.5:
    - getcert start-tracking: use issuer option when specified
diff --git a/configure.ac b/configure.ac
index d35b100..df274db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,7 +788,7 @@ if ! ${configure_dist_target_only:-false} ; then
 	fi,
 	idn=true)
 	if $idn ; then
-		PKG_CHECK_MODULES(IDN,libidn)
+		PKG_CHECK_MODULES(IDN,libidn2)
 		AC_DEFINE(CM_USE_IDN,1,[Define if dnsName subjectAltNames should be encoded properly, and if international domain names should be handled during service location.])
 	fi
 
diff --git a/src/certext.c b/src/certext.c
index 6b2ecf3..be53698 100644
--- a/src/certext.c
+++ b/src/certext.c
@@ -42,7 +42,7 @@
 #include <krb5.h>
 
 #ifdef CM_USE_IDN
-#include <idna.h>
+#include <idn2.h>
 #endif
 
 #include "certext.h"
diff --git a/src/srvloc.c b/src/srvloc.c
index fc58461..acab55b 100644
--- a/src/srvloc.c
+++ b/src/srvloc.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 #ifdef CM_USE_IDN
-#include <idna.h>
+#include <idn2.h>
 #endif
 
 #ifdef HAVE_OPENSSL