Compare commits

...

4 Commits
epel9 ... i9ce

Author SHA1 Message Date
MSVSphere Packaging Team ab077b4e6f import libebml-1.4.5-1.el9
1 year ago
MSVSphere Packaging Team 0d5283bbfa Merge and update
1 year ago
MSVSphere Packaging Team f9b8fafd6b Remove unnecessary files
1 year ago
Arkady L. Shane 925e82de82
import libebml-1.4.2-3.el9
2 years ago

17
.gitignore vendored

@ -1,16 +1 @@
libebml-1.0.0.tar.bz2
/libebml-1.2.0.tar.bz2
/libebml-1.2.1.tar.bz2
/libebml-1.2.2.tar.bz2
/libebml-1.3.0.tar.bz2
/libebml-1.3.1.tar.bz2
/libebml-1.3.3.tar.bz2
/libebml-1.3.4.tar.bz2
/libebml-1.3.5.tar.xz
/libebml-1.3.6.tar.xz
/libebml-1.3.7.tar.xz
/libebml-1.3.9.tar.xz
/libebml-1.3.10.tar.xz
/libebml-1.4.0.tar.xz
/libebml-1.4.1.tar.xz
/libebml-1.4.2.tar.xz
SOURCES/libebml-1.4.5.tar.xz

@ -0,0 +1 @@
4363f762c74695928021b84f0d8620dbb1a69ff8 SOURCES/libebml-1.4.5.tar.xz

@ -0,0 +1,12 @@
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 <utf8/checked.h>
namespace libebml {

@ -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,6 +66,23 @@ rm -r src/lib/utf8-cpp
%changelog
* Fri Feb 02 2024 Dominik Mierzejewski <dominik@greysector.net> - 1.4.5-1
- update to 1.4.5 (#2254413)
- fixes CVE-2023-52339 (#2258046, #2258047)
* Mon Jul 24 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 1.4.4-2
- Rebuilt for MSVSphere 9.2
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Oct 11 2022 Dominik Mierzejewski <dominik@greysector.net> - 1.4.4-1
- update to 1.4.4 (#2131232)
- drop obsolete patch
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

@ -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 <robux4 @ users.sf.net>
*/
#include <cassert>
+#include <limits>
#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 <cassert>
+#include <limits>
#include "ebml/EbmlUnicodeString.h"

@ -1,12 +0,0 @@
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 @@
#include "ebml/EbmlUnicodeString.h"
-#include "lib/utf8-cpp/source/utf8/checked.h"
+#include <utf8/checked.h>
START_LIBEBML_NAMESPACE

@ -1 +0,0 @@
SHA512 (libebml-1.4.2.tar.xz) = b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
Loading…
Cancel
Save