openssh: upgrade to 6.5p1

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/init b/meta/recipes-connectivity/openssh/openssh/init
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/init
rename to meta/recipes-connectivity/openssh/openssh/init

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh/nostrip.patch
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/nostrip.patch
rename to meta/recipes-connectivity/openssh/openssh/nostrip.patch

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/openssh-CVE-2011-4327.patch b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/openssh-CVE-2011-4327.patch
rename to meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/ssh_config b/meta/recipes-connectivity/openssh/openssh/ssh_config
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/ssh_config
rename to meta/recipes-connectivity/openssh/openssh/ssh_config

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd b/meta/recipes-connectivity/openssh/openssh/sshd
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/sshd
rename to meta/recipes-connectivity/openssh/openssh/sshd

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket b/meta/recipes-connectivity/openssh/openssh/sshd.socket
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/sshd.socket
rename to meta/recipes-connectivity/openssh/openssh/sshd.socket

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service b/meta/recipes-connectivity/openssh/openssh/sshd@.service
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/sshd@.service
rename to meta/recipes-connectivity/openssh/openssh/sshd@.service

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshd_config b/meta/recipes-connectivity/openssh/openssh/sshd_config
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/sshd_config
rename to meta/recipes-connectivity/openssh/openssh/sshd_config

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/sshdgenkeys.service
rename to meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service

diff --git a/meta/recipes-connectivity/openssh/openssh-6.4p1/volatiles.99_sshd b/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.4p1/volatiles.99_sshd
rename to meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd

diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
similarity index 97%
rename from meta/recipes-connectivity/openssh/openssh_6.4p1.bb
rename to meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index 236714de2dc75b24adefef22ce398d1fbc0578c4..6c413afd451968d9f16002b37dd8a1d266050359 100644 (file)
--- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -32,8 +32,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
 
 PAM_SRC_URI = "file://sshd"
 
-SRC_URI[md5sum] = "a62b88b884df0b09b8a8c5789ac9e51b"
-SRC_URI[sha256sum] = "5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2"
+SRC_URI[md5sum] = "a084e7272b8cbd25afe0f5dce4802fef"
+SRC_URI[sha256sum] = "a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027"
 
 inherit useradd update-rc.d update-alternatives systemd