From d9f73ca6dfb7c81660ff140efe0b10027e775e07 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 1 Dec 2015 17:55:50 +0100 Subject: 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 Cc: Khem Raj Cc: Saul Wold Cc: Richard Purdie Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libbsd/0001-Use-local-SHA512-header.patch | 75 ++++++++++++++++++++++ meta/recipes-support/libbsd/libbsd_0.7.0.bb | 21 ------ meta/recipes-support/libbsd/libbsd_0.8.0.bb | 24 +++++++ 3 files changed, 99 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch delete mode 100644 meta/recipes-support/libbsd/libbsd_0.7.0.bb create mode 100644 meta/recipes-support/libbsd/libbsd_0.8.0.bb 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 @@ +From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 1 Dec 2015 03:39:10 +0100 +Subject: [PATCH] Use local SHA512 header + +Actually use the local private SHA512 header instead of relying on the +OpenSSL one for no good reason. Add definition for expected macro +SHA512_DIGEST_LENGTH. + +Signed-off-by: Marek Vasut +Upstream-Status: Backport +--- + src/getentropy_aix.c | 2 +- + src/getentropy_hpux.c | 3 ++- + src/getentropy_linux.c | 3 ++- + src/hash/sha512.h | 2 ++ + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c +index cbd4037..d4ccab7 100644 +--- a/src/getentropy_aix.c ++++ b/src/getentropy_aix.c +@@ -39,7 +39,7 @@ + #include + #include + +-#include ++#include "hash/sha512.h" + + #include + +diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c +index 45ac84b..294d83a 100644 +--- a/src/getentropy_hpux.c ++++ b/src/getentropy_hpux.c +@@ -41,7 +41,8 @@ + #include + #include + #include +-#include ++ ++#include "hash/sha512.h" + + #include + +diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c +index 0a5d6b8..d7a8ae5 100644 +--- a/src/getentropy_linux.c ++++ b/src/getentropy_linux.c +@@ -47,7 +47,8 @@ + #include + #include + #include +-#include ++ ++#include "hash/sha512.h" + + #include + #include +diff --git a/src/hash/sha512.h b/src/hash/sha512.h +index 43c5aaf..4f368a1 100644 +--- a/src/hash/sha512.h ++++ b/src/hash/sha512.h +@@ -31,6 +31,8 @@ + + #include + ++#define SHA512_DIGEST_LENGTH 64 ++ + typedef struct SHA512Context { + uint64_t state[8]; + uint64_t count[2]; +-- +2.6.2 + diff --git a/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/meta/recipes-support/libbsd/libbsd_0.7.0.bb deleted file mode 100644 index 902666da7f..0000000000 --- a/meta/recipes-support/libbsd/libbsd_0.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2013 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Library of utility functions from BSD systems" -DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ - and lacking on others like GNU systems, thus making it easier to port \ - projects with strong BSD origins, without needing to embed the same \ - code over and over again on each project." - -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" -LICENSE = "BSD-4-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f1530ea92aeaa1c5e2547cfd43905d8c" -SECTION = "libs" -DEPENDS = "" - -SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "fcceb4e66fd448ca4ed42ba22a8babb0" -SRC_URI[sha256sum] = "0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb" - -inherit autotools pkgconfig diff --git a/meta/recipes-support/libbsd/libbsd_0.8.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.0.bb new file mode 100644 index 0000000000..34569681da --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.8.0.bb @@ -0,0 +1,24 @@ +# Copyright (C) 2013 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library of utility functions from BSD systems" +DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ + and lacking on others like GNU systems, thus making it easier to port \ + projects with strong BSD origins, without needing to embed the same \ + code over and over again on each project." + +HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" +LICENSE = "BSD-4-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = " \ + http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-Use-local-SHA512-header.patch \ + " + +SRC_URI[md5sum] = "262bdd1aa3bee6066a8c9cb49bb6c584" +SRC_URI[sha256sum] = "fbb732084bd960e4c78b688aac875be98e290cc6fe462b2ff8ee946a6473e38c" + +inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf