![Peter Korsgaard](/assets/img/avatar_default.png)
Fixes the following security issues:
CVE-2017-6362: Double-free in gdImagePngPtr()
CVE-2017-7890: Buffer over-read into uninitialized memory
Drop patches no more needed:
0001-gdlib-config.patch: @LIBICONV@ is nowadays correct AC_SUBST'ed by
configure
0002-gd_bmp-fix-build-with-uClibc.patch: upstream uses ceil() since
6913dd3cd2
While we're at it, add a hash for the license file.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
97 lines
2.5 KiB
Makefile
97 lines
2.5 KiB
Makefile
################################################################################
|
|
#
|
|
# gd
|
|
#
|
|
################################################################################
|
|
|
|
GD_VERSION = 2.2.5
|
|
GD_SOURCE = libgd-$(GD_VERSION).tar.xz
|
|
GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION)
|
|
GD_INSTALL_STAGING = YES
|
|
GD_LICENSE = GD license
|
|
GD_LICENSE_FILES = COPYING
|
|
GD_CONFIG_SCRIPTS = gdlib-config
|
|
GD_CONF_OPTS = --without-x --disable-rpath --disable-werror
|
|
GD_DEPENDENCIES = host-pkgconf
|
|
|
|
# gd forgets to link utilities with -pthread even though it uses
|
|
# pthreads, causing linking errors with static linking
|
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
|
GD_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread"
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
|
|
GD_DEPENDENCIES += fontconfig
|
|
GD_CONF_OPTS += --with-fontconfig
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
|
GD_DEPENDENCIES += freetype
|
|
GD_CONF_OPTS += --with-freetype=$(STAGING_DIR)/usr
|
|
else
|
|
GD_CONF_OPTS += --without-freetype
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
|
GD_DEPENDENCIES += libiconv
|
|
# not strictly needed for gd, but ensures -liconv ends up in
|
|
# gdlib-config --libs output
|
|
GD_CONF_ENV += LIBS="-liconv"
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_JPEG),y)
|
|
GD_DEPENDENCIES += jpeg
|
|
GD_CONF_OPTS += --with-jpeg
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
|
GD_DEPENDENCIES += libpng
|
|
GD_CONF_OPTS += --with-png
|
|
else
|
|
GD_CONF_OPTS += --without-png
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_WEBP),y)
|
|
GD_DEPENDENCIES += webp
|
|
GD_CONF_OPTS += --with-webp
|
|
else
|
|
GD_CONF_OPTS += --without-webp
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_TIFF),y)
|
|
GD_DEPENDENCIES += tiff
|
|
GD_CONF_OPTS += --with-tiff
|
|
else
|
|
GD_CONF_OPTS += --without-tiff
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
|
|
GD_DEPENDENCIES += xlib_libXpm
|
|
GD_CONF_OPTS += --with-xpm
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
GD_DEPENDENCIES += zlib
|
|
endif
|
|
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2
|
|
GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng
|
|
|
|
define GD_REMOVE_TOOLS
|
|
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GD_TOOLS_))
|
|
endef
|
|
|
|
GD_POST_INSTALL_TARGET_HOOKS += GD_REMOVE_TOOLS
|
|
|
|
$(eval $(autotools-package))
|