From 8c77cb389045590170b927c8f34cd856274f486a Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 27 Sep 2009 08:58:32 +0000 Subject: [PATCH] Ship back htaccess since it is needed to set some php_value --- debian/changelog | 2 ++ debian/conf/apache.conf | 10 ++++++---- debian/conf/lighttpd.conf | 3 +++ debian/roundcube-core.install | 2 +- debian/rules | 1 - 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index dfd65bc..98b46ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ roundcube (0.3-1) UNRELEASED; urgency=low change. Thanks to Richard van den Berg for noticing this. Closes: #544579. * Depends on libjs-jquery (>= 1.3) since this is now used by roundcube. * Don't ship any plugins for now but ship an empty plugins directory. + * Ship main .htaccess since it is needed to setup correctly PHP (for + example, to disable PHP Suhosin cookie encryption). -- Vincent Bernat Wed, 16 Sep 2009 22:32:29 +0200 diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index 79e3d41..f4befee 100644 --- a/debian/conf/apache.conf +++ b/debian/conf/apache.conf @@ -12,10 +12,12 @@ - Options +FollowSymLinks - AllowOverride All - order allow,deny - allow from all + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all # Protecting basic directories: diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf index 38c43d4..46a12ae 100644 --- a/debian/conf/lighttpd.conf +++ b/debian/conf/lighttpd.conf @@ -2,6 +2,9 @@ # virtual host configuration. Do not forget to adapt the rest of the # configuration. +# Look at /var/lib/roundcube/.htaccess. You may need to migrate some +# of those php_flag/php_value to your setup. + alias.url += ("/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www") alias.url += ("/roundcube" => "/var/lib/roundcube") diff --git a/debian/roundcube-core.install b/debian/roundcube-core.install index 7d1a04b..ddeac9e 100644 --- a/debian/roundcube-core.install +++ b/debian/roundcube-core.install @@ -1,4 +1,4 @@ -robots.txt index.php program/ bin/ usr/share/roundcube +robots.txt index.php .htaccess program/ bin/ usr/share/roundcube skins temp var/lib/roundcube plugins/filesystem_attachments var/lib/roundcube/plugins debian/conf/* etc/roundcube diff --git a/debian/rules b/debian/rules index c76a509..752ed66 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,6 @@ binary-install/roundcube-core:: # Remove useless file rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm - find $(CURDIR)/debian/roundcube-core -name '.htaccess' -print0 | xargs -r0 rm find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm # Remove files shipped in tinymce package rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce -- 2.39.2