strongswan: bump to version 5.2.1

PATCH New Gustavo Zacarias 2 participants 4 messages Dec 16, 2014 – Dec 22, 2014

lore

Share & tools

lore

Gustavo Zacarias

author

2014-12-16 00:56 UTC #0 lore raw

PATCH 1/1 strongswan: bump to version 5.2.1

Also add hash file.

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

---
 package/strongswan/Config.in       | 17 +++++++++++++----
 package/strongswan/strongswan.hash |  2 ++
 package/strongswan/strongswan.mk   |  9 ++++++---
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 package/strongswan/strongswan.hash

package/strongswan/Config.in +13 -4

index 3b0f47f..c1b7f41 100644
@@ -110,13 +110,22 @@ config BR2_PACKAGE_STRONGSWAN_SQL
 
 endif
 
-config BR2_PACKAGE_STRONGSWAN_TOOLS
-	bool "Enable additional utilities (openac, scepclient and pki)"
+config BR2_PACKAGE_STRONGSWAN_PKI
+	bool "Enable pki certificate utility"
+	default y
+
+config BR2_PACKAGE_STRONGSWAN_SCEP
+	bool "Enable SCEP client tool"
 	default y
 
 config BR2_PACKAGE_STRONGSWAN_SCRIPTS
-	bool "Enable additional utilities (found in directory scripts)"
-	depends on BR2_PACKAGE_STRONGSWAN_CHARON || BR2_PACKAGE_STRONGSWAN_TOOLS
+	bool "Enable additional utilities (found in scripts directory)"
+	depends on BR2_PACKAGE_STRONGSWAN_CHARON
+	default y
+
+config BR2_PACKAGE_STRONGSWAN_VICI
+	bool "Enable vici/swanctl"
+	depends on BR2_PACKAGE_STRONGSWAN_CHARON
 	default y
 
 endif

package/strongswan/strongswan.hash new file +2 -0

new file mode 100644
index 0000000..f434530
@@ -0,0 +1,2 @@
+# From http://download.strongswan.org/strongswan-5.2.1.tar.bz2.md5
+md5	dd3717c0aa59ab4591ca1812941ebb82	strongswan-5.2.1.tar.bz2

package/strongswan/strongswan.mk +6 -3

index bb1d268..f1fe3cc 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRONGSWAN_VERSION = 5.1.3
+STRONGSWAN_VERSION = 5.2.1
 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
 STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPLv2+

@@ -28,8 +28,11 @@ STRONGSWAN_CONF_OPTS +=
 	--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-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no)                  \
-	--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),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 +=               \

Signature · 1 line

2.0.4

Thomas Petazzoni

2014-12-20 20:48 UTC #1 lore raw

PATCH 1/1 strongswan: bump to version 5.2.1

Dear Gustavo Zacarias,

package/strongswan/Config.in config BR2_PACKAGE_STRONGSWAN_SQL · line 114

Quoted 2 lines · Gustavo Zacarias

package/strongswan/Config.in +0 -2

-config BR2_PACKAGE_STRONGSWAN_TOOLS
-	bool "Enable additional utilities (openac, scepclient and pki)"

You're removing this option. Shouldn't it be added to Config.in.legacy, for proper legacy handling?

Thanks,

Thomas

Signature · 3 lines

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

Gustavo Zacarias

author

2014-12-22 11:35 UTC #2 lore raw

PATCH 1/1 strongswan: bump to version 5.2.1

Quoted 5 lines · Thomas Petazzoni

package/strongswan/Config.in config BR2_PACKAGE_STRONGSWAN_SQL · line 114
Quoted 2 lines
package/strongswan/Config.in +0 -2
-config BR2_PACKAGE_STRONGSWAN_TOOLS
-	bool "Enable additional utilities (openac, scepclient and pki)"
You're removing this option. Shouldn't it be added to Config.in.legacy, for proper legacy handling?

Hi.
Possibly, however it won't do any good since some tools (openac) are just gone upstream and i've defaulted to 'y' for the new split tool options. Frankly speaking i'd rather see the number of options reduced for this package, only a few of them introduce dependencies:
Curl fetcher (libcurl)
TNCCS 1.1 (libxml2)
EAP-SIM (pcsc-lite)

And that's it, the other options won't make strongswan that big. Regards.

Thomas Petazzoni

2014-12-22 13:04 UTC #3 lore raw

PATCH 1/1 strongswan: bump to version 5.2.1

Dear Gustavo Zacarias,

Quoted 2 lines · Gustavo Zacarias

Possibly, however it won't do any good since some tools (openac) are just gone upstream and i've defaulted to 'y' for the new split tool options.

Ok. But still, even if some tools are gone upstream, we should have some Config.in.legacy handling, no?

Quoted 7 lines

Frankly speaking i'd rather see the number of options reduced for this package, only a few of them introduce dependencies:
Curl fetcher (libcurl)
TNCCS 1.1 (libxml2)
EAP-SIM (pcsc-lite)
And that's it, the other options won't make strongswan that big.

No problem on my side, feel free to submit some patches :-)

Thomas

Signature · 3 lines

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