From nobody Fri Nov 18 13:15:55 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NDHNC6szjz4hM22; Fri, 18 Nov 2022 13:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NDHNC6NdCz3knq; Fri, 18 Nov 2022 13:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668777355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVU2bgZvpiGLOETA0zEzoe1+c0RRKOKhyaTNRlZG7Dg=; b=kGxJdkR2EmHtecsuYwQycbsYk/DXL7sGtWG525ZwAcwtD2Md0w4sb2JS3UPG5kqDJCBrfV zS3uhzf9uBtfr8KtiQFCvbmA/rt0/X52Pcocf5dD8pGBP9UCFRxoCkKrCSJkpUYAnyMamA 3cwaLAprSH9DZllbFwZpDrJTxClslrkDthSci0VtbmFIrIggvNEccTP0Q6ns6MJoErEB+N 2iTdyd4pCr348DnPLAD/OpMUYa8jUx5jHIjUCywq47tH8ws0dwtrhiJ3jEsuCWXdKa9tXW 3zNZaQHfmW6TvEHBLOtXLay4GHZprZDiG9fwM3NCSN0eiXNLty3iqfpPvgLqyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668777355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVU2bgZvpiGLOETA0zEzoe1+c0RRKOKhyaTNRlZG7Dg=; b=u4bAJvQAiXGuiAhGm4eImK8OkANEMlutc8c2JWXbF6dPGdkTHvxmZ94xJmTutMNCrkmTTe Ao9ap7FKgPD5Knd0NPImAl4rLC+PdyxA6wQijLv6cEo7vC4MHoE/mnIer5kurElc9AcUiH HjyWZq4vfOVLaqfuNOxEx64cMYHlup0lGpNCQlSuhuGI6TIrmZTRsqSY9SRDg2yS+MZbBn f4YPohxsvsPXv7Ll/QQSrIPRkz2MTiaIhj4x5CbBFv+FzlHje+Ld0sAEopO/pn5OX3xMJQ DyV3uwrbSRISlNSW4/5ooa6LhUQXcTmp5w3TF2kV4Yj30lz5AFBCnabnXOif6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668777355; a=rsa-sha256; cv=none; b=t/R7WB54xvQ8thbc4wI06Iut9LEse5EvQ/ojpcehdQ3jCzBW9t38aUiSApIbxRcJWTn3Zx J3DTk1V+0ZNYxEYoqinGUwYAGZhlMUXe72DWj0LXYVPbpWXbiBUShyVaa4OXNJYLREDBgt w+qBwT6gE26xTNduWiC3JKLtNBwoGvJJtNNBZHI0gfaPjKsUoUhlY/MkpWc5BIKOJUfzVa EmBTTg2H6pAHhMdoZmcV4HwJJlHt2gegIaH4FJXoD/RWZc+igktSwhImVcb09hLKBPPODS 39YfiHiHgLnXNhJ5Z7gDJrTguh9BZud44duQ3HkqXt8SFdaSB1q2qbRc5MlzhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NDHNC5R2jz1M01; Fri, 18 Nov 2022 13:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AIDFtT3089169; Fri, 18 Nov 2022 13:15:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIDFt8F089168; Fri, 18 Nov 2022 13:15:55 GMT (envelope-from git) Date: Fri, 18 Nov 2022 13:15:55 GMT Message-Id: <202211181315.2AIDFt8F089168@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 56fc85f2008d - main - www/radicale: Fix 'main component missing' error, Bump PORTREVISION List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56fc85f2008dd9804c03063944ed5860e83aba93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=56fc85f2008dd9804c03063944ed5860e83aba93 commit 56fc85f2008dd9804c03063944ed5860e83aba93 Author: Ryan Steinmetz AuthorDate: 2022-11-18 13:13:58 +0000 Commit: Ryan Steinmetz CommitDate: 2022-11-18 13:15:52 +0000 www/radicale: Fix 'main component missing' error, Bump PORTREVISION Approved by: maintainer Obtained from: https://github.com/Kozea/Radicale/pull/1252/commits --- www/radicale/Makefile | 1 + www/radicale/files/patch-radicale_item_filter.py | 25 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/www/radicale/Makefile b/www/radicale/Makefile index 823e7266abdb..230fda6b1063 100644 --- a/www/radicale/Makefile +++ b/www/radicale/Makefile @@ -1,5 +1,6 @@ PORTNAME= radicale PORTVERSION= 3.1.8 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/radicale/files/patch-radicale_item_filter.py b/www/radicale/files/patch-radicale_item_filter.py new file mode 100644 index 000000000000..a6a5e5cc1ae2 --- /dev/null +++ b/www/radicale/files/patch-radicale_item_filter.py @@ -0,0 +1,25 @@ +--- 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