From b37475417f7ce150768a8bf1b1ee95b620e1fe83 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Tue, 28 Mar 2017 14:10:13 +0200 Subject: [PATCH] libs/libgd: Update to 2.2.4 Update libgd to 2.2.4 Fixes multiple CVEs Refresh patches Update list according to: https://svnweb.freebsd.org/ports/head/graphics/gd/pkg-plist?revision=432648&view=markup ...except helpers as it's not generated. Signed-off-by: Daniel Engberg --- libs/libgd/Makefile | 11 +++++------ libs/libgd/patches/101-gdlib-config.patch | 4 ++-- libs/libgd/patches/102-gdlib-pc-in.patch | 9 +++++++++ libs/libgd/patches/200-uclibc-ceill.patch | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 libs/libgd/patches/102-gdlib-pc-in.patch diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 6d7f0c3ee..dd8d1b4de 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgd -PKG_VERSION:=2.1.1 +PKG_VERSION:=2.2.4 PKG_RELEASE:=1 -PKG_SOURCE:=gd-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/libgd/libgd/archive -PKG_MD5SUM:=e91a1a99903e460e7ba00a794e72cc1e +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/ +PKG_HASH:=137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=MIT @@ -21,7 +21,6 @@ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/libgd-gd-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -64,7 +63,7 @@ define Build/InstallDev $(1)/usr/bin/gdlib-config $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_color_map,_errors,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx,pp}.h \ $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,la,so*} $(1)/usr/lib/ diff --git a/libs/libgd/patches/101-gdlib-config.patch b/libs/libgd/patches/101-gdlib-config.patch index e51502cac..b0d82b727 100644 --- a/libs/libgd/patches/101-gdlib-config.patch +++ b/libs/libgd/patches/101-gdlib-config.patch @@ -1,6 +1,6 @@ --- a/config/gdlib-config.in +++ b/config/gdlib-config.in -@@ -71,7 +71,7 @@ while test $# -gt 0; do +@@ -74,7 +74,7 @@ while test $# -gt 0; do echo @LDFLAGS@ ;; --libs) @@ -9,7 +9,7 @@ ;; --cflags|--includes) echo -I@includedir@ -@@ -84,7 +84,7 @@ while test $# -gt 0; do +@@ -87,7 +87,7 @@ while test $# -gt 0; do echo "includedir: $includedir" echo "cflags: -I@includedir@" echo "ldflags: @LDFLAGS@" diff --git a/libs/libgd/patches/102-gdlib-pc-in.patch b/libs/libgd/patches/102-gdlib-pc-in.patch new file mode 100644 index 000000000..79baeb3e1 --- /dev/null +++ b/libs/libgd/patches/102-gdlib-pc-in.patch @@ -0,0 +1,9 @@ +--- a/config/gdlib.pc.in ++++ b/config/gdlib.pc.in +@@ -7,5 +7,5 @@ Name: gd + Description: GD graphics library + Version: @VERSION@ + Cflags: -I${includedir} +-Libs.private: @LIBS@ @LIBICONV@ ++Libs.private: @LIBS@ + Libs: -L${libdir} -lgd diff --git a/libs/libgd/patches/200-uclibc-ceill.patch b/libs/libgd/patches/200-uclibc-ceill.patch index 8d2aa1233..1b4fc8e31 100644 --- a/libs/libgd/patches/200-uclibc-ceill.patch +++ b/libs/libgd/patches/200-uclibc-ceill.patch @@ -1,6 +1,6 @@ --- a/src/gd_bmp.c +++ b/src/gd_bmp.c -@@ -21,6 +21,7 @@ +@@ -28,6 +28,7 @@ #include #include #include @@ -8,7 +8,7 @@ #include "gd.h" #include "gdhelpers.h" #include "bmp.h" -@@ -42,6 +43,13 @@ static int bmp_read_rle(gdImagePtr im, g +@@ -49,6 +50,13 @@ static int bmp_read_rle(gdImagePtr im, g #define BMP_DEBUG(s)