diff options
author | Sakib Sajal <sakib.sajal@windriver.com> | 2021-10-05 15:32:36 -0400 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-10-08 12:40:11 -0700 |
commit | 3f8d565e396a751f2a68c6378c98bb4e059b653f (patch) | |
tree | 73527cc24812d3d66f6d4a47959e415620d50626 | |
parent | 965b85b6785b5e66b5dd56db570ca53e26848cfb (diff) | |
download | meta-openembedded-3f8d565e396a751f2a68c6378c98bb4e059b653f.tar.gz |
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.patch | 33 | ||||
-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 @@ | |||
1 | From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001 | ||
2 | From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu> | ||
3 | Date: Mon, 19 Jul 2021 10:07:13 +0430 | ||
4 | Subject: [PATCH] fix read out-of-bands in reading tga header file | ||
5 | |||
6 | CVE: CVE-2021-38115 | ||
7 | Upstream-Status: Backport [8b111b2b4a4842179be66db68d84dda91a246032] | ||
8 | |||
9 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | ||
10 | --- | ||
11 | src/gd_tga.c | 6 +++++- | ||
12 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/gd_tga.c b/src/gd_tga.c | ||
15 | index cae9428..286febb 100644 | ||
16 | --- a/src/gd_tga.c | ||
17 | +++ b/src/gd_tga.c | ||
18 | @@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) | ||
19 | return -1; | ||
20 | } | ||
21 | |||
22 | - gdGetBuf(tga->ident, tga->identsize, ctx); | ||
23 | + | ||
24 | + if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) { | ||
25 | + gd_error("fail to read header ident"); | ||
26 | + return -1; | ||
27 | + } | ||
28 | } | ||
29 | |||
30 | return 1; | ||
31 | -- | ||
32 | 2.25.1 | ||
33 | |||
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/" | |||
9 | 9 | ||
10 | SECTION = "libs" | 10 | SECTION = "libs" |
11 | LICENSE = "GD" | 11 | LICENSE = "GD" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" |
13 | 13 | ||
14 | DEPENDS = "freetype libpng jpeg zlib tiff" | 14 | DEPENDS = "freetype libpng jpeg zlib tiff" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ | 16 | SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1 \ |
17 | file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \ | ||
18 | " | 17 | " |
19 | 18 | ||
20 | SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" | 19 | SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" |
21 | 20 | ||
22 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
23 | 22 | ||