[arch-commits] Commit in openssh/trunk (PKGBUILD sshd)

[Pierre Schmitz]

    Date: Wednesday, March 10, 2010 @ 10:33:21
  Author: pierre
Revision: 71831

upgpkg: openssh 5.4p1-2
fix FS#18611 and FS#17138

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

----------+
 PKGBUILD |    5 ++---
 sshd     |    8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-10 12:57:25 UTC (rev 71830)
+++ PKGBUILD	2010-03-10 15:33:21 UTC (rev 71831)
@@ -4,8 +4,7 @@
 
 pkgname=openssh
 pkgver=5.4p1
-pkgrel=1
-#_gsskexver=20080404
+pkgrel=2
 pkgdesc='A Secure SHell server/client'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -15,7 +14,7 @@
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
         'sshd' 'sshd.confd' 'sshd.pam')
 md5sums=('da10af8a789fa2e83e3635f3a1b76f5e'
-         'e8a3b7a3e3ace43eeb1f28a7c93fa15d'
+         'bc6a8bdb8d41ad821589c3e9c284e27d'
          'e2cea70ac13af7e63d40eb04415eacd5'
          '1c7c2ea8734ec7e3ca58d820634dc73a')
 

Modified: sshd
===================================================================
--- sshd	2010-03-10 12:57:25 UTC (rev 71830)
+++ sshd	2010-03-10 15:33:21 UTC (rev 71831)
@@ -4,7 +4,13 @@
 . /etc/rc.d/functions
 . /etc/conf.d/sshd
 
-PID=`cat /var/run/sshd.pid 2>/dev/null`
+PID="$(cat /var/run/sshd.pid 2>/dev/null)"
+# check if there is a sshd using that pid and ignore it otherwise
+if [ "$(readlink /proc/${PID}/exe 2>/dev/null)" != '/usr/sbin/sshd' ]; then
+  PID=''
+  rm -f /var/run/sshd.pid
+fi
+
 case "$1" in
   start)
     stat_busy "Starting Secure Shell Daemon"