[vpnc] Update to svn snapshot

[Daniel Williams]

commit 6bdbfa2698a9e54dfb5178f92ddebf1f1ecb95cf
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Jul 21 09:52:19 2011 -0500

    Update to svn snapshot

 sources   |    2 +-
 vpnc.spec |   16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/sources b/sources
index d4ea7aa..570998b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4378f9551d5b077e1770bbe09995afb3  vpnc-0.5.3.tar.gz
+2172b85ffb22853ae99e4ccdce0201f0  vpnc-0.5.3.svn457.tar.gz
diff --git a/vpnc.spec b/vpnc.spec
index 2defefa..360dfd9 100644
--- a/vpnc.spec
+++ b/vpnc.spec
@@ -1,13 +1,15 @@
+%define snapshot .svn457
+
 Name:           vpnc
 Version:        0.5.3
-Release:        11%{?dist}
+Release:        12%{snapshot}%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.unix-ag.uni-kl.de/~massar/vpnc/
-Source0:        http://www.unix-ag.uni-kl.de/~massar/vpnc/%{name}-%{version}.tar.gz
+Source0:        http://www.unix-ag.uni-kl.de/~massar/vpnc/%{name}-%{version}%{snapshot}.tar.gz
 Source1:        generic-vpnc.conf
 Source2:	vpnc.consolehelper
 Source3:	vpnc-disconnect.consolehelper
@@ -15,8 +17,7 @@ Source4:	vpnc.pam
 Source5:	vpnc-helper
 Source6:	vpnc-cleanup
 Source7:	http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/a1cac186:/vpnc-script
-Patch2:		vpnc-0.5.3-cloexec.patch
-Patch3:		vpnc-0.5.1-dpd.patch
+Patch1:		vpnc-0.5.1-dpd.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,8 +52,7 @@ or openconnect.
 
 %prep
 %setup -q
-%patch2 -p1 -b .cloexec
-%patch3 -p1 -b .dpd
+%patch1 -p1 -b .dpd
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
@@ -120,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 
 %changelog
+* Thu Jul 21 2011 Dan Williams <dcbw at redhat.com> - 0.5.3-12.svn457
+- Update to svn snapshot r457
+- Enable support for Hybrid XAUTH (see rh #677419)
+
 * Sat May 28 2011 David Woodhouse <David.Woodhouse at intel.com> - 0.5.3-11
 - Update vpnc-script to cope with 'ipid' in route list.