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

[Paul Wouters]

commit d314a88f612cc9a5d4be4214ef630124db6ec45e
Merge: 1111dfc 68fd6c5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jan 17 17:49:27 2014 -0800

    Merge branch 'master' into f19

 .gitignore     |    1 +
 libreswan.spec |   10 +++++++---
 sources        |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc libreswan.spec
index cc9a87c,d5d1d26..748d2af
--- a/libreswan.spec
+++ b/libreswan.spec
@@@ -199,16 -200,24 +199,20 @@@ if [ ! -f %{_sysconfdir}/ipsec.d/cert8.
  fi
  
  %changelog
+ * Sat Jan 18 2014 Paul Wouters <pwouters at redhat.com> - 3.8-1
+ - Updated to 3.8, fixes rhbz#CVE-2013-6467 (rhbz#1054102)
+ 
  * Wed Dec 11 2013 Paul Wouters <pwouters at redhat.com> - 3.7-1
  - Updated to 3.7, fixes CVE-2013-4564
+ - Fixes creating a bogus NSS db on startup (rhbz#1005410)
  
 -* 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