package/strongswan: bump to version 5.9.0

- Drop patches (already in version)
- wolfssl is an optional dependency since version 5.8.0 and
  c92eade82c
- Update indentation of hash file (two spaces)

https://wiki.strongswan.org/versions/78

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2020-10-04 23:27:37 +02:00 committed by Thomas Petazzoni
parent 8d971bc328
commit da912a3d2a
3 changed files with 13 additions and 17 deletions

View File

@ -44,6 +44,10 @@ config BR2_PACKAGE_STRONGSWAN_GMP
bool "GNU MP (libgmp)"
select BR2_PACKAGE_GMP
config BR2_PACKAGE_STRONGSWAN_WOLFSSL
bool "wolfssl"
select BR2_PACKAGE_WOLFSSL
endchoice
config BR2_PACKAGE_STRONGSWAN_AF_ALG

View File

@ -1,9 +1,7 @@
# From http://download.strongswan.org/strongswan-5.6.3.tar.bz2.md5
md5 a6a28eeb22aa58080a7581771a5b63f9 strongswan-5.6.3.tar.bz2
# From http://download.strongswan.org/strongswan-5.9.0.tar.bz2.md5
md5 705628cddd5b7683ef8a688acd9514d8 strongswan-5.9.0.tar.bz2
# Calculated based on the hash above
sha256 c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 strongswan-5.6.3.tar.bz2
sha256 72b47a385da5d1532b816d9fe04c50d074c29ed42ea3f0878fbd66335917bb66 strongswan-5.9.0.tar.bz2
# Locally calculated
sha256 e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7 strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch
sha256 415d104717cb0781770e9077d00b3df310b11e65e4b9c1d35b62fbba04549263 strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE

View File

@ -4,12 +4,9 @@
#
################################################################################
STRONGSWAN_VERSION = 5.6.3
STRONGSWAN_VERSION = 5.9.0
STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
STRONGSWAN_SITE = http://download.strongswan.org
STRONGSWAN_PATCH = \
$(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch \
$(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch
STRONGSWAN_LICENSE = GPL-2.0+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf
@ -38,16 +35,12 @@ STRONGSWAN_CONF_OPTS += \
--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) \
--enable-wolfssl=$(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),yes,no) \
--with-ipseclibdir=/usr/lib \
--with-plugindir=/usr/lib/ipsec/plugins \
--with-imcvdir=/usr/lib/ipsec/imcvs \
--with-dev-headers=/usr/include
# strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch
STRONGSWAN_IGNORE_CVES += CVE-2018-16151 CVE-2018-16152
# strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch
STRONGSWAN_IGNORE_CVES += CVE-2018-17540
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
STRONGSWAN_CONF_ENV += LIBS='-latomic'
endif
@ -80,7 +73,8 @@ STRONGSWAN_DEPENDENCIES += \
$(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)
$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) \
$(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),wolfssl)
ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
STRONGSWAN_DEPENDENCIES += \