Attachment #51614 for bug #78347

View | Details | Raw Unified | Return to bug 78347
Collapse All | Expand All

Lines 6-13 Link Here

(-)imlib2.new/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= imlib2	8	PORTNAME= imlib2
9	PORTVERSION= 1.1.2	9	PORTVERSION= 1.2.0
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= enlightenment	12	MASTER_SITE_SUBDIR= enlightenment
Lines 27-32 Link Here
27	USE_GNOME= gnomehack pkgconfig gnometarget	26	USE_GNOME= gnomehack pkgconfig gnometarget
28	USE_REINPLACE= yes	27	USE_REINPLACE= yes
29	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
		29	USE_AUTOCONF_VER=259
30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
31	LDFLAGS="-L${LOCALBASE}/lib"	31	LDFLAGS="-L${LOCALBASE}/lib"
32	INSTALLS_SHLIB= yes	32	INSTALLS_SHLIB= yes

Lines 1-2 Link Here

(-)imlib2.new/distinfo (-2 / +2 lines)
1	MD5 (imlib2-1.1.2.tar.gz) = 3389bad516032c951fda4fe620df0cef	1	MD5 (imlib2-1.2.0.tar.gz) = 853fb77100ee3c3ca944f52c892ab49b
2	SIZE (imlib2-1.1.2.tar.gz) = 875843	2	SIZE (imlib2-1.2.0.tar.gz) = 890457




--- configure.in.orig	Wed Jan  5 01:39:08 2005
+++ configure.in	Sun Feb 27 21:16:57 2005
@@ -6,7 +6,7 @@
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(imlib2, 1.2.0)
+AM_INIT_AUTOMAKE(imlib2, 1.2.0.001)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
@@ -86,6 +86,9 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
 
+# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
+requirements="freetype2"
+
 mmx=no
 AC_ARG_ENABLE(mmx,[  --disable-mmx           attempt compiling using mmx assembly [default=yes]],
 [
@@ -98,15 +101,16 @@
   fi
 ],
 [
-if test x$target_os = xlinux-gnu; then
+if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
   if test x$target_cpu = x$host_cpu; then
     mmx=`cat /proc/cpuinfo | grep mmx`
     if test -n "$mmx"; then
       mmx=yes
+      echo "You appear to be compiling on a "$target_cpu/$target_os" system; using MMX."
     fi
   else
     echo ""
-    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_os" machine."
+    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_cpu/$target_os" machine."
     echo "If this target supports mmx, please enable mmx with --enable-mmx as a"
     echo "configure option."
     echo ""
@@ -114,6 +118,7 @@
 else
   echo ""
   echo "You are not running Linux - This script cannot auto-detect mmx assembly."
+  echo "(You appear to be running $target_os.)"
   echo "You will have to enable the mmx assembly (which gives anywhere from 10%"
   echo "to 300% speedups) by adding --enable-mmx on the configure command-line."
   echo ""
@@ -139,35 +144,28 @@
 freetype_cflags=`$FREETYPE_CONFIG --cflags`
 freetype_libs=`$FREETYPE_CONFIG --libs`
 
-x11=no
-AC_ARG_ENABLE(x11,[  --disable-x11           attempt to build with X11 support [default=yes]],
-[
-  if test x$enableval = xyes; then
-    have_x=yes
-  else
-    have_x=no
-  fi
-],
-[
-  AC_CHECK_HEADER(X11/X.h,
-    [ have_x="yes" ],
-    [ have_x="no" ]
-  )
-]
-)
-AC_MSG_CHECKING(whether X11 support is to be enabled)
+AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)])
+
+if test "x$have_x" = "xno"; then
+   # If --without-x was passed, this will be "disabled" instead of "no" --
+   # so always treat "no" as an error
+   AC_MSG_ERROR(
+[no X support found.  Use --x-includes and --x-libraries to specify the X
+path on your system, or --without-x to disable X support.])
+fi
+
 if test "x$have_x" = "xyes"; then
