X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Froundcube-core.postinst;h=721340650d9ee2e2b8a90d4e4fdea8f039799de1;hb=HEAD;hp=5e7e0e223a9f7a71b1c76dd7387eb67fe79a61cf;hpb=0682ba561c9e444ed77692718d75f0226401cce8;p=roundcube.git

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 5e7e0e2..7213406 100644
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -8,8 +8,8 @@ set -e
 . /usr/share/debconf/confmodule
 . /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_owner="root:www-data"
+dbc_generate_include_perms="640"
 dbc_dbfile_owner="www-data:www-data"
 dbc_dbfile_perms="0660"
 dbc_dbuser=roundcube
@@ -35,65 +35,114 @@ apache_install() {
 	fi
 }
 
+fix_symlinks() {
+    # In 0.5.1-1, symlinks have been mangled. Before this version,
+    # /var/lib/roundcube and /usr/share/roundcube were using symlinks
+    # to each other:
+    #  /usr/share/roundcube/config   -> /var/lib/roundcube/config
+    #  /usr/share/roundcube/logs     -> /var/lib/roundcube/logs
+    #  /usr/share/roundcube/plugins  -> /var/lib/roundcube/plugins
+    #  /usr/share/roundcube/skins    -> /var/lib/roundcube/skins
+    #  /usr/share/roundcube/temp     -> /var/lib/roundcube/temp
+    #  /var/lib/roundcube/logs       -> ../../log/roundcube
+    #  /var/lib/roundcube/.htaccess  -> /usr/share/roundcube/.htaccess
+    #  /var/lib/roundcube/bin        -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/index.php  -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/program    -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/robots.txt -> /usr/share/roundcube/bin
+
+    # As of 0.7.2-6, the user is expected to use /var/lib/roundcube
+    # since /usr/share/roundcube does not contain the appropriate
+    # symlinks anymore.
+    #  /var/lib/roundcube/logs       -> ../../log/roundcube
+    #  /var/lib/roundcube/.htaccess  -> /usr/share/roundcube/.htaccess
+    #  /var/lib/roundcube/index.php  -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/program    -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/robots.txt -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/plugins/*  -> /usr/share/roundcube/plugins/*
+    #  /var/lib/roundcube/skins/*    -> /usr/share/roundcube/skins/*
+
+    # Because dpkg will not overwrite a symlink but follow them, an
+    # upgrade gives a confuse situation. We have the following
+    # symlinks in /usr/share/roundcube:
+    #  /usr/share/roundcube/plugins  -> /var/lib/roundcube/plugins
+    #  /usr/share/roundcube/skins    -> /var/lib/roundcube/skins
+    # And the following are not symlinks as they should be:
+    #  /var/lib/roundcube/plugins/*  -> /usr/share/roundcube/plugins/*
+    #  /var/lib/roundcube/skins/*    -> /usr/share/roundcube/skins/*
+
+    # We detect and fix that.
+    for dir in plugins skins; do
+        [ -L /usr/share/roundcube/${dir} ] || continue
+        echo "Fixing symbolic link /usr/share/roundcube/${dir}"
+        [ ! -L /var/lib/roundcube/${dir} ] || {
+            echo "/var/lib/roundcube/${dir} is not expected to be a symbolic link. Abort."
+            exit 1
+        }
+        # Remove the symbolic link and make a real directory.
+        rm /usr/share/roundcube/${dir}
+        mkdir /usr/share/roundcube/${dir}
+
+        # We move each subdirectory regardless we own them or not. The
+        # ideal solution would be to leave files installed by the user
+        # in /var/lib/roundcube/${dir} but since other packages (like
+        # roundcube-plugins and roundcube-plugins-extra) may have
+        # installed files, it is something difficult to track. We do
+        # not want each package to fix this mess. What's important is
+        # that user installation will keep working as expected,
+        # despite the move.
+        for d in /var/lib/roundcube/${dir}/*; do
+            mv ${d} /usr/share/roundcube/${dir}
+            ln -s /usr/share/roundcube/${dir}/${d##*/} /var/lib/roundcube/${dir}/${d##*/}
+        done
+    done
+}
 
 case "$1" in
     configure)
 
