From a4eb0240f49d16d46c6cd0d1339da52aa8e07ec8f1fd033bf1558a1c5350d2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 15:13:53 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main openjpeg2 revision 2c2df381abf9b213dbca0864fea4203b --- openjpeg-2.5.0.tar.gz | 3 --- openjpeg-2.5.2.tar.gz | 3 +++ openjpeg2.changes | 42 ++++++++++++++++++++++++++++++++++++++++++ openjpeg2.spec | 22 ++++++++++++++-------- 4 files changed, 59 insertions(+), 11 deletions(-) delete mode 100644 openjpeg-2.5.0.tar.gz create mode 100644 openjpeg-2.5.2.tar.gz diff --git a/openjpeg-2.5.0.tar.gz b/openjpeg-2.5.0.tar.gz deleted file mode 100644 index e1c4754..0000000 --- a/openjpeg-2.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a -size 1867111 diff --git a/openjpeg-2.5.2.tar.gz b/openjpeg-2.5.2.tar.gz new file mode 100644 index 0000000..15647ab --- /dev/null +++ b/openjpeg-2.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a +size 1871948 diff --git a/openjpeg2.changes b/openjpeg2.changes index b0133e3..16d95b1 100644 --- a/openjpeg2.changes +++ b/openjpeg2.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Aug 16 16:59:14 UTC 2024 - Manfred Hollstein + +- Make version check for the work around reliable to not silently + match Factory/Tumbleweed. + +------------------------------------------------------------------- +Fri Aug 16 06:59:29 UTC 2024 - Manfred Hollstein + +- Work around a bug by cmake installing docs into the wrong + directory when building for openSUSE Leap 15.5 + +------------------------------------------------------------------- +Wed Feb 28 14:43:25 UTC 2024 - Michael Vetter + +- Update to 2.5.2: + * Make sure openjpeg.h includes opj_config.h #1514 + +------------------------------------------------------------------- +Tue Feb 27 06:16:30 UTC 2024 - Michael Vetter + +- Update to 2.5.1: + * CMake: drop support for cmake < 3.5 + * Several bugfixes, including #1509 for CVE-2021-3575 (bsc#1187048) + * Significant speed-up rate allocation by rate/distoratio ratio #1440 +- Set devel-doc subpackage to noarch +- Change cmake parameters (see c7bccf) + ------------------------------------------------------------------- Wed Mar 8 14:11:29 UTC 2023 - Martin Pluskal @@ -11,6 +39,9 @@ Fri Jun 3 09:59:48 UTC 2022 - Timothy Brown * Decoder: add support for high throughput (HTJ2K) decoding * Decoder: add support for partial bitstream decoding * Bug fixes (including security fixes) + * Fix CVE-2018-16376 (bsc#1106881) + * Fix CVE-2021-29338 (bsc#1184774) + * Fix CVE-2022-1122 (bsc#1197738) ------------------------------------------------------------------- Mon Jan 18 23:00:45 UTC 2021 - Dirk Müller @@ -21,6 +52,14 @@ Mon Jan 18 23:00:45 UTC 2021 - Dirk Müller * Encoder: single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements) #1253 * Encoder: support IMF profiles #1235 * Many bug fixes (including security fixes) + * Fix CVE-2020-27814 (bsc#1179594) + * Fix CVE-2020-27824 (bsc#1179821) + * Fix CVE-2020-27841 (bsc#1180042) + * Fix CVE-2020-27842 (bsc#1180043) + * Fix CVE-2020-27843 (bsc#1180044) + * Fix CVE-2020-27845 (bsc#1180046) + * Fix CVE-2020-15389 (bsc#1173578) + * Fix CVE-2020-27823 (bsc#1180457) - drop 024b8407392cb0b8.patch, 05f9b91e60debda0.patch, 21399f6b7d318fcd.patch, 3aef207f90e937d4.patch, @@ -51,6 +90,9 @@ Tue Apr 02 10:41:57 UTC 2019 - mvetter@suse.com * Fix CVE-2018-14423 (bsc#1102016) * Fix CVE-2018-7648 (bsc#1083901) * Fix CVE-2018-5727 (bsc#1076314) + * Fix CVE-2018-20846 (bsc#1140205) + * Fix CVE-2018-21010 (bsc#1149789) + * Fix CVE-2018-20845 (bsc#1140130) * For full list see ChangeLog file - Remove install-fix.patch: upstreamed diff --git a/openjpeg2.spec b/openjpeg2.spec index 9f6b2bc..ea0c29b 100644 --- a/openjpeg2.spec +++ b/openjpeg2.spec @@ -1,7 +1,7 @@ # # spec file for package openjpeg2 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define library_name libopenjp2-7 %define base_version 2.5 Name: openjpeg2 -Version: 2.5.0 +Version: 2.5.2 Release: 0 Summary: Opensource JPEG 2000 Codec Implementation License: BSD-2-Clause @@ -27,7 +27,7 @@ Group: Productivity/Graphics/Other URL: https://www.openjpeg.org/ Source0: https://github.com/uclouvain/openjpeg/archive/v%{version}.tar.gz#/openjpeg-%{version}.tar.gz Source1: baselibs.conf -BuildRequires: cmake > 2.8.2 +BuildRequires: cmake > 3.5 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -79,6 +79,7 @@ Summary: API documentation for %{name} Group: Documentation/HTML Recommends: %{library_name} = %{version} Recommends: %{name} = %{version} +BuildArch: noarch %description devel-doc The OpenJPEG library is an open-source JPEG 2000 codec written in C language. @@ -106,14 +107,18 @@ done -DBUILD_TESTING=OFF \ -DBUILD_DOC=ON \ -DBUILD_THIRDPARTY=OFF \ - -DOPENJPEG_INSTALL_LIB_DIR=%{_lib} \ - -DOPENJPEG_INSTALL_DOC_DIR=share/doc/packages/%{name}-devel-doc + -DCMAKE_INSTALL_LIB_DIR=%{_lib} \ + -DCMAKE_INSTALL_DOC_DIR=share/doc/packages/%{name}-devel-doc %cmake_build all doc %install %cmake_install -rm %{buildroot}%{_defaultdocdir}/%{name}-devel-doc/LICENSE +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 0 && 0%{?sle_version} <= 150500 +# Work around a bug by cmake installing docs into the wrong directory: +mkdir -p %{buildroot}%{_defaultdocdir} +mv %{buildroot}/usr/share/doc/openjpeg %{buildroot}%{_defaultdocdir}/%{name} +%endif %fdupes %{buildroot}%{_defaultdocdir} %post -n %{library_name} -p /sbin/ldconfig @@ -131,12 +136,13 @@ rm %{buildroot}%{_defaultdocdir}/%{name}-devel-doc/LICENSE %{_includedir}/openjpeg-%{base_version}/ %{_libdir}/libopenjp2.so %{_libdir}/pkgconfig/libopenjp2.pc -%{_libdir}/openjpeg-%{base_version}/ +%{_libdir}/cmake/openjpeg-2.5/ %{_mandir}/man3/libopenjp2.3%{?ext_man} %files devel-doc %license LICENSE %doc AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md -%doc %{_defaultdocdir}/%{name}-devel-doc/html +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/html %changelog