Pullup ticket #4862 - requested by taca

mail/roundcube: security fix

Revisions pulled up:
- mail/roundcube/Makefile                                       1.77
- mail/roundcube/PLIST                                          1.38
- mail/roundcube/distinfo                                       1.45
- mail/roundcube/options.mk                                     1.14

---
   Module Name:	pkgsrc
   Committed By:	prlw1
   Date:		Thu Oct 29 15:54:20 UTC 2015

   Modified Files:
   	pkgsrc/mail/roundcube: Makefile PLIST distinfo options.mk

   Log Message:
   Update roundcube to 1.1.3

   ok taca@

   Since Makefile 1.59, the iconv option had no effect - reinstate iconv as
   being optional.

   This update to 1.1.3 makes multibyte and openssl a requirement (and drops
   mcrypt support).

   RELEASE 1.1.3
   -------------
   - Fix closing of nested menus (#1490443)
   - Fix so E_DEPRECATED errors from PEAR libs are ignored by error_reporting change (#1490281)
   - Fix compatibility with PHP 5.3 in rcube_ldap class (#1490424)
   - Get rid of Mail_mimeDecode package dependency (#1490416)
   - Fix "Importing..." message does not hide on error (#1490422)
   - Fix Compose action in addressbook for results from multiple addressbooks (#1490413)
   - Fix bug where some messages in multi-folder search couldn't be viewed/printed/downloaded (#1490426)
   - Fix unintentional messages list page change on page switch in compose addressbook (#1490427)
   - Fix race-condition in saving user preferences and loading plugin config (#1490431)
   - Fix so plain text signature field uses monospace font (#1490435)
   - Fix so links with href == content aren't added to links list on html to text conversion (#1490434)
   - Fix handling of non-break spaces in html to text conversion (#1490436)
   - Fix self-reply detection issues (#1490439)
   - Fix multi-folder search result sorting by arrival date (#1490450)
   - Fix so *-request@ addresses in Sender: header are also ignored on reply-all (#1490452)
   - Update to TinyMCE 4.1.10 (#1490405)
   - Fix draft removal after a message is sent and storing sent message is disabled (#1490467)
   - Fix so imap folder attribute comparisons are case-insensitive (#1490466)
   - Fix bug where new messages weren't added to the list in search mode
   - Fix wrong positioning of message list header on page scroll in Webkit browsers (#1490035)
   - Fix some javascript errors in rare situations (#1490441)
   - Fix error when using back button after sending an email (#1490009)
   - Fix removing signature when switching to identity with an empty sig in HTML mode (#1490470)
   - Disable links list generation on html-to-text conversion of identities or composed message (#1490437)
   - Fix "washing" of style elements wrapped into many lines
   - Fix so input field (e.g. search box) does not loose focus on list load (#1490455)
   - Fix so css of one html part does not apply to other text parts on message display (#1490505)
   - Fix XSS issue in drag-n-drop file uploads (#1490530)
   - Fix handling of plus character in mailto: links (#1490510)
   - Fix so adding CC/BCC recipients from the sidebar unhides compose form fields in Classic skin (#1490472)
   - Fix so gc.sh script removes also expired sessions from sql database (#1490512)
   - Fix support for Mozilla-based browsers, e.g. Pale Moon (#1490517)
   - Fix various issues with Turkish (and similar) locales (#1490519)
   - Fix so In-Reply-To header is set also for MDN receipts (#1490523)
   - Fix missing HTTP_X_FORWARDED_FOR address in generated Received header
   - Fix issue where Content-Length of some attachments could be set to wrong value causing browser errors (#1490482)

4 files changed, 12 insertions, 21 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 2c80335c4fe..07a5c7d4af0 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2015/08/31 15:31:26 taca Exp $
+# $NetBSD: Makefile,v 1.76.2.1 2015/11/24 19:45:41 bsiegert Exp $
 
-DISTNAME=	roundcubemail-1.1.2
+DISTNAME=	roundcubemail-1.1.3
 PKGNAME=	${DISTNAME:S/mail-/-/}
-PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -11,13 +10,11 @@ HOMEPAGE=	http://roundcube.net/
 COMMENT=	Browser-based multilingual IMAP client
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_BASE_VERS}:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
 DEPENDS+=	${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
-DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=${PHP_BASE_VERS}:../../security/php-mcrypt
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_Sieve>=1.3.2:../../net/pear-Net_Sieve
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 0ceab585364..ead5aad8254 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2015/06/06 14:14:12 taca Exp $
+@comment $NetBSD: PLIST,v 1.37.4.1 2015/11/24 19:45:41 bsiegert Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README.md
@@ -1662,6 +1662,7 @@ share/roundcube/program/lib/Roundcube/rcube_message.php
 share/roundcube/program/lib/Roundcube/rcube_message_header.php
 share/roundcube/program/lib/Roundcube/rcube_message_part.php
 share/roundcube/program/lib/Roundcube/rcube_mime.php
+share/roundcube/program/lib/Roundcube/rcube_mime_decode.php
 share/roundcube/program/lib/Roundcube/rcube_output.php
 share/roundcube/program/lib/Roundcube/rcube_plugin.php
 share/roundcube/program/lib/Roundcube/rcube_plugin_api.php
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 8c06b5d385e..85b4761a444 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.44 2015/06/06 14:14:12 taca Exp $
+$NetBSD: distinfo,v 1.44.4.1 2015/11/24 19:45:41 bsiegert Exp $
 
-SHA1 (roundcubemail-1.1.2.tar.gz) = df88deae691da3ecf3e9f0aee674c1f3042ea1eb
-RMD160 (roundcubemail-1.1.2.tar.gz) = 82e0ff532d52b2d82bf803c2a52d7ff4474916b7
-Size (roundcubemail-1.1.2.tar.gz) = 3203919 bytes
+SHA1 (roundcubemail-1.1.3.tar.gz) = 4513227bd64eb8564f056817341b1dfe478e215e
+RMD160 (roundcubemail-1.1.3.tar.gz) = e4301d85004cc5986743ef16e3c4ea2c3f8dd9fd
+SHA512 (roundcubemail-1.1.3.tar.gz) = be5d64a8d52aa623de614bc1b137ae2f74250de050de086a510114121bcb760b973f8319884395827f324371542b741b80054b90031d8814752bb018dcda2096
+Size (roundcubemail-1.1.3.tar.gz) = 3208502 bytes
 SHA1 (patch-ac) = 235116580665d5d58edc218c063b41171a2d9227
 SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
 SHA1 (patch-config.inc.php) = 20a71b7fd9fbf0a1e097bd17428b9a1a2bed638d
diff --git a/mail/roundcube/options.mk b/mail/roundcube/options.mk
index 4105d834797..9639c1c3e1d 100644
--- a/mail/roundcube/options.mk
+++ b/mail/roundcube/options.mk
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.13 2015/09/13 14:39:37 taca Exp $
+# $NetBSD: options.mk,v 1.13.2.1 2015/11/24 19:45:41 bsiegert Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.roundcube
 
-PKG_OPTIONS_REQUIRED_GROUPS=	db converters webserver
+PKG_OPTIONS_REQUIRED_GROUPS=	db webserver
 PKG_OPTIONS_GROUP.db=		mysql pgsql sqlite
-PKG_OPTIONS_GROUP.converters=	iconv multibyte
 PKG_OPTIONS_GROUP.webserver=	apache nginx
 
-PKG_SUPPORTED_OPTIONS=		ldap sockets gd
+PKG_SUPPORTED_OPTIONS=		ldap iconv sockets gd
 PKG_SUGGESTED_OPTIONS=		mysql iconv sockets gd apache
 
 .include "../../mk/bsd.options.mk"
@@ -41,13 +40,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=4.3.1:../../converters/php-iconv
 .endif
 
 ###
-### Use mbstring.
-###
-.if !empty(PKG_OPTIONS:Mmultibyte)
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../converters/php-mbstring
-.endif
-
-###
 ### Use apache web server
 ###
 .if !empty(PKG_OPTIONS:Mapache)