From a598cd8e6c3b7351d762403b09c05e5541e45d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Sun, 15 Sep 2013 14:33:40 +0200
Subject: Fix radicale config patch

---
 app-office/radicale/Manifest                       |  2 +-
 .../radicale/files/radicale-0.8-config.patch       | 40 +++++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index cae8a2d..b593e47 100644
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,4 +1,4 @@
-AUX radicale-0.8-config.patch 1155 SHA256 7aa56c0b420807d8fcc13fa3c14a37f47e26d34bebd90fdd53c134a47c1b351c SHA512 d62a4a9b27a4085745d5ac479b1ffd054ef51d7497f2036f3405be92eb08edb2902120910b4f4a567c36bda211979efb262abec2237791dfc000341f0ae8191e WHIRLPOOL 403421198bb12bd76e8a41a4fa060410cd1bf113015245e8ce86d49f3e392c0c0d8e508a76517c0d1b145986a271edfc498f8fe0a29ef41b2ad3be1cbd52a51b
+AUX radicale-0.8-config.patch 2174 SHA256 4bc6c584597219629e1df3b7854695c0660fc2c0ca68f09fba18969df1122d14 SHA512 51b2e90d43f89b3ebef59d3df334041638544457870bf00410ed172399eced19eae4d63eea05f2d3078177c4ea4fceab1e73f28357b58485ffbec78e52f9c042 WHIRLPOOL ee44ea505c09928e5b813e38a35d2f4199464834efc21f74850b26cba33130cb567d415414d5017be469d9cd979a07d91d307ef1b594ab737cd2a973fc5ca4d0
 AUX radicale.init.d 576 SHA256 695b1e49b94d93586838db454388e19423bf64a6e7f3b623518b23de5d686206 SHA512 96567a16f4fd6d3b0fb7258b77b25ea903e2fa55b1cedca91118d45285628bdd678a67092bc23ff0c8df0078c44574cbdcfd999e34f32513962660155edcfaee WHIRLPOOL ba6416158fbb6ed4d64835c310f50548d480e697cddaefe8807ef83d05c58af138afa9d7f475cde729859e0e1eb023cc59e04b1558aeedd095f57fcdf6f20605
 DIST Radicale-0.7.1.tar.gz 35355 SHA256 36e076b8c54be9df61a8434e9670d852429dcae557fadb77de23e762258bb8e4 SHA512 00ad9788b39a33f94e656e9104e1a81a9052b182021ea486d865a826c8e8711d58476beb35b89fd46371166886d9a312f417db49d81293d0434af0261c1636e1 WHIRLPOOL a353dad90c3391e104b113479b975e4a29049e7c4301122c6ed064233cc757661ea56ee92fbfe21c97e2702787bd8f639ae93418d68ac3abacb744848d909fa1
 DIST Radicale-0.8.tar.gz 39813 SHA256 e8c0df5239c22f2687a09eca7d53c318706648aff72b620849ed3f7540bc1941 SHA512 8b4db28b1fedc78e6d638a8e00dbbe0f37ada39686aae4afdf427461bbd7189d8222adf417fa5e546d9f6a6c7ff0c08eb3aa8609e9fb57c17a9e30161eabba85 WHIRLPOOL c705914db79503215f86e40545950e0fb07d439bc89372849865fece597eb863c28bd13255206a6e298308ba0a819b2e065ca05b592fc7bbb0c2c44896322138
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