pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/roundcube/patches roundcube: remove patches that ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a59e23c4aa53
branches:  trunk
changeset: 383344:a59e23c4aa53
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 18 07:00:31 2022 +0000

description:
roundcube: remove patches that were removed from distinfo during update

diffstat:

 mail/roundcube/patches/patch-af                                    |  15 ------
 mail/roundcube/patches/patch-config_config.inc.php.sample          |  17 ------
 mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php |  25 ----------
 3 files changed, 0 insertions(+), 57 deletions(-)

diffs (69 lines):

diff -r 440555c31f56 -r a59e23c4aa53 mail/roundcube/patches/patch-af
--- a/mail/roundcube/patches/patch-af   Thu Aug 18 00:20:58 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.8 2020/01/14 14:30:00 taca Exp $
-
-Honor PKG_SYSCONFDIR.
-
---- program/include/iniset.php.orig    2020-01-01 19:58:53.000000000 +0000
-+++ program/include/iniset.php
-@@ -28,7 +28,7 @@ if (!defined('INSTALL_PATH')) {
- }
- 
- if (!defined('RCMAIL_CONFIG_DIR')) {
--    define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: (INSTALL_PATH . 'config'));
-+    define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: '@PKG_SYSCONFDIR@');
- }
- 
- if (!defined('RCUBE_LOCALIZATION_DIR')) {
diff -r 440555c31f56 -r a59e23c4aa53 mail/roundcube/patches/patch-config_config.inc.php.sample
--- a/mail/roundcube/patches/patch-config_config.inc.php.sample Thu Aug 18 00:20:58 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-config_config.inc.php.sample,v 1.2 2020/01/14 14:30:00 taca Exp $
-
-Add default paths for log, tmp and MIME types.
-
---- config/config.inc.php.sample.orig  2020-01-01 19:58:53.000000000 +0000
-+++ config/config.inc.php.sample
-@@ -84,3 +84,10 @@ $config['plugins'] = array(
- 
- // skin name: folder from skins/
- $config['skin'] = 'elastic';
-+
-+// use this folder to store log files (must be writeable for apache user)
-+// This is used by the 'file' log driver.
-+$config['log_dir'] = '@VARBASE@/log/roundcube/';
-+
-+// use this folder to store temp files (must be writeable for apache user)
-+$config['temp_dir'] = '@VARBASE@/tmp/roundcube/';
diff -r 440555c31f56 -r a59e23c4aa53 mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php
--- a/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php        Thu Aug 18 00:20:58 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$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';



Home | Main Index | Thread Index | Old Index