-  x_dir="/usr/X11R6";
-  x_cflags="-I"$x_dir"/include"
-  x_libs="-L"$x_dir"/lib -lX11 -lXext"
-  AC_MSG_RESULT(enabling X11 support)
+  if test "x$x_includes" != "x"; then
+    x_cflags="-I$x_includes"
+  fi
+  if test "x$x_libraries" != "x"; then
+    x_libs="-L$x_libraries -lX11 -lXext"
+  fi
   AM_CONDITIONAL(BUILD_X11, true)
   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
 else
-  x_dir=""
   x_cflags=""
   x_libs=""
-  AC_MSG_RESULT(disabling X11 support)
   AM_CONDITIONAL(BUILD_X11, false)
 fi
 
@@ -354,7 +352,9 @@
 fi
 AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
 AC_SUBST(BZ2LIBS)
-  
+
+AC_SUBST(requirements)
+
 AC_OUTPUT([
 Makefile
 src/Makefile
@@ -395,6 +395,9 @@
 echo "  GIF.....................: $gif_ok"
 echo "  ZLIB....................: $zlib_ok"
 echo "  BZIP2...................: $bz2_ok"
+echo
+echo
+echo "Use MMX for extra speed...: $mmx"
 echo
 echo
 echo "Installation Path.........: $prefix"




--- imlib2.spec.orig	Thu Jan  6 16:55:03 2005
+++ imlib2.spec	Sun Feb 27 18:19:06 2005
@@ -1,16 +1,16 @@
 Summary: Powerful image loading and rendering library
 Name: imlib2
 Version: 1.2.0
-Release: 1.%(date '+%Y%m%d')
+Release: 2.%(date '+%Y%m%d')
 License: BSD
 Group: System Environment/Libraries
-URL: http://www.rasterman.com/raster/imlib.html
+URL: http://www.enlightenment.org
 Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-#BuildSuggests: xorg-x11-devel
-BuildRequires: freetype-devel XFree86-devel
+#BuildSuggests: xorg-x11-devel freetype-devel freetype2-devel
+BuildRequires: /usr/bin/freetype-config XFree86-devel libungif-devel
 Requires: %{name}-loader_jpeg = %{version}
 Requires: %{name}-loader_png = %{version}
 Requires: %{name}-loader_argb = %{version}
@@ -26,7 +26,8 @@
 Summary: Imlib2 headers, static libraries and documentation
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
-Requires: freetype-devel >= 2
+Requires: /usr/bin/freetype-config
+
 %description devel
 Headers, static libraries and documentation for Imlib2.
 
@@ -117,8 +118,12 @@
 %setup -q
 
 %build
-%{configure} --prefix=%{_prefix}
-%{__make} %{?_smp_mflags} %{?mflags}
+%{configure} --prefix=%{_prefix} \
+%ifarch x86_64
+       --disable-mmx \
+%endif
+       $RPM_CONFIGURE_OPTS
+%{__make} LDFLAGS="$LDFLAGS -L/usr/X11R6/%{_lib}" %{?_smp_mflags} %{?mflags}
 
 %install
 %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install




===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c	2004/12/14 03:50:46	1.2
+++ loaders/loader_xpm.c	2005/01/04 03:34:03	1.3
@@ -192,37 +192,37 @@
                     {
                        /* Header */
                        sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
-                       if (ncolors > 32766)
+                       if ((ncolors > 32766) || (ncolors < 1))
                          {
                             fprintf(stderr,
-                                    "IMLIB ERROR: XPM files with colors > 32766 not supported\n");
+                                    "IMLIB ERROR: XPM files with colors > 32766 or < 1 not supported\n");
                             free(line);
                             fclose(f);
                             xpm_parse_done();
                             return 0;
                          }
-                       if (cpp > 5)
+                       if ((cpp > 5) || (cpp < 1))
                          {
                             fprintf(stderr,
-                                    "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
+                                    "IMLIB ERROR: XPM files with characters per pixel > 5 or < 1not supported\n");
                             free(line);
                             fclose(f);
                             xpm_parse_done();
                             return 0;
                          }
-                       if (w > 32767)
+                       if ((w > 32767) || (w < 1))
                          {
                             fprintf(stderr,
-                                    "IMLIB ERROR: Image width > 32767 pixels for file\n");
+                                    "IMLIB ERROR: Image width > 32767 or < 1 pixels for file\n");
                             free(line);
                             fclose(f);
                             xpm_parse_done();
                             return 0;
                          }
-                       if (h > 32767)
+                       if ((h > 32767) || (h < 1))
                          {
                             fprintf(stderr,
-                                    "IMLIB ERROR: Image height > 32767 pixels for file\n");
+                                    "IMLIB ERROR: Image height > 32767 or < 1 pixels for file\n");
                             free(line);
                             fclose(f);
                             xpm_parse_done();
@@ -284,9 +284,14 @@
                                            if (k >= len)
                                              {
                                                 if (col[0])
-                                                   strcat(col, " ");
+						  {
+						     if (strlen(col) < ( sizeof(col) - 2))
+						       strcat(col, " ");
+						     else
+						       done = 1;
+						  }
                                                 if (strlen(col) + strlen(s) <
-                                                    sizeof(col))
+                                                    (sizeof(col) - 1))
                                                    strcat(col, s);
                                              }
                                            if (col[0])
