diff --git a/security/openiked-portable/Makefile b/security/openiked-portable/Makefile index 959590d8ada5..48374cbc441b 100644 --- a/security/openiked-portable/Makefile +++ b/security/openiked-portable/Makefile @@ -1,30 +1,29 @@ PORTNAME= openiked -DISTVERSION= 7.3 -PORTREVISION= 1 +DISTVERSION= 7.4 CATEGORIES= security net MASTER_SITES= OPENBSD/OpenIKED PKGNAMESUFFIX= -portable -MAINTAINER= david@lapinbilly.eu +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 +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/distinfo b/security/openiked-portable/distinfo index 8124d5d73e06..f364695b1d78 100644 --- a/security/openiked-portable/distinfo +++ b/security/openiked-portable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702828261 -SHA256 (openiked-7.3.tar.gz) = 9a04d513a81f9d5a873a0bd9992067a55796812674c9a96791b3adc6a63e6347 -SIZE (openiked-7.3.tar.gz) = 317141 +TIMESTAMP = 1744831930 +SHA256 (openiked-7.4.tar.gz) = 19b72b48080240c3eff585f5cbcf6aa7b5734192ad8bc6677ae64a455074358a +SIZE (openiked-7.4.tar.gz) = 321175 diff --git a/security/openiked-portable/files/patch-ikectl_CMakeLists.txt b/security/openiked-portable/files/patch-ikectl_CMakeLists.txt new file mode 100644 index 000000000000..de79da698eb5 --- /dev/null +++ b/security/openiked-portable/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 + "$<$:-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-portable/files/patch-ikectl_ikeca.c b/security/openiked-portable/files/patch-ikectl_ikeca.c new file mode 100644 index 000000000000..51a6e8a3e043 --- /dev/null +++ b/security/openiked-portable/files/patch-ikectl_ikeca.c @@ -0,0 +1,16 @@ +--- ikectl/ikeca.c.orig 2025-04-17 19:27:59 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"