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

Gaetan Bisson bisson at archlinux.org
Mon Jan 24 05:27:52 EST 2011


    Date: Monday, January 24, 2011 @ 05:27:52
  Author: bisson
Revision: 107350

- major upstream update
- create a host key of type ECDSA in rc.d script
- slightly improve rc.d script (use grep rather than cut+test)

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-24 10:25:24 UTC (rev 107349)
+++ PKGBUILD	2011-01-24 10:27:52 UTC (rev 107350)
@@ -3,8 +3,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=openssh
-pkgver=5.6p1
-pkgrel=2
+pkgver=5.7p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -15,10 +15,10 @@
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('347dd39c91c3529f41dae63714d452fb95efea1e'
+sha1sums=('423e27475f06e1055847dfff7f61e1ac632b5372'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '660092c57bde28bed82078f74011f95fc51c2293'
-          '9738367ee87b6d5a2a34c675b4c483044853109f')
+          '71d67cde8044fe9b11fb5f9e3698ffe4da23f460')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"

Modified: sshd
===================================================================
--- sshd	2011-01-24 10:25:24 UTC (rev 107349)
+++ sshd	2011-01-24 10:27:52 UTC (rev 107350)
@@ -6,7 +6,7 @@
 
 PIDFILE=/var/run/sshd.pid
 PID=$(cat $PIDFILE 2>/dev/null)
-if [ "$(readlink -q /proc/$PID/exe | cut -d ' ' -f 1)" != "/usr/sbin/sshd" ]; then
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd[ $]'; then
   PID=
   rm $PIDFILE 2>/dev/null
 fi
@@ -17,6 +17,7 @@
     [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
     [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
     [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; }
     [ -d /var/empty ] || mkdir -p /var/empty
     [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS
     if [ $? -gt 0 ]; then



More information about the arch-commits mailing list