X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Froundcube-core.postinst;h=64bdf5d8a2192883e81cdefb693787177bc91af8;hb=620857a6a896becc107d67e32f388b92e95a1fc1;hp=5db3c4b328da05b4862d0fe4cf9f1edd4760b7da;hpb=287d47d3d0dbea2e1059bbbd47c3675c403312b4;p=roundcube.git

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 5db3c4b..64bdf5d 100644
--- 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,28 @@ apache_install() {
 case "$1" in
     configure)
 
+	# We try to fix an incomplete upgrade (see #610725)
+	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
+		# Ok, we may need to do some upgrade steps. Let's get
+		# database parameters
+		eval `sed -n 's/^\$\(.*\);$/\1/p' /etc/roundcube/debian-db.php`
+		if [ x"$dbtype" = x"mysql" ]; then
+		    echo "Fixing MySQL indexes (you can ignore errors)..."
+		    MYSQLARGS="-f -u $dbuser -p$dbpass $dbname"
+		    [ -z "$dbserver" ] || MYSQLARGS="-h $dbserver $MYSQLARGS"
+		    [ -z "$dbport" ] || MYSQLARGS="-P $dbport $MYSQLARGS"
+		    cat <<EOF | mysql $MYSQLARGS || true
+ALTER TABLE \`messages\` ADD INDEX \`index_index\` (\`user_id\`, \`cache_key\`, \`idx\`);
+ALTER TABLE \`session\` CHANGE \`vars\` \`vars\` MEDIUMTEXT NOT NULL;
+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 +93,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 +135,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
 
     ;;