diff options
| author | drochner <drochner@pkgsrc.org> | 2016-02-16 20:17:41 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2016-02-16 20:17:41 +0000 |
| commit | 8982a5dfac41cc94b9b17d7f52258b6c3f24339c (patch) | |
| tree | d0029883151b3725cff0104dfe365e4b0025bab6 | |
| parent | c963a4a475255cb49c724d92415647a4a174d892 (diff) | |
| download | pkgsrc-8982a5dfac41cc94b9b17d7f52258b6c3f24339c.tar.gz | |
pull in https://github.com/python-pillow/Pillow/pull/1706
fixed buffer overflow in PcdDecode
bump PKGREV
| -rw-r--r-- | graphics/py-imaging/Makefile | 4 | ||||
| -rw-r--r-- | graphics/py-imaging/distinfo | 3 | ||||
| -rw-r--r-- | graphics/py-imaging/patches/patch-PcdDecode | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index b4f0a49c9d3..7870859e065 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2015/12/05 21:25:46 adam Exp $ +# $NetBSD: Makefile,v 1.52 2016/02/16 20:17:41 drochner Exp $ DISTNAME= Imaging-1.1.7 PKGNAME= ${PYPKGPREFIX}-imaging-1.1.7 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/media/downloads/ diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo index 7497b61c7a9..0a8d5474dfb 100644 --- a/graphics/py-imaging/distinfo +++ b/graphics/py-imaging/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2015/11/03 21:34:17 agc Exp $ +$NetBSD: distinfo,v 1.20 2016/02/16 20:17:41 drochner Exp $ SHA1 (python/Imaging-1.1.7.tar.gz) = 76c37504251171fda8da8e63ecb8bc42a69a5c81 RMD160 (python/Imaging-1.1.7.tar.gz) = 9af570fe100e250a4860314341fe3e6d695d7fde @@ -9,6 +9,7 @@ SHA1 (patch-PIL_IcnsImagePlugin.py) = 04d5ff3c666413178071eea2512162d6954bfc01 SHA1 (patch-PIL_Image.py) = 871994b3c8823c90ae23e6248762e403192e33fc SHA1 (patch-PIL_IptcImagePlugin.py) = bb809394b8c6f6e5b79aa1c90f429c3362e812e3 SHA1 (patch-PIL_JpegImagePlugin.py) = d4fd6d5d60ea011def2e42460d7faa2e0f47b65e +SHA1 (patch-PcdDecode) = 75457d449e359c25dfe4c8b7ff017b8ca6b1d2ff SHA1 (patch-_imagingft.c) = b935ce5ebdd57061ace324f7b53055113782f89c SHA1 (patch-ab) = f4b850da1ba15843b2d8b124c2ca8dfd17163c26 SHA1 (patch-ac) = 2ad2a988c7fdddb34812959ddfd60442282a48ea diff --git a/graphics/py-imaging/patches/patch-PcdDecode b/graphics/py-imaging/patches/patch-PcdDecode new file mode 100644 index 00000000000..c609d8e1540 --- /dev/null +++ b/graphics/py-imaging/patches/patch-PcdDecode @@ -0,0 +1,24 @@ +$NetBSD: patch-PcdDecode,v 1.1 2016/02/16 20:17:42 drochner Exp $ + +https://github.com/python-pillow/Pillow/pull/1706 + +--- libImaging/PcdDecode.c.orig 2016-02-16 20:03:07.000000000 +0000 ++++ libImaging/PcdDecode.c +@@ -47,7 +47,7 @@ ImagingPcdDecode(Imaging im, ImagingCode + out[0] = ptr[x]; + out[1] = ptr[(x+4*state->xsize)/2]; + out[2] = ptr[(x+5*state->xsize)/2]; +- out += 4; ++ out += 3; + } + + state->shuffle((UINT8*) im->image[state->y], +@@ -62,7 +62,7 @@ ImagingPcdDecode(Imaging im, ImagingCode + out[0] = ptr[x+state->xsize]; + out[1] = ptr[(x+4*state->xsize)/2]; + out[2] = ptr[(x+5*state->xsize)/2]; +- out += 4; ++ out += 3; + } + + state->shuffle((UINT8*) im->image[state->y], |