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 @@
-From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-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 <marex@denx.de>
-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 <string.h>
- #include <termios.h>
- 
--#include <openssl/sha.h>
-+#include "hash/sha512.h"
- 
- #include <libperfstat.h>
- 
-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 <errno.h>
- #include <unistd.h>
- #include <time.h>
--#include <openssl/sha.h>
-+
-+#include "hash/sha512.h"
- 
- #include <sys/vfs.h>
- 
-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 <errno.h>
- #include <unistd.h>
- #include <time.h>
--#include <openssl/sha.h>
-+
-+#include "hash/sha512.h"
- 
- #include <linux/types.h>
- #include <linux/random.h>
-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 <sys/types.h>
- 
-+#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.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 @@
-# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com>
-# 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
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 @@
+# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com>
+# 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/"
+# There seems to be more licenses used in the code, I don't think we want to list them all here, complete list:
+# OE @ ~/projects/libbsd $ grep ^License: COPYING  | sort
+# License: BSD-2-clause
+# License: BSD-2-clause
+# License: BSD-2-clause-NetBSD
+# License: BSD-2-clause-author
+# License: BSD-2-clause-verbatim
+# License: BSD-3-clause
+# License: BSD-3-clause
+# License: BSD-3-clause
+# License: BSD-3-clause-Peter-Wemm
+# License: BSD-3-clause-Regents
+# License: BSD-4-clause-Christopher-G-Demetriou
+# License: BSD-4-clause-Niels-Provos
+# License: BSD-5-clause-Peter-Wemm
+# License: Beerware
+# License: Expat
+# License: ISC
+# License: ISC-Original
+# License: public-domain
+# License: public-domain-Colin-Plumb
+LICENSE = "BSD-4-Clause & ISC & PD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=145ec05a217d8f879f29cfc5f83084be"
+SECTION = "libs"
+
+SRC_URI = " \
+    http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+"
+
+SRC_URI[md5sum] = "f3daff0283af6e30f25d68be2deac4ef"
+SRC_URI[sha256sum] = "adbc8781ad720bce939b689f38a9f0247732a36792147a7c28027c393c2af9b0"
+
+inherit autotools pkgconfig