[libreswan/f19: 10/10] Merge branch 'master' into f19

[Paul Wouters]

commit 1111dfc8958af5d311df384532ae2e8458479f85
Merge: 7169f7f fe27601
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Dec 11 13:54:32 2013 -0500

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	libreswan.spec
    	sources

 .gitignore     |    2 ++
 libreswan.spec |   27 ++++++++++++++++-----------
 sources        |    2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)
---
diff --cc libreswan.spec
index 2ca35ff,be12fd4..cc9a87c
--- a/libreswan.spec
+++ b/libreswan.spec
@@@ -197,13 -200,20 +199,16 @@@ if [ ! -f %{_sysconfdir}/ipsec.d/cert8.
  fi
  
  %changelog
+ * Wed Dec 11 2013 Paul Wouters <pwouters at redhat.com> - 3.7-1
+ - Updated to 3.7, fixes CVE-2013-4564
+ 
 -* Thu Oct 31 2013 Paul Wouters <pwouters at redhat.com> - 3.6-1
 +* Sat Nov 02 2013 Paul Wouters <pwouters at redhat.com> - 3.6-1
  - Updated to 3.6 (IKEv2, MODECFG, Cisco interop fixes)
  - Generate empty NSS db if none exists
 +- FIPS update, prelink blacklist added.
  
 -* Mon Aug 19 2013 Paul Wouters <pwouters at redhat.com> - 3.5-3
 +* Mon Aug 19 2013 Paul Wouters <pwouters at redhat.com> - 3.5-2
  - Add a Provides: for openswan-doc
 -
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5-1.1
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Mon Jul 15 2013 Paul Wouters <pwouters at redhat.com> - 3.5-2
  - Added interop patch for (some?) Cisco VPN clients sending 16 zero
    bytes of extraneous IKE data
  - Removed fipscheck_version