Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs17:/tmp/cvs-serv14409/10.4/unstable/main/finkinfo/graphics
Modified Files:
imlib2-loaders.info imlib2.info imlib2.patch
Log Message:
new upstream, security patch a well
Index: imlib2-loaders.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imlib2-loaders.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imlib2-loaders.info 21 Apr 2006 21:43:45 -0000 1.3
+++ imlib2-loaders.info 24 Aug 2007 13:20:55 -0000 1.4
@@ -1,16 +1,23 @@
Package: imlib2-loaders
-Version: 1.2.2
+Version: 1.4.0
Revision: 1021
Description: Image handling library (extra loaders)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: imlib2-shlibs (>= %v-1)
-BuildDepends: imlib2 (>= %v-1), libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, x11-dev
+BuildDepends: <<
+ imlib2 (>= %v-1),
+ libgettext3-dev,
+ gettext-bin,
+ gettext-tools,
+ libiconv-dev,
+ x11-dev
+<<
Source: mirror:sourceforge:enlightenment/imlib2_loaders-%v.tar.gz
-Source-MD5: d6442646a4544901433173ec359bd8c5
-PatchScript: perl -pi.bak -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g' ltmain.sh configure
+Source-MD5: 6f51ef8d566769b9ac17c640a34fb1c8
+PatchScript: perl -pi -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g' ltmain.sh configure
SetLIBS: -L%p/lib
ConfigureParams: --disable-dependency-tracking
--with-imlib2-config=%p/bin/imlib2-config --disable-edb --disable-eet
--disable-mmx
Index: imlib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imlib2.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- imlib2.info 13 Jul 2006 02:36:04 -0000 1.7
+++ imlib2.info 24 Aug 2007 13:20:55 -0000 1.8
@@ -1,17 +1,29 @@
Package: imlib2
-Version: 1.2.2
-Revision: 1023
+Version: 1.4.0
+Revision: 1021
Description: Image handling library for X11
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
-BuildDepends: freetype219, libgettext3-dev, gettext-bin, gettext-tools,
libid3tag, libiconv-dev, libjpeg, libpng3, libtiff, giflib | libungif, x11-dev
-Replaces: %N-shlibs (<<1.1.0-14)
+BuildDepends: <<
+ freetype219,
+ libgettext3-dev,
+ gettext-bin,
+ gettext-tools,
+ libid3tag,
+ libiconv-dev,
+ libjpeg,
+ libpng3,
+ libtiff,
+ giflib | libungif,
+ x11-dev
+<<
+Replaces: %N-shlibs (<< 1.1.0-14)
BuildDependsOnly: true
Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
-Source-MD5: 07b2a7745ddd3c7c4480b50cb916174c
+Source-MD5: 69f7ee996c943142332b4c98597b095c
UpdateLibtoolInDirs: libltdl
PatchScript: <<
perl -pi -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g' ltmain.sh configure
@@ -29,7 +41,17 @@
DocFiles: AUTHORS COPYING ChangeLog README TODO doc/*.html doc/*.gif
SplitOff: <<
Package: %N-shlibs
- Depends: freetype219-shlibs, libgettext3-shlibs, libiconv,
libid3tag-shlibs, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs,
giflib-shlibs | libungif-shlibs, x11
+ Depends: <<
+ freetype219-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libid3tag-shlibs,
+ libjpeg-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ libtiff-shlibs,
+ giflib-shlibs | libungif-shlibs,
+ x11
+ <<
DocFiles: COPYING
Files: lib/libImlib2.*.dylib lib/imlib2
Shlibs: %p/lib/libImlib2.1.dylib 4.0.0 %n (>= 1.2.0-1)
Index: imlib2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imlib2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imlib2.patch 13 Jul 2006 02:36:05 -0000 1.2
+++ imlib2.patch 24 Aug 2007 13:20:55 -0000 1.3
@@ -1,14 +1,105 @@
---- imlib2-1.2.2/imlib2.pc.in 2006-01-23 22:46:12.000000000 -0500
-+++ imlib2-1.2.2-new/imlib2.pc.in 2006-07-05 22:24:36.000000000 -0400
-@@ -5,8 +5,6 @@
-
+--- imlib2-1.4.0/imlib2.pc.in 2007-03-23 05:32:39.000000000 -0400
++++ imlib2-1.4.0-new/imlib2.pc.in 2007-08-23 12:29:22.000000000 -0400
+@@ -6,6 +6,6 @@
Name: imlib2
Description: Powerful image loading and rendering library
--Requires: @requirements@
Version: @VERSION@
-Libs: -L${libdir} -lImlib2
-Cflags: -I${includedir}
--
+Libs: [EMAIL PROTECTED]@/lib/freetype219/lib -L${libdir} -lImlib2 -lfreetype
+Cflags: [EMAIL PROTECTED]@/lib/freetype219/include -I${includedir}
+
+--- imlib2-1.4.0/src/modules/loaders/loader_argb.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_argb.c 2007-08-23
12:36:18.000000000 -0400
+@@ -10,7 +10,7 @@
+ load(ImlibImage * im, ImlibProgressFunction progress,
+ char progress_granularity, char immediate_load)
+ {
+- int w, h, alpha;
++ int w=0, h=0, alpha=0;
+ FILE *f;
+
+ if (im->data)
+@@ -23,6 +23,8 @@
+ {
+ char buf[256], buf2[256];
+
++ memset(buf, 0, sizeof(buf));
++ memset(buf2, 0, sizeof(buf));
+ if (!fgets(buf, 255, f))
+ {
+ fclose(f);
+--- imlib2-1.4.0/src/modules/loaders/loader_jpeg.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_jpeg.c 2007-08-23
12:37:51.000000000 -0400
+@@ -94,8 +94,9 @@
+ im->w = w = cinfo.output_width;
+ im->h = h = cinfo.output_height;
+
+- if (cinfo.rec_outbuf_height > 16)
++ if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 8192 || h >
8192)
+ {
++ im->w = im->h = 0;
+ jpeg_destroy_decompress(&cinfo);
+ fclose(f);
+ return 0;
+--- imlib2-1.4.0/src/modules/loaders/loader_lbm.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_lbm.c 2007-08-23
12:37:03.000000000 -0400
+@@ -437,6 +437,7 @@
+ }
+ }
+ if (!full || !ok) {
++ im->w = im->h = 0;
+ freeilbm(&ilbm);
+ return ok;
+ }
+@@ -451,12 +452,13 @@
+ 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;
+@@ -495,6 +497,7 @@
+ * the memory for im->data.
+ *----------*/
+ if (!ok) {
++ im->w = im->h = 0;
+ if (im->data) free(im->data);
+ im->data = NULL;
+ }
+--- imlib2-1.4.0/src/modules/loaders/loader_pnm.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_pnm.c 2007-08-23
12:28:37.000000000 -0400
+@@ -68,7 +68,7 @@
+ int i = 0;
+
+ /* read numbers */
+- while (c != EOF && !isspace(c))
++ while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
+ {
+ buf[i++] = c;
+ c = fgetc(f);
+--- imlib2-1.4.0/src/modules/loaders/loader_tga.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_tga.c 2007-08-23
12:44:11.000000000 -0400
+@@ -350,7 +350,9 @@
+ 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)
+ {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
