From nobody Sat May 3 15:47:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZqXH94TBMz5vVfB; Sat, 03 May 2025 15:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZqXH912hrz3jlJ; Sat, 03 May 2025 15:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746287253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCagqsf/r0euT1IRMAsAl+3PhtUlLhKtZb6Ag6Ayj3Y=; b=Ba9Wo/j+r7VkV1/BLEj/uo1cdVGY2pnCA2rakyaj+QekflsrMeyuQbCij+3VZ4gTQNgvEC h4qbsUAaq724phzbvSgevvCup1bJcHx6/9l1gY6Fn13lpElChRzcPafqoGrB3tXhuT3MA9 O5tThjQtJCFZWsjFMkcMwtSwSh62yP5PIGR+dDJL/xIUB+kElylzzZ1PjqJATHlzqu/mOT xRnk1aoO69+LKWR8HuzD0+Osies4ZvNX80u5HlmtlbS9KlcdKKUKWVm+3IrCLRIyoP4J19 CXTI/MNzHJ4c5JxIyjekf8+39QLcdM185d9vmAzLbvA2lI5O1iYJYIqU0gLesg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746287253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCagqsf/r0euT1IRMAsAl+3PhtUlLhKtZb6Ag6Ayj3Y=; b=fo+W6XqrpUe3/OrLmZuvZ5R8ayrW8hvejL9G48v85ZvqSTWbjtJTVsGS59CYeRRRdmXL74 +0owWKlQU3fXaWgYrHotCc/Irnd6ffuP0buXvDeVNURu3cban/mDaPGzGajroJwN3v7NZ1 LP17T+aO8VuFavmRvs63iT0+H5lqJxbqv3w8QvITqOZpyJ/Pu0OlwlCJoMEbxZaF8/4BD+ C+kWj371cuajCXQbRebr86cXiS3awyuYof3Hr1eYLIkqdsRWN21ea7uv4yyFZ0ciauhikg jyuyNDMNmpcES9M8t4owWGlkhMLFIMwXSH7SvRcMqfsLqyKipZLzqN7Z1/7vHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746287253; a=rsa-sha256; cv=none; b=G76XXfb47lSitGrjraahnh8KpK7QBwzXSF8MOa/SJNLvZ8/InxvYOeaFUGw9IWC5rawO5R 5f0thfxo/ja+lDW+LukCgfLcjGq32ajbEAApECpwo6W/d99qz4GbXffka70oE23XZ4XNJL CpGlDwEW2QG0GqECWmQS6jbQfMamDsz764GbUvkKV3gVNHM7KZvJZDV1vbpJgfpOTn6IyJ UueTXzfRAIQAwRQsk4vEP3ROeB17T8Zi4LoZSc6YzhMnEiq4XxXKHWsuC4+SxRjAy2n9GR ilbdcFQugnsrJwyelT+iWDcl5WqZFsjUSp+4rhIt0dbY3qeWHz/exkEYfDBcjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZqXH908qtzppW; Sat, 03 May 2025 15:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 543FlWGw001767; Sat, 3 May 2025 15:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FlW23001764; Sat, 3 May 2025 15:47:32 GMT (envelope-from git) Date: Sat, 3 May 2025 15:47:32 GMT Message-Id: <202505031547.543FlW23001764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 1271b1d747a7 - main - rc.d: remove obsolete /etc/rc.d/keyserv List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1271b1d747a7746a858e793cda8e78c150c79e01 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1271b1d747a7746a858e793cda8e78c150c79e01 commit 1271b1d747a7746a858e793cda8e78c150c79e01 Author: Lexi Winter AuthorDate: 2025-05-03 15:44:03 +0000 Commit: Lexi Winter CommitDate: 2025-05-03 15:44:03 +0000 rc.d: remove obsolete /etc/rc.d/keyserv the keyserv daemon was removed in 9dcb984251b3. also remove its rc script. Reviewed by: kevans, adrian, emaste Approved by: kevans (mentor) Fixes: 9dcb984251b3 ("Remove publickey(5) stuff") Differential Revision: https://reviews.freebsd.org/D50135 --- ObsoleteFiles.inc | 1 + libexec/rc/rc.d/Makefile | 5 +---- libexec/rc/rc.d/keyserv | 28 ---------------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b5432dae3824..52cb219c6e89 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -102,6 +102,7 @@ OLD_FILES+=usr/share/man/man1/keylogin.1.gz OLD_FILES+=usr/share/man/man1/keylogin.1.gz OLD_FILES+=usr/share/man/man5/publickey.5.gz OLD_FILES+=usr/share/man/man8/keyserv.1.gz +OLD_FILES+=etc/rc.d/keyserv # 20241206: Remove Altera DE4 drivers OLD_FILES+=usr/share/man/man4/altera_atse.4.gz diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 6e2e9d30ef79..122c52be3da8 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -290,13 +290,10 @@ NTPPACKAGE= ntp _opensm= opensm .endif -.if ${MK_OPENSSL} != "no" -CONFS+= keyserv -.if ${MK_OPENSSL_KTLS} != "no" +.if ${MK_OPENSSL} != "no" && ${MK_OPENSSL_KTLS} != "no" CONFS+= tlsclntd \ tlsservd .endif -.endif .if ${MK_OPENSSH} != "no" CONFGROUPS+= SSH diff --git a/libexec/rc/rc.d/keyserv b/libexec/rc/rc.d/keyserv deleted file mode 100755 index d78695eb33b2..000000000000 --- a/libexec/rc/rc.d/keyserv +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# - -# Start keyserv if we are running Secure RPC - -# PROVIDE: keyserv -# REQUIRE: ypset -# BEFORE: DAEMON -# KEYWORD: shutdown - -. /etc/rc.subr - -name="keyserv" -desc="Server for storing private encryption keys" -rcvar="keyserv_enable" -command="/usr/sbin/${name}" -start_precmd="keyserv_prestart" - -: ${keyserv_svcj_options:="net_basic"} - -keyserv_prestart() -{ - force_depend rpcbind || return 1 -} - -load_rc_config $name -run_rc_command "$1"