From a598cd8e6c3b7351d762403b09c05e5541e45d10 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Sun, 15 Sep 2013 14:33:40 +0200
Subject: Fix radicale config patch

---
 .../radicale/files/radicale-0.8-config.patch       | 40 +++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'app-office/radicale/files/radicale-0.8-config.patch')

diff --git a/app-office/radicale/files/radicale-0.8-config.patch b/app-office/radicale/files/radicale-0.8-config.patch
index f52894e..aa867bc 100644
--- a/app-office/radicale/files/radicale-0.8-config.patch
+++ b/app-office/radicale/files/radicale-0.8-config.patch
@@ -1,14 +1,43 @@
-Fix the config for Gentoo's default needs.
+From 6887e996ad771d22659c0eb8cbca94c936fdb10a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <gentoo@necoro.eu>
+Date: Sun, 15 Sep 2013 14:02:32 +0200
+Subject: Fix the config for Gentoo's default needs.
+
     * Set pathes
     * Set rights.type to 'owner_only' to model pre-0.8 behavior
       (None means 'everyone is allowed everything')
+    * Remove 'public_users' and 'private_users' as they are obsolete.
 ---
+ config  | 13 ++++---------
+ logging |  2 +-
+ 2 files changed, 5 insertions(+), 10 deletions(-)
 
 diff --git a/config b/config
-index 453a45e..96ad0e0 100644
+index 453a45e..10c1595 100644
 --- a/config
 +++ b/config
-@@ -97,10 +97,10 @@ http_password_parameter =
+@@ -30,7 +30,7 @@ dns_lookup = True
+ # Root URL of Radicale (starting and ending with a slash)
+ base_prefix = /
+ # Message displayed in the client when a password is needed
+-realm = Radicale - Password Required lol
++realm = Radicale - Password Required
+ 
+ 
+ [encoding]
+@@ -45,11 +45,6 @@ stock = utf-8
+ # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http
+ type = None
+ 
+-# Usernames used for public collections, separated by a comma
+-public_users = public
+-# Usernames used for private collections, separated by a comma
+-private_users = private
+-
+ # Htpasswd filename
+ htpasswd_filename = /etc/radicale/users
+ # Htpasswd encryption method
+@@ -97,10 +92,10 @@ http_password_parameter =
  [rights]
  # Rights management method
  # Value: None | owner_only | owner_write | from_file
@@ -21,7 +50,7 @@ index 453a45e..96ad0e0 100644
  
  
  [storage]
-@@ -109,7 +109,7 @@ file = ~/.config/radicale/rights
+@@ -109,7 +104,7 @@ file = ~/.config/radicale/rights
  type = filesystem
  
  # Folder for storing local collections, created if not present
@@ -43,3 +72,6 @@ index f4efb88..b10f88c 100644
  formatter = full
  
  
+-- 
+1.8.1.5
+
-- 
cgit v1.2.3-54-g00ecf