Merge tag 'upstream/5.0.4'

Upstream version 5.0.4

5 files changed, 37 insertions, 0 deletions

diff --git a/testing/scripts/recipes/011_xfrm-proxy.mk b/testing/scripts/recipes/009_xfrm-proxy.mk
index 569fbfe3c..569fbfe3c 100644
--- a/testing/scripts/recipes/011_xfrm-proxy.mk
+++ b/testing/scripts/recipes/009_xfrm-proxy.mk
diff --git a/testing/scripts/recipes/009_tkm.mk b/testing/scripts/recipes/010_tkm.mk
index 971cd170f..971cd170f 100644
--- a/testing/scripts/recipes/009_tkm.mk
+++ b/testing/scripts/recipes/010_tkm.mk
diff --git a/testing/scripts/recipes/011_openssl-fips.mk b/testing/scripts/recipes/011_openssl-fips.mk
new file mode 100644
index 000000000..5d28b181e
--- /dev/null
+++ b/testing/scripts/recipes/011_openssl-fips.mk
@@ -0,0 +1,23 @@
+#!/usr/bin/make
+
+PV  = 2.0.3
+PKG = openssl-fips-$(PV)
+TAR = $(PKG).tar.gz
+SRC = http://www.openssl.org/source/$(TAR)
+
+all: install
+
+$(TAR):
+	wget $(SRC)
+
+$(PKG): $(TAR)
+	tar xfz $(TAR)
+
+configure: $(PKG)
+	cd $(PKG) && ./config
+
+build: configure
+	cd $(PKG) && make
+
+install: build
+	cd $(PKG) && make install
diff --git a/testing/scripts/recipes/012_openssl.mk b/testing/scripts/recipes/012_openssl.mk
new file mode 100644
index 000000000..9312445ce
--- /dev/null
+++ b/testing/scripts/recipes/012_openssl.mk
@@ -0,0 +1,13 @@
+#!/usr/bin/make
+
+PV  = 1.0.1e
+PKG = openssl-$(PV)
+SRC = http://download.strongswan.org/testing/openssl-fips/
+
+all: install
+
+$(PKG):
+	wget -r $(SRC) --no-directories --directory-prefix $(PKG) --accept deb
+
+install: $(PKG)
+	cd $(PKG) && dpkg -i *.deb
diff --git a/testing/scripts/recipes/010_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index 94abb9ddb..14fdebbc9 100644
--- a/testing/scripts/recipes/010_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -12,6 +12,7 @@ CONFIG_OPTS = \
 	--with-random-device=/dev/urandom \
 	--disable-load-warning \
 	--enable-curl \
+	--enable-soup \
 	--enable-ldap \
 	--enable-eap-aka \
 	--enable-eap-aka-3gpp2 \