From 08a914e633b0bcd5d36c308ef76e6953850ee263 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 24 Jun 2015 13:08:52 -0500 Subject: [PATCH] exiv2-0.25 (#1234185) --- .gitignore | 5 +--- exiv2-0.24-CVE-2014-9449.patch | 27 -------------------- exiv2-0.24-cmake_LIB_SUFFIX.patch | 29 ---------------------- exiv2-0.25-cmake_LIB_SUFFIX.patch | 41 +++++++++++++++++++++++++++++++ exiv2.spec | 19 ++++++-------- sources | 2 +- 6 files changed, 51 insertions(+), 72 deletions(-) delete mode 100644 exiv2-0.24-CVE-2014-9449.patch delete mode 100644 exiv2-0.24-cmake_LIB_SUFFIX.patch create mode 100644 exiv2-0.25-cmake_LIB_SUFFIX.patch diff --git a/.gitignore b/.gitignore index 124d50e..20568a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/exiv2-0.21.1.tar.gz -/exiv2-0.22.tar.gz -/exiv2-0.23.tar.gz -/exiv2-0.24.tar.gz +/exiv2-0.25.tar.gz diff --git a/exiv2-0.24-CVE-2014-9449.patch b/exiv2-0.24-CVE-2014-9449.patch deleted file mode 100644 index cf1b46f..0000000 --- a/exiv2-0.24-CVE-2014-9449.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up exiv2-0.24/src/riffvideo.cpp.CVE-2014-9449 exiv2-0.24/src/riffvideo.cpp ---- exiv2-0.24/src/riffvideo.cpp.CVE-2014-9449 2013-12-01 06:13:42.000000000 -0600 -+++ exiv2-0.24/src/riffvideo.cpp 2015-01-05 11:21:42.306728309 -0600 -@@ -856,7 +856,7 @@ namespace Exiv2 { - - void RiffVideo::infoTagsHandler() - { -- const long bufMinSize = 100; -+ const long bufMinSize = 10000; - DataBuf buf(bufMinSize); - buf.pData_[4] = '\0'; - io_->seek(-12, BasicIo::cur); -@@ -879,10 +879,14 @@ namespace Exiv2 { - if(infoSize >= 0) { - size -= infoSize; - io_->read(buf.pData_, infoSize); -+ if(infoSize < 4) -+ buf.pData_[infoSize] = '\0'; - } - - if(tv) - xmpData_[exvGettext(tv->label_)] = buf.pData_; -+ else -+ continue; - } - io_->seek(cur_pos + size_external, BasicIo::beg); - } // RiffVideo::infoTagsHandler diff --git a/exiv2-0.24-cmake_LIB_SUFFIX.patch b/exiv2-0.24-cmake_LIB_SUFFIX.patch deleted file mode 100644 index 6f33f6d..0000000 --- a/exiv2-0.24-cmake_LIB_SUFFIX.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up exiv2-0.24/CMakeLists.txt.cmake_LIB_SUFFIX exiv2-0.24/CMakeLists.txt ---- exiv2-0.24/CMakeLists.txt.cmake_LIB_SUFFIX 2013-09-23 05:58:43.000000000 -0500 -+++ exiv2-0.24/CMakeLists.txt 2013-12-02 12:09:15.191761985 -0600 -@@ -123,8 +123,8 @@ INCLUDE( config/CMakeChecks.txt ) - - SET( INSTALL_TARGET_STANDARD_ARGS - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) - - ## -diff -up exiv2-0.24/config/CMakeChecks.txt.cmake_LIB_SUFFIX exiv2-0.24/config/CMakeChecks.txt ---- exiv2-0.24/config/CMakeChecks.txt.cmake_LIB_SUFFIX 2013-07-23 19:34:42.000000000 -0500 -+++ exiv2-0.24/config/CMakeChecks.txt 2013-12-02 12:10:55.277711848 -0600 -@@ -251,9 +251,9 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COM - - IF( NOT MSVC ) - CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY ) -- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig ) -+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig ) - CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig ) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib${LIB_SUFFIX}/pkgconfig ) - ENDIF( NOT MSVC ) - - # ****************************************************************************** diff --git a/exiv2-0.25-cmake_LIB_SUFFIX.patch b/exiv2-0.25-cmake_LIB_SUFFIX.patch new file mode 100644 index 0000000..5a7f7b4 --- /dev/null +++ b/exiv2-0.25-cmake_LIB_SUFFIX.patch @@ -0,0 +1,41 @@ +diff -up exiv2-0.25/CMakeLists.txt.cmake_LIB_SUFFIX exiv2-0.25/CMakeLists.txt +--- exiv2-0.25/CMakeLists.txt.cmake_LIB_SUFFIX 2015-06-15 10:32:21.000000000 -0500 ++++ exiv2-0.25/CMakeLists.txt 2015-06-22 08:48:19.486245765 -0500 +@@ -25,7 +25,7 @@ if( POLICY CMP0042 ) + else() + SET(CMAKE_MACOSX_RPATH 1) + endif() +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") + + + SET( PACKAGE_COPYRIGHT "Andreas Huggel" ) +@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt ) + + SET( INSTALL_TARGET_STANDARD_ARGS + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") + + ## + # add sources from XMPSDK directory +diff -up exiv2-0.25/config/CMakeChecks.txt.cmake_LIB_SUFFIX exiv2-0.25/config/CMakeChecks.txt +--- exiv2-0.25/config/CMakeChecks.txt.cmake_LIB_SUFFIX 2015-04-30 10:31:18.000000000 -0500 ++++ exiv2-0.25/config/CMakeChecks.txt 2015-06-22 08:41:22.913094633 -0500 +@@ -291,9 +291,9 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COM + + IF( NOT MSVC ) + CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY ) +- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig ) ++ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig ) + CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig ) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib${LIB_SUFFIX}/pkgconfig ) + ENDIF( NOT MSVC ) + + # ****************************************************************************** diff --git a/exiv2.spec b/exiv2.spec index dc5a79b..1eb5dac 100644 --- a/exiv2.spec +++ b/exiv2.spec @@ -5,22 +5,18 @@ Summary: Exif and Iptc metadata manipulation library Name: exiv2 -Version: 0.24 -Release: 7%{?dist} +Version: 0.25 +Release: 1%{?dist} License: GPLv2+ URL: http://www.exiv2.org/ Source0: http://www.exiv2.org/exiv2-%{version}%{?pre:-%{pre}}.tar.gz ## upstream patches -# CVE-2014-9449 exiv2: buffer overflow in RiffVideo::infoTagsHandler -# https://bugzilla.redhat.com/show_bug.cgi?id=1178908 -# http://dev.exiv2.org/issues/960 -# commit: http://dev.exiv2.org/projects/exiv2/repository/diff?rev=3264&rev_to=3263 -Patch100: exiv2-0.24-CVE-2014-9449.patch ## upstreamable patches -Patch50: exiv2-0.24-cmake_LIB_SUFFIX.patch +# support LIB_SUFFIX, and avoid hard-coded rpath while we're at it +Patch50: exiv2-0.25-cmake_LIB_SUFFIX.patch Patch51: exiv2-0.24-cmake_mandir.patch Patch52: exiv2-0.24-doxygen_config.patch @@ -71,8 +67,6 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch100 -p1 -b .CVE-2014-9449 - %patch50 -p1 -b .cmake_LIB_SUFFIX %patch51 -p1 -b .cmake_mandir %patch52 -p1 -b .doxygen_config @@ -136,7 +130,7 @@ test -x %{buildroot}%{_libdir}/libexiv2.so %postun libs -p /sbin/ldconfig %files libs -f exiv2.lang -%{_libdir}/libexiv2.so.13* +%{_libdir}/libexiv2.so.14* %files devel %{_includedir}/exiv2/ @@ -148,6 +142,9 @@ test -x %{buildroot}%{_libdir}/libexiv2.so %changelog +* Mon Jun 22 2015 Rex Dieter 0.25-1 +- exiv2-0.25 (#1234185) + * Wed Jun 17 2015 Fedora Release Engineering - 0.24-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 5fc8f71..33ec862 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8a23dc56a98ede85c00718a97a8d6fc exiv2-0.24.tar.gz +258d4831b30f75a01e0234065c6c2806 exiv2-0.25.tar.gz