From ce5d1735710d11b135fc6cb235e976b306833e7d Mon Sep 17 00:00:00 2001
From: Florian Larysch <fl@n621.de>
Date: Wed, 20 Aug 2025 15:21:22 +0200
Subject: [PATCH] package/vorbis-tools: security bump to version 1.4.3

This is a bugfix release that among other things includes the GCC 14
build fix and resolves CVE-2023-43361.

Changelog: https://github.com/xiph/vorbis-tools/blob/v1.4.3/CHANGES

Fixes:
https://www.cve.org/CVERecord?id=CVE-2023-43361

Signed-off-by: Florian Larysch <fl@n621.de>
[Julien:
 - reword commit log title to add "security"
 - add link to CVE in commit log
]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 .../0001-fix-build-with-gcc-14.patch          | 51 -------------------
 package/vorbis-tools/vorbis-tools.hash        |  2 +-
 package/vorbis-tools/vorbis-tools.mk          |  2 +-
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 package/vorbis-tools/0001-fix-build-with-gcc-14.patch

diff --git a/package/vorbis-tools/0001-fix-build-with-gcc-14.patch b/package/vorbis-tools/0001-fix-build-with-gcc-14.patch
deleted file mode 100644
index a05ce8a584..0000000000
--- a/package/vorbis-tools/0001-fix-build-with-gcc-14.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f4a31fe975ea37537f39ace4420aee893b7e0b1a Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 21 Jul 2024 21:57:38 +0200
-Subject: [PATCH] fix build with gcc >= 14
-
-Add missing includes to avoid the following build failure with gcc >=
-14:
-
-codec_skeleton.c: In function 'skeleton_process_fisbone_message_header':
-codec_skeleton.c:119:9: error: implicit declaration of function 'utf8_decode' [-Wimplicit-function-declaration]
-  119 |     if (utf8_decode(header, &decoded) < 0) {
-      |         ^~~~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/bb5d56d836e7d0f2a62daa9954878ad6e0b190ed
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Upstream: https://github.com/xiph/vorbis-tools/pull/48
----
- ogginfo/codec_skeleton.c | 2 ++
- share/utf8.c             | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c
-index a27f8da..f906f8c 100644
---- a/ogginfo/codec_skeleton.c
-+++ b/ogginfo/codec_skeleton.c
-@@ -28,6 +28,8 @@
- 
- #include "private.h"
- 
-+#include "utf8.h"
-+
- typedef struct {
-     bool supported;
-     uint16_t version_major;
-diff --git a/share/utf8.c b/share/utf8.c
-index be378d1..e819b67 100644
---- a/share/utf8.c
-+++ b/share/utf8.c
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
-+#include "charset.h"
- #include "utf8.h"
- 
- 
--- 
-2.43.0
-
diff --git a/package/vorbis-tools/vorbis-tools.hash b/package/vorbis-tools/vorbis-tools.hash
index a4f463e466..e31daf96ac 100644
--- a/package/vorbis-tools/vorbis-tools.hash
+++ b/package/vorbis-tools/vorbis-tools.hash
@@ -1,4 +1,4 @@
 # From http://downloads.xiph.org/releases/vorbis/SHA256SUMS
-sha256  db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0  vorbis-tools-1.4.2.tar.gz
+sha256  a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde  vorbis-tools-1.4.3.tar.gz
 # Locally computed
 sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/package/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk
index 936d2d816c..d64fe0b1ee 100644
--- a/package/vorbis-tools/vorbis-tools.mk
+++ b/package/vorbis-tools/vorbis-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VORBIS_TOOLS_VERSION = 1.4.2
+VORBIS_TOOLS_VERSION = 1.4.3
 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis
 VORBIS_TOOLS_LICENSE = GPL-2.0
 VORBIS_TOOLS_LICENSE_FILES = COPYING