strongswan: fix compilation against wolfssl

Backports upstream patch fix compilation error against recent versions of wolfssl.

Closes https://github.com/openwrt/packages/issues/25877

Signed-off-by: Matt Eaton <git@divinehawk.com>

diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index d9869cc7d4105800f30507a8a64ab877b59a3cfc..6130a5b5faef9ff5abd98787a144abc408bb2bb5 100644 (file)
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
 PKG_VERSION:=5.9.14
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 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/0905-wolfssl-parse_error.patch b/net/strongswan/patches/0905-wolfssl-parse_error.patch
new file mode 100644 (file)
index 0000000..a56cfe5
--- /dev/null
+++ b/net/strongswan/patches/0905-wolfssl-parse_error.patch
@@ -0,0 +1,19 @@
+From 60336ceecbd1cda73aa26dd44cfdaf2e31a046e1 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+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,6 +78,4 @@ typedef union {
+ } wolfssl_ed_key;
+ #endif /* HAVE_ED25519 || HAVE_ED448 */
+ 
+-#undef PARSE_ERROR
+-
+ #endif /* WOLFSSL_PLUGIN_COMMON_H_ */