diff --git a/0018-CVE-2022-43272-Fixed-memory-leak-in-single-process-mode.patch b/0018-CVE-2022-43272-Fixed-memory-leak-in-single-process-mode.patch deleted file mode 100644 index c833d99bcb5b41fa47268a91481d518d4144b442..0000000000000000000000000000000000000000 --- a/0018-CVE-2022-43272-Fixed-memory-leak-in-single-process-mode.patch +++ /dev/null @@ -1,61 +0,0 @@ -From cd73ffc250bf6472afdd17170eb688243701f860 Mon Sep 17 00:00:00 2001 -From: Marco Eichelberg -Date: Thu, 9 Jun 2022 10:03:38 +0200 -Subject: [PATCH 18/18] [CVE-2022-43272] Fixed memory leak in single process - mode. - -Fixed a memory leak in dcmqrscp's single process mode. - -Thanks to for the bug report and test data. - -(cherry picked from commit c34f4e46e672ad21accf04da0dc085e43be6f5e1) ---- - dcmqrdb/libsrc/dcmqrsrv.cc | 24 ++++++++++-------------- - 1 file changed, 10 insertions(+), 14 deletions(-) - -diff --git a/dcmqrdb/libsrc/dcmqrsrv.cc b/dcmqrdb/libsrc/dcmqrsrv.cc -index 157e6c022..f5f9df661 100644 ---- a/dcmqrdb/libsrc/dcmqrsrv.cc -+++ b/dcmqrdb/libsrc/dcmqrsrv.cc -@@ -1,6 +1,6 @@ - /* - * -- * Copyright (C) 1993-2021, OFFIS e.V. -+ * Copyright (C) 1993-2022, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -1126,21 +1126,17 @@ OFCondition DcmQueryRetrieveSCP::waitForAssociation(T_ASC_Network * theNet) - #endif - } - -- // cleanup code -+ // clean-up association - OFCondition oldcond = cond; /* store condition flag for later use */ -- if (!options_.singleProcess_ && (cond != ASC_SHUTDOWNAPPLICATION)) -+ cond = ASC_dropAssociation(assoc); -+ if (cond.bad()) - { -- /* the child will handle the association, we can drop it */ -- cond = ASC_dropAssociation(assoc); -- if (cond.bad()) -- { -- DCMQRDB_ERROR("Cannot Drop Association: " << DimseCondition::dump(temp_str, cond)); -- } -- cond = ASC_destroyAssociation(&assoc); -- if (cond.bad()) -- { -- DCMQRDB_ERROR("Cannot Destroy Association: " << DimseCondition::dump(temp_str, cond)); -- } -+ DCMQRDB_ERROR("Cannot Drop Association: " << DimseCondition::dump(temp_str, cond)); -+ } -+ cond = ASC_destroyAssociation(&assoc); -+ if (cond.bad()) -+ { -+ DCMQRDB_ERROR("Cannot Destroy Association: " << DimseCondition::dump(temp_str, cond)); - } - - if (oldcond == ASC_SHUTDOWNAPPLICATION) cond = oldcond; /* abort flag is reported to top-level wait loop */ --- -2.39.2 - diff --git a/0018-chore-undo-changes-to-standard-dirs.patch b/0018-chore-undo-changes-to-standard-dirs.patch new file mode 100644 index 0000000000000000000000000000000000000000..08e4c1a403728446414d8c69b47037a0956401d3 --- /dev/null +++ b/0018-chore-undo-changes-to-standard-dirs.patch @@ -0,0 +1,39 @@ +From ff7f5232d86375f036919f43606890e541a24cab Mon Sep 17 00:00:00 2001 +From: "Ankur Sinha (Ankur Sinha Gmail)" +Date: Sat, 17 Aug 2024 16:51:39 +0100 +Subject: [PATCH 2/2] chore: undo changes to standard dirs + +--- + CMake/GenerateDCMTKConfigure.cmake | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/CMake/GenerateDCMTKConfigure.cmake b/CMake/GenerateDCMTKConfigure.cmake +index a3856d3d0..6e2cb6827 100644 +--- a/CMake/GenerateDCMTKConfigure.cmake ++++ b/CMake/GenerateDCMTKConfigure.cmake +@@ -158,8 +158,8 @@ if(WIN32 AND NOT CYGWIN) + set(DCMTK_DEFAULT_CONFIGURATION_DIR "%PROGRAMDATA%\\\\dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}\\\\etc${PATH_SEPARATOR}") + set(DCMTK_DEFAULT_SUPPORT_DATA_DIR "%PROGRAMDATA%\\\\dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}\\\\share${PATH_SEPARATOR}") + else() +- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}") ++ set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk") ++ set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}") + set(DCMTK_DEFAULT_CONFIGURATION_DIR "") + set(DCMTK_DEFAULT_SUPPORT_DATA_DIR "") + endif() +@@ -195,9 +195,8 @@ else() + + # Modify the installation paths for configuration files, data files and documents + # by adding a subdirectory with the DCMTK name and version number +- set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}") ++ set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk") ++ set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk") + + # These variables are defined as macros in osconfig.h and must end with a path separator + if(CMAKE_VERSION VERSION_LESS 3.20.0) +-- +2.48.1 + diff --git a/dcmtk-3.6.7.tar.gz b/dcmtk-3.6.9.tar.gz similarity index 42% rename from dcmtk-3.6.7.tar.gz rename to dcmtk-3.6.9.tar.gz index 57c08e08976e1f95aa7a1a90cb5390b51a35ead5..f80b7787180d71ea5b2c06b58260b14ed19ac4d4 100644 Binary files a/dcmtk-3.6.7.tar.gz and b/dcmtk-3.6.9.tar.gz differ diff --git a/dcmtk.spec b/dcmtk.spec index d643d7ffa0e8044cb2b06a0fd4079a13cc6c9f2d..89c5ff1b35c672eca1b0dc7f8c30d59e810d48e3 100644 --- a/dcmtk.spec +++ b/dcmtk.spec @@ -1,16 +1,18 @@ -%global abi_version 17 +%define anolis_release 1 + +%global abi_version 19 %bcond_with charls2 Name: dcmtk Summary: Offis DICOM Toolkit (DCMTK) -Version: 3.6.7 +Version: 3.6.9 %global soname_version %{abi_version}.%{version} -Release: 1%{?dist} +Release: %{anolis_release}%{?dist} License: BSD -Source: https://dicom.offis.de/download/dcmtk/dcmtk367/dcmtk-3.6.7.tar.gz +Source: https://dicom.offis.de/download/dcmtk/dcmtk369/dcmtk-3.6.9.tar.gz URL: http://dicom.offis.de/dcmtk.php.en %if %{with charls2} @@ -32,8 +34,7 @@ Patch: 0015-Update-colorTransformation-for-CharLS-2.patch Patch: 0016-Update-JpegLsEncode-for-CharLS-2.patch %endif Patch: 0017-Increase-sleep-for-tests.patch - -Patch: 0018-CVE-2022-43272-Fixed-memory-leak-in-single-process-mode.patch +Patch: 0018-chore-undo-changes-to-standard-dirs.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -171,6 +172,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/wlistdb/OFFIS/lockfile %{_libdir}/libdcmtract.so.%{soname_version} %{_libdir}/libdcmwlm.so.%{abi_version} %{_libdir}/libdcmwlm.so.%{soname_version} +%{_libdir}/libdcmxml.so.%{abi_version} +%{_libdir}/libdcmxml.so.%{soname_version} %{_libdir}/libi2d.so.%{abi_version} %{_libdir}/libi2d.so.%{soname_version} %{_libdir}/libijg16.so.%{abi_version} @@ -179,12 +182,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/wlistdb/OFFIS/lockfile %{_libdir}/libijg12.so.%{soname_version} %{_libdir}/libijg8.so.%{abi_version} %{_libdir}/libijg8.so.%{soname_version} +%{_libdir}/liboficonv.so.%{abi_version} +%{_libdir}/liboficonv.so.%{soname_version} %{_libdir}/liboflog.so.%{abi_version} %{_libdir}/liboflog.so.%{soname_version} %{_libdir}/libofstd.so.%{abi_version} %{_libdir}/libofstd.so.%{soname_version} %dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/consolog.cfg %config(noreplace) %{_sysconfdir}/%{name}/dcmpstat.cfg +%config(noreplace) %{_sysconfdir}/%{name}/dcmqrprf.cfg %config(noreplace) %{_sysconfdir}/%{name}/dcmqrscp.cfg %config(noreplace) %{_sysconfdir}/%{name}/printers.cfg %config(noreplace) %{_sysconfdir}/%{name}/storescp.cfg @@ -219,13 +226,20 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/wlistdb/OFFIS/lockfile %{_libdir}/libdcmtls.so %{_libdir}/libdcmtract.so %{_libdir}/libdcmwlm.so +%{_libdir}/libdcmxml.so %{_libdir}/libi2d.so %{_libdir}/libijg16.so %{_libdir}/libijg12.so %{_libdir}/libijg8.so +%{_libdir}/liboficonv.so %{_libdir}/liboflog.so %{_libdir}/libofstd.so %changelog +* Thu Jun 12 2025 mgb01105731 - 3.6.9-1 +- Update to 3.6.9 to fix CVE-2024-52333 CVE-2024-34509 CVE-2024-27628 +- Delete patch as CVE-2022-43272 fixed in 3.6.9 +- Add patch to place in correct locations + * Fri Jun 16 2023 forrest_ly - 3.6.7-1 - init for anolis 23