From 836bcc2a2746d3475ad570bce00fc8fc367c9092 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 24 Mar 2020 08:57:03 +0100
Subject: update to 2.3.0 add dependency on libraqm remove gdlib-config

---
 gd.spec | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

(limited to 'gd.spec')

diff --git a/gd.spec b/gd.spec
index 3548f60..9ab9c57 100644
--- a/gd.spec
+++ b/gd.spec
@@ -24,6 +24,11 @@
 #   FAIL gdimagefile/gdnametest (exit status: 2)
 %global  with_liq   0
 %endif
+%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7
+%global with_raqm 1
+%else
+%global with_raqm 0
+%endif
 
 Summary:       A graphics library for quick creation of PNG or JPEG images
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 8
@@ -31,8 +36,8 @@ Name:          gd
 %else
 Name:          gd-last
 %endif
-Version:       2.2.5
-Release:       10%{?prever}%{?short}%{?dist}
+Version:       2.3.0
+Release:       1%{?prever}%{?short}%{?dist}
 License:       MIT
 URL:           http://libgd.github.io/
 %if 0%{?commit:1}
@@ -42,16 +47,8 @@ Source0:       libgd-%{version}-%{commit}.tgz
 %else
 Source0:       https://github.com/libgd/libgd/releases/download/gd-%{version}/libgd-%{version}.tar.xz
 %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
-# CVE-2018-1000222 - https://github.com/libgd/libgd/commit/ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5
-Patch3:        gd-2.2.5-gdImageBmpPtr-double-free.patch
-# CVE-2019-6977
-Patch4:        gd-2.2.5-heap-based-buffer-overflow.patch
-# CVE-2019-6978
-Patch5:        gd-2.2.5-potential-double-free.patch
+# Missing, temporary workaround, fixed upstream for next version
+Source1:       https://raw.githubusercontent.com/libgd/libgd/gd-%{version}/config/getlib.sh
 
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
@@ -69,6 +66,9 @@ BuildRequires: libwebp-devel
 %if %{with_liq}
 BuildRequires: libimagequant-devel
 %endif
+%if %{with_raqm}
+BuildRequires: libraqm-devel
+%endif
 BuildRequires: libX11-devel
 BuildRequires: libXpm-devel
 BuildRequires: zlib-devel
@@ -128,6 +128,9 @@ Requires: zlib-devel%{?_isa}
 %if %{with_liq}
 Requires: libimagequant-devel%{?_isa}
 %endif
+%if %{with_raqm}
+Requires: libraqm-devel
+%endif
 
 %if "%{name}" == "gd-last"
 Conflicts: gd-devel < %{version}
@@ -144,11 +147,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
-%patch3 -p1 -b .gdImageBmpPtr-free
-%patch4 -p1
-%patch5 -p1
+install -m 0755 %{SOURCE1} config/
 
 : $(perl config/getver.pl)
 
@@ -200,6 +199,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
 
 
 %check
+# minor diff in size
+XFAIL_TESTS="gdimagestringft/gdimagestringft_bbox"
+%ifarch s390x
+XFAIL_TESTS="gdimagestring16/gdimagestring16 gdimagestringup16/gdimagestringup16 $XFAIL_TESTS"
+%endif
 %if 0%{?fedora} <= 28 && 0%{?rhel} <= 7
 %ifarch %{ix86}
 # See https://github.com/libgd/libgd/issues/359
@@ -233,16 +237,19 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
 
 %files progs
 %{_bindir}/*
-%exclude %{_bindir}/gdlib-config
 
 %files devel
-%{_bindir}/gdlib-config
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/gdlib.pc
 
 
 %changelog
+* Tue Mar 24 2020 Remi Collet <remi@remirepo.net> - 2.3.0-1
+- update to 2.3.0
+- add dependency on libraqm
+- remove gdlib-config
+
 * Fri Nov 01 2019 odubaj@redhat.com - 2.2.5-10
 - Fixed heap based buffer overflow in gd_color_match.c:gdImageColorMatch() in libgd as used in imagecolormatch()
 - Resolves: RHBZ#1678104 (CVE-2019-6977)
-- 
cgit