diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-05-07 15:49:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 14:49:14 +0100 |
commit | e11c4958865455a31cd255d6f1aab60abb84da59 (patch) | |
tree | 52f3c97de11e861bdd3672188bade6013c4aefbe | |
parent | 649782175a1fc48e4207e18bc2244a50293a8034 (diff) | |
download | poky-e11c4958865455a31cd255d6f1aab60abb84da59.tar.gz |
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 <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh-6.0p1/init (renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/init) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch (renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/nostrip.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config (renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/ssh_config) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh-6.0p1/sshd (renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config (renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd_config) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.0p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_5.9p1.bb) | 8 |
6 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/init b/meta/recipes-connectivity/openssh/openssh-6.0p1/init index 055dd22e1b..055dd22e1b 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/init +++ b/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 index 33111f5494..33111f5494 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/nostrip.patch +++ b/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 index 4a4a649ba8..4a4a649ba8 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/ssh_config +++ b/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 index 4882e58b48..4882e58b48 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/sshd +++ b/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 index 4f9b626fbd..4f9b626fbd 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/sshd_config +++ b/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 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." | |||
5 | HOMEPAGE = "http://openssh.org" | 5 | HOMEPAGE = "http://openssh.org" |
6 | SECTION = "console/network" | 6 | SECTION = "console/network" |
7 | LICENSE = "BSD" | 7 | LICENSE = "BSD" |
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" |
9 | 9 | ||
10 | PR = "r3" | 10 | PR = "r0" |
11 | 11 | ||
12 | DEPENDS = "zlib openssl" | 12 | DEPENDS = "zlib openssl" |
13 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 13 | 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. | |||
26 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" | 26 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" |
27 | 27 | ||
28 | PAM_SRC_URI = "file://sshd" | 28 | PAM_SRC_URI = "file://sshd" |
29 | SRC_URI[md5sum] = "afe17eee7e98d3b8550cc349834a85d0" | 29 | SRC_URI[md5sum] = "3c9347aa67862881c5da3f3b1c08da7b" |
30 | SRC_URI[sha256sum] = "8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5" | 30 | SRC_URI[sha256sum] = "589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de" |
31 | 31 | ||
32 | inherit useradd update-rc.d | 32 | inherit useradd update-rc.d |
33 | 33 | ||