package/giflib: bump to version 5.2.1
- Switch to generic-package (autotools has been dropped since version 5.1.5) - Remove hook and instead use dedicated makefile targets to build only shared or static library and not binaries or documentation (added by an upstreamble patch) - ac_cv_prog_have_xmlto=no can be removed as doc is not built anymore Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> [Peter: drop redundant GIFLIB_SOURCE] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
cbfee0ad53
commit
bf16f14e6b
|
@ -1,31 +0,0 @@
|
|||
From 08438a5098f3bb1de23a29334af55eba663f75bd Mon Sep 17 00:00:00 2001
|
||||
From: "Eric S. Raymond" <esr@thyrsus.com>
|
||||
Date: Sat, 9 Feb 2019 10:52:21 -0500
|
||||
Subject: [PATCH] Address SF bug #113: Heap Buffer Overflow-2 in function
|
||||
DGifDecompressLine()...
|
||||
|
||||
This was CVE-2018-11490
|
||||
|
||||
[Retrieved from:
|
||||
https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
lib/dgif_lib.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
|
||||
index 15c1460..c4aee5f 100644
|
||||
--- a/lib/dgif_lib.c
|
||||
+++ b/lib/dgif_lib.c
|
||||
@@ -930,7 +930,7 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
|
||||
while (StackPtr != 0 && i < LineLen)
|
||||
Line[i++] = Stack[--StackPtr];
|
||||
}
|
||||
- if (LastCode != NO_SUCH_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) {
|
||||
+ if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < LZ_MAX_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) {
|
||||
Prefix[Private->RunningCode - 2] = LastCode;
|
||||
|
||||
if (CrntCode == Private->RunningCode - 2) {
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 12 Jul 2019 12:20:38 +0200
|
||||
Subject: [PATCH] Makefile: add targets to manage static building
|
||||
|
||||
Add static-lib, shared-lib, install-static-lib and install-shared-lib
|
||||
targets to allow the user to build giflib when dynamic library support
|
||||
is not available or enable on the toolchain
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://sourceforge.net/p/giflib/code/merge-requests/7]
|
||||
---
|
||||
Makefile | 18 ++++++++++++++----
|
||||
1 file changed, 14 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b2bf6de..111f52f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \
|
||||
|
||||
LDLIBS=libgif.a -lm
|
||||
|
||||
-all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
|
||||
+SHARED_LIBS = libgif.so libutil.so
|
||||
+STATIC_LIBS = libgif.a libutil.a
|
||||
+
|
||||
+all: shared-lib static-lib $(UTILS)
|
||||
$(MAKE) -C doc
|
||||
|
||||
-$(UTILS):: libgif.a libutil.a
|
||||
+$(UTILS):: $(STATIC_LIBS)
|
||||
+
|
||||
+shared-lib: $(SHARED_LIBS)
|
||||
+
|
||||
+static-lib: $(STATIC_LIBS)
|
||||
|
||||
libgif.so: $(OBJECTS) $(HEADERS)
|
||||
$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
|
||||
@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS)
|
||||
$(AR) rcs libutil.a $(UOBJECTS)
|
||||
|
||||
clean:
|
||||
- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o
|
||||
+ rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o
|
||||
rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
|
||||
rm -f libgif.so.$(LIBMAJOR)
|
||||
rm -fr doc/*.1 *.html doc/staging
|
||||
@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE)
|
||||
install-include:
|
||||
$(INSTALL) -d "$(DESTDIR)$(INCDIR)"
|
||||
$(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)"
|
||||
-install-lib:
|
||||
+install-static-lib:
|
||||
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
|
||||
$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
|
||||
+install-shared-lib:
|
||||
+ $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
|
||||
$(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
|
||||
ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
|
||||
ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
|
||||
+install-lib: install-static-lib install-shared-lib
|
||||
install-man:
|
||||
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
|
||||
$(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -1,28 +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
|
||||
|
||||
[Retrieved (and backported) from:
|
||||
https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
dgif_lib.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
|
||||
index 3a52467..179bd84 100644
|
||||
--- a/lib/dgif_lib.c
|
||||
+++ b/lib/dgif_lib.c
|
||||
@@ -1143,7 +1143,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;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# From http://sourceforge.net/projects/giflib/files
|
||||
md5 2c171ced93c0e83bb09e6ccad8e3ba2b giflib-5.1.4.tar.bz2
|
||||
sha1 5f1157cfc377916280849e247b8e34fa0446513f giflib-5.1.4.tar.bz2
|
||||
md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz
|
||||
sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz
|
||||
# Locally computed
|
||||
sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING
|
||||
|
|
|
@ -4,27 +4,45 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
GIFLIB_VERSION = 5.1.4
|
||||
GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.bz2
|
||||
GIFLIB_VERSION = 5.2.1
|
||||
GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib
|
||||
GIFLIB_INSTALL_STAGING = YES
|
||||
GIFLIB_LICENSE = MIT
|
||||
GIFLIB_LICENSE_FILES = COPYING
|
||||
|
||||
GIFLIB_BINS = \
|
||||
gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifbuild gifburst gifclip \
|
||||
gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip \
|
||||
gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
|
||||
gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \
|
||||
text2gif
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
GIFLIB_BUILD_LIBS = static-lib
|
||||
GIFLIB_INSTALL_LIBS = install-static-lib
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
GIFLIB_BUILD_LIBS = shared-lib
|
||||
GIFLIB_INSTALL_LIBS = install-shared-lib
|
||||
else
|
||||
GIFLIB_BUILD_LIBS = static-lib shared-lib
|
||||
GIFLIB_INSTALL_LIBS = install-lib
|
||||
endif
|
||||
|
||||
GIFLIB_CONF_ENV = ac_cv_prog_have_xmlto=no
|
||||
|
||||
define GIFLIB_BINS_CLEANUP
|
||||
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GIFLIB_BINS))
|
||||
define GIFLIB_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GIFLIB_BUILD_LIBS)
|
||||
endef
|
||||
|
||||
GIFLIB_POST_INSTALL_TARGET_HOOKS += GIFLIB_BINS_CLEANUP
|
||||
define HOST_GIFLIB_BUILD_CMDS
|
||||
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
define GIFLIB_INSTALL_STAGING_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \
|
||||
PREFIX=/usr install-include $(GIFLIB_INSTALL_LIBS)
|
||||
endef
|
||||
|
||||
define GIFLIB_INSTALL_TARGET_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
|
||||
PREFIX=/usr install-include $(GIFLIB_INSTALL_LIBS)
|
||||
endef
|
||||
|
||||
define HOST_GIFLIB_INSTALL_CMDS
|
||||
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \
|
||||
PREFIX=/usr install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(host-generic-package))
|
||||
|
|
Loading…
Reference in a new issue