CVS commit: pkgsrc/mail/roundcube

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/roundcube
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Wed, 16 May 2018 08:14:41 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed May 16 08:14:41 UTC 2018

Modified Files:
        pkgsrc/mail/roundcube: Makefile Makefile.common PLIST distinfo
            options.mk
        pkgsrc/mail/roundcube/files: apache.conf nginx.conf
        pkgsrc/mail/roundcube/patches: patch-rcube_mime_default
Added Files:
        pkgsrc/mail/roundcube/files: lighttpd.conf
Removed Files:
        pkgsrc/mail/roundcube/patches: patch-ac

Log Message:
roundcube: update to 1.3.6

* add JavaScript dependencies listed in jsdeps.json
  * put them on /pub/pkgsrc/distfiles/roundcube to avoid checksum error due
    to archive automatic generation (e.g. tinymce_languages.zip)
* remove patch-ac
* add example configuration fragment for www/lighttpd

CHANGELOG Roundcube Webmail
===========================

RELEASE 1.3.6
-------------
- Fix parsing date strings (e.g. from a Date: mail header) with comments (#6216)
- Fix PHP 7.2: count(): Parameter must be an array in enchant-based spellchecker (#6234)
- Fix possible IMAP command injection and type juggling vulnerabilities (#6229)
- Enigma: Fix key selection for signing
- Enigma: Enable keypair generation on Internet Explorer 11
- Fix check_request() bypass in places using get_uids() [CVE-2018-9846] (#6238)
- Fix bug where usernames without domain part could be malformed or converted to lower-case on logon (#6224)

RELEASE 1.3.5
-------------
- Managesieve: Fix bug where text: syntax was forced for strings longer than 1024 characters (#6143)
- Managesieve: Fix missing Save button in Edit Filter Set page of Classic skin (#6154)
- Fix duplicated labels in Test SMTP Config section (#6166)
- Fix PHP Warning: exif_read_data(...): Illegal IFD size (#6169)
- Enigma: Fix key generation in Safari by upgrade to OpenPGP 2.6.2 (#6149)
- Fix security issue in remote content blocking on HTML image and style tags (#6178)
- Added 9pt and 11pt to the list of font sizes in HTML editor
- Fix handling encoding of HTML tags in "inline" JSON output (#6207)
- Fix bug where some unix timestamps were not handled correctly by rcube_utils::anytodatetime() (#6212)

RELEASE 1.3.4
-------------
- Fix bug where contacts search could skip some records (#6130)
- Fix possible information leak - add more strict sql error check on user creation (#6125)
- Fix a couple of warnings on PHP 7.2 (#6098)
- Fix broken long filenames when using imap4d server - workaround server bug (#6048)
- Fix so temp_dir misconfiguration prints an error to the log (#6045)
- Fix untagged COPYUID responses handling - again (#5982)
- Fix PHP warning "idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated" with PHP 7.2 (#6075)
- Fix bug where Archive folder wasn't auto-created on login with create_default_folders=true
- Fix performance issue when parsing malformed and long Date header (#6087)
- Fix syntax error in mssql.initial.sql (#6097)
- Fix bug where contacts export by selection returned no more than 10 entries (#6103)
- Fix searching contacts by address in LDAP source (#6084)
- Fix X-Frame-Options:ALLOW-FROM support, remove custom click-jacking protection (#6057)

RELEASE 1.3.3
-------------
- Fix decoding of mailto: links with + character in HTML messages (#6020)
- Fix false reporting of failed upgrade in installto.sh (#6019)
- Fix file disclosure vulnerability caused by insufficient input validation [CVE-2017-16651] (#6026)
- Fix mangled non-ASCII characters in links in HTML messages (#6028)

RELEASE 1.3.2
-------------
- Improve detection for Egde browser and add pointer event support (#5922)
- Fix bug where pink image was used instead of a thumbnail when image resize fails (#5933)
- Fix so files size/count limit is verified (client-side) also on drag-n-drop uploads (#5940)
- Fix invalid template loading on a message error in preview frame (#5941)
- Fix bug where HTML messages could have been rendered empty on some systems (#5957)
- Fix wording of "Mark previewed messages as read" to "Mark messages as read" (#5952)
- Enigma: Fix decryption of messages encoded with non-ascii charset (#5962)
- Fix missing cursor in HTML editor on mail reply (#5969)
- Fix (again) bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
- Fix bug where mail search could return empty result on servers without SORT capability (#5973)
- Fix bug where assets_path wasn't added to some watermark frames
- Fix so untagged COPYUID responses are also supported according to RFC6851 (#5982)
- Fix issue caused by non-default session.cookie_lifetime setting (#5961)
- Fix Edge encoding bug when pasting text into the HTML editor, update to TinyMCE 4.5.8 (#5885)
- Fix handling of unknown Content-Disposition type (#6002)
- Fix truncated folder name on messages list in multi-folder mode, for folders with non-ascii characters (#6004)
- Fix bug where removing the last subfolder did not hide toggle button on its parent record (#6007)
- Fix bug where ghost messages could be added to the list after fast delete (#5941)

RELEASE 1.3.1
-------------
- Don't ignore (global) userlogins/sendmail logs in per_user_logging mode
- Add Preferences > Mailbox View > Main Options > Layout (#5829)
- Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
- Managesieve: Fix parsing dot-staffed lines in multiline text (#5838)
- Managesieve: Fix AM/PM suffix in vacation time selectors
- Managesieve: Fix bug where 'exists' operator was reset to 'contains' (#5899)
- Remove non-printable characters from filenames on download/display (#5880)
- Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
- Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
- Fix bug where HTML messages with @media styles could moddify style of page body (#5811)
- Fix style issue on selected and unfocused message that is part of a thread (#5798)
- Fix bug where a.button style from managesieve plugin could impact other elements (#5800)
- Fix position of selected icon for (Mailvelope) Encrypt button
- Fix fatal error when using DMY- or MDY-based date format in PostgreSQL (#5808)
- Fix bug where errors were not printed when using bin/update.sh (#5834)
- Fix PHP 7.2 warnings on count() use (#5845)
- Fix bug where Chrome could not upload the same file that was selected before (#5854)
- Fix duplicate messages on the list after deleting messages on the next to the last page (#5862)
- Fix bug where messages count was not updated after delete when imap_cache is set (#5872)
- Fix potential XSS vulnerability with malformed HTML message markup
- Fix sending message with "Too many public recipients" dialog buttons (#5924)
- Bring back double-click behavior on the message list which was removed in 1.3.0 (#5823)
- Enigma: Fix decrypting an encrypted+signed message when signature verification fails (#5914)

RELEASE 1.3.0
-------------
- Update to TinyMCE 4.5.7
- Fix bug where invalid recipients could be silently discarded (#5739)
- Fix conflict with _gid cookie of Google Analytics (#5748)
- Print error from CLI scripts when system/exec function is disabled (#5744)
- Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)
- Fix bug where it wasn't possible to scroll folders list in Edge (#5750)
- Fix folders list sorting on Windows - if php-intl is available (#5732)
- Fix addressbook searching by gender (#5757)
- Fix prevention from using % and * characters in folder name (#5762)
- Fix POST parameter reflection in default_charset selector (#5768)
- Enigma: Fix compatibility with assets_dir
- Managesieve: Skip redundant LISTSCRIPTS command
- Fix SQL syntax error on MariaDB 10.2 (#5774)
- Fix bug where zipdownload ignored files with the same name (#5777)
- Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)

RELEASE 1.3-rc
--------------
- "Flattened" the larry theme: fresher look by removing shadows and gradients
- Support logging to php://stdout (#5721)
- Add support for DelSp=Yes in format=flowed messages (#5702)
- Update to jQuery 3.2.1
- Update to TinyMCE 4.5.6
- Plugin API: Call message_part_structure hook for sub-parts of multipart/alternative message (#5678)
- Enigma: Always use detached signatures (#5624)
- Enigma: Fix handling of messages with nested PGP encrypted parts (#5634)
- Minimize unwanted message loading in preview frame on drag (#5616)
- Fix failing database schema check in all engines except mysql (#5730)
- Fix autocomplete popup closing with click outside the input, don't handle Tab key as Enter (#5606)
- Fix jsdeps.json synchronization on update, warn about missing requirements of install-jsdeps.sh (#5598)
- Fix missing thread expand icon on search result in widescreen mode (#5613)
- Fix bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
- Fix bug where external content in src attribute of input/video tags was not secured (#5583)
- Fix PHP error on update of a contact with multiple email addresses when using PHP 7.1 (#5587)
- Fix bug where mail content frame couldn't be reset in some corner cases (#5608)
- Fix bug where some classic skin images were not displayed in IE/Edge (#5614)
- Fix bug where signature couldn't be added above the quote in Firefox 51 (#5628)
- Fix regression where groups with email address were resolved to its members' addresses
- Fix update of group name in the contacts list header on group rename (#5648)
- Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
- Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
- Managesieve: Fix parser issue with empty lines between comments (#5657)
- Managesieve: Fix possible defect in handling \r\n in scripts (#5685)
- Fix/rephrase "unsaved changes" warning when cancelling a draft (#5610)
- Fix XSS issue in handling of a style tag inside of an svg element [CVE-2017-6820]
- Fix bug where settings/upload.inc could not be used by plugins (#5694)
- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
- Fix bug where namespace prefix could not be truncated on folders list if show_real_foldernames=true (#5695)
- Fix undesired effects when postgres database uses different timezone than PHP host (#5708)
- Installer: Fix DB schema initialization on MS SQL Server
- Fix bug where base_dn setting was ignored inside group_filters (#5720)
- Password: Fix security issue in virtualmin and sasl drivers [CVE-2017-8114]

RELEASE 1.3-beta
----------------
- Nicely handle contact deletion on contact edit (#5522)
- vcard_attachments: Add possibility to attach contact vCard to composed message (#4997)
- Preserve message internal/received date on import in mbox format (#5559)
- Zipdownload: Fix date format in mbox "From line"
- Possibility to display QR code for contacts data (#5030)
- Added identicon plugin
- Widescreen layout aka three column view (#5093)
- Unify automatic marking as \Seen in preview pane, full-page and extwin views (#5071)
- Disable double-click on the list when preview pane is on (#5199)
- Support hostname and hostname:port in force_https option (#5511)
- Support ALLOW-FROM in x_frame_options (#5122)
- Allow to omit a subject when sending an email (#5068)
- Warn about too many disclosed recipients in composed email [max_disclosed_recipients] (#5132)
- identity_select: Support Received header (#5085)
- Plugin API: Added get_compose_responses hook (#5457)
- Display error when trying to upload more files than specified in max_file_uploads (#5483)
- Add missing sql upgrade file for 'ip' column resize in session table (#5465)
- Do not show inline images of unsupported mimetype (#5463)
- Password: Added replacement variables support in password_pop_host (#5539)
- Password: Don't store passwords in temp files when using dovecotpw (#5531)
- Password: Added LDAP PPolicy driver (#5364)
- Password: Added cpanel_webmail driver (#5549)
- Password: Added possibility to nicely redirect from other plugins on password expiration (#5468)
- Implement separate action to mark all messages in a folder as \Seen (#5006)
- Implement marking as \Seen in all folders or in a folder and its subfolders (#5076)
- Archive: Don't reload messages list when it's not needed (#5225)
- Archive: Add option to automatically mark archived messages as \Seen (#5142)
- Improve randomness of password salts and random hashes (#5266)
- Password/cPanel: Add support for hash authentication and reseller accounts (#5252)
- Support host-specific imap_conn_options/smtp_conn_options/managesieve_conn_options (#5136)
- Center and scale images in attachment preview frame (#5421)
- Added max_message_size option enforced when attaching files to a composed message (#4993)
- Added Search button in quick search menus (#5312)
- Implement "one click" attachment/messages/photo upload (#5024)
- Squirrelmail_usercopy: Add option to define character set of data files
- Removed useless 'created' column from 'session' table (#5389)
- Dropped legacy browsers support (#5167)
    - Removed legacy_browser plugin
    - Removed hacks for IE < 10
    - Update to jQuery 3.1.1 and jQuery-UI 1.12.0
    - compile .min.js files with ECMASCRIPT5 option
- Require PHP >= 5.4
- Add possibility to preview and download attachments in mail compose (#5053)
- Add possibility to rename attachments in mail compose (#4996)
- Remove backward compatibility "layer" of bc.php (#4902)
- Support WEBP images in mail messages (#5362)
- Support MathML in HTML message preview (#5182)
- Rename Addressbook to Contacts (#5233)
- Remove PHP mail() support, smtp_server is required now (#5340)
- Display full message subject in onmouseover on truncated subject in mail view (#5346)
- Enigma: Support GnuPG 2.1 (#5313)
- Enigma: Support key generation for multiple identities (#5383)
- Enigma: Import keys from key-server(s) (#5286)
- Enigma: Search missing public keys on a key-server in mail compose (#5286)
- Enigma: Delete user keys when using deluser.sh script
- Enigma: Fix redundant list-secret-keys/list-public-keys calls on signing/encryption
- Enigma: Implement PGP encryption and signing in one go (#5302)
- Enigma: Display signature verification status for encrypted+signed messages (#5302)
- Display different attachment icon on encrypted messages
- Display different confirmation text when moving messages to Trash (#5220)
- Indicate that a collapsed thread has flagged children (#5013)
- Implemented message/rfc822 attachment preview
- Update to jsTimezoneDetect 1.0.6
- Managesieve: Add (optional) RAW script editor (#5414)
- Managesieve: Add option to automatically set vacation :from address (#5428)
- Managesieve: Support 'string' test from variables extension [RFC 5229] (#5248)
- Managesieve: Support 'duplicate' extension [RFC 7352]
- Managesieve: Unhide advanced rule controls if there are inputs with errors
- Managesieve: Display warning message when filter form contains errors
- Control search engine crawlers via X-Robots-Tag header instead of <meta> and robots.txt (#5098)
- Fixed redundancy in sql caching system and compatibility with Galera Cluster (#5439)
    - Removed redundant 'created' column from cache and cache_shared tables
    - Removed use of redundant data records
    - Added missing primary keys (dictionary, cache, cache_shared tables)
- Fix so templating system does not mess with external (e.g. email) content (#5499)
- Fix redundant keep-alive/refresh after session error on compose page (#5500)
- Managesieve: Fix handling of scripts with nested rules (#5540)
- Fix variable substitution in ldap host for some use-cases, e.g. new_user_identity (#5544)
- Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555)
- Fix adding images to new identity signatures
- Fix rsync error handling in installto.sh script (#5562)
- Fix some advanced search issues with multiple addressbooks (#5572)
- Fix so group/addressbook selection is retained on page refresh


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/mail/roundcube/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/roundcube/Makefile.common
cvs rdiff -u -r1.44 -r1.45 pkgsrc/mail/roundcube/PLIST
cvs rdiff -u -r1.60 -r1.61 pkgsrc/mail/roundcube/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/roundcube/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/roundcube/files/apache.conf \
    pkgsrc/mail/roundcube/files/nginx.conf
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/roundcube/files/lighttpd.conf
cvs rdiff -u -r1.10 -r0 pkgsrc/mail/roundcube/patches/patch-ac
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/roundcube/patches/patch-rcube_mime_default

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/roundcube/Makefile
diff -u pkgsrc/mail/roundcube/Makefile:1.88 pkgsrc/mail/roundcube/Makefile:1.89
--- pkgsrc/mail/roundcube/Makefile:1.88 Fri Apr 28 13:48:29 2017
+++ pkgsrc/mail/roundcube/Makefile      Wed May 16 08:14:40 2018
@@ -1,11 +1,20 @@
-# $NetBSD: Makefile,v 1.88 2017/04/28 13:48:29 taca Exp $
+# $NetBSD: Makefile,v 1.89 2018/05/16 08:14:40 triaxx Exp $
 
 DISTNAME=      roundcubemail-${RC_VERS}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/}
 
 MAINTAINER=    taca%NetBSD.org@localhost
 COMMENT=       Browser-based multilingual IMAP client
-LICENSE=       gnu-gpl-v3
+LICENSE=       gnu-gpl-v3 AND mit AND gnu-lgpl-v2.1
+
+# JavaScript dependencies from bin/install-jsdeps.sh
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=    jquery-3.2.1.min.js
+DISTFILES+=    jstz.min.js
+DISTFILES+=    publickey.js
+DISTFILES+=    tinymce_4.5.8.zip
+DISTFILES+=    tinymce_languages.zip
+DISTFILES+=    codemirror-5.21.0.zip
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
@@ -18,7 +27,9 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-pear-Net_IDN
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.10.0:../../mail/pear-Mail_Mime
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.6:../../mail/pear-Auth_SASL
 
-RC_SUBDIRS=    SQL bin installer plugins program skins
+RC_SUBDIRS=    SQL bin plugins program skins
+TMCE_SUBDIRS=  langs plugins skins themes
+CM_SUBDIRS=    lib mode/sieve addon/selection
 CONF_PLUGINS=  acl additional_message_headers database_attachments \
                emoticons help http_authentication jqueryui \
                krb_authentication managesieve new_user_identity \
@@ -27,8 +38,15 @@ CONF_PLUGINS=        acl additional_message_hea
 .for d in ${RC_SUBDIRS}
 INSTALLATION_DIRS+=    ${RCDIR}/${d}
 .endfor
+.for d in ${TMCE_SUBDIRS}
+INSTALLATION_DIRS+=    ${RCDIR}/program/js/tinymce/${d}
+.endfor
+.for d in ${CM_SUBDIRS}
+INSTALLATION_DIRS+=    ${RCDIR}/plugins/managesieve/codemirror/${d}
+.endfor
 INSTALLATION_DIRS+=    ${DOCDIR} ${EGDIR}
 
+
 OWN_DIRS+=             ${PKG_SYSCONFDIR}
 OWN_DIRS_PERMS+=       ${VARBASE}/log/roundcube \
                        ${WWW_USER} ${WWW_GROUP} 0750
@@ -37,8 +55,6 @@ OWN_DIRS_PERMS+=      ${VARBASE}/spool/roundc
 OWN_DIRS_PERMS+=       ${VARBASE}/tmp/roundcube \
                        ${WWW_USER} ${WWW_GROUP} 0750
 
-CONF_FILES=            ${PREFIX}/${EGDIR}/roundcube.conf \
-                       ${PKG_SYSCONFDIR}/roundcube.conf
 CONF_FILES+=           ${PREFIX}/${EGDIR}/mimetypes.php \
                        ${PKG_SYSCONFDIR}/mimetypes.php
 CONF_FILES_PERMS+=     ${PREFIX}/${EGDIR}/config.inc.php \
@@ -51,11 +67,11 @@ CONF_FILES_PERMS+=  ${PREFIX}/${EGDIR}/de
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     do-configure
 SUBST_MESSAGE.files=   Fixing configuration files.
-SUBST_FILES.files=     roundcube.conf
+SUBST_FILES.files=     apache.conf lighttpd.conf nginx.conf
 SUBST_FILES.files+=    config/config.inc.php.sample
-SUBST_FILES.files+=    installer/index.php
 SUBST_FILES.files+=    program/include/iniset.php
 SUBST_FILES.files+=    program/lib/Roundcube/rcube_mime.php
+SUBST_VARS.files=      RCDIR VARBASE PKG_EXAMPLES PKG_SYSCONFBASE PKG_SYSCONFDIR
 SUBST_SED.files=       -e "s|@RCDIR@|${RCDIR}|g"
 SUBST_SED.files+=      -e "s|@VARBASE@|${VARBASE}|g"
 SUBST_SED.files+=      -e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g"
@@ -68,7 +84,9 @@ REPLACE.php.new=      ${PREFIX}/bin/php
 REPLACE_FILES.php=     bin/*.sh
 
 post-extract:
-       ${CP} ${FILESDIR}/${WWW_CONF_FILE} ${WRKSRC}/roundcube.conf
+       ${CP} ${FILESDIR}/apache.conf ${WRKSRC}/apache.conf
+       ${CP} ${FILESDIR}/lighttpd.conf ${WRKSRC}/lighttpd.conf
+       ${CP} ${FILESDIR}/nginx.conf ${WRKSRC}/nginx.conf
 
 pre-install:
        cd ${WRKSRC}/plugins && ${RM} -fr enigma password zipdownload
@@ -80,7 +98,6 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${PREFIX}/${RCDIR}
        ${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${PREFIX}/${RCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${RCDIR}
 .for i in ${RC_SUBDIRS}
        cd ${WRKSRC}/${i} && ${FIND} . -type f \! -name "*.orig" -print | \
                pax -rw ${DESTDIR}${PREFIX}/${RCDIR}/${i}
@@ -90,14 +107,51 @@ do-install:
                ${XARGS} ${CHMOD} ${PKGDIRMODE}
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/${RCDIR}/${i}
 .endfor
-       ${INSTALL_DATA} ${WRKSRC}/roundcube.conf \
-               ${DESTDIR}${PREFIX}/${EGDIR}/roundcube.conf
+       ${INSTALL_DATA} ${WRKSRC}/apache.conf \
+               ${DESTDIR}${PREFIX}/${EGDIR}/apache.conf
+       ${INSTALL_DATA} ${WRKSRC}/lighttpd.conf \
+               ${DESTDIR}${PREFIX}/${EGDIR}/lighttpd.conf
+       ${INSTALL_DATA} ${WRKSRC}/nginx.conf \
+               ${DESTDIR}${PREFIX}/${EGDIR}/nginx.conf
        ${INSTALL_DATA} ${WRKSRC}/config/mimetypes.php \
                ${DESTDIR}${PREFIX}/${EGDIR}/mimetypes.php
        ${INSTALL_DATA} ${WRKSRC}/config/config.inc.php.sample \
                ${DESTDIR}${PREFIX}/${EGDIR}/config.inc.php
        ${INSTALL_DATA} ${WRKSRC}/config/defaults.inc.php \
                ${DESTDIR}${PREFIX}/${EGDIR}/defaults.inc.php
+       ${INSTALL_DATA} ${WRKDIR}/jquery-3.2.1.min.js \
+               ${DESTDIR}${PREFIX}/${RCDIR}/program/js/jquery.min.js
+       ${INSTALL_DATA} ${WRKDIR}/jstz.min.js \
+               ${DESTDIR}${PREFIX}/${RCDIR}/program/js/jstz.min.js
+       ${INSTALL_DATA} ${WRKDIR}/publickey.js \
+               ${DESTDIR}${PREFIX}/${RCDIR}/program/js/publickey.js
+.for i in ${TMCE_SUBDIRS}
+       cd ${WRKDIR}/tinymce/js/tinymce/${i} && ${FIND} . -type f -print | \
+               pax -rw ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/${i}
+       ${FIND} ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/${i} -type f | \
+               ${XARGS} ${CHMOD} ${SHAREMODE}
+       ${FIND} ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/${i} -type d | \
+               ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/${i}
+.endfor
+       ${INSTALL_DATA} ${WRKDIR}/tinymce/js/tinymce/tinymce.min.js \
+         ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/tinymce.min.js
+       cd ${WRKDIR}/langs && ${FIND} . -type f -print | \
+               pax -rw ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/langs
+       ${FIND} ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/langs -type f | \
+               ${XARGS} ${CHMOD} ${SHAREMODE}
+       ${FIND} ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/langs -type d | \
+               ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/${RCDIR}/program/js/tinymce/langs
+.for i in ${CM_SUBDIRS}
+       cd ${WRKDIR}/codemirror-5.21.0/${i} && ${FIND} . -type f -print | \
+               pax -rw ${DESTDIR}${PREFIX}/${RCDIR}/plugins/managesieve/codemirror/${i}
+       ${FIND} ${DESTDIR}${PREFIX}/${RCDIR}/plugins/managesieve/codemirror/${i} -type f | \
+               ${XARGS} ${CHMOD} ${SHAREMODE}
+       ${FIND} ${DESTDIR}${PREFIX}/${RCDIR}/plugins/managesieve/codemirror/${i} -type d | \
+               ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/${RCDIR}/plugins/managesieve/codemirror/${i}
+.endfor
 
 .include "Makefile.common"
 .include "../../lang/php/phpversion.mk"

Index: pkgsrc/mail/roundcube/Makefile.common
diff -u pkgsrc/mail/roundcube/Makefile.common:1.9 pkgsrc/mail/roundcube/Makefile.common:1.10
--- pkgsrc/mail/roundcube/Makefile.common:1.9   Mon Apr 30 06:45:03 2018
+++ pkgsrc/mail/roundcube/Makefile.common       Wed May 16 08:14:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2018/04/30 06:45:03 taca Exp $
+# $NetBSD: Makefile.common,v 1.10 2018/05/16 08:14:40 triaxx Exp $
 #
 # used by mail/roundcube/Makefile
 # used by mail/roundcube/plugins.mk
@@ -8,8 +8,10 @@ CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=roundcube/}
 GITHUB_PROJECT=        roundcubemail
 HOMEPAGE=      http://roundcube.net/
+DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=   roundcube
 
-RC_VERS=       1.2.9
+RC_VERS=       1.3.6
 
 USE_LANGUAGES=         # none
 USE_TOOLS+=            pax

Index: pkgsrc/mail/roundcube/PLIST
diff -u pkgsrc/mail/roundcube/PLIST:1.44 pkgsrc/mail/roundcube/PLIST:1.45
--- pkgsrc/mail/roundcube/PLIST:1.44    Sun Mar 12 13:34:04 2017
+++ pkgsrc/mail/roundcube/PLIST Wed May 16 08:14:40 2018
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.44 2017/03/12 13:34:04 taca Exp $
+@comment $NetBSD: PLIST,v 1.45 2018/05/16 08:14:40 triaxx Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README.md
 share/doc/roundcube/UPGRADING
+share/examples/roundcube/apache.conf
 share/examples/roundcube/config.inc.php
 share/examples/roundcube/defaults.inc.php
+share/examples/roundcube/lighttpd.conf
 share/examples/roundcube/mimetypes.php
+share/examples/roundcube/nginx.conf
 share/examples/roundcube/plugins/acl/config.inc.php
 share/examples/roundcube/plugins/additional_message_headers/config.inc.php
 share/examples/roundcube/plugins/database_attachments/config.inc.php
@@ -19,7 +22,6 @@ share/examples/roundcube/plugins/new_use
 share/examples/roundcube/plugins/newmail_notifier/config.inc.php
 share/examples/roundcube/plugins/redundant_attachments/config.inc.php
 share/examples/roundcube/plugins/squirrelmail_usercopy/config.inc.php
-share/examples/roundcube/roundcube.conf
 share/roundcube/.htaccess
 share/roundcube/SQL/mssql.initial.sql
 share/roundcube/SQL/mssql/2009103100.sql
@@ -37,6 +39,9 @@ share/roundcube/SQL/mssql/2013061000.sql
 share/roundcube/SQL/mssql/2014042900.sql
 share/roundcube/SQL/mssql/2015030800.sql
 share/roundcube/SQL/mssql/2015111100.sql
+share/roundcube/SQL/mssql/2016081200.sql
+share/roundcube/SQL/mssql/2016100900.sql
+share/roundcube/SQL/mssql/2016112200.sql
 share/roundcube/SQL/mysql.initial.sql
 share/roundcube/SQL/mysql/2008030300.sql
 share/roundcube/SQL/mysql/2008040500.sql
@@ -58,9 +63,15 @@ share/roundcube/SQL/mysql/2013061000.sql
 share/roundcube/SQL/mysql/2014042900.sql
 share/roundcube/SQL/mysql/2015030800.sql
 share/roundcube/SQL/mysql/2015111100.sql
+share/roundcube/SQL/mysql/2016081200.sql
+share/roundcube/SQL/mysql/2016100900.sql
+share/roundcube/SQL/mysql/2016112200.sql
 share/roundcube/SQL/oracle.initial.sql
 share/roundcube/SQL/oracle/2015030800.sql
 share/roundcube/SQL/oracle/2015111100.sql
+share/roundcube/SQL/oracle/2016081200.sql
+share/roundcube/SQL/oracle/2016100900.sql
+share/roundcube/SQL/oracle/2016112200.sql
 share/roundcube/SQL/postgres.initial.sql
 share/roundcube/SQL/postgres/2008030300.sql
 share/roundcube/SQL/postgres/2008060900.sql
@@ -81,6 +92,9 @@ share/roundcube/SQL/postgres/2013061000.
 share/roundcube/SQL/postgres/2014042900.sql
 share/roundcube/SQL/postgres/2015030800.sql
 share/roundcube/SQL/postgres/2015111100.sql
+share/roundcube/SQL/postgres/2016081200.sql
+share/roundcube/SQL/postgres/2016100900.sql
+share/roundcube/SQL/postgres/2016112200.sql
 share/roundcube/SQL/sqlite.initial.sql
 share/roundcube/SQL/sqlite/2008030300.sql
 share/roundcube/SQL/sqlite/2008060900.sql
@@ -102,6 +116,9 @@ share/roundcube/SQL/sqlite/2013061000.sq
 share/roundcube/SQL/sqlite/2014042900.sql
 share/roundcube/SQL/sqlite/2015030800.sql
 share/roundcube/SQL/sqlite/2015111100.sql
+share/roundcube/SQL/sqlite/2016081200.sql
+share/roundcube/SQL/sqlite/2016100900.sql
+share/roundcube/SQL/sqlite/2016112200.sql
 share/roundcube/bin/cleandb.sh
 share/roundcube/bin/cssshrink.sh
 share/roundcube/bin/decrypt.sh
@@ -112,6 +129,7 @@ share/roundcube/bin/gc.sh
 share/roundcube/bin/importgettext.sh
 share/roundcube/bin/indexcontacts.sh
 share/roundcube/bin/initdb.sh
+share/roundcube/bin/install-jsdeps.sh
 share/roundcube/bin/installto.sh
 share/roundcube/bin/jsshrink.sh
 share/roundcube/bin/makedoc.sh
@@ -124,26 +142,16 @@ share/roundcube/bin/update.sh
 share/roundcube/bin/updatecss.sh
 share/roundcube/bin/updatedb.sh
 share/roundcube/index.php
-share/roundcube/installer/check.php
-share/roundcube/installer/client.js
-share/roundcube/installer/config.php
-share/roundcube/installer/images/add.png
-share/roundcube/installer/images/banner_gradient.gif
-share/roundcube/installer/images/banner_schraffur.gif
-share/roundcube/installer/images/delete.png
-share/roundcube/installer/images/error.png
-share/roundcube/installer/images/roundcube_logo.png
-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.php
 share/roundcube/plugins/acl/composer.json
+share/roundcube/plugins/acl/localization/ar.inc
 share/roundcube/plugins/acl/localization/ar_SA.inc
 share/roundcube/plugins/acl/localization/ast.inc
 share/roundcube/plugins/acl/localization/az_AZ.inc
 share/roundcube/plugins/acl/localization/be_BE.inc
 share/roundcube/plugins/acl/localization/bg_BG.inc
+share/roundcube/plugins/acl/localization/bn_BD.inc
 share/roundcube/plugins/acl/localization/br.inc
 share/roundcube/plugins/acl/localization/bs_BA.inc
 share/roundcube/plugins/acl/localization/ca_ES.inc
@@ -168,8 +176,10 @@ share/roundcube/plugins/acl/localization
 share/roundcube/plugins/acl/localization/fo_FO.inc
 share/roundcube/plugins/acl/localization/fr_FR.inc
 share/roundcube/plugins/acl/localization/fy_NL.inc
+share/roundcube/plugins/acl/localization/ga_IE.inc
 share/roundcube/plugins/acl/localization/gl_ES.inc
 share/roundcube/plugins/acl/localization/he_IL.inc
+share/roundcube/plugins/acl/localization/hi_IN.inc
 share/roundcube/plugins/acl/localization/hr_HR.inc
 share/roundcube/plugins/acl/localization/hu_HU.inc
 share/roundcube/plugins/acl/localization/hy_AM.inc
@@ -179,33 +189,44 @@ share/roundcube/plugins/acl/localization
 share/roundcube/plugins/acl/localization/it_IT.inc
 share/roundcube/plugins/acl/localization/ja_JP.inc
 share/roundcube/plugins/acl/localization/ka_GE.inc
+share/roundcube/plugins/acl/localization/kab.inc
 share/roundcube/plugins/acl/localization/km_KH.inc
+share/roundcube/plugins/acl/localization/kn_IN.inc
 share/roundcube/plugins/acl/localization/ko_KR.inc
 share/roundcube/plugins/acl/localization/ku.inc
 share/roundcube/plugins/acl/localization/ku_IQ.inc
 share/roundcube/plugins/acl/localization/lb_LU.inc
 share/roundcube/plugins/acl/localization/lt_LT.inc
 share/roundcube/plugins/acl/localization/lv_LV.inc
+share/roundcube/plugins/acl/localization/mk_MK.inc
+share/roundcube/plugins/acl/localization/ml_IN.inc
 share/roundcube/plugins/acl/localization/mn_MN.inc
+share/roundcube/plugins/acl/localization/mr_IN.inc
+share/roundcube/plugins/acl/localization/ms_MY.inc
 share/roundcube/plugins/acl/localization/nb_NO.inc
+share/roundcube/plugins/acl/localization/ne_NP.inc
 share/roundcube/plugins/acl/localization/nl_BE.inc
 share/roundcube/plugins/acl/localization/nl_NL.inc
 share/roundcube/plugins/acl/localization/nn_NO.inc
 share/roundcube/plugins/acl/localization/pl_PL.inc
+share/roundcube/plugins/acl/localization/ps.inc
 share/roundcube/plugins/acl/localization/pt_BR.inc
 share/roundcube/plugins/acl/localization/pt_PT.inc
 share/roundcube/plugins/acl/localization/ro_RO.inc
 share/roundcube/plugins/acl/localization/ru_RU.inc
+share/roundcube/plugins/acl/localization/si_LK.inc
 share/roundcube/plugins/acl/localization/sk_SK.inc
 share/roundcube/plugins/acl/localization/sl_SI.inc
 share/roundcube/plugins/acl/localization/sq_AL.inc
 share/roundcube/plugins/acl/localization/sr_CS.inc
 share/roundcube/plugins/acl/localization/sv_SE.inc
+share/roundcube/plugins/acl/localization/ta_IN.inc
 share/roundcube/plugins/acl/localization/th_TH.inc
 share/roundcube/plugins/acl/localization/ti.inc
 share/roundcube/plugins/acl/localization/tr_TR.inc
 share/roundcube/plugins/acl/localization/tzl.inc
 share/roundcube/plugins/acl/localization/uk_UA.inc
+share/roundcube/plugins/acl/localization/uz.inc
 share/roundcube/plugins/acl/localization/vi_VN.inc
 share/roundcube/plugins/acl/localization/zh_CN.inc
 share/roundcube/plugins/acl/localization/zh_TW.inc
@@ -224,11 +245,13 @@ share/roundcube/plugins/additional_messa
 share/roundcube/plugins/archive/archive.js
 share/roundcube/plugins/archive/archive.php
 share/roundcube/plugins/archive/composer.json
+share/roundcube/plugins/archive/localization/ar.inc
 share/roundcube/plugins/archive/localization/ar_SA.inc
 share/roundcube/plugins/archive/localization/ast.inc
 share/roundcube/plugins/archive/localization/az_AZ.inc
 share/roundcube/plugins/archive/localization/be_BE.inc
 share/roundcube/plugins/archive/localization/bg_BG.inc
+share/roundcube/plugins/archive/localization/bn_BD.inc
 share/roundcube/plugins/archive/localization/br.inc
 share/roundcube/plugins/archive/localization/bs_BA.inc
 share/roundcube/plugins/archive/localization/ca_ES.inc
@@ -252,15 +275,21 @@ share/roundcube/plugins/archive/localiza
 share/roundcube/plugins/archive/localization/fi_FI.inc
 share/roundcube/plugins/archive/localization/fo_FO.inc
 share/roundcube/plugins/archive/localization/fr_FR.inc
+share/roundcube/plugins/archive/localization/fy_NL.inc
+share/roundcube/plugins/archive/localization/ga_IE.inc
 share/roundcube/plugins/archive/localization/gl_ES.inc
 share/roundcube/plugins/archive/localization/he_IL.inc
+share/roundcube/plugins/archive/localization/hi_IN.inc
 share/roundcube/plugins/archive/localization/hr_HR.inc
 share/roundcube/plugins/archive/localization/hu_HU.inc
 share/roundcube/plugins/archive/localization/hy_AM.inc
 share/roundcube/plugins/archive/localization/ia.inc
 share/roundcube/plugins/archive/localization/id_ID.inc
+share/roundcube/plugins/archive/localization/is_IS.inc
 share/roundcube/plugins/archive/localization/it_IT.inc
 share/roundcube/plugins/archive/localization/ja_JP.inc
+share/roundcube/plugins/archive/localization/ka_GE.inc
+share/roundcube/plugins/archive/localization/kab.inc
 share/roundcube/plugins/archive/localization/km_KH.inc
 share/roundcube/plugins/archive/localization/ko_KR.inc
 share/roundcube/plugins/archive/localization/ku.inc
@@ -268,13 +297,18 @@ share/roundcube/plugins/archive/localiza
 share/roundcube/plugins/archive/localization/lb_LU.inc
 share/roundcube/plugins/archive/localization/lt_LT.inc
 share/roundcube/plugins/archive/localization/lv_LV.inc
+share/roundcube/plugins/archive/localization/mk_MK.inc
 share/roundcube/plugins/archive/localization/ml_IN.inc
 share/roundcube/plugins/archive/localization/mn_MN.inc
 share/roundcube/plugins/archive/localization/mr_IN.inc
+share/roundcube/plugins/archive/localization/ms_MY.inc
 share/roundcube/plugins/archive/localization/nb_NO.inc
+share/roundcube/plugins/archive/localization/ne_NP.inc
+share/roundcube/plugins/archive/localization/nl_BE.inc
 share/roundcube/plugins/archive/localization/nl_NL.inc
 share/roundcube/plugins/archive/localization/nn_NO.inc
 share/roundcube/plugins/archive/localization/pl_PL.inc
+share/roundcube/plugins/archive/localization/ps.inc
 share/roundcube/plugins/archive/localization/pt_BR.inc
 share/roundcube/plugins/archive/localization/pt_PT.inc
 share/roundcube/plugins/archive/localization/ro_RO.inc
@@ -285,9 +319,12 @@ share/roundcube/plugins/archive/localiza
 share/roundcube/plugins/archive/localization/sq_AL.inc
 share/roundcube/plugins/archive/localization/sr_CS.inc
 share/roundcube/plugins/archive/localization/sv_SE.inc
+share/roundcube/plugins/archive/localization/ta_IN.inc
+share/roundcube/plugins/archive/localization/th_TH.inc
 share/roundcube/plugins/archive/localization/tr_TR.inc
 share/roundcube/plugins/archive/localization/tzl.inc
 share/roundcube/plugins/archive/localization/uk_UA.inc
+share/roundcube/plugins/archive/localization/uz.inc
 share/roundcube/plugins/archive/localization/vi_VN.inc
 share/roundcube/plugins/archive/localization/zh_CN.inc
 share/roundcube/plugins/archive/localization/zh_TW.inc
@@ -327,14 +364,18 @@ share/roundcube/plugins/attachment_remin
 share/roundcube/plugins/attachment_reminder/localization/fi_FI.inc
 share/roundcube/plugins/attachment_reminder/localization/fo_FO.inc
 share/roundcube/plugins/attachment_reminder/localization/fr_FR.inc
+share/roundcube/plugins/attachment_reminder/localization/fy_NL.inc
+share/roundcube/plugins/attachment_reminder/localization/ga_IE.inc
 share/roundcube/plugins/attachment_reminder/localization/gl_ES.inc
 share/roundcube/plugins/attachment_reminder/localization/he_IL.inc
 share/roundcube/plugins/attachment_reminder/localization/hr_HR.inc
 share/roundcube/plugins/attachment_reminder/localization/hu_HU.inc
 share/roundcube/plugins/attachment_reminder/localization/ia.inc
 share/roundcube/plugins/attachment_reminder/localization/id_ID.inc
+share/roundcube/plugins/attachment_reminder/localization/is_IS.inc
 share/roundcube/plugins/attachment_reminder/localization/it_IT.inc
 share/roundcube/plugins/attachment_reminder/localization/ja_JP.inc
+share/roundcube/plugins/attachment_reminder/localization/kab.inc
 share/roundcube/plugins/attachment_reminder/localization/km_KH.inc
 share/roundcube/plugins/attachment_reminder/localization/kn_IN.inc
 share/roundcube/plugins/attachment_reminder/localization/ko_KR.inc
@@ -343,6 +384,7 @@ share/roundcube/plugins/attachment_remin
 share/roundcube/plugins/attachment_reminder/localization/lb_LU.inc
 share/roundcube/plugins/attachment_reminder/localization/lt_LT.inc
 share/roundcube/plugins/attachment_reminder/localization/lv_LV.inc
+share/roundcube/plugins/attachment_reminder/localization/mk_MK.inc
 share/roundcube/plugins/attachment_reminder/localization/ml_IN.inc
 share/roundcube/plugins/attachment_reminder/localization/mn_MN.inc
 share/roundcube/plugins/attachment_reminder/localization/nb_NO.inc
@@ -359,6 +401,7 @@ share/roundcube/plugins/attachment_remin
 share/roundcube/plugins/attachment_reminder/localization/sv_SE.inc
 share/roundcube/plugins/attachment_reminder/localization/tr_TR.inc
 share/roundcube/plugins/attachment_reminder/localization/uk_UA.inc
+share/roundcube/plugins/attachment_reminder/localization/uz.inc
 share/roundcube/plugins/attachment_reminder/localization/vi_VN.inc
 share/roundcube/plugins/attachment_reminder/localization/zh_CN.inc
 share/roundcube/plugins/attachment_reminder/localization/zh_TW.inc
@@ -389,6 +432,7 @@ share/roundcube/plugins/help/composer.js
 share/roundcube/plugins/help/content/license.html
 share/roundcube/plugins/help/help.js
 share/roundcube/plugins/help/help.php
+share/roundcube/plugins/help/localization/ar.inc
 share/roundcube/plugins/help/localization/ar_SA.inc
 share/roundcube/plugins/help/localization/ast.inc
 share/roundcube/plugins/help/localization/az_AZ.inc
@@ -418,6 +462,7 @@ share/roundcube/plugins/help/localizatio
 share/roundcube/plugins/help/localization/fo_FO.inc
 share/roundcube/plugins/help/localization/fr_FR.inc
 share/roundcube/plugins/help/localization/fy_NL.inc
+share/roundcube/plugins/help/localization/ga_IE.inc
 share/roundcube/plugins/help/localization/gl_ES.inc
 share/roundcube/plugins/help/localization/he_IL.inc
 share/roundcube/plugins/help/localization/hr_HR.inc
@@ -425,6 +470,7 @@ share/roundcube/plugins/help/localizatio
 share/roundcube/plugins/help/localization/hy_AM.inc
 share/roundcube/plugins/help/localization/ia.inc
 share/roundcube/plugins/help/localization/id_ID.inc
+share/roundcube/plugins/help/localization/is_IS.inc
 share/roundcube/plugins/help/localization/it_IT.inc
 share/roundcube/plugins/help/localization/ja_JP.inc
 share/roundcube/plugins/help/localization/km_KH.inc
@@ -435,8 +481,10 @@ share/roundcube/plugins/help/localizatio
 share/roundcube/plugins/help/localization/lb_LU.inc
 share/roundcube/plugins/help/localization/lt_LT.inc
 share/roundcube/plugins/help/localization/lv_LV.inc
+share/roundcube/plugins/help/localization/mk_MK.inc
 share/roundcube/plugins/help/localization/ml_IN.inc
 share/roundcube/plugins/help/localization/mn_MN.inc
+share/roundcube/plugins/help/localization/mr_IN.inc
 share/roundcube/plugins/help/localization/nb_NO.inc
 share/roundcube/plugins/help/localization/nl_BE.inc
 share/roundcube/plugins/help/localization/nl_NL.inc
@@ -446,15 +494,18 @@ share/roundcube/plugins/help/localizatio
 share/roundcube/plugins/help/localization/pt_PT.inc
 share/roundcube/plugins/help/localization/ro_RO.inc
 share/roundcube/plugins/help/localization/ru_RU.inc
+share/roundcube/plugins/help/localization/si_LK.inc
 share/roundcube/plugins/help/localization/sk_SK.inc
 share/roundcube/plugins/help/localization/sl_SI.inc
 share/roundcube/plugins/help/localization/sq_AL.inc
 share/roundcube/plugins/help/localization/sr_CS.inc
 share/roundcube/plugins/help/localization/sv_SE.inc
+share/roundcube/plugins/help/localization/th_TH.inc
 share/roundcube/plugins/help/localization/ti.inc
 share/roundcube/plugins/help/localization/tr_TR.inc
 share/roundcube/plugins/help/localization/tzl.inc
 share/roundcube/plugins/help/localization/uk_UA.inc
+share/roundcube/plugins/help/localization/uz.inc
 share/roundcube/plugins/help/localization/vi_VN.inc
 share/roundcube/plugins/help/localization/zh_CN.inc
 share/roundcube/plugins/help/localization/zh_TW.inc
@@ -469,11 +520,13 @@ share/roundcube/plugins/help/tests/Help.
 share/roundcube/plugins/hide_blockquote/composer.json
 share/roundcube/plugins/hide_blockquote/hide_blockquote.js
 share/roundcube/plugins/hide_blockquote/hide_blockquote.php
+share/roundcube/plugins/hide_blockquote/localization/ar.inc
 share/roundcube/plugins/hide_blockquote/localization/ar_SA.inc
 share/roundcube/plugins/hide_blockquote/localization/ast.inc
 share/roundcube/plugins/hide_blockquote/localization/az_AZ.inc
 share/roundcube/plugins/hide_blockquote/localization/be_BE.inc
 share/roundcube/plugins/hide_blockquote/localization/bg_BG.inc
+share/roundcube/plugins/hide_blockquote/localization/bn_BD.inc
 share/roundcube/plugins/hide_blockquote/localization/br.inc
 share/roundcube/plugins/hide_blockquote/localization/bs_BA.inc
 share/roundcube/plugins/hide_blockquote/localization/ca_ES.inc
@@ -492,10 +545,13 @@ share/roundcube/plugins/hide_blockquote/
 share/roundcube/plugins/hide_blockquote/localization/es_ES.inc
 share/roundcube/plugins/hide_blockquote/localization/et_EE.inc
 share/roundcube/plugins/hide_blockquote/localization/eu_ES.inc
+share/roundcube/plugins/hide_blockquote/localization/fa_AF.inc
 share/roundcube/plugins/hide_blockquote/localization/fa_IR.inc
 share/roundcube/plugins/hide_blockquote/localization/fi_FI.inc
 share/roundcube/plugins/hide_blockquote/localization/fo_FO.inc
 share/roundcube/plugins/hide_blockquote/localization/fr_FR.inc
+share/roundcube/plugins/hide_blockquote/localization/fy_NL.inc
+share/roundcube/plugins/hide_blockquote/localization/ga_IE.inc
 share/roundcube/plugins/hide_blockquote/localization/gl_ES.inc
 share/roundcube/plugins/hide_blockquote/localization/he_IL.inc
 share/roundcube/plugins/hide_blockquote/localization/hr_HR.inc
@@ -508,11 +564,14 @@ share/roundcube/plugins/hide_blockquote/
 share/roundcube/plugins/hide_blockquote/localization/ja_JP.inc
 share/roundcube/plugins/hide_blockquote/localization/ka_GE.inc
 share/roundcube/plugins/hide_blockquote/localization/km_KH.inc
+share/roundcube/plugins/hide_blockquote/localization/kn_IN.inc
 share/roundcube/plugins/hide_blockquote/localization/ko_KR.inc
 share/roundcube/plugins/hide_blockquote/localization/ku.inc
+share/roundcube/plugins/hide_blockquote/localization/ku_IQ.inc
 share/roundcube/plugins/hide_blockquote/localization/lb_LU.inc
 share/roundcube/plugins/hide_blockquote/localization/lt_LT.inc
 share/roundcube/plugins/hide_blockquote/localization/lv_LV.inc
+share/roundcube/plugins/hide_blockquote/localization/mk_MK.inc
 share/roundcube/plugins/hide_blockquote/localization/ml_IN.inc
 share/roundcube/plugins/hide_blockquote/localization/mn_MN.inc
 share/roundcube/plugins/hide_blockquote/localization/nb_NO.inc
@@ -529,9 +588,11 @@ share/roundcube/plugins/hide_blockquote/
 share/roundcube/plugins/hide_blockquote/localization/sq_AL.inc
 share/roundcube/plugins/hide_blockquote/localization/sr_CS.inc
 share/roundcube/plugins/hide_blockquote/localization/sv_SE.inc
+share/roundcube/plugins/hide_blockquote/localization/th_TH.inc
 share/roundcube/plugins/hide_blockquote/localization/tr_TR.inc
 share/roundcube/plugins/hide_blockquote/localization/tzl.inc
 share/roundcube/plugins/hide_blockquote/localization/uk_UA.inc
+share/roundcube/plugins/hide_blockquote/localization/uz.inc
 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
@@ -541,6 +602,10 @@ share/roundcube/plugins/http_authenticat
 share/roundcube/plugins/http_authentication/http_authentication.php
 share/roundcube/plugins/http_authentication/logout.html
 share/roundcube/plugins/http_authentication/tests/HttpAuthentication.php
+share/roundcube/plugins/identicon/composer.json
+share/roundcube/plugins/identicon/identicon.php
+share/roundcube/plugins/identicon/identicon_engine.php
+share/roundcube/plugins/identicon/tests/Identicon.php
 share/roundcube/plugins/identity_select/composer.json
 share/roundcube/plugins/identity_select/identity_select.php
 share/roundcube/plugins/identity_select/tests/IdentitySelect.php
@@ -618,80 +683,61 @@ share/roundcube/plugins/jqueryui/js/i18n
 share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-CN.js
 share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-HK.js
 share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-TW.js
-share/roundcube/plugins/jqueryui/js/jquery-ui-1.10.4.custom.min.js
 share/roundcube/plugins/jqueryui/js/jquery-ui-accessible-datepicker.js
-share/roundcube/plugins/jqueryui/js/jquery.miniColors.min.js
+share/roundcube/plugins/jqueryui/js/jquery-ui.min.js
+share/roundcube/plugins/jqueryui/js/jquery.minicolors.min.js
 share/roundcube/plugins/jqueryui/js/jquery.tagedit.js
 share/roundcube/plugins/jqueryui/tests/Jqueryui.php
-share/roundcube/plugins/jqueryui/themes/classic/images/animated-overlay.gif
 share/roundcube/plugins/jqueryui/themes/classic/images/buttongradient.png
 share/roundcube/plugins/jqueryui/themes/classic/images/listheader.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_flat_75_ffffff_40x100.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_flat_90_cc3333_40x100.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_glass_95_fef1ec_1x400.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_000000_256x240.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
-share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
-share/roundcube/plugins/jqueryui/themes/classic/jquery-ui-1.10.4.custom.css
-share/roundcube/plugins/jqueryui/themes/classic/roundcube-custom.diff
+share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_444444_256x240.png
+share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_555555_256x240.png
+share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_777620_256x240.png
+share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_777777_256x240.png
+share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_cc0000_256x240.png
+share/roundcube/plugins/jqueryui/themes/classic/images/ui-icons_ffffff_256x240.png
+share/roundcube/plugins/jqueryui/themes/classic/jquery-ui.css
+share/roundcube/plugins/jqueryui/themes/classic/jquery-ui.css.diff
 share/roundcube/plugins/jqueryui/themes/larry/images/animated-overlay.gif
-share/roundcube/plugins/jqueryui/themes/larry/images/minicolors-all.png
-share/roundcube/plugins/jqueryui/themes/larry/images/minicolors-handles.gif
+share/roundcube/plugins/jqueryui/themes/larry/images/jquery.minicolors.png
 share/roundcube/plugins/jqueryui/themes/larry/images/ui-dialog-close.png
 share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png
-share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png
-share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png
-share/roundcube/plugins/jqueryui/themes/larry/jquery-ui-1.10.4.custom.css
-share/roundcube/plugins/jqueryui/themes/larry/jquery-ui-css.diff
-share/roundcube/plugins/jqueryui/themes/larry/jquery.miniColors.css
+share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_444444_256x240.png
+share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_555555_256x240.png
+share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_777620_256x240.png
+share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_777777_256x240.png
+share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_cc0000_256x240.png
+share/roundcube/plugins/jqueryui/themes/larry/images/ui-icons_ffffff_256x240.png
+share/roundcube/plugins/jqueryui/themes/larry/jquery-ui.css
+share/roundcube/plugins/jqueryui/themes/larry/jquery-ui.css.diff
+share/roundcube/plugins/jqueryui/themes/larry/jquery.minicolors.css
 share/roundcube/plugins/jqueryui/themes/larry/tagedit.css
-share/roundcube/plugins/jqueryui/themes/redmond/images/animated-overlay.gif
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_flat_55_fbec88_40x100.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_217bc0_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_2e83ff_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_469bdd_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_6da8d5_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_cd0a0a_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_d8e7f3_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_f9bd01_256x240.png
-share/roundcube/plugins/jqueryui/themes/redmond/jquery-ui-1.10.4.custom.css
 share/roundcube/plugins/krb_authentication/krb_authentication.php
 share/roundcube/plugins/krb_authentication/tests/KrbAuthentication.php
-share/roundcube/plugins/legacy_browser/composer.json
-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/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/iehacks.css
-share/roundcube/plugins/legacy_browser/skins/larry/images/buttons.gif
-share/roundcube/plugins/legacy_browser/tests/LegacyBrowser.php
 share/roundcube/plugins/managesieve/Changelog
+share/roundcube/plugins/managesieve/codemirror/addon/selection/active-line.js
+share/roundcube/plugins/managesieve/codemirror/addon/selection/mark-selection.js
+share/roundcube/plugins/managesieve/codemirror/addon/selection/selection-pointer.js
+share/roundcube/plugins/managesieve/codemirror/lib/codemirror.css
+share/roundcube/plugins/managesieve/codemirror/lib/codemirror.js
+share/roundcube/plugins/managesieve/codemirror/mode/sieve/index.html
+share/roundcube/plugins/managesieve/codemirror/mode/sieve/sieve.js
 share/roundcube/plugins/managesieve/composer.json
+share/roundcube/plugins/managesieve/helpdocs/en_US/settings-filters.rst
+share/roundcube/plugins/managesieve/helpdocs/en_US/settings-vacation.rst
+share/roundcube/plugins/managesieve/helpdocs/po/settings-filters.pot
+share/roundcube/plugins/managesieve/helpdocs/po/settings-vacation.pot
 share/roundcube/plugins/managesieve/lib/Roundcube/rcube_sieve.php
 share/roundcube/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
 share/roundcube/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
 share/roundcube/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
+share/roundcube/plugins/managesieve/localization/ar.inc
 share/roundcube/plugins/managesieve/localization/ar_SA.inc
 share/roundcube/plugins/managesieve/localization/ast.inc
 share/roundcube/plugins/managesieve/localization/az_AZ.inc
 share/roundcube/plugins/managesieve/localization/be_BE.inc
 share/roundcube/plugins/managesieve/localization/bg_BG.inc
+share/roundcube/plugins/managesieve/localization/bn_BD.inc
 share/roundcube/plugins/managesieve/localization/br.inc
 share/roundcube/plugins/managesieve/localization/bs_BA.inc
 share/roundcube/plugins/managesieve/localization/ca_ES.inc
@@ -716,8 +762,10 @@ share/roundcube/plugins/managesieve/loca
 share/roundcube/plugins/managesieve/localization/fo_FO.inc
 share/roundcube/plugins/managesieve/localization/fr_FR.inc
 share/roundcube/plugins/managesieve/localization/fy_NL.inc
+share/roundcube/plugins/managesieve/localization/ga_IE.inc
 share/roundcube/plugins/managesieve/localization/gl_ES.inc
 share/roundcube/plugins/managesieve/localization/he_IL.inc
+share/roundcube/plugins/managesieve/localization/hi_IN.inc
 share/roundcube/plugins/managesieve/localization/hr_HR.inc
 share/roundcube/plugins/managesieve/localization/hu_HU.inc
 share/roundcube/plugins/managesieve/localization/hy_AM.inc
@@ -727,20 +775,27 @@ share/roundcube/plugins/managesieve/loca
 share/roundcube/plugins/managesieve/localization/it_IT.inc
 share/roundcube/plugins/managesieve/localization/ja_JP.inc
 share/roundcube/plugins/managesieve/localization/ka_GE.inc
+share/roundcube/plugins/managesieve/localization/kab.inc
 share/roundcube/plugins/managesieve/localization/km_KH.inc
+share/roundcube/plugins/managesieve/localization/kn_IN.inc
 share/roundcube/plugins/managesieve/localization/ko_KR.inc
 share/roundcube/plugins/managesieve/localization/ku.inc
+share/roundcube/plugins/managesieve/localization/ku_IQ.inc
 share/roundcube/plugins/managesieve/localization/lb_LU.inc
 share/roundcube/plugins/managesieve/localization/lt_LT.inc
 share/roundcube/plugins/managesieve/localization/lv_LV.inc
+share/roundcube/plugins/managesieve/localization/mk_MK.inc
 share/roundcube/plugins/managesieve/localization/ml_IN.inc
 share/roundcube/plugins/managesieve/localization/mn_MN.inc
 share/roundcube/plugins/managesieve/localization/mr_IN.inc
+share/roundcube/plugins/managesieve/localization/ms_MY.inc
 share/roundcube/plugins/managesieve/localization/nb_NO.inc
+share/roundcube/plugins/managesieve/localization/ne_NP.inc
 share/roundcube/plugins/managesieve/localization/nl_BE.inc
 share/roundcube/plugins/managesieve/localization/nl_NL.inc
 share/roundcube/plugins/managesieve/localization/nn_NO.inc
 share/roundcube/plugins/managesieve/localization/pl_PL.inc
+share/roundcube/plugins/managesieve/localization/ps.inc
 share/roundcube/plugins/managesieve/localization/pt_BR.inc
 share/roundcube/plugins/managesieve/localization/pt_PT.inc
 share/roundcube/plugins/managesieve/localization/ro_RO.inc
@@ -751,10 +806,14 @@ share/roundcube/plugins/managesieve/loca
 share/roundcube/plugins/managesieve/localization/sq_AL.inc
 share/roundcube/plugins/managesieve/localization/sr_CS.inc
 share/roundcube/plugins/managesieve/localization/sv_SE.inc
+share/roundcube/plugins/managesieve/localization/ta_IN.inc
 share/roundcube/plugins/managesieve/localization/th_TH.inc
+share/roundcube/plugins/managesieve/localization/ti.inc
 share/roundcube/plugins/managesieve/localization/tr_TR.inc
 share/roundcube/plugins/managesieve/localization/tzl.inc
 share/roundcube/plugins/managesieve/localization/uk_UA.inc
+share/roundcube/plugins/managesieve/localization/ur_PK.inc
+share/roundcube/plugins/managesieve/localization/uz.inc
 share/roundcube/plugins/managesieve/localization/vi_VN.inc
 share/roundcube/plugins/managesieve/localization/zh_CN.inc
 share/roundcube/plugins/managesieve/localization/zh_TW.inc
@@ -771,6 +830,7 @@ share/roundcube/plugins/managesieve/skin
 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
+share/roundcube/plugins/managesieve/skins/classic/templates/seteditraw.html
 share/roundcube/plugins/managesieve/skins/classic/templates/vacation.html
 share/roundcube/plugins/managesieve/skins/larry/images/add.png
 share/roundcube/plugins/managesieve/skins/larry/images/del.png
@@ -783,6 +843,7 @@ share/roundcube/plugins/managesieve/skin
 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
+share/roundcube/plugins/managesieve/skins/larry/templates/seteditraw.html
 share/roundcube/plugins/managesieve/skins/larry/templates/vacation.html
 share/roundcube/plugins/managesieve/tests/Managesieve.php
 share/roundcube/plugins/managesieve/tests/Parser.php
@@ -792,6 +853,7 @@ share/roundcube/plugins/managesieve/test
 share/roundcube/plugins/managesieve/tests/src/parser.out
 share/roundcube/plugins/managesieve/tests/src/parser_body
 share/roundcube/plugins/managesieve/tests/src/parser_date
+share/roundcube/plugins/managesieve/tests/src/parser_duplicate
 share/roundcube/plugins/managesieve/tests/src/parser_enotify_a
 share/roundcube/plugins/managesieve/tests/src/parser_enotify_b
 share/roundcube/plugins/managesieve/tests/src/parser_imapflags
@@ -816,6 +878,7 @@ share/roundcube/plugins/markasjunk/local
 share/roundcube/plugins/markasjunk/localization/az_AZ.inc
 share/roundcube/plugins/markasjunk/localization/be_BE.inc
 share/roundcube/plugins/markasjunk/localization/bg_BG.inc
+share/roundcube/plugins/markasjunk/localization/bn_BD.inc
 share/roundcube/plugins/markasjunk/localization/br.inc
 share/roundcube/plugins/markasjunk/localization/bs_BA.inc
 share/roundcube/plugins/markasjunk/localization/ca_ES.inc
@@ -840,8 +903,10 @@ share/roundcube/plugins/markasjunk/local
 share/roundcube/plugins/markasjunk/localization/fo_FO.inc
 share/roundcube/plugins/markasjunk/localization/fr_FR.inc
 share/roundcube/plugins/markasjunk/localization/fy_NL.inc
+share/roundcube/plugins/markasjunk/localization/ga_IE.inc
 share/roundcube/plugins/markasjunk/localization/gl_ES.inc
 share/roundcube/plugins/markasjunk/localization/he_IL.inc
+share/roundcube/plugins/markasjunk/localization/hi_IN.inc
 share/roundcube/plugins/markasjunk/localization/hr_HR.inc
 share/roundcube/plugins/markasjunk/localization/hu_HU.inc
 share/roundcube/plugins/markasjunk/localization/hy_AM.inc
@@ -850,20 +915,25 @@ share/roundcube/plugins/markasjunk/local
 share/roundcube/plugins/markasjunk/localization/is_IS.inc
 share/roundcube/plugins/markasjunk/localization/it_IT.inc
 share/roundcube/plugins/markasjunk/localization/ja_JP.inc
+share/roundcube/plugins/markasjunk/localization/ka_GE.inc
 share/roundcube/plugins/markasjunk/localization/km_KH.inc
 share/roundcube/plugins/markasjunk/localization/ko_KR.inc
 share/roundcube/plugins/markasjunk/localization/ku.inc
 share/roundcube/plugins/markasjunk/localization/lb_LU.inc
 share/roundcube/plugins/markasjunk/localization/lt_LT.inc
 share/roundcube/plugins/markasjunk/localization/lv_LV.inc
+share/roundcube/plugins/markasjunk/localization/mk_MK.inc
 share/roundcube/plugins/markasjunk/localization/ml_IN.inc
 share/roundcube/plugins/markasjunk/localization/mn_MN.inc
 share/roundcube/plugins/markasjunk/localization/mr_IN.inc
+share/roundcube/plugins/markasjunk/localization/ms_MY.inc
 share/roundcube/plugins/markasjunk/localization/nb_NO.inc
+share/roundcube/plugins/markasjunk/localization/ne_NP.inc
 share/roundcube/plugins/markasjunk/localization/nl_BE.inc
 share/roundcube/plugins/markasjunk/localization/nl_NL.inc
 share/roundcube/plugins/markasjunk/localization/nn_NO.inc
 share/roundcube/plugins/markasjunk/localization/pl_PL.inc
+share/roundcube/plugins/markasjunk/localization/ps.inc
 share/roundcube/plugins/markasjunk/localization/pt_BR.inc
 share/roundcube/plugins/markasjunk/localization/pt_PT.inc
 share/roundcube/plugins/markasjunk/localization/ro_RO.inc
@@ -874,8 +944,12 @@ share/roundcube/plugins/markasjunk/local
 share/roundcube/plugins/markasjunk/localization/sq_AL.inc
 share/roundcube/plugins/markasjunk/localization/sr_CS.inc
 share/roundcube/plugins/markasjunk/localization/sv_SE.inc
+share/roundcube/plugins/markasjunk/localization/ta_IN.inc
+share/roundcube/plugins/markasjunk/localization/th_TH.inc
+share/roundcube/plugins/markasjunk/localization/ti.inc
 share/roundcube/plugins/markasjunk/localization/tr_TR.inc
 share/roundcube/plugins/markasjunk/localization/uk_UA.inc
+share/roundcube/plugins/markasjunk/localization/uz.inc
 share/roundcube/plugins/markasjunk/localization/vi_VN.inc
 share/roundcube/plugins/markasjunk/localization/zh_CN.inc
 share/roundcube/plugins/markasjunk/localization/zh_TW.inc
@@ -916,6 +990,8 @@ share/roundcube/plugins/new_user_dialog/
 share/roundcube/plugins/new_user_dialog/localization/fi_FI.inc
 share/roundcube/plugins/new_user_dialog/localization/fo_FO.inc
 share/roundcube/plugins/new_user_dialog/localization/fr_FR.inc
+share/roundcube/plugins/new_user_dialog/localization/fy_NL.inc
+share/roundcube/plugins/new_user_dialog/localization/ga_IE.inc
 share/roundcube/plugins/new_user_dialog/localization/gl_ES.inc
 share/roundcube/plugins/new_user_dialog/localization/he_IL.inc
 share/roundcube/plugins/new_user_dialog/localization/hr_HR.inc
@@ -923,6 +999,7 @@ share/roundcube/plugins/new_user_dialog/
 share/roundcube/plugins/new_user_dialog/localization/hy_AM.inc
 share/roundcube/plugins/new_user_dialog/localization/ia.inc
 share/roundcube/plugins/new_user_dialog/localization/id_ID.inc
+share/roundcube/plugins/new_user_dialog/localization/is_IS.inc
 share/roundcube/plugins/new_user_dialog/localization/it_IT.inc
 share/roundcube/plugins/new_user_dialog/localization/ja_JP.inc
 share/roundcube/plugins/new_user_dialog/localization/km_KH.inc
@@ -932,6 +1009,7 @@ share/roundcube/plugins/new_user_dialog/
 share/roundcube/plugins/new_user_dialog/localization/lb_LU.inc
 share/roundcube/plugins/new_user_dialog/localization/lt_LT.inc
 share/roundcube/plugins/new_user_dialog/localization/lv_LV.inc
+share/roundcube/plugins/new_user_dialog/localization/mk_MK.inc
 share/roundcube/plugins/new_user_dialog/localization/ml_IN.inc
 share/roundcube/plugins/new_user_dialog/localization/mn_MN.inc
 share/roundcube/plugins/new_user_dialog/localization/mr_IN.inc
@@ -949,6 +1027,7 @@ share/roundcube/plugins/new_user_dialog/
 share/roundcube/plugins/new_user_dialog/localization/sq_AL.inc
 share/roundcube/plugins/new_user_dialog/localization/sr_CS.inc
 share/roundcube/plugins/new_user_dialog/localization/sv_SE.inc
+share/roundcube/plugins/new_user_dialog/localization/th_TH.inc
 share/roundcube/plugins/new_user_dialog/localization/tr_TR.inc
 share/roundcube/plugins/new_user_dialog/localization/uk_UA.inc
 share/roundcube/plugins/new_user_dialog/localization/vi_VN.inc
@@ -990,6 +1069,7 @@ share/roundcube/plugins/newmail_notifier
 share/roundcube/plugins/newmail_notifier/localization/fo_FO.inc
 share/roundcube/plugins/newmail_notifier/localization/fr_FR.inc
 share/roundcube/plugins/newmail_notifier/localization/fy_NL.inc
+share/roundcube/plugins/newmail_notifier/localization/ga_IE.inc
 share/roundcube/plugins/newmail_notifier/localization/gl_ES.inc
 share/roundcube/plugins/newmail_notifier/localization/he_IL.inc
 share/roundcube/plugins/newmail_notifier/localization/hr_HR.inc
@@ -997,6 +1077,7 @@ share/roundcube/plugins/newmail_notifier
 share/roundcube/plugins/newmail_notifier/localization/hy_AM.inc
 share/roundcube/plugins/newmail_notifier/localization/ia.inc
 share/roundcube/plugins/newmail_notifier/localization/id_ID.inc
+share/roundcube/plugins/newmail_notifier/localization/is_IS.inc
 share/roundcube/plugins/newmail_notifier/localization/it_IT.inc
 share/roundcube/plugins/newmail_notifier/localization/ja_JP.inc
 share/roundcube/plugins/newmail_notifier/localization/km_KH.inc
@@ -1006,6 +1087,7 @@ share/roundcube/plugins/newmail_notifier
 share/roundcube/plugins/newmail_notifier/localization/lb_LU.inc
 share/roundcube/plugins/newmail_notifier/localization/lt_LT.inc
 share/roundcube/plugins/newmail_notifier/localization/lv_LV.inc
+share/roundcube/plugins/newmail_notifier/localization/mk_MK.inc
 share/roundcube/plugins/newmail_notifier/localization/ml_IN.inc
 share/roundcube/plugins/newmail_notifier/localization/mn_MN.inc
 share/roundcube/plugins/newmail_notifier/localization/mr_IN.inc
@@ -1024,9 +1106,11 @@ share/roundcube/plugins/newmail_notifier
 share/roundcube/plugins/newmail_notifier/localization/sq_AL.inc
 share/roundcube/plugins/newmail_notifier/localization/sr_CS.inc
 share/roundcube/plugins/newmail_notifier/localization/sv_SE.inc
+share/roundcube/plugins/newmail_notifier/localization/th_TH.inc
 share/roundcube/plugins/newmail_notifier/localization/ti.inc
 share/roundcube/plugins/newmail_notifier/localization/tr_TR.inc
 share/roundcube/plugins/newmail_notifier/localization/uk_UA.inc
+share/roundcube/plugins/newmail_notifier/localization/uz.inc
 share/roundcube/plugins/newmail_notifier/localization/vi_VN.inc
 share/roundcube/plugins/newmail_notifier/localization/zh_CN.inc
 share/roundcube/plugins/newmail_notifier/localization/zh_TW.inc
@@ -1075,6 +1159,8 @@ share/roundcube/plugins/subscriptions_op
 share/roundcube/plugins/subscriptions_option/localization/fi_FI.inc
 share/roundcube/plugins/subscriptions_option/localization/fo_FO.inc
 share/roundcube/plugins/subscriptions_option/localization/fr_FR.inc
+share/roundcube/plugins/subscriptions_option/localization/fy_NL.inc
+share/roundcube/plugins/subscriptions_option/localization/ga_IE.inc
 share/roundcube/plugins/subscriptions_option/localization/gl_ES.inc
 share/roundcube/plugins/subscriptions_option/localization/he_IL.inc
 share/roundcube/plugins/subscriptions_option/localization/hr_HR.inc
@@ -1091,6 +1177,7 @@ share/roundcube/plugins/subscriptions_op
 share/roundcube/plugins/subscriptions_option/localization/lb_LU.inc
 share/roundcube/plugins/subscriptions_option/localization/lt_LT.inc
 share/roundcube/plugins/subscriptions_option/localization/lv_LV.inc
+share/roundcube/plugins/subscriptions_option/localization/mk_MK.inc
 share/roundcube/plugins/subscriptions_option/localization/ml_IN.inc
 share/roundcube/plugins/subscriptions_option/localization/mn_MN.inc
 share/roundcube/plugins/subscriptions_option/localization/nb_NO.inc
@@ -1106,8 +1193,10 @@ share/roundcube/plugins/subscriptions_op
 share/roundcube/plugins/subscriptions_option/localization/sq_AL.inc
 share/roundcube/plugins/subscriptions_option/localization/sr_CS.inc
 share/roundcube/plugins/subscriptions_option/localization/sv_SE.inc
+share/roundcube/plugins/subscriptions_option/localization/th_TH.inc
 share/roundcube/plugins/subscriptions_option/localization/tr_TR.inc
 share/roundcube/plugins/subscriptions_option/localization/uk_UA.inc
+share/roundcube/plugins/subscriptions_option/localization/uz.inc
 share/roundcube/plugins/subscriptions_option/localization/vi_VN.inc
 share/roundcube/plugins/subscriptions_option/localization/zh_CN.inc
 share/roundcube/plugins/subscriptions_option/localization/zh_TW.inc
@@ -1144,6 +1233,7 @@ share/roundcube/plugins/userinfo/localiz
 share/roundcube/plugins/userinfo/localization/fo_FO.inc
 share/roundcube/plugins/userinfo/localization/fr_FR.inc
 share/roundcube/plugins/userinfo/localization/fy_NL.inc
+share/roundcube/plugins/userinfo/localization/ga_IE.inc
 share/roundcube/plugins/userinfo/localization/gl_ES.inc
 share/roundcube/plugins/userinfo/localization/he_IL.inc
 share/roundcube/plugins/userinfo/localization/hr_HR.inc
@@ -1161,6 +1251,7 @@ share/roundcube/plugins/userinfo/localiz
 share/roundcube/plugins/userinfo/localization/lb_LU.inc
 share/roundcube/plugins/userinfo/localization/lt_LT.inc
 share/roundcube/plugins/userinfo/localization/lv_LV.inc
+share/roundcube/plugins/userinfo/localization/mk_MK.inc
 share/roundcube/plugins/userinfo/localization/ml_IN.inc
 share/roundcube/plugins/userinfo/localization/mn_MN.inc
 share/roundcube/plugins/userinfo/localization/mr_IN.inc
@@ -1178,9 +1269,11 @@ share/roundcube/plugins/userinfo/localiz
 share/roundcube/plugins/userinfo/localization/sq_AL.inc
 share/roundcube/plugins/userinfo/localization/sr_CS.inc
 share/roundcube/plugins/userinfo/localization/sv_SE.inc
+share/roundcube/plugins/userinfo/localization/th_TH.inc
 share/roundcube/plugins/userinfo/localization/ti.inc
 share/roundcube/plugins/userinfo/localization/tr_TR.inc
 share/roundcube/plugins/userinfo/localization/uk_UA.inc
+share/roundcube/plugins/userinfo/localization/uz.inc
 share/roundcube/plugins/userinfo/localization/vi_VN.inc
 share/roundcube/plugins/userinfo/localization/zh_CN.inc
 share/roundcube/plugins/userinfo/localization/zh_TW.inc
@@ -1216,6 +1309,8 @@ share/roundcube/plugins/vcard_attachment
 share/roundcube/plugins/vcard_attachments/localization/fi_FI.inc
 share/roundcube/plugins/vcard_attachments/localization/fo_FO.inc
 share/roundcube/plugins/vcard_attachments/localization/fr_FR.inc
+share/roundcube/plugins/vcard_attachments/localization/fy_NL.inc
+share/roundcube/plugins/vcard_attachments/localization/ga_IE.inc
 share/roundcube/plugins/vcard_attachments/localization/gl_ES.inc
 share/roundcube/plugins/vcard_attachments/localization/he_IL.inc
 share/roundcube/plugins/vcard_attachments/localization/hr_HR.inc
@@ -1223,6 +1318,7 @@ share/roundcube/plugins/vcard_attachment
 share/roundcube/plugins/vcard_attachments/localization/hy_AM.inc
 share/roundcube/plugins/vcard_attachments/localization/ia.inc
 share/roundcube/plugins/vcard_attachments/localization/id_ID.inc
+share/roundcube/plugins/vcard_attachments/localization/is_IS.inc
 share/roundcube/plugins/vcard_attachments/localization/it_IT.inc
 share/roundcube/plugins/vcard_attachments/localization/ja_JP.inc
 share/roundcube/plugins/vcard_attachments/localization/km_KH.inc
@@ -1231,6 +1327,7 @@ share/roundcube/plugins/vcard_attachment
 share/roundcube/plugins/vcard_attachments/localization/lb_LU.inc
 share/roundcube/plugins/vcard_attachments/localization/lt_LT.inc
 share/roundcube/plugins/vcard_attachments/localization/lv_LV.inc
+share/roundcube/plugins/vcard_attachments/localization/mk_MK.inc
 share/roundcube/plugins/vcard_attachments/localization/ml_IN.inc
 share/roundcube/plugins/vcard_attachments/localization/mn_MN.inc
 share/roundcube/plugins/vcard_attachments/localization/mr_IN.inc
@@ -1248,8 +1345,10 @@ share/roundcube/plugins/vcard_attachment
 share/roundcube/plugins/vcard_attachments/localization/sq_AL.inc
 share/roundcube/plugins/vcard_attachments/localization/sr_CS.inc
 share/roundcube/plugins/vcard_attachments/localization/sv_SE.inc
+share/roundcube/plugins/vcard_attachments/localization/th_TH.inc
 share/roundcube/plugins/vcard_attachments/localization/tr_TR.inc
 share/roundcube/plugins/vcard_attachments/localization/uk_UA.inc
+share/roundcube/plugins/vcard_attachments/localization/uz.inc
 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
@@ -1268,7 +1367,6 @@ share/roundcube/plugins/virtuser_file/vi
 share/roundcube/plugins/virtuser_query/composer.json
 share/roundcube/plugins/virtuser_query/tests/VirtuserQuery.php
 share/roundcube/plugins/virtuser_query/virtuser_query.php
-share/roundcube/program/include/bc.php
 share/roundcube/program/include/clisetup.php
 share/roundcube/program/include/iniset.php
 share/roundcube/program/include/rcmail.php
@@ -1289,20 +1387,16 @@ share/roundcube/program/js/jstz.min.js
 share/roundcube/program/js/list.js
 share/roundcube/program/js/publickey.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
 share/roundcube/program/js/tinymce/langs/be.js
 share/roundcube/program/js/tinymce/langs/bg_BG.js
-share/roundcube/program/js/tinymce/langs/bn_BD.js
 share/roundcube/program/js/tinymce/langs/bs.js
 share/roundcube/program/js/tinymce/langs/ca.js
 share/roundcube/program/js/tinymce/langs/cs.js
 share/roundcube/program/js/tinymce/langs/cs_CZ.js
-share/roundcube/program/js/tinymce/langs/cy.js
 share/roundcube/program/js/tinymce/langs/da.js
 share/roundcube/program/js/tinymce/langs/de.js
 share/roundcube/program/js/tinymce/langs/de_AT.js
-share/roundcube/program/js/tinymce/langs/dv.js
 share/roundcube/program/js/tinymce/langs/el.js
 share/roundcube/program/js/tinymce/langs/en_CA.js
 share/roundcube/program/js/tinymce/langs/en_GB.js
@@ -1331,9 +1425,7 @@ share/roundcube/program/js/tinymce/langs
 share/roundcube/program/js/tinymce/langs/ja.js
 share/roundcube/program/js/tinymce/langs/ka_GE.js
 share/roundcube/program/js/tinymce/langs/kab.js
-share/roundcube/program/js/tinymce/langs/kk.js
 share/roundcube/program/js/tinymce/langs/km_KH.js
-share/roundcube/program/js/tinymce/langs/ko.js
 share/roundcube/program/js/tinymce/langs/ko_KR.js
 share/roundcube/program/js/tinymce/langs/ku.js
 share/roundcube/program/js/tinymce/langs/ku_IQ.js
@@ -1341,21 +1433,18 @@ share/roundcube/program/js/tinymce/langs
 share/roundcube/program/js/tinymce/langs/lt.js
 share/roundcube/program/js/tinymce/langs/lv.js
 share/roundcube/program/js/tinymce/langs/mk_MK.js
-share/roundcube/program/js/tinymce/langs/ml.js
 share/roundcube/program/js/tinymce/langs/ml_IN.js
-share/roundcube/program/js/tinymce/langs/mn_MN.js
 share/roundcube/program/js/tinymce/langs/nb_NO.js
 share/roundcube/program/js/tinymce/langs/nl.js
+share/roundcube/program/js/tinymce/langs/oc.js
 share/roundcube/program/js/tinymce/langs/pl.js
 share/roundcube/program/js/tinymce/langs/pt_BR.js
 share/roundcube/program/js/tinymce/langs/pt_PT.js
+share/roundcube/program/js/tinymce/langs/readme.md
 share/roundcube/program/js/tinymce/langs/ro.js
-share/roundcube/program/js/tinymce/langs/ru_RU.js
-share/roundcube/program/js/tinymce/langs/si_LK.js
+share/roundcube/program/js/tinymce/langs/ru.js
 share/roundcube/program/js/tinymce/langs/sk.js
 share/roundcube/program/js/tinymce/langs/sl_SI.js
-share/roundcube/program/js/tinymce/langs/sq.js
-share/roundcube/program/js/tinymce/langs/sr.js
 share/roundcube/program/js/tinymce/langs/sv_SE.js
 share/roundcube/program/js/tinymce/langs/ta.js
 share/roundcube/program/js/tinymce/langs/ta_IN.js
@@ -1371,7 +1460,6 @@ share/roundcube/program/js/tinymce/langs
 share/roundcube/program/js/tinymce/langs/vi_VN.js
 share/roundcube/program/js/tinymce/langs/zh_CN.js
 share/roundcube/program/js/tinymce/langs/zh_TW.js
-share/roundcube/program/js/tinymce/license.txt
 share/roundcube/program/js/tinymce/plugins/advlist/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/anchor/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/autolink/plugin.min.js
@@ -1380,6 +1468,8 @@ share/roundcube/program/js/tinymce/plugi
 share/roundcube/program/js/tinymce/plugins/bbcode/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/charmap/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/code/plugin.min.js
+share/roundcube/program/js/tinymce/plugins/codesample/css/prism.css
+share/roundcube/program/js/tinymce/plugins/codesample/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/colorpicker/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/contextmenu/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/directionality/plugin.min.js
@@ -1400,17 +1490,19 @@ share/roundcube/program/js/tinymce/plugi
 share/roundcube/program/js/tinymce/plugins/emoticons/img/smiley-wink.gif
 share/roundcube/program/js/tinymce/plugins/emoticons/img/smiley-yell.gif
 share/roundcube/program/js/tinymce/plugins/emoticons/plugin.min.js
+share/roundcube/program/js/tinymce/plugins/example/dialog.html
+share/roundcube/program/js/tinymce/plugins/example/plugin.min.js
+share/roundcube/program/js/tinymce/plugins/example_dependency/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/fullpage/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/fullscreen/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/hr/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/image/plugin.min.js
+share/roundcube/program/js/tinymce/plugins/imagetools/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/importcss/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/insertdatetime/plugin.min.js
-share/roundcube/program/js/tinymce/plugins/layer/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/legacyoutput/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/link/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/lists/plugin.min.js
-share/roundcube/program/js/tinymce/plugins/media/moxieplayer.swf
 share/roundcube/program/js/tinymce/plugins/media/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/nonbreaking/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/noneditable/plugin.min.js
@@ -1425,22 +1517,18 @@ share/roundcube/program/js/tinymce/plugi
 share/roundcube/program/js/tinymce/plugins/table/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/template/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/textcolor/plugin.min.js
+share/roundcube/program/js/tinymce/plugins/textpattern/plugin.min.js
+share/roundcube/program/js/tinymce/plugins/toc/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/visualblocks/css/visualblocks.css
 share/roundcube/program/js/tinymce/plugins/visualblocks/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/visualchars/plugin.min.js
 share/roundcube/program/js/tinymce/plugins/wordcount/plugin.min.js
-share/roundcube/program/js/tinymce/roundcube/browser.css
-share/roundcube/program/js/tinymce/roundcube/content.css
-share/roundcube/program/js/tinymce/roundcube/video.png
 share/roundcube/program/js/tinymce/skins/lightgray/content.inline.min.css
 share/roundcube/program/js/tinymce/skins/lightgray/content.min.css
-share/roundcube/program/js/tinymce/skins/lightgray/fonts/readme.md
-share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce-small.eot
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce-small.svg
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce-small.woff
-share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce.dev.svg
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce.eot
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce.svg
 share/roundcube/program/js/tinymce/skins/lightgray/fonts/tinymce.ttf
@@ -1451,6 +1539,7 @@ share/roundcube/program/js/tinymce/skins
 share/roundcube/program/js/tinymce/skins/lightgray/img/trans.gif
 share/roundcube/program/js/tinymce/skins/lightgray/skin.ie7.min.css
 share/roundcube/program/js/tinymce/skins/lightgray/skin.min.css
+share/roundcube/program/js/tinymce/themes/inlite/theme.min.js
 share/roundcube/program/js/tinymce/themes/modern/theme.min.js
 share/roundcube/program/js/tinymce/tinymce.min.js
 share/roundcube/program/js/treelist.js
@@ -1517,6 +1606,7 @@ share/roundcube/program/lib/Roundcube/rc
 share/roundcube/program/lib/Roundcube/rcube_vcard.php
 share/roundcube/program/lib/Roundcube/rcube_washtml.php
 share/roundcube/program/localization/ar/labels.inc
+share/roundcube/program/localization/ar/messages.inc
 share/roundcube/program/localization/ar_SA/labels.inc
 share/roundcube/program/localization/ar_SA/messages.inc
 share/roundcube/program/localization/ast/labels.inc
@@ -1612,6 +1702,7 @@ share/roundcube/program/localization/ja_
 share/roundcube/program/localization/ja_JP/messages.inc
 share/roundcube/program/localization/ka_GE/labels.inc
 share/roundcube/program/localization/ka_GE/messages.inc
+share/roundcube/program/localization/kab/labels.inc
 share/roundcube/program/localization/km_KH/labels.inc
 share/roundcube/program/localization/km_KH/messages.inc
 share/roundcube/program/localization/kn_IN/labels.inc
@@ -1653,6 +1744,7 @@ share/roundcube/program/localization/pl_
 share/roundcube/program/localization/pl_PL/messages.inc
 share/roundcube/program/localization/ps/labels.inc
 share/roundcube/program/localization/ps/messages.inc
+share/roundcube/program/localization/pt_BR/csv2vcard.inc
 share/roundcube/program/localization/pt_BR/labels.inc
 share/roundcube/program/localization/pt_BR/messages.inc
 share/roundcube/program/localization/pt_PT/labels.inc
@@ -1684,9 +1776,11 @@ share/roundcube/program/localization/ti/
 share/roundcube/program/localization/tr_TR/labels.inc
 share/roundcube/program/localization/tr_TR/messages.inc
 share/roundcube/program/localization/tzl/labels.inc
+share/roundcube/program/localization/tzl/messages.inc
 share/roundcube/program/localization/uk_UA/labels.inc
 share/roundcube/program/localization/uk_UA/messages.inc
 share/roundcube/program/localization/ur_PK/labels.inc
+share/roundcube/program/localization/uz/labels.inc
 share/roundcube/program/localization/uz/messages.inc
 share/roundcube/program/localization/vi_VN/labels.inc
 share/roundcube/program/localization/vi_VN/messages.inc
@@ -1696,9 +1790,13 @@ share/roundcube/program/localization/zh_
 share/roundcube/program/localization/zh_TW/labels.inc
 share/roundcube/program/localization/zh_TW/messages.inc
 share/roundcube/program/resources/blank.gif
-share/roundcube/program/resources/blank.tif
+share/roundcube/program/resources/blank.tiff
+share/roundcube/program/resources/blank.webp
 share/roundcube/program/resources/blocked.gif
 share/roundcube/program/resources/dummy.pdf
+share/roundcube/program/resources/tinymce/browser.css
+share/roundcube/program/resources/tinymce/content.css
+share/roundcube/program/resources/tinymce/video.png
 share/roundcube/program/steps/addressbook/copy.inc
 share/roundcube/program/steps/addressbook/delete.inc
 share/roundcube/program/steps/addressbook/edit.inc
@@ -1711,6 +1809,7 @@ share/roundcube/program/steps/addressboo
 share/roundcube/program/steps/addressbook/move.inc
 share/roundcube/program/steps/addressbook/photo.inc
 share/roundcube/program/steps/addressbook/print.inc
+share/roundcube/program/steps/addressbook/qrcode.inc
 share/roundcube/program/steps/addressbook/save.inc
 share/roundcube/program/steps/addressbook/search.inc
 share/roundcube/program/steps/addressbook/show.inc
@@ -1760,7 +1859,6 @@ share/roundcube/program/steps/utils/save
 share/roundcube/program/steps/utils/spell.inc
 share/roundcube/program/steps/utils/spell_html.inc
 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/common.css
@@ -1892,11 +1990,7 @@ share/roundcube/skins/larry/images/googi
 share/roundcube/skins/larry/images/googiespell/indicator.gif
 share/roundcube/skins/larry/images/googiespell/ok.gif
 share/roundcube/skins/larry/images/googiespell/spellc.gif
-share/roundcube/skins/larry/images/linen.jpg
-share/roundcube/skins/larry/images/linen_header.jpg
-share/roundcube/skins/larry/images/linen_login.jpg
 share/roundcube/skins/larry/images/listicons.png
-share/roundcube/skins/larry/images/login_shadow.png
 share/roundcube/skins/larry/images/messages.png
 share/roundcube/skins/larry/images/messages_dark.png
 share/roundcube/skins/larry/images/overflowshadow.png
@@ -1915,8 +2009,6 @@ share/roundcube/skins/larry/meta.json
 share/roundcube/skins/larry/print.css
 share/roundcube/skins/larry/settings.css
 share/roundcube/skins/larry/styles.css
-share/roundcube/skins/larry/svggradient.php
-share/roundcube/skins/larry/svggradients.css
 share/roundcube/skins/larry/templates/about.html
 share/roundcube/skins/larry/templates/addressbook.html
 share/roundcube/skins/larry/templates/compose.html

Index: pkgsrc/mail/roundcube/distinfo
diff -u pkgsrc/mail/roundcube/distinfo:1.60 pkgsrc/mail/roundcube/distinfo:1.61
--- pkgsrc/mail/roundcube/distinfo:1.60 Mon Apr 30 06:45:03 2018
+++ pkgsrc/mail/roundcube/distinfo      Wed May 16 08:14:40 2018
@@ -1,11 +1,34 @@
-$NetBSD: distinfo,v 1.60 2018/04/30 06:45:03 taca Exp $
+$NetBSD: distinfo,v 1.61 2018/05/16 08:14:40 triaxx Exp $
 
-SHA1 (roundcubemail-1.2.9.tar.gz) = dd27b89ae04a6a6c04c0109395e85d098af6cc33
-RMD160 (roundcubemail-1.2.9.tar.gz) = e57fa96c3e406a2c61c56de70f02fbc5ee4a2bc3
-SHA512 (roundcubemail-1.2.9.tar.gz) = b284b1969ad603fc3dd4dbf1dec271dd0d0a22a1dd139c78fd4bc12171f7e94a1b05c15e3926299ca17f39b5dd70b4eaa3bf22e494a7a8e2173a2211d0324f4d
-Size (roundcubemail-1.2.9.tar.gz) = 3539037 bytes
-SHA1 (patch-ac) = 235116580665d5d58edc218c063b41171a2d9227
+SHA1 (roundcube/codemirror-5.21.0.zip) = 3b767c2e3acd6796e54ed19ed2ac0755fcf87984
+RMD160 (roundcube/codemirror-5.21.0.zip) = 3c629362a2a6c31aee099811b4598ba22e2fd763
+SHA512 (roundcube/codemirror-5.21.0.zip) = e80bc2f66e49acc9c618237ceec5fe526a4bcb91acfd3035e82cef1a9313531a8dda5d8caec00ffe4e507266e2846e44e0562e8fe567415ef650cfcca7b9c659
+Size (roundcube/codemirror-5.21.0.zip) = 1356111 bytes
+SHA1 (roundcube/jquery-3.2.1.min.js) = 1055018c28ab41087ef9ccefe411606893dabea2
+RMD160 (roundcube/jquery-3.2.1.min.js) = 3e2258f10b8d26c43b80b378db356dccb13f1e01
+SHA512 (roundcube/jquery-3.2.1.min.js) = dcff2b5c2b8625d3593a7531ff4ddcd633939cc9f7acfeb79c18a9e6038fdaa99487960075502f159d44f902d965b0b5aed32b41bfa66a1dc07d85b5d5152b58
+Size (roundcube/jquery-3.2.1.min.js) = 86659 bytes
+SHA1 (roundcube/jstz.min.js) = 4291cd3b259d2060460c2a6ab99f428d3c0c9537
+RMD160 (roundcube/jstz.min.js) = 7e1561a667d51e879eb79d57e6e69971c7e27bd8
+SHA512 (roundcube/jstz.min.js) = 5de18a936d531d252ce82c3dc55661e5e8595ea39506a26f3d47ee625bf3de101194bfa681da43f1103e9e96dd4047858a2b4228ce67ad1eecc13cebfa09188a
+Size (roundcube/jstz.min.js) = 12076 bytes
+SHA1 (roundcube/publickey.js) = d0920e190754e024c4be76ad5bbc7e76b2e37a4d
+RMD160 (roundcube/publickey.js) = 40ae054af69c621c77a24e7a77f6280b1c630c23
+SHA512 (roundcube/publickey.js) = 443bb71b2e374e2c392ea2fba61ea1c5a78523aa9cf03846dc184ac937d967cf2f87f27529aaf82f0c982cb26b3d6423b202f6424eaf8d10c7478928b6efaa42
+Size (roundcube/publickey.js) = 19078 bytes
+SHA1 (roundcube/roundcubemail-1.3.6.tar.gz) = 16b4e8c90686cb5d9559dc4f73e1e59382cc040f
+RMD160 (roundcube/roundcubemail-1.3.6.tar.gz) = c732b3be00b02eb6201ce799963bb8396ccd9bd2
+SHA512 (roundcube/roundcubemail-1.3.6.tar.gz) = e625ee69702d51ac4da53ec419324068a3706547db4cd1e48c877706a5e2b768e9562d2bc461f5ae270a9278e7ef45bf4d9cf26cb8ee609ea412e8e4a3a7b00d
+Size (roundcube/roundcubemail-1.3.6.tar.gz) = 3123479 bytes
+SHA1 (roundcube/tinymce_4.5.8.zip) = 08b0757264adb86066940bbafb7aa9ec0c7c6685
+RMD160 (roundcube/tinymce_4.5.8.zip) = 68217fd86a7b359f2a3f233fd64f6d24ca0e6d53
+SHA512 (roundcube/tinymce_4.5.8.zip) = 5d0d9315f226730394e5fb13f2ed19edcc974adb34533437d4fb2b35ec5a77368d37a3c60b39afd5e30beff90f26feb7713d027f1ab0fa708e6a6b597edd4be6
+Size (roundcube/tinymce_4.5.8.zip) = 387375 bytes
+SHA1 (roundcube/tinymce_languages.zip) = 4726119c65c3fcbe7ac1d0d2b3b0cac8f580ad76
+RMD160 (roundcube/tinymce_languages.zip) = 372facd0ca877ad709278cf09b0a72d04556e55a
+SHA512 (roundcube/tinymce_languages.zip) = 5d20984675cbe97e8a0300c9a10c566ad51f712ef6cb1fdb7a019b4e5df19446f2f615f4501bd21ce256b99c7c57a0e80d4e112f553b99e997aec64eb4a95984
+Size (roundcube/tinymce_languages.zip) = 287381 bytes
 SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
 SHA1 (patch-config_config.inc.php.sample) = 1c9751ba36394d592e7d3cdcc705010e0a4adda9
 SHA1 (patch-plugins_password_helpers_passwd-expect) = 9e0082f23e37bbab26e8bb1439668132d5aacca2
-SHA1 (patch-rcube_mime_default) = fe6ff1bea0a2c4223b34e44a6d0ca76e6476d2aa
+SHA1 (patch-rcube_mime_default) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c

Index: pkgsrc/mail/roundcube/options.mk
diff -u pkgsrc/mail/roundcube/options.mk:1.15 pkgsrc/mail/roundcube/options.mk:1.16
--- pkgsrc/mail/roundcube/options.mk:1.15       Tue Sep 13 15:56:01 2016
+++ pkgsrc/mail/roundcube/options.mk    Wed May 16 08:14:40 2018
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.15 2016/09/13 15:56:01 taca Exp $
+# $NetBSD: options.mk,v 1.16 2018/05/16 08:14:40 triaxx Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.roundcube
 
 PKG_OPTIONS_REQUIRED_GROUPS=   db webserver
 PKG_OPTIONS_GROUP.db=          mysql pgsql sqlite
-PKG_OPTIONS_GROUP.webserver=   apache nginx
+PKG_OPTIONS_GROUP.webserver=   apache lighttpd nginx
 
 PKG_SUPPORTED_OPTIONS=         ldap iconv php-sockets gd
 PKG_SUGGESTED_OPTIONS=         mysql iconv php-sockets gd apache
@@ -45,21 +45,28 @@ DEPENDS+=   ${PHP_PKG_PREFIX}-iconv>=4.3.1
 ### Use apache web server
 ###
 .if !empty(PKG_OPTIONS:Mapache)
-WWW_USER?=              ${APACHE_USER}
-WWW_GROUP?=             ${APACHE_GROUP}
+WWW_USER?=             ${APACHE_USER}
+WWW_GROUP?=            ${APACHE_GROUP}
 BUILD_DEFS+=           APACHE_USER APACHE_GROUP
-WWW_CONF_FILE?=                apache.conf
 .include "../../mk/apache.mk"
 .endif
 
 ###
+### Use lighttpd web server
+###
+.if !empty(PKG_OPTIONS:Mlighttpd)
+DEPENDS+=              lighttpd-[0-9]*:../../www/lighttpd
+WWW_USER?=             lighttpd
+WWW_GROUP?=            lighttpd
+.endif
+
+###
 ### Use nginx web server
 ###
 .if !empty(PKG_OPTIONS:Mnginx)
-DEPENDS+=      nginx-[0-9]*:../../www/nginx
+DEPENDS+=              nginx-[0-9]*:../../www/nginx
 WWW_USER?=             nginx
 WWW_GROUP?=            nginx
-WWW_CONF_FILE?=                nginx.conf
 .endif
 
 ###

Index: pkgsrc/mail/roundcube/files/apache.conf
diff -u pkgsrc/mail/roundcube/files/apache.conf:1.1 pkgsrc/mail/roundcube/files/apache.conf:1.2
--- pkgsrc/mail/roundcube/files/apache.conf:1.1 Mon Aug 31 15:31:27 2015
+++ pkgsrc/mail/roundcube/files/apache.conf     Wed May 16 08:14:41 2018
@@ -1,26 +1,25 @@
-# $NetBSD: apache.conf,v 1.1 2015/08/31 15:31:27 taca Exp $
+# $NetBSD: apache.conf,v 1.2 2018/05/16 08:14:41 triaxx Exp $
 #
-# RoundCube configuration file fragment for Apache
+# RoundCube example fragment for www/apache24
 
 <IfModule mod_alias.c>
-    Alias /roundcube "@RCDIR@/"
+       Alias /roundcube "@RCDIR@/"
 </IfModule>
 
 # Don't forget to adapt the configuration in @RCDIR@/.htaccess
 # to your liking.
 <Directory "@RCDIR@">
-    AllowOverride All
-    DirectoryIndex index.php
-<IfModule !mod_authz_core.c>
-    Order allow,deny
-    Allow from all
-</IfModule>
-<IfModule mod_authz_core.c>
-    Require all granted
-</IfModule>
+       AllowOverride All
+       DirectoryIndex index.php
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 </Directory>
 
-#
 # For security, don't serve pages from the roundcube installer directory.
 #
 # If you are using the installer to setup roundcube you will need access to
@@ -29,6 +28,6 @@
 # access to that directory.
 #
 #<Directory "@RCDIR@/installer">
-#    Order deny,allow
-#    Deny from all
+#      Order deny,allow
+#      Deny from all
 #</Directory>
Index: pkgsrc/mail/roundcube/files/nginx.conf
diff -u pkgsrc/mail/roundcube/files/nginx.conf:1.1 pkgsrc/mail/roundcube/files/nginx.conf:1.2
--- pkgsrc/mail/roundcube/files/nginx.conf:1.1  Mon Aug 31 15:31:27 2015
+++ pkgsrc/mail/roundcube/files/nginx.conf      Wed May 16 08:14:41 2018
@@ -1,17 +1,16 @@
-# $NetBSD: nginx.conf,v 1.1 2015/08/31 15:31:27 taca Exp $
+# $NetBSD: nginx.conf,v 1.2 2018/05/16 08:14:41 triaxx Exp $
 #
-# RoundCube configuration file fragment for nginx
+# RoundCube example fragment for www/nginx
 
 server {
-    location /roundube {
-        root @RCDIR@;
-        index index.php;
-    }
-
-    location ~ \.php$ {
-        include @PKG_SYSCONFDIR@/fastcgi_params;
-        fastcgi_pass unix:@VARBASE@/run/php-fpm.sock;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_index index.php;
-    }
+       location /roundube {
+               root @RCDIR@;
+               index index.php;
+       }
+       location ~ \.php$ {
+               include @PKG_SYSCONFDIR@/fastcgi_params;
+               fastcgi_pass unix:@VARBASE@/run/roundcube.sock;
+               fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+               fastcgi_index index.php;
+       }
 }

Index: pkgsrc/mail/roundcube/patches/patch-rcube_mime_default
diff -u pkgsrc/mail/roundcube/patches/patch-rcube_mime_default:1.2 pkgsrc/mail/roundcube/patches/patch-rcube_mime_default:1.3
--- pkgsrc/mail/roundcube/patches/patch-rcube_mime_default:1.2  Sat Dec 26 14:24:48 2015
+++ pkgsrc/mail/roundcube/patches/patch-rcube_mime_default      Wed May 16 08:14:41 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-rcube_mime_default,v 1.2 2015/12/26 14:24:48 taca Exp $
+$NetBSD: patch-rcube_mime_default,v 1.3 2018/05/16 08:14:41 triaxx Exp $
 
 Fix path to /etc/.
 
---- program/lib/Roundcube/rcube_mime.php.orig  2015-12-23 09:18:12.000000000 +0000
+--- program/lib/Roundcube/rcube_mime.php.orig  2018-04-11 11:06:18.000000000 +0000
 +++ program/lib/Roundcube/rcube_mime.php
-@@ -770,12 +770,12 @@ class rcube_mime
+@@ -790,12 +790,12 @@ class rcube_mime
              $file_paths[] = 'C:/xampp/apache/conf/mime.types.';
          }
          else {
@@ -22,4 +22,4 @@ Fix path to /etc/.
 +            $file_paths[] = '@PKG_SYSCONFBASE@/nginx/mime.types';
              $file_paths[] = '/usr/local/etc/httpd/conf/mime.types';
              $file_paths[] = '/usr/local/etc/apache/conf/mime.types';
-         }
+             $file_paths[] = '/usr/local/etc/apache24/mime.types';

Added files:

Index: pkgsrc/mail/roundcube/files/lighttpd.conf
diff -u /dev/null pkgsrc/mail/roundcube/files/lighttpd.conf:1.1
--- /dev/null   Wed May 16 08:14:41 2018
+++ pkgsrc/mail/roundcube/files/lighttpd.conf   Wed May 16 08:14:41 2018
@@ -0,0 +1,28 @@
+# $NetBSD: lighttpd.conf,v 1.1 2018/05/16 08:14:41 triaxx Exp $
+#
+# Roundcube example fragment for www/lighttpd
+# (inspired by @DOCDIR@/INSTALL)
+
+# Following modules need to be loaded:
+#server.modules += (
+#      "mod_fastcgi",
+#      "mod_setenv",
+#      "mod_compress",
+#      "mod_alias",
+#)
+
+$HTTP["url"] =~ "^/roundcube" {
+       alias.url = ( "/roundcube" => "@RCDIR@" )
+       static-file.etags = "enable"
+       etag.use-mtime = "enable"
+       $HTTP["url"] =~ "^/roundcube/(plugins|skins|program)" {
+               setenv.add-response-header  = ( "Cache-Control" => "public, max-age=2592000")
+       }
+       compress.cache-dir = var.cache_dir + "/cache/compress"
+       compress.filetype = ("text/plain", "text/html", "text/javascript", "text/css", "text/xml", "image/gif", "image/png")
+       fastcgi.server = (
+               ".php" => 
+               (( "socket" => var.socket_dir + "/roundcube.sock",
+               )),
+       )
+}

Prev by Date: CVS commit: pkgsrc/www/py-WebOb
Next by Date: CVS commit: pkgsrc/mail/roundcube-plugin-enigma
Previous by Thread: CVS commit: pkgsrc/www/py-WebOb
Next by Thread: CVS commit: pkgsrc/mail/roundcube-plugin-enigma
Indexes:

Home | Main Index | Thread Index | Old Index