vorbis-tools: upgrade 1.4.2 -> 1.4.3

Refreshed gettext.patch
Dropped 0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch & CVE-2023-43361.patch
Dropped patches fixed in newer version
Dropped md5sum

Changelog:
https://gitlab.xiph.org/xiph/vorbis-tools/-/blob/release-1.4.3/CHANGES

Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Vijay Anusuri 2025-10-17 16:03:09 +05:30 committed by Khem Raj
parent b28f8caccf
commit 37a17c25cc
No known key found for this signature in database
GPG Key ID: BB053355919D3314
4 changed files with 29 additions and 85 deletions

View File

@ -1,27 +0,0 @@
From 8c10181547c93438fc10f753e7164ee004add6d1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 27 Aug 2022 10:28:47 -0700
Subject: [PATCH] ogginfo: Include utf8.h for missing utf8_decode
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ogginfo/codec_skeleton.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c
index a27f8da..3ac13f6 100644
--- a/ogginfo/codec_skeleton.c
+++ b/ogginfo/codec_skeleton.c
@@ -25,6 +25,7 @@
#include <ogg/ogg.h>
#include "i18n.h"
+#include "utf8.h" /* utf8_decode */
#include "private.h"
--
2.37.2

View File

@ -1,38 +0,0 @@
From 6ca16244ba70cd1c0c8d062d1416bdc79bf20898 Mon Sep 17 00:00:00 2001
From: Peter Marko <peter.marko@siemens.com>
Date: Fri, 17 Jan 2025 18:49:12 +0100
Subject: [PATCH] oggenc: Don't assume the output path ends in a file name.
oggenc attempts to create any specified directories in the output
file path if they don't exist. The parser was assuming there was
a final filename after the last directory separator, and so would
try to read off the end of the argument if it was a bare directory
such as `./` or `outdir/`. This adds a check to make sure the
scan isn't starting off the end of the path string.
Thanks to Frank-Z7 (Zeng Yunxiang) at Huazhong University of Science
and Technology (cse.hust.edu.cn) for the report.
CVE: CVE-2023-43361
Upstream-Status: Submitted [https://gitlab.xiph.org/xiph/vorbis-tools/-/merge_requests/7]
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
oggenc/platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oggenc/platform.c b/oggenc/platform.c
index 6d9f4ef..1ff02ca 100644
--- a/oggenc/platform.c
+++ b/oggenc/platform.c
@@ -147,7 +147,7 @@ int create_directories(char *fn, int isutf8)
start = start+2;
#endif
- while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
+ while((end = strpbrk(start + strspn(start, PATH_SEPS), PATH_SEPS)) != NULL)
{
int rv;
memcpy(segment, fn, end-fn);
--
2.30.2

View File

@ -3,18 +3,40 @@ Fix build with gettext 0.20.x
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
Makefile.am | 4 ++--
configure.ac | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 62c36d7..201c69c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = po intl include share win32 @OPT_SUBDIRS@ tests
-DIST_SUBDIRS = po intl include share win32 ogg123 oggenc oggdec ogginfo \
+SUBDIRS = po include share win32 @OPT_SUBDIRS@ tests
+DIST_SUBDIRS = po include share win32 ogg123 oggenc oggdec ogginfo \
vcut vorbiscomment m4 tests
EXTRA_DIST = config.rpath README AUTHORS COPYING CHANGES
diff --git a/configure.ac b/configure.ac
index 6751ec8..67746ce 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@ CFLAGS="$cflags_save"
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
ALL_LINGUAS="be cs da en_GB eo es fr hr hu nl pl ro ru sk sv uk vi" ALL_LINGUAS="be cs da de en_GB eo es fr hr hu id ka nb nl pl ro ru sk sl sr sv uk vi "
-AM_GNU_GETTEXT -AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT([external])
dnl -------------------------------------------------- dnl --------------------------------------------------
dnl System checks dnl System checks
@@ -397,7 +397,6 @@ @@ -413,7 +413,6 @@ AC_CONFIG_FILES([
Makefile Makefile
m4/Makefile m4/Makefile
po/Makefile.in po/Makefile.in
@ -22,16 +44,6 @@ Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
include/Makefile include/Makefile
share/Makefile share/Makefile
win32/Makefile win32/Makefile
--- a/Makefile.am --
+++ b/Makefile.am 2.43.0
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = po intl include share win32 @OPT_SUBDIRS@
-DIST_SUBDIRS = po intl include share win32 ogg123 oggenc oggdec ogginfo \
+SUBDIRS = po include share win32 @OPT_SUBDIRS@
+DIST_SUBDIRS = po include share win32 ogg123 oggenc oggdec ogginfo \
vcut vorbiscomment m4
EXTRA_DIST = config.rpath README AUTHORS COPYING CHANGES

View File

@ -12,12 +12,9 @@ DEPENDS = "libogg libvorbis"
SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \
file://gettext.patch \ file://gettext.patch \
file://0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch \
file://CVE-2023-43361.patch \
" "
SRC_URI[md5sum] = "998fca293bd4e4bdc2b96fb70f952f4e" SRC_URI[sha256sum] = "a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde"
SRC_URI[sha256sum] = "db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0"
inherit autotools pkgconfig gettext inherit autotools pkgconfig gettext