Received: by mail.netbsd.org (Postfix, from userid 605) id E496584D7E; Tue, 9 Jun 2020 11:51:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 698D684D6E for ; Tue, 9 Jun 2020 11:51:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id xqdgPuyvfVUc for ; Tue, 9 Jun 2020 11:51:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 59C8D84CEA for ; Tue, 9 Jun 2020 11:51:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 53769FB27; Tue, 9 Jun 2020 11:51:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159170351032580" MIME-Version: 1.0 Date: Tue, 9 Jun 2020 11:51:50 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2020Q1] pkgsrc/mail To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20200609115150.53769FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159170351032580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Tue Jun 9 11:51:50 UTC 2020 Modified Files: pkgsrc/mail/roundcube [pkgsrc-2020Q1]: Makefile Makefile.common distinfo options.mk pkgsrc/mail/roundcube-plugin-password [pkgsrc-2020Q1]: distinfo Added Files: pkgsrc/mail/roundcube/patches [pkgsrc-2020Q1]: patch-program_lib_Roundcube_rcube__mime.php Removed Files: pkgsrc/mail/roundcube/patches [pkgsrc-2020Q1]: patch-rcube_mime_default Log Message: Pullup ticket #6231 - requested by taca mail/roundcube: security fix Revisions pulled up: - mail/roundcube-plugin-password/distinfo 1.18-1.19 - mail/roundcube/Makefile 1.93 - mail/roundcube/Makefile.common 1.18-1.19 - mail/roundcube/distinfo 1.69-1.70 - mail/roundcube/options.mk 1.17 - mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php 1.3 - mail/roundcube/patches/patch-rcube_mime_default deleted --- Module Name: pkgsrc Committed By: taca Date: Sun Jun 7 22:07:04 UTC 2020 Modified Files: pkgsrc/mail/roundcube: Makefile Makefile.common distinfo options.mk Added Files: pkgsrc/mail/roundcube/patches: patch-program_lib_Roundcube_rcube__mime.php Removed Files: pkgsrc/mail/roundcube/patches: patch-rcube_mime_default Log Message: mail/roundcube: update to 1.4.5 Update roundcube to 1.4.5, including some security fixes. pkgsrc change: * Proper replace PHP interpreter. * Fix php-sockets option to work. RELEASE 1.4.5 ------------- - Fix bug in extracting required plugins from composer.json that led to spurious error in log (#7364) - Fix so the database setup description is compatible with MySQL 8 (#7340) - Markasjunk: Fix regression in jsevent driver (#7361) - Fix missing flag indication on collapsed thread in Larry and Elastic (#7366) - Fix default keyservers (use keys.openpgp.org), add note about CORS (#7373, #7367) - Mailvelope: Use sender's address to find pubkeys to check signatures (#7348) - Mailvelope: Fix Encrypt button hidden in Elastic (#7353) - Fix PHP warning: count(): Parameter must be an array or an object... in ID command handler (#7392) - Fix error when user-configured skin does not exist anymore (#7271) - Elastic: Fix aspect ratio of a contact photo in mail preview (#7339) - Fix bug where PDF attachments marked as inline could have not been attached on mail forward (#7382) - Security: Fix a couple of XSS issues in Installer (#7406) - Security: Fix XSS issue in template object 'username' (#7406) - Security: Better fix for CVE-2020-12641 - Security: Fix cross-site scripting (XSS) via malicious XML attachment --- Module Name: pkgsrc Committed By: taca Date: Sun Jun 7 22:08:37 UTC 2020 Modified Files: pkgsrc/mail/roundcube-plugin-password: distinfo Log Message: mail/roundcube-plugin-password: update to 1.4.5 Update roundcube-plugin-password to 1.4.5 RELEASE 1.4.5 ------------- - Password: Fix issue with Modoboa driver (#7372) --- Module Name: pkgsrc Committed By: taca Date: Tue Jun 9 00:25:19 UTC 2020 Modified Files: pkgsrc/mail/roundcube: Makefile.common distinfo pkgsrc/mail/roundcube-plugin-password: distinfo Log Message: mail/roundcube: update to 1.14.6 Update roundcube to 1.14.6. RELEASE 1.4.6 ------------- - Installer: Fix regression in SMTP test section (#7417) To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.92.2.1 pkgsrc/mail/roundcube/Makefile cvs rdiff -u -r1.16.2.1 -r1.16.2.2 pkgsrc/mail/roundcube/Makefile.common cvs rdiff -u -r1.66.2.2 -r1.66.2.3 pkgsrc/mail/roundcube/distinfo cvs rdiff -u -r1.16 -r1.16.14.1 pkgsrc/mail/roundcube/options.mk cvs rdiff -u -r1.17.2.3 -r1.17.2.4 \ pkgsrc/mail/roundcube-plugin-password/distinfo cvs rdiff -u -r0 -r1.3.2.2 \ pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php cvs rdiff -u -r1.3 -r0 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. --_----------=_159170351032580 Content-Disposition: inline Content-Length: 8270 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/roundcube/Makefile diff -u pkgsrc/mail/roundcube/Makefile:1.92 pkgsrc/mail/roundcube/Makefile:1.92.2.1 --- pkgsrc/mail/roundcube/Makefile:1.92 Tue Jan 14 14:30:00 2020 +++ pkgsrc/mail/roundcube/Makefile Tue Jun 9 11:51:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2020/01/14 14:30:00 taca Exp $ +# $NetBSD: Makefile,v 1.92.2.1 2020/06/09 11:51:49 bsiegert Exp $ DISTNAME= roundcubemail-${RC_VERS} PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/:S/-complete//} @@ -44,6 +44,24 @@ CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/de ${PKG_SYSCONFDIR}/defaults.inc.php \ ${WWW_USER} ${WWW_GROUP} 0640 +CONF_PLUGINS= acl additional_message_headers database_attachments \ + emoticons help http_authentication jqueryui \ + krb_authentication managesieve markasjunk \ + new_user_identity newmail_notifier \ + redundant_attachments squirrelmail_usercopy +RC_DOCS= CHANGELOG INSTALL LICENSE README.md UPGRADING +REPLACE_PHP= cleandb.sh decrypt.sh deluser.sh gc.sh \ + indexcontacts.sh initdb.sh installto.sh \ + moduserprefs.sh msgexport.sh msgimport.sh \ + update.sh updatecss.sh updatedb.sh + +REPLACE_INTERPRETER+= php +REPLACE.php.old= .*php[^ ]* +REPLACE.php.new= ${PREFIX}/bin/php +.for f in ${REPLACE_PHP} +REPLACE_FILES.php+= bin/${f} +.endfor + SUBST_CLASSES+= files SUBST_STAGE.files= do-configure SUBST_MESSAGE.files= Fixing configuration files. @@ -58,17 +76,6 @@ SUBST_SED.files+= -e "s|@PKG_EXAMPLES@|$ SUBST_VARS.files+= PKG_SYSCONFBASE SUBST_VARS.files+= PKG_SYSCONFDIR -CONF_PLUGINS= acl additional_message_headers database_attachments \ - emoticons help http_authentication jqueryui \ - krb_authentication managesieve markasjunk \ - new_user_identity newmail_notifier \ - redundant_attachments squirrelmail_usercopy -RC_DOCS= CHANGELOG INSTALL LICENSE README.md UPGRADING -REPLACE_PHP= cleandb.sh decrypt.sh deluser.sh gc.sh \ - indexcontacts.sh initdb.sh installto.sh \ - moduserprefs.sh msgexport.sh msgimport.sh \ - update.sh updatecss.sh updatedb.sh - pre-configure: ${CP} ${FILESDIR}/apache.conf ${WRKSRC}/apache.conf ${CP} ${FILESDIR}/lighttpd.conf ${WRKSRC}/lighttpd.conf Index: pkgsrc/mail/roundcube/Makefile.common diff -u pkgsrc/mail/roundcube/Makefile.common:1.16.2.1 pkgsrc/mail/roundcube/Makefile.common:1.16.2.2 --- pkgsrc/mail/roundcube/Makefile.common:1.16.2.1 Fri May 8 19:17:54 2020 +++ pkgsrc/mail/roundcube/Makefile.common Tue Jun 9 11:51:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16.2.1 2020/05/08 19:17:54 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.16.2.2 2020/06/09 11:51:49 bsiegert Exp $ # # used by mail/roundcube/Makefile # used by mail/roundcube/plugins.mk @@ -10,7 +10,7 @@ GITHUB_PROJECT= roundcubemail GITHUB_RELEASE= ${RC_VERS} HOMEPAGE= https://roundcube.net/ -RC_VERS= 1.4.4 +RC_VERS= 1.4.6 USE_LANGUAGES= # none USE_TOOLS+= pax Index: pkgsrc/mail/roundcube/distinfo diff -u pkgsrc/mail/roundcube/distinfo:1.66.2.2 pkgsrc/mail/roundcube/distinfo:1.66.2.3 --- pkgsrc/mail/roundcube/distinfo:1.66.2.2 Fri May 8 19:17:54 2020 +++ pkgsrc/mail/roundcube/distinfo Tue Jun 9 11:51:49 2020 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.66.2.2 2020/05/08 19:17:54 bsiegert Exp $ +$NetBSD: distinfo,v 1.66.2.3 2020/06/09 11:51:49 bsiegert Exp $ -SHA1 (roundcubemail-1.4.4-complete.tar.gz) = 4e425263f5bec27d39c07bde524f421bda205c07 -RMD160 (roundcubemail-1.4.4-complete.tar.gz) = 43c3ea4da074337c4b8826420eab9a799fd46e1a -SHA512 (roundcubemail-1.4.4-complete.tar.gz) = ddea321b5266c547f67c010147e9aa1457bea4802bec37f9e9d87e691bdc8df27f5c90cff8770de2458822160b85f7359f62742072ae1d642a040b9d88651519 -Size (roundcubemail-1.4.4-complete.tar.gz) = 7029864 bytes +SHA1 (roundcubemail-1.4.6-complete.tar.gz) = 44961ef62bb9c9875141ca34704bbc7d6f36373d +RMD160 (roundcubemail-1.4.6-complete.tar.gz) = 51e323bf7def448b55f57b9279745b5779690ab3 +SHA512 (roundcubemail-1.4.6-complete.tar.gz) = e86763ced58cfa8174f71d33ae45cd62f26a58853b9361b800003fa5bf883a4106c957f66b6b17b03172a3ee595ca74d7c19ac38e449a23377defd77cf555742 +Size (roundcubemail-1.4.6-complete.tar.gz) = 7031573 bytes SHA1 (patch-af) = 7f29b0310a2a6b2e71858787e08b025e30d8bd12 SHA1 (patch-config_config.inc.php.sample) = 92a48a97b16fe3f5f4b9441fce762a559d8daca7 -SHA1 (patch-rcube_mime_default) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c +SHA1 (patch-program_lib_Roundcube_rcube__mime.php) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c Index: pkgsrc/mail/roundcube/options.mk diff -u pkgsrc/mail/roundcube/options.mk:1.16 pkgsrc/mail/roundcube/options.mk:1.16.14.1 --- pkgsrc/mail/roundcube/options.mk:1.16 Wed May 16 08:14:40 2018 +++ pkgsrc/mail/roundcube/options.mk Tue Jun 9 11:51:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2018/05/16 08:14:40 triaxx Exp $ +# $NetBSD: options.mk,v 1.16.14.1 2020/06/09 11:51:49 bsiegert Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube @@ -80,7 +80,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_LDA ### ### Use sockets, required by managesieve and password plugins. ### -.if !empty(PKG_OPTIONS:Msockets) +.if !empty(PKG_OPTIONS:Mphp-sockets) DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=4.3.1:../../net/php-sockets .endif Index: pkgsrc/mail/roundcube-plugin-password/distinfo diff -u pkgsrc/mail/roundcube-plugin-password/distinfo:1.17.2.3 pkgsrc/mail/roundcube-plugin-password/distinfo:1.17.2.4 --- pkgsrc/mail/roundcube-plugin-password/distinfo:1.17.2.3 Fri May 8 19:17:54 2020 +++ pkgsrc/mail/roundcube-plugin-password/distinfo Tue Jun 9 11:51:49 2020 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.17.2.3 2020/05/08 19:17:54 bsiegert Exp $ +$NetBSD: distinfo,v 1.17.2.4 2020/06/09 11:51:49 bsiegert Exp $ -SHA1 (roundcubemail-1.4.4-complete.tar.gz) = 4e425263f5bec27d39c07bde524f421bda205c07 -RMD160 (roundcubemail-1.4.4-complete.tar.gz) = 43c3ea4da074337c4b8826420eab9a799fd46e1a -SHA512 (roundcubemail-1.4.4-complete.tar.gz) = ddea321b5266c547f67c010147e9aa1457bea4802bec37f9e9d87e691bdc8df27f5c90cff8770de2458822160b85f7359f62742072ae1d642a040b9d88651519 -Size (roundcubemail-1.4.4-complete.tar.gz) = 7029864 bytes +SHA1 (roundcubemail-1.4.6-complete.tar.gz) = 44961ef62bb9c9875141ca34704bbc7d6f36373d +RMD160 (roundcubemail-1.4.6-complete.tar.gz) = 51e323bf7def448b55f57b9279745b5779690ab3 +SHA512 (roundcubemail-1.4.6-complete.tar.gz) = e86763ced58cfa8174f71d33ae45cd62f26a58853b9361b800003fa5bf883a4106c957f66b6b17b03172a3ee595ca74d7c19ac38e449a23377defd77cf555742 +Size (roundcubemail-1.4.6-complete.tar.gz) = 7031573 bytes SHA1 (patch-plugins_password_helpers_passwd-expect) = 15e427a3c90bf7c0437a023b3f099abb5a139165 Added files: Index: pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php diff -u /dev/null pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php:1.3.2.2 --- /dev/null Tue Jun 9 11:51:50 2020 +++ pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php Tue Jun 9 11:51:50 2020 @@ -0,0 +1,25 @@ +$NetBSD: patch-program_lib_Roundcube_rcube__mime.php,v 1.3.2.2 2020/06/09 11:51:50 bsiegert Exp $ + +Fix path to /etc/. + +--- program/lib/Roundcube/rcube_mime.php.orig 2018-04-11 11:06:18.000000000 +0000 ++++ program/lib/Roundcube/rcube_mime.php +@@ -790,12 +790,12 @@ class rcube_mime + $file_paths[] = 'C:/xampp/apache/conf/mime.types.'; + } + else { +- $file_paths[] = '/etc/mime.types'; +- $file_paths[] = '/etc/httpd/mime.types'; +- $file_paths[] = '/etc/httpd2/mime.types'; +- $file_paths[] = '/etc/apache/mime.types'; +- $file_paths[] = '/etc/apache2/mime.types'; +- $file_paths[] = '/etc/nginx/mime.types'; ++ $file_paths[] = '@PKG_SYSCONFBASE@/mime.types'; ++ $file_paths[] = '@PKG_SYSCONFBASE@/httpd/mime.types'; ++ $file_paths[] = '@PKG_SYSCONFBASE@/httpd2/mime.types'; ++ $file_paths[] = '@PKG_SYSCONFBASE@/apache/mime.types'; ++ $file_paths[] = '@PKG_SYSCONFBASE@/apache2/mime.types'; ++ $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'; --_----------=_159170351032580--