Browse code
Upgrade cairo to 1.16.0
Change-Id: Ie15525fd896ecd59e9f5e932d21f152dbbc40c06
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6876
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
michellew-vmware authored on 2019/03/15 07:17:56Showing 1 changed files
| ... | ... |
@@ -1,26 +1,25 @@ |
| 1 |
-Summary: A 2D graphics library. |
|
| 2 |
-Name: cairo |
|
| 3 |
-Version: 1.14.8 |
|
| 4 |
-Release: 3%{?dist}
|
|
| 5 |
-License: LGPLv2 or MPLv1.1 |
|
| 6 |
-URL: http://cairographics.org |
|
| 7 |
-Group: System Environment/Libraries |
|
| 8 |
-Vendor: VMware, Inc. |
|
| 9 |
-Distribution: Photon |
|
| 10 |
-Source0: http://cairographics.org/releases/%{name}-%{version}.tar.xz
|
|
| 11 |
-%define sha1 cairo=c6f7b99986f93c9df78653c3e6a3b5043f65145e |
|
| 12 |
-Patch0: CVE-2017-9814.patch |
|
| 13 |
-BuildRequires: pkg-config |
|
| 14 |
-BuildRequires: libpng-devel |
|
| 15 |
-BuildRequires: libxml2-devel |
|
| 16 |
-BuildRequires: pixman-devel |
|
| 17 |
-BuildRequires: freetype2-devel |
|
| 18 |
-BuildRequires: fontconfig-devel |
|
| 19 |
-BuildRequires: glib-devel |
|
| 20 |
-Requires: pixman |
|
| 21 |
-Requires: glib |
|
| 22 |
-Requires: libpng |
|
| 23 |
-Requires: expat |
|
| 1 |
+Summary: A 2D graphics library. |
|
| 2 |
+Name: cairo |
|
| 3 |
+Version: 1.16.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 |
+License: LGPLv2 or MPLv1.1 |
|
| 6 |
+URL: http://cairographics.org |
|
| 7 |
+Group: System Environment/Libraries |
|
| 8 |
+Vendor: VMware, Inc. |
|
| 9 |
+Distribution: Photon |
|
| 10 |
+Source0: http://cairographics.org/releases/%{name}-%{version}.tar.xz
|
|
| 11 |
+%define sha1 cairo=00e81842ae5e81bb0343108884eb5205be0eac14 |
|
| 12 |
+BuildRequires: pkg-config |
|
| 13 |
+BuildRequires: libpng-devel |
|
| 14 |
+BuildRequires: libxml2-devel |
|
| 15 |
+BuildRequires: pixman-devel |
|
| 16 |
+BuildRequires: freetype2-devel |
|
| 17 |
+BuildRequires: fontconfig-devel |
|
| 18 |
+BuildRequires: glib-devel |
|
| 19 |
+Requires: pixman |
|
| 20 |
+Requires: glib |
|
| 21 |
+Requires: libpng |
|
| 22 |
+Requires: expat |
|
| 24 | 23 |
|
| 25 | 24 |
%description |
| 26 | 25 |
Cairo is a 2D graphics library with support for multiple output devices. |
| ... | ... |
@@ -36,15 +35,14 @@ It contains the libraries and header files to create applications |
| 36 | 36 |
|
| 37 | 37 |
%prep |
| 38 | 38 |
%setup -q |
| 39 |
-%patch0 -p1 |
|
| 40 | 39 |
%build |
| 41 |
-./configure \ |
|
| 42 |
- --prefix=%{_prefix} \
|
|
| 43 |
- --enable-xlib=no \ |
|
| 44 |
- --enable-xlib-render=no \ |
|
| 45 |
- --enable-win32=no \ |
|
| 46 |
- CFLAGS="-O3 -fPIC" \ |
|
| 47 |
- --disable-static |
|
| 40 |
+%configure \ |
|
| 41 |
+ --prefix=%{_prefix} \
|
|
| 42 |
+ --enable-xlib=no \ |
|
| 43 |
+ --enable-xlib-render=no \ |
|
| 44 |
+ --enable-win32=no \ |
|
| 45 |
+ CFLAGS="-O3 -fPIC" \ |
|
| 46 |
+ --disable-static |
|
| 48 | 47 |
make %{?_smp_mflags}
|
| 49 | 48 |
|
| 50 | 49 |
%install |
| ... | ... |
@@ -72,6 +70,9 @@ find %{buildroot} -name '*.la' -delete
|
| 72 | 72 |
%{_libdir}/pkgconfig/*.pc
|
| 73 | 73 |
|
| 74 | 74 |
%changelog |
| 75 |
+* Thu Mar 14 2019 Michelle Wang <michellew@vmware.com> 1.16.0-1 |
|
| 76 |
+- Upgrade cairo to 1.16.0 for CVE-2018-18064 |
|
| 77 |
+- CVE-2018-18064 is for version up to (including) 1.15.14 |
|
| 75 | 78 |
* Tue Oct 10 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.14.8-3 |
| 76 | 79 |
- Fix CVE-2017-9814 |
| 77 | 80 |
* Tue Jun 06 2017 Chang Lee <changlee@vmware.com> 1.14.8-2 |