X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Froundcube-core.postinst;h=843a1859a9b38ea87fc4541bb1bacf1280a4112f;hb=933da5831e3bbf633c254a1cd23c90ffc297181c;hp=e574daeb58fa37b7e3d70bc947aaa17255c330cd;hpb=2a9280c80be73d7b1d4834131439399f333d5295;p=roundcube.git

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index e574dae..843a185 100644
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -39,21 +39,31 @@ 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-2; then
+	# 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
-		# 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
+		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 \`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
@@ -91,9 +101,10 @@ EOF
 
 	# Put hosts, language and key in main.inc.php
 	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\['language'\] = \).*\(;\)\$+\1'${language}'\2+" >> $CONFFILE.ucftmp
+	    awk "/^.rcmail_config\['default_host'\] =/ {print \$1\" = ${hosts};\" ; next}
+                 /^.rcmail_config\['des_key'\] =/ {print \$1\" = '${deskey}';\" ; next}
+                 /^.rcmail_config\['language'\] =/ {print \$1\" = '${language}';\" ; next}
+                 {print}" >> $CONFFILE.ucftmp
 
 	ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
  	chown root:www-data $CONFFILE