From 7f992eac3d283f29ee42fe955f01b8d4f8fbd628 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 8 Nov 2017 19:25:22 +0100
Subject: [PATCH] Bump version + add CVE ID

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

diff --git a/CHANGELOG b/CHANGELOG
index b693d01c2..f660b8602 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,9 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
-- Fix file disclosure vulnerability caused by insuficient input validation in relation to attachment plugins (#6026)
+RELEASE 1.1.10
+--------------
+- Fix file disclosure vulnerability caused by insufficient input validation [CVE-2017-16651] (#6026)
 
 RELEASE 1.1.9
 -------------
diff --git a/index.php b/index.php
index 021e36930..016df22b4 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.1.9                                                           |
+ | Version 1.1.10                                                          |
  |                                                                         |
  | Copyright (C) 2005-2016, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/installer/index.php b/installer/index.php
index f367b35e6..683224c82 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,7 +3,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 1.1.9                                                           |
+ | Version 1.1.10                                                          |
  |                                                                         |
  | Copyright (C) 2009-2016, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 23e8c422f..5cd46785e 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,7 +21,7 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '1.1.9');
+define('RCMAIL_VERSION', '1.1.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 dcc53017e..9ffb205b4 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -54,7 +54,7 @@ foreach ($config as $optname => $optval) {
 }
 
 // framework constants
-define('RCUBE_VERSION', '1.1.9');
+define('RCUBE_VERSION', '1.1.10');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {