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

Update to imlib2-1.3.0. Initial diffs from 'bsdmaniak at daemon-tips dot org'

Browse Source 
and brad@.

This contains security fixes from the imlib2 cvs repository for CVE-2006-4806,
CVE-2006-4807, CVE-2006-4808 and CVE-2006-4809.

ok brad@, steven@
This commit is contained in:
bernd 2006-11-20 09:21:09 +00:00
parent b58292acd3
commit c0a214242c
17 changed files with 399 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/imlib2/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2006/08/03 12:43:20 espie Exp $
# $OpenBSD: Makefile,v 1.14 2006/11/20 09:21:09 bernd Exp $
COMMENT= "image manipulation library"
DISTNAME= imlib2-1.1.2
PKGNAME= ${DISTNAME}p3
SHARED_LIBS= Imlib2 2.2
DISTNAME= imlib2-1.3.0
SHARED_LIBS= Imlib2 4.0 # .4.0
CATEGORIES= graphics
HOMEPAGE= http://enlightenment.org/Libraries/Imlib2/
@ -20,20 +19,25 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS+= jpeg.>=62::graphics/jpeg \
ungif.>=5::graphics/libungif \
gif.>=5::graphics/libungif \
png.>=2::graphics/png \
tiff.>=35::graphics/tiff \
bz2::archivers/bzip2 \
ltdl::devel/libtool,-ltdl
id3tag.>=3::audio/libid3tag
USE_X11= Yes
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/src/lib/.libs -L${X11BASE}/lib -L${LOCALBASE}/lib"
.if ${MACHINE_ARCH} == "amd64"
CONFIGURE_ARGS+= --enable-amd64
.else
CONFIGURE_ARGS+= --disable-amd64
.endif
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+= --enable-mmx

8
graphics/imlib2/distinfo
View File

@ -1,4 +1,4 @@
MD5 (imlib2-1.1.2.tar.gz) = 3389bad516032c951fda4fe620df0cef
RMD160 (imlib2-1.1.2.tar.gz) = 79decb1ffda55afdd74c26dd48e76071b104b965
SHA1 (imlib2-1.1.2.tar.gz) = ac26760d09aed5eb200101a9846c7647cf991dff
SIZE (imlib2-1.1.2.tar.gz) = 875843
MD5 (imlib2-1.3.0.tar.gz) = 00b724fc6d2dcfa3045bb6a554bb2c8a
RMD160 (imlib2-1.3.0.tar.gz) = 272fc0a62699e0f0f690f4cc8418ac5c8e0ee615
SHA1 (imlib2-1.3.0.tar.gz) = ad9c673a94d4e5e610704cefd06855f900151e25
SIZE (imlib2-1.3.0.tar.gz) = 955862

21
graphics/imlib2/patches/patch-configure_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure_in,v 1.2 2005/06/23 17:46:52 fgsch Exp $
--- configure.in.orig Mon Aug 30 23:46:15 2004
+++ configure.in Thu Jun 23 05:38:14 2005
@@ -214,7 +214,7 @@ dnl /here was freetype headers checking
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_CHECK_LIB(ltdl, lt_dlopen, ltdlopen_libs=-lltdl)
-EXTRA_LIBS="-L/usr/local/lib -L/usr/X11R6/lib"
+EXTRA_LIBS=""
# Test for libjpeg
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
@@ -255,7 +255,7 @@ if test "$png_ok" = yes; then
AC_MSG_RESULT($png_ok)
if test "$png_ok" = yes; then
PNGLIBS="-lpng -lz -lm"
- REQUIREMENTS=libpng12
+ REQUIREMENTS=libpng
else
AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***)
fi

