diff mbox series

[2/2] package/libbsd: bump version to 0.11.7

Message ID 20230628151320.554700-2-bernd@kuhls.net
State Accepted
Headers show
Series [1/2] package/libmd: bump version to 1.1.0 | expand

Commit Message

Bernd Kuhls June 28, 2023, 3:13 p.m. UTC 
Release notes:
https://archive.hadrons.org/software/libbsd/libbsd-0.11.4.announce
https://archive.hadrons.org/software/libbsd/libbsd-0.11.5.announce
https://archive.hadrons.org/software/libbsd/libbsd-0.11.6.announce
https://archive.hadrons.org/software/libbsd/libbsd-0.11.7.announce

Removed patch which is included in upstream release:
https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/873639ebb5bc3688e5e78d71e5c0c49469498f46

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .checkpackageignore                           |  1 -
 ...01-src-local-elf.h-fix-big-endian-sh.patch | 39 -------------------
 package/libbsd/libbsd.hash                    |  6 ++-
 package/libbsd/libbsd.mk                      |  2 +-
 4 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch

Comments

Thomas Petazzoni July 1, 2023, 2 p.m. UTC | #1 
On Wed, 28 Jun 2023 17:13:20 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Release notes:
> https://archive.hadrons.org/software/libbsd/libbsd-0.11.4.announce
> https://archive.hadrons.org/software/libbsd/libbsd-0.11.5.announce
> https://archive.hadrons.org/software/libbsd/libbsd-0.11.6.announce
> https://archive.hadrons.org/software/libbsd/libbsd-0.11.7.announce
> 
> Removed patch which is included in upstream release:
> https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/873639ebb5bc3688e5e78d71e5c0c49469498f46
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .checkpackageignore                           |  1 -
>  ...01-src-local-elf.h-fix-big-endian-sh.patch | 39 -------------------
>  package/libbsd/libbsd.hash                    |  6 ++-
>  package/libbsd/libbsd.mk                      |  2 +-
>  4 files changed, 5 insertions(+), 43 deletions(-)
>  delete mode 100644 package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch

After this patch, the legal-info was broken due to a change in the
license file. I fixed that up when applying, with the following details
in the commit log:

    Update hash of license file, which has changed due to:
    - Copyright year updates
    - Changes in list of files affected by the different license
    - Removal of one part under BSD-4-Clause, but as there are still other
      parts under BSD-4-Clause, this doesn't change the overall license
      information in Buildroot
    
Applied to master with this change, thanks!

Thomas
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index 3c38e34eb7..a0a5cd893e 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -693,7 +693,6 @@  package/libavl/0001-fix-makefile.patch Upstream
 package/libb64/0001-Integer-overflows.patch Upstream
 package/libb64/0002-Initialize-C++-objects.patch Upstream
 package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch Upstream
-package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch Upstream
 package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream
 package/libcec/0001-cecloader-h-fix-null-return.patch Upstream
 package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream
diff --git a/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch b/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch
deleted file mode 100644
index 8612d268f8..0000000000
--- a/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From 93c9f8aa72349a4fe33e2a732100c76f3904eb80 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 7 Jun 2022 19:27:13 +0200
-Subject: [PATCH] src/local-elf.h: fix big endian sh
-
-Fix the following build failure with big endian sh (e.g. sh4aeb):
-
-In file included from nlist.c:44:
-nlist.c: In function '__elf_is_okay__':
-local-elf.h:223:25: error: 'ELFDATA2LMSB' undeclared (first use in this function); did you mean 'ELFDATA2LSB'?
-  223 | #define ELF_TARG_DATA   ELFDATA2LMSB
-      |                         ^~~~~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/2980fb79c208454195d77383f1ece9afbd7f981b
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/19]
----
- src/local-elf.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/local-elf.h b/src/local-elf.h
-index 1dd3b42..8c4794f 100644
---- a/src/local-elf.h
-+++ b/src/local-elf.h
-@@ -230,7 +230,7 @@
- #if defined(__LITTLE_ENDIAN__)
- #define ELF_TARG_DATA	ELFDATA2LSB
- #elif defined(__BIG_ENDIAN__)
--#define ELF_TARG_DATA	ELFDATA2LMSB
-+#define ELF_TARG_DATA	ELFDATA2MSB
- #else
- #error Unknown SH endianness
- #endif
--- 
-2.35.1
-
diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash
index 17bb32e01c..6792f988d4 100644
--- a/package/libbsd/libbsd.hash
+++ b/package/libbsd/libbsd.hash
@@ -1,3 +1,5 @@ 
-# From https://lists.freedesktop.org/archives/libbsd/2021-February/000305.html
-sha512  a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5  libbsd-0.11.3.tar.xz
+# From https://archive.hadrons.org/software/libbsd/libbsd-0.11.7.announce
+sha256  9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261  libbsd-0.11.7.tar.xz
+sha512  51fda4724f41dd8a4628afd58c21236a7588d9045e337e06eeabf83805a9aaaa53705441ca901ad11f1c65f18e881523bdc97721a7d3d6a5cced27f2450d09a2  libbsd-0.11.7.tar.xz
+# Locally computed
 sha256  ff2fdeeb0fe8bcb9045fe91d69e8312a5b477c54db48dffe34dd1c0d730c5864  COPYING
diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
index 86df8a97a2..27937c4611 100644
--- a/package/libbsd/libbsd.mk
+++ b/package/libbsd/libbsd.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-LIBBSD_VERSION = 0.11.3
+LIBBSD_VERSION = 0.11.7
 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz
 LIBBSD_SITE = https://libbsd.freedesktop.org/releases
 LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \