From 20142bca1ba98c1d43ca9704cfca61db6ec6bcf9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 22 Mar 2022 18:36:31 +0100 Subject: openswan: allow musl compile with local queue.h --- package/openswan/Makefile | 3 --- package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c | 11 +++++++++++ .../openswan/patches/patch-lib_libalgoparse_klips_interface_c | 11 +++++++++++ package/openswan/patches/patch-lib_libipsecconf_keywords_c | 11 +++++++++++ package/openswan/patches/patch-lib_libipsecconf_oeconns_c | 11 +++++++++++ package/openswan/patches/patch-lib_liboswlog_oswlog_c | 11 +++++++++++ 6 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c create mode 100644 package/openswan/patches/patch-lib_libalgoparse_klips_interface_c create mode 100644 package/openswan/patches/patch-lib_libipsecconf_keywords_c create mode 100644 package/openswan/patches/patch-lib_libipsecconf_oeconns_c create mode 100644 package/openswan/patches/patch-lib_liboswlog_oswlog_c (limited to 'package') diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 9dec6182d..41ec00201 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -19,9 +19,6 @@ PKG_NOPARALLEL:= 1 DISTFILES:= v${PKG_VERSION}.tar.gz WRKDIST= $(WRKDIR)/Openswan-$(PKG_VERSION) -# GLOB_BRACE usage -PKG_LIBC_DEPENDS:= uclibc-ng glibc - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c b/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c new file mode 100644 index 000000000..dbb01fb0d --- /dev/null +++ b/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libalgoparse/kernel_alg.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libalgoparse/kernel_alg.c 2022-03-22 16:18:54.795141065 +0100 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include "queue.h" + + #include + diff --git a/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c b/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c new file mode 100644 index 000000000..9f901deef --- /dev/null +++ b/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libalgoparse/klips_interface.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libalgoparse/klips_interface.c 2022-03-22 16:19:33.414205801 +0100 +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include "queue.h" + + #include + diff --git a/package/openswan/patches/patch-lib_libipsecconf_keywords_c b/package/openswan/patches/patch-lib_libipsecconf_keywords_c new file mode 100644 index 000000000..671e9564b --- /dev/null +++ b/package/openswan/patches/patch-lib_libipsecconf_keywords_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libipsecconf/keywords.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libipsecconf/keywords.c 2022-03-22 16:20:38.212636657 +0100 +@@ -20,7 +20,7 @@ + * + */ + +-#include ++#include "queue.h" + #include + #include + #include diff --git a/package/openswan/patches/patch-lib_libipsecconf_oeconns_c b/package/openswan/patches/patch-lib_libipsecconf_oeconns_c new file mode 100644 index 000000000..f7e9ca9c9 --- /dev/null +++ b/package/openswan/patches/patch-lib_libipsecconf_oeconns_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libipsecconf/oeconns.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libipsecconf/oeconns.c 2022-03-22 16:21:06.271957222 +0100 +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include "queue.h" + + #include "ipsecconf/parser.h" + #include "ipsecconf/confread.h" diff --git a/package/openswan/patches/patch-lib_liboswlog_oswlog_c b/package/openswan/patches/patch-lib_liboswlog_oswlog_c new file mode 100644 index 000000000..4fb7e2ef7 --- /dev/null +++ b/package/openswan/patches/patch-lib_liboswlog_oswlog_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/liboswlog/oswlog.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/liboswlog/oswlog.c 2022-03-22 16:21:39.003164693 +0100 +@@ -25,7 +25,7 @@ + #include + #include + #include /* used only if MSG_NOSIGNAL not defined */ +-#include ++#include "queue.h" + #include + #include + #include -- cgit v1.2.3