gd: uprev from 2.2.5 to 2.3.0
PATCH 1/1 gd: uprev from 2.2.5 to 2.3.0
Major release after 2.2.5.
Changelog: https://github.com/libgd/libgd/blob/gd-2.3.0/CHANGELOG.md
Changes:
- SRC_REV points to tag gd-2.3.0
- branch in SRC_URI points to master
- updated homepage
- removed patches as they were merged upstream
under gd-2.3.0 tag
Signed-off-by Sakib Sajal <[email protected]>
---
...c-Replace-strncpy-with-memccpy-to-fi.patch | 46 ---
.../recipes-support/gd/gd/CVE-2017-6363.patch | 35 --
.../gd/gd/CVE-2018-1000222.patch | 82 -----
.../gd/gd/CVE-2018-14553.patch | 110 -------
.../recipes-support/gd/gd/CVE-2019-6978.patch | 299 ------------------
.../gd/{gd_2.2.5.bb => gd_2.3.0.bb} | 13 +-
6 files changed, 4 insertions(+), 581 deletions(-)
delete mode 100644 meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch
delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch
delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch
delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2019-6978.patch
rename meta-oe/recipes-support/gd/{gd_2.2.5.bb => gd_2.3.0.bb} (74%)meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch deleted +0 -46
@@ -1,46 +0,0 @@ -From 85c7694a5cf34597909bdd1ca6931b0f99904c2e Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Tue, 19 Jun 2018 00:40:49 -0700 -Subject: [PATCH] annotate.c/gdft.c: Replace strncpy with memccpy to fix - -Wstringop-truncation. - -Fixed for gcc8: -git/src/gdft.c:1699:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation] - -Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/442] - -Signed-off-by: Robert Yang <[email protected]> ---- - src/annotate.c | 2 +- - src/gdft.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/annotate.c b/src/annotate.c -index 00aaf49..17df813 100644 ---- a/src/annotate.c -+++ b/src/annotate.c -@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) - fprintf(stderr, "Font maximum length is 1024, %d given\n", font_len); - goto badLine; - } -- strncpy(font, st, font_len); -+ memcpy(font, st, font_len); - } - } else if(!strcmp(st, "align")) { - char *st = strtok(0, " \t\r\n"); -diff --git a/src/gdft.c b/src/gdft.c -index 9fa8295..81dbe41 100644 ---- a/src/gdft.c -+++ b/src/gdft.c -@@ -1696,7 +1696,7 @@ static char * font_path(char **fontpath, char *name_list) - gdFree(path); - return "could not alloc full list of fonts"; - } -- strncpy(fontlist, name_list, name_list_len); -+ memcpy(fontlist, name_list, name_list_len); - fontlist[name_list_len] = 0; - - /* --- -2.10.2 -
meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Wed, 31 Jan 2018 14:50:16 -0500 -Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds - #383 - -The gd image formats allow for a palette of 256 colors, -so if the transparent index is out of range, disable it. - -Upstream-Status: Backport -[https://github.com/libgd/libgd.git commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c] -CVE-2017-6363 - -Signed-off-by: Haiqing Bai <[email protected]> ---- - src/gd_gd.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gd_gd.c b/src/gd_gd.c -index f8d39cb..5a86fc3 100644 ---- a/src/gd_gd.c -+++ b/src/gd_gd.c -@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag) - if (!gdGetWord (&im->transparent, in)) { - goto fail1; - } -- if (im->transparent == 257) { -+ /* Make sure transparent index is within bounds of the palette. */ -+ if (im->transparent >= 256 || im->transparent < 0) { - im->transparent = (-1); - } - } --- -1.9.1 -
meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch deleted +0 -82
82 lines not on this page · raw message
meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch deleted +0 -110
110 lines not on this page · raw message
meta-oe/recipes-support/gd/gd/CVE-2019-6978.patch deleted +0 -299
299 lines not on this page · raw message
meta-oe/recipes-support/gd/gd_2.3.0.bb renamed from meta-oe/recipes-support/gd/gd_2.2.5.bb +4 -9
@@ -5,23 +5,18 @@ images, and flood fills, and to write out the result as a PNG or JPEG file. \ This is particularly useful in Web applications, where PNG and JPEG are two \ of the formats accepted for inline images by most browsers. Note that gd is not \ a paint program." -HOMEPAGE = "http://libgd.bitbucket.org/" +HOMEPAGE = "http://libgd.github.io/" SECTION = "libs" LICENSE = "GD" -LIC_FILES_CHKSUM = "file://COPYING;md5=07384b3aa2e0d39afca0d6c40286f545" +LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ - file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \ - file://CVE-2018-1000222.patch \ - file://CVE-2019-6978.patch \ - file://CVE-2017-6363.patch \ - file://CVE-2018-14553.patch \ +SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ " -SRCREV = "8255231b68889597d04d451a72438ab92a405aba" +SRCREV = "b079fa06223c3ab862c8f0eea58a968727971988" S = "${WORKDIR}/git"
Signature · 1 line
2.24.1