3 files changed, 38 insertions, 10 deletions
diff --git a/security/openiked/files/patch-ikectl_CMakeLists.txt b/security/openiked/files/patch-ikectl_CMakeLists.txt
new file mode 100644
index 000000000000..de79da698eb5
--- /dev/null
+++ b/security/openiked/files/patch-ikectl_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- ikectl/CMakeLists.txt.orig	2025-04-09 19:47:21 UTC
++++ ikectl/CMakeLists.txt
+@@ -42,7 +42,9 @@ list(APPEND CFLAGS
+ 	-Wsign-compare
+ 	"$<$<CONFIG:DEBUG>:-O0;-g>"
+ )
+-
++if(DEFINED CADIR)
++	add_definitions( -DCADIR="${CADIR}" )
++endif()
+ target_compile_options(ikectl PRIVATE ${CFLAGS})
+ if(HAVE_LD_Z)
+ 	target_link_options(ikectl PRIVATE "LINKER:-z,relro,-z,now")
diff --git a/security/openiked/files/patch-ikectl_Makefile.am b/security/openiked/files/patch-ikectl_Makefile.am
deleted file mode 100644
index 315d87d83986..000000000000
--- a/security/openiked/files/patch-ikectl_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ikectl/Makefile.am.orig	2020-09-04 14:25:33 UTC
-+++ ikectl/Makefile.am
-@@ -28,7 +28,6 @@ $(MANPAGES): $(MANPAGES_IN)
- 
- install-exec-hook: $(MANPAGES)
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/iked/
--	$(MKDIR_P) $(DESTDIR)$(SSLDIR)
- 	$(MKDIR_P) $(DESTDIR)$(sbindir)
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
- 
diff --git a/security/openiked/files/patch-ikectl_ikeca.c b/security/openiked/files/patch-ikectl_ikeca.c
new file mode 100644
index 000000000000..4db8e1ce4744
--- /dev/null
+++ b/security/openiked/files/patch-ikectl_ikeca.c
@@ -0,0 +1,25 @@
+--- ikectl/ikeca.c.orig	2025-04-09 19:47:21 UTC
++++ ikectl/ikeca.c
+@@ -47,8 +47,11 @@
+ #define SSLDIR		PREFIX "/etc/ssl"
+ #endif
+ #define SSL_CNF		SSLDIR "/openssl.cnf"
+-#define X509_CNF	SSLDIR "/ikex509v3.cnf"
+-#define IKECA_CNF	SSLDIR "/ikeca.cnf"
++#ifndef CADIR
++#define CADIR       SSLDIR
++#endif
++#define X509_CNF	CADIR "/ikex509v3.cnf"
++#define IKECA_CNF	CADIR "/ikeca.cnf"
+ #define KEYBASE		PREFIX "/etc/iked"
+ #ifndef EXPDIR
+ #define EXPDIR		PREFIX "/usr/share/iked"
+@@ -1118,7 +1121,7 @@ ca_setup(char *caname, int create, int quiet, char *pa
+ 		err(1, "calloc");
+ 
+ 	ca->caname = strdup(caname);
+-	len = snprintf(ca->sslpath, sizeof(ca->sslpath), SSLDIR "/%s", caname);
++	len = snprintf(ca->sslpath, sizeof(ca->sslpath), CADIR "/%s", caname);
+ 	if (len < 0 || (size_t)len >= sizeof(ca->sslpath))
+ 		err(1, "%s: snprintf", __func__);
+