From 42b44f7058d5f0dc670d4ca4477f22fd4ddab118 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:40:31 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 4f9b55a..9d9b361 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ rm -r src/lib/utf8-cpp %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0604721266527ea45a21434080e15808a3e2f5ea Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 11 Oct 2022 13:14:28 +0200 Subject: [PATCH 2/5] update to 1.4.4 (#2131232) drop obsolete patch --- .gitignore | 1 + libebml-gcc11.patch | 22 ---------------------- libebml-use-system-utf8cpp.patch | 10 +++++----- libebml.spec | 13 +++++++------ sources | 2 +- 5 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 libebml-gcc11.patch diff --git a/.gitignore b/.gitignore index a417517..006b1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.4.0.tar.xz /libebml-1.4.1.tar.xz /libebml-1.4.2.tar.xz +/libebml-1.4.4.tar.xz diff --git a/libebml-gcc11.patch b/libebml-gcc11.patch deleted file mode 100644 index 859f763..0000000 --- a/libebml-gcc11.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up libebml-1.4.2/src/EbmlString.cpp.gcc11 libebml-1.4.2/src/EbmlString.cpp ---- libebml-1.4.2/src/EbmlString.cpp.gcc11 2021-02-18 12:42:59.000000000 +0100 -+++ libebml-1.4.2/src/EbmlString.cpp 2021-03-01 11:42:02.122854703 +0100 -@@ -34,6 +34,7 @@ - \author Steve Lhomme - */ - #include -+#include - - #include "ebml/EbmlString.h" - -diff -up libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 libebml-1.4.2/src/EbmlUnicodeString.cpp ---- libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 2021-03-01 11:42:02.121854696 +0100 -+++ libebml-1.4.2/src/EbmlUnicodeString.cpp 2021-03-01 11:42:21.772995170 +0100 -@@ -36,6 +36,7 @@ - */ - - #include -+#include - - #include "ebml/EbmlUnicodeString.h" - diff --git a/libebml-use-system-utf8cpp.patch b/libebml-use-system-utf8cpp.patch index 3003e1a..cae9cc4 100644 --- a/libebml-use-system-utf8cpp.patch +++ b/libebml-use-system-utf8cpp.patch @@ -1,12 +1,12 @@ -diff -up libebml-1.3.7/src/EbmlUnicodeString.cpp.utf8cpp libebml-1.3.7/src/EbmlUnicodeString.cpp ---- libebml-1.3.7/src/EbmlUnicodeString.cpp.utf8cpp 2019-03-12 20:27:42.000000000 +0100 -+++ libebml-1.3.7/src/EbmlUnicodeString.cpp 2019-06-07 22:54:39.002363241 +0200 -@@ -39,7 +39,7 @@ +diff -up libebml-1.4.4/src/EbmlUnicodeString.cpp.utf8cpp libebml-1.4.4/src/EbmlUnicodeString.cpp +--- libebml-1.4.4/src/EbmlUnicodeString.cpp.utf8cpp 2022-10-11 13:11:14.129418820 +0200 ++++ libebml-1.4.4/src/EbmlUnicodeString.cpp 2022-10-11 13:11:44.405608490 +0200 +@@ -40,7 +40,7 @@ #include "ebml/EbmlUnicodeString.h" -#include "lib/utf8-cpp/source/utf8/checked.h" +#include - START_LIBEBML_NAMESPACE + namespace libebml { diff --git a/libebml.spec b/libebml.spec index 2155885..f32c855 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,13 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.4.2 -Release: 2%{?dist} +Version: 1.4.4 +Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-use-system-utf8cpp.patch -# https://github.com/Matroska-Org/libebml/pull/81 -Patch1: %{name}-gcc11.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: utf8cpp-devel @@ -36,7 +34,6 @@ will use the Extensible Binary Meta Language library. %prep %setup -q %patch0 -p1 -b .utf8cpp -%patch1 -p1 -b .gcc11 rm -r src/lib/utf8-cpp @@ -54,7 +51,7 @@ rm -r src/lib/utf8-cpp %files %license LICENSE.LGPL -%doc ChangeLog +%doc NEWS.md %{_libdir}/%{name}.so.5* %files devel @@ -69,6 +66,10 @@ rm -r src/lib/utf8-cpp %changelog +* Tue Oct 11 2022 Dominik Mierzejewski - 1.4.4-1 +- update to 1.4.4 (#2131232) +- drop obsolete patch + * Thu Jul 22 2021 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index e818fab..5457851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.4.2.tar.xz) = b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5 +SHA512 (libebml-1.4.4.tar.xz) = 24f2bf51cd71f583bdd3bb33dbf20b5adeb8e96345de3abf3014f3ae1b0610c1bd04b802f26b4a1a26f884a696d6accf784bed1510f12538a6664cbd9ae51d6d From a9620bbc70cc2c6c474233bb1d82c90628ee4cc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:12:24 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 67fd4bf..acbd6d6 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,9 @@ rm -r src/lib/utf8-cpp %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Oct 11 2022 Dominik Mierzejewski - 1.4.4-1 - update to 1.4.4 (#2131232) - drop obsolete patch From 5aad11d939743e75c29f5d537eaf509250f9802e Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 2 Feb 2024 12:33:07 +0100 Subject: [PATCH 4/5] update to 1.4.5 (#2254413) - fixes CVE-2023-52339 (#2258046, #2258047) --- libebml.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libebml.spec b/libebml.spec index acbd6d6..0c21b8a 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.4.4 -Release: 2%{?dist} +Version: 1.4.5 +Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,10 @@ rm -r src/lib/utf8-cpp %changelog +* Fri Feb 02 2024 Dominik Mierzejewski - 1.4.5-1 +- update to 1.4.5 (#2254413) +- fixes CVE-2023-52339 (#2258046, #2258047) + * Thu Jan 19 2023 Fedora Release Engineering - 1.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6d52edf6f922e4a6d383a78f9116456c4cf9827a Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 2 Feb 2024 12:53:13 +0100 Subject: [PATCH 5/5] upload forgotten sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 006b1a5..2e0a603 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.4.1.tar.xz /libebml-1.4.2.tar.xz /libebml-1.4.4.tar.xz +/libebml-1.4.5.tar.xz diff --git a/sources b/sources index 5457851..3133aac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.4.4.tar.xz) = 24f2bf51cd71f583bdd3bb33dbf20b5adeb8e96345de3abf3014f3ae1b0610c1bd04b802f26b4a1a26f884a696d6accf784bed1510f12538a6664cbd9ae51d6d +SHA512 (libebml-1.4.5.tar.xz) = 6ee2afd538de8b028a1acd4a0f00a8aa230deac297573d868683e96f22fa4953858d3a1d8ab414ac27757f35699e6149f0aaef6eb4d235baa79226d8f36ccb5c