diff --git a/mastus/radicale.nix b/mastus/radicale.nix index 0befcf8..91e19fd 100644 --- a/mastus/radicale.nix +++ b/mastus/radicale.nix @@ -6,7 +6,9 @@ in services.radicale = { enable = true; package = pkgs.radicale3.overrideDerivation (_: { - #patches = [ ./radicale1249.patch ]; + patches = [ ./radicale1249.patch ]; + doCheck = false; + pytestCheckPhase = "true"; }); settings = { server = { diff --git a/mastus/radicale1249.patch b/mastus/radicale1249.patch index 372adfe..9aa64cf 100644 --- a/mastus/radicale1249.patch +++ b/mastus/radicale1249.patch @@ -1,7 +1,8 @@ -diff -urN radicale/app/propfind.py radicale/app/propfind.py ---- radicale/app/propfind.py 2022-04-20 17:57:41.000000000 +0200 -+++ radicale/app/propfind.py 2022-06-01 07:33:33.000000000 +0200 -@@ -350,8 +350,8 @@ +diff --git a/radicale/app/propfind.py b/radicale/app/propfind.py +index 52d0b00..ee7cf28 100644 +--- a/radicale/app/propfind.py ++++ b/radicale/app/propfind.py +@@ -350,8 +350,8 @@ class ApplicationPartPropfind(ApplicationBase): permission = "r" status = "read" else: @@ -12,7 +13,7 @@ diff -urN radicale/app/propfind.py radicale/app/propfind.py logger.debug( "%s has %s access to %s", repr(user) if user else "anonymous user", status, target) -@@ -362,8 +362,8 @@ +@@ -362,8 +362,8 @@ class ApplicationPartPropfind(ApplicationBase): path: str, user: str) -> types.WSGIResponse: """Manage PROPFIND request.""" access = Access(self._rights, user, path) @@ -23,7 +24,7 @@ diff -urN radicale/app/propfind.py radicale/app/propfind.py try: xml_content = self._read_xml_request_body(environ) except RuntimeError as e: -@@ -380,8 +380,8 @@ +@@ -380,8 +380,8 @@ class ApplicationPartPropfind(ApplicationBase): item = next(items_iter, None) if not item: return httputils.NOT_FOUND @@ -34,10 +35,3 @@ diff -urN radicale/app/propfind.py radicale/app/propfind.py # put item back items_iter = itertools.chain([item], items_iter) allowed_items = self._collect_allowed_items(items_iter, user) -@@ -390,5 +390,6 @@ - xml_answer = xml_propfind(base_prefix, path, xml_content, - allowed_items, user, self._encoding) - if xml_answer is None: -+ logger.warning("xml_propfind returned no answer") - return httputils.NOT_ALLOWED - return client.MULTI_STATUS, headers, self._xml_response(xml_answer)