From 179175e27c80bbf1eeb4ff0621abea268f0f2db3 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Thu, 23 May 2019 20:54:28 +0300 Subject: [PATCH] strongswan: update to 5.8.0 Signed-off-by: Lucian Cristian --- net/strongswan/Makefile | 6 ++-- net/strongswan/patches/101-musl-fixes.patch | 2 +- net/strongswan/patches/201-kmodloader.patch | 28 ------------------- .../patches/305-minimal_dh_plugin.patch | 6 ++-- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 net/strongswan/patches/201-kmodloader.patch diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 13d351b361..48ff454e39 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan -PKG_VERSION:=5.7.2 +PKG_VERSION:=5.8.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/ -PKG_HASH:=308e3ba76e2ce2da070e48fcebbe1fa923a27cc71e43bf63917e6f2a889ecc70 +PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ +PKG_HASH:=15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933 PKG_LICENSE:=GPL-2.0+ PKG_MAINTAINER:=Stijn Tintel diff --git a/net/strongswan/patches/101-musl-fixes.patch b/net/strongswan/patches/101-musl-fixes.patch index 8db92215e6..488352b35c 100644 --- a/net/strongswan/patches/101-musl-fixes.patch +++ b/net/strongswan/patches/101-musl-fixes.patch @@ -72,7 +72,7 @@ #include --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c -@@ -38,6 +38,8 @@ +@@ -39,6 +39,8 @@ * THE SOFTWARE. */ diff --git a/net/strongswan/patches/201-kmodloader.patch b/net/strongswan/patches/201-kmodloader.patch deleted file mode 100644 index cd74f27119..0000000000 --- a/net/strongswan/patches/201-kmodloader.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/starter/netkey.c -+++ b/src/starter/netkey.c -@@ -30,7 +30,7 @@ bool starter_netkey_init(void) - /* af_key module makes the netkey proc interface visible */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv af_key")); -+ ignore_result(system("modprobe af_key 2>&1 >/dev/null")); - } - - /* now test again */ -@@ -44,11 +44,11 @@ bool starter_netkey_init(void) - /* make sure that all required IPsec modules are loaded */ - if (stat(PROC_MODULES, &stb) == 0) - { -- ignore_result(system("modprobe -qv ah4")); -- ignore_result(system("modprobe -qv esp4")); -- ignore_result(system("modprobe -qv ipcomp")); -- ignore_result(system("modprobe -qv xfrm4_tunnel")); -- ignore_result(system("modprobe -qv xfrm_user")); -+ ignore_result(system("modprobe ah4 2>&1 >/dev/null")); -+ ignore_result(system("modprobe esp4 2>&1 >/dev/null")); -+ ignore_result(system("modprobe ipcomp 2>&1 >/dev/null")); -+ ignore_result(system("modprobe xfrm4_tunnel 2>&1 >/dev/null")); -+ ignore_result(system("modprobe xfrm_user 2>&1 >/dev/null")); - } - - DBG2(DBG_APP, "found netkey IPsec stack"); diff --git a/net/strongswan/patches/305-minimal_dh_plugin.patch b/net/strongswan/patches/305-minimal_dh_plugin.patch index 187549f5dd..ef0c51c2ce 100644 --- a/net/strongswan/patches/305-minimal_dh_plugin.patch +++ b/net/strongswan/patches/305-minimal_dh_plugin.patch @@ -8,7 +8,7 @@ ARG_DISBL_SET([curve25519], [disable Curve25519 Diffie-Hellman plugin.]) ARG_DISBL_SET([hmac], [disable HMAC crypto implementation plugin.]) ARG_ENABL_SET([md4], [enable MD4 software implementation plugin.]) -@@ -1413,6 +1414,7 @@ ADD_PLUGIN([botan], [s ch +@@ -1423,6 +1424,7 @@ ADD_PLUGIN([botan], [s ch ADD_PLUGIN([af-alg], [s charon scepclient pki scripts medsrv attest nm cmd aikgen]) ADD_PLUGIN([fips-prf], [s charon nm cmd]) ADD_PLUGIN([gmp], [s charon scepclient pki scripts manager medsrv attest nm cmd aikgen fuzz]) @@ -16,7 +16,7 @@ ADD_PLUGIN([curve25519], [s charon pki scripts nm cmd]) ADD_PLUGIN([agent], [s charon nm cmd]) ADD_PLUGIN([keychain], [s charon cmd]) -@@ -1553,6 +1555,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x +@@ -1563,6 +1565,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x AM_CONDITIONAL(USE_MGF1, test x$mgf1 = xtrue) AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue) AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue) @@ -24,7 +24,7 @@ AM_CONDITIONAL(USE_CURVE25519, test x$curve25519 = xtrue) AM_CONDITIONAL(USE_RDRAND, test x$rdrand = xtrue) AM_CONDITIONAL(USE_AESNI, test x$aesni = xtrue) -@@ -1827,6 +1830,7 @@ AC_CONFIG_FILES([ +@@ -1838,6 +1841,7 @@ AC_CONFIG_FILES([ src/libstrongswan/plugins/mgf1/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile -- 2.30.2