diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-01-02 10:05:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-07 23:35:06 +0000 |
commit | fca3bc561ceaa485bae6140aadd32c84f75d74f7 (patch) | |
tree | 0cafd880090987a15c8f06a6b2d73b5dde810cd7 | |
parent | 3fb5191d4da52c6b352a23881c0ea63c2e348619 (diff) | |
download | poky-fca3bc561ceaa485bae6140aadd32c84f75d74f7.tar.gz |
dropbear: upgrade to 2014.66
* Upgrade to upstream 2014.66; incorporates several minor bugfix
releases.
* LIC_FILES_CHKSUM changed because the copyright year changed; there was
no change to the license text itself.
(From OE-Core rev: 78f388e81cad5dfb6aea52da68f9b4523c88c5ad)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 947a491679..e187d04339 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -5,7 +5,7 @@ SECTION = "console/network" | |||
5 | # some files are from other projects and have others license terms: | 5 | # some files are from other projects and have others license terms: |
6 | # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY | 6 | # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY |
7 | LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" | 7 | LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4d290ce0ac102c828dfc9ce836784688" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e3a1b9604afd1648b28b0c6f1709e9f4" |
9 | 9 | ||
10 | DEPENDS = "zlib" | 10 | DEPENDS = "zlib" |
11 | RPROVIDES_${PN} = "ssh sshd" | 11 | RPROVIDES_${PN} = "ssh sshd" |
diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch index 71a4666b5c..dc9d5782e8 100644 --- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +++ b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch | |||
@@ -13,7 +13,7 @@ index 7d06322..71a21c2 100644 | |||
13 | /* The command to invoke for xauth when using X11 forwarding. | 13 | /* The command to invoke for xauth when using X11 forwarding. |
14 | * "-q" for quiet */ | 14 | * "-q" for quiet */ |
15 | #ifndef XAUTH_COMMAND | 15 | #ifndef XAUTH_COMMAND |
16 | -#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" | 16 | -#define XAUTH_COMMAND "/usr/bin/xauth -q" |
17 | +#define XAUTH_COMMAND "xauth -q" | 17 | +#define XAUTH_COMMAND "xauth -q" |
18 | #endif | 18 | #endif |
19 | 19 | ||
diff --git a/meta/recipes-core/dropbear/dropbear_2014.63.bb b/meta/recipes-core/dropbear/dropbear_2014.63.bb deleted file mode 100644 index bb7e6178bc..0000000000 --- a/meta/recipes-core/dropbear/dropbear_2014.63.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require dropbear.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "7066bb9a2da708f3ed06314fdc9c47fd" | ||
4 | SRC_URI[sha256sum] = "595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae" | ||
diff --git a/meta/recipes-core/dropbear/dropbear_2014.66.bb b/meta/recipes-core/dropbear/dropbear_2014.66.bb new file mode 100644 index 0000000000..8931eb75b2 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_2014.66.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | require dropbear.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "c21a01111aa5015db038c6efdb85717d" | ||
4 | SRC_URI[sha256sum] = "ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76" | ||