aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakib Sajal <sakib.sajal@windriver.com>2021-10-05 15:32:36 -0400
committerArmin Kuster <akuster808@gmail.com>2021-10-08 12:40:11 -0700
commit3f8d565e396a751f2a68c6378c98bb4e059b653f (patch)
tree73527cc24812d3d66f6d4a47959e415620d50626
parent965b85b6785b5e66b5dd56db570ca53e26848cfb (diff)
downloadmeta-openembedded-contrib-3f8d565e396a751f2a68c6378c98bb4e059b653f.tar.gz
meta-openembedded-contrib-3f8d565e396a751f2a68c6378c98bb4e059b653f.tar.bz2
meta-openembedded-contrib-3f8d565e396a751f2a68c6378c98bb4e059b653f.zip
gd: upgrade v2.3.2 -> v2.3.3
Changes: i) removed patches contained in newer version ii) LIC_FILES_CHKSUM changed because of the following commits: 6013c7bc Just make it easier for the doc 82d26095 merge duplicate COPYING files Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch33
-rw-r--r--meta-oe/recipes-support/gd/gd_2.3.3.bb (renamed from meta-oe/recipes-support/gd/gd_2.3.2.bb)7
2 files changed, 3 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch b/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch
deleted file mode 100644
index 649b9b744f..0000000000
--- a/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001
-From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu>
-Date: Mon, 19 Jul 2021 10:07:13 +0430
-Subject: [PATCH] fix read out-of-bands in reading tga header file
-
-CVE: CVE-2021-38115
-Upstream-Status: Backport [8b111b2b4a4842179be66db68d84dda91a246032]
-
-Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
----
- src/gd_tga.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/gd_tga.c b/src/gd_tga.c
-index cae9428..286febb 100644
---- a/src/gd_tga.c
-+++ b/src/gd_tga.c
-@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga)
- return -1;
- }
-
-- gdGetBuf(tga->ident, tga->identsize, ctx);
-+
-+ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) {
-+ gd_error("fail to read header ident");
-+ return -1;
-+ }
- }
-
- return 1;
---
-2.25.1
-
diff --git a/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb
index 557b45dc49..f95ee714b6 100644
--- a/meta-oe/recipes-support/gd/gd_2.3.2.bb
+++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb
@@ -9,15 +9,14 @@ HOMEPAGE = "http://libgd.github.io/"
SECTION = "libs"
LICENSE = "GD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1"
DEPENDS = "freetype libpng jpeg zlib tiff"
-SRC_URI = "git://github.com/libgd/libgd.git;branch=master \
- file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \
+SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1 \
"
-SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e"
+SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc"
S = "${WORKDIR}/git"