mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
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 37a17c25cc)
Adapted to Kirkstone.
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
-28
@@ -1,28 +0,0 @@
|
|||||||
From 68c5a33685f5b86e7f18f239ceb8861484fee552 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petter Reinholdtsen <pere@debian.org>
|
|
||||||
Date: Sun, 6 Apr 2025 07:53:53 +0200
|
|
||||||
Subject: [PATCH] Added missing include "utf8.h" to codec_skeleton.c.
|
|
||||||
|
|
||||||
Patch from Sebastian Ramacher <sramacher@debian.org> and Debian.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://gitlab.xiph.org/xiph/vorbis-tools/-/commit/68c5a33685f5b86e7f18f239ceb8861484fee552]
|
|
||||||
Signed-off-by: Vijay Anusuri <vanusuri@mvista.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..0709860 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"
|
|
||||||
|
|
||||||
#include "private.h"
|
|
||||||
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
From 5bb47f58582c15c2413564b741d1d95e7b566aa8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ralph Giles <giles@thaumas.net>
|
|
||||||
Date: Sun, 17 Sep 2023 11:49:12 -0700
|
|
||||||
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/`. It also did not handle more than one
|
|
||||||
consecutive separator. This corrects both issues.
|
|
||||||
|
|
||||||
Thanks to Frank-Z7 (Zeng Yunxiang) at Huazhong University of Science
|
|
||||||
and Technology (cse.hust.edu.cn) for the report.
|
|
||||||
|
|
||||||
Fixes CVE-2023-43361.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://gitlab.xiph.org/xiph/vorbis-tools/-/commit/5bb47f58582c15c2413564b741d1d95e7b566aa8]
|
|
||||||
CVE: CVE-2023-43361
|
|
||||||
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
|
||||||
---
|
|
||||||
oggenc/platform.c | 10 +++++++---
|
|
||||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/oggenc/platform.c b/oggenc/platform.c
|
|
||||||
index 6d9f4ef..d50ad99 100644
|
|
||||||
--- a/oggenc/platform.c
|
|
||||||
+++ b/oggenc/platform.c
|
|
||||||
@@ -136,18 +136,22 @@ int create_directories(char *fn, int isutf8)
|
|
||||||
{
|
|
||||||
char *end, *start;
|
|
||||||
struct stat statbuf;
|
|
||||||
- char *segment = malloc(strlen(fn)+1);
|
|
||||||
+ const size_t fn_len = strlen(fn);
|
|
||||||
+ char *segment = malloc(fn_len+1);
|
|
||||||
#ifdef _WIN32
|
|
||||||
wchar_t seg[MAX_PATH+1];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
start = fn;
|
|
||||||
#ifdef _WIN32
|
|
||||||
- if(strlen(fn) >= 3 && isalpha(fn[0]) && fn[1]==':')
|
|
||||||
+ // Strip drive prefix
|
|
||||||
+ if(fn_len >= 3 && isalpha(fn[0]) && fn[1]==':') {
|
|
||||||
start = start+2;
|
|
||||||
+ }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
|
|
||||||
+ // Loop through path segments, creating directories if necessary
|
|
||||||
+ while((end = strpbrk(start + strspn(start, PATH_SEPS), PATH_SEPS)) != NULL)
|
|
||||||
{
|
|
||||||
int rv;
|
|
||||||
memcpy(segment, fn, end-fn);
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
|
|||||||
+1
-3
@@ -12,11 +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-Added-missing-include-utf8.h-to-codec_skeleton.c.patch \
|
|
||||||
file://CVE-2023-43361.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0"
|
SRC_URI[sha256sum] = "a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde"
|
||||||
|
|
||||||
inherit autotools pkgconfig gettext
|
inherit autotools pkgconfig gettext
|
||||||
|
|
||||||
Reference in New Issue
Block a user