Update imlib2 to 1.1.2. This version now includes an IFF ILBM loader.

More importantly, this version fixes a buffer overflow vulnerability.
Closes PR 26833 by Peter Bex.

9 files changed, 48 insertions, 44 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 4b68aeb5ed5..9221581a6c7 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/08/26 20:21:58 recht Exp $
+# $NetBSD: Makefile,v 1.22 2004/09/06 02:56:07 rh Exp $
 #
 
-DISTNAME=		imlib2-1.1.1
+DISTNAME=		imlib2-1.1.2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST
index 4d04bfc1548..96d1834ee24 100644
--- a/graphics/imlib2/PLIST
+++ b/graphics/imlib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/08/26 20:21:58 recht Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/09/06 02:56:07 rh Exp $
 bin/bumpmaptest
 bin/color_spaces
 bin/imconvert
@@ -32,6 +32,9 @@ lib/imlib2_loaders/image/gif.so
 lib/imlib2_loaders/image/jpeg.a
 lib/imlib2_loaders/image/jpeg.la
 lib/imlib2_loaders/image/jpeg.so
+lib/imlib2_loaders/image/lbm.a
+lib/imlib2_loaders/image/lbm.la
+lib/imlib2_loaders/image/lbm.so
 lib/imlib2_loaders/image/png.a
 lib/imlib2_loaders/image/png.la
 lib/imlib2_loaders/image/png.so
@@ -54,7 +57,7 @@ lib/libImlib2.a
 lib/libImlib2.la
 lib/libImlib2.so
 lib/libImlib2.so.2
