git: 9678923b0d17 - main - security/openiked-portable: Sunset port

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 02 Aug 2025 15:52:50 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9678923b0d173e82b749de2336378036cc18259c

commit 9678923b0d173e82b749de2336378036cc18259c
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-08-02 06:39:45 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-08-02 15:51:35 +0000

    security/openiked-portable: Sunset port
    
    Moved to security/openiked
    
    PR:             287724
---
 MOVED                                              |  1 +
 security/Makefile                                  |  1 -
 security/openiked-portable/Makefile                | 30 ----------
 security/openiked-portable/distinfo                |  3 -
 security/openiked-portable/files/iked.in           | 70 ----------------------
 .../files/patch-ikectl_CMakeLists.txt              | 13 ----
 .../openiked-portable/files/patch-ikectl_ikeca.c   | 25 --------
 security/openiked-portable/pkg-descr               |  8 ---
 security/openiked-portable/pkg-plist               | 16 -----
 9 files changed, 1 insertion(+), 166 deletions(-)

diff --git a/MOVED b/MOVED
index 5fba3fe5fb7d..a17ba809742e 100644
--- a/MOVED
+++ b/MOVED
@@ -4701,3 +4701,4 @@ devel/ossp-var||2025-08-02|Has expired: Obsolete, last release in 2002
 devel/ossp-cfg||2025-08-02|Has expired: Abandoned upstream, last release in 2006
 net/ossp-sa||2025-08-02|Removed, depends on expired devel/ossp-ex
 devel/ossp-ex||2025-08-02|Has expired: Abandoned upstream, last release in 2007
+security/openiked-portable|security/openiked|2025-08-02|Merged into security/openiked
diff --git a/security/Makefile b/security/Makefile
index 0504a0107b93..caa8f27b110a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -442,7 +442,6 @@
     SUBDIR += openfhe
     SUBDIR += openfortivpn
     SUBDIR += openiked
-    SUBDIR += openiked-portable
     SUBDIR += opensaml
     SUBDIR += opensc
     SUBDIR += openssh-askpass
diff --git a/security/openiked-portable/Makefile b/security/openiked-portable/Makefile
deleted file mode 100644
index 4ca9a2ea2483..000000000000
--- a/security/openiked-portable/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-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 <bsd.port.mk>
diff --git a/security/openiked-portable/distinfo b/security/openiked-portable/distinfo
deleted file mode 100644
index f364695b1d78..000000000000
--- a/security/openiked-portable/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1744831930
-SHA256 (openiked-7.4.tar.gz) = 19b72b48080240c3eff585f5cbcf6aa7b5734192ad8bc6677ae64a455074358a
-SIZE (openiked-7.4.tar.gz) = 321175
diff --git a/security/openiked-portable/files/iked.in b/security/openiked-portable/files/iked.in
deleted file mode 100644
index 79df736b6f79..000000000000
--- a/security/openiked-portable/files/iked.in
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: head/security/openiked/files/iked.in 425847 2016-11-10 16:14:03Z marcel $
-#
-# PROVIDE: iked
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add these lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# iked_enable (bool):	Set to NO by default.
-#			Set it to YES to enable iked.
-# iked_ramdisk (bool):	Set to NO by default. See below.
-#
-# When iked_ramdisk is set to YES, the rc.d script will make sure
-# all directories exist, but will not generate a key pair if none
-# exists.  The daemon is not started when the key pair no config
-# files are missing.  It is assumed the ramdisk is not populated
-# completely.  When iked_ramdisk is NO, key pairs are created as
-# needed and thr daemon is started unconditionally.
-
-. /etc/rc.subr
-
-name=iked
-desc="IKEv2 daemon"
-rcvar=iked_enable
-
-load_rc_config $name
-
-: ${iked_enable:=NO}
-: ${iked_ramdisk=NO}
-
-command=%%PREFIX%%/sbin/iked
-start_precmd=iked_precmd
-required_modules="ipsec"
-
-iked_config=%%PREFIX%%/etc/iked.conf
-iked_rootdir=%%PREFIX%%/etc/iked
-iked_privkey=${iked_rootdir}/private/local.key
-iked_pubkey=${iked_rootdir}/local.pub
-
-iked_precmd()
-{
-
-	if checkyesno iked_ramdisk; then
-		# Make sure we have our directory hierarchy.
-		for D in ca certs crls export private pubkeys \
-		    pubkeys/fqdn pubkeys/ipv4 pubkeys/ipv6 pubkeys/ufqdn; do
-			mkdir -p %%PREFIX%%/etc/iked/$D
-		done
-		chmod 700 %%PREFIX%%/etc/iked/private
-	else
-		# Create a key pair if not already present.
-		if test ! -f $iked_privkey; then
-			/usr/bin/openssl ecparam -genkey -name prime256v1 -noout -out "$iked_privkey"
-			/bin/chmod 600 "$iked_privkey"
-			/usr/bin/openssl ec -in "$iked_privkey" -pubout -out "$iked_pubkey"
-		fi
-	fi
-
-	# We must have a private key and a configuration file.
-	# Don't start iked when those are missing.
-	if test ! \( -f $iked_privkey -a -f $iked_config \); then
-		# Be quiet about it; it must be intentional.
-		exit 1
-	fi
-}
-
-run_rc_command "$1"
diff --git a/security/openiked-portable/files/patch-ikectl_CMakeLists.txt b/security/openiked-portable/files/patch-ikectl_CMakeLists.txt
deleted file mode 100644
index de79da698eb5..000000000000
--- a/security/openiked-portable/files/patch-ikectl_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-portable/files/patch-ikectl_ikeca.c b/security/openiked-portable/files/patch-ikectl_ikeca.c
deleted file mode 100644
index 4db8e1ce4744..000000000000
--- a/security/openiked-portable/files/patch-ikectl_ikeca.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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__);
- 
diff --git a/security/openiked-portable/pkg-descr b/security/openiked-portable/pkg-descr
deleted file mode 100644
index cd2f05da0925..000000000000
--- a/security/openiked-portable/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-OpenIKED is a free, permissively licensed Internet Key Exchange
-(IKEv2) implementation, developed as part of the OpenBSD project.
-It is intended to be a lean, secure and interoperable daemon that
-allows for easy setup and management of IPsec VPNs.
-
-The portable versions take the OpenBSD based source code and add
-compatibility functions and build infrastructure for other operating
-systems.
diff --git a/security/openiked-portable/pkg-plist b/security/openiked-portable/pkg-plist
deleted file mode 100644
index 64f78b4cacb6..000000000000
--- a/security/openiked-portable/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@sample(,,600) etc/iked.conf.sample
-sbin/ikectl
-sbin/iked
-share/man/man5/iked.conf.5.gz
-share/man/man8/ikectl.8.gz
-share/man/man8/iked.8.gz
-etc/ssl/ikeca.cnf
-etc/ssl/ikex509v3.cnf
-@dir etc/iked/ca
-@dir etc/iked/certs
-@dir etc/iked/crls
-@dir(,,700) etc/iked/private
-@dir etc/iked/pubkeys/fqdn
-@dir etc/iked/pubkeys/ipv4
-@dir etc/iked/pubkeys/ipv6
-@dir etc/iked/pubkeys/ufqdn