---- On Tue, 22 Jul 2025 09:33:07 +0200 Wout Decré <[email protected]> wrote --- > On 7/20/25 08:31, Bernhard Froehlich wrote: > > ---- Am Wed, 18 Jun 2025 10:18:11 +0200 [email protected] schrieb ---- > > > > > >> Hi, > >> > >> Is it possible to move the bcrypt run dependency to OPTIONS? > >> > >> And maybe add support for Argon2? > >> > >> I created the following patch which does this: > >> > >> diff --git a/www/radicale/Makefile b/www/radicale/Makefile > >> index 0549aee57ab0..3801afb2d31a 100644 > >> --- a/www/radicale/Makefile > >> +++ b/www/radicale/Makefile > >> @@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md > >> > >> BUILD_DEPENDS= > >> ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ > >> ${PY_SETUPTOOLS} > >> -RUN_DEPENDS= > >> ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ > >> - ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \ > >> +RUN_DEPENDS= > >> ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \ > >> ${PYTHON_PKGNAMEPREFIX}vobject>=0.9.6:deskutils/py-vobject@${PY_FLAVOR} \ > >> ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.7.3:devel/py-python-dateutil@${PY_FLAVOR} > >> \ > >> ${PYTHON_PKGNAMEPREFIX}pika>=1.1.0:devel/py-pika@${PY_FLAVOR} \ > >> @@ -30,6 +29,12 @@ NO_ARCH= yes > >> > >> SUB_LIST= USERS="${USERS}" GROUPS="${GROUPS}" > >> PYTHON_CMD="${PYTHON_CMD}" > >> > >> +OPTIONS_DEFINE= BCRYPT ARGON2 > >> +OPTIONS_DEFAULT=BCRYPT ARGON2 > >> + > >> +BCRYPT_RUN_DEPENDS= > >> ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} > >> +ARGON2_RUN_DEPENDS= > >> ${PYTHON_PKGNAMEPREFIX}argon2-cffi>=0:security/py-argon2-cffi@${PY_FLAVOR} > >> + > >> post-patch: > >> @${REINPLACE_CMD} 's,/etc/radicale,${ETCDIR},g' \ > >> ${WRKSRC}/config \ > >> > >> Kind regards, > >> Wout > > > > Hi Wout, > > > > > > well sure we can add both as options but why? Is there a specific usecase > > or argument? The dependencies are not very heavy and having proper crypto > > available is always a good idea. So in any case the options will be > > enabled per default. > > > > > > Thanks, > > Bernhard > > Hi Bernhard, > > I actually made the patch for my local ports to prevent having to build > the whole Rust chain as this now a dependency of py-bcrypt (since 4.3.0).
Thats fair. I've added options for bcrypt, argon2 and ldap just now and also fixed the dependencies to match upstream. Thanks! -- Bernhard Froehlich https://www.bluelife.at/
