From nobody Tue Jan 16 17:47:51 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 4TDxLH4Sqzz57hyb; Tue, 16 Jan 2024 17:47:51 +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 4TDxLH3yFKz4p5J; Tue, 16 Jan 2024 17:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705427271; 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=1iOmHrKLngGuVo3iJmdHUcFShMPYFpWVzT6Yhv1tsbQ=; b=vktV9M/UOCPh/RnFB/SxlQOMZfp+Z6LU9cKRfGA82CTYs+8oE6U6wXNQltgpFpQRhBr+Kw 4wgnDmbA4682czrpUF/+VInuOBoFUnvlR92VwpXjMw2kUceLGcYd1DzQ1AR0k1CjuWohNm IY390c0dlLHwPnZ0e7VX7Q5U7zS3hOJZJigEKp/+8BbbPVkmL9FncW4LODuE8kqsOtVUej f6ZJXqJwfsqE4FmgqlnSmLub1S6pTmcrWYwxUtntm9mPPxNVOmdcuI16i8GuE4fAM90dr/ JnNPEEfndapf0ue0D41QudQFZ/iVY5xqG/pnndzzAFXmoqajFDy5lC7VL+IW9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705427271; 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=1iOmHrKLngGuVo3iJmdHUcFShMPYFpWVzT6Yhv1tsbQ=; b=VGXi3OZh+x8SZbcSWpX2u4jen293J1nfF/fjv1SBKKAXSo/G8Pn5OIM/xWdz7aaHR1/iHZ dPalIcXsqITylfvm+7pgBEu4Z/y4WuLr3ngoLhS0RNtupkSUUwsvR00XikXgtpCM3rfa6s yzZ9pj4DRp6Q/vnFTu8vLhDpjvae0R1gRIdf7lzMAjwJGDnPnh5IZNhlI/4JOKLGsAsfor y7B4gvFcTsn07jnliCVj800SmXC5AeAzB5g6mqwEIOGeNnXYTYACHbWVGjfOWDBNOtFFlw FMeyOy78wv2QEvyI+tJiRuhXtyIr9UXfvkFi8LrQZt1YOz9eUii702c7d7tUdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705427271; a=rsa-sha256; cv=none; b=bEU64kVCc9505wLk7I5o6nWZxTK/ATyuChmYMXzajJGvGv+W45H9QzWHNX70xY9GLC/jyb 0I3x33Gd89hqKny0Fl7LWLczi2MvvoSBuJttXV1pSXDD2JcaDi8Wm+aZGk2PKm2Cy7xxb5 V+Gy5fGGEQ61Q1A0PEkt+dwBsCDADoLqLwNtu0z8IUwWc0mvCA445Ik+yn7NDPTsKSkZzB HyLCb/+AHT9ajy2Ssjy9/Jm2BpGyoF2qKNDBXG4zhs3TfXM8I2mZmDp+74FCNAbxAJEIPp Lf/F9phBIMwtfLYeABW9if3UEPeBjvcWJRX87ShtFTkiODsUR2AyzY1Oso675g== 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 4TDxLH3332zqJb; Tue, 16 Jan 2024 17:47:51 +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 40GHlpqo073503; Tue, 16 Jan 2024 17:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GHlpRs073500; Tue, 16 Jan 2024 17:47:51 GMT (envelope-from git) Date: Tue, 16 Jan 2024 17:47:51 GMT Message-Id: <202401161747.40GHlpRs073500@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9aca78ddf6d2 - main - security/py-merkletools: Refactor 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9aca78ddf6d269beca776d49945a88e494f4c4ed Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9aca78ddf6d269beca776d49945a88e494f4c4ed commit 9aca78ddf6d269beca776d49945a88e494f4c4ed Author: Muhammad Moinur Rahman AuthorDate: 2024-01-16 17:45:26 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-16 17:47:42 +0000 security/py-merkletools: Refactor Before python 3.6 version pysha3 was required as a runtime dependency however after the import of sha3 this can be skipped. Additionally this port has not been updated since 2019 and should be deprecated. Approved by: portmgr (blanket) --- security/py-merkletools/Makefile | 8 +++++--- .../py-merkletools/files/patch-merkletools_____init____.py | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/security/py-merkletools/Makefile b/security/py-merkletools/Makefile index 6f5228efc59b..f4953864d78c 100644 --- a/security/py-merkletools/Makefile +++ b/security/py-merkletools/Makefile @@ -1,6 +1,6 @@ PORTNAME= merkletools DISTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +11,6 @@ WWW= https://github.com/Tierion/pymerkletools LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysha3>0:security/py-pysha3@${PY_FLAVOR} - USES= python USE_PYTHON= distutils autoplist @@ -20,6 +18,10 @@ NO_ARCH= yesA POST_PLIST= rm-tests-from-plist +post-patch: + @${RM} ${WRKSRC}/requirements.txt ${WRKSRC}/merkletools.egg-info/requires.txt + @${REINPLACE_CMD} -e '/pysha3/d' ${WRKSRC}/setup.py + post-install: @${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/tests diff --git a/security/py-merkletools/files/patch-merkletools_____init____.py b/security/py-merkletools/files/patch-merkletools_____init____.py new file mode 100644 index 000000000000..b8a32413a358 --- /dev/null +++ b/security/py-merkletools/files/patch-merkletools_____init____.py @@ -0,0 +1,14 @@ +--- merkletools/__init__.py.orig 2024-01-16 17:39:29 UTC ++++ merkletools/__init__.py +@@ -1,11 +1,5 @@ import binascii + import hashlib + import binascii +-try: +- import sha3 +-except: +- from warnings import warn +- warn("sha3 is not working!") +- + + class MerkleTools(object): + def __init__(self, hash_type="sha256"):