[libreswan/f20: 5/5] Merge branch 'f19' into f20

[Paul Wouters]

commit 8a5a39471fb4f1408ce4ced60bb2fbaed7a3a5df
Merge: decff41 7169f7f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Nov 2 16:00:47 2013 -0700

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

 .gitignore     |    1 +
 libreswan.spec |   35 +++++++++++++++++++++++++----------
 sources        |    2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 300c5ab,6a72691..c7810e6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
  /libreswan-3.2.tar.gz
  /libreswan-3.3.tar.gz
 +/libreswan-3.4.tar.gz
  /libreswan-3.5.tar.gz
+ /libreswan-3.6.tar.gz
diff --cc libreswan.spec
index 34d8880,2ca35ff..50aad37
--- a/libreswan.spec
+++ b/libreswan.spec
@@@ -185,15 -189,21 +189,26 @@@ rm -fr %{buildroot}/etc/rc.d/rc
  
  %post
  %systemd_post ipsec.service
+ if [ ! -f /etc/ipsec.d/cert8.db ] ; then
+ echo > /var/tmp/libreswan-nss-pwd
+ certutil -N -f /var/tmp/libreswan-nss-pwd -d /etc/ipsec.d
+ restorecon /etc/ipsec.d/*db 2>/dev/null || :
+ rm /var/tmp/libreswan-nss-pwd
+ fi
  
  %changelog
+ * 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-2
 +* Mon Aug 19 2013 Paul Wouters <pwouters at redhat.com> - 3.5-3
  - 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