From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Jun 2014 12:39:21 +0000 (+0200)
Subject: strongswan: Update to 5.2.0dr6.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=567fadff6a099d8e2d59ee6ce1e1957cb5de8840;p=people%2Fms%2Fipfire-2.x.git

strongswan: Update to 5.2.0dr6.
---

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 6d7bb0de46..550fa69d9a 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -30,6 +30,7 @@ etc/strongswan.d/charon/eap-tls.conf
 etc/strongswan.d/charon/eap-ttls.conf
 etc/strongswan.d/charon/farp.conf
 etc/strongswan.d/charon/fips-prf.conf
+etc/strongswan.d/charon/gcrypt.conf
 etc/strongswan.d/charon/gmp.conf
 etc/strongswan.d/charon/hmac.conf
 etc/strongswan.d/charon/kernel-netlink.conf
@@ -60,6 +61,7 @@ etc/strongswan.d/charon/xauth-eap.conf
 etc/strongswan.d/charon/xauth-generic.conf
 etc/strongswan.d/charon/xauth-noauth.conf
 etc/strongswan.d/charon/xcbc.conf
+etc/strongswan.d/pki.conf
 etc/strongswan.d/starter.conf
 etc/strongswan.d/tools.conf
 usr/bin/pki
@@ -106,6 +108,7 @@ usr/lib/ipsec/plugins/libstrongswan-eap-tls.so
 usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so
 usr/lib/ipsec/plugins/libstrongswan-farp.so
 usr/lib/ipsec/plugins/libstrongswan-fips-prf.so
+usr/lib/ipsec/plugins/libstrongswan-gcrypt.so
 usr/lib/ipsec/plugins/libstrongswan-gmp.so
 usr/lib/ipsec/plugins/libstrongswan-hmac.so
 usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
@@ -186,6 +189,7 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/plugins/eap-ttls.conf
 #usr/share/strongswan/templates/config/plugins/farp.conf
 #usr/share/strongswan/templates/config/plugins/fips-prf.conf
+#usr/share/strongswan/templates/config/plugins/gcrypt.conf
 #usr/share/strongswan/templates/config/plugins/gmp.conf
 #usr/share/strongswan/templates/config/plugins/hmac.conf
 #usr/share/strongswan/templates/config/plugins/kernel-netlink.conf
@@ -220,5 +224,6 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/strongswan.d
 #usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf
 #usr/share/strongswan/templates/config/strongswan.d/charon.conf
+#usr/share/strongswan/templates/config/strongswan.d/pki.conf
 #usr/share/strongswan/templates/config/strongswan.d/starter.conf
 #usr/share/strongswan/templates/config/strongswan.d/tools.conf
diff --git a/config/rootfiles/core/80/filelists/strongswan b/config/rootfiles/core/80/filelists/strongswan
new file mode 120000
index 0000000000..90c727e265
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/lfs/strongswan b/lfs/strongswan
index ba492106ec..7448c8d2fb 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1.3
+VER        = 5.2.0dr6
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1d1c108775242743cd8699215b2918c3
+$(DL_FILE)_MD5 = 6b9ac43a3934dcdf66ccbdfebc54081b
 
 install : $(TARGET)
 
@@ -88,6 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-dhcp \
 		--enable-farp \
 		--enable-openssl \
+		--enable-gcrypt \
 		--enable-xauth-eap \
 		--enable-xauth-noauth \
 		--enable-eap-radius \