diff --git a/.gitignore b/.gitignore index 47308dc..b579fca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libebml-1.4.2.tar.xz +SOURCES/libebml-1.4.5.tar.xz diff --git a/.libebml.metadata b/.libebml.metadata index 1c39f46..e50dbee 100644 --- a/.libebml.metadata +++ b/.libebml.metadata @@ -1 +1 @@ -a5e545d1bf22abf8b6722f4bc2d2034bb61b2d46 SOURCES/libebml-1.4.2.tar.xz +4363f762c74695928021b84f0d8620dbb1a69ff8 SOURCES/libebml-1.4.5.tar.xz diff --git a/SOURCES/libebml-gcc11.patch b/SOURCES/libebml-gcc11.patch deleted file mode 100644 index 859f763..0000000 --- a/SOURCES/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/SOURCES/libebml-use-system-utf8cpp.patch b/SOURCES/libebml-use-system-utf8cpp.patch index 3003e1a..cae9cc4 100644 --- a/SOURCES/libebml-use-system-utf8cpp.patch +++ b/SOURCES/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/SPECS/libebml.spec b/SPECS/libebml.spec index 1425a06..a1d8d9c 100644 --- a/SPECS/libebml.spec +++ b/SPECS/libebml.spec @@ -1,20 +1,14 @@ -%if 0%{?el9} -%global _without_utf8cpp 1 -%endif - Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.4.2 -Release: 3%{?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 Patch0: %{name}-use-system-utf8cpp.patch -# https://github.com/Matroska-Org/libebml/pull/81 -Patch1: %{name}-gcc11.patch BuildRequires: cmake3 BuildRequires: gcc-c++ -%{!?_without_utf8cpp:BuildRequires: utf8cpp-devel} +BuildRequires: utf8cpp-devel %description Extensible Binary Meta Language access library A library for reading @@ -39,11 +33,8 @@ will use the Extensible Binary Meta Language library. %prep %setup -q -%{!?_without_utf8cpp: %patch0 -p1 -b .utf8cpp rm -r src/lib/utf8-cpp -} -%patch1 -p1 -b .gcc11dd %build @@ -60,7 +51,7 @@ rm -r src/lib/utf8-cpp %files %license LICENSE.LGPL -%doc ChangeLog +%doc NEWS.md %{_libdir}/%{name}.so.5* %files devel @@ -75,9 +66,23 @@ rm -r src/lib/utf8-cpp %changelog -* Mon Jul 24 2023 Arkady L. Shane - 1.4.2-3 +* Fri Feb 02 2024 Dominik Mierzejewski - 1.4.5-1 +- update to 1.4.5 (#2254413) +- fixes CVE-2023-52339 (#2258046, #2258047) + +* Mon Jul 24 2023 Arkady L. Shane - 1.4.4-2 - Rebuilt for MSVSphere 9.2 +* 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 + +* 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