gunnar: server/horde/horde-ingo ChangeLog, 1.3, 1.4 backends.php, 1.1, 1.2 conf.php, 1.2, 1.3 horde-ingo-kolab.spec, 1.15, 1.16

cvs at kolab.org cvs at kolab.org
Thu Nov 29 09:25:55 CET 2007 

Author: gunnar

Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv8296/horde/horde-ingo

Modified Files:
	ChangeLog backends.php conf.php horde-ingo-kolab.spec 
Log Message:
Horde packages updated to the newest RC1 release.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	20 Jul 2007 11:19:08 -0000	1.3
+++ ChangeLog	29 Nov 2007 08:25:52 -0000	1.4
@@ -1,3 +1,7 @@
+2007-11-29  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-ingo-kolab.spec: Update to RC1
+
 2007-07-19  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-ingo-kolab.spec: Update to 20070719

Index: backends.php
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/backends.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- backends.php	25 May 2007 13:06:44 -0000	1.1
+++ backends.php	29 Nov 2007 08:25:52 -0000	1.2
@@ -1,53 +1,28 @@
 <?php
-/**
- * $Horde: ingo/config/backends.php.dist,v 1.20.8.4 2006/02/02 22:57:31 jan Exp $
- *
- * Ingo works purely on a preferred mechanism for server selection. There are
- * a number of properties that you can set for each backend:
- *
- * driver:       The Ingo_Driver driver to use to get the script to the
- *               backend server. Valid options:
- *                   'null'       --  No backend server
- *                   'timsieved'  --  Cyrus timsieved server
- *                   'vfs'        --  Use Horde VFS
- *
- * preferred:    This is the field that is used to choose which server is
- *               used. The value for this field may be a single string or an
- *               array of strings containing the hostnames to use with this
- *               server.
- *
- * hordeauth:    Ingo uses the current logged in username and password. If
- *               you want the full username at realm to be used to connect then
- *               set this to 'full' otherwise set this to true and just the
- *               username will be used to connect to the driver.
- *
- * params:       An array containing any additional information that the
- *               Ingo_Driver class needs.
- *
- * script:       The type of Ingo_Script driver this server uses.
- *               Valid options:
- *                   'imap'      --  IMAP client side filtering
- *                   'maildrop'  --  Maildrop scripts
- *                   'procmail'  --  Procmail scripts
- *                   'sieve'     --  Sieve scripts
- *
- * scriptparams: An array containing any additional information that the
- *               Ingo_Script driver needs.
- */
 
 /* Kolab Example (using Sieve) */
 if ($GLOBALS['conf']['kolab']['enabled']) {
+    require_once 'Horde/Kolab.php';
+
+    if (!is_callable('Kolab', 'getServer')) {
+        $server = $GLOBALS['conf']['kolab']['imap']['server'];
+    } else {
+        $server = Kolab::getServer('imap');
+    }
+
     $backends['kolab'] = array(
         'driver' => 'timsieved',
         'preferred' => '',
         'hordeauth' => 'full',
         'params' => array(
-            'hostspec' => $GLOBALS['conf']['kolab']['imap']['server'],
+            'hostspec' => $server,
             'logintype' => 'PLAIN',
+            'usetls' => false,
             'port' => $GLOBALS['conf']['kolab']['imap']['sieveport'],
             'scriptname' => 'kmail-vacation.siv'
         ),
         'script' => 'sieve',
-        'scriptparams' => array()
+        'scriptparams' => array(),
+        'shares' => false
     );
 }

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/conf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conf.php	4 Oct 2007 09:47:55 -0000	1.2
+++ conf.php	29 Nov 2007 08:25:52 -0000	1.3
@@ -1,13 +1,12 @@
 <?php
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: ingo/config/conf.xml,v 1.20 2007/07/27 16:55:13 jan Exp $
+// $Horde: ingo/config/conf.xml,v 1.21 2007/09/06 23:27:25 jan Exp $
 $conf['menu']['apps'] = array();
 $conf['storage']['driver'] = 'prefs';
 $conf['storage']['maxblacklist'] = 0;
 $conf['storage']['maxwhitelist'] = 0;
 $conf['rules']['userheader'] = true;
 $conf['rules']['usefolderapi'] = true;
-$conf['spam']['enabled'] = true;
 $conf['spam']['header'] = 'X-Spam-Level';
 $conf['spam']['char'] = '*';
 $conf['spam']['compare'] = 'string';

Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- horde-ingo-kolab.spec	4 Oct 2007 09:47:55 -0000	1.15
+++ horde-ingo-kolab.spec	29 Nov 2007 08:25:52 -0000	1.16
@@ -2,10 +2,10 @@
 %define         V_horde_name ingo
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 10
-%define         V_day   04
-%define         V_version 1.2_alpha
-%define         V_uver    1.2-alpha
+%define         V_month 11
+%define         V_day   28
+%define         V_version 1.2_rc1
+%define         V_uver    1.2-rc1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -69,9 +69,10 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
 
-	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                   \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'    \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/backends.php'
+	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/backends.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

More information about the commits mailing list