From ed15bed8df810c337e90cd1af32ef4490a864b69 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Wed, 3 Apr 2024 18:36:18 -0300
Subject: [PATCH] recipes: networking/openssh: Improve perp service
 instructions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Suggested by Jing Luo.

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 archive/openssh/rc.main           | 24 ++++--------------------
 recipes/networking/openssh/recipe |  4 ++--
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/archive/openssh/rc.main b/archive/openssh/rc.main
index 5961cc5a..57531866 100644
--- a/archive/openssh/rc.main
+++ b/archive/openssh/rc.main
@@ -11,29 +11,13 @@ exec 2>&1
 TARGET="$1"
 SVNAME="${2:-sshd}"
 
-make_keys()
-{
-    if test ! -f /etc/ssh/ssh_host_key || test ! -s /etc/ssh/ssh_host_key
-    then
-        echo "*** ${SVNAME}: Generating /etc/ssh/ssh_host_key ..."
-        /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ''
-    fi
-    if test ! -f /etc/ssh/ssh_host_dsa_key || test ! -s /etc/ssh/ssh_host_dsa_key
-    then
-        echo "*** ${SVNAME}: Generating /etc/ssh/ssh_host_dsa_key ..."
-        /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
-    fi
-    if test ! -f /etc/ssh/ssh_host_rsa_key || test ! -s /etc/ssh/ssh_host_rsa_key
-    then
-        echo "*** ${SVNAME}: Generating /etc/ssh/ssh_host_rsa_key ..."
-        /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-    fi
-}
-
 start()
 {
     echo "*** ${SVNAME}: Starting sshd ..."
-    make_keys
+
+    # Generate host (rsa, dsa, ecdsa and ed25519) keys, if do not exist
+    /usr/bin/ssh-keygen -A
+
     # sshd options required for perp service:
     #   -D  no detach, run in foreground
     #   -e  log to stderr (for tinylog) instead of syslog
diff --git a/recipes/networking/openssh/recipe b/recipes/networking/openssh/recipe
index d0a448a3..9dffa78b 100644
--- a/recipes/networking/openssh/recipe
+++ b/recipes/networking/openssh/recipe
@@ -1,6 +1,6 @@
 # Build recipe for openssh.
 #
-# Copyright (c) 2018-2019, 2021-2022 Matias Fonzo, <selk@dragora.org>.
+# Copyright (c) 2018-2019, 2021-2022, 2024 Matias Fonzo, <selk@dragora.org>.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ set -e
 
 program=openssh
 version=9.1p1
-release=1
+release=2
 
 # Define a category for the output of the package name
 pkgcategory=networking
-- 
2.11.4.GIT