imlib2 stable port information

Package: imlib2
Version: 1.4.0
Revision: 1022
Description: Image handling library for X11
License: BSD
Maintainer: Benjamin Reed

Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
freetype219,
libgettext3-dev,
gettext-bin,
gettext-tools,
libid3tag,
libiconv-dev,
libjpeg,
libpng3,
libtiff,
giflib | libungif,
x11-dev,
xmkmf (>= 1.0.2-3)
<<
Replaces: %N-shlibs (<< 1.1.0-14)
BuildDependsOnly: true

Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
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
sed -e 's,@FINKPREFIX@,%p,g' < %a/%n.patch | patch -p1
<<

SetCPPFLAGS: -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/include -I/usr/X11R6/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L/usr/X11R6/lib
SetLIBS: -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-mmx

CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
./configure %c
make
<<
InstallScript: make install DESTDIR=%d
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
<<
DocFiles: COPYING
Files: lib/libImlib2.*.dylib lib/imlib2
Shlibs: %p/lib/libImlib2.1.dylib 6.0.0 %n (>= 1.4.0-1)
<<

Homepage: http://enlightenment.sourceforge.net/Libraries/Imlib2/
DescDetail: <<
Imlib2 is the successor to Imlib. It is not just a newer version, it is a
completely new library. Imlib2 can be installed alongside Imlib 1.x
without any problems since they are effectively different libraries, but
they have very similar functionality.
<<

imlib2 stable port .patch


--- 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
Version: @VERSION@
-Libs: -L${libdir} -lImlib2
-Cflags: -I${includedir}
+Libs: -L@FINKPREFIX@/lib/freetype219/lib -L${libdir} -lImlib2 -lfreetype
+Cflags: -I@FINKPREFIX@/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)
{

imlib2 _unstable_ port information

Package: imlib2
Version: 1.4.0
Revision: 1022
Description: Image handling library for X11
License: BSD
Maintainer: Benjamin Reed

Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
freetype219,
libgettext3-dev,
gettext-bin,
gettext-tools,
libid3tag,
libiconv-dev,
libjpeg,
libpng3,
libtiff,
giflib | libungif,
x11-dev,
xmkmf (>= 1.0.2-3)
<<
Replaces: %N-shlibs (<< 1.1.0-14)
BuildDependsOnly: true

Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
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
sed -e 's,@FINKPREFIX@,%p,g' < %a/%n.patch | patch -p1
<<

SetCPPFLAGS: -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/include -I/usr/X11R6/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L/usr/X11R6/lib
SetLIBS: -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-mmx

CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
./configure %c
make
<<
InstallScript: make install DESTDIR=%d
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
<<
DocFiles: COPYING
Files: lib/libImlib2.*.dylib lib/imlib2
Shlibs: %p/lib/libImlib2.1.dylib 6.0.0 %n (>= 1.4.0-1)
<<

Homepage: http://enlightenment.sourceforge.net/Libraries/Imlib2/
DescDetail: <<
Imlib2 is the successor to Imlib. It is not just a newer version, it is a
completely new library. Imlib2 can be installed alongside Imlib 1.x
without any problems since they are effectively different libraries, but
they have very similar functionality.
<<

imlib2 _unstable_ port .patch


--- 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
Version: @VERSION@
-Libs: -L${libdir} -lImlib2
-Cflags: -I${includedir}
+Libs: -L@FINKPREFIX@/lib/freetype219/lib -L${libdir} -lImlib2 -lfreetype
+Cflags: -I@FINKPREFIX@/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)
{