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 <philipp@redfish-solutions.com>

diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index 546bf636f20d2d2e46cf39b7ab24e44d9315ba13..1687a387e8b08fe10bb6ed2e70e820c752017193 100644 (file)
--- 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 (file)
index 0000000..902ef16
--- /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"