diff mbox series

libbsd: upgrade 0.11.7 -> 0.11.8

Message ID 1705309205-23958-1-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Commit c5709bb67c14f7ba829803cf1dc3f1c564376168
Headers show
Series libbsd: upgrade 0.11.7 -> 0.11.8 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 15, 2024, 9 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...e-off64_t-with-off_t-in-funopen_seek.patch | 34 -------------------
 .../{libbsd_0.11.7.bb => libbsd_0.11.8.bb}    | 11 ++----
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch
 rename meta/recipes-support/libbsd/{libbsd_0.11.7.bb => libbsd_0.11.8.bb} (81%)
diff mbox series

Patch

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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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.8.bb
similarity index 81%
rename from meta/recipes-support/libbsd/libbsd_0.11.7.bb
rename to 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 @@ 
-# 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 \
@@ -36,14 +33,12 @@  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"
+LIC_FILES_CHKSUM = "file://COPYING;md5=befe09fada57bdcf7f7c12f51081b08f"
 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 = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261"
+SRC_URI[sha256sum] = "55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33"
 
 inherit autotools pkgconfig