From f1d007a51e58f90286c468202a19df3caf619688 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sun, 15 Dec 2024 08:28:37 +0100 Subject: [PATCH 1/4] Fix: set PRODID on collection upload --- radicale/app/put.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/radicale/app/put.py b/radicale/app/put.py index 6f883dca..bf559da0 100644 --- a/radicale/app/put.py +++ b/radicale/app/put.py @@ -29,7 +29,7 @@ from typing import Iterator, List, Mapping, MutableMapping, Optional, Tuple import vobject import radicale.item as radicale_item -from radicale import httputils, pathutils, rights, storage, types, xmlutils +from radicale import httputils, pathutils, rights, storage, types, xmlutils, utils from radicale.app.base import Access, ApplicationBase from radicale.hook import HookNotificationItem, HookNotificationItemTypes from radicale.log import logger @@ -37,6 +37,8 @@ from radicale.log import logger MIMETYPE_TAGS: Mapping[str, str] = {value: key for key, value in xmlutils.MIMETYPES.items()} +PRODID = u"-//Radicale//NONSGML Version " + utils.package_version("radicale") + "//EN" + def prepare(vobject_items: List[vobject.base.Component], path: str, content_type: str, permission: bool, parent_permission: bool, @@ -80,6 +82,7 @@ def prepare(vobject_items: List[vobject.base.Component], path: str, vobject_collection = vobject.iCalendar() for component in components: vobject_collection.add(component) + vobject_collection.add(vobject.base.ContentLine("PRODID", [], PRODID)) item = radicale_item.Item(collection_path=collection_path, vobject_item=vobject_collection) item.prepare() From 0a5773a844bb702fad3936b592a3c3607dfdecf0 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sun, 15 Dec 2024 08:29:09 +0100 Subject: [PATCH 2/4] Extend copyright --- radicale/app/put.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radicale/app/put.py b/radicale/app/put.py index bf559da0..17c103f5 100644 --- a/radicale/app/put.py +++ b/radicale/app/put.py @@ -2,7 +2,8 @@ # Copyright © 2008 Nicolas Kandel # Copyright © 2008 Pascal Halter # Copyright © 2008-2017 Guillaume Ayoub -# Copyright © 2017-2018 Unrud +# Copyright © 2017-2020 Unrud +# Copyright © 2020-2023 Tuna Celik # Copyright © 2024-2024 Peter Bieringer # # This library is free software: you can redistribute it and/or modify From 855e983ae2712391a5996b006dcf8956cdbf47f8 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sun, 15 Dec 2024 08:29:53 +0100 Subject: [PATCH 3/4] Fix: set PRODID on collection upload (instead of vobject is inserting default one) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2292dd77..4ed800a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * Improve: auth.ldap config shown on startup, terminate in case no password is supplied for bind user * Add: option [auth] uc_username for uppercase conversion (similar to existing lc_username) * Add: option [debug] storage_cache_action for conditional logging +* Fix: set PRODID on collection upload (instead of vobject is inserting default one) ## 3.3.1 From 7597c7d4a54b6dc020672625c6123c18c001cd6f Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sun, 15 Dec 2024 08:37:35 +0100 Subject: [PATCH 4/4] make tox happy --- radicale/app/put.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radicale/app/put.py b/radicale/app/put.py index 17c103f5..c1f0eacd 100644 --- a/radicale/app/put.py +++ b/radicale/app/put.py @@ -30,7 +30,8 @@ from typing import Iterator, List, Mapping, MutableMapping, Optional, Tuple import vobject import radicale.item as radicale_item -from radicale import httputils, pathutils, rights, storage, types, xmlutils, utils +from radicale import (httputils, pathutils, rights, storage, types, utils, + xmlutils) from radicale.app.base import Access, ApplicationBase from radicale.hook import HookNotificationItem, HookNotificationItemTypes from radicale.log import logger