Received: by mail.netbsd.org (Postfix, from userid 605) id 1C7F384D57; Sun, 7 Jun 2020 22:07:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 98CFC84D53 for ; Sun, 7 Jun 2020 22:07:05 +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 qwNORgkywl5p for ; Sun, 7 Jun 2020 22:07:04 +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 B92B584CE0 for ; Sun, 7 Jun 2020 22:07:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B2FEDFB27; Sun, 7 Jun 2020 22:07:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1591567624295500" MIME-Version: 1.0 Date: Sun, 7 Jun 2020 22:07:04 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/mail/roundcube To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20200607220704.B2FEDFB27@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. --_----------=_1591567624295500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 pkgsrc/mail/roundcube/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/roundcube/Makefile.common cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/roundcube/distinfo cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/roundcube/options.mk cvs rdiff -u -r0 -r1.3 \ 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. --_----------=_1591567624295500 Content-Disposition: inline Content-Length: 6770 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.93 --- pkgsrc/mail/roundcube/Makefile:1.92 Tue Jan 14 14:30:00 2020 +++ pkgsrc/mail/roundcube/Makefile Sun Jun 7 22:07:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2020/01/14 14:30:00 taca Exp $ +# $NetBSD: Makefile,v 1.93 2020/06/07 22:07:04 taca 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.17 pkgsrc/mail/roundcube/Makefile.common:1.18 --- pkgsrc/mail/roundcube/Makefile.common:1.17 Thu Apr 30 07:09:34 2020 +++ pkgsrc/mail/roundcube/Makefile.common Sun Jun 7 22:07:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2020/04/30 07:09:34 taca Exp $ +# $NetBSD: Makefile.common,v 1.18 2020/06/07 22:07:04 taca 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.5 USE_LANGUAGES= # none USE_TOOLS+= pax Index: pkgsrc/mail/roundcube/distinfo diff -u pkgsrc/mail/roundcube/distinfo:1.68 pkgsrc/mail/roundcube/distinfo:1.69 --- pkgsrc/mail/roundcube/distinfo:1.68 Thu Apr 30 07:09:34 2020 +++ pkgsrc/mail/roundcube/distinfo Sun Jun 7 22:07:04 2020 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.68 2020/04/30 07:09:34 taca Exp $ +$NetBSD: distinfo,v 1.69 2020/06/07 22:07:04 taca 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.5-complete.tar.gz) = 551d5dda8760471241dfc77333b004693f04feaf +RMD160 (roundcubemail-1.4.5-complete.tar.gz) = 99158492a9feaad08f24021bbb356113ce27c4a2 +SHA512 (roundcubemail-1.4.5-complete.tar.gz) = 031a4669249efa67050212fc6b19429751fabb8204ffe1ea0088810f2efe30de9b7bf986c21c3091b6037628a0527550e33e96ad67cd0f16c85dc5398f67b761 +Size (roundcubemail-1.4.5-complete.tar.gz) = 7031560 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.17 --- pkgsrc/mail/roundcube/options.mk:1.16 Wed May 16 08:14:40 2018 +++ pkgsrc/mail/roundcube/options.mk Sun Jun 7 22:07:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2018/05/16 08:14:40 triaxx Exp $ +# $NetBSD: options.mk,v 1.17 2020/06/07 22:07:04 taca 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 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 --- /dev/null Sun Jun 7 22:07:04 2020 +++ pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php Sun Jun 7 22:07:04 2020 @@ -0,0 +1,25 @@ +$NetBSD: patch-program_lib_Roundcube_rcube__mime.php,v 1.3 2020/06/07 22:07:04 taca 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'; --_----------=_1591567624295500--