From nobody Tue Oct 7 19:17:08 2025 X-Original-To: dev-commits-ports-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 4ch5VY377bz6BqZZ; Tue, 07 Oct 2025 19:17:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch5VY2QL4z40lH; Tue, 07 Oct 2025 19:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759864629; 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=9SdzoEfq+NiGVYdkkUlkCV7PaBCWg2P23h9HRpQrXUw=; b=OQ+lDGcadE+lF4WPgTpq3bzf9STDzCZJuKAv3jJY657mb8K30CVJioaFmO4SidAXGcv0q6 gxERbmGYH/HWEvrA/GY34xNCaUrdrfSPVc7Q4iSl+6InYjKPkZmjAJA/n+hBgum29HfLZm GQPT0FQgnIixkrqESQobRQI3qalXQsdYCHC8fE0Qb6o645JHixCU2NHL4HWfMRb9HFutiD eMpgKJbA5pDGq4YfXg/ljimlYTc2Nusw0mvS3SNySQcXHYkw45e2+0uKdiSAuRTCdkYM6t tMxyHMAgUDIov1y0DCxuXqsk3PSP1UwBbcQPEF19uR4R22SeOOUyHfKZ0jxA6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759864629; 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=9SdzoEfq+NiGVYdkkUlkCV7PaBCWg2P23h9HRpQrXUw=; b=aQYW7NAs3RIelCDDzxzWm8lU+W1eOheXIAlFltpQb44Cs3XcZx0oMg3izQ+Hy2X2r/T6Pp BafOVXakG/MKbxQrPqQpbuDqHYFG0b5yHx22nMZDSgPzRRfiwZx+wl0nIM8Ysv6+OgVbj+ VRwLVOPkpJbaGD2DSwmU74kQUWR+Pw5M8jSm3Q4Yw2aO9Oi4Z3NJgOmwXWXvkEskCbWZRF vtEntlkse4UENCNSTgWXPl5VzONt6bRGhEcTrqz21CExNX4hYiM/pGM+e6fqv9+MLJMurO Ml7vlDV/HbzIDdsBcrqXL/yPRklyXbg2WKhdTiGqfdtvbBzpSDQcdScsfV2Edw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759864629; a=rsa-sha256; cv=none; b=pxt1zfY4ASnE8ClyuZxxDOLNw38lpe6IiT8MJIoEo4Q8MKic2FNnEOYZTeANEvqYvzANfX ITBv8YJbSL14ALJElCPfkXkiL9+awFSTFp9IbmDXtCqfG4mVQtnjZ5Xdn9B06V9BdhHS1G Ii6D5LwGlm3V/jG7xajhz+vZ0OIof5OoB+ippFbKYXVPF5CbaXymL6M/DYAfKz4HrV/U8A iKZMZQkdHFDr+yqE7th8ZWNc8ItUHzOhLej7dI9iKVOJPda1U0w3lWB9+WjcElkyoYmT+N tf45c3tY6n0YvSfBDjICOjnmkjdeu6qHTM8nEmgx3LwQORmUUZ/4ufR8HmhmMQ== 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 4ch5VY19n6zyWq; Tue, 07 Oct 2025 19:17:09 +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 597JH8Ws098308; Tue, 7 Oct 2025 19:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597JH8xC098305; Tue, 7 Oct 2025 19:17:08 GMT (envelope-from git) Date: Tue, 7 Oct 2025 19:17:08 GMT Message-Id: <202510071917.597JH8xC098305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 8a5ad92ecc59 - main - security/openssh-portable: Stop trying to generate DSA key. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a5ad92ecc597e3ec730f60f5f28df43e91604ba Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a5ad92ecc597e3ec730f60f5f28df43e91604ba commit 8a5ad92ecc597e3ec730f60f5f28df43e91604ba Author: Bryan Drewery AuthorDate: 2025-10-07 19:16:27 +0000 Commit: Bryan Drewery CommitDate: 2025-10-07 19:16:52 +0000 security/openssh-portable: Stop trying to generate DSA key. DSA key support was removed in 10.0. --- security/openssh-portable/Makefile | 2 +- security/openssh-portable/files/openssh.in | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 6cf668fc4280..12f7e4ef9da9 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssh DISTVERSION= 10.1p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in index 9526a70b0d07..251cca91fc62 100644 --- a/security/openssh-portable/files/openssh.in +++ b/security/openssh-portable/files/openssh.in @@ -23,8 +23,6 @@ load_rc_config ${name} : ${openssh_skipportscheck="NO"} # These only control ssh-keygen automatically generating host keys. -: ${openssh_dsa_enable="YES"} -: ${openssh_dsa_flags=""} : ${openssh_rsa_enable="YES"} : ${openssh_rsa_flags=""} : ${openssh_ecdsa_enable="YES"} @@ -44,13 +42,11 @@ pidfile=${openssh_pidfile:="/var/run/sshd.pid"} openssh_keygen() { local skip_dsa= skip_rsa= skip_ecdsa= skip_ed25519= - checkyesno openssh_dsa_enable || skip_dsa=y checkyesno openssh_rsa_enable || skip_rsa=y checkyesno openssh_ecdsa_enable || skip_ecdsa=y checkyesno openssh_ed25519_enable || skip_ed25519=y - if [ \( -n "$skip_dsa" -o -f %%ETCDIR%%/ssh_host_dsa_key \) -a \ - \( -n "$skip_rsa" -o -f %%ETCDIR%%/ssh_host_rsa_key \) -a \ + if [ \( -n "$skip_rsa" -o -f %%ETCDIR%%/ssh_host_rsa_key \) -a \ \( -n "$skip_ecdsa" -o -f %%ETCDIR%%/ssh_host_ecdsa_key \) -a \ \( -n "$skip_ed25519" -o -f %%ETCDIR%%/ssh_host_ed25519_key \) ]; then return 0 @@ -62,15 +58,6 @@ openssh_keygen() [ -x %%PREFIX%%/bin/ssh-keygen ] || err 1 "%%PREFIX%%/bin/ssh-keygen does not exist." - if [ -f %%ETCDIR%%/ssh_host_dsa_key ]; then - echo "You already have a DSA host key" \ - "in %%ETCDIR%%/ssh_host_dsa_key" - echo "Skipping protocol version 2 DSA Key Generation" - elif checkyesno openssh_dsa_enable; then - %%PREFIX%%/bin/ssh-keygen -t dsa $openssh_dsa_flags \ - -f %%ETCDIR%%/ssh_host_dsa_key -N '' - fi - if [ -f %%ETCDIR%%/ssh_host_rsa_key ]; then echo "You already have a RSA host key" \ "in %%ETCDIR%%/ssh_host_rsa_key"