36
graphics/imlib2/patches/patch-loaders_Makefile_in
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-loaders_Makefile_in,v 1.1 2004/09/21 22:40:36 brad Exp $
--- loaders/Makefile.in.orig Mon Aug 30 23:23:11 2004
+++ loaders/Makefile.in Sun Sep 19 05:26:22 2004
@@ -131,19 +131,19 @@ pkg_LTLIBRARIES = $(JPEG_L) $(PNG_L) $(
jpeg_la_SOURCES = loader_jpeg.c
-jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
+jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2
png_la_SOURCES = loader_png.c
-png_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
+png_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
png_la_LIBADD = @PNGLIBS@ -lImlib2
tiff_la_SOURCES = loader_tiff.c
-tiff_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
+tiff_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
tiff_la_LIBADD = @TIFFLIBS@ -lImlib2
gif_la_SOURCES = loader_gif.c
-gif_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
+gif_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
gif_la_LIBADD = @GIFLIBS@ -lImlib2
pnm_la_SOURCES = loader_pnm.c
@@ -171,7 +171,7 @@ zlib_la_LDFLAGS = -no-undefined -module
zlib_la_LIBADD = @ZLIBLIBS@ -lImlib2
bz2_la_SOURCES = loader_bz2.c
-bz2_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs
+bz2_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
bz2_la_LIBADD = @BZ2LIBS@ -lImlib2
lbm_la_SOURCES = loader_lbm.c

23
graphics/imlib2/patches/patch-src_Makefile_in
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/01/06 21:57:00 brad Exp $
--- src/Makefile.in.orig Mon Aug 30 23:23:10 2004
+++ src/Makefile.in Fri Jan 6 16:00:32 2006
@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-LDFLAGS = -L/usr/X11R6/lib
+LDFLAGS = @LDFLAGS@
INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/loaders $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) @XMISS@
MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S asm_blend_cmod.S
@@ -129,8 +129,8 @@ libImlib2_la_SOURCES = scale.c image.c b
EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c context.c color.h context.h draw.h grab.h rend.h rgba.h ximage.h $(MMX_SRCS)
libImlib2_la_LDFLAGS = -version-info 2:2:1
-@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
-@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
+@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) $(MMX_OBJS) -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
+@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
@HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)
@HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

19
graphics/imlib2/patches/patch-src_modules_loaders_loader_argb_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_modules_loaders_loader_argb_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_argb.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_argb.c Mon Nov 6 10:41:32 2006
@@ -47,6 +47,11 @@ load(ImlibImage * im, ImlibProgressFunct
fclose(f);
return 0;
}
+ if ((w < 1) || (h < 1) || (w > 8192) || (h > 8192))
+ {
+ fclose(f);
+ return 0;
+ }
im->w = w;
im->h = h;
if (!im->format)

