taglib: upgrade 1.11.1 -> 1.12
PATCH 1/1 taglib: upgrade 1.11.1 -> 1.12
CVE-2017-12678.patch
CVE-2018-11439.patch
removed since they are included in 1.12
Signed-off-by Wang Mingyu <[email protected]>
---
.../taglib/taglib/CVE-2017-12678.patch | 40 ---------------
.../taglib/taglib/CVE-2018-11439.patch | 51 -------------------
.../{taglib_1.11.1.bb => taglib_1.12.bb} | 9 ++--
3 files changed, 3 insertions(+), 97 deletions(-)
delete mode 100644 meta/recipes-support/taglib/taglib/CVE-2017-12678.patch
delete mode 100644 meta/recipes-support/taglib/taglib/CVE-2018-11439.patch
rename meta/recipes-support/taglib/{taglib_1.11.1.bb => taglib_1.12.bb} (85%)meta/recipes-support/taglib/taglib/CVE-2017-12678.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001 -From: "Stephen F. Booth" <[email protected]> -Date: Sun, 23 Jul 2017 10:11:09 -0400 -Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame - -If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame -which causes problems in rebuildAggregateFrames() when it is assumed -that TDRC is a TextIdentificationFrame - -Upstream-Status: Backport -[https://github.com/taglib/taglib/pull/831/commits/eb9ded1206f18f2c319157337edea2533a40bea6] - -CVE: CVE-2017-12678 - -Signed-off-by: Yi Zhao <[email protected]> ---- - taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp -index 759a9b7b..9347ab86 100644 ---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp -+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp -@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const - tag->frameList("TDAT").size() == 1) - { - TextIdentificationFrame *tdrc = -- static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); -+ dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); - UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front()); - -- if(tdrc->fieldList().size() == 1 && -+ if(tdrc && -+ tdrc->fieldList().size() == 1 && - tdrc->fieldList().front().size() == 4 && - tdat->data().size() >= 5) - { --- -2.13.5 -
meta/recipes-support/taglib/taglib/CVE-2018-11439.patch deleted +0 -51
51 lines not on this page · raw message
meta/recipes-support/taglib/taglib_1.12.bb renamed from meta/recipes-support/taglib/taglib_1.11.1.bb +3 -6
@@ -9,13 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "zlib" -SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz \ - file://CVE-2017-12678.patch \ - file://CVE-2018-11439.patch \ - " +SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "cee7be0ccfc892fa433d6c837df9522a" -SRC_URI[sha256sum] = "b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b" +SRC_URI[md5sum] = "4313ed2671234e029b7af8f97c84e9af" +SRC_URI[sha256sum] = "7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703" UPSTREAM_CHECK_URI = "http://github.com/taglib/taglib/releases/"
Signature · 1 line
2.25.1