Hello community,
here is the log from the commit of package openjpeg2 for openSUSE:Factory
checked in at 2017-11-03 16:31:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openjpeg2 (Old)
and /work/SRC/openSUSE:Factory/.openjpeg2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjpeg2"
Fri Nov 3 16:31:04 2017 rev:11 rq:536483 version:2.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openjpeg2/openjpeg2.changes 2017-09-15
21:08:30.251302032 +0200
+++ /work/SRC/openSUSE:Factory/.openjpeg2.new/openjpeg2.changes 2017-11-03
16:31:35.169500788 +0100
@@ -1,0 +2,17 @@
+Mon Oct 23 15:04:03 UTC 2017 - idon...@suse.com
+
+- Update to version 2.3.0
+- Drop upstream patches:
+ * 0018-tcd_get_decoded_tile_size.patch
+ * openjpeg2-CVE-2016-10504.patch
+ * openjpeg2-CVE-2016-10505.patch
+ * openjpeg2-CVE-2016-10506.patch
+ * openjpeg2-CVE-2017-12982.patch
+ * openjpeg2-CVE-2017-14039.patch
+ * openjpeg2-CVE-2017-14040.patch
+ * openjpeg2-CVE-2017-14041.patch
+ * openjpeg2-CVE-2017-14151.patch
+ * openjpeg2-CVE-2017-14152.patch
+- Add install-fix.patch from upstream to fix library installation.
+
+-------------------------------------------------------------------
Old:
----
0018-tcd_get_decoded_tile_size.patch
openjpeg-2.1.2.tar.gz
openjpeg2-CVE-2016-10504.patch
openjpeg2-CVE-2016-10505.patch
openjpeg2-CVE-2016-10506.patch
openjpeg2-CVE-2017-12982.patch
openjpeg2-CVE-2017-14039.patch
openjpeg2-CVE-2017-14040.patch
openjpeg2-CVE-2017-14041.patch
openjpeg2-CVE-2017-14151.patch
openjpeg2-CVE-2017-14152.patch
New:
----
install-fix.patch
openjpeg-2.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openjpeg2.spec ++++++
--- /var/tmp/diff_new_pack.tEHBvA/_old 2017-11-03 16:31:37.113430035 +0100
+++ /var/tmp/diff_new_pack.tEHBvA/_new 2017-11-03 16:31:37.117429890 +0100
@@ -17,9 +17,10 @@
%define library_name libopenjp2-7
-%define base_version 2.1
+%define base_version 2.3
+
Name: openjpeg2
-Version: %{base_version}.2
+Version: 2.3.0
Release: 0
Summary: Opensource JPEG 2000 Codec Implementation
License: BSD-2-Clause
@@ -27,37 +28,17 @@
Url: http://www.openjpeg.org/
Source0:
https://github.com/uclouvain/openjpeg/archive/v%{version}.tar.gz#/openjpeg-%{version}.tar.gz
Source1: baselibs.conf
+Patch1: install-fix.patch
BuildRequires: cmake > 2.8.2
BuildRequires: doxygen
BuildRequires: fdupes
+BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libtiff-4)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# CVE-2016-5152 is
-#
https://pdfium.googlesource.com/pdfium.git/+/d8cc503575463ff3d81b22dad292665f2c88911e/third_party/libopenjpeg20/0018-tcd_get_decoded_tile_size.patch
-Patch1: 0018-tcd_get_decoded_tile_size.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2016-10504.patch bsc#1056351 h...@suse.com
-Patch2: openjpeg2-CVE-2016-10504.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2016-10505.patch bsc#1056363 h...@suse.com
-Patch3: openjpeg2-CVE-2016-10505.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2016-10506.patch bsc#1056396 h...@suse.com
-Patch4: openjpeg2-CVE-2016-10506.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2017-12982.patch bsc#1054696 h...@suse.com
-Patch5: openjpeg2-CVE-2017-12982.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2017-14039.patch bsc#1056622 bsc#1057511
h...@suse.com
-Patch6: openjpeg2-CVE-2017-14039.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2017-14040.patch bsc#1056621 h...@suse.com
-Patch7: openjpeg2-CVE-2017-14040.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2017-14041.patch bsc#1056562 h...@suse.com
-Patch8: openjpeg2-CVE-2017-14041.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2017-14151.patch bsc#1057336 h...@suse.com
-Patch9: openjpeg2-CVE-2017-14151.patch
-# PATCH-FIX-UPSTREAM openjpeg2-CVE-2017-14152.patch bsc#1057335 h...@suse.com
-Patch10: openjpeg2-CVE-2017-14152.patch
-
%description
The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
It has been developed in order to promote the use of JPEG 2000, the new
@@ -94,33 +75,26 @@
%setup -q -n openjpeg-%{version}
# do not embed timestamps into html documentation
sed -i 's|^HTML_TIMESTAMP[ =].*$|HTML_TIMESTAMP = NO|'
doc/Doxyfile.dox.cmake.in
+%patch1 -p1
+
# ensure no bundled libraries are used
for d in thirdparty/*; do
[ -d "$d" ] && rm -rf "$d"
done
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
%build
%cmake \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DBUILD_CODEC:BOOL=ON \
- -DBUILD_JPIP:BOOL=OFF \
- -DBUILD_JPWL:BOOL=OFF \
- -DBUILD_MJ2:BOOL=OFF \
- -DBUILD_TESTING:BOOL=OFF \
- -DBUILD_DOC:BOOL=ON \
- -DBUILD_THIRDPARTY:BOOL=OFF \
- -DOPENJPEG_INSTALL_LIB_DIR:PATH="%{_lib}"
-make %{?_smp_mflags} all doc
+ -DBUILD_SHARED_LIBS=ON \
+ -DBUILD_CODEC=ON \
+ -DBUILD_JPIP=OFF \
+ -DBUILD_JPWL=OFF \
+ -DBUILD_MJ2=OFF \
+ -DBUILD_TESTING=OFF \
+ -DBUILD_DOC=ON \
+ -DBUILD_THIRDPARTY=OFF \
+ -DOPENJPEG_INSTALL_LIB_DIR=%{_lib}
+
+make %{?_smp_mflags} VERBOSE=1 all doc
cat << END > libopenjp2.pc
@@ -136,6 +110,7 @@
%install
%cmake_install
+
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
install -m 644 build/libopenjp2.pc %{buildroot}%{_libdir}/pkgconfig/
rm -rf %{buildroot}%{_datadir}/doc
++++++ install-fix.patch ++++++
>From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.roua...@spatialys.com>
Date: Mon, 9 Oct 2017 11:40:43 +0200
Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
static-only build lacks the installation target for the library (#1019, fixes
regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
---
src/lib/openjp2/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 0b4520384..f8990ccf0 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -99,6 +99,7 @@ else()
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
else()
add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
endif()
endif()
++++++ openjpeg-2.1.2.tar.gz -> openjpeg-2.3.0.tar.gz ++++++
++++ 231989 lines of diff (skipped)
