[vpnc/f19] * Mon Sep 23 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-19.svn457 - Add support for dynamically

[Paul Wouters]

commit a91d9f28c917ea2669dfbc92dee91e45cb8511d3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Sep 23 13:38:07 2013 -0400

    * Mon Sep 23 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-19.svn457
    - Add support for dynamically reconfiguring unbound DNS (rhbz#865092)
    
    Conflicts:
    	vpnc.spec

 vpnc-0.5.3-unbound-support.patch |   37 +++++++++++++++++++++++++++++++++++++
 vpnc.spec                        |    9 +++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/vpnc-0.5.3-unbound-support.patch b/vpnc-0.5.3-unbound-support.patch
new file mode 100644
index 0000000..0b742cd
--- /dev/null
+++ b/vpnc-0.5.3-unbound-support.patch
@@ -0,0 +1,37 @@
+--- vpnc-script.orig	2012-10-01 14:14:52.736704348 -0600
++++ vpnc-script.orig	2012-10-24 00:37:17.425238523 -0600
+@@ -86,6 +86,9 @@ 
+ elif [ -x /sbin/modify_resolvconf ]; then # Mandatory tool on Suse earlier than 11.1
+ 	MODIFYRESOLVCONF=modify_resolvconf_suse
+ 	RESTORERESOLVCONF=restore_resolvconf_suse
++elif command -v unbound-control > /dev/null && unbound-control status &> /dev/null; then 
++        MODIFYRESOLVCONF=modify_resolvconf_unbound
++        RESTORERESOLVCONF=restore_resolvconf_unbound
+ else # Generic for any OS
+ 	MODIFYRESOLVCONF=modify_resolvconf_generic
+ 	RESTORERESOLVCONF=restore_resolvconf_generic
+@@ -470,6 +473,24 @@ 
+ 	/sbin/resolvconf -d $TUNDEV
+ }
+ 
++# === resolv.conf handling via unbound =========
++
++modify_resolvconf_unbound() {
++        if [ -n "$CISCO_DEF_DOMAIN" ]; then
++                unbound-control forward_add +i ${CISCO_DEF_DOMAIN} ${INTERNAL_IP4_DNS[@]}
++		unbound-control flush_requestlist
++                unbound-control flush_zone ${CISCO_DEF_DOMAIN}
++        fi
++}
++
++restore_resolvconf_unbound() {
++        if [ -n "$CISCO_DEF_DOMAIN" ]; then
++                unbound-control forward_remove +i ${CISCO_DEF_DOMAIN}
++                unbound-control flush_zone ${CISCO_DEF_DOMAIN}
++		unbound-control	flush_requestlist
++        fi
++}
++
+ # ========= Toplevel state handling  =======================================
+ 
+ kernel_is_2_6_or_above() {
diff --git a/vpnc.spec b/vpnc.spec
index f386396..08c95f2 100644
--- a/vpnc.spec
+++ b/vpnc.spec
@@ -2,7 +2,7 @@
 
 Name:		vpnc
 Version:	0.5.3
-Release:	17%{snapshot}%{?dist}
+Release:	18%{snapshot}%{?dist}
 
 Summary:	IPSec VPN client compatible with Cisco equipment
 
@@ -22,6 +22,7 @@ Source8:	%{name}-tmpfiles.conf
 
 Patch1:		vpnc-0.5.1-dpd.patch
 Patch2:		vpnc-0.5.3-use-autodie.patch
+Patch3:		vpnc-0.5.3-unbound-support.patch
 
 BuildRequires:	libgcrypt-devel > 1.1.90
 BuildRequires:	gnutls-devel
@@ -119,6 +120,10 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 
 %changelog
+<<<<<<< HEAD
+* Mon Sep 23 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-18.svn457
+- Add support for dynamically reconfiguring unbound DNS (rhbz#865092)
+
 * Thu Mar  7 2013 Tomáš Mráz <tmraz at redhat.com> - 0.5.3-17.svn457
 - Make it build
 - Remove vpnc-cleanup upstart configuration file
@@ -255,7 +260,7 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
 * Mon May 16 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-1
 - new upstream version
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Wed Jan 05 2005 Warren Togami <wtogami at redhat.com> 0.3.2-3