diff --git a/www/radicale/Makefile b/www/radicale/Makefile index 17ce89d704ac..4dbedc9aec2d 100644 --- a/www/radicale/Makefile +++ b/www/radicale/Makefile @@ -1,50 +1,48 @@ PORTNAME= radicale -PORTVERSION= 3.1.8 -PORTREVISION= 2 +PORTVERSION= 3.1.9 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Radicale-${PORTVERSION} MAINTAINER= decke@FreeBSD.org COMMENT= Python based CalDAV/CardDAV server WWW= https://radicale.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.md BUILD_DEPENDS= ${PY_SETUPTOOLS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${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}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR} -USES= cpe python shebangfix +USES= cpe python USE_PYTHON= autoplist distutils USERS= radicale GROUPS= radicale USE_RC_SUBR= radicale NO_ARCH= yes -SHEBANG_FILES= radicale.wsgi SUB_LIST= USERS="${USERS}" GROUPS="${GROUPS}" PYTHON_CMD="${PYTHON_CMD}" post-patch: @${REINPLACE_CMD} 's,/etc/radicale,${ETCDIR},g' \ ${WRKSRC}/config \ ${WRKSRC}/radicale/config.py @${REINPLACE_CMD} 's,/etc/ssl,${ETCDIR},g' \ ${WRKSRC}/config \ ${WRKSRC}/radicale/config.py @${REINPLACE_CMD} 's,/var/lib/radicale,${DATADIR},g' \ ${WRKSRC}/config \ ${WRKSRC}/radicale/config.py post-install: @${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample ${INSTALL_DATA} ${WRKSRC}/rights ${STAGEDIR}/${ETCDIR}/rights.sample ${INSTALL_SCRIPT} ${WRKSRC}/radicale.wsgi ${STAGEDIR}${WWWDIR}/radicale.wsgi .include diff --git a/www/radicale/distinfo b/www/radicale/distinfo index f84f82198702..735843cd9b3d 100644 --- a/www/radicale/distinfo +++ b/www/radicale/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658826001 -SHA256 (Radicale-3.1.8.tar.gz) = 556a5b6dad428d9d0e2e879cfd84afe8d5987e04ae9d57b3015073f01664e484 -SIZE (Radicale-3.1.8.tar.gz) = 113385 +TIMESTAMP = 1711764587 +SHA256 (Radicale-3.1.9.tar.gz) = 3ad32467989364e13463b329b2e963f3ddd7c40e43f31f1e6906409baf6818e9 +SIZE (Radicale-3.1.9.tar.gz) = 116881 diff --git a/www/radicale/files/patch-radicale_item_filter.py b/www/radicale/files/patch-radicale_item_filter.py deleted file mode 100644 index a6a5e5cc1ae2..000000000000 --- a/www/radicale/files/patch-radicale_item_filter.py +++ /dev/null @@ -1,25 +0,0 @@ ---- radicale/item/filter.py.orig 2022-07-14 20:36:41 UTC -+++ radicale/item/filter.py -@@ -225,6 +225,7 @@ def visit_time_ranges(vobject_item: vobject.base.Compo - def get_children(components: Iterable[vobject.base.Component]) -> Iterator[ - Tuple[vobject.base.Component, bool, List[date]]]: - main = None -+ rec_main = None - recurrences = [] - for comp in components: - if hasattr(comp, "recurrence_id") and comp.recurrence_id.value: -@@ -232,11 +233,14 @@ def visit_time_ranges(vobject_item: vobject.base.Compo - if comp.rruleset: - # Prevent possible infinite loop - raise ValueError("Overwritten recurrence with RRULESET") -+ rec_main = comp - yield comp, True, [] - else: - if main is not None: - raise ValueError("Multiple main components") - main = comp -+ if main is None and len(recurrences) == 1: -+ main = rec_main - if main is None: - raise ValueError("Main component missing") - yield main, False, recurrences diff --git a/www/radicale/pkg-descr b/www/radicale/pkg-descr index ff705957e883..bde50167f9f5 100644 --- a/www/radicale/pkg-descr +++ b/www/radicale/pkg-descr @@ -1,14 +1,12 @@ Radicale is a small but powerful CalDAV (calendars, todo-lists) and CardDAV (contacts) server, that: - Shares calendars through CalDAV, WebDAV and HTTP. - Shares contacts through CardDAV, WebDAV and HTTP. - Supports events, todos, journal entries and business cards. - Works out-of-the-box, no installation nor configuration required. - Can warn users on concurrent editing. - Can limit access by authentication. - Can secure connections. - Works with many CalDAV and CardDAV clients. - Is GPLv3-licensed free software. - -See also: https://github.com/Kozea/Radicale +* Shares calendars and contact lists through CalDAV, CardDAV and HTTP. +* Supports events, todos, journal entries and business cards. +* Works out-of-the-box, no complicated setup or configuration required. +* Can limit access by authentication. +* Can secure connections with TLS. +* Works with many CalDAV and CardDAV clients +* Stores all data on the file system in a simple folder structure. +* Can be extended with plugins. +* Is GPLv3-licensed free software.