summaryrefslogtreecommitdiff
path: root/testing/openssh
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-03-21 00:01:20 +0000
committerroot <root@rshg054.dnsready.net>2012-03-21 00:01:20 +0000
commita3108a9a809c496e1f6a0e9caf0acebac3889bfb (patch)
treedf7be9bed47b2d4a4f0ae33d40a406a775a5d1e7 /testing/openssh
parent99136e3a2e9f6f07a7ff08d5721bce354b853c8b (diff)
Wed Mar 21 00:01:20 UTC 2012
Diffstat (limited to 'testing/openssh')
-rw-r--r--testing/openssh/PKGBUILD9
-rw-r--r--testing/openssh/sshd.close-sessions14
2 files changed, 19 insertions, 4 deletions
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
index 9d03737c7..4589f2e31 100644
--- a/testing/openssh/PKGBUILD
+++ b/testing/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 153489 2012-03-14 23:42:15Z pierre $
+# $Id: PKGBUILD 153822 2012-03-19 19:12:31Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=5.9p1
-pkgrel=6
+pkgrel=7
pkgdesc='Free version of the SSH connectivity tools'
arch=('i686' 'x86_64')
license=('custom:BSD')
@@ -14,10 +14,12 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/
depends=('krb5' 'openssl' 'libedit')
optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
+ 'sshd.close-sessions'
'sshd.confd'
'sshd.pam'
'sshd')
sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+ '3e8efad4578bbeb8f9788432758c69dc2b303c1c'
'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
'3413909fd45a28701c92e6e5b59c6b65346ddb0f'
'21fa88de6cc1c7912e71655f50896ba17991a1c2')
@@ -50,16 +52,15 @@ package() {
install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+ install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
rm "${pkgdir}"/usr/share/man/man1/slogin.1
ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
- # additional contrib scripts that we like
install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
- # PAM is a common, standard feature to have
sed \
-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-e '/^#UsePAM no$/c UsePAM yes' \
diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions
new file mode 100644
index 000000000..208583238
--- /dev/null
+++ b/testing/openssh/sshd.close-sessions
@@ -0,0 +1,14 @@
+# Close sshd sessions before shutting down the network; see FS#17389.
+
+sshd_close_sessions () {
+ /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
+ fi
+ done
+ stat_done
+}
+
+add_hook shutdown_start sshd_close_sessions