Imported Debian patch 0.5.1+dfsg-3

[roundcube.git] / debian / roundcube-core.postinst

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 5db3c4b328da05b4862d0fe4cf9f1edd4760b7da..59f85f727ba009b087ba18dc6b201321ab2c2386 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -9,7 +9,7 @@ set -e
 . /usr/share/dbconfig-common/dpkg/postinst 
 dbc_generate_include=php:/etc/roundcube/debian-db.php
 dbc_generate_include_owner="www-data:www-data"
-dbc_generate_include_perms="660"
+dbc_generate_include_perms="640"
 dbc_dbfile_owner="www-data:www-data"
 dbc_dbfile_perms="0660"
 dbc_dbuser=roundcube
@@ -39,6 +39,38 @@ apache_install() {
 case "$1" in
     configure)
 
+       # We try to fix an incomplete upgrade (see #610725 and #613586)
+       if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.5.1+dfsg-2; then
+           db_get roundcube/dbconfig-upgrade || true
+           if [ x"$RET" = x"true" ]; then
+               if [ x"$dbc_dbtype" = x"mysql" ]; then
+                   # Ok, we may need to do some upgrade steps.
+                   echo "Fixing MySQL installation..."
+                   if dpkg --compare-versions "$2" ge 0.5; then
+                       # Hack (ugly) to replace "mysql" by "mysql -f"
+                       real_mysql="$(which mysql)"
+                       workdir="$(mktemp -d)"
+                       oldpath="$PATH"
+                       cat <<EOF > "$workdir/mysql"
+#!/bin/sh
+"$real_mysql" "\$@" -f
+EOF
+                       chmod +x "$workdir/mysql"
+                       PATH="$workdir:$PATH"
+                       dbc_mysql_exec_file \
+                           /usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.5-1 || true
+                       PATH="$oldpath"
+                       rm -rf "$workdir"
+                    fi
+                   cat <<EOF | while read command; do dbc_mysql_exec_command "$command" || true ; done
+ALTER TABLE \`messages\` ADD INDEX \`index_index\` (\`user_id\`, \`cache_key\`, \`idx\`);
+ALTER TABLE \`contacts\`ADD INDEX \`user_contacts_index\` (\`user_id\`,\`email\`);
+ALTER TABLE \`identities\` ADD INDEX \`user_identities_index\` (\`user_id\`, \`del\`);
+EOF
+               fi
+           fi
+       fi
+
        CONFFILE=/etc/roundcube/main.inc.php
        touch $CONFFILE.ucftmp
        chmod 640 $CONFFILE.ucftmp
@@ -71,7 +103,7 @@ case "$1" in
        cat /usr/share/roundcube/main.inc.php.dist | \
            sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \
                -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \
-               -e "s+^\(\$rcmail_config\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
+               -e "s+^\(\$rcmail_config\['language'\] = \).*\(;\)\$+\1'${language}'\2+" >> $CONFFILE.ucftmp
 
        ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
        chown root:www-data $CONFFILE
@@ -113,7 +145,6 @@ case "$1" in
        chmod -R 750 /var/log/roundcube
        chown -R www-data:www-data /var/lib/roundcube/temp
        chmod -R 750 /var/lib/roundcube/temp
-       chown www-data:adm /var/lib/roundcube/skins
 
     ;;