diff --git a/security/openiked-portable/Makefile b/security/openiked-portable/Makefile index 48374cbc441b..4ca9a2ea2483 100644 --- a/security/openiked-portable/Makefile +++ b/security/openiked-portable/Makefile @@ -1,29 +1,30 @@ PORTNAME= openiked DISTVERSION= 7.4 +PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= OPENBSD/OpenIKED PKGNAMESUFFIX= -portable MAINTAINER= david.marec@proton.me COMMENT= IKEv2 daemon WWW= https://github.com/openiked/openiked-portable LICENSE= ISCL LIB_DEPENDS= libevent.so:devel/libevent USES= cmake ssl USE_RC_SUBR= iked CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PREFIX}/share/man -DCADIR=${PREFIX}/etc/ssl CONFLICTS_INSTALL= openiked USERS= _iked GROUPS= _iked post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/iked.conf \ ${STAGEDIR}${PREFIX}/etc/iked.conf.sample .include diff --git a/security/openiked-portable/files/patch-ikectl_ikeca.c b/security/openiked-portable/files/patch-ikectl_ikeca.c index 51a6e8a3e043..4db8e1ce4744 100644 --- a/security/openiked-portable/files/patch-ikectl_ikeca.c +++ b/security/openiked-portable/files/patch-ikectl_ikeca.c @@ -1,16 +1,25 @@ ---- ikectl/ikeca.c.orig 2025-04-17 19:27:59 UTC +--- 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__); +