From nobody Mon Feb 19 11:40:24 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 4TdgZc6Knxz5BXwh; Mon, 19 Feb 2024 11:40:24 +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 4TdgZc5q0Hz4syk; Mon, 19 Feb 2024 11:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708342824; 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=zK8yX0fW24Cu9mfyzMl1GkxUZ8Y+4lhkXAWIf6o7PKc=; b=QmZ1Dh71XWI1RAvsQsYeWskyRZy8RjBwB9PfWNBQVsIB6TciUOvzB8bCu3yRjAKxiDvjue pVakjscFwIyhB+T135MRW9KCk/fxnIpOdNfKZtZVVFwRICBKgB6TDViSi3vpTUi7ytOJbP PSTNHfrjWFSeLRw6Tc/Ce9RgHHzr05NVV7lpT4dWVcD+TJEMzgky6uU/OG9UUZ1jNjCiaE cFOls0xocJ8y9Ioj2cd84qAKZqt3JUx3mfffF2+aXUETq/O3HpyRGjRHokV5bOZrk6dZpu rUfPi82bYhUwOLr6hCsz+7WWj5X1gXcP0Nx3Y4FpFXmrVWAX+LjdpX+lwiYqjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708342824; 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=zK8yX0fW24Cu9mfyzMl1GkxUZ8Y+4lhkXAWIf6o7PKc=; b=P3QvzKLsaoNbdl63jV/Qzk2sla+BbGeZXEMvpCFRwqq5nNqTHY3bufvOckXfiUKjeh3V15 m0lPW1DfRTQ0w+Lsjw+hTBnhXXODBxarz5FTIJJhf8MWTd6l9dD9Xxh7HLnWlImRmi3z6V EYKN0MTtoKgpD0wocqPDsa678xzy7XJH2OJ3qACIPXRIOay+aYytpkB00UvWHqdJQQ7Sm7 IL+ZsII2VUjiSJv0CZ83B/bOHf2xqN4wNzx7XHg4PWU179T3dK6fNEa7WWxwi/aBglCGDc g9ZANz5OhtRJrpA0vZaUy5eIekInaZPu/wtHZPps/nyG2PMyMkQf8+X8Qi1l6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708342824; a=rsa-sha256; cv=none; b=OMvrzAMKG8dg1/l1mzZhuyJnXnHdAmZFsKU3i1Nr+YPbYGDzU2FpmGD7p1RMgeyJB38Dy5 kWtQHT4Goo28dEidDHuqBU5z2Ppotp1claFSXs18sZMHjScUnzmYKDDrMM55/PpzsXIFfy c0erOdJbJqgqDC2tc3elLZyXF6I7NvOi6lxlpeQxhy1ub7Ri+h+x9WXaSw6dga1Vl5upcY 6BGGV+y0CqiXOweRQ4BQdsvlIh/GsNt+VXXQkA6XKDlFygjMCiZgPgbxfcqPJgNteSh2T1 eSlZgHijMu7nnrxz21yleSkO0JUz9XtKMh8fWqBOsF7kESU2LCf8RFeWc5POWw== 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 4TdgZc4sxMzYY3; Mon, 19 Feb 2024 11:40:24 +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 41JBeOWZ079829; Mon, 19 Feb 2024 11:40:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JBeOYg079826; Mon, 19 Feb 2024 11:40:24 GMT (envelope-from git) Date: Mon, 19 Feb 2024 11:40:24 GMT Message-Id: <202402191140.41JBeOYg079826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ruslan Makhmatkhanov Subject: git: 314e0d5a8c76 - main - security/py-pyaff4: replace pyblake2 with pynacl 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: rm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 314e0d5a8c766d3b809c20c21235b9a040cbab44 Auto-Submitted: auto-generated The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=314e0d5a8c766d3b809c20c21235b9a040cbab44 commit 314e0d5a8c766d3b809c20c21235b9a040cbab44 Author: Ruslan Makhmatkhanov AuthorDate: 2024-02-19 11:39:18 +0000 Commit: Ruslan Makhmatkhanov CommitDate: 2024-02-19 11:39:18 +0000 security/py-pyaff4: replace pyblake2 with pynacl Import minimal upstream commit to switch from pyblake2 to pynacl. This allows us to build run this port with python311: https://github.com/aff4/pyaff4/commit/af2ce19c5a2ad61d68309a856ded93cee2901ea4 Full-blown update to latest version requires adding missing ports to tree. PR: 277134 Approved by: antoine (maintainer) --- security/py-pyaff4/Makefile | 5 +++-- security/py-pyaff4/files/patch-pyaff4_hashes.py | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/security/py-pyaff4/Makefile b/security/py-pyaff4/Makefile index b7abeda298a6..1cc98a127567 100644 --- a/security/py-pyaff4/Makefile +++ b/security/py-pyaff4/Makefile @@ -1,5 +1,6 @@ PORTNAME= pyaff4 DISTVERSION= 0.26.post6 +PORTREVISION= 1 CATEGORIES= security devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,10 +15,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5.1:archivers/py-python-snappy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.2:textproc/py-rdflib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyblake2>=0.9.3:security/py-pyblake2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}expiringdict>=1.1.4:devel/py-expiringdict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR} NO_ARCH= yes USES= python zip diff --git a/security/py-pyaff4/files/patch-pyaff4_hashes.py b/security/py-pyaff4/files/patch-pyaff4_hashes.py new file mode 100644 index 000000000000..8675e79860e6 --- /dev/null +++ b/security/py-pyaff4/files/patch-pyaff4_hashes.py @@ -0,0 +1,22 @@ +https://github.com/aff4/pyaff4/commit/af2ce19c5a2ad61d68309a856ded93cee2901ea4 + +--- pyaff4/hashes.py.orig 2017-12-05 20:36:26 UTC ++++ pyaff4/hashes.py +@@ -16,7 +16,7 @@ import hashlib + from pyaff4 import lexicon + from pyaff4.rdfvalue import * + import hashlib +-import pyblake2 ++import nacl.hash + + def new(datatype): + return map[datatype]() +@@ -54,7 +54,7 @@ map = { + lexicon.HASH_SHA256: hashlib.sha256, + lexicon.HASH_SHA512: hashlib.sha512, + lexicon.HASH_MD5: hashlib.md5, +- lexicon.HASH_BLAKE2B: pyblake2.blake2b ++ lexicon.HASH_BLAKE2B: nacl.hash.blake2b + } + + nameMap = {