From nobody Tue Aug 20 09:46:15 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wp4NR5n8dz5SmKX; Tue, 20 Aug 2024 09:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wp4NR586Wz47HY; Tue, 20 Aug 2024 09:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724147175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDOF89bfpOgKl73517MxylfHaqUc6HdWDNWNZysQ+/k=; b=N17PyMluYM/ZCxh1Y5lwionVDrreTt7vskBd96rv/wf3vU9qsSiXo6qdQf5/uCNbVSRIP+ V0OJVMq7wcDruHgrO0cPoAYFCxuOOZaZGaTu/KOFj+tsOGXbP5VktdRvdlIb5iwAR8RUem 5wcO8eBMMKdmNmRQfIw2o8Ybd9G7PdVaWfroo+Mytrt2XSpn8hwesvUCmn8yrkoeEENw55 a3pVAuVp+nKPLo2HRL9mCze6s8YOgkbK6VqM9crh0/hMT2wuiucPcUai6hd+NCyS28n2zN 7Ulso58C0eXVyWhuLAjRCkxyM+QVIoGvIT4z46/fLqARN0RN2Aqg1arhFZA+2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724147175; a=rsa-sha256; cv=none; b=xoVExgtltrCuQ1CLqsye1GeBEVgRktVSKGfh26JaO/00RYsKQmoOk7jidj7C+3OdAjBIZO O1RWZeQ3P3a/XoQklDlh7t6AQz/NdGzaQMFkPATWg8JxtgVPGZRMI6tcjzu61h+YCUTYk6 +v5vIcemv5uDA7xfy2fUJsaCPgdc2d4AMjSTjU9B3+FvpTW9SFL0jxggtEqfMkD+OGRr/Q I/Dpx7GP6Lh7NZXDuyZJnrXEhV9yjsduyCKK1lq51l7VSkuna6rDn09/j/6gpnIKjPuFLA n+MK9fAgixZFpGQV+uJ+p1QPqK9UzMKBnwEKqtndnTHNev7HgVP7xJahFGrUCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724147175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDOF89bfpOgKl73517MxylfHaqUc6HdWDNWNZysQ+/k=; b=kko1y5gEMo1t2oALVA7y7pkd9BWUJqSwDANp4jeLtla3YDxCSlgay7fwEGDOG4ZcP2+VNy PmFRFo4mD/AqjbvkD5GN+uk2suFmzyD2FqaanGWEa3/Nm+9sgT6hWTxEM/5zRxp3rmy6wb Co+/6PHuNFr1jYSz7WnkfY3sKtFg7LbmYvaV44yaUorbfrJllzwpnzCYoSmPRvY2c1DNhu VJhY/Krj2EWoPw4lMRL23pGB0Q/U9pRzFqvw8vRuYVKUB1RjRFm8U6Knq36e6u1a1bVc2X xfJUsRI1ix/+HjYz600zQmp64QBsPuUAaiCo4S1ik2TIlrcqc5RK0KBLJo8Y6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wp4NR4dSvzvpT; Tue, 20 Aug 2024 09:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47K9kFGh049477; Tue, 20 Aug 2024 09:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K9kFEN049474; Tue, 20 Aug 2024 09:46:15 GMT (envelope-from git) Date: Tue, 20 Aug 2024 09:46:15 GMT Message-Id: <202408200946.47K9kFEN049474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 70fe5a1c9d64 - main - devel/py-Jinja2: Update to 3.1.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70fe5a1c9d646e1f0157a04377ddb77f27b1a52a Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=70fe5a1c9d646e1f0157a04377ddb77f27b1a52a commit 70fe5a1c9d646e1f0157a04377ddb77f27b1a52a Author: Nicola Vitale AuthorDate: 2024-08-20 09:40:50 +0000 Commit: Nicola Vitale CommitDate: 2024-08-20 09:40:50 +0000 devel/py-Jinja2: Update to 3.1.4 - This is a security release, which fixes security issues and bugs but does not otherwise change behavior and should not result in breaking changes. [1] - Convert from distutils to pep517 - Pet portclippy(1) Reference: https://github.com/advisories/GHSA-h75v-3vvj-5mfj [1] Security: CVE-2024-34064 --- devel/py-Jinja2/Makefile | 44 ++++++++++++++++++++++++++++++++++++-------- devel/py-Jinja2/distinfo | 6 +++--- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile index f82665a8e0b7..0794e57d2d3c 100644 --- a/devel/py-Jinja2/Makefile +++ b/devel/py-Jinja2/Makefile @@ -1,34 +1,40 @@ PORTNAME= Jinja2 -DISTVERSION= 3.1.3 +DISTVERSION= 3.1.4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX?= +DISTNAME= ${PYWHEEL_NAME}-${DISTVERSION} MAINTAINER= nivit@FreeBSD.org COMMENT= Fast and easy to use stand-alone template engine WWW= https://jinja.palletsprojects.com/en/3.1.x/ LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE.rst +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.9.0:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markupsafe>=2.0.0:textproc/py-markupsafe@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markupsafe>=2.0.0:textproc/py-markupsafe@${PY_FLAVOR} -NO_ARCH= yes .if empty(PKGNAMESUFFIX) USES= cpe python -USE_PYTHON= autoplist distutils pytest # 23 tests fail, see https://github.com/pallets/jinja/issues/1757 - CPE_VENDOR= pocoo +USE_PYTHON= autoplist pep517 pytest # 23 tests fail, see https://github.com/pallets/jinja/issues/1757 +PEP517_INSTALL_CMD= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} \ + --prefix ${PREFIX} \ + ${BUILD_WRKSRC}/dist/${PYWHEEL_NAME}-${DISTVERSION}*.whl .endif .if ${PKGNAMESUFFIX} == -doc USES= gmake python USE_PYTHON= flavors .endif +PYWHEEL_NAME= ${PORTNAME:tl:C|[-_]+|_|g} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +NO_ARCH= yes + OPTIONS_DEFINE?= BABEL EXAMPLES OPTIONS_DEFAULT?= BABEL BABEL_DESC= Enable Babel extension @@ -37,6 +43,28 @@ BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.7:devel/py-babel@${PY_FLAVOR} .include +.if empty(PKGNAMESUFFIX) +do-install: + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + @cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} + @${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PYWHEEL_NAME}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST} + @${REINPLACE_CMD} \ + -e '/\.pyc$$/d' \ + -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../include/|include/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../lib/|lib/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../libdata/|libdata/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../libexec/|libexec/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../man/|man/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../sbin/|sbin/|' \ + -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../share/|share/|' \ + ${_PYTHONPKGLIST} + @cd ${STAGEDIR}${PREFIX} && ${FIND} lib -name '*.pyc' >> ${_PYTHONPKGLIST} +.endif + .if ${PKGNAMESUFFIX} == "-doc" BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Pallets-Sphinx-Themes>=2.0.2:textproc/py-pallets-sphinx-themes@${PY_FLAVOR} \ @@ -59,12 +87,12 @@ do-install: .if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= * post-build: - ${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \ - ${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples + ${PYTHON_CMD} -m compileall ${WRKSRC}/docs/examples ; \ + ${PYTHON_CMD} -O -m compileall ${WRKSRC}/docs/examples post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC}/docs/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .endif check regression-test: build diff --git a/devel/py-Jinja2/distinfo b/devel/py-Jinja2/distinfo index 89c26456b217..e3118028209e 100644 --- a/devel/py-Jinja2/distinfo +++ b/devel/py-Jinja2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704965223 -SHA256 (Jinja2-3.1.3.tar.gz) = ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90 -SIZE (Jinja2-3.1.3.tar.gz) = 268261 +TIMESTAMP = 1716822740 +SHA256 (jinja2-3.1.4.tar.gz) = 4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 +SIZE (jinja2-3.1.4.tar.gz) = 240245