From 1a7b603875bb397ebd2b2e69d5be0b59473f06f4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 28 Apr 2020 21:57:22 +0200
Subject: [PATCH] Bump version to 1.2.10

---
 CHANGELOG                           | 6 ++++++
 index.php                           | 2 +-
 installer/index.php                 | 2 +-
 program/include/iniset.php          | 2 +-
 program/lib/Roundcube/bootstrap.php | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5040e089d..cb7dccaba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,13 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 1.2.10
+--------------
 - Fix missing message-htmlpart1 class breaking inline CSS (#6493)
+- Security: Fix XSS issue in handling of CDATA in HTML messages
+- Security: Fix remote code execution via crafted 'im_convert_path' or 'im_identify_path' settings
+- Security: Fix local file inclusion (and code execution) via crafted 'plugins' option
+- Security: Fix CSRF bypass that could be used to log out an authenticated user (#7302)
 
 RELEASE 1.2.9
 -------------
diff --git a/index.php b/index.php
index 80c3fbda7..5a605783e 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /**
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.2.9                                                           |
+ | Version 1.2.10                                                          |
  |                                                                         |
  | Copyright (C) 2005-2017, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/installer/index.php b/installer/index.php
index 56711d0b9..36aee5c1d 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,7 +3,7 @@
 /**
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 1.2.9                                                           |
+ | Version 1.2.10                                                          |
  |                                                                         |
  | Copyright (C) 2009-2017, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 2b938c0a8..89b9452a7 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,7 +21,7 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '1.2.9');
+define('RCMAIL_VERSION', '1.2.10');
 define('RCMAIL_START', microtime(true));
 
 if (!defined('INSTALL_PATH')) {
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index f238f97a2..321b75d17 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -55,7 +55,7 @@ foreach ($config as $optname => $optval) {
 }
 
 // framework constants
-define('RCUBE_VERSION', '1.2.9');
+define('RCUBE_VERSION', '1.2.10');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {