update to 2.0.35

ok simon@
This commit is contained in:
steven 2007-07-02 10:46:04 +00:00
parent 4faaa741fe
commit d6995d6f70
4 changed files with 21 additions and 38 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.49 2007/05/31 18:32:06 rui Exp $ # $OpenBSD: Makefile,v 1.50 2007/07/02 10:46:04 steven Exp $
COMMENT= "library for dynamic creation of images" COMMENT= "library for dynamic creation of images"
DISTNAME= gd-2.0.34 DISTNAME= gd-2.0.35
PKGNAME= ${DISTNAME}p1 SHARED_LIBS= gd 20.35
SHARED_LIBS= gd 20.34
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ${HOMEPAGE}releases/ MASTER_SITES= ${HOMEPAGE}releases/

View File

@ -1,5 +1,5 @@
MD5 (gd-2.0.34.tar.gz) = OgLd5CvpKlES/iO0H1RDKw== MD5 (gd-2.0.35.tar.gz) = mCljRI3DbyDLebbpum/e3g==
RMD160 (gd-2.0.34.tar.gz) = FefcFHYtf5M2oAve/1hD5lAqvXo= RMD160 (gd-2.0.35.tar.gz) = SuN7VjvsriYwjeG7xIm4zudo3K0=
SHA1 (gd-2.0.34.tar.gz) = 2QA3b2sC1dKeZ20PG3IuPBIoOyw= SHA1 (gd-2.0.35.tar.gz) = 73+7JQ9Ba6twz9pvdyg2JLg8AdU=
SHA256 (gd-2.0.34.tar.gz) = bn87r6U/x/7h3ps/VAWF8vMMZdEXQURH1FzxFpn2T5I= SHA256 (gd-2.0.35.tar.gz) = u9FrnCaDd6rqnDwtZMXBEExTYA5AkPIi17s4k4w9fVI=
SIZE (gd-2.0.34.tar.gz) = 1273059 SIZE (gd-2.0.35.tar.gz) = 1345700

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2007/02/17 16:30:11 bernd Exp $ $OpenBSD: patch-configure,v 1.4 2007/07/02 10:46:04 steven Exp $
--- configure.orig Wed Feb 7 10:59:57 2007 --- configure.orig Mon Apr 23 16:57:52 2007
+++ configure Wed Feb 7 11:01:33 2007 +++ configure Tue Jun 26 08:11:35 2007
@@ -23162,7 +23162,7 @@ if test `eval echo '${'$as_ac_Header'}'` @@ -22322,7 +22322,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF _ACEOF
@ -10,25 +10,25 @@ $OpenBSD: patch-configure,v 1.3 2007/02/17 16:30:11 bernd Exp $
else else
CPPFLAGS="$_cppflags" CPPFLAGS="$_cppflags"
fi fi
@@ -24254,7 +24254,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec @@ -23262,7 +23262,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
ac_status=$? test ! -s conftest.err
echo "$as_me:$LINENO: \$? = $ac_status" >&5 } && test -s conftest$ac_exeext &&
(exit $ac_status); }; }; then $as_test_x conftest$ac_exeext; then
- acx_pthread_ok=yes - acx_pthread_ok=yes
+ acx_pthread_ok=no + acx_pthread_ok=no
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
@@ -24452,7 +24452,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec @@ -23444,7 +23444,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
ac_status=$? test ! -s conftest.err
echo "$as_me:$LINENO: \$? = $ac_status" >&5 } && test -s conftest$ac_exeext &&
(exit $ac_status); }; }; then $as_test_x conftest$ac_exeext; then
- acx_pthread_ok=yes - acx_pthread_ok=yes
+ acx_pthread_ok=no + acx_pthread_ok=no
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
@@ -25472,7 +25472,7 @@ FFLAGS!$FFLAGS$ac_delim @@ -24461,7 +24461,7 @@ FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim LIBTOOL!$LIBTOOL$ac_delim
XMKMF!$XMKMF$ac_delim XMKMF!$XMKMF$ac_delim

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-gd_png_c,v 1.1 2007/05/31 18:32:06 rui Exp $
--- gd_png.c.orig Thu May 31 16:03:54 2007
+++ gd_png.c Thu May 31 16:05:09 2007
@@ -81,7 +81,11 @@ gdPngErrorHandler (png_structp png_ptr, png_const_char
static void
gdPngReadData (png_structp png_ptr, png_bytep data, png_size_t length)
{
- gdGetBuf (data, length, (gdIOCtx *) png_get_io_ptr (png_ptr));
+ int check;
+ check = gdGetBuf (data, length, (gdIOCtx *) png_get_io_ptr (png_ptr));
+ if (check != length) {
+ png_error(png_ptr, "Read Error: truncated data");
+ }
}
static void