patch with fixes attached
On 15:27 Wed 23 May , Stuart Henderson wrote:
> On 2012/05/23 18:12, Sergey Bronnikov wrote:
> > 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.
>
> > --- /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
>
> Not sure how you ended up with this, but copy the changed files over
> /usr/ports/productivity/radicale and just send a 'cvs diff -u'.
>
> > +-certificate = /etc/apache2/ssl/server.crt
> > ++certificate = /etc/radicale/server.crt
>
> Put this back to ${SYSCONFDIR}.
>
> > -- "certificate": "/etc/apache2/ssl/server.crt",
> > -- "key": "/etc/apache2/ssl/server.key"},
> > -+ "certificate": "${SYSCONFDIR}/radicale/server.crt",
> > -+ "key": "${SYSCONFDIR}/radicale/private/server.key"},
>
> Looks like you lost this patch completely.
>
Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/radicale/Makefile,v
retrieving revision 1.16
diff -u -p -u Makefile
--- Makefile 12 Jan 2012 00:19:54 -0000 1.16
+++ Makefile 23 May 2012 15:49:07 -0000
@@ -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
Index: distinfo
===================================================================
RCS file: /cvs/ports/productivity/radicale/distinfo,v
retrieving revision 1.6
diff -u -p -u distinfo
--- distinfo 12 Jan 2012 00:19:54 -0000 1.6
+++ distinfo 23 May 2012 15:49:07 -0000
@@ -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
Index: patches/patch-config
===================================================================
RCS file: /cvs/ports/productivity/radicale/patches/patch-config,v
retrieving revision 1.4
diff -u -p -u patches/patch-config
--- patches/patch-config 19 Aug 2011 20:35:34 -0000 1.4
+++ patches/patch-config 23 May 2012 15:49:07 -0000
@@ -1,6 +1,6 @@
-$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
+$OpenBSD$
+--- config.orig Tue Mar 13 13:45:35 2012
++++ config Wed May 23 19:20:15 2012
@@ -22,9 +22,9 @@ pid =
# SSL flag, enable HTTPS protocol
ssl = False
@@ -10,12 +10,12 @@ $OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen
# SSL private key
-key = /etc/apache2/ssl/server.key
+key = ${SYSCONFDIR}/radicale/private/server.key
+ # Reverse DNS to resolve client address in logs
+ dns_lookup = True
- [encoding]
- # Encoding for responding requests
-@@ -41,10 +41,10 @@ public_users = public
- # Usernames used for private calendars, separated by a comma
+@@ -47,10 +47,10 @@ public_users = public
private_users = private
+
# Htpasswd filename
-htpasswd_filename = /etc/radicale/users
+htpasswd_filename = ${SYSCONFDIR}/radicale/users
@@ -23,16 +23,17 @@ $OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen
# 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 =
+@@ -83,15 +83,14 @@ courier_socket =
+ type = filesystem
- [storage]
- # Folder for storing local calendars, created if not present
--folder = ~/.config/radicale/calendars
-+folder = /var/db/radicale/calendars
+ # Folder for storing local collections, created if not present
+-filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/db/radicale/calendars
+-
[logging]
# Logging configuration file
# If no config is given, simple information is printed on the standard output
Index: patches/patch-radicale_config_py
===================================================================
RCS file: /cvs/ports/productivity/radicale/patches/patch-radicale_config_py,v
retrieving revision 1.4
diff -u -p -u patches/patch-radicale_config_py
--- patches/patch-radicale_config_py 19 Aug 2011 20:35:34 -0000 1.4
+++ patches/patch-radicale_config_py 23 May 2012 15:49:07 -0000
@@ -1,18 +1,18 @@
$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
+--- radicale/config.py.orig Tue Mar 13 13:46:54 2012
++++ radicale/config.py Wed May 23 19:46:00 2012
@@ -43,8 +43,8 @@ INITIAL_CONFIG = {
"daemon": "False",
"pid": "",
"ssl": "False",
- "certificate": "/etc/apache2/ssl/server.crt",
-- "key": "/etc/apache2/ssl/server.key"},
+- "key": "/etc/apache2/ssl/server.key",
+ "certificate": "${SYSCONFDIR}/radicale/server.crt",
-+ "key": "${SYSCONFDIR}/radicale/private/server.key"},
++ "key": "${SYSCONFDIR}/radicale/private/server.key",
+ "dns_lookup": "True"},
"encoding": {
"request": "utf-8",
- "stock": "utf-8"},
-@@ -52,7 +52,7 @@ INITIAL_CONFIG = {
+@@ -53,7 +53,7 @@ INITIAL_CONFIG = {
"type": "None",
"public_users": "public",
"private_users": "private",
@@ -21,24 +21,19 @@ $OpenBSD: patch-radicale_config_py,v 1.4 2011/08/19 20
"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": ""},
+@@ -66,12 +66,10 @@ INITIAL_CONFIG = {
+ "courier_socket": ""},
"storage": {
-- "folder": os.path.expanduser("~/.config/radicale/calendars")},
-+ "folder": "/var/db/radicale/calendars"},
+ "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"},
"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'])
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/radicale/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u pkg/PLIST
--- pkg/PLIST 12 Jan 2012 00:19:54 -0000 1.5
+++ pkg/PLIST 23 May 2012 15:49:07 -0000
@@ -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}
