From f2ff464002e91b1599d7694ce2eaef5b30e8b67c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 23 Dec 2015 09:07:34 +0100
Subject: [PATCH] Bump version to 1.1.4; update Changelog

---
 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 3f7cbd961..4f4980f34 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 1.1.4
+-------------
 - Add workaround for https://bugs.php.net/bug.php?id=70757 (#1490582)
 - Fix duplicate messages in list and wrong count after delete (#1490572)
 - Fix so Installer requires PHP5
@@ -18,7 +20,7 @@ CHANGELOG Roundcube Webmail
 - Fix regression in displaying contents of message/rfc822 parts (#1490606)
 - Fix handling of message/rfc822 attachments on replies and forwards (#1490607)
 - Fix PDF support detection in Firefox > 19 (#1490610)
-- Fix path traversal vulnerability in setting a skin (#1490620)
+- Fix path traversal vulnerability (CWE-22) in setting a skin (#1490620)
 - Fix so drag-n-drop of text (e.g. recipient addresses) on compose page actually works (#1490619)
 
 RELEASE 1.1.3
diff --git a/index.php b/index.php
index 30eefafe1..1d40b8b3b 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.1.3                                                           |
+ | Version 1.1.4                                                           |
  |                                                                         |
  | Copyright (C) 2005-2015, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/installer/index.php b/installer/index.php
index c655c0251..c7dc4cfd1 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,7 +3,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 1.1.3                                                           |
+ | Version 1.1.4                                                           |
  |                                                                         |
  | Copyright (C) 2009-2015, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 37806b79c..c7dedf90d 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,7 +21,7 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '1.1.3');
+define('RCMAIL_VERSION', '1.1.4');
 define('RCMAIL_START', microtime(true));
 
 if (!defined('INSTALL_PATH')) {
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index f9c96c4dc..17139ca76 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.3');
+define('RCUBE_VERSION', '1.1.4');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {