diff --git a/security/py-tuf/Makefile b/security/py-tuf/Makefile index 647c2215a41dd..57f05f9dafea7 100644 --- a/security/py-tuf/Makefile +++ b/security/py-tuf/Makefile @@ -1,7 +1,7 @@ # Created by: Kubilay Kocak PORTNAME= tuf -PORTVERSION= 0.11.1 +PORTVERSION= 1.0.0 CATEGORIES= security devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -9,27 +9,20 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bofh@FreeBSD.org COMMENT= Framework for securing software update systems -LICENSE= MIT APACHE20 +LICENSE= APACHE20 MIT LICENSE_COMB= dual -#LICENSE_FILE= Not packaged in PyPI sdist +LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.12:devel/py-iso8601@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}securesystemslib>=0.11.2:security/py-securesystemslib@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.19.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}securesystemslib>=0.22.0:security/py-securesystemslib@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -# Actually 2.6-3.5 -USES= python:3.6+ +USES= python:3.7+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -# https://github.com/theupdateframework/tuf/pull/781#discussion_r221880421 -post-patch: - ${REINPLACE_CMD} -e \ - "s|'python',|sys.executable,|g" \ - ${WRKSRC}/tests/*.py - do-test: @cd ${WRKSRC}/tests && ${PYTHON_CMD} -m pytest -v -rs diff --git a/security/py-tuf/distinfo b/security/py-tuf/distinfo index fe568a48ccf76..26de1b34327a1 100644 --- a/security/py-tuf/distinfo +++ b/security/py-tuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533611892 -SHA256 (tuf-0.11.1.tar.gz) = 65d5f87a41830494bf585f8a5082618ab26015d156a67f23e37552419e427cf1 -SIZE (tuf-0.11.1.tar.gz) = 2726141 +TIMESTAMP = 1646764548 +SHA256 (tuf-1.0.0.tar.gz) = ec74150954d56e206fa72f3b0234ea802649370e528dea5a83e507bd408fda82 +SIZE (tuf-1.0.0.tar.gz) = 218507 diff --git a/security/py-tuf/files/patch-tests_test__download.py b/security/py-tuf/files/patch-tests_test__download.py deleted file mode 100644 index e3cd948617121..0000000000000 --- a/security/py-tuf/files/patch-tests_test__download.py +++ /dev/null @@ -1,13 +0,0 @@ -# https://github.com/theupdateframework/tuf/pull/781#discussion_r221880421 -# Need to import sys to use it - ---- tests/test_download.py.orig 2019-05-14 10:30:26 UTC -+++ tests/test_download.py -@@ -36,6 +36,7 @@ import logging - import os - import random - import subprocess -+import sys - import time - import unittest -