From 31c72438c458b92834135140f3dbb4cdabfdc23a Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Wed, 23 May 2018 23:38:17 -0400
Subject: [PATCH] - Resolves rhbz#1574939 IKEv2 VPN connections fail to use DNS
 servers provided by the server

---
 strongswan-5.6.2-1574939-VPN-DNS.patch | 13 +++++++++++++
 strongswan.spec                        |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 strongswan-5.6.2-1574939-VPN-DNS.patch

diff --git a/strongswan-5.6.2-1574939-VPN-DNS.patch b/strongswan-5.6.2-1574939-VPN-DNS.patch
new file mode 100644
index 0000000..bd2e387
--- /dev/null
+++ b/strongswan-5.6.2-1574939-VPN-DNS.patch
@@ -0,0 +1,13 @@
+diff -Naur strongswan-5.6.2-orig/src/charon-nm/nm/nm_service.c strongswan-5.6.2/src/charon-nm/nm/nm_service.c
+--- strongswan-5.6.2-orig/src/charon-nm/nm/nm_service.c	2018-02-13 11:28:06.000000000 -0500
++++ strongswan-5.6.2/src/charon-nm/nm/nm_service.c	2018-05-23 23:33:14.143959126 -0400
+@@ -65,8 +65,7 @@
+ 	enumerator = handler->create_enumerator(handler, type);
+ 	while (enumerator->enumerate(enumerator, &chunk))
+ 	{
+-		g_variant_builder_add (&builder, "u",
+-							   g_variant_new_uint32 (*(uint32_t*)chunk.ptr));
++		 g_variant_builder_add (&builder, "u", *(uint32_t*)chunk.ptr);
+ 	}
+ 	enumerator->destroy(enumerator);
+ 
diff --git a/strongswan.spec b/strongswan.spec
index 9ca1ce8..bd71616 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -3,12 +3,13 @@
 
 Name:           strongswan
 Version:        5.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 License:        GPLv2+
 URL:            http://www.strongswan.org/
 Source0:        http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
 Patch1:         strongswan-5.6.0-uintptr_t.patch
+Patch2:         strongswan-5.6.2-1574939-VPN-DNS.patch
 
 # only needed for pre-release versions
 #BuildRequires:  autoconf automake
@@ -76,6 +77,7 @@ PT-TLS to support TNC over TLS.
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 %patch1 -p1
+%patch2 -p1
 
 %build
 # only for snapshots
@@ -254,6 +256,9 @@ done
 %{_libexecdir}/strongswan/charon-nm
 
 %changelog
+* Thu May 24 2018 Paul Wouters <pwouters@redhat.com> - 5.6.2-4
+- Resolves rhbz#1574939 IKEv2 VPN connections fail to use DNS servers provided by the server
+
 * Sun May 20 2018 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.6.2-3
 - Move eap-radius, sqlite, and pkcs7 plugins out of tnc-imcvs, added package
   sqlite (#1579945)