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

[Paul Wouters]

commit f575dc16694c0e8586b748a4b85eb917fb7fce65
Merge: 1b179bf 1a3c473
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Nov 7 00:37:07 2014 -0500

    Merge branch 'master' into f21

 .gitignore     |    1 +
 libreswan.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc libreswan.spec
index 5a42dd5,0e7fe17..bd42577
--- a/libreswan.spec
+++ b/libreswan.spec
@@@ -200,11 -200,11 +200,14 @@@ if [ ! -f %{_sysconfdir}/ipsec.d/cert8.
  fi
  
  %changelog
+ * Fri Nov 07 2014 Paul Wouters <pwouters at redhat.com> - 3.12-1
+ - Updated to 3.12 Various IKEv2 fixes
+ 
  * Wed Oct 22 2014 Paul Wouters <pwouters at redhat.com> - 3.11-1
  - Updated to 3.11 (many fixes, including startup fixes)
 +- Resolves: rhbz#1144941 libreswan 3.10 upgrade breaks old ipsec.secrets configs
 +- Resolves: rhbz#1147072 ikev1 aggr mode connection fails after libreswan upgrade
 +- Resolves: rhbz#1144831 Libreswan appears to start with systemd before all the NICs are up and running
  
  * Tue Sep 09 2014 Paul Wouters <pwouters at redhat.com> - 3.10-3
  - Fix some coverity issues, auto=route on bootup and snprintf on 32bit machines