From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 8 Apr 2015 10:20:44 +0000 (-0300)
Subject: strongswan: bump to version 5.3.0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6117fa4501bcf35d46c60a79b954f92673f7bd39;p=buildroot.git

strongswan: bump to version 5.3.0

Enable connmark and forecast plugins when iptables is selected.
And always enable the led plugin, though it's not new to 5.3.0.

[Thomas: also update hash file.]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash
index 6073b3656e..626356a0bf 100644
--- a/package/strongswan/strongswan.hash
+++ b/package/strongswan/strongswan.hash
@@ -1,2 +1,2 @@
-# From http://download.strongswan.org/strongswan-5.2.2.tar.bz2.md5
-md5	7ee1a33060b2bde35be0f6d78a1d26d0	strongswan-5.2.2.tar.bz2
+# From http://download.strongswan.org/strongswan-5.3.0.tar.bz2.md5
+md5	c52d4228231c2025d9c320d0e9990327	strongswan-5.3.0.tar.bz2
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index 059955d8b6..057870fa80 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRONGSWAN_VERSION = 5.2.2
+STRONGSWAN_VERSION = 5.3.0
 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
 STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPLv2+
@@ -12,6 +12,7 @@ STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
 STRONGSWAN_CONF_OPTS += \
 	--without-lib-prefix \
+	--enable-led \
 	--enable-pkcs11=yes \
 	--enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
 	--enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
@@ -70,4 +71,15 @@ STRONGSWAN_DEPENDENCIES += \
 	$(if $(BR2_PACKAGE_MYSQL),mysql)
 endif
 
+ifeq ($(BR2_PACKAGE_IPTABLES),y)
+STRONGSWAN_DEPENDENCIES += iptables
+STRONGSWAN_CONF_OPTS += \
+	--enable-connmark \
+	--enable-forecast
+else
+STRONGSWAN_COF_OPTS += \
+	--disable-connmark \
+	--disable-forecast
+endif
+
 $(eval $(autotools-package))