Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openssh: handle multiple ports and simplify init script

Browse source 
Signed-off-by: Peter Wagner <tripolar@gmx.at>
This commit is contained in:
Peter Wagner 2019-03-21 19:29:07 +01:00
parent 057524be06
commit ba72d8d139
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/openssh/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=7.9p1 PKG_VERSION:=7.9p1
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \

16
net/openssh/files/sshd.init
View file

@ -8,7 +8,8 @@ USE_PROCD=1
PROG=/usr/sbin/sshd PROG=/usr/sbin/sshd
start_service() { start_service() {
for type in rsa ecdsa ed25519; do { for type in rsa ecdsa ed25519
do
# check for keys # check for keys
key=/etc/ssh/ssh_host_${type}_key key=/etc/ssh/ssh_host_${type}_key
[ ! -f $key ] && { [ ! -f $key ] && {
@ -17,10 +18,10 @@ start_service() {
/usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&- /usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&-
} }
} }
}; done done
mkdir -m 0700 -p /var/empty mkdir -m 0700 -p /var/empty
local lport=`grep ^Port /etc/ssh/sshd_config | cut -d " " -f 2` local lport=$(awk '/^Port / { print $2; exit }' /etc/ssh/sshd_config)
[ -z $lport ] && lport=22 [ -z $lport ] && lport=22
procd_open_instance procd_open_instance
@ -31,16 +32,13 @@ start_service() {
shutdown() { shutdown() {
local pid local pid
local pids
local pid_mine
stop stop
# kill active clients # kill active clients
pid_mine="$$" for pid in $(pidof sshd)
pids="$(pidof sshd)" do
for pid in $pids; do [ "$pid" == "$$" ] && continue
[ "$pid" = "$pid_mine" ] && continue
[ -e "/proc/$pid/stat" ] && kill $pid [ -e "/proc/$pid/stat" ] && kill $pid
done done
} }