summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2025-12-24 23:23:51 +0100
committerGyorgy Sarvari <skandigraun@gmail.com>2025-12-25 10:17:02 +0100
commitd8e53c627cdcc3ec3fa0994ebde8bec350573d79 (patch)
treef212dc6a9a6bc422cf16a122dfedd901feb7eada
parent593b6d93ca3745a242a9a4cbdae38f725d693e95 (diff)
downloadmeta-openembedded-d8e53c627cdcc3ec3fa0994ebde8bec350573d79.tar.gz
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> (cherry picked from commit 37a17c25cc38e8207db96b106c0de88dd3977df7) Adapted to Kirkstone. Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-Added-missing-include-utf8.h-to-codec_skeleton.c.patch28
-rw-r--r--meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/CVE-2023-43361.patch57
-rw-r--r--meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/gettext.patch44
-rw-r--r--meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.3.bb (renamed from meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb)4
4 files changed, 29 insertions, 104 deletions
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-Added-missing-include-utf8.h-to-codec_skeleton.c.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-Added-missing-include-utf8.h-to-codec_skeleton.c.patch
deleted file mode 100644
index db7d142543..0000000000
--- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-Added-missing-include-utf8.h-to-codec_skeleton.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 68c5a33685f5b86e7f18f239ceb8861484fee552 Mon Sep 17 00:00:00 2001
2From: Petter Reinholdtsen <pere@debian.org>
3Date: Sun, 6 Apr 2025 07:53:53 +0200
4Subject: [PATCH] Added missing include "utf8.h" to codec_skeleton.c.
5
6Patch from Sebastian Ramacher <sramacher@debian.org> and Debian.
7
8Upstream-Status: Backport [https://gitlab.xiph.org/xiph/vorbis-tools/-/commit/68c5a33685f5b86e7f18f239ceb8861484fee552]
9Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
10---
11 ogginfo/codec_skeleton.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c
15index a27f8da..0709860 100644
16--- a/ogginfo/codec_skeleton.c
17+++ b/ogginfo/codec_skeleton.c
18@@ -25,6 +25,7 @@
19 #include <ogg/ogg.h>
20
21 #include "i18n.h"
22+#include "utf8.h"
23
24 #include "private.h"
25
26--
27GitLab
28
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/CVE-2023-43361.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/CVE-2023-43361.patch
deleted file mode 100644
index 69286907fa..0000000000
--- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/CVE-2023-43361.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 5bb47f58582c15c2413564b741d1d95e7b566aa8 Mon Sep 17 00:00:00 2001
2From: Ralph Giles <giles@thaumas.net>
3Date: Sun, 17 Sep 2023 11:49:12 -0700
4Subject: [PATCH] oggenc: Don't assume the output path ends in a file name.
5
6oggenc attempts to create any specified directories in the output
7file path if they don't exist. The parser was assuming there was
8a final filename after the last directory separator, and so would
9try to read off the end of the argument if it was a bare directory
10such as `./` or `outdir/`. It also did not handle more than one
11consecutive separator. This corrects both issues.
12
13Thanks to Frank-Z7 (Zeng Yunxiang) at Huazhong University of Science
14and Technology (cse.hust.edu.cn) for the report.
15
16Fixes CVE-2023-43361.
17
18Upstream-Status: Backport [https://gitlab.xiph.org/xiph/vorbis-tools/-/commit/5bb47f58582c15c2413564b741d1d95e7b566aa8]
19CVE: CVE-2023-43361
20Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
21---
22 oggenc/platform.c | 10 +++++++---
23 1 file changed, 7 insertions(+), 3 deletions(-)
24
25diff --git a/oggenc/platform.c b/oggenc/platform.c
26index 6d9f4ef..d50ad99 100644
27--- a/oggenc/platform.c
28+++ b/oggenc/platform.c
29@@ -136,18 +136,22 @@ int create_directories(char *fn, int isutf8)
30 {
31 char *end, *start;
32 struct stat statbuf;
33- char *segment = malloc(strlen(fn)+1);
34+ const size_t fn_len = strlen(fn);
35+ char *segment = malloc(fn_len+1);
36 #ifdef _WIN32
37 wchar_t seg[MAX_PATH+1];
38 #endif
39
40 start = fn;
41 #ifdef _WIN32
42- if(strlen(fn) >= 3 && isalpha(fn[0]) && fn[1]==':')
43+ // Strip drive prefix
44+ if(fn_len >= 3 && isalpha(fn[0]) && fn[1]==':') {
45 start = start+2;
46+ }
47 #endif
48
49- while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
50+ // Loop through path segments, creating directories if necessary
51+ while((end = strpbrk(start + strspn(start, PATH_SEPS), PATH_SEPS)) != NULL)
52 {
53 int rv;
54 memcpy(segment, fn, end-fn);
55--
56GitLab
57
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/gettext.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/gettext.patch
index dd03fa9524..5044427a95 100644
--- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/gettext.patch
+++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/gettext.patch
@@ -3,18 +3,40 @@ Fix build with gettext 0.20.x
3Upstream-Status: Pending 3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> 5Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
6---
7 Makefile.am | 4 ++--
8 configure.ac | 3 +--
9 2 files changed, 3 insertions(+), 4 deletions(-)
10
11diff --git a/Makefile.am b/Makefile.am
12index 62c36d7..201c69c 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -2,8 +2,8 @@
16
17 AUTOMAKE_OPTIONS = foreign dist-zip
18
19-SUBDIRS = po intl include share win32 @OPT_SUBDIRS@ tests
20-DIST_SUBDIRS = po intl include share win32 ogg123 oggenc oggdec ogginfo \
21+SUBDIRS = po include share win32 @OPT_SUBDIRS@ tests
22+DIST_SUBDIRS = po include share win32 ogg123 oggenc oggdec ogginfo \
23 vcut vorbiscomment m4 tests
24
25 EXTRA_DIST = config.rpath README AUTHORS COPYING CHANGES
26diff --git a/configure.ac b/configure.ac
27index 6751ec8..67746ce 100644
6--- a/configure.ac 28--- a/configure.ac
7+++ b/configure.ac 29+++ b/configure.ac
8@@ -34,7 +34,7 @@ 30@@ -34,7 +34,7 @@ CFLAGS="$cflags_save"
9 AC_PROG_LIBTOOL 31 AC_PROG_LIBTOOL
10 32
11 ALL_LINGUAS="be cs da en_GB eo es fr hr hu nl pl ro ru sk sv uk vi" 33 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 "
12-AM_GNU_GETTEXT 34-AM_GNU_GETTEXT
13+AM_GNU_GETTEXT([external]) 35+AM_GNU_GETTEXT([external])
14 36
15 dnl -------------------------------------------------- 37 dnl --------------------------------------------------
16 dnl System checks 38 dnl System checks
17@@ -397,7 +397,6 @@ 39@@ -413,7 +413,6 @@ AC_CONFIG_FILES([
18 Makefile 40 Makefile
19 m4/Makefile 41 m4/Makefile
20 po/Makefile.in 42 po/Makefile.in
@@ -22,16 +44,6 @@ Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
22 include/Makefile 44 include/Makefile
23 share/Makefile 45 share/Makefile
24 win32/Makefile 46 win32/Makefile
25--- a/Makefile.am 47--
26+++ b/Makefile.am 482.43.0
27@@ -2,8 +2,8 @@ 49
28
29 AUTOMAKE_OPTIONS = foreign dist-zip
30
31-SUBDIRS = po intl include share win32 @OPT_SUBDIRS@
32-DIST_SUBDIRS = po intl include share win32 ogg123 oggenc oggdec ogginfo \
33+SUBDIRS = po include share win32 @OPT_SUBDIRS@
34+DIST_SUBDIRS = po include share win32 ogg123 oggenc oggdec ogginfo \
35 vcut vorbiscomment m4
36
37 EXTRA_DIST = config.rpath README AUTHORS COPYING CHANGES
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.3.bb
index 33a212de8e..778b848534 100644
--- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb
+++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.3.bb
@@ -12,11 +12,9 @@ DEPENDS = "libogg libvorbis"
12 12
13SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ 13SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \
14 file://gettext.patch \ 14 file://gettext.patch \
15 file://0001-Added-missing-include-utf8.h-to-codec_skeleton.c.patch \
16 file://CVE-2023-43361.patch \
17 " 15 "
18 16
19SRC_URI[sha256sum] = "db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0" 17SRC_URI[sha256sum] = "a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde"
20 18
21inherit autotools pkgconfig gettext 19inherit autotools pkgconfig gettext
22 20