Hello community,
here is the log from the commit of package openjpeg for openSUSE:Factory
checked in at 2012-10-18 21:58:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openjpeg (Old)
and /work/SRC/openSUSE:Factory/.openjpeg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjpeg", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/openjpeg/openjpeg.changes 2012-09-20
16:00:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openjpeg.new/openjpeg.changes 2012-10-18
21:58:53.000000000 +0200
@@ -1,0 +2,33 @@
+Mon Oct 15 17:57:30 UTC 2012 - asterios.dra...@gmail.com
+
+- Update to version 1.5.1:
+ Security:
+ * Fixes: CVE-2012-3535
+ * Fixes: CVE-2012-3358
+ New Features:
+ * Use a new API scheme and solve the SOVERSIONing in OpenJPEG
+ * Allow better integration with multi-arch system
+ * Compile & Install Java bindings (CMake)
+ * Install required addXMLinJP2 (JPIP)
+ Misc:
+ * Fix linker error by resolving all symbols (eg. missing -lm)
+ * Fix some man page typos
+ * Huge amount of bug fixes. See CHANGES for details.
+- Removed the following patches (fixed upstream):
+ * heap_buffer_overflow_fix.patch
+ * heap_buffer_overflow_2_fix.patch
+ * heap_corruption_fix.patch
+ * openjpeg-1.5.0-cmake_Config.patch
+ * openjpeg-1.5.0-cmake_libdir.patch
+ * openjpeg-1.5.0-pkgconfig_includedir.patch
+- Replaced openjpeg-1.5.0-cmake_header_symlink.patch with a fix inside the spec
+ file.
+- Removed symlink from %{_includedir}/openjpeg-1.5 to %{_includedir}/openjpeg
+ (not needed).
+- Added the following patches (taken from Fedora):
+ * openjpeg-1.5.1-cmake_libdir.patch
+ Fix libopenjpeg.pc symlink
+ * openjpeg-1.5.1-soname.patch
+ Revert soname bump compared to 1.5.0 release
+
+-------------------------------------------------------------------
Old:
----
heap_buffer_overflow_2_fix.patch
heap_buffer_overflow_fix.patch
heap_corruption_fix.patch
openjpeg-1.5.0-cmake_Config.patch
openjpeg-1.5.0-cmake_header_symlink.patch
openjpeg-1.5.0-cmake_libdir.patch
openjpeg-1.5.0-pkgconfig_includedir.patch
openjpeg-1.5.0.tar.gz
New:
----
openjpeg-1.5.1-cmake_libdir.patch
openjpeg-1.5.1-soname.patch
openjpeg-1.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openjpeg.spec ++++++
--- /var/tmp/diff_new_pack.01DObV/_old 2012-10-18 21:58:54.000000000 +0200
+++ /var/tmp/diff_new_pack.01DObV/_new 2012-10-18 21:58:54.000000000 +0200
@@ -16,8 +16,10 @@
#
+%define so_ver 1
+
Name: openjpeg
-Version: 1.5.0
+Version: 1.5.1
Release: 0
Summary: An open-source JPEG 2000 codec
License: BSD-2-Clause
@@ -25,22 +27,14 @@
Url: http://www.openjpeg.org/
Source0: http://openjpeg.googlecode.com/files/%{name}-%{version}.tar.gz
Source1: baselibs.conf
-# PATCH-FIX-OPENSUSE openjpeg-1.5.0-cmake_Config.patch rh#669425
asterios.dra...@gmail.com -- Fix OpenJPEGConfig.cmake (taken from Fedora)
-Patch0: openjpeg-1.5.0-cmake_Config.patch
-# PATCH-FIX-OPENSUSE openjpeg-1.5.0-cmake_header_symlink.patch
asterios.dra...@gmail.com -- Fix cmake create_symlink usage for header file
(taken from Fedora)
-Patch1: openjpeg-1.5.0-cmake_header_symlink.patch
-# PATCH-FIX-OPENSUSE openjpeg-1.5.0-cmake_libdir.patch
asterios.dra...@gmail.com -- Fix installation directories (taken from Fedora)
-Patch2: openjpeg-1.5.0-cmake_libdir.patch
-# PATCH-FIX-UPSTREAM openjpeg-1.5.0-pkgconfig_includedir.patch
asterios.dra...@gmail.com -- Fix includedir in pkgconfig file (taken from
Fedora)
-Patch3: openjpeg-1.5.0-pkgconfig_includedir.patch
-# PATCH-FIX-UPSTREAM heap_corruption_fix.patch CVE-2009-5030 bnc#757260
asterios.dra...@gmail.com -- Fix heap corruption when processing certain Gray16
TIFF images (http://code.google.com/p/openjpeg/source/detail?r=1703)
-Patch4: heap_corruption_fix.patch
-# PATCH-FIX-UPSTREAM heap_buffer_overflow_fix.patch CVE-2012-3358 bnc#770649
asterios.dra...@gmail.com -- Fix heap-based buffer overflow when processing
JPEG2000 images (http://code.google.com/p/openjpeg/source/detail?r=1727)
-Patch5: heap_buffer_overflow_fix.patch
-# PATCH-FIX-UPSTREAM heap_buffer_overflow_2_fix.patch CVE-2012-3535 bnc#777445
asterios.dra...@gmail.com -- Fix heap-based buffer overflow when processing
JPEG2000 images (http://code.google.com/p/openjpeg/source/detail?r=1919)
-Patch6: heap_buffer_overflow_2_fix.patch
+# PATCH-FIX-UPSTREAM openjpeg-1.5.1-cmake_libdir.patch
asterios.dra...@gmail.com -- Fix libopenjpeg.pc symlink (taken from Fedora)
+Patch0: openjpeg-1.5.1-cmake_libdir.patch
+# PATCH-FIX-OPENSUSE openjpeg-1.5.1-soname.patch asterios.dra...@gmail.com --
Revert soname bump compared to 1.5.0 release (for now, remove patch in 2.0
release) (taken from Fedora)
+# See
"http://code.google.com/p/openjpeg/source/browse/tags/version.1.5.1/CMakeLists.txt";.
The change was introduced in 1.5.1 but soname can remain the same between
1.5.0 and 1.5.1 versions.
+Patch1: openjpeg-1.5.1-soname.patch
BuildRequires: cmake
BuildRequires: doxygen
+BuildRequires: fdupes
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
@@ -55,17 +49,17 @@
%package devel
Summary: Development files for the OpenJPEG library
Group: Development/Libraries/C and C++
-Requires: libopenjpeg1 = %{version}
+Requires: libopenjpeg%{so_ver} = %{version}
%description devel
This package contains header files and libraries needed for developing programs
using the OpenJPEG library.
-%package -n libopenjpeg1
+%package -n libopenjpeg%{so_ver}
Summary: An open-source JPEG 2000 codec
Group: System/Libraries
-%description -n libopenjpeg1
+%description -n libopenjpeg%{so_ver}
OpenJPEG library is an open-source JPEG 2000 codec written in C. It has been
developed in order to promote the use of JPEG 2000, the new still-image
compression standard from the Joint Photographic Experts Group (JPEG).
@@ -74,11 +68,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6
# Remove build time references so build-compare can do its work
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/g"
doc/Doxyfile.dox.cmake.in
@@ -90,32 +79,34 @@
export CXXFLAGS="%{optflags}"
cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DOPENJPEG_INSTALL_BIN_DIR=%{_bindir} \
- -DOPENJPEG_INSTALL_LIB_DIR=%{_libdir} \
- -DOPENJPEG_INSTALL_DATA_DIR=%{_datadir} \
- -DOPENJPEG_INSTALL_INCLUDE_DIR=%{_includedir} \
+ -DOPENJPEG_INSTALL_LIB_DIR:PATH=%{_lib} \
-DOPENJPEG_INSTALL_DOC_DIR=%{_docdir}/%{name} \
-DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_BUILD_TYPE=release \
-DBUILD_DOC=ON \
-DBUILD_THIRDPARTY=OFF ..
make %{?_smp_mflags} VERBOSE=1
cd ..
%install
-cd build
-%make_install
-cd ..
+%make_install -C build
+
+# Install devel docs manually in order to fix rpmlint warning "files-duplicate"
+cp -a build/doc/html/ %{buildroot}%{_docdir}/%{name}-devel/
# Compatibility symlink
-ln -s openjpeg-1.5 %{buildroot}%{_includedir}/openjpeg
+ln -s openjpeg-1.5/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
+
# Fix of Fedora build
%if 0%{?fedora_version}
-rm -f %{buildroot}%{_docdir}/openjpeg/{CHANGES,LICENSE}
+ rm -f %{buildroot}%{_docdir}/openjpeg/{CHANGES,LICENSE}
%endif
-%post -n libopenjpeg1 -p /sbin/ldconfig
+%fdupes -s %{buildroot}
+
+%post -n libopenjpeg%{so_ver} -p /sbin/ldconfig
-%postun -n libopenjpeg1 -p /sbin/ldconfig
+%postun -n libopenjpeg%{so_ver} -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
@@ -129,9 +120,8 @@
%files devel
%defattr(-,root,root,-)
-%doc build/doc/html/
+%doc %{_docdir}/%{name}-devel/
%{_includedir}/openjpeg-1.5/
-%{_includedir}/openjpeg/
%{_includedir}/openjpeg.h
%{_libdir}/pkgconfig/libopenjpeg.pc
%{_libdir}/pkgconfig/libopenjpeg1.pc
@@ -139,8 +129,9 @@
%{_libdir}/libopenjpeg.so
%{_mandir}/man3/libopenjpeg.3%{ext_man}
-%files -n libopenjpeg1
+%files -n libopenjpeg%{so_ver}
%defattr(-,root,root,-)
-%{_libdir}/libopenjpeg.so.1*
+%{_libdir}/libopenjpeg.so.%{version}
+%{_libdir}/libopenjpeg.so.%{so_ver}*
%changelog
++++++ openjpeg-1.5.0-cmake_libdir.patch -> openjpeg-1.5.1-cmake_libdir.patch
++++++
--- /work/SRC/openSUSE:Factory/openjpeg/openjpeg-1.5.0-cmake_libdir.patch
2012-02-29 14:09:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openjpeg.new/openjpeg-1.5.1-cmake_libdir.patch
2012-10-18 21:58:53.000000000 +0200
@@ -1,21 +1,12 @@
-diff -up openjpeg-1.5.0/CMakeLists.txt.pkgconfig openjpeg-1.5.0/CMakeLists.txt
---- openjpeg-1.5.0/CMakeLists.txt.pkgconfig 2012-02-07 04:49:55.000000000
-0600
-+++ openjpeg-1.5.0/CMakeLists.txt 2012-02-09 14:11:50.695269015 -0600
-@@ -107,7 +107,7 @@ IF(NOT OPENJPEG_INSTALL_DOC_DIR)
- ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
-
- IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-- SET(OPENJPEG_INSTALL_PACKAGE_DIR
"${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+ SET(OPENJPEG_INSTALL_PACKAGE_DIR
"${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
- ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-
- #-----------------------------------------------------------------------------
-@@ -146,7 +146,7 @@ IF(UNIX)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
-- ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
-+ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+diff -up openjpeg-1.5.1/CMakeLists.txt.cmake_libdir
openjpeg-1.5.1/CMakeLists.txt
+--- openjpeg-1.5.1/CMakeLists.txt.cmake_libdir 2012-09-13 02:58:39.000000000
-0500
++++ openjpeg-1.5.1/CMakeLists.txt 2012-09-13 08:55:59.493257595 -0500
+@@ -183,7 +183,7 @@ IF(UNIX)
+ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
\"libopenjpeg1.pc\"
- \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+-
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
++
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+ ENDIF(UNIX)
+
+ #-----------------------------------------------------------------------------
++++++ openjpeg-1.5.1-soname.patch ++++++
diff -up openjpeg-1.5.1/CMakeLists.txt.soname openjpeg-1.5.1/CMakeLists.txt
--- openjpeg-1.5.1/CMakeLists.txt.soname 2012-09-13 09:20:46.726091979
-0500
+++ openjpeg-1.5.1/CMakeLists.txt 2012-09-13 09:21:01.831906609 -0500
@@ -50,7 +50,7 @@ SET(PACKAGE_VERSION
# you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
# cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
if(NOT OPENJPEG_SOVERSION)
- SET(OPENJPEG_SOVERSION 5)
+ SET(OPENJPEG_SOVERSION 1)
endif(NOT OPENJPEG_SOVERSION)
SET(OPENJPEG_LIBRARY_PROPERTIES
VERSION
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
++++++ openjpeg-1.5.0.tar.gz -> openjpeg-1.5.1.tar.gz ++++++
++++ 40420 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
