From e11c4958865455a31cd255d6f1aab60abb84da59 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Mon, 7 May 2012 15:49:13 -0700 Subject: [PATCH] openssh: upgrade to 6.0p1 LICENSE checksum changed due to a trivial difference in the credits list. (From OE-Core rev: ce1fc60b0044bccf6cf8432700d6c0b6f042dae2) Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- .../openssh/{openssh-5.9p1 => openssh-6.0p1}/init | 0 .../{openssh-5.9p1 => openssh-6.0p1}/nostrip.patch | 0 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/ssh_config | 0 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd | 0 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd_config | 0 .../openssh/{openssh_5.9p1.bb => openssh_6.0p1.bb} | 8 ++++---- 6 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/init (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/nostrip.patch (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/ssh_config (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd_config (100%) rename meta/recipes-connectivity/openssh/{openssh_5.9p1.bb => openssh_6.0p1.bb} (94%) 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 749f89e033..dba08a19ae 100644 --- 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