From: Philip Prindeville <redacted>
Date: Thu, 17 Jul 2025 04:33:22 +0000 (-0600)
Subject: strongswan: fix build issues around PARSE_ERROR
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=89fa8033b851db004182c5e33b0728bc2f95b807;p=openwrt-packages.git

strongswan: fix build issues around PARSE_ERROR

This symbol is an enum defined both in wolfssl and strongswan.  This
creates a clash in C's flat namespace.  A workaround is to redefine it
when we include wolfssl headers, but really one of the other should
pick a better name.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index 546bf636f..1687a387e 100644
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
 PKG_VERSION:=6.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 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/0100-work-around-parse_error-clash.patch b/net/strongswan/patches/0100-work-around-parse_error-clash.patch
new file mode 100644
index 000000000..902ef16bd
--- /dev/null
+++ b/net/strongswan/patches/0100-work-around-parse_error-clash.patch
@@ -0,0 +1,11 @@
+--- a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
++++ b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
+@@ -27,6 +27,8 @@
+ #include <library.h>
+ #include <utils/debug.h>
+ 
++#define PARSE_ERROR	WOLFSSL_PARSE_ERROR
++
+ #include "wolfssl_plugin.h"
+ #include "wolfssl_aead.h"
+ #include "wolfssl_crypter.h"