exiv2-0.25 (#1234185)
This commit is contained in:
Rex Dieter
parent
7244fe72ec
commit
08a914e633
5
.gitignore
vendored
5
.gitignore
vendored
@ -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
|
||||
|
||||
@ -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
|
||||
@ -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 )
|
||||
|
||||
# ******************************************************************************
|
||||
41
exiv2-0.25-cmake_LIB_SUFFIX.patch
Normal file
41
exiv2-0.25-cmake_LIB_SUFFIX.patch
Normal file
@ -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 )
|
||||
|
||||
# ******************************************************************************
|
||||
19
exiv2.spec
19
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 <rdieter@fedoraproject.org> 0.25-1
|
||||
- exiv2-0.25 (#1234185)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user