diff --git a/python-pillow.spec b/python-pillow.spec index dc37292..b110ec2 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -25,7 +25,7 @@ Name: python-pillow Version: 2.1.0 -Release: 3%{?snap}%{?dist} +Release: 4%{?snap}%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -40,6 +40,8 @@ Source0: https://github.com/python-imaging/Pillow/tarball/%{commit}/pytho Patch0: python-pillow-archs.patch # Fix memory corruption caused by incorrect palette size Patch1: python-pillow_bytearray.patch +# Fix incorrect PyArg_ParseTuple +Patch2: python-pillow_tupleargs.patch BuildRequires: python2-devel BuildRequires: python-setuptools @@ -210,6 +212,7 @@ PIL image wrapper for Qt. %setup -q -n python-imaging-Pillow-%{shortcommit} %patch0 -p1 -b .archs %patch1 -p1 -b .bytes +%patch2 -p1 -b .tupleargs %if %{with_python3} # Create Python 3 source tree @@ -361,6 +364,10 @@ popd %endif %changelog +* Thu Aug 29 2013 Sandro Mani - 2.1.0-4 +- Add patch to fix incorrect PyArg_ParseTuple tuple signature, fixes rhbz#962091 and rhbz#988767. +- Renable webp support on bigendian arches + * Wed Aug 28 2013 Sandro Mani - 2.1.0-3 - Add patch to fix memory corruption caused by invalid palette size, see rhbz#1001122 diff --git a/python-pillow_tupleargs.patch b/python-pillow_tupleargs.patch new file mode 100644 index 0000000..4612115 --- /dev/null +++ b/python-pillow_tupleargs.patch @@ -0,0 +1,12 @@ +diff -rupN python-imaging-Pillow-75af7e0/_webp.c python-imaging-Pillow-75af7e0-new/_webp.c +--- python-imaging-Pillow-75af7e0/_webp.c 2013-07-02 14:52:49.000000000 +0200 ++++ python-imaging-Pillow-75af7e0-new/_webp.c 2013-08-29 13:03:34.558822782 +0200 +@@ -17,7 +17,7 @@ PyObject* WebPEncode_wrapper(PyObject* s + Py_ssize_t size; + size_t ret_size; + +- if (!PyArg_ParseTuple(args, "s#nifs",(char**)&rgb, &size, &width, &height, &quality_factor, &mode)) { ++ if (!PyArg_ParseTuple(args, "s#iifs",(char**)&rgb, &size, &width, &height, &quality_factor, &mode)) { + Py_RETURN_NONE; + } +