diff options
Diffstat (limited to 'core/openssh')
| -rw-r--r-- | core/openssh/PKGBUILD | 33 | ||||
| -rw-r--r-- | core/openssh/install | 10 | ||||
| -rwxr-xr-x | core/openssh/sshd | 44 | ||||
| -rw-r--r-- | core/openssh/sshd.close-sessions | 17 | ||||
| -rw-r--r-- | core/openssh/sshd.confd | 4 | ||||
| -rw-r--r-- | core/openssh/sshd.service | 2 | ||||
| -rw-r--r-- | core/openssh/sshd@.service | 2 |
7 files changed, 24 insertions, 88 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index dac70e5d1..5697f8099 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $ +# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=6.2p1 +pkgver=6.2p2 pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' @@ -15,31 +15,28 @@ depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.close-sessions' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d' - '954bf1660aa32620c37034320877f4511b767ccb' + 'sshd.pam') +sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba' '6df5be396f8c593bb511a249a1453294d18a01a6' - 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - 'f9af4a442b804ab661cec0edb25dd76dee16d8d2' + '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' + '2d87de52a6b2f764180f9f67cb9747392784b4a5' 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - 'd93dca5ebda4610ff7647187f8928a3de28703f3' - '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7') + 'd93dca5ebda4610ff7647187f8928a3de28703f3') -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') + +install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ --with-ldns \ @@ -69,20 +66,14 @@ package() { make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1 install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id diff --git a/core/openssh/install b/core/openssh/install new file mode 100644 index 000000000..6f0cd3703 --- /dev/null +++ b/core/openssh/install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp $2 6.2p2) = -1 ]]; then + cat <<EOF + +==> The sshd daemon has been moved to /usr/bin alongside all binaries. +==> Please update this path in your scripts if applicable. + +EOF + fi +} diff --git a/core/openssh/sshd b/core/openssh/sshd deleted file mode 100755 index d60804e84..000000000 --- a/core/openssh/sshd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openssh/sshd.close-sessions b/core/openssh/sshd.close-sessions deleted file mode 100644 index be2a709fc..000000000 --- a/core/openssh/sshd.close-sessions +++ /dev/null @@ -1,17 +0,0 @@ -# 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 | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions diff --git a/core/openssh/sshd.confd b/core/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/core/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service index 633164e5d..349bde59d 100644 --- a/core/openssh/sshd.service +++ b/core/openssh/sshd.service @@ -4,7 +4,7 @@ Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] -ExecStart=/usr/sbin/sshd -D +ExecStart=/usr/bin/sshd -D ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service index 2fd9b0814..7ce3d37ba 100644 --- a/core/openssh/sshd@.service +++ b/core/openssh/sshd@.service @@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon After=sshdgenkeys.service [Service] -ExecStart=-/usr/sbin/sshd -i +ExecStart=-/usr/bin/sshd -i StandardInput=socket StandardError=syslog |