Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=8639b97cb24e31b0db2897a1b3073d1125c26e67
commit 8639b97cb24e31b0db2897a1b3073d1125c26e67 Author: James Buren <[email protected]> Date: Sat Nov 5 00:37:27 2011 -0500 imlib-1.9.15-8-x86_64 * remove package diff --git a/source/xlib-extra/imlib/FrugalBuild b/source/xlib-extra/imlib/FrugalBuild deleted file mode 100644 index 42f5785..0000000 --- a/source/xlib-extra/imlib/FrugalBuild +++ /dev/null @@ -1,20 +0,0 @@ -# Compiling Time: 0.32 SBU -# Maintainer: Miklos Vajna <[email protected]> - -pkgname=imlib -pkgver=1.9.15 -pkgrel=8 -pkgdesc="A display depth-independent image loading and rendering library" -url="http://freshmeat.net/projects/imlib/"; -depends=('libtiff' 'libjpeg>=8a' 'libgif' 'libpng>=1.4.1' 'libxext') -groups=('xlib-extra') -archs=('i686' 'x86_64' 'ppc') -_F_gnome_devel=y -Finclude gnome -source=(${source[@]} imlib-1.9.15-sec2.patch imlib-png-1.4.patch imlib-m4-fix.patch) -Fconfopts="$Fconfopts --sysconfdir=/etc/imlib" -sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' \ - '723e3d44db2cd2f4134efdb7f755bdd07bb61090' \ - '27e9db6cf73e5bd27e25a7b6a620c62cf42e5bad' \ - 'a0eac327e61154323de19ecd608ebedbfb9b4708') -# optimization OK diff --git a/source/xlib-extra/imlib/imlib-1.9.15-sec2.patch b/source/xlib-extra/imlib/imlib-1.9.15-sec2.patch deleted file mode 100644 index 6d65c5f..0000000 --- a/source/xlib-extra/imlib/imlib-1.9.15-sec2.patch +++ /dev/null @@ -1,510 +0,0 @@ -diff -Naur imlib-1.9.15.orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c ---- imlib-1.9.15.orig/gdk_imlib/io-gif.c 2002-03-04 18:06:29.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/io-gif.c 2006-08-25 00:26:40.000000000 +0200 -@@ -55,7 +55,7 @@ - } - *w = gif->Image.Width; - *h = gif->Image.Height; -- if(*h > 32767 || *w > 32767) -+ if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) - { - return NULL; - } -diff -Naur imlib-1.9.15.orig/gdk_imlib/io-ppm.c imlib-1.9.15/gdk_imlib/io-ppm.c ---- imlib-1.9.15.orig/gdk_imlib/io-ppm.c 2002-03-04 18:06:29.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/io-ppm.c 2006-08-25 00:26:40.000000000 +0200 -@@ -53,12 +53,12 @@ - sscanf(s, "%i %i", w, h); - a = *w; - b = *h; -- if (a > 32767) -+ if (a <= 0 || a > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); - return NULL; - } -- if (b > 32767) -+ if (b <= 0 || b > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); - return NULL; -diff -Naur imlib-1.9.15.orig/gdk_imlib/io-tiff.c imlib-1.9.15/gdk_imlib/io-tiff.c ---- imlib-1.9.15.orig/gdk_imlib/io-tiff.c 2002-03-04 18:06:29.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/io-tiff.c 2006-08-25 00:26:40.000000000 +0200 -@@ -36,7 +36,9 @@ - npix = ww * hh; - *w = (int)ww; - *h = (int)hh; -- if(ww > 32767 || hh > 32767) -+ if (ww <= 0 || ww > 32767 || -+ hh <= 0 || hh > 32767 || -+ hh >= (G_MAXINT/sizeof(uint32)) / ww) - { - TIFFClose(tif); - return NULL; -diff -Naur imlib-1.9.15.orig/gdk_imlib/io-xpm.c imlib-1.9.15/gdk_imlib/io-xpm.c ---- imlib-1.9.15.orig/gdk_imlib/io-xpm.c 2002-03-04 18:06:29.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/io-xpm.c 2006-08-25 00:26:40.000000000 +0200 -@@ -40,8 +40,12 @@ - context = 0; - i = j = 0; - cmap = NULL; -+ memset(lookup, 0, sizeof(lookup)); - - line = malloc(lsz); -+ if (!line) -+ return NULL; -+ - while (!done) - { - pc = c; -@@ -70,25 +74,25 @@ - { - /* Header */ - sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n"); - free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n"); - free(line); - return NULL; - } -- if (*w > 32767) -+ if (*w <= 0 || *w > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); - free(line); - return NULL; - } -- if (*h > 32767) -+ if (*h <= 0 || *h > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); - free(line); -@@ -120,11 +124,13 @@ - { - int slen; - int hascolor, iscolor; -+ int space; - - hascolor = 0; - iscolor = 0; - tok[0] = 0; - col[0] = 0; -+ space = sizeof(col) - 1; - s[0] = 0; - len = strlen(line); - strncpy(cmap[j].str, line, cpp); -@@ -147,10 +153,10 @@ - { - if (k >= len) - { -- if (col[0]) -- strcat(col, " "); -- if (strlen(col) + strlen(s) < sizeof(col)) -- strcat(col, s); -+ if (col[0] && space > 0) -+ strncat(col, " ", space), space -= 1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - if (col[0]) - { -@@ -180,14 +186,17 @@ - } - } - } -- strcpy(tok, s); -+ if (slen < sizeof(tok)) -+ strcpy(tok, s); - col[0] = 0; -+ space = sizeof(col) - 1; - } - else - { -- if (col[0]) -- strcat(col, " "); -- strcat(col, s); -+ if (col[0] && space > 0) -+ strcat(col, " "), space -= 1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - } - } -diff -Naur imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c ---- imlib-1.9.15.orig/gdk_imlib/misc.c 2002-03-04 18:06:32.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/misc.c 2006-08-25 00:26:40.000000000 +0200 -@@ -1355,11 +1355,16 @@ - - /* - * Make sure we don't wrap on our memory allocations -+ * we check G_MAX_INT/4 because rend.c malloc's w * h * bpp -+ * + 3 is safety margin - */ - - void *_gdk_malloc_image(unsigned int w, unsigned int h) - { -- if( w > 32767 || h > 32767) -+ if (w <= 0 || w > 32767 || -+ h <= 0 || h > 32767 || -+ h >= (G_MAXINT/4 - 1) / w) - return NULL; -- return malloc(w * h * 3); -+ return malloc(w * h * 3 + 3); - } -+ -diff -Naur imlib-1.9.15.orig/gdk_imlib/utils.c imlib-1.9.15/gdk_imlib/utils.c ---- imlib-1.9.15.orig/gdk_imlib/utils.c 2002-03-22 15:43:29.000000000 +0100 -+++ imlib-1.9.15/gdk_imlib/utils.c 2006-08-25 00:26:40.000000000 +0200 -@@ -1236,36 +1236,56 @@ - context = 0; - ptr = NULL; - end = NULL; -+ memset(lookup, 0, sizeof(lookup)); - - while (!done) - { - line = data[count++]; -+ if (!line) -+ break; -+ line = strdup(line); -+ if (!line) -+ break; -+ len = strlen(line); -+ for (i = 0; i < len; ++i) -+ { -+ c = line[i]; -+ if (c < 32) -+ line[i] = 32; -+ else if (c > 127) -+ line[i] = 127; -+ } -+ - if (context == 0) - { - /* Header */ - sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (w > 32767) -+ if (w <= 0 || w > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } -- if (h > 32767) -+ if (h <= 0 || h > 32767) - { - fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } - cmap = malloc(sizeof(struct _cmap) * ncolors); -@@ -1273,6 +1293,7 @@ - if (!cmap) - { - free(im); -+ free(line); - return NULL; - } - im->rgb_width = w; -@@ -1282,6 +1303,7 @@ - { - free(cmap); - free(im); -+ free(line); - return NULL; - } - im->alpha_data = NULL; -@@ -1355,7 +1377,7 @@ - strcpy(col + colptr, " "); - colptr++; - } -- if (colptr + ls <= sizeof(col)) -+ if (colptr + ls < sizeof(col)) - { - strcpy(col + colptr, s); - colptr += ls; -@@ -1558,6 +1580,7 @@ - } - if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) - done = 1; -+ free(line); - } - if (!transp) - { -diff -Naur imlib-1.9.15.orig/Imlib/load.c imlib-1.9.15/Imlib/load.c ---- imlib-1.9.15.orig/Imlib/load.c 2004-09-21 02:23:20.000000000 +0200 -+++ imlib-1.9.15/Imlib/load.c 2006-08-25 00:26:40.000000000 +0200 -@@ -4,6 +4,8 @@ - #include "Imlib_private.h" - #include <setjmp.h> - -+#define G_MAXINT ((int) 0x7fffffff) -+ - /* Split the ID - damages input */ - - static char * -@@ -41,13 +43,17 @@ - - /* - * Make sure we don't wrap on our memory allocations -+ * we check G_MAXINT/4 because rend.c malloc's w * h * bpp -+ * + 3 is safety margin - */ - - void * _imlib_malloc_image(unsigned int w, unsigned int h) - { -- if( w > 32767 || h > 32767) -- return NULL; -- return malloc(w * h * 3); -+ if (w <= 0 || w > 32767 || -+ h <= 0 || h > 32767 || -+ h >= (G_MAXINT/4 - 1) / w) -+ return NULL; -+ return malloc(w * h * 3 + 3); - } - - #ifdef HAVE_LIBJPEG -@@ -360,7 +366,9 @@ - npix = ww * hh; - *w = (int)ww; - *h = (int)hh; -- if(ww > 32767 || hh > 32767) -+ if (ww <= 0 || ww > 32767 || -+ hh <= 0 || hh > 32767 || -+ hh >= (G_MAXINT/sizeof(uint32)) / ww) - { - TIFFClose(tif); - return NULL; -@@ -463,7 +471,7 @@ - } - *w = gif->Image.Width; - *h = gif->Image.Height; -- if (*h > 32767 || *w > 32767) -+ if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) - { - return NULL; - } -@@ -1000,7 +1008,12 @@ - comment = 0; - quote = 0; - context = 0; -+ memset(lookup, 0, sizeof(lookup)); -+ - line = malloc(lsz); -+ if (!line) -+ return NULL; -+ - while (!done) - { - pc = c; -@@ -1029,25 +1042,25 @@ - { - /* Header */ - sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n"); - free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n"); - free(line); - return NULL; - } -- if (*w > 32767) -+ if (*w <= 0 || *w > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); - free(line); - return NULL; - } -- if (*h > 32767) -+ if (*h <= 0 || *h > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); - free(line); -@@ -1080,11 +1093,13 @@ - { - int slen; - int hascolor, iscolor; -+ int space; - - iscolor = 0; - hascolor = 0; - tok[0] = 0; - col[0] = 0; -+ space = sizeof(col) - 1; - s[0] = 0; - len = strlen(line); - strncpy(cmap[j].str, line, cpp); -@@ -1107,10 +1122,10 @@ - { - if (k >= len) - { -- if (col[0]) -- strcat(col, " "); -- if (strlen(col) + strlen(s) < sizeof(col)) -- strcat(col, s); -+ if (col[0] && space > 0) -+ strcat(col, " "), space -= 1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - if (col[0]) - { -@@ -1140,14 +1155,17 @@ - } - } - } -- strcpy(tok, s); -+ if (slen < sizeof(tok)); -+ strcpy(tok, s); - col[0] = 0; -+ space = sizeof(col) - 1; - } - else - { -- if (col[0]) -- strcat(col, " "); -- strcat(col, s); -+ if (col[0] && space > 0) -+ strcat(col, " "), space -=1; -+ if (slen <= space) -+ strcat(col, s), space -= slen; - } - } - } -@@ -1376,12 +1394,12 @@ - sscanf(s, "%i %i", w, h); - a = *w; - b = *h; -- if (a > 32767) -+ if (a <= 0 || a > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); - return NULL; - } -- if (b > 32767) -+ if (b <= 0 || b > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); - return NULL; -diff -Naur imlib-1.9.15.orig/Imlib/utils.c imlib-1.9.15/Imlib/utils.c ---- imlib-1.9.15.orig/Imlib/utils.c 2004-09-21 02:22:59.000000000 +0200 -+++ imlib-1.9.15/Imlib/utils.c 2006-08-25 00:26:40.000000000 +0200 -@@ -1496,36 +1496,56 @@ - context = 0; - ptr = NULL; - end = NULL; -+ memset(lookup, 0, sizeof(lookup)); - - while (!done) - { - line = data[count++]; -+ if (!line) -+ break; -+ line = strdup(line); -+ if (!line) -+ break; -+ len = strlen(line); -+ for (i = 0; i < len; ++i) -+ { -+ c = line[i]; -+ if (c < 32) -+ line[i] = 32; -+ else if (c > 127) -+ line[i] = 127; -+ } -+ - if (context == 0) - { - /* Header */ - sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); -- if (ncolors > 32766) -+ if (ncolors <= 0 || ncolors > 32766) - { - fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (cpp > 5) -+ if (cpp <= 0 || cpp > 5) - { - fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n"); - free(im); -+ free(line); - return NULL; - } -- if (w > 32767) -+ if (w <= 0 || w > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } -- if (h > 32767) -+ if (h <= 0 || h > 32767) - { - fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n"); - free(im); -+ free(line); - return NULL; - } - cmap = malloc(sizeof(struct _cmap) * ncolors); -@@ -1533,6 +1553,7 @@ - if (!cmap) - { - free(im); -+ free(line); - return NULL; - } - im->rgb_width = w; -@@ -1542,6 +1563,7 @@ - { - free(cmap); - free(im); -+ free(line); - return NULL; - } - im->alpha_data = NULL; -@@ -1817,6 +1839,7 @@ - } - if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) - done = 1; -+ free(line); - } - if (!transp) - { diff --git a/source/xlib-extra/imlib/imlib-m4-fix.patch b/source/xlib-extra/imlib/imlib-m4-fix.patch deleted file mode 100644 index d6d27d9..0000000 --- a/source/xlib-extra/imlib/imlib-m4-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -/usr/share/aclocal/imlib.m4:167: warning: underquoted definition of AM_PATH_GDK_IMLIB -/usr/share/aclocal/imlib.m4:167: run info '(automake)Extending aclocal' -/usr/share/aclocal/imlib.m4:167: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal ---- imlib.m4 2004-08-27 18:03:11.000000000 +0200 -+++ imlib.m4.vm 2007-04-02 10:20:35.000000000 +0200 -@@ -6,7 +6,7 @@ - dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS - dnl --AC_DEFUN(AM_PATH_IMLIB, -+AC_DEFUN([AM_PATH_IMLIB], - [dnl - dnl Get the cflags and libraries from the imlib-config script - dnl -@@ -164,7 +164,7 @@ - ]) - - # Check for gdk-imlib --AC_DEFUN(AM_PATH_GDK_IMLIB, -+AC_DEFUN([AM_PATH_GDK_IMLIB], - [dnl - dnl Get the cflags and libraries from the imlib-config script - dnl diff --git a/source/xlib-extra/imlib/imlib-png-1.4.patch b/source/xlib-extra/imlib/imlib-png-1.4.patch deleted file mode 100644 index eda3cb7..0000000 --- a/source/xlib-extra/imlib/imlib-png-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur imlib-1.9.15/Imlib/load.c imlib-1.9.15-2/Imlib/load.c ---- imlib-1.9.15/Imlib/load.c 2004-09-20 19:23:20.000000000 -0500 -+++ imlib-1.9.15-2/Imlib/load.c 2010-05-04 14:44:41.000000000 -0500 -@@ -1619,7 +1619,7 @@ - return 0; - fread(buf, 1, 8, f); - rewind(f); -- return (int)png_check_sig(buf, 8); -+ return (int)(png_sig_cmp(buf, 0, 8) == 0); - #else - return 0; - #endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
