summaryrefslogtreecommitdiff
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 12:46:46 +0000
commit5534deb69b0a2835fbbf149a00d1f6ba61cc8160 (patch)
tree43e323e5f0ff016a6a780eab701f6f451f459a2a
parentec81b985bb29a8562366f5343171e68a1f9cc4e9 (diff)
downloadopenembedded-core-5534deb69b0a2835fbbf149a00d1f6ba61cc8160.tar.gz
openembedded-core-5534deb69b0a2835fbbf149a00d1f6ba61cc8160.tar.bz2
openembedded-core-5534deb69b0a2835fbbf149a00d1f6ba61cc8160.zip
openssh : upgrade to 6.1p1
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
-PR = "r4"
+PR = "r0"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -27,9 +27,9 @@ 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] = "3c9347aa67862881c5da3f3b1c08da7b"
-SRC_URI[sha256sum] = "589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de"
+SRC_URI[md5sum] = "3345cbf4efe90ffb06a78670ab2d05d5"
+SRC_URI[sha256sum] = "d1c157f6c0852e90c191cc7c9018a583b51e3db4035489cb262639d337a1c411"
inherit useradd update-rc.d update-alternatives
USERADD_PACKAGES = "${PN}-sshd"