summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-01-15 17:00:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-19 12:21:23 +0000
commit2a5b8a9d538e43385e37498abeea23caf5cecd60 (patch)
tree60a8633b51fa5ee2fbeb99c8026e17be6c8005ea
parent23311babb0dc922f2c20ce85b211136346085802 (diff)
downloadpoky-2a5b8a9d538e43385e37498abeea23caf5cecd60.tar.gz
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 <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch34
-rw-r--r--meta/recipes-support/libbsd/libbsd_0.11.8.bb (renamed from meta/recipes-support/libbsd/libbsd_0.11.7.bb)11
2 files changed, 3 insertions, 42 deletions
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 @@
1From 9c4e5f8984e46344c9e150764b8aa0a7a70b6cb5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 15 Dec 2022 09:02:22 -0800
4Subject: [PATCH] funopen: Replace off64_t with off_t in funopen_seek
5
6AC_SYS_LARGEFILE in configure.ac is setting needed defines to make
764bit off_t on relevant platforms.
8
9Fixes build on musl
10
11| ../../../../../../../../workspace/sources/libbsd/src/funopen.c:68:28: error: unknown type name 'off64_t'; did you mean 'off_t'?
12| funopen_seek(void *cookie, off64_t *offset, int whence)
13| ^~~~~~~
14| off_t
15
16Upstream-Status: Submitted [https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/24]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/funopen.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/src/funopen.c b/src/funopen.c
23index 1e6f43a..a9b40e8 100644
24--- a/src/funopen.c
25+++ b/src/funopen.c
26@@ -65,7 +65,7 @@ funopen_write(void *cookie, const char *buf, size_t size)
27 }
28
29 static int
30-funopen_seek(void *cookie, off64_t *offset, int whence)
31+funopen_seek(void *cookie, off_t *offset, int whence)
32 {
33 struct funopen_cookie *cookiewrap = cookie;
34 off_t soff = *offset;
diff --git a/meta/recipes-support/libbsd/libbsd_0.11.7.bb b/meta/recipes-support/libbsd/libbsd_0.11.8.bb
index 5c958f950e..17049c8c28 100644
--- a/meta/recipes-support/libbsd/libbsd_0.11.7.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.11.8.bb
@@ -1,6 +1,3 @@
1# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com>
2# Released under the MIT license (see COPYING.MIT for the terms)
3
4SUMMARY = "Library of utility functions from BSD systems" 1SUMMARY = "Library of utility functions from BSD systems"
5DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ 2DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \
6 and lacking on others like GNU systems, thus making it easier to port \ 3 and lacking on others like GNU systems, thus making it easier to port \
@@ -36,14 +33,12 @@ LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD"
36LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" 33LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD"
37LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" 34LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD"
38 35
39LIC_FILES_CHKSUM = "file://COPYING;md5=75e85c5a558f86d10fbd5abc567ea5e6" 36LIC_FILES_CHKSUM = "file://COPYING;md5=befe09fada57bdcf7f7c12f51081b08f"
40SECTION = "libs" 37SECTION = "libs"
41 38
42SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 39SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
43 file://0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch \
44 "
45 40
46SRC_URI[sha256sum] = "9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261" 41SRC_URI[sha256sum] = "55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33"
47 42
48inherit autotools pkgconfig 43inherit autotools pkgconfig
49 44