diff options
| -rw-r--r-- | package/gd/0001-gdlib-config.patch (renamed from package/gd/gd-01-gdlib-config.patch) | 0 | ||||
| -rw-r--r-- | package/gd/0002-no-zlib.patch (renamed from package/gd/gd-02-no-zlib.patch) | 0 | ||||
| -rw-r--r-- | package/gd/0003-gd_bmp-fix-build-with-uClibc.patch (renamed from package/gd/gd-03-gd_bmp-fix-build-with-uClibc.patch) | 0 | ||||
| -rw-r--r-- | package/gd/gd-04-CVE-2014-2497.patch | 33 | ||||
| -rw-r--r-- | package/gd/gd.hash | 2 | ||||
| -rw-r--r-- | package/gd/gd.mk | 3 |
6 files changed, 3 insertions, 35 deletions
diff --git a/package/gd/gd-01-gdlib-config.patch b/package/gd/0001-gdlib-config.patch index 7756bf1240..7756bf1240 100644 --- a/package/gd/gd-01-gdlib-config.patch +++ b/package/gd/0001-gdlib-config.patch diff --git a/package/gd/gd-02-no-zlib.patch b/package/gd/0002-no-zlib.patch index 65cf7f8f19..65cf7f8f19 100644 --- a/package/gd/gd-02-no-zlib.patch +++ b/package/gd/0002-no-zlib.patch diff --git a/package/gd/gd-03-gd_bmp-fix-build-with-uClibc.patch b/package/gd/0003-gd_bmp-fix-build-with-uClibc.patch index 89bc39186e..89bc39186e 100644 --- a/package/gd/gd-03-gd_bmp-fix-build-with-uClibc.patch +++ b/package/gd/0003-gd_bmp-fix-build-with-uClibc.patch diff --git a/package/gd/gd-04-CVE-2014-2497.patch b/package/gd/gd-04-CVE-2014-2497.patch deleted file mode 100644 index d30bfbb8b4..0000000000 --- a/package/gd/gd-04-CVE-2014-2497.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 463c3bd09bfe8e924e19acad7a2a6af16953a704 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Mon, 4 Aug 2014 10:31:25 +0200 -Subject: [PATCH] CVE-2014-2497, NULL pointer dereference, fix #126 - ---- - src/gdxpm.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/gdxpm.c b/src/gdxpm.c -index ae6e336..15603a6 100644 ---- a/src/gdxpm.c -+++ b/src/gdxpm.c -@@ -83,6 +83,16 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXpm(char *filename) - if(overflow2(sizeof(int), number)) { - goto done; - } -+ for(i = 0; i < number; i++) { -+ /* -+ avoid NULL pointer dereference -+ TODO better fix need to manage monochrome/monovisual -+ see m_color or g4_color or g_color -+ */ -+ if (!image.colorTable[i].c_color) { -+ goto done; -+ } -+ } - - colors = (int *)gdMalloc(sizeof(int) * number); - if(colors == NULL) { --- -1.8.5.2 - diff --git a/package/gd/gd.hash b/package/gd/gd.hash new file mode 100644 index 0000000000..8edbb1ad52 --- /dev/null +++ b/package/gd/gd.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285 libgd-2.1.1.tar.xz diff --git a/package/gd/gd.mk b/package/gd/gd.mk index d7a65128fe..2991cd5a76 100644 --- a/package/gd/gd.mk +++ b/package/gd/gd.mk @@ -4,13 +4,12 @@ # ################################################################################ -GD_VERSION = 2.1.0 +GD_VERSION = 2.1.1 GD_SOURCE = libgd-$(GD_VERSION).tar.xz GD_SITE = https://bitbucket.org/libgd/gd-libgd/downloads GD_INSTALL_STAGING = YES GD_LICENSE = GD license GD_LICENSE_FILES = COPYING - GD_CONFIG_SCRIPTS = gdlib-config GD_CONF_OPTS = --without-x --disable-rpath GD_DEPENDENCIES = host-pkgconf |
