cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to gd-2.1.1, based on a diff from Rafael Sadowski

Browse Source
This commit is contained in:
sthen 2015-11-14 12:41:53 +00:00
parent 6b3415f2ae
commit e7bd8a49fa
4 changed files with 15 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/gd/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.62 2015/08/17 19:52:39 sthen Exp $
# $OpenBSD: Makefile,v 1.63 2015/11/14 12:41:53 sthen Exp $
COMMENT= library for dynamic creation of images
V= 2.1.0
V= 2.1.1
DISTNAME= libgd-$V
PKGNAME= gd-$V
REVISION= 2
SHARED_LIBS= gd 21.0
SHARED_LIBS += gd 21.0 # 3.0
CATEGORIES= graphics
@ -20,7 +19,9 @@ WANTLIB += pthread-stubs stdc++ tiff vpx z
MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-xpm
SEPARATE_BUILD= Yes
LIB_DEPENDS= graphics/jpeg \
graphics/png \
@ -29,6 +30,4 @@ LIB_DEPENDS= graphics/jpeg \
MODULES= converters/libiconv
CONFIGURE_STYLE= gnu
.include <bsd.port.mk>

4
graphics/gd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libgd-2.1.0.tar.gz) = PO72nVRUo5LoeTrpC18NYy3T4gh5wShWqh0dPQY6Ucg=
SIZE (libgd-2.1.0.tar.gz) = 2330322
SHA256 (libgd-2.1.1.tar.gz) = z0e85aTExtx3uo0DSdHuyc7/d+2G8UskmgeAt/GFVMU=
SIZE (libgd-2.1.1.tar.gz) = 2390586

32
graphics/gd/patches/patch-src_gd_gif_in_c
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_gd_gif_in_c,v 1.1 2015/03/26 09:16:31 jasper Exp $
Security fix for CVE-2014-9709, gd: buffer read overflow in gd_gif_in.c
--- src/gd_gif_in.c.orig Thu Mar 26 10:07:17 2015
+++ src/gd_gif_in.c Thu Mar 26 10:08:35 2015
@@ -75,8 +75,10 @@ static struct {
#define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
+#define CSD_BUF_SIZE 280
+
typedef struct {
- unsigned char buf[280];
+ unsigned char buf[CSD_BUF_SIZE];
int curbit;
int lastbit;
int done;
@@ -410,7 +412,12 @@ GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_
ret = 0;
for (i = scd->curbit, j = 0; j < code_size; ++i, ++j) {
- ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j;
+ if (i < CSD_BUF_SIZE * 8) {
+ ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j;
+ } else {
+ ret = -1;
+ break;
+ }
}
scd->curbit += code_size;

15
graphics/gd/pkg/DESCR
View File

@ -1,7 +1,8 @@
GD is an open source code library for the dynamic creation of images
by programmers. GD is written in C, and "wrappers" are available
for Perl, PHP and other languages. GD creates PNG, JPEG and GIF
images, among other formats. GD is commonly used to generate charts,
graphics, thumbnails, and most anything else, on the fly. While not
restricted to use on the web, the most common applications of GD
involve web site development.
GD is an open source code library for the dynamic creation of images by
programmers.
GD is written in C, and "wrappers" are available for Perl, PHP and other
languages. GD creates PNG, JPEG, GIF, WebP, XPM, BMP images, among other
formats. GD is commonly used to generate charts, graphics, thumbnails,
and most anything else, on the fly. While not restricted to use on the
web, the most common applications of GD involve website development.