X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fdbconfig-common_support.patch;h=fb61443254447eb258a738622776f3f88eaedbc4;hb=5073df0f02f556142911afec7b1bfa193eb0de7a;hp=61938fa841b027cb52fb7fc58f8320c1fdd7b95b;hpb=082b0b4208b3295cb86375499339474bff2be54c;p=roundcube.git

diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch
index 61938fa..fb61443 100644
--- a/debian/patches/dbconfig-common_support.patch
+++ b/debian/patches/dbconfig-common_support.patch
@@ -1,22 +1,23 @@
 The default db.inc.php is modified to adapt it to the use of dbconfig-common package.
 
---- roundcube_0.1~beta2.2/config/db.inc.php.dist        2006-03-20 23:08:51.000000000 +0100
-+++ roundcube_0.1~beta2.2/config/db.inc.php.dist  2007-03-13 14:33:38.000000000 +0100
+Index: roundcube/config/db.inc.php.dist
+===================================================================
+--- roundcube.orig/config/db.inc.php.dist	2012-09-29 11:31:38.219918435 +0200
++++ roundcube/config/db.inc.php.dist	2012-09-29 11:31:42.800010013 +0200
 @@ -14,15 +14,20 @@
-
+ 
  $rcmail_config = array();
-
+ 
 -// PEAR database DSN for read/write operations
 -// format is db_provider://user:password@host/database 
 -// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
--// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql
--
+-// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql or sqlsrv
++/* Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database ! */
+ 
 -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
 -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
 -// Warning: for SQLite use absolute path in DSN:
 -// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646';
-+/* Do not set db_dsnw here, use dpkg-reconfigure roundcube to configure database ! */
-+
 +include_once("/etc/roundcube/debian-db.php");
 +
 +switch ($dbtype) {
@@ -29,6 +30,6 @@ The default db.inc.php is modified to adapt it to the use of dbconfig-common pac
 +   $rcmail_config['db_dsnw'] = "$dbtype://$dbuser:$dbpass@$dbserver$dbport/$dbname";
 +   break;
 + }
-
+ 
  // PEAR database DSN for read only operations (if empty write database will be used)
  // useful for database replication