Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
6427f9328d
!6 update to 1.13.1
From: @dedv_dwe 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
2023-08-01 06:06:21 +00:00
ut004527
2c97f6042c update to 1.13.1 2023-08-01 13:56:52 +08:00
openeuler-ci-bot
d3a6d67cbd
!4 update to 1.13
From: @leeffo 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-02-16 11:23:38 +00:00
liweiganga
0d6c037059 update to 1.13 2023-02-15 16:44:09 +08:00
openeuler-ci-bot
65b502f28c
!3 update to 1.12
From: @tianlijing 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-12-12 12:14:54 +00:00
tianlijing
7127d3816e update to 1.12 2022-08-07 06:24:27 +08:00
openeuler-ci-bot
97351192cf !2 add yaml file in package
Merge pull request !2 from gaoch_100/master
2020-07-21 11:30:58 +08:00
gaochao_100
427e0dd0e6 add yaml file in package 2020-06-15 11:35:06 +08:00
openeuler-ci-bot
558d187563 !1 taglib: change the path of AUTHORS
Merge pull request !1 from openeuler-net/init
2019-12-26 20:39:51 +08:00
songnannan
02116c365c init 2019-12-26 19:45:55 +08:00
7 changed files with 28 additions and 111 deletions

View File

@ -1,33 +0,0 @@
From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
From: "Stephen F. Booth" <me@sbooth.org>
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
---
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

View File

@ -1,46 +0,0 @@
From 2c4ae870ec086f2ddd21a47861a3709c36faac45 Mon Sep 17 00:00:00 2001
From: Scott Gayou <github.scott@gmail.com>
Date: Tue, 9 Oct 2018 18:46:55 -0500
Subject: [PATCH] Fixed OOB read when loading invalid ogg flac file. (#868)
(#869)
CVE-2018-11439 is caused by a failure to check the minimum length
of a ogg flac header. This header is detailed in full at:
https://xiph.org/flac/ogg_mapping.html. Added more strict checking
for entire header.
---
taglib/ogg/flac/oggflacfile.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp
index 53d04508..07ea9dcc 100644
--- a/taglib/ogg/flac/oggflacfile.cpp
+++ b/taglib/ogg/flac/oggflacfile.cpp
@@ -231,11 +231,21 @@ void Ogg::FLAC::File::scan()
if(!metadataHeader.startsWith("fLaC")) {
// FLAC 1.1.2+
+ // See https://xiph.org/flac/ogg_mapping.html for the header specification.
+ if(metadataHeader.size() < 13)
+ return;
+
+ if(metadataHeader[0] != 0x7f)
+ return;
+
if(metadataHeader.mid(1, 4) != "FLAC")
return;
- if(metadataHeader[5] != 1)
- return; // not version 1
+ if(metadataHeader[5] != 1 && metadataHeader[6] != 0)
+ return; // not version 1.0
+
+ if(metadataHeader.mid(9, 4) != "fLaC")
+ return;
metadataHeader = metadataHeader.mid(13);
}
--
2.19.1

Binary file not shown.

BIN
taglib-1.13.1.tar.gz Normal file

Binary file not shown.

View File

@ -1,20 +0,0 @@
diff -up taglib-1.5rc1/taglib-config.cmake.multilib-2 taglib-1.5rc1/taglib-config.cmake
--- taglib-1.5rc1/taglib-config.cmake.multilib-2 2008-01-29 19:30:00.000000000 -0600
+++ taglib-1.5rc1/taglib-config.cmake 2008-02-13 06:41:11.000000000 -0600
@@ -16,7 +16,6 @@ EOH
prefix=${CMAKE_INSTALL_PREFIX}
exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${LIB_INSTALL_DIR}
includedir=${INCLUDE_INSTALL_DIR}
flags=""
@@ -29,7 +28,7 @@ while test $# -gt 0
do
case $1 in
--libs)
- flags="$flags -L$libdir -ltag"
+ flags="$flags -ltag"
;;
--cflags)
flags="$flags -I$includedir/taglib"

View File

@ -1,17 +1,10 @@
Name: taglib
Summary: Audio Meta-Data Library
Version: 1.11.1
Release: 11
Version: 1.13.1
Release: 1
License: LGPLv2 or MPLv1.1
URL: https://taglib.github.io/
Source0: https://taglib.github.io/releases/%{name}-%{version}.tar.gz
# patch0 comes from redhat
Patch0: taglib-1.5rc1-multilib.patch
# patch1 comes from TagLib official
Patch1: 0001-Don-t-assume-TDRC-is-an-instance-of-TextIdentificati.patch
Patch6000: CVE-2018-11439-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.-8.patch
URL: https://taglib.org/
Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc gcc-c++ cmake pkgconfig zlib-devel
@ -52,20 +45,39 @@ test "$(pkg-config --modversion taglib_c)" = "%{version}"
%ldconfig_scriptlets
%files
%license AUTHORS COPYING.LGPL COPYING.MPL
%defattr(-,root,root)
%doc AUTHORS
%license COPYING.LGPL COPYING.MPL
%{_libdir}/libtag*.so.*
%files devel
%defattr(-,root,root)
%{_bindir}/%{name}-config
%{_includedir}/%{name}/
%{_libdir}/libtag*.so
%{_libdir}/pkgconfig/taglib*.pc
%files help
%defattr(-,root,root)
%doc NEWS examples
%changelog
* Tue Aug 01 2023 wangqia <wangqia@uniontech.com> - 1.13.1-1
- update to 1.13.1
* Wed Feb 15 2023 liweiganga <liweiganga@uniontech.com> - 1.13-1
- update to 1.13
* Sat Sep 10 2022 tianlijing <tianlijing@kylinos.cn> - 1.12-1
- update to 1.12
* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.11.1-12
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:change the path of AUTHORS
* Wed Nov 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.11.1-11
- Type: enhancement
- ID: NA

4
taglib.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: taglib/taglib
tag_prefix: ^v
seperator: .