96c14857ec
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
25 lines
1.3 KiB
PHP
25 lines
1.3 KiB
PHP
$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';
|