diff options
author | tron <tron@pkgsrc.org> | 2008-10-30 11:26:25 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2008-10-30 11:26:25 +0000 |
commit | c8c48237405077f67a094913191b8bcc4397e1f6 (patch) | |
tree | 56f77ca3f12b172156614a7a3e646a327076ddbd /graphics/imlib2 | |
parent | 9237c08075df7b957a22ad1f89546d81436a2c39 (diff) | |
download | pkgsrc-c8c48237405077f67a094913191b8bcc4397e1f6.tar.gz |
Update "imlib" package to version 1.4.2. Changes since version 1.4.0:
- Various bugfixes and security updates
This update addresses SA32354.
Diffstat (limited to 'graphics/imlib2')
-rw-r--r-- | graphics/imlib2/Makefile | 5 | ||||
-rw-r--r-- | graphics/imlib2/distinfo | 11 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-ca | 30 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-ce | 13 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-cf | 13 |
5 files changed, 6 insertions, 66 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index f28a92951af..9249a74be1e 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2008/06/02 10:05:50 drochner Exp $ +# $NetBSD: Makefile,v 1.47 2008/10/30 11:26:25 tron Exp $ -DISTNAME= imlib2-1.4.0 -PKGREVISION= 2 +DISTNAME= imlib2-1.4.2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index f0d27894a19..86f89def923 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.21 2008/06/02 10:05:50 drochner Exp $ +$NetBSD: distinfo,v 1.22 2008/10/30 11:26:26 tron 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 --git a/graphics/imlib2/patches/patch-ca b/graphics/imlib2/patches/patch-ca deleted file mode 100644 index b487d29517b..00000000000 --- a/graphics/imlib2/patches/patch-ca +++ /dev/null @@ -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 --git a/graphics/imlib2/patches/patch-ce b/graphics/imlib2/patches/patch-ce deleted file mode 100644 index f9e9e6ba251..00000000000 --- a/graphics/imlib2/patches/patch-ce +++ /dev/null @@ -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 --git a/graphics/imlib2/patches/patch-cf b/graphics/imlib2/patches/patch-cf deleted file mode 100644 index 6da54b63c72..00000000000 --- a/graphics/imlib2/patches/patch-cf +++ /dev/null @@ -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")) |