summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2022-08-18 07:00:31 +0000
committerwiz <wiz@pkgsrc.org>2022-08-18 07:00:31 +0000
commit49dd5b49f625659293c984d6a25f24139a38af18 (patch)
tree2d668888b6e46d2af5e9bbe76f9d535e09951bd0 /mail
parent220af8aa31b55421271ca9a34516c9a474dcc04f (diff)
downloadpkgsrc-49dd5b49f625659293c984d6a25f24139a38af18.tar.gz
roundcube: remove patches that were removed from distinfo during update
Diffstat (limited to 'mail')
-rw-r--r--mail/roundcube/patches/patch-af15
-rw-r--r--mail/roundcube/patches/patch-config_config.inc.php.sample17
-rw-r--r--mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php25
3 files changed, 0 insertions, 57 deletions
diff --git a/mail/roundcube/patches/patch-af b/mail/roundcube/patches/patch-af
deleted file mode 100644
index 8cd2af5938a..00000000000
--- a/mail/roundcube/patches/patch-af
+++ /dev/null
@@ -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 --git a/mail/roundcube/patches/patch-config_config.inc.php.sample b/mail/roundcube/patches/patch-config_config.inc.php.sample
deleted file mode 100644
index 5378f2fb06f..00000000000
--- a/mail/roundcube/patches/patch-config_config.inc.php.sample
+++ /dev/null
@@ -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 --git a/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php b/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php
deleted file mode 100644
index a58849607a7..00000000000
--- a/mail/roundcube/patches/patch-program_lib_Roundcube_rcube__mime.php
+++ /dev/null
@@ -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';