diff options
author | Remi Collet <remi@remirepo.net> | 2018-03-28 16:32:48 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2018-03-28 16:32:48 +0200 |
commit | 1b11443e99c3247957ec38cd317c49d497d5a2d7 (patch) | |
tree | a2c573308cfdea9246dbd7e8b6bfa2d43aaed236 /gd.spec | |
parent | 93b81235a3e6baff590d7478403d82cc956d0bb4 (diff) |
Sync with fedora:
* Mon Mar 26 2018 Marek Skalický <mskalick@redhat.com> - 2.2.5-2
- Fix CVE-2018-5711 - Potential infinite loop in gdImageCreateFromGifCtx
Diffstat (limited to 'gd.spec')
-rw-r--r-- | gd.spec | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -28,7 +28,7 @@ Name: gd Name: gd-last %endif Version: 2.2.5 -Release: 1%{?prever}%{?short}%{?dist} +Release: 2%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -41,6 +41,8 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/li %endif Patch1: gd-2.1.0-multilib.patch +# CVE-2018-5711 - https://github.com/libgd/libgd/commit/a11f47475e6443b7f32d21f2271f28f417e2ac04 +Patch2: gd-2.2.5-upstream.patch BuildRequires: freetype-devel BuildRequires: fontconfig-devel @@ -126,6 +128,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %prep %setup -q -n libgd-%{version}%{?prever:-%{prever}} %patch1 -p1 -b .mlib +%patch2 -p1 -b .upstream : $(perl config/getver.pl) @@ -185,9 +188,6 @@ XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" # See https://github.com/libgd/libgd/issues/363 XFAIL_TESTS="freetype/bug00132 $XFAIL_TESTS" %endif -%if 0%{?rhel} > 0 && 0%{?rhel} <= 5 -XFAIL_TESTS="gdimagestringft/gdimagestringft_bbox $XFAIL_TESTS" -%endif export XFAIL_TESTS @@ -221,6 +221,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Mon Mar 26 2018 Marek Skalický <mskalick@redhat.com> - 2.2.5-2 +- Fix CVE-2018-5711 - Potential infinite loop in gdImageCreateFromGifCtx + * Wed Aug 30 2017 Remi Collet <remi@fedoraproject.org> - 2.2.5-1 - Update to 2.2.5 - fix double-free in gdImagePngPtr(). CVE-2017-6362 |