From 2a5b8a9d538e43385e37498abeea23caf5cecd60 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 15 Jan 2024 17:00:05 +0800 Subject: libbsd: upgrade 0.11.7 -> 0.11.8 License-Update: Switch arc4random(3bsd) man page from OpenBSD to NetBSD 0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch removed since it's included in 0.11.8 (From OE-Core rev: c5709bb67c14f7ba829803cf1dc3f1c564376168) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...eplace-off64_t-with-off_t-in-funopen_seek.patch | 34 -------------- meta/recipes-support/libbsd/libbsd_0.11.7.bb | 52 ---------------------- meta/recipes-support/libbsd/libbsd_0.11.8.bb | 47 +++++++++++++++++++ 3 files changed, 47 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch delete mode 100644 meta/recipes-support/libbsd/libbsd_0.11.7.bb create mode 100644 meta/recipes-support/libbsd/libbsd_0.11.8.bb diff --git a/meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch b/meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch deleted file mode 100644 index 45ecef041b..0000000000 --- a/meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9c4e5f8984e46344c9e150764b8aa0a7a70b6cb5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 15 Dec 2022 09:02:22 -0800 -Subject: [PATCH] funopen: Replace off64_t with off_t in funopen_seek - -AC_SYS_LARGEFILE in configure.ac is setting needed defines to make -64bit off_t on relevant platforms. - -Fixes build on musl - -| ../../../../../../../../workspace/sources/libbsd/src/funopen.c:68:28: error: unknown type name 'off64_t'; did you mean 'off_t'? -| funopen_seek(void *cookie, off64_t *offset, int whence) -| ^~~~~~~ -| off_t - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/24] -Signed-off-by: Khem Raj ---- - src/funopen.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/funopen.c b/src/funopen.c -index 1e6f43a..a9b40e8 100644 ---- a/src/funopen.c -+++ b/src/funopen.c -@@ -65,7 +65,7 @@ funopen_write(void *cookie, const char *buf, size_t size) - } - - static int --funopen_seek(void *cookie, off64_t *offset, int whence) -+funopen_seek(void *cookie, off_t *offset, int whence) - { - struct funopen_cookie *cookiewrap = cookie; - off_t soff = *offset; diff --git a/meta/recipes-support/libbsd/libbsd_0.11.7.bb b/meta/recipes-support/libbsd/libbsd_0.11.7.bb deleted file mode 100644 index 5c958f950e..0000000000 --- a/meta/recipes-support/libbsd/libbsd_0.11.7.bb +++ /dev/null @@ -1,52 +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 = "https://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 -u -# 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-author -# License: BSD-3-clause-John-Birrell -# 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-3-Clause & BSD-4-Clause & ISC & PD" -LICENSE:${PN} = "BSD-3-Clause & ISC & PD" -LICENSE:${PN}-dbg = "BSD-3-Clause & ISC & PD" -LICENSE:${PN}-dev = "BSD-3-Clause & ISC & PD" -LICENSE:${PN}-doc = "BSD-3-Clause & BSD-4-Clause & ISC & PD" -LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD" -LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" -LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" - -LIC_FILES_CHKSUM = "file://COPYING;md5=75e85c5a558f86d10fbd5abc567ea5e6" -SECTION = "libs" - -SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch \ - " - -SRC_URI[sha256sum] = "9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261" - -inherit autotools pkgconfig - -DEPENDS += "libmd" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libbsd/libbsd_0.11.8.bb b/meta/recipes-support/libbsd/libbsd_0.11.8.bb new file mode 100644 index 0000000000..17049c8c28 --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.11.8.bb @@ -0,0 +1,47 @@ +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 = "https://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 -u +# 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-author +# License: BSD-3-clause-John-Birrell +# 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-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE:${PN} = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-dbg = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-dev = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-doc = "BSD-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" + +LIC_FILES_CHKSUM = "file://COPYING;md5=befe09fada57bdcf7f7c12f51081b08f" +SECTION = "libs" + +SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33" + +inherit autotools pkgconfig + +DEPENDS += "libmd" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf