[pkgsrc/pkgsrc-2008Q3]: pkgsrc/graphics/imlib2 pullup ticket #2562 - requeste...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1274b9bc4592
branches:  pkgsrc-2008Q3
changeset: 547848:1274b9bc4592
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Fri Oct 31 12:00:46 2008 +0000

description:
pullup ticket #2562 - requested by tron
imlib2: update package for security fix

revisions pulled up:
pkgsrc/graphics/imlib2/Makefile         1.47
pkgsrc/graphics/imlib2/distinfo         1.22
pkgsrc/graphics/imlib2/patches/patch-ca r0
pkgsrc/graphics/imlib2/patches/patch-ce r0
pkgsrc/graphics/imlib2/patches/patch-cf r0

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Thu Oct 30 11:26:26 UTC 2008

   Modified Files:
           pkgsrc/graphics/imlib2: Makefile distinfo
   Removed Files:
           pkgsrc/graphics/imlib2/patches: patch-ca patch-ce patch-cf

   Log Message:
   Update "imlib" package to version 1.4.2. Changes since version 1.4.0:
   - Various bugfixes and security updates

   This update addresses SA32354.

diffstat:

 graphics/imlib2/Makefile         |   5 ++---
 graphics/imlib2/distinfo         |  11 ++++-------
 graphics/imlib2/patches/patch-ca |  30 ------------------------------
 graphics/imlib2/patches/patch-ce |  13 -------------
 graphics/imlib2/patches/patch-cf |  13 -------------
 5 files changed, 6 insertions(+), 66 deletions(-)

diffs (102 lines):

diff -r f4d8fd3f2a4b -r 1274b9bc4592 graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Wed Oct 29 10:05:39 2008 +0000
+++ b/graphics/imlib2/Makefile  Fri Oct 31 12:00:46 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2008/06/02 10:05:50 drochner Exp $
+# $NetBSD: Makefile,v 1.46.8.1 2008/10/31 12:00:46 rtr Exp $
 
-DISTNAME=      imlib2-1.4.0
-PKGREVISION=   2
+DISTNAME=      imlib2-1.4.2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff -r f4d8fd3f2a4b -r 1274b9bc4592 graphics/imlib2/distinfo
--- a/graphics/imlib2/distinfo  Wed Oct 29 10:05:39 2008 +0000
+++ b/graphics/imlib2/distinfo  Fri Oct 31 12:00:46 2008 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.21 2008/06/02 10:05:50 drochner Exp $
+$NetBSD: distinfo,v 1.21.8.1 2008/10/31 12:00:46 rtr Exp $
 
-SHA1 (imlib2-1.4.0.tar.gz) = 2bbd65b82a690d21dab2bfeb33cc370f6bb49393
-RMD160 (imlib2-1.4.0.tar.gz) = 5b663a420e1008ddc047665912cad473323803da
-Size (imlib2-1.4.0.tar.gz) = 955897 bytes
+SHA1 (imlib2-1.4.2.tar.gz) = 769ea1da26774cd7531d1d66432cf8d7d7b30c2b
+RMD160 (imlib2-1.4.2.tar.gz) = 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695
+Size (imlib2-1.4.2.tar.gz) = 932684 bytes
 SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5
 SHA1 (patch-ac) = bd81a8f1dfaacb43a4f62a187c4d00c43be5a7e3
 SHA1 (patch-ad) = adf301fe0179aa1ab05fc54bb7ab706ee97ab7a7
 SHA1 (patch-ae) = 6503e4cbc9bbb93f971ab2ae9fd7d50ddee9e0e8
-SHA1 (patch-ca) = c2150a4c1ad3ccccaf37961e2f301cd7f2ba2044
 SHA1 (patch-cb) = da837b92a1a4cfd139fe2d9ed319d1cd6e0fb703
-SHA1 (patch-ce) = 2a6d3fd704885d56b3ed4c2a19d2800f29c7c9a0
-SHA1 (patch-cf) = 25e8616cebc2983b51d1230339d17620a25cc156
diff -r f4d8fd3f2a4b -r 1274b9bc4592 graphics/imlib2/patches/patch-ca
--- a/graphics/imlib2/patches/patch-ca  Wed Oct 29 10:05:39 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$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
-@@ -23,7 +23,7 @@ char
- load(ImlibImage * im, ImlibProgressFunction progress,
-      char progress_granularity, char immediate_load)
- {
--   int                 w, h, alpha;
-+   int                 w=0, h=0, alpha=0;
-    FILE               *f;
- 
-    if (im->data)
-@@ -36,13 +36,15 @@ load(ImlibImage * im, ImlibProgressFunct
-    {
-       char                buf[256], buf2[256];
- 
-+      memset(buf, 0, sizeof(buf));
-+      memset(buf2, 0, sizeof(buf));
-       if (!fgets(buf, 255, f))
-         {
-            fclose(f);
-            return 0;
-         }
-       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
--      if (strcmp(buf2, "ARGB"))
-+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
-         {
-            fclose(f);
-            return 0;
diff -r f4d8fd3f2a4b -r 1274b9bc4592 graphics/imlib2/patches/patch-ce
--- a/graphics/imlib2/patches/patch-ce  Wed Oct 29 10:05:39 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2006/11/24 12:46:12 drochner Exp $
-
---- src/modules/loaders/loader_pnm.c.orig      2006-09-05 02:37:07.000000000 +0200
-+++ src/modules/loaders/loader_pnm.c
-@@ -80,7 +80,7 @@ load(ImlibImage * im, ImlibProgressFunct
-              int                 i = 0;
- 
-              /* read numbers */
--             while (c != EOF && !isspace(c))
-+             while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
-                {
-                   buf[i++] = c;
-                   c = fgetc(f);
diff -r f4d8fd3f2a4b -r 1274b9bc4592 graphics/imlib2/patches/patch-cf
--- a/graphics/imlib2/patches/patch-cf  Wed Oct 29 10:05:39 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-cf,v 1.3 2008/06/02 10:05:50 drochner Exp $
-
---- src/modules/loaders/loader_xpm.c.orig      2008-06-02 11:44:35.000000000 +0200
-+++ src/modules/loaders/loader_xpm.c
-@@ -284,7 +284,7 @@ load(ImlibImage * im, ImlibProgressFunct
-                                  if (line[k] != ' ')
-                                    {
-                                       s[0] = 0;
--                                      sscanf(&line[k], "%65535s", s);
-+                                      sscanf(&line[k], "%255s", s);
-                                       slen = strlen(s);
-                                       k += slen;
-                                       if (!strcmp(s, "c"))