From f3a45fc265a0cbe42f34b340fb7d1931b151a09a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 11 Aug 2025 19:13:11 +0800 Subject: [PATCH] strongswan: fix build with wolfssl 5.7.6 Backport an upstream patch to fix build with wolfssl 5.7.6. Signed-off-by: Tianling Shen --- net/strongswan/Makefile | 2 +- ...ARSE_ERROR-as-headers-included-later.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 net/strongswan/patches/0010-wolfssl-Don-t-undef-PARSE_ERROR-as-headers-included-later.patch diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 94b850b5ee..9531e7c80e 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.11 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ diff --git a/net/strongswan/patches/0010-wolfssl-Don-t-undef-PARSE_ERROR-as-headers-included-later.patch b/net/strongswan/patches/0010-wolfssl-Don-t-undef-PARSE_ERROR-as-headers-included-later.patch new file mode 100644 index 0000000000..7755424ddd --- /dev/null +++ b/net/strongswan/patches/0010-wolfssl-Don-t-undef-PARSE_ERROR-as-headers-included-later.patch @@ -0,0 +1,21 @@ +From 60336ceecbd1cda73aa26dd44cfdaf2e31a046e1 Mon Sep 17 00:00:00 2001 +From: Tobias Brunner +Date: Fri, 4 Oct 2024 11:23:28 +0200 +Subject: [PATCH] wolfssl: Don't undef PARSE_ERROR as headers included later + might refer to it + +--- + src/libstrongswan/plugins/wolfssl/wolfssl_common.h | 2 -- + 1 file changed, 2 deletions(-) + +--- a/src/libstrongswan/plugins/wolfssl/wolfssl_common.h ++++ b/src/libstrongswan/plugins/wolfssl/wolfssl_common.h +@@ -78,8 +78,6 @@ typedef union { + } wolfssl_ed_key; + #endif /* HAVE_ED25519 || HAVE_ED448 */ + +-#undef PARSE_ERROR +- + /* Eliminate macro conflicts */ + #undef RNG +