summaryrefslogtreecommitdiff
path: root/graphics/imlib2
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-01-31 10:23:44 +0000
committerwiz <wiz@pkgsrc.org>2011-01-31 10:23:44 +0000
commitc310f02afa886a0b533314a0ff9ff7de3ac74edd (patch)
treee1ef981d3722bc691248f392823ec819de3a377b /graphics/imlib2
parent652577ea4655a266b975ab76774c5b25e6f6e36e (diff)
downloadpkgsrc-c310f02afa886a0b533314a0ff9ff7de3ac74edd.tar.gz
Remove obsolete patch (a very similar chunk is nowadays a few lines
higher, where the variables are defined).
Diffstat (limited to 'graphics/imlib2')
-rw-r--r--graphics/imlib2/distinfo3
-rw-r--r--graphics/imlib2/patches/patch-cb21
2 files changed, 1 insertions, 23 deletions
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index b41310859d6..51a8b6758a5 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2011/01/31 10:22:26 wiz Exp $
+$NetBSD: distinfo,v 1.26 2011/01/31 10:23:44 wiz Exp $
SHA1 (imlib2-1.4.2.tar.gz) = 769ea1da26774cd7531d1d66432cf8d7d7b30c2b
RMD160 (imlib2-1.4.2.tar.gz) = 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695
@@ -9,4 +9,3 @@ SHA1 (patch-ac) = 02e6706b640a6e51cb028447e56ceb65816c64d2
SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
SHA1 (patch-ae) = 8cb6e0f0fa1220b2e6840b19256eaf8cd947b63b
SHA1 (patch-af) = 9ee80e6dac9cc182ac847ac0b8c215352ee99290
-SHA1 (patch-cb) = 15b44bb49545c5cffcb8eb59b68797a08e29369d
diff --git a/graphics/imlib2/patches/patch-cb b/graphics/imlib2/patches/patch-cb
deleted file mode 100644
index dbe4f7f6804..00000000000
--- a/graphics/imlib2/patches/patch-cb
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cb,v 1.2 2011/01/31 10:22:26 wiz Exp $
-
-fix some insufficient validation of graphics files, patches from Ubuntu
-(CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809)
-
---- src/modules/loaders/loader_jpeg.c.orig 2006-09-05 02:37:07.000000000 +0200
-+++ src/modules/loaders/loader_jpeg.c
-@@ -95,6 +95,13 @@ load(ImlibImage * im, ImlibProgressFunct
- UNSET_FLAG(im->flags, F_HAS_ALPHA);
- im->format = strdup("jpeg");
- }
-+ if (w < 1 || h < 1 || w > 16383 || h > 16383)
-+ {
-+ im->w = im->h = 0;
-+ jpeg_destroy_decompress(&cinfo);
-+ fclose(f);
-+ return 0;
-+ }
- if (((!im->data) && (im->loader)) || (immediate_load) || (progress))
- {
- DATA8 *ptr, *line[16], *data;