summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-12-01 17:55:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:49 +0000
commitd9f73ca6dfb7c81660ff140efe0b10027e775e07 (patch)
tree6298596e82a692c1e678a14e8167a28329e6f6f4 /meta
parent10d6dc414c7779aafee54850b1d707dc6e001cb1 (diff)
downloadpoky-d9f73ca6dfb7c81660ff140efe0b10027e775e07.tar.gz
libbsd: Upgrade to 0.8.0
Upgrade the library version to recently released 0.8.0 . The COPYING file changed again, but the changes are just new names added to the Copyright (C) YYYY John Doe <...> section, no changes to the license itself. (From OE-Core rev: 9950c08341a2950521f18a1bf4593e84dfab864b) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Khem Raj <raj.khem@gmail.com> Cc: Saul Wold <sgw@linux.intel.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch75
-rw-r--r--meta/recipes-support/libbsd/libbsd_0.8.0.bb (renamed from meta/recipes-support/libbsd/libbsd_0.7.0.bb)11
2 files changed, 82 insertions, 4 deletions
diff --git a/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
new file mode 100644
index 0000000000..af47b2baba
--- /dev/null
+++ b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
@@ -0,0 +1,75 @@
1From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001
2From: Guillem Jover <guillem@hadrons.org>
3Date: Tue, 1 Dec 2015 03:39:10 +0100
4Subject: [PATCH] Use local SHA512 header
5
6Actually use the local private SHA512 header instead of relying on the
7OpenSSL one for no good reason. Add definition for expected macro
8SHA512_DIGEST_LENGTH.
9
10Signed-off-by: Marek Vasut <marex@denx.de>
11Upstream-Status: Backport
12---
13 src/getentropy_aix.c | 2 +-
14 src/getentropy_hpux.c | 3 ++-
15 src/getentropy_linux.c | 3 ++-
16 src/hash/sha512.h | 2 ++
17 4 files changed, 7 insertions(+), 3 deletions(-)
18
19diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c
20index cbd4037..d4ccab7 100644
21--- a/src/getentropy_aix.c
22+++ b/src/getentropy_aix.c
23@@ -39,7 +39,7 @@
24 #include <string.h>
25 #include <termios.h>
26
27-#include <openssl/sha.h>
28+#include "hash/sha512.h"
29
30 #include <libperfstat.h>
31
32diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c
33index 45ac84b..294d83a 100644
34--- a/src/getentropy_hpux.c
35+++ b/src/getentropy_hpux.c
36@@ -41,7 +41,8 @@
37 #include <errno.h>
38 #include <unistd.h>
39 #include <time.h>
40-#include <openssl/sha.h>
41+
42+#include "hash/sha512.h"
43
44 #include <sys/vfs.h>
45
46diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c
47index 0a5d6b8..d7a8ae5 100644
48--- a/src/getentropy_linux.c
49+++ b/src/getentropy_linux.c
50@@ -47,7 +47,8 @@
51 #include <errno.h>
52 #include <unistd.h>
53 #include <time.h>
54-#include <openssl/sha.h>
55+
56+#include "hash/sha512.h"
57
58 #include <linux/types.h>
59 #include <linux/random.h>
60diff --git a/src/hash/sha512.h b/src/hash/sha512.h
61index 43c5aaf..4f368a1 100644
62--- a/src/hash/sha512.h
63+++ b/src/hash/sha512.h
64@@ -31,6 +31,8 @@
65
66 #include <sys/types.h>
67
68+#define SHA512_DIGEST_LENGTH 64
69+
70 typedef struct SHA512Context {
71 uint64_t state[8];
72 uint64_t count[2];
73--
742.6.2
75
diff --git a/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.0.bb
index 902666da7f..34569681da 100644
--- a/meta/recipes-support/libbsd/libbsd_0.7.0.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.8.0.bb
@@ -9,13 +9,16 @@ DESCRIPTION = "This library provides useful functions commonly found on BSD syst
9 9
10HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" 10HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"
11LICENSE = "BSD-4-Clause & MIT" 11LICENSE = "BSD-4-Clause & MIT"
12LIC_FILES_CHKSUM = "file://COPYING;md5=f1530ea92aeaa1c5e2547cfd43905d8c" 12LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78"
13SECTION = "libs" 13SECTION = "libs"
14DEPENDS = "" 14DEPENDS = ""
15 15
16SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" 16SRC_URI = " \
17 http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
18 file://0001-Use-local-SHA512-header.patch \
19 "
17 20
18SRC_URI[md5sum] = "fcceb4e66fd448ca4ed42ba22a8babb0" 21SRC_URI[md5sum] = "262bdd1aa3bee6066a8c9cb49bb6c584"
19SRC_URI[sha256sum] = "0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb" 22SRC_URI[sha256sum] = "fbb732084bd960e4c78b688aac875be98e290cc6fe462b2ff8ee946a6473e38c"
20 23
21inherit autotools pkgconfig 24inherit autotools pkgconfig