From 9e3ebeae4e614a70375071b5c6bcf4b062fba117 Mon Sep 17 00:00:00 2001 From: Andrei Dinu Date: Mon, 28 Jan 2013 10:50:04 +0200 Subject: [PATCH] openssh : upgrade to 6.1p1 (From OE-Core rev: 5534deb69b0a2835fbbf149a00d1f6ba61cc8160) Signed-off-by: Andrei Dinu Signed-off-by: Richard Purdie --- .../openssh/{openssh-6.0p1 => openssh-6.1p1}/init | 0 .../openssh/{openssh-6.0p1 => openssh-6.1p1}/nostrip.patch | 0 .../{openssh-6.0p1 => openssh-6.1p1}/openssh-CVE-2011-4327.patch | 0 .../openssh/{openssh-6.0p1 => openssh-6.1p1}/ssh_config | 0 .../openssh/{openssh-6.0p1 => openssh-6.1p1}/sshd | 0 .../openssh/{openssh-6.0p1 => openssh-6.1p1}/sshd_config | 0 .../openssh/{openssh_6.0p1.bb => openssh_6.1p1.bb} | 6 +++--- 7 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-connectivity/openssh/{openssh-6.0p1 => openssh-6.1p1}/init (100%) rename meta/recipes-connectivity/openssh/{openssh-6.0p1 => openssh-6.1p1}/nostrip.patch (100%) rename meta/recipes-connectivity/openssh/{openssh-6.0p1 => openssh-6.1p1}/openssh-CVE-2011-4327.patch (100%) rename meta/recipes-connectivity/openssh/{openssh-6.0p1 => openssh-6.1p1}/ssh_config (100%) rename meta/recipes-connectivity/openssh/{openssh-6.0p1 => openssh-6.1p1}/sshd (100%) rename meta/recipes-connectivity/openssh/{openssh-6.0p1 => openssh-6.1p1}/sshd_config (100%) rename meta/recipes-connectivity/openssh/{openssh_6.0p1.bb => openssh_6.1p1.bb} (95%) diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/init b/meta/recipes-connectivity/openssh/openssh-6.1p1/init similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-6.0p1/init rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-6.0p1/openssh-CVE-2011-4327.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-6.0p1/sshd rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config rename to 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 similarity index 95% rename from meta/recipes-connectivity/openssh/openssh_6.0p1.bb rename to meta/recipes-connectivity/openssh/openssh_6.1p1.bb index df77040..71d71e4 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" -- 2.7.4