-	# From 0.1-beta2.2 to 0.1-rc1, a column was added to table
-	# `identities'. For MySQL and PostgreSQL, this is handled by
-	# dbconfig-common but for sqlite, there is no way to add a
-	# column to a table. Therefore, we dump here the table and add
-	# the column.
-	[ "$dbc_upgrade" = "true" ] && {
-	    case "$dbc_dbtype" in
-		sqlite)
-		    db="${dbc_basepath}/${dbc_dbname}"
-		# OK, we need to check if the table contains html_signature
-		    if ! sqlite "$db" '.schema identities' | grep -q html_signature; then
-		        # We need to add it
-			echo -n "Need to upgrade 'identities' table in $db... "
-			upgrade_tmp=$(mktemp -t roundcube.sqlite.XXXXXXXXXX)
-			(
-			    cat <<EOF
-BEGIN TRANSACTION;
-DROP TABLE identities;
-CREATE TABLE identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  del tinyint NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-
-CREATE INDEX ix_identities_user_id ON identities(user_id);
-
+	# We try to fix an incomplete upgrade (see #610725 and #613586)
+	if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.5.1+dfsg-5; 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
-			    # We dump and keep only inserts
-			    sqlite "$db" '.dump identities' | \
-				awk '/^INSERT INTO/ {start = 1} {if (start == 1) print}' | \
-				head -n -2 | \
-				sed 's/^\(INSERT INTO identities \)/\1(identity_id, user_id, del, standard, name, organization, email, "reply-to", bcc, signature) /'
-			    echo 'COMMIT;' ) > $upgrade_tmp
-			sqlite "$db" < $upgrade_tmp
-			rm $upgrade_tmp
-			echo "OK"
-		    fi
-		    ;;
-		*)
-		    # Do nothing
-		    ;;
-	    esac
-	}
+			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 \`changed\` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER \`user_id\`;
+ALTER TABLE \`identities\` ADD INDEX \`user_identities_index\` (\`user_id\`, \`del\`);
+EOF
+		fi
+	    fi
+	fi
+
+        # Fix bug 680917
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt 0.7.2-6; then
+            fix_symlinks
+        fi
 
  	CONFFILE=/etc/roundcube/main.inc.php
  	touch $CONFFILE.ucftmp
  	chmod 640 $CONFFILE.ucftmp
+	chown root:www-data $CONFFILE.ucftmp
 
 	db_get roundcube/hosts || true
 	hosts="$RET"
@@ -120,14 +169,27 @@ EOF
 	done
 
 	# 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\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
+	cat /usr/share/roundcube/main.inc.php.dist | while read line; do
+	    case "$line" in
+		"\$rcmail_config['default_host'] = "*)
+		    printf "\$rcmail_config['default_host'] = %s;\n" "${hosts}"
+		    ;;
+		"\$rcmail_config['des_key'] = "*)
+		    printf "\$rcmail_config['des_key'] = '%s';\n" "${deskey}"
+		    ;;
+		"\$rcmail_config['language'] = "*)
+		    printf "\$rcmail_config['language'] = '%s';\n" "${language}"
+		    ;;
+		*)
+		    printf "%s\n" "$line"
+		    ;;
+	    esac
+	done >> $CONFFILE.ucftmp
 
 	ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
- 	chown root:www-data $CONFFILE
-        rm -f $CONFFILE.ucftmp
+	chown root:www-data $CONFFILE
+	[ ! -f $CONFFILE.dpkg-dist ] || chown root:www-data $CONFFILE.dpkg-dist
+	rm -f $CONFFILE.ucftmp
 	
 	# Handle webserver reconfiguration/restart ; stolen from zabbix package
 	db_get roundcube/reconfigure-webserver || true
@@ -165,7 +227,6 @@ EOF
 	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
 
     ;;