Sysop: | Amessyroom |
---|---|
Location: | Fayetteville, NC |
Users: | 23 |
Nodes: | 6 (0 / 6) |
Uptime: | 52:26:05 |
Calls: | 583 |
Files: | 1,139 |
D/L today: |
179 files (27,921K bytes) |
Messages: | 111,611 |
Hi,Hi Wout,
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
-aBUILD_DEPENDS=
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ -a-a-a-a-a-a-a-a-a-a-a-a-a-a-a ${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=-a-a-a-a yes
-aSUB_LIST=-a-a-a-a-a USERS="${USERS}" GROUPS="${GROUPS}" PYTHON_CMD="${PYTHON_CMD}"
+OPTIONS_DEFINE=-a-a-a-a-a-a-a 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}
+
-apost-patch:
-a-a-a-a-a-a-a @${REINPLACE_CMD} 's,/etc/radicale,${ETCDIR},g' \ -a-a-a-a-a-a-a-a-a-a-a-a-a-a-a ${WRKSRC}/config \
Kind regards,
Wout