summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2011-08-09 02:48:41 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2011-08-09 02:48:41 +0200
commitf45630f2071cfc38664a182be65df8dce29577c8 (patch)
tree7c246e51b83abc04ae9dbc16fb3fd5cfd557bcf8
parent5793fe6e26d1a6785e6a0a130cb3ba589da9ca23 (diff)
downloadoverlay-f45630f2071cfc38664a182be65df8dce29577c8.tar.gz
overlay-f45630f2071cfc38664a182be65df8dce29577c8.tar.bz2
overlay-f45630f2071cfc38664a182be65df8dce29577c8.zip
Radicale fixes
-rw-r--r--app-office/radicale/Manifest4
-rwxr-xr-xapp-office/radicale/files/radicale.fcgi2
-rw-r--r--app-office/radicale/radicale-0.6.ebuild6
3 files changed, 9 insertions, 3 deletions
diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index aeea496..41aad7a 100644
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,7 +1,7 @@
AUX logging 1034 RMD160 a3edc69f3bd9b111e02903cc5f49169323933f68 SHA1 d9c2f56de2b0501741250da78ba1689ac1fbd3cc SHA256 095d292d26491c72e401c68586f6013ec822b04fa919439f401f715e6ba5fccf
-AUX radicale.fcgi 1156 RMD160 01076450d014889d6dbcfa313a13c77c2701fdd1 SHA1 a124994eefc4e186cb8c22806f0718158c4c0cae SHA256 d11153602e9fef7ab72ec5526ded77e7ed027bb11837bd86dac19c01c11bce89
+AUX radicale.fcgi 1116 RMD160 01f7d5e69ae1e194fcee1ed96aba2218586b6079 SHA1 9095612ced9a0d22112313aa44081b951c980549 SHA256 9e00346fae03658f17ef47c94c6ad50116b750d2eef435152b621542895e75d8
AUX radicale.init.d 550 RMD160 f1f6aa919952b744900c781b8d6cd9283bc44534 SHA1 3c2043b9f2680b14969bd7f3727e3df85c7f9c48 SHA256 1b28de6c1bc2c6119eb654622713fdd2c16d89105940c6b55d2bc081fbb2fd2c
AUX radicale.wsgi 888 RMD160 32965394ef97e3ee8ba958e6aaa62a8d62a69c9b SHA1 56cd1d79321735d5d2f5ec8ecc7404708d361d4c SHA256 cffe36a531d7f897e3822c059c4b0cb7fd8cd2cf0a659e4bddb39abed8101ca2
DIST Radicale-0.6.tar.gz 29903 RMD160 343637edab81ef7a4804020f16b28448081af084 SHA1 ffe51253cc6cf3bc9f28057b55e64dd95147fa30 SHA256 5798c80a842e023dcdf4829fa47f74d500dfa71264c193b24fd5397407efbf5c
-EBUILD radicale-0.6.ebuild 1218 RMD160 58275053382d822b5ac31275843de92a2075788c SHA1 8047b26b8bb051628f8850af702b44945a0ace7e SHA256 6111446123539ed4b7dfc253cf8160988b7c63c953e3f3c852456e31d4202f44
+EBUILD radicale-0.6.ebuild 1341 RMD160 f35709eee1bf8d81e409bb6c0d79c07d1db292c3 SHA1 8503bf7911294ef736c9fd4bc3d756a216540262 SHA256 c6170fe71b737530989633c584360305c75479df706f1fba704787091b9ab399
EBUILD radicale-9999.ebuild 792 RMD160 5239fd36cee932180729089609dcc94d1fed2653 SHA1 8988ea9bb90c439553e4fac74579c9cfd28a0fb3 SHA256 cad0db601c86dbe05299a558591cd23e885aa2b0faac700fee04fdae549f2d66
diff --git a/app-office/radicale/files/radicale.fcgi b/app-office/radicale/files/radicale.fcgi
index 42d8413..e284450 100755
--- a/app-office/radicale/files/radicale.fcgi
+++ b/app-office/radicale/files/radicale.fcgi
@@ -28,7 +28,7 @@ from flup.server.fcgi import WSGIServer
import radicale
-radicale.log.start(radicale.config.get("logging", "config"))
+radicale.log.start()
radicale.log.LOGGER.info("Starting Radicale FastCGI server")
WSGIServer(radicale.Application()).run()
diff --git a/app-office/radicale/radicale-0.6.ebuild b/app-office/radicale/radicale-0.6.ebuild
index 5ad083c..15e9bed 100644
--- a/app-office/radicale/radicale-0.6.ebuild
+++ b/app-office/radicale/radicale-0.6.ebuild
@@ -28,6 +28,12 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ distutils_src_prepare
+
+ sed -i -e "s/htpasswd_encoding/encoding/" ${S}/radicale/acl/htpasswd.py || die
+}
+
src_install() {
distutils_src_install