Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Jun 2021 16:06:32 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 0d8918971975 - 2021Q2 - graphics/py-pillow: upgrade to 8.2.0 + fix vulnerabilities
Message-ID:  <202106261606.15QG6WUS008017@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0d89189719750ec21a542236de9611791ac08713

commit 0d89189719750ec21a542236de9611791ac08713
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2021-04-24 10:10:42 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2021-06-26 16:05:24 +0000

    graphics/py-pillow: upgrade to 8.2.0 + fix vulnerabilities
    
    - Release notes at <https://github.com/python-pillow/Pillow/releases/tag/8.2.0>;
    
    - Security fixes described at
    <https://github.com/python-pillow/Pillow/pull/5377/commits/8ec027867f19633d9adfc5c8b7504d9b609fc5f1>;
    
    - Since I´m there, add newer optional dependencies.
    
    Security:       CVE-2021-25287
    Security:       CVE-2021-25288
    Security:       CVE-2021-28675
    Security:       CVE-2021-28676
    Security:       CVE-2021-28677
    Security:       CVE-2021-28678
    
    PR:             255361
    Approved by:    koobs (maintainer)
    
    (cherry picked from commit 553bcea9dbe91208a9c8bf265e0d8e1172094ffe but
    disable RAQM)
---
 graphics/py-pillow/Makefile | 21 +++++++++++++--------
 graphics/py-pillow/distinfo |  6 +++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile
index a17c42ee67ff..4a47300c872d 100644
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@@ -1,7 +1,7 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 
 PORTNAME=	pillow
-PORTVERSION=	7.0.0
+PORTVERSION=	8.2.0
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,8 +13,7 @@ LICENSE_NAME=	Standard PIL License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 # Python 3.5+
 USES=		cpe python:3.5+
@@ -24,12 +23,14 @@ USE_PYTHON=	autoplist concurrent distutils
 GH_ACCOUNT=	python-${PORTNAME}
 GH_PROJECT=	${PORTNAME:C/p/P/}
 
-OPTIONS_DEFINE=		FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP
-OPTIONS_DEFAULT=	FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP
+OPTIONS_DEFINE=		FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP XCB
+OPTIONS_DEFAULT=	FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP XCB
 
 LCMS_DESC=		Little Color Management System
 OLE_DESC=		Microsoft OLE2 file format support
+RAQM_DESC=		Complex text layout support
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support
+XCB_DESC=		X11 screengrab support
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_VARS=		PYDISTUTILS_BUILDARGS+=--enable-freetype
@@ -65,15 +66,19 @@ WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_VARS=		PYDISTUTILS_BUILDARGS+="--enable-webp --enable-webpmux"
 WEBP_VARS_OFF=		PYDISTUTILS_BUILDARGS+="--disable-webp --disable-webpmux"
 
+XCB_USES=		xorg
+XCB_VARS=		PYDISTUTILS_BUILDARGS+="--enable-xcb" USE_XORG=xcb
+XCB_VARS_OFF=		PYDISTUTILS_BUILDARGS+="--disable-xcb"
+
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_BUILD_TARGET=	build build_ext
-PYDISTUTILS_BUILDARGS+=		saveopts
+PYDISTUTILS_BUILDARGS+=		saveopts --disable-raqm
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so
 
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+do-test: install
+	@cd ${WRKSRC} && ${PYTHON_CMD} selftest.py
 
 .include <bsd.port.post.mk>
diff --git a/graphics/py-pillow/distinfo b/graphics/py-pillow/distinfo
index 9e0c77dce471..a1a68742bb8a 100644
--- a/graphics/py-pillow/distinfo
+++ b/graphics/py-pillow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579047762
-SHA256 (python-pillow-Pillow-7.0.0_GH0.tar.gz) = 925f52e26491063943c14edadc6d276e3a8427b11d6943113fd2ef24dcbeabca
-SIZE (python-pillow-Pillow-7.0.0_GH0.tar.gz) = 37880130
+TIMESTAMP = 1619193474
+SHA256 (python-pillow-Pillow-8.2.0_GH0.tar.gz) = da86280bbfcd2b7fd87d33ce6f28688bf600600dfdbe85bfc16c562bbd26ca97
+SIZE (python-pillow-Pillow-8.2.0_GH0.tar.gz) = 47898485



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106261606.15QG6WUS008017>