openssh: upgrade to 6.0p1

LICENSE checksum changed due to a trivial difference in the credits
list.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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

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

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

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

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

diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
similarity index 94%
rename from meta/recipes-connectivity/openssh/openssh_5.9p1.bb
rename to meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 749f89e03382a56198698a1865ad577bf6c26540..dba08a19aebd11c1da43b22ae1c60307f8c81c4e 100644 (file)
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
@@ -5,9 +5,9 @@ and for executing commands on a remote machine."
 HOMEPAGE = "http://openssh.org"
 SECTION = "console/network"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
 
-PR = "r3"
+PR = "r0"
 
 DEPENDS = "zlib openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -26,8 +26,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://sshd"
-SRC_URI[md5sum] = "afe17eee7e98d3b8550cc349834a85d0"
-SRC_URI[sha256sum] = "8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5"
+SRC_URI[md5sum] = "3c9347aa67862881c5da3f3b1c08da7b"
+SRC_URI[sha256sum] = "589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de"
 
 inherit useradd update-rc.d