summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Anusuri <vanusuri@mvista.com>2025-10-17 16:03:09 +0530
committerKhem Raj <raj.khem@gmail.com>2025-10-17 08:32:03 -0700
commit37a17c25cc38e8207db96b106c0de88dd3977df7 (patch)
treee1ff8c697324a5860dee75e0d8d8654e1d1a1fe1
parentb28f8caccfefa7c03ec193a67fa8b11deeafa558 (diff)
downloadmeta-openembedded-37a17c25cc38e8207db96b106c0de88dd3977df7.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>
-rw-r--r--meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch27
-rw-r--r--meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/CVE-2023-43361.patch38
-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)5
4 files changed, 29 insertions, 85 deletions
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch
deleted file mode 100644
index 36a31a85cd..0000000000
--- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 8c10181547c93438fc10f753e7164ee004add6d1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Aug 2022 10:28:47 -0700
4Subject: [PATCH] ogginfo: Include utf8.h for missing utf8_decode
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 ogginfo/codec_skeleton.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c
14index a27f8da..3ac13f6 100644
15--- a/ogginfo/codec_skeleton.c
16+++ b/ogginfo/codec_skeleton.c
17@@ -25,6 +25,7 @@
18 #include <ogg/ogg.h>
19
20 #include "i18n.h"
21+#include "utf8.h" /* utf8_decode */
22
23 #include "private.h"
24
25--
262.37.2
27
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 7f5b634115..0000000000
--- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/CVE-2023-43361.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 6ca16244ba70cd1c0c8d062d1416bdc79bf20898 Mon Sep 17 00:00:00 2001
2From: Peter Marko <peter.marko@siemens.com>
3Date: Fri, 17 Jan 2025 18:49:12 +0100
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/`. This adds a check to make sure the
11scan isn't starting off the end of the path string.
12
13Thanks to Frank-Z7 (Zeng Yunxiang) at Huazhong University of Science
14and Technology (cse.hust.edu.cn) for the report.
15
16CVE: CVE-2023-43361
17Upstream-Status: Submitted [https://gitlab.xiph.org/xiph/vorbis-tools/-/merge_requests/7]
18Signed-off-by: Peter Marko <peter.marko@siemens.com>
19---
20 oggenc/platform.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/oggenc/platform.c b/oggenc/platform.c
24index 6d9f4ef..1ff02ca 100644
25--- a/oggenc/platform.c
26+++ b/oggenc/platform.c
27@@ -147,7 +147,7 @@ int create_directories(char *fn, int isutf8)
28 start = start+2;
29 #endif
30
31- while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
32+ while((end = strpbrk(start + strspn(start, PATH_SEPS), PATH_SEPS)) != NULL)
33 {
34 int rv;
35 memcpy(segment, fn, end-fn);
36--
372.30.2
38
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 2cbd840138..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,12 +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-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch \
16 file://CVE-2023-43361.patch \
17 " 15 "
18 16
19SRC_URI[md5sum] = "998fca293bd4e4bdc2b96fb70f952f4e" 17SRC_URI[sha256sum] = "a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde"
20SRC_URI[sha256sum] = "db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0"
21 18
22inherit autotools pkgconfig gettext 19inherit autotools pkgconfig gettext
23 20