diff --git a/ctest-depends.patch b/ctest-depends.patch deleted file mode 100644 index 4d2d8af..0000000 --- a/ctest-depends.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libjpeg-turbo-2.0.2/CMakeLists.txt -=================================================================== ---- libjpeg-turbo-2.0.2.orig/CMakeLists.txt 2019-03-13 12:44:05.376162889 +0100 -+++ libjpeg-turbo-2.0.2/CMakeLists.txt 2019-03-13 12:45:59.156696193 +0100 -@@ -1003,7 +1003,8 @@ foreach(libtype ${TEST_LIBTYPES}) - DEPENDS djpeg-${libtype}-rgb-islow) - - add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" -- testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) -+ testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2} -+ cjpeg-${libtype}-rgb-islow) - - if(NOT WITH_12BIT) - # CC: RGB->RGB565 SAMP: fullsize IDCT: islow ENT: huff diff --git a/libjpeg-turbo-2.0.4.tar.gz b/libjpeg-turbo-2.0.4.tar.gz deleted file mode 100644 index af0bfcc..0000000 --- a/libjpeg-turbo-2.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916a23406 -size 2161812 diff --git a/libjpeg-turbo-2.0.4.tar.gz.sig b/libjpeg-turbo-2.0.4.tar.gz.sig deleted file mode 100644 index 7a586d4..0000000 Binary files a/libjpeg-turbo-2.0.4.tar.gz.sig and /dev/null differ diff --git a/libjpeg-turbo-2.0.5.tar.gz b/libjpeg-turbo-2.0.5.tar.gz new file mode 100644 index 0000000..1dc4241 --- /dev/null +++ b/libjpeg-turbo-2.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16f8f6f2715b3a38ab562a84357c793dd56ae9899ce130563c72cd93d8357b5d +size 2162983 diff --git a/libjpeg-turbo-2.0.5.tar.gz.sig b/libjpeg-turbo-2.0.5.tar.gz.sig new file mode 100644 index 0000000..d51f7a8 Binary files /dev/null and b/libjpeg-turbo-2.0.5.tar.gz.sig differ diff --git a/libjpeg-turbo-CVE-2020-13790.patch b/libjpeg-turbo-CVE-2020-13790.patch deleted file mode 100644 index 6a1f7b6..0000000 --- a/libjpeg-turbo-CVE-2020-13790.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/rdppm.c -+++ b/rdppm.c -@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) - /* On 16-bit-int machines we have to be careful of maxval = 65535 */ - source->rescale = (JSAMPLE *) - (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, -- (size_t)(((long)maxval + 1L) * -+ (size_t)(((long)MAX(maxval, 255) + 1L) * - sizeof(JSAMPLE))); - half_maxval = maxval / 2; - for (val = 0; val <= (long)maxval; val++) { - diff --git a/libjpeg-turbo.changes b/libjpeg-turbo.changes index 98fea37..47aa4b9 100644 --- a/libjpeg-turbo.changes +++ b/libjpeg-turbo.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Aug 12 21:24:44 UTC 2020 - Matthias Eliasson + +- Update to version 2.0.5 + * Worked around issues in the MIPS DSPr2 SIMD extensions that caused failures + in the libjpeg-turbo regression tests. Specifically, the + jsimd_h2v1_downsample_dspr2() and jsimd_h2v2_downsample_dspr2() functions + in the MIPS DSPr2 SIMD extensions are now disabled until/unless they can be + fixed, and other functions that are incompatible with big endian MIPS CPUs + are disabled when building libjpeg-turbo for such CPUs. + * Fixed an oversight in the TJCompressor.compress(int) method in the + TurboJPEG Java API that caused an error ("java.lang.IllegalStateException: + No source image is associated with this instance") when attempting to use + that method to compress a YUV image. + * Fixed an issue (CVE-2020-13790) in the PPM reader that caused a buffer + overrun in cjpeg, TJBench, or the tjLoadImage() function if one of the + values in a binary PPM/PGM input file exceeded the maximum value defined in + the file's header and that maximum value was less than 255. libjpeg-turbo + 1.5.0 already included a similar fix for binary PPM/PGM files with maximum + values greater than 255. + * The TurboJPEG API library's global error handler, which is used in + functions such as tjBufSize() and tjLoadImage() that do not require a + TurboJPEG instance handle, is now thread-safe on platforms that support + thread-local storage. +- Fix source verification +- Drop patches fixed upstream: + * ctest-depends.patch + * libjpeg-turbo-CVE-2020-13790.patch +- Run spec-cleaner + * Remove package groups + * Use make macros + ------------------------------------------------------------------- Mon Jun 8 11:49:47 UTC 2020 - pgajdos@suse.com diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 3cd8473..387ae75 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -18,8 +18,7 @@ %define asan_build 0 %define debug_build 0 - -%define srcver 2.0.4 +%define srcver 2.0.5 %define major 8 %define minor 2 %define micro 2 @@ -33,14 +32,12 @@ Version: %{srcver} Release: 0 Summary: A SIMD-accelerated library for manipulating JPEG image files License: BSD-3-Clause -Group: Productivity/Graphics/Convertors -URL: https://github.com/libjpeg-turbo/libjpeg-turbo +URL: https://sourceforge.net/projects/libjpeg-turbo Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz -Source1: baselibs.conf +Source1: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz.sig +Source2: libjpeg-turbo.keyring +Source3: baselibs.conf Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch -Patch2: ctest-depends.patch -# CVE-2020-13790 [bsc#1172491], heap-based buffer over-read in get_rgb_row() in rdppm.c via a malformed PPM input file -Patch3: libjpeg-turbo-CVE-2020-13790.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -68,7 +65,6 @@ It also includes the following command line utilities: Version: %{libver} Release: 0 Summary: A SIMD-accelerated JPEG compression/decompression library -Group: System/Libraries %description -n libjpeg%{major} A library for manipulating JPEG images. It supports @@ -79,7 +75,6 @@ AltiVec, NEON, MIPS DSPR2, and Loongson MMI. Version: %{version} Release: 0 Summary: A SIMD-accelerated JPEG compression/decompression library -Group: System/Libraries %description -n libturbojpeg%{tmajor} A library for manipulating JPEG images. It supports @@ -90,7 +85,6 @@ AltiVec, NEON, MIPS DSPR2, and Loongson MMI. Version: %{libver} Release: 0 Summary: Development Tools for applications which will use the Libjpeg Library -Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Requires: libturbojpeg%{tmajor} = %{version} Conflicts: libjpeg-devel @@ -105,8 +99,6 @@ files using the libjpeg library. %prep %setup -q %patch1 -%patch2 -p1 -%patch3 -p1 %build MYLDFLAGS="-Wl,-z,relro,-z,now" @@ -130,7 +122,7 @@ MYCFLAGS="$MYCFLAGS -O0 -g" -DFLOATTEST=64bit \ %endif %{nil} -make %{?_smp_mflags} +%make_build %check %if %{asan_build} diff --git a/libjpeg62-turbo.changes b/libjpeg62-turbo.changes index 8676ab4..741aa3b 100644 --- a/libjpeg62-turbo.changes +++ b/libjpeg62-turbo.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Aug 12 21:24:44 UTC 2020 - Matthias Eliasson + +- Update to version 2.0.5 + * Worked around issues in the MIPS DSPr2 SIMD extensions that caused failures + in the libjpeg-turbo regression tests. Specifically, the + jsimd_h2v1_downsample_dspr2() and jsimd_h2v2_downsample_dspr2() functions + in the MIPS DSPr2 SIMD extensions are now disabled until/unless they can be + fixed, and other functions that are incompatible with big endian MIPS CPUs + are disabled when building libjpeg-turbo for such CPUs. + * Fixed an oversight in the TJCompressor.compress(int) method in the + TurboJPEG Java API that caused an error ("java.lang.IllegalStateException: + No source image is associated with this instance") when attempting to use + that method to compress a YUV image. + * Fixed an issue (CVE-2020-13790) in the PPM reader that caused a buffer + overrun in cjpeg, TJBench, or the tjLoadImage() function if one of the + values in a binary PPM/PGM input file exceeded the maximum value defined in + the file's header and that maximum value was less than 255. libjpeg-turbo + 1.5.0 already included a similar fix for binary PPM/PGM files with maximum + values greater than 255. + * The TurboJPEG API library's global error handler, which is used in + functions such as tjBufSize() and tjLoadImage() that do not require a + TurboJPEG instance handle, is now thread-safe on platforms that support + thread-local storage. +- Drop patches fixed upstream: + * ctest-depends.patch + * libjpeg-turbo-CVE-2020-13790.patch +- Run spec-cleaner + * Remove package groups + * Use make macros + ------------------------------------------------------------------- Mon Jun 8 11:49:47 UTC 2020 - pgajdos@suse.com diff --git a/libjpeg62-turbo.spec b/libjpeg62-turbo.spec index 871799e..aacd564 100644 --- a/libjpeg62-turbo.spec +++ b/libjpeg62-turbo.spec @@ -19,23 +19,19 @@ %define major 62 %define minor 3 %define micro 0 -%define srcver 2.0.4 +%define srcver 2.0.5 %define libver %{major}.%{minor}.%{micro} Name: libjpeg62-turbo Version: %{srcver} Release: 0 Summary: A SIMD-accelerated library for manipulating JPEG image files License: BSD-3-Clause -Group: Productivity/Graphics/Convertors -URL: http://sourceforge.net/projects/libjpeg-turbo +URL: https://sourceforge.net/projects/libjpeg-turbo Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz Source1: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz.sig Source2: libjpeg-turbo.keyring Source3: baselibs.conf Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch -Patch2: ctest-depends.patch -# CVE-2020-13790 [bsc#1172491], heap-based buffer over-read in get_rgb_row() in rdppm.c via a malformed PPM input file -Patch3: libjpeg-turbo-CVE-2020-13790.patch BuildRequires: cmake BuildRequires: gcc-c++ # needed for tests as we remove the lib here @@ -53,7 +49,6 @@ such as SSE/SSE2/AVX2, AltiVec, NEON, MIPS DSPR2, and Loongson MMI. Version: %{libver} Release: 0 Summary: A SIMD-accelerated JPEG compression/decompression library -Group: System/Libraries Obsoletes: libjpeg = 6.2.0 %description -n libjpeg%{major} @@ -65,7 +60,6 @@ AltiVec, NEON, MIPS DSPR2, and Loongson MMI. Version: %{libver} Release: 0 Summary: Development Tools for applications which will use the Libjpeg Library -Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Conflicts: libjpeg-devel Provides: libjpeg-devel = %{version} @@ -79,8 +73,6 @@ files using the libjpeg library. %prep %setup -q -n libjpeg-turbo-%{srcver} %patch1 -%patch2 -p1 -%patch3 -p1 %build export LDFLAGS="-Wl,-z,relro,-z,now" @@ -90,7 +82,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now" -DFLOATTEST=64bit \ %endif %{nil} -make %{?_smp_mflags} +%make_build %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}