diff --git a/gdcm-3.0.24-c++20.patch b/gdcm-3.0.24-c++20.patch new file mode 100644 index 0000000000000000000000000000000000000000..ab6b899bcec000fd73be2fb9f5c13eeea19823c0 --- /dev/null +++ b/gdcm-3.0.24-c++20.patch @@ -0,0 +1,10 @@ +--- GDCM-3.0.24/CMakeLists.txt ++++ GDCM-3.0.24/CMakeLists.txt +@@ -335,6 +335,7 @@ mark_as_advanced( + option(GDCM_USE_SYSTEM_POPPLER "Use system poppler (pdf)" OFF) + if(GDCM_USE_SYSTEM_POPPLER) + find_package(Poppler REQUIRED) ++ set(CMAKE_CXX_STANDARD 20) + endif() + mark_as_advanced(GDCM_USE_SYSTEM_POPPLER) + diff --git a/gdcm-3.0.21.tar.gz b/gdcm-3.0.24.tar.gz similarity index 35% rename from gdcm-3.0.21.tar.gz rename to gdcm-3.0.24.tar.gz index d477679338ef6655fe066c41cccf9c956a079f48..1154792c7d2588fef7c370234847ded75ed18f08 100644 Binary files a/gdcm-3.0.21.tar.gz and b/gdcm-3.0.24.tar.gz differ diff --git a/gdcm.spec b/gdcm.spec index b932ac7984f793b7380c94840d93b48cc6cda5b9..111f1cbb03beed180fcaef310ff10d0200de7971 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -3,18 +3,19 @@ %bcond_with texdocs Name: gdcm -Version: 3.0.21 -Release: 1%{dist} +Version: 3.0.24 +Release: 1%{dist} Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files -License: BSD -URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page +License: BSD-3-Clause +URL: https://sourceforge.net/projects/gdcm/ Source0: https://github.com/malaterre/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz Patch1: 0001-3.0.1-Use-copyright.patch -Patch3: 0002-Fix-export-variables.patch +Patch2: 0002-Fix-export-variables.patch +Patch3: gdcm-3.0.24-c++20.patch -BuildRequires: CharLS-devel >= 2.0 +BuildRequires: CharLS-devel >= 2.2 BuildRequires: cmake BuildRequires: doxygen BuildRequires: libxslt-devel @@ -31,7 +32,7 @@ BuildRequires: gl2ps-devel BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: libuuid-devel -BuildRequires: mesa-libOSMesa-devel +BuildRequires: mesa-libGL-devel BuildRequires: openssl-devel BuildRequires: pkgconfig(libopenjp2) BuildRequires: poppler-devel @@ -123,6 +124,8 @@ rm -rf Utilities/pvrg rm -rf Utilities/rle rm -rf Utilities/wxWidgets +sed -i -e 's@cmake_minimum_required(VERSION 2.8.7)@cmake_minimum_required(VERSION 3.5)@' Examples/CMakeLists.txt + %build %cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -170,27 +173,28 @@ make test -C %{__cmake_builddir} || exit 0 %doc AUTHORS README.md %license Copyright.txt README.Copyright.txt %{_libdir}/libgdcmCommon.so.3.0 -%{_libdir}/libgdcmCommon.so.3.0.21 +%{_libdir}/libgdcmCommon.so.3.0.24 %{_libdir}/libgdcmDICT.so.3.0 -%{_libdir}/libgdcmDICT.so.3.0.21 +%{_libdir}/libgdcmDICT.so.3.0.24 %{_libdir}/libgdcmDSED.so.3.0 -%{_libdir}/libgdcmDSED.so.3.0.21 +%{_libdir}/libgdcmDSED.so.3.0.24 %{_libdir}/libgdcmIOD.so.3.0 -%{_libdir}/libgdcmIOD.so.3.0.21 +%{_libdir}/libgdcmIOD.so.3.0.24 %{_libdir}/libgdcmMEXD.so.3.0 -%{_libdir}/libgdcmMEXD.so.3.0.21 +%{_libdir}/libgdcmMEXD.so.3.0.24 %{_libdir}/libgdcmMSFF.so.3.0 -%{_libdir}/libgdcmMSFF.so.3.0.21 +%{_libdir}/libgdcmMSFF.so.3.0.24 %{_libdir}/libgdcmjpeg12.so.3.0 -%{_libdir}/libgdcmjpeg12.so.3.0.21 +%{_libdir}/libgdcmjpeg12.so.3.0.24 %{_libdir}/libgdcmjpeg16.so.3.0 -%{_libdir}/libgdcmjpeg16.so.3.0.21 +%{_libdir}/libgdcmjpeg16.so.3.0.24 %{_libdir}/libgdcmjpeg8.so.3.0 -%{_libdir}/libgdcmjpeg8.so.3.0.21 +%{_libdir}/libgdcmjpeg8.so.3.0.24 %{_libdir}/libgdcmmd5.so.3.0 -%{_libdir}/libgdcmmd5.so.3.0.21 +%{_libdir}/libgdcmmd5.so.3.0.24 %{_libdir}/libsocketxx.so.1.2 %{_libdir}/libsocketxx.so.1.2.0 +%dir %{_datadir}/%{name}-3.0/ %{_datadir}/%{name}-3.0/XML/ %files doc @@ -235,5 +239,8 @@ make test -C %{__cmake_builddir} || exit 0 %{python3_sitearch}/__pycache__/%{name}* %changelog +* Tue Aug 19 2025 wenxin - 3.0.24-1 +- Update to 3.0.24 to fix CVE-2024-22391 + * Fri Jun 16 2023 forrest_ly - 3.0.21-1 - init for anolis 23