CVS commit: pkgsrc/net/Radicale2

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Sun Sep 13 13:07:39 UTC 2026

Modified Files:
        pkgsrc/net/Radicale2: Makefile distinfo
Added Files:
        pkgsrc/net/Radicale2/patches: patch-radicale_____init____.py
            patch-radicale_web.py

Log Message:
Fix Radicale2 after setuptools-82 removed the pkg_resources module


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/Radicale2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/Radicale2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/Radicale2/patches/patch-radicale_____init____.py \
    pkgsrc/net/Radicale2/patches/patch-radicale_web.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/Radicale2/Makefile
diff -u pkgsrc/net/Radicale2/Makefile:1.22 pkgsrc/net/Radicale2/Makefile:1.23
--- pkgsrc/net/Radicale2/Makefile:1.22  Tue Jan  6 07:54:23 2026
+++ pkgsrc/net/Radicale2/Makefile       Sun Sep 13 13:07:39 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2026/01/06 07:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/09/13 13:07:39 jakllsch Exp $
 
 DISTNAME=      Radicale-2.1.12
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net time www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=R/Radicale/}
 
@@ -10,7 +10,6 @@ HOMEPAGE=     https://radicale.org/
 COMMENT=       CalDAV (calendar) and CardDAV (contact) server
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=              ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 DEPENDS+=              ${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
 # for md5 htpasswd_encryption method
 DEPENDS+=              ${PYPKGPREFIX}-passlib-[0-9]*:../../security/py-passlib

Index: pkgsrc/net/Radicale2/distinfo
diff -u pkgsrc/net/Radicale2/distinfo:1.7 pkgsrc/net/Radicale2/distinfo:1.8
--- pkgsrc/net/Radicale2/distinfo:1.7   Fri May 17 15:49:08 2024
+++ pkgsrc/net/Radicale2/distinfo       Sun Sep 13 13:07:39 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2024/05/17 15:49:08 sborrill Exp $
+$NetBSD: distinfo,v 1.8 2026/09/13 13:07:39 jakllsch Exp $
 
 BLAKE2s (Radicale-2.1.12.tar.gz) = 90e686602e4de958eca6da4b0a75b1b2fe4971ecd11922ff78c384d0cf86841b
 SHA512 (Radicale-2.1.12.tar.gz) = a708fb1269f7ba8c9e351e101f613a8adb18c12b1239b832ed9e0287476f30aa7ded30f9bc259da9c4b5f3aefe90bbf9980d0d08d98dd07b79cd19930b0e204c
 Size (Radicale-2.1.12.tar.gz) = 109781 bytes
+SHA1 (patch-radicale_____init____.py) = 2ce0f280f5d402fce9134f80ea64b10abbd73f3b
+SHA1 (patch-radicale_web.py) = ecd079c4ef4b357fb35a4d61c3d5c1fcda9a347f

Added files:

Index: pkgsrc/net/Radicale2/patches/patch-radicale_____init____.py
diff -u /dev/null pkgsrc/net/Radicale2/patches/patch-radicale_____init____.py:1.1
--- /dev/null   Sun Sep 13 13:07:39 2026
+++ pkgsrc/net/Radicale2/patches/patch-radicale_____init____.py Sun Sep 13 13:07:39 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-radicale_____init____.py,v 1.1 2026/09/13 13:07:39 jakllsch Exp $
+
+Avoid using deprecated and removed pkg_resources
+
+--- radicale/__init__.py.orig  2026-09-12 21:09:52.972762254 +0000
++++ radicale/__init__.py
+@@ -33,7 +33,7 @@ import io
+ import itertools
+ import logging
+ import os
+-import pkg_resources
++from importlib.metadata import version
+ import posixpath
+ import pprint
+ import random
+@@ -54,7 +54,7 @@ import vobject
+ from radicale import auth, config, log, rights, storage, web, xmlutils
+ 
+ 
+-VERSION = pkg_resources.get_distribution('radicale').version
++VERSION = version('radicale')
+ 
+ NOT_ALLOWED = (
+     client.FORBIDDEN, (("Content-Type", "text/plain"),),
Index: pkgsrc/net/Radicale2/patches/patch-radicale_web.py
diff -u /dev/null pkgsrc/net/Radicale2/patches/patch-radicale_web.py:1.1
--- /dev/null   Sun Sep 13 13:07:39 2026
+++ pkgsrc/net/Radicale2/patches/patch-radicale_web.py  Sun Sep 13 13:07:39 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-radicale_web.py,v 1.1 2026/09/13 13:07:39 jakllsch Exp $
+
+Avoid using deprecated and removed pkg_resources
+
+--- radicale/web.py.orig       2020-05-19 01:33:23.000000000 +0000
++++ radicale/web.py
+@@ -19,8 +19,7 @@ import posixpath
+ import time
+ from http import client
+ from importlib import import_module
+-
+-import pkg_resources
++from importlib import resources as importlib_resources
+ 
+ from radicale import storage
+ 
+@@ -92,12 +91,13 @@ class NoneWeb(BaseWeb):
+ class Web(BaseWeb):
+     def __init__(self, configuration, logger):
+         super().__init__(configuration, logger)
+-        self.folder = pkg_resources.resource_filename(__name__, "web")
++        self.folder = importlib_resources.files('radicale') / 'web'
+ 
+     def get(self, environ, base_prefix, path, user):
+         try:
+-            filesystem_path = storage.path_to_filesystem(
+-                self.folder, path[len("/.web"):])
++            with importlib_resources.as_file(self.folder) as mypath:
++                filesystem_path = storage.path_to_filesystem(
++                    mypath, path[len("/.web"):])
+         except ValueError as e:
+             self.logger.debug("Web content with unsafe path %r requested: %s",
+                               path, e, exc_info=True)