From 384e89b3d74fc420b07f3c744f620df0b90b9016 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 20 Apr 2017 16:55:51 +0200 Subject: [PATCH] strongswan: bump to 5.5.2 Signed-off-by: Stijn Tintel (cherry picked from commit 18b076ab9359d56ff1fc5b89bda378f2e4723e2d) Conflicts: net/strongswan/Makefile --- net/strongswan/Makefile | 4 ++-- net/strongswan/patches/101-musl-fixes.patch | 4 ++-- net/strongswan/patches/210-sleep.patch | 2 +- .../patches/305-minimal_dh_plugin.patch | 24 +++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 5289d3f974..6231aa5521 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan -PKG_VERSION:=5.5.1 +PKG_VERSION:=5.5.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_HASH:=da976fca836f05fc7b7a38baab299745f960cb7640319969d239d8aa4ace9f6a PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/ -PKG_MD5SUM:=4eba9474f7dc6c8c8d7037261358e68d 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 e48d22b41d..753bd8e8d6 100644 --- a/net/strongswan/patches/101-musl-fixes.patch +++ b/net/strongswan/patches/101-musl-fixes.patch @@ -72,8 +72,8 @@ #include --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c -@@ -15,6 +15,8 @@ - * for more details. +@@ -38,6 +38,8 @@ + * THE SOFTWARE. */ +#include "musl.h" diff --git a/net/strongswan/patches/210-sleep.patch b/net/strongswan/patches/210-sleep.patch index d8adec3d05..d8f2f3be25 100644 --- a/net/strongswan/patches/210-sleep.patch +++ b/net/strongswan/patches/210-sleep.patch @@ -1,6 +1,6 @@ --- a/src/ipsec/_ipsec.in +++ b/src/ipsec/_ipsec.in -@@ -259,7 +259,7 @@ stop) +@@ -257,7 +257,7 @@ stop) loop=110 while [ $loop -gt 0 ] ; do kill -0 $spid 2>/dev/null || break diff --git a/net/strongswan/patches/305-minimal_dh_plugin.patch b/net/strongswan/patches/305-minimal_dh_plugin.patch index 597510f190..a1b0b5f80a 100644 --- a/net/strongswan/patches/305-minimal_dh_plugin.patch +++ b/net/strongswan/patches/305-minimal_dh_plugin.patch @@ -5,36 +5,36 @@ ARG_ENABL_SET([gcrypt], [enables the libgcrypt plugin.]) ARG_DISBL_SET([gmp], [disable GNU MP (libgmp) based crypto implementation plugin.]) +ARG_DISBL_SET([gmpdh], [disable GNU MP (libgmp) based static-linked crypto DH minimal implementation plugin.]) + 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.]) - ARG_DISBL_SET([md5], [disable MD5 software implementation plugin.]) -@@ -1347,6 +1348,7 @@ ADD_PLUGIN([gcrypt], [s ch +@@ -1362,6 +1363,7 @@ ADD_PLUGIN([gcrypt], [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]) +ADD_PLUGIN([gmpdh], [s charon scepclient pki scripts manager medsrv attest nm cmd aikgen]) + ADD_PLUGIN([curve25519], [s charon scripts nm cmd]) ADD_PLUGIN([agent], [s charon nm cmd]) ADD_PLUGIN([keychain], [s charon cmd]) - ADD_PLUGIN([chapoly], [s charon scripts nm cmd]) -@@ -1480,6 +1482,7 @@ AM_CONDITIONAL(USE_SHA2, test x$sha2 = x - AM_CONDITIONAL(USE_SHA3, test x$sha3 = xtrue) +@@ -1498,6 +1500,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) +AM_CONDITIONAL(USE_GMPDH, test x$gmpdh = xtrue) + AM_CONDITIONAL(USE_CURVE25519, test x$curve25519 = xtrue) AM_CONDITIONAL(USE_RDRAND, test x$rdrand = xtrue) AM_CONDITIONAL(USE_AESNI, test x$aesni = xtrue) - AM_CONDITIONAL(USE_RANDOM, test x$random = xtrue) -@@ -1733,6 +1736,7 @@ AC_CONFIG_FILES([ - src/libstrongswan/plugins/sha3/Makefile +@@ -1756,6 +1759,7 @@ AC_CONFIG_FILES([ + src/libstrongswan/plugins/mgf1/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile + src/libstrongswan/plugins/gmpdh/Makefile + src/libstrongswan/plugins/curve25519/Makefile src/libstrongswan/plugins/rdrand/Makefile src/libstrongswan/plugins/aesni/Makefile - src/libstrongswan/plugins/random/Makefile --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am -@@ -307,6 +307,13 @@ if MONOLITHIC +@@ -313,6 +313,13 @@ if MONOLITHIC endif endif @@ -45,8 +45,8 @@ +endif +endif + - if USE_RDRAND - SUBDIRS += plugins/rdrand + if USE_CURVE25519 + SUBDIRS += plugins/curve25519 if MONOLITHIC --- /dev/null +++ b/src/libstrongswan/plugins/gmpdh/Makefile.am -- 2.30.2