From a54f58869f259e3087ca5a1bebd1d4c096c1f99c Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 7 Feb 2012 17:44:25 +0100 Subject: [PATCH] Drop roundcube-sqlite package. Closes: #657092. --- debian/changelog | 9 ++ debian/control | 10 +-- debian/roundcube-core.NEWS | 10 +++ debian/roundcube-core.config | 2 +- debian/roundcube-core.dirs | 1 - debian/rules | 1 - debian/sql/sqlite/0.1.1-1 | 28 ------ debian/sql/sqlite/0.1~rc1~dfsg-1 | 27 ------ debian/sql/sqlite/0.2~stable-1 | 8 -- debian/sql/sqlite/0.5-1 | 146 ------------------------------- debian/sql/sqlite/0.6+dfsg-1 | 38 -------- debian/sql/sqlite/0.7-1 | 67 -------------- debian/sql/sqlite/0.7.1-1 | 38 -------- 13 files changed, 21 insertions(+), 364 deletions(-) delete mode 100644 debian/sql/sqlite/0.1.1-1 delete mode 100644 debian/sql/sqlite/0.1~rc1~dfsg-1 delete mode 100644 debian/sql/sqlite/0.2~stable-1 delete mode 100644 debian/sql/sqlite/0.5-1 delete mode 100644 debian/sql/sqlite/0.6+dfsg-1 delete mode 100644 debian/sql/sqlite/0.7-1 delete mode 100644 debian/sql/sqlite/0.7.1-1 diff --git a/debian/changelog b/debian/changelog index b81ac2d..1df0e70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +roundcube (0.7.1-2) unstable; urgency=high + + * Remove roundcube-sqlite package since php5 package does not ship + SQLite 2.x support anymore. Roundcube is incompatible with SQLite 3.x. + Closes: #657092. + * Urgency set to high for php5 migration into testing. + + -- Vincent Bernat Tue, 07 Feb 2012 17:37:52 +0100 + roundcube (0.7.1-1) unstable; urgency=low * New upstream version. Closes: #656093. diff --git a/debian/control b/debian/control index 19f31a0..96364ab 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Depends: dbconfig-common, debconf | debconf-2.0, ucf, php-net-socket, php-mail-mime (>= 1.8.0), php5-pspell, tinymce (>= 3), libjs-jquery (>= 1.6.4), libjs-jquery-ui (>= 1.8), libmagic1, - roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), + roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), ${misc:Depends} Suggests: php-auth-sasl (>= 1.0.3), php-crypt-gpg, roundcube-plugins Replaces: roundcube @@ -66,14 +66,6 @@ Description: metapackage providing PostgreSQL dependencies for RoundCube a skinnable AJAX based webmail solution for IMAP servers. Install this one if you want to use a PostgreSQL database with RoundCube. -Package: roundcube-sqlite -Architecture: all -Depends: php-mdb2-driver-sqlite (>= 1.5.0b2), sqlite, ${misc:Depends} -Description: metapackage providing sqlite dependencies for RoundCube - This package provides sqlite dependencies for RoundCube Webmail, a - skinnable AJAX based webmail solution for IMAP servers. Install this - one if you want to use a sqlite database with RoundCube. - Package: roundcube-plugins Architecture: all Depends: roundcube-core (= ${source:Version}), ${misc:Depends} diff --git a/debian/roundcube-core.NEWS b/debian/roundcube-core.NEWS index 58abf9a..a0ecf6b 100644 --- a/debian/roundcube-core.NEWS +++ b/debian/roundcube-core.NEWS @@ -1,3 +1,13 @@ +roundcube (0.7.1-2) unstable; urgency=high + + Roundcube SQLite support is limited to SQLite 2.x. No support for + SQLite 3.x currently exists. Unfortunately, SQLite 2.x is unmaintained + for several years and therefore has been dropped from php5 + package. You will need to select another database to keep Roundcube + running. + + -- Vincent Bernat Tue, 07 Feb 2012 17:41:58 +0100 + roundcube (0.3.1-2) unstable; urgency=low Starting from Roundcube 0.3, an incompatibility with Suhosin session diff --git a/debian/roundcube-core.config b/debian/roundcube-core.config index 72347da..a1ecf4f 100644 --- a/debian/roundcube-core.config +++ b/debian/roundcube-core.config @@ -41,7 +41,7 @@ db_input medium roundcube/language || true db_go || true if [ -f /usr/share/dbconfig-common/dpkg/config ]; then - dbc_dbtypes="sqlite, mysql, pgsql" + dbc_dbtypes="mysql, pgsql" dbc_authmethod_user="password" . /usr/share/dbconfig-common/dpkg/config dbc_go roundcube $@ diff --git a/debian/roundcube-core.dirs b/debian/roundcube-core.dirs index 1b6272a..55ce9e8 100644 --- a/debian/roundcube-core.dirs +++ b/debian/roundcube-core.dirs @@ -2,7 +2,6 @@ usr/share/roundcube usr/share/dbconfig-common/data/roundcube/install usr/share/dbconfig-common/data/roundcube/upgrade/mysql usr/share/dbconfig-common/data/roundcube/upgrade/pgsql -usr/share/dbconfig-common/data/roundcube/upgrade/sqlite etc/roundcube etc/roundcube/plugins/jqueryui var/log/roundcube diff --git a/debian/rules b/debian/rules index bc3776a..0f49325 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,6 @@ binary-install/roundcube-core:: # Install empty tables and updates for each db type install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/mysql install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/pgsql - install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/sqlite # Old database upgrades cp -r $(CURDIR)/debian/sql/* $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/. diff --git a/debian/sql/sqlite/0.1.1-1 b/debian/sql/sqlite/0.1.1-1 deleted file mode 100644 index 1857890..0000000 --- a/debian/sql/sqlite/0.1.1-1 +++ /dev/null @@ -1,28 +0,0 @@ --- RoundCube Webmail update script for SQLite databases --- Updates from version 0.1-stable to 0.1.1 - -DROP TABLE messages; - -CREATE TABLE messages ( - message_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - del tinyint NOT NULL default '0', - cache_key varchar(128) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - idx integer NOT NULL default '0', - uid integer NOT NULL default '0', - subject varchar(255) NOT NULL default '', - "from" varchar(255) NOT NULL default '', - "to" varchar(255) NOT NULL default '', - "cc" varchar(255) NOT NULL default '', - "date" datetime NOT NULL default '0000-00-00 00:00:00', - size integer NOT NULL default '0', - headers text NOT NULL, - structure text -); - -CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid); - -CREATE INDEX ix_users_username ON users(username); -CREATE INDEX ix_users_alias ON users(alias); - diff --git a/debian/sql/sqlite/0.1~rc1~dfsg-1 b/debian/sql/sqlite/0.1~rc1~dfsg-1 deleted file mode 100644 index e725729..0000000 --- a/debian/sql/sqlite/0.1~rc1~dfsg-1 +++ /dev/null @@ -1,27 +0,0 @@ --- RoundCube Webmail update script for SQLite databases --- Updates from version 0.1-beta2 and older - -DROP TABLE messages; - -CREATE TABLE messages ( - message_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - del tinyint NOT NULL default '0', - cache_key varchar(128) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - idx integer NOT NULL default '0', - uid integer NOT NULL default '0', - subject varchar(255) NOT NULL default '', - "from" varchar(255) NOT NULL default '', - "to" varchar(255) NOT NULL default '', - cc varchar(255) NOT NULL default '', - date datetime NOT NULL default '0000-00-00 00:00:00', - size integer NOT NULL default '0', - headers text NOT NULL, - structure text -); - -CREATE INDEX ix_messages_user_id ON messages(user_id); -CREATE INDEX ix_messages_cache_key ON messages(cache_key); -CREATE INDEX ix_messages_idx ON messages(idx); -CREATE INDEX ix_messages_uid ON messages(uid); diff --git a/debian/sql/sqlite/0.2~stable-1 b/debian/sql/sqlite/0.2~stable-1 deleted file mode 100644 index 4005727..0000000 --- a/debian/sql/sqlite/0.2~stable-1 +++ /dev/null @@ -1,8 +0,0 @@ --- Updates from version 0.2-alpha - -CREATE INDEX ix_messages_created ON messages (created); - --- Updates from version 0.2-beta - -CREATE INDEX ix_session_changed ON session (changed); -CREATE INDEX ix_cache_created ON cache (created); diff --git a/debian/sql/sqlite/0.5-1 b/debian/sql/sqlite/0.5-1 deleted file mode 100644 index d3aad40..0000000 --- a/debian/sql/sqlite/0.5-1 +++ /dev/null @@ -1,146 +0,0 @@ --- Updates from version 0.3-stable - -DELETE FROM messages; -DROP INDEX ix_messages_user_cache_uid; -CREATE UNIQUE INDEX ix_messages_user_cache_uid ON messages (user_id,cache_key,uid); -CREATE INDEX ix_messages_index ON messages (user_id,cache_key,idx); -DROP INDEX ix_contacts_user_id; -CREATE INDEX ix_contacts_user_id ON contacts(user_id, email); - --- Updates from version 0.3.1 - --- ALTER TABLE identities ADD COLUMN changed datetime NOT NULL default '0000-00-00 00:00:00'; -- - -CREATE TABLE temp_identities ( - identity_id integer NOT NULL PRIMARY KEY, - user_id integer 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' -); -INSERT INTO temp_identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature) - SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature - FROM identities WHERE del=0; - -DROP INDEX ix_identities_user_id; -DROP TABLE identities; - -CREATE TABLE identities ( - identity_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - changed datetime NOT NULL default '0000-00-00 00:00:00', - 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, del); - -INSERT INTO identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature) - SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature - FROM temp_identities; - -DROP TABLE temp_identities; - -CREATE TABLE contactgroups ( - contactgroup_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '' -); - -CREATE INDEX ix_contactgroups_user_id ON contactgroups(user_id, del); - -CREATE TABLE contactgroupmembers ( - contactgroup_id integer NOT NULL, - contact_id integer NOT NULL default '0', - created datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (contactgroup_id, contact_id) -); - --- Updates from version 0.3.1 - -CREATE TABLE tmp_users ( - user_id integer NOT NULL PRIMARY KEY, - username varchar(128) NOT NULL default '', - mail_host varchar(128) NOT NULL default '', - alias varchar(128) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - last_login datetime NOT NULL default '0000-00-00 00:00:00', - language varchar(5), - preferences text NOT NULL default '' -); - -INSERT INTO tmp_users (user_id, username, mail_host, alias, created, last_login, language, preferences) - SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM users; - -DROP TABLE users; - -CREATE TABLE users ( - user_id integer NOT NULL PRIMARY KEY, - username varchar(128) NOT NULL default '', - mail_host varchar(128) NOT NULL default '', - alias varchar(128) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', - last_login datetime DEFAULT NULL, - language varchar(5), - preferences text NOT NULL default '' -); - -INSERT INTO users (user_id, username, mail_host, alias, created, last_login, language, preferences) - SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM tmp_users; - -CREATE INDEX ix_users_username ON users(username); -CREATE INDEX ix_users_alias ON users(alias); -DROP TABLE tmp_users; - --- Updates from version 0.4.2 - -DROP INDEX ix_users_username; -CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host); - -CREATE TABLE contacts_tmp ( - contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '', - email varchar(255) NOT NULL default '', - firstname varchar(128) NOT NULL default '', - surname varchar(128) NOT NULL default '', - vcard text NOT NULL default '' -); - -INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard) - SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts; - -DROP TABLE contacts; -CREATE TABLE contacts ( - contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '', - email varchar(255) NOT NULL default '', - firstname varchar(128) NOT NULL default '', - surname varchar(128) NOT NULL default '', - vcard text NOT NULL default '' -); - -INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard) - SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp; - -CREATE INDEX ix_contacts_user_id ON contacts(user_id, email); -DROP TABLE contacts_tmp; - diff --git a/debian/sql/sqlite/0.6+dfsg-1 b/debian/sql/sqlite/0.6+dfsg-1 deleted file mode 100644 index c47cdbb..0000000 --- a/debian/sql/sqlite/0.6+dfsg-1 +++ /dev/null @@ -1,38 +0,0 @@ -CREATE TABLE contacts_tmp ( - contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '', - email varchar(255) NOT NULL default '', - firstname varchar(128) NOT NULL default '', - surname varchar(128) NOT NULL default '', - vcard text NOT NULL default '' -); - -INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard) - SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts; - -DROP TABLE contacts; -CREATE TABLE contacts ( - contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '', - email varchar(255) NOT NULL default '', - firstname varchar(128) NOT NULL default '', - surname varchar(128) NOT NULL default '', - vcard text NOT NULL default '', - words text NOT NULL default '' -); - -INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard) - SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp; - -CREATE INDEX ix_contacts_user_id ON contacts(user_id, email); -DROP TABLE contacts_tmp; - -DELETE FROM messages; -DELETE FROM cache; -CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id); diff --git a/debian/sql/sqlite/0.7-1 b/debian/sql/sqlite/0.7-1 deleted file mode 100644 index 85f63a8..0000000 --- a/debian/sql/sqlite/0.7-1 +++ /dev/null @@ -1,67 +0,0 @@ --- Updates from version 0.6 - -CREATE TABLE dictionary ( - user_id integer DEFAULT NULL, - "language" varchar(5) NOT NULL, - data text NOT NULL -); - -CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language"); - -CREATE TABLE searches ( - search_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL DEFAULT '0', - "type" smallint NOT NULL DEFAULT '0', - name varchar(128) NOT NULL, - data text NOT NULL -); - -CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name); - -DROP TABLE messages; - -CREATE TABLE cache_index ( - user_id integer NOT NULL, - mailbox varchar(255) NOT NULL, - changed datetime NOT NULL default '0000-00-00 00:00:00', - valid smallint NOT NULL DEFAULT '0', - data text NOT NULL, - PRIMARY KEY (user_id, mailbox) -); - -CREATE INDEX ix_cache_index_changed ON cache_index (changed); - -CREATE TABLE cache_thread ( - user_id integer NOT NULL, - mailbox varchar(255) NOT NULL, - changed datetime NOT NULL default '0000-00-00 00:00:00', - data text NOT NULL, - PRIMARY KEY (user_id, mailbox) -); - -CREATE INDEX ix_cache_thread_changed ON cache_thread (changed); - -CREATE TABLE cache_messages ( - user_id integer NOT NULL, - mailbox varchar(255) NOT NULL, - uid integer NOT NULL, - changed datetime NOT NULL default '0000-00-00 00:00:00', - data text NOT NULL, - flags integer NOT NULL DEFAULT '0', - PRIMARY KEY (user_id, mailbox, uid) -); - -CREATE INDEX ix_cache_messages_changed ON cache_messages (changed); - --- Updates from version 0.7-beta - -DROP TABLE session; -CREATE TABLE session ( - sess_id varchar(128) NOT NULL PRIMARY KEY, - created datetime NOT NULL default '0000-00-00 00:00:00', - changed datetime NOT NULL default '0000-00-00 00:00:00', - ip varchar(40) NOT NULL default '', - vars text NOT NULL -); - -CREATE INDEX ix_session_changed ON session (changed); diff --git a/debian/sql/sqlite/0.7.1-1 b/debian/sql/sqlite/0.7.1-1 deleted file mode 100644 index 9d92276..0000000 --- a/debian/sql/sqlite/0.7.1-1 +++ /dev/null @@ -1,38 +0,0 @@ --- Updates from version 0.7 - -CREATE TABLE contacts_tmp ( - contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL, - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '', - email text NOT NULL default '', - firstname varchar(128) NOT NULL default '', - surname varchar(128) NOT NULL default '', - vcard text NOT NULL default '', - words text NOT NULL default '' -); - -INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words) - SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts; - -DROP TABLE contacts; - -CREATE TABLE contacts ( - contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL, - changed datetime NOT NULL default '0000-00-00 00:00:00', - del tinyint NOT NULL default '0', - name varchar(128) NOT NULL default '', - email text NOT NULL default '', - firstname varchar(128) NOT NULL default '', - surname varchar(128) NOT NULL default '', - vcard text NOT NULL default '', - words text NOT NULL default '' -); - -INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words) - SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts_tmp; - -CREATE INDEX ix_contacts_user_id ON contacts(user_id, del); -DROP TABLE contacts_tmp; -- 2.39.2