@@ -322,9 +327,16 @@
                                         }
                                       else
                                         {
-                                           if (col[0])
-                                              strcat(col, " ");
-                                           strcat(col, s);
+					   if (col[0])
+					     {
+						if (strlen(col) < ( sizeof(col) - 2))
+						  strcat(col, " ");
+						else
+						  done = 1;
+					     }
+					   if (strlen(col) + strlen(s) <
+					       (sizeof(col) - 1))
+					     strcat(col, s);
                                         }
                                    }
                               }




bin/bumpmaptest
bin/color_spaces
bin/imconvert
bin/imlib2
bin/imlib2_test
bin/imlib2_view
bin/imlib2-config
bin/imlib2_conv
include/Imlib2.h
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/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/libImlib2.a
lib/libImlib2.so
lib/libImlib2.so.3
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
libdata/pkgconfig/imlib2.pc
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/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
@dirrm share/imlib2/data/images
@dirrm share/imlib2/data/fonts
@dirrm share/imlib2/data
@dirrm share/imlib2
@dirrm lib/imlib2/loaders
@dirrm lib/imlib2/filters
@dirrm lib/imlib2

Return to bug 78347

Line 0 Link Here

(-)imlib2.new/files/patch-configure.in (+121 lines)
		1	--- configure.in.orig Wed Jan 5 01:39:08 2005
		2	+++ configure.in Sun Feb 27 21:16:57 2005
		3	@@ -6,7 +6,7 @@
		4	AC_CANONICAL_HOST
		5	AC_CANONICAL_TARGET
		6	AC_ISC_POSIX
		7	-AM_INIT_AUTOMAKE(imlib2, 1.2.0)
		8	+AM_INIT_AUTOMAKE(imlib2, 1.2.0.001)
		9	AM_CONFIG_HEADER(config.h)
		10
		11	AC_C_BIGENDIAN
		12	@@ -86,6 +86,9 @@
		13	packagesrcdir=`cd $srcdir && pwd`
		14	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
		15
		16	+# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
		17	+requirements="freetype2"
		18	+
		19	mmx=no
		20	AC_ARG_ENABLE(mmx,[ --disable-mmx attempt compiling using mmx assembly [default=yes]],
		21	[
		22	@@ -98,15 +101,16 @@
		23	fi
		24	],
		25	[
		26	-if test x$target_os = xlinux-gnu; then
		27	+if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
		28	if test x$target_cpu = x$host_cpu; then
		29	mmx=`cat /proc/cpuinfo \| grep mmx`
		30	if test -n "$mmx"; then
		31	mmx=yes
		32	+ echo "You appear to be compiling on a "$target_cpu/$target_os" system; using MMX."
		33	fi
		34	else
		35	echo ""
		36	- echo "You are cross-compiling on a "$host_cpu" machine for a "$target_os" machine."
		37	+ echo "You are cross-compiling on a "$host_cpu" machine for a "$target_cpu/$target_os" machine."
		38	echo "If this target supports mmx, please enable mmx with --enable-mmx as a"
		39	echo "configure option."
		40	echo ""
		41	@@ -114,6 +118,7 @@
		42	else
		43	echo ""
		44	echo "You are not running Linux - This script cannot auto-detect mmx assembly."
		45	+ echo "(You appear to be running $target_os.)"
		46	echo "You will have to enable the mmx assembly (which gives anywhere from 10%"
		47	echo "to 300% speedups) by adding --enable-mmx on the configure command-line."
		48	echo ""
		49	@@ -139,35 +144,28 @@
		50	freetype_cflags=`$FREETYPE_CONFIG --cflags`
		51	freetype_libs=`$FREETYPE_CONFIG --libs`
		52
		53	-x11=no
		54	-AC_ARG_ENABLE(x11,[ --disable-x11 attempt to build with X11 support [default=yes]],
		55	-[
		56	- if test x$enableval = xyes; then
		57	- have_x=yes
		58	- else
		59	- have_x=no
		60	- fi
		61	-],
		62	-[
		63	- AC_CHECK_HEADER(X11/X.h,
		64	- [ have_x="yes" ],
65	- [ have_x="no" ]
66	- )
67	-]
68	-)
69	-AC_MSG_CHECKING(whether X11 support is to be enabled)
70	+AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)])
71	+
72	+if test "x$have_x" = "xno"; then
73	+ # If --without-x was passed, this will be "disabled" instead of "no" --
74	+ # so always treat "no" as an error
75	+ AC_MSG_ERROR(
76	+[no X support found. Use --x-includes and --x-libraries to specify the X
77	+path on your system, or --without-x to disable X support.])
78	+fi
79	+
80	if test "x$have_x" = "xyes"; then
81	- x_dir="/usr/X11R6";
82	- x_cflags="-I"$x_dir"/include"
83	- x_libs="-L"$x_dir"/lib -lX11 -lXext"
84	- AC_MSG_RESULT(enabling X11 support)
85	+ if test "x$x_includes" != "x"; then
86	+ x_cflags="-I$x_includes"
87	+ fi
88	+ if test "x$x_libraries" != "x"; then
89	+ x_libs="-L$x_libraries -lX11 -lXext"
90	+ fi
91	AM_CONDITIONAL(BUILD_X11, true)
92	AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
93	else
94	- x_dir=""
95	x_cflags=""
96	x_libs=""
97	- AC_MSG_RESULT(disabling X11 support)
98	AM_CONDITIONAL(BUILD_X11, false)
99	fi
100
101	@@ -354,7 +352,9 @@
102	fi
103	AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
104	AC_SUBST(BZ2LIBS)
105	-
106	+
107	+AC_SUBST(requirements)
108	+
109	AC_OUTPUT([
110	Makefile
111	src/Makefile
112	@@ -395,6 +395,9 @@
113	echo " GIF.....................: $gif_ok"
114	echo " ZLIB....................: $zlib_ok"
115	echo " BZIP2...................: $bz2_ok"
116	+echo
117	+echo
118	+echo "Use MMX for extra speed...: $mmx"
119	echo
120	echo
121	echo "Installation Path.........: $prefix"

Line 0 Link Here

(-)imlib2.new/files/patch-imlib2.spec (+48 lines)
	1	--- imlib2.spec.orig Thu Jan 6 16:55:03 2005
	2	+++ imlib2.spec Sun Feb 27 18:19:06 2005
	3	@@ -1,16 +1,16 @@
	4	Summary: Powerful image loading and rendering library
	5	Name: imlib2
	6	Version: 1.2.0
	7	-Release: 1.%(date '+%Y%m%d')
	8	+Release: 2.%(date '+%Y%m%d')
	9	License: BSD
	10	Group: System Environment/Libraries
	11	-URL: http://www.rasterman.com/raster/imlib.html
	12	+URL: http://www.enlightenment.org
	13	Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz
	14	Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
	15	Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
	16	Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
	17	-#BuildSuggests: xorg-x11-devel
	18	-BuildRequires: freetype-devel XFree86-devel
	19	+#BuildSuggests: xorg-x11-devel freetype-devel freetype2-devel
	20	+BuildRequires: /usr/bin/freetype-config XFree86-devel libungif-devel
	21	Requires: %{name}-loader_jpeg = %{version}
	22	Requires: %{name}-loader_png = %{version}
	23	Requires: %{name}-loader_argb = %{version}
	24	@@ -26,7 +26,8 @@
	25	Summary: Imlib2 headers, static libraries and documentation
	26	Group: System Environment/Libraries
	27	Requires: %{name} = %{version}
	28	-Requires: freetype-devel >= 2
	29	+Requires: /usr/bin/freetype-config
	30	+
	31	%description devel
	32	Headers, static libraries and documentation for Imlib2.
	33
	34	@@ -117,8 +118,12 @@
	35	%setup -q
	36
	37	%build
	38	-%{configure} --prefix=%{_prefix}
	39	-%{__make} %{?_smp_mflags} %{?mflags}
	40	+%{configure} --prefix=%{_prefix} \
	41	+%ifarch x86_64
	42	+ --disable-mmx \
	43	+%endif
	44	+ $RPM_CONFIGURE_OPTS
	45	+%{__make} LDFLAGS="$LDFLAGS -L/usr/X11R6/%{_lib}" %{?_smp_mflags} %{?mflags}
	46
	47	%install
	48	%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install

Lines 1-90 Link Here

(-)imlib2.new/files/patch-security-1 (-90 lines)
1	===================================================================
2	RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
3	retrieving revision 1.2
4	retrieving revision 1.3
5	diff -u -r1.2 -r1.3
6	--- enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c 2004/12/14 03:50:46 1.2
7	+++ loaders/loader_xpm.c 2005/01/04 03:34:03 1.3
8	@@ -192,37 +192,37 @@
9	{
10	/* Header */
11	sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
12	- if (ncolors > 32766)
13	+ if ((ncolors > 32766) \|\| (ncolors < 1))
14	{
15	fprintf(stderr,
16	- "IMLIB ERROR: XPM files with colors > 32766 not supported\n");
17	+ "IMLIB ERROR: XPM files with colors > 32766 or < 1 not supported\n");
18	free(line);
19	fclose(f);
20	xpm_parse_done();
21	return 0;
22	}
23	- if (cpp > 5)
24	+ if ((cpp > 5) \|\| (cpp < 1))
25	{
26	fprintf(stderr,
27	- "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
28	+ "IMLIB ERROR: XPM files with characters per pixel > 5 or < 1not supported\n");
29	free(line);
30	fclose(f);
31	xpm_parse_done();
32	return 0;
33	}
34	- if (w > 32767)
35	+ if ((w > 32767) \|\| (w < 1))
36	{
37	fprintf(stderr,
38	- "IMLIB ERROR: Image width > 32767 pixels for file\n");
39	+ "IMLIB ERROR: Image width > 32767 or < 1 pixels for file\n");
40	free(line);
41	fclose(f);
42	xpm_parse_done();
43	return 0;
44	}
45	- if (h > 32767)
46	+ if ((h > 32767) \|\| (h < 1))
47	{
48	fprintf(stderr,
49	- "IMLIB ERROR: Image height > 32767 pixels for file\n");
50	+ "IMLIB ERROR: Image height > 32767 or < 1 pixels for file\n");
51	free(line);
52	fclose(f);
53	xpm_parse_done();
54	@@ -284,9 +284,14 @@
55	if (k >= len)
56	{
57	if (col[0])
58	- strcat(col, " ");
59	+ {
60	+ if (strlen(col) < ( sizeof(col) - 2))
61	+ strcat(col, " ");
62	+ else
63	+ done = 1;
64	+ }
65	if (strlen(col) + strlen(s) <
66	- sizeof(col))
67	+ (sizeof(col) - 1))
68	strcat(col, s);
69	}
70	if (col[0])
71	@@ -322,9 +327,16 @@
72	}
73	else
74	{
75	- if (col[0])
76	- strcat(col, " ");
77	- strcat(col, s);
78	+ if (col[0])
79	+ {
80	+ if (strlen(col) < ( sizeof(col) - 2))
81	+ strcat(col, " ");
82	+ else
83	+ done = 1;
84	+ }
85	+ if (strlen(col) + strlen(s) <
86	+ (sizeof(col) - 1))
87	+ strcat(col, s);
88	}
89	}
90	}

