From ac2f27833a6ca1aa50c1539c4753063f5f2dd802 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sat, 2 Aug 2025 08:36:34 +0200 Subject: security/openiked: Merge with security/openiked-portable Adapt changes from security/openiked-portable and transfer maintainership to security/openiked-portable's maintainer PR: 287724 --- security/openiked/files/patch-ikectl_ikeca.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 security/openiked/files/patch-ikectl_ikeca.c (limited to 'security/openiked/files/patch-ikectl_ikeca.c') 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__); + -- cgit v1.2.3