From nobody Mon Aug 21 17:15:12 2023 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 4RTzcw42Qsz4r392; Mon, 21 Aug 2023 17:15:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTzcw2fZmz4fJS; Mon, 21 Aug 2023 17:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638112; 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=5X0wCtAy0x/QB1gTMzpNFtRa9n3D4Aw507nrLL8aoRI=; b=cdFPBtEAyGIrdaePsRlpISFzX2fGZULO93hGfx6OWd5rBybEXEjgvNYCbt2Xvyp+BUkkVi MrR9+rDe+xLWbkHT7NE0EkvgfXmODnwFX5UWkRrTvcrrg1l+2om3DSho+CUDW3/YONnN5b bIgr9wSvEOeCopPz4hSaw671tgdC2UBTHt/42c+YqJMGn5fVrznm+BPl8j3I8/a04GVb5/ XKUhi2/soRmqnYR8p77LGCvG2gFLoTdfRQgSDoJA+GjQnkTt1Q97K3i+Euz08rRUgUTmp7 cz9hB2yuUDPX7eCXRO/FChCFZWLB1SMw7rUI0xJz6dEmrZbBrt3gh63W+kXAvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638112; 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=5X0wCtAy0x/QB1gTMzpNFtRa9n3D4Aw507nrLL8aoRI=; b=S4gTGh+bnH84wlT7TH8BryKYH3UjrYMfLTBZtcfLiS/DtfJKN3jEmoi7dOndU9BQZj/vz0 w3TiBQbzFDF4UMmr4oLgtbYgJwiRotclpFmha0WfBI4OJ69BKq3ic4Red8dGPPJ40HRAY9 eV+HG/ulVHPJxwy0sVRWU49r6N47N1R81s431uc0aO+joflr2loOPOH7NKMW1Vvwlbyz/r bu0/9Plin1vbxAPDaQDtFcoXrvzRXxsy/nH7xoY7wl2DB1YVBTwVei7PXxHL1OgaFs4Q8n ALqftECAbLC1lm9Ic2XSOD5/Qg4MNGlMS0QXRWlzfu9jkEdfvjaZ8kjy3ZedCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692638112; a=rsa-sha256; cv=none; b=sJsBpJKYa2Ui4B7Qr5z6R3pbiHAL1qCJAhoHjV2YSmP99qOb6hiVwI2Eftm2WAFrXYleKp 4v3DqQCpk9IXkAUOAagRTsVUGxxKmT0Cv/jVkLt2fIgf8jU8Y/r3wg0TyYqHSoM2W++8Ra K1lFFlt/HvyHQt3js+foC09h5yVwhdfORMgrpLsBZMhrklAK5w4nXcH4nLoZAFa3ASQI92 9mai0OvnIk3GJ6rXJ3KxkAS348T9z8sr1zabtEaU4o2LhGyO7aD3qRo5WT5FFxpSThlA4t IHGum5dXAVtSqHaODZg3mwRT3wHXQziONN2nohxE239BU7BFJKjIRBvgr7d5hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTzcw1lg2zTYM; Mon, 21 Aug 2023 17:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHFCe0002454; Mon, 21 Aug 2023 17:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHFCS4002451; Mon, 21 Aug 2023 17:15:12 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:15:12 GMT Message-Id: <202308211715.37LHFCS4002451@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9638dd03eeb2 - main - www/py-django-bleach: Update to 3.1.0 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9638dd03eeb257fd9059b90427e58d82554c16ef Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9638dd03eeb257fd9059b90427e58d82554c16ef commit 9638dd03eeb257fd9059b90427e58d82554c16ef Author: Po-Chuan Hsieh AuthorDate: 2023-08-21 17:05:05 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-08-21 17:05:05 +0000 www/py-django-bleach: Update to 3.1.0 Changes: https://github.com/marksweb/django-bleach/releases --- www/py-django-bleach/Makefile | 5 +-- www/py-django-bleach/distinfo | 6 +-- www/py-django-bleach/files/patch-bleach6 | 74 ++++++++++++++++++++++++-------- 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/www/py-django-bleach/Makefile b/www/py-django-bleach/Makefile index 868942ab2e6f..981c35d02b3a 100644 --- a/www/py-django-bleach/Makefile +++ b/www/py-django-bleach/Makefile @@ -1,6 +1,5 @@ PORTNAME= django-bleach -PORTVERSION= 3.0.1 -PORTREVISION= 2 +PORTVERSION= 3.1.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +11,7 @@ WWW= https://github.com/marksweb/django-bleach LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bleach>=5:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django32>=3.2:www/py-django32@${PY_FLAVOR} diff --git a/www/py-django-bleach/distinfo b/www/py-django-bleach/distinfo index bedb6147208e..cd2c09db54f2 100644 --- a/www/py-django-bleach/distinfo +++ b/www/py-django-bleach/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665647979 -SHA256 (django-bleach-3.0.1.tar.gz) = 0e5f145bca1a52e822097853403832d92e957e4a1d47bb90233de9d07219247b -SIZE (django-bleach-3.0.1.tar.gz) = 22219 +TIMESTAMP = 1692211821 +SHA256 (django-bleach-3.1.0.tar.gz) = 766405a32b877a5beb6b377ace0d8bbe2a7d4d6304f04542aa14fd74b14398a7 +SIZE (django-bleach-3.1.0.tar.gz) = 22197 diff --git a/www/py-django-bleach/files/patch-bleach6 b/www/py-django-bleach/files/patch-bleach6 index 3e894a4e2716..157e9581e206 100644 --- a/www/py-django-bleach/files/patch-bleach6 +++ b/www/py-django-bleach/files/patch-bleach6 @@ -1,24 +1,64 @@ ---- django_bleach/tests/test_forms.py.orig 2022-10-12 00:33:48 UTC +--- django_bleach/tests/test_forms.py.orig 2023-08-05 01:36:02 UTC +++ django_bleach/tests/test_forms.py -@@ -147,7 +147,7 @@ class TestCustomWidget(TestCase): +@@ -127,7 +127,7 @@ class TestCustomWidget(TestCase): + # Define form inside function with overridden settings so + # get_default_widget() sees the modified setting. no_tags = BleachField( - max_length=100, - strip_tags=True, -- allowed_tags=[] -+ allowed_tags={} +- max_length=100, strip_tags=True, allowed_tags=[] ++ max_length=100, strip_tags=True, allowed_tags={} ) no_strip = BleachField( - max_length=100, ---- testproject/models.py.orig 2022-10-12 00:33:48 UTC + max_length=100, allowed_tags=None, allowed_attributes=None +--- setup.py.orig 2023-08-05 01:36:02 UTC ++++ setup.py +@@ -43,7 +43,7 @@ setup( + license="MIT", + packages=find_packages(exclude=("testproject*",)), + install_requires=[ +- "bleach[css]>=5,<6", ++ "bleach[css]>=5", + "Django>=3.2", + ], + python_requires=">=3.8", +--- testproject/constants.py.orig 2023-08-05 01:36:02 UTC ++++ testproject/constants.py +@@ -2,11 +2,11 @@ ALLOWED_ATTRIBUTES = {"*": ["class", "style"], "a": [" + + ALLOWED_CSS_PROPERTIES = ["color"] + +-ALLOWED_PROTOCOLS = [ ++ALLOWED_PROTOCOLS = { + "https", + "data", +-] ++} + + ALLOWED_STYLES = ALLOWED_CSS_PROPERTIES + +-ALLOWED_TAGS = ["a", "li", "ul"] ++ALLOWED_TAGS = {"a", "li", "ul"} +--- testproject/forms.py.orig 2023-08-05 01:36:02 UTC ++++ testproject/forms.py +@@ -23,7 +23,7 @@ class CustomBleachWidget(forms.Textarea): + class BleachForm(forms.Form): + """Form for testing BleachField""" + +- no_tags = BleachField(max_length=100, strip_tags=True, allowed_tags=[]) ++ no_tags = BleachField(max_length=100, strip_tags=True, allowed_tags={}) + + no_strip = BleachField( + max_length=100, allowed_tags=None, allowed_attributes=None +--- testproject/models.py.orig 2023-08-05 01:36:02 UTC +++ testproject/models.py -@@ -10,8 +10,8 @@ class Person(models.Model): +@@ -10,9 +10,9 @@ class Person(models.Model): biography = BleachField( max_length=100, - verbose_name='Person biography', -- allowed_tags=['p', 'a', 'li', 'ul', 'strong'], -+ allowed_tags={'p', 'a', 'li', 'ul', 'strong'}, - allowed_attributes=['class', 'href', 'style'], -- allowed_protocols=['http', 'https'], -+ allowed_protocols={'http', 'https'}, - css_sanitizer=CSSSanitizer(allowed_css_properties=['color', 'background-color']) - ) + verbose_name="Person biography", +- allowed_tags=["p", "a", "li", "ul", "strong"], ++ allowed_tags={"p", "a", "li", "ul", "strong"}, + allowed_attributes=["class", "href", "style"], +- allowed_protocols=["http", "https"], ++ allowed_protocols={"http", "https"}, + css_sanitizer=CSSSanitizer( + allowed_css_properties=["color", "background-color"] + ),