Skip to content

Commit

Permalink
openjpeg: Autospec creation for update from version 2.3.1 to version …
Browse files Browse the repository at this point in the history
…2.4.0

Antonin Descampe (2):
      Update version number for automatic abi check
      Comment back opj_previous_version in abi_check.sh

Eduardo Barretto (1):
      jp3d/jpwl/mj2/jpip: Fix resource leaks (#1226)

Even Rouault (63):
      j2k.c: use correct naming convention for total_data_size variable
      compression: emit POC marker when only one single POC is requested (fixes #1191)
      opj_j2k_check_poc_val(): fix starting index for checking layer dimension
      opj_j2k_check_poc_val(): prevent potential write outside of allocated array
      Add test for previous commit
      Fix POC in multi-tile scenarios: avoid almost endless loop when a tile has no POC settings
      Add test for previous commit
      Change opj_j2k_check_poc_val() to take into account tile number
      test_decode_area.c: assign tdy to *ptileh instead of *ptilew (fixes #1195)
      opj_decompress_fuzzer: remove checks regarding input dimensions (fixes #1079)
      opj_tcd_mct_decode()/opj_mct_decode()/opj_mct_encode_real()/opj_mct_decode_real(): proper deal with a number of samples larger than 4 billion (refs #1151)
      pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18979
      abi-check.sh: fix false postive ABI error, and display output error log
      opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228)
      opj_tcd_init_tile(): avoid integer overflow
      tests: add alternate checksums for libtiff 4.1
      openjpeg.h: fix values of OPJ_PROFILE_IMF_ constants
      Implement writing of IMF profiles
      opj_compress: improve help message regarding new IMF switch
      opj_decompress: add sanity checks to avoid segfault in case of decoding error
      Rename mis-named function opj_tcd_get_encoded_tile_size() to opj_tcd_get_encoder_input_buffer_size()
      Fix warnings about signed/unsigned casts in pi.c
      struct opj_j2k: remove unused fields, and add some documentation
      Add support for generation of PLT markers in encoder
      Add multithreading support in the T1 (entropy phase) encoder
      Add multithreaded support in the DWT encoder.
      dwt.c: change sign of constants to match standard and compensate (no functional change)
      Encoder: use floating-point operations for irreversible transformation
      tcd.c: add comment
      compare_images.c: code reformatting
      Testing: revise testing of lossy encoding by comparing PEAK and MSE with original image
      opj_mct_encode_real(): add SSE optimization
      opj_j2k_setup_encoder(): add validation of tile width and height to avoid potential division by zero
      opj_dwt_encode_1_real(): avoid many bound comparisons, similarly to decoding side
      Irreversible decoding: align code more closely to the standard by avoid messing up with stepsize (no functional change)
      Irreversible compression/decompression DWT: use 1/K constant as per standard
      Irreversible decoding: partially revert previous commit, to fix failures in test suite
      bench_dwt.c: add a -I switch to test irreversible FWDT/IDWT
      Speed-up 9x7 IDWD by ~20%
      Remove useless + 5U margin in opj_dwt_decode_tile_97()
      Speed-up 9x7 IDWD by ~30% with OPJ_NUM_THREADS=2
      Forward DWT: small code refactoring to allow future improvements for the horizontal pass
      Forward DWT 5x3: performance improvements in horizontal pass, and modest in vertical pass
      dwt.c: remove unused typedef
      Forward DWT: small code refactoring to allow future improvements for the vertical pass
      Forward DWT 5-3: major speed up by vectorizing vertical pass
      Forward DWT 9-7: major speed up by vectorizing vertical pass
      T1 encoder: speed-up by aggressive inlining and more cache friendly data organization
      opj_decompress: fix double-free on input directory with mix of valid and invalid images (CVE-2020-15389)
      Encoder: avoid uint32 overflow when allocating memory for codestream buffer (fixes #1243)
      Fix typo in internal function name
      Encoder: grow buffer size in opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in opj_mqc_flush (fixes #1283)
      Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283)
      Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
      pngtoimage(): fix wrong computation of x1,y1 if -d option is used, that would result in a heap buffer overflow (fixes #1284)
      Encoder: avoid global buffer overflow on irreversible conversion when too many decomposition levels are specified (fixes #1286)
      opj_t2_encode_packet(): avoid out of bound access of #1294, but likely not the proper fix
      opj_j2k_setup_encoder(): validate POC compno0 (fixes #1293)
      opj_t2_encode_packet(): avoid out of bound access of #1297, but likely not the proper fix
      pi.c: avoid out of bounds access with POC (refs uclouvain/openjpeg#1293 (comment))
      opj_j2k_write_sod(): avoid potential heap buffer overflow (fixes #1299) (probably master only)
      pi.c: avoid out of bounds access with POC (fixes #1302)
      Prepare for v2.4.0

Jamaika1 (1):
      Change defined WIN32

Lemures Lemniscati (1):
      Set ${OPENJPEG_INSTALL_DOC_DIR} to DESTINATION of HTMLs

Matthew Sharp (1):
      Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)

Max Moroz (1):
      tests/fuzzers: link fuzz binaries using $LIB_FUZZING_ENGINE. (#1230)

Pei JIA (1):
      Bump Java compatibility from 1.5 to 1.6 (#1263)

Robert Ancell (1):
      JPWL: convert: Fix buffer overflow reading an image file less than four characters (#1196)

Sebastian Rasmussen (6):
      openjp2/j2k: Report error if all wanted components are not decoded.
      openjp2/j2k: Make comments adhere to specification.
      openjp2/j2k: Validate all SGcod/SPcod/SPcoc parameter values.
      openjp2: Error out if failing to create Tier 1 handle.
      openjp2: Plug memory leak when setting data as TLS fails.
      openjp2: Plug image leak when failing to allocate codestream index.

Tim Gates (1):
      docs: fix simple typo, producted -> produced

Young Xiao (2):
      convertbmp: detect invalid file dimensions early
      bmp_read_rle4_data(): avoid potential infinite loop

szukw000 (2):
      color_apply_icc_profile: add checks on the number of components (#1236)
      Testing for invalid values of width, height, numcomps (#1254)

yuan (3):
      Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283)
      Free p_tcd_marker_info to avoid memory leak
      Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283)
  • Loading branch information
phmccarty committed Dec 30, 2020
1 parent 2ba66ad commit c0ec516
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 185 deletions.
152 changes: 0 additions & 152 deletions CVE-2019-12973.patch

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := openjpeg
URL = https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz
URL = https://github.com/uclouvain/openjpeg/archive/v2.4.0/openjpeg-2.4.0.tar.gz
ARCHIVES =

include ../common/Makefile.common
44 changes: 21 additions & 23 deletions openjpeg.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Generated by: autospec.py
#
Name : openjpeg
Version : 2.3.1
Release : 4
URL : https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz
Source0 : https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz
Version : 2.4.0
Release : 5
URL : https://github.com/uclouvain/openjpeg/archive/v2.4.0/openjpeg-2.4.0.tar.gz
Source0 : https://github.com/uclouvain/openjpeg/archive/v2.4.0/openjpeg-2.4.0.tar.gz
Summary : No detailed summary available
Group : Development/Tools
License : BSD-2-Clause Libpng MIT
Expand All @@ -22,7 +22,6 @@ BuildRequires : openjdk11
BuildRequires : openjdk11-dev
BuildRequires : tiff-dev
BuildRequires : zlib-dev
Patch1: CVE-2019-12973.patch

%description
========================================================================
Expand Down Expand Up @@ -67,16 +66,15 @@ license components for the openjpeg package.


%prep
%setup -q -n openjpeg-2.3.1
cd %{_builddir}/openjpeg-2.3.1
%patch1 -p1
%setup -q -n openjpeg-2.4.0
cd %{_builddir}/openjpeg-2.4.0

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1588113323
export SOURCE_DATE_EPOCH=1609293697
mkdir -p clr-build
pushd clr-build
export GCC_IGNORE_WERROR=1
Expand All @@ -88,18 +86,18 @@ export FCFLAGS="$FFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -
export FFLAGS="$FFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -mzero-caller-saved-regs=used "
export CXXFLAGS="$CXXFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -mzero-caller-saved-regs=used "
%cmake ..
make %{?_smp_mflags} VERBOSE=1
make %{?_smp_mflags}
popd

%install
export SOURCE_DATE_EPOCH=1588113323
export SOURCE_DATE_EPOCH=1609293697
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/openjpeg
cp %{_builddir}/openjpeg-2.3.1/LICENSE %{buildroot}/usr/share/package-licenses/openjpeg/a1a529b822da257f69972ea711df38489e9d4251
cp %{_builddir}/openjpeg-2.3.1/src/bin/wx/OPJViewer/source/license.txt %{buildroot}/usr/share/package-licenses/openjpeg/28399384e8bacfe952bb12c4c52a9ba009a9c18d
cp %{_builddir}/openjpeg-2.3.1/thirdparty/astyle/LICENSE.md %{buildroot}/usr/share/package-licenses/openjpeg/3ad29cc31a206b0662eb91917964b82f11b3df16
cp %{_builddir}/openjpeg-2.3.1/thirdparty/liblcms2/COPYING %{buildroot}/usr/share/package-licenses/openjpeg/f595de201a37b00737678b96b4c4a10d5bc5f6d9
cp %{_builddir}/openjpeg-2.3.1/thirdparty/libpng/LICENSE %{buildroot}/usr/share/package-licenses/openjpeg/783722cebfdeba6fa3b211d6fb18d68cc647feb4
cp %{_builddir}/openjpeg-2.4.0/LICENSE %{buildroot}/usr/share/package-licenses/openjpeg/a1a529b822da257f69972ea711df38489e9d4251
cp %{_builddir}/openjpeg-2.4.0/src/bin/wx/OPJViewer/source/license.txt %{buildroot}/usr/share/package-licenses/openjpeg/28399384e8bacfe952bb12c4c52a9ba009a9c18d
cp %{_builddir}/openjpeg-2.4.0/thirdparty/astyle/LICENSE.md %{buildroot}/usr/share/package-licenses/openjpeg/3ad29cc31a206b0662eb91917964b82f11b3df16
cp %{_builddir}/openjpeg-2.4.0/thirdparty/liblcms2/COPYING %{buildroot}/usr/share/package-licenses/openjpeg/f595de201a37b00737678b96b4c4a10d5bc5f6d9
cp %{_builddir}/openjpeg-2.4.0/thirdparty/libpng/LICENSE %{buildroot}/usr/share/package-licenses/openjpeg/783722cebfdeba6fa3b211d6fb18d68cc647feb4
pushd clr-build
%make_install
popd
Expand All @@ -110,9 +108,9 @@ mv %{buildroot}/usr/lib/libopenjp2.so* %{buildroot}/usr/lib64/

%files
%defattr(-,root,root,-)
/usr/lib/openjpeg-2.3/OpenJPEGConfig.cmake
/usr/lib/openjpeg-2.3/OpenJPEGTargets-relwithdebinfo.cmake
/usr/lib/openjpeg-2.3/OpenJPEGTargets.cmake
/usr/lib/openjpeg-2.4/OpenJPEGConfig.cmake
/usr/lib/openjpeg-2.4/OpenJPEGTargets-relwithdebinfo.cmake
/usr/lib/openjpeg-2.4/OpenJPEGTargets.cmake

%files bin
%defattr(-,root,root,-)
Expand All @@ -122,15 +120,15 @@ mv %{buildroot}/usr/lib/libopenjp2.so* %{buildroot}/usr/lib64/

%files dev
%defattr(-,root,root,-)
/usr/include/openjpeg-2.3/openjpeg.h
/usr/include/openjpeg-2.3/opj_config.h
/usr/include/openjpeg-2.3/opj_stdint.h
/usr/include/openjpeg-2.4/openjpeg.h
/usr/include/openjpeg-2.4/opj_config.h
/usr/include/openjpeg-2.4/opj_stdint.h
/usr/lib64/libopenjp2.so
/usr/lib64/pkgconfig/libopenjp2.pc

%files lib
%defattr(-,root,root,-)
/usr/lib64/libopenjp2.so.2.3.1
/usr/lib64/libopenjp2.so.2.4.0
/usr/lib64/libopenjp2.so.7

%files license
Expand Down
2 changes: 1 addition & 1 deletion options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = openjpeg
url = https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz
url = https://github.com/uclouvain/openjpeg/archive/v2.4.0/openjpeg-2.4.0.tar.gz
archives =
giturl = https://github.com/uclouvain/openjpeg.git
domain =
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4
5
1 change: 0 additions & 1 deletion series

This file was deleted.

12 changes: 8 additions & 4 deletions symbols
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@ libopenjp2.so.7:opj_dwt_decode
libopenjp2.so.7:opj_dwt_decode_real
libopenjp2.so.7:opj_dwt_encode
libopenjp2.so.7:opj_dwt_encode_real
libopenjp2.so.7:opj_dwt_getgain
libopenjp2.so.7:opj_dwt_getgain_real
libopenjp2.so.7:opj_dwt_getnorm
libopenjp2.so.7:opj_dwt_getnorm_real
libopenjp2.so.7:opj_encode
libopenjp2.so.7:opj_encoder_set_extra_options
libopenjp2.so.7:opj_end_compress
libopenjp2.so.7:opj_end_decompress
libopenjp2.so.7:opj_event_msg
libopenjp2.so.7:opj_free
libopenjp2.so.7:opj_get_cstr_index
libopenjp2.so.7:opj_get_cstr_info
libopenjp2.so.7:opj_get_decoded_tile
libopenjp2.so.7:opj_get_encoding_packet_count
libopenjp2.so.7:opj_get_num_cpus
libopenjp2.so.7:opj_has_thread_support
libopenjp2.so.7:opj_image_comp_header_update
Expand All @@ -72,6 +72,7 @@ libopenjp2.so.7:opj_j2k_decode
libopenjp2.so.7:opj_j2k_decode_tile
libopenjp2.so.7:opj_j2k_destroy
libopenjp2.so.7:opj_j2k_encode
libopenjp2.so.7:opj_j2k_encoder_set_extra_options
libopenjp2.so.7:opj_j2k_end_compress
libopenjp2.so.7:opj_j2k_end_decompress
libopenjp2.so.7:opj_j2k_get_tile
Expand All @@ -91,6 +92,7 @@ libopenjp2.so.7:opj_jp2_decode
libopenjp2.so.7:opj_jp2_decode_tile
libopenjp2.so.7:opj_jp2_destroy
libopenjp2.so.7:opj_jp2_encode
libopenjp2.so.7:opj_jp2_encoder_set_extra_options
libopenjp2.so.7:opj_jp2_end_compress
libopenjp2.so.7:opj_jp2_end_decompress
libopenjp2.so.7:opj_jp2_get_tile
Expand Down Expand Up @@ -120,7 +122,7 @@ libopenjp2.so.7:opj_mqc_bypass_enc
libopenjp2.so.7:opj_mqc_bypass_flush_enc
libopenjp2.so.7:opj_mqc_bypass_get_extra_bytes
libopenjp2.so.7:opj_mqc_bypass_init_enc
libopenjp2.so.7:opj_mqc_encode
libopenjp2.so.7:opj_mqc_byteout
libopenjp2.so.7:opj_mqc_erterm_enc
libopenjp2.so.7:opj_mqc_flush
libopenjp2.so.7:opj_mqc_init_dec
Expand Down Expand Up @@ -216,14 +218,16 @@ libopenjp2.so.7:opj_tcd_decode_tile
libopenjp2.so.7:opj_tcd_destroy
libopenjp2.so.7:opj_tcd_encode_tile
libopenjp2.so.7:opj_tcd_get_decoded_tile_size
libopenjp2.so.7:opj_tcd_get_encoded_tile_size
libopenjp2.so.7:opj_tcd_get_encoder_input_buffer_size
libopenjp2.so.7:opj_tcd_init
libopenjp2.so.7:opj_tcd_init_decode_tile
libopenjp2.so.7:opj_tcd_init_encode_tile
libopenjp2.so.7:opj_tcd_is_band_empty
libopenjp2.so.7:opj_tcd_is_subband_area_of_interest
libopenjp2.so.7:opj_tcd_makelayer
libopenjp2.so.7:opj_tcd_makelayer_fixed
libopenjp2.so.7:opj_tcd_marker_info_create
libopenjp2.so.7:opj_tcd_marker_info_destroy
libopenjp2.so.7:opj_tcd_rateallocate
libopenjp2.so.7:opj_tcd_rateallocate_fixed
libopenjp2.so.7:opj_tcd_reinit_segment
Expand Down
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
38321fa9730252039ad0b7f247a160a8164f5871/v2.3.1.tar.gz
bbbf4dc4d9ce95286843cd39ac2febd3fd516c9d/openjpeg-2.4.0.tar.gz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.4.0
5 changes: 5 additions & 0 deletions whatrequires
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
# This file contains recursive sources that require this package
darktable
krita
opencv
poppler
webkitgtk

0 comments on commit c0ec516

Please sign in to comment.