Tue Jun 9 11:51:50 2020 UTC ()
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)


(bsiegert)
diff -r1.92 -r1.92.2.1 pkgsrc/mail/roundcube/Makefile
diff -r1.16.2.1 -r1.16.2.2 pkgsrc/mail/roundcube/Makefile.common
diff -r1.66.2.2 -r1.66.2.3 pkgsrc/mail/roundcube/distinfo
diff -r1.16 -r1.16.14.1 pkgsrc/mail/roundcube/options.mk
diff -r1.17.2.3 -r1.17.2.4 pkgsrc/mail/roundcube-plugin-password/distinfo
diff -r0 -r1.3.2.2 pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php
diff -r1.3 -r0 pkgsrc/mail/roundcube/patches/patch-rcube_mime_default
cvs diff -r1.92 -r1.92.2.1 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2020/01/14 14:30:00 1.92
+++ pkgsrc/mail/roundcube/Makefile 2020/06/09 11:51:49 1.92.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.92 2020/01/14 14:30:00 taca Exp $ 1# $NetBSD: Makefile,v 1.92.2.1 2020/06/09 11:51:49 bsiegert Exp $
2 2
3DISTNAME= roundcubemail-${RC_VERS} 3DISTNAME= roundcubemail-${RC_VERS}
4PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/:S/-complete//} 4PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/:S/-complete//}
5 5
6MAINTAINER= taca@NetBSD.org 6MAINTAINER= taca@NetBSD.org
7COMMENT= Browser-based multilingual IMAP client 7COMMENT= Browser-based multilingual IMAP client
8LICENSE= gnu-gpl-v3 AND mit AND gnu-lgpl-v2.1 8LICENSE= gnu-gpl-v3 AND mit AND gnu-lgpl-v2.1
9 9
10DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring 10DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
11DEPENDS+= ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif 11DEPENDS+= ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
12DEPENDS+= ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl 12DEPENDS+= ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
13DEPENDS+= ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json 13DEPENDS+= ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
14DEPENDS+= ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip 14DEPENDS+= ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
@@ -34,51 +34,58 @@ OWN_DIRS_PERMS+= ${VARBASE}/spool/roundc @@ -34,51 +34,58 @@ OWN_DIRS_PERMS+= ${VARBASE}/spool/roundc
34 ${WWW_USER} ${WWW_GROUP} 0750 34 ${WWW_USER} ${WWW_GROUP} 0750
35OWN_DIRS_PERMS+= ${VARBASE}/tmp/roundcube \ 35OWN_DIRS_PERMS+= ${VARBASE}/tmp/roundcube \
36 ${WWW_USER} ${WWW_GROUP} 0750 36 ${WWW_USER} ${WWW_GROUP} 0750
37 37
38CONF_FILES+= ${PREFIX}/${EGDIR}/mimetypes.php \ 38CONF_FILES+= ${PREFIX}/${EGDIR}/mimetypes.php \
39 ${PKG_SYSCONFDIR}/mimetypes.php 39 ${PKG_SYSCONFDIR}/mimetypes.php
40CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/config.inc.php \ 40CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/config.inc.php \
41 ${PKG_SYSCONFDIR}/config.inc.php \ 41 ${PKG_SYSCONFDIR}/config.inc.php \
42 ${WWW_USER} ${WWW_GROUP} 0640 42 ${WWW_USER} ${WWW_GROUP} 0640
43CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/defaults.inc.php \ 43CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/defaults.inc.php \
44 ${PKG_SYSCONFDIR}/defaults.inc.php \ 44 ${PKG_SYSCONFDIR}/defaults.inc.php \
45 ${WWW_USER} ${WWW_GROUP} 0640 45 ${WWW_USER} ${WWW_GROUP} 0640
46 46
 47CONF_PLUGINS= acl additional_message_headers database_attachments \
 48 emoticons help http_authentication jqueryui \
 49 krb_authentication managesieve markasjunk \
 50 new_user_identity newmail_notifier \
 51 redundant_attachments squirrelmail_usercopy
 52RC_DOCS= CHANGELOG INSTALL LICENSE README.md UPGRADING
 53REPLACE_PHP= cleandb.sh decrypt.sh deluser.sh gc.sh \
 54 indexcontacts.sh initdb.sh installto.sh \
 55 moduserprefs.sh msgexport.sh msgimport.sh \
 56 update.sh updatecss.sh updatedb.sh
 57
 58REPLACE_INTERPRETER+= php
 59REPLACE.php.old= .*php[^ ]*
 60REPLACE.php.new= ${PREFIX}/bin/php
 61.for f in ${REPLACE_PHP}
 62REPLACE_FILES.php+= bin/${f}
 63.endfor
 64
