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

[Pierre Schmitz]

    Date: Monday, March 15, 2010 @ 09:02:58
  Author: pierre
Revision: 72389

upgpkg: openssh 5.4p1-3
roll back to working init script (for real)

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-15 11:17:39 UTC (rev 72388)
+++ PKGBUILD	2010-03-15 13:02:58 UTC (rev 72389)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=5.4p1
-pkgrel=2
+pkgrel=3
 pkgdesc='A Secure SHell server/client'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -14,7 +14,7 @@
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
         'sshd' 'sshd.confd' 'sshd.pam')
 md5sums=('da10af8a789fa2e83e3635f3a1b76f5e'
-         'bc6a8bdb8d41ad821589c3e9c284e27d'
+         '17b1b1bf0f578a55945ee204bd4462af'
          'e2cea70ac13af7e63d40eb04415eacd5'
          '1c7c2ea8734ec7e3ca58d820634dc73a')
 

Modified: sshd
===================================================================
--- sshd	2010-03-15 11:17:39 UTC (rev 72388)
+++ sshd	2010-03-15 13:02:58 UTC (rev 72389)
@@ -5,12 +5,6 @@
 . /etc/conf.d/sshd
 
 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"