Update roundcube to 1.1.5, including security fix.

RELEASE 1.1.5
-------------
- Plugin API: Add html2text hook
- Plugin API: Added addressbook_export hook
- Fix missing emoticons on html-to-text conversion
- Fix random "access to this resource is secured against CSRF" message at logout (#4956)
- Fix missing language name in "Add to Dictionary" request in HTML mode (#4951)
- Enable use of TLSv1.1 and TLSv1.2 for IMAP (#4955)
- Fix XSS issue in SVG images handling (#4949)
- Fix (again) security issue in DBMail driver of password plugin [CVE-2015-2181] (#4958)
- Fix bug where Archive/Junk buttons were not active after page jump with select=all mode (#4961)
- Fix bug in long recipients list parsing for cases where recipient name contained @-char (#4964)
- Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#4966)
- Hide DSN option in Preferences when smtp_server is not used (#4967)
- Protect download urls against CSRF using unique request tokens (#4957)
- newmail_notifier: Refactor desktop notifications
- Fix so contactlist_fields option can be set via config file
- Fix so SPECIAL-USE assignments are forced only until user sets special folders (#4782)
- Fix performance in reverting order of THREAD result
- Fix converting mail addresses with @www. into mailto links (#5197)

4 files changed, 13 insertions, 84 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 5b02a2a824c..07eb6e9458d 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2016/03/16 13:36:52 taca Exp $
+# $NetBSD: Makefile,v 1.81 2016/05/26 03:20:37 taca Exp $
 
-DISTNAME=	roundcubemail-1.1.4
+DISTNAME=	roundcubemail-1.1.5
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 87bb0a2734b..d9170493a73 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2015/12/26 14:24:48 taca Exp $
+@comment $NetBSD: PLIST,v 1.40 2016/05/26 03:20:37 taca Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README.md
@@ -100,7 +100,9 @@ share/roundcube/bin/cssshrink.sh
 share/roundcube/bin/decrypt.sh
 share/roundcube/bin/deluser.sh
 share/roundcube/bin/dumpschema.sh
+share/roundcube/bin/exportgettext.sh
 share/roundcube/bin/gc.sh
+share/roundcube/bin/importgettext.sh
 share/roundcube/bin/indexcontacts.sh
 share/roundcube/bin/installto.sh
 share/roundcube/bin/jsshrink.sh
@@ -108,6 +110,8 @@ share/roundcube/bin/makedoc.sh
 share/roundcube/bin/moduserprefs.sh
 share/roundcube/bin/msgexport.sh
 share/roundcube/bin/msgimport.sh
+share/roundcube/bin/package2composer.sh
+share/roundcube/bin/transifexpull.sh
 share/roundcube/bin/update.sh
 share/roundcube/bin/updatecss.sh
 share/roundcube/bin/updatedb.sh
@@ -125,7 +129,6 @@ share/roundcube/installer/index.php
 share/roundcube/installer/styles.css
 share/roundcube/installer/test.php
 share/roundcube/plugins/acl/acl.js
-share/roundcube/plugins/acl/acl.min.js
 share/roundcube/plugins/acl/acl.php
 share/roundcube/plugins/acl/composer.json
 share/roundcube/plugins/acl/localization/ar_SA.inc
@@ -195,12 +198,10 @@ share/roundcube/plugins/acl/localization/vi_VN.inc
 share/roundcube/plugins/acl/localization/zh_CN.inc
 share/roundcube/plugins/acl/localization/zh_TW.inc
 share/roundcube/plugins/acl/skins/classic/acl.css
-share/roundcube/plugins/acl/skins/classic/acl.min.css
 share/roundcube/plugins/acl/skins/classic/images/enabled.png
 share/roundcube/plugins/acl/skins/classic/images/partial.png
 share/roundcube/plugins/acl/skins/classic/templates/table.html
 share/roundcube/plugins/acl/skins/larry/acl.css
-share/roundcube/plugins/acl/skins/larry/acl.min.css
 share/roundcube/plugins/acl/skins/larry/images/enabled.png
 share/roundcube/plugins/acl/skins/larry/images/partial.png
 share/roundcube/plugins/acl/skins/larry/templates/table.html
@@ -209,7 +210,6 @@ share/roundcube/plugins/additional_message_headers/additional_message_headers.ph
 share/roundcube/plugins/additional_message_headers/composer.json
 share/roundcube/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
 share/roundcube/plugins/archive/archive.js
-share/roundcube/plugins/archive/archive.min.js
 share/roundcube/plugins/archive/archive.php
 share/roundcube/plugins/archive/composer.json
 share/roundcube/plugins/archive/localization/ar_SA.inc
@@ -279,14 +279,12 @@ share/roundcube/plugins/archive/localization/vi_VN.inc
 share/roundcube/plugins/archive/localization/zh_CN.inc
 share/roundcube/plugins/archive/localization/zh_TW.inc
 share/roundcube/plugins/archive/skins/classic/archive.css
-share/roundcube/plugins/archive/skins/classic/archive.min.css
 share/roundcube/plugins/archive/skins/classic/archive_act.png
 share/roundcube/plugins/archive/skins/classic/archive_pas.png
 share/roundcube/plugins/archive/skins/classic/foldericon.png
 share/roundcube/plugins/archive/skins/larry/.gitignore
 share/roundcube/plugins/archive/tests/Archive.php
 share/roundcube/plugins/attachment_reminder/attachment_reminder.js
-share/roundcube/plugins/attachment_reminder/attachment_reminder.min.js
 share/roundcube/plugins/attachment_reminder/attachment_reminder.php
 share/roundcube/plugins/attachment_reminder/composer.json
 share/roundcube/plugins/attachment_reminder/localization/ar_SA.inc
@@ -366,7 +364,6 @@ share/roundcube/plugins/emoticons/tests/Emoticons.php
 share/roundcube/plugins/enigma/README
 share/roundcube/plugins/enigma/config.inc.php.dist
 share/roundcube/plugins/enigma/enigma.js
-share/roundcube/plugins/enigma/enigma.min.js
 share/roundcube/plugins/enigma/enigma.php
 share/roundcube/plugins/enigma/home/.htaccess
 share/roundcube/plugins/enigma/lib/enigma_driver.php
@@ -383,7 +380,6 @@ share/roundcube/plugins/enigma/localization/en_US.inc
 share/roundcube/plugins/enigma/localization/ja_JP.inc
 share/roundcube/plugins/enigma/localization/ru_RU.inc
 share/roundcube/plugins/enigma/skins/classic/enigma.css
-share/roundcube/plugins/enigma/skins/classic/enigma.min.css
 share/roundcube/plugins/enigma/skins/classic/enigma.png
 share/roundcube/plugins/enigma/skins/classic/enigma_error.png
 share/roundcube/plugins/enigma/skins/classic/key.png
@@ -403,7 +399,6 @@ share/roundcube/plugins/filesystem_attachments/tests/FilesystemAttachments.php
 share/roundcube/plugins/help/composer.json
 share/roundcube/plugins/help/content/license.html
 share/roundcube/plugins/help/help.js
-share/roundcube/plugins/help/help.min.js
 share/roundcube/plugins/help/help.php
 share/roundcube/plugins/help/localization/ar_SA.inc
 share/roundcube/plugins/help/localization/ast.inc
@@ -474,17 +469,14 @@ share/roundcube/plugins/help/localization/zh_CN.inc
 share/roundcube/plugins/help/localization/zh_TW.inc
 share/roundcube/plugins/help/skins/classic/help.css
 share/roundcube/plugins/help/skins/classic/help.gif
-share/roundcube/plugins/help/skins/classic/help.min.css
 share/roundcube/plugins/help/skins/classic/templates/help.html
 share/roundcube/plugins/help/skins/larry/help.css
-share/roundcube/plugins/help/skins/larry/help.min.css
 share/roundcube/plugins/help/skins/larry/help.png
 share/roundcube/plugins/help/skins/larry/icons.psd
 share/roundcube/plugins/help/skins/larry/templates/help.html
 share/roundcube/plugins/help/tests/Help.php
 share/roundcube/plugins/hide_blockquote/composer.json
 share/roundcube/plugins/hide_blockquote/hide_blockquote.js
-share/roundcube/plugins/hide_blockquote/hide_blockquote.min.js
 share/roundcube/plugins/hide_blockquote/hide_blockquote.php
 share/roundcube/plugins/hide_blockquote/localization/ar_SA.inc
 share/roundcube/plugins/hide_blockquote/localization/ast.inc
@@ -549,7 +541,6 @@ share/roundcube/plugins/hide_blockquote/localization/vi_VN.inc
 share/roundcube/plugins/hide_blockquote/localization/zh_CN.inc
 share/roundcube/plugins/hide_blockquote/localization/zh_TW.inc
 share/roundcube/plugins/hide_blockquote/skins/larry/style.css
-share/roundcube/plugins/hide_blockquote/skins/larry/style.min.css
 share/roundcube/plugins/hide_blockquote/tests/HideBlockquote.php
 share/roundcube/plugins/http_authentication/composer.json
 share/roundcube/plugins/http_authentication/http_authentication.php
@@ -687,13 +678,10 @@ share/roundcube/plugins/legacy_browser/js/iehacks.js
 share/roundcube/plugins/legacy_browser/js/jquery.min.js
 share/roundcube/plugins/legacy_browser/legacy_browser.php
 share/roundcube/plugins/legacy_browser/skins/classic/iehacks.css
-share/roundcube/plugins/legacy_browser/skins/classic/iehacks.min.css
 share/roundcube/plugins/legacy_browser/skins/classic/images/abook_toolbar.gif
 share/roundcube/plugins/legacy_browser/skins/classic/images/mail_toolbar.gif
 share/roundcube/plugins/legacy_browser/skins/larry/ie7hacks.css
-share/roundcube/plugins/legacy_browser/skins/larry/ie7hacks.min.css
 share/roundcube/plugins/legacy_browser/skins/larry/iehacks.css
-share/roundcube/plugins/legacy_browser/skins/larry/iehacks.min.css
 share/roundcube/plugins/legacy_browser/skins/larry/images/buttons.gif
 share/roundcube/plugins/legacy_browser/tests/LegacyBrowser.php
 share/roundcube/plugins/managesieve/Changelog
@@ -768,7 +756,6 @@ share/roundcube/plugins/managesieve/localization/vi_VN.inc
 share/roundcube/plugins/managesieve/localization/zh_CN.inc
 share/roundcube/plugins/managesieve/localization/zh_TW.inc
 share/roundcube/plugins/managesieve/managesieve.js
-share/roundcube/plugins/managesieve/managesieve.min.js
 share/roundcube/plugins/managesieve/managesieve.php
 share/roundcube/plugins/managesieve/skins/classic/images/add.png
 share/roundcube/plugins/managesieve/skins/classic/images/del.png
@@ -777,9 +764,7 @@ share/roundcube/plugins/managesieve/skins/classic/images/erase.png
 share/roundcube/plugins/managesieve/skins/classic/images/filter.png
 share/roundcube/plugins/managesieve/skins/classic/images/up_small.gif
 share/roundcube/plugins/managesieve/skins/classic/managesieve.css
-share/roundcube/plugins/managesieve/skins/classic/managesieve.min.css
 share/roundcube/plugins/managesieve/skins/classic/managesieve_mail.css
-share/roundcube/plugins/managesieve/skins/classic/managesieve_mail.min.css
 share/roundcube/plugins/managesieve/skins/classic/templates/filteredit.html
 share/roundcube/plugins/managesieve/skins/classic/templates/managesieve.html
 share/roundcube/plugins/managesieve/skins/classic/templates/setedit.html
@@ -791,9 +776,7 @@ share/roundcube/plugins/managesieve/skins/larry/images/erase.png
 share/roundcube/plugins/managesieve/skins/larry/images/up_small.gif
 share/roundcube/plugins/managesieve/skins/larry/images/vacation_icons.png
 share/roundcube/plugins/managesieve/skins/larry/managesieve.css
-share/roundcube/plugins/managesieve/skins/larry/managesieve.min.css
 share/roundcube/plugins/managesieve/skins/larry/managesieve_mail.css
-share/roundcube/plugins/managesieve/skins/larry/managesieve_mail.min.css
 share/roundcube/plugins/managesieve/skins/larry/templates/filteredit.html
 share/roundcube/plugins/managesieve/skins/larry/templates/managesieve.html
 share/roundcube/plugins/managesieve/skins/larry/templates/setedit.html
@@ -888,12 +871,10 @@ share/roundcube/plugins/markasjunk/localization/vi_VN.inc
 share/roundcube/plugins/markasjunk/localization/zh_CN.inc
 share/roundcube/plugins/markasjunk/localization/zh_TW.inc
 share/roundcube/plugins/markasjunk/markasjunk.js
-share/roundcube/plugins/markasjunk/markasjunk.min.js
 share/roundcube/plugins/markasjunk/markasjunk.php
 share/roundcube/plugins/markasjunk/skins/classic/junk_act.png
 share/roundcube/plugins/markasjunk/skins/classic/junk_pas.png
 share/roundcube/plugins/markasjunk/skins/classic/markasjunk.css
-share/roundcube/plugins/markasjunk/skins/classic/markasjunk.min.css
 share/roundcube/plugins/markasjunk/skins/larry/.gitignore
 share/roundcube/plugins/markasjunk/tests/Markasjunk.php
 share/roundcube/plugins/new_user_dialog/composer.json
@@ -963,7 +944,6 @@ share/roundcube/plugins/new_user_dialog/localization/zh_CN.inc
 share/roundcube/plugins/new_user_dialog/localization/zh_TW.inc
 share/roundcube/plugins/new_user_dialog/new_user_dialog.php
 share/roundcube/plugins/new_user_dialog/newuserdialog.css
-share/roundcube/plugins/new_user_dialog/newuserdialog.min.css
 share/roundcube/plugins/new_user_dialog/tests/NewUserDialog.php
 share/roundcube/plugins/new_user_identity/composer.json
 share/roundcube/plugins/new_user_identity/config.inc.php.dist
@@ -1040,7 +1020,6 @@ share/roundcube/plugins/newmail_notifier/localization/zh_CN.inc
 share/roundcube/plugins/newmail_notifier/localization/zh_TW.inc
 share/roundcube/plugins/newmail_notifier/mail.png
 share/roundcube/plugins/newmail_notifier/newmail_notifier.js
-share/roundcube/plugins/newmail_notifier/newmail_notifier.min.js
 share/roundcube/plugins/newmail_notifier/newmail_notifier.php
 share/roundcube/plugins/newmail_notifier/overlay.ico
 share/roundcube/plugins/newmail_notifier/sound.mp3
@@ -1143,7 +1122,6 @@ share/roundcube/plugins/password/localization/vi_VN.inc
 share/roundcube/plugins/password/localization/zh_CN.inc
 share/roundcube/plugins/password/localization/zh_TW.inc
 share/roundcube/plugins/password/password.js
-share/roundcube/plugins/password/password.min.js
 share/roundcube/plugins/password/password.php
 share/roundcube/plugins/password/tests/Password.php
 share/roundcube/plugins/redundant_attachments/composer.json
@@ -1291,7 +1269,6 @@ share/roundcube/plugins/userinfo/localization/zh_CN.inc
 share/roundcube/plugins/userinfo/localization/zh_TW.inc
 share/roundcube/plugins/userinfo/tests/Userinfo.php
 share/roundcube/plugins/userinfo/userinfo.js
-share/roundcube/plugins/userinfo/userinfo.min.js
 share/roundcube/plugins/userinfo/userinfo.php
 share/roundcube/plugins/vcard_attachments/composer.json
 share/roundcube/plugins/vcard_attachments/localization/ar.inc
@@ -1359,17 +1336,14 @@ share/roundcube/plugins/vcard_attachments/localization/vi_VN.inc
 share/roundcube/plugins/vcard_attachments/localization/zh_CN.inc
 share/roundcube/plugins/vcard_attachments/localization/zh_TW.inc
 share/roundcube/plugins/vcard_attachments/skins/classic/style.css
-share/roundcube/plugins/vcard_attachments/skins/classic/style.min.css
 share/roundcube/plugins/vcard_attachments/skins/classic/vcard.png
 share/roundcube/plugins/vcard_attachments/skins/classic/vcard_add_contact.png
 share/roundcube/plugins/vcard_attachments/skins/larry/style.css
-share/roundcube/plugins/vcard_attachments/skins/larry/style.min.css
 share/roundcube/plugins/vcard_attachments/skins/larry/vcard.png
 share/roundcube/plugins/vcard_attachments/skins/larry/vcard_add_contact.png
 share/roundcube/plugins/vcard_attachments/tests/VcardAttachments.php
 share/roundcube/plugins/vcard_attachments/vcard_attachments.php
 share/roundcube/plugins/vcard_attachments/vcardattach.js
-share/roundcube/plugins/vcard_attachments/vcardattach.min.js
 share/roundcube/plugins/virtuser_file/composer.json
 share/roundcube/plugins/virtuser_file/tests/VirtuserFile.php
 share/roundcube/plugins/virtuser_file/virtuser_file.php
@@ -1445,12 +1419,9 @@ share/roundcube/plugins/zipdownload/localization/zh_CN.inc
 share/roundcube/plugins/zipdownload/localization/zh_TW.inc
 share/roundcube/plugins/zipdownload/skins/classic/zip.png
 share/roundcube/plugins/zipdownload/skins/classic/zipdownload.css
-share/roundcube/plugins/zipdownload/skins/classic/zipdownload.min.css
 share/roundcube/plugins/zipdownload/skins/larry/zipdownload.css
-share/roundcube/plugins/zipdownload/skins/larry/zipdownload.min.css
 share/roundcube/plugins/zipdownload/tests/Zipdownload.php
 share/roundcube/plugins/zipdownload/zipdownload.js
-share/roundcube/plugins/zipdownload/zipdownload.min.js
 share/roundcube/plugins/zipdownload/zipdownload.php
 share/roundcube/program/include/bc.php
 share/roundcube/program/include/clisetup.php
@@ -1464,17 +1435,12 @@ share/roundcube/program/include/rcmail_output_html.php
 share/roundcube/program/include/rcmail_output_json.php
 share/roundcube/program/include/rcmail_string_replacer.php
 share/roundcube/program/js/app.js
-share/roundcube/program/js/app.min.js
 share/roundcube/program/js/common.js
-share/roundcube/program/js/common.min.js
 share/roundcube/program/js/editor.js
-share/roundcube/program/js/editor.min.js
 share/roundcube/program/js/googiespell.js
-share/roundcube/program/js/googiespell.min.js
 share/roundcube/program/js/jquery.min.js
 share/roundcube/program/js/jstz.min.js
 share/roundcube/program/js/list.js
-share/roundcube/program/js/list.min.js
 share/roundcube/program/js/tinymce/langs/ar.js
 share/roundcube/program/js/tinymce/langs/ar_SA.js
 share/roundcube/program/js/tinymce/langs/az.js
@@ -1627,7 +1593,6 @@ share/roundcube/program/js/tinymce/skins/lightgray/skin.min.css
 share/roundcube/program/js/tinymce/themes/modern/theme.min.js
 share/roundcube/program/js/tinymce/tinymce.min.js
 share/roundcube/program/js/treelist.js
-share/roundcube/program/js/treelist.min.js
 share/roundcube/program/lib/Roundcube/README.md
 share/roundcube/program/lib/Roundcube/bootstrap.php
 share/roundcube/program/lib/Roundcube/html.php
@@ -1930,15 +1895,10 @@ share/roundcube/program/steps/utils/text2html.inc
 share/roundcube/robots.txt
 share/roundcube/skins/classic/README
 share/roundcube/skins/classic/addressbook.css
-share/roundcube/skins/classic/addressbook.min.css
 share/roundcube/skins/classic/common.css
-share/roundcube/skins/classic/common.min.css
 share/roundcube/skins/classic/embed.css
-share/roundcube/skins/classic/embed.min.css
 share/roundcube/skins/classic/functions.js
-share/roundcube/skins/classic/functions.min.js
 share/roundcube/skins/classic/googiespell.css
-share/roundcube/skins/classic/googiespell.min.css
 share/roundcube/skins/classic/images/abook_toolbar.png
 share/roundcube/skins/classic/images/buttons/add_act.png
 share/roundcube/skins/classic/images/buttons/add_pas.png
@@ -2012,16 +1972,11 @@ share/roundcube/skins/classic/includes/messagetoolbar.html
 share/roundcube/skins/classic/includes/settingstabs.html
 share/roundcube/skins/classic/includes/taskbar.html
 share/roundcube/skins/classic/mail.css
-share/roundcube/skins/classic/mail.min.css
 share/roundcube/skins/classic/meta.json
 share/roundcube/skins/classic/print.css
-share/roundcube/skins/classic/print.min.css
 share/roundcube/skins/classic/safari.css
-share/roundcube/skins/classic/safari.min.css
 share/roundcube/skins/classic/settings.css
-share/roundcube/skins/classic/settings.min.css
 share/roundcube/skins/classic/splitter.js
-share/roundcube/skins/classic/splitter.min.js
 share/roundcube/skins/classic/templates/about.html
 share/roundcube/skins/classic/templates/addressbook.html
 share/roundcube/skins/classic/templates/compose.html
@@ -2052,11 +2007,8 @@ share/roundcube/skins/classic/thumbnail.png
 share/roundcube/skins/classic/watermark.html
 share/roundcube/skins/larry/README
 share/roundcube/skins/larry/addressbook.css
-share/roundcube/skins/larry/addressbook.min.css
 share/roundcube/skins/larry/embed.css
-share/roundcube/skins/larry/embed.min.css
 share/roundcube/skins/larry/googiespell.css
-share/roundcube/skins/larry/googiespell.min.css
 share/roundcube/skins/larry/images/addcontact.png
 share/roundcube/skins/larry/images/ajaxloader.gif
 share/roundcube/skins/larry/images/ajaxloader_dark.gif
@@ -2091,17 +2043,12 @@ share/roundcube/skins/larry/includes/links.html
 share/roundcube/skins/larry/includes/mailtoolbar.html
 share/roundcube/skins/larry/includes/settingstabs.html
 share/roundcube/skins/larry/mail.css
-share/roundcube/skins/larry/mail.min.css
 share/roundcube/skins/larry/meta.json
 share/roundcube/skins/larry/print.css
-share/roundcube/skins/larry/print.min.css
 share/roundcube/skins/larry/settings.css
-share/roundcube/skins/larry/settings.min.css
 share/roundcube/skins/larry/styles.css
-share/roundcube/skins/larry/styles.min.css
 share/roundcube/skins/larry/svggradient.php
 share/roundcube/skins/larry/svggradients.css
-share/roundcube/skins/larry/svggradients.min.css
 share/roundcube/skins/larry/templates/about.html
 share/roundcube/skins/larry/templates/addressbook.html
 share/roundcube/skins/larry/templates/compose.html
@@ -2129,5 +2076,4 @@ share/roundcube/skins/larry/templates/settings.html
 share/roundcube/skins/larry/templates/settingsedit.html
 share/roundcube/skins/larry/thumbnail.png
 share/roundcube/skins/larry/ui.js
-share/roundcube/skins/larry/ui.min.js
 share/roundcube/skins/larry/watermark.html
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 50dd2f3def4..9dd369fad61 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.48 2015/12/26 14:24:48 taca Exp $
+$NetBSD: distinfo,v 1.49 2016/05/26 03:20:37 taca Exp $
 
-SHA1 (roundcubemail-1.1.4.tar.gz) = 4883c8bb39fadf8af94ffb09ee426cba9f8ef2e3
-RMD160 (roundcubemail-1.1.4.tar.gz) = 24f4bd093db74183132eba7ff610fcff9840541a
-SHA512 (roundcubemail-1.1.4.tar.gz) = 18c2422d65292cd13bc4ce592e8490cc0a9d3e9551ac4d188db93eb989525af7ccf519642dd2e68a7380ab0d0d4ad4f999af2b7e99da75d88274743949b42f8a
-Size (roundcubemail-1.1.4.tar.gz) = 3209549 bytes
+SHA1 (roundcubemail-1.1.5.tar.gz) = d0843b592a810435dff49aa615fd3075691ca18d
+RMD160 (roundcubemail-1.1.5.tar.gz) = b716851dc55fa88553ad06c21e8c8080416303f1
+SHA512 (roundcubemail-1.1.5.tar.gz) = 7723746c4c1959460adb9f157fed6ebf78720ee84640791e0501b6c2adb5c60a58fa93e4e244dfad1998f3595cc31ca3dc48e7e111e69e5a0444d96d6cf04289
+Size (roundcubemail-1.1.5.tar.gz) = 3147385 bytes
 SHA1 (patch-ac) = 235116580665d5d58edc218c063b41171a2d9227
 SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
-SHA1 (patch-config.inc.php) = 6652bd2aaba06e1d1dd4a02d2390aa523f54e613
+SHA1 (patch-plugins_password_helpers_passwd-expect) = 9e0082f23e37bbab26e8bb1439668132d5aacca2
 SHA1 (patch-rcube_mime_default) = fe6ff1bea0a2c4223b34e44a6d0ca76e6476d2aa
diff --git a/mail/roundcube/patches/patch-config.inc.php b/mail/roundcube/patches/patch-config.inc.php
deleted file mode 100644
index 0e0edab5184..00000000000
--- a/mail/roundcube/patches/patch-config.inc.php
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-config.inc.php,v 1.2 2015/12/26 14:24:48 taca Exp $
-
-Add default paths for log, tmp and MIME types.
-
---- config/config.inc.php.sample	2015-03-16 20:54:49.000000000 +0000
-+++ config/config.inc.php.sample.18555.sample
-@@ -83,3 +83,10 @@ $config['plugins'] = array(
- 
- // skin name: folder from skins/
- $config['skin'] = 'larry';
-+
-+// use this folder to store log files (must be writeable for apache user)
-+// This is used by the 'file' log driver.
-+$config['log_dir'] = '@VARBASE@/log/roundcube/';
-+
-+// use this folder to store temp files (must be writeable for apache user)
-+$config['temp_dir'] = '@VARBASE@/tmp/roundcube/';