From 9ef2d15c291e85d066522ca68d2cd7114a038aaa Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sat, 25 Jan 2025 12:15:16 +0100 Subject: [PATCH] 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 --- net/openssh/Makefile | 2 +- net/openssh/files/sshd.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 2bc2f0a0ea..d66ec8f9ad 100644 --- 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 998b9a5869..a322f4793a 100644 --- 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 } } -- 2.30.2