ports@, Here an update of security/py-service_identity to the last released version 24.1.0 which was released in January 2024.
Changelog: https://service-identity.readthedocs.io/en/stable/changelog.html This release contains tests on pypi that allow to moves away from github. As dependency it is used at: 1. devel/py-twisted 2. net/synapse 3. security/py-trustme To test it I run make test on -current/amd64 before and after upgrade inside each dependency, and no new failure is discovered. So, it seems like safe upgrade. diff --git security/py-service_identity/Makefile security/py-service_identity/Makefile index 9cab998de99..28621623eb6 100644 --- security/py-service_identity/Makefile +++ security/py-service_identity/Makefile @@ -1,13 +1,8 @@ COMMENT = service identity verification for pyOpenSSL/py-cryptography -MODPY_EGG_VERSION = 21.1.0 -PKGNAME = py-${DISTNAME:S/-/_/} -REVISION = 3 - -# also on pypi, but no tests present -GH_ACCOUNT = pyca -GH_PROJECT = service-identity -GH_TAGNAME = ${MODPY_EGG_VERSION} +MODPY_EGG_VERSION = 24.1.0 +DISTNAME= service_identity-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} CATEGORIES = security @@ -15,8 +10,10 @@ CATEGORIES = security PERMIT_PACKAGE = Yes MODULES = lang/python -MODPY_PYBUILD = setuptools +MODPY_PI= Yes +MODPY_PYBUILD = hatch-vcs +BUILD_DEPENDS= devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR} RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ devel/py-asn1-modules${MODPY_FLAVOR} \ devel/py-attrs${MODPY_FLAVOR} \ diff --git security/py-service_identity/distinfo security/py-service_identity/distinfo index 8fbb57e62f6..6c242252faf 100644 --- security/py-service_identity/distinfo +++ security/py-service_identity/distinfo @@ -1,2 +1,2 @@ -SHA256 (service-identity-21.1.0.tar.gz) = VBKUrWBgwQ4oVU82uxwVThH3GtPiOhYO6mLv+b9QUiw= -SIZE (service-identity-21.1.0.tar.gz) = 35326 +SHA256 (service_identity-24.1.0.tar.gz) = aCnJ1i+4MsLhxDVimwqMR24ZKYgfKL7k0gvCQWEAkiE= +SIZE (service_identity-24.1.0.tar.gz) = 40183 diff --git security/py-service_identity/patches/patch-src_service_identity___init___py security/py-service_identity/patches/patch-src_service_identity___init___py new file mode 100644 index 00000000000..1f3a27d8ea2 --- /dev/null +++ security/py-service_identity/patches/patch-src_service_identity___init___py @@ -0,0 +1,15 @@ +https://github.com/pyca/service-identity/issues/68 +Index: src/service_identity/__init__.py +--- src/service_identity/__init__.py.orig ++++ src/service_identity/__init__.py +@@ -58,6 +58,9 @@ def __getattr__(name: str) -> str: + return meta["Project-URL"].split(" ", 1)[1] + + if name == "__email__": +- return meta["Author-email"].split("<", 1)[1].rstrip(">") ++ if "<" in meta["Author-email"]: ++ return meta["Author-email"].split("<", 1)[1].rstrip(">") ++ else: ++ return meta["Author-email"] + + return meta[dunder_to_metadata[name]] diff --git security/py-service_identity/pkg/PLIST security/py-service_identity/pkg/PLIST index e47a1ec325e..fda0228f172 100644 --- security/py-service_identity/pkg/PLIST +++ security/py-service_identity/pkg/PLIST @@ -1,28 +1,25 @@ @pkgpath security/py-service_identity lib/python${MODPY_VERSION}/site-packages/service_identity/ lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst -lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/LICENSE lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/METADATA lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/RECORD lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/licenses/ +lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE lib/python${MODPY_VERSION}/site-packages/service_identity/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} -lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} -lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}cryptography.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}cryptography.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}hazmat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}hazmat.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}pyopenssl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}pyopenssl.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/service_identity/_common.py -lib/python${MODPY_VERSION}/site-packages/service_identity/_compat.py lib/python${MODPY_VERSION}/site-packages/service_identity/cryptography.py lib/python${MODPY_VERSION}/site-packages/service_identity/exceptions.py +lib/python${MODPY_VERSION}/site-packages/service_identity/hazmat.py +lib/python${MODPY_VERSION}/site-packages/service_identity/py.typed lib/python${MODPY_VERSION}/site-packages/service_identity/pyopenssl.py -- wbr, Kirill
