Skip to contentSkip to conversation

gd: update to 2.2.4

PATCH New Yi Zhao 1 participant 1 message Aug 18, 2017

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 gd: update to 2.2.4

* Remove the following patches which already merged in upstream:

    fix-gcc-unused-functions.patch
    .gitignore-the-new-test-case.patch
    CVE-2016-10166.patch
    CVE-2016-10167.patch
    CVE-2016-10168.patch
    CVE-2016-6906-1.patch
    CVE-2016-6906-2.patch
    Fix-290-TGA-RLE-decoding-is-broken.patch

* Update LICENSE's MD5 check sum.
The COPYING file has been update with the following commits in upstream:

commit f863b3c2d300ff5344f6752e5813b0d6985e79c4
Resolve #282: COPYING vs. docs/naturaldocs/license.txt

commit 9ccdaedbd9a2cfd1c8a9a258c09af161e796bd41
Sync COPYING and docs/naturaldocs/license.txt

These two commits updated the copyright statement regarding the authorship of gd and adjust the format.

---
 .../gd/files/fix-gcc-unused-functions.patch        |  43 ---
 .../gd/gd/.gitignore-the-new-test-case.patch       |  24 --
 meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch |  60 ----
 meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch |  48 ---
 meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch |  38 ---
 .../recipes-support/gd/gd/CVE-2016-6906-1.patch    | 167 ----------
 .../recipes-support/gd/gd/CVE-2016-6906-2.patch    | 135 --------
 .../gd/gd/Fix-290-TGA-RLE-decoding-is-broken.patch | 359 ---------------------
 .../gd/{gd_2.2.3.bb => gd_2.2.4.bb}                |  27 +-
 9 files changed, 4 insertions(+), 897 deletions(-)
 delete mode 100644 meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/.gitignore-the-new-test-case.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-6906-1.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-6906-2.patch
 delete mode 100644 meta-oe/recipes-support/gd/gd/Fix-290-TGA-RLE-decoding-is-broken.patch
 rename meta-oe/recipes-support/gd/{gd_2.2.3.bb => gd_2.2.4.bb} (61%)
meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch deleted +0 -43
deleted file mode 100644
index 02cb5ad..0000000
@@ -1,43 +0,0 @@
-gdft.c: remove functions that cause warnings about being unused
-
-Upstream-Status: Backport (Fixed in master branch)
-
-Signed-off-by: Derek Straka <[email protected]>
---- git/src/gdft.c.orig	2016-08-12 10:20:41.418440091 -0400
-+++ git/src/gdft.c	2016-08-12 10:22:34.226442987 -0400
-@@ -139,16 +139,6 @@
- }
- #else
- 
--#ifndef HAVE_LIBFONTCONFIG
--static char * font_pattern(char **fontpath, char *fontpattern)
--{
--	(void)fontpath;
--	(void)fontpattern;
--
--	return "libgd was not built with FontConfig support\n";
--}
--#endif /* HAVE_LIBFONTCONFIG */
--
- #include "gdcache.h"
- /* 2.0.16 Christophe Thomas: starting with FreeType 2.1.6, this is
-   mandatory, and it has been supported for a long while. */
-@@ -446,16 +436,15 @@
- 	return (strcmp (a->fontlist, b->fontlist) == 0 && a->flags == b->flags);
- }
- 
-+#ifdef HAVE_LIBFONTCONFIG
- static int useFontConfig(int flag)
- {
--#ifdef HAVE_LIBFONTCONFIG
- 	if (fontConfigFlag) {
- 		return (!(flag & gdFTEX_FONTPATHNAME));
- 	}
--#endif
- 	return flag & gdFTEX_FONTCONFIG;
- }
--
-+#endif
- static void *
- fontFetch (char **error, void *key)
- {
meta-oe/recipes-support/gd/gd/.gitignore-the-new-test-case.patch deleted +0 -24
deleted file mode 100644
index eab4975..0000000
@@ -1,24 +0,0 @@
-From 8520274759cb8f95e483b02a445aff225e13467b Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <[email protected]>
-Date: Tue, 16 Aug 2016 16:00:27 +0200
-Subject: [PATCH] .gitignore the new test case
-
-Upstream-Status: Backport
-
-Signed-off-by: Catalin Enache <[email protected]>
----
- tests/tga/.gitignore | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/tga/.gitignore b/tests/tga/.gitignore
-index e88e124..7a659b1 100644
---- a/tests/tga/.gitignore
-+++ b/tests/tga/.gitignore
-@@ -4,3 +4,4 @@
- /bug00248
- /bug00248a
- /tga_null
-+/tga_read
--- 
-2.10.2
-
meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch deleted +0 -60

60 lines not on this page · raw message

meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch deleted +0 -48

48 lines not on this page · raw message

meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch deleted +0 -38
deleted file mode 100644
index aef1060..0000000
@@ -1,38 +0,0 @@
-From 2d37bdc03a6e2b820fe380016f22592a7733e0be Mon Sep 17 00:00:00 2001
-From: Catalin Enache <[email protected]>
-Date: Fri, 7 Apr 2017 12:32:49 +0300
-Subject: [PATCH] Fix #354: Signed Integer Overflow gd_io.c
-
-GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
-byte unsigned). These values are multiplied and assigned to an int when
-reading the image, what can cause integer overflows. We have to avoid
-that, and also make sure that either chunk count is actually greater
-than zero. If illegal chunk counts are detected, we bail out from
-reading the image.
-
-Upstream-Status: Backport
-CVE: CVE-2016-10168
-
-Signed-off-by: Catalin Enache <[email protected]>
----
- src/gd_gd2.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gd_gd2.c b/src/gd_gd2.c
-index bae65ea..9006bd2 100644
---- a/src/gd_gd2.c
-+++ b/src/gd_gd2.c
-@@ -151,6 +151,10 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy,
- 	GD2_DBG (printf ("%d Chunks vertically\n", *ncy));
- 
- 	if (gd2_compressed (*fmt)) {
-+		if (*ncx <= 0 || *ncy <= 0 || *ncx > INT_MAX / *ncy) {
-+			GD2_DBG(printf ("Illegal chunk counts: %d * %d\n", *ncx, *ncy));
-+			goto fail1;
-+		}
- 		nc = (*ncx) * (*ncy);
- 
- 		GD2_DBG (printf ("Reading %d chunk index entries\n", nc));
--- 
-2.10.2
-
meta-oe/recipes-support/gd/gd/CVE-2016-6906-1.patch deleted +0 -167

167 lines not on this page · raw message

meta-oe/recipes-support/gd/gd/CVE-2016-6906-2.patch deleted +0 -135

135 lines not on this page · raw message

meta-oe/recipes-support/gd/gd/Fix-290-TGA-RLE-decoding-is-broken.patch deleted +0 -359

359 lines not on this page · raw message

meta-oe/recipes-support/gd/gd_2.2.4.bb renamed from meta-oe/recipes-support/gd/gd_2.2.3.bb +4 -23
similarity index 61%
rename from meta-oe/recipes-support/gd/gd_2.2.3.bb
rename to meta-oe/recipes-support/gd/gd_2.2.4.bb
index 5621706..4932bb7 100644
@@ -9,20 +9,14 @@ HOMEPAGE = "http://libgd.bitbucket.org/"
 
 SECTION = "libs"
 LICENSE = "GD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
+LIC_FILES_CHKSUM = "file://COPYING;md5=07384b3aa2e0d39afca0d6c40286f545"
+
 DEPENDS = "freetype libpng jpeg zlib tiff"
 
 SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
-           file://fix-gcc-unused-functions.patch \
-           file://CVE-2016-10166.patch \
-           file://CVE-2016-10167.patch \
-           file://CVE-2016-10168.patch \
-           file://.gitignore-the-new-test-case.patch \
-           file://Fix-290-TGA-RLE-decoding-is-broken.patch;apply=no \
-           file://CVE-2016-6906-1.patch;apply=no \
-           file://CVE-2016-6906-2.patch;apply=no"
+          "
 
-SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c"
+SRCREV = "de09874b15a4c88772db35ced842330f5de23e76"
 
 S = "${WORKDIR}/git"
 
@@ -39,19 +33,6 @@ EXTRA_OECONF += " --disable-rpath \
 
 EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
 
-do_git_apply () {
-       cd ${S}
-       if [ ! -f tests/tga/tga_read_rgb.png ]; then
-               git apply ${S}/../Fix-290-TGA-RLE-decoding-is-broken.patch
-               git apply ${S}/../CVE-2016-6906-1.patch
-               git apply ${S}/../CVE-2016-6906-2.patch
-       fi
-}
-
-do_patch_append() {
-    bb.build.exec_func('do_git_apply', d)
-}
-
 do_install_append() {
     # cleanup buildpaths from gdlib.pc
     sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc
Signature · 1 line
2.7.4