19
graphics/imlib2/patches/patch-src_modules_loaders_loader_gif_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_modules_loaders_loader_gif_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_gif.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_gif.c Mon Nov 6 10:41:32 2006
@@ -72,6 +72,11 @@ load(ImlibImage * im, ImlibProgressFunct
}
w = gif->Image.Width;
h = gif->Image.Height;
+ if ((w < 1) || (h < 1) || (w > 8192) || (h > 8192))
+ {
+ DGifCloseFile(gif);
+ return 0;
+ }
rows = malloc(h * sizeof(GifRowType *));
if (!rows)
{

20
graphics/imlib2/patches/patch-src_modules_loaders_loader_jpeg_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_modules_loaders_loader_jpeg_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_jpeg.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_jpeg.c Mon Nov 6 10:41:32 2006
@@ -92,6 +92,12 @@ load(ImlibImage * im, ImlibProgressFunct
{
im->w = w = cinfo.output_width;
im->h = h = cinfo.output_height;
+ if ((w < 1) || (h < 1) || (w > 8192) || (h > 8192))
+ {
+ jpeg_destroy_decompress(&cinfo);
+ fclose(f);
+ return 0;
+ }
UNSET_FLAG(im->flags, F_HAS_ALPHA);
im->format = strdup("jpeg");
}

19
graphics/imlib2/patches/patch-src_modules_loaders_loader_lbm_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_modules_loaders_loader_lbm_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_lbm.c.orig Wed Sep 6 13:34:49 2006
+++ src/modules/loaders/loader_lbm.c Mon Nov 6 10:41:32 2006
@@ -421,7 +421,10 @@ 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 < 1) || (im->h < 1) || (im->w > 8192) || (im->h > 8192))
+ {
+ 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. */

21
graphics/imlib2/patches/patch-src_modules_loaders_loader_png_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_modules_loaders_loader_png_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_png.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_png.c Mon Nov 6 10:41:32 2006
@@ -85,6 +85,13 @@ load(ImlibImage * im, ImlibProgressFunct
&interlace_type, NULL, NULL);
im->w = (int)w32;
im->h = (int)h32;
+ if ((w32 < 1) || (h32 < 1) || (w32 > 8192) || (h32 > 8192))
+ {
+ png_read_end(png_ptr, info_ptr);
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ fclose(f);
+ return 0;
+ }
if (color_type == PNG_COLOR_TYPE_PALETTE)
{
png_set_expand(png_ptr);

28
graphics/imlib2/patches/patch-src_modules_loaders_loader_pnm_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_modules_loaders_loader_pnm_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_pnm.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_pnm.c Mon Nov 6 10:41:32 2006
@@ -107,7 +107,7 @@ load(ImlibImage * im, ImlibProgressFunct
}
}
}
- if ((w <= 0) || (w > 8192) || (h <= 0) || (h > 8192) || (v < 0) || (v > 255))
+ if ((v < 0) || (v > 255))
{
fclose(f);
return 0;
@@ -115,6 +115,11 @@ load(ImlibImage * im, ImlibProgressFunct
im->w = w;
im->h = h;
+ if ((w < 1) || (h < 1) || (w > 8192) || (h > 8192))
+ {
+ fclose(f);
+ return 0;
+ }
if (!im->format)
{
if (p == '8')

85
graphics/imlib2/patches/patch-src_modules_loaders_loader_tga_c Normal file
View File

@ -0,0 +1,85 @@
$OpenBSD: patch-src_modules_loaders_loader_tga_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_tga.c.orig Wed Sep 6 13:34:49 2006
+++ src/modules/loaders/loader_tga.c Mon Nov 6 10:41:32 2006
@@ -297,9 +297,8 @@ load(ImlibImage * im, ImlibProgressFunct
im->w = (header->widthHi << 8) | header->widthLo;
im->h = (header->heightHi << 8) | header->heightLo;
- if ((im->w > 32767) || (im->w < 1) || (im->h > 32767) || (im->h < 1))
+ if ((im->w < 1) || (im->h < 1) || (im->w > 8192) || (im->h > 8192))
{
- im->w = 0;
munmap(seg, ss.st_size);
close(fd);
return 0;
@@ -318,7 +317,7 @@ load(ImlibImage * im, ImlibProgressFunct
if (((!im->data) && (im->loader)) || (immediate_load) || (progress))
{
unsigned long datasize;
- unsigned char *bufptr;
+ unsigned char *bufptr, *bufend;
DATA32 *dataptr;
int y;
@@ -346,6 +345,7 @@ load(ImlibImage * im, ImlibProgressFunct
/* bufptr is the next byte to be read from the buffer */
bufptr = filedata;
+ bufend = filedata + datasize;
/* dataptr is the next 32-bit pixel to be filled in */
dataptr = im->data;
@@ -418,9 +418,10 @@ 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;
curbyte = *bufptr++;
@@ -437,7 +438,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 +449,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 +459,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 +474,7 @@ load(ImlibImage * im, ImlibProgressFunct
{
int i;
- for (i = 0; i < count; i++)
+ for (i = 0; (i < count) && (dataptr < final_pixel); i++)
{
switch (bpp)
{

54
graphics/imlib2/patches/patch-src_modules_loaders_loader_tiff_c Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-src_modules_loaders_loader_tiff_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_tiff.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_tiff.c Mon Nov 6 10:41:32 2006
@@ -75,11 +75,11 @@ static void
raster(TIFFRGBAImage_Extra * img, uint32 * rast,
uint32 x, uint32 y, uint32 w, uint32 h)
{
- uint32 image_width, image_height;
+ int image_width, image_height;
uint32 *pixel, pixel_value;
int i, j, dy, rast_offset;
DATA32 *buffer_pixel, *buffer = img->image->data;
- int alpha_premult = (EXTRASAMPLE_UNASSALPHA==img->rgba.alpha);
+ int alpha_premult;
image_width = img->image->w;
image_height = img->image->h;
@@ -91,6 +91,8 @@ raster(TIFFRGBAImage_Extra * img, uint32
/* I don't understand why, but that seems to be what's going on. */
/* libtiff needs better docs! */
+ if (img->rgba.alpha == EXTRASAMPLE_UNASSALPHA)
+ alpha_premult = 1;
for (i = y, rast_offset = 0; i > dy; i--, rast_offset--)
{
pixel = rast + (rast_offset * image_width);
@@ -204,6 +206,12 @@ load(ImlibImage * im, ImlibProgressFunct
rgba_image.image = im;
im->w = width = rgba_image.rgba.width;
im->h = height = rgba_image.rgba.height;
+ if ((width < 1) || (height < 1) || (width > 8192) || (height > 8192))
+ {
+ TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
+ TIFFClose(tif);
+ return 0;
+ }
rgba_image.num_pixels = num_pixels = width * height;
if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
SET_FLAG(im->flags, F_HAS_ALPHA);
@@ -397,8 +405,9 @@ save(ImlibImage * im, ImlibProgressFunct
if (has_alpha)
{
+ uint16 extras[] = { EXTRASAMPLE_ASSOCALPHA };
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 4);
- TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, EXTRASAMPLE_ASSOCALPHA);
+ TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, 1, extras);
}
else
{

31
graphics/imlib2/patches/patch-src_modules_loaders_loader_xpm_c Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-src_modules_loaders_loader_xpm_c,v 1.1 2006/11/20 09:21:09 bernd Exp $
Fix for CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809.
Should be fixed in >1.3.0.
--- src/modules/loaders/loader_xpm.c.orig Tue Sep 5 02:37:07 2006
+++ src/modules/loaders/loader_xpm.c Mon Nov 6 10:41:32 2006
@@ -211,19 +211,19 @@ load(ImlibImage * im, ImlibProgressFunct
xpm_parse_done();
return 0;
}
- if ((w > 32767) || (w < 1))
+ if ((w > 8192) || (w < 1))
{
fprintf(stderr,
- "IMLIB ERROR: Image width > 32767 or < 1 pixels for file\n");
+ "IMLIB ERROR: Image width > 8192 or < 1 pixels for file\n");
free(line);
fclose(f);
xpm_parse_done();
return 0;
}
- if ((h > 32767) || (h < 1))
+ if ((h > 8192) || (h < 1))
{
fprintf(stderr,
- "IMLIB ERROR: Image height > 32767 or < 1 pixels for file\n");
+ "IMLIB ERROR: Image height > 8192 or < 1 pixels for file\n");
free(line);
fclose(f);
xpm_parse_done();

327
graphics/imlib2/patches/patch-src_rgba_c
View File

@ -1,327 +0,0 @@
$OpenBSD: patch-src_rgba_c,v 1.2 2004/09/21 22:40:36 brad Exp $
--- src/rgba.c.orig Sat Jul 12 21:09:17 2003
+++ src/rgba.c Tue Aug 24 20:42:32 2004
@@ -2856,7 +2856,7 @@ __imlib_RGBA_to_RGB565_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -2926,7 +2926,7 @@ __imlib_RGBA_to_RGB565_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -2998,7 +2998,7 @@ __imlib_RGBA_to_BGR565_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3068,7 +3068,7 @@ __imlib_RGBA_to_BGR565_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3140,7 +3140,7 @@ __imlib_RGBA_to_RGB555_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3210,7 +3210,7 @@ __imlib_RGBA_to_RGB555_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3282,7 +3282,7 @@ __imlib_RGBA_to_BGR555_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3352,7 +3352,7 @@ __imlib_RGBA_to_BGR555_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3423,7 +3423,7 @@ __imlib_RGBA_to_RGB332_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3467,7 +3467,7 @@ __imlib_RGBA_to_RGB332_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB332(src, dest);
}
@@ -3520,7 +3520,7 @@ __imlib_RGBA_to_RGB332_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3565,7 +3565,7 @@ __imlib_RGBA_to_RGB332_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB332_DITHER(src, dest);
}
@@ -3599,7 +3599,7 @@ __imlib_RGBA_to_RGB666_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3643,7 +3643,7 @@ __imlib_RGBA_to_RGB666_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB666(src, dest);
}
@@ -3696,7 +3696,7 @@ __imlib_RGBA_to_RGB666_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3741,7 +3741,7 @@ __imlib_RGBA_to_RGB666_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB666_DITHER(src, dest);
}
@@ -3775,7 +3775,7 @@ __imlib_RGBA_to_RGB232_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3819,7 +3819,7 @@ __imlib_RGBA_to_RGB232_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB232(src, dest);
}
@@ -3872,7 +3872,7 @@ __imlib_RGBA_to_RGB232_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3917,7 +3917,7 @@ __imlib_RGBA_to_RGB232_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB232_DITHER(src, dest);
}
@@ -3951,7 +3951,7 @@ __imlib_RGBA_to_RGB222_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3995,7 +3995,7 @@ __imlib_RGBA_to_RGB222_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB222(src, dest);
}
@@ -4048,7 +4048,7 @@ __imlib_RGBA_to_RGB222_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4093,7 +4093,7 @@ __imlib_RGBA_to_RGB222_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB222_DITHER(src, dest);
}
@@ -4127,7 +4127,7 @@ __imlib_RGBA_to_RGB221_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4171,7 +4171,7 @@ __imlib_RGBA_to_RGB221_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB221(src, dest);
}
@@ -4224,7 +4224,7 @@ __imlib_RGBA_to_RGB221_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4269,7 +4269,7 @@ __imlib_RGBA_to_RGB221_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB221_DITHER(src, dest);
}
@@ -4303,7 +4303,7 @@ __imlib_RGBA_to_RGB121_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4347,7 +4347,7 @@ __imlib_RGBA_to_RGB121_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB121(src, dest);
}
@@ -4400,7 +4400,7 @@ __imlib_RGBA_to_RGB121_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4445,7 +4445,7 @@ __imlib_RGBA_to_RGB121_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB121_DITHER(src, dest);
}
@@ -4479,7 +4479,7 @@ __imlib_RGBA_to_RGB111_fast(DATA32 * src
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4523,7 +4523,7 @@ __imlib_RGBA_to_RGB111_fast(DATA32 * src
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB111(src, dest);
}
@@ -4576,7 +4576,7 @@ __imlib_RGBA_to_RGB111_dither(DATA32 * s
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4621,7 +4621,7 @@ __imlib_RGBA_to_RGB111_dither(DATA32 * s
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((long)dest)))); x++)
{
WRITE1_RGBA_RGB111_DITHER(src, dest);
}

33
graphics/imlib2/pkg/PFRAG.shared
View File

@ -1,17 +1,18 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/26 14:35:52 steven Exp $
lib/imlib2_loaders/filter/bump_map.so
lib/imlib2_loaders/filter/colormod.so
lib/imlib2_loaders/filter/testfilter.so
lib/imlib2_loaders/image/argb.so
lib/imlib2_loaders/image/bmp.so
lib/imlib2_loaders/image/bz2.so
lib/imlib2_loaders/image/gif.so
lib/imlib2_loaders/image/jpeg.so
lib/imlib2_loaders/image/lbm.so
lib/imlib2_loaders/image/png.so
lib/imlib2_loaders/image/pnm.so
lib/imlib2_loaders/image/tga.so
lib/imlib2_loaders/image/tiff.so
lib/imlib2_loaders/image/xpm.so
lib/imlib2_loaders/image/zlib.so
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/11/20 09:21:09 bernd Exp $
lib/imlib2/filters/bumpmap.so
lib/imlib2/filters/colormod.so
lib/imlib2/filters/testfilter.so
lib/imlib2/loaders/argb.so
lib/imlib2/loaders/bmp.so
lib/imlib2/loaders/bz2.so
lib/imlib2/loaders/gif.so
lib/imlib2/loaders/id3.so
lib/imlib2/loaders/jpeg.so
lib/imlib2/loaders/lbm.so
lib/imlib2/loaders/png.so
lib/imlib2/loaders/pnm.so
lib/imlib2/loaders/tga.so
lib/imlib2/loaders/tiff.so
lib/imlib2/loaders/xpm.so
lib/imlib2/loaders/zlib.so
@lib lib/libImlib2.so.${LIBImlib2_VERSION}

107
graphics/imlib2/pkg/PLIST
View File

@ -1,48 +1,77 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/21 22:40:36 brad Exp $
bin/bumpmaptest
bin/color_spaces
bin/imconvert
bin/imlib2
@comment $OpenBSD: PLIST,v 1.4 2006/11/20 09:21:09 bernd Exp $
bin/imlib2-config
bin/imlib2_bumpmap
bin/imlib2_colorspace
bin/imlib2_conv
bin/imlib2_grab
bin/imlib2_poly
bin/imlib2_show
bin/imlib2_test
bin/imlib2_view
bin/polytest
include/Imlib2.h
lib/imlib2_loaders/
lib/imlib2_loaders/filter/
lib/imlib2_loaders/filter/bump_map.a
lib/imlib2_loaders/filter/bump_map.la
lib/imlib2_loaders/filter/colormod.a
lib/imlib2_loaders/filter/colormod.la
lib/imlib2_loaders/filter/testfilter.a
lib/imlib2_loaders/filter/testfilter.la
lib/imlib2_loaders/image/
lib/imlib2_loaders/image/argb.a
lib/imlib2_loaders/image/argb.la
lib/imlib2_loaders/image/bmp.a
lib/imlib2_loaders/image/bmp.la
lib/imlib2_loaders/image/bz2.a
lib/imlib2_loaders/image/bz2.la
lib/imlib2_loaders/image/gif.a
lib/imlib2_loaders/image/gif.la
lib/imlib2_loaders/image/jpeg.a
lib/imlib2_loaders/image/jpeg.la
lib/imlib2_loaders/image/lbm.a
lib/imlib2_loaders/image/lbm.la
lib/imlib2_loaders/image/png.a
lib/imlib2_loaders/image/png.la
lib/imlib2_loaders/image/pnm.a
lib/imlib2_loaders/image/pnm.la
lib/imlib2_loaders/image/tga.a
lib/imlib2_loaders/image/tga.la
lib/imlib2_loaders/image/tiff.a
lib/imlib2_loaders/image/tiff.la
lib/imlib2_loaders/image/xpm.a
lib/imlib2_loaders/image/xpm.la
lib/imlib2_loaders/image/zlib.a
lib/imlib2_loaders/image/zlib.la
lib/imlib2/
lib/imlib2/filters/
lib/imlib2/filters/bumpmap.a
lib/imlib2/filters/bumpmap.la
lib/imlib2/filters/colormod.a
lib/imlib2/filters/colormod.la
lib/imlib2/filters/testfilter.a
lib/imlib2/filters/testfilter.la
lib/imlib2/loaders/
lib/imlib2/loaders/argb.a
lib/imlib2/loaders/argb.la
lib/imlib2/loaders/bmp.a
lib/imlib2/loaders/bmp.la
lib/imlib2/loaders/bz2.a
lib/imlib2/loaders/bz2.la
lib/imlib2/loaders/gif.a
lib/imlib2/loaders/gif.la
lib/imlib2/loaders/id3.a
lib/imlib2/loaders/id3.la
lib/imlib2/loaders/jpeg.a
lib/imlib2/loaders/jpeg.la
lib/imlib2/loaders/lbm.a
lib/imlib2/loaders/lbm.la
lib/imlib2/loaders/png.a
lib/imlib2/loaders/png.la
lib/imlib2/loaders/pnm.a
lib/imlib2/loaders/pnm.la
lib/imlib2/loaders/tga.a
lib/imlib2/loaders/tga.la
lib/imlib2/loaders/tiff.a
lib/imlib2/loaders/tiff.la
lib/imlib2/loaders/xpm.a
lib/imlib2/loaders/xpm.la
lib/imlib2/loaders/zlib.a
lib/imlib2/loaders/zlib.la
lib/libImlib2.a
lib/libImlib2.la
lib/pkgconfig/
lib/pkgconfig/imlib2.pc
%%SHARED%%
share/imlib2/
share/imlib2/data/
share/imlib2/data/fonts/
share/imlib2/data/fonts/cinema.ttf
share/imlib2/data/fonts/grunge.ttf
share/imlib2/data/fonts/morpheus.ttf
share/imlib2/data/fonts/notepad.ttf
share/imlib2/data/images/
share/imlib2/data/images/audio.png
share/imlib2/data/images/bg.png
share/imlib2/data/images/bulb.png
share/imlib2/data/images/cal.png
share/imlib2/data/images/calc.png
share/imlib2/data/images/folder.png
share/imlib2/data/images/globe.png
share/imlib2/data/images/imlib2.png
share/imlib2/data/images/lock.png
share/imlib2/data/images/mail.png
share/imlib2/data/images/menu.png
share/imlib2/data/images/mush.png
share/imlib2/data/images/paper.png
share/imlib2/data/images/sh1.png
share/imlib2/data/images/sh2.png
share/imlib2/data/images/sh3.png
share/imlib2/data/images/stop.png
share/imlib2/data/images/tnt.png