mirror of
https://abf.rosa.ru/djam/libjpeg-turbo.git
synced 2025-02-23 19:02:55 +00:00
Automatic import for version 1.1.1-1.1
This commit is contained in:
parent
619d2d79b6
commit
c6843aebc9
2 changed files with 20 additions and 2 deletions
13
libjpeg-turbo-1.0.1-CVE-2012-2806.patch
Normal file
13
libjpeg-turbo-1.0.1-CVE-2012-2806.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
Index: jdmarker.c
|
||||||
|
===================================================================
|
||||||
|
--- jdmarker.c.orig
|
||||||
|
+++ jdmarker.c
|
||||||
|
@@ -276,7 +276,7 @@ get_sof (j_decompress_ptr cinfo, boolean
|
||||||
|
((j_common_ptr) cinfo, JPOOL_IMAGE,
|
||||||
|
cinfo->num_components * SIZEOF(jpeg_component_info));
|
||||||
|
|
||||||
|
- for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
|
||||||
|
+ for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components && ci < MAX_COMPS_IN_SCAN;
|
||||||
|
ci++, compptr++) {
|
||||||
|
compptr->component_index = ci;
|
||||||
|
INPUT_BYTE(cinfo, compptr->component_id, return FALSE);
|
|
@ -9,7 +9,8 @@
|
||||||
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
|
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
|
||||||
Name: libjpeg-turbo
|
Name: libjpeg-turbo
|
||||||
Version: 1.1.1
|
Version: 1.1.1
|
||||||
Release: 2
|
%define subrel 1
|
||||||
|
Release: %mkrel 1
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: wxWidgets Library License
|
License: wxWidgets Library License
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
|
@ -23,7 +24,7 @@ Source2: http://jpegclub.org/jpegexiforient.c
|
||||||
Source3: http://jpegclub.org/exifautotran.txt
|
Source3: http://jpegclub.org/exifautotran.txt
|
||||||
Patch0: jpeg-6b-c++fixes.patch
|
Patch0: jpeg-6b-c++fixes.patch
|
||||||
Patch1: libjpeg-turbo11-noinst_jpgtest.patch
|
Patch1: libjpeg-turbo11-noinst_jpgtest.patch
|
||||||
|
Patch2: libjpeg-turbo-1.0.1-CVE-2012-2806.patch
|
||||||
BuildRequires: libtool >= 1.4
|
BuildRequires: libtool >= 1.4
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
BuildRequires: nasm
|
BuildRequires: nasm
|
||||||
|
@ -117,6 +118,7 @@ have orientation markings in the EXIF data.
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p0 -b .CVE-2012-2806
|
||||||
|
|
||||||
cp %{SOURCE2} jpegexiforient.c
|
cp %{SOURCE2} jpegexiforient.c
|
||||||
cp %{SOURCE3} exifautotran
|
cp %{SOURCE3} exifautotran
|
||||||
|
@ -203,6 +205,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 01 2012 Oden Eriksson <oeriksson@mandriva.com> 1:1.1.1-1.1
|
||||||
|
- P2: security fix for CVE-2012-2806 (suse)
|
||||||
|
|
||||||
* Fri May 27 2011 Funda Wang <fwang@mandriva.org> 1:1.1.1-1
|
* Fri May 27 2011 Funda Wang <fwang@mandriva.org> 1:1.1.1-1
|
||||||
+ Revision: 679380
|
+ Revision: 679380
|
||||||
- update to new version 1.1.1
|
- update to new version 1.1.1
|
||||||
|
|
Loading…
Add table
Reference in a new issue