-lib/libImlib2.so.2.1
+lib/libImlib2.so.2.2
 lib/pkgconfig/imlib2.pc
 @dirrm lib/imlib2_loaders/image
 @dirrm lib/imlib2_loaders/filter
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 18afb48df5d..ea8b29745fe 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/06 02:56:07 rh Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	imlib2
 
 .if !empty(IMLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.imlib2+=	imlib2>=1.1.0nb2
+BUILDLINK_RECOMMENDED.imlib2+=	imlib2>=1.1.2
 BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
 .endif	# IMLIB2_BUILDLINK3_MK
 
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 78b54eb0456..ea929cb7e0a 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/08/26 20:21:58 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/09/06 02:56:07 rh Exp $
 
-SHA1 (imlib2-1.1.1.tar.gz) = 3ed59dbba286ac0a8b0f375467b7d662e765b5c3
-Size (imlib2-1.1.1.tar.gz) = 871202 bytes
-SHA1 (patch-aa) = 5fd7a62f2424b87ce750e0f7700135f51f3bf9da
-SHA1 (patch-ab) = a6756a42c87562df34516a05ca2bd616b9562ba8
-SHA1 (patch-ac) = d65999f9b844db4a20dcd5bd47ff1127df54af15
-SHA1 (patch-ad) = 062c1359e98aafd30379699db4ab041d8f170bdb
-SHA1 (patch-ae) = 02bd5ca5c130fd02143199137f5108a8123f8112
+SHA1 (imlib2-1.1.2.tar.gz) = ac26760d09aed5eb200101a9846c7647cf991dff
+Size (imlib2-1.1.2.tar.gz) = 875843 bytes
+SHA1 (patch-aa) = c17ca68d6335814d2d36330f61b2bd65a1af9f9c
+SHA1 (patch-ab) = 7d62dace61a3c39a93e642edfcf66beaa80fa184
+SHA1 (patch-ac) = 988d5962f10c3ff843f259bc4029465b0c85e21f
+SHA1 (patch-ad) = 622dfb1c2666dad4f216e78191ec186cb8d6f657
+SHA1 (patch-ae) = 9858eccea874a1574fc472b025968c847bd1d3bd
diff --git a/graphics/imlib2/patches/patch-aa b/graphics/imlib2/patches/patch-aa
index 987621e374b..b20592c639a 100644
--- a/graphics/imlib2/patches/patch-aa
+++ b/graphics/imlib2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/08/26 20:21:58 recht Exp $
+$NetBSD: patch-aa,v 1.4 2004/09/06 02:56:07 rh Exp $
 
---- src/Makefile.in.orig	2004-07-30 05:06:53.000000000 +0200
-+++ src/Makefile.in	2004-08-26 20:28:32.000000000 +0200
-@@ -113,7 +113,7 @@
+--- demo/Makefile.in.orig	2004-08-31 05:23:11.000000000 +0200
++++ demo/Makefile.in
+@@ -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
+ 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@
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ 
  
- MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S 		       asm_blend_cmod.S
diff --git a/graphics/imlib2/patches/patch-ab b/graphics/imlib2/patches/patch-ab
index 5f7e50e92f8..88dfde5478f 100644
--- a/graphics/imlib2/patches/patch-ab
+++ b/graphics/imlib2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2004/08/26 20:21:58 recht Exp $
+$NetBSD: patch-ab,v 1.5 2004/09/06 02:56:07 rh Exp $
 
---- loaders/Makefile.in.orig	2004-07-30 05:06:54.000000000 +0200
-+++ loaders/Makefile.in	2004-08-26 20:29:16.000000000 +0200
-@@ -113,7 +113,7 @@
+--- filters/Makefile.in.orig	2004-08-31 05:23:10.000000000 +0200
++++ filters/Makefile.in
+@@ -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$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
+-LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
 +LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
- INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
  
  
diff --git a/graphics/imlib2/patches/patch-ac b/graphics/imlib2/patches/patch-ac
index 827d3104696..0e1fa2e0897 100644
--- a/graphics/imlib2/patches/patch-ac
+++ b/graphics/imlib2/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2004/08/26 20:21:58 recht Exp $
+$NetBSD: patch-ac,v 1.2 2004/09/06 02:56:07 rh Exp $
 
---- filters/Makefile.in.orig	2004-08-26 20:30:16.000000000 +0200
-+++ filters/Makefile.in	2004-08-26 20:30:32.000000000 +0200
-@@ -113,7 +113,7 @@
+--- loaders/Makefile.in.orig	2004-08-31 05:23:11.000000000 +0200
++++ loaders/Makefile.in
+@@ -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$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
+-LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
 +LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
- INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
  
  
diff --git a/graphics/imlib2/patches/patch-ad b/graphics/imlib2/patches/patch-ad
index ad5187b4aea..8908afad171 100644
--- a/graphics/imlib2/patches/patch-ad
+++ b/graphics/imlib2/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2004/08/26 20:21:58 recht Exp $
+$NetBSD: patch-ad,v 1.2 2004/09/06 02:56:07 rh Exp $
 
---- test/Makefile.in.orig	2004-08-26 20:32:09.000000000 +0200
-+++ test/Makefile.in	2004-08-26 20:32:23.000000000 +0200
-@@ -113,7 +113,7 @@
+--- src/Makefile.in.orig	2004-08-31 05:23:10.000000000 +0200
++++ src/Makefile.in
+@@ -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				
+ MAINTAINERCLEANFILES = Makefile.in
  
 -LDFLAGS = -L/usr/X11R6/lib
 +LDFLAGS = @LDFLAGS@
- INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS) 		       -I$(prefix)/include -I$(includedir)
- 
+ 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
diff --git a/graphics/imlib2/patches/patch-ae b/graphics/imlib2/patches/patch-ae
index ab889583282..a582633f5c5 100644
--- a/graphics/imlib2/patches/patch-ae
+++ b/graphics/imlib2/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2004/08/26 20:21:58 recht Exp $
+$NetBSD: patch-ae,v 1.2 2004/09/06 02:56:07 rh Exp $
 
---- demo/Makefile.in.orig	2004-08-26 20:43:34.000000000 +0200
-+++ demo/Makefile.in	2004-08-26 20:43:49.000000000 +0200
-@@ -113,7 +113,7 @@
+--- test/Makefile.in.orig	2004-08-31 05:23:11.000000000 +0200
++++ test/Makefile.in
+@@ -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_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS) 		       -I$(prefix)/include -I$(includedir)