From nobody Fri May 13 11:46:19 2022 X-Original-To: dev-commits-ports-main@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 465891AD9763; Fri, 13 May 2022 11:46:21 +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 4L06L43Hn5z3sZq; Fri, 13 May 2022 11:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652442381; 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=6XEyOTVvjffrFge+78a414hzMP+K2aNYZpzI8qbGH9Q=; b=hO7f1KygfQvOj7GsRkoF2k9pH2ufP2mTvjIzS0XVEWvR87c5+gkPITU6M+WXu/1+iog6St NiV3dT+bf82NafzohUy3LoXWn66g/CGKERjmE34JhVnYrkBfCBsReNg/Km9l0/nvLjKpVC yh2Z1zNUiT5fi2lMoQKrz5D0O4MdxqryrSZWoWW8b5ggV/xk4Y3KSelR3Y/IqrTkB4GtNZ PLp9huP4xovPAHxlLJhYkbYJl8f2LcEm78EBX1hg7k6shnFMKgWC9bMatqckeFair2cIxo S/LUFKEF3rXHNPasAu2GUN/VnjM8hm15NKCXd4NQbd7m0v/J9/mPAk5qMUKX2g== 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 001CA22394; Fri, 13 May 2022 11:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DBkJ3j064911; Fri, 13 May 2022 11:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DBkJTN064910; Fri, 13 May 2022 11:46:19 GMT (envelope-from git) Date: Fri, 13 May 2022 11:46:19 GMT Message-Id: <202205131146.24DBkJTN064910@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: 0950d88f0d07 - main - security/py-argon2-cffi: Update to 21.3.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0950d88f0d075d164b703286244aa998c5ce8bff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652442381; 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=6XEyOTVvjffrFge+78a414hzMP+K2aNYZpzI8qbGH9Q=; b=gH5dryDfINlMUkecWf1SByPB8oXXB1cf55mbaDp0oypEGjj4py3RMqAnSTwPHIVh9/ItPN 3Adg1Z2hS1zZS1lNnRXXhMXylFIBWlWlWt/oU3tJHkLQS766tzMuHwYG+wXPEba1WFqUqY bG0bM71C6D9qQ0Ux/vVg2yl2sTvwx+aC9jxp4lEXKyll6+cmvmnIvrYtu+F/IwHtJBNVGT NFSG9bIMPnMFxKfQDJFNAdyaA75WT6xFp+ob3YwOkAdPTcSyvDz0Sc+b7LnoKQ7WmtCMPq NSvnc/BUBzILBTbTebBWdwA16UAsQjD3+DiF/Op7IqRS6mFwyfBktxgWt8jrHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652442381; a=rsa-sha256; cv=none; b=VpZGq5LpOlCti7wUrD9t8K68FRLhFYpJHGoyQoQbyVQx1LXl4xgr+j8TlncPbGUZ3Ra/Hw wFK/IMoZkWBpmWOxh9jKuzpe0qsT1yHD4bXfPeDLAgxxmSOIn+ob7V3dBZIijGiE+ku+Sr ghH4IYuIezv65I2JhYfgK3rK+b5icOfY5KbcYI3B6BdihDf0VzFmoaDbvJRz8kvfJhw6Xj J3RUcSunMG7jQiSwh/xtUOpoB2hwmSoHjMNRKewHslTS8LOdbAUIulL2igUOU6Q3hDfVov 4pmOOtpLbokwme1rjpCoP9wbiVWFQmEQlMhRYuV+gJaVnNZcUQAgjS3XQOxoiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0950d88f0d075d164b703286244aa998c5ce8bff commit 0950d88f0d075d164b703286244aa998c5ce8bff Author: Po-Chuan Hsieh AuthorDate: 2022-05-13 11:31:24 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-05-13 11:39:35 +0000 security/py-argon2-cffi: Update to 21.3.0 - Add NO_ARCH Changes: https://github.com/hynek/argon2-cffi/releases --- security/py-argon2-cffi/Makefile | 34 ++++++++-------- security/py-argon2-cffi/distinfo | 6 +-- .../files/patch-tests_test__low__level.py | 22 ----------- security/py-argon2-cffi/files/setup.py | 45 ++++++++++++++++++++++ security/py-argon2-cffi/pkg-descr | 9 ++--- 5 files changed, 69 insertions(+), 47 deletions(-) diff --git a/security/py-argon2-cffi/Makefile b/security/py-argon2-cffi/Makefile index dad0bee9639c..386307870ad7 100644 --- a/security/py-argon2-cffi/Makefile +++ b/security/py-argon2-cffi/Makefile @@ -1,9 +1,8 @@ PORTNAME= argon2-cffi -PORTVERSION= 19.1.0 +PORTVERSION= 21.3.0 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Secure Argon2 password hashing algorithm @@ -11,25 +10,26 @@ COMMENT= Secure Argon2 password hashing algorithm LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} -LIB_DEPENDS= libargon2.so:security/libargon2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argon2-cffi-bindings>=0:security/py-argon2-cffi-bindings@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=5.0.2:devel/py-coverage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0,1:devel/py-pytest@${PY_FLAVOR} -USES= python:3.6+ localbase -USE_PYTHON= autoplist distutils +USES= python:3.6+ +USE_PYTHON= autoplist concurrent distutils -MAKE_ENV+= ARGON2_CFFI_USE_SYSTEM=1 +NO_ARCH= yes -PYDISTUTILS_BUILD_TARGET= build_ext -PYDISTUTILS_BUILDARGS+= --inplace +.include -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/argon2/*.so +.if ${PYTHON_REL} < 30800 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} +.endif + +post-patch: + @${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py do-test: - @cd ${WRKSRC} && PYTHONPATH=src ${PYTHON_CMD} -m pytest -v -rs + cd ${WRKSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} -m pytest -rs -v -.include +.include diff --git a/security/py-argon2-cffi/distinfo b/security/py-argon2-cffi/distinfo index eb7fc1783bd3..9f3b3d1b4db1 100644 --- a/security/py-argon2-cffi/distinfo +++ b/security/py-argon2-cffi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559532624 -SHA256 (argon2_cffi-19.1.0.tar.gz) = 81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26 -SIZE (argon2_cffi-19.1.0.tar.gz) = 1808120 +TIMESTAMP = 1652122691 +SHA256 (argon2-cffi-21.3.0.tar.gz) = d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b +SIZE (argon2-cffi-21.3.0.tar.gz) = 38446 diff --git a/security/py-argon2-cffi/files/patch-tests_test__low__level.py b/security/py-argon2-cffi/files/patch-tests_test__low__level.py deleted file mode 100644 index cdcde1e7d3e9..000000000000 --- a/security/py-argon2-cffi/files/patch-tests_test__low__level.py +++ /dev/null @@ -1,22 +0,0 @@ -# Disable deadline on test_argument_ranges -# https://github.com/hynek/argon2_cffi/pull/52 - ---- tests/test_low_level.py.orig 2018-06-17 05:51:36 UTC -+++ tests/test_low_level.py -@@ -5,7 +5,7 @@ import os - - import pytest - --from hypothesis import assume, given -+from hypothesis import assume, given, settings - from hypothesis import strategies as st - - from argon2.exceptions import ( -@@ -253,6 +253,7 @@ class TestVerify(object): - hash_len=st.integers(lib.ARGON2_MIN_OUTLEN, 513), - salt_len=st.integers(lib.ARGON2_MIN_SALT_LENGTH, 513), - ) -+@settings(deadline=None) - def test_argument_ranges( - password, time_cost, parallelism, memory_cost, hash_len, salt_len - ): diff --git a/security/py-argon2-cffi/files/setup.py b/security/py-argon2-cffi/files/setup.py new file mode 100644 index 000000000000..a804b1fcb68e --- /dev/null +++ b/security/py-argon2-cffi/files/setup.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# setup.py generated by flit for tools that don't yet use PEP 517 + +from distutils.core import setup + +packages = \ +['argon2'] + +package_data = \ +{'': ['*']} + +package_dir = \ +{'': 'src'} + +install_requires = \ +['argon2-cffi-bindings'] + +extras_require = \ +{":python_version < '3.7'": ['dataclasses'], + ":python_version < '3.8'": ['typing-extensions'], + 'dev': ['pre-commit', + 'cogapp', + 'tomli', + 'coverage[toml]>=5.0.2', + 'hypothesis', + 'pytest', + 'sphinx', + 'sphinx-notfound-page', + 'furo'], + 'docs': ['sphinx', 'sphinx-notfound-page', 'furo'], + 'tests': ['coverage[toml]>=5.0.2', 'hypothesis', 'pytest']} + +setup(name='argon2-cffi', + version='%%PORTVERSION%%', + description='The secure Argon2 password hashing algorithm.', + author=None, + author_email='Hynek Schlawack ', + url=None, + packages=packages, + package_data=package_data, + package_dir=package_dir, + install_requires=install_requires, + extras_require=extras_require, + python_requires='>=3.6', + ) diff --git a/security/py-argon2-cffi/pkg-descr b/security/py-argon2-cffi/pkg-descr index 2c7c6261eba4..1bd48c0ad478 100644 --- a/security/py-argon2-cffi/pkg-descr +++ b/security/py-argon2-cffi/pkg-descr @@ -1,6 +1,5 @@ -Argon2 won the Password Hashing Competition and argon2_cffi is the simplest -way to use it in Python and PyPy: +Argon2 won the Password Hashing Competition and argon2-cffi is the simplest way +to use it in Python and PyPy. -passlib 1.7.0 and later offers Argon2 support using this library too. - -WWW: https://argon2-cffi.readthedocs.io/ +WWW: https://argon2-cffi.readthedocs.io/en/stable/ +WWW: https://github.com/hynek/argon2-cffi