summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndrei Dinu <andrei.adrianx.dinu@intel.com>2013-01-28 10:50:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 14:49:04 +0000
commitf3dfb7c200389e08a362737fa27546e704907f0a (patch)
treeb002c69c90babce09bbd3f6b55e0b7cc83cfce35 /meta/recipes-connectivity
parent3ba2ce25bdc78f660552d3d16272a551d434c527 (diff)
downloadpoky-f3dfb7c200389e08a362737fa27546e704907f0a.tar.gz
openssh : upgrade to 6.1p1
(From OE-Core rev: 5534deb69b0a2835fbbf149a00d1f6ba61cc8160) Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.1p1/init (renamed from meta/recipes-connectivity/openssh/openssh-6.0p1/init)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.1p1/nostrip.patch (renamed from meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.1p1/openssh-CVE-2011-4327.patch (renamed from meta/recipes-connectivity/openssh/openssh-6.0p1/openssh-CVE-2011-4327.patch)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.1p1/ssh_config (renamed from meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.1p1/sshd (renamed from meta/recipes-connectivity/openssh/openssh-6.0p1/sshd)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.1p1/sshd_config (renamed from meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config)0
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.1p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_6.0p1.bb)6
7 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/init b/meta/recipes-connectivity/openssh/openssh-6.1p1/init
index cde52ef3f4..cde52ef3f4 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/init
+++ b/meta/recipes-connectivity/openssh/openssh-6.1p1/init
diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-6.1p1/nostrip.patch
index 33111f5494..33111f5494 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch
+++ b/meta/recipes-connectivity/openssh/openssh-6.1p1/nostrip.patch
diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/openssh-CVE-2011-4327.patch b/meta/recipes-connectivity/openssh/openssh-6.1p1/openssh-CVE-2011-4327.patch
index 8489edcc82..8489edcc82 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/openssh-CVE-2011-4327.patch
+++ b/meta/recipes-connectivity/openssh/openssh-6.1p1/openssh-CVE-2011-4327.patch
diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config b/meta/recipes-connectivity/openssh/openssh-6.1p1/ssh_config
index 4a4a649ba8..4a4a649ba8 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config
+++ b/meta/recipes-connectivity/openssh/openssh-6.1p1/ssh_config
diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/sshd b/meta/recipes-connectivity/openssh/openssh-6.1p1/sshd
index 4882e58b48..4882e58b48 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/sshd
+++ b/meta/recipes-connectivity/openssh/openssh-6.1p1/sshd
diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config b/meta/recipes-connectivity/openssh/openssh-6.1p1/sshd_config
index 4f9b626fbd..4f9b626fbd 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config
+++ b/meta/recipes-connectivity/openssh/openssh-6.1p1/sshd_config
diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.1p1.bb
index df77040099..71d71e4464 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.1p1.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9 9
10PR = "r4" 10PR = "r0"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -27,9 +27,9 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
27 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 27 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
28 28
29PAM_SRC_URI = "file://sshd" 29PAM_SRC_URI = "file://sshd"
30SRC_URI[md5sum] = "3c9347aa67862881c5da3f3b1c08da7b"
31SRC_URI[sha256sum] = "589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de"
32 30
31SRC_URI[md5sum] = "3345cbf4efe90ffb06a78670ab2d05d5"
32SRC_URI[sha256sum] = "d1c157f6c0852e90c191cc7c9018a583b51e3db4035489cb262639d337a1c411"
33inherit useradd update-rc.d update-alternatives 33inherit useradd update-rc.d update-alternatives
34 34
35USERADD_PACKAGES = "${PN}-sshd" 35USERADD_PACKAGES = "${PN}-sshd"