diff options
author | rtr <rtr@pkgsrc.org> | 2008-11-24 08:43:51 +0000 |
---|---|---|
committer | rtr <rtr@pkgsrc.org> | 2008-11-24 08:43:51 +0000 |
commit | 052c5d0407793b5c84a5db1daffe475305feb8b5 (patch) | |
tree | 49497cbea76c83ba0bc5bf669c3106f405819491 | |
parent | 348808c2820b9be94f924ab9fbce5d5c77a095d6 (diff) | |
download | pkgsrc-052c5d0407793b5c84a5db1daffe475305feb8b5.tar.gz |
pullup ticket #2595 - requested by tron
imlib2: add patch to fix buffer overflow
revisions pulled up:
pkgsrc/graphics/imlib2/Makefile 1.48
pkgsrc/graphics/imlib2/distinfo 1.23
pkgsrc/graphics/imlib2/patches/patch-aa 1.12
Module Name: pkgsrc
Committed By: tron
Date: Sun Nov 23 18:41:16 UTC 2008
Modified Files:
pkgsrc/graphics/imlib2: Makefile distinfo
Added Files:
pkgsrc/graphics/imlib2/patches: patch-aa
Log Message:
Add Debian patch to fix a buffer overflow in the XPM file loader.
Bump package revision.
-rw-r--r-- | graphics/imlib2/Makefile | 3 | ||||
-rw-r--r-- | graphics/imlib2/distinfo | 3 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-aa | 14 |
3 files changed, 18 insertions, 2 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 9dbb179701c..c98d7f23d27 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.46.8.1 2008/10/31 12:00:46 rtr Exp $ +# $NetBSD: Makefile,v 1.46.8.2 2008/11/24 08:43:51 rtr Exp $ DISTNAME= imlib2-1.4.2 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index d38c0aeeebf..2ab8278ebab 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.21.8.1 2008/10/31 12:00:46 rtr Exp $ +$NetBSD: distinfo,v 1.21.8.2 2008/11/24 08:43:51 rtr Exp $ 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-aa) = deb91537edb7c0ff44dfb2be2ad377f960f65c06 SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5 SHA1 (patch-ac) = bd81a8f1dfaacb43a4f62a187c4d00c43be5a7e3 SHA1 (patch-ad) = adf301fe0179aa1ab05fc54bb7ab706ee97ab7a7 diff --git a/graphics/imlib2/patches/patch-aa b/graphics/imlib2/patches/patch-aa new file mode 100644 index 00000000000..cf4792c46ec --- /dev/null +++ b/graphics/imlib2/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.11.12.1 2008/11/24 08:43:51 rtr Exp $ + +--- src/modules/loaders/loader_xpm.c.orig 2008-10-21 03:32:51.000000000 +0100 ++++ src/modules/loaders/loader_xpm.c 2008-11-23 18:36:37.000000000 +0000 +@@ -253,8 +253,8 @@ + return 0; + } + ptr = im->data; +- end = ptr + (sizeof(DATA32) * w * h); + pixels = w * h; ++ end = ptr + pixels; + } + else + { |