diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-05-14 09:22:19 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-05-14 09:22:19 +0000 |
| commit | 73222d9177e25643e5110188a1c5c3e7311eb690 (patch) | |
| tree | 4826546bc7a0ca3fd5b53b1bf56197660adb306f | |
| parent | mail-client/roundcube: json is now required in php (diff) | |
| download | pva-73222d9177e25643e5110188a1c5c3e7311eb690.tar.gz pva-73222d9177e25643e5110188a1c5c3e7311eb690.tar.bz2 pva-73222d9177e25643e5110188a1c5c3e7311eb690.zip | |
mail-client/roundcube: fix installer, fix bug #292692.
svn path=/; revision=419
| -rw-r--r-- | mail-client/roundcube/Manifest | 3 | ||||
| -rw-r--r-- | mail-client/roundcube/files/roundcube-0.4_beta-upgrade.patch | 14 | ||||
| -rw-r--r-- | mail-client/roundcube/roundcube-0.4_beta.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest index a3efaed..c69074c 100644 --- a/mail-client/roundcube/Manifest +++ b/mail-client/roundcube/Manifest @@ -1,5 +1,6 @@ AUX postinstall-en.txt 2513 RMD160 c2a04efcdd4007642221797a10877c2fc57ad874 SHA1 8bc888b2944694bbbadeddfe6f193c3a8a995a87 SHA256 5c1fa9d43f29158521188aae417654f968fb41662c46721b8183728df37eb4c4 +AUX roundcube-0.4_beta-upgrade.patch 649 RMD160 66ae4905a790d1e351ef354465d6cd1840299de5 SHA1 e61ee56a7d98d24e0520a8e95cefb960da8fd577 SHA256 9a30ae8717ce5fb2b7d55942a2086044f55103e7a298b860a71635f2474ba65a DIST roundcubemail-0.4-beta.tar.gz 2033675 RMD160 1bca68c3a560ea7dc9aba730b95a4cd57d306a4e SHA1 438130363d834b50aacaace95eb86c4ed724aa7d SHA256 cf9cbaccd09cb164e85a889d929f07fe37b7d5d10a3cad021e0d9ffb5b728941 -EBUILD roundcube-0.4_beta.ebuild 2026 RMD160 c4e5a602247af5e0599b4735cb06600259f75042 SHA1 9cdb55c42590bd7daa7020f184264e3ebe3001ae SHA256 511117de9519e7ed607777119f6709ef4af017f087c414a5b28dd2384bf74913 +EBUILD roundcube-0.4_beta.ebuild 2095 RMD160 6aea3f83ab6e0f37e7b97e57628c19ba42cc6b14 SHA1 1a2d0e7f2284ffac016f949329ff32b614a6f519 SHA256 2aec4bf9f3ece7e646ad2d27df74e45d5b3e74de7d8ef0d287500d49cbc76914 MISC ChangeLog 2839 RMD160 c8ddaa07cdc3f10dbe8c90830885a43b2579ed60 SHA1 3ec4e3ebd8aa9bff1f319ac6d90fd0f5cef03e87 SHA256 3d8f5ececdd3c0d1fb962d4af1cf61e2491daf3ce1ebeb072018c2e169b1fe02 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 diff --git a/mail-client/roundcube/files/roundcube-0.4_beta-upgrade.patch b/mail-client/roundcube/files/roundcube-0.4_beta-upgrade.patch new file mode 100644 index 0000000..c4c066d --- /dev/null +++ b/mail-client/roundcube/files/roundcube-0.4_beta-upgrade.patch @@ -0,0 +1,14 @@ +diff --git a/installer/rcube_install.php b/installer/rcube_install.php +index ae568d2..d42f816 100644 +--- a/installer/rcube_install.php ++++ b/installer/rcube_install.php +@@ -354,7 +354,8 @@ class rcube_install + // check list of tables + $existing_tables = $DB->list_tables(); + foreach ($db_schema as $table => $cols) { +- if (!in_array($this->config['db_table_'.$table], $existing_tables)) ++ $table = !empty($this->config['db_table_'.$table]) ? $this->config['db_table_'.$table] : $table; ++ if (!in_array($table, $existing_tables)) + $errors[] = "Missing table ".$table; + + // TODO: check cols and indices diff --git a/mail-client/roundcube/roundcube-0.4_beta.ebuild b/mail-client/roundcube/roundcube-0.4_beta.ebuild index dec7c9e..59f2e61 100644 --- a/mail-client/roundcube/roundcube-0.4_beta.ebuild +++ b/mail-client/roundcube/roundcube-0.4_beta.ebuild @@ -49,8 +49,9 @@ pkg_setup() { } src_prepare() { - mv config/db.inc.php{.dist,} - mv config/main.inc.php{.dist,} + mv config/db.inc.php{.dist,} || die + mv config/main.inc.php{.dist,} || die + epatch "${FILESDIR}/roundcube-0.4_beta-upgrade.patch" } src_install () { |