pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/imlib2 update to 1.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/3117eceff63e
branches: trunk
changeset: 533409:3117eceff63e
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Sep 18 19:18:10 2007 +0000
description:
update to 1.4.0
changes: security fixes, and a few crashes fixed
diffstat:
graphics/imlib2/Makefile | 5 +-
graphics/imlib2/distinfo | 16 ++-----
graphics/imlib2/patches/patch-aa | 12 ------
graphics/imlib2/patches/patch-ac | 19 +++++----
graphics/imlib2/patches/patch-af | 12 ------
graphics/imlib2/patches/patch-cc | 47 -----------------------
graphics/imlib2/patches/patch-cd | 18 ---------
graphics/imlib2/patches/patch-cf | 80 ----------------------------------------
graphics/imlib2/patches/patch-cg | 32 ----------------
9 files changed, 17 insertions(+), 224 deletions(-)
diffs (truncated from 334 to 300 lines):
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile Tue Sep 18 19:11:39 2007 +0000
+++ b/graphics/imlib2/Makefile Tue Sep 18 19:18:10 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2007/08/02 21:35:14 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/18 19:18:10 drochner Exp $
-DISTNAME= imlib2-1.3.0
-PKGREVISION= 1
+DISTNAME= imlib2-1.4.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/distinfo
--- a/graphics/imlib2/distinfo Tue Sep 18 19:11:39 2007 +0000
+++ b/graphics/imlib2/distinfo Tue Sep 18 19:18:10 2007 +0000
@@ -1,18 +1,12 @@
-$NetBSD: distinfo,v 1.19 2007/08/02 21:35:14 tnn Exp $
+$NetBSD: distinfo,v 1.20 2007/09/18 19:18:10 drochner Exp $
-SHA1 (imlib2-1.3.0.tar.gz) = ad9c673a94d4e5e610704cefd06855f900151e25
-RMD160 (imlib2-1.3.0.tar.gz) = 272fc0a62699e0f0f690f4cc8418ac5c8e0ee615
-Size (imlib2-1.3.0.tar.gz) = 955862 bytes
-SHA1 (patch-aa) = 03767f5b2d80b257d1d426feaa62f390971099ee
+SHA1 (imlib2-1.4.0.tar.gz) = 2bbd65b82a690d21dab2bfeb33cc370f6bb49393
+RMD160 (imlib2-1.4.0.tar.gz) = 5b663a420e1008ddc047665912cad473323803da
+Size (imlib2-1.4.0.tar.gz) = 955897 bytes
SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5
-SHA1 (patch-ac) = da65ecd50753c37e267c2fd3de7f1dcef8dab1f1
+SHA1 (patch-ac) = bd81a8f1dfaacb43a4f62a187c4d00c43be5a7e3
SHA1 (patch-ad) = adf301fe0179aa1ab05fc54bb7ab706ee97ab7a7
SHA1 (patch-ae) = 6503e4cbc9bbb93f971ab2ae9fd7d50ddee9e0e8
-SHA1 (patch-af) = 5ef016d8c0916280a72d03fac4ed41e670e004e4
SHA1 (patch-ca) = c2150a4c1ad3ccccaf37961e2f301cd7f2ba2044
SHA1 (patch-cb) = da837b92a1a4cfd139fe2d9ed319d1cd6e0fb703
-SHA1 (patch-cc) = 6a9d1b59e0574d8bb9cc7493a314feb1c90cc57f
-SHA1 (patch-cd) = 398d5ea852ac5ece67dd34d83726422895058a6c
SHA1 (patch-ce) = 2a6d3fd704885d56b3ed4c2a19d2800f29c7c9a0
-SHA1 (patch-cf) = c6a2bd12ce8d6bf2fafcd2ed7cd6ead734456808
-SHA1 (patch-cg) = 5767ddcffce7c0da93aa942c80f67d14e28788fe
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-aa
--- a/graphics/imlib2/patches/patch-aa Tue Sep 18 19:11:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2007/03/14 16:10:43 yyamano Exp $
-
---- configure.in.orig 2006-09-29 02:59:07.000000000 +0900
-+++ configure.in
-@@ -116,6 +116,7 @@ esac
-
- case $host_os in
- solaris*) mmx="no";;
-+ darwin*) mmx="no";;
- esac
-
- dnl
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-ac
--- a/graphics/imlib2/patches/patch-ac Tue Sep 18 19:11:39 2007 +0000
+++ b/graphics/imlib2/patches/patch-ac Tue Sep 18 19:18:10 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/11/04 20:11:47 tv Exp $
+$NetBSD: patch-ac,v 1.5 2007/09/18 19:18:11 drochner Exp $
---- src/lib/grab.c.orig 2004-11-01 04:39:42.000000000 -0500
+--- src/lib/grab.c.orig 2007-02-16 12:58:53.000000000 +0100
+++ src/lib/grab.c
-@@ -412,7 +412,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
+@@ -539,7 +539,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
int i;
int src_x, src_y, src_w, src_h, origw, origh;
int width, height, clipx, clipy;
@@ -12,7 +12,7 @@
XImage *xim = NULL, *mxim = NULL;
static signed char x_does_shm = -1;
XColor cols[256];
-@@ -545,14 +547,17 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
+@@ -673,14 +675,17 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
/* Create an Ximage (shared or not) */
if (x_does_shm < 0)
{
@@ -30,14 +30,15 @@
if (x_does_shm)
{
_x_err = 0;
-@@ -599,12 +604,14 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
+@@ -727,6 +732,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
}
}
}
+#endif /* !__INTERIX */
if (!is_shm)
xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap);
-
+ if (!xim)
+@@ -739,6 +745,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
if ((m) && (domask))
{
_x_err = 0;
@@ -45,7 +46,7 @@
if (x_does_shm)
{
mxim = XShmCreateImage(d, v, 1, ZPixmap, NULL, &mshminfo, w, h);
-@@ -652,6 +659,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
+@@ -786,6 +793,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
}
}
}
@@ -53,7 +54,7 @@
if (!is_mshm)
mxim = XGetImage(d, m, 0, 0, w, h, 0xffffffff, ZPixmap);
}
-@@ -705,6 +713,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
+@@ -844,6 +852,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
d, xim, mxim, v, xatt.depth, x, y, w, h, 0);
/* destroy the Ximage */
@@ -61,7 +62,7 @@
if (is_shm)
{
XSync(d, False);
-@@ -718,6 +727,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
+@@ -857,6 +866,7 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
shmdt(mshminfo.shmaddr);
shmctl(mshminfo.shmid, IPC_RMID, 0);
}
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-af
--- a/graphics/imlib2/patches/patch-af Tue Sep 18 19:11:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.2 2007/08/02 21:35:14 tnn Exp $
-
---- configure.orig 2006-09-29 03:02:33.000000000 +0900
-+++ configure
-@@ -21224,6 +21224,7 @@ esac
-
- case $host_os in
- solaris*) mmx="no";;
-+ darwin*) mmx="no";;
- esac
-
- # Check whether --enable-mmx was given.
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-cc
--- a/graphics/imlib2/patches/patch-cc Tue Sep 18 19:11:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2006/11/24 12:46:12 drochner Exp $
-
---- src/modules/loaders/loader_lbm.c.orig 2006-09-06 13:34:49.000000000 +0200
-+++ src/modules/loaders/loader_lbm.c
-@@ -421,7 +421,7 @@ ILBM ilbm;
-
- im->w = L2RWORD(ilbm.bmhd.data);
- im->h = L2RWORD(ilbm.bmhd.data + 2);
-- if (im->w <= 0 || im->h <= 0) ok = 0;
-+ if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
-
- ilbm.depth = ilbm.bmhd.data[8];
- if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
-@@ -453,6 +453,7 @@ ILBM ilbm;
- }
- }
- if (!full || !ok) {
-+ im->w = im->h = 0;
- freeilbm(&ilbm);
- return ok;
- }
-@@ -467,12 +468,13 @@ ILBM ilbm;
- cancel = 0;
- plane[0] = NULL;
-
-+ n = ilbm.depth;
-+ if (ilbm.mask == 1) n++;
-+
- im->data = malloc(im->w * im->h * sizeof(DATA32));
-- if (im->data) {
-- n = ilbm.depth;
-- if (ilbm.mask == 1) n++;
-+ plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
-+ if (im->data && plane[0]) {
-
-- plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
- for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
-
- z = ((im->w + 15) / 16) * 2 * n;
-@@ -511,6 +513,7 @@ ILBM ilbm;
- * the memory for im->data.
- *----------*/
- if (!ok) {
-+ im->w = im->h = 0;
- if (im->data) free(im->data);
- im->data = NULL;
- }
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-cd
--- a/graphics/imlib2/patches/patch-cd Tue Sep 18 19:11:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2006/11/24 12:46:12 drochner Exp $
-
---- src/modules/loaders/loader_png.c.orig 2006-09-05 02:37:07.000000000 +0200
-+++ src/modules/loaders/loader_png.c
-@@ -83,6 +83,13 @@ load(ImlibImage * im, ImlibProgressFunct
- png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
- (png_uint_32 *) (&h32), &bit_depth, &color_type,
- &interlace_type, NULL, NULL);
-+ if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383)
-+ {
-+ png_read_end(png_ptr, info_ptr);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-+ fclose(f);
-+ return 0;
-+ }
- im->w = (int)w32;
- im->h = (int)h32;
- if (color_type == PNG_COLOR_TYPE_PALETTE)
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-cf
--- a/graphics/imlib2/patches/patch-cf Tue Sep 18 19:11:39 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2006/11/24 12:46:12 drochner Exp $
-
---- src/modules/loaders/loader_tga.c.orig 2006-09-06 13:34:49.000000000 +0200
-+++ src/modules/loaders/loader_tga.c
-@@ -319,6 +319,7 @@ load(ImlibImage * im, ImlibProgressFunct
- {
- unsigned long datasize;
- unsigned char *bufptr;
-+ unsigned char *bufend;
- DATA32 *dataptr;
-
- int y;
-@@ -347,6 +348,9 @@ load(ImlibImage * im, ImlibProgressFunct
- /* bufptr is the next byte to be read from the buffer */
- bufptr = filedata;
-
-+ /* bufend is one past the last byte to be read from the buffer */
-+ bufend = filedata + datasize;
-+
- /* dataptr is the next 32-bit pixel to be filled in */
- dataptr = im->data;
-
-@@ -364,7 +368,9 @@ load(ImlibImage * im, ImlibProgressFunct
- else
- dataptr = im->data + (y * im->w);
-
-- for (x = 0; x < im->w; x++) /* for each pixel in the row */
-+ for (x = 0;
-+ x < im->w && bufptr+bpp/8 < bufend;
-+ x++) /* for each pixel in the row */
- {
- switch (bpp)
- {
-@@ -418,8 +424,8 @@ load(ImlibImage * im, ImlibProgressFunct
- unsigned char curbyte, red, green, blue, alpha;
- DATA32 *final_pixel = dataptr + im->w * im->h;
-
-- /* loop until we've got all the pixels */
-- while (dataptr < final_pixel)
-+ /* loop until we've got all the pixels or run out of input */
-+ while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend)
- {
- int count;
-
-@@ -437,7 +443,7 @@ load(ImlibImage * im, ImlibProgressFunct
- green = *bufptr++;
- red = *bufptr++;
- alpha = *bufptr++;
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- WRITE_RGBA(dataptr, red, green, blue, alpha);
- dataptr++;
-@@ -448,7 +454,7 @@ load(ImlibImage * im, ImlibProgressFunct
- blue = *bufptr++;
- green = *bufptr++;
- red = *bufptr++;
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- WRITE_RGBA(dataptr, red, green, blue,
- (char)0xff);
-@@ -458,7 +464,7 @@ load(ImlibImage * im, ImlibProgressFunct
-
- case 8:
- alpha = *bufptr++;
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- WRITE_RGBA(dataptr, alpha, alpha, alpha,
- (char)0xff);
-@@ -473,7 +479,7 @@ load(ImlibImage * im, ImlibProgressFunct
- {
- int i;
-
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- switch (bpp)
- {
diff -r 22701463c836 -r 3117eceff63e graphics/imlib2/patches/patch-cg
--- a/graphics/imlib2/patches/patch-cg Tue Sep 18 19:11:39 2007 +0000
Home |
Main Index |
Thread Index |
Old Index