diff --git a/1-bugfix-for-CVE-2023-47466.patch b/1-bugfix-for-CVE-2023-47466.patch deleted file mode 100644 index b0596945abe9938ce499c5c0f1e06fdee5b618b6..0000000000000000000000000000000000000000 --- a/1-bugfix-for-CVE-2023-47466.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dfa33bec0806cbb45785accb8cc6c2048a7d40cf Mon Sep 17 00:00:00 2001 -From: Urs Fleisch -Date: Sun, 5 Nov 2023 14:40:18 +0100 -Subject: [PATCH] Fix crash with invalid WAV files (#1163) (#1164) - -With specially crafted WAV files having the "id3 " chunk as the -only valid chunk, when trying to write the tags, the existing -"id3 " chunk is removed, and then vector::front() is called on -the now empty chunks vector. -Now it is checked if the vector is empty to avoid the crash. ---- - taglib/riff/rifffile.cpp | 3 +++ - tests/data/invalid-chunk.wav | Bin 0 -> 40 bytes - tests/test_wav.cpp | 18 ++++++++++++++++++ - 3 files changed, 21 insertions(+) - create mode 100644 tests/data/invalid-chunk.wav - -Conflict:Remove patch error test use case -Context adapt -Reference:https://github.com/taglib/taglib/commit/dfa33bec0806cbb45785accb8cc6c2048a7d40cf - -diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp -index 005551f..f615e6c 100644 ---- a/taglib/riff/rifffile.cpp -+++ b/taglib/riff/rifffile.cpp -@@ -361,6 +361,9 @@ void RIFF::File::writeChunk(const ByteVector &name, const ByteVector &data, - - void RIFF::File::updateGlobalSize() - { -+ if(d->chunks.empty()) -+ return; -+ - const Chunk first = d->chunks.front(); - const Chunk last = d->chunks.back(); - d->size = last.offset + last.size + last.padding - first.offset + 12; diff --git a/taglib.spec b/taglib.spec index 728cc891942ceb9e4826e8fefe08e40cdfad7c8e..6e4cbf9268317bb39f289b09fa3fbaf7a330e18e 100644 --- a/taglib.spec +++ b/taglib.spec @@ -1,15 +1,15 @@ -%define anolis_release 2 +%define anolis_release 1 Name: taglib Summary: Audio Meta-Data Library -Version: 1.13 +Version: 1.13.1 Release: %{anolis_release}%{?dist} License: LGPLv2 or MPLv1.1 URL: http://taglib.github.io/ Source0: http://taglib.github.io/releases/taglib-%{version}.tar.gz -Patch1: 1-bugfix-for-CVE-2023-47466.patch +Patch0: taglib-1.13.1-multilib.patch BuildRequires: cmake >= 3.0.0 BuildRequires: zlib-devel @@ -35,6 +35,7 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep +| %autosetup -n taglib-%{version} -p1 %build @@ -62,6 +63,12 @@ The %{name}-doc package contains documentation files for %{name}. %{_libdir}/pkgconfig/taglib_c.pc %changelog +| +* Mon Jan 01 2024 Upstream Sync - 1.13.1-1%{?dist} +- Sync upstream changes from commit 3444269701530120ec56fcf3a9cdae91b58dee6a +- Upgrade to v1.13.1 +- Apply taglib-1.13.1-multilib.patch for improved multilib support + * Fri Jul 25 2025 tomcruiseqi - 1.13-2 - Fix CVE-2023-47466