diff --git a/MOVED b/MOVED index 29d2efabd9d3..dda789cb832b 100644 --- a/MOVED +++ b/MOVED @@ -5554,3 +5554,4 @@ biology/gperiodic|science/gperiodic|2026-08-19|Move to a more appropriate catego devel/rubygem-grape20|devel/rubygem-grape-gitlab|2026-08-20|Make clear it is used for Gitlab only sysutils/filevercmp||2026-08-23|Expired: Dependent ports now use git submodules devel/py-ptvsd|devel/py-debugpy|2026-08-25|Has expired: No longer maintained upstream, use py-debugpy instead +security/py-biscuit-auth|security/py-biscuit-python|2026-08-26|Renamed to match upstream PyPI package name diff --git a/security/Makefile b/security/Makefile index ddbe5a7a19c5..db4166d5da24 100644 --- a/security/Makefile +++ b/security/Makefile @@ -908,7 +908,7 @@ SUBDIR += py-badkeys SUBDIR += py-base58 SUBDIR += py-bcrypt - SUBDIR += py-biscuit-auth + SUBDIR += py-biscuit-python SUBDIR += py-bitbox02 SUBDIR += py-blake3 SUBDIR += py-btchip-python diff --git a/security/py-biscuit-auth/pkg-plist b/security/py-biscuit-auth/pkg-plist deleted file mode 100644 index 02bfa0e2dd96..000000000000 --- a/security/py-biscuit-auth/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -%%PYTHON_SITELIBDIR%%/biscuit_auth/__init__.py -%%PYTHON_SITELIBDIR%%/biscuit_auth/__init__.pyi -%%PYTHON_SITELIBDIR%%/biscuit_auth/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/biscuit_auth/__pycache__/__init__%%PYTHON_TAG%%.pyc -%%PYTHON_SITELIBDIR%%/biscuit_auth/biscuit_auth%%PYTHON_TAG%%.so -%%PYTHON_SITELIBDIR%%/biscuit_auth/py.typed -%%PYTHON_SITELIBDIR%%/biscuit_python-0.4.0.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/biscuit_python-0.4.0.dist-info/RECORD -%%PYTHON_SITELIBDIR%%/biscuit_python-0.4.0.dist-info/WHEEL -%%PYTHON_SITELIBDIR%%/biscuit_python-0.4.0.dist-info/licenses/LICENSE diff --git a/security/py-biscuit-auth/Makefile b/security/py-biscuit-python/Makefile rename from security/py-biscuit-auth/Makefile rename to security/py-biscuit-python/Makefile --- a/security/py-biscuit-auth/Makefile +++ b/security/py-biscuit-python/Makefile @@ -1,6 +1,6 @@ -PORTNAME= biscuit-auth +PORTNAME= biscuit-python DISTVERSION= 0.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,34 +11,20 @@ WWW= https://github.com/eclipse-biscuit/biscuit-python LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1<2:devel/py-maturin@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1<2:devel/py-maturin@${PY_FLAVOR} USES= cargo python USE_GITHUB= yes GH_ACCOUNT= eclipse-biscuit -GH_PROJECT= biscuit-python GH_TAGNAME= ${DISTVERSION} -USE_PYTHON= autoplist concurrent flavors +USE_PYTHON= autoplist concurrent pep517 CARGO_BUILD= no CARGO_INSTALL= no -CARGO_ENV= PYO3_PYTHON=${PYTHON_CMD} \ - PYTHON_SYS_EXECUTABLE=${PYTHON_CMD} +MAKE_ENV+= ${CARGO_ENV} -MAKE_ENV= ${CARGO_ENV} - -BINARY_ALIAS= python3=${PYTHON_CMD} - -do-build: - cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} \ - ${PYTHON_CMD} -m maturin build --release --strip --interpreter ${PYTHON_CMD} - -do-install: - cd ${WRKDIR}/target/wheels && \ - ${PYTHON_CMD} -m installer --destdir=${STAGEDIR} --prefix=${PREFIX} *.whl +PEP517_BUILD_CONFIG_SETTING= -C "maturin.build-args=--strip" .include "${.CURDIR}/Makefile.crates" .include diff --git a/security/py-biscuit-auth/Makefile.crates b/security/py-biscuit-python/Makefile.crates rename from security/py-biscuit-auth/Makefile.crates rename to security/py-biscuit-python/Makefile.crates diff --git a/security/py-biscuit-auth/distinfo b/security/py-biscuit-python/distinfo rename from security/py-biscuit-auth/distinfo rename to security/py-biscuit-python/distinfo diff --git a/security/py-biscuit-auth/pkg-descr b/security/py-biscuit-python/pkg-descr rename from security/py-biscuit-auth/pkg-descr rename to security/py-biscuit-python/pkg-descr --- a/security/py-biscuit-auth/pkg-descr +++ b/security/py-biscuit-python/pkg-descr @@ -1,3 +1 @@ Python bindings for biscuit-auth, a decentralized authorization token system. - -WWW: https://github.com/eclipse-biscuit/biscuit-python diff --git a/www/bunkerweb/Makefile b/www/bunkerweb/Makefile index 0106240a2296..6c15ca82cb2c 100644 --- a/www/bunkerweb/Makefile +++ b/www/bunkerweb/Makefile @@ -1,6 +1,6 @@ PORTNAME= bunkerweb DISTVERSION= 1.6.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www security MAINTAINER= joneum@FreeBSD.org @@ -26,7 +26,7 @@ RUN_DEPENDS= openresty:www/openresty \ ${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} \ ${LUA_MODLIBDIR}/cjson.so:devel/lua-cjson@${LUA_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}biscuit-auth>0:security/py-biscuit-auth@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}biscuit-python>0:security/py-biscuit-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}kubernetes>0:sysutils/py-kubernetes@${PY_FLAVOR} \