diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-22 00:01:28 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-22 00:01:28 +0000 |
| commit | 39e662ccfbe62ae77d458159d192816171a22f43 (patch) | |
| tree | 2484a55934cd77dd33597ab2f214de5b7326cf69 /testing/openssh | |
| parent | a3108a9a809c496e1f6a0e9caf0acebac3889bfb (diff) | |
Thu Mar 22 00:01:28 UTC 2012
Diffstat (limited to 'testing/openssh')
| -rw-r--r-- | testing/openssh/PKGBUILD | 6 | ||||
| -rw-r--r-- | testing/openssh/sshd.close-sessions | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD index 4589f2e31..6203ac45c 100644 --- a/testing/openssh/PKGBUILD +++ b/testing/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153822 2012-03-19 19:12:31Z bisson $ +# $Id: PKGBUILD 153863 2012-03-20 07:01:42Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.9p1 -pkgrel=7 +pkgrel=8 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') @@ -19,7 +19,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd.pam' 'sshd') sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' - '3e8efad4578bbeb8f9788432758c69dc2b303c1c' + '954bf1660aa32620c37034320877f4511b767ccb' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '3413909fd45a28701c92e6e5b59c6b65346ddb0f' '21fa88de6cc1c7912e71655f50896ba17991a1c2') diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions index 208583238..be2a709fc 100644 --- a/testing/openssh/sshd.close-sessions +++ b/testing/openssh/sshd.close-sessions @@ -1,13 +1,16 @@ # Close sshd sessions before shutting down the network; see FS#17389. sshd_close_sessions () { + if ck_daemon sshd; then + return + fi /etc/rc.d/sshd stop stat_busy "Stopping Secure Shell Sessions" for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe &>/dev/null | grep -q '^/usr/sbin/sshd'; then - kill $i &>/dev/null + if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then + kill $i fi - done + done &>/dev/null stat_done } |