1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

security/strongswan: fix build on current

Backport upstream commit a7f617ab3328153939cb757a5cf9001071ef8720

PR:		280435
Approved by:	kwf@nanoteq.com (maintainer)
This commit is contained in:
Olivier Cochard 2024-09-30 13:52:57 +02:00
parent 3776b4306a
commit 825afe0bb4
7 changed files with 27 additions and 13 deletions

View File

@ -1,6 +1,6 @@
--- conf/Makefile.in.orig 2019-03-29 18:18:48 UTC
--- conf/Makefile.in.orig 2024-03-19 10:57:29 UTC
+++ conf/Makefile.in
@@ -899,15 +899,15 @@ install-data-local: $(plugins_install_src)
@@ -917,15 +917,15 @@ install-data-local: $(plugins_install_src)
test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true
test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true
test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true

View File

@ -0,0 +1,14 @@
--- src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c.orig 2023-06-08 10:35:17 UTC
+++ src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
@@ -765,6 +765,11 @@ ENUM(sadb_ext_type_names, SADB_EXT_RESERVED, SADB_EXT_
"SADB_X_EXT_SA_REPLAY",
"SADB_X_EXT_NEW_ADDRESS_SRC",
"SADB_X_EXT_NEW_ADDRESS_DST",
+#ifdef SADB_X_EXT_IF_HW_OFFL
+ "SADB_X_EXT_LFT_CUR_SW_OFFL",
+ "SADB_X_EXT_LFT_CUR_HW_OFFL",
+ "SADB_X_EXT_IF_HW_OFFL",
+#endif
#endif /* __linux__ */
#endif /* __APPLE__ */
);

View File

@ -1,6 +1,6 @@
--- src/libcharon/plugins/smp/smp.c.orig 2018-10-23 17:03:28 UTC
--- src/libcharon/plugins/smp/smp.c.orig 2024-03-19 10:25:55 UTC
+++ src/libcharon/plugins/smp/smp.c
@@ -740,7 +740,7 @@ METHOD(plugin_t, destroy, void,
@@ -745,7 +745,7 @@ plugin_t *smp_plugin_create()
*/
plugin_t *smp_plugin_create()
{
@ -9,7 +9,7 @@
private_smp_t *this;
mode_t old;
@@ -768,6 +768,11 @@ plugin_t *smp_plugin_create()
@@ -773,6 +773,11 @@ plugin_t *smp_plugin_create()
free(this);
return NULL;
}

View File

@ -1,6 +1,6 @@
--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig 2018-12-14 15:48:24 UTC
--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig 2024-02-21 15:54:00 UTC
+++ src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -810,7 +810,7 @@ plugin_t *openssl_plugin_create()
@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create()
},
);

View File

@ -1,6 +1,6 @@
--- src/libstrongswan/utils/utils/byteorder.h.orig 2018-10-03 21:35:17 UTC
--- src/libstrongswan/utils/utils/byteorder.h.orig 2023-03-27 21:00:49 UTC
+++ src/libstrongswan/utils/utils/byteorder.h
@@ -22,6 +22,10 @@
@@ -23,6 +23,10 @@
#ifndef BYTEORDER_H_
#define BYTEORDER_H_

View File

@ -1,6 +1,6 @@
--- src/starter/Makefile.in.orig 2018-12-27 09:46:22 UTC
--- src/starter/Makefile.in.orig 2024-03-19 10:57:37 UTC
+++ src/starter/Makefile.in
@@ -1018,8 +1018,8 @@ install-exec-local :
@@ -1057,8 +1057,8 @@ install-exec-local :
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/crls" || true
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" || true
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" || $(INSTALL) -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" || true

View File

@ -1,6 +1,6 @@
--- src/swanctl/Makefile.in.orig 2019-01-18 17:24:51 UTC
--- src/swanctl/Makefile.in.orig 2024-03-19 10:57:37 UTC
+++ src/swanctl/Makefile.in
@@ -1065,7 +1065,7 @@ install-data-local: swanctl.conf
@@ -1151,7 +1151,7 @@ install-data-local: swanctl.conf
test -e "$(DESTDIR)$(swanctldir)/bliss" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/bliss" || true
test -e "$(DESTDIR)$(swanctldir)/pkcs8" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/pkcs8" || true
test -e "$(DESTDIR)$(swanctldir)/pkcs12" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/pkcs12" || true