diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/giflib')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch | 23 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb) | 18 |
2 files changed, 9 insertions, 32 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch b/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch deleted file mode 100644 index 9957be82f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" <esr@thyrsus.com> -Date: Sun, 17 Mar 2019 12:37:21 -0400 -Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address - ---- - dgif_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-status: Backport [https://sourceforge.net/p/giflib/code/ci/799eb6a3af8a3dd81e2429bf11a72a57e541f908/] -CVE: CVE-2019-15133 - ---- a/lib/dgif_lib.c 2021-01-13 19:28:18.923493586 +0100 -+++ b/lib/dgif_lib.c 2021-01-13 19:28:55.245863085 +0100 -@@ -1099,7 +1099,7 @@ DGifSlurp(GifFileType *GifFile) - - sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; - /* Allocate memory for the image */ -- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && -+ if (sp->ImageDesc.Width <= 0 && sp->ImageDesc.Height <= 0 && - sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { - return GIF_ERROR; - } diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb index 1871bab46..105c53eab 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb @@ -3,14 +3,17 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2 \ - file://CVE-2019-15133.patch \ -" - CVE_PRODUCT = "giflib_project:giflib" -inherit autotools +DEPENDS = "xmlto-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz" +SRC_URI[sha256sum] = "31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd" + +do_install() { + # using autotools's default will end up in /usr/local + oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install +} PACKAGES += "${PN}-utils" FILES_${PN} = "${libdir}/libgif.so.*" @@ -19,6 +22,3 @@ FILES_${PN}-utils = "${bindir}" BBCLASSEXTEND = "native" RDEPENDS_${PN}-utils = "perl" - -SRC_URI[md5sum] = "2c171ced93c0e83bb09e6ccad8e3ba2b" -SRC_URI[sha256sum] = "df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5" |