Port of Radicale updated to version 0.7
Changes are following:
Repeating events
Collection deletion
Courier and PAM authentication methods
CardDAV support
Custom LDAP filters supported
Plese review patch, test and commit.
Sergey B.
diff -uprN /usr/ports/productivity/radicale/Makefile
/usr/ports/mystuff/productivity/radicale/Makefile
--- /usr/ports/productivity/radicale/Makefile Mon May 14 18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/Makefile Wed May 23 16:52:08 2012
@@ -2,7 +2,7 @@
COMMENT = simple CalDAV calendar server
-MODPY_EGG_VERSION = 0.6.4
+MODPY_EGG_VERSION = 0.7
DISTNAME = Radicale-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:L}
CATEGORIES = productivity net
diff -uprN /usr/ports/productivity/radicale/distinfo
/usr/ports/mystuff/productivity/radicale/distinfo
--- /usr/ports/productivity/radicale/distinfo Mon May 14 18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/distinfo Wed May 23 16:52:19 2012
@@ -1,5 +1,5 @@
-MD5 (Radicale-0.6.4.tar.gz) = vpxdjfmFBZ3dZSUpVl+unw==
-RMD160 (Radicale-0.6.4.tar.gz) = naeu3o7Ej6lyWoWYXNPm470ndok=
-SHA1 (Radicale-0.6.4.tar.gz) = FYVN06cHDvhDhXO0qf75KitGuKs=
-SHA256 (Radicale-0.6.4.tar.gz) = g/1tG5WM0urn+o13PbUI4aT4cmbkg0YBbQPissfrgOo=
-SIZE (Radicale-0.6.4.tar.gz) = 30994
+MD5 (Radicale-0.7.tar.gz) = lIGDhsGrO8PiczAUnrEGfw==
+RMD160 (Radicale-0.7.tar.gz) = as9TxZH9m11CXSJuLAc3roCraJ4=
+SHA1 (Radicale-0.7.tar.gz) = LySOYZV8ucmbQE1zsX26xyh1+mg=
+SHA256 (Radicale-0.7.tar.gz) = 89F9FrrEy+7cXmaotxHynVEwnpJkqe+TC11GZQN5TAk=
+SIZE (Radicale-0.7.tar.gz) = 34061
diff -uprN /usr/ports/productivity/radicale/patches/CVS/patch-config
/usr/ports/mystuff/productivity/radicale/patches/CVS/patch-config
--- /usr/ports/productivity/radicale/patches/CVS/patch-config Thu Jan 1
03:00:00 1970
+++ /usr/ports/mystuff/productivity/radicale/patches/CVS/patch-config Wed May
23 17:09:42 2012
@@ -0,0 +1,32 @@
+--- config.orig Wed May 23 17:07:02 2012
++++ config Wed May 23 17:08:52 2012
+@@ -22,9 +22,9 @@ pid =
+ # SSL flag, enable HTTPS protocol
+ ssl = False
+ # SSL certificate path
+-certificate = /etc/apache2/ssl/server.crt
++certificate = /etc/radicale/server.crt
+ # SSL private key
+-key = /etc/apache2/ssl/server.key
++key = /etc/radicale/private/server.key
+ # Reverse DNS to resolve client address in logs
+ dns_lookup = True
+
+@@ -50,7 +50,7 @@ private_users = private
+ htpasswd_filename = /etc/radicale/users
+ # Htpasswd encryption method
+ # Value: plain | sha1 | crypt
+-htpasswd_encryption = crypt
++htpasswd_encryption = sha1
+
+ # LDAP server URL, with protocol and port
+ ldap_url = ldap://localhost:389/
+@@ -83,7 +83,7 @@ courier_socket =
+ type = filesystem
+
+ # Folder for storing local collections, created if not present
+-filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/db/radicale/calendars
+
+
+ [logging]
diff -uprN /usr/ports/productivity/radicale/patches/patch-config
/usr/ports/mystuff/productivity/radicale/patches/patch-config
--- /usr/ports/productivity/radicale/patches/patch-config Mon May 14
18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/patches/patch-config Thu Jan
1 03:00:00 1970
@@ -1,45 +0,0 @@
-$OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen Exp $
---- config.orig Wed Jun 15 20:03:33 2011
-+++ config Mon Aug 1 23:41:44 2011
-@@ -22,9 +22,9 @@ pid =
- # SSL flag, enable HTTPS protocol
- ssl = False
- # SSL certificate path
--certificate = /etc/apache2/ssl/server.crt
-+certificate = ${SYSCONFDIR}/radicale/server.crt
- # SSL private key
--key = /etc/apache2/ssl/server.key
-+key = ${SYSCONFDIR}/radicale/private/server.key
-
- [encoding]
- # Encoding for responding requests
-@@ -41,10 +41,10 @@ public_users = public
- # Usernames used for private calendars, separated by a comma
- private_users = private
- # Htpasswd filename
--htpasswd_filename = /etc/radicale/users
-+htpasswd_filename = ${SYSCONFDIR}/radicale/users
- # Htpasswd encryption method
- # Value: plain | sha1 | crypt
--htpasswd_encryption = crypt
-+htpasswd_encryption = sha1
- # LDAP server URL, with protocol and port
- ldap_url = ldap://localhost:389/
- # LDAP base path
-@@ -59,14 +59,14 @@ ldap_password =
-
- [storage]
- # Folder for storing local calendars, created if not present
--folder = ~/.config/radicale/calendars
-+folder = /var/db/radicale/calendars
-
- [logging]
- # Logging configuration file
- # 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
--config = /etc/radicale/logging
-+config = ${SYSCONFDIR}/radicale/logging
- # Set the default logging level to debug
- debug = False
- # Store all environment variables (including those set in the shell)
diff -uprN /usr/ports/productivity/radicale/patches/patch-radicale_config_py
/usr/ports/mystuff/productivity/radicale/patches/patch-radicale_config_py
--- /usr/ports/productivity/radicale/patches/patch-radicale_config_py Mon May
14 18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/patches/patch-radicale_config_py
Thu Jan 1 03:00:00 1970
@@ -1,44 +0,0 @@
-$OpenBSD: patch-radicale_config_py,v 1.4 2011/08/19 20:35:34 sthen Exp $
---- radicale/config.py.orig Wed Jun 15 20:03:33 2011
-+++ radicale/config.py Mon Aug 1 23:44:48 2011
-@@ -43,8 +43,8 @@ INITIAL_CONFIG = {
- "daemon": "False",
- "pid": "",
- "ssl": "False",
-- "certificate": "/etc/apache2/ssl/server.crt",
-- "key": "/etc/apache2/ssl/server.key"},
-+ "certificate": "${SYSCONFDIR}/radicale/server.crt",
-+ "key": "${SYSCONFDIR}/radicale/private/server.key"},
- "encoding": {
- "request": "utf-8",
- "stock": "utf-8"},
-@@ -52,7 +52,7 @@ INITIAL_CONFIG = {
- "type": "None",
- "public_users": "public",
- "private_users": "private",
-- "httpasswd_filename": "/etc/radicale/users",
-+ "httpasswd_filename": "${SYSCONFDIR}/radicale/users",
- "httpasswd_encryption": "crypt",
- "ldap_url": "ldap://localhost:389/";,
- "ldap_base": "ou=users,dc=example,dc=com",
-@@ -60,9 +60,9 @@ INITIAL_CONFIG = {
- "ldap_binddn": "",
- "ldap_password": ""},
- "storage": {
-- "folder": os.path.expanduser("~/.config/radicale/calendars")},
-+ "folder": "/var/db/radicale/calendars"},
- "logging": {
-- "config": "/etc/radicale/logging",
-+ "config": "${SYSCONFDIR}/radicale/logging",
- "debug": "False",
- "full_environment": "False"}}
-
-@@ -74,7 +74,7 @@ for section, values in INITIAL_CONFIG.items():
- for key, value in values.items():
- _CONFIG_PARSER.set(section, key, value)
-
--_CONFIG_PARSER.read("/etc/radicale/config")
-+_CONFIG_PARSER.read("${SYSCONFDIR}/radicale/config")
- _CONFIG_PARSER.read(os.path.expanduser("~/.config/radicale/config"))
- if 'RADICALE_CONFIG' in os.environ:
- _CONFIG_PARSER.read(os.environ['RADICALE_CONFIG'])
diff -uprN /usr/ports/productivity/radicale/pkg/PLIST
/usr/ports/mystuff/productivity/radicale/pkg/PLIST
--- /usr/ports/productivity/radicale/pkg/PLIST Mon May 14 18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/pkg/PLIST Wed May 23 17:04:06 2012
@@ -11,8 +11,12 @@ lib/python${MODPY_VERSION}/site-packages/radicale/__ma
lib/python${MODPY_VERSION}/site-packages/radicale/acl/
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/config.py
@@ -21,6 +25,11 @@ lib/python${MODPY_VERSION}/site-packages/radicale/ical
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/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/filesystem.py
+lib/python${MODPY_VERSION}/site-packages/radicale/storage/filesystem.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/xmlutils.py
lib/python${MODPY_VERSION}/site-packages/radicale/xmlutils.pyc
share/doc/pkg-readmes/${FULLPKGNAME}
