strongswan: kill unnecessary whitespace

PATCH New Gustavo Zacarias 2 participants 4 messages Apr 8, 2015

lore

Share & tools

lore

Gustavo Zacarias

author

2015-04-08 10:20 UTC #0 lore raw

PATCH 1/2 strongswan: kill unnecessary whitespace

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/strongswan/strongswan.mk | 92 ++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

package/strongswan/strongswan.mk +46 ~~-46~~

index 2d23383..059955d 100644
@@ -10,63 +10,63 @@ STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPLv2+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
-STRONGSWAN_CONF_OPTS +=                                                              \
-	--without-lib-prefix                                                         \
-	--enable-pkcs11=yes                                                          \
-	--enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no)                        \
-	--enable-socket-default=$(if $(BR2_INET_IPV6),yes,no)                        \
-	--enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no)              \
-	--enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no)                \
-	--enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no)                      \
-	--enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no)                \
-	--enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no)                    \
-	--enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no)                \
-	--enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no)            \
-	--enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no)            \
-	--enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no)  \
-	--enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no)    \
-	--enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no)                  \
-	--enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no)                \
-	--enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no)                      \
-	--enable-pki=$(if $(BR2_PACKAGE_STRONGSWAN_PKI),yes,no)                      \
-	--enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no)              \
-	--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)              \
-	--enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no)                    \
+STRONGSWAN_CONF_OPTS += \
+	--without-lib-prefix \
+	--enable-pkcs11=yes \
+	--enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
+	--enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
+	--enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
+	--enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
+	--enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
+	--enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
+	--enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
+	--enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
+	--enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
+	--enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
+	--enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
+	--enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
+	--enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
+	--enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
+	--enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
+	--enable-pki=$(if $(BR2_PACKAGE_STRONGSWAN_PKI),yes,no) \
+	--enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no) \
+	--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \
+	--enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \
 	--enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no)
 
 ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
-STRONGSWAN_CONF_OPTS +=               \
-	--enable-eap-sim              \
-	--enable-eap-sim-file         \
-	--enable-eap-aka              \
-	--enable-eap-aka-3gpp2        \
-	--enable-eap-simaka-sql       \
+STRONGSWAN_CONF_OPTS += \
+	--enable-eap-sim \
+	--enable-eap-sim-file \
+	--enable-eap-aka \
+	--enable-eap-aka-3gpp2 \
+	--enable-eap-simaka-sql \
 	--enable-eap-simaka-pseudonym \
-	--enable-eap-simaka-reauth    \
-	--enable-eap-identity         \
-	--enable-eap-md5              \
-	--enable-eap-gtc              \
-	--enable-eap-mschapv2         \
-	--enable-eap-tls              \
-	--enable-eap-ttls             \
-	--enable-eap-peap             \
-	--enable-eap-tnc              \
-	--enable-eap-dynamic          \
+	--enable-eap-simaka-reauth \
+	--enable-eap-identity \
+	--enable-eap-md5 \
+	--enable-eap-gtc \
+	--enable-eap-mschapv2 \
+	--enable-eap-tls \
+	--enable-eap-ttls \
+	--enable-eap-peap \
+	--enable-eap-tnc \
+	--enable-eap-dynamic \
 	--enable-eap-radius
 STRONGSWAN_DEPENDENCIES += gmp
 endif
 
-STRONGSWAN_DEPENDENCIES +=                                 \
-	$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl)    \
-	$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt)   \
-	$(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp)            \
-	$(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl)       \
-	$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2)   \
+STRONGSWAN_DEPENDENCIES += \
+	$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
+	$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
+	$(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
+	$(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
+	$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
 	$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
 
 ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
-STRONGSWAN_DEPENDENCIES +=                                 \
-	$(if $(BR2_PACKAGE_SQLITE),sqlite)                 \
+STRONGSWAN_DEPENDENCIES += \
+	$(if $(BR2_PACKAGE_SQLITE),sqlite) \
 	$(if $(BR2_PACKAGE_MYSQL),mysql)
 endif

Signature · 1 line

2.0.5

Gustavo Zacarias

author

2015-04-08 10:20 UTC #1 lore raw

PATCH 2/2 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.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/strongswan/strongswan.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

package/strongswan/strongswan.mk +13 -1

index 059955d..057870f 100644
@@ -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))

Signature · 1 line

2.0.5

Thomas Petazzoni

2015-04-08 19:15 UTC #2 lore raw

PATCH 2/2 strongswan: bump to version 5.3.0

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias

Enable connmark and forecast plugins when iptables is selected. And always enable the led plugin, though it's not new to 5.3.0.
Signed-off-by Gustavo Zacarias <[email protected]>

You missed updating the hash file, so I did that while committing.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2015-04-08 19:15 UTC #3 lore raw

PATCH 1/2 strongswan: kill unnecessary whitespace

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/strongswan/strongswan.mk | 92 ++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

Applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com