diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-10-16 04:02:10 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-10-16 04:02:10 +0000 |
| commit | 2810189d0b33f8d8c5c2d9a78ff9664b65fc6c6e (patch) | |
| tree | 52ae9bf123b0c440e72d1be245a5b93e3892d844 | |
| parent | 9d1dd780d6dfaed6411b5c516a279b7766db3604 (diff) | |
automatic import of spdlogopeneuler25.09
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CVE-2025-6140.patch | 31 | ||||
| -rw-r--r-- | sources | 1 | ||||
| -rw-r--r-- | spdlog.spec | 218 |
4 files changed, 251 insertions, 0 deletions
@@ -0,0 +1 @@ +/v1.11.0.tar.gz diff --git a/CVE-2025-6140.patch b/CVE-2025-6140.patch new file mode 100644 index 0000000..110f6b1 --- /dev/null +++ b/CVE-2025-6140.patch @@ -0,0 +1,31 @@ +From 10320184df1eb4638e253a34b1eb44ce78954094 Mon Sep 17 00:00:00 2001 +From: Gabi Melman <gmelman1@gmail.com> +Date: Mon, 17 Mar 2025 15:46:31 +0200 +Subject: [PATCH] Fixed issue #3360 (#3361) + +Backport of upstream commit 10320184df1eb4638e253a34b1eb44ce78954094 for +spdlog 1.11.0 (CVE-2025-6140, allocation-size-too-big in scoped_padder). + +Only the scoped_padder fix is kept. The unrelated field_size change +(D_formatter) and whitespace cleanup from the original upstream commit +are intentionally dropped, since they are not part of this CVE's fix and +would alter unrelated behavior. + +--- + include/spdlog/pattern_formatter-inl.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/spdlog/pattern_formatter-inl.h b/include/spdlog/pattern_formatter-inl.h +--- a/include/spdlog/pattern_formatter-inl.h ++++ b/include/spdlog/pattern_formatter-inl.h +@@ -76,6 +76,10 @@ + else if (padinfo_.truncate_) + { + long new_size = static_cast<long>(dest_.size()) + remaining_pad_; ++ if (new_size < 0) ++ { ++ new_size = 0; ++ } + dest_.resize(static_cast<size_t>(new_size)); + } + } @@ -0,0 +1 @@ +287c6492c25044fd2da9947ab120b2bd v1.11.0.tar.gz diff --git a/spdlog.spec b/spdlog.spec new file mode 100644 index 0000000..500ace8 --- /dev/null +++ b/spdlog.spec @@ -0,0 +1,218 @@ +Name: spdlog +Version: 1.11.0 +Release: 8%{?dist} + +License: MIT +Summary: Super fast C++ logging library +URL: https://github.com/gabime/%{name} +Source0: v%{version}.tar.gz + +# Fix CVE-2025-6140 (negative size in scoped_padder, upstream #3360) +Patch0: CVE-2025-6140.patch + +BuildRequires: catch1-devel +BuildRequires: cmake +BuildRequires: fmt-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: google-benchmark-devel + +%description +This is a packaged version of the gabime/spdlog C++ logging +library available at Github. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libstdc++-devel%{?_isa} +Requires: fmt-devel%{?_isa} + +%description devel +The %{name}-devel package contains C++ header files for developing +applications that use %{name}. + +%prep +%autosetup -p1 +find . -name '.gitignore' -delete +sed -e "s,\r,," -i README.md +rm -f tests/catch.hpp + +%build +%cmake \ + -DCMAKE_INSTALL_LIBDIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=Release \ + -DSPDLOG_BUILD_SHARED=ON \ + -DSPDLOG_BUILD_EXAMPLE=OFF \ + -DSPDLOG_BUILD_BENCH=OFF \ + -DSPDLOG_BUILD_TESTS=OFF \ + -DSPDLOG_INSTALL=ON \ + -DSPDLOG_FMT_EXTERNAL=ON +%cmake_build + +%install +%cmake_install + +%files +%license LICENSE +%doc README.md +%{_libdir}/lib%{name}.so.1* + +%files devel +%doc example +%{_includedir}/%{name} +%{_libdir}/lib%{name}.so +%{_libdir}/cmake/%{name} +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Fri Oct 16 2026 kuyan_kubuds <kuyan@kubuds.cn> - 1.11.0-8 +- Fix CVE-2025-6140 + +* Sat Nov 25 2025 Funda Wang <fundawang@yeah.net> - 1.11.0-7 +- update release version +* Tue Nov 19 2024 Funda Wang <fundawang@yeah.net> - 1.11.0-6 +- adopt to new cmake macro + +* Wed Mar 01 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-5 +- Ported to catch v3. Fixed FTBFS in ELN. + +* Tue Feb 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-4 +- Fixed FTBFS in EPEL/ELN due to catch v3 update. + +* Tue Feb 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-3 +- Fixed FTBFS due to catch v3 update. + +* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Nov 03 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.11.0-1 +- Updated to version 1.11.0. + +* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 10 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.10.0-2 +- Rebuilt due to fmt library update. + +* Mon Apr 18 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.10.0-1 +- Updated to version 1.10.0. + +* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Sep 15 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.2-2 +- Rebuilt due to google-benchmark 1.6.0 update. + +* Fri Aug 13 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.2-1 +- Updated to version 1.9.2. + +* Tue Jul 27 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.1-1 +- Updated to version 1.9.1. + +* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.9.0-1 +- Updated to version 1.9.0. + +* Sun Jul 04 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.5-2 +- Rebuilt due to fmt library update. + +* Fri Apr 02 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.5-1 +- Updated to version 1.8.5. + +* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Dec 12 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.2-1 +- Updated to version 1.8.2. + +* Tue Oct 13 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.1-1 +- Updated to version 1.8.1. + +* Sat Sep 05 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.8.0-1 +- Updated to version 1.8.0. + +* Tue Jul 21 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.7.0-1 +- Updated to version 1.7.0. + +* Tue Jun 02 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.6.1-1 +- Updated to version 1.6.1. + +* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 27 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.0-1 +- Updated to version 1.5.0. + +* Wed Dec 18 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 1.4.2-1 +- Updated to version 1.4.2. + +* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Jan 20 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 1.3.1-1 +- Updated to version 1.3.1. + +* Mon Nov 05 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 1.2.1-1 +- Updated to version 1.2.1. + +* Sun Sep 02 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 1.1.0-1 +- Updated to version 1.1.0. + +* Thu Aug 09 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 1.0.0-1 +- Updated to version 1.0.0. + +* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.17.0-1 +- Updated to version 0.17.0. +- Added tests support. +- Added cmake and pkg-config support. + +* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Sep 04 2016 Daniel Kopecek <dkopecek@redhat.com> - 0.10.0-1 +- Update to 0.10.0 + +* Fri Jul 08 2016 Daniel Kopecek <dkopecek@redhat.com> - 0-8.20160703git34bb86b +- update to rev 34bb86b + +* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0-7.20151110gitcbc8ba7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Daniel Kopecek <dkopecek@redhat.com> - 0-6.20151110gitcbc8ba7 +- update to rev cbc8ba7 + +* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-5.20150410git211ce99 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Apr 30 2015 Daniel Kopecek <dkopecek@redhat.com> - 0-4.20150410git211ce99 +- don't build the base package +- remove a dot from the release tag +- corrected -devel subpackage description + +* Mon Apr 20 2015 Daniel Kopecek <dkopecek@redhat.com> - 0-3.20150410git.211ce99 +- use the -p option when copying the header files + +* Tue Apr 14 2015 Daniel Kopecek <dkopecek@redhat.com> - 0-2.20150410git.211ce99 +- don't build the debuginfo subpackage +- require libstdc++-devel +- don't generate a distribution specific pkg-config file + +* Fri Apr 10 2015 Daniel Kopecek <dkopecek@redhat.com> - 0-1.20150410git.211ce99 +- Initial package |
