diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2016-01-07 15:42:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 15:41:45 +0000 |
commit | fbc2147ab56d2de5dc763632f7cadf81bf47ce2c (patch) | |
tree | bc38b045719b4da414f35ae5f3f884e3cd26cd66 | |
parent | 221d864042658daa054281aab439b44d54fe94d7 (diff) | |
download | poky-fbc2147ab56d2de5dc763632f7cadf81bf47ce2c.tar.gz |
libbsd: upgrade to 0.8.1
* fixes building lldpd from meta-networking, more information in:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807730
http://cgit.freedesktop.org/libbsd/commit/?id=48ac79b1883981f5135b5b9c76ca268e6cbe65b2
* update LIC_FILES_CHKSUM and LICENSE according to:
http://cgit.freedesktop.org/libbsd/commit/?id=6bcb1312f4691b92d0193e4a923a776dc6f233df
http://cgit.freedesktop.org/libbsd/commit/?id=290a1ce8f262a7f30a77c0a89eaa28876de876ed
be aware that it doesn't list all LICENSEs, only those where
common license text already exists (feel free to add additional
texts).
(From OE-Core rev: bc1fd218acde4728b8a039cb4da3fd9f50eb57a5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch | 75 | ||||
-rw-r--r-- | meta/recipes-support/libbsd/libbsd_0.8.0.bb | 24 | ||||
-rw-r--r-- | meta/recipes-support/libbsd/libbsd_0.8.1.bb | 43 |
3 files changed, 43 insertions, 99 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 deleted file mode 100644 index af47b2baba..0000000000 --- a/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Guillem Jover <guillem@hadrons.org> | ||
3 | Date: Tue, 1 Dec 2015 03:39:10 +0100 | ||
4 | Subject: [PATCH] Use local SHA512 header | ||
5 | |||
6 | Actually use the local private SHA512 header instead of relying on the | ||
7 | OpenSSL one for no good reason. Add definition for expected macro | ||
8 | SHA512_DIGEST_LENGTH. | ||
9 | |||
10 | Signed-off-by: Marek Vasut <marex@denx.de> | ||
11 | Upstream-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 | |||
19 | diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c | ||
20 | index 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 | |||
32 | diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c | ||
33 | index 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 | |||
46 | diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c | ||
47 | index 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> | ||
60 | diff --git a/src/hash/sha512.h b/src/hash/sha512.h | ||
61 | index 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 | -- | ||
74 | 2.6.2 | ||
75 | |||
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.0.bb deleted file mode 100644 index 34569681da..0000000000 --- a/meta/recipes-support/libbsd/libbsd_0.8.0.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | # Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "Library of utility functions from BSD systems" | ||
5 | DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ | ||
6 | and lacking on others like GNU systems, thus making it easier to port \ | ||
7 | projects with strong BSD origins, without needing to embed the same \ | ||
8 | code over and over again on each project." | ||
9 | |||
10 | HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" | ||
11 | LICENSE = "BSD-4-Clause & MIT" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78" | ||
13 | SECTION = "libs" | ||
14 | DEPENDS = "" | ||
15 | |||
16 | SRC_URI = " \ | ||
17 | http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | ||
18 | file://0001-Use-local-SHA512-header.patch \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[md5sum] = "262bdd1aa3bee6066a8c9cb49bb6c584" | ||
22 | SRC_URI[sha256sum] = "fbb732084bd960e4c78b688aac875be98e290cc6fe462b2ff8ee946a6473e38c" | ||
23 | |||
24 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.1.bb b/meta/recipes-support/libbsd/libbsd_0.8.1.bb new file mode 100644 index 0000000000..45420d55e6 --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.8.1.bb | |||
@@ -0,0 +1,43 @@ | |||
1 | # Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "Library of utility functions from BSD systems" | ||
5 | DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ | ||
6 | and lacking on others like GNU systems, thus making it easier to port \ | ||
7 | projects with strong BSD origins, without needing to embed the same \ | ||
8 | code over and over again on each project." | ||
9 | |||
10 | HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" | ||
11 | # There seems to be more licenses used in the code, I don't think we want to list them all here, complete list: | ||
12 | # OE @ ~/projects/libbsd $ grep ^License: COPYING | sort | ||
13 | # License: BSD-2-clause | ||
14 | # License: BSD-2-clause | ||
15 | # License: BSD-2-clause-NetBSD | ||
16 | # License: BSD-2-clause-author | ||
17 | # License: BSD-2-clause-verbatim | ||
18 | # License: BSD-3-clause | ||
19 | # License: BSD-3-clause | ||
20 | # License: BSD-3-clause | ||
21 | # License: BSD-3-clause-Peter-Wemm | ||
22 | # License: BSD-3-clause-Regents | ||
23 | # License: BSD-4-clause-Christopher-G-Demetriou | ||
24 | # License: BSD-4-clause-Niels-Provos | ||
25 | # License: BSD-5-clause-Peter-Wemm | ||
26 | # License: Beerware | ||
27 | # License: Expat | ||
28 | # License: ISC | ||
29 | # License: ISC-Original | ||
30 | # License: public-domain | ||
31 | # License: public-domain-Colin-Plumb | ||
32 | LICENSE = "BSD-4-Clause & ISC & PD" | ||
33 | LIC_FILES_CHKSUM = "file://COPYING;md5=145ec05a217d8f879f29cfc5f83084be" | ||
34 | SECTION = "libs" | ||
35 | |||
36 | SRC_URI = " \ | ||
37 | http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | ||
38 | " | ||
39 | |||
40 | SRC_URI[md5sum] = "f3daff0283af6e30f25d68be2deac4ef" | ||
41 | SRC_URI[sha256sum] = "adbc8781ad720bce939b689f38a9f0247732a36792147a7c28027c393c2af9b0" | ||
42 | |||
43 | inherit autotools pkgconfig | ||