Pullup ticket #6046 - requested by taca

mail/roundcube, mail/roundcube-plugin-*: security fix

Revisions pulled up:
- mail/roundcube-plugin-enigma/Makefile                         1.6
- mail/roundcube-plugin-enigma/distinfo                         1.14
- mail/roundcube-plugin-password/Makefile                       1.6
- mail/roundcube-plugin-password/distinfo                       1.14
- mail/roundcube-plugin-zipdownload/Makefile                    1.4
- mail/roundcube-plugin-zipdownload/distinfo                    1.14
- mail/roundcube/Makefile.common                                1.14
- mail/roundcube/distinfo                                       1.65

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Sep  1 13:08:09 UTC 2019

   Modified Files:
   	pkgsrc/mail/roundcube: Makefile.common distinfo

   Log Message:
   mail/roundcube: update to 1.3.10

    RELEASE 1.3.10
   --------------
   - Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
   - Fix compatibility with kolab/net_ldap3 > 1.0.7 (#6785)
   - Fix bug where bmp images couldn't be displayed on some systems (#6728)
   - Fix bug in parsing vCard data using PHP 7.3 due to an invalid regexp (#6744)
   - Fix bug where bold/strong text was converted to upper-case on html-to-text conversion (6758)
   - Fix bug in rcube_utils::parse_hosts() where %t, %d, %z could return only tld (#6746)
   - Fix bug where Next/Prev button in mail view didn't work with multi-folder search result (#6793)
   - Fix bug where selection of columns on messages list wasn't working
   - Fix bug in converting multi-page Tiff images to Jpeg (#6824)
   - Fix wrong messages order after returning to a multi-folder search result (#6836)
   - Fix PHP 7.4 deprecation: implode() wrong parameter order (#6866)
   - Fix bug where it was possible to bypass the position:fixed CSS check in received messages (#6898)
   - Fix bug where some strict remote URIs in url() style were unintentionally blocked (#6899)
   - Fix bug where it was possible to bypass the CSS jail in HTML messages using :root pseudo-class (#6897)
   - Fix bug where it was possible to bypass href URI check with data:application/xhtml+xml URIs (#6896)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Sep  1 13:08:56 UTC 2019

   Modified Files:
   	pkgsrc/mail/roundcube-plugin-enigma: Makefile distinfo

   Log Message:
   mail/roundcube-plugin-enigma: update to 1.3.10

    RELEASE 1.3.10
   --------------
   - Enigma: Fix bug where revoked users/keys were not greyed out in key info
   - Enigma: Fix error message when trying to encrypt with a revoked key (#6607)
   - Enigma: Fix "decryption oracle" bug [CVE-2019-10740] (#6638)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Sep  1 13:10:39 UTC 2019

   Modified Files:
   	pkgsrc/mail/roundcube-plugin-password: Makefile distinfo

   Log Message:
   mail/roundcube-plugin-password: update to 1.3.10

   Update roundcube-plugin-password to 1.3.10.  No changes except version.

   pkgsrc change: remove duplicated setting PLUGIN.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Sep  1 13:11:47 UTC 2019

   Modified Files:
   	pkgsrc/mail/roundcube-plugin-zipdownload: Makefile distinfo

   Log Message:
   mail/roundcube-plugin-zipdownload: update to 1.3.10

   Update roundcube-plugin-password to 1.3.10.  No changes except version.

   pkgsrc change: remove duplicated setting PLUGIN.

8 files changed, 30 insertions, 32 deletions

diff --git a/mail/roundcube-plugin-enigma/Makefile b/mail/roundcube-plugin-enigma/Makefile
index ed70f3181c1..261506ad9e6 100644
--- a/mail/roundcube-plugin-enigma/Makefile
+++ b/mail/roundcube-plugin-enigma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/04/30 03:58:45 taca Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
 PLUGIN=		enigma
 
@@ -7,11 +7,9 @@ COMMENT=	Enigma Plugin for Roundcube
 LICENSE=	gnu-gpl-v3
 
 # JavaScript dependencies from bin/install-jsdeps.sh
-SITES.openpgp.min.js=	"https://raw.githubusercontent.com/openpgpjs/openpgpjs/v2.6.2/dist/"
+SITES.openpgp.min.js=	https://raw.githubusercontent.com/openpgpjs/openpgpjs/v2.6.2/dist/
 DISTFILES+=	openpgp.min.js
 
-PLUGIN=		enigma
-
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Crypt_GPG>=1.4.3:../../security/pear-Crypt_GPG
 
 do-install: plugin-install
diff --git a/mail/roundcube-plugin-enigma/distinfo b/mail/roundcube-plugin-enigma/distinfo
index cf2f9a052d1..5f2d95c6f5a 100644
--- a/mail/roundcube-plugin-enigma/distinfo
+++ b/mail/roundcube-plugin-enigma/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.13 2019/04/30 03:58:45 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
 SHA1 (roundcube/openpgp.min.js) = cce0087eb20328453b9378a2b01cc6339cef97b2
 RMD160 (roundcube/openpgp.min.js) = 713bc7f30e848e4978f6b4a16125d76bd8afd60a
 SHA512 (roundcube/openpgp.min.js) = 5600446f071f140374d5893af56ab6936379f4daee43788e6cc676eb70d76774e91dc713c8152e7830b217901cbd063421d7551840e082f5e61b3d08dcb0baee
 Size (roundcube/openpgp.min.js) = 330742 bytes
-SHA1 (roundcube/roundcubemail-1.3.9.tar.gz) = 8a9651917c609e2cf97217e3aed3b0fb2469edf3
-RMD160 (roundcube/roundcubemail-1.3.9.tar.gz) = f22c2950f51e7d29d071a82e6a381ded7e8c5722
-SHA512 (roundcube/roundcubemail-1.3.9.tar.gz) = d9c02e61ae95ae5004561134612aea6decb501d1f39708e3d5fa1de8996bedfbc0248d6e6cb5e082e63cd9ae4e6b8c091771a23234a4760a17d0a1127f34942f
-Size (roundcube/roundcubemail-1.3.9.tar.gz) = 3125755 bytes
+SHA1 (roundcube/roundcubemail-1.3.10.tar.gz) = e47db672bedd8413837dbca073f81f4b17c2f131
+RMD160 (roundcube/roundcubemail-1.3.10.tar.gz) = 88b33acaa6a01e053bcc5c8d061eb1b76a0c6b2a
+SHA512 (roundcube/roundcubemail-1.3.10.tar.gz) = 3f7be9c0f41b8e551a4863e06928a073aacf5368ffa8b1d0acd8c26224a957e806b986f7bc5b88ac4c853f9c4eff3112cc66b1c90386660e4eab7fa747c3a5cc
+Size (roundcube/roundcubemail-1.3.10.tar.gz) = 3127446 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) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c
diff --git a/mail/roundcube-plugin-password/Makefile b/mail/roundcube-plugin-password/Makefile
index 90a31836a01..5a042f292b7 100644
--- a/mail/roundcube-plugin-password/Makefile
+++ b/mail/roundcube-plugin-password/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/04/30 03:58:45 taca Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
 PLUGIN=		password
 
@@ -6,8 +6,6 @@ MAINTAINER=	taca@NetBSD.org
 COMMENT=	Password change plugin for roundcube
 LICENSE=	gnu-gpl-v3
 
-PLUGIN=		password
-
 REPLACE_PERL+=		plugins/password/helpers/change_ldap_pass.pl
 REPLACE_PYTHON+=	plugins/password/helpers/chpass-wrapper.py
 
diff --git a/mail/roundcube-plugin-password/distinfo b/mail/roundcube-plugin-password/distinfo
index b6cd012e4bd..e6ea42f1d4b 100644
--- a/mail/roundcube-plugin-password/distinfo
+++ b/mail/roundcube-plugin-password/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2019/04/30 03:58:45 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
-SHA1 (roundcube/roundcubemail-1.3.9.tar.gz) = 8a9651917c609e2cf97217e3aed3b0fb2469edf3
-RMD160 (roundcube/roundcubemail-1.3.9.tar.gz) = f22c2950f51e7d29d071a82e6a381ded7e8c5722
-SHA512 (roundcube/roundcubemail-1.3.9.tar.gz) = d9c02e61ae95ae5004561134612aea6decb501d1f39708e3d5fa1de8996bedfbc0248d6e6cb5e082e63cd9ae4e6b8c091771a23234a4760a17d0a1127f34942f
-Size (roundcube/roundcubemail-1.3.9.tar.gz) = 3125755 bytes
+SHA1 (roundcube/roundcubemail-1.3.10.tar.gz) = e47db672bedd8413837dbca073f81f4b17c2f131
+RMD160 (roundcube/roundcubemail-1.3.10.tar.gz) = 88b33acaa6a01e053bcc5c8d061eb1b76a0c6b2a
+SHA512 (roundcube/roundcubemail-1.3.10.tar.gz) = 3f7be9c0f41b8e551a4863e06928a073aacf5368ffa8b1d0acd8c26224a957e806b986f7bc5b88ac4c853f9c4eff3112cc66b1c90386660e4eab7fa747c3a5cc
+Size (roundcube/roundcubemail-1.3.10.tar.gz) = 3127446 bytes
diff --git a/mail/roundcube-plugin-zipdownload/Makefile b/mail/roundcube-plugin-zipdownload/Makefile
index 68b56fa0c79..8dce7841029 100644
--- a/mail/roundcube-plugin-zipdownload/Makefile
+++ b/mail/roundcube-plugin-zipdownload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/04/30 03:58:45 taca Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
 PLUGIN=		zipdownload
 
@@ -8,8 +8,6 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.4.0:../../archivers/php-zip
 
-PLUGIN=		zipdownload
-
 do-install: plugin-install
 
 .include "../../mail/roundcube/plugins.mk"
diff --git a/mail/roundcube-plugin-zipdownload/distinfo b/mail/roundcube-plugin-zipdownload/distinfo
index b6cd012e4bd..e6ea42f1d4b 100644
--- a/mail/roundcube-plugin-zipdownload/distinfo
+++ b/mail/roundcube-plugin-zipdownload/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2019/04/30 03:58:45 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
-SHA1 (roundcube/roundcubemail-1.3.9.tar.gz) = 8a9651917c609e2cf97217e3aed3b0fb2469edf3
-RMD160 (roundcube/roundcubemail-1.3.9.tar.gz) = f22c2950f51e7d29d071a82e6a381ded7e8c5722
-SHA512 (roundcube/roundcubemail-1.3.9.tar.gz) = d9c02e61ae95ae5004561134612aea6decb501d1f39708e3d5fa1de8996bedfbc0248d6e6cb5e082e63cd9ae4e6b8c091771a23234a4760a17d0a1127f34942f
-Size (roundcube/roundcubemail-1.3.9.tar.gz) = 3125755 bytes
+SHA1 (roundcube/roundcubemail-1.3.10.tar.gz) = e47db672bedd8413837dbca073f81f4b17c2f131
+RMD160 (roundcube/roundcubemail-1.3.10.tar.gz) = 88b33acaa6a01e053bcc5c8d061eb1b76a0c6b2a
+SHA512 (roundcube/roundcubemail-1.3.10.tar.gz) = 3f7be9c0f41b8e551a4863e06928a073aacf5368ffa8b1d0acd8c26224a957e806b986f7bc5b88ac4c853f9c4eff3112cc66b1c90386660e4eab7fa747c3a5cc
+Size (roundcube/roundcubemail-1.3.10.tar.gz) = 3127446 bytes
diff --git a/mail/roundcube/Makefile.common b/mail/roundcube/Makefile.common
index 38464aa7845..e1b79ee902e 100644
--- a/mail/roundcube/Makefile.common
+++ b/mail/roundcube/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2019/04/30 03:58:45 taca Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2019/09/10 18:10:55 bsiegert Exp $
 #
 # used by mail/roundcube/Makefile
 # used by mail/roundcube/plugins.mk
@@ -11,7 +11,7 @@ HOMEPAGE=	http://roundcube.net/
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	roundcube
 
-RC_VERS=	1.3.9
+RC_VERS=	1.3.10
 
 USE_LANGUAGES=		# none
 USE_TOOLS+=		pax
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index a31875b0ea1..5d9caa72174 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2019/04/30 03:58:45 taca Exp $
+$NetBSD: distinfo,v 1.64.2.1 2019/09/10 18:10:55 bsiegert Exp $
 
 SHA1 (roundcube/codemirror-5.21.0.zip) = 3b767c2e3acd6796e54ed19ed2ac0755fcf87984
 RMD160 (roundcube/codemirror-5.21.0.zip) = 3c629362a2a6c31aee099811b4598ba22e2fd763
@@ -16,10 +16,10 @@ 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.9.tar.gz) = 8a9651917c609e2cf97217e3aed3b0fb2469edf3
-RMD160 (roundcube/roundcubemail-1.3.9.tar.gz) = f22c2950f51e7d29d071a82e6a381ded7e8c5722
-SHA512 (roundcube/roundcubemail-1.3.9.tar.gz) = d9c02e61ae95ae5004561134612aea6decb501d1f39708e3d5fa1de8996bedfbc0248d6e6cb5e082e63cd9ae4e6b8c091771a23234a4760a17d0a1127f34942f
-Size (roundcube/roundcubemail-1.3.9.tar.gz) = 3125755 bytes
+SHA1 (roundcube/roundcubemail-1.3.10.tar.gz) = e47db672bedd8413837dbca073f81f4b17c2f131
+RMD160 (roundcube/roundcubemail-1.3.10.tar.gz) = 88b33acaa6a01e053bcc5c8d061eb1b76a0c6b2a
+SHA512 (roundcube/roundcubemail-1.3.10.tar.gz) = 3f7be9c0f41b8e551a4863e06928a073aacf5368ffa8b1d0acd8c26224a957e806b986f7bc5b88ac4c853f9c4eff3112cc66b1c90386660e4eab7fa747c3a5cc
+Size (roundcube/roundcubemail-1.3.10.tar.gz) = 3127446 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