diff --git a/Pillow-9.0.1.tar.gz b/Pillow-9.2.0.tar.gz similarity index 80% rename from Pillow-9.0.1.tar.gz rename to Pillow-9.2.0.tar.gz index b6733d7e4241100c688d4fc324ab5d83147d7a02..49e347e30221aeddb6c7571cd0de353349102e89 100644 Binary files a/Pillow-9.0.1.tar.gz and b/Pillow-9.2.0.tar.gz differ diff --git a/backport-Corrected-memory-allocation.patch b/backport-Corrected-memory-allocation.patch deleted file mode 100644 index 798fb625f75b57b94217803d4e6607f644d4328a..0000000000000000000000000000000000000000 --- a/backport-Corrected-memory-allocation.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fe32501922ef5e1be9a7d307132719bd5d52ca35 Mon Sep 17 00:00:00 2001 -From: Andrew Murray -Date: Fri, 14 Jan 2022 10:16:35 +1100 -Subject: [PATCH] Corrected allocation - -Conflict:NA -Reference:https://github.com/python-pillow/Pillow/pull/5958/commits/fe32501922ef5e1be9a7d307132719bd5d52ca35 - -This patch is the rear patch of CVE-2022-22815,CVE-2022-22816 - ---- - src/path.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/path.c b/src/path.c -index dea274e..1180406 100644 ---- a/src/path.c -+++ b/src/path.c -@@ -57,7 +57,7 @@ alloc_array(Py_ssize_t count) { - if ((unsigned long long)count > (SIZE_MAX / (2 * sizeof(double))) - 1) { - return ImagingError_MemoryError(); - } -- xy = calloc(2 * count * sizeof(double) + 1, sizeof(double)); -+ xy = calloc(2 * count + 1, sizeof(double)); - if (!xy) { - ImagingError_MemoryError(); - } --- -2.27.0 - diff --git a/python-pillow.spec b/python-pillow.spec index 8b6eec23101bb5cf5b576d0f4e2cd73e5949571b..575d79abd55cdc0c5f4b9ad72cb3a4629cc70286 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -4,17 +4,13 @@ %global with_docs 0 Name: python-pillow -Version: 9.0.1 -Release: 2 +Version: 9.2.0 +Release: 1 Summary: Python image processing library License: MIT URL: http://python-pillow.github.io/ Source0: https://github.com/python-pillow/Pillow/archive/%{version}/Pillow-%{version}.tar.gz -Patch0: python-pillow_spinxwarn.patch -Patch1: python-pillow_sphinx-issues.patch - -Patch6000: backport-Corrected-memory-allocation.patch BuildRequires: freetype-devel ghostscript lcms2-devel libimagequant-devel libjpeg-devel libtiff-devel BuildRequires: libwebp-devel openjpeg2-devel tk-devel zlib-devel python3-cffi python3-devel python3-numpy python3-olefile @@ -152,6 +148,11 @@ pytest --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v %{python3_sitearch}/PIL/__pycache__/ImageQt* %changelog +* Thu Apr 11 2024 wangjing - 9.2.0-1 +- update package of version 9.2.0 +- Deprecate ImageFont.getsize and related functions +- Added GIF decompression bomb check + * Wed Apr 20 2022 dongyuzhen - 9.0.1-2 - correct memory allocation in alloc_array (this is the rear patch of CVE-2022-22815,CVE-2022-22816) diff --git a/python-pillow_sphinx-issues.patch b/python-pillow_sphinx-issues.patch deleted file mode 100644 index 1db7a6cd799c4c2e4318457766c653d2a6c35537..0000000000000000000000000000000000000000 --- a/python-pillow_sphinx-issues.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rupN --no-dereference Pillow-9.0.1/docs/conf.py Pillow-9.0.1-new/docs/conf.py ---- Pillow-9.0.1/docs/conf.py 2022-02-03 00:45:27.000000000 +0100 -+++ Pillow-9.0.1-new/docs/conf.py 2022-02-23 09:06:33.169472252 +0100 -@@ -30,12 +30,10 @@ needs_sphinx = "2.4" - # ones. - extensions = [ - "sphinx_copybutton", -- "sphinx_issues", - "sphinx_removed_in", - "sphinx.ext.autodoc", - "sphinx.ext.intersphinx", -- "sphinx.ext.viewcode", -- "sphinxext.opengraph", -+ "sphinx.ext.viewcode" - ] - - intersphinx_mapping = {"python": ("https://docs.python.org/3", None)} diff --git a/python-pillow_spinxwarn.patch b/python-pillow_spinxwarn.patch deleted file mode 100644 index a9698f7c8e1480e91f69dac67719d79a9e0cbe9c..0000000000000000000000000000000000000000 --- a/python-pillow_spinxwarn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN --no-dereference Pillow-9.0.1/docs/Makefile Pillow-9.0.1-new/docs/Makefile ---- Pillow-9.0.1/docs/Makefile 2022-02-03 00:45:27.000000000 +0100 -+++ Pillow-9.0.1-new/docs/Makefile 2022-02-23 09:06:33.060472214 +0100 -@@ -42,7 +42,7 @@ clean: - -rm -rf $(BUILDDIR)/* - - html: -- $(SPHINXBUILD) -b html -W --keep-going $(ALLSPHINXOPTS) $(BUILDDIR)/html -+ $(SPHINXBUILD) -b html --keep-going $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." -