From 20b142ecae196e1d636f1cdd9510db0cd370fc96a3586c9b40280a3718c1757d Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 10 Nov 2012 21:33:37 +0000
Subject: [PATCH 1/2] Accepting request 140823 from home:wrosenauer

OBS-URL: https://build.opensuse.org/request/show/140823
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=44
---
 roundcubemail-0.8.2.tar.gz     |  3 ---
 roundcubemail-0.8.3.tar.gz     |  3 +++
 roundcubemail-config-dir.patch | 14 ++++----------
 roundcubemail.changes          |  9 +++++++++
 roundcubemail.spec             |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 roundcubemail-0.8.2.tar.gz
 create mode 100644 roundcubemail-0.8.3.tar.gz

diff --git a/roundcubemail-0.8.2.tar.gz b/roundcubemail-0.8.2.tar.gz
deleted file mode 100644
index 1bdc574..0000000
--- a/roundcubemail-0.8.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43d2d7c86171eb317af7d165803aab76f01de5ad06564cbeb77eb07147f72a61
-size 3722844
diff --git a/roundcubemail-0.8.3.tar.gz b/roundcubemail-0.8.3.tar.gz
new file mode 100644
index 0000000..8bf497c
--- /dev/null
+++ b/roundcubemail-0.8.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27f9583b92eebaa7cbb70088443cdc3f27ebaea966c6ddac7aadc7948285e503
+size 3723551
diff --git a/roundcubemail-config-dir.patch b/roundcubemail-config-dir.patch
index 40c80db..6f7305d 100644
--- a/roundcubemail-config-dir.patch
+++ b/roundcubemail-config-dir.patch
@@ -1,5 +1,5 @@
 diff --git a/installer/index.php b/installer/index.php
-index bb1b1ba..572ef80 100644
+index 4c94fea..204cdf4 100644
 --- a/installer/index.php
 +++ b/installer/index.php
 @@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
@@ -8,20 +8,14 @@ index bb1b1ba..572ef80 100644
  define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
 -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
 +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ define('RCMAIL_CHARSET', 'UTF-8');
  
  $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
- $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
 diff --git a/program/include/iniset.php b/program/include/iniset.php
-index f223b0d..630001f 100644
+index 3809479..b3e0ded 100644
 --- a/program/include/iniset.php
 +++ b/program/include/iniset.php
-@@ -46,15 +46,12 @@ define('RCMAIL_VERSION', '0.8.1');
- define('RCMAIL_CHARSET', 'UTF-8');
- define('JS_OBJECT_NAME', 'rcmail');
- define('RCMAIL_START', microtime(true));
-+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
- 
- if (!defined('INSTALL_PATH')) {
+@@ -51,10 +51,6 @@ if (!defined('INSTALL_PATH')) {
      define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
  }
  
diff --git a/roundcubemail.changes b/roundcubemail.changes
index a516a82..9934d81 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov 10 21:12:16 UTC 2012 - wr@rosenauer.org
+
+- Update to version 0.8.3
+  * This update adds small bug fixes and improvements to the 0.8
+    stable series. It also fixes a possible, although unintended,
+    DoS to the webserver running Roundcube. See the included
+    CHANGELOG file for details.
+
 -------------------------------------------------------------------
 Mon Oct 29 07:00:08 UTC 2012 - wr@rosenauer.org
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index ce9d531..de1a7b3 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -21,7 +21,7 @@ Summary:        A modern browser-based multilingual IMAP client
 License:        GPL-3.0+ and GPL-2.0 and BSD-3-Clause
 Group:          Productivity/Networking/Email/Clients
 Url:            http://www.roundcube.net/
-Version:        0.8.2
+Version:        0.8.3
 Release:        0
 BuildRequires:  apache2-devel
 BuildRequires:  fdupes

From 92c4b48fd2248216c85d7bc0e03ed7c25af427bd551b46ddb7b816692d49a465 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 10 Nov 2012 22:35:58 +0000
Subject: [PATCH 2/2] Accepting request 140828 from home:wrosenauer

last submit broke roundcube, this fixes it; notice: I had to manually remove my browser cookies after update to 0.8.3 before I was able to login again :-(

OBS-URL: https://build.opensuse.org/request/show/140828
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=45
---
 roundcubemail-config-dir.patch | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/roundcubemail-config-dir.patch b/roundcubemail-config-dir.patch
index 6f7305d..e520607 100644
--- a/roundcubemail-config-dir.patch
+++ b/roundcubemail-config-dir.patch
@@ -12,17 +12,15 @@ index 4c94fea..204cdf4 100644
  
  $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
 diff --git a/program/include/iniset.php b/program/include/iniset.php
-index 3809479..b3e0ded 100644
+index 3809479..5004448 100644
 --- a/program/include/iniset.php
 +++ b/program/include/iniset.php
-@@ -51,10 +51,6 @@ if (!defined('INSTALL_PATH')) {
-     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
+@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) {
  }
  
--if (!defined('RCMAIL_CONFIG_DIR')) {
+ if (!defined('RCMAIL_CONFIG_DIR')) {
 -    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
--}
--
++    define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ }
+ 
  // make sure path_separator is defined
- if (!defined('PATH_SEPARATOR')) {
-     define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');