openssh: fix recursive key file removal

The -r option is not required here but should also not hurt,
since it was already tested, that $key is a file.
However, to express the intent of the command more clearly,
let's drop it.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 2bc2f0a0ea13c80339ec6fe9e6561d7f6a22206a..d66ec8f9ad79a8ed82760950ca6b590236bda4e4 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openssh
 PKG_REALVERSION:=9.9p1
 PKG_VERSION:=9.9_p1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \

diff --git a/net/openssh/files/sshd.init b/net/openssh/files/sshd.init
index 998b9a58692e8efcfcb83b58fda8250ac091497b..a322f4793a1e734169158f770076ddd1a3328b4e 100644 (file)
--- a/net/openssh/files/sshd.init
+++ b/net/openssh/files/sshd.init
@@ -15,7 +15,7 @@ start_service() {
                [ -f $key ] && {
                        [ -x /usr/bin/ssh-keygen ] && {
                                if ! /usr/bin/ssh-keygen -y -f $key > /dev/null 2>&1; then
-                                       rm -rf $key
+                                       rm -f $key
                                fi
                        }
                }