On Fri, Oct 18, 2013 at 05:53:44PM +0200, Joerg Jung wrote:
> please find below an update for radicale to version 0.8.
>
> Comments? OKs?
Please find below an updated diff with corrected path in config patches.
Thanks to sthen@ for noticing.
Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/radicale/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 11 Mar 2013 11:37:55 -0000 1.19
+++ Makefile 20 Oct 2013 12:55:00 -0000
@@ -2,7 +2,7 @@
COMMENT = simple CalDAV calendar server
-MODPY_EGG_VERSION = 0.7.1
+MODPY_EGG_VERSION = 0.8
DISTNAME = Radicale-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:L}
CATEGORIES = productivity net
Index: distinfo
===================================================================
RCS file: /cvs/ports/productivity/radicale/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 8 Mar 2013 10:38:01 -0000 1.8
+++ distinfo 20 Oct 2013 12:55:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (Radicale-0.7.1.tar.gz) = NuB2uMVL6d9hqENOlnDYUkKdyuVX+tt33iPnYiWLuOQ=
-SIZE (Radicale-0.7.1.tar.gz) = 35355
+SHA256 (Radicale-0.8.tar.gz) = 6MDfUjnCLyaHoJ7KfVPDGHBmSK/3K2IISe0/dUC8GUE=
+SIZE (Radicale-0.8.tar.gz) = 39813
Index: patches/patch-config
===================================================================
RCS file: /cvs/ports/productivity/radicale/patches/patch-config,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config
--- patches/patch-config 23 May 2012 18:02:09 -0000 1.5
+++ patches/patch-config 20 Oct 2013 12:55:00 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-config,v 1.5 2012/05/23 18:02:09 sthen Exp $
---- config.orig Tue Mar 13 13:45:35 2012
-+++ config Wed May 23 19:20:15 2012
+--- config.orig Fri Jun 28 16:37:37 2013
++++ config Fri Oct 18 17:39:40 2013
@@ -22,9 +22,9 @@ pid =
# SSL flag, enable HTTPS protocol
ssl = False
@@ -12,8 +12,8 @@ $OpenBSD: patch-config,v 1.5 2012/05/23
+key = ${SYSCONFDIR}/radicale/private/server.key
# Reverse DNS to resolve client address in logs
dns_lookup = True
-
-@@ -47,10 +47,10 @@ public_users = public
+ # Root URL of Radicale (starting and ending with a slash)
+@@ -51,10 +51,10 @@ public_users = public
private_users = private
# Htpasswd filename
@@ -26,16 +26,25 @@ $OpenBSD: patch-config,v 1.5 2012/05/23
# LDAP server URL, with protocol and port
ldap_url = ldap://localhost:389/
-@@ -83,15 +83,14 @@ courier_socket =
+@@ -100,7 +100,7 @@ http_password_parameter =
+ type = None
+
+ # File for rights management from_file
+-file = ~/.config/radicale/rights
++file = ${SYSCONFDIR}/config/radicale/rights
+
+
+ [storage]
+@@ -109,7 +109,7 @@ file = ~/.config/radicale/rights
type = filesystem
# Folder for storing local collections, created if not present
-filesystem_folder = ~/.config/radicale/collections
+filesystem_folder = /var/db/radicale/calendars
--
- [logging]
- # Logging configuration file
+ # Database URL for SQLAlchemy
+ # dialect+driver://user:password@host/dbname[?key=value..]
+@@ -123,7 +123,7 @@ database_url =
# If no config is given, simple information is printed on the standard output
# For more information about the syntax of the configuration file, see:
# http://docs.python.org/library/logging.config.html
Index: patches/patch-radicale_config_py
===================================================================
RCS file: /cvs/ports/productivity/radicale/patches/patch-radicale_config_py,v
retrieving revision 1.6
diff -u -p -r1.6 patch-radicale_config_py
--- patches/patch-radicale_config_py 8 Mar 2013 10:38:01 -0000 1.6
+++ patches/patch-radicale_config_py 20 Oct 2013 12:55:00 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-radicale_config_py,v 1.6 2013/03/08 10:38:01 jasper Exp $
---- radicale/config.py.orig Fri Aug 3 14:04:39 2012
-+++ radicale/config.py Sun Feb 24 17:39:19 2013
+--- radicale/config.py.orig Fri Jun 28 16:35:07 2013
++++ radicale/config.py Sun Oct 20 14:46:24 2013
@@ -43,8 +43,8 @@ INITIAL_CONFIG = {
"daemon": "False",
"pid": "",
@@ -9,35 +9,33 @@ $OpenBSD: patch-radicale_config_py,v 1.6
- "key": "/etc/apache2/ssl/server.key",
+ "certificate": "${SYSCONFDIR}/radicale/server.crt",
+ "key": "${SYSCONFDIR}/radicale/private/server.key",
- "dns_lookup": "True"},
- "encoding": {
- "request": "utf-8",
-@@ -53,7 +53,7 @@ INITIAL_CONFIG = {
+ "dns_lookup": "True",
+ "base_prefix": "/",
+ "realm": "Radicale - Password Required"},
+@@ -55,7 +55,7 @@ INITIAL_CONFIG = {
"type": "None",
"public_users": "public",
"private_users": "private",
- "htpasswd_filename": "/etc/radicale/users",
+ "htpasswd_filename": "${SYSCONFDIR}/radicale/users",
"htpasswd_encryption": "crypt",
- "imap_auth_host_name": "localhost",
- "imap_auth_host_port": "143",
-@@ -68,12 +68,10 @@ INITIAL_CONFIG = {
- "courier_socket": ""},
+ "imap_hostname": "localhost",
+ "imap_port": "143",
+@@ -77,11 +77,10 @@ INITIAL_CONFIG = {
+ "file": ""},
"storage": {
"type": "filesystem",
- "filesystem_folder": os.path.expanduser(
- "~/.config/radicale/collections"),
-- "git_folder": os.path.expanduser(
-- "~/.config/radicale/collections")},
-+ "filesystem_folder": "/var/db//radicale/calendars",
-+ "git_folder": "/var/db/radicale/calendars"},
++ "filesystem_folder": "/var/db/radicale/calendars",
+ "database_url": ""},
"logging": {
- "config": "/etc/radicale/logging",
+ "config": "${SYSCONFDIR}/radicale/logging",
"debug": "False",
"full_environment": "False"}}
-@@ -85,7 +83,7 @@ for section, values in INITIAL_CONFIG.items():
+@@ -93,7 +92,7 @@ for section, values in INITIAL_CONFIG.items():
for key, value in values.items():
_CONFIG_PARSER.set(section, key, value)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/radicale/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 8 Mar 2013 10:38:01 -0000 1.7
+++ pkg/PLIST 20 Oct 2013 12:55:00 -0000
@@ -8,28 +8,41 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/radicale/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/__main__.py
lib/python${MODPY_VERSION}/site-packages/radicale/__main__.pyc
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/IMAP.py
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/IMAP.pyc
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/LDAP.py
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/LDAP.pyc
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/PAM.py
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/PAM.pyc
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/__init__.py
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/courier.py
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/courier.pyc
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/htpasswd.py
-lib/python${MODPY_VERSION}/site-packages/radicale/acl/htpasswd.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/IMAP.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/IMAP.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/LDAP.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/LDAP.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/PAM.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/PAM.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/__init__.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/courier.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/courier.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/htpasswd.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/htpasswd.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/http.py
+lib/python${MODPY_VERSION}/site-packages/radicale/auth/http.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/config.py
lib/python${MODPY_VERSION}/site-packages/radicale/config.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/ical.py
lib/python${MODPY_VERSION}/site-packages/radicale/ical.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/log.py
lib/python${MODPY_VERSION}/site-packages/radicale/log.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/__init__.py
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/from_file.py
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/from_file.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/owner_only.py
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/owner_only.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/owner_write.py
+lib/python${MODPY_VERSION}/site-packages/radicale/rights/owner_write.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/
lib/python${MODPY_VERSION}/site-packages/radicale/storage/__init__.py
lib/python${MODPY_VERSION}/site-packages/radicale/storage/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/radicale/storage/database.py
+lib/python${MODPY_VERSION}/site-packages/radicale/storage/database.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/filesystem.py
lib/python${MODPY_VERSION}/site-packages/radicale/storage/filesystem.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/xmlutils.py
