pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/imlib2 fix some insufficient validation of gr...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd6ae8b857b9
branches:  trunk
changeset: 521834:dd6ae8b857b9
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Nov 24 12:46:12 2006 +0000

description:
fix some insufficient validation of graphics files, patches from Ubuntu
(CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809)
update to 1.3.0 (no changelog available)

diffstat:

 graphics/imlib2/Makefile         |   5 +-
 graphics/imlib2/PLIST            |   3 +-
 graphics/imlib2/distinfo         |  20 +++++----
 graphics/imlib2/patches/patch-ba |  22 ----------
 graphics/imlib2/patches/patch-bb |  39 -------------------
 graphics/imlib2/patches/patch-bc |  78 --------------------------------------
 graphics/imlib2/patches/patch-bd |  81 ----------------------------------------
 graphics/imlib2/patches/patch-ca |  30 ++++++++++++++
 graphics/imlib2/patches/patch-cb |  18 ++++++++
 graphics/imlib2/patches/patch-cc |  47 +++++++++++++++++++++++
 graphics/imlib2/patches/patch-cd |  18 ++++++++
 graphics/imlib2/patches/patch-ce |  13 ++++++
 graphics/imlib2/patches/patch-cf |  80 +++++++++++++++++++++++++++++++++++++++
 graphics/imlib2/patches/patch-cg |  32 +++++++++++++++
 14 files changed, 253 insertions(+), 233 deletions(-)

diffs (truncated from 558 to 300 lines):

diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Fri Nov 24 12:28:12 2006 +0000
+++ b/graphics/imlib2/Makefile  Fri Nov 24 12:46:12 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2006/11/06 11:28:32 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2006/11/24 12:46:12 drochner Exp $
 
-DISTNAME=      imlib2-1.2.0
-PKGREVISION=   5
+DISTNAME=      imlib2-1.3.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/PLIST
--- a/graphics/imlib2/PLIST     Fri Nov 24 12:28:12 2006 +0000
+++ b/graphics/imlib2/PLIST     Fri Nov 24 12:46:12 2006 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2005/01/11 13:37:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/11/24 12:46:12 drochner 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
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/distinfo
--- a/graphics/imlib2/distinfo  Fri Nov 24 12:28:12 2006 +0000
+++ b/graphics/imlib2/distinfo  Fri Nov 24 12:46:12 2006 +0000
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.16 2006/07/19 16:16:23 rillig Exp $
+$NetBSD: distinfo,v 1.17 2006/11/24 12:46:12 drochner Exp $
 
-SHA1 (imlib2-1.2.0.tar.gz) = 54f8ef83b0eac3f8e7f2218705e02a425fa73118
-RMD160 (imlib2-1.2.0.tar.gz) = 158ed1bd7c59b8d1db2c00db98027d9c5c0abec3
-Size (imlib2-1.2.0.tar.gz) = 890457 bytes
-SHA1 (patch-aa) = 73e23778f6aaee5de213865aa64f9c5a4af6ba24
+SHA1 (imlib2-1.3.0.tar.gz) = ad9c673a94d4e5e610704cefd06855f900151e25
+RMD160 (imlib2-1.3.0.tar.gz) = 272fc0a62699e0f0f690f4cc8418ac5c8e0ee615
+Size (imlib2-1.3.0.tar.gz) = 955862 bytes
 SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5
 SHA1 (patch-ac) = da65ecd50753c37e267c2fd3de7f1dcef8dab1f1
 SHA1 (patch-ad) = adf301fe0179aa1ab05fc54bb7ab706ee97ab7a7
 SHA1 (patch-ae) = 6503e4cbc9bbb93f971ab2ae9fd7d50ddee9e0e8
-SHA1 (patch-ba) = 0a3937fc4d017356ba5d33f957426f9befc94730
-SHA1 (patch-bb) = 9df1e76c3023c6f9714906b226293bc3e026baca
-SHA1 (patch-bc) = 29365da268d210b4eb7bb431f815a78bcf22f1e3
-SHA1 (patch-bd) = 2fd3fa738dc36c360868c0b73f1a3fcb3a4a14e4
+SHA1 (patch-ca) = c2150a4c1ad3ccccaf37961e2f301cd7f2ba2044
+SHA1 (patch-cb) = da837b92a1a4cfd139fe2d9ed319d1cd6e0fb703
+SHA1 (patch-cc) = 6a9d1b59e0574d8bb9cc7493a314feb1c90cc57f
+SHA1 (patch-cd) = 398d5ea852ac5ece67dd34d83726422895058a6c
+SHA1 (patch-ce) = 2a6d3fd704885d56b3ed4c2a19d2800f29c7c9a0
+SHA1 (patch-cf) = c6a2bd12ce8d6bf2fafcd2ed7cd6ead734456808
+SHA1 (patch-cg) = 5767ddcffce7c0da93aa942c80f67d14e28788fe
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/patches/patch-ba
--- a/graphics/imlib2/patches/patch-ba  Fri Nov 24 12:28:12 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/04/11 05:29:15 kim Exp $
-
---- src/modules/filters/Makefile.am.orig       2004-11-01 22:03:49.000000000 -0500
-+++ src/modules/filters/Makefile.am    2005-04-11 01:11:56.000000000 -0400
-@@ -11,11 +11,14 @@
- pkg_LTLIBRARIES       = testfilter.la bumpmap.la colormod.la
- 
- testfilter_la_SOURCES = filter_test.c
--testfilter_la_LDFLAGS = -module -avoid-version
-+testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+testfilter_la_LIBADD  = -lImlib2
- 
- bumpmap_la_SOURCES    = filter_bumpmap.c
--bumpmap_la_LDFLAGS    = -module -avoid-version
-+bumpmap_la_LDFLAGS    = -module -avoid-version -L$(top_builddir)/src/lib/
-+bumpmap_la_LIBADD  = -lImlib2
- 
- colormod_la_SOURCES   = filter_colormod.c
--colormod_la_LDFLAGS   = -module -avoid-version
-+colormod_la_LDFLAGS   = -module -avoid-version -L$(top_builddir)/src/lib/
-+colormod_la_LIBADD  = -lImlib2
- 
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/patches/patch-bb
--- a/graphics/imlib2/patches/patch-bb  Fri Nov 24 12:28:12 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2005/04/11 05:29:15 kim Exp $
-
---- src/modules/filters/Makefile.in.orig       2005-01-08 02:56:15.000000000 -0500
-+++ src/modules/filters/Makefile.in    2005-04-11 00:55:20.000000000 -0400
-@@ -104,13 +104,16 @@
- pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la
- 
- testfilter_la_SOURCES = filter_test.c
--testfilter_la_LDFLAGS = -module -avoid-version
-+testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+testfilter_la_LIBADD = -lImlib2
- 
- bumpmap_la_SOURCES = filter_bumpmap.c
--bumpmap_la_LDFLAGS = -module -avoid-version
-+bumpmap_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+bumpmap_la_LIBADD = -lImlib2
- 
- colormod_la_SOURCES = filter_colormod.c
--colormod_la_LDFLAGS = -module -avoid-version
-+colormod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+colormod_la_LIBADD = -lImlib2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
-@@ -121,11 +124,11 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--testfilter_la_LIBADD = 
-+testfilter_la_DEPENDENCIES = 
- testfilter_la_OBJECTS =  filter_test.lo
--bumpmap_la_LIBADD = 
-+bumpmap_la_DEPENDENCIES = 
- bumpmap_la_OBJECTS =  filter_bumpmap.lo
--colormod_la_LIBADD = 
-+colormod_la_DEPENDENCIES = 
- colormod_la_OBJECTS =  filter_colormod.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/patches/patch-bc
--- a/graphics/imlib2/patches/patch-bc  Fri Nov 24 12:28:12 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2005/04/11 05:29:15 kim Exp $
-
---- src/modules/loaders/Makefile.am.orig       2004-11-01 22:04:05.000000000 -0500
-+++ src/modules/loaders/Makefile.am    2005-04-11 01:11:56.000000000 -0400
-@@ -43,49 +43,49 @@
- lbm.la
- 
- jpeg_la_SOURCES      = loader_jpeg.c
--jpeg_la_LDFLAGS      = -module -avoid-version
--jpeg_la_LIBADD       = @JPEGLIBS@
-+jpeg_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+jpeg_la_LIBADD       = @JPEGLIBS@ -lImlib2
- 
- png_la_SOURCES       = loader_png.c
--png_la_LDFLAGS       = -module -avoid-version
--png_la_LIBADD        = @PNGLIBS@
-+png_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+png_la_LIBADD        = @PNGLIBS@ -lImlib2
-                        
- tiff_la_SOURCES      = loader_tiff.c
--tiff_la_LDFLAGS      = -module -avoid-version
--tiff_la_LIBADD       = @TIFFLIBS@
-+tiff_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+tiff_la_LIBADD       = @TIFFLIBS@ -lImlib2
- 
- gif_la_SOURCES       = loader_gif.c
--gif_la_LDFLAGS       = -module -avoid-version
--gif_la_LIBADD        = @GIFLIBS@
-+gif_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+gif_la_LIBADD        = @GIFLIBS@ -lImlib2
- 
- zlib_la_SOURCES      = loader_zlib.c
--zlib_la_LDFLAGS      = -module -avoid-version
--zlib_la_LIBADD       = @ZLIBLIBS@ 
-+zlib_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+zlib_la_LIBADD       = @ZLIBLIBS@  -lImlib2
- 
- bz2_la_SOURCES       = loader_bz2.c
--bz2_la_LDFLAGS       = -module -avoid-version
--bz2_la_LIBADD        = @BZ2LIBS@ 
-+bz2_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+bz2_la_LIBADD        = @BZ2LIBS@  -lImlib2
- 
- pnm_la_SOURCES       = loader_pnm.c
--pnm_la_LDFLAGS       = -module -avoid-version
--pnm_la_LIBADD        = 
-+pnm_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+pnm_la_LIBADD        = -lImlib2
- 
- argb_la_SOURCES      = loader_argb.c
--argb_la_LDFLAGS      = -module -avoid-version
--argb_la_LIBADD       = 
-+argb_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+argb_la_LIBADD       = -lImlib2
- 
- bmp_la_SOURCES       = loader_bmp.c
--bmp_la_LDFLAGS       = -module -avoid-version
--bmp_la_LIBADD        = 
-+bmp_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+bmp_la_LIBADD        = -lImlib2
- 
- xpm_la_SOURCES       = loader_xpm.c
--xpm_la_LDFLAGS       = -module -avoid-version
--xpm_la_LIBADD        = 
-+xpm_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+xpm_la_LIBADD        = -lImlib2
- 
- tga_la_SOURCES       = loader_tga.c
--tga_la_LDFLAGS       = -module -avoid-version
--tga_la_LIBADD        = 
-+tga_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+tga_la_LIBADD        = -lImlib2
- 
- lbm_la_SOURCES       = loader_lbm.c
--lbm_la_LDFLAGS       = -module -avoid-version
--lbm_la_LIBADD        = 
-+lbm_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+lbm_la_LIBADD        = -lImlib2
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/patches/patch-bd
--- a/graphics/imlib2/patches/patch-bd  Fri Nov 24 12:28:12 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2005/04/11 05:29:15 kim Exp $
-
---- src/modules/loaders/Makefile.in.orig       2005-01-08 02:56:15.000000000 -0500
-+++ src/modules/loaders/Makefile.in    2005-04-11 01:19:24.000000000 -0400
-@@ -113,52 +113,52 @@
- 
- 
- jpeg_la_SOURCES = loader_jpeg.c
--jpeg_la_LDFLAGS = -module -avoid-version
--jpeg_la_LIBADD = @JPEGLIBS@
-+jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2
- 
- png_la_SOURCES = loader_png.c
--png_la_LDFLAGS = -module -avoid-version
--png_la_LIBADD = @PNGLIBS@
-+png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+png_la_LIBADD = @PNGLIBS@ -lImlib2
- 
- tiff_la_SOURCES = loader_tiff.c
--tiff_la_LDFLAGS = -module -avoid-version
--tiff_la_LIBADD = @TIFFLIBS@
-+tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+tiff_la_LIBADD = @TIFFLIBS@ -lImlib2
- 
- gif_la_SOURCES = loader_gif.c
--gif_la_LDFLAGS = -module -avoid-version
--gif_la_LIBADD = @GIFLIBS@
-+gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+gif_la_LIBADD = @GIFLIBS@ -lImlib2
- 
- zlib_la_SOURCES = loader_zlib.c
--zlib_la_LDFLAGS = -module -avoid-version
--zlib_la_LIBADD = @ZLIBLIBS@ 
-+zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+zlib_la_LIBADD = @ZLIBLIBS@  -lImlib2
- 
- bz2_la_SOURCES = loader_bz2.c
--bz2_la_LDFLAGS = -module -avoid-version
--bz2_la_LIBADD = @BZ2LIBS@ 
-+bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+bz2_la_LIBADD = @BZ2LIBS@  -lImlib2
- 
- pnm_la_SOURCES = loader_pnm.c
--pnm_la_LDFLAGS = -module -avoid-version
--pnm_la_LIBADD = 
-+pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+pnm_la_LIBADD = -lImlib2
- 
- argb_la_SOURCES = loader_argb.c
--argb_la_LDFLAGS = -module -avoid-version
--argb_la_LIBADD = 
-+argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+argb_la_LIBADD = -lImlib2
- 
- bmp_la_SOURCES = loader_bmp.c
--bmp_la_LDFLAGS = -module -avoid-version
--bmp_la_LIBADD = 
-+bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+bmp_la_LIBADD = -lImlib2
- 
- xpm_la_SOURCES = loader_xpm.c
--xpm_la_LDFLAGS = -module -avoid-version
--xpm_la_LIBADD = 
-+xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+xpm_la_LIBADD = -lImlib2
- 
- tga_la_SOURCES = loader_tga.c
--tga_la_LDFLAGS = -module -avoid-version
--tga_la_LIBADD = 
-+tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+tga_la_LIBADD = -lImlib2
- 
- lbm_la_SOURCES = loader_lbm.c
--lbm_la_LDFLAGS = -module -avoid-version
--lbm_la_LIBADD = 
-+lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+lbm_la_LIBADD = -lImlib2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff -r b1407f3f16de -r dd6ae8b857b9 graphics/imlib2/patches/patch-ca
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/imlib2/patches/patch-ca  Fri Nov 24 12:46:12 2006 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ca,v 1.1 2006/11/24 12:46:12 drochner Exp $
+
+--- src/modules/loaders/loader_argb.c.orig     2006-09-05 02:37:07.000000000 +0200
++++ src/modules/loaders/loader_argb.c



Home | Main Index | Thread Index | Old Index