summaryrefslogtreecommitdiff
path: root/kolab-webclient/ingo
diff options
context:
space:
mode:
authorGunnar Wrobel <p@rdus.de>2011-01-11 13:53:28 (GMT)
committerChristoph Wickert <cwickert@fedoraproject.org>2011-04-10 21:13:58 (GMT)
commit16b5467cf010ff78029c0370a4f836eaf88b8300 (patch)
treef5de95d19dd09a11cc17bc33eba03e707714c3b0 /kolab-webclient/ingo
parent6a0f6de7e2c0709a9c3817743b45f549821698e4 (diff)
downloadserver-16b5467cf010ff78029c0370a4f836eaf88b8300.tar.gz
Ensure the backend override configuration gets applied.
kolab/issue4684 (No options in webclient -> Options -> Filters) kolab/issue4683 (Forwards and spamfilter missing from filters)
Diffstat (limited to 'kolab-webclient/ingo')
-rw-r--r--kolab-webclient/ingo/ChangeLog9
-rw-r--r--kolab-webclient/ingo/ingo.spec2
-rw-r--r--kolab-webclient/ingo/patches/ingo-1.2.5/series1
-rw-r--r--kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff30
4 files changed, 41 insertions, 1 deletions
diff --git a/kolab-webclient/ingo/ChangeLog b/kolab-webclient/ingo/ChangeLog
index aca5694..6c00a82 100644
--- a/kolab-webclient/ingo/ChangeLog
+++ b/kolab-webclient/ingo/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-11 Gunnar Wrobel <p@rdus.de>
+
+ * patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff:
+
+ Ensure the backend override configuration gets applied.
+
+ kolab/issue4684 (No options in webclient -> Options -> Filters)
+ kolab/issue4683 (Forwards and spamfilter missing from filters)
+
2010-11-26 Gunnar Wrobel <p@rdus.de>
* ingo.spec: Update to 1.2.5.
diff --git a/kolab-webclient/ingo/ingo.spec b/kolab-webclient/ingo/ingo.spec
index 4982242..e082c9b 100644
--- a/kolab-webclient/ingo/ingo.spec
+++ b/kolab-webclient/ingo/ingo.spec
@@ -1,7 +1,7 @@
# Macros
%define V_package ingo
%define V_version 1.2.5
-%define V_release 20101126
+%define V_release 20110111
# Package Information
Name: %{V_package}
diff --git a/kolab-webclient/ingo/patches/ingo-1.2.5/series b/kolab-webclient/ingo/patches/ingo-1.2.5/series
new file mode 100644
index 0000000..c877d38
--- /dev/null
+++ b/kolab-webclient/ingo/patches/ingo-1.2.5/series
@@ -0,0 +1 @@
+t_ingo_HK_GW_ConfigurationOverride.diff
diff --git a/kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff b/kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff
new file mode 100644
index 0000000..940423b
--- /dev/null
+++ b/kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff
@@ -0,0 +1,30 @@
+From: Gunnar Wrobel <p@rdus.de>
+Subject: [PATCH] t/ingo/HK/GW/ConfigurationOverride
+
+Allow overriding configuration defaults.
+
+STATUS: HACK
+
+Signed-off-by: Gunnar Wrobel <p@rdus.de>
+
+---
+
+--- a/config/backends.php.dist 2009-08-05 23:06:10.000000000 +0200
++++ b/config/backends.php.dist 2010-03-09 22:21:04.000000000 +0100
+@@ -332,3 +332,16 @@
+ 'shares' => false
+ );
+ }
++
++ // Load global configuration stanzas in .d directory
++ $directory = dirname(__FILE__) . '/backends.d';
++ if (file_exists($directory) && is_dir($directory)) {
++ $sub_files = glob("$directory/*.php");
++ if ($sub_files) {
++ foreach ($sub_files as $sub_file) {
++ ob_start();
++ $success = include $sub_file;
++ $output = ob_get_clean();
++ }
++ }
++ }