diff --git a/exiv2-no-rpath.patch b/exiv2-no-rpath.patch new file mode 100644 index 0000000..28a9b54 --- /dev/null +++ b/exiv2-no-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake +index 1ea9deb..36253d1 100644 +--- a/cmake/mainSetup.cmake ++++ b/cmake/mainSetup.cmake +@@ -26,8 +26,6 @@ if (UNIX) + if (APPLE) + set(CMAKE_MACOSX_RPATH ON) + set(CMAKE_INSTALL_RPATH "@loader_path") +- else() +- join_paths(CMAKE_INSTALL_RPATH "$ORIGIN" ".." "${CMAKE_INSTALL_LIBDIR}") + endif() + endif() diff --git a/exiv2.spec b/exiv2.spec index b28ab17..b3a85a5 100644 --- a/exiv2.spec +++ b/exiv2.spec @@ -1,6 +1,6 @@ Name: exiv2 Version: 0.28.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Exif and Iptc metadata manipulation library # GPL-2.0-or-later: main library @@ -23,6 +23,8 @@ Source0: %{vcs}/archive/v%{version}/%{name}-%{version}.tar.gz # POC files for upstream issues Source1: issue_ghsa_38h4_fx85_qcx7_poc.tiff +Patch0: exiv2-no-rpath.patch + # CVE fixes Patch50: exiv2-CVE-2025-26623.patch Patch51: exiv2-CVE-2025-26623-test.patch @@ -109,8 +111,7 @@ cp %{SOURCE1} test/data/issue_ghsa_38h4_fx85_qcx7_poc.tiff -DCMAKE_INSTALL_DOCDIR="%{_pkgdocdir}" \ -DEXIV2_BUILD_DOC:BOOL=ON \ -DEXIV2_BUILD_SAMPLES:BOOL=OFF \ - -DEXIV2_ENABLE_NLS:BOOL=ON \ - -DCMAKE_SKIP_RPATH:BOOL=OFF + -DEXIV2_ENABLE_NLS:BOOL=ON %cmake_build %cmake_build --target doc @@ -154,6 +155,10 @@ test -x %{buildroot}%{_libdir}/libexiv2.so %changelog +* Mon Feb 24 2025 Jan Grulich - 0.28.3-5 +- Revert: remove rpath patch + Resolves: RHEL-80106 + * Mon Feb 24 2025 Jan Grulich - 0.28.3-4 - Fix CVE-2025-26623 exiv2: Use After Free Resolves: RHEL-80106