CVS commit: pkgsrc/mail

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Oct 17 15:47:09 UTC 2023

Modified Files:
        pkgsrc/mail/roundcube: Makefile.common distinfo
        pkgsrc/mail/roundcube-plugin-password: distinfo
        pkgsrc/mail/roundcube/patches:
            patch-program_lib_Roundcube_rcube__mime.php

Log Message:
mail/roundcube: update to 1.6.4

1.6.4 (2023-10-16)

Security update.

- Fix PHP8 warnings (#9142, #9160)
- Fix default 'mime.types' path on Windows (#9113)
- Managesieve: Fix javascript error when relational or spamtest
  extension is not enabled (#9139)
- Fix cross-site scripting (XSS) vulnerability in handling of SVG in
  HTML messages (#9168)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/roundcube/Makefile.common
cvs rdiff -u -r1.85 -r1.86 pkgsrc/mail/roundcube/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/roundcube-plugin-password/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php

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.common
diff -u pkgsrc/mail/roundcube/Makefile.common:1.31 pkgsrc/mail/roundcube/Makefile.common:1.32
--- pkgsrc/mail/roundcube/Makefile.common:1.31  Mon Sep 18 03:39:02 2023
+++ pkgsrc/mail/roundcube/Makefile.common       Tue Oct 17 15:47:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2023/09/18 03:39:02 taca Exp $
+# $NetBSD: Makefile.common,v 1.32 2023/10/17 15:47:08 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.6.3
+RC_VERS=       1.6.4
 
 USE_LANGUAGES=         # none
 USE_TOOLS+=            pax

Index: pkgsrc/mail/roundcube/distinfo
diff -u pkgsrc/mail/roundcube/distinfo:1.85 pkgsrc/mail/roundcube/distinfo:1.86
--- pkgsrc/mail/roundcube/distinfo:1.85 Mon Sep 18 03:39:02 2023
+++ pkgsrc/mail/roundcube/distinfo      Tue Oct 17 15:47:08 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.85 2023/09/18 03:39:02 taca Exp $
+$NetBSD: distinfo,v 1.86 2023/10/17 15:47:08 taca Exp $
 
-BLAKE2s (roundcubemail-1.6.3-complete.tar.gz) = 6874a24ed9ad198c2bd50e5de93ec782adad8a388d441a2348bee1f1529acae6
-SHA512 (roundcubemail-1.6.3-complete.tar.gz) = 9a44a898f8ed9a338f126af19b572b61a7b108412be5f0c445f6ff3d84636a1487cc594347629a757e2fa18fdfa2881c3dd373e2431132a906799992c935b548
-Size (roundcubemail-1.6.3-complete.tar.gz) = 6026670 bytes
+BLAKE2s (roundcubemail-1.6.4-complete.tar.gz) = 02ec63308fe260213e31d30e1e38446ae1a6242db2a5be0c10564ced5a7555eb
+SHA512 (roundcubemail-1.6.4-complete.tar.gz) = ccfd6828ed0f9a25c3144133a9a0f091b7ef76251e74422fe90dc1eb6fdddee8522902869d97609cd594f0977ecb6eb7402378d390ae33d907d154a24a607f85
+Size (roundcubemail-1.6.4-complete.tar.gz) = 6027429 bytes
 SHA1 (patch-config_config.inc.php.sample) = 92a48a97b16fe3f5f4b9441fce762a559d8daca7
 SHA1 (patch-program_include_iniset.php) = 8a6c13c0c87d583ed60e43c01a4173d9d802a6a1
-SHA1 (patch-program_lib_Roundcube_rcube__mime.php) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c
+SHA1 (patch-program_lib_Roundcube_rcube__mime.php) = bfefc6850d3db230dd4224491e895fe25a32e87a

Index: pkgsrc/mail/roundcube-plugin-password/distinfo
diff -u pkgsrc/mail/roundcube-plugin-password/distinfo:1.33 pkgsrc/mail/roundcube-plugin-password/distinfo:1.34
--- pkgsrc/mail/roundcube-plugin-password/distinfo:1.33 Mon Sep 18 03:39:03 2023
+++ pkgsrc/mail/roundcube-plugin-password/distinfo      Tue Oct 17 15:47:09 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.33 2023/09/18 03:39:03 taca Exp $
+$NetBSD: distinfo,v 1.34 2023/10/17 15:47:09 taca Exp $
 
-BLAKE2s (roundcubemail-1.6.3-complete.tar.gz) = 6874a24ed9ad198c2bd50e5de93ec782adad8a388d441a2348bee1f1529acae6
-SHA512 (roundcubemail-1.6.3-complete.tar.gz) = 9a44a898f8ed9a338f126af19b572b61a7b108412be5f0c445f6ff3d84636a1487cc594347629a757e2fa18fdfa2881c3dd373e2431132a906799992c935b548
-Size (roundcubemail-1.6.3-complete.tar.gz) = 6026670 bytes
+BLAKE2s (roundcubemail-1.6.4-complete.tar.gz) = 02ec63308fe260213e31d30e1e38446ae1a6242db2a5be0c10564ced5a7555eb
+SHA512 (roundcubemail-1.6.4-complete.tar.gz) = ccfd6828ed0f9a25c3144133a9a0f091b7ef76251e74422fe90dc1eb6fdddee8522902869d97609cd594f0977ecb6eb7402378d390ae33d907d154a24a607f85
+Size (roundcubemail-1.6.4-complete.tar.gz) = 6027429 bytes
 SHA1 (patch-plugins_password_helpers_passwd-expect) = 15e427a3c90bf7c0437a023b3f099abb5a139165

Index: pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php
diff -u pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php:1.5 pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php:1.6
--- pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php:1.5       Fri Aug 19 13:09:38 2022
+++ pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php   Tue Oct 17 15:47:09 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-program_lib_Roundcube_rcube__mime.php,v 1.5 2022/08/19 13:09:38 taca Exp $
+$NetBSD: patch-program_lib_Roundcube_rcube__mime.php,v 1.6 2023/10/17 15:47:09 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.orig  2023-10-16 09:23:06.000000000 +0000
 +++ program/lib/Roundcube/rcube_mime.php
-@@ -790,12 +790,12 @@ class rcube_mime
-             $file_paths[] = 'C:/xampp/apache/conf/mime.types.';
+@@ -835,12 +835,12 @@ class rcube_mime
+             $file_paths[] = 'C:/xampp/apache/conf/mime.types';
          }
          else {
 -            $file_paths[] = '/etc/mime.types';