Lines 1-31 Link Here

(-)imlib2.new/pkg-plist (-26 / +46 lines)
1	bin/bumpmaptest
2	bin/color_spaces
3	bin/imconvert
4	bin/imlib2
5	bin/imlib2_test
6	bin/imlib2_view
7	bin/imlib2-config	1	bin/imlib2-config
8	bin/polytest	2	bin/imlib2_conv
9	include/Imlib2.h	3	include/Imlib2.h
		4	lib/imlib2/filters/bumpmap.so
		5	lib/imlib2/filters/colormod.so
		6	lib/imlib2/filters/testfilter.so
		7	lib/imlib2/loaders/argb.so
		8	lib/imlib2/loaders/bmp.so
		9	lib/imlib2/loaders/bz2.so
		10	lib/imlib2/loaders/gif.so
		11	lib/imlib2/loaders/jpeg.so
		12	lib/imlib2/loaders/lbm.so
		13	lib/imlib2/loaders/png.so
		14	lib/imlib2/loaders/pnm.so
		15	lib/imlib2/loaders/tga.so
		16	lib/imlib2/loaders/tiff.so
		17	lib/imlib2/loaders/xpm.so
		18	lib/imlib2/loaders/zlib.so
10	lib/libImlib2.a	19	lib/libImlib2.a
11	lib/libImlib2.so	20	lib/libImlib2.so
12	lib/libImlib2.so.2	21	lib/libImlib2.so.3
13	lib/imlib2_loaders/filter/bump_map.so
14	lib/imlib2_loaders/filter/colormod.so
15	lib/imlib2_loaders/filter/testfilter.so
16	lib/imlib2_loaders/image/argb.so
17	lib/imlib2_loaders/image/bmp.so
18	lib/imlib2_loaders/image/bz2.so
19	lib/imlib2_loaders/image/gif.so
20	lib/imlib2_loaders/image/jpeg.so
21	lib/imlib2_loaders/image/lbm.so
22	lib/imlib2_loaders/image/png.so
23	lib/imlib2_loaders/image/pnm.so
24	lib/imlib2_loaders/image/tga.so
25	lib/imlib2_loaders/image/tiff.so
26	lib/imlib2_loaders/image/xpm.so
27	lib/imlib2_loaders/image/zlib.so
28	libdata/pkgconfig/imlib2.pc	22	libdata/pkgconfig/imlib2.pc
29	@dirrm lib/imlib2_loaders/image	23	share/imlib2/data/fonts/cinema.ttf
30	@dirrm lib/imlib2_loaders/filter	24	share/imlib2/data/fonts/grunge.ttf
31	@dirrm lib/imlib2_loaders	25	share/imlib2/data/fonts/morpheus.ttf
		26	share/imlib2/data/fonts/notepad.ttf
		27	share/imlib2/data/images/audio.png
		28	share/imlib2/data/images/bg.png
		29	share/imlib2/data/images/bulb.png
		30	share/imlib2/data/images/cal.png
		31	share/imlib2/data/images/calc.png
		32	share/imlib2/data/images/folder.png
		33	share/imlib2/data/images/globe.png
		34	share/imlib2/data/images/imlib2.png
		35	share/imlib2/data/images/lock.png
		36	share/imlib2/data/images/mail.png
		37	share/imlib2/data/images/menu.png
		38	share/imlib2/data/images/mush.png
		39	share/imlib2/data/images/paper.png
		40	share/imlib2/data/images/sh1.png
		41	share/imlib2/data/images/sh2.png
		42	share/imlib2/data/images/sh3.png
		43	share/imlib2/data/images/stop.png
		44	share/imlib2/data/images/tnt.png
		45	@dirrm share/imlib2/data/images
		46	@dirrm share/imlib2/data/fonts
		47	@dirrm share/imlib2/data
		48	@dirrm share/imlib2
		49	@dirrm lib/imlib2/loaders
		50	@dirrm lib/imlib2/filters
		51	@dirrm lib/imlib2