47SUBST_CLASSES+= files 65SUBST_CLASSES+= files
48SUBST_STAGE.files= do-configure 66SUBST_STAGE.files= do-configure
49SUBST_MESSAGE.files= Fixing configuration files. 67SUBST_MESSAGE.files= Fixing configuration files.
50SUBST_FILES.files= apache.conf lighttpd.conf nginx.conf 68SUBST_FILES.files= apache.conf lighttpd.conf nginx.conf
51SUBST_FILES.files+= config/config.inc.php.sample 69SUBST_FILES.files+= config/config.inc.php.sample
52SUBST_FILES.files+= program/include/iniset.php 70SUBST_FILES.files+= program/include/iniset.php
53SUBST_FILES.files+= program/lib/Roundcube/rcube_mime.php 71SUBST_FILES.files+= program/lib/Roundcube/rcube_mime.php
54SUBST_VARS.files= RCDIR VARBASE PKG_EXAMPLES PKG_SYSCONFBASE PKG_SYSCONFDIR 72SUBST_VARS.files= RCDIR VARBASE PKG_EXAMPLES PKG_SYSCONFBASE PKG_SYSCONFDIR
55SUBST_VARS.files+= RCDIR 73SUBST_VARS.files+= RCDIR
56SUBST_VARS.files+= VARBASE 74SUBST_VARS.files+= VARBASE
57SUBST_SED.files+= -e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g" 75SUBST_SED.files+= -e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g"
58SUBST_VARS.files+= PKG_SYSCONFBASE 76SUBST_VARS.files+= PKG_SYSCONFBASE
59SUBST_VARS.files+= PKG_SYSCONFDIR 77SUBST_VARS.files+= PKG_SYSCONFDIR
60 78
61CONF_PLUGINS= acl additional_message_headers database_attachments \ 
62 emoticons help http_authentication jqueryui \ 
63 krb_authentication managesieve markasjunk \ 
64 new_user_identity newmail_notifier \ 
65 redundant_attachments squirrelmail_usercopy 
66RC_DOCS= CHANGELOG INSTALL LICENSE README.md UPGRADING 
67REPLACE_PHP= cleandb.sh decrypt.sh deluser.sh gc.sh \ 
68 indexcontacts.sh initdb.sh installto.sh \ 
69 moduserprefs.sh msgexport.sh msgimport.sh \ 
70 update.sh updatecss.sh updatedb.sh 
71 
72pre-configure: 79pre-configure:
73 ${CP} ${FILESDIR}/apache.conf ${WRKSRC}/apache.conf 80 ${CP} ${FILESDIR}/apache.conf ${WRKSRC}/apache.conf
74 ${CP} ${FILESDIR}/lighttpd.conf ${WRKSRC}/lighttpd.conf 81 ${CP} ${FILESDIR}/lighttpd.conf ${WRKSRC}/lighttpd.conf
75 ${CP} ${FILESDIR}/nginx.conf ${WRKSRC}/nginx.conf 82 ${CP} ${FILESDIR}/nginx.conf ${WRKSRC}/nginx.conf
76 83
77pre-install: 84pre-install:
78 cd ${WRKSRC}/plugins && ${RM} -fr enigma password zipdownload 85 cd ${WRKSRC}/plugins && ${RM} -fr enigma password zipdownload
79 86
80do-install: 87do-install:
81.for i in ${RC_DOCS} 88.for i in ${RC_DOCS}
82 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${DOCDIR} 89 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${DOCDIR}
83.endfor 90.endfor
84 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${PREFIX}/${RCDIR} 91 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${PREFIX}/${RCDIR}
cvs diff -r1.16.2.1 -r1.16.2.2 pkgsrc/mail/roundcube/Makefile.common (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile.common 2020/05/08 19:17:54 1.16.2.1
+++ pkgsrc/mail/roundcube/Makefile.common 2020/06/09 11:51:49 1.16.2.2
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile.common,v 1.16.2.1 2020/05/08 19:17:54 bsiegert Exp $ 1# $NetBSD: Makefile.common,v 1.16.2.2 2020/06/09 11:51:49 bsiegert Exp $
2# 2#
3# used by mail/roundcube/Makefile 3# used by mail/roundcube/Makefile
4# used by mail/roundcube/plugins.mk 4# used by mail/roundcube/plugins.mk
5 5
6DISTNAME= roundcubemail-${RC_VERS}-complete 6DISTNAME= roundcubemail-${RC_VERS}-complete
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_GITHUB:=roundcube/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=roundcube/}
9GITHUB_PROJECT= roundcubemail 9GITHUB_PROJECT= roundcubemail
10GITHUB_RELEASE= ${RC_VERS} 10GITHUB_RELEASE= ${RC_VERS}
11HOMEPAGE= https://roundcube.net/ 11HOMEPAGE= https://roundcube.net/
12 12
13RC_VERS= 1.4.4 13RC_VERS= 1.4.6
14 14
15USE_LANGUAGES= # none 15USE_LANGUAGES= # none
16USE_TOOLS+= pax 16USE_TOOLS+= pax
17EXTRACT_USING= bsdtar 17EXTRACT_USING= bsdtar
18NO_BUILD= yes 18NO_BUILD= yes
19WRKNAME= ${DISTNAME:S/-complete//} 19WRKNAME= ${DISTNAME:S/-complete//}
20WRKSRC= ${WRKDIR}/${WRKNAME} 20WRKSRC= ${WRKDIR}/${WRKNAME}
21 21
22DISTINFO_FILE?= ${PKGDIR}/../../mail/roundcube/distinfo 22DISTINFO_FILE?= ${PKGDIR}/../../mail/roundcube/distinfo
23 23
24PKG_SYSCONFSUBDIR?= roundcube 24PKG_SYSCONFSUBDIR?= roundcube
25 25
26PKG_GROUPS_VARS+= WWW_GROUP 26PKG_GROUPS_VARS+= WWW_GROUP
cvs diff -r1.66.2.2 -r1.66.2.3 pkgsrc/mail/roundcube/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/distinfo 2020/05/08 19:17:54 1.66.2.2
+++ pkgsrc/mail/roundcube/distinfo 2020/06/09 11:51:49 1.66.2.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.66.2.2 2020/05/08 19:17:54 bsiegert Exp $ 1$NetBSD: distinfo,v 1.66.2.3 2020/06/09 11:51:49 bsiegert Exp $
2 2
3SHA1 (roundcubemail-1.4.4-complete.tar.gz) = 4e425263f5bec27d39c07bde524f421bda205c07 3SHA1 (roundcubemail-1.4.6-complete.tar.gz) = 44961ef62bb9c9875141ca34704bbc7d6f36373d
4RMD160 (roundcubemail-1.4.4-complete.tar.gz) = 43c3ea4da074337c4b8826420eab9a799fd46e1a 4RMD160 (roundcubemail-1.4.6-complete.tar.gz) = 51e323bf7def448b55f57b9279745b5779690ab3
5SHA512 (roundcubemail-1.4.4-complete.tar.gz) = ddea321b5266c547f67c010147e9aa1457bea4802bec37f9e9d87e691bdc8df27f5c90cff8770de2458822160b85f7359f62742072ae1d642a040b9d88651519 5SHA512 (roundcubemail-1.4.6-complete.tar.gz) = e86763ced58cfa8174f71d33ae45cd62f26a58853b9361b800003fa5bf883a4106c957f66b6b17b03172a3ee595ca74d7c19ac38e449a23377defd77cf555742
6Size (roundcubemail-1.4.4-complete.tar.gz) = 7029864 bytes 6Size (roundcubemail-1.4.6-complete.tar.gz) = 7031573 bytes
7SHA1 (patch-af) = 7f29b0310a2a6b2e71858787e08b025e30d8bd12 7SHA1 (patch-af) = 7f29b0310a2a6b2e71858787e08b025e30d8bd12
8SHA1 (patch-config_config.inc.php.sample) = 92a48a97b16fe3f5f4b9441fce762a559d8daca7 8SHA1 (patch-config_config.inc.php.sample) = 92a48a97b16fe3f5f4b9441fce762a559d8daca7
9SHA1 (patch-rcube_mime_default) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c 9SHA1 (patch-program_lib_Roundcube_rcube__mime.php) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c
cvs diff -r1.16 -r1.16.14.1 pkgsrc/mail/roundcube/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/options.mk 2018/05/16 08:14:40 1.16
+++ pkgsrc/mail/roundcube/options.mk 2020/06/09 11:51:49 1.16.14.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.16 2018/05/16 08:14:40 triaxx Exp $ 1# $NetBSD: options.mk,v 1.16.14.1 2020/06/09 11:51:49 bsiegert Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube 3PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= db webserver 5PKG_OPTIONS_REQUIRED_GROUPS= db webserver
6PKG_OPTIONS_GROUP.db= mysql pgsql sqlite 6PKG_OPTIONS_GROUP.db= mysql pgsql sqlite
7PKG_OPTIONS_GROUP.webserver= apache lighttpd nginx 7PKG_OPTIONS_GROUP.webserver= apache lighttpd nginx
8 8
9PKG_SUPPORTED_OPTIONS= ldap iconv php-sockets gd 9PKG_SUPPORTED_OPTIONS= ldap iconv php-sockets gd
10PKG_SUGGESTED_OPTIONS= mysql iconv php-sockets gd apache 10PKG_SUGGESTED_OPTIONS= mysql iconv php-sockets gd apache
11 11
12PKG_OPTIONS_LEGACY_OPTS+= sockets:php-sockets 12PKG_OPTIONS_LEGACY_OPTS+= sockets:php-sockets
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
@@ -70,23 +70,23 @@ WWW_GROUP?= nginx @@ -70,23 +70,23 @@ WWW_GROUP?= nginx
70.endif 70.endif
71 71
72### 72###
73### Use OpenLDAP for storing data. 73### Use OpenLDAP for storing data.
74### 74###
75.if !empty(PKG_OPTIONS:Mldap) 75.if !empty(PKG_OPTIONS:Mldap)
76DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.1:../../databases/php-ldap 76DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.1:../../databases/php-ldap
77DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_LDAP3-[0-9]*:../../net/pear-Net_LDAP3 77DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_LDAP3-[0-9]*:../../net/pear-Net_LDAP3
78.endif 78.endif
79 79
80### 80###
81### Use sockets, required by managesieve and password plugins. 81### Use sockets, required by managesieve and password plugins.
82### 82###
83.if !empty(PKG_OPTIONS:Msockets) 83.if !empty(PKG_OPTIONS:Mphp-sockets)
84DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=4.3.1:../../net/php-sockets 84DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=4.3.1:../../net/php-sockets
85.endif 85.endif
86 86
87### 87###
88### Add support for gd 88### Add support for gd
89### 89###
90.if !empty(PKG_OPTIONS:Mgd) 90.if !empty(PKG_OPTIONS:Mgd)
91DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd 91DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd
92.endif 92.endif
cvs diff -r1.17.2.3 -r1.17.2.4 pkgsrc/mail/roundcube-plugin-password/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/roundcube-plugin-password/distinfo 2020/05/08 19:17:54 1.17.2.3
+++ pkgsrc/mail/roundcube-plugin-password/distinfo 2020/06/09 11:51:49 1.17.2.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.17.2.3 2020/05/08 19:17:54 bsiegert Exp $ 1$NetBSD: distinfo,v 1.17.2.4 2020/06/09 11:51:49 bsiegert Exp $
2 2
3SHA1 (roundcubemail-1.4.4-complete.tar.gz) = 4e425263f5bec27d39c07bde524f421bda205c07 3SHA1 (roundcubemail-1.4.6-complete.tar.gz) = 44961ef62bb9c9875141ca34704bbc7d6f36373d
4RMD160 (roundcubemail-1.4.4-complete.tar.gz) = 43c3ea4da074337c4b8826420eab9a799fd46e1a 4RMD160 (roundcubemail-1.4.6-complete.tar.gz) = 51e323bf7def448b55f57b9279745b5779690ab3
5SHA512 (roundcubemail-1.4.4-complete.tar.gz) = ddea321b5266c547f67c010147e9aa1457bea4802bec37f9e9d87e691bdc8df27f5c90cff8770de2458822160b85f7359f62742072ae1d642a040b9d88651519 5SHA512 (roundcubemail-1.4.6-complete.tar.gz) = e86763ced58cfa8174f71d33ae45cd62f26a58853b9361b800003fa5bf883a4106c957f66b6b17b03172a3ee595ca74d7c19ac38e449a23377defd77cf555742
6Size (roundcubemail-1.4.4-complete.tar.gz) = 7029864 bytes 6Size (roundcubemail-1.4.6-complete.tar.gz) = 7031573 bytes
7SHA1 (patch-plugins_password_helpers_passwd-expect) = 15e427a3c90bf7c0437a023b3f099abb5a139165 7SHA1 (patch-plugins_password_helpers_passwd-expect) = 15e427a3c90bf7c0437a023b3f099abb5a139165
File Added: pkgsrc/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php
$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';
File Deleted: pkgsrc/mail/roundcube/patches/Attic/patch-rcube_mime_default