- up to 2.2.5

diff --git a/gd-upstream.patch b/gd-upstream.patch
deleted file mode 100644 (file)
index 8aee1a0..0000000
--- a/gd-upstream.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 18 Jan 2017 13:59:02 +0100
-Subject: [PATCH] Fix build issue regarding INT_MAX
-
-For portability gd_gd2.c needs to include <limits.h>.
----
- src/gd_gd2.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gd_gd2.c b/src/gd_gd2.c
-index c2904ca..049c4c5 100644
---- a/src/gd_gd2.c
-+++ b/src/gd_gd2.c
-@@ -74,6 +74,7 @@
- 
- /* 2.0.29: no more errno.h, makes windows happy */
- #include <math.h>
-+#include <limits.h>
- #include <string.h>
- #include "gd.h"
- #include "gd_errors.h"
-
-
-From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Thu, 19 Jan 2017 01:02:58 +0100
-Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite.
-
-We make sure to never pass a negative `int` as argument to a `size_t`
-parameter.
----
- src/gd_io_dp.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
-index eda2eeb..cb38794 100644
---- a/src/gd_io_dp.c
-+++ b/src/gd_io_dp.c
-@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
-               rlen = dp->realSize - dp->pos;
-       }
- 
-+      if (rlen < 0) {
-+              return 0;
-+      }
-+
-       memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen);
-       dp->pos += rlen;
- 

diff --git a/gd.spec b/gd.spec
index c160cd6132926271df777a8cecdf886eec36a9f3..f70c586503ccb37c34b55c3ce9ae46c78912f4ae 100644 (file)
--- a/gd.spec
+++ b/gd.spec
@@ -14,18 +14,17 @@ Summary(es.UTF-8):  Biblioteca para manipulación de imágenes
 Summary(pl.UTF-8):     Biblioteka do tworzenia grafiki w formacie PNG, JPEG
 Summary(pt_BR.UTF-8):  Biblioteca para manipulação de imagens
 Name:          gd
-Version:       2.2.4
-Release:       2
+Version:       2.2.5
+Release:       1
 License:       BSD-like
 Group:         Libraries
 #Source0Download: https://github.com/libgd/libgd/releases
 Source0:       https://github.com/libgd/libgd/releases/download/%{name}-%{version}/lib%{name}-%{version}.tar.xz
-# Source0-md5: a244855a323a3ea1975d708eb1e12b7a
+# Source0-md5: 8d8d6a6189513ecee6e893b1fb109bf8
 Patch0:                %{name}-fontpath.patch
 Patch1:                %{name}-2.0.33-BoxBound.patch
 Patch2:                %{name}-loop.patch
 Patch3:                %{name}-liq.patch
-Patch4:                %{name}-upstream.patch
 URL:           https://libgd.github.io/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -165,7 +164,6 @@ para uso pelos programas que usam a libgd.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # hack to avoid inclusion of -s in --ldflags
 %{__sed} -i -e 's,@LDFLAGS@,,g' config/gdlib-config.in