From cvs at kolab.org  Thu Apr  1 00:30:17 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 00:30:17 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	- New directory 
Message-ID: <20100331223017.A7A07600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv19530/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Log Message:
Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment added to the repository




From cvs at kolab.org  Thu Apr  1 00:32:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 00:32:24 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Delivery.php, NONE, 1.1 
Message-ID: <20100331223224.D49CF600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv19607/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Added Files:
	Delivery.php 
Log Message:
Add the first bit of the class hierarchy that will handle the different script segments.

--- NEW FILE: Delivery.php ---
<?php
/**
 * A sieve script that handles mail delivery to a specific folder.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */

/**
 * A sieve script that handles mail delivery to a specific folder.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you did not
 * receive this file, see
 * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */
class KolabAdmin_Sieve_Segment_Delivery
{
    /**
     * Constructor.
     */
    public function __construct()
    {
    }
}


From cvs at kolab.org  Thu Apr  1 00:32:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 00:32:24 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	NONE, 1.1 
Message-ID: <20100331223224.D1D7A600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv19607/kolab-webadmin/lib/KolabAdmin

Added Files:
	Sieve.php 
Log Message:
Add the first bit of the class hierarchy that will handle the different script segments.

--- NEW FILE: Sieve.php ---
<?php
/**
 * Manages Kolab user sieve scripts.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */

/**
 * Manages Kolab user sieve scripts.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you did not
 * receive this file, see
 * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */
class KolabAdmin_Sieve
{

    /**
     * The sieve connection.
     */
    private $_sieve;

    /**
     * The sieve script segments.
     */
    private $_segments;

    /**
     * Constructor.
     */
    public function __construct(Net_Sieve $sieve)
    {
        $this->_sieve = $sieve;
    }

    private function _init()
    {
        if ($this->_segments === null) {
            $this->_segments['delivery'] = new KolabAdmin_Sieve_Segment_Delivery();
        }
    }

    public function fetchDeliverySegment()
    {
        $this->_init();
        return $this->_segments['delivery'];
    }
}


From cvs at kolab.org  Thu Apr  1 00:43:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 00:43:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Delivery.php, 1.1, 1.2 
Message-ID: <20100331224336.DE09C60056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv19952/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Delivery.php 
Log Message:
More stubs.

Index: Delivery.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Delivery.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Delivery.php	31 Mar 2010 22:32:22 -0000	1.1
+++ Delivery.php	31 Mar 2010 22:43:34 -0000	1.2
@@ -27,11 +27,41 @@
  * @link     http://www.kolab.org
  */
 class KolabAdmin_Sieve_Segment_Delivery
+extends KolabAdmin_Sieve_Segment
 {
     /**
+     * The folder to deliver mails to.
+     *
+     * @var string
+     */
+    private $_delivery_folder;
+
+    /**
      * Constructor.
      */
     public function __construct()
     {
+    }
+
+    /**
+     * Retrieve the delivery folder this script will deliver to.
+     *
+     * @return string The delivery folder.
+     */
+    public function getDeliveryFolder()
+    {
+        return $this->_delivery_folder;
+    }
+
+    /**
+     * Set the delivery folder this script will deliver to.
+     *
+     * @param string $folder The delivery folder.
+     *
+     * @return NULL
+     */
+    public function setDeliveryFolder($folder)
+    {
+        $this->_delivery_folder = $folder;
     }
 }



From cvs at kolab.org  Thu Apr  1 00:43:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 00:43:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Segment.php, NONE, 1.1 
Message-ID: <20100331224336.DB2C1600148@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv19952/kolab-webadmin/lib/KolabAdmin/Sieve

Added Files:
	Segment.php 
Log Message:
More stubs.

--- NEW FILE: Segment.php ---
<?php
/**
 * A sieve script that handles mail delivery to a specific folder.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */

/**
 * A sieve script that handles mail delivery to a specific folder.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you did not
 * receive this file, see
 * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */
class KolabAdmin_Sieve_Segment
{
    /**
     * Is this particular segment active?
     *
     * @var bool
     */
    private $_active = false;

    /**
     * Constructor.
     */
    public function __construct()
    {
    }

    /**
     * Is this particular segment active?
     *
     * @return bool True if the segment is active.
     */
    public function isActive()
    {
        return $this->_active;
    }

    /**
     * Set the segment active.
     *
     * @return NULL
     */
    public function setActive()
    {
        $this->_active = true;
    }

    /**
     * Set the segment inactive.
     *
     * @return NULL
     */
    public function setInactive()
    {
        $this->_active = false;
    }

    public function generate()
    {
        return '';
    }
}


From cvs at kolab.org  Thu Apr  1 11:12:33 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 11:12:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Segment.php, 1.1, 1.2 
Message-ID: <20100401091233.0D17960056A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv9222/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Segment.php 
Log Message:
Add a first draft of the segment machinery to support the combined script. The logic is still somewhat to complex but refactoring comes later.

Index: Segment.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Segment.php	31 Mar 2010 22:43:34 -0000	1.1
+++ Segment.php	1 Apr 2010 09:12:30 -0000	1.2
@@ -37,8 +37,10 @@
 
     /**
      * Constructor.
+     *
+     * @param string $script The current script segment
      */
-    public function __construct()
+    public function __construct($script = '')
     {
     }
 



From cvs at kolab.org  Thu Apr  1 11:12:33 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 11:12:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.1, 1.2 
Message-ID: <20100401091233.0E8DB600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv9222/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Add a first draft of the segment machinery to support the combined script. The logic is still somewhat to complex but refactoring comes later.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Sieve.php	31 Mar 2010 22:32:22 -0000	1.1
+++ Sieve.php	1 Apr 2010 09:12:30 -0000	1.2
@@ -29,6 +29,11 @@
 class KolabAdmin_Sieve
 {
 
+    const SCRIPT = 'kolab.siv';
+
+    const OLD_SCRIPT_DELIVERY = 'kolab-deliver.siv';
+
+
     /**
      * The sieve connection.
      */
@@ -41,6 +46,8 @@
 
     /**
      * Constructor.
+     *
+     * @param Net_Sieve $sieve The sieve connection.
      */
     public function __construct(Net_Sieve $sieve)
     {
@@ -50,7 +57,44 @@
     private function _init()
     {
         if ($this->_segments === null) {
-            $this->_segments['delivery'] = new KolabAdmin_Sieve_Segment_Delivery();
+            $scripts = $this->_sieve->listScripts();
+
+            if (!empty($scripts)) {
+                if (in_array(self::SCRIPT, $scripts)) {
+                    $this->_segments = $this->_splitSegments(
+                        $this->_sieve->getScript(self::SCRIPT)
+                    );
+                } else {
+                    if (in_array(self::OLD_SCRIPT_DELIVERY, $scripts)) {
+                        $this->_segments['delivery'] = new KolabAdmin_Sieve_Segment_Delivery(
+                            $this->_sieve->getScript(self::OLD_SCRIPT_DELIVERY)
+                        );
+                        if ($this->_sieve->getActive() == self::OLD_SCRIPT_DELIVERY) {
+                            $this->_segments['delivery']->setActive();
+                        }
+                    }
+                }
+            }
+            if (!isset($this->_segments['delivery'])) {
+                $this->_segments['delivery'] = new KolabAdmin_Sieve_Segment_Delivery();
+            }
+        }
+    }
+
+    private function _splitSegments($script)
+    {
+        preg_match('/^\\(### SEGMENT START [^#]*.*?### SEGMENT END [^#]*\\)/', $script, $matches);
+        foreach ($matches as $match) {
+            preg_match('/^### SEGMENT START \\([^#]*\\)/', $match, $id);
+            if (!empty($id[0])) {
+                $class = 'KolabAdmin_Sieve_Segment_' . ucfirst($id[0]);
+                $this->_segments[$id[0]] = new $class($match);
+                if (preg_match('/^### SEGMENT START \\([^ ]* ENABLED\\)/', $match)) {
+                    $this->_segments[$id[0]]->setActive();
+                }
+            } else {
+                throw new Exception('Unknown segment type.');
+            }
         }
     }
 



From cvs at kolab.org  Thu Apr  1 11:12:33 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 11:12:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Delivery.php, 1.2, 1.3 
Message-ID: <20100401091233.100A1600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv9222/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Delivery.php 
Log Message:
Add a first draft of the segment machinery to support the combined script. The logic is still somewhat to complex but refactoring comes later.

Index: Delivery.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Delivery.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Delivery.php	31 Mar 2010 22:43:34 -0000	1.2
+++ Delivery.php	1 Apr 2010 09:12:30 -0000	1.3
@@ -37,13 +37,6 @@
     private $_delivery_folder;
 
     /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
      * Retrieve the delivery folder this script will deliver to.
      *
      * @return string The delivery folder.



From cvs at kolab.org  Thu Apr  1 15:38:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 15:38:21 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Delivery.php, 1.3, 1.4 
Message-ID: <20100401133821.54D33600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv16540/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Delivery.php 
Log Message:
Complete the handling of the folder delivery segment.

Index: Delivery.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Delivery.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Delivery.php	1 Apr 2010 09:12:30 -0000	1.3
+++ Delivery.php	1 Apr 2010 13:38:19 -0000	1.4
@@ -30,11 +30,32 @@
 extends KolabAdmin_Sieve_Segment
 {
     /**
+     * The segment type
+     *
+     * @var string
+     */
+    protected $type = 'delivery';
+
+    /**
      * The folder to deliver mails to.
      *
      * @var string
      */
-    private $_delivery_folder;
+    private $_delivery_folder = 'Inbox';
+
+    /**
+     * Constructor.
+     *
+     * @param string $script The current script segment
+     */
+    public function __construct($script = '')
+    {
+        $this->template = 'if allof (%s' . "\r\n" .
+            'header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"]) {' . "\r\n" .
+            'fileinto "INBOX/%s";' . "\r\n" .
+            '}' . "\r\n";
+        parent::__construct($script);
+    }
 
     /**
      * Retrieve the delivery folder this script will deliver to.
@@ -56,5 +77,25 @@
     public function setDeliveryFolder($folder)
     {
         $this->_delivery_folder = $folder;
+    }
+
+    public function getArguments()
+    {
+        return array(
+            ($this->isActive()) ? 'true, ## delivery enabled' : 'false, ## delivery disabled',
+            $this->getDeliveryFolder()
+        );
+    }
+
+    public function parseArguments($script)
+    {
+        $this->parseDeliveryFolder($script);
+    }
+
+    public function parseDeliveryFolder($script)
+    {
+        if (preg_match("/fileinto \"INBOX\/([^\"]*)\";/", $script, $regs)) {
+            $this->setDeliveryFolder($regs[1]);
+        }
     }
 }



From cvs at kolab.org  Thu Apr  1 15:38:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 15:38:21 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.2, 1.3 
Message-ID: <20100401133821.4CF31600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv16540/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Complete the handling of the folder delivery segment.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Sieve.php	1 Apr 2010 09:12:30 -0000	1.2
+++ Sieve.php	1 Apr 2010 13:38:19 -0000	1.3
@@ -83,19 +83,22 @@
 
     private function _splitSegments($script)
     {
-        preg_match('/^\\(### SEGMENT START [^#]*.*?### SEGMENT END [^#]*\\)/', $script, $matches);
+        $segments = array();
+        preg_match_all('/^### SEGMENT START [^#]*.*?### SEGMENT END [^#]*/s', $script, $matches);
         foreach ($matches as $match) {
-            preg_match('/^### SEGMENT START \\([^#]*\\)/', $match, $id);
-            if (!empty($id[0])) {
-                $class = 'KolabAdmin_Sieve_Segment_' . ucfirst($id[0]);
-                $this->_segments[$id[0]] = new $class($match);
-                if (preg_match('/^### SEGMENT START \\([^ ]* ENABLED\\)/', $match)) {
-                    $this->_segments[$id[0]]->setActive();
+            preg_match('/^### SEGMENT START ([^# ]*) ?(ENABLED)?/s', $match[0], $id);
+            if (!empty($id[1])) {
+                $type = strtolower($id[1]);
+                $class = 'KolabAdmin_Sieve_Segment_' . ucfirst($type);
+                $segments[$type] = new $class($match[0]);
+                if ($id[2] == 'ENABLED') {
+                    $segments[$type]->setActive();
                 }
             } else {
                 throw new Exception('Unknown segment type.');
             }
         }
+        return $segments;
     }
 
     public function fetchDeliverySegment()



From cvs at kolab.org  Thu Apr  1 15:38:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 15:38:21 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Segment.php, 1.2, 1.3 
Message-ID: <20100401133821.505CC600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv16540/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Segment.php 
Log Message:
Complete the handling of the folder delivery segment.

Index: Segment.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Segment.php	1 Apr 2010 09:12:30 -0000	1.2
+++ Segment.php	1 Apr 2010 13:38:19 -0000	1.3
@@ -26,9 +26,23 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://www.kolab.org
  */
-class KolabAdmin_Sieve_Segment
+abstract class KolabAdmin_Sieve_Segment
 {
     /**
+     * The segment type
+     *
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * The script template
+     *
+     * @var string
+     */
+    protected $template;
+
+    /**
      * Is this particular segment active?
      *
      * @var bool
@@ -42,6 +56,9 @@
      */
     public function __construct($script = '')
     {
+        if (!empty($script)) {
+            $this->parseArguments($script);
+        }
     }
 
     /**
@@ -76,6 +93,13 @@
 
     public function generate()
     {
-        return '';
+        return '### SEGMENT START ' . strtoupper($this->type) .' ' .
+            (($this->_active) ? 'ENABLED' : 'DISABLED') . "\r\n" .
+            vsprintf($this->template, $this->getArguments()) .
+            '### SEGMENT END ' . strtoupper($this->type) . "\r\n";
     }
+
+    abstract public function getArguments();
+
+    abstract public function parseArguments($script);
 }



From cvs at kolab.org  Thu Apr  1 17:10:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 17:10:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin Makefile.am,1.61,1.62 
Message-ID: <20100401151036.130F3600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv19058/kolab-webadmin

Modified Files:
	Makefile.am 
Log Message:
Add the handler for the forward sieve segment.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Makefile.am	31 Mar 2010 19:55:10 -0000	1.61
+++ Makefile.am	1 Apr 2010 15:10:33 -0000	1.62
@@ -125,9 +125,15 @@
 pearkadir = $(phplibdir)/KolabAdmin
 dist_pearka_DATA = $(PEARKA_FILES)
 
-PEARKA_SIEVE_FILES = lib/KolabAdmin/Sieve/Script.php
+PEARKA_SIEVE_FILES = lib/KolabAdmin/Sieve/Script.php \
+	lib/KolabAdmin/Sieve/Segment.php
 pearkasievedir = $(phplibdir)/KolabAdmin/Sieve
 dist_pearkasieve_DATA = $(PEARKA_SIEVE_FILES)
+
+PEARKA_SIEVE_SEGMENT_FILES = lib/KolabAdmin/Sieve/Segment/Delivery.php \
+	lib/KolabAdmin/Sieve/Segment/Forward.php
+pearkasievesegmentdir = $(phplibdir)/KolabAdmin/Sieve/Segment
+dist_pearkasievesegment_DATA = $(PEARKA_SIEVE_SEGMENT_FILES)
 
 PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
 	php/admin/templates/kde.tpl \



From cvs at kolab.org  Thu Apr  1 17:10:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 17:10:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.3, 1.4 
Message-ID: <20100401151036.154F2600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv19058/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Add the handler for the forward sieve segment.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Sieve.php	1 Apr 2010 13:38:19 -0000	1.3
+++ Sieve.php	1 Apr 2010 15:10:33 -0000	1.4
@@ -33,6 +33,8 @@
 
     const OLD_SCRIPT_DELIVERY = 'kolab-deliver.siv';
 
+    const OLD_SCRIPT_FORWARD = 'kolab-forward.siv';
+
 
     /**
      * The sieve connection.
@@ -73,11 +75,22 @@
                             $this->_segments['delivery']->setActive();
                         }
                     }
+                    if (in_array(self::OLD_SCRIPT_FORWARD, $scripts)) {
+                        $this->_segments['forward'] = new KolabAdmin_Sieve_Segment_Forward(
+                            $this->_sieve->getScript(self::OLD_SCRIPT_FORWARD)
+                        );
+                        if ($this->_sieve->getActive() == self::OLD_SCRIPT_FORWARD) {
+                            $this->_segments['forward']->setActive();
+                        }
+                    }
                 }
             }
             if (!isset($this->_segments['delivery'])) {
                 $this->_segments['delivery'] = new KolabAdmin_Sieve_Segment_Delivery();
             }
+            if (!isset($this->_segments['forward'])) {
+                $this->_segments['forward'] = new KolabAdmin_Sieve_Segment_Forward();
+            }
         }
     }
 
@@ -105,5 +118,11 @@
     {
         $this->_init();
         return $this->_segments['delivery'];
+    }
+
+    public function fetchForwardSegment()
+    {
+        $this->_init();
+        return $this->_segments['forward'];
     }
 }



From cvs at kolab.org  Thu Apr  1 17:10:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Apr 2010 17:10:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Forward.php, NONE, 1.1 
Message-ID: <20100401151036.16A02600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv19058/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Added Files:
	Forward.php 
Log Message:
Add the handler for the forward sieve segment.

--- NEW FILE: Forward.php ---
<?php
/**
 * A sieve script that handles mail forwarding to a specific address.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */

/**
 * A sieve script that handles mail forwarding to a specific address.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you did not
 * receive this file, see
 * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */
class KolabAdmin_Sieve_Segment_Forward
extends KolabAdmin_Sieve_Segment
{
    /**
     * The segment type.
     *
     * @var string
     */
    protected $type = 'forward';

    /**
     * The forwarding address.
     *
     * @var string
     */
    private $_forward_address = '';

    /**
     * Should mails be kept on the server after forwarding?
     *
     * @var string
     */
    private $_keep_on_server = true;

    /**
     * Constructor.
     *
     * @param string $script The current script segment
     */
    public function __construct($script = '')
    {
        $this->template = 'if allof (%s)' . "\r\n" .
            'redirect "%s";%s' . "\r\n";
        parent::__construct($script);
    }

    /**
     * Retrieve the forwarding address this script will deliver to.
     *
     * @return string The forwarding address.
     */
    public function getForwardAddress()
    {
        return $this->_forward_address;
    }

    /**
     * Set the forwarding address this script will deliver to.
     *
     * @param string $folder The forward address.
     *
     * @return NULL
     */
    public function setForwardAddress($address)
    {
        $this->_forward_address = $address;
    }

    /**
     * Should the messages be kept on the server after forwarding?
     *
     * @return bool True if the messages should be kept.
     */
    public function getKeepOnServer()
    {
        return $this->_keep_on_server;
    }

    /**
     * Set if the messages should be kept on the server after forwarding.
     *
     * @param boolean $keep True if the messages should be kept.
     *
     * @return NULL
     */
    public function setKeepOnServer($keep)
    {
        $this->_keep_on_server = $keep;
    }

    public function getArguments()
    {
        $address = $this->getForwardAddress();
        if (empty($address)) {
            throw new Exception('Please enter a valid e-mail address!');
        }
        return array(
            ($this->isActive()) ? 'true, ## forward enabled' : 'false, ## forward disabled',
            $address,
            ($this->getKeepOnServer()) ? ' keep;' : ''
        );
    }

    public function parseArguments($script)
    {
        $this->parseForwardAddress($script);
        $this->parseKeepOnServer($script);
    }

    public function parseForwardAddress($script)
    {
        if (preg_match("/redirect \"([^\"]*)\"/s", $script, $regs)) {
            $this->_forward_address = $regs[1];
        }
    }

    public function parseKeepOnServer($script)
    {
        if (preg_match('/redirect "[^\"]*"; keep;/s', $script, $regs)) {
            $this->_keep_on_server = true;
        } else {
            $this->_keep_on_server = false;
        }
    }
}


From cvs at kolab.org  Tue Apr  6 10:55:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 10:55:31 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Vacation.php, NONE, 1.1 
Message-ID: <20100406085531.4D111600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv24304/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Added Files:
	Vacation.php 
Log Message:
Add the vacation segment.

--- NEW FILE: Vacation.php ---
<?php
/**
 * A sieve script that responds automatically during vacations.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */

/**
 * A sieve script that responds automatically during vacations.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you did not
 * receive this file, see
 * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */
class KolabAdmin_Sieve_Segment_Vacation
extends KolabAdmin_Sieve_Segment
{
    /**
     * The segment type.
     *
     * @var string
     */
    protected $type = 'vacation';

    /**
     * The text of the automatic response.
     *
     * @var string
     */
    private $_response;

    /**
     * Resend response after this amount of days elapsed.
     *
     * @var string
     */
    private $_resend_after = 7;

    /**
     * Recipient addresses for which the response should be sent.
     *
     * @var array
     */
    private $_recipient_addresses = array();

    /**
     * Should a response be sent in case the incoming message has been tagged as
     * spam?
     *
     * @var boolean
     */
    private $_react_to_spam = false;

    /**
     * The sender address must be part of this domain for the automatic
     * responses to be sent.
     *
     * @var string
     */
    private $_domain = '';

    /**
     * Constructor.
     *
     * @param string $script The current script segment
     */
    public function __construct($script = '')
    {
        $this->_response = '';

        $this->template = 'if allof (%s' . "\r\n" .
            '%s' . "\r\n" .
            '%s) {' . "\r\n" .
            'vacation :addresses [ %s ] :days %s text:' . "\r\n" .
            '%s' . "\r\n" .
            '.' . "\r\n" .
            ';' . "\r\n" .
            '}' . "\r\n";
        parent::__construct($script);
    }

    /**
     * Fetch the text of the automatic response.
     *
     * @return string The response.
     */
    public function getResponse()
    {
        return $this->undotstuff($this->_response);
    }

    /**
     * Set the text of the automatic response.
     *
     * @param string $response The response.
     *
     * @return NULL
     */
    public function setResponse($response)
    {
        $this->_response = $this->dotstuff($response);
    }

    /**
     * Resend the automatic response after how many days?
     *
     * @return int The number of days.
     */
    public function getResendAfter()
    {
        return $this->_resend_after;
    }

    /**
     * Set after how many days the automatic response should get sent again.
     *
     * @param int $days Resend after this many days.
     *
     * @return NULL
     */
    public function setResendAfter($days)
    {
        $this->_resend_after = $days;
    }

    /**
     * Send the responses to which recipient addresses?
     *
     * @return array The recipient addresses.
     */
    public function getRecipientAddresses()
    {
        return $this->_recipient_addresses;
    }

    /**
     * Set the recipient addresses for which the automatic reply will be sent.
     *
     * @param array $addresses The recipient addresses.
     *
     * @return NULL
     */
    public function setRecipientAddresses(array $addresses)
    {
        $this->_recipient_addresses = $addresses;
    }

    /**
     * Should the vacation notice also be sent in reply to messages
     * flagged as spam?
     *
     * @return boolean True in case the reply should also be sent to
     * potential spam messages.
     */
    public function getReactToSpam()
    {
        return $this->_react_to_spam;
    }

    /**
     * Set whether the replies during vacation should also get sent to
     * potential spam messages.
     *
     * @param boolean $react_to_spam Should the replies also be sent
     * for potential spam messages?
     *
     * @return NULL
     */
    public function setReactToSpam($react_to_spam)
    {
        $this->_react_to_spam = $react_to_spam;
    }

    /**
     * Should we only react to messages recieved from a specific domain?
     *
     * @return string The domain for which the vacation response will be sent.
     */
    public function getDomain()
    {
        return $this->_domain;
    }

    /**
     * Set the domain for which vacation replies will be sent.
     *
     * @param string $domain The domain for which the vacation response will be sent.
     *
     * @return NULL
     */
    public function setDomain($domain)
    {
        $this->_domain = $domain;
    }

    public function getArguments()
    {
        $domain = $this->getDomain();
        if (!empty($domain)) {
            $domain = 'address :domain :contains "From" "' . $domain . '"';
        } else {
            $domain = '';
        }
        if (!$this->getReactToSpam()) {
            $react_to_spam = 'not header :contains "X-Spam-Flag" "YES"';
        } else {
            $react_to_spam = '';
        }
        return array(
            ($this->isActive()) ? 'true, ## vacation enabled' : 'false, ## vacation disabled',
            $domain,
            $react_to_spam,
            '"' . join('", "', $this->getRecipientAddresses()) . '"',
            $this->getResendAfter(),
            $this->getResponse()
        );
    }

    public function parseArguments($script)
    {
        $this->parseResponse($script);
        $this->parseResendAfter($script);
        $this->parseDomain($script);
        $this->parseRecipientAddresses($script);
        $this->parseReactToSpam($script);
    }

    public function parseResponse($script)
    {
        if (preg_match("/text:(.*\r\n)\\.\r\n/s", $script, $regs)) {
            $this->_response = trim(str_replace( '\n', "\r\n", $regs[1]));
        }
    }

    public function parseResendAfter($script)
    {
        if (preg_match("/:days ([0-9]+)/s", $script, $regs)) {
            $this->_resend_after = $regs[1];
        }
    }

    public function parseDomain($script)
    {
        if (preg_match('/address :domain :contains "From" "(.*)"/i', $script, $regs)) {
            $this->_domain = $regs[1];
        }
    }

    public function parseRecipientAddresses($script)
    {
        if (preg_match("/:addresses \\[([^\\]]*)\\]/s", $script, $regs)) {
            $tmp = split(',', $regs[1]);
            $this->_recipient_addresses = array();
            foreach ($tmp as $a) {
                if (preg_match('/^ *"(.*)" *$/', $a, $regs)) {
                    $this->_recipient_addresses[] = $regs[1];
                } else {
                    $this->_recipient_addresses[] = $a;
                }
            }
        }
    }

    public function parseReactToSpam($script)
    {
        if (preg_match('/header :contains "X-Spam-Flag" "YES"/i', $script)) {
            $this->_react_to_spam = false;
        } else {
            $this->_react_to_spam = true;
        }
    }
}


From cvs at kolab.org  Tue Apr  6 10:55:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 10:55:31 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Segment.php, 1.3, 1.4 
Message-ID: <20100406085531.4E417600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv24304/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Segment.php 
Log Message:
Add the vacation segment.

Index: Segment.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Segment.php	1 Apr 2010 13:38:19 -0000	1.3
+++ Segment.php	6 Apr 2010 08:55:28 -0000	1.4
@@ -99,6 +99,16 @@
             '### SEGMENT END ' . strtoupper($this->type) . "\r\n";
     }
 
+    protected function dotstuff($str)
+    {
+        return str_replace("\n.", "\n..", $str);
+    }
+
+    protected function undotstuff($str)
+    {
+        return str_replace("\n..", "\n.", $str);
+    }
+
     abstract public function getArguments();
 
     abstract public function parseArguments($script);



From cvs at kolab.org  Tue Apr  6 10:56:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 10:56:34 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.4, 1.5 
Message-ID: <20100406085634.E5260600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv24415/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Add the vacation segment.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Sieve.php	1 Apr 2010 15:10:33 -0000	1.4
+++ Sieve.php	6 Apr 2010 08:56:32 -0000	1.5
@@ -33,7 +33,9 @@
 
     const OLD_SCRIPT_DELIVERY = 'kolab-deliver.siv';
 
-    const OLD_SCRIPT_FORWARD = 'kolab-forward.siv';
+    const OLD_SCRIPT_FORWARD  = 'kolab-forward.siv';
+
+    const OLD_SCRIPT_VACATION = 'kolab-vacation.siv';
 
 
     /**
@@ -83,6 +85,14 @@
                             $this->_segments['forward']->setActive();
                         }
                     }
+                    if (in_array(self::OLD_SCRIPT_VACATION, $scripts)) {
+                        $this->_segments['vacation'] = new KolabAdmin_Sieve_Segment_Vacation(
+                            $this->_sieve->getScript(self::OLD_SCRIPT_VACATION)
+                        );
+                        if ($this->_sieve->getActive() == self::OLD_SCRIPT_VACATION) {
+                            $this->_segments['vacation']->setActive();
+                        }
+                    }
                 }
             }
             if (!isset($this->_segments['delivery'])) {
@@ -91,6 +101,9 @@
             if (!isset($this->_segments['forward'])) {
                 $this->_segments['forward'] = new KolabAdmin_Sieve_Segment_Forward();
             }
+            if (!isset($this->_segments['vacation'])) {
+                $this->_segments['vacation'] = new KolabAdmin_Sieve_Segment_Vacation();
+            }
         }
     }
 
@@ -104,7 +117,7 @@
                 $type = strtolower($id[1]);
                 $class = 'KolabAdmin_Sieve_Segment_' . ucfirst($type);
                 $segments[$type] = new $class($match[0]);
-                if ($id[2] == 'ENABLED') {
+                if (isset($id[2]) && $id[2] == 'ENABLED') {
                     $segments[$type]->setActive();
                 }
             } else {
@@ -124,5 +137,11 @@
     {
         $this->_init();
         return $this->_segments['forward'];
+    }
+
+    public function fetchVacationSegment()
+    {
+        $this->_init();
+        return $this->_segments['vacation'];
     }
 }



From cvs at kolab.org  Tue Apr  6 10:56:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 10:56:34 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin Makefile.am,1.62,1.63 
Message-ID: <20100406085634.E8224600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv24415/kolab-webadmin

Modified Files:
	Makefile.am 
Log Message:
Add the vacation segment.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- Makefile.am	1 Apr 2010 15:10:33 -0000	1.62
+++ Makefile.am	6 Apr 2010 08:56:32 -0000	1.63
@@ -121,7 +121,8 @@
 	php/admin/include/mysmarty.php 
 EXTRA_DIST += $(PHP_INCLUDES)
 
-PEARKA_FILES = lib/KolabAdmin/Ldap.php
+PEARKA_FILES = lib/KolabAdmin/Ldap.php \
+	lib/KolabAdmin/Sieve.php
 pearkadir = $(phplibdir)/KolabAdmin
 dist_pearka_DATA = $(PEARKA_FILES)
 
@@ -131,7 +132,8 @@
 dist_pearkasieve_DATA = $(PEARKA_SIEVE_FILES)
 
 PEARKA_SIEVE_SEGMENT_FILES = lib/KolabAdmin/Sieve/Segment/Delivery.php \
-	lib/KolabAdmin/Sieve/Segment/Forward.php
+	lib/KolabAdmin/Sieve/Segment/Forward.php \
+	lib/KolabAdmin/Sieve/Segment/Vacation.php
 pearkasievesegmentdir = $(phplibdir)/KolabAdmin/Sieve/Segment
 dist_pearkasievesegment_DATA = $(PEARKA_SIEVE_SEGMENT_FILES)
 



From cvs at kolab.org  Tue Apr  6 10:57:26 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 10:57:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Script.php, 1.3, 1.4 
Message-ID: <20100406085726.5EF63600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv24461/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Script.php 
Log Message:
PHP5.3 strict, WS

Index: Script.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Script.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Script.php	31 Mar 2010 21:05:43 -0000	1.3
+++ Script.php	6 Apr 2010 08:57:24 -0000	1.4
@@ -19,131 +19,132 @@
  */
 
 class KolabAdmin_Sieve_Script {
-  // Funny multiline string escaping in Sieve
-  /*static*/ function dotstuff( $str ) {
-    return str_replace( "\n.", "\n..", $str );
-  }
+
+    // Funny multiline string escaping in Sieve
+    static function dotstuff( $str ) {
+        return str_replace( "\n.", "\n..", $str );
+    }
   
-  /*static*/ function undotstuff( $str ) {
-    return str_replace( "\n..", "\n.", $str );
-  }
+    static function undotstuff( $str ) {
+        return str_replace( "\n..", "\n.", $str );
+    }
   
-  /*static*/ function getDeliverFolder( $script ) {
-    $inbox = false;      
-	if( preg_match("/fileinto \"INBOX\/([^\"]*)\";/", $script, $regs ) ) {
-	  $inbox = $regs[1];
-	}
-    return $inbox;
-  }
+    static function getDeliverFolder( $script ) {
+        $inbox = false;      
+        if( preg_match("/fileinto \"INBOX\/([^\"]*)\";/", $script, $regs ) ) {
+            $inbox = $regs[1];
+        }
+        return $inbox;
+    }
 
-  /*static*/ function getVacationAddresses( $script ) {
-    $addresses = false;
-    if( preg_match("/:addresses \\[([^\\]]*)\\]/s", $script, $regs ) ) {
-      $tmp = split(',', $regs[1] );
-      $addresses = array();
-      foreach( $tmp as $a ) {
-		if( ereg('^ *"(.*)" *$', $a, $regs ) ) $addresses[] = $regs[1];
-		else $addresses[] = $a;
-      }
+    static function getVacationAddresses( $script ) {
+        $addresses = false;
+        if( preg_match("/:addresses \\[([^\\]]*)\\]/s", $script, $regs ) ) {
+            $tmp = split(',', $regs[1] );
+            $addresses = array();
+            foreach( $tmp as $a ) {
+                if( ereg('^ *"(.*)" *$', $a, $regs ) ) $addresses[] = $regs[1];
+                else $addresses[] = $a;
+            }
+        }
+        return $addresses;
     }
-    return $addresses;
-  }
 
-  /*static*/ function getMailDomain( $script ) {
-	$maildomain = false;
-	if( preg_match( '/address :domain :contains "From" "(.*)"/i', $script, $regs ) ) {
-	  $maildomain = $regs[1];
-	}
-	return $maildomain;
-  }
+    static function getMailDomain( $script ) {
+        $maildomain = false;
+        if( preg_match( '/address :domain :contains "From" "(.*)"/i', $script, $regs ) ) {
+            $maildomain = $regs[1];
+        }
+        return $maildomain;
+    }
   
-  /*static*/ function getReactToSpam( $script ) {
-	$spam = false;
-	if( preg_match('/header :contains "X-Spam-Flag" "YES"/i', $script ) ) {
-	  $spam = true;
-	}
-	return $spam;
-  }
+    static function getReactToSpam( $script ) {
+        $spam = false;
+        if( preg_match('/header :contains "X-Spam-Flag" "YES"/i', $script ) ) {
+            $spam = true;
+        }
+        return $spam;
+    }
 
-  /*static*/ function getVacationDays( $script ) {
-    $days = false;
-    if( preg_match("/:days ([0-9]+)/s", $script, $regs ) ) {
-      $days = $regs[1];
+    static function getVacationDays( $script ) {
+        $days = false;
+        if( preg_match("/:days ([0-9]+)/s", $script, $regs ) ) {
+            $days = $regs[1];
+        }
+        return $days;
     }
-    return $days;
-  }
 
-  /*static*/ function getVacationText( $script ) {
-    $text = false;
-    if( preg_match("/text:(.*\r\n)\\.\r\n/s", $script, $regs ) ) {
-      $text = $regs[1];
-      $text = str_replace( '\n', "\r\n", $text );
-      $text = KolabAdmin_Sieve_Script::undotstuff($text);
+    static function getVacationText( $script ) {
+        $text = false;
+        if( preg_match("/text:(.*\r\n)\\.\r\n/s", $script, $regs ) ) {
+            $text = $regs[1];
+            $text = str_replace( '\n', "\r\n", $text );
+            $text = KolabAdmin_Sieve_Script::undotstuff($text);
+        }
+        return $text;
     }
-    return $text;
-  }
 
-  /*static*/ function getForwardAddress( $script ) {
-    $address = false;
-    if( preg_match("/redirect \"([^\"]*)\"/s", $script, $regs ) ) {
-      $address = $regs[1];
+    static function getForwardAddress( $script ) {
+        $address = false;
+        if( preg_match("/redirect \"([^\"]*)\"/s", $script, $regs ) ) {
+            $address = $regs[1];
+        }
+        return $address;
     }
-    return $address;
-  }
 
-  /*static*/ function getKeepOnServer( $script ) {
-    return ereg('"; keep;', $script, $regs ) > 0;
-  }
+    static function getKeepOnServer( $script ) {
+        return ereg('"; keep;', $script, $regs ) > 0;
+    }
 
-  /*static*/ function getScriptInfo($script) {
-	return array('maildomain'        => KolabAdmin_Sieve_Script::getMailDomain($script),
-				 'vacationaddresses' => KolabAdmin_Sieve_Script::getVacationAddresses($script),
-				 'days'              => KolabAdmin_Sieve_Script::getVacationDays($script),
-				 'reacttospam'       => KolabAdmin_Sieve_Script::getReactToSpam($script),
-				 'vacationtext'      => KolabAdmin_Sieve_Script::getVacationText($script),
-				 'vacationenabled'   => KolabAdmin_Sieve_Script::isVacationEnabled($script),
-				 'deliveryfolder'    => KolabAdmin_Sieve_Script::getDeliverFolder($script),
-				 'deliveryenabled'   => KolabAdmin_Sieve_Script::isDeliveryEnabled($script));
-  }
+    static function getScriptInfo($script) {
+        return array('maildomain'        => KolabAdmin_Sieve_Script::getMailDomain($script),
+                     'vacationaddresses' => KolabAdmin_Sieve_Script::getVacationAddresses($script),
+                     'days'              => KolabAdmin_Sieve_Script::getVacationDays($script),
+                     'reacttospam'       => KolabAdmin_Sieve_Script::getReactToSpam($script),
+                     'vacationtext'      => KolabAdmin_Sieve_Script::getVacationText($script),
+                     'vacationenabled'   => KolabAdmin_Sieve_Script::isVacationEnabled($script),
+                     'deliveryfolder'    => KolabAdmin_Sieve_Script::getDeliverFolder($script),
+                     'deliveryenabled'   => KolabAdmin_Sieve_Script::isDeliveryEnabled($script));
+    }
 
-  /*static*/ function isDeliveryEnabled($script) {
-	return ereg('## delivery enabled', $script, $regs )>0;
-  }
+    static function isDeliveryEnabled($script) {
+        return ereg('## delivery enabled', $script, $regs )>0;
+    }
 
-  /*static*/ function isVacationEnabled($script) {
-	return ereg('## vacation enabled', $script, $regs )>0;
-  }
+    static function isVacationEnabled($script) {
+        return ereg('## vacation enabled', $script, $regs )>0;
+    }
   
-  /*static*/ function createScript($scriptinfo) {
-	$tests = array();
-	if( $scriptinfo['vacationenabled'] ) {
-	  $tests[] = "## vacation enabled\r\ntrue";
-	} else {
-	  $tests[] = "## vacation disabled\r\nnot true";
-	}
+    static function createScript($scriptinfo) {
+        $tests = array();
+        if( $scriptinfo['vacationenabled'] ) {
+            $tests[] = "## vacation enabled\r\ntrue";
+        } else {
+            $tests[] = "## vacation disabled\r\nnot true";
+        }
 
-	if(!empty($scriptinfo['maildomain'])) {
-	  $tests[] = "address :domain :contains \"From\" \"".$scriptinfo['maildomain']."\"";
-	}
-	if($scriptinfo['reacttospam']) {
-	  $tests[] = "not header :contains \"X-Spam-Flag\" \"YES\"";
-	}
-	$script =
-	  "require \"vacation\";\r\n\r\n".
-	  "require \"fileinto\";\r\n\r\n".
-	  "if allof (".join(",\r\n",$tests).") {\r\n".
-	  "  vacation :addresses [ \"".join('", "', $scriptinfo['vacationaddresses'] )."\" ] :days ".
-	  $scriptinfo['days']." text:\r\n".
-	  KolabAdmin_Sieve_Script::dotstuff(trim($scriptinfo['vacationtext']))."\r\n.\r\n;\r\n}\r\n";
-	if($scriptinfo['deliveryfolder']) {
-	  if($scriptinfo['deliveryenabled']) {
-		$script .= "if allof (true, ## delivery enabled\r\n";
-	  } else {
-		$script .= "if allof (not true, ## delivery disabled\r\n";
-	  }
-	  $script .= "header :contains [\"X-Kolab-Scheduling-Message\"] [\"FALSE\"]) {\r\nfileinto \"INBOX/".
-		$scriptinfo['deliveryfolder']."\";\r\n}\r\n";
-	}
-	return $script;
-  }
+        if(!empty($scriptinfo['maildomain'])) {
+            $tests[] = "address :domain :contains \"From\" \"".$scriptinfo['maildomain']."\"";
+        }
+        if($scriptinfo['reacttospam']) {
+            $tests[] = "not header :contains \"X-Spam-Flag\" \"YES\"";
+        }
+        $script =
+            "require \"vacation\";\r\n\r\n".
+            "require \"fileinto\";\r\n\r\n".
+            "if allof (".join(",\r\n",$tests).") {\r\n".
+            "  vacation :addresses [ \"".join('", "', $scriptinfo['vacationaddresses'] )."\" ] :days ".
+            $scriptinfo['days']." text:\r\n".
+            KolabAdmin_Sieve_Script::dotstuff(trim($scriptinfo['vacationtext']))."\r\n.\r\n;\r\n}\r\n";
+        if($scriptinfo['deliveryfolder']) {
+            if($scriptinfo['deliveryenabled']) {
+                $script .= "if allof (true, ## delivery enabled\r\n";
+            } else {
+                $script .= "if allof (not true, ## delivery disabled\r\n";
+            }
+            $script .= "header :contains [\"X-Kolab-Scheduling-Message\"] [\"FALSE\"]) {\r\nfileinto \"INBOX/".
+                $scriptinfo['deliveryfolder']."\";\r\n}\r\n";
+        }
+        return $script;
+    }
 };



From cvs at kolab.org  Tue Apr  6 11:00:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 11:00:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.4, 1.5 
Message-ID: <20100406090036.DB773600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv24547/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in 
Log Message:
The new handler reads the old delivery script just fine.

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- deliver.php.in	31 Mar 2010 19:55:10 -0000	1.4
+++ deliver.php.in	6 Apr 2010 09:00:34 -0000	1.5
@@ -21,7 +21,12 @@
 require_once '@kolab_php_module_prefix at admin/include/mysmarty.php';
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
+require_once 'KolabAdmin/Sieve/Segment.php';
+require_once 'KolabAdmin/Sieve/Segment/Delivery.php';
+require_once 'KolabAdmin/Sieve/Segment/Forward.php';
+require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
 // Funny multiline string escaping in Sieve
 function dotstuff( $str ) {
@@ -79,15 +84,7 @@
 	  }	
   }
 
-  $scripts = $sieve->listScripts();
-  $inbox = false;
-  if( in_array( $scriptname, $scripts ) ) {
-	// Fetch script data from server
-	$script = $sieve->getScript($scriptname);
-	$inbox = KolabAdmin_Sieve_Script::getDeliverFolder( $script );
-  }
-  if( $inbox === false ) $inbox = 'Inbox';
-  $active = ( $sieve->getActive() === $scriptname );  
+  $handler = new KolabAdmin_Sieve($sieve);
 }
 
 /**** Insert into template and output ***/
@@ -101,8 +98,8 @@
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $active );
-$smarty->assign( 'inbox', $inbox );
+$smarty->assign( 'active', $handler->fetchDeliverySegment()->isActive() );
+$smarty->assign( 'inbox', $handler->fetchDeliverySegment()->getDeliveryFolder() );
 $smarty->assign( 'maincontent', 'deliver.tpl' );
 $smarty->display('page.tpl');
 



From cvs at kolab.org  Tue Apr  6 12:14:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 12:14:21 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Vacation.php, 1.1, 1.2 
Message-ID: <20100406101421.8AF47600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv26720/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Vacation.php 
Log Message:
Import code that was misplaced in the controller.

Index: Vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Vacation.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Vacation.php	6 Apr 2010 08:55:29 -0000	1.1
+++ Vacation.php	6 Apr 2010 10:14:19 -0000	1.2
@@ -90,6 +90,19 @@
             '.' . "\r\n" .
             ';' . "\r\n" .
             '}' . "\r\n";
+
+        $this->_response = sprintf(
+            _("I am out of office until %s.\r\n").
+            _("In urgent cases, please contact Mrs. <vacation replacement>\r\n\r\n").
+            _("email: <email address of vacation replacement>\r\n").
+            _("phone: +49 711 1111 11\r\n").
+            _("fax.:  +49 711 1111 12\r\n\r\n").
+            _("Yours sincerely,\r\n").
+            _("-- \r\n").
+            _("<enter your name and email address here>"),
+            strftime(_('%x'))
+        );
+
         parent::__construct($script);
     }
 
@@ -122,6 +135,10 @@
      */
     public function getResendAfter()
     {
+        //@todo: Should be placed into a validate method.
+        if ($this->_resend_after < 1) {
+            $this->_resend_after = 7;
+        }
         return $this->_resend_after;
     }
 



From cvs at kolab.org  Tue Apr  6 12:18:57 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 12:18:57 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.5, 1.6 forward.php.in, 1.4,
	1.5 vacation.php.in, 1.6, 1.7 
Message-ID: <20100406101857.073B3600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv26820/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
The new handler reads the old forward and vacation scripts just fine.

In addition this switches from the patched PEAR-Net_Sieve in kolab-webadmin/php/admin/include/Sieve.php to the standard PEAR-Net_Sieve package.
The patched version was imported as is into Kolab CVS. There is no hint if there was anything specific that needed patching or what has actually
been patched. The diff to the current PEAR-Net_Sieve also did not indicate anything that looked like it might be specific to the Kolab server.
The patched version did however fail to work with the new handler as it was not able to load several sieve scripts in succession (which is necessary
to avoid loosing data).

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- deliver.php.in	6 Apr 2010 09:00:34 -0000	1.5
+++ deliver.php.in	6 Apr 2010 10:18:55 -0000	1.6
@@ -38,7 +38,7 @@
 }
 
 $errors = array();
-if( (@include_once '@kolab_php_module_prefix at admin/include/Sieve.php' ) === false ) {
+if( (@include_once 'Net/Sieve.php' ) === false ) {
   $errors[] = _('Net/Sieve.php is missing. Without that, filter settings are not available');
   $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server");
 }

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- forward.php.in	31 Mar 2010 19:55:10 -0000	1.4
+++ forward.php.in	6 Apr 2010 10:18:55 -0000	1.5
@@ -22,7 +22,12 @@
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
+require_once 'KolabAdmin/Sieve/Segment.php';
+require_once 'KolabAdmin/Sieve/Segment/Delivery.php';
+require_once 'KolabAdmin/Sieve/Segment/Forward.php';
+require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
 // Funny multiline string escaping in Sieve
 function dotstuff( $str ) {
@@ -34,7 +39,7 @@
 }
 
 $errors = array();
-if( (@include_once '@kolab_php_module_prefix at admin/include/Sieve.php' ) === false ) {
+if( (@include_once 'Net/Sieve.php' ) === false ) {
   $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
   $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server");
 }
@@ -84,16 +89,7 @@
 	}
   }
 
-  $scripts = $sieve->listScripts();
-  if( in_array( $scriptname, $scripts ) ) {
-	$script = $sieve->getScript($scriptname);
-	$address = KolabAdmin_Sieve_Script::getForwardAddress( $script );
-	$keep = KolabAdmin_Sieve_Script::getKeepOnServer( $script );
-  } else {
-	$address = '';
-	$keep = true;
-  }
-  $active = ( $sieve->getActive() === $scriptname );  
+  $handler = new KolabAdmin_Sieve($sieve);
 }
 
 /**** Insert into template and output ***/
@@ -107,9 +103,9 @@
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $active );
-$smarty->assign( 'keep', $keep );
-$smarty->assign( 'address', $address );
+$smarty->assign( 'active', $handler->fetchForwardSegment()->isActive() );
+$smarty->assign( 'keep', $handler->fetchForwardSegment()->getKeepOnServer() );
+$smarty->assign( 'address', $handler->fetchForwardSegment()->getForwardAddress() );
 $smarty->assign( 'maincontent', 'forward.tpl' );
 $smarty->display('page.tpl');
 

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vacation.php.in	31 Mar 2010 19:55:10 -0000	1.6
+++ vacation.php.in	6 Apr 2010 10:18:55 -0000	1.7
@@ -10,10 +10,15 @@
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
+require_once 'KolabAdmin/Sieve/Segment.php';
+require_once 'KolabAdmin/Sieve/Segment/Delivery.php';
+require_once 'KolabAdmin/Sieve/Segment/Forward.php';
+require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
 $errors = array();
-if( (@include_once '@kolab_php_module_prefix at admin/include/Sieve.php' ) === false ) {
+if( (@include_once 'Net/Sieve.php' ) === false ) {
   $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
   $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server");
 }
@@ -70,36 +75,13 @@
 	}
   }
 
-  $addresses = $days = $text = false;
-  $scripts = $sieve->listScripts();
-  if( in_array( $scriptname, $scripts ) ) {
-	$script = $sieve->getScript($scriptname);
-	$maildomain = KolabAdmin_Sieve_Script::getMailDomain( $script );
-	$reacttospam = KolabAdmin_Sieve_Script::getReactToSpam( $script );
-	debug("reacttospam=".($reacttospam?"true":"false"));
-	$addresses = KolabAdmin_Sieve_Script::getVacationAddresses( $script );
-	$days = KolabAdmin_Sieve_Script::getVacationDays( $script );
-	$text = KolabAdmin_Sieve_Script::getVacationText( $script );
-  } else $reacttospam = true;
-  if( $addresses === false ) {
-	$object = $ldap->read( $auth->dn() );
-	$addresses = array_merge( (array)$object['mail'], (array)$object['alias'] );
-  }
-  if( $days === false || $days < 1 ) $days = 7;
-  if( $text === false ) {
-	$date = strftime(_('%x'));
-	$text = sprintf(
-					_("I am out of office until %s.\r\n").
-					_("In urgent cases, please contact Mrs. <vacation replacement>\r\n\r\n").
-					_("email: <email address of vacation replacement>\r\n").
-					_("phone: +49 711 1111 11\r\n").
-					_("fax.:  +49 711 1111 12\r\n\r\n").
-					_("Yours sincerely,\r\n").
-					_("-- \r\n").
-					_("<enter your name and email address here>"),
-					$date);
+  $handler = new KolabAdmin_Sieve($sieve);
+
+  $addresses = $handler->fetchVacationSegment()->getRecipientAddresses();
+  if (empty($addresses)) {
+	$object = $ldap->read($auth->dn());
+	$addresses = array_merge((array) $object['mail'], (array) $object['alias']);
   }
-  $active = ( $sieve->getActive() === $scriptname );  
 }
 
 /**** Insert into template and output ***/
@@ -113,13 +95,12 @@
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'active', $active );
-$smarty->assign( 'text', $text );
+$smarty->assign( 'active', $handler->fetchVacationSegment()->isActive() );
+$smarty->assign( 'text', $handler->fetchVacationSegment()->getResponse() );
 $smarty->assign( 'addresses', $addresses );
-$smarty->assign( 'maildomain', $maildomain );
-$smarty->assign( 'reacttospam', $reacttospam );
-$smarty->assign( 'days', $days );
-$smarty->assign( 'inbox', $inbox );
+$smarty->assign( 'maildomain', $handler->fetchVacationSegment()->getDomain() );
+$smarty->assign( 'reacttospam', !$handler->fetchVacationSegment()->getReactToSpam() );
+$smarty->assign( 'days', $handler->fetchVacationSegment()->getResendAfter() );
 $smarty->assign( 'maincontent', 'vacation.tpl' );
 $smarty->display('page.tpl');
 



From cvs at kolab.org  Tue Apr  6 19:46:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 19:46:20 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.5, 1.6 
Message-ID: <20100406174620.5923E600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv7641/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Fix segment detection and add functionality to generate the combined script.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Sieve.php	6 Apr 2010 08:56:32 -0000	1.5
+++ Sieve.php	6 Apr 2010 17:46:18 -0000	1.6
@@ -110,18 +110,16 @@
     private function _splitSegments($script)
     {
         $segments = array();
-        preg_match_all('/^### SEGMENT START [^#]*.*?### SEGMENT END [^#]*/s', $script, $matches);
-        foreach ($matches as $match) {
-            preg_match('/^### SEGMENT START ([^# ]*) ?(ENABLED)?/s', $match[0], $id);
+        preg_match_all('/### SEGMENT START [^#]*.*?### SEGMENT END [^#]*/s', $script, $matches);
+        foreach ($matches[0] as $match) {
+            preg_match('/### SEGMENT START ([^# ]*) ?(ENABLED)?/s', $match, $id);
             if (!empty($id[1])) {
                 $type = strtolower($id[1]);
                 $class = 'KolabAdmin_Sieve_Segment_' . ucfirst($type);
-                $segments[$type] = new $class($match[0]);
+                $segments[$type] = new $class($match);
                 if (isset($id[2]) && $id[2] == 'ENABLED') {
                     $segments[$type]->setActive();
                 }
-            } else {
-                throw new Exception('Unknown segment type.');
             }
         }
         return $segments;
@@ -143,5 +141,22 @@
     {
         $this->_init();
         return $this->_segments['vacation'];
+    }
+
+    public function store()
+    {
+        $result = $this->_sieve->installScript(self::SCRIPT, $this->getScript(), true);
+        if ($result instanceOf PEAR_Error) {
+            throw new Exception($result->getMessage());
+        }
+    }
+
+    public function getScript()
+    {
+        $script = 'require "fileinto";' . "\r\n" . 'require "vacation";' . "\r\n\r\n\r\n";
+        foreach ($this->_segments as $segment) {
+            $script .= $segment->generate() . "\r\n\r\n";
+        }
+        return $script;
     }
 }



From cvs at kolab.org  Tue Apr  6 19:47:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 19:47:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Segment.php, 1.4, 1.5 
Message-ID: <20100406174736.5ECA5600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv7711/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Segment.php 
Log Message:
Fix some minor sieve script issues.

Index: Segment.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Segment.php	6 Apr 2010 08:55:28 -0000	1.4
+++ Segment.php	6 Apr 2010 17:47:34 -0000	1.5
@@ -72,13 +72,15 @@
     }
 
     /**
-     * Set the segment active.
+     * Set the segment (in)active.
+     *
+     * @param boolean $active Should the segment be active or inactive?
      *
      * @return NULL
      */
-    public function setActive()
+    public function setActive($active = true)
     {
-        $this->_active = true;
+        $this->_active = $active;
     }
 
     /**



From cvs at kolab.org  Tue Apr  6 19:47:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 19:47:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Forward.php, 1.1, 1.2 Vacation.php, 1.2, 1.3 
Message-ID: <20100406174736.64BBB600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv7711/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Forward.php Vacation.php 
Log Message:
Fix some minor sieve script issues.

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Forward.php	1 Apr 2010 15:10:33 -0000	1.1
+++ Forward.php	6 Apr 2010 17:47:34 -0000	1.2
@@ -57,8 +57,10 @@
      */
     public function __construct($script = '')
     {
-        $this->template = 'if allof (%s)' . "\r\n" .
-            'redirect "%s";%s' . "\r\n";
+        $this->template = 'if allof (%s' . "\r\n" .
+            ') {' . "\r\n" .
+            'redirect "%s";%s' . "\r\n" .
+            '}' . "\r\n";
         parent::__construct($script);
     }
 
@@ -113,7 +115,7 @@
             throw new Exception('Please enter a valid e-mail address!');
         }
         return array(
-            ($this->isActive()) ? 'true, ## forward enabled' : 'false, ## forward disabled',
+            ($this->isActive()) ? 'true ## forward enabled' : 'false ## forward disabled',
             $address,
             ($this->getKeepOnServer()) ? ' keep;' : ''
         );

Index: Vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Vacation.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Vacation.php	6 Apr 2010 10:14:19 -0000	1.2
+++ Vacation.php	6 Apr 2010 17:47:34 -0000	1.3
@@ -83,7 +83,7 @@
         $this->_response = '';
 
         $this->template = 'if allof (%s' . "\r\n" .
-            '%s' . "\r\n" .
+            '%s,' . "\r\n" .
             '%s) {' . "\r\n" .
             'vacation :addresses [ %s ] :days %s text:' . "\r\n" .
             '%s' . "\r\n" .
@@ -151,6 +151,10 @@
      */
     public function setResendAfter($days)
     {
+        //@todo: Should be placed into a validate method.
+        if ($this->_resend_after < 1) {
+            throw new Exception(_('Days must be at least one'));
+        }
         $this->_resend_after = $days;
     }
 
@@ -230,12 +234,12 @@
         if (!empty($domain)) {
             $domain = 'address :domain :contains "From" "' . $domain . '"';
         } else {
-            $domain = '';
+            $domain = 'true';
         }
         if (!$this->getReactToSpam()) {
             $react_to_spam = 'not header :contains "X-Spam-Flag" "YES"';
         } else {
-            $react_to_spam = '';
+            $react_to_spam = 'true';
         }
         return array(
             ($this->isActive()) ? 'true, ## vacation enabled' : 'false, ## vacation disabled',



From cvs at kolab.org  Tue Apr  6 19:49:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 19:49:21 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.6, 1.7 forward.php.in, 1.5,
	1.6 vacation.php.in, 1.7, 1.8 
Message-ID: <20100406174921.900B8600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv7789/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
And finally replace the code in the controllers with the new script generator.

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- deliver.php.in	6 Apr 2010 10:18:55 -0000	1.6
+++ deliver.php.in	6 Apr 2010 17:49:19 -0000	1.7
@@ -62,29 +62,26 @@
     $errors[] = _('Error while connecting to Sieve service:');
     $errors[] = $sieve->getError();
   // Update sieve script on server in case we have submit data
-  } elseif( $_REQUEST['submit'] ) {
-	$inbox  = trim($_REQUEST['inbox']);
-	$active = isset($_REQUEST['active']);
-
-	  $script = 
-		"require \"fileinto\";\r\nif header :contains [\"X-Kolab-Scheduling-Message\"] [\"FALSE\"] {\r\nfileinto \"INBOX/$inbox\";\r\n}\r\n";
+  } else {
+	try {
+	  $handler = new KolabAdmin_Sieve($sieve);
 
-	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
-		$errors[] = $res->getMessage();
-		$errors[] = _('Script was:');
-		$errors[] = '<pre>'.MySmarty::htmlentities($script).'</pre>';
-	  }
-	  if( !$active && $sieve->getActive() === $scriptname ) {
-		$sieve->setActive( '' );
+	  if ($_REQUEST['submit']) {
+		$handler->fetchDeliverySegment()->setActive($_REQUEST['active']);
+		$handler->fetchDeliverySegment()->setDeliveryFolder($_REQUEST['inbox']);
+		$handler->store();
+		if ($_REQUEST['active']) {
+		  $messages[] = sprintf(_("Delivery to '%s' successfully activated"), $_REQUEST['inbox']);
+		} else {
+		  $messages[] =  sprintf(_("Delivery to '%s' successfully deactivated"), $_REQUEST['inbox']);
+		}
 	  }
-
-	  if( !$errors ) {
-		if( $active ) $messages[] = sprintf(_("Delivery to '%s' successfully activated"), $inbox);
-		else $messages[] =  sprintf(_("Delivery to '%s' successfully deactivated"), $inbox);
-	  }	
+	} catch (Exception $e) {
+	  $errors[] = $e->getMessage();
+	  $errors[] = 'Script was:';
+	  $errors[] = '<pre>' . $handler->getScript() . '</pre>';
+	}
   }
-
-  $handler = new KolabAdmin_Sieve($sieve);
 }
 
 /**** Insert into template and output ***/

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- forward.php.in	6 Apr 2010 10:18:55 -0000	1.5
+++ forward.php.in	6 Apr 2010 17:49:19 -0000	1.6
@@ -63,33 +63,27 @@
     $errors[] = _('Error while connecting to Sieve service:');
     $errors[] = $sieve->getError();
   // Update sieve script on server in case we have submit data
-  } elseif( $_REQUEST['submit'] ) {
-	$address = trim($_REQUEST['address']);
-	$keep = isset($_REQUEST['keep']);
-	$active = isset($_REQUEST['active']);
-
-	if( empty( $address ) ) {
-	  $errors[] = _('Please enter an email address');
-	} else {
-	  $script = 
-		"require \"fileinto\";\r\nredirect \"".addslashes($address)."\";".($keep?" keep;":"");
-	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
-		$errors[] = $res->getMessage();
-		$errors[] = _('Script was:');
-		$errors[] = '<pre>'.MySmarty::htmlentities($script).'</pre>';
-	  }
-	  if( !$active && $sieve->getActive() === $scriptname ) {
-		$sieve->setActive( '' );
-	  }
+  } else {
+	try {
+	  $handler = new KolabAdmin_Sieve($sieve);
 
-	  if( !$errors ) {
-		if( $active ) $messages[] = sprintf(_("Forwarding to '%s' successfully activated"), $address);
-		else $messages[] =  sprintf(_("Forwarding to '%s' successfully deactivated"), $address);
+	  if ($_REQUEST['submit']) {
+		$handler->fetchForwardSegment()->setActive($_REQUEST['active']);
+		$handler->fetchForwardSegment()->setForwardAddress($_REQUEST['address']);
+		$handler->fetchForwardSegment()->setKeepOnServer($_REQUEST['keep']);
+		$handler->store();
+		if ($_REQUEST['active']) {
+		  $messages[] = sprintf(_("Forwarding to '%s' successfully activated"), $_REQUEST['address']);
+		} else {
+		  $messages[] = sprintf(_("Forwarding to '%s' successfully deactivated"), $_REQUEST['address']);
+		}
 	  }
+	} catch (Exception $e) {
+	  $errors[] = $e->getMessage();
+	  $errors[] = 'Script was:';
+	  $errors[] = '<pre>' . $handler->getScript() . '</pre>';
 	}
   }
-
-  $handler = new KolabAdmin_Sieve($sieve);
 }
 
 /**** Insert into template and output ***/

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vacation.php.in	6 Apr 2010 10:18:55 -0000	1.7
+++ vacation.php.in	6 Apr 2010 17:49:19 -0000	1.8
@@ -42,45 +42,38 @@
     $errors[] = _('Error while connecting to Sieve service:');
     $errors[] = $sieve->getError();
   // Update sieve script on server in case we have submit data
-  } elseif( $_REQUEST['submit'] ) {
-	$addresses = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_REQUEST['addresses'] ) ), 'strlen') );
-	$maildomain = trim( $_REQUEST['maildomain'] );
-	$reacttospam = isset( $_REQUEST['reacttospam'] );
-	$days = $_REQUEST['days'];
-	if( $days < 1 ) {
-	  $errors[] = _('Days must be at least one');
-	} else {
-	  $script = 
-		"require \"vacation\";\r\n\r\n".
-		(!empty($maildomain)?"if not address :domain :contains \"From\" \"".$maildomain."\" { keep; stop; }\r\n":"").
-		($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
-		"vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".
-		$_REQUEST['days']." text:\r\n".
-		KolabAdmin_Sieve_Script::dotstuff(trim($_REQUEST['text']))."\r\n.\r\n;\r\n\r\n";
-	  $active = isset($_REQUEST['active']);
-	  
-	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
-		$errors[] = $res->getMessage();
-		$errors[] = 'Script was:';
-		$errors[] = '<pre>'.MySmarty::htmlentities($script).'</pre>';
-	  }
-	  if( !$active && $sieve->getActive() === $scriptname ) {
-		$sieve->setActive( '' );
-	  }
-	}
+  } else {
+	try {
+	  $handler = new KolabAdmin_Sieve($sieve);
 
-	if( !$errors ) {
-	  if( $active ) $messages[] = _('Vacation message successfully activated');
-	  else $messages[] = _('Vacation message successfully deactivated');
-	}
-  }
+	  if ($_REQUEST['submit']) {
+		$handler->fetchVacationSegment()->setActive($_REQUEST['active']);
+		$handler->fetchVacationSegment()->setDomain(trim($_REQUEST['maildomain']));
+		$handler->fetchVacationSegment()->setReactToSpam(!isset($_REQUEST['reacttospam']));
+		$handler->fetchVacationSegment()->setResendAfter($_REQUEST['days']);
+		$handler->fetchVacationSegment()->setResponse(trim($_REQUEST['text']));
 
-  $handler = new KolabAdmin_Sieve($sieve);
+		$addresses = array_unique(array_filter(array_map('trim', preg_split('/\n/', $_REQUEST['addresses'])), 'strlen'));
+		$handler->fetchVacationSegment()->setRecipientAddresses($addresses);
 
-  $addresses = $handler->fetchVacationSegment()->getRecipientAddresses();
-  if (empty($addresses)) {
-	$object = $ldap->read($auth->dn());
-	$addresses = array_merge((array) $object['mail'], (array) $object['alias']);
+		$handler->store();
+		if ($_REQUEST['active']) {
+		  $messages[] = _('Vacation message successfully activated');
+		} else {
+		  $messages[] = _('Vacation message successfully deactivated');
+		}
+	  } else {
+		$addresses = $handler->fetchVacationSegment()->getRecipientAddresses();
+		if (empty($addresses)) {
+		  $object = $ldap->read($auth->dn());
+		  $addresses = array_merge((array) $object['mail'], (array) $object['alias']);
+		}
+	  }
+	} catch (Exception $e) {
+	  $errors[] = $e->getMessage();
+	  $errors[] = 'Script was:';
+	  $errors[] = '<pre>' . $handler->getScript() . '</pre>';
+	}
   }
 }
 



From cvs at kolab.org  Tue Apr  6 19:49:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 19:49:21 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	deliver.tpl, 1.2, 1.3 forward.tpl, 1.1, 1.2 vacation.tpl, 1.2, 1.3 
Message-ID: <20100406174921.89E33600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv7789/kolab-webadmin/php/admin/templates

Modified Files:
	deliver.tpl forward.tpl vacation.tpl 
Log Message:
And finally replace the code in the controllers with the new script generator.

Index: deliver.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/deliver.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- deliver.tpl	11 Mar 2005 10:44:37 -0000	1.2
+++ deliver.tpl	6 Apr 2010 17:49:19 -0000	1.3
@@ -7,8 +7,8 @@
 <h1>{tr msg="Email Delivery"}</h1>
 <div class="contentform">
 <form method="POST">
-<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate delivery to folder (only one of vacation, forward and delivery to folder can be active at any time)"}<br />
+<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate delivery to folder"}<br />
 {tr msg="Deliver regular mail to folder"} <input type="text" name="inbox" value="{$inbox}" /><br />
 <input type="submit" name="submit" value="{tr msg="Update"}"/><br />
 </form>
-</div>
\ No newline at end of file
+</div>

Index: forward.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/forward.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forward.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ forward.tpl	6 Apr 2010 17:49:19 -0000	1.2
@@ -7,9 +7,9 @@
 <h1>{tr msg="Email Forwarding"}</h1>
 <div class="contentform">
 <form method="POST">
-<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate email forwarding (only one of vacation, forward and delivery to folder can be active at any time)"}<br />
+<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate email forwarding"}<br />
 {tr msg="Forward mail to"} <input type="text" name="address" value="{$address}" /><br />
 <input type="checkbox" name="keep" value="true" {if $keep}checked{/if} /> {tr msg="Keep copy on server"}<br />
 <input type="submit" name="submit" value="{tr msg="Update"}"/><br />
 </form>
-</div>
\ No newline at end of file
+</div>

Index: vacation.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/vacation.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vacation.tpl	7 Apr 2005 08:36:08 -0000	1.2
+++ vacation.tpl	6 Apr 2010 17:49:19 -0000	1.3
@@ -7,7 +7,7 @@
 <h1>{tr msg="Vacation Notification"}</h1>
 <div class="contentform">
 <form method="post">
-<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate vacation notification (only one of vacation, forward and delivery to folder can be active at any time)"}<br />
+<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate vacation notification"}<br />
 <textarea name="text" cols="80" rows="10">{$text|escape}</textarea><br />
 {tr msg="Resend notification only after"} <input type="text" size="5" name="days" value="{$days}" /> {tr msg="days"}<br />
 {tr msg="Send responses for these addresses:"}<br />



From cvs at kolab.org  Tue Apr  6 19:56:35 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Apr 2010 19:56:35 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.7, 1.8 forward.php.in, 1.6,
	1.7 vacation.php.in, 1.8, 1.9 
Message-ID: <20100406175635.88035600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv8022/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
Do not check for PEAR-Net_Sieve in the code. The package dependencies should ensure that it is installed. In addition remove some unused functions.

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- deliver.php.in	6 Apr 2010 17:49:19 -0000	1.7
+++ deliver.php.in	6 Apr 2010 17:56:33 -0000	1.8
@@ -21,6 +21,7 @@
 require_once '@kolab_php_module_prefix at admin/include/mysmarty.php';
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'Net/Sieve.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';
@@ -28,21 +29,6 @@
 require_once 'KolabAdmin/Sieve/Segment/Forward.php';
 require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
-// Funny multiline string escaping in Sieve
-function dotstuff( $str ) {
-  return str_replace( "\n.", "\n..", $str );
-}
-
-function undotstuff( $str ) {
-  return str_replace( "\n..", "\n.", $str );
-}
-
-$errors = array();
-if( (@include_once 'Net/Sieve.php' ) === false ) {
-  $errors[] = _('Net/Sieve.php is missing. Without that, filter settings are not available');
-  $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server");
-}
-
 /**** Authentication etc. ***/
 $sidx = 'user';
 
@@ -54,7 +40,7 @@
 /**** Sieve handling ***/
 // this is the name KDE client stores - so we can also change the setting from KDE client
 $scriptname = "kolab-deliver.siv";
-if( !$errors ) {
+
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   
@@ -82,7 +68,6 @@
 	  $errors[] = '<pre>' . $handler->getScript() . '</pre>';
 	}
   }
-}
 
 /**** Insert into template and output ***/
 $smarty = new MySmarty();

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- forward.php.in	6 Apr 2010 17:49:19 -0000	1.6
+++ forward.php.in	6 Apr 2010 17:56:33 -0000	1.7
@@ -22,6 +22,7 @@
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'Net/Sieve.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';
@@ -29,21 +30,6 @@
 require_once 'KolabAdmin/Sieve/Segment/Forward.php';
 require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
-// Funny multiline string escaping in Sieve
-function dotstuff( $str ) {
-  return str_replace( "\n.", "\n..", $str );
-}
-
-function undotstuff( $str ) {
-  return str_replace( "\n..", "\n.", $str );
-}
-
-$errors = array();
-if( (@include_once 'Net/Sieve.php' ) === false ) {
-  $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
-  $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server");
-}
-
 /**** Authentication etc. ***/
 $sidx = 'user';
 
@@ -55,7 +41,7 @@
 /**** Sieve handling ***/
 // this is the name KDE client stores - so we can also change the setting from KDE client
 $scriptname = "kolab-forward.siv";
-if( !$errors ) {
+
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   
@@ -84,7 +70,6 @@
 	  $errors[] = '<pre>' . $handler->getScript() . '</pre>';
 	}
   }
-}
 
 /**** Insert into template and output ***/
 $smarty = new MySmarty();

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vacation.php.in	6 Apr 2010 17:49:19 -0000	1.8
+++ vacation.php.in	6 Apr 2010 17:56:33 -0000	1.9
@@ -10,6 +10,7 @@
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
+require_once 'Net/Sieve.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';
@@ -17,12 +18,6 @@
 require_once 'KolabAdmin/Sieve/Segment/Forward.php';
 require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
-$errors = array();
-if( (@include_once 'Net/Sieve.php' ) === false ) {
-  $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
-  $errors[] = _("Suggest your system administrator to run \"pear install http://pear.php.net/get/Net_Sieve\" on the server");
-}
-
 /**** Authentication etc. ***/
 $sidx = 'user';
 
@@ -33,7 +28,7 @@
 
 /**** Sieve handling ***/
 $scriptname = 'kolab-vacation.siv';
-if( !$errors ) {
+
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   //$sieve->setDebug(true);
@@ -75,7 +70,6 @@
 	  $errors[] = '<pre>' . $handler->getScript() . '</pre>';
 	}
   }
-}
 
 /**** Insert into template and output ***/
 $smarty = new MySmarty();



From cvs at kolab.org  Wed Apr  7 05:25:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 05:25:09 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Forward.php, 1.2, 1.3 Vacation.php, 1.3, 1.4 
Message-ID: <20100407032509.0959D600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv25213/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Forward.php Vacation.php 
Log Message:
Ensure we always generate valid sieve.

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Forward.php	6 Apr 2010 17:47:34 -0000	1.2
+++ Forward.php	7 Apr 2010 03:25:06 -0000	1.3
@@ -59,7 +59,7 @@
     {
         $this->template = 'if allof (%s' . "\r\n" .
             ') {' . "\r\n" .
-            'redirect "%s";%s' . "\r\n" .
+            '%s%s' . "\r\n" .
             '}' . "\r\n";
         parent::__construct($script);
     }
@@ -83,6 +83,9 @@
      */
     public function setForwardAddress($address)
     {
+        if (empty($address)) {
+            throw new Exception('Please enter a valid e-mail address!');
+        }
         $this->_forward_address = $address;
     }
 
@@ -111,8 +114,10 @@
     public function getArguments()
     {
         $address = $this->getForwardAddress();
-        if (empty($address)) {
-            throw new Exception('Please enter a valid e-mail address!');
+        if (!empty($address)) {
+            $address = 'redirect "' . $address . '";';
+        } else {
+            $address = '';
         }
         return array(
             ($this->isActive()) ? 'true ## forward enabled' : 'false ## forward disabled',

Index: Vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Vacation.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Vacation.php	6 Apr 2010 17:47:34 -0000	1.3
+++ Vacation.php	7 Apr 2010 03:25:06 -0000	1.4
@@ -85,7 +85,7 @@
         $this->template = 'if allof (%s' . "\r\n" .
             '%s,' . "\r\n" .
             '%s) {' . "\r\n" .
-            'vacation :addresses [ %s ] :days %s text:' . "\r\n" .
+            'vacation %s :days %s text:' . "\r\n" .
             '%s' . "\r\n" .
             '.' . "\r\n" .
             ';' . "\r\n" .
@@ -241,11 +241,17 @@
         } else {
             $react_to_spam = 'true';
         }
+        $addresses = $this->getRecipientAddresses();
+        if (!empty($addresses)) {
+            $addresses = ':addresses [ "' . join('", "', $this->getRecipientAddresses()) . '" ]';
+        } else {
+            $addresses = '';
+        }
         return array(
             ($this->isActive()) ? 'true, ## vacation enabled' : 'false, ## vacation disabled',
             $domain,
             $react_to_spam,
-            '"' . join('", "', $this->getRecipientAddresses()) . '"',
+            $addresses,
             $this->getResendAfter(),
             $this->getResponse()
         );



From cvs at kolab.org  Wed Apr  7 05:52:29 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 05:52:29 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.8, 1.9 forward.php.in, 1.7,
	1.8 vacation.php.in, 1.9, 1.10 
Message-ID: <20100407035229.5D36A600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv25671/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
Add check for unknown script.

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- deliver.php.in	6 Apr 2010 17:56:33 -0000	1.8
+++ deliver.php.in	7 Apr 2010 03:52:27 -0000	1.9
@@ -61,6 +61,12 @@
 		} else {
 		  $messages[] =  sprintf(_("Delivery to '%s' successfully deactivated"), $_REQUEST['inbox']);
 		}
+	  } else {
+		$result = $handler->checkUnknownScript();
+		if ($result) {
+		  $errors[] = sprintf(_("Warning: You currently have a sieve script named %s active for your account."), $result);
+		  $errors[] = _("Warning: This script will be overwritten without further warnings if you press \"Update\"!");
+		}
 	  }
 	} catch (Exception $e) {
 	  $errors[] = $e->getMessage();

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- forward.php.in	6 Apr 2010 17:56:33 -0000	1.7
+++ forward.php.in	7 Apr 2010 03:52:27 -0000	1.8
@@ -63,6 +63,12 @@
 		} else {
 		  $messages[] = sprintf(_("Forwarding to '%s' successfully deactivated"), $_REQUEST['address']);
 		}
+	  } else {
+		$result = $handler->checkUnknownScript();
+		if ($result) {
+		  $errors[] = sprintf(_("Warning: You currently have a sieve script named %s active for your account."), $result);
+		  $errors[] = _("Warning: This script will be overwritten without further warnings if you press \"Update\"!");
+		}
 	  }
 	} catch (Exception $e) {
 	  $errors[] = $e->getMessage();

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vacation.php.in	6 Apr 2010 17:56:33 -0000	1.9
+++ vacation.php.in	7 Apr 2010 03:52:27 -0000	1.10
@@ -58,6 +58,12 @@
 		  $messages[] = _('Vacation message successfully deactivated');
 		}
 	  } else {
+		$result = $handler->checkUnknownScript();
+		if ($result) {
+		  $errors[] = sprintf(_("Warning: You currently have a sieve script named %s active for your account."), $result);
+		  $errors[] = _("Warning: This script will be overwritten without further warnings if you press \"Update\"!");
+		}
+
 		$addresses = $handler->fetchVacationSegment()->getRecipientAddresses();
 		if (empty($addresses)) {
 		  $object = $ldap->read($auth->dn());



From cvs at kolab.org  Wed Apr  7 05:52:29 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 05:52:29 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.6, 1.7 
Message-ID: <20100407035229.560F1600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv25671/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Add check for unknown script.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Sieve.php	6 Apr 2010 17:46:18 -0000	1.6
+++ Sieve.php	7 Apr 2010 03:52:27 -0000	1.7
@@ -159,4 +159,19 @@
         }
         return $script;
     }
+
+    public function checkUnknownScript()
+    {
+        $known = array(
+            self::SCRIPT,
+            self::OLD_SCRIPT_DELIVERY,
+            self::OLD_SCRIPT_FORWARD,
+            self::OLD_SCRIPT_VACATION,
+        );
+        $active = $this->_sieve->getActive();
+        if (!in_array($active, $known)) {
+            return $active;
+        }
+        return false;
+    }
 }



From cvs at kolab.org  Wed Apr  7 08:14:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 08:14:40 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
	Segment.php, 1.5, 1.6 
Message-ID: <20100407061440.7FFA9600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv29327/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Segment.php 
Log Message:
Full escaping of deactivated script segments.

Index: Segment.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Segment.php	6 Apr 2010 17:47:34 -0000	1.5
+++ Segment.php	7 Apr 2010 06:14:38 -0000	1.6
@@ -95,10 +95,19 @@
 
     public function generate()
     {
+        $script = $this->_generateScript();
+        if (!$this->_active) {
+            $script = preg_replace('/^(.)/m', '#$1', $script);
+        }
         return '### SEGMENT START ' . strtoupper($this->type) .' ' .
             (($this->_active) ? 'ENABLED' : 'DISABLED') . "\r\n" .
-            vsprintf($this->template, $this->getArguments()) .
+            $script .
             '### SEGMENT END ' . strtoupper($this->type) . "\r\n";
+    }
+
+    private function _generateScript()
+    {
+        return vsprintf($this->template, $this->getArguments());
     }
 
     protected function dotstuff($str)



From cvs at kolab.org  Wed Apr  7 08:14:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 08:14:40 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.7, 1.8 
Message-ID: <20100407061440.80071600564@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv29327/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Full escaping of deactivated script segments.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Sieve.php	7 Apr 2010 03:52:27 -0000	1.7
+++ Sieve.php	7 Apr 2010 06:14:38 -0000	1.8
@@ -116,6 +116,9 @@
             if (!empty($id[1])) {
                 $type = strtolower($id[1]);
                 $class = 'KolabAdmin_Sieve_Segment_' . ucfirst($type);
+                if (!isset($id[2])) {
+                    $match = preg_replace('/^#/m', '', $match);
+                }
                 $segments[$type] = new $class($match);
                 if (isset($id[2]) && $id[2] == 'ENABLED') {
                     $segments[$type]->setActive();



From cvs at kolab.org  Wed Apr  7 09:24:07 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:24:07 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Forward.php, 1.3, 1.4 
Message-ID: <20100407072407.66676600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv31043/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Forward.php 
Log Message:
If the redirection is not activated then the address is missing now. Adapt keep check.

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Forward.php	7 Apr 2010 03:25:06 -0000	1.3
+++ Forward.php	7 Apr 2010 07:24:05 -0000	1.4
@@ -141,7 +141,7 @@
 
     public function parseKeepOnServer($script)
     {
-        if (preg_match('/redirect "[^\"]*"; keep;/s', $script, $regs)) {
+        if (preg_match('/keep;/s', $script, $regs)) {
             $this->_keep_on_server = true;
         } else {
             $this->_keep_on_server = false;



From cvs at kolab.org  Wed Apr  7 09:27:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:27:02 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve
	- New directory 
Message-ID: <20100407072702.C2580600564@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve
In directory doto:/tmp/cvs-serv31209/kolab-webadmin/test/KolabAdmin/Unit/Sieve

Log Message:
Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve added to the repository




From cvs at kolab.org  Wed Apr  7 09:27:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:27:36 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment
	- New directory 
Message-ID: <20100407072736.8D614600564@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment
In directory doto:/tmp/cvs-serv31259/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment

Log Message:
Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment added to the repository




From cvs at kolab.org  Wed Apr  7 09:28:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:28:42 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin
	Autoload.php, NONE, 1.1 
Message-ID: <20100407072842.B8ECE600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin
In directory doto:/tmp/cvs-serv31321/kolab-webadmin/kolab-webadmin/test/KolabAdmin

Added Files:
	Autoload.php 
Log Message:
kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033)) 

This also adds the tests that drove the implementation.

--- NEW FILE: Autoload.php ---
<?php
/**
 * Setup autoloading for the tests.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */

ini_set('include_path', dirname(__FILE__) . '/../../lib' . PATH_SEPARATOR . ini_get('include_path'));

if (!spl_autoload_functions()) {
    spl_autoload_register(
        create_function(
            '$class', 
            '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class);'
            . '$err_mask = E_ALL ^ E_WARNING;'
            . '$oldErrorReporting = error_reporting($err_mask);'
            . 'include "$filename.php";'
            . 'error_reporting($oldErrorReporting);'
        )
    );
}

/** Catch strict standards */
error_reporting(E_ALL | E_STRICT);



From cvs at kolab.org  Wed Apr  7 09:28:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:28:42 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit
	SieveTest.php, NONE, 1.1 
Message-ID: <20100407072842.B969360057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit
In directory doto:/tmp/cvs-serv31321/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit

Added Files:
	SieveTest.php 
Log Message:
kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033)) 

This also adds the tests that drove the implementation.

--- NEW FILE: SieveTest.php ---
<?php
/**
 * Test the sieve utilities provided by the webadmin.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */

/**
 * Require the tested classes.
 */
require_once dirname(__FILE__) . '/../Autoload.php';

/**
 * Test the sieve utilities provided by the webadmin.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you
 * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */
class KolabAdmin_Unit_SieveTest extends PHPUnit_Framework_TestCase
{
    public function testMultiLineDotEscaping()
    {
        $this->assertEquals("abc\n..xyz", KolabAdmin_Sieve_Script::dotstuff("abc\n.xyz"));
    }

    public function testMultiLineDotUnscaping()
    {
        $this->assertEquals("abc\n.xyz", KolabAdmin_Sieve_Script::undotstuff("abc\n..xyz"));
    }

    public function testGetDeliveryFolder()
    {
        $this->assertEquals('Test', KolabAdmin_Sieve_Script::getDeliverFolder($this->_getScript()));
    }

    public function testEmptyDeliveryFolder()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getDeliverFolder(''));
    }

    public function testGetVacationAddresses()
    {
        $this->assertEquals(
            array('a at example.com', 'b at example.com'),
            KolabAdmin_Sieve_Script::getVacationAddresses($this->_getScript())
        );
    }

    public function testGetVacationAddressesWithSingleAddress()
    {
        $this->assertEquals(
            array('a at example.com'),
            KolabAdmin_Sieve_Script::getVacationAddresses(
                'vacation :addresses [a at example.com]'
            )
        );
    }

    public function testEmptyVacationAddresses()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getVacationAddresses(''));
    }

    public function testGetMailDomain()
    {
        $this->assertEquals('example.org', KolabAdmin_Sieve_Script::getMailDomain($this->_getScript()));
    }

    public function testEmptyMailDomain()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getMailDomain(''));
    }

    public function testGetReactToSpam()
    {
        $this->assertTrue(KolabAdmin_Sieve_Script::getReactToSpam($this->_getScript()));
    }

    public function testEmptyReactToSpam()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getReactToSpam(''));
    }

    public function testGetVacationDays()
    {
        $this->assertEquals(60, KolabAdmin_Sieve_Script::getVacationDays($this->_getScript()));
    }

    public function testEmptyVacationDays()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getVacationDays(''));
    }

    public function testGetVacationText()
    {
        $this->assertEquals("\r\nI'm on vacation\r\n", KolabAdmin_Sieve_Script::getVacationText($this->_getScript()));
    }

    public function testEmptyVacationText()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getVacationText(''));
    }

    public function testGetForwardAddress()
    {
        $this->assertEquals("test at example.com", KolabAdmin_Sieve_Script::getForwardAddress($this->_getScript()));
    }

    public function testEmptyForwardAddress()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getForwardAddress(''));
    }

    public function testGetKeepOnServer()
    {
        $this->assertTrue(KolabAdmin_Sieve_Script::getKeepOnServer($this->_getScript()));
    }

    public function testEmptyKeepOnServer()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::getKeepOnServer(''));
    }

    public function testIsDeliveryEnabled()
    {
        $this->assertTrue(KolabAdmin_Sieve_Script::isDeliveryEnabled($this->_getScript()));
    }

    public function testDeliveryNotEnables()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::isDeliveryEnabled(''));
    }

    public function testIsVacationEnabled()
    {
        $this->assertTrue(KolabAdmin_Sieve_Script::isVacationEnabled($this->_getScript()));
    }

    public function testVacationNotEnables()
    {
        $this->assertFalse(KolabAdmin_Sieve_Script::isVacationEnabled(''));
    }

    public function testGetScriptInfo()
    {
        $this->assertEquals(
            array(
                'maildomain'        => 'example.org',
                'vacationaddresses' => array('a at example.com', 'b at example.com'),
                'days'              => '60',
                'reacttospam'       => true,
                'vacationtext'      => "\r\nI'm on vacation\r\n",
                'vacationenabled'   => true,
                'deliveryfolder'    => 'Test',
                'deliveryenabled'   => true
            ),
            KolabAdmin_Sieve_Script::getScriptInfo($this->_getScript())
        );
    }

    public function testGetEmptyScriptInfo()
    {
        $this->assertEquals(
            array(
                'maildomain'        => false,
                'vacationaddresses' => false,
                'days'              => false,
                'reacttospam'       => false,
                'vacationtext'      => false,
                'vacationenabled'   => false,
                'deliveryfolder'    => false,
                'deliveryenabled'   => false
            ),
            KolabAdmin_Sieve_Script::getScriptInfo('')
        );
    }

    public function testCreateScript()
    {
        $this->assertEquals(
            $this->_getScript2(),
            KolabAdmin_Sieve_Script::createScript(
                array(
                    'maildomain'        => 'example.org',
                    'vacationaddresses' => array('a at example.com', 'b at example.com'),
                    'days'              => '60',
                    'reacttospam'       => true,
                    'vacationtext'      => "\r\nI'm on vacation\r\n",
                    'vacationenabled'   => true,
                    'deliveryfolder'    => 'Test',
                    'deliveryenabled'   => true
                )
            )
        );
    }

    public function testCreateScriptGetScriptInfo()
    {
        $info = array(
            'maildomain'        => 'example.org',
            'vacationaddresses' => array('a at example.com', 'b at example.com'),
            'days'              => '60',
            'reacttospam'       => true,
            'vacationtext'      => "\r\nI'm on vacation\r\n",
            'vacationenabled'   => true,
            'deliveryfolder'    => 'Test',
            'deliveryenabled'   => true
        );
        $this->assertEquals(
            $info,
            KolabAdmin_Sieve_Script::getScriptInfo(
                KolabAdmin_Sieve_Script::createScript(
                    $info
                )
            )
        );
    }

    private function _getScript()
    {
        return 
            'fileinto "INBOX/Test";'
            . '## delivery enabled'
            . '## vacation enabled'
            . 'redirect "test at example.com"; keep;"'
            . 'if header :contains "X-Spam-Flag" "YES" { keep; stop; }' . "\r\n"
            . 'if not address :domain :contains "From" "example.org" { keep; stop; }' . "\r\n"
            . 'vacation :addresses [ "a at example.com", "b at example.com" ] :days 60 text:' . "\r\n"
            . 'I\'m on vacation' . "\r\n.\r\n;\r\n\r\n";
    }

    private function _getScript2()
    {
        return 
            'require "vacation";' . "\r\n" .
            '' . "\r\n" .
            'require "fileinto";' . "\r\n" .
            '' . "\r\n" .
            'if allof (## vacation enabled' . "\r\n" .
            'true,' . "\r\n" .
            'address :domain :contains "From" "example.org",' . "\r\n" .
            'not header :contains "X-Spam-Flag" "YES") {' . "\r\n" .
            '  vacation :addresses [ "a at example.com", "b at example.com" ] :days 60 text:' . "\r\n" .
            'I\'m on vacation' . "\r\n" .
            '.' . "\r\n" .
            ';' . "\r\n" .
            '}' . "\r\n" .
            'if allof (true, ## delivery enabled' . "\r\n" .
            'header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"]) {' . "\r\n" .
            'fileinto "INBOX/Test";' . "\r\n" .
            '}' . "\r\n";
    }

    private function _getOldDeliveryScript()
    {
        return 'require "fileinto";' . "\r\n" .
            'if header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"] {' . "\r\n" .
            'fileinto "INBOX/Test";' . "\r\n" . 
            '}' . "\r\n";
    }

    private function _getActiveDeliveryScript()
    {
        return 'if allof (true, ## delivery enabled' . "\r\n" .
            'header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"]) {' . "\r\n" .
            'fileinto "INBOX/Test";' . "\r\n" .
            '}' . "\r\n";
    }

    private function _getInactiveDeliveryScript()
    {
        return 'if allof (false, ## delivery disabled' . "\r\n" .
            'header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"]) {' . "\r\n" .
            'fileinto "INBOX/Test";' . "\r\n" .
            '}' . "\r\n";
    }
}


From cvs at kolab.org  Wed Apr  7 09:28:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:28:42 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.531,1.532 
Message-ID: <20100407072842.A202F600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv31321

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033)) 

This also adds the tests that drove the implementation.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -d -r1.531 -r1.532
--- release-notes.txt	30 Mar 2010 09:26:44 -0000	1.531
+++ release-notes.txt	7 Apr 2010 07:28:40 -0000	1.532
@@ -28,6 +28,8 @@
 
     - kolab-webadmin-2.2.3-2009????
 
+	kolab/issue1446 (Webinterface for setting vacation, email-delivery and
+	                 forwarding (rt#5033))
 	kolab/issue3401 (Change font color of the kolab-webadmin)
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
 	                 nicer)



From cvs at kolab.org  Wed Apr  7 09:28:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:28:42 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.124,1.125 
Message-ID: <20100407072842.C0CC860057C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv31321/kolab-webadmin/kolab-webadmin

Modified Files:
	ChangeLog 
Log Message:
kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033)) 

This also adds the tests that drove the implementation.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- ChangeLog	26 Mar 2010 11:29:19 -0000	1.124
+++ ChangeLog	7 Apr 2010 07:28:40 -0000	1.125
@@ -1,3 +1,12 @@
+2010-04-07  Gunnar Wrobel  <p at rdus.de>
+
+	* php/*:
+	* www/*:
+	* lib/*:
+	* test/*:
+
+	kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033))
+
 2010-03-26 Karl-Heinz Ruskowski <khruskowski at intevation.de>
 
 	* php/admin/include/form.class.php: kolab/issue1262 removed quota



From cvs at kolab.org  Wed Apr  7 09:28:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Apr 2010 09:28:42 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment
	DeliveryTest.php, NONE, 1.1 ForwardTest.php, NONE,
	1.1 VacationTest.php, NONE, 1.1 
Message-ID: <20100407072842.BB9B660057B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment
In directory doto:/tmp/cvs-serv31321/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment

Added Files:
	DeliveryTest.php ForwardTest.php VacationTest.php 
Log Message:
kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033)) 

This also adds the tests that drove the implementation.

--- NEW FILE: DeliveryTest.php ---
<?php
/**
 * Test the sieve script delivery segment.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */

/**
 * Require the tested classes.
 */
require_once dirname(__FILE__) . '/../../../Autoload.php';

/**
 * Test the sieve script delivery segment.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you
 * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */
class KolabAdmin_Unit_Sieve_Segment_DeliveryTest extends PHPUnit_Framework_TestCase
{
    public function setUp()
    {
        $this->sieve = $this->getMock('Net_Sieve');
        $this->manager = new KolabAdmin_Sieve($this->sieve);
    }

    public function testSieveHandlerAllowsFetchingDeliverySegment()
    {
        $this->assertType(
            'KolabAdmin_Sieve_Segment_Delivery',
            $this->manager->fetchDeliverySegment()
        );
    }

    public function testSieveHandlerIndicatesThatTheDeliverySegmentIsActiveIfAnOldActiveScriptWasFound()
    {
        $this->_provideActiveScript(
            'kolab-deliver.siv', $this->_getOldDeliveryScript()
        );
        $this->assertTrue(
            $this->manager->fetchDeliverySegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesThatTheDeliverySegmentIsInactiveIfAnOldInactiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab-deliver.siv', $this->_getOldDeliveryScript()
        );
        $this->assertFalse(
            $this->manager->fetchDeliverySegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesThatTheDeliverySegmentIsActiveIfANewActiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab.siv', $this->_getDeliveryScript()
        );
        $this->assertTrue(
            $this->manager->fetchDeliverySegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesAnInactiveDeliverySegmentIfNoActiveScriptWasFound()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array()));
        $this->assertFalse(
            $this->manager->fetchDeliverySegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesAnInactiveDeliverySegmentIfAnInactiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab.siv', $this->_getDeliveryScript('Test', false)
        );
        $this->assertFalse(
            $this->manager->fetchDeliverySegment()->isActive()
        );
    }

    public function testSieveHandlerAllowsActivatingDeliverySegment()
    {
        $segment = $this->manager->fetchDeliverySegment();
        $segment->setActive();
        $this->assertEquals(
            $this->_getDeliveryScript('Inbox'),
            $segment->generate()
        );
    }

    public function testSieveHandlerAllowsDeactivatingDeliverySegment()
    {
        $segment = $this->manager->fetchDeliverySegment();
        $segment->setInactive();
        $this->assertEquals(
            $this->_getDeliveryScript('Inbox', false),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentDeliveryProvidesDeliveryFolder()
    {
        $this->_provideActiveScript(
            'kolab-deliver.siv', $this->_getOldDeliveryScript()
        );
        $segment = $this->manager->fetchDeliverySegment();
        $this->assertEquals('Test', $segment->getDeliveryFolder());
    }

    public function testSieveSegmentDeliveryProvidesDeliveryFolder()
    {
        $this->_provideInactiveScript(
            'kolab.siv', $this->_getDeliveryScript('Test', false)
        );
        $segment = $this->manager->fetchDeliverySegment();
        $this->assertEquals('Test', $segment->getDeliveryFolder());
    }

    public function testSieveSegmentDeliveryAllowsSettingDeliveryFolder()
    {
        $segment = $this->manager->fetchDeliverySegment();
        $segment->setActive();
        $segment->setDeliveryFolder('Dummy');
        $this->assertEquals(
            $this->_getDeliveryScript('Dummy'),
            $segment->generate()
        );
    }

    private function _provideInactiveScript($name, $script)
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array($name)));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with($name)
            ->will($this->returnValue($script));
    }

    private function _provideActiveScript($name, $script)
    {
        $this->_provideInactiveScript($name, $script);
        $this->sieve->expects($this->once())
            ->method('getActive')
            ->will($this->returnValue($name));
    }

    private function _getOldDeliveryScript()
    {
        return 'require "fileinto";' . "\r\n" .
            'if header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"] {' . "\r\n" .
            'fileinto "INBOX/Test";' . "\r\n" . 
            '}' . "\r\n";
    }

    private function _getDeliveryScript($box = 'Test', $active = true)
    {
        $script = 'if allof (' . (($active) ? 'true, ## delivery enabled' : 'false, ## delivery disabled') . "\r\n" .
            'header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"]) {' . "\r\n" .
            'fileinto "INBOX/' . $box . '";' . "\r\n" .
            '}' . "\r\n";
        if (!$active) {
            $script = preg_replace('/^(.)/m', '#$1', $script);
        }
        return '### SEGMENT START DELIVERY ' . (($active) ? 'ENABLED' : 'DISABLED') . "\r\n" .
            $script .
            '### SEGMENT END DELIVERY' . "\r\n";
    }
}
--- NEW FILE: ForwardTest.php ---
<?php
/**
 * Test the sieve script forward segment.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */

/**
 * Require the tested classes.
 */
require_once dirname(__FILE__) . '/../../../Autoload.php';

/**
 * Test the sieve script forward segment.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you
 * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */
class KolabAdmin_Unit_Sieve_Segment_ForwardTest extends PHPUnit_Framework_TestCase
{
    public function setUp()
    {
        $this->sieve = $this->getMock('Net_Sieve');
        $this->manager = new KolabAdmin_Sieve($this->sieve);
    }

    public function testSieveHandlerAllowsFetchingForwardSegment()
    {
        $this->assertType(
            'KolabAdmin_Sieve_Segment_Forward',
            $this->manager->fetchForwardSegment()
        );
    }

    public function testSieveHandlerIndicatesThatTheForwardSegmentIsActiveIfAnOldActiveScriptWasFound()
    {
        $this->_provideActiveScript(
            'kolab-forward.siv', $this->_getOldForwardScript()
        );
        $this->assertTrue(
            $this->manager->fetchForwardSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesThatTheForwardSegmentIsInactiveIfAnOldInactiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab-forward.siv', $this->_getOldForwardScript()
        );
        $this->assertFalse(
            $this->manager->fetchForwardSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesThatTheForwardSegmentIsActiveIfANewActiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab.siv', $this->_getForwardScript()
        );
        $this->assertTrue(
            $this->manager->fetchForwardSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesAnInactiveForwardSegmentIfNoActiveScriptWasFound()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array()));
        $this->assertFalse(
            $this->manager->fetchForwardSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesAnInactiveForwardSegmentIfAnInactiveScriptWasFound()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getForwardScript('test at example.com', false)));
        $this->assertFalse(
            $this->manager->fetchForwardSegment()->isActive()
        );
    }

    public function testSieveHandlerAllowsActivatingForwardSegment()
    {
        $segment = $this->manager->fetchForwardSegment();
        $segment->setActive();
        $segment->setForwardAddress('somebody at example.com');
        $this->assertEquals(
            $this->_getForwardScript('somebody at example.com'),
            $segment->generate()
        );
    }

    public function testSieveHandlerAllowsDeactivatingForwardSegment()
    {
        $segment = $this->manager->fetchForwardSegment();
        $segment->setInactive();
        $segment->setForwardAddress('somebody at example.com');
        $this->assertEquals(
            $this->_getForwardScript('somebody at example.com', false),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentForwardProvidesForwardAddress()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-forward.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-forward.siv')
            ->will($this->returnValue($this->_getOldForwardScript()));
        $segment = $this->manager->fetchForwardSegment();
        $this->assertEquals('test at example.org', $segment->getForwardAddress());
    }

    public function testSieveSegmentForwardProvidesForwardAddress()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getForwardScript('dummy at example.com', false)));
        $segment = $this->manager->fetchForwardSegment();
        $this->assertEquals('dummy at example.com', $segment->getForwardAddress());
    }

    public function testSieveSegmentForwardAllowsSettingForwardAddress()
    {
        $segment = $this->manager->fetchForwardSegment();
        $segment->setActive();
        $segment->setForwardAddress('dummy at example.com');
        $this->assertEquals(
            $this->_getForwardScript('dummy at example.com'),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentForwardProvidesKeepOnServerAttributeTrueIfSetToTrue()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-forward.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-forward.siv')
            ->will($this->returnValue($this->_getOldForwardScript()));
        $segment = $this->manager->fetchForwardSegment();
        $this->assertTrue($segment->getKeepOnServer());
    }

    public function testOldSieveSegmentForwardProvidesKeepOnServerAttributeFalseIfSetToFalse()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-forward.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-forward.siv')
            ->will($this->returnValue($this->_getOldForwardScript(false)));
        $segment = $this->manager->fetchForwardSegment();
        $this->assertFalse($segment->getKeepOnServer());
    }

    public function testSieveSegmentForwardProvidesKeepOnServerAttributeTrueIfSetToTrue()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getForwardScript('dummy at example.com', false, true)));
        $segment = $this->manager->fetchForwardSegment();
        $this->assertTrue($segment->getKeepOnServer());
    }

    public function testSieveSegmentForwardAllowsSettingKeepOnServerToTrue()
    {
        $segment = $this->manager->fetchForwardSegment();
        $segment->setActive();
        $segment->setForwardAddress('dummy at example.com');
        $segment->setKeepOnServer(true);
        $this->assertEquals(
            $this->_getForwardScript('dummy at example.com', true, true),
            $segment->generate()
        );
    }

    public function testSieveSegmentForwardAllowsSettingKeepOnServerToFalse()
    {
        $segment = $this->manager->fetchForwardSegment();
        $segment->setActive();
        $segment->setKeepOnServer(false);
        $segment->setForwardAddress('dummy at example.com');
        $this->assertEquals(
            $this->_getForwardScript('dummy at example.com', true, false),
            $segment->generate()
        );
    }

    private function _provideInactiveScript($name, $script)
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array($name)));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with($name)
            ->will($this->returnValue($script));
    }

    private function _provideActiveScript($name, $script)
    {
        $this->_provideInactiveScript($name, $script);
        $this->sieve->expects($this->once())
            ->method('getActive')
            ->will($this->returnValue($name));
    }

    private function _getOldForwardScript($keep_on_server = true)
    {
        return 'require "fileinto";' . "\r\n" .
            'redirect "test at example.org";' . (($keep_on_server) ? ' keep;' : '') . "\r\n";
    }

    private function _getForwardScript($address = 'test at example.com', $active = true, $keep_on_server = true)
    {
        if (!empty($address)) {
            $address = 'redirect "' . $address . '";';
        } else {
            $address = '';
        }
        $script = 'if allof (' . (($active) ? 'true ## forward enabled' : 'false ## forward disabled') . "\r\n" .
            ') {' . "\r\n" .
            $address . (($keep_on_server) ? ' keep;' : '') . "\r\n" .
            '}' . "\r\n";
        if (!$active) {
            $script = preg_replace('/^(.)/m', '#$1', $script);
        }
        return '### SEGMENT START FORWARD ' . (($active) ? 'ENABLED' : 'DISABLED') . "\r\n" .
            $script .
            '### SEGMENT END FORWARD' . "\r\n";
    }
}
--- NEW FILE: VacationTest.php ---
<?php
/**
 * Test the sieve script vacation segment.
 *
 * PHP version 5
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */

/**
 * Require the tested classes.
 */
require_once dirname(__FILE__) . '/../../../Autoload.php';

/**
 * Test the sieve script vacation segment.
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * See the enclosed file COPYING for license information (LGPL). If you
 * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
 *
 * @category Kolab
 * @package  KolabAdmin
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://pear.horde.org/index.php?package=KolabAdmin
 */
class KolabAdmin_Unit_Sieve_Segment_VacationTest extends PHPUnit_Framework_TestCase
{
    public function setUp()
    {
        $this->sieve = $this->getMock('Net_Sieve');
        $this->manager = new KolabAdmin_Sieve($this->sieve);
    }

    public function testSieveHandlerAllowsFetchingVacationSegment()
    {
        $this->assertType(
            'KolabAdmin_Sieve_Segment_Vacation',
            $this->manager->fetchVacationSegment()
        );
    }

    public function testSieveHandlerIndicatesThatTheVacationSegmentIsActiveIfAnOldActiveScriptWasFound()
    {
        $this->_provideActiveScript(
            'kolab-vacation.siv', $this->_getOldVacationScript()
        );
        $this->assertTrue(
            $this->manager->fetchVacationSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesThatTheVacationSegmentIsInactiveIfAnOldInactiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab-vacation.siv', $this->_getOldVacationScript()
        );
        $this->assertFalse(
            $this->manager->fetchVacationSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesThatTheVacationSegmentIsActiveIfANewActiveScriptWasFound()
    {
        $this->_provideInactiveScript(
            'kolab.siv', $this->_getVacationScript()
        );
        $this->assertTrue(
            $this->manager->fetchVacationSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesAnInactiveVacationSegmentIfNoActiveScriptWasFound()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array()));
        $this->assertFalse(
            $this->manager->fetchVacationSegment()->isActive()
        );
    }

    public function testSieveHandlerIndicatesAnInactiveVacationSegmentIfAnInactiveScriptWasFound()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(false)));
        $this->assertFalse(
            $this->manager->fetchVacationSegment()->isActive()
        );
    }

    public function testSieveHandlerAllowsActivatingVacationSegment()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $this->assertEquals(
            $this->_getVacationScript(),
            $segment->generate()
        );
    }

    public function testSieveHandlerAllowsDeactivatingVacationSegment()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setInactive();
        $this->assertEquals(
            $this->_getVacationScript(false),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentVacationProvidesResponse()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-vacation.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-vacation.siv')
            ->will($this->returnValue($this->_getOldVacationScript("REPLY\r\nLINE2\r\n")));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals("REPLY\r\nLINE2", $segment->getResponse());
    }

    public function testSieveSegmentVacationProvidesResponse()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(true, "REPLY\r\nLINE2\r\n")));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals("REPLY\r\nLINE2", $segment->getResponse());
    }

    public function testSieveSegmentVacationAllowsSettingResponse()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $segment->setResponse("REPLY\r\nLINE2");
        $this->assertEquals(
            $this->_getVacationScript(true, "REPLY\r\nLINE2"),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentVacationProvidesResendAfter()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-vacation.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-vacation.siv')
            ->will($this->returnValue($this->_getOldVacationScript('', '', false, array(), 8)));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals(8, $segment->getResendAfter());
    }

    public function testSieveSegmentVacationProvidesResendAfter()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(true, '', '', false, array(), 12)));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals(12, $segment->getResendAfter());
    }

    public function testSieveSegmentVacationAllowsSettingResendAfter()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $segment->setResendAfter(9);
        $this->assertEquals(
            $this->_getVacationScript(true, '', '', false, array(), 9),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentVacationProvidesDomain()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-vacation.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-vacation.siv')
            ->will($this->returnValue($this->_getOldVacationScript('REPLY', 'example.com')));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals('example.com', $segment->getDomain());
    }

    public function testSieveSegmentVacationProvidesDomain()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(true, 'REPLY', 'example.com')));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals('example.com', $segment->getDomain());
    }

    public function testSieveSegmentVacationAllowsSettingDomain()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $segment->setDomain('example.org');
        $this->assertEquals(
            $this->_getVacationScript(true, '', 'example.org'),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentVacationProvidesRecipientAddresses()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-vacation.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-vacation.siv')
            ->will($this->returnValue($this->_getOldVacationScript('', '', false, array('1 at example.org', '2 at example.org'))));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals(array('1 at example.org', '2 at example.org'), $segment->getRecipientAddresses());
    }

    public function testSieveSegmentVacationProvidesRecipientAddresses()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(true, '', '', false, array('1 at example.org', '2 at example.org'))));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertEquals(array('1 at example.org', '2 at example.org'), $segment->getRecipientAddresses());
    }

    public function testSieveSegmentVacationAllowsSettingRecipientAddresses()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $segment->setRecipientAddresses(array('1 at example.com', '2 at example.com'));
        $this->assertEquals(
            $this->_getVacationScript(true, '', '', false, array('1 at example.com', '2 at example.com')),
            $segment->generate()
        );
    }

    public function testOldSieveSegmentVacationProvidesReactToSpamAttributeTrueIfSetToTrue()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-vacation.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-vacation.siv')
            ->will($this->returnValue($this->_getOldVacationScript('', '', true)));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertTrue($segment->getReactToSpam());
    }

    public function testOldSieveSegmentVacationProvidesReactToSpamAttributeFalseIfSetToFalse()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab-vacation.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab-vacation.siv')
            ->will($this->returnValue($this->_getOldVacationScript('', '', false)));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertFalse($segment->getReactToSpam());
    }

    public function testSieveSegmentVacationProvidesReactToSpamAttributeFalseIfSetToFalse()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(true, '', '', false)));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertFalse($segment->getReactToSpam());
    }

    public function testSieveSegmentVacationProvidesReactToSpamAttributeTrueIfSetToTrue()
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array('kolab.siv')));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with('kolab.siv')
            ->will($this->returnValue($this->_getVacationScript(true, '', '', true)));
        $segment = $this->manager->fetchVacationSegment();
        $this->assertTrue($segment->getReactToSpam());
    }

    public function testSieveSegmentVacationAllowsSettingReactToSpamToTrue()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $segment->setReactToSpam(true);
        $this->assertEquals(
            $this->_getVacationScript(true, '', '', true),
            $segment->generate()
        );
    }

    public function testSieveSegmentVacationAllowsSettingReactToSpamToFalse()
    {
        $segment = $this->manager->fetchVacationSegment();
        $segment->setActive();
        $segment->setReactToSpam(false);
        $this->assertEquals(
            $this->_getVacationScript(true, '', '', false),
            $segment->generate()
        );
    }

    private function _provideInactiveScript($name, $script)
    {
        $this->sieve->expects($this->once())
            ->method('listScripts')
            ->will($this->returnValue(array($name)));
        $this->sieve->expects($this->once())
            ->method('getScript')
            ->with($name)
            ->will($this->returnValue($script));
    }

    private function _provideActiveScript($name, $script)
    {
        $this->_provideInactiveScript($name, $script);
        $this->sieve->expects($this->once())
            ->method('getActive')
            ->will($this->returnValue($name));
    }

    private function _getOldVacationScript($text = '', $domain = null, $react_to_spam = false, $addresses = array(), $days = 7)
    {
        return 'require "vacation";' . "\r\n" .
            ((empty($domain)) ? '' : 'if not address :domain :contains "From" "' . $domain . '" { keep; stop; }' . "\r\n") .
            (($react_to_spam) ? '' : 'if header :contains "X-Spam-Flag" "YES" { keep; stop; }' . "\r\n") .
            'vacation :addresses [ "' . join('", "', $addresses) . '" ] :days ' . $days . ' text:' . "\r\n" .
            $text . "\r\n" .
            '.' . "\r\n" .
            ';' . "\r\n";
    }

    private function _getVacationScript($active = true, $text = '', $domain = null, $react_to_spam = false, $addresses = array(), $days = 7)
    {
        if (empty($text)) {
            $text = sprintf(
                _("I am out of office until %s.\r\n").
                _("In urgent cases, please contact Mrs. <vacation replacement>\r\n\r\n").
                _("email: <email address of vacation replacement>\r\n").
                _("phone: +49 711 1111 11\r\n").
                _("fax.:  +49 711 1111 12\r\n\r\n").
                _("Yours sincerely,\r\n").
                _("-- \r\n").
                _("<enter your name and email address here>"),
                strftime(_('%x'))
            );
        }

        if (!empty($addresses)) {
            $addresses = ':addresses [ "' . join('", "', $addresses) . '" ]';
        } else {
            $addresses = '';
        }

        $script = 'if allof (' . (($active) ? 'true, ## vacation enabled' : 'false, ## vacation disabled') . "\r\n" .
            ((empty($domain)) ? 'true,' : 'address :domain :contains "From" "' . $domain . '",') . "\r\n" .
            (($react_to_spam) ? 'true' : 'not header :contains "X-Spam-Flag" "YES"') . ') {' . "\r\n" .
            'vacation ' . $addresses . ' :days ' . $days . ' text:' . "\r\n" .
            $text . "\r\n" .
            '.' . "\r\n" .
            ';' . "\r\n" .
            '}' . "\r\n";

        if (!$active) {
            $script = preg_replace('/^(.)/m', '#$1', $script);
        }

        return '### SEGMENT START VACATION ' . (($active) ? 'ENABLED' : 'DISABLED') . "\r\n" .
            $script .
            '### SEGMENT END VACATION' . "\r\n";
    }
}


From cvs at kolab.org  Fri Apr  9 12:49:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Apr 2010 12:49:37 +0200 (CEST)
Subject: gunnar: server Makefile,1.111,1.112 
Message-ID: <20100409104937.732AE600586@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv27325

Modified Files:
	Makefile 
Log Message:
Overwrite test reports, don't append.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- Makefile	30 Mar 2010 07:04:16 -0000	1.111
+++ Makefile	9 Apr 2010 10:49:35 -0000	1.112
@@ -775,7 +775,7 @@
 	@for TEST in $(PHPUNIT_TESTS); \
 	do                             \
           PHPUNIT='';                  \
-	  $(PHPUNIT) -d date.timezone="Europe/Berlin" -d log_errors=1 -d error_log="/tmp/$${TEST//\//_}-php-errors.log" $$TEST 2>&1 | tee -a /tmp/$${TEST//\//_}-phpunit.log | grep "^OK" > /dev/null || PHPUNIT="FAIL"; \
+	  $(PHPUNIT) -d date.timezone="Europe/Berlin" -d log_errors=1 -d error_log="/tmp/$${TEST//\//_}-php-errors.log" $$TEST 2>&1 | tee /tmp/$${TEST//\//_}-phpunit.log | grep "^OK" > /dev/null || PHPUNIT="FAIL"; \
 	  if [ -n "$$PHPUNIT" ]; then  \
 	    echo;                      \
 	    echo "FAIL ($$TEST): Some phpunit tests failed!"; \



From cvs at kolab.org  Mon Apr 12 21:04:49 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Apr 2010 21:04:49 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf mandriva,1.16,1.17 
Message-ID: <20100412190449.B8FB8600167@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv32340

Modified Files:
	mandriva 
Log Message:
Updated on Request of Thomas S.

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mandriva	28 Mar 2010 15:51:25 -0000	1.16
+++ mandriva	12 Apr 2010 19:04:47 -0000	1.17
@@ -58,7 +58,7 @@
 emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${localstatedir}/spool/postfix/extern/cyrus/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
-emailserver_sasl_conffile=${sasl_confdir}/postfix/sasl/smtpd.con
+emailserver_sasl_conffile=${sysconfdir}/postfix/sasl/smtpd.conf
 emailserver_logfile=${logdir}/postfix.log
 emailserver_usr=kolab
 emailserver_grp=kolab
@@ -172,21 +172,23 @@
 sasl_authdconffile=${sysconfdir}/saslauthd.conf
 sasl_logfile=${logdir}/sasl/saslauthd.log
 
-resmgr_logfile=${logdir}/kolab/filter
+resmgr_logdir=${logdir}/kolab/filter
+resmgr_scriptsdir=${bindir}
 resmgr_confdir=${sysconfdir}/kolab/filter
 resmgr_conffile_usr=kolab
-resmgr_conffile_grp=kolab
+resmgr_conffile_grp=root
 resmgr_filterdir=${localstatedir}/lib/kolab/kolab-filter/tmp
-resmgr_scriptsdir=${bindir}
-resmgr_usr=kolab
+resmgr_usr=root
 resmgr_grp=kolab
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=$logdir}/kolab/fbview.log
 freebusy_logdir=${logdir}/kolab/freebusy
 freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 freebusy_cachedir=${localstatedir}/cache/freebusy
 freebusy_usr=apache
-freebusy_grp=apache
+freebusy_grp=root
 freebusy_log_type=file
 freebusy_log_name=${freebusy_logdir}/freebusy.log
 



From cvs at kolab.org  Tue Apr 13 11:29:53 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 11:29:53 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.9, 1.10 forward.php.in, 1.8,
	1.9 vacation.php.in, 1.10, 1.11 
Message-ID: <20100413092953.ABCC1600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv24077/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
Fix delivery to folders containing umlauts for the cyrus server. Do not duplicate mails when activating forwarding and delivery at the same time (and keeping mails on the server).

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- deliver.php.in	7 Apr 2010 03:52:27 -0000	1.9
+++ deliver.php.in	13 Apr 2010 09:29:51 -0000	1.10
@@ -22,6 +22,7 @@
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
 require_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- forward.php.in	7 Apr 2010 03:52:27 -0000	1.8
+++ forward.php.in	13 Apr 2010 09:29:51 -0000	1.9
@@ -23,6 +23,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
 require_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vacation.php.in	7 Apr 2010 03:52:27 -0000	1.10
+++ vacation.php.in	13 Apr 2010 09:29:51 -0000	1.11
@@ -11,6 +11,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
 require_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';



From cvs at kolab.org  Tue Apr 13 11:29:53 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 11:29:53 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Delivery.php, 1.4, 1.5 Forward.php, 1.4, 1.5 
Message-ID: <20100413092953.AAFEC60057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv24077/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Delivery.php Forward.php 
Log Message:
Fix delivery to folders containing umlauts for the cyrus server. Do not duplicate mails when activating forwarding and delivery at the same time (and keeping mails on the server).

Index: Delivery.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Delivery.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Delivery.php	1 Apr 2010 13:38:19 -0000	1.4
+++ Delivery.php	13 Apr 2010 09:29:51 -0000	1.5
@@ -83,7 +83,9 @@
     {
         return array(
             ($this->isActive()) ? 'true, ## delivery enabled' : 'false, ## delivery disabled',
-            $this->getDeliveryFolder()
+            // UTF7-conversion handles a specific cyrus bug. This does not work
+            // when using dovecot for example. The sieve RFC requires UTF8.
+            String::convertCharset($this->getDeliveryFolder(), 'utf-8', 'utf7-imap')
         );
     }
 
@@ -95,7 +97,7 @@
     public function parseDeliveryFolder($script)
     {
         if (preg_match("/fileinto \"INBOX\/([^\"]*)\";/", $script, $regs)) {
-            $this->setDeliveryFolder($regs[1]);
+            $this->setDeliveryFolder(String::convertCharset($regs[1], 'utf7-imap', 'utf-8'));
         }
     }
 }

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Forward.php	7 Apr 2010 07:24:05 -0000	1.4
+++ Forward.php	13 Apr 2010 09:29:51 -0000	1.5
@@ -122,7 +122,7 @@
         return array(
             ($this->isActive()) ? 'true ## forward enabled' : 'false ## forward disabled',
             $address,
-            ($this->getKeepOnServer()) ? ' keep;' : ''
+            ($this->getKeepOnServer()) ? '' : ' stop;'
         );
     }
 



From cvs at kolab.org  Tue Apr 13 11:29:53 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 11:29:53 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php,
	1.8, 1.9 
Message-ID: <20100413092953.ABD90600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin
In directory doto:/tmp/cvs-serv24077/kolab-webadmin/lib/KolabAdmin

Modified Files:
	Sieve.php 
Log Message:
Fix delivery to folders containing umlauts for the cyrus server. Do not duplicate mails when activating forwarding and delivery at the same time (and keeping mails on the server).

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Sieve.php	7 Apr 2010 06:14:38 -0000	1.8
+++ Sieve.php	13 Apr 2010 09:29:51 -0000	1.9
@@ -157,8 +157,9 @@
     public function getScript()
     {
         $script = 'require "fileinto";' . "\r\n" . 'require "vacation";' . "\r\n\r\n\r\n";
-        foreach ($this->_segments as $segment) {
-            $script .= $segment->generate() . "\r\n\r\n";
+        $order = array('vacation', 'forward', 'delivery');
+        foreach ($order as $segment) {
+            $script .= $this->_segments[$segment]->generate() . "\r\n\r\n";
         }
         return $script;
     }



From cvs at kolab.org  Tue Apr 13 11:43:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 11:43:02 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
	Forward.php, 1.5, 1.6 
Message-ID: <20100413094302.3BFE060057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv24477/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Forward.php 
Log Message:
Update testing and fix an upgrade bug with the new forward segment script. Strict testing is no longer possible because we use the old Horde String library.

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Forward.php	13 Apr 2010 09:29:51 -0000	1.5
+++ Forward.php	13 Apr 2010 09:43:00 -0000	1.6
@@ -143,8 +143,14 @@
     {
         if (preg_match('/keep;/s', $script, $regs)) {
             $this->_keep_on_server = true;
-        } else {
+        } else if (preg_match('/stop;/s', $script, $regs)) {
+            $this->_keep_on_server = false;
+        } else if (preg_match('/require/s', $script, $regs)) {
+            // The unused "require" statement provides the information that it
+            // is an old script variant.
             $this->_keep_on_server = false;
+        } else {
+            $this->_keep_on_server = true;
         }
     }
 }



From cvs at kolab.org  Tue Apr 13 11:43:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 11:43:02 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin
	AllTests.php, 1.2, 1.3 Autoload.php, 1.1, 1.2 
Message-ID: <20100413094302.4188A600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin
In directory doto:/tmp/cvs-serv24477/kolab-webadmin/test/KolabAdmin

Modified Files:
	AllTests.php Autoload.php 
Log Message:
Update testing and fix an upgrade bug with the new forward segment script. Strict testing is no longer possible because we use the old Horde String library.

Index: AllTests.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/AllTests.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AllTests.php	21 Feb 2010 08:05:08 -0000	1.2
+++ AllTests.php	13 Apr 2010 09:43:00 -0000	1.3
@@ -49,7 +49,7 @@
     public static function suite()
     {
         // Catch strict standards
-        error_reporting(E_ALL | E_STRICT);
+        //error_reporting(E_ALL | E_STRICT);
 
         // Build the suite
         $suite = new PHPUnit_Framework_TestSuite('KolabAdmin');

Index: Autoload.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Autoload.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Autoload.php	7 Apr 2010 07:28:40 -0000	1.1
+++ Autoload.php	13 Apr 2010 09:43:00 -0000	1.2
@@ -27,4 +27,6 @@
 }
 
 /** Catch strict standards */
-error_reporting(E_ALL | E_STRICT);
+//error_reporting(E_ALL | E_STRICT);
+
+require_once 'Horde/String.php';
\ No newline at end of file



From cvs at kolab.org  Tue Apr 13 11:43:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 11:43:02 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment
	ForwardTest.php, 1.1, 1.2 
Message-ID: <20100413094302.455E8600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment
In directory doto:/tmp/cvs-serv24477/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment

Modified Files:
	ForwardTest.php 
Log Message:
Update testing and fix an upgrade bug with the new forward segment script. Strict testing is no longer possible because we use the old Horde String library.

Index: ForwardTest.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/test/KolabAdmin/Unit/Sieve/Segment/ForwardTest.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ForwardTest.php	7 Apr 2010 07:28:40 -0000	1.1
+++ ForwardTest.php	13 Apr 2010 09:43:00 -0000	1.2
@@ -256,7 +256,7 @@
         }
         $script = 'if allof (' . (($active) ? 'true ## forward enabled' : 'false ## forward disabled') . "\r\n" .
             ') {' . "\r\n" .
-            $address . (($keep_on_server) ? ' keep;' : '') . "\r\n" .
+            $address . (($keep_on_server) ? '' : ' stop;') . "\r\n" .
             '}' . "\r\n";
         if (!$active) {
             $script = preg_replace('/^(.)/m', '#$1', $script);



From cvs at kolab.org  Tue Apr 13 21:41:25 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 21:41:25 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.287,1.288 
Message-ID: <20100413194125.3966A600148@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv9603

Modified Files:
	ChangeLog 
Log Message:
Removed perllib defination, it's not longer needed.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- ChangeLog	31 Mar 2010 14:27:54 -0000	1.287
+++ ChangeLog	13 Apr 2010 19:41:23 -0000	1.288
@@ -1,3 +1,8 @@
+2010-04-13 Richard Bos <ml at radoeka.nl>
+
+       * centos-clarkconnect debian kolab mandriva suse:
+         Removed perllib definition, it's not longer needed.
+
 2010-03-31  Karl-Heinz Ruskowski <khruskowski at intevation.de>
 
 	* templates/local.cf.template.in: Removed required_score.



From cvs at kolab.org  Tue Apr 13 21:41:25 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Apr 2010 21:41:25 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf debian, 1.32, 1.33 kolab, 1.75,
	1.76 mandriva, 1.17, 1.18 suse, 1.96, 1.97 centos-clarkconnect,
	1.15, 1.16 
Message-ID: <20100413194125.435BC600167@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv9603/dist_conf

Modified Files:
	debian kolab mandriva suse centos-clarkconnect 
Log Message:
Removed perllib defination, it's not longer needed.

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- debian	11 Feb 2010 20:30:18 -0000	1.32
+++ debian	13 Apr 2010 19:41:23 -0000	1.33
@@ -25,7 +25,6 @@
 kolabconf_script=${sbindir}/kolabconf
 
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=/usr/share/perl5
 
 amavisd_conffile=${sysconfdir}/amavis/conf.d
 amavisd_templatedir=${sysconfdir}/amavis/conf.d

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- kolab	9 Feb 2010 09:37:53 -0000	1.75
+++ kolab	13 Apr 2010 19:41:23 -0000	1.76
@@ -22,9 +22,6 @@
 pkgdocdir=${datadir}/doc
 kolabconf_script=${sbindir}/kolabconf
 
-# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl/vendor_perl/5.8.8
-
 amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
 amavisd_templatedir=${sysconfdir}/amavisd/templates
 amavisd_logfile=${localstatedir}/amavisd/amavisd.log

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mandriva	12 Apr 2010 19:04:47 -0000	1.17
+++ mandriva	13 Apr 2010 19:41:23 -0000	1.18
@@ -23,9 +23,6 @@
 pkgdocdir=${datadir}/doc/kolab
 kolabconf_script=${sbindir}/kolabconf
 
-# perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${perl_vendorlib}
-
 amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
 amavisd_templatedir=${sysconfdir}/amavisd/templates
 amavisd_logfile=${logdir}/amavisd

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- suse	9 Feb 2010 09:37:53 -0000	1.96
+++ suse	13 Apr 2010 19:41:23 -0000	1.97
@@ -22,9 +22,6 @@
 pkgdocdir=${datadir}/doc/packages/kolab
 kolabconf_script=${sbindir}/kolabconf
 
-# perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl5/vendor_perl/5.8.8
-
 amavisd_conffile=${sysconfdir}/amavisd.conf
 amavisd_templatedir=${sysconfdir}/amavisd/templates.d
 amavisd_logfile=${localstatedir}/log/amavisd

Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- centos-clarkconnect	10 Feb 2009 22:41:14 -0000	1.15
+++ centos-clarkconnect	13 Apr 2010 19:41:23 -0000	1.16
@@ -43,9 +43,6 @@
 pkgdocdir=${datadir}/doc/kolab-2.1
 kolabconf_script=${sbindir}/kolabconf
 
-# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=/usr/lib/perl5/vendor_perl/5.8.5
-
 sysrundir=${localstatedir}/run
 
 #--------------------------------------------------------------------



From cvs at kolab.org  Wed Apr 14 00:21:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Apr 2010 00:21:50 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, 1.10, 1.11 forward.php.in, 1.9,
	1.10 vacation.php.in, 1.11, 1.12 
Message-ID: <20100413222150.A33BD600148@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv15166/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
The old script names are not required anymore.

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- deliver.php.in	13 Apr 2010 09:29:51 -0000	1.10
+++ deliver.php.in	13 Apr 2010 22:21:48 -0000	1.11
@@ -39,9 +39,6 @@
 $menuitems[$sidx]['selected'] = 'selected';
 
 /**** Sieve handling ***/
-// this is the name KDE client stores - so we can also change the setting from KDE client
-$scriptname = "kolab-deliver.siv";
-
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- forward.php.in	13 Apr 2010 09:29:51 -0000	1.9
+++ forward.php.in	13 Apr 2010 22:21:48 -0000	1.10
@@ -40,9 +40,6 @@
 $menuitems[$sidx]['selected'] = 'selected';
 
 /**** Sieve handling ***/
-// this is the name KDE client stores - so we can also change the setting from KDE client
-$scriptname = "kolab-forward.siv";
-
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vacation.php.in	13 Apr 2010 09:29:51 -0000	1.11
+++ vacation.php.in	13 Apr 2010 22:21:48 -0000	1.12
@@ -28,8 +28,6 @@
 $menuitems[$sidx]['selected'] = 'selected';
 
 /**** Sieve handling ***/
-$scriptname = 'kolab-vacation.siv';
-
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   //$sieve->setDebug(true);



From cvs at kolab.org  Wed Apr 14 00:38:04 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Apr 2010 00:38:04 +0200 (CEST)
Subject: gunnar: utils/admin kolab_vacation_tool,1.4,1.5 
Message-ID: <20100413223804.CAE42600148@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv15661/admin

Modified Files:
	kolab_vacation_tool 
Log Message:
Adapt to the new backend classes.

Index: kolab_vacation_tool
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_vacation_tool	16 Mar 2006 12:26:23 -0000	1.4
+++ kolab_vacation_tool	13 Apr 2010 22:38:02 -0000	1.5
@@ -23,10 +23,16 @@
 ini_set( 'include_path',
          '.:/kolab/var/kolab/php:/kolab/var/kolab/php/pear:'.$include_path);
 
-require_once 'admin/include/sieveutils.class.php';
 require_once 'PEAR.php';
 
-include_once 'admin/include/Sieve.php';
+include_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
+require_once 'KolabAdmin/Sieve.php';
+require_once 'KolabAdmin/Sieve/Script.php';
+require_once 'KolabAdmin/Sieve/Segment.php';
+require_once 'KolabAdmin/Sieve/Segment/Delivery.php';
+require_once 'KolabAdmin/Sieve/Segment/Forward.php';
+require_once 'KolabAdmin/Sieve/Segment/Vacation.php';
 
 include ("Console/Getopt.php");
 
@@ -116,58 +122,22 @@
     return $errors;
   }
 
-  $addresses = $days = $text = false;
-  if( PEAR::isError( $scripts = $sieve->listScripts() ) ) {
-    $errors[] = $scripts->getMessage();
-    /* try to disconnect anyway (without recording further errors) */
-    $sieve->disconnect();
-    return $errors;
-  }
-  if( in_array( $scriptname, $scripts ) ) {
-    $script = $sieve->getScript($scriptname);
-    $old_maildomain = SieveUtils::getMailDomain( $script );
-    $old_dontreacttospam = SieveUtils::getReactToSpam( $script );
-    $addresses = SieveUtils::getVacationAddresses( $script );
-    $days = SieveUtils::getVacationDays( $script );
-    $text = SieveUtils::getVacationText( $script );
-  } else $old_dontreacttospam = true;
-  if( $addresses === false ) $addresses = array( "" );
-  $active = ( $sieve->getActive() === $scriptname );
-
-  if(is_null($maildomain))
-    $new_maildomain = $old_maildomain;
-  else
-    $new_maildomain = $maildomain;
-
-  if(is_null($dontreacttospam))
-    $new_dontreacttospam = $old_dontreacttospam;
-  else
-    $new_dontreacttospam = $dontreacttospam;
-
-  if( $new_maildomain != $old_maildomain ||
-      $new_dontreacttospam != $old_dontreacttospam ) {
-
-    $script =
-      "require \"vacation\";\r\n\r\n".
-      (!empty($new_maildomain)?"if not address :domain :contains \"From\" \"".$new_maildomain."\" { keep; stop; }\r\n":"").
-      ($new_dontreacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
-      ($addresses && $text && $days ?
-      "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".$days." text:\r\n".
-      SieveUtils::dotstuff($text).".\r\n;":"")."\r\n\r\n";
+  try {
+    $handler = new KolabAdmin_Sieve($sieve);
 
-    if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
-      $errors[] = $res->getMessage();
-      $errors[] = 'Script was:';
-      $errors[] = $script;
-      /* try to disconnect anyway (without recording further errors) */
-      $sieve->disconnect();
-      return $errors;
-    }
+    $handler->fetchVacationSegment()->setDomain(trim($maildomain));
+    $handler->fetchVacationSegment()->setReactToSpam(!$dontreacttospam);
 
+    $handler->store();
+  } catch (Exception $e) {
+    $errors[] = $e->getMessage();
+    $errors[] = 'Script was:';
+    $errors[] = '<pre>' . $handler->getScript() . '</pre>';
+    return $errors;
+  }
 
-    if ($verbosity == 0) {
-      fwrite(STDOUT, "$user on $host: updated\n");
-    }
+  if ($verbosity == 0) {
+    fwrite(STDOUT, "$user on $host: updated\n");
   }
 
   if ($verbosity > 0) {



From cvs at kolab.org  Wed Apr 14 21:00:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Apr 2010 21:00:54 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/imp ChangeLog, 1.3, 1.4 imp.spec, 1.8,
	1.9 
Message-ID: <20100414190054.DDE31600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/imp
In directory doto:/tmp/cvs-serv25303

Modified Files:
	ChangeLog imp.spec 
Log Message:
Hid IMP and made the dynamic version (dimp) the default view.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	30 Mar 2010 13:30:49 -0000	1.3
+++ ChangeLog	14 Apr 2010 19:00:52 -0000	1.4
@@ -1,3 +1,9 @@
+2010-04-14  Gunnar Wrobel  <p at rdus.de>
+
+	* configuration/imp-4.3.6/conf.php:
+
+	Hid IMP and made the dynamic version (dimp) the default view.
+
 2010-03-30  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/imp-4.3.6/webclient-imp_mime_drivers.php.template: 

Index: imp.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imp.spec	30 Mar 2010 13:30:49 -0000	1.8
+++ imp.spec	14 Apr 2010 19:00:52 -0000	1.9
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package imp
 %define         V_version 4.3.6
-%define         V_release 20100330
+%define         V_release 20100414
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Wed Apr 14 21:00:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Apr 2010 21:00:54 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6
	10-kolab_conf_base.php, 1.1, 1.2 conf.php, 1.2, 1.3 
Message-ID: <20100414190054.E210F60057C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6
In directory doto:/tmp/cvs-serv25303/configuration/imp-4.3.6

Modified Files:
	10-kolab_conf_base.php conf.php 
Log Message:
Hid IMP and made the dynamic version (dimp) the default view.

Index: 10-kolab_conf_base.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6/10-kolab_conf_base.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-kolab_conf_base.php	18 Jan 2010 17:44:22 -0000	1.1
+++ 10-kolab_conf_base.php	14 Apr 2010 19:00:52 -0000	1.2
@@ -8,3 +8,7 @@
 $conf['hooks']['display_folder'] = true;
 
 $conf['sentmail']['driver'] = 'none';
+
+// Uncomment in order to allow your users to select the type of mailer they wish to use.
+// $conf['user']['force_view'] = null;
+// $conf['user']['select_view'] = true;

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6/conf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conf.php	22 Jan 2010 08:03:27 -0000	1.2
+++ conf.php	14 Apr 2010 19:00:52 -0000	1.3
@@ -14,8 +14,9 @@
 $conf['user']['allow_view_source'] = true;
 $conf['user']['alternate_login'] = false;
 $conf['user']['redirect_on_logout'] = false;
-$conf['user']['default_view'] = 'imp';
-$conf['user']['select_view'] = true;
+$conf['user']['default_view'] = 'dimp';
+$conf['user']['force_view'] = 'dimp';
+$conf['user']['select_view'] = false;
 $conf['server']['change_server'] = false;
 $conf['server']['change_port'] = false;
 $conf['server']['change_protocol'] = false;



From cvs at kolab.org  Wed Apr 14 21:01:10 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Apr 2010 21:01:10 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.532,1.533 
Message-ID: <20100414190110.53C7B600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv25373

Modified Files:
	release-notes.txt 
Log Message:
Hid IMP and made the dynamic version (dimp) the default view.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -d -r1.532 -r1.533
--- release-notes.txt	7 Apr 2010 07:28:40 -0000	1.532
+++ release-notes.txt	14 Apr 2010 19:01:08 -0000	1.533
@@ -22,6 +22,8 @@
 
     - imp-4.3.6-2010????
 
+	Hid IMP and made the dynamic version (dimp) the default view.
+
 	kolab/issue3543 (Display of pure HTML email very clunky, claimed to be
 	                 no displayable part) 
 	kolab/issue4174 (Patch for imp/dimp login by uid)



From cvs at kolab.org  Thu Apr 15 00:27:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 00:27:34 +0200 (CEST)
Subject: gunnar:  ChangeLog,NONE,1.1 
Message-ID: <20100414222734.8D900600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository
In directory doto:/tmp/cvs-serv1385/d/d

Added Files:
	ChangeLog 
Log Message:
kolab/issue4080 (DIMP: Mails can not be copied to other folders)



From cvs at kolab.org  Thu Apr 15 00:27:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 00:27:34 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.533,1.534 
Message-ID: <20100414222734.95A7A600571@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1385

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue4080 (DIMP: Mails can not be copied to other folders)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -d -r1.533 -r1.534
--- release-notes.txt	14 Apr 2010 19:01:08 -0000	1.533
+++ release-notes.txt	14 Apr 2010 22:27:32 -0000	1.534
@@ -20,6 +20,10 @@
 
 	kolab/issue3555 (unable to save filter settings more than once)
 
+    - dimp-1.1.4-2010????
+
+	kolab/issue4080 (DIMP: Mails can not be copied to other folders) 
+
     - imp-4.3.6-2010????
 
 	Hid IMP and made the dynamic version (dimp) the default view.



From cvs at kolab.org  Thu Apr 15 00:27:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 00:27:34 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/dimp/patches/dimp-1.1.4
	t_dimp_H_MS_CopyMessagesWithCtrl.diff, NONE, 1.1 series, 1.5, 1.6 
Message-ID: <20100414222734.959AF600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4
In directory doto:/tmp/cvs-serv1385/d/d/patches/dimp-1.1.4

Modified Files:
	series 
Added Files:
	t_dimp_H_MS_CopyMessagesWithCtrl.diff 
Log Message:
kolab/issue4080 (DIMP: Mails can not be copied to other folders)

--- NEW FILE: t_dimp_H_MS_CopyMessagesWithCtrl.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/dimp/H/MS/CopyMessagesWithCtrl

Allow copying messages with Drag&Drop while holding Ctrl.

https://www.intevation.de/roundup/kolab/issue4080

STATUS: MERGED in HEAD but not in FRAMEWORK_3

Signed-off-by: Gunnar Wrobel <p at rdus.de>

diff -Naur a/DimpBase.js b/js/DimpBase.js
--- a/DimpBase.js	2010-04-14 22:21:28.000000000 +0200
+++ b/js/DimpBase.js	2010-04-14 22:20:38.000000000 +0200
@@ -1175,7 +1175,7 @@
     },
 
     /* Drag/Drop handler. */
-    _folderDropHandler: function(drop, drag)
+    _folderDropHandler: function(drop, drag, e)
     {
         var dropbase, sel, uids,
             foldername = drop.readAttribute('mbox'),
@@ -1198,10 +1198,14 @@
                 uids = this.viewport.createSelection('domid', drag.id);
             }
 
-            // Don't allow drag/drop to the current folder.
-            if (uids.size() && this.folder != foldername) {
-                this.viewport.updateFlag(uids, 'deletedmsg', true);
-                DimpCore.doAction('MoveMessage', this.viewport.addRequestParams({ tofld: foldername }), DimpCore.toUIDArray(uids), this.bcache.get('deleteC') || this.bcache.set('deleteC', this._deleteCallback.bind(this)));
+            if (uids.size()) {
+                if (e.ctrlKey) {
+                    DimpCore.doAction('CopyMessage', this.viewport.addRequestParams({ tofld: foldername }), DimpCore.toUIDArray(uids), this.bcache.get('pollFC') || this.bcache.set('pollFC', this._pollFoldersCallback.bind(this)));
+                } else if (this.folder != foldername) {
+                    // Don't allow drag/drop to the current folder.
+                    this.viewport.updateFlag(uids, 'deletedmsg', true);
+                    DimpCore.doAction('MoveMessage', this.viewport.addRequestParams({ tofld: foldername }), DimpCore.toUIDArray(uids), this.bcache.get('deleteC') || this.bcache.set('deleteC', this._deleteCallback.bind(this)));
+                }
             }
         }
     },
@@ -2073,17 +2077,20 @@
 
 DimpBase._folderDropConfig = {
     hoverclass: 'dragdrop',
-    caption: function(drop, drag) {
-        var d = drag.readAttribute('l'),
+    caption: function(drop, drag, e) {
+        var m,
+            d = drag.readAttribute('l'),
             ftype = drop.readAttribute('ftype'),
-            l = drop.readAttribute('l'),
-            m = DIMP.text.moveto;
+            l = drop.readAttribute('l');
         if (drop == $('dropbase')) {
-            return m.replace(/%s/, d).replace(/%s/, DIMP.text.baselevel);
-        } else if (drag.hasClassName('folder')) {
-            return (ftype != 'special' && !this.isSubfolder(drag, drop)) ? m.replace(/%s/, d).replace(/%s/, l) : '';
+            return DIMP.text.moveto.replace(/%s/, d).replace(/%s/, DIMP.text.baselevel);
         } else {
-            return ftype != 'container' ? m.replace(/%s/, this._dragCaption()).replace(/%s/, l) : '';
+            m = (e.ctrlKey) ? DIMP.text.copyto : DIMP.text.moveto;
+            if (drag.hasClassName('folder')) {
+                return (ftype != 'special' && !this.isSubfolder(drag, drop)) ? m.replace(/%s/, d).replace(/%s/, l) : '';
+            } else {
+                return ftype != 'container' ? m.replace(/%s/, this._dragCaption()).replace(/%s/, l) : '';
+            }
         }
     }.bind(DimpBase),
     onDrop: DimpBase._folderDropHandler.bind(DimpBase)
diff -Naur a/dragdrop.js b/js/dragdrop.js
--- a/dragdrop.js	2010-04-14 22:21:28.000000000 +0200
+++ b/js/dragdrop.js	2010-04-14 22:20:38.000000000 +0200
@@ -1 +1,452 @@
-var DragDrop={Drags:{drags:$H(),register:function(a){if(!this.drags.size()){if(!this.div){this.div=new Element("DIV",{className:a.options.classname}).hide()}$(document.body).insert(this.div)}this.drags.set(a.element.readAttribute("id"),a)},unregister:function(a){if(this.drag==a.element){this.drag.deactivate()}this.drags.unset(a.element.readAttribute("id"));if(!this.drags.size()&&this.div){this.div.remove()}},get_drag:function(a){return this.drags.get(Object.isElement(a)?$(a).readAttribute("id"):a)},activate:function(a){if(this.drag){this.deactivate()}this.drag=a;this.mousemoveE=a._mouseMove.bindAsEventListener(a);this.mouseupE=a._mouseUp.bindAsEventListener(a);document.observe("mousemove",this.mousemoveE);document.observe("mouseup",this.mouseupE)},deactivate:function(){if(this.drag){this.drag=null;document.stopObserving("mousemove",this.mousemoveE);document.stopObserving("mouseup",this.mouseupE)}}},Drops:{drops:$H(),register:function(a){this.drops.set(a.element.readAttribute
 ("id"),a)},unregister:function(a){if(this.drop==a.element){this.drop=null}this.drops.unset(a.element.readAttribute("id"))},get_drop:function(a){return this.drops.get(Object.isElement(a)?$(a).readAttribute("id"):a)}},validDrop:function(a){var b=DragDrop.Drops.drop;return(b&&a&&a!=b.element&&(!b.options.accept.size()||b.options.accept.include(a.tagName)))}},Drag=Class.create({initialize:function(a){this.element=$(a);this.options=Object.extend({caption:"",classname:"drag",constraint:null,ghosting:false,scroll:null,snap:null,threshold:0,onDrag:null,onEnd:null,onStart:null},arguments[1]||{});this.mousedownE=this._mouseDown.bindAsEventListener(this);this.element.observe("mousedown",this.mousedownE);if(this.options.scroll){this.options.scroll=$(this.options.scroll)}DragDrop.Drags.register(this);if(Prototype.Browser.IE){this.element.observe("selectstart",Event.stop)}else{if(Prototype.Browser.Gecko){this.element.setStyle({MozUserSelect:"none"})}}},destroy:function(){this.element.stop
 Observing("mousedown",this.mousedownE);DragDrop.Drags.unregister(this)},_mouseDown:function(a){$(document.body).setStyle({cursor:"default"});DragDrop.Drags.activate(this);this.move=0;this.wasDragged=false;this.lastdrag=this.lastcaption=null;if(Object.isFunction(this.options.onStart)){this.options.onStart(this,a)}if(!Prototype.Browser.IE&&!Prototype.Browser.Gecko){a.stop()}},_mouseMove:function(f){var b,c,a,d;if(++this.move<=this.options.threshold){return}this.lastCoord=d=[f.pointerX(),f.pointerY()];if(this.options.ghosting){if(!this.ghost){b=this.element.offsetLeft;c=this.element.offsetTop;this.ghost=$(this.element.cloneNode(true)).writeAttribute("id",null).setOpacity(0.7).clonePosition(this.element,{setLeft:false,setTop:false}).setStyle({left:b+"px",position:"absolute",top:c+"px",zIndex:parseInt(this.element.getStyle("zIndex"))+1});this.element.insert({before:this.ghost});a=this.ghost.viewportOffset();this.ghostOffset=[a[0]-b,a[1]-c]}d[0]-=this.ghostOffset[0];d[1]-=this.gho
 stOffset[1];switch(this.options.constraint){case"horizontal":d[1]=this.ghost.offsetTop;break;case"vertical":d[0]=this.ghost.offsetLeft;break}if(this.options.snap){d=this.options.snap(d[0],d[1],this.element)}if(this.options.offset){d[0]+=this.options.offset.x;d[1]+=this.options.offset.y}this._setContents(this.ghost,d[0],d[1])}this._onMoveDrag(d);if(Object.isFunction(this.options.onDrag)){this.options.onDrag(this,f)}this.wasDragged=true;if(this.options.scroll){this._onMoveScroll()}},_mouseUp:function(a){var b=DragDrop.Drops.drop;this._stopScrolling();if(this.ghost){this.ghost.remove();this.ghost=null}DragDrop.Drags.div.hide();if(DragDrop.validDrop(this.element)&&Object.isFunction(b.options.onDrop)){b.options.onDrop(b.element,this.element)}DragDrop.Drags.deactivate();if(Object.isFunction(this.options.onEnd)){this.options.onEnd(this,a)}},_onMoveDrag:function(g){var f,c,e,b,a,h=DragDrop.Drops.drop,i=DragDrop.Drags.div;if(h&&h.element!=this.lastdrag){if(DragDrop.validDrop(this.ele
 ment)){b=h.options.caption;if(b){c=Object.isFunction(b)?b(h.element,this.element):b;if(c&&h.options.hoverclass){e=h.options.hoverclass}a=true}}else{a=true}this.lastdrag=h.element}else{if((!h&&this.lastdrag)||(this.move==(this.options.threshold+1))){a=true;this.lastdrag=null}}if(a){if(!c){f=this.options.caption;c=Object.isFunction(f)?f(this.element):f}this.lastcaption=c;i.update(c).writeAttribute({className:e||this.options.classname});if(c.empty()){i.hide()}}if(!this.lastcaption.empty()){this._setContents(i,g[0]+15,g[1]+(this.ghost?(this.ghost.getHeight()+5):5))}},_onMoveScroll:function(){this._stopScrolling();var e,d,b,a=this.options.scroll,c=a.getDimensions();if(a.scrollHeight==c.height){return}e=document.viewport.getScrollOffsets();d=a.viewportOffset(),b=[0,0];d[0]+=a.scrollLeft+e.left;d[2]=d[0]+c.width;if(this.lastCoord[0]>d[2]||this.lastCoord[0]<d[0]){return}d[1]+=a.scrollTop+e.top;d[3]=d[1]+c.height;if(this.lastCoord[1]<d[1]){b[1]=this.lastCoord[1]-d[1]}if(this.lastCoor
 d[1]>d[3]){b[1]=this.lastCoord[1]-d[3]}if(b[0]||b[1]){this.lastScrolled=new Date();this.scrollInterval=setInterval(this._scroll.bind(this,b[0]*15,b[1]*15),10)}},_stopScrolling:function(){if(this.scrollInterval){clearInterval(this.scrollInterval);this.scrollInterval=null}},_scroll:function(a,e){var c=new Date(),d=c-this.lastScrolled,b=this.options.scroll;this.lastScrolled=c;b.scrollTop+=e*d/1000},_setContents:function(c,a,e){var d=document.viewport.getDimensions(),b=c.getDimensions();if((a+b.width>d.width)||(e+b.height>d.height)){c.hide()}else{c.setStyle({left:a+"px",top:e+"px"}).show()}}}),Drop=Class.create({initialize:function(a){this.element=$(a);this.options=Object.extend({accept:[],caption:"",hoverclass:"",onDrop:null,onOut:null,onOver:null},arguments[1]||{});this.mouseoverE=this._mouseOver.bindAsEventListener(this);this.mouseoutE=this._mouseOut.bindAsEventListener(this);this.element.observe("mouseover",this.mouseoverE);this.element.observe("mouseout",this.mouseoutE);Dra
 gDrop.Drops.register(this)},destroy:function(){this.element.stopObserving("mouseover",this.mouseoverE);this.element.stopObserving("mouseout",this.mouseoutE);DragDrop.Drops.unregister(this)},_mouseOver:function(a){if(DragDrop.Drags.drag){DragDrop.Drops.drop=this;if(Object.isFunction(this.options.onOver)){this.options.onOver(this.element,DragDrop.Drags.drag)}}},_mouseOut:function(a){if(Object.isFunction(this.options.onOut)){this.options.onOut(this.element,DragDrop.Drags.drag)}DragDrop.Drops.drop=null}});
\ No newline at end of file
+/**
+ * dragdrop.js - A minimalist library to handle drag/drop actions.
+ * Requires prototype.js 1.6.0.2+
+ *
+ * Adapted from SkyByte.js/SkyByteDD.js v1.0-beta, May 17 2007
+ *   (c) 2007 Aleksandras Ilarionovas (Alex)
+ *   http://www.skybyte.net/scripts/
+ *
+ * Scrolling and ghosting code adapted from script.aculo.us dragdrop.js v1.8.0
+ *   (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+ *   (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi at oriontransfer.co.nz)
+ *
+ * The original scripts were freely distributable under the terms of an
+ * MIT-style license.
+ *
+ * Usage:
+ *   new Drag(element, {
+ *       classname: '',           // Class name of the drag element
+ *       caption: '',             // Either string or function to set caption
+ *                                // on mouse move
+ *       ghosting: false,         // Show ghost outline when dragging.
+ *       offset: { x:0, y:0 },    // An offset to apply to ghosted elements.
+ *       scroll: element,         // Scroll this element when above/below.
+ *                                // Only working for vertical elements
+ *       snap: null,              // If ghosting, snap allows to specify
+ *                                // coords at which the ghosted image will
+ *                                // "snap" into place.
+ *       threshold: 0,            // Move threshold
+ *       // For the following functions, d = drop element, e = event object
+ *       onStart: function(d,e),  // A function to run on mousedown
+ *       onDrag: function(d,e),   // A function to run on mousemove
+ *       onEnd: function(d,e)     // A function to run on mouseup
+ *   });
+ *
+ *   new Drop(element, {
+ *       accept: [],           // Accept filter by tag name(s) or leave empty
+ *                             // to accept all tags
+ *       caption: '',          // Either string or function to set caption on
+ *                             // mouse over
+ *       hoverclass: '',       // Change the drag element to this class when
+ *                             // hovering over an element.
+ *       onDrop: function(drop,drag)  // Function fired when mouse button
+ *                                    // released (a/k/a a drop event)
+ *       onOver: function(drop,drag)  // Function fired when mouse over zone
+ *       onOut: function(drop,drag)   // Function fired when mouse leaves the
+ *                                    // zone
+ *  });
+ *
+ * $Horde
+ *
+ * @author Michael Slusarz <slusarz at curecanti.org>
+ */
+
+var DragDrop = {
+    Drags: {
+        drags: $H(),
+
+        register: function(obj)
+        {
+            if (!this.drags.size()) {
+                if (!this.div) {
+                    this.div = new Element('DIV', { className: obj.options.classname }).hide();
+                }
+                $(document.body).insert(this.div);
+            }
+
+            this.drags.set(obj.element.readAttribute('id'), obj);
+        },
+
+        unregister: function(obj)
+        {
+            if (this.drag == obj.element) {
+                this.drag.deactivate();
+            }
+
+            this.drags.unset(obj.element.readAttribute('id'));
+
+            if (!this.drags.size() && this.div) {
+                this.div.remove();
+            }
+        },
+
+        get_drag: function(el)
+        {
+            return this.drags.get(Object.isElement(el) ? $(el).readAttribute('id') : el);
+        },
+
+        activate: function(drag)
+        {
+            if (this.drag) {
+                this.deactivate();
+            }
+            this.drag = drag;
+            this.mousemoveE = drag._mouseMove.bindAsEventListener(drag);
+            this.mouseupE = drag._mouseUp.bindAsEventListener(drag);
+            document.observe('mousemove', this.mousemoveE);
+            document.observe('mouseup', this.mouseupE);
+        },
+
+        deactivate: function()
+        {
+            if (this.drag) {
+                this.drag = null;
+                document.stopObserving('mousemove', this.mousemoveE);
+                document.stopObserving('mouseup', this.mouseupE);
+            }
+        }
+    },
+
+    Drops: {
+        drops: $H(),
+
+        register: function(obj)
+        {
+            this.drops.set(obj.element.readAttribute('id'), obj);
+        },
+
+        unregister: function(obj)
+        {
+            if (this.drop == obj.element) {
+                this.drop = null;
+            }
+
+            this.drops.unset(obj.element.readAttribute('id'));
+        },
+
+        get_drop: function(el)
+        {
+            return this.drops.get(Object.isElement(el) ? $(el).readAttribute('id') : el);
+        }
+    },
+
+    validDrop: function(el)
+    {
+        var d = DragDrop.Drops.drop;
+        return (d &&
+                el &&
+                el != d.element &&
+                (!d.options.accept.size() ||
+                 d.options.accept.include(el.tagName)));
+    }
+},
+
+Drag = Class.create({
+
+    initialize: function(el) {
+        this.element = $(el);
+        this.options = Object.extend({
+            caption: '',
+            classname: 'drag',
+            constraint: null,
+            ghosting: false,
+            scroll: null,
+            snap: null,
+            threshold: 0,
+            onDrag: null,
+            onEnd: null,
+            onStart: null
+        }, arguments[1] || {});
+        this.mousedownE = this._mouseDown.bindAsEventListener(this);
+        this.element.observe('mousedown', this.mousedownE);
+        if (this.options.scroll) {
+            this.options.scroll = $(this.options.scroll);
+        }
+        DragDrop.Drags.register(this);
+
+        // Disable text selection.
+        // See: http://ajaxcookbook.org/disable-text-selection/
+        // Stopping the event on mousedown works on all browsers, but avoid
+        // that if possible because it will prevent any event handlers further
+        // up the DOM tree from firing.
+        if (Prototype.Browser.IE) {
+            this.element.observe('selectstart', Event.stop);
+        } else if (Prototype.Browser.Gecko) {
+            this.element.setStyle({ MozUserSelect: 'none' });
+        }
+    },
+
+    destroy: function()
+    {
+        this.element.stopObserving('mousedown', this.mousedownE);
+        DragDrop.Drags.unregister(this);
+    },
+
+    _mouseDown: function(e)
+    {
+        $(document.body).setStyle({ cursor: 'default' });
+        DragDrop.Drags.activate(this);
+        this.move = 0;
+        this.wasDragged = false;
+        this.lastcaption = null;
+
+        if (Object.isFunction(this.options.onStart)) {
+            this.options.onStart(this, e);
+        }
+
+        if (!Prototype.Browser.IE && !Prototype.Browser.Gecko) {
+            e.stop();
+        }
+    },
+
+    _mouseMove: function(e)
+    {
+        var oleft, otop, vo, xy;
+
+        if (++this.move <= this.options.threshold) {
+            return;
+        }
+
+        this.lastCoord = xy = [ e.pointerX(), e.pointerY() ];
+
+        if (this.options.ghosting) {
+            if (!this.ghost) {
+                oleft = this.element.offsetLeft;
+                otop = this.element.offsetTop;
+                this.ghost = $(this.element.cloneNode(true)).writeAttribute('id', null).setOpacity(0.7).clonePosition(this.element, { setLeft: false, setTop: false }).setStyle({ left: oleft + 'px', position: 'absolute', top: otop + 'px', zIndex: parseInt(this.element.getStyle('zIndex')) + 1 });
+                this.element.insert({ before: this.ghost });
+                vo = this.ghost.viewportOffset();
+                this.ghostOffset = [ vo[0] - oleft, vo[1] - otop ];
+            }
+
+            xy[0] -= this.ghostOffset[0];
+            xy[1] -= this.ghostOffset[1];
+
+            switch (this.options.constraint) {
+            case 'horizontal':
+                xy[1] = this.ghost.offsetTop;
+                break;
+
+            case 'vertical':
+                xy[0] = this.ghost.offsetLeft;
+                break;
+            }
+
+            if (this.options.snap) {
+                xy = this.options.snap(xy[0], xy[1], this.element);
+            }
+
+            if (this.options.offset) {
+                xy[0] += this.options.offset.x;
+                xy[1] += this.options.offset.y;
+            }
+
+            this._setContents(this.ghost, xy[0], xy[1]);
+        }
+
+        this._onMoveDrag(xy, e);
+
+        if (Object.isFunction(this.options.onDrag)) {
+            this.options.onDrag(this, e);
+        }
+
+        this.wasDragged = true;
+
+        if (this.options.scroll) {
+            this._onMoveScroll();
+        }
+    },
+
+    _mouseUp: function(e)
+    {
+        var d = DragDrop.Drops.drop;
+
+        this._stopScrolling();
+
+        if (this.ghost) {
+            this.ghost.remove();
+            this.ghost = null;
+        }
+        DragDrop.Drags.div.hide();
+
+        if (DragDrop.validDrop(this.element) &&
+            Object.isFunction(d.options.onDrop)) {
+            d.options.onDrop(d.element, this.element, e);
+        }
+
+        DragDrop.Drags.deactivate();
+
+        if (Object.isFunction(this.options.onEnd)) {
+            this.options.onEnd(this, e);
+        }
+    },
+
+    _onMoveDrag: function(xy, e)
+    {
+        var c_opt, caption, cname, d_cap,
+            d = DragDrop.Drops.drop,
+            div = DragDrop.Drags.div,
+            d_update = true;
+
+        if (d && DragDrop.validDrop(this.element)) {
+            d_cap = d.options.caption;
+            if (d_cap) {
+                caption = Object.isFunction(d_cap) ? d_cap(d.element, this.element, e) : d_cap;
+                if (caption && d.options.hoverclass) {
+                    cname = d.options.hoverclass;
+                }
+            } else {
+                d_update = false;
+            }
+        }
+
+        if (d_update) {
+            if (!caption) {
+                c_opt = this.options.caption;
+                caption = Object.isFunction(c_opt) ? c_opt(this.element) : c_opt;
+            }
+            if (caption != this.lastcaption) {
+                this.lastcaption = caption;
+                div.update(caption).writeAttribute({ className: cname || this.options.classname });
+                if (caption.empty()) {
+                    div.hide();
+                }
+            }
+        }
+
+        if (!this.lastcaption.empty()) {
+            this._setContents(div, xy[0] + 15, xy[1] + (this.ghost ? (this.ghost.getHeight() + 5) : 5));
+        }
+    },
+
+    _onMoveScroll: function()
+    {
+        this._stopScrolling();
+
+        var delta, p, speed,
+            s = this.options.scroll,
+            dim = s.getDimensions();
+
+        // No need to scroll if element is not current scrolling.
+        if (s.scrollHeight == dim.height) {
+            return;
+        }
+
+        delta = document.viewport.getScrollOffsets();
+        p = s.viewportOffset(),
+        speed = [ 0, 0 ];
+
+        p[0] += s.scrollLeft + delta.left;
+        p[2] = p[0] + dim.width;
+
+        // Only scroll if directly above/below element
+        if (this.lastCoord[0] > p[2] ||
+            this.lastCoord[0] < p[0]) {
+            return;
+        }
+
+        p[1] += s.scrollTop + delta.top;
+        p[3] = p[1] + dim.height;
+
+        // Left scroll
+        //if (this.lastCoord[0] < p[0]) {
+        //    speed[0] = this.lastCoord[0] - p[0];
+        //}
+        // Top scroll
+        if (this.lastCoord[1] < p[1]) {
+            speed[1] = this.lastCoord[1] - p[1];
+        }
+        // Scroll right
+        //if (this.lastCoord[0] > p[2]) {
+        //    speed[0] = this.lastCoord[0] - p[2];
+        //}
+        // Scroll left
+        if (this.lastCoord[1] > p[3]) {
+            speed[1] = this.lastCoord[1] - p[3];
+        }
+
+        if (speed[0] || speed[1]) {
+            this.lastScrolled = new Date();
+            this.scrollInterval = setInterval(this._scroll.bind(this, speed[0] * 15, speed[1] * 15), 10);
+        }
+    },
+
+    _stopScrolling: function()
+    {
+        if (this.scrollInterval) {
+            clearInterval(this.scrollInterval);
+            this.scrollInterval = null;
+        }
+    },
+
+    _scroll: function(x, y)
+    {
+        var current = new Date(),
+            delta = current - this.lastScrolled,
+            s = this.options.scroll;
+        this.lastScrolled = current;
+
+        //s.scrollLeft += x * delta / 1000;
+        s.scrollTop += y * delta / 1000;
+    },
+
+    _setContents: function(elt, x, y)
+    {
+        var d_pos = document.viewport.getDimensions(),
+            e_pos = elt.getDimensions();
+
+        if ((x + e_pos.width > d_pos.width) ||
+            (y + e_pos.height > d_pos.height)) {
+            elt.hide();
+        } else {
+            elt.setStyle({ left: x + 'px', top: y + 'px' }).show();
+        }
+    }
+
+}),
+
+Drop = Class.create({
+
+    initialize: function(el)
+    {
+        this.element = $(el);
+        this.options = Object.extend({
+            accept: [],
+            caption: '',
+            hoverclass: '',
+            onDrop: null,
+            onOut: null,
+            onOver: null
+        }, arguments[1] || {});
+        this.mouseoverE = this._mouseOver.bindAsEventListener(this);
+        this.mouseoutE = this._mouseOut.bindAsEventListener(this);
+        this.element.observe('mouseover', this.mouseoverE);
+        this.element.observe('mouseout', this.mouseoutE);
+        DragDrop.Drops.register(this);
+    },
+
+    destroy: function()
+    {
+        this.element.stopObserving('mouseover', this.mouseoverE);
+        this.element.stopObserving('mouseout', this.mouseoutE);
+        DragDrop.Drops.unregister(this);
+    },
+
+    _mouseOver: function(e)
+    {
+        if (DragDrop.Drags.drag) {
+            DragDrop.Drops.drop = this;
+            if (Object.isFunction(this.options.onOver)) {
+                this.options.onOver(this.element, DragDrop.Drags.drag);
+            }
+        }
+    },
+
+    _mouseOut: function(e)
+    {
+        if (Object.isFunction(this.options.onOut)) {
+            this.options.onOut(this.element, DragDrop.Drags.drag);
+        }
+        DragDrop.Drops.drop = null;
+    }
+});
diff -Naur a/src/dragdrop.js b/js/src/dragdrop.js
--- a/src/dragdrop.js	2010-04-14 22:21:28.000000000 +0200
+++ b/js/src/dragdrop.js	2010-04-14 22:20:38.000000000 +0200
@@ -188,7 +188,7 @@
         DragDrop.Drags.activate(this);
         this.move = 0;
         this.wasDragged = false;
-        this.lastdrag = this.lastcaption = null;
+        this.lastcaption = null;
 
         if (Object.isFunction(this.options.onStart)) {
             this.options.onStart(this, e);
@@ -244,7 +244,7 @@
             this._setContents(this.ghost, xy[0], xy[1]);
         }
 
-        this._onMoveDrag(xy);
+        this._onMoveDrag(xy, e);
 
         if (Object.isFunction(this.options.onDrag)) {
             this.options.onDrag(this, e);
@@ -271,7 +271,7 @@
 
         if (DragDrop.validDrop(this.element) &&
             Object.isFunction(d.options.onDrop)) {
-            d.options.onDrop(d.element, this.element);
+            d.options.onDrop(d.element, this.element, e);
         }
 
         DragDrop.Drags.deactivate();
@@ -281,30 +281,23 @@
         }
     },
 
-    _onMoveDrag: function(xy)
+    _onMoveDrag: function(xy, e)
     {
-        var c_opt, caption, cname, d_cap, d_update,
+        var c_opt, caption, cname, d_cap,
             d = DragDrop.Drops.drop,
-            div = DragDrop.Drags.div;
+            div = DragDrop.Drags.div,
+            d_update = true;
 
-        if (d && d.element != this.lastdrag) {
-            if (DragDrop.validDrop(this.element)) {
-                d_cap = d.options.caption;
-                if (d_cap) {
-                    caption = Object.isFunction(d_cap) ? d_cap(d.element, this.element) : d_cap;
-                    if (caption && d.options.hoverclass) {
-                        cname = d.options.hoverclass;
-                    }
-                    d_update = true;
+        if (d && DragDrop.validDrop(this.element)) {
+            d_cap = d.options.caption;
+            if (d_cap) {
+                caption = Object.isFunction(d_cap) ? d_cap(d.element, this.element, e) : d_cap;
+                if (caption && d.options.hoverclass) {
+                    cname = d.options.hoverclass;
                 }
             } else {
-                d_update = true;
+                d_update = false;
             }
-            this.lastdrag = d.element;
-        } else if ((!d && this.lastdrag) ||
-                   (this.move == (this.options.threshold + 1))) {
-            d_update = true;
-            this.lastdrag = null;
         }
 
         if (d_update) {
@@ -312,10 +305,12 @@
                 c_opt = this.options.caption;
                 caption = Object.isFunction(c_opt) ? c_opt(this.element) : c_opt;
             }
-            this.lastcaption = caption;
-            div.update(caption).writeAttribute({ className: cname || this.options.classname });
-            if (caption.empty()) {
-                div.hide();
+            if (caption != this.lastcaption) {
+                this.lastcaption = caption;
+                div.update(caption).writeAttribute({ className: cname || this.options.classname });
+                if (caption.empty()) {
+                    div.hide();
+                }
             }
         }
 
diff -Naur /kolab/var/kolab/www/client/dimp/lib/DIMP.php b/lib/DIMP.php
--- /kolab/var/kolab/www/client/dimp/lib/DIMP.php	2010-04-14 22:21:28.000000000 +0200
+++ b/lib/DIMP.php	2010-04-14 22:20:38.000000000 +0200
@@ -215,6 +215,7 @@
             'showtext' => _("Show Quoted Text"),
             'lines' => _("lines"),
             'ok' => _("Ok"),
+            'copyto' => _("Copy %s to %s"),
             'moveto' => _("Move %s to %s"),
             'baselevel' => _("base level of the folder tree"),
             'cancel' => _("Cancel"),

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4/series,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- series	22 Jan 2010 17:20:02 -0000	1.5
+++ series	14 Apr 2010 22:27:32 -0000	1.6
@@ -3,3 +3,4 @@
 t_dimp_H_GW_AclView.diff
 t_dimp_H_GW_FoldersView.diff
 t_dimp_HK_GW_ItipHandling.diff
+t_dimp_H_MS_CopyMessagesWithCtrl.diff
\ No newline at end of file



From cvs at kolab.org  Thu Apr 15 00:28:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 00:28:54 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/dimp dimp.spec,1.4,1.5 
Message-ID: <20100414222854.AA369600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/dimp
In directory doto:/tmp/cvs-serv1496

Modified Files:
	dimp.spec 
Log Message:
kolab/issue4080 (DIMP: Mails can not be copied to other folders)

Index: dimp.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/dimp/dimp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dimp.spec	22 Jan 2010 14:02:40 -0000	1.4
+++ dimp.spec	14 Apr 2010 22:28:52 -0000	1.5
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package dimp
 %define         V_version 1.1.4
-%define         V_release 20100122
+%define         V_release 20100414
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Thu Apr 15 16:45:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 16:45:40 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.288,1.289 
Message-ID: <20100415144540.2F86B600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv2360/kolabd/kolabd

Modified Files:
	ChangeLog 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- ChangeLog	13 Apr 2010 19:41:23 -0000	1.288
+++ ChangeLog	15 Apr 2010 14:45:38 -0000	1.289
@@ -1,3 +1,9 @@
+2010-04-15  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/resmgr.conf.template.in:
+
+	kolab/issue3962 (Names of config variables for "untrusted" text missleading)
+
 2010-04-13 Richard Bos <ml at radoeka.nl>
 
        * centos-clarkconnect debian kolab mandriva suse:



From cvs at kolab.org  Thu Apr 15 16:45:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 16:45:40 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.40,
	1.41 
Message-ID: <20100415144540.38B29600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv2360/kolabd/kolabd/templates

Modified Files:
	resmgr.conf.template.in 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- resmgr.conf.template.in	22 Feb 2010 06:34:46 -0000	1.40
+++ resmgr.conf.template.in	15 Apr 2010 14:45:38 -0000	1.41
@@ -122,8 +122,7 @@
  * -  %2$s denotes the address in the original from header
  * -  %3$s denotes the name part in the original from header if any
  */
-// $conf['kolab']['filter']['untrusted_subject_insert'] = '(UNTRUSTED, sender is <%1$s>)';
-// $conf['kolab']['filter']['unauthenticated_subject_insert'] = '(UNTRUSTED, sender <%1$s> is not authenticated)';
+// $conf['kolab']['filter']['unauthenticated_from_insert'] = '(UNTRUSTED, sender <%1$s> is not authenticated)';
 
 /* Should we allow forwarded ical messages from Outlook
  * by encapsulating them in a MIME multipart



From cvs at kolab.org  Thu Apr 15 16:45:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 16:45:40 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.33,
	1.34 Kolab_Filter.spec, 1.28, 1.29 
Message-ID: <20100415144540.2D42B60015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv2360/d/Kolab_Filter

Modified Files:
	ChangeLog Kolab_Filter.spec 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog	25 Mar 2010 16:28:18 -0000	1.33
+++ ChangeLog	15 Apr 2010 14:45:38 -0000	1.34
@@ -1,3 +1,10 @@
+2010-04-15  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Filter-0.1.8/issue3967.patch:
+
+	kolab/issue3962 (Names of config variables for "untrusted" text missleading)
+	kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful)
+
 2010-03-25  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Filter-0.1.8/issue3983.patch:

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Kolab_Filter.spec	29 Mar 2010 19:22:55 -0000	1.28
+++ Kolab_Filter.spec	15 Apr 2010 14:45:38 -0000	1.29
@@ -7,7 +7,7 @@
 %define         V_repo_commit 
 %define         V_repo_release 
 %define         V_version 0.1.8
-%define         V_release 20100325
+%define         V_release 20100415
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc 



From cvs at kolab.org  Thu Apr 15 16:45:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 16:45:40 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.8
	issue3967.patch, NONE, 1.1 issue3983.patch, 1.1, 1.2 
Message-ID: <20100415144540.3369E600167@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.8
In directory doto:/tmp/cvs-serv2360/d/Kolab_Filter/patches/Kolab_Filter-0.1.8

Modified Files:
	issue3983.patch 
Added Files:
	issue3967.patch 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

--- NEW FILE: issue3967.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] issue3967.patch

kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful)

STATUS: MERGED

REF: http://issues.kolab.org/issue3967

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	15 Apr 2010 13:23:20 -0000	1.4.2.9
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	15 Apr 2010 14:08:11 -0000
@@ -391,18 +391,10 @@
             $allowed_addrs = false;
         }
 
-        if ($sasluser) {
-            if (isset($conf['kolab']['filter']['untrusted_subject_insert'])) {
-                $fmt = $conf['kolab']['filter']['untrusted_subject_insert'];
-            } else {
-                $fmt = _("(UNTRUSTED, sender is <%s>)");
-            }
+        if (isset($conf['kolab']['filter']['unauthenticated_from_insert'])) {
+            $fmt = $conf['kolab']['filter']['unauthenticated_from_insert'];
         } else {
-            if (isset($conf['kolab']['filter']['unauthenticated_subject_insert'])) {
-                $fmt = $conf['kolab']['filter']['unauthenticated_subject_insert'];
-            } else {
-                $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
-            }
+            $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
         }
 
         $adrs = imap_rfc822_parse_adrlist($fromhdr, $domains[0]);

Index: issue3983.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.8/issue3983.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- issue3983.patch	25 Mar 2010 16:28:18 -0000	1.1
+++ issue3983.patch	15 Apr 2010 14:45:38 -0000	1.2
@@ -3,7 +3,7 @@
 
 Fixes unit testing for PHP 5.3.* and inactivates some problematic tests.
 
-STATUS: UNMERGED
+STATUS: MERGED
 
 REF: http://issues.kolab.org/issue3983
 



From cvs at kolab.org  Thu Apr 15 16:45:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Apr 2010 16:45:40 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.534,1.535 
Message-ID: <20100415144540.34E6B60016F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2360

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -d -r1.534 -r1.535
--- release-notes.txt	14 Apr 2010 22:27:32 -0000	1.534
+++ release-notes.txt	15 Apr 2010 14:45:37 -0000	1.535
@@ -54,6 +54,8 @@
 	kolab/issue3560 (php error when inviting outside of free/busy interval)
 	kolab/issue3616 (automatic replies to invitations contain 127.0.0.1 in
 	                 Message-ID)
+	kolab/issue3962 (Names of config variables for "untrusted" text missleading)
+	kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
 
     - Kolab_Format-1.0.1-2009????
@@ -122,6 +124,7 @@
 	kolab/issue3584 (rfc2739 is not copyrightable nor licensable)
 	kolab/issue3765 (dist_conf'iguration for openldap module loading)
 	kolab/issue3953 (use spamassassin_confdir in local.cf.template comment)
+	kolab/issue3962 (Names of config variables for "untrusted" text missleading)
 	kolab/issue3979 (improve kolab_ca.sh usability)
 
     - kolab-fbview-1.2.0-2009????



From cvs at kolab.org  Tue Apr 20 06:52:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Apr 2010 06:52:50 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9 -
	New directory 
Message-ID: <20100420045250.6291F600563@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9
In directory doto:/tmp/cvs-serv13623/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9 added to the repository




From cvs at kolab.org  Tue Apr 20 06:53:58 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Apr 2010 06:53:58 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.535,1.536 
Message-ID: <20100420045358.D596160C4AE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv13701

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue4257 (Always accept policy doesnt set atendee status to accepted)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -d -r1.535 -r1.536
--- release-notes.txt	15 Apr 2010 14:45:37 -0000	1.535
+++ release-notes.txt	20 Apr 2010 04:53:56 -0000	1.536
@@ -40,7 +40,7 @@
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
 	                 nicer)
 
-    - Kolab_Filter-0.1.8-2010????
+    - Kolab_Filter-0.1.9-2010????
 
 	Added french translation. Submitted by Mathieu Parent
 	(mathieuparent at users.sourceforge.net).
@@ -57,6 +57,8 @@
 	kolab/issue3962 (Names of config variables for "untrusted" text missleading)
 	kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
+	kolab/issue4257 ("Always accept" policy doesn't set atendee status
+	                 to "accepted")
 
     - Kolab_Format-1.0.1-2009????
 



From cvs at kolab.org  Tue Apr 20 06:53:58 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Apr 2010 06:53:58 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9
	Kolab_Filter_p1.patch, NONE, 1.1 
Message-ID: <20100420045358.DE2D560C4B0@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9
In directory doto:/tmp/cvs-serv13701/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.9

Added Files:
	Kolab_Filter_p1.patch 
Log Message:
kolab/issue4257 (Always accept policy doesnt set atendee status to accepted)

--- NEW FILE: Kolab_Filter_p1.patch ---
diff -Naur --exclude='*~' a/framework/Kolab_Filter/test/Horde/Kolab/Filter/ResourceTest.php a/framework/Kolab_Filter/test/Horde/Kolab/Filter/ResourceTest.php
--- a/framework/Kolab_Filter/test/Horde/Kolab/Filter/ResourceTest.php	2010-01-23 22:59:34.000000000 +0100
+++ b/framework/Kolab_Filter/test/Horde/Kolab/Filter/ResourceTest.php	2010-03-25 17:09:33.000000000 +0100
@@ -183,6 +183,8 @@
      */
     public function testAllDay()
     {
+        $this->markTestIncomplete('Fails as deprecated');
+
         $GLOBALS['KOLAB_FILTER_TESTING'] = &new Horde_iCalendar_vfreebusy();
         $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTSTART', Horde_iCalendar::_parseDateTime('20090901T000000Z'));
         $GLOBALS['KOLAB_FILTER_TESTING']->setAttribute('DTEND', Horde_iCalendar::_parseDateTime('20091101T000000Z'));



From cvs at kolab.org  Tue Apr 20 06:53:58 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Apr 2010 06:53:58 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.34,
	1.35 Kolab_Filter.spec, 1.29, 1.30 package.info, 1.3, 1.4 
Message-ID: <20100420045358.DF70E60C4B2@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv13701/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog Kolab_Filter.spec package.info 
Log Message:
kolab/issue4257 (Always accept policy doesnt set atendee status to accepted)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	15 Apr 2010 14:45:38 -0000	1.34
+++ ChangeLog	20 Apr 2010 04:53:56 -0000	1.35
@@ -1,3 +1,10 @@
+2010-04-20  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec:  Update to 0.1.9.
+
+	kolab/issue4257 ("Always accept" policy doesn't set atendee status
+	to "accepted")
+
 2010-04-15  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Filter-0.1.8/issue3967.patch:

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Kolab_Filter.spec	15 Apr 2010 14:45:38 -0000	1.29
+++ Kolab_Filter.spec	20 Apr 2010 04:53:56 -0000	1.30
@@ -6,8 +6,8 @@
 %define         V_package_origin WGET
 %define         V_repo_commit 
 %define         V_repo_release 
-%define         V_version 0.1.8
-%define         V_release 20100415
+%define         V_version 0.1.9
+%define         V_release 20100420
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc 

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	25 Mar 2010 16:28:18 -0000	1.3
+++ package.info	20 Apr 2010 04:53:56 -0000	1.4
@@ -13,10 +13,10 @@
 package_origin='WGET'
 
 # Version number
-version='0.1.8'
+version='0.1.9'
 
 # Package release number
-release='20100325'
+release='20100420'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Tue Apr 20 20:16:55 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Apr 2010 20:16:55 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf mandriva,1.18,1.19 
Message-ID: <20100420181655.420E960C4B9@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv15522

Modified Files:
	mandriva 
Log Message:
Corrected the location of imap_sievedir

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mandriva	13 Apr 2010 19:41:23 -0000	1.18
+++ mandriva	20 Apr 2010 18:16:52 -0000	1.19
@@ -85,7 +85,7 @@
 imap_misclogfile=${localstatedir}/lib/imap/log/misc.log
 imap_statedir=${localstatedir}/lib/imap
 imap_spool=${localstatedir}/spool/imap
-imap_sievedir=${localstatedir}/lib/sieve
+imap_sievedir=${localstatedir}/lib/imap/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
 imap_rpm=cyrus-imapd



From cvs at kolab.org  Wed Apr 21 12:41:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 12:41:37 +0200 (CEST)
Subject: thomas: server 1st.README,1.1.2.13,1.1.2.14 
Message-ID: <20100421104137.7F53360015E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29877

Modified Files:
      Tag: kolab_2_2_branch
	1st.README 
Log Message:
Document using Intevation's file distribution key instead of my personal key


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- 1st.README	17 Dec 2009 15:36:57 -0000	1.1.2.13
+++ 1st.README	21 Apr 2010 10:41:35 -0000	1.1.2.14
@@ -33,10 +33,11 @@
 To install the Kolab server, you need to download the files from the
 directory containing this file (1st.README) to some local directory.
 
-You can check the integrity of the downloaded files with:
+You can check the integrity of the downloaded files by importing our file
+distribution key and verify the OpenPGP signature and SHA1 checksums:
 
-$ gpg --keyserver hkp://subkeys.pgp.net --recv-key 5816791A
-  or import the key from https://www.intevation.de/~thomas/gpg_pub_key.asc
+$ wget https://ssl.intevation.de/Intevation-Distribution-Key.asc
+$ gpg --import Intevation-Distribution-Key.asc
 $ gpg --verify SHA1SUMS.sig
 $ sha1sum -c SHA1SUMS
 



From cvs at kolab.org  Wed Apr 21 12:41:52 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 12:41:52 +0200 (CEST)
Subject: thomas: server 1st.README,1.10,1.11 
Message-ID: <20100421104152.C10B560015E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29966

Modified Files:
	1st.README 
Log Message:
Document using Intevation's file distribution key instead of my personal key

Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- 1st.README	17 Dec 2009 11:17:37 -0000	1.10
+++ 1st.README	21 Apr 2010 10:41:50 -0000	1.11
@@ -33,10 +33,11 @@
 To install the Kolab server, you need to download the files from the
 directory containing this file (1st.README) to some local directory.
 
-You can check the integrity of the downloaded files with:
+You can check the integrity of the downloaded files by importing our file
+distribution key and verify the OpenPGP signature and SHA1 checksums:
 
-$ gpg --keyserver keys.gnupg.net --recv-key 5816791A
-  or import the key from https://www.intevation.de/~thomas/gpg_pub_key.asc
+$ wget https://ssl.intevation.de/Intevation-Distribution-Key.asc
+$ gpg --import Intevation-Distribution-Key.asc
 $ gpg --verify SHA1SUMS.sig
 $ sha1sum -c SHA1SUMS
 
@@ -144,7 +145,7 @@
 
 It is possible to convert existing berkeley database files to the now
 default skiplist format, but the necessary procedure is not well
-tested and therefor currently not recommended.  The documentation of
+tested and therefore currently not recommended.  The documentation of
 the actual conversion is beyond the scope of this document.
 
 



From cvs at kolab.org  Wed Apr 21 16:48:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:48:44 +0200 (CEST)
Subject: gunnar: server/clamav Makefile, 1.7.2.3, 1.7.2.4 clamav.spec, 1.6.2.1,
	1.6.2.2 
Message-ID: <20100421144844.88271600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv5701

Modified Files:
      Tag: kolab_2_2_branch
	Makefile clamav.spec 
Log Message:
Update to clamav-0.96

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- Makefile	17 Nov 2009 09:18:56 -0000	1.7.2.3
+++ Makefile	21 Apr 2010 14:48:42 -0000	1.7.2.4
@@ -5,7 +5,7 @@
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
+SOURCE_0=http://files.kolab.org/incoming/wrobel/$(NAME)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 
 .PHONY: all
@@ -24,7 +24,7 @@
 
 $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/
+	cd  $(KOLABRPMSRC)/$(PACKAGE)/ && wget -c "$(SOURCE_0)"
 
 	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec

Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- clamav.spec	30 Oct 2009 16:34:01 -0000	1.6.2.1
+++ clamav.spec	21 Apr 2010 14:48:42 -0000	1.6.2.2
@@ -29,8 +29,8 @@
 Packager:     Intevation GmbH
 Group:        AntiVirus
 License:      GPL
-Version:      0.95.3
-Release:      20091030
+Version:      0.96
+Release:      20100421
 
 #   package options
 %option       with_milter  no



From cvs at kolab.org  Wed Apr 21 16:50:28 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:50:28 +0200 (CEST)
Subject: gunnar: server/patches/php/php-5.2.13 - New directory 
Message-ID: <20100421145028.56F4B600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/php/php-5.2.13
In directory doto:/tmp/cvs-serv5787/php-5.2.13

Log Message:
Directory /kolabrepository/server/patches/php/php-5.2.13 added to the repository
--> Using per-directory sticky tag `kolab_2_2_branch'




From cvs at kolab.org  Wed Apr 21 16:50:59 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:50:59 +0200 (CEST)
Subject: gunnar: server/patches/php/php-5.2.13
	KOLAB_php-5.2.13_Annotations.patch, NONE,
	1.1.2.1 KOLAB_php-5.2.13_myrights.patch, NONE, 1.1.2.1 
Message-ID: <20100421145059.8BDDD600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/php/php-5.2.13
In directory doto:/tmp/cvs-serv5836/php-5.2.13

Added Files:
      Tag: kolab_2_2_branch
	KOLAB_php-5.2.13_Annotations.patch 
	KOLAB_php-5.2.13_myrights.patch 
Log Message:
Kolab specific php patches for PHP 5.2.13

--- NEW FILE: KOLAB_php-5.2.13_Annotations.patch ---
Provides get/set ANNOTATIONS support to PHP. [Version: 5.2.6]

diff -r 4f78d3c907b7 ext/imap/php_imap.c
--- a/ext/imap/php_imap.c	Fri May 02 11:21:11 2008 +0200
+++ b/ext/imap/php_imap.c	Mon Jun 09 10:35:56 2008 +0200
@@ -129,6 +129,7 @@
 	PHP_FE(imap_binary,								NULL)
 	PHP_FE(imap_utf8,								NULL)
 	PHP_FE(imap_status,								NULL)
+	PHP_FE(imap_status_current,							NULL)
 	PHP_FE(imap_mailboxmsginfo,						NULL)
 	PHP_FE(imap_setflag_full,						NULL)
 	PHP_FE(imap_clearflag_full,						NULL)
@@ -155,6 +156,10 @@
 	PHP_FE(imap_setacl,								NULL)
 	PHP_FE(imap_getacl,								NULL)
 #endif
+#if defined(HAVE_IMAP2005)
+ 	PHP_FE(imap_setannotation,							NULL)
+ 	PHP_FE(imap_getannotation,							NULL)
+#endif
 
 	PHP_FE(imap_mail,								NULL)
 
@@ -416,6 +421,30 @@
 #endif
 
 
+#if defined(HAVE_IMAP2005)
+/* {{{ mail_getannotation
+ *
+ * Mail GET_ANNOTATION callback
+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
+ */
+void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist)
+{
+        ANNOTATION_VALUES *cur;
+        
+	TSRMLS_FETCH();
+
+	/* walk through the ANNOTATION_VALUES */
+        
+	for(cur = alist->values; cur; cur = cur->next) {
+	    if (cur->value)
+		add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1);
+	    else
+		add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, "", 0, 1);
+	}
+}
+/* }}} */
+#endif
+
 /* {{{ PHP_GINIT_FUNCTION
  */
 static PHP_GINIT_FUNCTION(imap)
@@ -441,6 +470,7 @@
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
 	imap_globals->quota_return = NIL;
 	imap_globals->imap_acl_list = NIL;
+	imap_globals->imap_annotation_list = NIL;
 #endif
 	imap_globals->gets_stream = NIL;
 }
@@ -1097,6 +1127,117 @@
 
 #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
 
+#if defined(HAVE_IMAP2005)
+
+/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value)
+	Sets an annotation for a given mailbox */
+PHP_FUNCTION(imap_setannotation)
+{
+	zval **streamind, **mailbox, **entry, **attr, **value;
+	pils *imap_le_struct;
+        long ret;
+	
+        // TODO: Use zend_parse_parameters here
+	if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(mailbox);
+	convert_to_string_ex(entry);
+	convert_to_string_ex(attr);
+	convert_to_string_ex(value);
+
+        // create annotation object
+        ANNOTATION *annotation = mail_newannotation();
+        if (!annotation)
+            RETURN_FALSE;
+        annotation->values = mail_newannotationvalue();
+        if (!annotation->values) {
+            mail_free_annotation(&annotation);
+            RETURN_FALSE;
+        }
+        
+        // fill in annotation values
+        annotation->mbox = Z_STRVAL_PP(mailbox);
+        annotation->entry = Z_STRVAL_PP(entry);
+        annotation->values->attr = Z_STRVAL_PP(attr);
+        annotation->values->value = Z_STRVAL_PP(value);
+        
+        ret = imap_setannotation(imap_le_struct->imap_stream, annotation);
+                
+        // make sure mail_free_annotation doesn't free our variables
+        annotation->mbox = NULL;
+        annotation->entry = NULL;
+        annotation->values->attr = NULL;
+        annotation->values->value = NULL;
+        mail_free_annotation(&annotation);
+        
+        RETURN_BOOL(ret);
+}
+/* }}} */
+
+/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr)
+	Gets the ACL for a given mailbox */
+PHP_FUNCTION(imap_getannotation)
+{
+	zval **streamind, **mailbox, **entry, **attr;
+	pils *imap_le_struct;
+        long ret;
+
+	if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(mailbox);
+	convert_to_string_ex(entry);
+	convert_to_string_ex(attr);
+
+	/* initializing the special array for the return values */
+	if (array_init(return_value) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+        // fillup calling parameters
+        STRINGLIST *entries = mail_newstringlist();
+        if (!entries)
+            RETURN_FALSE;
+        
+        STRINGLIST *cur = entries;
+        cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry));
+        cur->text.size = Z_STRLEN_PP(entry);
+        cur->next = NIL;
+        
+        STRINGLIST *attributes = mail_newstringlist();
+        if (!attributes)
+            RETURN_FALSE;
+        cur = attributes;
+        cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr));
+        cur->text.size = Z_STRLEN_PP(attr);
+        cur->next = NIL;
+        
+        IMAPG(imap_annotation_list) = return_value;
+        
+        /* set the callback for the GET_ANNOTATION function */
+	mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation);
+        ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes);
+        
+        mail_free_stringlist(&entries);
+        mail_free_stringlist(&attributes);
+        
+        if (!ret) {
+            zval_dtor(return_value);
+            RETURN_FALSE;
+        }
+        
+	IMAPG(imap_annotation_list) = NIL;
+}
+/* }}} */
+
+#endif /* HAVE_IMAP2005 */
 
 /* {{{ proto bool imap_expunge(resource stream_id)
    Permanently delete all messages marked for deletion */
@@ -2707,6 +2848,42 @@
 }
 /* }}} */
 
+/* {{{ proto object imap_status_current(resource stream_id, int options)
+   Get (cached) status info from current mailbox */
+PHP_FUNCTION(imap_status_current)
+{
+ 	zval **streamind, **pflags;
+	pils *imap_le_struct;
+	long flags = 0L;
+
+ 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) {
+ 		ZEND_WRONG_PARAM_COUNT();
+ 	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_long_ex(pflags);
+	flags = Z_LVAL_PP(pflags);
+
+	if (object_init(return_value) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (flags & SA_MESSAGES) {
+		add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs);
+	}
+	if (flags & SA_RECENT) {
+		add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent);
+	}
+	if (flags & SA_UIDNEXT) {
+		add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1);
+	}
+	if (flags & SA_UIDVALIDITY) {
+		add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity);
+	}
+}
+/* }}} */
+
 /* {{{ proto object imap_status(resource stream_id, string mailbox, int options)
    Get status info from a mailbox */
 PHP_FUNCTION(imap_status)
diff -r 4f78d3c907b7 ext/imap/php_imap.h
--- a/ext/imap/php_imap.h	Fri May 02 11:21:11 2008 +0200
+++ b/ext/imap/php_imap.h	Mon Jun 09 10:35:56 2008 +0200
@@ -152,6 +152,7 @@
 PHP_FUNCTION(imap_lsub_full);
 PHP_FUNCTION(imap_create);
 PHP_FUNCTION(imap_rename);
+PHP_FUNCTION(imap_status_current);
 PHP_FUNCTION(imap_status);
 PHP_FUNCTION(imap_bodystruct);
 PHP_FUNCTION(imap_fetch_overview);
@@ -168,6 +169,9 @@
 PHP_FUNCTION(imap_thread);
 PHP_FUNCTION(imap_timeout);
 
+// TODO: Needs fixing in configure in
+#define HAVE_IMAP2005 1
+
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
 PHP_FUNCTION(imap_get_quota);
 PHP_FUNCTION(imap_get_quotaroot);
@@ -175,7 +179,10 @@
 PHP_FUNCTION(imap_setacl);
 PHP_FUNCTION(imap_getacl);
 #endif
-
+#if defined(HAVE_IMAP2005)
+PHP_FUNCTION(imap_setannotation);
+PHP_FUNCTION(imap_getannotation);
+#endif
 
 ZEND_BEGIN_MODULE_GLOBALS(imap)
 	char *imap_user;
@@ -206,6 +213,9 @@
 	zval **quota_return;
 	zval *imap_acl_list;
 #endif
+#if defined(HAVE_IMAP2005)
+        zval *imap_annotation_list;
+#endif
 	/* php_stream for php_mail_gets() */
 	php_stream *gets_stream;
 ZEND_END_MODULE_GLOBALS(imap)

--- NEW FILE: KOLAB_php-5.2.13_myrights.patch ---
diff -r 591dd6329e97 ext/imap/php_imap.c
--- a/ext/imap/php_imap.c	Mon Dec 22 06:35:22 2008 +0100
+++ b/ext/imap/php_imap.c	Mon Dec 22 06:35:27 2008 +0100
@@ -157,6 +157,7 @@
 	PHP_FE(imap_set_quota,							NULL)
 	PHP_FE(imap_setacl,								NULL)
 	PHP_FE(imap_getacl,								NULL)
+	PHP_FE(imap_myrights,							NULL)
 #endif
 #if defined(HAVE_IMAP2005)
  	PHP_FE(imap_setannotation,							NULL)
@@ -417,6 +418,20 @@
 	for(; alist; alist = alist->next) {
 		add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1);
 	}
+}
+/* }}} */
+
+/* {{{ mail_myrights
+ *
+ * Mail MYRIGHTS callback
+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
+ */
+void mail_myrights(MAILSTREAM *stream, char *mailbox, char *rights)
+{
+	TSRMLS_FETCH();
+
+	ZVAL_STRING(IMAPG(imap_acl_list), rights, 1)
+
 }
 /* }}} */
 
@@ -1130,6 +1145,35 @@
 }
 /* }}} */
 
+/* {{{ proto string imap_myrights(resource stream_id, string mailbox)
+	Gets my rights (ACL) for a given mailbox */
+PHP_FUNCTION(imap_myrights)
+{
+	zval **streamind, **mailbox;
+	pils *imap_le_struct;
+
+	if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(mailbox);
+
+	IMAPG(imap_acl_list) = return_value;
+
+	/* set the callback for the GET_ACL function */
+	mail_parameters(NIL, SET_MYRIGHTS, (void *) mail_myrights);
+	if(!imap_myrights(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) {
+		php_error(E_WARNING, "c-client imap_myrights failed");
+		zval_dtor(return_value);
+		RETURN_FALSE;
+	}
+
+	IMAPG(imap_acl_list) = NIL;
+}
+/* }}} */
+
 #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
 
 #if defined(HAVE_IMAP2005)
diff -r 591dd6329e97 ext/imap/php_imap.h
--- a/ext/imap/php_imap.h	Mon Dec 22 06:35:22 2008 +0100
+++ b/ext/imap/php_imap.h	Mon Dec 22 06:35:27 2008 +0100
@@ -178,6 +178,7 @@
 PHP_FUNCTION(imap_set_quota);
 PHP_FUNCTION(imap_setacl);
 PHP_FUNCTION(imap_getacl);
+PHP_FUNCTION(imap_myrights);
 #endif
 #if defined(HAVE_IMAP2005)
 PHP_FUNCTION(imap_setannotation);



From cvs at kolab.org  Wed Apr 21 16:52:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:52:34 +0200 (CEST)
Subject: gunnar: server/apache-php Makefile, 1.8.2.3, 1.8.2.4 kolab.patch, 1.6,
	1.6.2.1 
Message-ID: <20100421145234.A02E1600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv5892

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
Update to 5.2.13. Activated modules hash, json, tokenizer (as already done in HEAD)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- Makefile	9 Nov 2009 17:08:38 -0000	1.8.2.3
+++ Makefile	21 Apr 2010 14:52:32 -0000	1.8.2.4
@@ -1,7 +1,8 @@
 include ../kolab.mk
 
 PACKAGE=apache-php
-VERSION=5.2.8
+OLD_VERSION=5.2.8
+VERSION=5.2.13
 RELEASE=20081209
 KOLABRELEASE=20081209_kolab2
 
@@ -11,11 +12,13 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
+	$(RPM) -ihv $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
+	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 \
+	  && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
 	--define 'with_pear yes' --define 'with_spl yes' --define 'with_gettext yes' \
@@ -24,12 +27,13 @@
 	--define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
 	--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-	--define 'with_sqlite yes' --define 'with_spl yes'
+	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
+	--define 'with_json yes' --define 'with_tokenizer yes'
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(OPENPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm:
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- kolab.patch	9 Feb 2009 10:08:19 -0000	1.6
+++ kolab.patch	21 Apr 2010 14:52:32 -0000	1.6.2.1
@@ -5,6 +5,15 @@
 diff -u -B -r1.30 apache-php.spec
 --- apache-php.spec	14 May 2008 10:38:56 -0000	1.30
 +++ apache-php.spec	15 May 2008 05:47:24 -0000
+@@ -22,7 +22,7 @@
+ ##
+ 
+ #   package versions
+-%define       V_php                     5.2.8
++%define       V_php                     5.2.13
+ %define       V_php_suhosin_p           5.2.7-0.9.6.3
+ %define       V_php_suhosin_e           0.9.27
+ %define       V_php_kolab               5.2.6
 @@ -39,7 +39,7 @@
  Group:        Web
  License:      PHP



From cvs at kolab.org  Wed Apr 21 16:53:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:53:21 +0200 (CEST)
Subject: gunnar: server/php Makefile, 1.18.2.3, 1.18.2.4 kolab.patch, 1.14,
	1.14.2.1 
Message-ID: <20100421145321.08479600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv5926

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
Update to 5.2.13. Activated modules hash, json, tokenizer (as already done in HEAD)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- Makefile	9 Nov 2009 17:08:44 -0000	1.18.2.3
+++ Makefile	21 Apr 2010 14:53:18 -0000	1.18.2.4
@@ -1,7 +1,8 @@
 include ../kolab.mk
 
 PACKAGE=php
-VERSION=5.2.8
+OLD_VERSION=5.2.8
+VERSION=5.2.13
 RELEASE=20081209
 KOLABRELEASE=20081209_kolab2
 
@@ -11,12 +12,13 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch $(PATCHES) Makefile
+	$(RPM) -ihv $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 \
+	  && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
 	--define 'with_pear yes' --define 'with_spl yes' --define 'with_gettext yes' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
@@ -24,11 +26,12 @@
 	--define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
 	--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-	--define 'with_sqlite yes' --define 'with_spl yes'
+	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
+	--define 'with_json yes' --define 'with_tokenizer yes'
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm:
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- kolab.patch	9 Feb 2009 10:08:25 -0000	1.14
+++ kolab.patch	21 Apr 2010 14:53:19 -0000	1.14.2.1
@@ -3,8 +3,17 @@
 RCS file: /v/openpkg/cvs/openpkg-src/php/php.spec,v
 retrieving revision 1.183
 diff -u -B -r1.183 php.spec
---- php.spec	11 May 2008 08:31:26 -0000	1.183
-+++ php.spec	13 May 2008 14:58:33 -0000
+--- php.spec   11 May 2008 08:31:26 -0000 1.183
++++ php.spec   13 May 2008 14:58:33 -0000
+@@ -22,7 +22,7 @@
+ ##
+ 
+ #   package versions
+-%define       V_php                     5.2.8
++%define       V_php                     5.2.13
+ %define       V_php_suhosin_p           5.2.7-0.9.6.3
+ %define       V_php_suhosin_e           0.9.27
+ %define       V_php_kolab               5.2.6
 @@ -39,7 +39,7 @@
  Group:        Language
  License:      PHP



From cvs at kolab.org  Wed Apr 21 16:55:53 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:55:53 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.234.2.16,
	1.234.2.17 kolabd.spec.in, 1.44.2.1, 1.44.2.2 
Message-ID: <20100421145553.98D14600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv5989/kolabd

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolabd.spec.in 
Log Message:
Require the hash, json, and tokenizer modules in php and apache-php.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.16
retrieving revision 1.234.2.17
diff -u -d -r1.234.2.16 -r1.234.2.17
--- ChangeLog	27 Feb 2010 21:29:41 -0000	1.234.2.16
+++ ChangeLog	21 Apr 2010 14:55:51 -0000	1.234.2.17
@@ -1,3 +1,8 @@
+2010-04-21  Gunnar Wrobel <wrobel at pardus.de>
+
+	* kolabd.spec.in: Require the hash, json, and tokenizer modules in
+	php and apache-php.
+
 2010-02-27  Gunnar Wrobel <wrobel at pardus.de>
 
 	* kolabd.spec: Fix typo (kolab/issue4176 (Adding RSS feed to Horde

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -d -r1.44.2.1 -r1.44.2.2
--- kolabd.spec.in	27 Feb 2010 21:29:41 -0000	1.44.2.1
+++ kolabd.spec.in	21 Apr 2010 14:55:51 -0000	1.44.2.2
@@ -57,8 +57,8 @@
 PreReq:       Kolab_FreeBusy
 
 # what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes
-PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_spl = yes
+PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes, php::with_hash = yes, php::with_json = yes, php::with_tokenizer = yes
+PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_spl = yes, apache-php::with_hash = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes
 
 PreReq:       imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
 PreReq:       perl-ssl



From cvs at kolab.org  Wed Apr 21 16:58:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:58:01 +0200 (CEST)
Subject: gunnar: server/apache .cvsignore, NONE, 1.2.2.1 Makefile, NONE,
	1.26.2.1 apache.base, NONE, 1.3.2.1 apache.conf, NONE,
	1.2.2.1 apache.patch, NONE, 1.1.2.1 apache.sh, NONE,
	1.1.2.1 apache.spec, NONE, 1.8.2.1 
Message-ID: <20100421145801.A2AE5600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv6120

Added Files:
      Tag: kolab_2_2_branch
	.cvsignore Makefile apache.base apache.conf apache.patch 
	apache.sh apache.spec 
Log Message:
apache-2.2.15 derived from the openpkg package but adapted to openpkg <= 20100101.

--- NEW FILE: .cvsignore ---
*.tgz
*.src.rpm

--- NEW FILE: Makefile ---
include ../kolab.mk

NAME = apache
PACKAGE = $(NAME)
VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
KOLABRELEASE = $(RELEASE)

SOURCE_0=http://www.apache.org/dist/httpd/httpd-$(VERSION).tar.bz2
EXTRA=apache.base apache.conf apache.patch apache.sh

.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

.PHONY: dist
dist: all
	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/

.PHONY: clean
clean:
	rm -rf $(KOLABRPMTMP)/$(NAME)*
	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -rf *~

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"

	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_mod_ssl yes' \
	   --define 'with_mod_authn_alias yes' --define 'with_mod_ldap yes'                    \
	   --define 'with_mod_ssl yes' --define 'with_mod_authn_alias yes'                     \
	   --define 'with_mod_ldap yes'

	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

--- NEW FILE: apache.base ---
##
##  apache.base -- Apache Base/Default Configuration
##  ______________________________________________________
##
##  PLEASE DO NOT EDIT THIS FILE!! ADJUST CONFIGURATION BY 
##  OVERRIDING DIRECTIVES IN "apache.conf" INSTEAD, PLEASE!
##  ______________________________________________________
##

#   global server
ServerRoot              @l_prefix@
ServerAdmin             root@@l_hostname at .@l_domainname@
ServerName              @l_hostname at .@l_domainname@
ServerTokens            os
User                    @l_nusr@
Group                   @l_ngrp@

#   runtime files
LockFile                @l_prefix@/var/apache/run/apache.lock
<IfModule mpm_prefork_module>
    PidFile             @l_prefix@/var/apache/run/apache.pid
    ScoreBoardFile      @l_prefix@/var/apache/run/apache.sb
</IfModule>
<IfModule cgid_module>
    ScriptSock          @l_prefix@/var/apache/run/apache.cgisock
</IfModule>

#  server behaviour
Timeout                 300
KeepAlive               on
MaxKeepAliveRequests    100
KeepAliveTimeout        15
<IfModule mpm_prefork_module>
    MinSpareServers     5
    MaxSpareServers     10
    StartServers        5
    MaxClients          150
    MaxRequestsPerChild 0
</IfModule>
<IfModule mpm_worker_module>
    MinSpareThreads     25
    MaxSpareThreads     75
    ThreadsPerChild     25
    StartServers        2
    ServerLimit         16
    MaxClients          150
    MaxRequestsPerChild 0
</IfModule>
HostnameLookups         off
UseCanonicalName        on

#   access logging
<IfModule log_config_module>
    LogFormat           "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
    <IfModule logio_module>
        LogFormat       "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combined_io
    </IfModule>
    <IfModule ssl_module>
        LogFormat       "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_ssl
    </IfModule>
    LogFormat           "%h %l %u %t \"%r\" %>s %b" common
    LogFormat           "%{Referer}i -> %U" referer
    LogFormat           "%{User-agent}i" agent
    CustomLog           @l_prefix@/var/apache/log/access.log common env=!ignore_global_access
</IfModule>

#   error logging
LogLevel                warn
ErrorLog                @l_prefix@/var/apache/log/error.log
ServerSignature         on

#   script logging
<IfModule cgi_module>
    ScriptLog           @l_prefix@/var/apache/log/script.log
    ScriptLogBuffer     1024
    ScriptLogLength     10485760
</IfModule>

#   secure root directory
<Directory />
    Options             FollowSymLinks
    AllowOverride       None
    Order               deny,allow
    Deny                from all
</Directory>

#   configure global document root
DocumentRoot            @l_prefix@/share/apache/htdocs
<IfModule alias_module>
    Alias               /apache-htdocs @l_prefix@/share/apache/htdocs
</IfModule>
<Directory "@l_prefix@/share/apache/htdocs">
    Options             Indexes FollowSymLinks MultiViews
    AllowOverride       none
    Order               allow,deny
    Allow               from all
</Directory>

#   default directories and files
<IfModule userdir_module>
    UserDir             public_html
    UserDir             disabled root
</IfModule>
<IfModule dir_module>
    DirectoryIndex      index.html
</IfModule>

#   local configuration files
AccessFileName          .htaccess
<Files ~ "^\.ht">
    Order               allow,deny
    Deny                from all
    Satisfy             All
</Files>

#   global Icons and CGI directory
<IfModule alias_module>
    Alias               /apache-icons @l_prefix@/share/apache/icons
    <Directory "@l_prefix@/share/apache/icons">
        Options         Indexes MultiViews
        AllowOverride   None
        Order           allow,deny
        Allow           from all
    </Directory>
    AliasMatch          ^/apache-manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ @l_prefix@/share/apache/manual$1
    <Directory "@l_prefix@/share/apache/manual">
        Options         Indexes
        AllowOverride   None
        Order           allow,deny
        Allow           from all
        <Files *.html>
            SetHandler  type-map
        </Files>
        SetEnvIf        Request_URI ^/apache-manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
        RedirectMatch   301 ^/apache-manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /apache-manual/$1$2
        LanguagePriority      en de es fr ja ko pt-br ru
        ForceLanguagePriority Prefer Fallback
    </Directory>
    Alias               /apache-error @l_prefix@/share/apache/error
    <Directory "@l_prefix@/share/apache/error">
        Options         IncludesNoExec
        AllowOverride   None
        Order           allow,deny
        Allow           from all
        AddOutputFilter Includes html
        AddHandler      type-map var
        LanguagePriority      en cs de es fr it ja ko nl pl pt-br ro sv tr
        ForceLanguagePriority Prefer Fallback
    </Directory>
    ScriptAlias         /openpkg-cgi "@l_prefix@/cgi"
    <Directory "@l_prefix@/cgi">
        AllowOverride   None
        Options         None
        Order           allow,deny
        Allow           from all
    </Directory>
</IfModule>

#   global server status information
<IfModule status_module>
    ExtendedStatus      on
    <Location /apache-server-status>
        SetHandler      server-status
        Order           deny,allow
        Deny            from all
        Allow           from 127.0.0.1
    </Location>
    <Location /apache-server-info>
        SetHandler      server-info
        Order           deny,allow
        Deny            from all
        Allow           from 127.0.0.1
    </Location>
</IfModule>

#   automatic CGI and SSI recognition
<IfModule mime_module>
    <IfModule cgi_module>
        AddHandler      cgi-script .cgi
    </IfModule>
    <IfModule include_module>
        AddType         text/html  .shtml
        AddOutputFilter INCLUDES   .shtml
    </IfModule>
</IfModule>

#   multi-language error documents
ErrorDocument           400 /apache-error/HTTP_BAD_REQUEST.html.var
ErrorDocument           401 /apache-error/HTTP_UNAUTHORIZED.html.var
ErrorDocument           403 /apache-error/HTTP_FORBIDDEN.html.var
ErrorDocument           404 /apache-error/HTTP_NOT_FOUND.html.var
ErrorDocument           405 /apache-error/HTTP_METHOD_NOT_ALLOWED.html.var
ErrorDocument           408 /apache-error/HTTP_REQUEST_TIME_OUT.html.var
ErrorDocument           410 /apache-error/HTTP_GONE.html.var
ErrorDocument           411 /apache-error/HTTP_LENGTH_REQUIRED.html.var
ErrorDocument           412 /apache-error/HTTP_PRECONDITION_FAILED.html.var
ErrorDocument           413 /apache-error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
ErrorDocument           414 /apache-error/HTTP_REQUEST_URI_TOO_LARGE.html.var
ErrorDocument           415 /apache-error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
ErrorDocument           500 /apache-error/HTTP_INTERNAL_SERVER_ERROR.html.var
ErrorDocument           501 /apache-error/HTTP_NOT_IMPLEMENTED.html.var
ErrorDocument           502 /apache-error/HTTP_BAD_GATEWAY.html.var
ErrorDocument           503 /apache-error/HTTP_SERVICE_UNAVAILABLE.html.var
ErrorDocument           506 /apache-error/HTTP_VARIANT_ALSO_VARIES.html.var

#   automatic directory indexing
<IfModule autoindex_module>
    IndexOptions        FancyIndexing HTMLTable VersionSort
    ReadmeName          README
    HeaderName          HEADER
    IndexIgnore         .??* *~ *# HEADER* README* RCS CVS *,v *,t
    DefaultIcon              /apache-icons/unknown.gif
    AddIcon                  /apache-icons/back.gif        ..
    AddIcon                  /apache-icons/dir.gif         ^^DIRECTORY^^
    AddIcon                  /apache-icons/blank.gif       ^^BLANKICON^^
    AddIcon                  /apache-icons/binary.gif      .bin .exe
    AddIcon                  /apache-icons/binhex.gif      .hqx
    AddIcon                  /apache-icons/tar.gif         .tar
    AddIcon                  /apache-icons/world2.gif      .wrl .wrl.gz .vrml .vrm .iv
    AddIcon                  /apache-icons/compressed.gif  .Z .z .tgz .gz .zip
    AddIcon                  /apache-icons/a.gif           .ps .ai .eps
    AddIcon                  /apache-icons/layout.gif      .html .shtml .htm .pdf
    AddIcon                  /apache-icons/text.gif        .txt
    AddIcon                  /apache-icons/c.gif           .c
    AddIcon                  /apache-icons/p.gif           .pl .py
    AddIcon                  /apache-icons/f.gif           .for
    AddIcon                  /apache-icons/dvi.gif         .dvi
    AddIcon                  /apache-icons/uuencoded.gif   .uu
    AddIcon                  /apache-icons/script.gif      .conf .sh .shar .csh .ksh .tcl
    AddIcon                  /apache-icons/tex.gif         .tex
    AddIcon                  /apache-icons/bomb.gif        core
    AddIconByEncoding   (CMP,/apache-icons/compressed.gif) x-compress x-gzip
    AddIconByType       (TXT,/apache-icons/text.gif)       text/*
    AddIconByType       (IMG,/apache-icons/image2.gif)     image/*
    AddIconByType       (SND,/apache-icons/sound2.gif)     audio/*
    AddIconByType       (VID,/apache-icons/movie.gif)      video/*
</IfModule>

#   MIME types and content negotiation
DefaultType             text/plain
<IfModule mime_module>
    TypesConfig         @l_prefix@/etc/apache/mime.types
    AddType             application/x-compress .Z
    AddType             application/x-gzip     .gz .tgz
    AddType             application/x-tar      .tar
    AddEncoding         x-compress   Z
    AddEncoding         x-gzip       gz tgz
    AddLanguage         da           .dk
    AddLanguage         nl           .nl
    AddLanguage         en           .en
    AddLanguage         et           .ee
    AddLanguage         fr           .fr
    AddLanguage         de           .de
    AddLanguage         el           .el
    AddLanguage         he           .he
    AddCharset          ISO-8859-8   .iso8859-8
    AddLanguage         it           .it
    AddLanguage         ja           .ja
    AddCharset          ISO-2022-JP  .jis
    AddLanguage         kr           .kr
    AddCharset          ISO-2022-KR  .iso-kr
    AddLanguage         no           .no
    AddLanguage         pl           .po
    AddCharset          ISO-8859-2   .iso-pl
    AddLanguage         pt           .pt
    AddLanguage         pt-br        .pt-br
    AddLanguage         ltz          .lu
    AddLanguage         ca           .ca
    AddLanguage         es           .es
    AddLanguage         sv           .se
    AddLanguage         cz           .cz
    AddLanguage         ru           .ru
    AddLanguage         tw           .tw
    AddCharset          Big5         .Big5 .big5
    AddCharset          WINDOWS-1251 .cp-1251
    AddCharset          CP866        .cp866
    AddCharset          ISO-8859-5   .iso-ru
    AddCharset          KOI8-R       .koi8-r
    AddCharset          UCS-2        .ucs2
    AddCharset          UCS-4        .ucs4
    AddCharset          UTF-8        .utf8
</IfModule>
<IfModule negotiation_module>
    AddHandler          type-map     .var
    LanguagePriority    en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
    ForceLanguagePriority Prefer Fallback
</IfModule>
<IfModule mime_magic_module>
    MIMEMagicFile       @l_prefix@/etc/apache/mime.magic
</IfModule>

#   SSL/TLS support
<IfModule ssl_module>
    SSLRandomSeed           startup builtin
    SSLRandomSeed           connect builtin
    SSLMutex                sem
    SSLCADNRequestFile      @l_prefix@/etc/x509/public-ca.crt.pem
    SSLCACertificateFile    @l_prefix@/etc/x509/public-ca.crt.pem
    SSLSessionCache         shm:@l_prefix@/var/apache/run/apache.ssl_scache(512000)
    SSLSessionCacheTimeout  300
    SSLCipherSuite          ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
    <IfModule setenvif_module>
        SetEnvIf            User-Agent ".*MSIE.*" \
                            nokeepalive ssl-unclean-shutdown \
                            downgrade-1.0 force-response-1.0
    </IfModule>
    <Files ~ "\.(cgi|shtml|pl|phtml|php?)$">
        SSLOptions          +StdEnvVars
    </Files>
    <Directory "@l_prefix@/cgi">
        SSLOptions          +StdEnvVars
    </Directory>
    AddType application/x-x509-ca-cert .crt
    AddType application/x-pkcs7-crl    .crl
</IfModule>

#   DAV support
<IfModule dav_module>
    DavLockDB           @l_prefix@/var/apache/run/apache.dav/lock
    BrowserMatch        "Microsoft Data Access Internet Publishing Provider" redirect-carefully
    BrowserMatch        "MS FrontPage"                                       redirect-carefully
    BrowserMatch        "^WebDrive"                                          redirect-carefully
    BrowserMatch        "^WebDAVFS/1.[0123]"                                 redirect-carefully
    BrowserMatch        "^gnome-vfs/1.0"                                     redirect-carefully
    BrowserMatch        "^XML Spy"                                           redirect-carefully
    BrowserMatch        "^Dreamweaver-WebDAV-SCM1"                           redirect-carefully
</IfModule>

#   Cache support
<IfModule disk_cache_module>
    CacheRoot           @l_prefix@/var/apache/run/apache.cache
    CacheMaxFileSize    1000000
    CacheMinFileSize    1
    CacheDirLength      2
    CacheDirLevels      3
</IfModule>


--- NEW FILE: apache.conf ---
##
##  apache.conf -- Apache Custom Configuration
##

#   include Apache default/base configuration
Include "@l_prefix@/etc/apache/apache.base"

#   include Apache add-on configurations
#   (mainly provided by other packages)
Include "@l_prefix@/etc/apache/apache.d/*.conf"

Listen          127.0.0.1:80
NameVirtualHost 127.0.0.1:80

<IfModule ssl_module>
Listen          127.0.0.1:443
</IfModule>

<VirtualHost 127.0.0.1:80>
    ServerName        @l_hostname at .@l_domainname@
    ServerAlias       localhost. at l_domainname@
    ServerAdmin       root at localhost.@l_domainname@
    ServerSignature   on

    DocumentRoot @l_prefix@/share/apache/htdocs
    <Directory @l_prefix@/share/apache/htdocs>
        Options       Indexes FollowSymLinks MultiViews
        AllowOverride none
        Order         allow,deny
        Allow         from all
    </Directory>

    ScriptAlias /cgi-bin @l_prefix@/cgi
    <Directory @l_prefix@/cgi>
        Options       Indexes FollowSymLinks MultiViews ExecCGI
        AllowOverride None
        Order         allow,deny
        Allow         from all
    </Directory>
</VirtualHost>

<IfModule ssl_module>
<VirtualHost 127.0.0.1:443>
    ServerName        @l_hostname at .@l_domainname@
    ServerAlias       localhost. at l_domainname@
    ServerAdmin       root at localhost.@l_domainname@
    ServerSignature   on

    DocumentRoot @l_prefix@/share/apache/htdocs
    <Directory @l_prefix@/share/apache/htdocs>
        Options       Indexes FollowSymLinks MultiViews
        AllowOverride none
        Order         allow,deny
        Allow         from all
    </Directory>

    ScriptAlias /cgi-bin @l_prefix@/cgi
    <Directory @l_prefix@/cgi>
        Options       Indexes FollowSymLinks MultiViews ExecCGI
        AllowOverride None
        Order         allow,deny
        Allow         from all
    </Directory>

    SSLEngine             on
    SSLCADNRequestFile    @l_prefix@/etc/x509/example-ca.crt.pem
    SSLCACertificateFile  @l_prefix@/etc/x509/example-ca.crt.pem
    SSLCertificateFile    @l_prefix@/etc/x509/example-server.crt.pem
    SSLCertificateKeyFile @l_prefix@/etc/x509/example-server.key.pem
</VirtualHost>
</IfModule>


--- NEW FILE: apache.patch ---
Index: build/config_vars.sh.in
--- build/config_vars.sh.in.orig	2008-02-05 00:00:07.000000000 +0100
+++ build/config_vars.sh.in	2010-03-06 09:23:16.000000000 +0100
@@ -35,7 +35,7 @@
    APU_CONFIG=@APU_CONFIG@
 fi
 
-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
+APR_LIBTOOL="@prefix@/share/apache/build/libtool"
 APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
 APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
 
Index: config.layout
--- config.layout.orig	2004-11-21 19:50:36.000000000 +0100
+++ config.layout	2010-03-06 09:23:16.000000000 +0100
@@ -50,7 +50,7 @@
     iconsdir:      ${datadir}/icons
     htdocsdir:     ${datadir}/htdocs
     manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
+    cgidir:        ${exec_prefix}/cgi
     includedir:    ${prefix}/include+
     localstatedir: ${prefix}/var+
     runtimedir:    ${localstatedir}/run
Index: configure
--- configure.orig	2010-03-02 06:34:50.000000000 +0100
+++ configure	2010-03-06 09:23:16.000000000 +0100
@@ -3603,6 +3603,11 @@
    { (exit 1); exit 1; }; }
 fi
 
+if test "x${USE_BUNDLED_APR}" != "x" ; then
+    apr_found=reconfig
+    apr_config=srclib/apr/apr-1-config
+fi
+
 if test "$apr_found" = "reconfig"; then
 
   # save our work to this point; this allows the sub-package to use it
@@ -3963,6 +3968,11 @@
    { (exit 1); exit 1; }; }
 fi
 
+if test "x${USE_BUNDLED_APR}" != "x" ; then
+    apu_found=reconfig
+    apu_config=srclib/apr-util/apu-1-config
+fi
+
 # Catch some misconfigurations:
 case ${apr_found}.${apu_found} in
 reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig	2010-01-06 00:40:54.000000000 +0100
+++ docs/conf/mime.types	2010-03-06 09:25:36.000000000 +0100
@@ -103,6 +103,7 @@
 application/mbox				mbox
 # application/media_control+xml
 application/mediaservercontrol+xml		mscml
+application/metalink+xml			metalink
 # application/mikey
 # application/moss-keys
 # application/moss-signature
Index: docs/docroot/index.html
--- docs/docroot/index.html.orig	2004-11-20 21:16:24.000000000 +0100
+++ docs/docroot/index.html	2010-03-06 09:23:16.000000000 +0100
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
+<html>
+  <body>
+    <h1>It works!</h1>
+    It works! Your <a href="http://openpkg.org/">OpenPKG</a> based <a href="http://httpd.apache.org/">Apache</a> HTTP server was successfully installed and started.<br/>
+    You now have to read the <a href="/apache-manual/">documentation</a> and configure it according to your local demands. 
+  </body>
+</html>
Index: modules/generators/mod_autoindex.c
--- modules/generators/mod_autoindex.c.orig	2009-08-28 16:37:37.000000000 +0200
+++ modules/generators/mod_autoindex.c	2010-03-06 09:23:16.000000000 +0100
@@ -1573,17 +1573,17 @@
 
             ++cols;
         }
-        ap_rputs("<th>", r);
+        ap_rputs("<th align=\"left\">", r);
         emit_link(r, "Name", K_NAME, keyid, direction,
                   colargs, static_columns);
         if (!(autoindex_opts & SUPPRESS_LAST_MOD)) {
-            ap_rputs("</th><th>", r);
+            ap_rputs("</th><th align=\"right\">", r);
             emit_link(r, "Last modified", K_LAST_MOD, keyid, direction,
                       colargs, static_columns);
             ++cols;
         }
         if (!(autoindex_opts & SUPPRESS_SIZE)) {
-            ap_rputs("</th><th>", r);
+            ap_rputs("</th><th align=\"right\">", r);
             emit_link(r, "Size", K_SIZE, keyid, direction,
                       colargs, static_columns);
             ++cols;
@@ -1677,7 +1677,14 @@
         }
 
         if (autoindex_opts & TABLE_INDEXING) {
-            ap_rputs("<tr>", r);
+            char *class;
+            if (strcmp(t2, "Parent Directory") == 0)
+                class = "updir";
+            else if (ar[x]->isdir)
+                class = "dir";
+            else
+                class = "file";
+            ap_rvputs(r, "<tr class=\"", class, "\">", NULL);
             if (!(autoindex_opts & SUPPRESS_ICON)) {
                 ap_rputs("<td valign=\"top\">", r);
                 if (autoindex_opts & ICONS_ARE_LINKS) {
@@ -1762,9 +1769,6 @@
                                                         desc_width), NULL);
                     }
                 }
-                else {
-                    ap_rputs("</td><td>&nbsp;", r);
-                }
             }
             ap_rputs("</td></tr>\n", r);
         }
Index: server/Makefile.in
--- server/Makefile.in.orig	2006-03-09 22:29:55.000000000 +0100
+++ server/Makefile.in	2010-03-06 09:23:16.000000000 +0100
@@ -56,7 +56,8 @@
 	tmp=export_files_unsorted.txt; \
 	rm -f $$tmp && touch $$tmp; \
 	for dir in $(EXPORT_DIRS); do \
-	    ls $$dir/*.h >> $$tmp; \
+		abs_dir=`cd $$dir && exec pwd`; \
+	    ls $$abs_dir/*.h >> $$tmp; \
 	done; \
 	for dir in $(EXPORT_DIRS_APR); do \
 	    (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
Index: support/Makefile.in
--- support/Makefile.in.orig	2005-07-07 01:15:34.000000000 +0200
+++ support/Makefile.in	2010-03-06 09:23:16.000000000 +0100
@@ -22,12 +22,6 @@
 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
 	    fi ; \
 	done
-	@if test -f "$(builddir)/envvars-std"; then \
-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
-	    fi ; \
-	fi
 
 htpasswd_OBJECTS = htpasswd.lo
 htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig	2006-07-12 05:38:44.000000000 +0200
+++ support/apachectl.in	2010-03-06 09:23:16.000000000 +0100
@@ -43,11 +43,6 @@
 # the path to your httpd binary, including options if necessary
 HTTPD='@exp_sbindir@/@progname@'
 #
-# pick up any necessary environment variables
-if test -f @exp_sbindir@/envvars; then
-  . @exp_sbindir@/envvars
-fi
-#
 # a command that outputs a formatted text version of the HTML at the
 # url given on the command line.  Designed for lynx, however other
 # programs may work.  
Index: support/apxs.in
--- support/apxs.in.orig	2006-07-12 05:38:44.000000000 +0200
+++ support/apxs.in	2010-03-06 09:23:16.000000000 +0100
@@ -190,9 +190,6 @@
 my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
 $httpd = eval qq("$httpd");
 $httpd = eval qq("$httpd");
-my $envvars = get_vars("sbindir") . "/envvars";
-$envvars = eval qq("$envvars");
-$envvars = eval qq("$envvars");
 
 #allow apxs to be run from the source tree, before installation
 if ($0 =~ m:support/apxs$:) {
@@ -204,7 +201,7 @@
 	exit 1;
 }
 
-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
+unless (grep /mod_so/, `$httpd -l`) {
     error("Sorry, no shared object support for Apache");
     error("available under your platform. Make sure");
     error("the Apache module mod_so is compiled into");
@@ -338,8 +335,7 @@
     exit(1);
 }
 
-my $libtool = `$apr_config --apr-libtool`;
-chomp($libtool);
+my $libtool = "$prefix/share/apache/build/libtool";
 
 my $apr_includedir = `$apr_config --includes`;
 chomp($apr_includedir);

--- NEW FILE: apache.sh ---
##
##  apache.sh -- Apache Shell Environment Script
##

#
#   Run-time paths
#

export PATH="@l_path@"
export LD_LIBRARY_PATH="@l_ld_library_path@"


--- NEW FILE: apache.spec ---
##
##  apache.spec -- OpenPKG RPM Package Specification
##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
##
##  Permission to use, copy, modify, and distribute this software for
##  any purpose with or without fee is hereby granted, provided that
##  the above copyright notice and this permission notice appear in all
##  copies.
##
##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
##  SUCH DAMAGE.
##

#   package information
Name:         apache
Summary:      Apache HTTP Server
URL:          http://httpd.apache.org/
Vendor:       Apache Software Foundation
Packager:     OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class:        BASE
Group:        Web
License:      ASF
Version:      2.2.15
Release:      20100406

#   package options
%option       with_mpm_prefork          yes
%option       with_mpm_worker           no
%option       with_mpm_event            no
%option       with_suexec               yes
%option       with_suexec_caller        %{l_nusr}
%option       with_suexec_userdir       public_html
%option       with_mod_deflate          no
%option       with_mod_ext_filter       no
%option       with_mod_substitute       no
%option       with_mod_ssl              no
%option       with_mod_dav              no
%option       with_mod_ldap             no
%option       with_mod_dbd              no
%option       with_mod_proxy            no
%option       with_mod_cache            no
%option       with_mod_diskcache        no
%option       with_mod_memcache         no
%option       with_mod_filecache        no
%option       with_mod_authn_alias      no

#   fixing implicit inter-module dependencies and correlations
%if "%{with_mpm_prefork}" == "yes"
%undefine     with_mpm_worker
%undefine     with_mpm_event
%endif
%if "%{with_mpm_worker}" == "yes"
%undefine     with_mpm_prefork
%undefine     with_mpm_event
%endif
%if "%{with_mpm_event}" == "yes"
%undefine     with_mpm_prefork
%undefine     with_mpm_worker
%endif
%if "%{with_mod_memcache}" == "yes" || "%{with_mod_diskcache}" == "yes"
%undefine     with_mod_cache
%define       with_mod_cache            yes
%endif

#   list of sources
Source0:      http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1:      rc.apache
Source2:      apache.base
Source3:      apache.conf
Source4:      apache.sh
Patch0:       apache.patch

#   build information
Prefix:       %{l_prefix}
BuildRoot:    %{l_buildroot}
BuildPreReq:  OpenPKG, openpkg >= 20060823, perl, make
PreReq:       OpenPKG, openpkg >= 20060823, perl
BuildPreReq:  apr, pcre
PreReq:       apr, pcre
%if "%{with_mpm_worker}" == "yes" || "%{with_mpm_event}" == "yes" || "%{with_mod_memcache}" == "yes"
BuildPreReq:  apr::with_threads = yes
PreReq:       apr::with_threads = yes
%endif
%if "%{with_mod_ldap}" == "yes"
BuildPreReq:  apr::with_ldap = yes
PreReq:       apr::with_ldap = yes
%endif
%if "%{with_mod_ssl}" == "yes"
BuildPreReq:  openssl >= 0.9.8
PreReq:       openssl >= 0.9.8
PreReq:       x509
%endif
%if "%{with_mod_deflate}" == "yes"
BuildPreReq:  zlib
PreReq:       zlib
%endif
AutoReq:      no
AutoReqProv:  no

%description
    The Apache Project is a collaborative software development effort
    aimed at creating a robust, commercial-grade, featureful, and
    freely-available source code implementation of an HTTP (Web) server.
    The project is jointly managed by a group of volunteers located
    around the world, using the Internet and the Web to communicate,
    plan, and develop the server and its related documentation. These
    volunteers are known as the Apache Group. In addition, hundreds
    of users have contributed ideas, code, and documentation to the
    project.

%track
    prog apache = {
        version   = %{version}
        url       = http://www.apache.org/dist/httpd/
        regex     = httpd-(2\.\d*[02468]\.\d+)\.tar\.(bz2|gz)
    }

%prep
    #   unpack Apache distribution
    %setup -q -n httpd-%{version}
    %patch -p0
    %{l_shtool} subst \
        -e 's;(" PLATFORM ");(%{l_openpkg_release -F "OpenPKG/%%t"});g' \
        server/core.c

%build
    #   configure package
    ( echo "ac_cv_func_uuid_create=no"
    ) >config.cache
    export CC="%{l_cc}"
    export CFLAGS="%{l_cflags -O}"
    export CPPFLAGS="%{l_cppflags}"
    export LDFLAGS="%{l_ldflags}"
    export LIBS=""
    case "%{l_platform -t}" in
        *-sunos* ) LIBS="$LIBS -lrt" ;;
    esac
%if "%{with_mod_ldap}" == "yes"
    LIBS="$LIBS -lssl -lcrypto"
%endif
    ./configure \
        --cache-file=./config.cache \
        --enable-layout=GNU \
        --prefix=%{l_prefix} \
        --with-program-name=apache \
        --sysconfdir=%{l_prefix}/etc/apache \
        --libexecdir=%{l_prefix}/libexec/apache \
        --includedir=%{l_prefix}/include/apache \
        --datadir=%{l_prefix}/share/apache \
        --localstatedir=%{l_prefix}/var/apache \
        --with-apr=%{l_prefix}/bin/apr-1-config \
        --with-apr-util=%{l_prefix}/bin/apu-1-config \
        --with-pcre=%{l_prefix} \
%if "%{with_mpm_prefork}" == "yes"
        --with-mpm="prefork" \
%endif
%if "%{with_mpm_worker}" == "yes"
        --with-mpm="worker" \
%endif
%if "%{with_mpm_event}" == "yes"
        --with-mpm="event" \
%endif
%if "%{with_mpm_worker}" == "yes" || "%{with_mpm_event}" == "yes" || "%{with_mod_memcache}" == "yes"
        --enable-threads \
%else
        --disable-threads \
%endif
%if "%{with_suexec}" == "yes"
        --enable-suexec \
        --with-suexec-bin=%{l_prefix}/sbin/suexec \
        --with-suexec-caller=%{with_suexec_caller} \
        --with-suexec-userdir=%{with_suexec_userdir} \
        --with-suexec-logfile=%{l_prefix}/var/apache/log/suexec.log \
%endif
%if "%{with_mod_deflate}" == "yes"
        --enable-deflate \
        --with-z=%{l_prefix} \
%endif
%if "%{with_mod_ext_filter}" == "yes"
        --enable-ext-filter \
%endif
%if "%{with_mod_substitute}" == "yes"
        --enable-substitute \
%endif
%if "%{with_mod_ssl}" == "yes"
        --enable-ssl \
        --with-ssl=%{l_prefix} \
%endif
%if "%{with_mod_dav}" == "yes"
        --enable-dav \
        --enable-dav-fs \
        --enable-dav-lock \
%endif
%if "%{with_mod_ldap}" == "yes"
        --enable-ldap \
        --enable-authnz-ldap \
%endif
%if "%{with_mod_dbd}" == "yes"
        --enable-dbd \
        --enable-authn-dbd \
%endif
%if "%{with_mod_proxy}" == "yes"
        --enable-proxy \
        --enable-proxy-connect \
        --enable-proxy-http \
        --enable-proxy-ftp \
        --enable-proxy-ajp \
        --enable-proxy-balancer \
%endif
%if "%{with_mod_cache}" == "yes"
        --enable-cache \
%if "%{with_mod_diskcache}" == "yes"
        --enable-disk-cache \
%endif
%if "%{with_mod_memcache}" == "yes"
        --enable-mem-cache \
%endif
%endif
%if "%{with_mod_filecache}" == "yes"
        --enable-file-cache \
%endif
%if "%{with_mod_authn_alias}" == "yes"
        --enable-authn-alias \
%endif
        --enable-filter \
        --enable-reqtimeout \
        --enable-usertrack \
        --enable-expires \
        --enable-so \
        --enable-speling \
        --enable-rewrite \
        --enable-headers \
        --enable-info \
        --enable-mime-magic \
        --enable-vhost-alias \
        --enable-auth-digest \
        --enable-auth-dbm \
        --enable-authz-dbm \
        --enable-authz-owner \
        --enable-unique-id \
        --enable-logio \
        --disable-shared

    #   build package
    %{l_make} %{l_mflags}

%install
    #   install package
    rm -rf $RPM_BUILD_ROOT
    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT

    #   create additional directories
    %{l_shtool} mkdir -f -p -m 755 \
        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
        $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d \
        $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache.dav \
        $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache.cache

    #   adjust GNU libtool configuration for apxs(1) runtime
    %{l_shtool} install -c -m 755 \
        -e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
        %{l_prefix}/share/apr/build-1/libtool \
        $RPM_BUILD_ROOT%{l_prefix}/share/apache/build/libtool

    #   install shell environment script
    %{l_shtool} install -c -m 644 %{l_value -s -a} \
         -e 's;@l_path@;%{l_build_path};' \
         -e 's;@l_ld_library_path@;%{l_build_ldlp};' \
         %{SOURCE apache.sh} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/apache/

    #   create default configuration
    l_hostname=`%{l_shtool} echo -e %h`
    l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
    %{l_shtool} install -c -m 644 %{l_value -s -a} \
        -e "s;@l_hostname@;$l_hostname;g" \
        -e "s;@l_domainname@;$l_domainname;g" \
        %{SOURCE apache.base} \
        %{SOURCE apache.conf} \
        $RPM_BUILD_ROOT%{l_prefix}/etc/apache/
    mv  $RPM_BUILD_ROOT%{l_prefix}/etc/apache/magic \
        $RPM_BUILD_ROOT%{l_prefix}/etc/apache/mime.magic

    #   install run-command script
    %{l_shtool} install -c -m 755 %{l_value -s -a} \
        -e 's;@with_mod_filecache@;%{with_mod_filecache};g' \
        %{SOURCE rc.apache} \
        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/

    #   strip down installation
    find $RPM_BUILD_ROOT%{l_prefix}/share/apache -name "*.orig" -print | xargs rm -f
    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/apache/htdocs/apache_pb*
    rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/{extra,original}
    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/apache
    rm -f $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi
    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
    strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/apache/manual
      find . -name "*.xml"   -print | xargs rm -f
      find . -name "*.xml.*" -print | xargs rm -f
      find . -name "*.xsl"   -print | xargs rm -f
      rm -rf style/xsl
      rm -rf style/latex
    ) || exit $?

    #   determine installation files
    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
        %{l_files_std} \
%if "%{with_suexec}" == "yes"
        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suexec' \
%endif
        '%config %{l_prefix}/etc/apache/*' \
        '%config %attr(444,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/apache/apache.base' \
        '%dir %attr(750,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/apache/run/apache.dav' \
        '%dir %attr(750,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/apache/run/apache.cache'

%files -f files

%clean
    rm -rf $RPM_BUILD_ROOT

%post
    #   after upgrade, restart service
    [ $1 -eq 2 ] || exit 0
    eval `%{l_rc} apache status 2>/dev/null`
    [ ".$apache_active" = .yes ] && %{l_rc} apache restart
    exit 0

%preun
    #   before erase, stop service and remove log files
    [ $1 -eq 0 ] || exit 0
    %{l_rc} apache stop 2>/dev/null
    rm -f $RPM_INSTALL_PREFIX/var/apache/log/*   >/dev/null 2>&1 || true
    rm -f $RPM_INSTALL_PREFIX/var/apache/run/*/* >/dev/null 2>&1 || true
    rm -f $RPM_INSTALL_PREFIX/var/apache/run/*   >/dev/null 2>&1 || true
    exit 0




From cvs at kolab.org  Wed Apr 21 16:58:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 16:58:43 +0200 (CEST)
Subject: gunnar: server/openssl - New directory 
Message-ID: <20100421145843.1EE36600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/openssl
In directory doto:/tmp/cvs-serv6160/openssl

Log Message:
Directory /kolabrepository/server/openssl added to the repository
--> Using per-directory sticky tag `kolab_2_2_branch'




From cvs at kolab.org  Wed Apr 21 17:01:07 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 17:01:07 +0200 (CEST)
Subject: gunnar: server/openssl .cvsignore, NONE, 1.1.2.1 Makefile, NONE,
	1.1.2.1 openssl.patch, NONE, 1.1.2.1 openssl.spec, NONE, 1.1.2.1 
Message-ID: <20100421150107.64BA0600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/openssl
In directory doto:/tmp/cvs-serv6234

Added Files:
      Tag: kolab_2_2_branch
	.cvsignore Makefile openssl.patch openssl.spec 
Log Message:
openssl-1.0.0 derived from the upstream openpkg package but adapted to the openpkg base package <= 20100101. This package requires rebuilding of apache, apache-php, apr, clamav, curl, imap, imapd, openldap, perl-crypto, perl-ssl, php, postfix, sasl.

--- NEW FILE: .cvsignore ---
*.tgz
*.src.rpm

--- NEW FILE: Makefile ---
include ../kolab.mk

NAME = openssl
PACKAGE = $(NAME)
VERSION = $(shell grep "^%define.*V_openssl" *.spec | sed -e "s/^%define.*V_openssl\s*\([0-9.]*\).*/\1/")
ZLIB_VERSION = $(shell grep "^%define.*V_zlib" *.spec | sed -e "s/^%define.*V_zlib\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
KOLABRELEASE = $(RELEASE)

SOURCE_0=ftp://ftp.openssl.org/source/$(NAME)-$(VERSION).tar.gz
SOURCE_1=http://www.zlib.net/zlib-$(ZLIB_VERSION).tar.gz
EXTRA=$(NAME).patch

.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

.PHONY: dist
dist: all
	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/

.PHONY: clean
clean:
	rm -rf $(KOLABRPMTMP)/$(NAME)*
	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -rf *~

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_1)"

	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec

	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

--- NEW FILE: openssl.patch ---
Index: Configure
--- Configure.orig	2010-01-19 22:40:54.000000000 +0100
+++ Configure	2010-03-30 09:15:55.000000000 +0200
@@ -34,6 +34,7 @@
 #		(Default: KRB5_DIR/include)
 # --with-krb5-flavor  Declare what flavor of Kerberos 5 is used.  Currently
 #		supported values are "MIT" and "Heimdal".  A value is required.
+# --with-cc     compiler to use for $CC (useful if cc is a disguised gcc)
 #
 # --test-sanity Make a number of sanity checks on the data in this file.
 #               This is a debugging tool for OpenSSL developers.
@@ -122,6 +123,7 @@
 #$bits2="THIRTY_TWO_BIT ";
 my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
+my $ccarg;
 
 my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes-586.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o";
 
@@ -434,12 +436,12 @@
 
 #### IBM's AIX.
 "aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
-"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
-"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
+"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
 # at build time. $OBJECT_MODE is respected at ./config stage!
-"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
-"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
+"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
 
 #
 # Cray T90 and similar (SDSC)
@@ -780,6 +782,10 @@
 			{
 			$strict_warnings = 1;
 			}
+		elsif (/^--with-cc=(.*)$/)
+			{
+                $ccarg=$1
+			}
 		elsif (/^reconfigure/ || /^reconf/)
 			{
 			if (open(IN,"<$Makefile"))
@@ -1058,7 +1064,7 @@
 print "IsMK1MF=$IsMK1MF\n";
 
 my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
-my $cc = $fields[$idx_cc];
+my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
 # Allow environment CC to override compiler...
 if($ENV{CC}) {
     $cc = $ENV{CC};
Index: config
--- config.orig	2010-03-09 18:08:39.000000000 +0100
+++ config	2010-03-30 09:13:58.000000000 +0200
@@ -277,6 +277,9 @@
 	    Power*)
 		echo "ppc-apple-darwin${VERSION}"
 		;;
+	    x86_64 )
+		echo "x86_64-apple-darwin${VERSION}"
+		;;
 	    *)
 		echo "i686-apple-darwin${VERSION}"
 		;;
@@ -407,7 +410,7 @@
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
+GCCVER=`(${CC-gcc} -dumpversion 2>/dev/null && exit; gcc -dumpversion 2>/dev/null && exit; cc --version 2>/dev/null | grep GCC >/dev/null && cc -dumpversion )`
 if [ "$GCCVER" != "" ]; then
   # then strip off whatever prefix egcs prepends the number with...
   # Hopefully, this will work for any future prefixes as well.
@@ -425,8 +428,14 @@
 # we fallback to whatever cc does on the system
   if [ "$GCCVER" != "" ]; then
     CC=gcc
+    SUFFIX=gcc
   else
     CC=cc
+    SUFFIX=cc
+  fi
+else
+  if [ "$GCCVER" != "" ]; then
+    SUFFIX=gcc
   fi
 fi
 GCCVER=${GCCVER:-0}
@@ -436,7 +445,7 @@
   if [ $GCCVER -ge 30 ]; then
     # PA64 support only came in with gcc 3.0.x.
     # We check if the preprocessor symbol __LP64__ is defined...
-    if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
+    if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
       : # __LP64__ has slipped through, it therefore is not defined
     else
       GCC_BITS="64"
@@ -447,13 +456,14 @@
   if [ $GCCVER -ge 30 ]; then
     # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
     # to be working, at the very least 'make test' passes...
-    if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
+    if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
       GCC_ARCH="-m64"
     else
       GCC_ARCH="-m32"
     fi
   fi
   # check for WorkShop C, expected output is "cc: blah-blah C x.x"
+  if [ $GCCVER -eq 0 ]; then
   CCVER=`(cc -V 2>&1) 2>/dev/null | \
   	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
 	sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
@@ -466,6 +476,7 @@
       sleep 5
     fi
   fi
+  fi
 fi
 
 if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
@@ -483,6 +494,7 @@
 
 if [ "${SYSTEM}" = "AIX" ]; then	# favor vendor cc over gcc
     (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
+    (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
 fi
 
 CCVER=${CCVER:-0}
@@ -508,7 +520,7 @@
 	if [ $CPU -ge 4000 ]; then
 		options="$options -mips2"
 	fi
-	OUT="irix-$CC"
+	OUT="irix-$SUFFIX"
 	;;
   mips3-sgi-irix)
 	#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
@@ -518,11 +530,11 @@
 	#else
 	#	options="$options -mips3"
 	#fi
-	OUT="irix-mips3-$CC"
+	OUT="irix-mips3-$SUFFIX"
 	;;
   mips4-sgi-irix64)
 	echo "WARNING! If you wish to build 64-bit library, then you have to"
-	echo "         invoke './Configure irix64-mips4-$CC' *manually*."
+	echo "         invoke './Configure irix64-mips4-$SUFFIX' *manually*."
 	if [ "$TEST" = "false" -a -t 1 ]; then
 	  echo "         You have about 5 seconds to press Ctrl-C to abort."
 	  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
@@ -534,7 +546,7 @@
         #else
         #        options="$options -mips3"
         #fi
-	OUT="irix-mips3-$CC"
+	OUT="irix-mips3-$SUFFIX"
 	;;
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   ppc-apple-darwin*)
@@ -559,13 +571,16 @@
 	    fi
 	fi
 	OUT="darwin-i386-cc" ;;
+  x86_64-apple-darwin*)
+    OUT="darwin64-x86_64-cc"
+    ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
 	case ${ISA:-generic} in
-	*[678])	OUT="linux-alpha+bwx-$CC" ;;
-	*)	OUT="linux-alpha-$CC" ;;
+	*[678])	OUT="linux-alpha+bwx-$SUFFIX" ;;
+	*)	OUT="linux-alpha-$SUFFIX" ;;
 	esac
-	if [ "$CC" = "gcc" ]; then
+	if [ $GCCVER -gt 0 ]; then
 	    case ${ISA:-generic} in
 	    EV5|EV45)		options="$options -mcpu=ev5";;
 	    EV56|PCA56)		options="$options -mcpu=ev56";;
@@ -632,7 +647,7 @@
   s390x-*-linux2) OUT="linux-s390x" ;;
   x86_64-*-linux?) OUT="linux-x86_64" ;;
   *86-*-linux2) OUT="linux-elf"
-	if [ "$GCCVER" -gt 28 ]; then
+	if [ $GCCVER -gt 28 ]; then
           if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
 	    options="$options -march=pentium"
           fi
@@ -646,17 +661,17 @@
   *-*-linux1) OUT="linux-aout" ;;
   *-*-linux2) OUT="linux-generic32" ;;
   sun4[uv]*-*-solaris2)
-	OUT="solaris-sparcv9-$CC"
+	OUT="solaris-sparcv9-$SUFFIX"
 	ISA64=`(isalist) 2>/dev/null | grep sparcv9`
 	if [ "$ISA64" != "" ]; then
-	    if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
+	    if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
 		echo "WARNING! If you wish to build 64-bit library, then you have to"
 		echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
 		if [ "$TEST" = "false" -a -t 1 ]; then
 		  echo "         You have about 5 seconds to press Ctrl-C to abort."
 		  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
 		fi
-	    elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
+	    elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
 		# $GCC_ARCH denotes default ABI chosen by compiler driver
 		# (first one found on the $PATH). I assume that user
 		# expects certain consistency with the rest of his builds
@@ -679,21 +694,21 @@
 	    fi
 	fi
 	;;
-  sun4m-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;
-  sun4d-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;
-  sun4*-*-solaris2)	OUT="solaris-sparcv7-$CC" ;;
+  sun4m-*-solaris2)	OUT="solaris-sparcv8-$SUFFIX" ;;
+  sun4d-*-solaris2)	OUT="solaris-sparcv8-$SUFFIX" ;;
+  sun4*-*-solaris2)	OUT="solaris-sparcv7-$SUFFIX" ;;
   *86*-*-solaris2)
 	ISA64=`(isalist) 2>/dev/null | grep amd64`
-	if [ "$ISA64" != "" ]; then
-	    OUT="solaris64-x86_64-$CC"
+	if [ "$ISA64" != "" -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
+	    OUT="solaris64-x86_64-$SUFFIX"
 	else
-	    OUT="solaris-x86-$CC"
+	    OUT="solaris-x86-$SUFFIX"
 	    if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then
 		options="$options no-sse2"
 	    fi
 	fi
 	;;
-  *-*-sunos4)		OUT="sunos-$CC" ;;
+  *-*-sunos4)		OUT="sunos-$SUFFIX" ;;
 
   *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
   alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
@@ -717,7 +732,7 @@
   *-*-osf)		OUT="osf1-alpha-cc" ;;
   *-*-tru64)		OUT="tru64-alpha-cc" ;;
   *-*-[Uu]nix[Ww]are7)
-	if [ "$CC" = "gcc" ]; then
+	if [ $GCCVER -gt 0 ]; then
 	  OUT="unixware-7-gcc" ; options="$options no-sse2"
 	else    
 	  OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
@@ -728,12 +743,12 @@
   *-*-vos)
 	options="$options no-threads no-shared no-asm no-dso"
 	EXE=".pm"
-	OUT="vos-$CC" ;;
+	OUT="vos-$SUFFIX" ;;
   BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
   RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
   *-siemens-sysv4) OUT="SINIX" ;;
   *-hpux1*)
-	if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
+	if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
 	    OUT="hpux64-parisc2-gcc"
 	fi
 	KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
@@ -751,8 +766,8 @@
 	     fi
 	     OUT="hpux64-ia64-cc"
 	elif [ $CPU_VERSION -ge 532 ]; then	# PA-RISC 2.x CPU
-	     OUT=${OUT:-"hpux-parisc2-${CC}"}
-	     if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
+	     OUT=${OUT:-"hpux-parisc2-${SUFFIX}"}
+	     if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then
 		echo "WARNING! If you wish to build 64-bit library then you have to"
 		echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
 		if [ "$TEST" = "false" -a -t 1 ]; then
@@ -761,19 +776,19 @@
 		fi
 	     fi
 	elif [ $CPU_VERSION -ge 528 ]; then	# PA-RISC 1.1+ CPU
-	     OUT="hpux-parisc-${CC}"
+	     OUT="hpux-parisc-${SUFFIX}"
 	elif [ $CPU_VERSION -ge 523 ]; then	# PA-RISC 1.0 CPU
-	     OUT="hpux-parisc-${CC}"
+	     OUT="hpux-parisc-${SUFFIX}"
 	else					# Motorola(?) CPU
-	     OUT="hpux-$CC"
+	     OUT="hpux-$SUFFIX"
 	fi
 	options="$options -D_REENTRANT" ;;
-  *-hpux)	OUT="hpux-parisc-$CC" ;;
+  *-hpux)	OUT="hpux-parisc-$SUFFIX" ;;
   *-aix)
 	KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
 	KERNEL_BITS=${KERNEL_BITS:-32}
 	OBJECT_MODE=${OBJECT_MODE:-32}
-	if [ "$CC" = "gcc" ]; then
+	if [ $GCCVER -gt 0 ]; then
 	    OUT="aix-gcc"
           if [ $OBJECT_MODE -eq 64 ]; then
             echo 'Your $OBJECT_MODE was found to be set to 64'
@@ -875,7 +890,7 @@
 #fi
 
 if [ -z "$OUT" ]; then
-  OUT="$CC"
+  OUT="$SUFFIX"
 fi
 
 if [ ".$PERL" = . ] ; then
@@ -907,9 +922,9 @@
 # compiler for the platform ... in which case we add it on
 # the end ... otherwise we leave it off
 
-$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
+$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null
 if [ $? = "0" ]; then
-  OUT="$OUT-$CC"
+  OUT="$OUT-$SUFFIX"
 fi
 
 OUT="$PREFIX$OUT"
@@ -919,9 +934,9 @@
   echo Configuring for $OUT
 
   if [ "$TEST" = "true" ]; then
-    echo $PERL ./Configure $OUT $options
+    echo $PERL ./Configure $OUT --with-cc=$CC $options
   else
-    $PERL ./Configure $OUT $options
+    $PERL ./Configure $OUT --with-cc=$CC $options
   fi
 else
   echo "This system ($OUT) is not supported. See file INSTALL for details."

--- NEW FILE: openssl.spec ---
##
##  openssl.spec -- OpenPKG RPM Package Specification
##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
##
##  Permission to use, copy, modify, and distribute this software for
##  any purpose with or without fee is hereby granted, provided that
##  the above copyright notice and this permission notice appear in all
##  copies.
##
##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
##  SUCH DAMAGE.
##

#   package version
%define       V_openssl 1.0.0
%define       V_zlib    1.2.5

#   package information
Name:         openssl
Summary:      Cryptography and SSL/TLS Toolkit
URL:          http://www.openssl.org/
Vendor:       The OpenSSL Project
Packager:     OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class:        CORE
Group:        SSL
License:      BSD-style
Version:      %{V_openssl}
Release:      20100420

#   package options
%option       with_zlib     no
%option       with_idea     no
%option       with_threads  no
%option       with_pic      no

#   list of sources
Source0:      ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
Source1:      http://www.zlib.net/zlib-%{V_zlib}.tar.gz
Patch0:       openssl.patch

#   build information
Prefix:       %{l_prefix}
BuildRoot:    %{l_buildroot}
BuildPreReq:  OpenPKG, openpkg >= 20060823, perl, make, gcc
PreReq:       OpenPKG, openpkg >= 20060823, perl
%if "%{with_zlib}" == "yes"
BuildPreReq:  zlib
PreReq:       zlib
%endif
AutoReq:      no
AutoReqProv:  no

%description
    The OpenSSL Project is a collaborative effort to develop a robust,
    commercial-grade, full-featured, and Open Source toolkit implementing the
    Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
    protocols with full-strength cryptography world-wide. The project is
    managed by a worldwide community of volunteers that use the Internet to
    communicate, plan, and develop the OpenSSL tookit and its related
    documentation.

%prep
    %setup -q
%if "%{with_zlib}" == "yes"
    %setup -q -D -T -a 1
%endif
    %patch -p0
    %{l_shtool} subst \
        -e 's;-march=pentium;;g' \
        -e 's;-m486;-march=i486;g' \
        Configure
    %{l_shtool} subst \
        -e 's;BN_LLONG *;;' \
        Configure
    %{l_shtool} subst \
        -e 's;test "$OSTYPE" = msdosdjgpp;true;' \
        util/point.sh
    %{l_shtool} subst \
        -e 's;^\(#define DEVRANDOM_EGD\);\1 "%{l_prefix}/var/prngd/prngd.socket",;' \
        e_os.h
    %{l_shtool} subst \
        -e 's;^\(my $openssl\)\;;\1 = "%{l_prefix}/bin/openssl"\;;' \
        tools/c_rehash.in
%if "%{with_zlib}" == "yes"
    %{l_shtool} subst \
        -e "s;\\(-DZLIB_SHARED\\);-I`pwd`/zlib-%{V_zlib} \\1;" \
        Configure
    %{l_shtool} subst \
        -e 's;, "z",;, "%{l_prefix}/lib/openssl/zlib.so",;' \
        crypto/comp/c_zlib.c
%endif

%build
%if "%{with_zlib}" == "yes"
    ( cd zlib-%{V_zlib}
      CC="%{l_cc}" \
      CFLAGS="%{l_cflags -O}" \
      ./configure \
          --prefix=%{l_prefix} \
          --shared
      %{l_make} %{l_mflags -O}
    ) || exit $?
%endif
    %{l_prefix}/bin/perl util/perlpath.pl %{l_prefix}/bin/perl
    options="no-shared no-dso"
%if "%{with_pic}" == "yes"
    options="$options -fPIC"
    case "%{l_platform -t}" in
        amd64-*          ) options="$options no-asm" ;;
        sparc64-freebsd* ) options="$options no-asm" ;;
    esac
%else
    case "%{l_platform -t}" in
        amd64-*          ) options="$options -fPIC no-asm" ;;
        ia64-*           ) options="$options -fPIC"        ;;
        sparc64-freebsd* ) options="$options -fPIC no-asm" ;;
    esac
%endif
%if "%{with_zlib}" == "yes"
    options="$options zlib-dynamic"
%else
    options="$options no-zlib"
%endif
%if "%{with_idea}" != "yes"
    options="$options no-idea"
%endif
%if "%{with_threads}" == "yes"
    options="$options threads"
%else
    options="$options no-threads"
%endif
    PERL=%{l_prefix}/bin/perl \
    ./config \
        --prefix=%{l_prefix} \
        --openssldir=%{l_prefix}/etc/openssl \
        --libdir=lib \
        $options
    %{l_make} %{l_mflags}

%install
    rm -rf $RPM_BUILD_ROOT
    %{l_make} %{l_mflags} install INSTALL_PREFIX=$RPM_BUILD_ROOT
    strip $RPM_BUILD_ROOT%{l_prefix}/bin/openssl >/dev/null 2>&1 || true
    ( cd $RPM_BUILD_ROOT%{l_prefix}
      rmdir lib/engines
      rm -rf etc/openssl/private
      rm -rf etc/openssl/certs
      rm -rf etc/openssl/misc
      rm -rf etc/openssl/lib
      mv etc/openssl/man man
      mv bin/c_rehash bin/openssl-crehash
      cd man
      for dir in man[1-9]; do
          for file in `cd $dir; echo *`; do
              mv $dir/$file $dir/openssl_$file
          done
      done
    ) || exit $?
%if "%{with_zlib}" == "yes"
    %{l_shtool} mkdir -f -p -m 755 \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/openssl
    %{l_shtool} install -c -m 644 \
        zlib-%{V_zlib}/libz.so \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/openssl/zlib.so
%endif
    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
        %{l_files_std} \
        '%config %{l_prefix}/etc/openssl/openssl.cnf'

%files -f files

%clean
    rm -rf $RPM_BUILD_ROOT




From cvs at kolab.org  Wed Apr 21 17:10:11 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 17:10:11 +0200 (CEST)
Subject: gunnar: server/clamav Makefile,1.7.2.4,1.7.2.5 
Message-ID: <20100421151011.B7C79600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv6803

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Update download location.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -d -r1.7.2.4 -r1.7.2.5
--- Makefile	21 Apr 2010 14:48:42 -0000	1.7.2.4
+++ Makefile	21 Apr 2010 15:10:09 -0000	1.7.2.5
@@ -5,7 +5,7 @@
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-SOURCE_0=http://files.kolab.org/incoming/wrobel/$(NAME)-$(VERSION).tar.gz
+SOURCE_0=http://files.kolab.org/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 
 .PHONY: all



From cvs at kolab.org  Wed Apr 21 17:32:29 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 17:32:29 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.107,1.398.2.108 
Message-ID: <20100421153229.D72DC600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7481

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Update release-notes with changes in kolabd

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.107
retrieving revision 1.398.2.108
diff -u -d -r1.398.2.107 -r1.398.2.108
--- release-notes.txt	27 Feb 2010 21:29:40 -0000	1.398.2.107
+++ release-notes.txt	21 Apr 2010 15:32:27 -0000	1.398.2.108
@@ -47,6 +47,9 @@
 
     - kolabd-2.2.?-20??????
 
+	Require the hash, json, and tokenizer modules in
+	php and apache-php.
+
         Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 



From cvs at kolab.org  Wed Apr 21 18:10:59 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 18:10:59 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.108,1.398.2.109 
Message-ID: <20100421161059.5D7A560015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8959

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Remove hash and tokenizer as the php and apache-php specs do not yet support these flags. Leave that change to HEAD.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.108
retrieving revision 1.398.2.109
diff -u -d -r1.398.2.108 -r1.398.2.109
--- release-notes.txt	21 Apr 2010 15:32:27 -0000	1.398.2.108
+++ release-notes.txt	21 Apr 2010 16:10:57 -0000	1.398.2.109
@@ -47,8 +47,7 @@
 
     - kolabd-2.2.?-20??????
 
-	Require the hash, json, and tokenizer modules in
-	php and apache-php.
+	Require the json module in php and apache-php.
 
         Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...



From cvs at kolab.org  Wed Apr 21 18:10:59 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 18:10:59 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.234.2.17,
	1.234.2.18 kolabd.spec.in, 1.44.2.2, 1.44.2.3 
Message-ID: <20100421161059.62F3B600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv8959/kolabd/kolabd

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolabd.spec.in 
Log Message:
Remove hash and tokenizer as the php and apache-php specs do not yet support these flags. Leave that change to HEAD.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.17
retrieving revision 1.234.2.18
diff -u -d -r1.234.2.17 -r1.234.2.18
--- ChangeLog	21 Apr 2010 14:55:51 -0000	1.234.2.17
+++ ChangeLog	21 Apr 2010 16:10:57 -0000	1.234.2.18
@@ -1,7 +1,6 @@
 2010-04-21  Gunnar Wrobel <wrobel at pardus.de>
 
-	* kolabd.spec.in: Require the hash, json, and tokenizer modules in
-	php and apache-php.
+	* kolabd.spec.in: Require the json module in php and apache-php.
 
 2010-02-27  Gunnar Wrobel <wrobel at pardus.de>
 

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.44.2.2
retrieving revision 1.44.2.3
diff -u -d -r1.44.2.2 -r1.44.2.3
--- kolabd.spec.in	21 Apr 2010 14:55:51 -0000	1.44.2.2
+++ kolabd.spec.in	21 Apr 2010 16:10:57 -0000	1.44.2.3
@@ -57,8 +57,8 @@
 PreReq:       Kolab_FreeBusy
 
 # what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes, php::with_hash = yes, php::with_json = yes, php::with_tokenizer = yes
-PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_spl = yes, apache-php::with_hash = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes
+PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes, php::with_json = yes
+PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_spl = yes, apache-php::with_json = yes
 
 PreReq:       imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
 PreReq:       perl-ssl



From cvs at kolab.org  Wed Apr 21 19:42:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 19:42:09 +0200 (CEST)
Subject: gunnar: server/openssl .cvsignore, 1.1, 1.2 Makefile, 1.1,
	1.2 openssl.patch, 1.1, 1.2 openssl.spec, 1.1, 1.2 
Message-ID: <20100421174209.E2C33600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/openssl
In directory doto:/tmp/cvs-serv11990

Added Files:
	.cvsignore Makefile openssl.patch openssl.spec 
Log Message:
Merge openssl-1.0.0 from the kolab_2_2_branch.







From cvs at kolab.org  Wed Apr 21 20:01:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 20:01:01 +0200 (CEST)
Subject: gunnar: server/apache Makefile,1.26.2.1,1.26.2.2 
Message-ID: <20100421180101.488D3600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv12609

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add missing rc.apache.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Attic/Makefile,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -d -r1.26.2.1 -r1.26.2.2
--- Makefile	21 Apr 2010 14:57:59 -0000	1.26.2.1
+++ Makefile	21 Apr 2010 18:00:59 -0000	1.26.2.2
@@ -7,7 +7,7 @@
 KOLABRELEASE = $(RELEASE)
 
 SOURCE_0=http://www.apache.org/dist/httpd/httpd-$(VERSION).tar.bz2
-EXTRA=apache.base apache.conf apache.patch apache.sh
+EXTRA=apache.base apache.conf apache.patch apache.sh rc.apache
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Wed Apr 21 20:15:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 20:15:01 +0200 (CEST)
Subject: gunnar: server/apache rc.apache,NONE,1.2.2.1 
Message-ID: <20100421181501.1BF35600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv13234

Added Files:
      Tag: kolab_2_2_branch
	rc.apache 
Log Message:
Add missing rc.apache.

--- NEW FILE: rc.apache ---
#!@l_prefix@/bin/openpkg rc
##
##  rc.apache -- Run-Commands
##

%config
    apache_enable="$openpkg_rc_def"
    apache_log_files="@l_prefix@/var/apache/log/access.log"
    apache_log_rotsteps="10"
    apache_log_rotminsize="10M"
    apache_log_rotcomplevel="9"
    apache_log_rotprolog="true"
    apache_log_rotepilog="true"
    apache_err_files="@l_prefix@/var/apache/log/error.log"
    apache_err_rotsteps="10"
    apache_err_rotminsize="1M"
    apache_err_rotcomplevel="9"
    apache_err_rotprolog="true"
    apache_err_rotepilog="true"
    apache_cgi_files="@l_prefix@/var/apache/log/script.log"
    apache_cgi_rotsteps="10"
    apache_cgi_rotminsize="1M"
    apache_cgi_rotcomplevel="9"
    apache_cgi_rotprolog="true"
    apache_cgi_rotepilog="true"
    apache_cachesize="10M"

%common
    apache_pidfile="@l_prefix@/var/apache/run/apache.pid"
    apache_cachedir="@l_prefix@/var/apache/run/apache.cache"
    apache_signal () {
        [ -f $apache_pidfile ] && kill -$1 `cat $apache_pidfile`
    }

%status -u @l_susr@ -o
    apache_usable="no"
    apache_active="no"
    @l_prefix@/sbin/apache -t 2>/dev/null && apache_usable="yes"
    rcService apache enable yes && \
        apache_signal 0 && apache_active="yes"
    echo "apache_enable=\"$apache_enable\""
    echo "apache_usable=\"$apache_usable\""
    echo "apache_active=\"$apache_active\""

%start -u @l_susr@
    rcService apache enable yes || exit 0
    rcService apache active yes && exit 0
    ( cd @l_prefix@/var/apache/run
      [ -e @l_prefix@/etc/apache/apache.sh ] &&
          . @l_prefix@/etc/apache/apache.sh
      @l_prefix@/sbin/apache
    ) || exit $?

%stop -u @l_susr@
    rcService apache enable yes || exit 0
    rcService apache active no  && exit 0
    @l_prefix@/sbin/apache -k stop
    sleep 2

%restart -u @l_susr@
    rcService apache enable yes || exit 0
    rcService apache active no  && exit 0
    rc apache stop start

%reload -u @l_susr@
    rcService apache enable yes || exit 0
    rcService apache active no  && exit 0
    @l_prefix@/sbin/apache -k graceful

%daily -u @l_susr@
    rcService apache enable yes || exit 0
    rcTmp -i
    hintfile=`rcTmp -f -n hint`
    shtool rotate -f \
        -n ${apache_log_rotsteps} -s ${apache_log_rotminsize} -d \
        -z ${apache_log_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "$apache_log_rotprolog" \
        -E "$apache_log_rotepilog; echo 1 >$hintfile" \
        ${apache_log_files}
    shtool rotate -f \
        -n ${apache_err_rotsteps} -s ${apache_err_rotminsize} -d \
        -z ${apache_err_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "$apache_err_rotprolog" \
        -E "$apache_err_rotepilog; echo 1 >$hintfile" \
        ${apache_err_files}
    shtool rotate -f \
        -n ${apache_cgi_rotsteps} -s ${apache_cgi_rotminsize} -d \
        -z ${apache_cgi_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
        -P "$apache_cgi_rotprolog" \
        -E "$apache_cgi_rotepilog; echo 1 >$hintfile" \
        ${apache_cgi_files}
    if [ ". at with_mod_filecache@" = .yes ]; then
        @l_prefix@/sbin/htcacheclean \
            -n -t -l "$apache_cachesize" -p "$apache_cachedir"
    fi
    if [ -s $hintfile ]; then
        @l_prefix@/sbin/apache -k graceful
    fi
    rcTmp -k




From cvs at kolab.org  Wed Apr 21 20:32:25 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 20:32:25 +0200 (CEST)
Subject: gunnar: server/php/patches/php-5.3.2 - New directory 
Message-ID: <20100421183225.CF80C600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php/patches/php-5.3.2
In directory doto:/tmp/cvs-serv13798/php-5.3.2

Log Message:
Directory /kolabrepository/server/php/patches/php-5.3.2 added to the repository




From cvs at kolab.org  Wed Apr 21 20:33:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 20:33:43 +0200 (CEST)
Subject: gunnar: server/php/patches/php-5.3.2
	KOLAB_php-5.3.2_Annotations.patch, NONE,
	1.1 KOLAB_php-5.3.2_myrights.patch, NONE, 1.1 
Message-ID: <20100421183343.BF7E9600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php/patches/php-5.3.2
In directory doto:/tmp/cvs-serv13863/php-5.3.2

Added Files:
	KOLAB_php-5.3.2_Annotations.patch 
	KOLAB_php-5.3.2_myrights.patch 
Log Message:
Patches for 5.3.2.

--- NEW FILE: KOLAB_php-5.3.2_Annotations.patch ---
Provides get/set ANNOTATIONS support to PHP. [Version: 5.2.6]

diff -r 76412c484360 ext/imap/php_imap.c
--- a/ext/imap/php_imap.c	Wed Dec 23 22:18:41 2009 +0100
+++ b/ext/imap/php_imap.c	Wed Dec 23 22:46:34 2009 +0100
@@ -161,6 +161,22 @@
 	ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
 #endif
+#if defined(HAVE_IMAP2005)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setannotation, 0, 0, 5)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, entry)
+	ZEND_ARG_INFO(0, attr)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getannotation, 0, 0, 4)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, entry)
+	ZEND_ARG_INFO(0, attr)
+ZEND_END_ARG_INFO()
+#endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1)
 	ZEND_ARG_INFO(0, stream_id)
@@ -402,6 +418,11 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status, 0, 0, 3)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status_current, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
@@ -504,6 +525,7 @@
 	PHP_FE(imap_binary,								arginfo_imap_binary)
 	PHP_FE(imap_utf8,								arginfo_imap_utf8)
 	PHP_FE(imap_status,								arginfo_imap_status)
+	PHP_FE(imap_status_current,						arginfo_imap_status_current)
 	PHP_FE(imap_mailboxmsginfo,						arginfo_imap_mailboxmsginfo)
 	PHP_FE(imap_setflag_full,						arginfo_imap_setflag_full)
 	PHP_FE(imap_clearflag_full,						arginfo_imap_clearflag_full)
@@ -534,6 +556,10 @@
 	PHP_FE(imap_setacl,								arginfo_imap_setacl)
 	PHP_FE(imap_getacl,								arginfo_imap_getacl)
 #endif
+#if defined(HAVE_IMAP2005)
+ 	PHP_FE(imap_setannotation,						arginfo_imap_setannotation)
+ 	PHP_FE(imap_getannotation,						arginfo_imap_getannotation)
+#endif
 
 	PHP_FE(imap_mail,								arginfo_imap_mail)
 
@@ -795,6 +821,30 @@
 /* }}} */
 #endif
 
+#if defined(HAVE_IMAP2005)
+/* {{{ mail_getannotation
+ *
+ * Mail GET_ANNOTATION callback
+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
+ */
+void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist)
+{
+        ANNOTATION_VALUES *cur;
+        
+	TSRMLS_FETCH();
+
+	/* walk through the ANNOTATION_VALUES */
+        
+	for(cur = alist->values; cur; cur = cur->next) {
+	    if (cur->value)
+		add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1);
+	    else
+		add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, "", 0, 1);
+	}
+}
+/* }}} */
+#endif
+
 /* {{{ PHP_GINIT_FUNCTION
  */
 static PHP_GINIT_FUNCTION(imap)
@@ -820,6 +870,7 @@
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
 	imap_globals->quota_return = NIL;
 	imap_globals->imap_acl_list = NIL;
+	imap_globals->imap_annotation_list = NIL;
 #endif
 	imap_globals->gets_stream = NIL;
 }
@@ -1475,7 +1526,119 @@
 }
 /* }}} */
 #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
-
+ 
+#if defined(HAVE_IMAP2005)
+
+/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value)
+	Sets an annotation for a given mailbox */
+PHP_FUNCTION(imap_setannotation)
+{
+	zval **streamind, **mailbox, **entry, **attr, **value;
+	pils *imap_le_struct;
+        long ret;
+	
+        // TODO: Use zend_parse_parameters here
+	if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(mailbox);
+	convert_to_string_ex(entry);
+	convert_to_string_ex(attr);
+	convert_to_string_ex(value);
+
+        // create annotation object
+        ANNOTATION *annotation = mail_newannotation();
+        if (!annotation)
+            RETURN_FALSE;
+        annotation->values = mail_newannotationvalue();
+        if (!annotation->values) {
+            mail_free_annotation(&annotation);
+            RETURN_FALSE;
+        }
+        
+        // fill in annotation values
+        annotation->mbox = Z_STRVAL_PP(mailbox);
+        annotation->entry = Z_STRVAL_PP(entry);
+        annotation->values->attr = Z_STRVAL_PP(attr);
+        annotation->values->value = Z_STRVAL_PP(value);
+        
+        ret = imap_setannotation(imap_le_struct->imap_stream, annotation);
+                
+        // make sure mail_free_annotation doesn't free our variables
+        annotation->mbox = NULL;
+        annotation->entry = NULL;
+        annotation->values->attr = NULL;
+        annotation->values->value = NULL;
+        mail_free_annotation(&annotation);
+        
+        RETURN_BOOL(ret);
+}
+/* }}} */
+
+/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr)
+	Gets the ACL for a given mailbox */
+PHP_FUNCTION(imap_getannotation)
+{
+	zval **streamind, **mailbox, **entry, **attr;
+	pils *imap_le_struct;
+        long ret;
+
+	if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(mailbox);
+	convert_to_string_ex(entry);
+	convert_to_string_ex(attr);
+
+	/* initializing the special array for the return values */
+	if (array_init(return_value) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+        // fillup calling parameters
+        STRINGLIST *entries = mail_newstringlist();
+        if (!entries)
+            RETURN_FALSE;
+        
+        STRINGLIST *cur = entries;
+        cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry));
+        cur->text.size = Z_STRLEN_PP(entry);
+        cur->next = NIL;
+        
+        STRINGLIST *attributes = mail_newstringlist();
+        if (!attributes)
+            RETURN_FALSE;
+        cur = attributes;
+        cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr));
+        cur->text.size = Z_STRLEN_PP(attr);
+        cur->next = NIL;
+        
+        IMAPG(imap_annotation_list) = return_value;
+        
+        /* set the callback for the GET_ANNOTATION function */
+	mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation);
+        ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes);
+        
+        mail_free_stringlist(&entries);
+        mail_free_stringlist(&attributes);
+        
+        if (!ret) {
+            zval_dtor(return_value);
+            RETURN_FALSE;
+        }
+        
+	IMAPG(imap_annotation_list) = NIL;
+}
+/* }}} */
+
+#endif /* HAVE_IMAP2005 */
+ 
 /* {{{ proto bool imap_expunge(resource stream_id)
    Permanently delete all messages marked for deletion */
 PHP_FUNCTION(imap_expunge)
@@ -3118,6 +3281,42 @@
 }
 /* }}} */
 
+/* {{{ proto object imap_status_current(resource stream_id, int options)
+   Get (cached) status info from current mailbox */
+PHP_FUNCTION(imap_status_current)
+{
+ 	zval **streamind, **pflags;
+	pils *imap_le_struct;
+	long flags = 0L;
+
+ 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) {
+ 		ZEND_WRONG_PARAM_COUNT();
+ 	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_long_ex(pflags);
+	flags = Z_LVAL_PP(pflags);
+
+	if (object_init(return_value) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (flags & SA_MESSAGES) {
+		add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs);
+	}
+	if (flags & SA_RECENT) {
+		add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent);
+	}
+	if (flags & SA_UIDNEXT) {
+		add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1);
+	}
+	if (flags & SA_UIDVALIDITY) {
+		add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity);
+	}
+}
+/* }}} */
+
 /* {{{ proto object imap_status(resource stream_id, string mailbox, int options)
    Get status info from a mailbox */
 PHP_FUNCTION(imap_status)
diff -r 76412c484360 ext/imap/php_imap.h
--- a/ext/imap/php_imap.h	Wed Dec 23 22:18:41 2009 +0100
+++ b/ext/imap/php_imap.h	Wed Dec 23 22:46:34 2009 +0100
@@ -153,6 +153,7 @@
 PHP_FUNCTION(imap_lsub_full);
 PHP_FUNCTION(imap_create);
 PHP_FUNCTION(imap_rename);
+PHP_FUNCTION(imap_status_current);
 PHP_FUNCTION(imap_status);
 PHP_FUNCTION(imap_bodystruct);
 PHP_FUNCTION(imap_fetch_overview);
@@ -173,6 +174,9 @@
 PHP_FUNCTION(imap_thread);
 PHP_FUNCTION(imap_timeout);
 
+// TODO: Needs fixing in configure in
+#define HAVE_IMAP2005 1
+
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
 PHP_FUNCTION(imap_get_quota);
 PHP_FUNCTION(imap_get_quotaroot);
@@ -180,7 +184,10 @@
 PHP_FUNCTION(imap_setacl);
 PHP_FUNCTION(imap_getacl);
 #endif
-
+#if defined(HAVE_IMAP2005)
+PHP_FUNCTION(imap_setannotation);
+PHP_FUNCTION(imap_getannotation);
+#endif
 
 ZEND_BEGIN_MODULE_GLOBALS(imap)
 	char *imap_user;
@@ -211,6 +218,9 @@
 	zval **quota_return;
 	zval *imap_acl_list;
 #endif
+#if defined(HAVE_IMAP2005)
+        zval *imap_annotation_list;
+#endif
 	/* php_stream for php_mail_gets() */
 	php_stream *gets_stream;
 ZEND_END_MODULE_GLOBALS(imap)

--- NEW FILE: KOLAB_php-5.3.2_myrights.patch ---
diff -r 5daa8cce8706 ext/imap/php_imap.c
--- a/ext/imap/php_imap.c	Wed Dec 23 22:46:34 2009 +0100
+++ b/ext/imap/php_imap.c	Wed Dec 23 22:49:02 2009 +0100
@@ -157,6 +157,11 @@
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_myrights, 0, 0, 2)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
@@ -555,6 +560,7 @@
 	PHP_FE(imap_set_quota,							arginfo_imap_set_quota)
 	PHP_FE(imap_setacl,								arginfo_imap_setacl)
 	PHP_FE(imap_getacl,								arginfo_imap_getacl)
+	PHP_FE(imap_myrights,							arginfo_imap_myrights)
 #endif
 #if defined(HAVE_IMAP2005)
  	PHP_FE(imap_setannotation,						arginfo_imap_setannotation)
@@ -817,6 +823,20 @@
 	for(; alist; alist = alist->next) {
 		add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1);
 	}
+}
+/* }}} */
+
+/* {{{ mail_myrights
+ *
+ * Mail MYRIGHTS callback
+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
+ */
+void mail_myrights(MAILSTREAM *stream, char *mailbox, char *rights)
+{
+	TSRMLS_FETCH();
+
+	ZVAL_STRING(IMAPG(imap_acl_list), rights, 1)
+
 }
 /* }}} */
 #endif
@@ -1525,6 +1545,36 @@
 	IMAPG(imap_acl_list) = NIL;
 }
 /* }}} */
+
+/* {{{ proto string imap_myrights(resource stream_id, string mailbox)
+	Gets my rights (ACL) for a given mailbox */
+PHP_FUNCTION(imap_myrights)
+{
+	zval **streamind, **mailbox;
+	pils *imap_le_struct;
+
+	if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(mailbox);
+
+	IMAPG(imap_acl_list) = return_value;
+
+	/* set the callback for the GET_ACL function */
+	mail_parameters(NIL, SET_MYRIGHTS, (void *) mail_myrights);
+	if(!imap_myrights(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) {
+		php_error(E_WARNING, "c-client imap_myrights failed");
+		zval_dtor(return_value);
+		RETURN_FALSE;
+	}
+
+	IMAPG(imap_acl_list) = NIL;
+}
+/* }}} */
+
 #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
  
 #if defined(HAVE_IMAP2005)
diff -r 5daa8cce8706 ext/imap/php_imap.h
--- a/ext/imap/php_imap.h	Wed Dec 23 22:46:34 2009 +0100
+++ b/ext/imap/php_imap.h	Wed Dec 23 22:49:02 2009 +0100
@@ -183,6 +183,7 @@
 PHP_FUNCTION(imap_set_quota);
 PHP_FUNCTION(imap_setacl);
 PHP_FUNCTION(imap_getacl);
+PHP_FUNCTION(imap_myrights);
 #endif
 #if defined(HAVE_IMAP2005)
 PHP_FUNCTION(imap_setannotation);



From cvs at kolab.org  Wed Apr 21 20:38:57 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 20:38:57 +0200 (CEST)
Subject: gunnar: server/apache .cvsignore, 1.2, 1.3 Makefile, 1.26,
	1.27 apache.base, 1.3, 1.4 apache.conf, 1.2, 1.3 apache.patch,
	1.1, 1.2 apache.sh, 1.1, 1.2 apache.spec, 1.8, 1.9 rc.apache,
	1.2, 1.3 
Message-ID: <20100421183857.C041D600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv13991

Added Files:
	.cvsignore Makefile apache.base apache.conf apache.patch 
	apache.sh apache.spec rc.apache 
Log Message:
Merge apache-2.2.15 from the kolab_2_2 branch.











From cvs at kolab.org  Wed Apr 21 21:29:23 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 21:29:23 +0200 (CEST)
Subject: gunnar: server/php .cvsignore, 1.6, 1.7 Makefile, 1.27,
	1.28 kolab.patch, 1.19, 1.20 
Message-ID: <20100421192923.81DB2600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv15511

Modified Files:
	.cvsignore Makefile kolab.patch 
Log Message:
Update to php-5.3.2 which builds with openssl-1.0.0.0

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/php/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- .cvsignore	4 Jan 2010 15:51:57 -0000	1.6
+++ .cvsignore	21 Apr 2010 19:29:21 -0000	1.7
@@ -1,2 +1,3 @@
 *.src.rpm
-*.tar.gz
\ No newline at end of file
+*.tar.gz
+*.tar.bz2

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile	9 Mar 2010 21:39:11 -0000	1.27
+++ Makefile	21 Apr 2010 19:29:21 -0000	1.28
@@ -3,11 +3,11 @@
 PACKAGE=php
 DOWNLOAD_VERSION=5.3.1
 OPENPKG_RELEASE=20091129
-VERSION=5.3.1
-RELEASE=20091129_kolab3
+VERSION=5.3.2
+RELEASE=20091129_kolab1
 
 SOURCE_URL=http://www.php.net/distributions
-SOURCE_0=php-5.3.1.tar.gz
+SOURCE_0=php-5.3.2.tar.bz2
 
 PATCHES=patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
         patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolab.patch	9 Mar 2010 21:39:11 -0000	1.19
+++ kolab.patch	21 Apr 2010 19:29:21 -0000	1.20
@@ -5,6 +5,15 @@
 diff -u -B -r1.183 php.spec
 --- php.spec	11 May 2008 08:31:26 -0000	1.183
 +++ php.spec	13 May 2008 14:58:33 -0000
+@@ -22,7 +22,7 @@
+ ##
+ 
+ #   package versions
+-%define       V_php                     5.3.1
++%define       V_php                     5.3.2
+ %define       V_php_suhosin_p           5.3.1-0.9.8
+ %define       V_php_suhosin_e           0.9.29
+ %define       V_php_kolab               5.2.8
 @@ -39,7 +39,7 @@
  Group:        Language
  License:      PHP



From cvs at kolab.org  Wed Apr 21 21:29:23 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 21:29:23 +0200 (CEST)
Subject: gunnar: server/php/patches/php-5.3.2 series,NONE,1.1 
Message-ID: <20100421192923.85779600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php/patches/php-5.3.2
In directory doto:/tmp/cvs-serv15511/patches/php-5.3.2

Added Files:
	series 
Log Message:
Update to php-5.3.2 which builds with openssl-1.0.0.0

--- NEW FILE: series ---
KOLAB_Annotations.patch
KOLAB_myrights.patch



From cvs at kolab.org  Wed Apr 21 23:13:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 23:13:15 +0200 (CEST)
Subject: gunnar: server/apache-php .cvsignore, 1.2, 1.3 Makefile, 1.15,
	1.16 kolab.patch, 1.9, 1.10 
Message-ID: <20100421211315.EA7F5600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv18837

Modified Files:
	.cvsignore Makefile kolab.patch 
Log Message:
Update to 5.3.2 which should compile with openssl-1.0.0

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/apache-php/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	4 Jan 2010 15:51:57 -0000	1.2
+++ .cvsignore	21 Apr 2010 21:13:13 -0000	1.3
@@ -1,2 +1,3 @@
 *.src.rpm
-*.tar.gz
\ No newline at end of file
+*.tar.gz
+*.tar.bz2

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	17 Jan 2010 13:22:55 -0000	1.15
+++ Makefile	21 Apr 2010 21:13:13 -0000	1.16
@@ -3,11 +3,11 @@
 PACKAGE=apache-php
 DOWNLOAD_VERSION=5.3.1
 OPENPKG_RELEASE=20091129
-VERSION=5.3.1
+VERSION=5.3.2
 RELEASE=20091129_kolab1
 
 SOURCE_URL=http://www.php.net/distributions
-SOURCE_0=php-5.3.1.tar.gz
+SOURCE_0=php-5.3.2.tar.bz2
 
 PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
         ../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.patch	24 Dec 2009 08:35:50 -0000	1.9
+++ kolab.patch	21 Apr 2010 21:13:13 -0000	1.10
@@ -5,6 +5,15 @@
 diff -u -B -r1.30 apache-php.spec
 --- apache-php.spec	14 May 2008 10:38:56 -0000	1.30
 +++ apache-php.spec	15 May 2008 05:47:24 -0000
+@@ -22,7 +22,7 @@
+ ##
+ 
+ #   package versions
+-%define       V_php                     5.3.1
++%define       V_php                     5.3.2
+ %define       V_php_suhosin_p           5.3.1-0.9.8
+ %define       V_php_suhosin_e           0.9.29
+ %define       V_php_kolab               5.2.8
 @@ -39,7 +39,7 @@
  Group:        Web
  License:      PHP



From cvs at kolab.org  Wed Apr 21 23:20:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Apr 2010 23:20:22 +0200 (CEST)
Subject: gunnar: server/clamav clamav.spec,1.7,1.8 
Message-ID: <20100421212022.590E3600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv19060/clamav

Modified Files:
	clamav.spec 
Log Message:
MFB: Update clamav to 0.96.

Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- clamav.spec	5 Jan 2010 12:58:43 -0000	1.7
+++ clamav.spec	21 Apr 2010 21:20:20 -0000	1.8
@@ -29,8 +29,8 @@
 Packager:     Intevation GmbH
 Group:        AntiVirus
 License:      GPL
-Version:      0.95.3
-Release:      20091030
+Version:      0.96
+Release:      20100421
 
 #   package options
 %option       with_milter  no



From cvs at kolab.org  Thu Apr 22 11:39:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 11:39:50 +0200 (CEST)
Subject: bernhard: doc/proko2-doc doc2.sxw,1.72,1.73 
Message-ID: <20100422093950.12410600577@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/proko2-doc
In directory doto:/tmp/cvs-serv15049

Modified Files:
	doc2.sxw 
Log Message:
Kontact configuration 2.d)2) Free/Busy Lists: Better phrasing when Free/Busy Lists are generated on the server.


Index: doc2.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
Binary files /tmp/cvsfP4DOk and /tmp/cvs1lra7k differ



From cvs at kolab.org  Thu Apr 22 11:49:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 11:49:36 +0200 (CEST)
Subject: bernhard: doc/www/src documentation.html.m4,1.39,1.40 
Message-ID: <20100422094936.64551600577@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv15590

Modified Files:
	documentation.html.m4 
Log Message:
New doc2 revision.


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- documentation.html.m4	18 Feb 2009 08:18:31 -0000	1.39
+++ documentation.html.m4	22 Apr 2010 09:49:34 -0000	1.40
@@ -31,8 +31,8 @@
 
 <h3>Setup</h3>
 <ul>
- <li>Kolab Server 2.0 and KDE Client "Proko2 Branch" Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):<br>
-     <a href="./doc/doc2-1.72.pdf">Doc2, Version 1.72 as pdf</a>
+ <li>Kolab Server 2.0 and KDE Client "Proko2 Branch" Setup (aka Doc2 2MB):<br>
+     <a href="./doc/doc2-1.73.pdf">Doc2, Version 1.73 as pdf</a>
     |
      <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/doc2.sxw"
        >CVS HEAD as sxw</a>



From cvs at kolab.org  Thu Apr 22 15:23:32 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:23:32 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.536,1.537 
Message-ID: <20100422132332.1B7DA600560@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23557

Modified Files:
	release-notes.txt 
Log Message:
Added missing entry for kolab/issue4176
(no change was needed in HEAD, but we list the history of stable, too)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -d -r1.536 -r1.537
--- release-notes.txt	20 Apr 2010 04:53:56 -0000	1.536
+++ release-notes.txt	22 Apr 2010 13:23:29 -0000	1.537
@@ -231,6 +231,8 @@
 	Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
+	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
+
     - kolab-webadmin-2.2.?-20??????
 
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))



From cvs at kolab.org  Thu Apr 22 15:25:12 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:25:12 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates local.cf.template.in, 1.1.2.1,
	1.1.2.2 
Message-ID: <20100422132512.038B5600560@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv23647/kolabd/kolabd/templates

Modified Files:
      Tag: kolab_2_2_branch
	local.cf.template.in 
Log Message:
additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)


Index: local.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/local.cf.template.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- local.cf.template.in	4 Jan 2010 10:16:45 -0000	1.1.2.1
+++ local.cf.template.in	22 Apr 2010 13:25:09 -0000	1.1.2.2
@@ -79,6 +79,38 @@
 score RCVD_IN_MAPS_DUL 0
 score RCVD_IN_MAPS_RSS 0
 score RCVD_IN_MAPS_NML 0
+score DNS_FROM_DOB 0
+score DNS_FROM_OPENWHOIS 0
+score RCVD_IN_DNSWL_HI 0
+score RCVD_IN_DNSWL_LOW 0
+score RCVD_IN_DNSWL_MED 0
+score RCVD_IN_IADB_DK 0
+score RCVD_IN_IADB_DOPTIN 0
+score RCVD_IN_IADB_DOPTIN_GT50 0
+score RCVD_IN_IADB_DOPTIN_LT50 0
+score RCVD_IN_IADB_EDDB 0
+score RCVD_IN_IADB_EPIA 0
+score RCVD_IN_IADB_GOODMAIL 0
+score RCVD_IN_IADB_LISTED 0
+score RCVD_IN_IADB_LOOSE 0
+score RCVD_IN_IADB_MI_CPEAR 0
+score RCVD_IN_IADB_MI_CPR_30 0
+score RCVD_IN_IADB_MI_CPR_MAT 0
+score RCVD_IN_IADB_ML_DOPTIN 0
+score RCVD_IN_IADB_NOCONTROL 0
+score RCVD_IN_IADB_OOO 0
+score RCVD_IN_IADB_OPTIN 0
+score RCVD_IN_IADB_OPTIN_GT50 0
+score RCVD_IN_IADB_OPTIN_LT50 0
+score RCVD_IN_IADB_OPTOUTONLY 0
+score RCVD_IN_IADB_RDNS 0
+score RCVD_IN_IADB_SENDERID 0
+score RCVD_IN_IADB_SPF 0
+score RCVD_IN_IADB_UNVERIFIED_1 0
+score RCVD_IN_IADB_UNVERIFIED_2 0
+score RCVD_IN_IADB_UT_CPEAR 0
+score RCVD_IN_IADB_UT_CPR_30 0
+score RCVD_IN_IADB_UT_CPR_MAT 0
 
 # disable all URI blacklists (from 25_uribl.cf)
 # (some require payment if used for many mailboxes)



From cvs at kolab.org  Thu Apr 22 15:25:12 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:25:12 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.234.2.18,1.234.2.19 
Message-ID: <20100422132512.05255600576@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23647/kolabd/kolabd

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.18
retrieving revision 1.234.2.19
diff -u -d -r1.234.2.18 -r1.234.2.19
--- ChangeLog	21 Apr 2010 16:10:57 -0000	1.234.2.18
+++ ChangeLog	22 Apr 2010 13:25:09 -0000	1.234.2.19
@@ -1,3 +1,7 @@
+2010-04-22  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* templates/local.cf.template.in: Disable further DNS blacklists.
+
 2010-04-21  Gunnar Wrobel <wrobel at pardus.de>
 
 	* kolabd.spec.in: Require the json module in php and apache-php.



From cvs at kolab.org  Thu Apr 22 15:25:12 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:25:12 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.109,1.398.2.110 
Message-ID: <20100422132512.04C0F600562@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23647

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.109
retrieving revision 1.398.2.110
diff -u -d -r1.398.2.109 -r1.398.2.110
--- release-notes.txt	21 Apr 2010 16:10:57 -0000	1.398.2.109
+++ release-notes.txt	22 Apr 2010 13:25:09 -0000	1.398.2.110
@@ -52,6 +52,7 @@
         Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
+	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
 
     - kolab-webadmin-2.2.?-20??????



From cvs at kolab.org  Thu Apr 22 15:25:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:25:22 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.537,1.538 
Message-ID: <20100422132522.C3F39600560@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23713

Modified Files:
	release-notes.txt 
Log Message:
additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -d -r1.537 -r1.538
--- release-notes.txt	22 Apr 2010 13:23:29 -0000	1.537
+++ release-notes.txt	22 Apr 2010 13:25:20 -0000	1.538
@@ -231,6 +231,7 @@
 	Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
+	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
 
     - kolab-webadmin-2.2.?-20??????



From cvs at kolab.org  Thu Apr 22 15:25:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:25:22 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.289,1.290 
Message-ID: <20100422132522.C840F600562@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23713/kolabd/kolabd

Modified Files:
	ChangeLog 
Log Message:
additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- ChangeLog	15 Apr 2010 14:45:38 -0000	1.289
+++ ChangeLog	22 Apr 2010 13:25:20 -0000	1.290
@@ -1,3 +1,7 @@
+2010-04-22  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* templates/local.cf.template.in: Disable further DNS blacklists.
+
 2010-04-15  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/resmgr.conf.template.in:



From cvs at kolab.org  Thu Apr 22 15:25:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:25:22 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates local.cf.template.in,1.5,1.6 
Message-ID: <20100422132522.CA846600576@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv23713/kolabd/kolabd/templates

Modified Files:
	local.cf.template.in 
Log Message:
additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)


Index: local.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/local.cf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- local.cf.template.in	31 Mar 2010 14:27:54 -0000	1.5
+++ local.cf.template.in	22 Apr 2010 13:25:20 -0000	1.6
@@ -74,6 +74,38 @@
 score RCVD_IN_MAPS_DUL 0
 score RCVD_IN_MAPS_RSS 0
 score RCVD_IN_MAPS_NML 0
+score DNS_FROM_DOB 0
+score DNS_FROM_OPENWHOIS 0
+score RCVD_IN_DNSWL_HI 0
+score RCVD_IN_DNSWL_LOW 0
+score RCVD_IN_DNSWL_MED 0
+score RCVD_IN_IADB_DK 0
+score RCVD_IN_IADB_DOPTIN 0
+score RCVD_IN_IADB_DOPTIN_GT50 0
+score RCVD_IN_IADB_DOPTIN_LT50 0
+score RCVD_IN_IADB_EDDB 0
+score RCVD_IN_IADB_EPIA 0
+score RCVD_IN_IADB_GOODMAIL 0
+score RCVD_IN_IADB_LISTED 0
+score RCVD_IN_IADB_LOOSE 0
+score RCVD_IN_IADB_MI_CPEAR 0
+score RCVD_IN_IADB_MI_CPR_30 0
+score RCVD_IN_IADB_MI_CPR_MAT 0
+score RCVD_IN_IADB_ML_DOPTIN 0
+score RCVD_IN_IADB_NOCONTROL 0
+score RCVD_IN_IADB_OOO 0
+score RCVD_IN_IADB_OPTIN 0
+score RCVD_IN_IADB_OPTIN_GT50 0
+score RCVD_IN_IADB_OPTIN_LT50 0
+score RCVD_IN_IADB_OPTOUTONLY 0
+score RCVD_IN_IADB_RDNS 0
+score RCVD_IN_IADB_SENDERID 0
+score RCVD_IN_IADB_SPF 0
+score RCVD_IN_IADB_UNVERIFIED_1 0
+score RCVD_IN_IADB_UNVERIFIED_2 0
+score RCVD_IN_IADB_UT_CPEAR 0
+score RCVD_IN_IADB_UT_CPR_30 0
+score RCVD_IN_IADB_UT_CPR_MAT 0
 
 # disable all URI blacklists (from 25_uribl.cf)
 # (some require payment if used for many mailboxes)



From cvs at kolab.org  Thu Apr 22 15:40:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 15:40:09 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.538,1.539 
Message-ID: <20100422134009.61321600560@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24249

Modified Files:
	release-notes.txt 
Log Message:
Spacing like in kolab_2_2_branch


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -d -r1.538 -r1.539
--- release-notes.txt	22 Apr 2010 13:25:20 -0000	1.538
+++ release-notes.txt	22 Apr 2010 13:40:07 -0000	1.539
@@ -238,9 +238,9 @@
 
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))
 
-   - imapd-2.3.13-20081020_kolab?
+    - imapd-2.3.13-20081020_kolab?
 
-       kolab/issue1141 (Cannot give users from other domains access to a folder (rt#5747))
+        kolab/issue1141 (Cannot give users from other domains access to a folder (rt#5747))
 
 
 Changes between 2.2.2 and 2.2.3:
@@ -398,7 +398,6 @@
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
 
 
-
     Packages in the OpenPKG based Kolab server release:
 
     - Kolab packages:
@@ -566,7 +565,6 @@
 	kolab/issue3549 (append_dot_mydomain allows circumventing
 	                 kolabfilter-verify-from-header)
 
-
     - Kolab_Filter-0.1.4-20090504
 
 	kolab/issue3521 (kolabmailboxfilter does not accept mail for
@@ -763,7 +761,6 @@
 	kolab/issue3420 (web client prefs and hooks should be
 	                 configurable via templates)
 	kolab/issue3513 (Clamav - new upstream version 0.95)
-
 
     - Kolab_Filter-0.1.4-20090401
 



From cvs at kolab.org  Thu Apr 22 16:05:00 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 16:05:00 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.110,1.398.2.111 
Message-ID: <20100422140500.5FECA600560@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24969

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
tab vs. space


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.110
retrieving revision 1.398.2.111
diff -u -d -r1.398.2.110 -r1.398.2.111
--- release-notes.txt	22 Apr 2010 13:25:09 -0000	1.398.2.110
+++ release-notes.txt	22 Apr 2010 14:04:58 -0000	1.398.2.111
@@ -49,7 +49,7 @@
 
 	Require the json module in php and apache-php.
 
-        Disable FH_DATE_PAST_20XX spamassassin test, which is broken
+	Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)



From cvs at kolab.org  Thu Apr 22 16:06:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 16:06:08 +0200 (CEST)
Subject: thomas: server/apache-php Makefile,1.16,1.17 
Message-ID: <20100422140608.10B9D600560@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv25315/apache-php

Modified Files:
	Makefile 
Log Message:
List 'with_hash' only once.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	21 Apr 2010 21:13:13 -0000	1.16
+++ Makefile	22 Apr 2010 14:06:06 -0000	1.17
@@ -21,7 +21,7 @@
               --define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
               --define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \
               --define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-              --define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
+              --define 'with_sqlite yes' --define 'with_spl yes' \
               --define 'with_json yes' --define 'with_tokenizer yes'
 
 include ../make-helper/package.mk



From cvs at kolab.org  Thu Apr 22 16:06:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 16:06:08 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolabd.spec.in,1.48,1.49 
Message-ID: <20100422140608.18436600576@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv25315/kolabd/kolabd

Modified Files:
	kolabd.spec.in 
Log Message:
List 'with_hash' only once.


Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- kolabd.spec.in	17 Jan 2010 13:24:20 -0000	1.48
+++ kolabd.spec.in	22 Apr 2010 14:06:06 -0000	1.49
@@ -57,8 +57,8 @@
 PreReq:       Kolab_FreeBusy
 
 # what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_hash = yes, php::with_json = yes, php::with_tokenizer = yes
-PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_hash = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes
+PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_json = yes, php::with_tokenizer = yes
+PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes
 
 PreReq:       imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
 PreReq:       perl-ssl



From cvs at kolab.org  Thu Apr 22 16:06:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 16:06:08 +0200 (CEST)
Subject: thomas: server/php Makefile,1.28,1.29 
Message-ID: <20100422140608.14984600561@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv25315/php

Modified Files:
	Makefile 
Log Message:
List 'with_hash' only once.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile	21 Apr 2010 19:29:21 -0000	1.28
+++ Makefile	22 Apr 2010 14:06:06 -0000	1.29
@@ -21,7 +21,7 @@
               --define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
               --define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \
               --define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-              --define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
+              --define 'with_sqlite yes' --define 'with_spl yes' \
               --define 'with_json yes' --define 'with_tokenizer yes'
 
 include ../make-helper/package.mk



From cvs at kolab.org  Thu Apr 22 16:06:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Apr 2010 16:06:21 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.539,1.540 
Message-ID: <20100422140621.DA61A600561@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv25374

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -d -r1.539 -r1.540
--- release-notes.txt	22 Apr 2010 13:40:07 -0000	1.539
+++ release-notes.txt	22 Apr 2010 14:06:19 -0000	1.540
@@ -97,6 +97,8 @@
 
     - kolabd-2.?.?-2009????
 
+	Require the tokenizer module in php and apache-php.
+
 	Corrected a syntax error in dist_conf/debian
 
 	Allow commas in dist_conf
@@ -140,7 +142,6 @@
 
 	kolab/issue991  (Better error message when connecting to sieve fails)
 	kolab/issue3401 (Change font color of the kolab-webadmin)
-	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
     - kolab-webclient-1.2.0-2009????
 
@@ -228,6 +229,8 @@
 
     - kolabd-2.2.?-20??????
 
+	Require the json module in php and apache-php.
+
 	Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
@@ -236,6 +239,7 @@
 
     - kolab-webadmin-2.2.?-20??????
 
+	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))
 
     - imapd-2.3.13-20081020_kolab?
@@ -305,10 +309,6 @@
 	                 Filter does not report lmtp error)
 	kolab/issue3610 (Mail to unknown at something.example.com gets
 	                 accepted and yields kolabmailboxfilter exit 38)
-	kolab/issue3768 (Kolab server 2.2.2 resmgr doesn't copy attendee
-	                 status (rt#5801))
-	kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event
-	                 attendee status values)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
 	kolab/issue3965 (Always accept: invitations get lost when
@@ -354,6 +354,10 @@
 	kolab/issue3567 (Migrate Horde prefs 2.2.0 -> 2.2.1, 2.2.2)
 	kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error
 	                 compareDateTime())
+	kolab/issue3768 (Kolab server 2.2.2 resmgr doesn't copy attendee
+	                 status (rt#5801))
+	kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event
+	                 attendee status values)
 	kolab/issue3844 (New user preference to specify order of date
 	                 input fields)
 	kolab/issue3846 (fix recurring events that are counted per week



From cvs at kolab.org  Tue Apr 27 13:04:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Apr 2010 13:04:40 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.540,1.541 
Message-ID: <20100427110440.034DE600581@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11684

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue4311 (Activate port 587 for email submission)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -d -r1.540 -r1.541
--- release-notes.txt	22 Apr 2010 14:06:19 -0000	1.540
+++ release-notes.txt	27 Apr 2010 11:04:37 -0000	1.541
@@ -130,6 +130,7 @@
 	kolab/issue3953 (use spamassassin_confdir in local.cf.template comment)
 	kolab/issue3962 (Names of config variables for "untrusted" text missleading)
 	kolab/issue3979 (improve kolab_ca.sh usability)
+	kolab/issue4311 (Activate port 587 for email submission)
 
     - kolab-fbview-1.2.0-2009????
 
@@ -208,6 +209,7 @@
 	kolab/issue4237 (additional event.default folder created by
 	                 kolabd (rt#6038))
 	kolab/issue4275 (LDAP.pm quota error)
+	kolab/issue4311 (Activate port 587 for email submission)
 
     - php-5.2.8-20081209_kolab3
 



From cvs at kolab.org  Tue Apr 27 13:04:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Apr 2010 13:04:40 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.290,1.291 
Message-ID: <20100427110440.04BA3600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv11684/kolabd/kolabd

Modified Files:
	ChangeLog 
Log Message:
kolab/issue4311 (Activate port 587 for email submission)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- ChangeLog	22 Apr 2010 13:25:20 -0000	1.290
+++ ChangeLog	27 Apr 2010 11:04:37 -0000	1.291
@@ -1,3 +1,8 @@
+2010-04-27  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* templates/master.cf.template.in: Added submission port, solving
+	kolab/issue4311 (Activate port 587 for email submission)
+
 2010-04-22  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/local.cf.template.in: Disable further DNS blacklists.



From cvs at kolab.org  Tue Apr 27 13:04:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Apr 2010 13:04:40 +0200 (CEST)
Subject: thomas: server/perl-kolab/perl-kolab/sbin kolab_bootstrap.in, 1.4,
	1.5 
Message-ID: <20100427110440.08BBF600583@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/perl-kolab/perl-kolab/sbin
In directory doto:/tmp/cvs-serv11684/perl-kolab/perl-kolab/sbin

Modified Files:
	kolab_bootstrap.in 
Log Message:
kolab/issue4311 (Activate port 587 for email submission)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_bootstrap.in	11 Mar 2010 16:19:48 -0000	1.4
+++ kolab_bootstrap.in	27 Apr 2010 11:04:37 -0000	1.5
@@ -249,6 +249,7 @@
 checkPort("pop3s server", 995);
 checkPort("smtp server", 25);
 checkPort("smtps server", 465);
+checkPort("submission server", 587);
 checkPort("amavis server", 10024);
 checkPort("postfix reinjection from kolabfilter", 10025);
 checkPort("postfix reinjection from amavis", 10026);



From cvs at kolab.org  Tue Apr 27 13:04:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Apr 2010 13:04:40 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates master.cf.template.in, 1.28,
	1.29 
Message-ID: <20100427110440.0A2BA600585@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv11684/kolabd/kolabd/templates

Modified Files:
	master.cf.template.in 
Log Message:
kolab/issue4311 (Activate port 587 for email submission)


Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- master.cf.template.in	13 Dec 2009 18:04:37 -0000	1.28
+++ master.cf.template.in	27 Apr 2010 11:04:37 -0000	1.29
@@ -18,6 +18,10 @@
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
 @@@bind_addr@@@:smtp      inet  n       -       n       -       -       smtpd
+@@@bind_addr@@@:submission inet n       -       n       -       -       smtpd
+  -o smtpd_enforce_tls=yes
+  -o smtpd_sasl_auth_enable=yes
+  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
 #628      inet  n       -       n       -       -       qmqpd
 pickup    fifo  n       -       n       60      1       pickup
 cleanup   unix  n       -       n       -       0       cleanup



From cvs at kolab.org  Tue Apr 27 13:04:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Apr 2010 13:04:40 +0200 (CEST)
Subject: thomas: server/perl-kolab/perl-kolab ChangeLog,1.5,1.6 
Message-ID: <20100427110440.010FD60057F@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/perl-kolab/perl-kolab
In directory doto:/tmp/cvs-serv11684/perl-kolab/perl-kolab

Modified Files:
	ChangeLog 
Log Message:
kolab/issue4311 (Activate port 587 for email submission)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	30 Mar 2010 09:26:10 -0000	1.5
+++ ChangeLog	27 Apr 2010 11:04:37 -0000	1.6
@@ -1,3 +1,8 @@
+2010-04-27  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* sbin/kolab_bootstrap.in: Check for availability of submission port,
+	see kolab/issue4311 (Activate port 587 for email submission)
+
 2010-03-30  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP.pm (createObject): kolab/issue4275 (LDAP.pm quota error)



From cvs at kolab.org  Wed Apr 28 18:14:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Apr 2010 18:14:44 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage ChangeLog, 1.8,
	1.9 package.info, 1.7, 1.8 
Message-ID: <20100428161444.86FAD60015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv32265/d/d

Modified Files:
	ChangeLog package.info 
Log Message:
kolab/issue3416 (webclient hangs if freebusy triggering/retrieving hangs)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	25 Mar 2010 13:58:15 -0000	1.8
+++ ChangeLog	28 Apr 2010 16:14:42 -0000	1.9
@@ -1,3 +1,9 @@
+2010-04-28  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.4.0/issue3416.patch:
+
+	kolab/issue3416 (webclient hangs if freebusy triggering/retrieving hangs)
+
 2010-03-25  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.4.0/issue3983.patch:

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- package.info	29 Mar 2010 19:17:26 -0000	1.7
+++ package.info	28 Apr 2010 16:14:42 -0000	1.8
@@ -16,7 +16,7 @@
 version='0.4.0'
 
 # Package release number
-release='20100325'
+release='20100428'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Wed Apr 28 18:14:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Apr 2010 18:14:44 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.541,1.542 
Message-ID: <20100428161444.8FC7A600560@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv32265

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue3416 (webclient hangs if freebusy triggering/retrieving hangs)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -d -r1.541 -r1.542
--- release-notes.txt	27 Apr 2010 11:04:37 -0000	1.541
+++ release-notes.txt	28 Apr 2010 16:14:42 -0000	1.542
@@ -91,6 +91,7 @@
 
     - Kolab_Storage-0.4.0-2010????
 
+	kolab/issue3416 (webclient hangs if freebusy triggering/retrieving hangs)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
 	kolab/issue4165 (kolab-webclient does not show shared/
 	                 calendar and contact folders)



From cvs at kolab.org  Wed Apr 28 18:14:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Apr 2010 18:14:44 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
	issue3416.patch, NONE, 1.1 
Message-ID: <20100428161444.8508560014D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv32265/d/d/patches/Kolab_Storage-0.4.0

Added Files:
	issue3416.patch 
Log Message:
kolab/issue3416 (webclient hangs if freebusy triggering/retrieving hangs)

--- NEW FILE: issue3416.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] issue3416.patch

Do not block when free/busy is not available.

STATUS: UNMERGED

REF: http://issues.kolab.org/issue3416

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-04-28 17:18:16.000000000 +0200
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-04-28 18:05:34.684348740 +0200
@@ -31,6 +31,8 @@
 require_once 'Horde/String.php';
 require_once 'Horde/NLS.php';
 
+require_once 'HTTP/Request.php';
+
 /**
  * The root of the Kolab annotation hierarchy, used on the various IMAP folder
  * that are used by Kolab clients.
@@ -1256,14 +1258,15 @@
 
         $options['method'] = 'GET';
         $options['timeout'] = 5;
+        $options['readTimeout'] = array(5, 1000);
+        $options['socketOptions']['http']['timeout'] = 5.0;
         $options['allowRedirects'] = true;
 
         if (isset($conf['http']['proxy']) && !empty($conf['http']['proxy']['proxy_host'])) {
             $options = array_merge($options, $conf['http']['proxy']);
         }
 
-        require_once 'HTTP/Request.php';
-        $http = new HTTP_Request($url, $options);
+        $http = new HTTP_Request_NonBlocking($url, $options);
         $http->setBasicAuth(Auth::getAuth(), Auth::getCredential('password'));
         @$http->sendRequest();
         if ($http->getResponseCode() != 200) {
@@ -1643,3 +1646,157 @@
                                      $value);
     }
 }
+
+class HTTP_Request_NonBlocking extends HTTP_Request
+{
+    /**
+    * Sends the request
+    *
+    * @access public
+    * @param  bool   Whether to store response body in Response object property,
+    *                set this to false if downloading a LARGE file and using a Listener
+    * @return mixed  PEAR error on error, true otherwise
+    */
+    function sendRequest($saveBody = true)
+    {
+        if (!is_a($this->_url, 'Net_URL')) {
+            return PEAR::raiseError('No URL given', HTTP_REQUEST_ERROR_URL);
+        }
+
+        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
+        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
+
+        if (strcasecmp($this->_url->protocol, 'https') == 0) {
+            // Bug #14127, don't try connecting to HTTPS sites without OpenSSL
+            if (version_compare(PHP_VERSION, '4.3.0', '<') || !extension_loaded('openssl')) {
+                return PEAR::raiseError('Need PHP 4.3.0 or later with OpenSSL support for https:// requests',
+                                        HTTP_REQUEST_ERROR_URL);
+            } elseif (isset($this->_proxy_host)) {
+                return PEAR::raiseError('HTTPS proxies are not supported', HTTP_REQUEST_ERROR_PROXY);
+            }
+            $host = 'ssl://' . $host;
+        }
+
+        // magic quotes may fuck up file uploads and chunked response processing
+        $magicQuotes = ini_get('magic_quotes_runtime');
+        ini_set('magic_quotes_runtime', false);
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+        // connection token to a proxy server...
+        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
+            'Keep-Alive' == $this->_requestHeaders['connection'])
+        {
+            $this->removeHeader('connection');
+        }
+
+        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
+                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
+        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
+        $sockKey   = $host . ':' . $port;
+        unset($this->_sock);
+
+        // There is a connected socket in the "static" property?
+        if ($keepAlive && !empty($sockets[$sockKey]) &&
+            !empty($sockets[$sockKey]->fp))
+        {
+            $this->_sock =& $sockets[$sockKey];
+            $err = null;
+        } else {
+            $this->_notify('connect');
+            $this->_sock =& new Net_Socket();
+            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
+            $this->_sock->setBlocking(false);
+        }
+        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
+
+if (!PEAR::isError($err)) {
+            if (!empty($this->_readTimeout)) {
+                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
+            }
+
+            $this->_notify('sentRequest');
+
+            // Read the response
+            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
+            $err = $this->_response->process(
+                $this->_saveBody && $saveBody,
+                HTTP_REQUEST_METHOD_HEAD != $this->_method
+            );
+
+            if ($keepAlive) {
+                $keepAlive = (isset($this->_response->_headers['content-length'])
+                              || (isset($this->_response->_headers['transfer-encoding'])
+                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
+                if ($keepAlive) {
+                    if (isset($this->_response->_headers['connection'])) {
+                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
+                    } else {
+                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
+                    }
+                }
+            }
+        }
+
+        ini_set('magic_quotes_runtime', $magicQuotes);
+
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        if (!$keepAlive) {
+            $this->disconnect();
+        // Store the connected socket in "static" property
+        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
+            $sockets[$sockKey] =& $this->_sock;
+        }
+
+        // Check for redirection
+        if (    $this->_allowRedirects
+            AND $this->_redirects <= $this->_maxRedirects
+            AND $this->getResponseCode() > 300
+            AND $this->getResponseCode() < 399
+            AND !empty($this->_response->_headers['location'])) {
+
+
+            $redirect = $this->_response->_headers['location'];
+
+            // Absolute URL
+            if (preg_match('/^https?:\/\//i', $redirect)) {
+                $this->_url = &new Net_URL($redirect);
+                $this->addHeader('Host', $this->_generateHostHeader());
+            // Absolute path
+            } elseif ($redirect{0} == '/') {
+                $this->_url->path = $redirect;
+
+            // Relative path
+            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $redirect = Net_URL::resolvePath($redirect);
+                $this->_url->path = $redirect;
+
+            // Filename, no path
+            } else {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $this->_url->path = $redirect;
+            }
+
+            $this->_redirects++;
+            return $this->sendRequest($saveBody);
+
+        // Too many redirects
+        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
+            return PEAR::raiseError('Too many redirects', HTTP_REQUEST_ERROR_REDIRECTS);
+        }
+
+        return true;
+    }
+
+}



From cvs at kolab.org  Wed Apr 28 19:15:49 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Apr 2010 19:15:49 +0200 (CEST)
Subject: gunnar: server/php Makefile,1.29,1.30 
Message-ID: <20100428171549.C69F960014D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv1619

Modified Files:
	Makefile 
Log Message:
Fix release number (kolab/issue4320 (PHP-5.3.2 CVS fails to build on Ubuntu 10.04))

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile	22 Apr 2010 14:06:06 -0000	1.29
+++ Makefile	28 Apr 2010 17:15:47 -0000	1.30
@@ -4,7 +4,7 @@
 DOWNLOAD_VERSION=5.3.1
 OPENPKG_RELEASE=20091129
 VERSION=5.3.2
-RELEASE=20091129_kolab1
+RELEASE=20091129_kolab3
 
 SOURCE_URL=http://www.php.net/distributions
 SOURCE_0=php-5.3.2.tar.bz2



From cvs at kolab.org  Sun May  2 21:44:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun,  2 May 2010 21:44:43 +0200 (CEST)
Subject: mathieu: utils/ci/toolbox kolab-test-toolbox.ini, 1.1,
	1.2 kolab-test-toolbox.pl, 1.3, 1.4 
Message-ID: <20100502194443.B04B0600175@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/utils/ci/toolbox
In directory doto:/tmp/cvs-serv11844/ci/toolbox

Modified Files:
	kolab-test-toolbox.ini kolab-test-toolbox.pl 
Log Message:
kolab-test-toolbox: renamed debootstrap install method to xen-tools


Index: kolab-test-toolbox.ini
===================================================================
RCS file: /kolabrepository/utils/ci/toolbox/kolab-test-toolbox.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-test-toolbox.ini	4 Dec 2009 07:35:04 -0000	1.1
+++ kolab-test-toolbox.ini	2 May 2010 19:44:41 -0000	1.2
@@ -10,8 +10,8 @@
 vm_memory=256Mb
 vm_size=1Gb
 vm_swap=128Mb
-; debootstrap
-vm_install_method=debootstrap
+; xen-tools
+vm_install_method=xen-tools
 vm_dist=sid
 
 ; virt
@@ -43,7 +43,7 @@
 vm_memory=512Mb
 ; more for all the source and compiled packages
 vm_size=3Gb
-vm_install_method=debootstrap
+vm_install_method=xen-tools
 vm_dist=lenny
 
 ip_offset=10
@@ -59,7 +59,7 @@
 [debian-lenny-native]
 storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-lenny-native
 
-vm_install_method=debootstrap
+vm_install_method=xen-tools
 vm_dist=lenny
 
 ip_offset=15
@@ -69,7 +69,7 @@
 [debian-sid-native]
 storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-native
 
-vm_install_method=debootstrap
+vm_install_method=xen-tools
 vm_dist=sid
 
 ip_offset=20

Index: kolab-test-toolbox.pl
===================================================================
RCS file: /kolabrepository/utils/ci/toolbox/kolab-test-toolbox.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab-test-toolbox.pl	10 Dec 2009 18:42:26 -0000	1.3
+++ kolab-test-toolbox.pl	2 May 2010 19:44:41 -0000	1.4
@@ -297,7 +297,7 @@
     my $storagepooldir = conf('storage_pool_dir');
     
     print "* Bootstraping:\n";
-    if(conf('vm_install_method') eq 'debootstrap') {
+    if(conf('vm_install_method') eq 'xen-tools') {
         local_command("sudo xen-create-image --hostname $domname ".
             "--ip ".domain_ip($domid, $domname)." ".
             "--dist $dist --install-method debootstrap ".



From cvs at kolab.org  Tue May  4 16:10:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 May 2010 16:10:37 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.111,1.398.2.112 
Message-ID: <20100504141037.67A8F60015A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2574

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Added annotation for activesync configuration (z-push)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.111
retrieving revision 1.398.2.112
diff -u -d -r1.398.2.111 -r1.398.2.112
--- release-notes.txt	22 Apr 2010 14:04:58 -0000	1.398.2.111
+++ release-notes.txt	4 May 2010 14:10:35 -0000	1.398.2.112
@@ -52,6 +52,8 @@
 	Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
+	Added annotation for activesync configuration (z-push).
+
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
 



From cvs at kolab.org  Tue May  4 16:10:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 May 2010 16:10:37 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates
	imapd.annotation_definitions.template.in, 1.5, 1.5.2.1 
Message-ID: <20100504141037.7B06860016E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv2574/kolabd/kolabd/templates

Modified Files:
      Tag: kolab_2_2_branch
	imapd.annotation_definitions.template.in 
Log Message:
Added annotation for activesync configuration (z-push)

Index: imapd.annotation_definitions.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.annotation_definitions.template.in,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- imapd.annotation_definitions.template.in	22 Apr 2008 14:03:34 -0000	1.5
+++ imapd.annotation_definitions.template.in	4 May 2010 14:10:35 -0000	1.5.2.1
@@ -8,5 +8,6 @@
 /vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/pxfb-readable-for,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/h-share-attr-desc,mailbox,string,backend,value.shared value.priv,a
+/vendor/kolab/activesync,mailbox,string,backend,value.priv,r
 /vendor/horde/share-params,mailbox,string,backend,value.shared value.priv,a
 /vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a



From cvs at kolab.org  Tue May  4 16:10:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 May 2010 16:10:37 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.234.2.19,1.234.2.20 
Message-ID: <20100504141037.774D360015A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv2574/kolabd/kolabd

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Added annotation for activesync configuration (z-push)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.19
retrieving revision 1.234.2.20
diff -u -d -r1.234.2.19 -r1.234.2.20
--- ChangeLog	22 Apr 2010 13:25:09 -0000	1.234.2.19
+++ ChangeLog	4 May 2010 14:10:35 -0000	1.234.2.20
@@ -1,3 +1,8 @@
+2010-05-04  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* templates/imapd.annotation_definitions.template.in:
+	Added annotation for activesync configuration (z-push).
+
 2010-04-22  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/local.cf.template.in: Disable further DNS blacklists.



From cvs at kolab.org  Tue May  4 16:10:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 May 2010 16:10:44 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.542,1.543 
Message-ID: <20100504141044.38D12600561@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2653

Modified Files:
	release-notes.txt 
Log Message:
Added annotation for activesync configuration (z-push)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -d -r1.542 -r1.543
--- release-notes.txt	28 Apr 2010 16:14:42 -0000	1.542
+++ release-notes.txt	4 May 2010 14:10:42 -0000	1.543
@@ -237,6 +237,8 @@
 	Disable FH_DATE_PAST_20XX spamassassin test, which is broken
 	for 2010 and later...
 
+	Added annotation for activesync configuration (z-push).
+
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
 



From cvs at kolab.org  Tue May  4 16:10:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 May 2010 16:10:44 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates
	imapd.annotation_definitions.template.in, 1.6, 1.7 
Message-ID: <20100504141044.40C1B600587@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv2653/kolabd/kolabd/templates

Modified Files:
	imapd.annotation_definitions.template.in 
Log Message:
Added annotation for activesync configuration (z-push)

Index: imapd.annotation_definitions.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.annotation_definitions.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imapd.annotation_definitions.template.in	7 May 2009 16:13:33 -0000	1.6
+++ imapd.annotation_definitions.template.in	4 May 2010 14:10:42 -0000	1.7
@@ -9,5 +9,6 @@
 /vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/pxfb-readable-for,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/h-share-attr-desc,mailbox,string,backend,value.shared value.priv,a
+/vendor/kolab/activesync,mailbox,string,backend,value.priv,r
 /vendor/horde/share-params,mailbox,string,backend,value.shared value.priv,a
 /vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a



From cvs at kolab.org  Tue May  4 16:10:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 May 2010 16:10:44 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.291,1.292 
Message-ID: <20100504141044.3D2D2600586@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv2653/kolabd/kolabd

Modified Files:
	ChangeLog 
Log Message:
Added annotation for activesync configuration (z-push)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- ChangeLog	27 Apr 2010 11:04:37 -0000	1.291
+++ ChangeLog	4 May 2010 14:10:42 -0000	1.292
@@ -1,3 +1,8 @@
+2010-05-04  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* templates/imapd.annotation_definitions.template.in:
+	Added annotation for activesync configuration (z-push).
+
 2010-04-27  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/master.cf.template.in: Added submission port, solving



From cvs at kolab.org  Thu May  6 09:08:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:08:50 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Share/patches - New directory 
Message-ID: <20100506070850.649F8600148@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share/patches
In directory doto:/tmp/cvs-serv14690/pear/Horde_Share/patches

Log Message:
Directory /kolabrepository/server/pear/Horde_Share/patches added to the repository




From cvs at kolab.org  Thu May  6 09:08:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:08:50 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
	- New directory 
Message-ID: <20100506070850.66E64600149@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
In directory doto:/tmp/cvs-serv14690/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215

Log Message:
Directory /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215 added to the repository




From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.543,1.544 
Message-ID: <20100506071008.C3569600149@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv14778

Modified Files:
	release-notes.txt 
Log Message:
Support setting Zpush configuration values.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -d -r1.543 -r1.544
--- release-notes.txt	4 May 2010 14:10:42 -0000	1.543
+++ release-notes.txt	6 May 2010 07:10:06 -0000	1.544
@@ -20,10 +20,18 @@
 
 	kolab/issue3555 (unable to save filter settings more than once)
 
+    - Horde_Share-0.0.3dev20091215-2010????
+
+	Support setting Zpush configuration values.
+
     - dimp-1.1.4-2010????
 
 	kolab/issue4080 (DIMP: Mails can not be copied to other folders) 
 
+    - horde-3.3.6-2010????
+
+	Support setting Zpush configuration values.
+
     - imp-4.3.6-2010????
 
 	Hid IMP and made the dynamic version (dimp) the default view.
@@ -91,6 +99,8 @@
 
     - Kolab_Storage-0.4.0-2010????
 
+	Support setting Zpush configuration values.
+
 	kolab/issue3416 (webclient hangs if freebusy triggering/retrieving hangs)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
 	kolab/issue4165 (kolab-webclient does not show shared/
@@ -154,6 +164,8 @@
 	                 are selected)
 
     - kronolith-2.2.3-2010????
+
+	Support setting Zpush configuration values.
 
 	kolab/issue3848 (display "Basic Search" and "Advanced Search"
 	                 as tabs in place of a small table header.)



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde/patches/horde-3.3.6 series, 1.2,
	1.3 t_horde_HK_GW_ZpushAnnotations.diff, NONE, 1.1 
Message-ID: <20100506071008.C3CA560014A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/patches/horde-3.3.6
In directory doto:/tmp/cvs-serv14778/kolab-webclient/horde/patches/horde-3.3.6

Added Files:
	series t_horde_HK_GW_ZpushAnnotations.diff 
Log Message:
Support setting Zpush configuration values.


--- NEW FILE: t_horde_HK_GW_ZpushAnnotations.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/horde/HK/GW/ZpushAnnotations

Allows to modify the Zpush configuration.

Signed-off-by: Gunnar Wrobel <p at rdus.de>

diff -Naur a/config/prefs.php b/config/prefs.php
--- a/config/prefs.php.dist	2010-05-04 22:00:29.938760839 +0200
+++ b/config/prefs.php.dist	2010-05-04 22:02:27.177573941 +0200
@@ -165,6 +165,14 @@
     'members' => array()
 );
 
+$prefGroups['activesync'] = array(
+    'column' => _("Other Information"),
+    'label' => _("ActiveSync"),
+    'desc' => _("Configuration for syncing with PDAs, Smartphones and Outlook."),
+    'url' => 'services/portal/activesync.php',
+    'members' => array()
+);
+
 // Personal Information preferences
 
 // default identity
diff -Naur a/services/portal/activesync.php b/services/portal/activesync.php
--- a/services/portal/activesync.php	1970-01-01 01:00:00.000000000 +0100
+++ b/services/portal/activesync.php	2010-05-06 06:52:58.250251515 +0200
@@ -0,0 +1,72 @@
+<?php
+/**
+ * $Horde: horde/services/portal/syncml.php,v 1.3.2.15 2009-01-06 15:27:33 jan Exp $
+ *
+ * Copyright 2005-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @author Karsten Fourmont <karsten at horde.org>
+ */
+
+require_once dirname(__FILE__) . '/../../lib/base.php';
+
+if (!Auth::isAuthenticated()) {
+    Horde::authenticationFailureRedirect();
+}
+
+require_once 'Horde/Kolab/Storage.php';
+$folder = Kolab_Storage::getFolder('INBOX');
+$result = $folder->getActiveSync();
+$devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
+
+$actionID = Util::getFormData('actionID');
+switch ($actionID) {
+case 'save':
+    if (Util::getFormData('delete')) {
+        $deviceids = array_keys(Util::getFormData('delete'));
+        $deviceid = $deviceids[0];
+        $result = $folder->deleteActiveSyncDevice($deviceid);
+        if (is_a($result, 'PEAR_Error')) {
+            $notification->push(_("Error deleting device:")
+                                . ' ' . $result->getMessage(),
+                                'horde.error');
+        } else {
+            $notification->push(sprintf(_("Deleted ActiveSync device \"%s\"."),
+                                        $deviceid),
+                                'horde.success');
+            unset($devices[$deviceid]);
+        }
+    } else {
+        $modes = Util::getFormData('mode_select', array());
+        foreach ($modes as $deviceid => $mode) {
+            $devices[$deviceid]['MODE'] = $mode;
+        }
+        $data = array('DEVICE' => $devices);
+        $result = $folder->setActiveSyncDeviceData($data, 'DEVICE');
+        if (is_a($result, 'PEAR_Error')) {
+            $notification->push(_("Error storing synchronization modes:")
+                                . ' ' . $result->getMessage(),
+                                'horde.error');
+        } else {
+            $notification->push(_("Synchronization modes stored successfully."),
+                                'horde.success');
+        }
+    }
+}
+
+/* Show the header. */
+require_once 'Horde/Prefs/UI.php';
+$result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'horde');
+if (!is_a($result, 'PEAR_Error')) {
+    extract($result);
+}
+$app = 'horde';
+$chunk = Util::nonInputVar('chunk');
+Prefs_UI::generateHeader('activesync', $chunk);
+
+require HORDE_TEMPLATES . '/activesync/activesync.inc';
+if (!$chunk) {
+    require HORDE_TEMPLATES . '/common-footer.inc';
+}
diff -Naur a/templates/activesync/activesync.inc b/templates/activesync/activesync.inc
--- a/templates/activesync/activesync.inc	1970-01-01 01:00:00.000000000 +0100
+++ b/templates/activesync/activesync.inc	2010-05-05 06:08:23.358849561 +0200
@@ -0,0 +1,41 @@
+<div class="smallheader">
+ <?php echo _("Known ActiveSync synchronisation devices") ?>
+</div>
+<?php if (!$devices): ?>
+<em><?php echo _("None") ?></em>
+<?php else: ?>
+<table class="striped">
+<tr>
+ <th><?php echo _("Device") ?></th>
+ <th><?php echo _("Type") ?></th>
+ <th><?php echo _("Mode") ?></th>
+</tr>
+<?php
+foreach ($devices as $device => $data) {
+?>
+<tr>
+ <td><?php echo htmlspecialchars($device) ?></td>
+ <td><?php echo htmlspecialchars($data['TYPE']) ?></td>
+ <td>
+   <select id="mode_select[<?php echo $device; ?>]" name="mode_select[<?php echo $device; ?>]">
+     <option value=""><?php echo _("Select the device mode:"); ?></option>
+     <option value="-1" <?php echo ($data['MODE'] === null || $data['MODE'] === '-1') ? 'selected="selected"' : ''; ?>>Default</option>
+     <option value="0" <?php echo ($data['MODE'] === '0') ? 'selected="selected"' : ''; ?>>Flat mode</option>
+     <option value="1" <?php echo ($data['MODE'] === '1') ? 'selected="selected"' : ''; ?>>Folder mode</option>
+   </select>
+ </td>
+ <td>
+   <input type="submit" class="button" value="<?php echo _("Delete") ?>" name="delete[<?php echo htmlspecialchars($device) ?>]"/>
+ </td>
+</tr>
+<?php } ?>
+</table>
+<?php endif; ?>
+<p>
+ <input type="hidden" name="actionID" value="save" />
+ <input type="submit" class="button" value="<?php echo _("Store device modes") ?>" />
+ <input id="prefs_return" type="button" class="button" onclick="cancelSubmit=true;document.location.href='<?php echo Horde::applicationUrl(Util::addParameter('services/prefs.php', 'app', 'horde'), true) ?>'" value="<?php echo _("Return to Options") ?>" />
+</p>
+
+</div>
+</form>



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith ChangeLog, 1.3,
	1.4 kronolith.spec, 1.10, 1.11 
Message-ID: <20100506071008.CF732600149@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith
In directory doto:/tmp/cvs-serv14778/kolab-webclient/kronolith

Modified Files:
	ChangeLog kronolith.spec 
Log Message:
Support setting Zpush configuration values.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	8 Mar 2010 17:26:09 -0000	1.3
+++ ChangeLog	6 May 2010 07:10:06 -0000	1.4
@@ -1,3 +1,9 @@
+2010-05-06  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/kronolith-2.3.3/t_kronolith_HK_GW_ZpushAnnotations.diff:
+
+	Support setting Zpush configuration values.
+
 2010-03-08  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/kronolith-2.3.3/t_kronolith_HK_GW_AdaptStartDateOfRecurrencesWhenEditing.diff:

Index: kronolith.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/kronolith.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kronolith.spec	9 Mar 2010 08:21:07 -0000	1.10
+++ kronolith.spec	6 May 2010 07:10:06 -0000	1.11
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package kronolith
 %define         V_version 2.3.3
-%define         V_release 20100309
+%define         V_release 20100506
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
	t_framework_HK_GW_ZpushAnnotations.diff, NONE, 1.1 
Message-ID: <20100506071008.D53A360015D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
In directory doto:/tmp/cvs-serv14778/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215

Added Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Support setting Zpush configuration values.

--- NEW FILE: t_framework_HK_GW_ZpushAnnotations.diff ---
diff -Naur a/a/a/Share/kolab.php b/a/a/Share/kolab.php
--- a/a/a/Share/kolab.php	2010-05-05 07:51:03.742452620 +0200
+++ b/a/a/Share/kolab.php	2010-05-06 07:46:45.088087728 +0200
@@ -529,7 +529,8 @@
             if (!is_a($type, 'PEAR_Error') && $type == 'event') {
                 $default = array_merge($default, array(
                                            'fbrelevance' => $this->_folder->getFbrelevance(),
-                                           'xfbaccess'   => $this->_folder->getXfbaccess()
+                                           'xfbaccess'   => $this->_folder->getXfbaccess(),
+                                           'activesync'  => $this->_folder->getActiveSync()
                                        ));
             }
             if (is_a($params, 'PEAR_Error') || $params == '') {



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde ChangeLog, NONE, 1.1 horde.spec,
	1.10, 1.11 
Message-ID: <20100506071008.C8A6F60014C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv14778/kolab-webclient/horde

Modified Files:
	horde.spec 
Added Files:
	ChangeLog 
Log Message:
Support setting Zpush configuration values.

--- NEW FILE: ChangeLog ---
2010-05-06  Gunnar Wrobel  <p at rdus.de>

	* patches/horde-3.3.6/t_horde_HK_GW_ZpushAnnotations.diff:

	Support setting Zpush configuration values.


Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- horde.spec	21 Jan 2010 22:38:40 -0000	1.10
+++ horde.spec	6 May 2010 07:10:06 -0000	1.11
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.6
-%define         V_release 20100121
+%define         V_release 20100506
 
 # Package Information
 Name:		%{V_package}
@@ -118,7 +118,7 @@
 
 	rm test.php
 
-	#find . -type f | grep '\.orig$' | xargs rm -f
+        find . -type f | grep '\.orig$' | xargs rm -f
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/
 



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
	t_framework_HK_GW_ZpushAnnotations.diff, NONE,
	1.1 t_framework_HK_GW_NamespaceSupport.diff, 1.1, 1.2 
Message-ID: <20100506071008.DC88F600168@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv14778/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0

Modified Files:
	t_framework_HK_GW_NamespaceSupport.diff 
Added Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Support setting Zpush configuration values.

--- NEW FILE: t_framework_HK_GW_ZpushAnnotations.diff ---
diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-05-04 23:44:49.522328256 +0200
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-05-06 07:46:01.507036608 +0200
@@ -412,13 +412,23 @@
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['xfbaccess']);
                     }
                     if (isset($params['fbrelevance'])) {
                         $result = $this->setFbrelevance($params['fbrelevance']);
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['fbrelevance']);
                     }
+                    if (isset($params['activesync'])) {
+                        $result = $this->setActiveSyncDeviceData($params['activesync'], 'FOLDER');
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['activesync']);
+                    }
+                    $value = serialize($params);
                 }
 
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters
@@ -1645,6 +1655,132 @@
         return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
                                      $value);
     }
+
+    /**
+     * Get the active sync settings for this folder.
+     *
+     * @return array  Array containing the active sync information.
+     */
+    function getActiveSync()
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $local = json_decode(base64_decode($raw), true);
+        if (!$this->name != 'INBOX') {
+            $raw = $imap->getAnnotation(
+                KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', 'INBOX'
+            );
+            $global = json_decode(base64_decode($raw), true);
+            if (!is_array($local)) {
+                $result = array(
+                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                    'FOLDER' => array()
+                );
+            } elseif (is_array($global)) {
+                $result = array(
+                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
+                );
+            } else {
+                $result = array(
+                    'DEVICE' => array(),
+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
+                );
+            }
+        } else {
+            $result = array(
+                'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                'FOLDER' => array()
+            );
+        }
+        $result['NAMESPACE'] = $this->_list->namespace->matchNamespace($this->name)->getType();
+        return $result;
+    }
+
+    /**
+     * Delete an active sync device for this folder.
+     *
+     * @param string $id The id of the device.
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function deleteActiveSyncDevice($id)
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $result = json_decode(base64_decode($raw), true);
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        if (!is_array($result)) {
+            return true;
+        }
+        unset($result['DEVICE'][$id]);
+        $result = $imap->setAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync',
+            array('value.priv' => base64_encode(json_encode($result))),
+            $this->name
+        );
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        return true;
+    }
+
+    /**
+     * Set the active sync annotation.
+     *
+     * @param string $data  The data to store in the annotation.
+     * @param string $type  The type of the data (DEVICE|FOLDER).
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setActiveSyncDeviceData($data, $type = 'DEVICE')
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $old = json_decode(base64_decode($raw), true);
+        if (is_a($old, 'PEAR_Error')) {
+            return $data;
+        }
+        if (!is_array($old)) {
+            $old = array();
+        }
+
+        $new_type = isset($old[$type]) ? $old[$type] : array();
+        $data_type = isset($data[$type]) ? $data[$type] : array();
+        foreach ($data_type as $id => $settings) {
+            foreach ($settings as $key => $value) {
+                $new_type[$id][$key] = $value;
+            }
+        }
+        $new = array($type => $new_type);
+        $result = $imap->setAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync',
+            array('value.priv' => base64_encode(json_encode($new))),
+            $this->name
+        );
+
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        return true;
+    }
 }
 
 class HTTP_Request_NonBlocking extends HTTP_Request

Index: t_framework_HK_GW_NamespaceSupport.diff
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0/t_framework_HK_GW_NamespaceSupport.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_GW_NamespaceSupport.diff	23 Mar 2010 08:10:36 -0000	1.1
+++ t_framework_HK_GW_NamespaceSupport.diff	6 May 2010 07:10:06 -0000	1.2
@@ -796,7 +796,7 @@
 +     * @throws Horde_Kolab_Storage_Exception If the namespace of the folder
 +     *                                       cannot be determined.
 +     */
-+    protected function matchNamespace($name)
++    public function matchNamespace($name)
 +    {
 +        foreach ($this->_namespaces as $namespace) {
 +            if ($namespace->matches($name)) {



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3
	t_kronolith_HK_GW_ZpushAnnotations.diff, NONE, 1.1 series, 1.9, 1.10 
Message-ID: <20100506071008.CE19660015A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3
In directory doto:/tmp/cvs-serv14778/kolab-webclient/kronolith/patches/kronolith-2.3.3

Modified Files:
	series 
Added Files:
	t_kronolith_HK_GW_ZpushAnnotations.diff 
Log Message:
Support setting Zpush configuration values.

--- NEW FILE: t_kronolith_HK_GW_ZpushAnnotations.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/GW/ZpushAnnotations

Allows to modify the Zpush configuration.

Signed-off-by: Gunnar Wrobel <p at rdus.de>

diff -Naur a/calendars/edit.php b/calendars/edit.php
--- a/calendars/edit.php	2010-05-04 22:00:35.670897983 +0200
+++ b/calendars/edit.php	2010-05-06 07:45:36.406431213 +0200
@@ -46,7 +46,6 @@
             $notification->push(sprintf(_("The calendar \"%s\" has been saved."), $original_name), 'horde.success');
         }
     }
-
     header('Location: ' . Horde::applicationUrl('calendars/', true));
     exit;
 }
@@ -57,6 +56,23 @@
 if (isset($params['fbrelevance'])) {
     $vars->set('fbrelevance', $params['fbrelevance']);
 }
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == Horde_Kolab_Storage_Namespace::PERSONAL) {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -Naur a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php
--- a/lib/Forms/EditCalendar.php	2010-05-04 22:00:36.210910903 +0200
+++ b/lib/Forms/EditCalendar.php	2010-05-05 10:30:48.073386331 +0200
@@ -49,13 +49,40 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $original_name = $this->_calendar->get('name');
         $new_name = $this->_vars->get('name');
         $this->_calendar->set('name', $new_name);
         $this->_calendar->set('desc', $this->_vars->get('description'));
-        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
+        $params = array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+        }
+
+        $this->_calendar->set('params', serialize($params));
 
         if ($original_name != $new_name) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $new_name);

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/series,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- series	9 Mar 2010 08:21:07 -0000	1.9
+++ series	6 May 2010 07:10:06 -0000	1.10
@@ -11,4 +11,5 @@
 t_kronolith_HK_UV_searchTabs.diff
 t_kronolith_HK_GW_AdaptStartDateOfRecurrencesWhenEditing.diff
 t_kronolith_HK_UV_SyncMLSyncBackendBeforeSync.diff
-t_SyncML_UV_RecurringEventsWeekCount.diff
\ No newline at end of file
+t_SyncML_UV_RecurringEventsWeekCount.diff
+t_kronolith_HK_GW_ZpushAnnotations.diff



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Share ChangeLog, 1.1, 1.2 package.info, 1.4,
	1.5 
Message-ID: <20100506071008.D348A60014A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share
In directory doto:/tmp/cvs-serv14778/pear/Horde_Share

Modified Files:
	ChangeLog package.info 
Log Message:
Support setting Zpush configuration values.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Share/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	21 Jul 2009 19:28:02 -0000	1.1
+++ ChangeLog	6 May 2010 07:10:06 -0000	1.2
@@ -1,3 +1,9 @@
+2010-05-06  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Horde_Share-0.0.3dev20091215/t_framework_HK_GW_ZpushAnnotations.diff:
+
+	Support setting Zpush configuration values.
+
 2009-07-21  Gunnar Wrobel  <p at rdus.de>
 
-	* package.info: Added package to Kolab CVS.
\ No newline at end of file
+	* package.info: Added package to Kolab CVS.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Share/package.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.info	11 Jan 2010 22:15:27 -0000	1.4
+++ package.info	6 May 2010 07:10:06 -0000	1.5
@@ -25,7 +25,7 @@
 version='0.0.3dev20091215'
 
 # Package release number
-release='20100111'
+release='20100506'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Thu May  6 09:10:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 May 2010 09:10:08 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage ChangeLog, 1.9,
	1.10 package.info, 1.8, 1.9 
Message-ID: <20100506071008.DA4EE60014C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv14778/php-kolab/Kolab_Storage

Modified Files:
	ChangeLog package.info 
Log Message:
Support setting Zpush configuration values.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	28 Apr 2010 16:14:42 -0000	1.9
+++ ChangeLog	6 May 2010 07:10:06 -0000	1.10
@@ -1,3 +1,9 @@
+2010-05-06  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff:
+
+	Support setting Zpush configuration values.
+
 2010-04-28  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.4.0/issue3416.patch:

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- package.info	28 Apr 2010 16:14:42 -0000	1.8
+++ package.info	6 May 2010 07:10:06 -0000	1.9
@@ -16,7 +16,7 @@
 version='0.4.0'
 
 # Package release number
-release='20100428'
+release='20100506'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Mon May 10 09:08:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:08:09 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Share package.info,1.5,1.6 
Message-ID: <20100510070809.5C7A7600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share
In directory doto:/tmp/cvs-serv17732

Modified Files:
	package.info 
Log Message:
Allways return the activesync share settings.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Share/package.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- package.info	6 May 2010 07:10:06 -0000	1.5
+++ package.info	10 May 2010 07:08:07 -0000	1.6
@@ -25,7 +25,7 @@
 version='0.0.3dev20091215'
 
 # Package release number
-release='20100506'
+release='20100510'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Mon May 10 09:08:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:08:09 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
	t_framework_HK_GW_ZpushAnnotations.diff, 1.1, 1.2 
Message-ID: <20100510070809.5E672600582@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
In directory doto:/tmp/cvs-serv17732/patches/Horde_Share-0.0.3dev20091215

Modified Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Allways return the activesync share settings.

Index: t_framework_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215/t_framework_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_GW_ZpushAnnotations.diff	6 May 2010 07:10:06 -0000	1.1
+++ t_framework_HK_GW_ZpushAnnotations.diff	10 May 2010 07:08:07 -0000	1.2
@@ -1,13 +1,13 @@
 diff -Naur a/a/a/Share/kolab.php b/a/a/Share/kolab.php
 --- a/a/a/Share/kolab.php	2010-05-05 07:51:03.742452620 +0200
 +++ b/a/a/Share/kolab.php	2010-05-06 07:46:45.088087728 +0200
-@@ -529,7 +529,8 @@
+@@ -524,7 +524,8 @@
+             $params = @unserialize($this->_folder->getAttribute('params'));
+             $default = array('source' => 'kolab',
+                              'default' => $this->get('default'),
+-                             'name' => $this->get('name'));
++                             'name' => $this->get('name'),
++                             'activesync'  => $this->_folder->getActiveSync());
+             $type = $this->get('type');
              if (!is_a($type, 'PEAR_Error') && $type == 'event') {
                  $default = array_merge($default, array(
-                                            'fbrelevance' => $this->_folder->getFbrelevance(),
--                                           'xfbaccess'   => $this->_folder->getXfbaccess()
-+                                           'xfbaccess'   => $this->_folder->getXfbaccess(),
-+                                           'activesync'  => $this->_folder->getActiveSync()
-                                        ));
-             }
-             if (is_a($params, 'PEAR_Error') || $params == '') {



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.544,1.545 
Message-ID: <20100510071131.5211B600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17827

Modified Files:
	release-notes.txt 
Log Message:
Complete active sync configuration management GUI.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -d -r1.544 -r1.545
--- release-notes.txt	6 May 2010 07:10:06 -0000	1.544
+++ release-notes.txt	10 May 2010 07:11:29 -0000	1.545
@@ -173,8 +173,14 @@
 	                 update recurrance dates)
 	kolab/issue4048 (Some German translations missing in kronolith)
 
+    - mnemo-2.2.3-2010????
+
+	Support setting Zpush configuration values.
+
     - nag-2.3.4-2010????
 
+	Support setting Zpush configuration values.
+
 	kolab/issue3888 (Organizer field not saved in Tasks written by
 	                 kolab-webclient)
 
@@ -231,6 +237,8 @@
 	Added support for PDO sqlite3.
 
     - turba-2.3.3-2010????
+
+	Support setting Zpush configuration values.
 
 	kolab/issue3859 ([turba] optimized formatName function and
 	                 fallback to company attribute)



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/mnemo/patches/mnemo-2.2.3 series, NONE,
	1.1 t_mnemo_HK_GW_ZpushAnnotations.diff, NONE, 1.1 
Message-ID: <20100510071131.58B07600583@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3
In directory doto:/tmp/cvs-serv17827/d/mnemo/patches/mnemo-2.2.3

Added Files:
	series t_mnemo_HK_GW_ZpushAnnotations.diff 
Log Message:
Complete active sync configuration management GUI.

--- NEW FILE: series ---
t_mnemo_HK_UV_SyncMLSyncBackendBeforeSync.diff
t_mnemo_HK_GW_ZpushAnnotations.diff

--- NEW FILE: t_mnemo_HK_GW_ZpushAnnotations.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/mnemo/HK/GW/ZpushAnnotations

Allows to modify the Zpush configuration.

Signed-off-by: Gunnar Wrobel <p at rdus.de>

diff -Naur a/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
--- a/lib/Forms/EditNotepad.php	2010-05-10 08:25:30.000000000 +0200
+++ b/lib/Forms/EditNotepad.php	2010-05-10 08:28:09.000000000 +0200
@@ -46,10 +46,38 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $this->_notepad->set('name', $this->_vars->get('name'));
         $this->_notepad->set('desc', $this->_vars->get('description'));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $params = array();
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+            $this->_notepad->set('params', serialize($params));
+        }
+
         $result = $this->_notepad->save();
         if (is_a($result, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Unable to save notepad \"%s\": %s"), $id, $result->getMessage()));
diff -Naur a/notepads/edit.php b/notepads/edit.php
--- a/notepads/edit.php	2010-05-10 08:25:30.000000000 +0200
+++ b/notepads/edit.php	2010-05-10 08:28:19.000000000 +0200
@@ -51,6 +51,26 @@
 
 $vars->set('name', $notepad->get('name'));
 $vars->set('description', $notepad->get('desc'));
+
+$params = @unserialize($notepad->get('params'));
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == Horde_Kolab_Storage_Namespace::PERSONAL) {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
+
 $title = $form->getTitle();
 require MNEMO_TEMPLATES . '/common-header.inc';
 require MNEMO_TEMPLATES . '/menu.inc';



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/mnemo ChangeLog, NONE, 1.1 mnemo.spec,
	1.3, 1.4 
Message-ID: <20100510071131.55F63600582@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/mnemo
In directory doto:/tmp/cvs-serv17827/d/mnemo

Modified Files:
	mnemo.spec 
Added Files:
	ChangeLog 
Log Message:
Complete active sync configuration management GUI.

--- NEW FILE: ChangeLog ---
2010-05-10  Gunnar Wrobel  <p at rdus.de>

	* patches/mnemo-2.2.3/t_mnemo_HK_GW_ZpushAnnotations.diff:

	Support setting Zpush configuration values.


Index: mnemo.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/mnemo/mnemo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnemo.spec	28 Feb 2010 09:27:23 -0000	1.3
+++ mnemo.spec	10 May 2010 07:11:29 -0000	1.4
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package mnemo
 %define         V_version 2.2.3
-%define         V_release 20100228
+%define         V_release 20100510
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/turba ChangeLog, 1.1, 1.2 turba.spec,
	1.6, 1.7 
Message-ID: <20100510071131.64C0E600567@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba
In directory doto:/tmp/cvs-serv17827/d/turba

Modified Files:
	ChangeLog turba.spec 
Log Message:
Complete active sync configuration management GUI.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	9 Mar 2010 21:38:27 -0000	1.1
+++ ChangeLog	10 May 2010 07:11:29 -0000	1.2
@@ -1,3 +1,9 @@
+2010-05-10  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff:
+
+	Support setting Zpush configuration values.
+
 2010-03-09  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/turba-2.3.3/t_turba_HK_GW_ConfigurationOverride.php:

Index: turba.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/turba.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- turba.spec	10 Mar 2010 05:19:24 -0000	1.6
+++ turba.spec	10 May 2010 07:11:29 -0000	1.7
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package turba
 %define         V_version 2.3.3
-%define         V_release 20100310
+%define         V_release 20100510
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/nag/patches/nag-2.3.4 series, NONE,
	1.1 t_nag_HK_GW_ZpushAnnotations.diff, NONE, 1.1 
Message-ID: <20100510071131.5FEA0600585@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/nag/patches/nag-2.3.4
In directory doto:/tmp/cvs-serv17827/d/nag/patches/nag-2.3.4

Added Files:
	series t_nag_HK_GW_ZpushAnnotations.diff 
Log Message:
Complete active sync configuration management GUI.

--- NEW FILE: series ---
t_nag_HK_UV_SyncMLSyncBackendBeforeSync.diff
t_nag_HK_GW_StoreCreatorAndOrganizer.diff
t_nag_HK_GW_ZpushAnnotations.diff

--- NEW FILE: t_nag_HK_GW_ZpushAnnotations.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/nag/HK/GW/ZpushAnnotations

Allows to modify the Zpush configuration.

Signed-off-by: Gunnar Wrobel <p at rdus.de>

diff -Naur a/lib/Forms/EditTaskList.php b/lib/Forms/EditTaskList.php
--- a/lib/Forms/EditTaskList.php	2010-05-10 08:10:16.000000000 +0200
+++ b/lib/Forms/EditTaskList.php	2010-05-10 08:18:34.000000000 +0200
@@ -46,10 +46,38 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $this->_tasklist->set('name', $this->_vars->get('name'));
         $this->_tasklist->set('desc', $this->_vars->get('description'));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $params = array();
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+            $this->_tasklist->set('params', serialize($params));
+        }
+
         $result = $this->_tasklist->save();
         if (is_a($result, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Unable to save task list \"%s\": %s"), $id, $result->getMessage()));
diff -Naur a/tasklists/edit.php b/tasklists/edit.php
--- a/tasklists/edit.php	2010-05-10 08:10:16.000000000 +0200
+++ b/tasklists/edit.php	2010-05-10 08:22:49.000000000 +0200
@@ -51,6 +51,26 @@
 
 $vars->set('name', $tasklist->get('name'));
 $vars->set('description', $tasklist->get('desc'));
+
+$params = @unserialize($tasklist->get('params'));
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == Horde_Kolab_Storage_Namespace::PERSONAL) {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
+
 $title = $form->getTitle();
 require NAG_TEMPLATES . '/common-header.inc';
 require NAG_TEMPLATES . '/menu.inc';



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/nag ChangeLog, 1.1, 1.2 nag.spec, 1.4,
	1.5 
Message-ID: <20100510071131.5DF88600584@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/nag
In directory doto:/tmp/cvs-serv17827/d/nag

Modified Files:
	ChangeLog nag.spec 
Log Message:
Complete active sync configuration management GUI.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	5 Mar 2010 06:55:49 -0000	1.1
+++ ChangeLog	10 May 2010 07:11:29 -0000	1.2
@@ -1,3 +1,9 @@
+2010-05-10  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/nag-2.3.4/t_nag_HK_GW_ZpushAnnotations.diff:
+
+	Support setting Zpush configuration values.
+
 2010-03-05  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/nag-2.3.4/t_nag_HK_GW_StoreCreatorAndOrganizer.diff:

Index: nag.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/nag.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nag.spec	5 Mar 2010 06:55:49 -0000	1.4
+++ nag.spec	10 May 2010 07:11:29 -0000	1.5
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package nag
 %define         V_version 2.3.4
-%define         V_release 20100305
+%define         V_release 20100510
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Mon May 10 09:11:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 10 May 2010 09:11:31 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/turba/patches/turba-2.3.3
	t_turba_HK_GW_ZpushAnnotations.diff, NONE, 1.1 series, 1.4, 1.5 
Message-ID: <20100510071131.683B2600582@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv17827/d/turba/patches/turba-2.3.3

Modified Files:
	series 
Added Files:
	t_turba_HK_GW_ZpushAnnotations.diff 
Log Message:
Complete active sync configuration management GUI.

--- NEW FILE: t_turba_HK_GW_ZpushAnnotations.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/ZpushAnnotations

Allows to modify the Zpush configuration.

Signed-off-by: Gunnar Wrobel <p at rdus.de>

diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
--- a/addressbooks/edit.php	2010-05-10 08:30:03.000000000 +0200
+++ b/addressbooks/edit.php	2010-05-10 08:31:19.000000000 +0200
@@ -53,6 +53,26 @@
 
 $vars->set('name', $addressbook->get('name'));
 $vars->set('description', $addressbook->get('desc'));
+
+$params = @unserialize($addressbook->get('params'));
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == Horde_Kolab_Storage_Namespace::PERSONAL) {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
+
 $title = $form->getTitle();
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
diff -Naur a/lib/Forms/EditAddressBook.php b/lib/Forms/EditAddressBook.php
--- a/lib/Forms/EditAddressBook.php	2010-05-10 08:30:05.000000000 +0200
+++ b/lib/Forms/EditAddressBook.php	2010-05-10 08:32:28.000000000 +0200
@@ -46,10 +46,38 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $this->_addressbook->set('name', $this->_vars->get('name'));
         $this->_addressbook->set('desc', $this->_vars->get('description'));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $params = array();
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+            $this->_addressbook->set('params', serialize($params));
+        }
+
         $result = $this->_addressbook->save();
         if (is_a($result, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Unable to save address book \"%s\": %s"), $id, $result->getMessage()));

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/series,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- series	24 Mar 2010 07:55:48 -0000	1.4
+++ series	10 May 2010 07:11:29 -0000	1.5
@@ -3,3 +3,4 @@
 t_turba_HK_GW_SyncMLrefresh.diff
 t_turba_HK_GW_ConfigurationOverride.diff
 t_turba_HK_GW_AlternativeNameDetailView.diff
+t_turba_HK_GW_ZpushAnnotations.diff
\ No newline at end of file



From cvs at kolab.org  Sat May 15 06:59:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 15 May 2010 06:59:01 +0200 (CEST)
Subject: gunnar: server/make-helper pear.mk,1.11,1.12 
Message-ID: <20100515045901.3910D600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv10185/make-helper

Modified Files:
	pear.mk 
Log Message:
POSIX (kolab/issue4357 (CVS Build fails - source not found. Ubuntu 10.04) )

Index: pear.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/pear.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pear.mk	7 Mar 2010 21:26:23 -0000	1.11
+++ pear.mk	15 May 2010 04:58:59 -0000	1.12
@@ -228,7 +228,7 @@
 ifneq ($(SPEC_PRESENT),)
 else
 $(PACKAGE).spec: ../../pear/pear.spec.template package.info
-	source ./package.info &&                               \
+	. ./package.info &&                                    \
 	  cat ../../pear/pear.spec.template |                  \
 	  sed -e "s#[@]pear_pkgdir[@]#$${pear_pkgdir}#g"       \
 	      -e "s#[@]pear_package[@]#$${pear_package}#g"     \



From cvs at kolab.org  Sun May 16 08:41:03 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 08:41:03 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.24,
	1.25 
Message-ID: <20100516064103.DBE41600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv23476/kolabd/templates

Modified Files:
	freebusy.conf.template.in 
Log Message:
Prepare moving the template into the corresponding package (the dist_conf rewriting is not necessary anymore).

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- freebusy.conf.template.in	22 Feb 2010 06:34:46 -0000	1.24
+++ freebusy.conf.template.in	16 May 2010 06:41:01 -0000	1.25
@@ -1,7 +1,7 @@
 KOLAB_META_START
-TARGET=@freebusy_confdir@/config.php
+TARGET=@@@freebusy_confdir@@@/config.php
 PERMISSIONS=0640
-OWNERSHIP=@freebusy_usr@:@freebusy_grp@
+OWNERSHIP=@@@freebusy_usr@@@:@@@freebusy_grp@@@
 KOLAB_META_END
 <?php
 @@@warning@@@
@@ -45,13 +45,13 @@
 /* Horde::Log configuration */
 $conf['log']['enabled']          = true;
 $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
-$conf['log']['type']             = '@freebusy_log_type@';
-$conf['log']['name']             = '@freebusy_log_name@';
+$conf['log']['type']             = '@@@freebusy_log_type@@@';
+$conf['log']['name']             = '@@@freebusy_log_name@@@';
 $conf['log']['ident']            = 'Kolab Free/Busy';
 $conf['log']['params']['append'] = true;
 
 /* PHP error logging */
-ini_set('error_log', '@freebusy_logdir@/php-error.log');
+ini_set('error_log', '@@@freebusy_logdir@@@/php-error.log');
 
 /* Horde::Kolab::LDAP configuration */
 $conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
@@ -129,7 +129,7 @@
 $conf['fb']['email_domain'] = '@@@fqdnhostname@@@';
 
 /* Location of the cache files */
-$conf['fb']['cache_dir']    = '@freebusy_cachedir@';
+$conf['fb']['cache_dir']    = '@@@freebusy_cachedir@@@';
 
 /* What db type to use for the freebusy caches */
 $conf['fb']['dbformat']     = 'db4';
@@ -155,6 +155,20 @@
  * disabling the use of ACL settings.
  */
 $conf['fb']['use_acls'] = true;
+
+/* The resulting vCalendar file is being cached. The following setting
+ * determines how many seconds it will be delivered without checking if
+ * the contents of the file might have changed. A negative setting disables
+ * caching (which is currently required for the resource management to work).
+ */
+$conf['fb']['vcal_cache']['min_age'] = -1;
+
+/* The resulting vCalendar file is being cached. The following setting
+ * determines after how many seconds it will be considered too old for
+ * delivery and a refresh of its contents will be enforced.
+ */
+$conf['fb']['vcal_cache']['max_age'] = 259200;
+
 
 /* Are there remote servers on which users have additional (shared)
  * folders? In that case free/busy information should also be fetched



From cvs at kolab.org  Sun May 16 08:42:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 08:42:15 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates - New directory 
Message-ID: <20100516064215.2EA5C600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates
In directory doto:/tmp/cvs-serv23536/templates

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Freebusy/templates added to the repository




From cvs at kolab.org  Sun May 16 08:42:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 08:42:15 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.6
	- New directory 
Message-ID: <20100516064215.34593600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.6
In directory doto:/tmp/cvs-serv23536/templates/Kolab_FreeBusy-0.1.6

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.6 added to the repository




From cvs at kolab.org  Sun May 16 08:58:55 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 08:58:55 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.545,1.546 
Message-ID: <20100516065855.067C2600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23910

Modified Files:
	release-notes.txt 
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -d -r1.545 -r1.546
--- release-notes.txt	10 May 2010 07:11:29 -0000	1.545
+++ release-notes.txt	16 May 2010 06:58:52 -0000	1.546
@@ -124,6 +124,8 @@
 
 	Support configurable attribute mapping.
 
+	freebusy.conf.template.in moved to the Kolab_FreeBusy package.
+
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
 	kolab/issue1671 (Improving the warning about kolab templates within
 	                 configuration files)



From cvs at kolab.org  Sun May 16 08:58:55 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 08:58:55 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.292, 1.293 Makefile.am, 1.54,
	1.55 kolab.globals.in, 1.27, 1.28 
Message-ID: <20100516065855.0DE3D600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23910/d/kolabd

Modified Files:
	ChangeLog Makefile.am kolab.globals.in 
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- ChangeLog	4 May 2010 14:10:42 -0000	1.292
+++ ChangeLog	16 May 2010 06:58:53 -0000	1.293
@@ -1,3 +1,15 @@
+2010-05-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Makefile.am (kolabtemplate_DATA): freebusy.conf.template.in
+	moved to the Kolab_FreeBusy package.
+
+	* kolab.globals.in (freebusy_*): Add the freebusy variables into
+	the global parameter list so that the freebusy.conf.template.in
+	can be removed.
+
+	* templates/freebusy.conf.template.in: Moved to the Kolab_FreeBusy
+	package.
+	
 2010-05-04  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/imapd.annotation_definitions.template.in:

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.am	23 Jul 2009 08:10:02 -0000	1.54
+++ Makefile.am	16 May 2010 06:58:53 -0000	1.55
@@ -36,7 +36,6 @@
 	templates/clamd.conf.template \
 	templates/cyrus.conf.template \
 	templates/DB_CONFIG.slapd.template \
-	templates/freebusy.conf.template \
 	templates/freshclam.conf.template \
 	templates/header_checks.template \
 	templates/httpd.conf.template \

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolab.globals.in	9 Feb 2010 09:42:21 -0000	1.27
+++ kolab.globals.in	16 May 2010 06:58:53 -0000	1.28
@@ -90,3 +90,10 @@
 syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie
 imap_confdir : @imap_confdir@
 imappartitions_script : @sbindir@/kolab_imappartitions
+freebusy_confdir: @freebusy_confdir@
+freebusy_usr: @freebusy_usr@
+freebusy_grp: @freebusy_grp@
+freebusy_log_type: @freebusy_log_type@
+freebusy_log_name: @freebusy_log_name@
+freebusy_logdir: @freebusy_logdir@
+freebusy_cachedir: @freebusy_cachedir@



From cvs at kolab.org  Sun May 16 09:03:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 09:03:43 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.546,1.547 
Message-ID: <20100516070343.CE205600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24115

Modified Files:
	release-notes.txt 
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package. kolab/issue3544 (Cached xfb access not up to date for changed distribution lists)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -d -r1.546 -r1.547
--- release-notes.txt	16 May 2010 06:58:52 -0000	1.546
+++ release-notes.txt	16 May 2010 07:03:41 -0000	1.547
@@ -75,11 +75,13 @@
 	kolab/issue3525 (free/busy regeneration aborts for unparsable events)
 	kolab/issue3528 (Events with broken encoding should work)
 
-    - Kolab_FreeBusy-0.1.5-2009????
+    - Kolab_FreeBusy-0.1.6-2009????
 
 	Improved handling of dba access.
 	Extended support for more complex scenario testing.
 
+	freebusy.conf.template.in moved to the Kolab_FreeBusy package.
+
 	kolab/issue3415 (freebusy cache regeneration on the command line looks
 	                 confusing)
 	kolab/issue3446 (SERVER_NAME undefined in freebusy/regenerate.php)
@@ -88,6 +90,8 @@
 	kolab/issue3527 (no immediately printing of folders during
 	                 freebusy cache regeneration)
 	kolab/issue3537 (Allowing xfb access to groups does not work)
+	kolab/issue3544 (Cached xfb access not up to date for changed
+	                 distribution lists)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) 
 
     - Kolab_Server-0.5.0-2010????



From cvs at kolab.org  Sun May 16 09:03:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 09:03:43 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.6
	freebusy.conf.template, NONE, 1.1 
Message-ID: <20100516070343.E1B92600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.6
In directory doto:/tmp/cvs-serv24115/d/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.6

Added Files:
	freebusy.conf.template 
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package. kolab/issue3544 (Cached xfb access not up to date for changed distribution lists)

--- NEW FILE: freebusy.conf.template ---
KOLAB_META_START
TARGET=@@@freebusy_confdir@@@/config.php
PERMISSIONS=0640
OWNERSHIP=@@@freebusy_usr@@@:@@@freebusy_grp@@@
KOLAB_META_END
<?php
@@@warning@@@

/*  
 *  COPYRIGHT
 *  ---------
 *
 *  See docs/AUTHORS file
 *
 *
 *  LICENSE
 *  -------
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *  $Revision: 1.1 $
 *
 *  ABOUT
 *  -----
 *
 *  This file provides configuration settings for both the
 *  freebusy.php and the pfb.php scripts.
 *
 */

$conf = array();

/* Horde::Log configuration */
$conf['log']['enabled']          = true;
$conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
$conf['log']['type']             = '@@@freebusy_log_type@@@';
$conf['log']['name']             = '@@@freebusy_log_name@@@';
$conf['log']['ident']            = 'Kolab Free/Busy';
$conf['log']['params']['append'] = true;

/* PHP error logging */
ini_set('error_log', '@@@freebusy_logdir@@@/php-error.log');

/* Horde::Kolab::LDAP configuration */
$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['phpdn']  = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw']  = '@@@php_pw@@@';

/**
 * If you use customized LDAP attributes on your LDAP server the
 * following configuration setting allows you to map the standard
 * Kolab attribute names to your customizations.
 *
 * Specify the mapping line by line:
 *
 * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
 * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
 *
 * or use a hash structure:
 *
 * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
 *                                       'mobile' => 'handy');
 *
 */
//$conf['kolab']['ldap']['map']['uid'] = 'uid2';

/**
 * If you use customized LDAP attributes on your LDAP server the
 * following configuration setting allows you to map the standard
 * Kolab attribute names to your customizations.
 *
 * Specify the mapping line by line:
 *
 * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
 * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
 *
 * or use a hash structure:
 *
 * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
 *                                       'mobile' => 'handy');
 *
 */
//$conf['kolab']['ldap']['map']['uid'] = 'uid2';

/* Horde::Kolab::IMAP configuration */
$conf['kolab']['imap']['server']   = '@@@fqdnhostname@@@';
$conf['kolab']['imap']['port']     = 143;
$conf['kolab']['imap']['protocol'] = 'notls/readonly';

/* Horde::Auth configuration */
$conf['auth']['params']['login_block'] = 0;
$conf['auth']['checkbrowser']          = false;
$conf['auth']['checkip']               = false;

/* Allow special users to log into the system */
$conf['kolab']['imap']['allow_special_users'] = true;

/* Do not record login attempts */
$conf['auth']['params']['login_block'] = false;

/* Kolab::Freebusy configuration */

/* Should we redirect using a Location header, if the user is not local? If this
 * is false we silently download the file ourselves and output it so that it
 * looks as though the free/busy information is coming from us.
 */
$conf['fb']['redirect']     = false;

/* What is the address of the current server where the free/busy data can be accessed?
 */
$conf['kolab']['freebusy']['server']  = 'https://@@@fqdnhostname@@@/freebusy';

/* What is our default mail domain? This is used if any users do not have
 * '@domain' specified after their username as part of their email address.
 */
$conf['fb']['email_domain'] = '@@@fqdnhostname@@@';

/* Location of the cache files */
$conf['fb']['cache_dir']    = '@@@freebusy_cachedir@@@';

/* What db type to use for the freebusy caches */
$conf['fb']['dbformat']     = 'db4';

/* Should we send a Content-Type header, indicating what the mime type of the
 * resulting VFB file is?
 */
$conf['fb']['send_content_type'] = false;

/* Should we send a Content-Length header, indicating how large the resulting
 * VFB file is?
 */
$conf['fb']['send_content_length'] = false;

/* Should we send a Content-Disposition header, indicating what the name of the
 * resulting VFB file should be?
 */
$conf['fb']['send_content_disposition'] = false;

/* Should we use ACLs or does everybody get full rights? DO NOT set
 * this to false if you don't know what you are doing. Your free/busy
 * service should not be visible to any outside networks when
 * disabling the use of ACL settings.
 */
$conf['fb']['use_acls'] = true;

/* The resulting vCalendar file is being cached. The following setting
 * determines how many seconds it will be delivered without checking if
 * the contents of the file might have changed. A negative setting disables
 * caching (which is currently required for the resource management to work).
 */
$conf['fb']['vcal_cache']['min_age'] = -1;

/* The resulting vCalendar file is being cached. The following setting
 * determines after how many seconds it will be considered too old for
 * delivery and a refresh of its contents will be enforced.
 */
$conf['fb']['vcal_cache']['max_age'] = 259200;


/* Are there remote servers on which users have additional (shared)
 * folders? In that case free/busy information should also be fetched
 * from these servers.
 *
 * Add them like this:
 *
 * array('remote1.example.com', 'remote2.example.com')
 */
$conf['fb']['remote_servers'] = array();

/**
 * Ensure we use the Kolab group driver when handling groups.
 */
$conf['group']['driver'] = 'kolab';
$conf['group']['cache'] = false;

//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
// If you modify this file, please do not forget to ping upstream
// about synchronizing this file with 
// 
// http://cvs.horde.org/framework/Kolab_FreeBusy/www/Horde/Kolab/FreeBusy/config.php
//
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

// DEBUGGING
// =========
//
// Activate this to see the log messages on the screen
// $conf['log']['type'] = 'display';
//
// Activate this to see the php messages on the screen
// ini_set('display_errors', 1);
//
// Both setting will disrupt header delivery (which should not cause a
// problem).



From cvs at kolab.org  Sun May 16 09:03:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 09:03:43 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.29,
	1.30 Kolab_FreeBusy.spec, 1.27, 1.28 Makefile, 1.10,
	1.11 package.info, 1.4, 1.5 
Message-ID: <20100516070343.D5C8C600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv24115/d/Kolab_Freebusy

Modified Files:
	ChangeLog Kolab_FreeBusy.spec Makefile package.info 
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package. kolab/issue3544 (Cached xfb access not up to date for changed distribution lists)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	25 Mar 2010 16:28:18 -0000	1.29
+++ ChangeLog	16 May 2010 07:03:41 -0000	1.30
@@ -1,3 +1,12 @@
+2010-05-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_FreeBusy.spec: Update to 0.1.6
+
+	freebusy.conf.template.in moved to the Kolab_FreeBusy package.
+
+	kolab/issue3544 (Cached xfb access not up to date for changed
+	distribution lists)
+
 2010-03-25  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_FreeBusy-0.1.5/issue3983.patch:

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Kolab_FreeBusy.spec	30 Mar 2010 06:57:44 -0000	1.27
+++ Kolab_FreeBusy.spec	16 May 2010 07:03:41 -0000	1.28
@@ -6,8 +6,8 @@
 %define         V_package_origin WGET
 %define         V_repo_commit 
 %define         V_repo_release 
-%define         V_version 0.1.5
-%define         V_release 20100330
+%define         V_version 0.1.6
+%define         V_release 20100516
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc freebusy
@@ -26,7 +26,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz
+Source0:    %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz
+Source1:    freebusy.conf.template
 
 # List of patches
 Patch0:    package.patch
@@ -76,6 +77,7 @@
 %install
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/log
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/cache
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"\
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache"                                       \
@@ -91,6 +93,9 @@
                 %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib
                 cp -a $RPM_BUILD_ROOT/%{l_prefix}/lib/%{V_php_lib_loc} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib/
         %endif
+
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
+	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                     \
                 '%config(noreplace) %{l_prefix}/var/kolab/www/freebusy/config.php' \

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	22 Jan 2010 15:36:04 -0000	1.10
+++ Makefile	16 May 2010 07:03:41 -0000	1.11
@@ -1,2 +1,7 @@
 SPEC_PRESENT = yes
 include ../../make-helper/pear.mk
+
+# Get the list of templates if there are any in the template directory
+TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null)
+
+EXTRA = package.patch $(TEMPLATES)

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.info	30 Mar 2010 06:57:44 -0000	1.4
+++ package.info	16 May 2010 07:03:41 -0000	1.5
@@ -13,10 +13,10 @@
 package_origin='WGET'
 
 # Version number
-version='0.1.5'
+version='0.1.6'
 
 # Package release number
-release='20100330'
+release='20100516'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Sun May 16 11:08:33 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:08:33 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.293,1.294 
Message-ID: <20100516090833.95925600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv27320/kolabd

Modified Files:
	ChangeLog 
Log Message:
        Adapt port policy.
        kolab/issue4311 (Activate port 587 for email submission)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- ChangeLog	16 May 2010 06:58:53 -0000	1.293
+++ ChangeLog	16 May 2010 09:08:31 -0000	1.294
@@ -1,5 +1,9 @@
 2010-05-16  Gunnar Wrobel  <p at rdus.de>
 
+	* templates/master.cf.template.in, templates/main.cf.template.in:
+	Adapt port policy.
+	kolab/issue4311 (Activate port 587 for email submission)
+
 	* Makefile.am (kolabtemplate_DATA): freebusy.conf.template.in
 	moved to the Kolab_FreeBusy package.
 



From cvs at kolab.org  Sun May 16 11:08:33 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:08:33 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates main.cf.template.in, 1.26,
	1.27 master.cf.template.in, 1.29, 1.30 
Message-ID: <20100516090833.9DDD2600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv27320/kolabd/templates

Modified Files:
	main.cf.template.in master.cf.template.in 
Log Message:
        Adapt port policy.
        kolab/issue4311 (Activate port 587 for email submission)


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- main.cf.template.in	13 Dec 2009 18:04:37 -0000	1.26
+++ main.cf.template.in	16 May 2010 09:08:31 -0000	1.27
@@ -161,6 +161,7 @@
 	check_policy_service unix:private/kolabpolicy
 smtpd_sender_restrictions = permit_mynetworks,
 	check_policy_service unix:private/kolabpolicy
+submission_sender_restrictions = check_policy_service unix:private/kolabpolicy
 kolabpolicy_time_limit = 3600
 kolabpolicy_max_idle = 20
 

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- master.cf.template.in	27 Apr 2010 11:04:37 -0000	1.29
+++ master.cf.template.in	16 May 2010 09:08:31 -0000	1.30
@@ -22,6 +22,7 @@
   -o smtpd_enforce_tls=yes
   -o smtpd_sasl_auth_enable=yes
   -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+  -o smtpd_sender_restrictions=${submission_sender_restrictions}
 #628      inet  n       -       n       -       -       qmqpd
 pickup    fifo  n       -       n       60      1       pickup
 cleanup   unix  n       -       n       -       0       cleanup



From cvs at kolab.org  Sun May 16 11:14:39 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:14:39 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6
	10-kolab_conf_base.php, 1.3, 1.4 
Message-ID: <20100516091439.EF92F600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6
In directory doto:/tmp/cvs-serv27472/d/horde/configuration/horde-3.3.6

Modified Files:
	10-kolab_conf_base.php 
Log Message:
kolab/issue2991 (The Kolab web client is always in the privileged networks) 

Index: 10-kolab_conf_base.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/10-kolab_conf_base.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 10-kolab_conf_base.php	21 Jan 2010 22:34:52 -0000	1.3
+++ 10-kolab_conf_base.php	16 May 2010 09:14:37 -0000	1.4
@@ -42,7 +42,7 @@
 $conf['cache']['driver'] = 'file';
 
 $conf['mailer']['params']['host'] = 'localhost';
-$conf['mailer']['params']['port'] = 25;
+$conf['mailer']['params']['port'] = 587;
 $conf['mailer']['params']['auth'] = true;
 $conf['mailer']['type'] = 'smtp';
 



From cvs at kolab.org  Sun May 16 11:14:39 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:14:39 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.547,1.548 
Message-ID: <20100516091439.E8EDD600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv27472

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2991 (The Kolab web client is always in the privileged networks) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -d -r1.547 -r1.548
--- release-notes.txt	16 May 2010 07:03:41 -0000	1.547
+++ release-notes.txt	16 May 2010 09:14:37 -0000	1.548
@@ -32,6 +32,8 @@
 
 	Support setting Zpush configuration values.
 
+	kolab/issue2991 (The Kolab web client is always in the privileged networks) 
+
     - imp-4.3.6-2010????
 
 	Hid IMP and made the dynamic version (dimp) the default view.



From cvs at kolab.org  Sun May 16 11:14:39 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:14:39 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde ChangeLog, 1.1, 1.2 horde.spec,
	1.11, 1.12 
Message-ID: <20100516091439.F2558600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv27472/d/horde

Modified Files:
	ChangeLog horde.spec 
Log Message:
kolab/issue2991 (The Kolab web client is always in the privileged networks) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	6 May 2010 07:10:06 -0000	1.1
+++ ChangeLog	16 May 2010 09:14:37 -0000	1.2
@@ -1,3 +1,9 @@
+2010-05-16  Gunnar Wrobel  <p at rdus.de>
+
+	* configuration/horde-3.3.6/10-kolab_conf_base.php: 
+
+	kolab/issue2991 (The Kolab web client is always in the privileged networks) 
+
 2010-05-06  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/horde-3.3.6/t_horde_HK_GW_ZpushAnnotations.diff:

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- horde.spec	6 May 2010 07:10:06 -0000	1.11
+++ horde.spec	16 May 2010 09:14:37 -0000	1.12
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.6
-%define         V_release 20100506
+%define         V_release 20100516
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Sun May 16 11:39:45 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:39:45 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.548,1.549 
Message-ID: <20100516093945.563DD600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv27972

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2966 (A created/edited event doesn't send mails to all attendee as default.) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -d -r1.548 -r1.549
--- release-notes.txt	16 May 2010 09:14:37 -0000	1.548
+++ release-notes.txt	16 May 2010 09:39:43 -0000	1.549
@@ -175,6 +175,8 @@
 
 	Support setting Zpush configuration values.
 
+	kolab/issue2966 (A created/edited event doesn't send mails to all
+	                 attendee as default.)
 	kolab/issue3848 (display "Basic Search" and "Advanced Search"
 	                 as tabs in place of a small table header.)
 	kolab/issue3885 (Modifying start date of recurring events does not



From cvs at kolab.org  Sun May 16 11:39:45 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:39:45 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3
	t_kronolith_HK_GW_SendInvitationsByDefault.diff, NONE,
	1.1 series, 1.10, 1.11 
Message-ID: <20100516093945.5D7D0600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3
In directory doto:/tmp/cvs-serv27972/d/kronolith/patches/kronolith-2.3.3

Modified Files:
	series 
Added Files:
	t_kronolith_HK_GW_SendInvitationsByDefault.diff 
Log Message:
kolab/issue2966 (A created/edited event doesn't send mails to all attendee as default.) 

--- NEW FILE: t_kronolith_HK_GW_SendInvitationsByDefault.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/GW/SendInvitationsByDefault

REF: https://issues.kolab.org/issue2966

STATUS: HACK

Signed-off-by: Gunnar Wrobel <p at rdus.de>

--- a/templates/edit/edit.inc	2010-05-16 11:32:56.122204796 +0200
+++ b/templates/edit/edit.inc	2010-05-16 11:33:19.730773324 +0200
@@ -373,7 +373,7 @@
 <tr>
  <td></td>
  <td colspan="4">
-  <input id="sendupdates" type="checkbox" class="checkbox" name="sendupdates" />
+  <input id="sendupdates" type="checkbox" class="checkbox" name="sendupdates" checked="checked" />
   <label for="sendupdates"><?php echo $event->isInitialized() ? _("Send updates to all attendees?") : _("Send invitations to all attendees?") ?></label>
  </td>
 </tr>

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/series,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- series	6 May 2010 07:10:06 -0000	1.10
+++ series	16 May 2010 09:39:43 -0000	1.11
@@ -13,3 +13,4 @@
 t_kronolith_HK_UV_SyncMLSyncBackendBeforeSync.diff
 t_SyncML_UV_RecurringEventsWeekCount.diff
 t_kronolith_HK_GW_ZpushAnnotations.diff
+t_kronolith_HK_GW_SendInvitationsByDefault.diff



From cvs at kolab.org  Sun May 16 11:39:45 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:39:45 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith ChangeLog, 1.4,
	1.5 kronolith.spec, 1.11, 1.12 
Message-ID: <20100516093945.5FAD2600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith
In directory doto:/tmp/cvs-serv27972/d/kronolith

Modified Files:
	ChangeLog kronolith.spec 
Log Message:
kolab/issue2966 (A created/edited event doesn't send mails to all attendee as default.) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	6 May 2010 07:10:06 -0000	1.4
+++ ChangeLog	16 May 2010 09:39:43 -0000	1.5
@@ -1,3 +1,10 @@
+2010-05-16  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/kronolith-2.3.3/t_kronolith_HK_GW_SendInvitationsByDefault.diff:
+
+	kolab/issue2966 (A created/edited event doesn't send mails to all
+	attendee as default.)
+
 2010-05-06  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/kronolith-2.3.3/t_kronolith_HK_GW_ZpushAnnotations.diff:

Index: kronolith.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/kronolith.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kronolith.spec	6 May 2010 07:10:06 -0000	1.11
+++ kronolith.spec	16 May 2010 09:39:43 -0000	1.12
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package kronolith
 %define         V_version 2.3.3
-%define         V_release 20100506
+%define         V_release 20100516
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Sun May 16 11:45:07 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 11:45:07 +0200 (CEST)
Subject: gunnar: server/make-helper kolab.mk,1.7,1.8 
Message-ID: <20100516094507.BB0F1600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv28194

Modified Files:
	kolab.mk 
Log Message:
kolab/issue4393 (CVS build failure: environment variables not set when invoking ) 

Index: kolab.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/kolab.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab.mk	12 Feb 2010 20:02:53 -0000	1.7
+++ kolab.mk	16 May 2010 09:45:05 -0000	1.8
@@ -1,12 +1,12 @@
 KOLAB_VERSION = 2.2.3
 
 # Check if we are in a test environment
-TEST_ENVIRONMENT=$(shell test -e test_environment && echo YES)
+TEST_ENVIRONMENT=$(test -e test_environment && echo YES)
 ifeq "x$(TEST_ENVIRONMENT)" "xYES"
-    BINARY_PKGS_DIR=$(shell source test_environment && echo $$BINARY_PKGS_DIR)
-    SOURCE_PKGS_DIR=$(shell source test_environment && echo $$SOURCE_PKGS_DIR)
-    KOLABDIR=$(shell source test_environment && echo $$KOLABDIR)
-    KOLABUID=$(shell source test_environment && echo $$KOLABUID)
+    BINARY_PKGS_DIR=$(. test_environment && echo $$BINARY_PKGS_DIR)
+    SOURCE_PKGS_DIR=$(.  test_environment && echo $$SOURCE_PKGS_DIR)
+    KOLABDIR=$(. test_environment && echo $$KOLABDIR)
+    KOLABUID=$(. test_environment && echo $$KOLABUID)
     OPENPKG=$(KOLABDIR)/bin/openpkg
 else
     BINARY_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/ix86-debian5.0 



From cvs at kolab.org  Sun May 16 21:18:07 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 21:18:07 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.23,1.24 
Message-ID: <20100516191807.44EB6600576@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv10550/dist_conf

Modified Files:
	kolabsrv.in 
Log Message:
Added redhar services

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kolabsrv.in	16 Jan 2010 19:33:43 -0000	1.23
+++ kolabsrv.in	16 May 2010 19:18:05 -0000	1.24
@@ -37,6 +37,18 @@
 	# Perhaps better use:
 	# lsb_release -i | cut -f2
 	case $system in
+	redhat)
+		case $sname in
+			apache) SERVICE="httpd" ;;
+			openldap) SERVICE="@LDAPD@" ;;
+			sasl) SERVICE="saslauthd" ;;
+			imapd) SERVICE="cyrus-imapd" ;;
+			amavisd) SERVICE="amavisd" ;;
+			clamav) SERVICE="clamd.amavisd" ;;
+			*) SERVICE=$sname
+		esac
+		;;
+
 	opensuse)
 		case $sname in
 			apache) SERVICE="apache2" ;;



From cvs at kolab.org  Sun May 16 21:18:07 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 May 2010 21:18:07 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.294,1.295 
Message-ID: <20100516191807.42AA3600575@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv10550

Modified Files:
	ChangeLog 
Log Message:
Added redhar services

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- ChangeLog	16 May 2010 09:08:31 -0000	1.294
+++ ChangeLog	16 May 2010 19:18:05 -0000	1.295
@@ -1,3 +1,7 @@
+2010-05-16 Richard Bos <richard at radoeka.nl>
+
+	* dist_conf/kolabsrv.in: Added redhat services, on request of Jeroen v. M.
+
 2010-05-16  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/master.cf.template.in, templates/main.cf.template.in:



From cvs at kolab.org  Wed May 19 11:18:21 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 19 May 2010 11:18:21 +0200 (CEST)
Subject: thomas: doc/www/src roadmap.html.m4,1.32,1.33 
Message-ID: <20100519091821.3D2A260057A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv31999/src

Modified Files:
	roadmap.html.m4 
Log Message:
Updated server roadmap


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- roadmap.html.m4	23 Dec 2009 16:56:52 -0000	1.32
+++ roadmap.html.m4	19 May 2010 09:18:18 -0000	1.33
@@ -32,7 +32,10 @@
 It contains important bugfixes and improvements.
 <p>
 It is planned to have further improvements in a release
-2.3.0 in second quarter of 2010.
+2.2.4 in second quarter of 2010 and a release 2.3.0 later in 2010.
+<p>
+<a href="http://www.kolabsys.com">Kolab Systems</a> is currently
+working on native packages for Debian and Fedora.
 
 <h3>Kolab Server 2.1 release series</h3>
 Current is 2.1.0 Final. No further releases planned.



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.44, 1.45 
Message-ID: <20100521155822.7B851600587@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv29268/php/admin/locale/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- messages.po	8 Sep 2008 17:52:30 -0000	1.44
+++ messages.po	21 May 2010 15:58:20 -0000	1.45
@@ -1675,8 +1675,8 @@
 msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
 
 #: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Sieve-Dienst (TCP-Port 2000)"
+msgid "Sieve service (TCP port %s)"
+msgstr "Sieve-Dienst (TCP-Port %s)"
 
 #: ../../../www/admin/settings/index.php.in:278
 msgid "FreeBusy Service via HTTP (in addition to HTTPS)"



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin ChangeLog,1.125,1.126 
Message-ID: <20100521155822.7A1D7600586@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv29268

Modified Files:
	ChangeLog 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- ChangeLog	7 Apr 2010 07:28:40 -0000	1.125
+++ ChangeLog	21 May 2010 15:58:20 -0000	1.126
@@ -1,3 +1,8 @@
+2010-05-21  Mathieu Parent  <math.parent at gmail.com>
+
+	* php/admin/locale/*/LC_MESSAGES/messages.po, www/admin/settings/index.php.in:
+	Configurable sieve port (l10n part of issue4373)
+
 2010-04-07  Gunnar Wrobel  <p at rdus.de>
 
 	* php/*:



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.23, 1.24 
Message-ID: <20100521155822.7FBFD600588@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
In directory doto:/tmp/cvs-serv29268/php/admin/locale/es/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- messages.po	8 Sep 2008 17:52:30 -0000	1.23
+++ messages.po	21 May 2010 15:58:20 -0000	1.24
@@ -1669,8 +1669,8 @@
 msgstr "Servicio IMAP/SSL (puerto TCP 993)"
 
 #: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Servicio Sieve (puerto TCP 2000)"
+msgid "Sieve service (TCP port %s)"
+msgstr "Servicio Sieve (puerto TCP %s)"
 
 #: ../../../www/admin/settings/index.php.in:278
 msgid "FreeBusy Service via HTTP (in addition to HTTPS)"



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.31, 1.32 
Message-ID: <20100521155822.8974F600589@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv29268/php/admin/locale/fr/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- messages.po	14 May 2009 14:13:43 -0000	1.31
+++ messages.po	21 May 2010 15:58:20 -0000	1.32
@@ -1674,8 +1674,8 @@
 msgstr "Service IMAP/SSL (TCP port 993)"
 
 #: ../../../www/admin/settings/index.php.in:279
-msgid "Sieve service (TCP port 2000)"
-msgstr "Service Sieve (TCP port 2000)"
+msgid "Sieve service (TCP port %s)"
+msgstr "Service Sieve (TCP port %s)"
 
 #: ../../../www/admin/settings/index.php.in:280
 msgid "FreeBusy Service via HTTP (in addition to HTTPS)"



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.25, 1.26 
Message-ID: <20100521155822.92ACB60058A@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv29268/php/admin/locale/it/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- messages.po	8 Sep 2008 17:52:30 -0000	1.25
+++ messages.po	21 May 2010 15:58:20 -0000	1.26
@@ -1669,8 +1669,8 @@
 msgstr "Servizio IMAP/SSL (Porta TCP 993)"
 
 #: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Servizio Sieve (Porta TCP 2000)"
+msgid "Sieve service (TCP port %s)"
+msgstr "Servizio Sieve (Porta TCP %s)"
 
 #: ../../../www/admin/settings/index.php.in:278
 msgid "FreeBusy Service via HTTP (in addition to HTTPS)"



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.54, 1.55 
Message-ID: <20100521155822.995B2600586@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv29268/php/admin/locale/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- messages.po	22 Feb 2009 20:13:17 -0000	1.54
+++ messages.po	21 May 2010 15:58:20 -0000	1.55
@@ -1656,8 +1656,8 @@
 msgstr "IMAP/SSL Service (TCP poort 993)"
 
 #: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Sieve service (TCP poort 2000)"
+msgid "Sieve service (TCP port %s)"
+msgstr "Sieve service (TCP poort %s)"
 
 #: ../../../www/admin/settings/index.php.in:278
 msgid "FreeBusy Service via HTTP (in addition to HTTPS)"



From cvs at kolab.org  Fri May 21 17:58:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 21 May 2010 17:58:22 +0200 (CEST)
Subject: mathieu: server/kolab-webadmin/kolab-webadmin/www/admin/settings
	index.php.in, 1.2, 1.3 
Message-ID: <20100521155822.9B6C5600587@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings
In directory doto:/tmp/cvs-serv29268/www/admin/settings

Modified Files:
	index.php.in 
Log Message:
Configurable sieve port (l10n part of issue4373)


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	11 Nov 2008 20:41:47 -0000	1.2
+++ index.php.in	21 May 2010 15:58:20 -0000	1.3
@@ -276,7 +276,7 @@
 				  array( 'service' => 'pop3s', 'name' => _('POP3/SSL service (TCP port 995)'), 'enabled' => toboolstr( $pop3s ) ),
 				  array( 'service' => 'imap', 'name'  => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
 				  array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ),
-				  array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ),
+				  array( 'service' => 'sieve', 'name' => sprintf(_('Sieve service (TCP port %s)'), 2000), 'enabled' => toboolstr( $sieve ) ),
 				  array( 'service' => 'http', 'name'  => _('FreeBusy Service via HTTP (in addition to HTTPS)'), 'enabled' => toboolstr( $http ) ),
 				  array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'), 
 						 'enabled' => toboolstr( $amavis ) ) );



From cvs at kolab.org  Wed Jun  2 21:06:34 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  2 Jun 2010 21:06:34 +0200 (CEST)
Subject: gunnar: server/kolab-webclient activesync_conf.patch, NONE,
	1.1.2.1 Makefile, 1.6.2.2, 1.6.2.3 kolab-webclient.spec,
	1.23.2.21, 1.23.2.22 
Message-ID: <20100602190634.4BA6C60056D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv5116

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab-webclient.spec 
Added Files:
      Tag: kolab_2_2_branch
	activesync_conf.patch 
Log Message:
Merge the activesync configuration frontend to the 2.2.4 stable branch so that it can be built via CVS (use make dist-activesync for that).

--- NEW FILE: activesync_conf.patch ---
diff -Naur a/config/prefs.php b/config/prefs.php
--- a/config/prefs.php.dist	2010-05-04 22:00:29.938760839 +0200
+++ b/config/prefs.php.dist	2010-05-04 22:02:27.177573941 +0200
@@ -165,6 +165,14 @@
     'members' => array()
 );
 
+$prefGroups['activesync'] = array(
+    'column' => _("Other Information"),
+    'label' => _("ActiveSync"),
+    'desc' => _("Configuration for syncing with PDAs, Smartphones and Outlook."),
+    'url' => 'services/portal/activesync.php',
+    'members' => array()
+);
+
 // Personal Information preferences
 
 // default identity
diff -Naur a/config/prefs.php b/config/prefs.php
--- a/config/prefs.php	2010-05-04 22:00:29.938760839 +0200
+++ b/config/prefs.php	2010-05-04 22:02:27.177573941 +0200
@@ -165,6 +165,14 @@
     'members' => array()
 );
 
+$prefGroups['activesync'] = array(
+    'column' => _("Other Information"),
+    'label' => _("ActiveSync"),
+    'desc' => _("Configuration for syncing with PDAs, Smartphones and Outlook."),
+    'url' => 'services/portal/activesync.php',
+    'members' => array()
+);
+
 // Personal Information preferences
 
 // default identity
diff -Naur a/services/portal/activesync.php b/services/portal/activesync.php
--- a/services/portal/activesync.php	1970-01-01 01:00:00.000000000 +0100
+++ b/services/portal/activesync.php	2010-05-06 06:52:58.250251515 +0200
@@ -0,0 +1,72 @@
+<?php
+/**
+ * $Horde: horde/services/portal/syncml.php,v 1.3.2.15 2009-01-06 15:27:33 jan Exp $
+ *
+ * Copyright 2005-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @author Karsten Fourmont <karsten at horde.org>
+ */
+
+require_once dirname(__FILE__) . '/../../lib/base.php';
+
+if (!Auth::isAuthenticated()) {
+    Horde::authenticationFailureRedirect();
+}
+
+require_once 'Horde/Kolab/Storage.php';
+$folder = Kolab_Storage::getFolder('INBOX');
+$result = $folder->getActiveSync();
+$devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
+
+$actionID = Util::getFormData('actionID');
+switch ($actionID) {
+case 'save':
+    if (Util::getFormData('delete')) {
+        $deviceids = array_keys(Util::getFormData('delete'));
+        $deviceid = $deviceids[0];
+        $result = $folder->deleteActiveSyncDevice($deviceid);
+        if (is_a($result, 'PEAR_Error')) {
+            $notification->push(_("Error deleting device:")
+                                . ' ' . $result->getMessage(),
+                                'horde.error');
+        } else {
+            $notification->push(sprintf(_("Deleted ActiveSync device \"%s\"."),
+                                        $deviceid),
+                                'horde.success');
+            unset($devices[$deviceid]);
+        }
+    } else {
+        $modes = Util::getFormData('mode_select', array());
+        foreach ($modes as $deviceid => $mode) {
+            $devices[$deviceid]['MODE'] = $mode;
+        }
+        $data = array('DEVICE' => $devices);
+        $result = $folder->setActiveSyncDeviceData($data, 'DEVICE');
+        if (is_a($result, 'PEAR_Error')) {
+            $notification->push(_("Error storing synchronization modes:")
+                                . ' ' . $result->getMessage(),
+                                'horde.error');
+        } else {
+            $notification->push(_("Synchronization modes stored successfully."),
+                                'horde.success');
+        }
+    }
+}
+
+/* Show the header. */
+require_once 'Horde/Prefs/UI.php';
+$result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'horde');
+if (!is_a($result, 'PEAR_Error')) {
+    extract($result);
+}
+$app = 'horde';
+$chunk = Util::nonInputVar('chunk');
+Prefs_UI::generateHeader('activesync', $chunk);
+
+require HORDE_TEMPLATES . '/activesync/activesync.inc';
+if (!$chunk) {
+    require HORDE_TEMPLATES . '/common-footer.inc';
+}
diff -Naur a/templates/activesync/activesync.inc b/templates/activesync/activesync.inc
--- a/templates/activesync/activesync.inc	1970-01-01 01:00:00.000000000 +0100
+++ b/templates/activesync/activesync.inc	2010-05-05 06:08:23.358849561 +0200
@@ -0,0 +1,41 @@
+<div class="smallheader">
+ <?php echo _("Known ActiveSync synchronisation devices") ?>
+</div>
+<?php if (!$devices): ?>
+<em><?php echo _("None") ?></em>
+<?php else: ?>
+<table class="striped">
+<tr>
+ <th><?php echo _("Device") ?></th>
+ <th><?php echo _("Type") ?></th>
+ <th><?php echo _("Mode") ?></th>
+</tr>
+<?php
+foreach ($devices as $device => $data) {
+?>
+<tr>
+ <td><?php echo htmlspecialchars($device) ?></td>
+ <td><?php echo htmlspecialchars($data['TYPE']) ?></td>
+ <td>
+   <select id="mode_select[<?php echo $device; ?>]" name="mode_select[<?php echo $device; ?>]">
+     <option value=""><?php echo _("Select the device mode:"); ?></option>
+     <option value="-1" <?php echo ($data['MODE'] === null || $data['MODE'] === '-1') ? 'selected="selected"' : ''; ?>>Default</option>
+     <option value="0" <?php echo ($data['MODE'] === '0') ? 'selected="selected"' : ''; ?>>Flat mode</option>
+     <option value="1" <?php echo ($data['MODE'] === '1') ? 'selected="selected"' : ''; ?>>Folder mode</option>
+   </select>
+ </td>
+ <td>
+   <input type="submit" class="button" value="<?php echo _("Delete") ?>" name="delete[<?php echo htmlspecialchars($device) ?>]"/>
+ </td>
+</tr>
+<?php } ?>
+</table>
+<?php endif; ?>
+<p>
+ <input type="hidden" name="actionID" value="save" />
+ <input type="submit" class="button" value="<?php echo _("Store device modes") ?>" />
+ <input id="prefs_return" type="button" class="button" onclick="cancelSubmit=true;document.location.href='<?php echo Horde::applicationUrl(Util::addParameter('services/prefs.php', 'app', 'horde'), true) ?>'" value="<?php echo _("Return to Options") ?>" />
+</p>
+
+</div>
+</form>
diff -Naur a/calendars/edit.php b/calendars/edit.php
--- a/kronolith/calendars/edit.php	2010-05-04 22:00:35.670897983 +0200
+++ b/kronolith/calendars/edit.php	2010-05-06 07:45:36.406431213 +0200
@@ -46,7 +46,6 @@
             $notification->push(sprintf(_("The calendar \"%s\" has been saved."), $original_name), 'horde.success');
         }
     }
-
     header('Location: ' . Horde::applicationUrl('calendars/', true));
     exit;
 }
@@ -57,6 +56,23 @@
 if (isset($params['fbrelevance'])) {
     $vars->set('fbrelevance', $params['fbrelevance']);
 }
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == 'PERSONAL') {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -Naur a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php	2010-05-04 22:00:36.210910903 +0200
+++ b/kronolith/lib/Forms/EditCalendar.php	2010-05-05 10:30:48.073386331 +0200
@@ -49,13 +49,40 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $original_name = $this->_calendar->get('name');
         $new_name = $this->_vars->get('name');
         $this->_calendar->set('name', $new_name);
         $this->_calendar->set('desc', $this->_vars->get('description'));
-        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
+        $params = array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+        }
+
+        $this->_calendar->set('params', serialize($params));
 
         if ($original_name != $new_name) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $new_name);
diff -Naur a/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
--- a/mnemo/lib/Forms/EditNotepad.php	2010-05-10 08:25:30.000000000 +0200
+++ b/mnemo/lib/Forms/EditNotepad.php	2010-05-10 08:28:09.000000000 +0200
@@ -46,10 +46,38 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $this->_notepad->set('name', $this->_vars->get('name'));
         $this->_notepad->set('desc', $this->_vars->get('description'));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $params = array();
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+            $this->_notepad->set('params', serialize($params));
+        }
+
         $result = $this->_notepad->save();
         if (is_a($result, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Unable to save notepad \"%s\": %s"), $id, $result->getMessage()));
diff -Naur a/notepads/edit.php b/notepads/edit.php
--- a/mnemo/notepads/edit.php	2010-05-10 08:25:30.000000000 +0200
+++ b/mnemo/notepads/edit.php	2010-05-10 08:28:19.000000000 +0200
@@ -51,6 +51,26 @@
 
 $vars->set('name', $notepad->get('name'));
 $vars->set('description', $notepad->get('desc'));
+
+$params = @unserialize($notepad->get('params'));
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == 'PERSONAL') {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
+
 $title = $form->getTitle();
 require MNEMO_TEMPLATES . '/common-header.inc';
 require MNEMO_TEMPLATES . '/menu.inc';
diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
--- a/turba/addressbooks/edit.php	2010-05-10 08:30:03.000000000 +0200
+++ b/turba/addressbooks/edit.php	2010-05-10 08:31:19.000000000 +0200
@@ -53,6 +53,26 @@
 
 $vars->set('name', $addressbook->get('name'));
 $vars->set('description', $addressbook->get('desc'));
+
+$params = @unserialize($addressbook->get('params'));
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == 'PERSONAL') {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
+
 $title = $form->getTitle();
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
diff -Naur a/lib/Forms/EditAddressBook.php b/lib/Forms/EditAddressBook.php
--- a/turba/lib/Forms/EditAddressBook.php	2010-05-10 08:30:05.000000000 +0200
+++ b/turba/lib/Forms/EditAddressBook.php	2010-05-10 08:32:28.000000000 +0200
@@ -46,10 +46,38 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $this->_addressbook->set('name', $this->_vars->get('name'));
         $this->_addressbook->set('desc', $this->_vars->get('description'));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $params = array();
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+            $this->_addressbook->set('params', serialize($params));
+        }
+
         $result = $this->_addressbook->save();
         if (is_a($result, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Unable to save address book \"%s\": %s"), $id, $result->getMessage()));
diff -Naur a/lib/Forms/EditTaskList.php b/lib/Forms/EditTaskList.php
--- a/nag/lib/Forms/EditTaskList.php	2010-05-10 08:10:16.000000000 +0200
+++ b/nag/lib/Forms/EditTaskList.php	2010-05-10 08:18:34.000000000 +0200
@@ -46,10 +46,38 @@
         $this->setButtons(array(_("Save")));
     }
 
+    function activeSyncSegment($devices, $default)
+    {
+        $this->addHidden('', 'activesync_devices', 'text');
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
+        }
+        $this->addVariable('', '', 'spacer');
+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
+        foreach ($devices as $id => $config) {
+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
+        }
+    }
+
     function execute()
     {
         $this->_tasklist->set('name', $this->_vars->get('name'));
         $this->_tasklist->set('desc', $this->_vars->get('description'));
+
+        if ($this->_vars->get('activesync_devices', '')) {
+            $params = array();
+            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
+            foreach ($ids as $id) {
+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
+            }
+            $this->_tasklist->set('params', serialize($params));
+        }
+
         $result = $this->_tasklist->save();
         if (is_a($result, 'PEAR_Error')) {
             return PEAR::raiseError(sprintf(_("Unable to save task list \"%s\": %s"), $id, $result->getMessage()));
diff -Naur a/tasklists/edit.php b/tasklists/edit.php
--- a/nag/tasklists/edit.php	2010-05-10 08:10:16.000000000 +0200
+++ b/nag/tasklists/edit.php	2010-05-10 08:22:49.000000000 +0200
@@ -51,6 +51,26 @@
 
 $vars->set('name', $tasklist->get('name'));
 $vars->set('description', $tasklist->get('desc'));
+
+$params = @unserialize($tasklist->get('params'));
+if (isset($params['activesync'])) {
+    if ($params['activesync']['NAMESPACE'] == 'PERSONAL') {
+        $default = 1;
+    } else {
+        $default = 0;
+    }
+    $devices = $params['activesync']['DEVICE'];
+    if (!empty($devices)) {
+        $folders = $params['activesync']['FOLDER'];
+        $vars->set('activesync_devices', implode('|', array_keys($devices)));
+        foreach ($devices as $id => $config) {
+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
+        }
+        $form->activeSyncSegment($devices, $default);
+    }
+}
+
 $title = $form->getTitle();
 require NAG_TEMPLATES . '/common-header.inc';
 require NAG_TEMPLATES . '/menu.inc';
diff -Naur a/a/a/Share/kolab.php b/a/a/Share/kolab.php
--- a/lib/Horde/Share/kolab.php	2010-05-05 07:51:03.742452620 +0200
+++ b/lib/Horde/Share/kolab.php	2010-05-06 07:46:45.088087728 +0200
@@ -524,7 +524,8 @@
             $params = @unserialize($this->_folder->getAttribute('params'));
             $default = array('source' => 'kolab',
                              'default' => $this->get('default'),
-                             'name' => $this->get('name'));
+                             'name' => $this->get('name'),
+                             'activesync'  => $this->_folder->getActiveSync());
             $type = $this->get('type');
             if (!is_a($type, 'PEAR_Error') && $type == 'event') {
                 $default = array_merge($default, array(
diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php	2010-05-04 23:44:49.522328256 +0200
+++ b/lib/Horde/Kolab/Storage/Folder.php	2010-05-06 07:46:01.507036608 +0200
@@ -412,13 +412,23 @@
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['xfbaccess']);
                     }
                     if (isset($params['fbrelevance'])) {
                         $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['fbrelevance']);
                     }
+                    if (isset($params['activesync'])) {
+                        $result = $this->setActiveSyncDeviceData($params['activesync'], 'FOLDER');
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['activesync']);
+                    }
+                    $value = serialize($params);
                 }
 
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters
@@ -1645,6 +1655,132 @@
         return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
                                      $value);
     }
+
+    /**
+     * Get the active sync settings for this folder.
+     *
+     * @return array  Array containing the active sync information.
+     */
+    function getActiveSync()
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $local = json_decode(base64_decode($raw), true);
+        if (!$this->name != 'INBOX') {
+            $raw = $imap->getAnnotation(
+                KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', 'INBOX'
+            );
+            $global = json_decode(base64_decode($raw), true);
+            if (!is_array($local)) {
+                $result = array(
+                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                    'FOLDER' => array()
+                );
+            } elseif (is_array($global)) {
+                $result = array(
+                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
+                );
+            } else {
+                $result = array(
+                    'DEVICE' => array(),
+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
+                );
+            }
+        } else {
+            $result = array(
+                'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                'FOLDER' => array()
+            );
+        }
+        $result['NAMESPACE'] = (strpos($this->name, 'INBOX') === 0) ? 'PERSONAL' : 'OTHER';
+        return $result;
+    }
+
+    /**
+     * Delete an active sync device for this folder.
+     *
+     * @param string $id The id of the device.
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function deleteActiveSyncDevice($id)
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $result = json_decode(base64_decode($raw), true);
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        if (!is_array($result)) {
+            return true;
+        }
+        unset($result['DEVICE'][$id]);
+        $result = $imap->setAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync',
+            array('value.priv' => base64_encode(json_encode($result))),
+            $this->name
+        );
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        return true;
+    }
+
+    /**
+     * Set the active sync annotation.
+     *
+     * @param string $data  The data to store in the annotation.
+     * @param string $type  The type of the data (DEVICE|FOLDER).
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setActiveSyncDeviceData($data, $type = 'DEVICE')
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $old = json_decode(base64_decode($raw), true);
+        if (is_a($old, 'PEAR_Error')) {
+            return $data;
+        }
+        if (!is_array($old)) {
+            $old = array();
+        }
+
+        $new_type = isset($old[$type]) ? $old[$type] : array();
+        $data_type = isset($data[$type]) ? $data[$type] : array();
+        foreach ($data_type as $id => $settings) {
+            foreach ($settings as $key => $value) {
+                $new_type[$id][$key] = $value;
+            }
+        }
+        $new = array($type => $new_type);
+        $result = $imap->setAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync',
+            array('value.priv' => base64_encode(json_encode($new))),
+            $this->name
+        );
+
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        return true;
+    }
 }
 
 class HTTP_Request_NonBlocking extends HTTP_Request

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/Makefile,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- Makefile	9 Nov 2009 17:08:39 -0000	1.6.2.2
+++ Makefile	2 Jun 2010 19:06:32 -0000	1.6.2.3
@@ -13,7 +13,7 @@
 PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch
+PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -66,3 +66,37 @@
 .PHONY: install
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+
+.PHONY: all-activesync
+all-activesync: $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm
+
+.PHONY: dist-activesync
+dist-activesync: all-activesync
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm ../stage/
+
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
+
+	for PATCH in $(PATCHES); do \
+	  cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
+
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+
+	if [ -n "$(TEMPLATES)" ]; then              \
+	  for TEMPLATE in $(TEMPLATES);             \
+	  do                                        \
+	    cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
+	  done;                                     \
+	fi
+
+	if [ -n "$(CONFIGS)" ]; then                \
+	  for CONFIG in $(CONFIGS);                 \
+	  do                                        \
+	    cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE);  \
+	  done;                                     \
+	fi
+
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_activesync yes'
+
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm .

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.21
retrieving revision 1.23.2.22
diff -u -d -r1.23.2.21 -r1.23.2.22
--- kolab-webclient.spec	3 Dec 2009 09:52:25 -0000	1.23.2.21
+++ kolab-webclient.spec	2 Jun 2010 19:06:32 -0000	1.23.2.22
@@ -8,7 +8,11 @@
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
+%if "%{with_activesync}" == "no"
 %define         V_release %{V_year}%{V_month}%{V_day}
+%else
+%define         V_release %{V_year}%{V_month}%{V_day}+activesync1
+%endif
 
 # Package Information
 Name:		%{V_package}
@@ -21,6 +25,9 @@
 Group:		MAIL
 Distribution:	OpenPKG
 
+#   package options
+%option       with_activesync    no
+
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_source_version}.tar.gz
 Source1:        http://ftp.horde.org/pub/passwd/passwd-h3-%{V_passwd_version}.tar.gz
@@ -76,6 +83,7 @@
 
 # List of Patches
 Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch
+Patch1:         activesync_conf.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -103,7 +111,11 @@
 
 	cd %{V_horde_name}-%{V_source_version}
 	%patch -p2 -P 0
+%if "%{with_activesync}" == "yes"
+	%patch -p1 -P 1
+%endif
 	cd ..
+
 
 %build
 



From cvs at kolab.org  Thu Jun  3 15:33:46 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jun 2010 15:33:46 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.295, 1.296 Makefile.am, 1.55,
	1.56 
Message-ID: <20100603133346.E8505600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv9181

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Imported patch for better file modes from the mailing list (http://kolab.org/pipermail/kolab-devel/2010-May/011850.html).

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- ChangeLog	16 May 2010 19:18:05 -0000	1.295
+++ ChangeLog	3 Jun 2010 13:33:44 -0000	1.296
@@ -1,3 +1,9 @@
+2010-06-03  Gunnar Wrobel  <p at rdus.de>
+
+	* Makefile.am: Better file modes during
+	installation (http://kolab.org/pipermail/kolab-devel/2010-May/011850.html,
+	Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>)
+
 2010-05-16 Richard Bos <richard at radoeka.nl>
 
 	* dist_conf/kolabsrv.in: Added redhat services, on request of Jeroen v. M.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Makefile.am	16 May 2010 06:58:53 -0000	1.55
+++ Makefile.am	3 Jun 2010 13:33:44 -0000	1.56
@@ -197,9 +197,9 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
-	chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
+	chmod 644 $(DESTDIR)$(kolabconfdir)/kolab.globals
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
-	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
+	chmod 755 $(DESTDIR)$(kolabnamespacedir)/*
 if ! OPENPKG
 	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
 endif



From cvs at kolab.org  Fri Jun  4 11:27:17 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jun 2010 11:27:17 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab Cyrus.pm, 1.6, 1.6.2.1 LDAP.pm,
	1.11.2.5, 1.11.2.6 
Message-ID: <20100604092717.C26DC600562@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv8977/d/lib/Kolab

Modified Files:
      Tag: kolab_2_2_branch
	Cyrus.pm LDAP.pm 
Log Message:
kolab/issue4237 (additional event.default folder created by kolabd (rt#6038)) 

Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Attic/Cyrus.pm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Cyrus.pm	10 Oct 2008 14:24:46 -0000	1.6
+++ Cyrus.pm	4 Jun 2010 09:27:15 -0000	1.6.2.1
@@ -40,6 +40,7 @@
         &create
         &createUid
         &createMailbox
+        &createCalendar
         &deleteMailbox
         &setQuota
         &setACL
@@ -106,6 +107,38 @@
         }
     } else {
         Kolab::log('Y', "Skipping mailbox creation for $uid (curuid='$cyruid', mailbox='".join(',',@{$mailbox})."'", KOLAB_DEBUG);
+    }
+}
+
+sub createCalendar
+{
+    my $cyrus = shift;
+    my $user = shift;
+    my $domain = shift;
+    my $folder = shift;
+    my $acl = shift;
+
+    my $calendar = 0;
+
+    my @mailboxes = $cyrus->list("user/$user/*\@$domain");
+    my %info;
+    foreach my $mailbox (@mailboxes) {
+	my $u = @{$mailbox}[0];
+	%info = $cyrus->info($u, ('/vendor/kolab/folder-type'));
+        my $key = '/mailbox/{' . $u . '}/vendor/kolab/folder-type';
+        if (exists($info{$key}) && $info{$key} eq 'event.default') {
+	    $calendar = $u;
+	}
+    }
+
+    if ($calendar) {
+        Kolab::log('Y', "Skipping calendar creation for $user\@$domain as $calendar is a default calendar.", KOLAB_DEBUG);
+    } else {
+        Kolab::log('Y', "Creating default calendar for $user\@$domain.", KOLAB_DEBUG);
+	createMailbox($cyrus, $folder, 0);
+	setFolderType($cyrus, $folder, 0, 'event.default');
+	setACL($cyrus, $folder, 0, $acl);
+        Kolab::log('Y', "Successfully created default calendar for $user\@$domain.", KOLAB_DEBUG);
     }
 }
 

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Attic/LDAP.pm,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -d -r1.11.2.5 -r1.11.2.6
--- LDAP.pm	16 Dec 2009 16:08:47 -0000	1.11.2.5
+++ LDAP.pm	4 Jun 2010 09:27:15 -0000	1.11.2.6
@@ -557,9 +557,7 @@
                         $domain = $Kolab::config{'postfix-mydomain'};
                     }
                     my $folder = $user . '/Calendar@' . $domain;
-                    Kolab::Cyrus::createMailbox($cyrus, $folder, 0);
-                    Kolab::Cyrus::setFolderType($cyrus, $folder, 0, 'event.default');
-                    Kolab::Cyrus::setACL($cyrus, $folder, 0, ["$uid all", 'calendar@' . $domain .' all']);
+                    Kolab::Cyrus::createCalendar($cyrus, $user, $domain, $folder, ["$uid all", 'calendar@' . $domain .' all']);
                 }
             }
         }



From cvs at kolab.org  Fri Jun  4 11:27:17 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jun 2010 11:27:17 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.112,1.398.2.113 
Message-ID: <20100604092717.BD74D600560@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8977

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue4237 (additional event.default folder created by kolabd (rt#6038)) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.112
retrieving revision 1.398.2.113
diff -u -d -r1.398.2.112 -r1.398.2.113
--- release-notes.txt	4 May 2010 14:10:35 -0000	1.398.2.112
+++ release-notes.txt	4 Jun 2010 09:27:15 -0000	1.398.2.113
@@ -64,8 +64,13 @@
 
     - imapd-2.3.13-20081020_kolab?
 
-        kolab/issue1141 (Cannot give users from other domains access to a folder (rt#5747))
+	kolab/issue1141 (Cannot give users from other domains access
+	                 to a folder (rt#5747))
 
+    - perl-kolab-2.2.3-20091217
+
+	kolab/issue4237 (additional event.default folder created by
+	                 kolabd (rt#6038))
 
 Changes between 2.2.2 and 2.2.3:
 



From cvs at kolab.org  Fri Jun  4 11:27:17 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jun 2010 11:27:17 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.13,1.56.2.14 
Message-ID: <20100604092717.A2F55600175@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv8977/d

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
kolab/issue4237 (additional event.default folder created by kolabd (rt#6038)) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Attic/ChangeLog,v
retrieving revision 1.56.2.13
retrieving revision 1.56.2.14
diff -u -d -r1.56.2.13 -r1.56.2.14
--- ChangeLog	16 Dec 2009 15:29:18 -0000	1.56.2.13
+++ ChangeLog	4 Jun 2010 09:27:15 -0000	1.56.2.14
@@ -1,3 +1,8 @@
+2010-06-04  Gunnar Wrobel <wrobel at pardus.de>
+
+	* lib/Kolab/Cyrus.pm: kolab/issue4237 (additional event.default
+	folder created by kolabd (rt#6038))
+
 2009-12-16  Sascha Wilde  <wilde at intevation.de>
 
 	* lib/Kolab/LDAP.pm (deleteObject): kolab/issue3940 (Deleting



From cvs at kolab.org  Sun Jun  6 10:50:53 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun,  6 Jun 2010 10:50:53 +0200 (CEST)
Subject: gunnar: server/kolab-webclient activesync_conf.patch, 1.1.2.1,
	1.1.2.2 kolab-webclient.spec, 1.23.2.22, 1.23.2.23 
Message-ID: <20100606085053.4EF2660014D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv19689

Modified Files:
      Tag: kolab_2_2_branch
	activesync_conf.patch kolab-webclient.spec 
Log Message:
Fix problem when deleting an activesync device which was still shown on the share settings.

Index: activesync_conf.patch
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/activesync_conf.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- activesync_conf.patch	2 Jun 2010 19:06:32 -0000	1.1.2.1
+++ activesync_conf.patch	6 Jun 2010 08:50:51 -0000	1.1.2.2
@@ -166,7 +166,7 @@
      header('Location: ' . Horde::applicationUrl('calendars/', true));
      exit;
  }
-@@ -57,6 +56,23 @@
+@@ -57,6 +56,26 @@
  if (isset($params['fbrelevance'])) {
      $vars->set('fbrelevance', $params['fbrelevance']);
  }
@@ -176,7 +176,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
@@ -280,7 +283,7 @@
 diff -Naur a/notepads/edit.php b/notepads/edit.php
 --- a/mnemo/notepads/edit.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/mnemo/notepads/edit.php	2010-05-10 08:28:19.000000000 +0200
-@@ -51,6 +51,26 @@
+@@ -51,6 +51,29 @@
  
  $vars->set('name', $notepad->get('name'));
  $vars->set('description', $notepad->get('desc'));
@@ -292,7 +295,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
@@ -310,7 +316,7 @@
 diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
 --- a/turba/addressbooks/edit.php	2010-05-10 08:30:03.000000000 +0200
 +++ b/turba/addressbooks/edit.php	2010-05-10 08:31:19.000000000 +0200
-@@ -53,6 +53,26 @@
+@@ -53,6 +53,29 @@
  
  $vars->set('name', $addressbook->get('name'));
  $vars->set('description', $addressbook->get('desc'));
@@ -322,7 +328,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
@@ -424,7 +433,7 @@
 diff -Naur a/tasklists/edit.php b/tasklists/edit.php
 --- a/nag/tasklists/edit.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/nag/tasklists/edit.php	2010-05-10 08:22:49.000000000 +0200
-@@ -51,6 +51,26 @@
+@@ -51,6 +51,29 @@
  
  $vars->set('name', $tasklist->get('name'));
  $vars->set('description', $tasklist->get('desc'));
@@ -436,7 +445,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.22
retrieving revision 1.23.2.23
diff -u -d -r1.23.2.22 -r1.23.2.23
--- kolab-webclient.spec	2 Jun 2010 19:06:32 -0000	1.23.2.22
+++ kolab-webclient.spec	6 Jun 2010 08:50:51 -0000	1.23.2.23
@@ -11,7 +11,7 @@
 %if "%{with_activesync}" == "no"
 %define         V_release %{V_year}%{V_month}%{V_day}
 %else
-%define         V_release %{V_year}%{V_month}%{V_day}+activesync1
+%define         V_release %{V_year}%{V_month}%{V_day}+activesync2
 %endif
 
 # Package Information



From cvs at kolab.org  Mon Jun  7 17:14:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:14:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
	t_framework_HK_GW_ZpushAnnotations.diff, 1.1, 1.2 
Message-ID: <20100607151409.79697600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv14011/patches/Kolab_Storage-0.4.0

Modified Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Only allow modification of the annotation type (default setting)
        in case the user owns a folder. Do not store empty share
        parameters.

Index: t_framework_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_GW_ZpushAnnotations.diff	6 May 2010 07:10:06 -0000	1.1
+++ t_framework_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:14:07 -0000	1.2
@@ -1,7 +1,16 @@
 diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-05-04 23:44:49.522328256 +0200
 +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-05-06 07:46:01.507036608 +0200
-@@ -412,13 +412,23 @@
+@@ -390,7 +390,7 @@
+ 
+         /** Handle the folder type */
+         $folder_type = $this->_type . ($this->_default ? '.default' : '');
+-        if ($this->_type_annotation != $folder_type) {
++        if ($this->_owner == Auth::getAuth() && $this->_type_annotation != $folder_type) {
+             $result = $this->_setAnnotation(KOLAB_ANNOT_FOLDER_TYPE, $folder_type);
+             if (is_a($result, 'PEAR_Error')) {
+                 $this->_type = null;
+@@ -412,13 +412,26 @@
                          if (is_a($result, 'PEAR_Error')) {
                              return $result;
                          }
@@ -21,10 +30,22 @@
 +                        }
 +                        unset($params['activesync']);
 +                    }
++                    if (empty($params)) {
++                        continue;
++                    }
 +                    $value = serialize($params);
                  }
  
                  // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+@@ -447,7 +450,7 @@
+         }
+ 
+         /** Now save the folder permissions */
+-        if (isset($this->_perms)) {
++        if ($this->_owner == Auth::getAuth() && isset($this->_perms)) {
+             $result = $this->_perms->save();
+             if (is_a($result, 'PEAR_Error')) {
+                 return $result;
 @@ -1645,6 +1655,132 @@
          return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
                                       $value);



From cvs at kolab.org  Mon Jun  7 17:14:09 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:14:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage ChangeLog, 1.10,
	1.11 package.info, 1.9, 1.10 
Message-ID: <20100607151409.643BD60015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv14011

Modified Files:
	ChangeLog package.info 
Log Message:
Only allow modification of the annotation type (default setting)
        in case the user owns a folder. Do not store empty share
        parameters.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	6 May 2010 07:10:06 -0000	1.10
+++ ChangeLog	7 Jun 2010 15:14:06 -0000	1.11
@@ -1,3 +1,11 @@
+2010-06-07  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff:
+
+	Only allow modification of the annotation type (default setting)
+	in case the user owns a folder. Do not store empty share
+	parameters.
+
 2010-05-06  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff:

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- package.info	6 May 2010 07:10:06 -0000	1.9
+++ package.info	7 Jun 2010 15:14:07 -0000	1.10
@@ -16,7 +16,7 @@
 version='0.4.0'
 
 # Package release number
-release='20100506'
+release='20100607'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith kronolith.spec,1.12,1.13 
Message-ID: <20100607154402.3475360015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith
In directory doto:/tmp/cvs-serv14745/kronolith

Modified Files:
	kronolith.spec 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: kronolith.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/kronolith.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kronolith.spec	16 May 2010 09:39:43 -0000	1.12
+++ kronolith.spec	7 Jun 2010 15:44:00 -0000	1.13
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package kronolith
 %define         V_version 2.3.3
-%define         V_release 20100516
+%define         V_release 20100607
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/mnemo/patches/mnemo-2.2.3
	t_mnemo_HK_GW_ZpushAnnotations.diff, 1.1, 1.2 
Message-ID: <20100607154402.4527C600169@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3
In directory doto:/tmp/cvs-serv14745/mnemo/patches/mnemo-2.2.3

Modified Files:
	t_mnemo_HK_GW_ZpushAnnotations.diff 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: t_mnemo_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3/t_mnemo_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_mnemo_HK_GW_ZpushAnnotations.diff	10 May 2010 07:11:29 -0000	1.1
+++ t_mnemo_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
@@ -8,38 +8,48 @@
 diff -Naur a/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
 --- a/lib/Forms/EditNotepad.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/lib/Forms/EditNotepad.php	2010-05-10 08:28:09.000000000 +0200
-@@ -46,10 +46,38 @@
+@@ -40,16 +40,46 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $notepad->get('name')));
+ 
+         $this->addHidden('', 'n', 'text', true);
+-        $this->addVariable(_("Name"), 'name', 'text', true);
++        if ($this->_notepad->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Name"), 'name', 'text', false, true);
++        } else {
++            $this->addVariable(_("Name"), 'name', 'text', true);
++        }
+         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
++        $this->addVariable(_("Synchronization options for ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this notepad"), _("synchronizes with this notepad"))));
 +        }
 +    }
 +
      function execute()
      {
-         $this->_notepad->set('name', $this->_vars->get('name'));
+-        $this->_notepad->set('name', $this->_vars->get('name'));
++        if ($this->_notepad->get('owner') == Auth::getAuth()) {
++            $this->_notepad->set('name', $this->_vars->get('name'));
++        }
          $this->_notepad->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $params = array();
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +            $this->_notepad->set('params', serialize($params));
 +        }
@@ -50,7 +60,18 @@
 diff -Naur a/notepads/edit.php b/notepads/edit.php
 --- a/notepads/edit.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/notepads/edit.php	2010-05-10 08:28:19.000000000 +0200
-@@ -51,6 +51,26 @@
+@@ -24,10 +24,6 @@
+     $notification->push($notepad, 'horde.error');
+     header('Location: ' . Horde::applicationUrl('notepads/', true));
+     exit;
+-} elseif ($notepad->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this notepad."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('notepads/', true));
+-    exit;
+ }
+ $form = new Mnemo_EditNotepadForm($vars, $notepad);
+ 
+@@ -51,6 +51,28 @@
  
  $vars->set('name', $notepad->get('name'));
  $vars->set('description', $notepad->get('desc'));
@@ -62,15 +83,17 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
 +



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3
	t_kronolith_HK_GW_ZpushAnnotations.diff, 1.1, 1.2 
Message-ID: <20100607154402.39345600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3
In directory doto:/tmp/cvs-serv14745/kronolith/patches/kronolith-2.3.3

Modified Files:
	t_kronolith_HK_GW_ZpushAnnotations.diff 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: t_kronolith_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/t_kronolith_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_kronolith_HK_GW_ZpushAnnotations.diff	6 May 2010 07:10:06 -0000	1.1
+++ t_kronolith_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
@@ -8,15 +8,18 @@
 diff -Naur a/calendars/edit.php b/calendars/edit.php
 --- a/calendars/edit.php	2010-05-04 22:00:35.670897983 +0200
 +++ b/calendars/edit.php	2010-05-06 07:45:36.406431213 +0200
-@@ -46,7 +46,6 @@
-             $notification->push(sprintf(_("The calendar \"%s\" has been saved."), $original_name), 'horde.success');
-         }
-     }
--
+@@ -26,10 +26,6 @@
+     $notification->push($calendar, 'horde.error');
      header('Location: ' . Horde::applicationUrl('calendars/', true));
      exit;
+-} elseif ($calendar->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this calendar."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('calendars/', true));
+-    exit;
  }
-@@ -57,6 +56,23 @@
+ $form = new Kronolith_EditCalendarForm($vars, $calendar);
+ 
+@@ -57,6 +56,25 @@
  if (isset($params['fbrelevance'])) {
      $vars->set('fbrelevance', $params['fbrelevance']);
  }
@@ -26,15 +29,17 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
  $title = $form->getTitle();
@@ -43,41 +48,64 @@
 diff -Naur a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php
 --- a/lib/Forms/EditCalendar.php	2010-05-04 22:00:36.210910903 +0200
 +++ b/lib/Forms/EditCalendar.php	2010-05-05 10:30:48.073386331 +0200
-@@ -49,13 +49,40 @@
+@@ -40,22 +40,56 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $calendar->get('name')));
+ 
+         $this->addHidden('', 'c', 'text', true);
+-        $this->addVariable(_("Name"), 'name', 'text', true);
++        if ($this->_calendar->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Name"), 'name', 'text', false, true);
++        } else {
++            $this->addVariable(_("Name"), 'name', 'text', true);
++        }
+         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+-                           array(array(_("owners/administrators"), _("readers"), _("no one")), 
+-                                 'This calendar is only included into the free/busy data for ...'));
++        if ($this->_calendar->get('owner') == Auth::getAuth()) {
++            $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
++                               array(array(_("owners/administrators"), _("readers"), _("no one")), 
++                                     'This calendar is only included into the free/busy data for ...'));
++        }
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
++        $this->addVariable(_("Synchronization options for ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this calendar"), _("synchronizes with this calendar but ignores alarms"), _("synchronizes with this calendar including alarms"))));
 +        }
 +    }
 +
      function execute()
      {
-         $original_name = $this->_calendar->get('name');
-         $new_name = $this->_vars->get('name');
-         $this->_calendar->set('name', $new_name);
+-        $original_name = $this->_calendar->get('name');
+-        $new_name = $this->_vars->get('name');
+-        $this->_calendar->set('name', $new_name);
          $this->_calendar->set('desc', $this->_vars->get('description'));
 -        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
-+        $params = array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0));
++
++        $original_name = $this->_calendar->get('name');
++        if ($this->_calendar->get('owner') == Auth::getAuth()) {
++            $new_name = $this->_vars->get('name');
++            $this->_calendar->set('name', $new_name);
++            $params = array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0));
++        } else {
++            $new_name = $original_name;
++        }
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +        }
 +



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/turba/patches/turba-2.3.3
	t_turba_HK_GW_ZpushAnnotations.diff, 1.1, 1.2 
Message-ID: <20100607154402.599EF60057E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv14745/turba/patches/turba-2.3.3

Modified Files:
	t_turba_HK_GW_ZpushAnnotations.diff 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: t_turba_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_turba_HK_GW_ZpushAnnotations.diff	10 May 2010 07:11:29 -0000	1.1
+++ t_turba_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
@@ -8,7 +8,18 @@
 diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
 --- a/addressbooks/edit.php	2010-05-10 08:30:03.000000000 +0200
 +++ b/addressbooks/edit.php	2010-05-10 08:31:19.000000000 +0200
-@@ -53,6 +53,26 @@
+@@ -24,10 +24,6 @@
+     $notification->push($addressbook, 'horde.error');
+     header('Location: ' . Horde::applicationUrl('addressbooks/', true));
+     exit;
+-} elseif ($addressbook->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this addressbook."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('addressbooks/', true));
+-    exit;
+ }
+ $form = new Mnemo_EditAddressbookForm($vars, $addressbook);
+ 
+@@ -53,6 +53,28 @@
  
  $vars->set('name', $addressbook->get('name'));
  $vars->set('description', $addressbook->get('desc'));
@@ -20,15 +31,17 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
 +
@@ -38,38 +51,48 @@
 diff -Naur a/lib/Forms/EditAddressBook.php b/lib/Forms/EditAddressBook.php
 --- a/lib/Forms/EditAddressBook.php	2010-05-10 08:30:05.000000000 +0200
 +++ b/lib/Forms/EditAddressBook.php	2010-05-10 08:32:28.000000000 +0200
-@@ -46,10 +46,38 @@
+@@ -40,16 +40,46 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $addressbook->get('name')));
+ 
+         $this->addHidden('', 'a', 'text', true);
+-        $this->addVariable(_("Name"), 'name', 'text', true);
++        if ($this->_addressbook->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Name"), 'name', 'text', false, true);
++        } else {
++            $this->addVariable(_("Name"), 'name', 'text', true);
++        }
+         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
++        $this->addVariable(_("Synchronization options for ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this addressbook"), _("synchronizes with this addressbook"))));
 +        }
 +    }
 +
      function execute()
      {
-         $this->_addressbook->set('name', $this->_vars->get('name'));
+-        $this->_addressbook->set('name', $this->_vars->get('name'));
++        if ($this->_addressbook->get('owner') == Auth::getAuth()) {
++            $this->_addressbook->set('name', $this->_vars->get('name'));
++        }
          $this->_addressbook->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $params = array();
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +            $this->_addressbook->set('params', serialize($params));
 +        }



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/nag/patches/nag-2.3.4
	t_nag_HK_GW_ZpushAnnotations.diff, 1.1, 1.2 
Message-ID: <20100607154402.4CB03600174@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/nag/patches/nag-2.3.4
In directory doto:/tmp/cvs-serv14745/nag/patches/nag-2.3.4

Modified Files:
	t_nag_HK_GW_ZpushAnnotations.diff 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: t_nag_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/patches/nag-2.3.4/t_nag_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_nag_HK_GW_ZpushAnnotations.diff	10 May 2010 07:11:29 -0000	1.1
+++ t_nag_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
@@ -8,38 +8,48 @@
 diff -Naur a/lib/Forms/EditTaskList.php b/lib/Forms/EditTaskList.php
 --- a/lib/Forms/EditTaskList.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/lib/Forms/EditTaskList.php	2010-05-10 08:18:34.000000000 +0200
-@@ -46,10 +46,38 @@
+@@ -40,16 +40,46 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $tasklist->get('name')));
+ 
+         $this->addHidden('', 't', 'text', true);
+-        $this->addVariable(_("Task List Name"), 'name', 'text', true);
++        if ($this->_tasklist->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Task List Name"), 'name', 'text', false, true);
++        } else {
++            $this->addVariable(_("Task List Name"), 'name', 'text', true);
++        }
+         $this->addVariable(_("Task List Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
 +        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this tasklist"), _("synchronizes with this tasklist but ignores alarms"), _("synchronizes with this tasklist including alarms"))));
 +        }
 +    }
 +
      function execute()
      {
-         $this->_tasklist->set('name', $this->_vars->get('name'));
+-        $this->_tasklist->set('name', $this->_vars->get('name'));
++        if ($this->_tasklist->get('owner') == Auth::getAuth()) {
++            $this->_tasklist->set('name', $this->_vars->get('name'));
++        }
          $this->_tasklist->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $params = array();
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +            $this->_tasklist->set('params', serialize($params));
 +        }
@@ -50,7 +60,18 @@
 diff -Naur a/tasklists/edit.php b/tasklists/edit.php
 --- a/tasklists/edit.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/tasklists/edit.php	2010-05-10 08:22:49.000000000 +0200
-@@ -51,6 +51,26 @@
+@@ -24,10 +24,6 @@
+     $notification->push($tasklist, 'horde.error');
+     header('Location: ' . Horde::applicationUrl('tasklists/', true));
+     exit;
+-} elseif ($tasklist->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this task list."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('tasklists/', true));
+-    exit;
+ }
+ $form = new Nag_EditTaskListForm($vars, $tasklist);
+ 
+@@ -51,6 +51,28 @@
  
  $vars->set('name', $tasklist->get('name'));
  $vars->set('description', $tasklist->get('desc'));
@@ -62,15 +83,17 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
 +



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/mnemo ChangeLog, 1.1, 1.2 mnemo.spec,
	1.4, 1.5 
Message-ID: <20100607154402.3F051600167@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/mnemo
In directory doto:/tmp/cvs-serv14745/mnemo

Modified Files:
	ChangeLog mnemo.spec 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/mnemo/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	10 May 2010 07:11:29 -0000	1.1
+++ ChangeLog	7 Jun 2010 15:44:00 -0000	1.2
@@ -1,3 +1,12 @@
+2010-06-07  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/mnemo-2.2.3/t_mnemo_HK_GW_ZpushAnnotations.diff:
+
+	 - Allow modifications of foreign shares.
+	 - Update list of devices immediately rather than reading them
+	   from the share parameters.
+	 - Adapt from SYNC/ALARM to S parameter.
+
 2010-05-10  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/mnemo-2.2.3/t_mnemo_HK_GW_ZpushAnnotations.diff:

Index: mnemo.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/mnemo/mnemo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mnemo.spec	10 May 2010 07:11:29 -0000	1.4
+++ mnemo.spec	7 Jun 2010 15:44:00 -0000	1.5
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package mnemo
 %define         V_version 2.2.3
-%define         V_release 20100510
+%define         V_release 20100607
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/nag ChangeLog, 1.2, 1.3 nag.spec, 1.5,
	1.6 
Message-ID: <20100607154402.4859C600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/nag
In directory doto:/tmp/cvs-serv14745/nag

Modified Files:
	ChangeLog nag.spec 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	10 May 2010 07:11:29 -0000	1.2
+++ ChangeLog	7 Jun 2010 15:44:00 -0000	1.3
@@ -1,3 +1,12 @@
+2010-06-07  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/nag-2.3.4/t_nag_HK_GW_ZpushAnnotations.diff:
+
+	 - Allow modifications of foreign shares.
+	 - Update list of devices immediately rather than reading them
+	   from the share parameters.
+	 - Adapt from SYNC/ALARM to S parameter.
+
 2010-05-10  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/nag-2.3.4/t_nag_HK_GW_ZpushAnnotations.diff:

Index: nag.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/nag.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nag.spec	10 May 2010 07:11:29 -0000	1.5
+++ nag.spec	7 Jun 2010 15:44:00 -0000	1.6
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package nag
 %define         V_version 2.3.4
-%define         V_release 20100510
+%define         V_release 20100607
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Mon Jun  7 17:44:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jun 2010 17:44:02 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/turba ChangeLog, 1.2, 1.3 turba.spec,
	1.7, 1.8 
Message-ID: <20100607154402.5AE2160057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba
In directory doto:/tmp/cvs-serv14745/turba

Modified Files:
	ChangeLog turba.spec 
Log Message:
         - Allow modifications of foreign shares.
         - Update list of devices immediately rather than reading them
           from the share parameters.
         - Adapt from SYNC/ALARM to S parameter.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	10 May 2010 07:11:29 -0000	1.2
+++ ChangeLog	7 Jun 2010 15:44:00 -0000	1.3
@@ -1,3 +1,12 @@
+2010-06-07  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff:
+
+	 - Allow modifications of foreign shares.
+	 - Update list of devices immediately rather than reading them
+	   from the share parameters.
+	 - Adapt from SYNC/ALARM to S parameter.
+
 2010-05-10  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff:

Index: turba.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/turba.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- turba.spec	10 May 2010 07:11:29 -0000	1.7
+++ turba.spec	7 Jun 2010 15:44:00 -0000	1.8
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package turba
 %define         V_version 2.3.3
-%define         V_release 20100510
+%define         V_release 20100607
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Tue Jun  8 10:14:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 10:14:54 +0200 (CEST)
Subject: gunnar: server install-kolab.sh,1.64,1.65 
Message-ID: <20100608081454.EC65A600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv32118

Modified Files:
	install-kolab.sh 
Log Message:
Echo the install information before any action occurs.

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- install-kolab.sh	17 Dec 2009 10:15:12 -0000	1.64
+++ install-kolab.sh	8 Jun 2010 08:14:52 -0000	1.65
@@ -201,13 +201,6 @@
     fi
 fi
 
-umask 022
-SRCDIR=`pwd`
-WORKDIR=`mktmpdir`
-echo "Changing to temporary working directory $WORKDIR ..."
-cd "$WORKDIR"
-populate_workdir
-
 echo
 echo "Kolab installation tag (TAG):       $TAG"
 echo "Kolab installation prefix (PREFIX): $PREFIX"
@@ -218,6 +211,13 @@
 echo "Kolab non-priviledged UID (KID):    $N_KID"
 echo "Exclude following Kolab packages:   $EXCLUDEPKGS"
 echo
+
+umask 022
+SRCDIR=`pwd`
+WORKDIR=`mktmpdir`
+echo "Changing to temporary working directory $WORKDIR ..."
+cd "$WORKDIR"
+populate_workdir
 
 echo "Received no instructions. Trying to determine required action..."
 if [ -d "$PREFIX/etc/openpkg" -a -z "$FLAG_BOOTSTRAP" ]; then



From cvs at kolab.org  Tue Jun  8 10:21:43 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 10:21:43 +0200 (CEST)
Subject: gunnar: server install-kolab.sh,1.65,1.66 
Message-ID: <20100608082143.7F6B3600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv32361

Modified Files:
	install-kolab.sh 
Log Message:
Extract the determine action part into its own function.

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- install-kolab.sh	8 Jun 2010 08:14:52 -0000	1.65
+++ install-kolab.sh	8 Jun 2010 08:21:41 -0000	1.66
@@ -212,69 +212,73 @@
 echo "Exclude following Kolab packages:   $EXCLUDEPKGS"
 echo
 
-umask 022
-SRCDIR=`pwd`
-WORKDIR=`mktmpdir`
-echo "Changing to temporary working directory $WORKDIR ..."
-cd "$WORKDIR"
-populate_workdir
+prefix_openpkg_determine_action() {
+    umask 022
+    SRCDIR=`pwd`
+    WORKDIR=`mktmpdir`
+    echo "Changing to temporary working directory $WORKDIR ..."
+    cd "$WORKDIR"
+    populate_workdir
 
-echo "Received no instructions. Trying to determine required action..."
-if [ -d "$PREFIX/etc/openpkg" -a -z "$FLAG_BOOTSTRAP" ]; then
+    echo "Received no instructions. Trying to determine required action..."
+    if [ -d "$PREFIX/etc/openpkg" -a -z "$FLAG_BOOTSTRAP" ]; then
     # Assume an upgrade based on the current directory
-    INSTALL=`pwd`
-    if [ "$FLAG_ENV" ]; then
-        echo "The OpenPKG environment already exists!"
-        exit 1
-    fi
-    echo "Found an OpenPKG environment. Assuming upgrade..."
-else
-    INSTALLER=`find . $FIND1 -name "openpkg-*.src.sh" -print`
-    BINARY=`find . $FIND1 -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print`
-    if [ -z "$INSTALLER" ]; then
+	INSTALL=`pwd`
+	if [ "$FLAG_ENV" ]; then
+            echo "The OpenPKG environment already exists!"
+            exit 1
+	fi
+	echo "Found an OpenPKG environment. Assuming upgrade..."
+    else
+	INSTALLER=`find . $FIND1 -name "openpkg-*.src.sh" -print`
+	BINARY=`find . $FIND1 -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print`
+	if [ -z "$INSTALLER" ]; then
         # No install script? Determine if there is a binary script
-        if [ -z "$BINARY" ]; then
-            echo "Sorry there is no OpenPKG installation script in the current directory!"
-            usage
-            exit 0
-        else
+            if [ -z "$BINARY" ]; then
+		echo "Sorry there is no OpenPKG installation script in the current directory!"
+		usage
+		exit 0
+            else
             # Looks like we only have a binary. Hope that it matches the plattform and install it
-            INSTALL="$BINARY"
-            echo "Found a binary OpenPKG package. This will be installed now."
-        fi
-    else
+		INSTALL="$BINARY"
+		echo "Found a binary OpenPKG package. This will be installed now."
+            fi
+	else
         # We have a source package. Check for a matching binary
-        PLATTAG=`shtool_get_plattag`
-        BIN=`basename "$INSTALLER" .src.sh`.$PLATTAG.sh
-        if [ "$BINARY" = "$BIN" ]; then
+            PLATTAG=`shtool_get_plattag`
+            BIN=`basename "$INSTALLER" .src.sh`.$PLATTAG.sh
+            if [ "$BINARY" = "$BIN" ]; then
             # There is a binary with the correct tag. Install it
-            INSTALL=$BIN
-            echo "Found a binary OpenPKG package with a correct tag. This will be installed now."
-        else
+		INSTALL=$BIN
+		echo "Found a binary OpenPKG package with a correct tag. This will be installed now."
+            else
             # Install from source
-            INSTALL=$INSTALLER
-            echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
-        fi
+		INSTALL=$INSTALLER
+		echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
+            fi
+	fi
     fi
-fi
 
-if echo "$INSTALL" | grep '\.src\.sh$' >/dev/null; then
+    if echo "$INSTALL" | grep '\.src\.sh$' >/dev/null; then
     # install from source
-    SRC="$INSTALL"
-    PLATTAG=`shtool_get_plattag`
-    BIN=`basename "$INSTALL" .src.sh`.$PLATTAG.sh
-    DIR=`dirname "$SRC"`
-elif echo "$INSTALL" | grep 'openpkg-.*\.sh$' >/dev/null; then
+	SRC="$INSTALL"
+	PLATTAG=`shtool_get_plattag`
+	BIN=`basename "$INSTALL" .src.sh`.$PLATTAG.sh
+	DIR=`dirname "$SRC"`
+    elif echo "$INSTALL" | grep 'openpkg-.*\.sh$' >/dev/null; then
     # install from binary
-    SRC=""
-    BIN="$INSTALL"
-    DIR=`dirname "$BIN"`
-elif [ -d "$PREFIX/etc/openpkg" ]; then
+	SRC=""
+	BIN="$INSTALL"
+	DIR=`dirname "$BIN"`
+    elif [ -d "$PREFIX/etc/openpkg" ]; then
     # upgrade
-    SRC=""
-    BIN=""
-    DIR="$INSTALL"
-fi
+	SRC=""
+	BIN=""
+	DIR="$INSTALL"
+    fi
+}
+
+prefix_openpkg_determine_action
 
 DIR=`cd $DIR; pwd`
 



From cvs at kolab.org  Tue Jun  8 11:57:35 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 11:57:35 +0200 (CEST)
Subject: gunnar: server/apache Makefile,1.26.2.2,1.26.2.3 
Message-ID: <20100608095735.DD962600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv2423/apache

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add install targets.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -d -r1.26.2.2 -r1.26.2.3
--- Makefile	21 Apr 2010 18:00:59 -0000	1.26.2.2
+++ Makefile	8 Jun 2010 09:57:33 -0000	1.26.2.3
@@ -23,7 +23,7 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
@@ -34,3 +34,7 @@
 	   --define 'with_mod_ldap yes'
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Tue Jun  8 11:57:35 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 11:57:35 +0200 (CEST)
Subject: gunnar: server/postfix Makefile,1.19.2.3,1.19.2.4 
Message-ID: <20100608095735.ED11E600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/postfix
In directory doto:/tmp/cvs-serv2423/postfix

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add install targets.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -d -r1.19.2.3 -r1.19.2.4
--- Makefile	9 Nov 2009 17:08:45 -0000	1.19.2.3
+++ Makefile	8 Jun 2010 09:57:33 -0000	1.19.2.4
@@ -7,7 +7,7 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch Makefile
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes'
@@ -21,3 +21,8 @@
 
 clean:
 	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Tue Jun  8 11:57:35 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 11:57:35 +0200 (CEST)
Subject: gunnar: server/openldap Makefile,1.24.2.2,1.24.2.3 
Message-ID: <20100608095735.E369960057E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv2423/openldap

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add install targets.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -d -r1.24.2.2 -r1.24.2.3
--- Makefile	9 Nov 2009 17:08:39 -0000	1.24.2.2
+++ Makefile	8 Jun 2010 09:57:33 -0000	1.24.2.3
@@ -23,7 +23,7 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
@@ -31,3 +31,7 @@
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_pth no'
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Tue Jun  8 11:57:35 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 11:57:35 +0200 (CEST)
Subject: gunnar: server/openssl Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20100608095735.E965060057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/openssl
In directory doto:/tmp/cvs-serv2423/openssl

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add install targets.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openssl/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Makefile	21 Apr 2010 15:01:05 -0000	1.1.2.1
+++ Makefile	8 Jun 2010 09:57:33 -0000	1.1.2.2
@@ -25,7 +25,7 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_1)"
@@ -34,3 +34,7 @@
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Tue Jun  8 11:59:27 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 11:59:27 +0200 (CEST)
Subject: gunnar: server/clamav Makefile, 1.7.2.5, 1.7.2.6 clamav.spec, 1.6.2.2,
	1.6.2.3 
Message-ID: <20100608095927.0CCC6600565@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv2574/clamav

Modified Files:
      Tag: kolab_2_2_branch
	Makefile clamav.spec 
Log Message:
Update to clamav-0.96.1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -d -r1.7.2.5 -r1.7.2.6
--- Makefile	21 Apr 2010 15:10:09 -0000	1.7.2.5
+++ Makefile	8 Jun 2010 09:59:24 -0000	1.7.2.6
@@ -5,7 +5,8 @@
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-SOURCE_0=http://files.kolab.org/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
+#SOURCE_0=http://files.kolab.org/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
+SOURCE_0=http://files.kolab.org/incoming/wrobel/$(NAME)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 
 .PHONY: all

Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- clamav.spec	21 Apr 2010 14:48:42 -0000	1.6.2.2
+++ clamav.spec	8 Jun 2010 09:59:25 -0000	1.6.2.3
@@ -29,8 +29,8 @@
 Packager:     Intevation GmbH
 Group:        AntiVirus
 License:      GPL
-Version:      0.96
-Release:      20100421
+Version:      0.96.1
+Release:      20100607
 
 #   package options
 %option       with_milter  no



From cvs at kolab.org  Tue Jun  8 12:00:13 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 12:00:13 +0200 (CEST)
Subject: gunnar: server/apache-php Makefile,1.8.2.4,1.8.2.5 
Message-ID: <20100608100013.0B71B600595@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv2685/apache-php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Remove unnecessary double building.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -d -r1.8.2.4 -r1.8.2.5
--- Makefile	21 Apr 2010 14:52:32 -0000	1.8.2.4
+++ Makefile	8 Jun 2010 10:00:10 -0000	1.8.2.5
@@ -17,9 +17,8 @@
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 \
-	  && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 && \
+	patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
 	--define 'with_pear yes' --define 'with_spl yes' --define 'with_gettext yes' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \



From cvs at kolab.org  Tue Jun  8 12:13:02 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 12:13:02 +0200 (CEST)
Subject: gunnar: server .cvsignore,1.1,1.1.4.1 update.mk,1.1.2.5,1.1.2.6 
Message-ID: <20100608101302.EFBED60057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3289

Modified Files:
      Tag: kolab_2_2_branch
	.cvsignore update.mk 
Log Message:
Provide an update target to get from 2.2.3 to 2.2.4. Use 'make update' for that.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- .cvsignore	12 Mar 2007 14:31:31 -0000	1.1
+++ .cvsignore	8 Jun 2010 10:13:00 -0000	1.1.4.1
@@ -1 +1,2 @@
 stage
+update
\ No newline at end of file

Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- update.mk	17 Dec 2009 11:39:04 -0000	1.1.2.5
+++ update.mk	8 Jun 2010 10:13:00 -0000	1.1.2.6
@@ -4,6 +4,25 @@
 
 # These are the packages that were updated from Kolab Server version
 # 2.2.2 to 2.2.3.
+UPDATES_2.2.3_2.2.4=openssl                 \
+                    http://files.kolab.org/incoming/wrobel/x509-0-20090125.src.rpm@ \
+                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/apr-1.2.12-20080101.src.rpm at with_ldap \
+                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/imap-2006k-20080101.src.rpm at with_annotate \
+                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/curl-7.17.1-20080101.src.rpm@ \
+                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/perl-crypto-5.10.0-20080101.src.rpm@ \
+                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/perl-ssl-5.10.0-20080101.src.rpm@ \
+                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/sasl-2.1.22-20080101.src.rpm at with_login,with_ldap,with_ntlm \
+                    apache                  \
+                    apache-php              \
+                    php                     \
+                    openldap                \
+                    imapd                   \
+                    postfix                 \
+                    kolabd                  \
+                    clamav                  \
+
+# These are the packages that were updated from Kolab Server version
+# 2.2.2 to 2.2.3.
 UPDATES_2.2.2_2.2.3=clamav                  \
                     db                      \
                     imapd                   \
@@ -18,7 +37,7 @@
 #                    perl-kolab
 
 # Set the new version we are aiming at after each release.
-CVS_VERSION=2.2.3
+CVS_VERSION=2.2.4
 # Determines the current version
 CURRENT_VERSION=$(shell $(KOLABDIR)/bin/openpkg rpm -q kolabd | sed -e 's/kolabd-\([0-9.]*\)-[0-9]*/\1/')
 
@@ -33,12 +52,43 @@
 current: $(KOLAB_SERVER_CVS)
 
 .PHONY:$(KOLAB_SERVER_CVS)
-$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.2
+$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.3
+	@mkdir -p update
+	@for UPDATE in $(UPDATES_2.2.3_2.2.4);                       \
+	do                                                           \
+	  if [ "x`echo $$UPDATE | grep http://`" == "x" ]; then      \
+	    make -C $$UPDATE install || exit $$?;                    \
+	  else                                                       \
+	    TARGET=`echo $${UPDATE} | sed -e 's#.*/\([^/]*\).src.rpm at .*#\1.$(PLATTAG).rpm#'`; \
+	    PACKAGE=`echo $${UPDATE} | sed -e 's#\([^@]*\)@.*#\1#'`; \
+	    if [ ! -e update/$$TARGET ]; then                        \
+	      OPTIONS=`echo $${UPDATE} | sed -e 's#.*@\([^@]*\)#\1#' | sed -e "s#\([^,]*\),\?#--define '\1 yes' #g"`; \
+	      LOCAL=`echo $${UPDATE} | sed -e 's#.*/\([^/]*\).src.rpm at .*#\1.src.rpm#'`; \
+	      cd update; wget -c $$PACKAGE; echo "openpkg rpm --rebuild $$OPTIONS $$LOCAL" | sh;\
+	      cp /kolab/RPM/PKG/$$TARGET .;                          \
+	      /kolab/bin/openpkg rpm -Uhv --force $$TARGET;          \
+	      cd ..;                                                 \
+	    fi;                                                      \
+	  fi;                                                        \
+	done
+	@for UPDATE in kolab-webadmin perl-kolab;                    \
+	do                                                           \
+	  echo "Please update $$UPDATE manually using 'make dist' and 'openpkg rpm'"; \
+	done
+
+ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.3"
+.PHONY:KOLAB_SERVER-2.2.3
+KOLAB_SERVER-2.2.3:
+	@echo "You are using Kolab Server 2.2.3. Updating from there..."
+else
+.PHONY:KOLAB_SERVER-2.2.3
+KOLAB_SERVER-2.2.3: KOLAB_SERVER-2.2.2
+	@echo "You are using Kolab Server 2.2.3. Updating from there..."
 	for UPDATE in $(UPDATES_2.2.2_2.2.3);   \
 	do                                      \
 	  make -C $$UPDATE install || exit $$?; \
 	done
-
+endif
 
 ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.2"
 .PHONY:KOLAB_SERVER-2.2.2



From cvs at kolab.org  Tue Jun  8 13:48:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 13:48:01 +0200 (CEST)
Subject: gunnar: server/clamav Makefile,1.10,1.11 clamav.spec,1.8,1.9 
Message-ID: <20100608114801.16E82600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv5959

Modified Files:
	Makefile clamav.spec 
Log Message:
Merge clamav-0.96.1 to HEAD.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	17 Jan 2010 13:22:55 -0000	1.10
+++ Makefile	8 Jun 2010 11:47:59 -0000	1.11
@@ -4,7 +4,8 @@
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-SOURCE_URL=http://files.kolab.org/server/development-2.2/externals
+#SOURCE_URL=http://files.kolab.org/server/development-2.2/externals
+SOURCE_URL=http://files.kolab.org/incoming/wrobel/
 SOURCE_0=$(PACKAGE)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 

Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- clamav.spec	21 Apr 2010 21:20:20 -0000	1.8
+++ clamav.spec	8 Jun 2010 11:47:59 -0000	1.9
@@ -29,8 +29,8 @@
 Packager:     Intevation GmbH
 Group:        AntiVirus
 License:      GPL
-Version:      0.96
-Release:      20100421
+Version:      0.96.1
+Release:      20100607
 
 #   package options
 %option       with_milter  no



From cvs at kolab.org  Tue Jun  8 21:17:13 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jun 2010 21:17:13 +0200 (CEST)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.21,
	1.10.2.22 Makefile, 1.6.2.3, 1.6.2.4 activesync_conf.patch,
	1.1.2.2, 1.1.2.3 kolab-webclient.spec, 1.23.2.23, 1.23.2.24 
Message-ID: <20100608191713.C24AD600563@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv20720

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Makefile activesync_conf.patch kolab-webclient.spec 
Log Message:
        Added alternatepackageversionthat provides an activesync
configuration frontend.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/ChangeLog,v
retrieving revision 1.10.2.21
retrieving revision 1.10.2.22
diff -u -d -r1.10.2.21 -r1.10.2.22
--- ChangeLog	3 Dec 2009 09:52:25 -0000	1.10.2.21
+++ ChangeLog	8 Jun 2010 19:17:10 -0000	1.10.2.22
@@ -1,3 +1,10 @@
+2010-06-08  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec:
+
+	Added alternate package version that provides an activesync
+	configuration frontend.
+
 2009-12-03  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/Makefile,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- Makefile	2 Jun 2010 19:06:32 -0000	1.6.2.3
+++ Makefile	8 Jun 2010 19:17:10 -0000	1.6.2.4
@@ -68,15 +68,15 @@
 	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 
 .PHONY: all-activesync
-all-activesync: $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm
+all-activesync: $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm
 
 .PHONY: dist-activesync
 dist-activesync: all-activesync
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm ../stage/
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm ../stage/
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
+	cd $(KOLABRPMSRC)/$(PACKAGE) #&& wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
 
 	for PATCH in $(PATCHES); do \
 	  cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
@@ -99,4 +99,4 @@
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_activesync yes'
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync1.src.rpm .
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm .

Index: activesync_conf.patch
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/activesync_conf.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- activesync_conf.patch	6 Jun 2010 08:50:51 -0000	1.1.2.2
+++ activesync_conf.patch	8 Jun 2010 19:17:10 -0000	1.1.2.3
@@ -158,15 +158,18 @@
 diff -Naur a/calendars/edit.php b/calendars/edit.php
 --- a/kronolith/calendars/edit.php	2010-05-04 22:00:35.670897983 +0200
 +++ b/kronolith/calendars/edit.php	2010-05-06 07:45:36.406431213 +0200
-@@ -46,7 +46,6 @@
-             $notification->push(sprintf(_("The calendar \"%s\" has been saved."), $original_name), 'horde.success');
-         }
-     }
--
+@@ -26,10 +26,6 @@
+     $notification->push($calendar, 'horde.error');
      header('Location: ' . Horde::applicationUrl('calendars/', true));
      exit;
+-} elseif ($calendar->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this calendar."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('calendars/', true));
+-    exit;
  }
-@@ -57,6 +56,26 @@
+ $form = new Kronolith_EditCalendarForm($vars, $calendar);
+ 
+@@ -57,6 +56,25 @@
  if (isset($params['fbrelevance'])) {
      $vars->set('fbrelevance', $params['fbrelevance']);
  }
@@ -184,10 +187,9 @@
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
  $title = $form->getTitle();
@@ -196,41 +198,66 @@
 diff -Naur a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php
 --- a/kronolith/lib/Forms/EditCalendar.php	2010-05-04 22:00:36.210910903 +0200
 +++ b/kronolith/lib/Forms/EditCalendar.php	2010-05-05 10:30:48.073386331 +0200
-@@ -49,13 +49,40 @@
+@@ -40,22 +40,57 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $calendar->get('name')));
+ 
+         $this->addHidden('', 'c', 'text', true);
+-        $this->addVariable(_("Name"), 'name', 'text', true);
++        if ($this->_calendar->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
++        } else {
++            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
++        }
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+-                           array(array('owners/administrators', 'readers', 'no one'), 
+-                                 'This calendar is only included into the free/busy data for ...'));
++        if ($this->_calendar->get('owner') == Auth::getAuth()) {
++            $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
++                               array(array(_("owners/administrators"), _("readers"), _("no one")), 
++                                     'This calendar is only included into the free/busy data for ...'));
++        }
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
++        $this->addVariable(_("Synchronization options for ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this calendar"), _("synchronizes with this calendar but ignores alarms"), _("synchronizes with this calendar including alarms"))));
 +        }
 +    }
 +
      function execute()
      {
-         $original_name = $this->_calendar->get('name');
-         $new_name = $this->_vars->get('name');
-         $this->_calendar->set('name', $new_name);
+-        $original_name = $this->_calendar->get('name');
+-        $new_name = $this->_vars->get('name');
+-        $this->_calendar->set('name', $new_name);
          $this->_calendar->set('desc', $this->_vars->get('description'));
 -        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
-+        $params = array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0));
++
++        $original_name = $this->_calendar->get('name');
++        if ($this->_calendar->get('owner') == Auth::getAuth()) {
++            $new_name = $this->_vars->get('name');
++            $this->_calendar->set('name', $new_name);
++            $params = array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0));
++        } else {
++            $new_name = $original_name;
++        }
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +        }
 +
@@ -241,38 +268,50 @@
 diff -Naur a/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
 --- a/mnemo/lib/Forms/EditNotepad.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/mnemo/lib/Forms/EditNotepad.php	2010-05-10 08:28:09.000000000 +0200
-@@ -46,10 +46,38 @@
+@@ -40,16 +40,47 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $notepad->get('name')));
+ 
+         $this->addHidden('', 'n', 'text', true);
+-        $this->addVariable(_("Name"), 'name', 'text', true);
++        if ($this->_notepad->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
++        } else {
++            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
++        }
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
++        $this->addVariable(_("Synchronization options for ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this notepad"), _("synchronizes with this notepad"))));
 +        }
 +    }
 +
      function execute()
      {
-         $this->_notepad->set('name', $this->_vars->get('name'));
+-        $this->_notepad->set('name', $this->_vars->get('name'));
++        if ($this->_notepad->get('owner') == Auth::getAuth()) {
++            $this->_notepad->set('name', $this->_vars->get('name'));
++        }
          $this->_notepad->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $params = array();
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +            $this->_notepad->set('params', serialize($params));
 +        }
@@ -283,7 +322,18 @@
 diff -Naur a/notepads/edit.php b/notepads/edit.php
 --- a/mnemo/notepads/edit.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/mnemo/notepads/edit.php	2010-05-10 08:28:19.000000000 +0200
-@@ -51,6 +51,29 @@
+@@ -24,10 +24,6 @@
+     $notification->push($notepad, 'horde.error');
+     header('Location: ' . Horde::applicationUrl('notepads/', true));
+     exit;
+-} elseif ($notepad->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this notepad."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('notepads/', true));
+-    exit;
+ }
+ $form = new Mnemo_EditNotepadForm($vars, $notepad);
+ 
+@@ -51,6 +51,28 @@
  
  $vars->set('name', $notepad->get('name'));
  $vars->set('description', $notepad->get('desc'));
@@ -303,10 +353,9 @@
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
 +
@@ -316,7 +365,18 @@
 diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
 --- a/turba/addressbooks/edit.php	2010-05-10 08:30:03.000000000 +0200
 +++ b/turba/addressbooks/edit.php	2010-05-10 08:31:19.000000000 +0200
-@@ -53,6 +53,29 @@
+@@ -24,10 +24,6 @@
+     $notification->push($addressbook, 'horde.error');
+     header('Location: ' . Horde::applicationUrl('addressbooks/', true));
+     exit;
+-} elseif ($addressbook->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this addressbook."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('addressbooks/', true));
+-    exit;
+ }
+ $form = new Mnemo_EditAddressbookForm($vars, $addressbook);
+ 
+@@ -53,6 +53,28 @@
  
  $vars->set('name', $addressbook->get('name'));
  $vars->set('description', $addressbook->get('desc'));
@@ -336,10 +396,9 @@
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
 +
@@ -349,38 +408,53 @@
 diff -Naur a/lib/Forms/EditAddressBook.php b/lib/Forms/EditAddressBook.php
 --- a/turba/lib/Forms/EditAddressBook.php	2010-05-10 08:30:05.000000000 +0200
 +++ b/turba/lib/Forms/EditAddressBook.php	2010-05-10 08:32:28.000000000 +0200
-@@ -46,10 +46,38 @@
+@@ -40,16 +40,50 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $addressbook->get('name')));
+ 
+         $this->addHidden('', 'a', 'text', true);
+-        $this->addVariable(_("Name"), 'name', 'text', true);
++        if ($this->_addressbook->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
++        } else {
++            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
++        }
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
++        $this->addVariable(_("Synchronization options for ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this addressbook"), _("synchronizes with this addressbook"))));
 +        }
 +    }
 +
      function execute()
      {
-         $this->_addressbook->set('name', $this->_vars->get('name'));
+-        $this->_addressbook->set('name', $this->_vars->get('name'));
++        if ($this->_addressbook->get('owner') == Auth::getAuth()) {
++            $this->_addressbook->set('name', $this->_vars->get('name'));
++        }
          $this->_addressbook->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
-+            $params = array();
++            $params = @unserialize($this->_addressbook->get('params'));
++            if ($params === false) {
++                $params = array();
++            }
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +            $this->_addressbook->set('params', serialize($params));
 +        }
@@ -391,38 +465,50 @@
 diff -Naur a/lib/Forms/EditTaskList.php b/lib/Forms/EditTaskList.php
 --- a/nag/lib/Forms/EditTaskList.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/nag/lib/Forms/EditTaskList.php	2010-05-10 08:18:34.000000000 +0200
-@@ -46,10 +46,38 @@
+@@ -40,16 +40,47 @@
+         parent::Horde_Form($vars, sprintf(_("Edit %s"), $tasklist->get('name')));
+ 
+         $this->addHidden('', 't', 'text', true);
+-        $this->addVariable(_("Task List Name"), 'name', 'text', true);
++        if ($this->_tasklist->get('owner') != Auth::getAuth()) {
++            $this->addVariable(_("Task List Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Task List Description"), 'description', 'longtext', false, true);
++        } else {
++            $this->addVariable(_("Task List Name"), 'name', 'text', true);
++            $this->addVariable(_("Task List Description"), 'description', 'longtext', false, false, null, array(4, 60));
++        }
+-        $this->addVariable(_("Task List Description"), 'description', 'longtext', false, false, null, array(4, 60));
+ 
          $this->setButtons(array(_("Save")));
      }
  
-+    function activeSyncSegment($devices, $default)
++    function activeSyncSegment($devices)
 +    {
 +        $this->addHidden('', 'activesync_devices', 'text');
 +        $this->addVariable('', '', 'spacer');
 +        $this->addVariable(_("Synchronize this calendar with the following ActiveSync devices"), '', 'header');
 +        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_sync', 'boolean', false);
-+        }
-+        $this->addVariable('', '', 'spacer');
-+        $this->addVariable(_("Activate alarms for this calendar on the following ActiveSync devices"), '', 'header');
-+        foreach ($devices as $id => $config) {
-+            $this->addVariable($id, 'activesync_' . $id . '_alarm', 'boolean', false);
++            $this->addVariable(sprintf("Device \"%s\"", $id), 'activesync_' . $id, 'radio', false, false, null, 
++                           array(array(_("does not synchronize with this tasklist"), _("synchronizes with this tasklist but ignores alarms"), _("synchronizes with this tasklist including alarms"))));
 +        }
 +    }
 +
      function execute()
      {
-         $this->_tasklist->set('name', $this->_vars->get('name'));
+-        $this->_tasklist->set('name', $this->_vars->get('name'));
++        if ($this->_tasklist->get('owner') == Auth::getAuth()) {
++            $this->_tasklist->set('name', $this->_vars->get('name'));
++        }
          $this->_tasklist->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
 +            $params = array();
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
-+                $sync = $this->_vars->get('activesync_' . $id . '_sync');
-+                $alarm = $this->_vars->get('activesync_' . $id . '_alarm');
-+                $params['activesync']['FOLDER'][$id]['SYNC'] = empty($sync) ? 0 : 1;
-+                $params['activesync']['FOLDER'][$id]['ALARM'] = empty($alarm) ? 0 : 1;
++                $sync = (int) $this->_vars->get('activesync_' . $id, 0);
++                if ($sync === 0 || $sync === 1 || $sync === 2) {
++                    $params['activesync']['FOLDER'][$id]['S'] = $sync;
++                }
 +            }
 +            $this->_tasklist->set('params', serialize($params));
 +        }
@@ -433,7 +519,18 @@
 diff -Naur a/tasklists/edit.php b/tasklists/edit.php
 --- a/nag/tasklists/edit.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/nag/tasklists/edit.php	2010-05-10 08:22:49.000000000 +0200
-@@ -51,6 +51,29 @@
+@@ -24,10 +24,6 @@
+     $notification->push($tasklist, 'horde.error');
+     header('Location: ' . Horde::applicationUrl('tasklists/', true));
+     exit;
+-} elseif ($tasklist->get('owner') != Auth::getAuth()) {
+-    $notification->push(_("You are not allowed to change this task list."), 'horde.error');
+-    header('Location: ' . Horde::applicationUrl('tasklists/', true));
+-    exit;
+ }
+ $form = new Nag_EditTaskListForm($vars, $tasklist);
+ 
+@@ -51,6 +51,28 @@
  
  $vars->set('name', $tasklist->get('name'));
  $vars->set('description', $tasklist->get('desc'));
@@ -453,10 +550,9 @@
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
 +        foreach ($devices as $id => $config) {
-+            $vars->set('activesync_' . $id . '_sync', isset($folders[$id]['SYNC']) ? $folders[$id]['SYNC'] : $default);
-+            $vars->set('activesync_' . $id . '_alarm', isset($folders[$id]['ALARM']) ? $folders[$id]['ALARM'] : $default);
++            $vars->set('activesync_' . $id, isset($folders[$id]['S']) ? $folders[$id]['S'] : $default);
 +        }
-+        $form->activeSyncSegment($devices, $default);
++        $form->activeSyncSegment($devices);
 +    }
 +}
 +
@@ -479,7 +575,16 @@
 diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
 --- a/lib/Horde/Kolab/Storage/Folder.php	2010-05-04 23:44:49.522328256 +0200
 +++ b/lib/Horde/Kolab/Storage/Folder.php	2010-05-06 07:46:01.507036608 +0200
-@@ -412,13 +412,23 @@
+@@ -390,7 +390,7 @@
+ 
+         /** Handle the folder type */
+         $folder_type = $this->_type . ($this->_default ? '.default' : '');
+-        if ($this->_type_annotation != $folder_type) {
++        if ($this->_owner == Auth::getAuth() && $this->_type_annotation != $folder_type) {
+             $result = $this->_setAnnotation(KOLAB_ANNOT_FOLDER_TYPE, $folder_type);
+             if (is_a($result, 'PEAR_Error')) {
+                 $this->_type = null;
+@@ -412,19 +412,38 @@
                          if (is_a($result, 'PEAR_Error')) {
                              return $result;
                          }
@@ -499,10 +604,35 @@
 +                        }
 +                        unset($params['activesync']);
 +                    }
++                    if (empty($params)) {
++                        continue;
++                    }
 +                    $value = serialize($params);
                  }
  
                  // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+                 $store = base64_encode($value);
+                 if ($key == 'desc') {
+-                    $entry = '/comment';
++                    if ($this->_owner == Auth::getAuth()) {
++                        $entry = '/comment';
++                    } else {
++                        continue;
++                    }
++                } else if ($key == 'params' && $this->_owner != Auth::getAuth()) {
++                    continue;
+                 } else {
+                     $entry = HORDE_ANNOT_SHARE_ATTR . $key;
+                 }
+@@ -447,7 +450,7 @@
+         }
+ 
+         /** Now save the folder permissions */
+-        if (isset($this->_perms)) {
++        if ($this->_owner == Auth::getAuth() && isset($this->_perms)) {
+             $result = $this->_perms->save();
+             if (is_a($result, 'PEAR_Error')) {
+                 return $result;
 @@ -1645,6 +1655,132 @@
          return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
                                       $value);

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.23
retrieving revision 1.23.2.24
diff -u -d -r1.23.2.23 -r1.23.2.24
--- kolab-webclient.spec	6 Jun 2010 08:50:51 -0000	1.23.2.23
+++ kolab-webclient.spec	8 Jun 2010 19:17:10 -0000	1.23.2.24
@@ -8,14 +8,19 @@
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
+
+# Package Information
+Name:		%{V_package}
+
+#   package options
+%option       with_activesync    no
+
 %if "%{with_activesync}" == "no"
 %define         V_release %{V_year}%{V_month}%{V_day}
 %else
-%define         V_release %{V_year}%{V_month}%{V_day}+activesync2
+%define         V_release %{V_year}%{V_month}%{V_day}+activesync3
 %endif
 
-# Package Information
-Name:		%{V_package}
 Summary:	The Kolab Groupware web client (based on horde)
 URL:		http://www.kolab.org/
 Packager:	Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
@@ -24,9 +29,6 @@
 License:	GPL
 Group:		MAIL
 Distribution:	OpenPKG
-
-#   package options
-%option       with_activesync    no
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_source_version}.tar.gz



From cvs at kolab.org  Wed Jun  9 15:36:14 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 15:36:14 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3
	t_kronolith_HK_GW_ZpushAnnotations.diff, 1.2, 1.3 
Message-ID: <20100609133614.910AA600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3
In directory doto:/tmp/cvs-serv29677/kolab-webclient/kronolith/patches/kronolith-2.3.3

Modified Files:
	t_kronolith_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_kronolith_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/t_kronolith_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_kronolith_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
+++ t_kronolith_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -48,17 +48,19 @@
 diff -Naur a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php
 --- a/lib/Forms/EditCalendar.php	2010-05-04 22:00:36.210910903 +0200
 +++ b/lib/Forms/EditCalendar.php	2010-05-05 10:30:48.073386331 +0200
-@@ -40,22 +40,56 @@
+@@ -40,22 +40,57 @@
          parent::Horde_Form($vars, sprintf(_("Edit %s"), $calendar->get('name')));
  
          $this->addHidden('', 'c', 'text', true);
 -        $this->addVariable(_("Name"), 'name', 'text', true);
 +        if ($this->_calendar->get('owner') != Auth::getAuth()) {
 +            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
 +        } else {
 +            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
 +        }
-         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
 -        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
 -                           array(array(_("owners/administrators"), _("readers"), _("no one")), 
 -                                 'This calendar is only included into the free/busy data for ...'));



From cvs at kolab.org  Wed Jun  9 15:36:14 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 15:36:14 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/turba/patches/turba-2.3.3
	t_turba_HK_GW_ZpushAnnotations.diff, 1.2, 1.3 
Message-ID: <20100609133614.94984600583@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv29677/kolab-webclient/turba/patches/turba-2.3.3

Modified Files:
	t_turba_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_turba_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_turba_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
+++ t_turba_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -51,17 +51,19 @@
 diff -Naur a/lib/Forms/EditAddressBook.php b/lib/Forms/EditAddressBook.php
 --- a/lib/Forms/EditAddressBook.php	2010-05-10 08:30:05.000000000 +0200
 +++ b/lib/Forms/EditAddressBook.php	2010-05-10 08:32:28.000000000 +0200
-@@ -40,16 +40,46 @@
+@@ -40,16 +40,50 @@
          parent::Horde_Form($vars, sprintf(_("Edit %s"), $addressbook->get('name')));
  
          $this->addHidden('', 'a', 'text', true);
 -        $this->addVariable(_("Name"), 'name', 'text', true);
 +        if ($this->_addressbook->get('owner') != Auth::getAuth()) {
 +            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
 +        } else {
 +            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
 +        }
-         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
  
          $this->setButtons(array(_("Save")));
      }
@@ -86,7 +88,10 @@
          $this->_addressbook->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
-+            $params = array();
++            $params = @unserialize($this->_addressbook->get('params'));
++            if ($params === false) {
++                $params = array();
++            }
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
 +                $sync = (int) $this->_vars->get('activesync_' . $id, 0);



From cvs at kolab.org  Wed Jun  9 15:36:14 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 15:36:14 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/mnemo/patches/mnemo-2.2.3
	t_mnemo_HK_GW_ZpushAnnotations.diff, 1.2, 1.3 
Message-ID: <20100609133614.99EA2600587@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3
In directory doto:/tmp/cvs-serv29677/kolab-webclient/mnemo/patches/mnemo-2.2.3

Modified Files:
	t_mnemo_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_mnemo_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3/t_mnemo_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_mnemo_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
+++ t_mnemo_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -8,17 +8,19 @@
 diff -Naur a/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
 --- a/lib/Forms/EditNotepad.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/lib/Forms/EditNotepad.php	2010-05-10 08:28:09.000000000 +0200
-@@ -40,16 +40,46 @@
+@@ -40,16 +40,47 @@
          parent::Horde_Form($vars, sprintf(_("Edit %s"), $notepad->get('name')));
  
          $this->addHidden('', 'n', 'text', true);
 -        $this->addVariable(_("Name"), 'name', 'text', true);
 +        if ($this->_notepad->get('owner') != Auth::getAuth()) {
 +            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
 +        } else {
 +            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
 +        }
-         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
  
          $this->setButtons(array(_("Save")));
      }



From cvs at kolab.org  Wed Jun  9 15:36:14 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 15:36:14 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
	t_framework_HK_GW_ZpushAnnotations.diff, 1.2, 1.3 
Message-ID: <20100609133614.9885B600585@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv29677/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0

Modified Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_framework_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_framework_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:14:07 -0000	1.2
+++ t_framework_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -10,7 +10,7 @@
              $result = $this->_setAnnotation(KOLAB_ANNOT_FOLDER_TYPE, $folder_type);
              if (is_a($result, 'PEAR_Error')) {
                  $this->_type = null;
-@@ -412,13 +412,26 @@
+@@ -412,19 +412,38 @@
                          if (is_a($result, 'PEAR_Error')) {
                              return $result;
                          }
@@ -37,6 +37,19 @@
                  }
  
                  // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+                 $store = base64_encode($value);
+                 if ($key == 'desc') {
+-                    $entry = '/comment';
++                    if ($this->_owner == Auth::getAuth()) {
++                        $entry = '/comment';
++                    } else {
++                        continue;
++                    }
++                } else if ($key == 'params' && $this->_owner != Auth::getAuth()) {
++                    continue;
+                 } else {
+                     $entry = HORDE_ANNOT_SHARE_ATTR . $key;
+                 }
 @@ -447,7 +450,7 @@
          }
  



From cvs at kolab.org  Wed Jun  9 15:36:14 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 15:36:14 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/nag/patches/nag-2.3.4
	t_nag_HK_GW_ZpushAnnotations.diff, 1.2, 1.3 
Message-ID: <20100609133614.8FD32600563@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/nag/patches/nag-2.3.4
In directory doto:/tmp/cvs-serv29677/kolab-webclient/nag/patches/nag-2.3.4

Modified Files:
	t_nag_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_nag_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/patches/nag-2.3.4/t_nag_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_nag_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
+++ t_nag_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -8,17 +8,19 @@
 diff -Naur a/lib/Forms/EditTaskList.php b/lib/Forms/EditTaskList.php
 --- a/lib/Forms/EditTaskList.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/lib/Forms/EditTaskList.php	2010-05-10 08:18:34.000000000 +0200
-@@ -40,16 +40,46 @@
+@@ -40,16 +40,47 @@
          parent::Horde_Form($vars, sprintf(_("Edit %s"), $tasklist->get('name')));
  
          $this->addHidden('', 't', 'text', true);
 -        $this->addVariable(_("Task List Name"), 'name', 'text', true);
 +        if ($this->_tasklist->get('owner') != Auth::getAuth()) {
 +            $this->addVariable(_("Task List Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Task List Description"), 'description', 'longtext', false, true);
 +        } else {
 +            $this->addVariable(_("Task List Name"), 'name', 'text', true);
++            $this->addVariable(_("Task List Description"), 'description', 'longtext', false, false, null, array(4, 60));
 +        }
-         $this->addVariable(_("Task List Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Task List Description"), 'description', 'longtext', false, false, null, array(4, 60));
  
          $this->setButtons(array(_("Save")));
      }



From cvs at kolab.org  Wed Jun  9 21:07:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 21:07:15 +0200 (CEST)
Subject: gunnar: server/make-helper kolab.mk,1.8,1.9 
Message-ID: <20100609190715.B6F00600588@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv5130/make-helper

Modified Files:
	kolab.mk 
Log Message:
kolab/issue4393 (CVS build failure: environment variables not set when invoking make update) 

Index: kolab.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/kolab.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.mk	16 May 2010 09:45:05 -0000	1.8
+++ kolab.mk	9 Jun 2010 19:07:13 -0000	1.9
@@ -1,23 +1,24 @@
 KOLAB_VERSION = 2.2.3
 
 # Check if we are in a test environment
-TEST_ENVIRONMENT=$(test -e test_environment && echo YES)
+TEST_ENVIRONMENT=$(shell test -e test_environment && echo YES)
 ifeq "x$(TEST_ENVIRONMENT)" "xYES"
-    BINARY_PKGS_DIR=$(. test_environment && echo $$BINARY_PKGS_DIR)
-    SOURCE_PKGS_DIR=$(.  test_environment && echo $$SOURCE_PKGS_DIR)
-    KOLABDIR=$(. test_environment && echo $$KOLABDIR)
-    KOLABUID=$(. test_environment && echo $$KOLABUID)
+    BINARY_PKGS_DIR=$(shell . ./test_environment && echo $$BINARY_PKGS_DIR)
+    SOURCE_PKGS_DIR=$(shell . ./test_environment && echo $$SOURCE_PKGS_DIR)
+    KOLABDIR=$(shell . ./test_environment && echo $$KOLABDIR)
+    KOLABUID=$(shell . ./test_environment && echo $$KOLABUID)
+    INSTALL_TYPE=$(shell . ./test_environment && echo $$INSTALL_TYPE)
     OPENPKG=$(KOLABDIR)/bin/openpkg
 else
     BINARY_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/ix86-debian5.0 
     SOURCE_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/sources
     KOLABUID=19414
-endif
 
-# Initial sanity check for the OpenPKG tool
-OPENPKG ?= $(shell which openpkg && echo YES)
-ifeq "x$(OPENPKG)" "x"
-  $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`")
+    # Initial sanity check for the OpenPKG tool
+    OPENPKG ?= $(shell which openpkg && echo YES)
+    ifeq "x$(OPENPKG)" "x"
+      $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`")
+    endif
 endif
 
 # Set KOLABDIR to the base directory of the OpenPKG/Kolab installation if it is unset



From cvs at kolab.org  Wed Jun  9 22:07:04 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jun 2010 22:07:04 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolab.globals.in,1.28,1.29 
Message-ID: <20100609200704.09301600588@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv6528/kolabd

Modified Files:
	kolab.globals.in 
Log Message:
Add a small header indicating that this file should not be modified.

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kolab.globals.in	16 May 2010 06:58:53 -0000	1.28
+++ kolab.globals.in	9 Jun 2010 20:07:02 -0000	1.29
@@ -1,3 +1,11 @@
+#=================================================================
+# THIS FILE PROVIDES THE BASIC KOLAB SERVER CONFIGURAtION.
+# DO NOT EDIT ANYTHING HERE.
+#
+# In case you feel the need to modify any of the settings listed
+# below you can copy the setting to kolab.conf and edit it there.
+# This will override the default setting provided here.
+#=================================================================
 conn_refresh_period : 60
 cyrus-admin : manager
 cyrus-admins : manager



From cvs at kolab.org  Mon Jun 14 08:42:30 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 Jun 2010 08:42:30 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.113,1.398.2.114 
Message-ID: <20100614064230.F0379600588@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23815

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.113
retrieving revision 1.398.2.114
diff -u -d -r1.398.2.113 -r1.398.2.114
--- release-notes.txt	4 Jun 2010 09:27:15 -0000	1.398.2.113
+++ release-notes.txt	14 Jun 2010 06:42:28 -0000	1.398.2.114
@@ -62,6 +62,13 @@
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))
 
+
+    - kolab-webclient-1.2.0-2010????
+
+	kolab/issue4395 (freebusy list contains time of an event,
+	                 which is from a now *not* shared, before
+	                 shared calendar folder)
+
     - imapd-2.3.13-20081020_kolab?
 
 	kolab/issue1141 (Cannot give users from other domains access



From cvs at kolab.org  Mon Jun 14 08:42:30 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 Jun 2010 08:42:30 +0200 (CEST)
Subject: gunnar: server/kolab-webclient issue4395.patch, NONE,
	1.1.2.1 ChangeLog, 1.10.2.22, 1.10.2.23 Makefile, 1.6.2.4,
	1.6.2.5 activesync_conf.patch, 1.1.2.3,
	1.1.2.4 kolab-webclient.spec, 1.23.2.24, 1.23.2.25 
Message-ID: <20100614064230.F30B360058A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv23815/kolab-webclient

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Makefile activesync_conf.patch kolab-webclient.spec 
Added Files:
      Tag: kolab_2_2_branch
	issue4395.patch 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)

--- NEW FILE: issue4395.patch ---
diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php	2010-05-04 23:44:49.522328256 +0200
+++ b/lib/Horde/Kolab/Storage/Folder.php	2010-05-06 07:46:01.507036608 +0200
@@ -414,13 +414,19 @@
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['xfbaccess']);
                     }
                     if (isset($params['fbrelevance'])) {
-                        $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
+                        $result = $this->setFbrelevance($params['fbrelevance']);
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['fbrelevance']);
                     }
+                    if (empty($params)) {
+                        continue;
+                    }
+                    $value = serialize($params);
                 }
 
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/ChangeLog,v
retrieving revision 1.10.2.22
retrieving revision 1.10.2.23
diff -u -d -r1.10.2.22 -r1.10.2.23
--- ChangeLog	8 Jun 2010 19:17:10 -0000	1.10.2.22
+++ ChangeLog	14 Jun 2010 06:42:28 -0000	1.10.2.23
@@ -1,3 +1,9 @@
+2010-06-14  Gunnar Wrobel  <p at rdus.de>
+
+	* issue4395.patch: kolab/issue4395 (freebusy list contains
+	time of an event, which is from a now *not* shared, before shared
+	calendar folder)
+
 2010-06-08  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/Makefile,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- Makefile	8 Jun 2010 19:17:10 -0000	1.6.2.4
+++ Makefile	14 Jun 2010 06:42:28 -0000	1.6.2.5
@@ -13,7 +13,7 @@
 PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch
+PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch issue4395.patch
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 

Index: activesync_conf.patch
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/activesync_conf.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- activesync_conf.patch	8 Jun 2010 19:17:10 -0000	1.1.2.3
+++ activesync_conf.patch	14 Jun 2010 06:42:28 -0000	1.1.2.4
@@ -591,7 +591,8 @@
 +                        unset($params['xfbaccess']);
                      }
                      if (isset($params['fbrelevance'])) {
-                         $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
+-                        $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
++                        $result = $this->setFbrelevance($params['fbrelevance']);
                          if (is_a($result, 'PEAR_Error')) {
                              return $result;
                          }

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.24
retrieving revision 1.23.2.25
diff -u -d -r1.23.2.24 -r1.23.2.25
--- kolab-webclient.spec	8 Jun 2010 19:17:10 -0000	1.23.2.24
+++ kolab-webclient.spec	14 Jun 2010 06:42:28 -0000	1.23.2.25
@@ -1,9 +1,9 @@
 # Versions
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
-%define         V_year  2009
-%define         V_month 12
-%define         V_day   02
+%define         V_year  2010
+%define         V_month 06
+%define         V_day   14
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
@@ -85,7 +85,8 @@
 
 # List of Patches
 Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch
-Patch1:         activesync_conf.patch
+Patch1:         issue4395.patch
+Patch2:         activesync_conf.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -114,6 +115,8 @@
 	cd %{V_horde_name}-%{V_source_version}
 	%patch -p2 -P 0
 %if "%{with_activesync}" == "yes"
+	%patch -p1 -P 2
+%else
 	%patch -p1 -P 1
 %endif
 	cd ..



From cvs at kolab.org  Thu Jun 17 20:49:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jun 2010 20:49:01 +0200 (CEST)
Subject: mathieu: server/kolabd/kolabd ChangeLog,1.296,1.297 
Message-ID: <20100617184901.EE16E600149@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv26046/kolabd/kolabd

Modified Files:
	ChangeLog 
Log Message:
Cyrus user and group is cyrus:mail on Debian

(http://bugs.debian.org/581757).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- ChangeLog	3 Jun 2010 13:33:44 -0000	1.296
+++ ChangeLog	17 Jun 2010 18:48:58 -0000	1.297
@@ -1,3 +1,8 @@
+2010-06-17  Mathieu Parent <math.parent at gmail.com>
+
+	* dist_conf/debian: Cyrus user and group is cyrus:mail on Debian
+	(http://bugs.debian.org/581757).
+
 2010-06-03  Gunnar Wrobel  <p at rdus.de>
 
 	* Makefile.am: Better file modes during



From cvs at kolab.org  Thu Jun 17 20:49:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jun 2010 20:49:01 +0200 (CEST)
Subject: mathieu: server release-notes.txt,1.549,1.550 
Message-ID: <20100617184901.05F12600170@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv26046

Modified Files:
	release-notes.txt 
Log Message:
Cyrus user and group is cyrus:mail on Debian

(http://bugs.debian.org/581757).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -d -r1.549 -r1.550
--- release-notes.txt	16 May 2010 09:39:43 -0000	1.549
+++ release-notes.txt	17 Jun 2010 18:48:58 -0000	1.550
@@ -132,6 +132,9 @@
 
 	freebusy.conf.template.in moved to the Kolab_FreeBusy package.
 
+	Cyrus user and group is cyrus:mail on Debian
+	(http://bugs.debian.org/581757).
+
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
 	kolab/issue1671 (Improving the warning about kolab templates within
 	                 configuration files)



From cvs at kolab.org  Thu Jun 17 20:49:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jun 2010 20:49:01 +0200 (CEST)
Subject: mathieu: server/kolabd/kolabd/dist_conf debian,1.33,1.34 
Message-ID: <20100617184901.06177600560@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv26046/kolabd/kolabd/dist_conf

Modified Files:
	debian 
Log Message:
Cyrus user and group is cyrus:mail on Debian

(http://bugs.debian.org/581757).


Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- debian	13 Apr 2010 19:41:23 -0000	1.33
+++ debian	17 Jun 2010 18:48:58 -0000	1.34
@@ -68,8 +68,8 @@
 
 imap_confdir=${sysconfdir}
 imap_confperm=0640
-imap_usr=root
-imap_grp=root
+imap_usr=cyrus
+imap_grp=mail
 imap_masterlogfile=${localstatedir}/log/mail.log
 imap_misclogfile=${localstatedir}/log/mail.log
 imap_statedir=${localstatedir}/lib/cyrus



From cvs at kolab.org  Tue Jun 22 11:44:36 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jun 2010 11:44:36 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0 -
	New directory 
Message-ID: <20100622094436.4729B600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
In directory doto:/tmp/cvs-serv29625/patches/Kolab_Storage-0.5.0

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0 added to the repository




From cvs at kolab.org  Tue Jun 22 11:46:00 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jun 2010 11:46:00 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage package.info,1.10,1.11 
Message-ID: <20100622094600.38D6B600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv29694

Modified Files:
	package.info 
Log Message:
Update to upstream release Kolab_Storage-0.5.0 which includes some of the Kolab patches.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- package.info	7 Jun 2010 15:14:07 -0000	1.10
+++ package.info	22 Jun 2010 09:45:58 -0000	1.11
@@ -13,10 +13,10 @@
 package_origin='WGET'
 
 # Version number
-version='0.4.0'
+version='0.5.0'
 
 # Package release number
-release='20100607'
+release='20100616'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Tue Jun 22 11:46:00 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jun 2010 11:46:00 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
	issue3416.patch, NONE,
	1.1 t_framework_HK_GW_ZpushAnnotations.diff, NONE,
	1.1 t_framework_HK_UV_NoDuplicationOnUidChange.diff, NONE,
	1.1 t_kronolith_HK_GW_ExportEventList.patch, NONE, 1.1 
Message-ID: <20100622094600.692C0600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
In directory doto:/tmp/cvs-serv29694/patches/Kolab_Storage-0.5.0

Added Files:
	issue3416.patch t_framework_HK_GW_ZpushAnnotations.diff 
	t_framework_HK_UV_NoDuplicationOnUidChange.diff 
	t_kronolith_HK_GW_ExportEventList.patch 
Log Message:
Update to upstream release Kolab_Storage-0.5.0 which includes some of the Kolab patches.

--- NEW FILE: issue3416.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] issue3416.patch

Do not block when free/busy is not available.

STATUS: UNMERGED

REF: http://issues.kolab.org/issue3416

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-04-28 17:18:16.000000000 +0200
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-04-28 18:05:34.684348740 +0200
@@ -31,6 +31,8 @@
 require_once 'Horde/String.php';
 require_once 'Horde/NLS.php';
 
+require_once 'HTTP/Request.php';
+
 /**
  * The root of the Kolab annotation hierarchy, used on the various IMAP folder
  * that are used by Kolab clients.
@@ -1256,14 +1258,15 @@
 
         $options['method'] = 'GET';
         $options['timeout'] = 5;
+        $options['readTimeout'] = array(5, 1000);
+        $options['socketOptions']['http']['timeout'] = 5.0;
         $options['allowRedirects'] = true;
 
         if (isset($conf['http']['proxy']) && !empty($conf['http']['proxy']['proxy_host'])) {
             $options = array_merge($options, $conf['http']['proxy']);
         }
 
-        require_once 'HTTP/Request.php';
-        $http = new HTTP_Request($url, $options);
+        $http = new HTTP_Request_NonBlocking($url, $options);
         $http->setBasicAuth(Auth::getAuth(), Auth::getCredential('password'));
         @$http->sendRequest();
         if ($http->getResponseCode() != 200) {
@@ -1643,3 +1646,157 @@
                                      $value);
     }
 }
+
+class HTTP_Request_NonBlocking extends HTTP_Request
+{
+    /**
+    * Sends the request
+    *
+    * @access public
+    * @param  bool   Whether to store response body in Response object property,
+    *                set this to false if downloading a LARGE file and using a Listener
+    * @return mixed  PEAR error on error, true otherwise
+    */
+    function sendRequest($saveBody = true)
+    {
+        if (!is_a($this->_url, 'Net_URL')) {
+            return PEAR::raiseError('No URL given', HTTP_REQUEST_ERROR_URL);
+        }
+
+        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
+        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
+
+        if (strcasecmp($this->_url->protocol, 'https') == 0) {
+            // Bug #14127, don't try connecting to HTTPS sites without OpenSSL
+            if (version_compare(PHP_VERSION, '4.3.0', '<') || !extension_loaded('openssl')) {
+                return PEAR::raiseError('Need PHP 4.3.0 or later with OpenSSL support for https:// requests',
+                                        HTTP_REQUEST_ERROR_URL);
+            } elseif (isset($this->_proxy_host)) {
+                return PEAR::raiseError('HTTPS proxies are not supported', HTTP_REQUEST_ERROR_PROXY);
+            }
+            $host = 'ssl://' . $host;
+        }
+
+        // magic quotes may fuck up file uploads and chunked response processing
+        $magicQuotes = ini_get('magic_quotes_runtime');
+        ini_set('magic_quotes_runtime', false);
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+        // connection token to a proxy server...
+        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
+            'Keep-Alive' == $this->_requestHeaders['connection'])
+        {
+            $this->removeHeader('connection');
+        }
+
+        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
+                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
+        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
+        $sockKey   = $host . ':' . $port;
+        unset($this->_sock);
+
+        // There is a connected socket in the "static" property?
+        if ($keepAlive && !empty($sockets[$sockKey]) &&
+            !empty($sockets[$sockKey]->fp))
+        {
+            $this->_sock =& $sockets[$sockKey];
+            $err = null;
+        } else {
+            $this->_notify('connect');
+            $this->_sock =& new Net_Socket();
+            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
+            $this->_sock->setBlocking(false);
+        }
+        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
+
+if (!PEAR::isError($err)) {
+            if (!empty($this->_readTimeout)) {
+                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
+            }
+
+            $this->_notify('sentRequest');
+
+            // Read the response
+            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
+            $err = $this->_response->process(
+                $this->_saveBody && $saveBody,
+                HTTP_REQUEST_METHOD_HEAD != $this->_method
+            );
+
+            if ($keepAlive) {
+                $keepAlive = (isset($this->_response->_headers['content-length'])
+                              || (isset($this->_response->_headers['transfer-encoding'])
+                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
+                if ($keepAlive) {
+                    if (isset($this->_response->_headers['connection'])) {
+                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
+                    } else {
+                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
+                    }
+                }
+            }
+        }
+
+        ini_set('magic_quotes_runtime', $magicQuotes);
+
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        if (!$keepAlive) {
+            $this->disconnect();
+        // Store the connected socket in "static" property
+        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
+            $sockets[$sockKey] =& $this->_sock;
+        }
+
+        // Check for redirection
+        if (    $this->_allowRedirects
+            AND $this->_redirects <= $this->_maxRedirects
+            AND $this->getResponseCode() > 300
+            AND $this->getResponseCode() < 399
+            AND !empty($this->_response->_headers['location'])) {
+
+
+            $redirect = $this->_response->_headers['location'];
+
+            // Absolute URL
+            if (preg_match('/^https?:\/\//i', $redirect)) {
+                $this->_url = &new Net_URL($redirect);
+                $this->addHeader('Host', $this->_generateHostHeader());
+            // Absolute path
+            } elseif ($redirect{0} == '/') {
+                $this->_url->path = $redirect;
+
+            // Relative path
+            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $redirect = Net_URL::resolvePath($redirect);
+                $this->_url->path = $redirect;
+
+            // Filename, no path
+            } else {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $this->_url->path = $redirect;
+            }
+
+            $this->_redirects++;
+            return $this->sendRequest($saveBody);
+
+        // Too many redirects
+        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
+            return PEAR::raiseError('Too many redirects', HTTP_REQUEST_ERROR_REDIRECTS);
+        }
+
+        return true;
+    }
+
+}

--- NEW FILE: t_framework_HK_GW_ZpushAnnotations.diff ---
diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-05-04 23:44:49.522328256 +0200
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2010-05-06 07:46:01.507036608 +0200
@@ -390,7 +390,7 @@
 
         /** Handle the folder type */
         $folder_type = $this->_type . ($this->_default ? '.default' : '');
-        if ($this->_type_annotation != $folder_type) {
+        if ($this->_owner == Auth::getAuth() && $this->_type_annotation != $folder_type) {
             $result = $this->_setAnnotation(KOLAB_ANNOT_FOLDER_TYPE, $folder_type);
             if (is_a($result, 'PEAR_Error')) {
                 $this->_type = null;
@@ -412,19 +412,38 @@
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['xfbaccess']);
                     }
                     if (isset($params['fbrelevance'])) {
                         $result = $this->setFbrelevance($params['fbrelevance']);
                         if (is_a($result, 'PEAR_Error')) {
                             return $result;
                         }
+                        unset($params['fbrelevance']);
                     }
+                    if (isset($params['activesync'])) {
+                        $result = $this->setActiveSyncDeviceData($params['activesync'], 'FOLDER');
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['activesync']);
+                    }
+                    if (empty($params)) {
+                        continue;
+                    }
+                    $value = serialize($params);
                 }
 
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters
                 $store = base64_encode($value);
                 if ($key == 'desc') {
-                    $entry = '/comment';
+                    if ($this->_owner == Auth::getAuth()) {
+                        $entry = '/comment';
+                    } else {
+                        continue;
+                    }
+                } else if ($key == 'params' && $this->_owner != Auth::getAuth()) {
+                    continue;
                 } else {
                     $entry = HORDE_ANNOT_SHARE_ATTR . $key;
                 }
@@ -447,7 +450,7 @@
         }
 
         /** Now save the folder permissions */
-        if (isset($this->_perms)) {
+        if ($this->_owner == Auth::getAuth() && isset($this->_perms)) {
             $result = $this->_perms->save();
             if (is_a($result, 'PEAR_Error')) {
                 return $result;
@@ -1645,6 +1655,132 @@
         return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
                                      $value);
     }
+
+    /**
+     * Get the active sync settings for this folder.
+     *
+     * @return array  Array containing the active sync information.
+     */
+    function getActiveSync()
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $local = json_decode(base64_decode($raw), true);
+        if (!$this->name != 'INBOX') {
+            $raw = $imap->getAnnotation(
+                KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', 'INBOX'
+            );
+            $global = json_decode(base64_decode($raw), true);
+            if (!is_array($local)) {
+                $result = array(
+                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                    'FOLDER' => array()
+                );
+            } elseif (is_array($global)) {
+                $result = array(
+                    'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
+                );
+            } else {
+                $result = array(
+                    'DEVICE' => array(),
+                    'FOLDER' => isset($local['FOLDER']) ? $local['FOLDER'] : array(),
+                );
+            }
+        } else {
+            $result = array(
+                'DEVICE' => isset($global['DEVICE']) ? $global['DEVICE'] : array(),
+                'FOLDER' => array()
+            );
+        }
+        $result['NAMESPACE'] = $this->_list->namespace->matchNamespace($this->name)->getType();
+        return $result;
+    }
+
+    /**
+     * Delete an active sync device for this folder.
+     *
+     * @param string $id The id of the device.
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function deleteActiveSyncDevice($id)
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $result = json_decode(base64_decode($raw), true);
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        if (!is_array($result)) {
+            return true;
+        }
+        unset($result['DEVICE'][$id]);
+        $result = $imap->setAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync',
+            array('value.priv' => base64_encode(json_encode($result))),
+            $this->name
+        );
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        return true;
+    }
+
+    /**
+     * Set the active sync annotation.
+     *
+     * @param string $data  The data to store in the annotation.
+     * @param string $type  The type of the data (DEVICE|FOLDER).
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setActiveSyncDeviceData($data, $type = 'DEVICE')
+    {
+        $imap = Horde_Kolab_Session::singleton()->getImap();
+        if (is_a($imap, 'PEAR_Error')) {
+            return $imap;
+        }
+        $raw = $imap->getAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync', 'value.priv', $this->name
+        );
+        $old = json_decode(base64_decode($raw), true);
+        if (is_a($old, 'PEAR_Error')) {
+            return $data;
+        }
+        if (!is_array($old)) {
+            $old = array();
+        }
+
+        $new_type = isset($old[$type]) ? $old[$type] : array();
+        $data_type = isset($data[$type]) ? $data[$type] : array();
+        foreach ($data_type as $id => $settings) {
+            foreach ($settings as $key => $value) {
+                $new_type[$id][$key] = $value;
+            }
+        }
+        $new = array($type => $new_type);
+        $result = $imap->setAnnotation(
+            KOLAB_ANNOT_ROOT . 'activesync',
+            array('value.priv' => base64_encode(json_encode($new))),
+            $this->name
+        );
+
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+        return true;
+    }
 }
 
 class HTTP_Request_NonBlocking extends HTTP_Request

--- NEW FILE: t_framework_HK_UV_NoDuplicationOnUidChange.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/SyncML/HK/GW/DoubleSyncFix

When the uid validity of an IMAP folder changes this confuses the Kolab storage
driver and leads to double entries. The attached patch has been proposed by
Univention and should be applied after some cleanup.

REF: https://issues.kolab.org/issue3238

Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>

--- a/a/a/lib/Horde/Kolab/Storage/Data.php	2008-10-20 16:27:27.000000000 +0200
+++ a/a/a/lib/Horde/Kolab/Storage/Data.php	2008-10-20 16:38:34.000000000 +0200
@@ -457,6 +457,14 @@ class Kolab_Data {
         $history = &Horde_History::singleton();
 
         $history_id = $app . ':' . $this->_folder->getShareId() . ':' . $object_uid;
+
+        // entries that should be added to the history MUST not
+        // have an existing entry in the history!! otherwise
+        // they are just marked as "modified"
+        if ($action == 'add' && $history->getActionTimestamp($history_id, 'add') == 0) {
+            $action = 'modify';
+        }
+
         $history->log($history_id, array('action' => $action, 'ts' => $mod_ts), true);
     }
 

--- NEW FILE: t_kronolith_HK_GW_ExportEventList.patch ---
diff --git a/horde-webmail/lib/Horde/Kolab/Storage/List.php b/horde-webmail/lib/Horde/Kolab/Storage/List.php
index a9bff36..a31ef82 100644
--- a/a/a/lib/Horde/Kolab/Storage/List.php
+++ b/a/a/lib/Horde/Kolab/Storage/List.php
@@ -136,7 +136,7 @@ class Kolab_List {
      */
     function &listFolders()
     {
-        if (!isset($this->_list)) {
+        if (!isset($this->_list) || is_a($this->_list, 'PEAR_Error')) {
             $session = &Horde_Kolab_Session::singleton();
             $imap = &$session->getImap();
             if (is_a($imap, 'PEAR_Error')) {



From cvs at kolab.org  Wed Jun 23 01:24:23 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 01:24:23 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7
	- New directory 
Message-ID: <20100622232423.41587600571@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7
In directory doto:/tmp/cvs-serv17740/templates/Kolab_FreeBusy-0.1.7

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 added to the repository




From cvs at kolab.org  Wed Jun 23 01:29:49 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 01:29:49 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.550,1.551 
Message-ID: <20100622232949.9CAC5600571@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17841

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -d -r1.550 -r1.551
--- release-notes.txt	17 Jun 2010 18:48:58 -0000	1.550
+++ release-notes.txt	22 Jun 2010 23:29:47 -0000	1.551
@@ -95,6 +95,8 @@
 	kolab/issue3544 (Cached xfb access not up to date for changed
 	                 distribution lists)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) 
+	kolab/issue4395 (freebusy list contains time of an event, which is
+	                 from a now *not* shared, before shared calendar folder)
 
     - Kolab_Server-0.5.0-2010????
 



From cvs at kolab.org  Wed Jun 23 01:29:49 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 01:29:49 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.30,
	1.31 Kolab_FreeBusy.spec, 1.28, 1.29 package.info, 1.5, 1.6 
Message-ID: <20100622232949.A33CD600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv17841/d/Kolab_Freebusy

Modified Files:
	ChangeLog Kolab_FreeBusy.spec package.info 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	16 May 2010 07:03:41 -0000	1.30
+++ ChangeLog	22 Jun 2010 23:29:47 -0000	1.31
@@ -1,3 +1,11 @@
+2010-06-23    Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_FreeBusy.spec: Update to 0.1.7
+
+	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
+	kolab/issue4395 (freebusy list contains time of an event, which is
+	from a now *not* shared, before shared calendar folder)
+
 2010-05-16  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_FreeBusy.spec: Update to 0.1.6

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Kolab_FreeBusy.spec	16 May 2010 07:03:41 -0000	1.28
+++ Kolab_FreeBusy.spec	22 Jun 2010 23:29:47 -0000	1.29
@@ -6,8 +6,8 @@
 %define         V_package_origin WGET
 %define         V_repo_commit 
 %define         V_repo_release 
-%define         V_version 0.1.6
-%define         V_release 20100516
+%define         V_version 0.1.7
+%define         V_release 20100623
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc freebusy

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- package.info	16 May 2010 07:03:41 -0000	1.5
+++ package.info	22 Jun 2010 23:29:47 -0000	1.6
@@ -13,10 +13,10 @@
 package_origin='WGET'
 
 # Version number
-version='0.1.6'
+version='0.1.7'
 
 # Package release number
-release='20100516'
+release='20100623'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Wed Jun 23 01:29:49 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 01:29:49 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7
	freebusy.conf.template, NONE, 1.1 
Message-ID: <20100622232949.A603A600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7
In directory doto:/tmp/cvs-serv17841/d/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7

Added Files:
	freebusy.conf.template 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) 

--- NEW FILE: freebusy.conf.template ---
KOLAB_META_START
TARGET=@@@freebusy_confdir@@@/config.php
PERMISSIONS=0640
OWNERSHIP=@@@freebusy_usr@@@:@@@freebusy_grp@@@
KOLAB_META_END
<?php
@@@warning@@@

/*  
 *  COPYRIGHT
 *  ---------
 *
 *  See docs/AUTHORS file
 *
 *
 *  LICENSE
 *  -------
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *  $Revision: 1.1 $
 *
 *  ABOUT
 *  -----
 *
 *  This file provides configuration settings for both the
 *  freebusy.php and the pfb.php scripts.
 *
 */

$conf = array();

/* Horde::Log configuration */
$conf['log']['enabled']          = true;
$conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
$conf['log']['type']             = '@@@freebusy_log_type@@@';
$conf['log']['name']             = '@@@freebusy_log_name@@@';
$conf['log']['ident']            = 'Kolab Free/Busy';
$conf['log']['params']['append'] = true;

/* PHP error logging */
ini_set('error_log', '@@@freebusy_logdir@@@/php-error.log');

/* Horde::Kolab::LDAP configuration */
$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['phpdn']  = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw']  = '@@@php_pw@@@';

/**
 * If you use customized LDAP attributes on your LDAP server the
 * following configuration setting allows you to map the standard
 * Kolab attribute names to your customizations.
 *
 * Specify the mapping line by line:
 *
 * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
 * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
 *
 * or use a hash structure:
 *
 * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
 *                                       'mobile' => 'handy');
 *
 */
//$conf['kolab']['ldap']['map']['uid'] = 'uid2';

/**
 * If you use customized LDAP attributes on your LDAP server the
 * following configuration setting allows you to map the standard
 * Kolab attribute names to your customizations.
 *
 * Specify the mapping line by line:
 *
 * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
 * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
 *
 * or use a hash structure:
 *
 * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
 *                                       'mobile' => 'handy');
 *
 */
//$conf['kolab']['ldap']['map']['uid'] = 'uid2';

/* Horde::Kolab::IMAP configuration */
$conf['kolab']['imap']['server']   = '@@@fqdnhostname@@@';
$conf['kolab']['imap']['port']     = 143;
$conf['kolab']['imap']['protocol'] = 'notls/readonly';

/* Horde::Auth configuration */
$conf['auth']['params']['login_block'] = 0;
$conf['auth']['checkbrowser']          = false;
$conf['auth']['checkip']               = false;

/* Allow special users to log into the system */
$conf['kolab']['imap']['allow_special_users'] = true;

/* Do not record login attempts */
$conf['auth']['params']['login_block'] = false;

/* Kolab::Freebusy configuration */

/* Should we redirect using a Location header, if the user is not local? If this
 * is false we silently download the file ourselves and output it so that it
 * looks as though the free/busy information is coming from us.
 */
$conf['fb']['redirect']     = false;

/* What is the address of the current server where the free/busy data can be accessed?
 */
$conf['kolab']['freebusy']['server']  = 'https://@@@fqdnhostname@@@/freebusy';

/* What is our default mail domain? This is used if any users do not have
 * '@domain' specified after their username as part of their email address.
 */
$conf['fb']['email_domain'] = '@@@fqdnhostname@@@';

/* Location of the cache files */
$conf['fb']['cache_dir']    = '@@@freebusy_cachedir@@@';

/* What db type to use for the freebusy caches */
$conf['fb']['dbformat']     = 'db4';

/* Should we send a Content-Type header, indicating what the mime type of the
 * resulting VFB file is?
 */
$conf['fb']['send_content_type'] = false;

/* Should we send a Content-Length header, indicating how large the resulting
 * VFB file is?
 */
$conf['fb']['send_content_length'] = false;

/* Should we send a Content-Disposition header, indicating what the name of the
 * resulting VFB file should be?
 */
$conf['fb']['send_content_disposition'] = false;

/* Should we use ACLs or does everybody get full rights? DO NOT set
 * this to false if you don't know what you are doing. Your free/busy
 * service should not be visible to any outside networks when
 * disabling the use of ACL settings.
 */
$conf['fb']['use_acls'] = true;

/* The resulting vCalendar file is being cached. The following setting
 * determines how many seconds it will be delivered without checking if
 * the contents of the file might have changed. A negative setting disables
 * caching (which is currently required for the resource management to work).
 */
$conf['fb']['vcal_cache']['min_age'] = -1;

/* The resulting vCalendar file is being cached. The following setting
 * determines after how many seconds it will be considered too old for
 * delivery and a refresh of its contents will be enforced.
 */
$conf['fb']['vcal_cache']['max_age'] = 259200;


/* Are there remote servers on which users have additional (shared)
 * folders? In that case free/busy information should also be fetched
 * from these servers.
 *
 * Add them like this:
 *
 * array('remote1.example.com', 'remote2.example.com')
 */
$conf['fb']['remote_servers'] = array();

/**
 * Ensure we use the Kolab group driver when handling groups.
 */
$conf['group']['driver'] = 'kolab';
$conf['group']['cache'] = false;

//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
// If you modify this file, please do not forget to ping upstream
// about synchronizing this file with 
// 
// http://cvs.horde.org/framework/Kolab_FreeBusy/www/Horde/Kolab/FreeBusy/config.php
//
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

// DEBUGGING
// =========
//
// Activate this to see the log messages on the screen
// $conf['log']['type'] = 'display';
//
// Activate this to see the php messages on the screen
// ini_set('display_errors', 1);
//
// Both setting will disrupt header delivery (which should not cause a
// problem).



From cvs at kolab.org  Wed Jun 23 02:02:48 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 02:02:48 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format Kolab_Package_Dependency.patch,
	NONE, 1.1.2.1 ChangeLog, 1.3.2.1, 1.3.2.2 Kolab_Format.spec,
	1.9.2.2, 1.9.2.3 
Message-ID: <20100623000248.910BE600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv18299/d/Kolab_Format

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Format.spec 
Added Files:
      Tag: kolab_2_2_branch
	Kolab_Package_Dependency.patch 
Log Message:
Fixed invalid package dependency on the Kolab package.

--- NEW FILE: Kolab_Package_Dependency.patch ---
diff -u -B -r1.2.2.6 task.php
--- lib/Horde/Kolab/Format/XML/task.php	12 Dec 2008 11:39:04 -0000	1.2.2.6
+++ lib/Horde/Kolab/Format/XML/task.php	22 Jun 2010 23:56:53 -0000
@@ -154,7 +154,7 @@
             $object['parent'] = null;
         }
 
-        $object['completed'] = (bool) Kolab::percentageToBoolean($object['completed']);
+        $object['completed'] = (bool) $this->percentageToBoolean($object['completed']);
 
         if (isset($object['organizer']) && isset($object['organizer']['smtp-address'])) {
             $object['assignee'] = $object['organizer']['smtp-address'];
@@ -184,8 +184,18 @@
 
         $object['estimate'] = number_format($object['estimate'], 2);
 
-        $object['completed'] = Kolab::BooleanToPercentage($object['completed']);
+        $object['completed'] = $this->booleanToPercentage($object['completed']);
 
         return $this->_saveArray($root, $object, $this->_fields_specific);
     }
+
+    function percentageToBoolean($percentage)
+    {
+        return $percentage == 100 ? '1' : '0';
+    }
+
+    function booleanToPercentage($boolean)
+    {
+        return $boolean ? '100' : '0';
+    }
 }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/ChangeLog,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- ChangeLog	2 Apr 2009 07:29:45 -0000	1.3.2.1
+++ ChangeLog	23 Jun 2010 00:02:46 -0000	1.3.2.2
@@ -1,3 +1,8 @@
+2010-06-23  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Format.spec: Fixed invalid package dependency on the Kolab
+	package.
+
 2009-04-02  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Format.spec: kolab/issue3525 (free/busy regeneration

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Attic/Kolab_Format.spec,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- Kolab_Format.spec	2 Apr 2009 09:48:45 -0000	1.9.2.2
+++ Kolab_Format.spec	23 Jun 2010 00:02:46 -0000	1.9.2.3
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Format
 %define         V_version 1.0.0
-%define         V_release 20090402
+%define         V_release 20090623
 %define         V_sourceurl http://pear.horde.org/get
 
 # Package Information
@@ -20,6 +20,7 @@
 
 # List of patches
 Patch0:    issue3525.patch
+Patch1:    Kolab_Package_Dependency.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -43,6 +44,7 @@
 	%setup -n %{V_package}-%{V_version}
 
         %patch -p2 -P 0
+        %patch -p0 -P 1
 
 	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
 



From cvs at kolab.org  Wed Jun 23 02:02:48 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 02:02:48 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.114,1.398.2.115 
Message-ID: <20100623000248.51D1E600571@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv18299

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Fixed invalid package dependency on the Kolab package.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.114
retrieving revision 1.398.2.115
diff -u -d -r1.398.2.114 -r1.398.2.115
--- release-notes.txt	14 Jun 2010 06:42:28 -0000	1.398.2.114
+++ release-notes.txt	23 Jun 2010 00:02:45 -0000	1.398.2.115
@@ -57,6 +57,10 @@
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
 
+    - Kolab_Format-1.0.0-2010????
+
+	Fixed invalid package dependency on the Kolab package.
+
     - kolab-webadmin-2.2.?-20??????
 
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)



From cvs at kolab.org  Wed Jun 23 16:54:11 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 16:54:11 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.551,1.552 
Message-ID: <20100623145411.BBCE560057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv9413

Modified Files:
	release-notes.txt 
Log Message:
MFB: Fixed invalid package dependency on the Kolab package.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -d -r1.551 -r1.552
--- release-notes.txt	22 Jun 2010 23:29:47 -0000	1.551
+++ release-notes.txt	23 Jun 2010 14:54:09 -0000	1.552
@@ -70,7 +70,9 @@
 	kolab/issue4257 ("Always accept" policy doesn't set atendee status
 	                 to "accepted")
 
-    - Kolab_Format-1.0.1-2009????
+    - Kolab_Format-1.0.1-2010????
+
+	Make the task handler independent of the Kolab package.
 
 	kolab/issue3520 (calendar with certain entries does not display in web
 	                 client)



From cvs at kolab.org  Wed Jun 23 16:54:11 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 16:54:11 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1
	Kolab_Package_Dependency.patch, NONE, 1.1 
Message-ID: <20100623145411.BE609600581@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1
In directory doto:/tmp/cvs-serv9413/d/Kolab_Format/patches/Kolab_Format-1.0.1

Added Files:
	Kolab_Package_Dependency.patch 
Log Message:
MFB: Fixed invalid package dependency on the Kolab package.

--- NEW FILE: Kolab_Package_Dependency.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_Package_Dependency.patch

Does make the task handler independent of the Kolab package.

STATUS: MERGED

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

diff -u -B -r1.2.2.6 task.php
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/task.php	12 Dec 2008 11:39:04 -0000	1.2.2.6
+++ a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/task.php	22 Jun 2010 23:56:53 -0000
@@ -154,7 +154,7 @@
             $object['parent'] = null;
         }
 
-        $object['completed'] = (bool) Kolab::percentageToBoolean($object['completed']);
+        $object['completed'] = (bool) $this->percentageToBoolean($object['completed']);
 
         if (isset($object['organizer']) && isset($object['organizer']['smtp-address'])) {
             $object['assignee'] = $object['organizer']['smtp-address'];
@@ -184,8 +184,18 @@
 
         $object['estimate'] = number_format($object['estimate'], 2);
 
-        $object['completed'] = Kolab::BooleanToPercentage($object['completed']);
+        $object['completed'] = $this->booleanToPercentage($object['completed']);
 
         return $this->_saveArray($root, $object, $this->_fields_specific);
     }
+
+    function percentageToBoolean($percentage)
+    {
+        return $percentage == 100 ? '1' : '0';
+    }
+
+    function booleanToPercentage($boolean)
+    {
+        return $boolean ? '100' : '0';
+    }
 }



From cvs at kolab.org  Wed Jun 23 16:54:11 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jun 2010 16:54:11 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format ChangeLog, 1.5, 1.6 package.info,
	1.2, 1.3 
Message-ID: <20100623145411.BFE81600583@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv9413/d/Kolab_Format

Modified Files:
	ChangeLog package.info 
Log Message:
MFB: Fixed invalid package dependency on the Kolab package.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	24 Apr 2009 06:20:52 -0000	1.5
+++ ChangeLog	23 Jun 2010 14:54:09 -0000	1.6
@@ -1,3 +1,9 @@
+2010-06-23  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Format-1.0.1/Kolab_Format_1.0.1_p1.patch:
+
+	Make the task handler independent of the Kolab package.
+
 2009-04-24  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Format_1.0.1_p1.patch: Removes an additional option that

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	18 Jan 2010 13:40:11 -0000	1.2
+++ package.info	23 Jun 2010 14:54:09 -0000	1.3
@@ -16,7 +16,7 @@
 version='1.0.1'
 
 # Package release number
-release='20100116'
+release='20100623'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Thu Jun 24 11:34:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 11:34:01 +0200 (CEST)
Subject: thomas: server/clamav Makefile,1.7.2.6,1.7.2.7 
Message-ID: <20100624093401.B6DE6600581@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv32594/clamav

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Download clamav package from server/externals directory instead of incoming/wrobel


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -d -r1.7.2.6 -r1.7.2.7
--- Makefile	8 Jun 2010 09:59:24 -0000	1.7.2.6
+++ Makefile	24 Jun 2010 09:33:59 -0000	1.7.2.7
@@ -5,8 +5,7 @@
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 
-#SOURCE_0=http://files.kolab.org/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
-SOURCE_0=http://files.kolab.org/incoming/wrobel/$(NAME)-$(VERSION).tar.gz
+SOURCE_0=http://files.kolab.org/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 
 .PHONY: all



From cvs at kolab.org  Thu Jun 24 11:43:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 11:43:20 +0200 (CEST)
Subject: thomas: server .cvsignore,1.1.4.1,1.1.4.2 
Message-ID: <20100624094320.EFA0960057A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv32765

Modified Files:
      Tag: kolab_2_2_branch
	.cvsignore 
Log Message:
Add missing EOL


Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/.cvsignore,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- .cvsignore	8 Jun 2010 10:13:00 -0000	1.1.4.1
+++ .cvsignore	24 Jun 2010 09:43:18 -0000	1.1.4.2
@@ -1,2 +1,2 @@
 stage
-update
\ No newline at end of file
+update



From cvs at kolab.org  Thu Jun 24 11:48:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 11:48:15 +0200 (CEST)
Subject: thomas: server update.mk,1.1.2.6,1.1.2.7 
Message-ID: <20100624094815.C51C6600581@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv402

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
Fix version number in comment and add big FIXME for triplication of options


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- update.mk	8 Jun 2010 10:13:00 -0000	1.1.2.6
+++ update.mk	24 Jun 2010 09:48:13 -0000	1.1.2.7
@@ -3,7 +3,9 @@
 # update packages from CVS. Currently
 
 # These are the packages that were updated from Kolab Server version
-# 2.2.2 to 2.2.3.
+# 2.2.3 to 2.2.4.
+#
+# FIXME: build options are replicated here, too ... this is the third location!
 UPDATES_2.2.3_2.2.4=openssl                 \
                     http://files.kolab.org/incoming/wrobel/x509-0-20090125.src.rpm@ \
                     http://files.kolab.org/server/release/kolab-server-2.2.3/sources/apr-1.2.12-20080101.src.rpm at with_ldap \



From cvs at kolab.org  Thu Jun 24 11:59:03 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 11:59:03 +0200 (CEST)
Subject: thomas: server/kolab-webclient kolab-webclient.spec, 1.23.2.25,
	1.23.2.26 
Message-ID: <20100624095903.8A848600581@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv570/kolab-webclient

Modified Files:
      Tag: kolab_2_2_branch
	kolab-webclient.spec 
Log Message:
Comment that activesync_conf.patch contains changes of issue4395.patch


Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.25
retrieving revision 1.23.2.26
diff -u -d -r1.23.2.25 -r1.23.2.26
--- kolab-webclient.spec	14 Jun 2010 06:42:28 -0000	1.23.2.25
+++ kolab-webclient.spec	24 Jun 2010 09:59:01 -0000	1.23.2.26
@@ -115,6 +115,7 @@
 	cd %{V_horde_name}-%{V_source_version}
 	%patch -p2 -P 0
 %if "%{with_activesync}" == "yes"
+	# activesync_conf.patch contains changes of issue4395.patch:
 	%patch -p1 -P 2
 %else
 	%patch -p1 -P 1



From cvs at kolab.org  Thu Jun 24 12:27:03 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 12:27:03 +0200 (CEST)
Subject: thomas: server install-kolab.sh,1.54.2.13,1.54.2.14 
Message-ID: <20100624102703.CDF3C600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1296

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh 
Log Message:
Correct requirements for php and apache-php:

- hash and tokenizer are not supported in this version
- spl is activated by kolabd requirements, so workaround in install-kolab.sh
  is no longer needed.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.13
retrieving revision 1.54.2.14
diff -u -d -r1.54.2.13 -r1.54.2.14
--- install-kolab.sh	2 Mar 2010 04:50:03 -0000	1.54.2.13
+++ install-kolab.sh	24 Jun 2010 10:27:01 -0000	1.54.2.14
@@ -20,7 +20,7 @@
 PREFIX=""
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D apache-php::with_spl"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
 EXCLUDEPKGS=""
 
 #Flags



From cvs at kolab.org  Thu Jun 24 12:27:03 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 12:27:03 +0200 (CEST)
Subject: thomas: server/apache-php Makefile,1.8.2.5,1.8.2.6 
Message-ID: <20100624102703.D29E8600583@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv1296/apache-php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Correct requirements for php and apache-php:

- hash and tokenizer are not supported in this version
- spl is activated by kolabd requirements, so workaround in install-kolab.sh
  is no longer needed.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -d -r1.8.2.5 -r1.8.2.6
--- Makefile	8 Jun 2010 10:00:10 -0000	1.8.2.5
+++ Makefile	24 Jun 2010 10:27:01 -0000	1.8.2.6
@@ -26,8 +26,7 @@
 	--define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
 	--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
-	--define 'with_json yes' --define 'with_tokenizer yes'
+	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_json yes'
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 



From cvs at kolab.org  Thu Jun 24 12:27:03 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 12:27:03 +0200 (CEST)
Subject: thomas: server/php Makefile,1.18.2.4,1.18.2.5 
Message-ID: <20100624102703.D967B600585@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv1296/php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Correct requirements for php and apache-php:

- hash and tokenizer are not supported in this version
- spl is activated by kolabd requirements, so workaround in install-kolab.sh
  is no longer needed.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -u -d -r1.18.2.4 -r1.18.2.5
--- Makefile	21 Apr 2010 14:53:18 -0000	1.18.2.4
+++ Makefile	24 Jun 2010 10:27:01 -0000	1.18.2.5
@@ -26,8 +26,7 @@
 	--define 'with_imap yes' --define 'with_ssl yes' --define 'with_ctype yes' \
 	--define 'with_openldap yes' --define 'with_mhash yes' --define 'with_zlib yes' \
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
-	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
-	--define 'with_json yes' --define 'with_tokenizer yes'
+	--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_json yes'
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(OLD_VERSION)-$(RELEASE).src.rpm:



From cvs at kolab.org  Thu Jun 24 12:30:53 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 12:30:53 +0200 (CEST)
Subject: thomas: server update.mk,1.1.2.7,1.1.2.8 
Message-ID: <20100624103053.3CD81600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1429

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
Dropped FIXME, I now understand why the options are needed :)

(for the record: There are no Makefiles containing the options for the other
 packages since they are unmodified OpenPKG packages)


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- update.mk	24 Jun 2010 09:48:13 -0000	1.1.2.7
+++ update.mk	24 Jun 2010 10:30:51 -0000	1.1.2.8
@@ -4,8 +4,6 @@
 
 # These are the packages that were updated from Kolab Server version
 # 2.2.3 to 2.2.4.
-#
-# FIXME: build options are replicated here, too ... this is the third location!
 UPDATES_2.2.3_2.2.4=openssl                 \
                     http://files.kolab.org/incoming/wrobel/x509-0-20090125.src.rpm@ \
                     http://files.kolab.org/server/release/kolab-server-2.2.3/sources/apr-1.2.12-20080101.src.rpm at with_ldap \



From cvs at kolab.org  Thu Jun 24 12:44:45 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 12:44:45 +0200 (CEST)
Subject: thomas: server update.mk,1.1.2.8,1.1.2.9 
Message-ID: <20100624104445.42306600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1660

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
Use x509-0-20090125.src.rpm package from files.kolab.org


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- update.mk	24 Jun 2010 10:30:51 -0000	1.1.2.8
+++ update.mk	24 Jun 2010 10:44:43 -0000	1.1.2.9
@@ -5,7 +5,7 @@
 # These are the packages that were updated from Kolab Server version
 # 2.2.3 to 2.2.4.
 UPDATES_2.2.3_2.2.4=openssl                 \
-                    http://files.kolab.org/incoming/wrobel/x509-0-20090125.src.rpm@ \
+                    http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/x509-0-20090125.src.rpm@ \
                     http://files.kolab.org/server/release/kolab-server-2.2.3/sources/apr-1.2.12-20080101.src.rpm at with_ldap \
                     http://files.kolab.org/server/release/kolab-server-2.2.3/sources/imap-2006k-20080101.src.rpm at with_annotate \
                     http://files.kolab.org/server/release/kolab-server-2.2.3/sources/curl-7.17.1-20080101.src.rpm@ \



From cvs at kolab.org  Thu Jun 24 12:48:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 12:48:42 +0200 (CEST)
Subject: thomas: server update.mk,1.1.2.9,1.1.2.10 
Message-ID: <20100624104842.BBC88600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1751

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
Added procmail to 2.2.2->2.2.3 updates (though obsolete and only manually buildable)


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- update.mk	24 Jun 2010 10:44:43 -0000	1.1.2.9
+++ update.mk	24 Jun 2010 10:48:40 -0000	1.1.2.10
@@ -34,7 +34,8 @@
                     kolab-webclient         \
 # Hm, we can't update these automatically...
 #                    openpkg                 \
-#                    perl-kolab
+#                    perl-kolab              \
+#                    procmail
 
 # Set the new version we are aiming at after each release.
 CVS_VERSION=2.2.4



From cvs at kolab.org  Thu Jun 24 13:00:12 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 13:00:12 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.115,1.398.2.116 
Message-ID: <20100624110012.2501D600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2040

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Added (many) missing entries to release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.115
retrieving revision 1.398.2.116
diff -u -d -r1.398.2.115 -r1.398.2.116
--- release-notes.txt	23 Jun 2010 00:02:45 -0000	1.398.2.115
+++ release-notes.txt	24 Jun 2010 11:00:10 -0000	1.398.2.116
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20??????, Kolab Server 2.2.x)
+(Version 20??????, Kolab Server 2.2.4)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -43,9 +43,22 @@
 	The specifics are described below.
 
 
-Changes between 2.2.3 and 2.2.x:
+Changes between 2.2.3 and 2.2.4:
 
-    - kolabd-2.2.?-20??????
+    - apache-2.2.15-2010????
+
+	New upstream version to support openssl 1.x
+
+    - apache-php-5.2.13-2010????
+
+	New upstream version, fixes various security issues.
+	Supports openssl 1.x
+
+    - clamav-0.96.1-20100607
+
+	New upstream version, fixes various security issues.
+
+    - kolabd-2.2.4-20??????
 
 	Require the json module in php and apache-php.
 
@@ -55,13 +68,13 @@
 	Added annotation for activesync configuration (z-push).
 
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)
-	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen) 
+	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen)
 
     - Kolab_Format-1.0.0-2010????
 
 	Fixed invalid package dependency on the Kolab package.
 
-    - kolab-webadmin-2.2.?-20??????
+    - kolab-webadmin-2.2.4-20??????
 
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))
@@ -78,10 +91,33 @@
 	kolab/issue1141 (Cannot give users from other domains access
 	                 to a folder (rt#5747))
 
+    - openssl-1.0.0-2010????
+
+	New upstream version, fixes various security issues.
+
+	Since OpenPKG uses static linking, packages which do not
+	get updated in this release need to be recompiled:
+	apr curl imap openldap perl-crypto perl-ssl sasl postfix
+
     - perl-kolab-2.2.3-20091217
 
 	kolab/issue4237 (additional event.default folder created by
 	                 kolabd (rt#6038))
+
+    - php-5.2.13-2010????
+
+	New upstream version, fixes various security issues.
+	Supports openssl 1.x
+
+    - x509-0-20090125
+
+	New package, dependency of apache-2.2.15.
+
+
+    Packages in the OpenPKG based Kolab server release:
+
+    ???
+
 
 Changes between 2.2.2 and 2.2.3:
 



From cvs at kolab.org  Thu Jun 24 13:10:46 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 13:10:46 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd configure.ac,1.12.2.2,1.12.2.3 
Message-ID: <20100624111046.C9F1C600582@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv2586/kolabd/kolabd

Modified Files:
      Tag: kolab_2_2_branch
	configure.ac 
Log Message:
Bump version numbers to 2.2.4


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -d -r1.12.2.2 -r1.12.2.3
--- configure.ac	15 Dec 2009 15:09:10 -0000	1.12.2.2
+++ configure.ac	24 Jun 2010 11:10:44 -0000	1.12.2.3
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 
 # not the real version
-m4_define(_VERSION,2.2.3)
+m4_define(_VERSION,2.2.4)
 AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 



From cvs at kolab.org  Thu Jun 24 13:10:46 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 13:10:46 +0200 (CEST)
Subject: thomas: server 1st.README, 1.1.2.14, 1.1.2.15 install-kolab.sh,
	1.54.2.14, 1.54.2.15 release-notes.txt, 1.398.2.116, 1.398.2.117 
Message-ID: <20100624111046.CDB8F600583@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2586

Modified Files:
      Tag: kolab_2_2_branch
	1st.README install-kolab.sh release-notes.txt 
Log Message:
Bump version numbers to 2.2.4


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- 1st.README	21 Apr 2010 10:41:35 -0000	1.1.2.14
+++ 1st.README	24 Jun 2010 11:10:44 -0000	1.1.2.15
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Install and Upgrade Information
 ================================================
-(Version 20091217, Kolab Server 2.2.3)
+(Version 2010????, Kolab Server 2.2.4)
 
 See http://kolab.org/ for general information about Kolab,
 or look at http://wiki.kolab.org/ for specific topics.
@@ -124,6 +124,13 @@
 # /kolab/bin/openpkg rc openldap start
 # /kolab/sbin/kolabconf -n
 # /kolab/bin/openpkg rc all start
+
+
+Upgrade from 2.2.3 to 2.2.4
+---------------------------
+
+???
+(mention which binary packages needs rebuild for new openssl)
 
 
 Upgrade from 2.2.2 to 2.2.3

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.14
retrieving revision 1.54.2.15
diff -u -d -r1.54.2.14 -r1.54.2.15
--- install-kolab.sh	24 Jun 2010 10:27:01 -0000	1.54.2.14
+++ install-kolab.sh	24 Jun 2010 11:10:44 -0000	1.54.2.15
@@ -12,7 +12,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2.3"
+KOLAB_VERSION="2.2.4"
 KID="19414"
 
 TAG="kolab"

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.116
retrieving revision 1.398.2.117
diff -u -d -r1.398.2.116 -r1.398.2.117
--- release-notes.txt	24 Jun 2010 11:00:10 -0000	1.398.2.116
+++ release-notes.txt	24 Jun 2010 11:10:44 -0000	1.398.2.117
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20??????, Kolab Server 2.2.4)
+(Version 2010????, Kolab Server 2.2.4)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.



From cvs at kolab.org  Thu Jun 24 13:10:46 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 13:10:46 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin configure.ac, 1.30.2.2,
	1.30.2.3 
Message-ID: <20100624111046.C577860057A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv2586/kolab-webadmin/kolab-webadmin

Modified Files:
      Tag: kolab_2_2_branch
	configure.ac 
Log Message:
Bump version numbers to 2.2.4


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -d -r1.30.2.2 -r1.30.2.3
--- configure.ac	15 Dec 2009 15:09:10 -0000	1.30.2.2
+++ configure.ac	24 Jun 2010 11:10:44 -0000	1.30.2.3
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-m4_define(_VERSION,2.2.3)
+m4_define(_VERSION,2.2.4)
 AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 



From cvs at kolab.org  Thu Jun 24 14:25:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 14:25:31 +0200 (CEST)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.29.2.1,1.29.2.2 
Message-ID: <20100624122531.CFDB060057B@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/perl-kolab/lib
In directory doto:/tmp/cvs-serv3823/perl-kolab/lib

Modified Files:
      Tag: kolab_2_2_branch
	Kolab.pm 
Log Message:
Bumped version number for perl-kolab, too


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Attic/Kolab.pm,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -d -r1.29.2.1 -r1.29.2.2
--- Kolab.pm	17 Jul 2009 14:44:27 -0000	1.29.2.1
+++ Kolab.pm	24 Jun 2010 12:25:29 -0000	1.29.2.2
@@ -59,7 +59,7 @@
 );
 
 # The Kolab version number for the perl-kolab package
-our $KOLAB_BASE_VERSION = "2.2.3";
+our $KOLAB_BASE_VERSION = "2.2.4";
 
 # Are current releases cvs based or is this a real release?
 my $KOLAB_CVS = 0;



From cvs at kolab.org  Thu Jun 24 14:25:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 14:25:31 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.117,1.398.2.118 
Message-ID: <20100624122531.CDA8860057A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3823

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Bumped version number for perl-kolab, too


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.117
retrieving revision 1.398.2.118
diff -u -d -r1.398.2.117 -r1.398.2.118
--- release-notes.txt	24 Jun 2010 11:10:44 -0000	1.398.2.117
+++ release-notes.txt	24 Jun 2010 12:25:29 -0000	1.398.2.118
@@ -99,7 +99,7 @@
 	get updated in this release need to be recompiled:
 	apr curl imap openldap perl-crypto perl-ssl sasl postfix
 
-    - perl-kolab-2.2.3-20091217
+    - perl-kolab-2.2.4-2010????
 
 	kolab/issue4237 (additional event.default folder created by
 	                 kolabd (rt#6038))



From cvs at kolab.org  Thu Jun 24 16:33:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 16:33:50 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.552,1.553 
Message-ID: <20100624143350.42DC2600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6125

Modified Files:
	release-notes.txt 
Log Message:
Allow access to the matchNamespace() function.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -d -r1.552 -r1.553
--- release-notes.txt	23 Jun 2010 14:54:09 -0000	1.552
+++ release-notes.txt	24 Jun 2010 14:33:48 -0000	1.553
@@ -107,7 +107,7 @@
 	kolab/issue3537 (Allowing xfb access to groups does not work)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) 
 
-    - Kolab_Storage-0.4.0-2010????
+    - Kolab_Storage-0.5.0-2010????
 
 	Support setting Zpush configuration values.
 



From cvs at kolab.org  Thu Jun 24 16:33:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 16:33:50 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage ChangeLog, 1.11,
	1.12 package.info, 1.11, 1.12 
Message-ID: <20100624143350.48760600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv6125/d/Kolab_Storage

Modified Files:
	ChangeLog package.info 
Log Message:
Allow access to the matchNamespace() function.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	7 Jun 2010 15:14:06 -0000	1.11
+++ ChangeLog	24 Jun 2010 14:33:48 -0000	1.12
@@ -1,3 +1,13 @@
+2010-06-24  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.5.0/Kolab_Storage_0.5.0_p1.patch:
+
+	Allow access to the matchNamespace() function.
+
+2010-06-22  Gunnar Wrobel  <p at rdus.de>
+
+	* package.info: Update to 0.5.0.
+
 2010-06-07  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff:

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- package.info	22 Jun 2010 09:45:58 -0000	1.11
+++ package.info	24 Jun 2010 14:33:48 -0000	1.12
@@ -16,7 +16,7 @@
 version='0.5.0'
 
 # Package release number
-release='20100616'
+release='20100624'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Thu Jun 24 16:33:50 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 16:33:50 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
	Kolab_Storage_0.5.0_p1.patch, NONE, 1.1 
Message-ID: <20100624143350.4B2BB600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
In directory doto:/tmp/cvs-serv6125/d/Kolab_Storage/patches/Kolab_Storage-0.5.0

Added Files:
	Kolab_Storage_0.5.0_p1.patch 
Log Message:
Allow access to the matchNamespace() function.

--- NEW FILE: Kolab_Storage_0.5.0_p1.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_Storage_0.5.0_p1.patch

Allow access to the matchNamespace() function.

This is required for the active sync configuration frontend.

STATUS: MERGED

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php	22 Jun 2010 09:31:39 -0000	1.1.2.1
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php	24 Jun 2010 14:21:12 -0000	1.1.2.2
@@ -104,7 +104,7 @@
      * @throws Horde_Kolab_Storage_Exception If the namespace of the folder
      *                                       cannot be determined.
      */
-    protected function matchNamespace($name)
+    public function matchNamespace($name)
     {
         foreach ($this->_namespaces as $namespace) {
             if ($namespace->matches($name)) {



From cvs at kolab.org  Thu Jun 24 18:19:23 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 18:19:23 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.118,1.398.2.119 
Message-ID: <20100624161923.E141F600572@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8413

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Updated release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.118
retrieving revision 1.398.2.119
diff -u -d -r1.398.2.118 -r1.398.2.119
--- release-notes.txt	24 Jun 2010 12:25:29 -0000	1.398.2.118
+++ release-notes.txt	24 Jun 2010 16:19:21 -0000	1.398.2.119
@@ -45,11 +45,11 @@
 
 Changes between 2.2.3 and 2.2.4:
 
-    - apache-2.2.15-2010????
+    - apache-2.2.15-20100406
 
 	New upstream version to support openssl 1.x
 
-    - apache-php-5.2.13-2010????
+    - apache-php-5.2.13-20100624_kolab1
 
 	New upstream version, fixes various security issues.
 	Supports openssl 1.x
@@ -58,7 +58,7 @@
 
 	New upstream version, fixes various security issues.
 
-    - kolabd-2.2.4-20??????
+    - kolabd-2.2.4-20100624
 
 	Require the json module in php and apache-php.
 
@@ -70,41 +70,40 @@
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen)
 
-    - Kolab_Format-1.0.0-2010????
+    - Kolab_Format-1.0.0-20090623
 
 	Fixed invalid package dependency on the Kolab package.
 
-    - kolab-webadmin-2.2.4-20??????
+    - kolab-webadmin-2.2.4-20100624
 
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))
 
-
-    - kolab-webclient-1.2.0-2010????
+    - kolab-webclient-1.2.0-20100614
 
 	kolab/issue4395 (freebusy list contains time of an event,
 	                 which is from a now *not* shared, before
 	                 shared calendar folder)
 
-    - imapd-2.3.13-20081020_kolab?
+    - imapd-2.3.13-20081020_kolab4+crossdomainacl1
 
 	kolab/issue1141 (Cannot give users from other domains access
 	                 to a folder (rt#5747))
 
-    - openssl-1.0.0-2010????
+    - openssl-1.0.0a-20100624
 
 	New upstream version, fixes various security issues.
 
 	Since OpenPKG uses static linking, packages which do not
 	get updated in this release need to be recompiled:
-	apr curl imap openldap perl-crypto perl-ssl sasl postfix
+	apr curl imap openldap perl-crypto perl-ssl postfix sasl
 
-    - perl-kolab-2.2.4-2010????
+    - perl-kolab-2.2.4-20100624
 
 	kolab/issue4237 (additional event.default folder created by
 	                 kolabd (rt#6038))
 
-    - php-5.2.13-2010????
+    - php-5.2.13-20100624_kolab1
 
 	New upstream version, fixes various security issues.
 	Supports openssl 1.x



From cvs at kolab.org  Thu Jun 24 18:22:29 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 18:22:29 +0200 (CEST)
Subject: thomas: server/openssl Makefile, 1.1.2.2, 1.1.2.3 openssl.spec,
	1.1.2.1, 1.1.2.2 
Message-ID: <20100624162229.3A0B5600572@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/openssl
In directory doto:/tmp/cvs-serv8531/openssl

Modified Files:
      Tag: kolab_2_2_branch
	Makefile openssl.spec 
Log Message:
openssl 1.0.0a


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openssl/Makefile,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- Makefile	8 Jun 2010 09:57:33 -0000	1.1.2.2
+++ Makefile	24 Jun 2010 16:22:27 -0000	1.1.2.3
@@ -2,7 +2,7 @@
 
 NAME = openssl
 PACKAGE = $(NAME)
-VERSION = $(shell grep "^%define.*V_openssl" *.spec | sed -e "s/^%define.*V_openssl\s*\([0-9.]*\).*/\1/")
+VERSION = $(shell grep "^%define.*V_openssl" *.spec | sed -e "s/^%define.*V_openssl\s*\([0-9.a-z]*\).*/\1/")
 ZLIB_VERSION = $(shell grep "^%define.*V_zlib" *.spec | sed -e "s/^%define.*V_zlib\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)

Index: openssl.spec
===================================================================
RCS file: /kolabrepository/server/openssl/openssl.spec,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- openssl.spec	21 Apr 2010 15:01:05 -0000	1.1.2.1
+++ openssl.spec	24 Jun 2010 16:22:27 -0000	1.1.2.2
@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_openssl 1.0.0
+%define       V_openssl 1.0.0a
 %define       V_zlib    1.2.5
 
 #   package information
@@ -36,7 +36,7 @@
 Group:        SSL
 License:      BSD-style
 Version:      %{V_openssl}
-Release:      20100420
+Release:      20100624
 
 #   package options
 %option       with_zlib     no



From cvs at kolab.org  Thu Jun 24 18:22:58 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 18:22:58 +0200 (CEST)
Subject: thomas: server/apache-php Makefile, 1.8.2.6, 1.8.2.7 kolab.patch,
	1.6.2.1, 1.6.2.2 
Message-ID: <20100624162258.7F715600572@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv8569/apache-php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
Updated release dates for php and apache-php


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -d -r1.8.2.6 -r1.8.2.7
--- Makefile	24 Jun 2010 10:27:01 -0000	1.8.2.6
+++ Makefile	24 Jun 2010 16:22:56 -0000	1.8.2.7
@@ -4,7 +4,7 @@
 OLD_VERSION=5.2.8
 VERSION=5.2.13
 RELEASE=20081209
-KOLABRELEASE=20081209_kolab2
+KOLABRELEASE=20100624_kolab1
 
 PATCHES=../patches/php/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
         ../patches/php/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- kolab.patch	21 Apr 2010 14:52:32 -0000	1.6.2.1
+++ kolab.patch	24 Jun 2010 16:22:56 -0000	1.6.2.2
@@ -19,7 +19,7 @@
  License:      PHP
  Version:      %{V_php}
 -Release:      20081209
-+Release:      20081209_kolab2
++Release:      20100624_kolab1
  
  #   package options
  %option       with_suhosin              no



From cvs at kolab.org  Thu Jun 24 18:22:58 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 18:22:58 +0200 (CEST)
Subject: thomas: server/php Makefile, 1.18.2.5, 1.18.2.6 kolab.patch, 1.14.2.1,
	1.14.2.2 
Message-ID: <20100624162258.8385F600576@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv8569/php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
Updated release dates for php and apache-php


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -d -r1.18.2.5 -r1.18.2.6
--- Makefile	24 Jun 2010 10:27:01 -0000	1.18.2.5
+++ Makefile	24 Jun 2010 16:22:56 -0000	1.18.2.6
@@ -4,7 +4,7 @@
 OLD_VERSION=5.2.8
 VERSION=5.2.13
 RELEASE=20081209
-KOLABRELEASE=20081209_kolab2
+KOLABRELEASE=20100624_kolab1
 
 PATCHES=../patches/php/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
         ../patches/php/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- kolab.patch	21 Apr 2010 14:53:19 -0000	1.14.2.1
+++ kolab.patch	24 Jun 2010 16:22:56 -0000	1.14.2.2
@@ -19,7 +19,7 @@
  License:      PHP
  Version:      %{V_php}
 -Release:      20081209
-+Release:      20081209_kolab2
++Release:      20100624_kolab1
  
  #   package options
  %option       with_suhosin              no



From cvs at kolab.org  Thu Jun 24 18:24:01 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 18:24:01 +0200 (CEST)
Subject: thomas: server Makefile, 1.76.2.4, 1.76.2.5 update.mk, 1.1.2.10,
	1.1.2.11 
Message-ID: <20100624162401.95A9A600572@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8605

Modified Files:
      Tag: kolab_2_2_branch
	Makefile update.mk 
Log Message:
make update: Should be removed by "make clean", mention two more manual packages


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.76.2.4
retrieving revision 1.76.2.5
diff -u -d -r1.76.2.4 -r1.76.2.5
--- Makefile	17 Nov 2009 09:20:21 -0000	1.76.2.4
+++ Makefile	24 Jun 2010 16:23:59 -0000	1.76.2.5
@@ -104,7 +104,7 @@
 	done
 
 .PHONY: clean
-clean: clean-base clean-kolab clean-pear clean-stage
+clean: clean-base clean-kolab clean-pear clean-stage clean-update
 	find . | grep "~$$" | xargs rm -rf
 
 .PHONY: clean-stage

Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- update.mk	24 Jun 2010 10:48:40 -0000	1.1.2.10
+++ update.mk	24 Jun 2010 16:23:59 -0000	1.1.2.11
@@ -49,6 +49,10 @@
 .PHONY: update
 update: current
 
+.PHONY: clean-update
+clean-update:
+	rm -rf update
+
 .PHONY:current
 current: $(KOLAB_SERVER_CVS)
 
@@ -72,9 +76,9 @@
 	    fi;                                                      \
 	  fi;                                                        \
 	done
-	@for UPDATE in kolab-webadmin perl-kolab;                    \
+	@for UPDATE in kolab-webadmin perl-kolab Kolab_Format kolab-webclient; \
 	do                                                           \
-	  echo "Please update $$UPDATE manually using 'make dist' and 'openpkg rpm'"; \
+	  echo "Please build $$UPDATE manually and install it via 'openpkg rpm'"; \
 	done
 
 ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.3"



From cvs at kolab.org  Thu Jun 24 19:37:51 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 19:37:51 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
	- New directory 
Message-ID: <20100624173751.7E626600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
In directory doto:/tmp/cvs-serv9858/patches/Kolab_FreeBusy-0.1.7

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7 added to the repository




From cvs at kolab.org  Thu Jun 24 19:38:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 19:38:44 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
	Kolab_FreeBusy_0.1.7_p1.patch, NONE, 1.1 
Message-ID: <20100624173844.D0CE8600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
In directory doto:/tmp/cvs-serv9913/patches/Kolab_FreeBusy-0.1.7

Added Files:
	Kolab_FreeBusy_0.1.7_p1.patch 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)

--- NEW FILE: Kolab_FreeBusy_0.1.7_p1.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_FreeBusy_0.1.7_p1.patch

Completes the fix for kolab/issue4395.

STATUS: MERGED

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/File/acl.php	15 Jun 2010 12:00:34 -0000	1.1.2.2
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/File/acl.php	24 Jun 2010 17:22:11 -0000
@@ -103,7 +103,6 @@
             if (is_a($oldacl, 'PEAR_Error')) {
                 $oldacl = array();
             }
-            $acl = array_merge($oldacl, $acl);
         } else {
             $oldacl = array();
         }



From cvs at kolab.org  Thu Jun 24 19:38:44 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 19:38:44 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.31,
	1.32 Kolab_FreeBusy.spec, 1.29, 1.30 package.info, 1.6, 1.7 
Message-ID: <20100624173844.CE1E9600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv9913

Modified Files:
	ChangeLog Kolab_FreeBusy.spec package.info 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	22 Jun 2010 23:29:47 -0000	1.31
+++ ChangeLog	24 Jun 2010 17:38:42 -0000	1.32
@@ -1,4 +1,11 @@
-2010-06-23    Gunnar Wrobel  <p at rdus.de>
+2010-06-24  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_FreeBusy-0.1.7/Kolab_FreeBusy_0.1.7_p1.patch:
+
+	kolab/issue4395 (freebusy list contains time of an event, which is
+	from a now *not* shared, before shared calendar folder)
+
+2010-06-23  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_FreeBusy.spec: Update to 0.1.7
 

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Kolab_FreeBusy.spec	22 Jun 2010 23:29:47 -0000	1.29
+++ Kolab_FreeBusy.spec	24 Jun 2010 17:38:42 -0000	1.30
@@ -7,7 +7,7 @@
 %define         V_repo_commit 
 %define         V_repo_release 
 %define         V_version 0.1.7
-%define         V_release 20100623
+%define         V_release 20100624
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc freebusy

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package.info	22 Jun 2010 23:29:47 -0000	1.6
+++ package.info	24 Jun 2010 17:38:42 -0000	1.7
@@ -16,7 +16,7 @@
 version='0.1.7'
 
 # Package release number
-release='20100623'
+release='20100624'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Thu Jun 24 20:02:19 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 20:02:19 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.119,1.398.2.120 
Message-ID: <20100624180219.CF3C6600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv10561

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.119
retrieving revision 1.398.2.120
diff -u -d -r1.398.2.119 -r1.398.2.120
--- release-notes.txt	24 Jun 2010 16:19:21 -0000	1.398.2.119
+++ release-notes.txt	24 Jun 2010 18:02:17 -0000	1.398.2.120
@@ -74,6 +74,11 @@
 
 	Fixed invalid package dependency on the Kolab package.
 
+    - Kolab_FreeBusy-0.1.2-20100624
+
+	kolab/issue4395 (freebusy list contains time of an event, which is
+	from a now *not* shared, before shared calendar folder)
+
     - kolab-webadmin-2.2.4-20100624
 
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)



From cvs at kolab.org  Thu Jun 24 20:02:19 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 20:02:19 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy issue4395.patch, NONE,
	1.1.2.1 ChangeLog, 1.25.2.1, 1.25.2.2 Kolab_FreeBusy.spec,
	1.18.2.3, 1.18.2.4 Makefile, 1.6.2.4, 1.6.2.5 
Message-ID: <20100624180219.D4BD1600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv10561/d/Kolab_Freebusy

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_FreeBusy.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue4395.patch 
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) 

--- NEW FILE: issue4395.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] issue4395.patch

Fixes handling of ACLs when triggering folders.

STATUS: UNMERGED

REF: http://issues.kolab.org/issue4395

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

diff -Naur --exclude='*~' a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php	2010-01-23 23:00:42.000000000 +0100
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php	2010-03-25 15:49:15.000000000 +0100
@@ -148,11 +148,9 @@
                  * it has been triggered by the folder owner before.
                  */
                 $append = false;
-                if (isset($acl[$access->user])) {
-                    $myacl = $acl[$access->user];
-                    if (strpos($myacl, 'a') !== false) {
+                if (isset($acl[$access->user])
+                    && (strpos($acl[$access->user], 'a') === false)) {
                         $append = true;
-                    }
                 }
 
                 $result = $c_acl->storeACL($acl, $relevance, $append);
@@ -1342,7 +1340,6 @@
             if (is_a($oldacl, 'PEAR_Error')) {
                 $oldacl = array();
             }
-            $acl = array_merge($oldacl, $acl);
         } else {
             $oldacl = array();
         }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- ChangeLog	31 Mar 2009 12:43:26 -0000	1.25.2.1
+++ ChangeLog	24 Jun 2010 18:02:17 -0000	1.25.2.2
@@ -1,3 +1,10 @@
+2010-06-24  Gunnar Wrobel  <p at rdus.de>
+
+	* issue4395.patch, Kolab_FreeBusy.spec, Makefile:
+
+	kolab/issue4395 (freebusy list contains time of an event, which is
+	from a now *not* shared, before shared calendar folder)
+
 2009-03-20  Gunnar Wrobel  <p at rdus.de>
 
 	* issue3450.patch, Kolab_FreeBusy.spec, Makefile: Fix kolab/issue3450

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- Kolab_FreeBusy.spec	6 Apr 2009 13:59:22 -0000	1.18.2.3
+++ Kolab_FreeBusy.spec	24 Jun 2010 18:02:17 -0000	1.18.2.4
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_FreeBusy
 %define         V_version 0.1.2
-%define         V_release 20090406
+%define         V_release 20100624
 
 # Package Information
 Name:	   %{V_package}
@@ -23,6 +23,7 @@
 Patch1:    issue3438.patch
 Patch2:    issue3450.patch
 Patch3:    issue3537.patch
+Patch4:    issue4395.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -59,6 +60,7 @@
         %patch -p3 -P 1
         %patch -p3 -P 2
         %patch -p1 -P 3
+        %patch -p3 -P 4
         cp %{S:1} .
 
 %build

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- Makefile	9 Nov 2009 17:08:45 -0000	1.6.2.4
+++ Makefile	24 Jun 2010 18:02:17 -0000	1.6.2.5
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch issue3537.patch package.xml
+EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch issue3537.patch issue4395.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Thu Jun 24 20:57:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 20:57:22 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.398.2.120,1.398.2.121 
Message-ID: <20100624185722.8432C600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11872

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue3966 (All day event with not booked not correctly processed) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.120
retrieving revision 1.398.2.121
diff -u -d -r1.398.2.120 -r1.398.2.121
--- release-notes.txt	24 Jun 2010 18:02:17 -0000	1.398.2.120
+++ release-notes.txt	24 Jun 2010 18:57:20 -0000	1.398.2.121
@@ -70,6 +70,11 @@
 	kolab/issue2244 (SpamAssassin uses DNS blacklists)
 	kolab/issue4176 (Adding RSS feed to Horde breaks portal screen)
 
+    - Kolab_Filter-0.1.4-20100624
+
+	kolab/issue3966 (All day event with "not booked" not correctly
+	                 processed)
+
     - Kolab_Format-1.0.0-20090623
 
 	Fixed invalid package dependency on the Kolab package.
@@ -77,7 +82,8 @@
     - Kolab_FreeBusy-0.1.2-20100624
 
 	kolab/issue4395 (freebusy list contains time of an event, which is
-	from a now *not* shared, before shared calendar folder)
+	                 from a now *not* shared, before shared calendar
+	                 folder)
 
     - kolab-webadmin-2.2.4-20100624
 



From cvs at kolab.org  Thu Jun 24 20:57:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Jun 2010 20:57:22 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter issue3966.patch, NONE,
	1.1.2.1 ChangeLog, 1.29.2.14, 1.29.2.15 Kolab_Filter.spec,
	1.19.2.18, 1.19.2.19 Makefile, 1.8.2.16, 1.8.2.17 
Message-ID: <20100624185722.8567D600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv11872/d/Kolab_Filter

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3966.patch 
Log Message:
kolab/issue3966 (All day event with not booked not correctly processed) 

--- NEW FILE: issue3966.patch ---
diff -u -B -r1.15.2.3 -r1.15.2.4
--- a/lib/Horde/Kolab/Resource.php	5 Mar 2009 10:08:53 -0000	1.15.2.3
+++ b/lib/Horde/Kolab/Resource.php	6 Mar 2009 08:43:12 -0000	1.15.2.4
@@ -249,9 +249,6 @@
         }
         $object['start-date'] = $this->convert2epoch($itip->getAttributeDefault('DTSTART', ''));
         $object['end-date'] = $this->convert2epoch($dtend);
-        if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') {
-            $object['show-time-as'] = $itip->getAttributeDefault('DTEND', '');
-        }
 
         $attendees = $itip->getAttribute('ATTENDEE');
         if (!is_a( $attendees, 'PEAR_Error')) {

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.14
retrieving revision 1.29.2.15
diff -u -d -r1.29.2.14 -r1.29.2.15
--- ChangeLog	25 Nov 2009 13:42:20 -0000	1.29.2.14
+++ ChangeLog	24 Jun 2010 18:57:20 -0000	1.29.2.15
@@ -1,9 +1,16 @@
+2010-06-24  Gunnar Wrobel  <p at rdus.de>
+
+	* issue3966.patch, Kolab_Filter.spec:
+
+	kolab/issue3966 (All day event with "not booked" not correctly
+	processed)
+
 2009-11-25  Sascha Wilde  <wilde at intevation.de>
 
 	* Kolab_Filter.spec: kolab/issue973 (Rewritten from shown
 	inconveniently in kontact)
 
-2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+2009-11-24  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not
 	delivered, Kolab Filter does not report lmtp error)

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.18
retrieving revision 1.19.2.19
diff -u -d -r1.19.2.18 -r1.19.2.19
--- Kolab_Filter.spec	3 Dec 2009 14:11:01 -0000	1.19.2.18
+++ Kolab_Filter.spec	24 Jun 2010 18:57:20 -0000	1.19.2.19
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091203
+%define         V_release 20100624
 
 # Package Information
 Name:	   %{V_package}
@@ -35,6 +35,7 @@
 Patch13:   issue3594.patch
 Patch14:   issue973.patch
 Patch15:   issue3965.patch
+Patch16:   issue3966.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -85,6 +86,7 @@
 	%patch -p1 -P 13
 	%patch -p1 -P 14
 	%patch -p1 -P 15
+	%patch -p1 -P 16
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.16
retrieving revision 1.8.2.17
diff -u -d -r1.8.2.16 -r1.8.2.17
--- Makefile	3 Dec 2009 14:11:01 -0000	1.8.2.16
+++ Makefile	24 Jun 2010 18:57:20 -0000	1.8.2.17
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue973.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue3966.patch issue973.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Fri Jun 25 07:10:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 07:10:15 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
	Kolab_Storage_0.5.0_p2.patch, NONE, 1.1 
Message-ID: <20100625051015.E4AFD600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.5.0
In directory doto:/tmp/cvs-serv28658/d/Kolab_Storage/patches/Kolab_Storage-0.5.0

Added Files:
	Kolab_Storage_0.5.0_p2.patch 
Log Message:
kolab/issue4169 (kolab-webclient sometimes shows a blank page on login) 

--- NEW FILE: Kolab_Storage_0.5.0_p2.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_Storage_0.5.0_p2.patch

Avoid PEAR Errors in the session data.

STATUS: MERGED

REF: https://issues.kolab.org/issue4169

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php	22 Jun 2010 09:31:39 -0000	1.3.2.9
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php	25 Jun 2010 04:53:49 -0000	1.3.2.10
@@ -168,10 +168,11 @@
             }
 
             // Obtain a list of all folders the current user has access to
-            $this->_list = $imap->getMailboxes();
-            if (is_a($this->_list, 'PEAR_Error')) {
-                return $this->_list;
+            $list = $imap->getMailboxes();
+            if (is_a($list, 'PEAR_Error')) {
+                return $list;
             }
+            $this->_list = $list;
         }
         return $this->_list;
     }



From cvs at kolab.org  Fri Jun 25 07:10:16 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 07:10:16 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage ChangeLog, 1.12,
	1.13 package.info, 1.12, 1.13 
Message-ID: <20100625051016.E6645600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv28658/d/Kolab_Storage

Modified Files:
	ChangeLog package.info 
Log Message:
kolab/issue4169 (kolab-webclient sometimes shows a blank page on login) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	24 Jun 2010 14:33:48 -0000	1.12
+++ ChangeLog	25 Jun 2010 05:10:13 -0000	1.13
@@ -1,3 +1,10 @@
+2010-06-25  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.5.0/Kolab_Storage_0.5.0_p2.patch:
+
+	kolab/issue4169 (kolab-webclient sometimes shows a blank page on
+	login)
+
 2010-06-24  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.5.0/Kolab_Storage_0.5.0_p1.patch:

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- package.info	24 Jun 2010 14:33:48 -0000	1.12
+++ package.info	25 Jun 2010 05:10:13 -0000	1.13
@@ -16,7 +16,7 @@
 version='0.5.0'
 
 # Package release number
-release='20100624'
+release='20100625'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Fri Jun 25 07:10:15 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 07:10:15 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.553,1.554 
Message-ID: <20100625051015.E5845600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv28658

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue4169 (kolab-webclient sometimes shows a blank page on login) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -d -r1.553 -r1.554
--- release-notes.txt	24 Jun 2010 14:33:48 -0000	1.553
+++ release-notes.txt	25 Jun 2010 05:10:13 -0000	1.554
@@ -115,6 +115,8 @@
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
 	kolab/issue4165 (kolab-webclient does not show shared/
 	                 calendar and contact folders)
+	kolab/issue4169 (kolab-webclient sometimes shows a blank page on
+	                 login)
 
     - kolabd-2.?.?-2009????
 



From cvs at kolab.org  Fri Jun 25 10:38:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 10:38:20 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.554,1.555 
Message-ID: <20100625083820.AD125600571@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv655

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue3732 (Logging needed for errors when creating a Kolab session object) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -d -r1.554 -r1.555
--- release-notes.txt	25 Jun 2010 05:10:13 -0000	1.554
+++ release-notes.txt	25 Jun 2010 08:38:18 -0000	1.555
@@ -96,6 +96,8 @@
 	kolab/issue3537 (Allowing xfb access to groups does not work)
 	kolab/issue3544 (Cached xfb access not up to date for changed
 	                 distribution lists)
+	kolab/issue3732 (Logging needed for errors when creating a Kolab
+	                 session object)
 	kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) 
 	kolab/issue4395 (freebusy list contains time of an event, which is
 	                 from a now *not* shared, before shared calendar folder)



From cvs at kolab.org  Fri Jun 25 10:38:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 10:38:20 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
	Kolab_FreeBusy_0.1.7_p2.patch, NONE, 1.1 
Message-ID: <20100625083820.AFCDF600572@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7
In directory doto:/tmp/cvs-serv655/d/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7

Added Files:
	Kolab_FreeBusy_0.1.7_p2.patch 
Log Message:
kolab/issue3732 (Logging needed for errors when creating a Kolab session object) 

--- NEW FILE: Kolab_FreeBusy_0.1.7_p2.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_FreeBusy_0.1.7_p1.patch

Fixes kolab/issue3732 (Logging needed for errors when creating a Kolab session object)

STATUS: MERGED

REF: https://issues.kolab.org/issue3732

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

diff -u -B -r1.15.2.3 Access.php
--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Access.php	28 Apr 2010 20:03:06 -0000	1.15.2.3
+++ a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Access.php	25 Jun 2010 08:08:13 -0000
@@ -40,11 +40,18 @@
     /**
      * Did the above combination authenticate?
      *
-     * @var string
+     * @var boolean
      */
     var $_authenticated = false;
 
     /**
+     * Contains an error string if authentication failed.
+     *
+     * @var string
+     */
+    var $_auth_error;
+
+    /**
      * The object representing the user calling the script.
      *
      * @var string
@@ -227,8 +234,8 @@
         }
 
         if (!$this->_authenticated) {
-            return PEAR::raiseError(sprintf(_("Invalid authentication for user %s!"), 
-                                            $this->user));
+            return PEAR::raiseError(sprintf(_("Invalid authentication for user %s: %s"), 
+                                            $this->user, $this->_auth_error));
         }
         return true;
     }
@@ -301,6 +308,8 @@
                     'remote_addr' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null,
                 );
                 Auth::setCredential('password', $pass);
+            } else {
+                $this->_auth_error = $auth->getLogoutReasonString();
             }
         }
     }



From cvs at kolab.org  Fri Jun 25 10:38:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 10:38:20 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.32,
	1.33 Kolab_FreeBusy.spec, 1.30, 1.31 package.info, 1.7, 1.8 
Message-ID: <20100625083820.B15CD600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv655/d/Kolab_Freebusy

Modified Files:
	ChangeLog Kolab_FreeBusy.spec package.info 
Log Message:
kolab/issue3732 (Logging needed for errors when creating a Kolab session object) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	24 Jun 2010 17:38:42 -0000	1.32
+++ ChangeLog	25 Jun 2010 08:38:18 -0000	1.33
@@ -1,3 +1,10 @@
+2010-06-25  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_FreeBusy-0.1.7/Kolab_FreeBusy_0.1.7_p2.patch:
+
+	kolab/issue3732 (Logging needed for errors when creating a Kolab
+	session object)
+
 2010-06-24  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_FreeBusy-0.1.7/Kolab_FreeBusy_0.1.7_p1.patch:
@@ -46,7 +53,7 @@
 	                 free/busy information)
 	kolab/issue3527 (no immediately printing of folders during
 	                 freebusy cache regeneration)
-	
+
 2009-03-06  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_FreeBusy.spec: Update to 0.1.3.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Kolab_FreeBusy.spec	24 Jun 2010 17:38:42 -0000	1.30
+++ Kolab_FreeBusy.spec	25 Jun 2010 08:38:18 -0000	1.31
@@ -7,7 +7,7 @@
 %define         V_repo_commit 
 %define         V_repo_release 
 %define         V_version 0.1.7
-%define         V_release 20100624
+%define         V_release 20100625
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc freebusy

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- package.info	24 Jun 2010 17:38:42 -0000	1.7
+++ package.info	25 Jun 2010 08:38:18 -0000	1.8
@@ -16,7 +16,7 @@
 version='0.1.7'
 
 # Package release number
-release='20100624'
+release='20100625'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'



From cvs at kolab.org  Fri Jun 25 12:46:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 12:46:37 +0200 (CEST)
Subject: thomas: server/php-kolab/Kolab_Format Kolab_Format.spec, 1.9.2.3,
	1.9.2.4 
Message-ID: <20100625104637.C1A6B600568@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv3350/php-kolab/Kolab_Format

Modified Files:
      Tag: kolab_2_2_branch
	Kolab_Format.spec 
Log Message:
Welcome in 2010: Kolab_Format-1.0.0-20090623 -> Kolab_Format-1.0.0-20100623


Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Attic/Kolab_Format.spec,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -d -r1.9.2.3 -r1.9.2.4
--- Kolab_Format.spec	23 Jun 2010 00:02:46 -0000	1.9.2.3
+++ Kolab_Format.spec	25 Jun 2010 10:46:35 -0000	1.9.2.4
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Format
 %define         V_version 1.0.0
-%define         V_release 20090623
+%define         V_release 20100623
 %define         V_sourceurl http://pear.horde.org/get
 
 # Package Information



From cvs at kolab.org  Fri Jun 25 12:46:37 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 12:46:37 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.121,1.398.2.122 
Message-ID: <20100625104637.C2AAA60056E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3350

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Welcome in 2010: Kolab_Format-1.0.0-20090623 -> Kolab_Format-1.0.0-20100623


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.121
retrieving revision 1.398.2.122
diff -u -d -r1.398.2.121 -r1.398.2.122
--- release-notes.txt	24 Jun 2010 18:57:20 -0000	1.398.2.121
+++ release-notes.txt	25 Jun 2010 10:46:35 -0000	1.398.2.122
@@ -75,7 +75,7 @@
 	kolab/issue3966 (All day event with "not booked" not correctly
 	                 processed)
 
-    - Kolab_Format-1.0.0-20090623
+    - Kolab_Format-1.0.0-20100623
 
 	Fixed invalid package dependency on the Kolab package.
 



From cvs at kolab.org  Fri Jun 25 13:14:52 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 13:14:52 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.122,1.398.2.123 
Message-ID: <20100625111452.94B9F600568@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv4061

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Fill "Packages in the OpenPKG based Kolab server release" for 2.2.4


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.122
retrieving revision 1.398.2.123
diff -u -d -r1.398.2.122 -r1.398.2.123
--- release-notes.txt	25 Jun 2010 10:46:35 -0000	1.398.2.122
+++ release-notes.txt	25 Jun 2010 11:14:50 -0000	1.398.2.123
@@ -126,7 +126,157 @@
 
     Packages in the OpenPKG based Kolab server release:
 
-    ???
+    - Kolab packages:
+
+      Updated:
+
+	Kolab_Filter-0.1.4-20100624
+	Kolab_Format-1.0.0-20100623
+	Kolab_FreeBusy-0.1.2-20100624
+	clamav-0.96.1-20100607
+	kolab-webadmin-2.2.4-20100624
+	kolab-webclient-1.2.0-20100614
+	kolabd-2.2.4-20100624
+	perl-kolab-2.2.4-20100624
+
+      Unchanged:
+
+	Horde_Argv-0.1.0-20081209
+	Horde_Auth-0.1.1-20081209
+	Horde_Browser-0.0.2-20081209
+	Horde_CLI-0.0.2-20081209
+	Horde_Cache-0.0.2-20081209
+	Horde_Cipher-0.0.2-20081209
+	Horde_DOM-0.1.0-20081209
+	Horde_DataTree-0.0.3-20081209
+	Horde_Date-0.1.0-20081209
+	Horde_Framework-0.0.2-20081209
+	Horde_Group-0.1.0-20081209
+	Horde_History-0.0.2-20081209
+	Horde_LDAP-0.0.2-20081209
+	Horde_MIME-0.0.2-20081209
+	Horde_NLS-0.0.2-20081209
+	Horde_Notification-0.0.2-20090223
+	Horde_Perms-0.1.0-20081209
+	Horde_Prefs-0.0.3-20090223
+	Horde_Secret-0.0.2-20081209
+	Horde_Serialize-0.0.2-20081209
+	Horde_SessionObjects-0.0.2-20081209
+	Horde_Util-0.1.0-20081209
+	Horde_iCalendar-0.1.0-20081209
+	Kolab_Server-0.4.0-20091013
+	Kolab_Storage-0.4.0-20090224
+	PEAR-Auth_SASL-1.0.2-1
+	PEAR-Date-1.4.7-1
+	PEAR-HTTP_Request-1.4.3-1
+	PEAR-Horde-Channel-1.0-20090119
+	PEAR-Log-1.11.2-1
+	PEAR-Mail-1.1.14-1
+	PEAR-Mail_mimeDecode-1.5.0-20081209
+	PEAR-Net_LDAP2-2.0.0RC5-1
+	PEAR-Net_LMTP-1.0.1-1
+	PEAR-Net_SMTP-1.3.1-1
+	PEAR-Net_Socket-1.0.9-1
+	PEAR-Net_URL-1.0.15-1
+	PEAR-PHPUnit-Channel-1.0-20090119
+	PHPUnit-3.3.3-1
+	kolab-fbview-1.2.0-20081227
+	perl-ldap-5.10.0-20081028_kolab1
+	php-smarty-2.6.20-20081212
+	sqlite-3.6.4-20081212
+
+    - OpenPKG packages:
+
+      Added:
+
+	x509-0-20090125
+
+      Updated:
+
+	apache-2.2.15-20100406
+	apache-php-5.2.13-20100624_kolab1
+	imapd-2.3.13-20081020_kolab4+crossdomainacl1
+	openssl-1.0.0a-20100624
+	php-5.2.13-20100624_kolab1
+
+      Recompiled (source is unchanged):
+
+	apr-1.2.12-20080101
+	curl-7.17.1-20080101
+	imap-2006k-20080101
+	openldap-2.3.43-20081212
+	perl-crypto-5.10.0-20080101
+	perl-ssl-5.10.0-20080101
+	postfix-2.4.6-20080101_kolab
+	sasl-2.1.22-20080101
+
+      Unchanged:
+
+	amavisd-2.5.3-20080101
+	autoconf-2.61-20080101
+	automake-1.10-20080101
+	bc-1.06-20080101
+	binutils-2.18-20080101
+	bison-2.3-20080101
+	bzip2-1.0.5-20080318
+	config-20060923-20080101
+	db-4.5.20.2-20070628_kolab1
+	diffutils-2.8.7-20080101
+	expat-2.0.1-20080101
+	file-4.23-20080101
+	flex-2.5.34-20080101
+	freetype-2.3.5-20080101
+	fsl-1.7.0-20080101
+	gawk-3.1.6-20080101
+	gcc-4.2.2-20080101
+	gd-2.0.35-20080101
+	gettext-0.17-20080101
+	gmp-4.2.2-20080101_kolab
+	grep-2.5.3-20080101
+	groff-1.19.2-20080101
+	gzip-1.3.12-20080101
+	jpeg-6b-20080101
+	libiconv-1.12-20080101
+	libmcrypt-2.5.8-20080101
+	libxml-2.6.31-20080111
+	libxslt-1.1.22-20080101
+	lzo-2.02-20080101
+	m4-1.4.9-20080101
+	make-3.81-20080101
+	mhash-0.9.9-20080101
+	mm-1.4.2-20080101
+	ncurses-5.6.20080112-20080113
+	openpkg-20071227-20071227_kolab2
+	openpkg-tools-1.4.6-20071231
+	pcre-7.5-20080110
+	perl-5.10.0-20080103
+	perl-comp-5.10.0-20080110
+	perl-conv-5.10.0-20080101
+	perl-db-5.10.0-20080118
+	perl-dns-5.10.0-20080101
+	perl-ds-5.10.0-20080104
+	perl-locale-5.10.0-20080112
+	perl-mail-5.10.0-20080117
+	perl-module-5.10.0-20080101
+	perl-net-5.10.0-20080101
+	perl-openpkg-5.10.0-20080109
+	perl-parse-5.10.0-20080117
+	perl-stats-5.10.0-20080101
+	perl-sys-5.10.0-20080101
+	perl-term-5.10.0-20080116
+	perl-text-5.10.0-20080101
+	perl-time-5.10.0-20080101
+	perl-util-5.10.0-20080116
+	perl-www-5.10.0-20080103
+	perl-xml-5.10.0-20080101
+	pkgconfig-0.23-20080117
+	png-1.2.24-20080101
+	procmail-3.22-20090727
+	readline-5.2.12-20080101
+	sed-4.1.5-20080101
+	spamassassin-3.2.4-20080107
+	texinfo-4.11-20080101
+	zlib-1.2.3-20080101
 
 
 Changes between 2.2.2 and 2.2.3:



From cvs at kolab.org  Fri Jun 25 16:02:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 16:02:42 +0200 (CEST)
Subject: thomas: server install-kolab.sh, 1.54.2.15,
	1.54.2.16 release-notes.txt, 1.398.2.123, 1.398.2.124 
Message-ID: <20100625140242.91B2F600568@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7360

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh release-notes.txt 
Log Message:
imapd: Add %option with_crossdomain_acl and drop +crossdomainacl1 from release


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.15
retrieving revision 1.54.2.16
diff -u -d -r1.54.2.15 -r1.54.2.16
--- install-kolab.sh	24 Jun 2010 11:10:44 -0000	1.54.2.15
+++ install-kolab.sh	25 Jun 2010 14:02:40 -0000	1.54.2.16
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009, 2010 by Intevation GmbH
 # Copyright (C) 2007 by Gunnar Wrobel
 #
 # Authors:
@@ -20,7 +20,7 @@
 PREFIX=""
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl"
 EXCLUDEPKGS=""
 
 #Flags

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.123
retrieving revision 1.398.2.124
diff -u -d -r1.398.2.123 -r1.398.2.124
--- release-notes.txt	25 Jun 2010 11:14:50 -0000	1.398.2.123
+++ release-notes.txt	25 Jun 2010 14:02:40 -0000	1.398.2.124
@@ -96,7 +96,7 @@
 	                 which is from a now *not* shared, before
 	                 shared calendar folder)
 
-    - imapd-2.3.13-20081020_kolab4+crossdomainacl1
+    - imapd-2.3.13-20081020_kolab5
 
 	kolab/issue1141 (Cannot give users from other domains access
 	                 to a folder (rt#5747))
@@ -195,7 +195,7 @@
 
 	apache-2.2.15-20100406
 	apache-php-5.2.13-20100624_kolab1
-	imapd-2.3.13-20081020_kolab4+crossdomainacl1
+	imapd-2.3.13-20081020_kolab5
 	openssl-1.0.0a-20100624
 	php-5.2.13-20100624_kolab1
 



From cvs at kolab.org  Fri Jun 25 16:02:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 16:02:42 +0200 (CEST)
Subject: thomas: server/imapd Makefile, 1.40.2.7, 1.40.2.8 kolab.patch,
	1.39.2.4, 1.39.2.5 
Message-ID: <20100625140242.93C5660056E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv7360/imapd

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
imapd: Add %option with_crossdomain_acl and drop +crossdomainacl1 from release


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.40.2.7
retrieving revision 1.40.2.8
diff -u -d -r1.40.2.7 -r1.40.2.8
--- Makefile	4 Feb 2010 09:44:47 -0000	1.40.2.7
+++ Makefile	25 Jun 2010 14:02:40 -0000	1.40.2.8
@@ -3,7 +3,7 @@
 PACKAGE=imapd
 VERSION=2.3.13
 RELEASE=20081020
-KOLABRELEASE=20081020_kolab4+crossdomainacl1
+KOLABRELEASE=20081020_kolab5
 
 PATCHES=../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-cyradm-$(VERSION)_Annotations.patch \
 	../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.39.2.4
retrieving revision 1.39.2.5
diff -u -d -r1.39.2.4 -r1.39.2.5
--- kolab.patch	4 Feb 2010 09:44:47 -0000	1.39.2.4
+++ kolab.patch	25 Jun 2010 14:02:40 -0000	1.39.2.5
@@ -1,23 +1,24 @@
 --- imapd.spec.orig	2008-10-20 20:12:23.000000000 +0200
-+++ imapd.spec	2010-02-02 17:53:21.186946571 +0100
++++ imapd.spec	2010-06-25 15:36:57.213108201 +0200
 @@ -32,7 +32,7 @@
  Group:        Mail
  License:      BSD
  Version:      2.3.13
 -Release:      20081020
-+Release:      20081020_kolab4+crossdomainacl1
++Release:      20081020_kolab5
  
  #   package options
  %option       with_fsl           yes
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,8 @@
  %option       with_annotate      no
  %option       with_morelogging   no
  %option       with_kolab         no
 +%option       with_kolab_nocaps  no
++%option       with_crossdomain_acl  no
  
  #   fixing implicit inter-module dependencies and correlations
  %if "%{with_kolab}" == "yes"
-@@ -67,12 +68,15 @@
+@@ -67,12 +69,15 @@
  Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
@@ -39,7 +40,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -120,11 +124,7 @@
+@@ -120,11 +125,7 @@
  
      #   add optional group file support with support to ignore case
  %if "%{with_group}" == "yes"
@@ -52,7 +53,7 @@
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
-@@ -132,7 +132,7 @@
+@@ -132,7 +133,7 @@
  
      #   add optional folder annotation support
  %if "%{with_annotate}" == "yes"
@@ -61,7 +62,7 @@
      %patch -p1 -P 3
  %endif
  
-@@ -152,12 +152,25 @@
+@@ -152,12 +153,25 @@
       %patch -p1 -P 6
  %endif
  
@@ -87,7 +88,7 @@
      #   make sure config2header rebuilds imapopts based on imapoptions
      rm -f lib/imapopts.h lib/imapopts.c >/dev/null 2>&1 || true
  
-@@ -287,7 +300,11 @@
+@@ -287,7 +301,11 @@
  %if "%{with_nntp}" == "yes"
          --enable-nntp \
  %endif
@@ -99,7 +100,7 @@
          --without-krb
  
      #   build program
-@@ -411,9 +428,6 @@
+@@ -411,9 +429,6 @@
      #   before erase, stop service and remove log and temporary files
      if [ $1 -eq 0 ]; then
          %{l_rc} imapd stop 2>/dev/null
@@ -109,8 +110,8 @@
          rm -f  $RPM_INSTALL_PREFIX/var/imapd/socket/*   >/dev/null 2>&1 || true
          rm -rf $RPM_INSTALL_PREFIX/var/imapd/tmp/*      >/dev/null 2>&1 || true
      fi
---- fsl.imapd.orig      2009-12-04 09:47:01.156452673 +0100
-+++ fsl.imapd   2009-12-04 09:47:14.204765811 +0100
+--- fsl.imapd.orig	2010-06-25 15:40:39.182628020 +0200
++++ fsl.imapd	2010-06-25 15:35:24.158800536 +0200
 @@ -14,7 +14,7 @@
      }
  };



From cvs at kolab.org  Fri Jun 25 16:18:39 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 16:18:39 +0200 (CEST)
Subject: thomas: server install-kolab.sh,1.54.2.16,1.54.2.17 
Message-ID: <20100625141839.8728C600568@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7910

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh 
Log Message:
Drop +activesync3 release value from kolab-webclient

- dynamic release values are not supported by 00INDEX.rdf
- source package is identical for the binary package compiled with
  or without activesync enabled

Added "-D kolab-webclient::with_activesync=no" to install-kolab.sh so users
can change it easily during compilation.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.16
retrieving revision 1.54.2.17
diff -u -d -r1.54.2.16 -r1.54.2.17
--- install-kolab.sh	25 Jun 2010 14:02:40 -0000	1.54.2.16
+++ install-kolab.sh	25 Jun 2010 14:18:37 -0000	1.54.2.17
@@ -20,7 +20,7 @@
 PREFIX=""
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl -D kolab-webclient::with_activesync=no"
 EXCLUDEPKGS=""
 
 #Flags



From cvs at kolab.org  Fri Jun 25 16:18:39 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 16:18:39 +0200 (CEST)
Subject: thomas: server/kolab-webclient ChangeLog, 1.10.2.23,
	1.10.2.24 Makefile, 1.6.2.5, 1.6.2.6 kolab-webclient.spec,
	1.23.2.26, 1.23.2.27 
Message-ID: <20100625141839.8EDDA60056E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv7910/kolab-webclient

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Makefile kolab-webclient.spec 
Log Message:
Drop +activesync3 release value from kolab-webclient

- dynamic release values are not supported by 00INDEX.rdf
- source package is identical for the binary package compiled with
  or without activesync enabled

Added "-D kolab-webclient::with_activesync=no" to install-kolab.sh so users
can change it easily during compilation.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/ChangeLog,v
retrieving revision 1.10.2.23
retrieving revision 1.10.2.24
diff -u -d -r1.10.2.23 -r1.10.2.24
--- ChangeLog	14 Jun 2010 06:42:28 -0000	1.10.2.23
+++ ChangeLog	25 Jun 2010 14:18:37 -0000	1.10.2.24
@@ -1,3 +1,8 @@
+2010-06-25  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* Makefile, kolab-webclient.spec: Drop +activesync3 target and
+	release value.
+
 2010-06-14  Gunnar Wrobel  <p at rdus.de>
 
 	* issue4395.patch: kolab/issue4395 (freebusy list contains

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/Makefile,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -d -r1.6.2.5 -r1.6.2.6
--- Makefile	14 Jun 2010 06:42:28 -0000	1.6.2.5
+++ Makefile	25 Jun 2010 14:18:37 -0000	1.6.2.6
@@ -66,37 +66,3 @@
 .PHONY: install
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-
-.PHONY: all-activesync
-all-activesync: $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm
-
-.PHONY: dist-activesync
-dist-activesync: all-activesync
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm ../stage/
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) #&& wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
-
-	for PATCH in $(PATCHES); do \
-	  cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
-
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
-
-	if [ -n "$(TEMPLATES)" ]; then              \
-	  for TEMPLATE in $(TEMPLATES);             \
-	  do                                        \
-	    cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
-
-	if [ -n "$(CONFIGS)" ]; then                \
-	  for CONFIG in $(CONFIGS);                 \
-	  do                                        \
-	    cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE);  \
-	  done;                                     \
-	fi
-
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_activesync yes'
-
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE)+activesync3.src.rpm .

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.26
retrieving revision 1.23.2.27
diff -u -d -r1.23.2.26 -r1.23.2.27
--- kolab-webclient.spec	24 Jun 2010 09:59:01 -0000	1.23.2.26
+++ kolab-webclient.spec	25 Jun 2010 14:18:37 -0000	1.23.2.27
@@ -3,23 +3,18 @@
 %define         V_package kolab-webclient
 %define         V_year  2010
 %define         V_month 06
-%define         V_day   14
+%define         V_day   25
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
+%define         V_release %{V_year}%{V_month}%{V_day}
 
 # Package Information
 Name:		%{V_package}
 
 #   package options
 %option       with_activesync    no
-
-%if "%{with_activesync}" == "no"
-%define         V_release %{V_year}%{V_month}%{V_day}
-%else
-%define         V_release %{V_year}%{V_month}%{V_day}+activesync3
-%endif
 
 Summary:	The Kolab Groupware web client (based on horde)
 URL:		http://www.kolab.org/



From cvs at kolab.org  Fri Jun 25 16:19:25 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 Jun 2010 16:19:25 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.124,1.398.2.125 
Message-ID: <20100625141925.8C1B960014C@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8010

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
new release date for kolab-webclient package


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.124
retrieving revision 1.398.2.125
diff -u -d -r1.398.2.124 -r1.398.2.125
--- release-notes.txt	25 Jun 2010 14:02:40 -0000	1.398.2.124
+++ release-notes.txt	25 Jun 2010 14:19:23 -0000	1.398.2.125
@@ -90,7 +90,7 @@
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 	kolab/issue4025 (Users can not change theire password (in 2.2.3))
 
-    - kolab-webclient-1.2.0-20100614
+    - kolab-webclient-1.2.0-20100625
 
 	kolab/issue4395 (freebusy list contains time of an event,
 	                 which is from a now *not* shared, before
@@ -135,7 +135,7 @@
 	Kolab_FreeBusy-0.1.2-20100624
 	clamav-0.96.1-20100607
 	kolab-webadmin-2.2.4-20100624
-	kolab-webclient-1.2.0-20100614
+	kolab-webclient-1.2.0-20100625
 	kolabd-2.2.4-20100624
 	perl-kolab-2.2.4-20100624
 



From cvs at kolab.org  Sun Jun 27 08:17:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 08:17:20 +0200 (CEST)
Subject: gunnar: server/perl-kolab/perl-kolab ChangeLog,1.6,1.7 
Message-ID: <20100627061720.BB966600570@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/perl-kolab
In directory doto:/tmp/cvs-serv30684/perl-kolab

Modified Files:
	ChangeLog 
Log Message:
Support a hooks directory that allows to extend the deletion of users.
kolab/issue3472 (web client user prefs not deleted when user gets deleted)
kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	27 Apr 2010 11:04:37 -0000	1.6
+++ ChangeLog	27 Jun 2010 06:17:18 -0000	1.7
@@ -1,3 +1,13 @@
+2010-06-27  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP.pm (deleteObject):
+
+	Support a hooks directory that allows to extend the deletion of
+	users.
+
+	kolab/issue3472 (web client user prefs not deleted when user gets
+	deleted)
+
 2010-04-27  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* sbin/kolab_bootstrap.in: Check for availability of submission port,



From cvs at kolab.org  Sun Jun 27 08:17:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 08:17:20 +0200 (CEST)
Subject: gunnar: server/perl-kolab/perl-kolab/lib/Kolab LDAP.pm,1.3,1.4 
Message-ID: <20100627061720.BD148600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv30684/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
Support a hooks directory that allows to extend the deletion of users.
kolab/issue3472 (web client user prefs not deleted when user gets deleted)
kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LDAP.pm	30 Mar 2010 09:26:10 -0000	1.3
+++ LDAP.pm	27 Jun 2010 06:17:18 -0000	1.4
@@ -719,6 +719,20 @@
 	}
     }
 
+    my $hooksdir = $Kolab::config{'kolab_hooksdir'} . '/delete';
+    opendir(DIR, $hooksdir) or Kolab::log('T', 'Given hook directory $hooksdir does not exist!', KOLAB_ERROR );
+    my @hooks = grep { /^hook-/ } readdir (DIR);
+    closedir(DIR);
+
+    foreach my $hook (@hooks) {
+	system($hook . ' $uid');
+	if ($?==0) {
+	    Kolab::log('L', "Successfully ran hook $hook for user $uid.", KOLAB_DEBUG);
+	} else {
+	    Kolab::log('L', "Failed running hook $hook for user $uid.", KOLAB_ERROR);
+	}
+    }
+
     # FIXME
     # This is a horrible fix for kolab/issue3472. kolabd is a simple
     # deamon that should react to changes within LDAP. It should NOT



From cvs at kolab.org  Sun Jun 27 08:17:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 08:17:20 +0200 (CEST)
Subject: gunnar: server/perl-kolab perl-kolab.spec,1.116,1.117 
Message-ID: <20100627061720.B964560056F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv30684

Modified Files:
	perl-kolab.spec 
Log Message:
Support a hooks directory that allows to extend the deletion of users.
kolab/issue3472 (web client user prefs not deleted when user gets deleted)
kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- perl-kolab.spec	30 Mar 2010 06:41:50 -0000	1.116
+++ perl-kolab.spec	27 Jun 2010 06:17:18 -0000	1.117
@@ -26,7 +26,7 @@
 #   versions of individual parts
 %define       V_perl         5.8.8
 %define       V_package      perl-kolab
-%define       V_version      2.2.3+cvs20100330
+%define       V_version      2.2.3+cvs20100627
 %define       V_release      1
 
 #   package information



From cvs at kolab.org  Sun Jun 27 08:53:59 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 08:53:59 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.555,1.556 
Message-ID: <20100627065359.7665660056F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv31296

Modified Files:
	release-notes.txt 
Log Message:
Fix hook execution, update release notes.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -d -r1.555 -r1.556
--- release-notes.txt	25 Jun 2010 08:38:18 -0000	1.555
+++ release-notes.txt	27 Jun 2010 06:53:57 -0000	1.556
@@ -238,10 +238,15 @@
 	Added arguments to rebuildTemplates(): dorunonchange and templates.
 	Use those in kolab_bootstrap (in replacement of bootstrapConfig()).
 
+	Support a hooks directory that allows to extend the deletion of
+	users.
+
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords (rt#5558)) 
 	kolab/issue1679 (Update template META mechanism to support service
 	                 restarts)
+	kolab/issue3472 (web client user prefs not deleted when user gets
+	                 deleted)
 	kolab/issue3604 (Change LDAPD in kolab_bootstrap to just openldap)
 	kolab/issue3951 (kolabconf -n (noreload) restarts services if
 	                 RUNONCHANGE is used)



From cvs at kolab.org  Sun Jun 27 08:53:59 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 08:53:59 +0200 (CEST)
Subject: gunnar: server/perl-kolab/perl-kolab/lib/Kolab LDAP.pm,1.4,1.5 
Message-ID: <20100627065359.7A736600570@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv31296/perl-kolab/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
Fix hook execution, update release notes.

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- LDAP.pm	27 Jun 2010 06:17:18 -0000	1.4
+++ LDAP.pm	27 Jun 2010 06:53:57 -0000	1.5
@@ -725,7 +725,7 @@
     closedir(DIR);
 
     foreach my $hook (@hooks) {
-	system($hook . ' $uid');
+	system($Kolab::config{'kolab_hooksdir'} . '/delete/' . $hook . " $uid");
 	if ($?==0) {
 	    Kolab::log('L', "Successfully ran hook $hook for user $uid.", KOLAB_DEBUG);
 	} else {



From cvs at kolab.org  Sun Jun 27 09:04:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 09:04:42 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.556,1.557 
Message-ID: <20100627070442.9271F60056F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv31521

Modified Files:
	release-notes.txt 
Log Message:
Support a hooks directory that allows to extend the deletion of users.
kolab/issue3472 (web client user prefs not deleted when user gets deleted)
kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -d -r1.556 -r1.557
--- release-notes.txt	27 Jun 2010 06:53:57 -0000	1.556
+++ release-notes.txt	27 Jun 2010 07:04:40 -0000	1.557
@@ -143,6 +143,9 @@
 	Cyrus user and group is cyrus:mail on Debian
 	(http://bugs.debian.org/581757).
 
+	Support a hooks directory that allows to extend the deletion of
+	users.
+
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
 	kolab/issue1671 (Improving the warning about kolab templates within
 	                 configuration files)
@@ -153,6 +156,8 @@
 	kolab/issue1755 (syncrepl support (for OpenLDAP >=2.4.6))
 	kolab/issue2499 (Notification messages by the resource manager sould be
 	                 localized)
+	kolab/issue3472 (web client user prefs not deleted when user gets
+	                 deleted)
 	kolab/issue3490 (Please include dist_conf/kolabsrv.in in source
 	                 packages)
 	kolab/issue3584 (rfc2739 is not copyrightable nor licensable)



From cvs at kolab.org  Sun Jun 27 09:04:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 09:04:42 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/dist_conf common, 1.58, 1.59 kolab, 1.76,
	1.77 
Message-ID: <20100627070442.9E4AD600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv31521/d/kolabd/dist_conf

Modified Files:
	common kolab 
Log Message:
Support a hooks directory that allows to extend the deletion of users.
kolab/issue3472 (web client user prefs not deleted when user gets deleted)
kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- common	9 Feb 2010 09:37:53 -0000	1.58
+++ common	27 Jun 2010 07:04:40 -0000	1.59
@@ -91,6 +91,7 @@
 	-e 's=[@]kolab_pkgs[@]=$(kolab_pkgs)=g' \
 	-e 's=[@]kolab_rusr[@]=$(kolab_rusr)=g' \
 	-e 's=[@]kolab_scriptsdir[@]=$(kolab_scriptsdir)=g' \
+	-e 's=[@]kolab_hooksdir[@]=$(kolab_hooksdir)=g' \
 	-e 's=[@]kolab_statedir[@]=$(kolab_statedir)=g' \
 	-e 's=[@]kolab_smtpdpolicy_conffile_grp[@]=$(kolab_smtpdpolicy_conffile_grp)=g' \
 	-e 's=[@]kolab_smtpdpolicy_conffile_usr[@]=$(kolab_smtpdpolicy_conffile_usr)=g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- kolab	13 Apr 2010 19:41:23 -0000	1.76
+++ kolab	27 Jun 2010 07:04:40 -0000	1.77
@@ -89,6 +89,7 @@
 syslog_facility=user
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${kolab_statedir}/log
+kolab_hooksdir=${kolab_statedir}/hooks
 kolab_pidfile=${kolab_statedir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}



From cvs at kolab.org  Sun Jun 27 09:04:42 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 27 Jun 2010 09:04:42 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd Makefile.am, 1.56, 1.57 kolab.globals.in,
	1.29, 1.30 
Message-ID: <20100627070442.982E0600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv31521/d/kolabd

Modified Files:
	Makefile.am kolab.globals.in 
Log Message:
Support a hooks directory that allows to extend the deletion of users.
kolab/issue3472 (web client user prefs not deleted when user gets deleted)
kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Makefile.am	3 Jun 2010 13:33:44 -0000	1.56
+++ Makefile.am	27 Jun 2010 07:04:40 -0000	1.57
@@ -190,6 +190,7 @@
 install-data-hook:
 	$(mkinstalldirs) -m 755 $(DESTDIR)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_logdir)
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_hooksdir)/delete
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/cgi-bin
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/icons
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kolab.globals.in	9 Jun 2010 20:07:02 -0000	1.29
+++ kolab.globals.in	27 Jun 2010 07:04:40 -0000	1.30
@@ -44,6 +44,7 @@
 kolab_rgrp: @kolab_rgrp@
 kolab_musr: @kolab_musr@
 kolab_mgrp: @kolab_mgrp@
+kolab_hooksdir: @kolab_hooksdir@
 kolab_quotawarning: @kolab_quotawarning@
 hashmethod: @sbindir@/slappasswd -s
 templatedir: @sysconfdir@/kolab/templates



From cvs at kolab.org  Mon Jun 28 10:37:51 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:37:51 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.398.2.125,1.398.2.126 
Message-ID: <20100628083751.4618160056B@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8849

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
new binutils-2.20-20091016 to fix kolab/issue4018 (Installation of Kolab server 2.2.3 from sources fails with gcc 4.4.x)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.125
retrieving revision 1.398.2.126
diff -u -d -r1.398.2.125 -r1.398.2.126
--- release-notes.txt	25 Jun 2010 14:19:23 -0000	1.398.2.125
+++ release-notes.txt	28 Jun 2010 08:37:48 -0000	1.398.2.126
@@ -54,6 +54,11 @@
 	New upstream version, fixes various security issues.
 	Supports openssl 1.x
 
+    - binutils-2.20-20091016
+
+	kolab/issue4018 (Installation of Kolab server 2.2.3 from sources fails
+	                 with gcc 4.4.x)
+
     - clamav-0.96.1-20100607
 
 	New upstream version, fixes various security issues.
@@ -195,6 +200,7 @@
 
 	apache-2.2.15-20100406
 	apache-php-5.2.13-20100624_kolab1
+	binutils-2.20-20091016
 	imapd-2.3.13-20081020_kolab5
 	openssl-1.0.0a-20100624
 	php-5.2.13-20100624_kolab1
@@ -216,7 +222,6 @@
 	autoconf-2.61-20080101
 	automake-1.10-20080101
 	bc-1.06-20080101
-	binutils-2.18-20080101
 	bison-2.3-20080101
 	bzip2-1.0.5-20080318
 	config-20060923-20080101



From cvs at kolab.org  Mon Jun 28 10:38:39 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:38:39 +0200 (CEST)
Subject: gunnar: server/pear/Kolab_Config - New directory 
Message-ID: <20100628083839.0B1DE60056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Kolab_Config
In directory doto:/tmp/cvs-serv8966/Kolab_Config

Log Message:
Directory /kolabrepository/server/pear/Kolab_Config added to the repository




From cvs at kolab.org  Mon Jun 28 10:40:52 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:40:52 +0200 (CEST)
Subject: gunnar: server/pear/Kolab_Config .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Makefile, NONE, 1.1 package.info, NONE, 1.1 
Message-ID: <20100628084052.1489C60056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Kolab_Config
In directory doto:/tmp/cvs-serv9075

Added Files:
	.cvsignore ChangeLog Makefile package.info 
Log Message:
Added new PEAR package Kolab_Config.

This is currently a simple implementation that is only able to read kolab.globals and kolab.conf. In the long term it would be nice
if this would also be able to retrieve LDAP configuration data. Right now this package is required for the new kolabd hooks so that
we can access the server configuration within the short PHP based hooks.

--- NEW FILE: .cvsignore ---
*.src.rpm
*.tgz
*.spec
package.patch
tmp

--- NEW FILE: ChangeLog ---
2010-06-28  Gunnar Wrobel  <p at rdus.de>

	* package.info: Added package to Kolab CVS.


--- NEW FILE: Makefile ---
include ../../make-helper/pear.mk

--- NEW FILE: package.info ---
# The name of Horde source package
pear_package='Kolab_Config'

# The name of the RPM package
package='Kolab_Config'

# Where to find information about the package
package_url='http://pear.horde.org/index.php?package='

# How should the source be retrieved?
#
# WGET: Download via wget
#package_origin='VC-GIT'
package_origin='WGET'

# The name of the package in the source repository
pear_pkgdir='framework/Kolab_Config'

# Commit tag or date to user
repo_commit='8db04d5dbc71180908279b3b701b770e5e5eb1a5'

# What release number should the source snapshot get (usually a date)?
repo_release='20100628'

# Version number
version='0.1.0'

# Package release number
release='20100628'

# Source URL to download from
sourceurl='http://pear.horde.org/get'

# In which PHP library location should the library get installed
php_lib_loc='php'

# Build prerequisites
buildprereq='                              \
BuildPreReq:  OpenPKG, openpkg >= 20070603 \
BuildPreReq:  php, php::with_pear = yes    \
BuildPreReq:  PEAR-Horde-Channel           \
'

# Installatin prerequisites
prereq='                                   \
PreReq:       OpenPKG, openpkg >= 20070603 \
PreReq:       php, php::with_pear = yes    \
PreReq:       PEAR-Horde-Channel           \
'

# Package summary description
summary='A package for reading the Kolab server configuration.'

# Long package description
description=' \
This package reads the various Kolab server \
 configuration files. It should also support retrieving configuration\
 parameters from LDAP but this is not yet implemented. \
'

# Source code license
license='LGPL'



From cvs at kolab.org  Mon Jun 28 10:42:51 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:42:51 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.557,1.558 
Message-ID: <20100628084251.1C21760056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv9188

Modified Files:
	release-notes.txt 
Log Message:
Update release notes with the information about the new Kolab_Config package.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -d -r1.557 -r1.558
--- release-notes.txt	27 Jun 2010 07:04:40 -0000	1.557
+++ release-notes.txt	28 Jun 2010 08:42:49 -0000	1.558
@@ -50,6 +50,14 @@
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
 	                 nicer)
 
+    - Kolab_Config-0.1.0-2010????
+
+        A new package that supports reading the Kolab server
+        configuration files.
+
+	kolab/issue3472 (web client user prefs not deleted when user gets
+	                 deleted)
+
     - Kolab_Filter-0.1.9-2010????
 
 	Added french translation. Submitted by Mathieu Parent



From cvs at kolab.org  Mon Jun 28 10:43:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:43:31 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolab.globals.in,1.30,1.31 
Message-ID: <20100628084331.C48D460056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv9260/kolabd

Modified Files:
	kolab.globals.in 
Log Message:
Add a configuration variable with the webclient data root path.

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- kolab.globals.in	27 Jun 2010 07:04:40 -0000	1.30
+++ kolab.globals.in	28 Jun 2010 08:43:29 -0000	1.31
@@ -57,6 +57,7 @@
 webserver_document_root: @webserver_document_root@
 webserver_usr: @webserver_usr@
 webserver_grp: @webserver_grp@
+webclient_data_root: @webclient_data_root@
 horde_cookie_path: @horde_cookie_path@
 horde_confdir: @horde_confdir@
 dimp_confdir: @dimp_confdir@



From cvs at kolab.org  Mon Jun 28 10:43:31 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:43:31 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/dist_conf common, 1.59, 1.60 kolab, 1.77,
	1.78 
Message-ID: <20100628084331.D9F4860056C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv9260/kolabd/dist_conf

Modified Files:
	common kolab 
Log Message:
Add a configuration variable with the webclient data root path.

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- common	27 Jun 2010 07:04:40 -0000	1.59
+++ common	28 Jun 2010 08:43:29 -0000	1.60
@@ -134,6 +134,7 @@
 	-e 's=[@]sasl_smtpconffile[@]=$(sasl_smtpconffile)=g' \
 	-e 's=[@]smarty_compiledir[@]=$(smarty_compiledir)=g' \
 	-e 's=[@]spamassassin_confdir[@]=$(spamassassin_confdir)=g' \
+	-e 's=[@]webclient_data_root[@]=$(webclient_data_root)=g' \
 	-e 's=[@]webserver_acceptlock[@]=$(webserver_acceptlock)=g' \
 	-e 's=[@]webserver_accesslogfile[@]=$(webserver_accesslogfile)=g' \
 	-e 's=[@]webserver_cgidir[@]=$(webserver_cgidir)=g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- kolab	27 Jun 2010 07:04:40 -0000	1.77
+++ kolab	28 Jun 2010 08:43:29 -0000	1.78
@@ -147,6 +147,7 @@
 webserver_grp=${kolab_grp}
 
 #webclient
+webclient_data_root=${localstatedir}/kolab/webclient_data
 horde_cookie_path=/client
 horde_confdir=${webserver_document_root}/client/config
 dimp_confdir=${webserver_document_root}/client/dimp/config



From cvs at kolab.org  Mon Jun 28 10:43:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:43:54 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde/hooks - New directory 
Message-ID: <20100628084354.B090E60056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/hooks
In directory doto:/tmp/cvs-serv9300/hooks

Log Message:
Directory /kolabrepository/server/kolab-webclient/horde/hooks added to the repository




From cvs at kolab.org  Mon Jun 28 10:44:04 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:44:04 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde/hooks/horde-3.3.6 - New
	directory 
Message-ID: <20100628084404.A2C7360056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/hooks/horde-3.3.6
In directory doto:/tmp/cvs-serv9316/hooks/horde-3.3.6

Log Message:
Directory /kolabrepository/server/kolab-webclient/horde/hooks/horde-3.3.6 added to the repository




From cvs at kolab.org  Mon Jun 28 10:51:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:51:54 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde Makefile, 1.4, 1.5 horde.spec,
	1.12, 1.13 
Message-ID: <20100628085154.B2E1960056D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv9687/d/horde

Modified Files:
	Makefile horde.spec 
Log Message:
kolab/issue3472 (web client user prefs not deleted when user gets deleted) 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	19 Jan 2010 05:41:54 -0000	1.4
+++ Makefile	28 Jun 2010 08:51:52 -0000	1.5
@@ -13,7 +13,10 @@
 # Get the list of configuration files if there are any in the configuration directory
 CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null)
 
-EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION)
+# Get the list of hooks if there are any in the hook directory
+HOOKS = $(shell ls hooks/$(PACKAGE)-$(VERSION)/hook-* 2> /dev/null)
+
+EXTRA = package.patch $(HOOKS) $(TEMPLATES) $(CONFIGURATION)
 
 include ../../make-helper/package-new.mk
 include ../../make-helper/fetch.mk

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- horde.spec	16 May 2010 09:14:37 -0000	1.12
+++ horde.spec	28 Jun 2010 08:51:52 -0000	1.13
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.6
-%define         V_release 20100516
+%define         V_release 20100627
 
 # Package Information
 Name:		%{V_package}
@@ -27,6 +27,7 @@
 Source9:        10-kolab_prefs_base.php
 Source10:       10-kolab_conf_base.php
 Source11:       conf.php
+Source12:       hook-delete_webmail_user.php
 
 # List of Patches
 Patch0:         package.patch
@@ -105,6 +106,7 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/tmp
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/sessions
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete
 
 	cd %{V_package}-%{V_version}
 
@@ -160,6 +162,10 @@
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
+
+	%{l_shtool} install -c -m 755 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete
+	sed -i -e 's#@@@php_bin@@@#%{l_prefix}/bin/php#' $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete/hook-*
+	sed -i -e 's#@@@prefix@@@#%{l_prefix}#' $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete/hook-*
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/hooks.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/prefs.d/



From cvs at kolab.org  Mon Jun 28 10:51:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:51:54 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.558,1.559 
Message-ID: <20100628085154.AB77960056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv9687

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue3472 (web client user prefs not deleted when user gets deleted) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -d -r1.558 -r1.559
--- release-notes.txt	28 Jun 2010 08:42:49 -0000	1.558
+++ release-notes.txt	28 Jun 2010 08:51:52 -0000	1.559
@@ -33,6 +33,7 @@
 	Support setting Zpush configuration values.
 
 	kolab/issue2991 (The Kolab web client is always in the privileged networks) 
+	kolab/issue3472 (web client user prefs not deleted when user gets deleted)
 
     - imp-4.3.6-2010????
 



From cvs at kolab.org  Mon Jun 28 10:51:54 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:51:54 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde/hooks/horde-3.3.6
	hook-delete_webmail_user.php, NONE, 1.1 
Message-ID: <20100628085154.B115360056C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/hooks/horde-3.3.6
In directory doto:/tmp/cvs-serv9687/d/horde/hooks/horde-3.3.6

Added Files:
	hook-delete_webmail_user.php 
Log Message:
kolab/issue3472 (web client user prefs not deleted when user gets deleted) 

--- NEW FILE: hook-delete_webmail_user.php ---
#!@@@php_bin@@@
<?php
/**
 * Deletes the Kolab webclient data of deleted users.
 *
 * PHP version 5
 *
 * Copyright 2010 Klarälvdalens Datakonsult AB
 *
 * @category Kolab
 * @package  Kolab
 * @author   Gunnar Wrobel <wrobel at pardus.de>
 * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
 * @link     http://www.kolab.org
 */

require_once 'Horde/Kolab/Config.php';
require_once 'Horde/Kolab/Config/Exception.php';

$uid = $_SERVER['argv'][1];
$config = new Horde_Kolab_Config('@@@prefix@@@/etc/kolab');
if (file_exists($config['webclient_data_root'] . '/storage/' . $uid . '.prefs')) {
    unlink($config['webclient_data_root'] . '/storage/' . $uid . '.prefs');
    if ($config['log_level'] >= 3) {
        syslog(LOG_INFO, "L: Deleted web client user preferences for user $uid.");
    }
}




From cvs at kolab.org  Mon Jun 28 10:53:22 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:53:22 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde ChangeLog,1.2,1.3 
Message-ID: <20100628085322.7D69460056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv9779

Modified Files:
	ChangeLog 
Log Message:
Add changelog entry for kolab/issue3472 (web client user prefs not deleted when user gets deleted) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	16 May 2010 09:14:37 -0000	1.2
+++ ChangeLog	28 Jun 2010 08:53:20 -0000	1.3
@@ -1,3 +1,10 @@
+2010-06-28  Gunnar Wrobel  <p at rdus.de>
+
+	* hooks/horde-3.3.6/hook-delete_webmail_user.php:
+
+	kolab/issue3472 (web client user prefs not deleted when user gets
+	deleted)
+
 2010-05-16  Gunnar Wrobel  <p at rdus.de>
 
 	* configuration/horde-3.3.6/10-kolab_conf_base.php: 



From cvs at kolab.org  Mon Jun 28 10:54:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 10:54:24 +0200 (CEST)
Subject: gunnar: server/perl-kolab/perl-kolab/lib/Kolab LDAP.pm,1.5,1.6 
Message-ID: <20100628085424.9088B60056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv9808/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
Remove the hack for kolab/issue3472 (web client user prefs not deleted when user gets deleted)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- LDAP.pm	27 Jun 2010 06:53:57 -0000	1.5
+++ LDAP.pm	28 Jun 2010 08:54:22 -0000	1.6
@@ -733,18 +733,6 @@
 	}
     }
 
-    # FIXME
-    # This is a horrible fix for kolab/issue3472. kolabd is a simple
-    # deamon that should react to changes within LDAP. It should NOT
-    # however have any application knowledge. It would be better if
-    # each application that requires cleanup operations after user
-    # removal could add a script in a directory collecting such
-    # operations.
-    if (-e $Kolab::config{'webserver_document_root'} . '/client/storage/' . $uid . '.prefs' ) {
-	unlink($Kolab::config{'webserver_document_root'} . '/client/storage/' . $uid . '.prefs');
-        Kolab::log('L', "Deleted web client user preferences for user $uid.", KOLAB_DEBUG);
-    }
-
     if (!$uid) {
         Kolab::log('L', 'Deleted object not found in mboxcache, returning', KOLAB_DEBUG);
         return;



From cvs at kolab.org  Mon Jun 28 11:04:27 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 11:04:27 +0200 (CEST)
Subject: gunnar: server/perl-kolab/perl-kolab ChangeLog,1.7,1.8 
Message-ID: <20100628090427.98C9B60056C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/perl-kolab
In directory doto:/tmp/cvs-serv10062/perl-kolab

Modified Files:
	ChangeLog 
Log Message:
Bump perl-kolab version.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	27 Jun 2010 06:17:18 -0000	1.7
+++ ChangeLog	28 Jun 2010 09:04:25 -0000	1.8
@@ -1,3 +1,10 @@
+2010-06-28  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP.pm:
+
+	Removed hack for kolab/issue3472 (web client user prefs not
+	deleted when user gets deleted)
+
 2010-06-27  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP.pm (deleteObject):



From cvs at kolab.org  Mon Jun 28 11:04:27 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 11:04:27 +0200 (CEST)
Subject: gunnar: server/perl-kolab perl-kolab.spec,1.117,1.118 
Message-ID: <20100628090427.943E960056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv10062

Modified Files:
	perl-kolab.spec 
Log Message:
Bump perl-kolab version.

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- perl-kolab.spec	27 Jun 2010 06:17:18 -0000	1.117
+++ perl-kolab.spec	28 Jun 2010 09:04:25 -0000	1.118
@@ -26,7 +26,7 @@
 #   versions of individual parts
 %define       V_perl         5.8.8
 %define       V_package      perl-kolab
-%define       V_version      2.2.3+cvs20100627
+%define       V_version      2.2.3+cvs20100628
 %define       V_release      1
 
 #   package information



From cvs at kolab.org  Mon Jun 28 11:17:32 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 11:17:32 +0200 (CEST)
Subject: thomas: server 1st.README, 1.1.2.15, 1.1.2.16 release-notes.txt,
	1.398.2.126, 1.398.2.127 
Message-ID: <20100628091732.C924E600563@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv10737

Modified Files:
      Tag: kolab_2_2_branch
	1st.README release-notes.txt 
Log Message:
Final update of release notes and README for 2.2.4


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- 1st.README	24 Jun 2010 11:10:44 -0000	1.1.2.15
+++ 1st.README	28 Jun 2010 09:17:30 -0000	1.1.2.16
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Install and Upgrade Information
 ================================================
-(Version 2010????, Kolab Server 2.2.4)
+(Version 20100628, Kolab Server 2.2.4)
 
 See http://kolab.org/ for general information about Kolab,
 or look at http://wiki.kolab.org/ for specific topics.
@@ -129,8 +129,14 @@
 Upgrade from 2.2.3 to 2.2.4
 ---------------------------
 
-???
-(mention which binary packages needs rebuild for new openssl)
+Since OpenPKG uses static linking, packages which do not
+get updated in this release need to be recompiled:
+apr curl imap openldap perl-crypto perl-ssl postfix sasl
+
+When using precompiled binary packages install-kolab.sh will take care of
+this, but before generating your own 00INDEX.rdf using the .src.rpm files
+together with binary RPMs from existing installations you need to remove the
+binary RPMs for above packages.
 
 
 Upgrade from 2.2.2 to 2.2.3

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.126
retrieving revision 1.398.2.127
diff -u -d -r1.398.2.126 -r1.398.2.127
--- release-notes.txt	28 Jun 2010 08:37:48 -0000	1.398.2.126
+++ release-notes.txt	28 Jun 2010 09:17:30 -0000	1.398.2.127
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 2010????, Kolab Server 2.2.4)
+(Version 20100628, Kolab Server 2.2.4)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.



From cvs at kolab.org  Mon Jun 28 11:24:12 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 11:24:12 +0200 (CEST)
Subject: gunnar: server/pear/Kolab_Config package.info,1.1,1.2 
Message-ID: <20100628092412.9C7D260056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Kolab_Config
In directory doto:/tmp/cvs-serv10977

Modified Files:
	package.info 
Log Message:
Use the temporary download location for Kolab_Config for now.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Kolab_Config/package.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- package.info	28 Jun 2010 08:40:50 -0000	1.1
+++ package.info	28 Jun 2010 09:24:10 -0000	1.2
@@ -10,8 +10,8 @@
 # How should the source be retrieved?
 #
 # WGET: Download via wget
-#package_origin='VC-GIT'
-package_origin='WGET'
+#package_origin='WGET'
+package_origin='VC-GIT'
 
 # The name of the package in the source repository
 pear_pkgdir='framework/Kolab_Config'
@@ -23,13 +23,14 @@
 repo_release='20100628'
 
 # Version number
-version='0.1.0'
+version='0.1.0dev20100628'
 
 # Package release number
 release='20100628'
 
 # Source URL to download from
-sourceurl='http://pear.horde.org/get'
+#sourceurl='http://pear.horde.org/get'
+sourceurl='http://files.kolab.org/incoming/wrobel/'
 
 # In which PHP library location should the library get installed
 php_lib_loc='php'



From cvs at kolab.org  Mon Jun 28 11:25:16 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 11:25:16 +0200 (CEST)
Subject: thomas: server 1st.README,1.1.2.16,1.1.2.17 
Message-ID: <20100628092516.4C6EA60056B@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11028

Modified Files:
      Tag: kolab_2_2_branch
	1st.README 
Log Message:
Correct text width for new paragraph in 1st.README


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- 1st.README	28 Jun 2010 09:17:30 -0000	1.1.2.16
+++ 1st.README	28 Jun 2010 09:25:14 -0000	1.1.2.17
@@ -129,14 +129,14 @@
 Upgrade from 2.2.3 to 2.2.4
 ---------------------------
 
-Since OpenPKG uses static linking, packages which do not
-get updated in this release need to be recompiled:
+Since OpenPKG uses static linking, packages which do not get updated in
+this release need to be recompiled:
 apr curl imap openldap perl-crypto perl-ssl postfix sasl
 
-When using precompiled binary packages install-kolab.sh will take care of
-this, but before generating your own 00INDEX.rdf using the .src.rpm files
-together with binary RPMs from existing installations you need to remove the
-binary RPMs for above packages.
+When using precompiled binary packages install-kolab.sh will take care
+of this, but before generating your own 00INDEX.rdf using the .src.rpm
+files together with binary RPMs from existing installations you need to
+remove the binary RPMs for above packages.
 
 
 Upgrade from 2.2.2 to 2.2.3



From cvs at kolab.org  Mon Jun 28 14:24:17 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 14:24:17 +0200 (CEST)
Subject: gunnar: server/kolab-webclient/horde horde.spec,1.13,1.14 
Message-ID: <20100628122417.7A96660056D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv10187

Modified Files:
	horde.spec 
Log Message:
Add the new dependency on Kolab_Config, bump version.

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- horde.spec	28 Jun 2010 08:51:52 -0000	1.13
+++ horde.spec	28 Jun 2010 12:24:14 -0000	1.14
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.6
-%define         V_release 20100627
+%define         V_release 20100628
 
 # Package Information
 Name:		%{V_package}
@@ -65,6 +65,7 @@
 PreReq:       Horde_Text_Flowed
 PreReq:       Horde_Tree
 PreReq:       Horde_UI
+PreReq:       Kolab_Config
 PreReq:       Kolab_Format >= 1.0.1
 PreReq:       Kolab_Server >= 0.5.0
 PreReq:       Kolab_Storage >= 0.4.0



From cvs at kolab.org  Mon Jun 28 15:50:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 15:50:24 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	createuser.tpl, 1.1, 1.2 
Message-ID: <20100628135024.803A260057C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv12774/kolab-webadmin/kolab-webadmin/php/admin/templates

Modified Files:
	createuser.tpl 
Log Message:
kolab/issue606 (It is not possible to register people with middlename correctly) 

Index: createuser.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/createuser.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- createuser.tpl	11 Mar 2005 10:32:36 -0000	1.1
+++ createuser.tpl	28 Jun 2010 13:50:22 -0000	1.2
@@ -17,6 +17,11 @@
 	<td>{tr msg="Required"}</td>
 </tr>
 <tr>
+	<td>{tr msg="Middle Name"}</td>
+	<td><input name="middlename" type="text" value="" size="50" onfocus="javascript:this.select()" /></td>
+	<td></td>
+</tr>
+<tr>
 	<td>{tr msg="Last Name"}</td>
 	<td><input name="lastname" type="text" value="" size="50" onfocus="javascript:this.select()" /></td>
 	<td>{tr msg="Required"}</td>
@@ -37,7 +42,8 @@
 	<td>{tr msg="Required, non volatile"}</td>
 </tr>
 <tr>
-	<td>{tr msg="Title"}</td><td><input name="title_0" type="text" value=""  size="50" onfocus="javascript:this.select()" /></td>
+	<td>{tr msg="Title"}</td>
+	<td><input name="title_0" type="text" value=""  size="50" onfocus="javascript:this.select()" /></td>
 	<td></td>
 </tr>
 <tr>



From cvs at kolab.org  Mon Jun 28 15:50:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 15:50:24 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.31, 1.32 
Message-ID: <20100628135024.81BC760057D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv12774/kolab-webadmin/kolab-webadmin/www/admin/user

Modified Files:
	user.php.in 
Log Message:
kolab/issue606 (It is not possible to register people with middlename correctly) 

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- user.php.in	15 Jan 2010 15:38:47 -0000	1.31
+++ user.php.in	28 Jun 2010 13:50:22 -0000	1.32
@@ -273,11 +273,14 @@
   if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
   else $cn = $ldap_object['cn'];
   if ($cn && $sn) $givenname = KolabLDAP::getGivenName($cn, $sn);
+  if (is_array($ldap_object['initials'])) $initials = $ldap_object['initials'][0];
+  else $initials = $ldap_object['initials'];
   if (is_array($ldap_object['mail'])) $mail = $ldap_object['mail'][0];
   else $mail = $ldap_object['mail'];
   if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];
   else $uid = $ldap_object['uid'];
   if(array_key_exists('givenname',$form->entries)) $form->entries['givenname']['value'] = $givenname;
+  if(array_key_exists('initials',$form->entries)) $form->entries['initials']['value'] = $initials;
   if(array_key_exists('sn',$form->entries)) $form->entries['sn']['value'] = $sn;
   if(array_key_exists('password_0',$form->entries))  $form->entries['password_0']['value'] = '';
   if(array_key_exists('password_1',$form->entries))  $form->entries['password_1']['value'] = '';
@@ -446,6 +449,7 @@
 $entries = array( 'givenname' => array( 'name' => _('First Name'),
 					'validation' => 'notempty',
 					'comment' => _('Required') ),
+		  'initials' => array( 'name' => _('Middle Name')),
 		  'sn' => array( 'name' => _('Last Name'),
 				       'validation' => 'notempty',
 				       'comment' => _('Required') ),
@@ -517,8 +521,9 @@
 				       'validation' => 'checkquota');
 } else {
   $entries['givenname']['attrs'] = 'readonly';
-  $entries['sn']['attrs'] = 'readonly';
   $entries['givenname']['comment'] = '';
+  $entries['initials']['attrs'] = 'readonly';
+  $entries['sn']['attrs'] = 'readonly';
   $entries['sn']['comment'] = '';
   $entries['alias']['attrs'] = 'readonly';
   $entries['kolabdelegate']['attrs'] = 'readonly';
@@ -565,6 +570,11 @@
        $ldap_object['sn'] = trim($_POST['sn']);
        $ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
 	   $ldap_object['givenName'] = trim($_POST['givenname']);
+	   if (!empty($_POST['initials'])) {
+		 $ldap_object['initials'] = trim($_POST['initials']);
+	   } else {
+		 $ldap_object['initials'] = array();
+	   }
        if( !empty( $_POST['password_0'] ) ) {
 	         $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt());
 		 if( $action == 'save' && $auth->dn() == $dn ) {



From cvs at kolab.org  Mon Jun 28 15:50:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 15:50:24 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.559,1.560 
Message-ID: <20100628135024.755EA60057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv12774

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue606 (It is not possible to register people with middlename correctly) 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -d -r1.559 -r1.560
--- release-notes.txt	28 Jun 2010 08:51:52 -0000	1.559
+++ release-notes.txt	28 Jun 2010 13:50:22 -0000	1.560
@@ -45,6 +45,8 @@
 
     - kolab-webadmin-2.2.3-2009????
 
+	kolab/issue606  (It is not possible to register people with
+	                 middlename correctly)
 	kolab/issue1446 (Webinterface for setting vacation, email-delivery and
 	                 forwarding (rt#5033))
 	kolab/issue3401 (Change font color of the kolab-webadmin)



From cvs at kolab.org  Mon Jun 28 15:50:24 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 15:50:24 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.126,1.127 
Message-ID: <20100628135024.7F63260057B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv12774/kolab-webadmin/kolab-webadmin

Modified Files:
	ChangeLog 
Log Message:
kolab/issue606 (It is not possible to register people with middlename correctly) 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- ChangeLog	21 May 2010 15:58:20 -0000	1.126
+++ ChangeLog	28 Jun 2010 13:50:22 -0000	1.127
@@ -1,3 +1,10 @@
+2010-06-28  Gunnar Wrobel  <p at rdus.de>
+
+	* www/admin/user/user.php.in:
+
+	kolab/issue606 (It is not possible to register people with
+	middlename correctly)
+
 2010-05-21  Mathieu Parent  <math.parent at gmail.com>
 
 	* php/admin/locale/*/LC_MESSAGES/messages.po, www/admin/settings/index.php.in:



From cvs at kolab.org  Mon Jun 28 17:46:23 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 17:46:23 +0200 (CEST)
Subject: gunnar: server/perl-ssl - New directory 
Message-ID: <20100628154623.257D560057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-ssl
In directory doto:/tmp/cvs-serv15332/perl-ssl

Log Message:
Directory /kolabrepository/server/perl-ssl added to the repository
--> Using per-directory sticky tag `kolab_2_2_branch'




From cvs at kolab.org  Mon Jun 28 17:47:08 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 17:47:08 +0200 (CEST)
Subject: gunnar: server/perl-ssl .cvsignore, NONE, 1.1.2.1 Makefile, NONE,
	1.1.2.1 kolab.patch, NONE, 1.1.2.1 
Message-ID: <20100628154708.4B4A060057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-ssl
In directory doto:/tmp/cvs-serv15384

Added Files:
      Tag: kolab_2_2_branch
	.cvsignore Makefile kolab.patch 
Log Message:
Added perl-ssl package with Net-SSLeay-1.36.

--- NEW FILE: .cvsignore ---
*.src.rpm

--- NEW FILE: Makefile ---
include ../kolab.mk

PACKAGE=perl-ssl
VERSION=5.10.0
RELEASE=20080101
KOLABRELEASE=20080101_kolab

SOURCE_0=http://files.kolab.org/server/development-2.2/externals/Net-SSLeay-1.36.tar.gz

all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch Makefile
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && \
	 wget $(SOURCE_0) && $(RPM) -ba $(PACKAGE).spec
	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

dist: all
	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/

clean:
	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

--- NEW FILE: kolab.patch ---
diff -Naur --exclude='*~' --exclude='*.tar.gz' --exclude='*tar.gz.1' /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.patch /kolab/RPM/SRC/perl-ssl/perl-ssl.patch
--- /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.patch	2010-06-28 17:33:29.478151129 +0200
+++ /kolab/RPM/SRC/perl-ssl/perl-ssl.patch	2010-06-28 17:45:06.854380622 +0200
@@ -41,22 +41,3 @@
  }
  
  # contrary to the behavior of read sysread can read partial data
-Index: Net-SSLeay-1.32/Makefile.PL
---- Net-SSLeay-1.32/Makefile.PL.orig	2007-09-18 08:28:10 +0200
-+++ Net-SSLeay-1.32/Makefile.PL	2007-09-18 08:28:40 +0200
-@@ -11,10 +11,8 @@
- ssleay();
- 
- build_requires('Sub::Uplevel');
--build_requires('Test::Exception');
- build_requires('Array::Compare');
- build_requires('Tree::DAG_Node');
--build_requires('Test::Warn');
- requires('MIME::Base64');
- 
- clean_files(map { fixpath($_) } qw(
-@@ -33,3 +31,4 @@
- 
- auto_install();
- WriteAll();
-+
diff -Naur --exclude='*~' --exclude='*.tar.gz' --exclude='*tar.gz.1' /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.spec /kolab/RPM/SRC/perl-ssl/perl-ssl.spec
--- /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.spec	2010-06-28 17:33:29.498151550 +0200
+++ /kolab/RPM/SRC/perl-ssl/perl-ssl.spec	2010-06-28 17:43:48.828346319 +0200
@@ -23,7 +23,7 @@
 
 #   versions of individual parts
 %define       V_perl              5.10.0
-%define       V_net_ssleay        1.32
+%define       V_net_ssleay        1.36
 %define       V_crypt_ssleay      0.57
 %define       V_io_socket_ssl     1.12
 



From cvs at kolab.org  Mon Jun 28 17:53:18 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 17:53:18 +0200 (CEST)
Subject: gunnar: server/perl-ssl kolab.patch,1.1.2.1,1.1.2.2 
Message-ID: <20100628155318.864C960057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-ssl
In directory doto:/tmp/cvs-serv15489

Modified Files:
      Tag: kolab_2_2_branch
	kolab.patch 
Log Message:
Bump version.

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/perl-ssl/Attic/kolab.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- kolab.patch	28 Jun 2010 15:47:06 -0000	1.1.2.1
+++ kolab.patch	28 Jun 2010 15:53:16 -0000	1.1.2.2
@@ -1,6 +1,6 @@
-diff -Naur --exclude='*~' --exclude='*.tar.gz' --exclude='*tar.gz.1' /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.patch /kolab/RPM/SRC/perl-ssl/perl-ssl.patch
+diff -Naur --exclude='*~' --exclude='*.tar.gz' --exclude='*tar.gz.*' /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.patch /kolab/RPM/SRC/perl-ssl/perl-ssl.patch
 --- /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.patch	2010-06-28 17:33:29.478151129 +0200
-+++ /kolab/RPM/SRC/perl-ssl/perl-ssl.patch	2010-06-28 17:45:06.854380622 +0200
++++ /kolab/RPM/SRC/perl-ssl/perl-ssl.patch	2010-06-28 17:45:40.519154865 +0200
 @@ -41,22 +41,3 @@
   }
   
@@ -24,9 +24,9 @@
 - auto_install();
 - WriteAll();
 -+
-diff -Naur --exclude='*~' --exclude='*.tar.gz' --exclude='*tar.gz.1' /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.spec /kolab/RPM/SRC/perl-ssl/perl-ssl.spec
+diff -Naur --exclude='*~' --exclude='*.tar.gz' --exclude='*tar.gz.*' /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.spec /kolab/RPM/SRC/perl-ssl/perl-ssl.spec
 --- /kolab/RPM/SRC/perl-ssl.orig/perl-ssl.spec	2010-06-28 17:33:29.498151550 +0200
-+++ /kolab/RPM/SRC/perl-ssl/perl-ssl.spec	2010-06-28 17:43:48.828346319 +0200
++++ /kolab/RPM/SRC/perl-ssl/perl-ssl.spec	2010-06-28 17:51:38.192539975 +0200
 @@ -23,7 +23,7 @@
  
  #   versions of individual parts
@@ -36,3 +36,12 @@
  %define       V_crypt_ssleay      0.57
  %define       V_io_socket_ssl     1.12
  
+@@ -38,7 +38,7 @@
+ Group:        Perl
+ License:      GPL/Artistic
+ Version:      %{V_perl}
+-Release:      20080101
++Release:      20080101_kolab1
+ 
+ #   list of sources
+ Source0:      http://www.cpan.org/modules/by-module/Net/Net-SSLeay-%{V_net_ssleay}.tar.gz



From cvs at kolab.org  Mon Jun 28 17:54:40 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 17:54:40 +0200 (CEST)
Subject: gunnar: server/perl-ssl Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20100628155440.E160360057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-ssl
In directory doto:/tmp/cvs-serv15538

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Fix release id.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/perl-ssl/Attic/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Makefile	28 Jun 2010 15:47:06 -0000	1.1.2.1
+++ Makefile	28 Jun 2010 15:54:38 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 PACKAGE=perl-ssl
 VERSION=5.10.0
 RELEASE=20080101
-KOLABRELEASE=20080101_kolab
+KOLABRELEASE=20080101_kolab1
 
 SOURCE_0=http://files.kolab.org/server/development-2.2/externals/Net-SSLeay-1.36.tar.gz
 



From cvs at kolab.org  Mon Jun 28 23:08:18 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jun 2010 23:08:18 +0200 (CEST)
Subject: gunnar: server/perl-ssl .cvsignore, 1.1, 1.2 Makefile, 1.1,
	1.2 kolab.patch, 1.1, 1.2 
Message-ID: <20100628210818.F341060056B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-ssl
In directory doto:/tmp/cvs-serv21971

Added Files:
	.cvsignore Makefile kolab.patch 
Log Message:
Merge perl-ssl with the newer Net-SSLey-1.36 from the kolab_2_2_branch.






From cvs at kolab.org  Tue Jun 29 09:47:20 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 Jun 2010 09:47:20 +0200 (CEST)
Subject: thomas: server release-notes.txt, 1.398.2.127, 1.398.2.128 1st.README,
	1.1.2.17, 1.1.2.18 
Message-ID: <20100629074720.0F03F60056B@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv5885

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 1st.README 
Log Message:
Updated release notes and README for updated perl-ssl


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.127
retrieving revision 1.398.2.128
diff -u -d -r1.398.2.127 -r1.398.2.128
--- release-notes.txt	28 Jun 2010 09:17:30 -0000	1.398.2.127
+++ release-notes.txt	29 Jun 2010 07:47:17 -0000	1.398.2.128
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20100628, Kolab Server 2.2.4)
+(Version 20100629, Kolab Server 2.2.4)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -112,13 +112,17 @@
 
 	Since OpenPKG uses static linking, packages which do not
 	get updated in this release need to be recompiled:
-	apr curl imap openldap perl-crypto perl-ssl postfix sasl
+	apr curl imap openldap perl-crypto postfix sasl
 
     - perl-kolab-2.2.4-20100624
 
 	kolab/issue4237 (additional event.default folder created by
 	                 kolabd (rt#6038))
 
+    - perl-ssl-5.10.0-20080101_kolab1
+
+	Upgrade included Net::SSLeay from 1.32 to 1.36 to support openssl 1.x
+
     - php-5.2.13-20100624_kolab1
 
 	New upstream version, fixes various security issues.
@@ -202,6 +206,7 @@
 	apache-php-5.2.13-20100624_kolab1
 	binutils-2.20-20091016
 	imapd-2.3.13-20081020_kolab5
+	perl-ssl-5.10.0-20080101_kolab1
 	openssl-1.0.0a-20100624
 	php-5.2.13-20100624_kolab1
 
@@ -212,7 +217,6 @@
 	imap-2006k-20080101
 	openldap-2.3.43-20081212
 	perl-crypto-5.10.0-20080101
-	perl-ssl-5.10.0-20080101
 	postfix-2.4.6-20080101_kolab
 	sasl-2.1.22-20080101
 

Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- 1st.README	28 Jun 2010 09:25:14 -0000	1.1.2.17
+++ 1st.README	29 Jun 2010 07:47:17 -0000	1.1.2.18
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Install and Upgrade Information
 ================================================
-(Version 20100628, Kolab Server 2.2.4)
+(Version 20100629, Kolab Server 2.2.4)
 
 See http://kolab.org/ for general information about Kolab,
 or look at http://wiki.kolab.org/ for specific topics.
@@ -131,7 +131,7 @@
 
 Since OpenPKG uses static linking, packages which do not get updated in
 this release need to be recompiled:
-apr curl imap openldap perl-crypto perl-ssl postfix sasl
+apr curl imap openldap perl-crypto postfix sasl
 
 When using precompiled binary packages install-kolab.sh will take care
 of this, but before generating your own 00INDEX.rdf using the .src.rpm



From cvs at kolab.org  Tue Jun 29 12:10:10 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 Jun 2010 12:10:10 +0200 (CEST)
Subject: thomas: server 1st.README, 1.1.2.18, 1.1.2.19 release-notes.txt,
	1.398.2.128, 1.398.2.129 install-kolab.sh, 1.54.2.17, 1.54.2.18 
Message-ID: <20100629101010.BBDB360014C@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv9138

Modified Files:
      Tag: kolab_2_2_branch
	1st.README release-notes.txt install-kolab.sh 
Log Message:
install-kolab.sh: Use clean /kolab/RPM/PKG directory

This way existing files with identical version numbers do not disturb the
build process. Needed for unchanged packages that have to be recompiled to link
against new openssl. Side effect of this that we can move the temporary files
into this directory, important for the openpkg base files.


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- 1st.README	29 Jun 2010 07:47:17 -0000	1.1.2.18
+++ 1st.README	29 Jun 2010 10:10:08 -0000	1.1.2.19
@@ -420,10 +420,8 @@
 To generate this file, you always need all .src.rpm files, so link or copy
 them in a new directory (needs to be writable by the kolab user of your
 installation). After this you can link/copy the install-kolab.sh file and
-your binary rpm files (e.g. openpkg-20071227-20071227_kolab1.*-kolab.rpm from
-/tmp/install-kolab.*/ and the others from /kolab/RPM/PKG/) into this
-directory and run the following command as user kolab or root to create the
-new 00INDEX.rdf file:
+your binary rpm files (from /kolab/RPM/PKG/) into this directory and run the
+following command as user kolab or root to create the new 00INDEX.rdf file:
 
 $ sh install-kolab.sh -X
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.128
retrieving revision 1.398.2.129
diff -u -d -r1.398.2.128 -r1.398.2.129
--- release-notes.txt	29 Jun 2010 07:47:17 -0000	1.398.2.128
+++ release-notes.txt	29 Jun 2010 10:10:08 -0000	1.398.2.129
@@ -101,6 +101,17 @@
 	                 which is from a now *not* shared, before
 	                 shared calendar folder)
 
+    - install-kolab.sh
+
+	Add defines for build options of imapd and kolab-webclient:
+	imapd::with_crossdomain_acl and kolab-webclient::with_activesync=no
+
+	Use clean /kolab/RPM/PKG directory so existing files with identical
+	version numbers do not disturb the build process. Needed for unchanged
+	packages that have to be recompiled to link against new openssl.
+	Side effect of this that we can move the temporary files into this
+	directory, important for the openpkg base files.
+
     - imapd-2.3.13-20081020_kolab5
 
 	kolab/issue1141 (Cannot give users from other domains access

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.17
retrieving revision 1.54.2.18
diff -u -d -r1.54.2.17 -r1.54.2.18
--- install-kolab.sh	25 Jun 2010 14:18:37 -0000	1.54.2.17
+++ install-kolab.sh	29 Jun 2010 10:10:08 -0000	1.54.2.18
@@ -18,6 +18,7 @@
 TAG="kolab"
 USER=""
 PREFIX=""
+UNIQEXT="$RANDOM.$RANDOM.$RANDOM.$$"
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
 DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl -D kolab-webclient::with_activesync=no"
@@ -71,7 +72,7 @@
 fi
 
 mktmpdir() {
-  newtmp="${TMPDIR-/tmp}/install-kolab.$RANDOM.$RANDOM.$RANDOM.$$"
+  newtmp="${TMPDIR-/tmp}/install-kolab.$UNIQEXT"
   mkdir "$newtmp" || {
     echo "Could not create temporary directory! Exiting." 1>&2
     exit 1
@@ -79,6 +80,16 @@
   echo "$newtmp"
 }
 
+mkpkgbackup() {
+  pkgbackup="$1.$UNIQEXT"
+  mkdir "$pkgbackup" || {
+    echo "Could not create PKG backup directory! Exiting." 1>&2
+    exit 1
+  }
+  mv "$1/"* "$pkgbackup"
+  echo "$pkgbackup"
+}
+
 shtool_get_plattag() {
   [ -f shtool ] || sh "$INSTALLER" -t | tar xf - shtool
   echo `sh shtool platform --type=binary`-$TAG
@@ -305,6 +316,10 @@
 fi
 
 if [ -n "$DIR" ]; then
+    PKGDIR="$PREFIX/RPM/PKG"
+    PKGBACKUP=`mkpkgbackup "$PKGDIR"`
+    cd "$PKGDIR" && mv "$WORKDIR"/* "$PKGDIR" && rmdir "$WORKDIR" || exit $?
+
     [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/bin/openpkg" rpm -q --qf="%{ARCH}-%{OS}" openpkg`-$TAG
     if [ -n "$KOLAB_VERSION" ]; then
         DEFINE="$DEFINE
@@ -314,16 +329,18 @@
     fi
 
     PACKAGES=`remove_from_list "$EXCLUDEPKGS" "$PACKAGES"`
-
-    find "$DIR" $FIND1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
     echo "----------- SETUP COMPLETED -----------"
     echo
     echo " Now running:"
     echo
-    echo "   $PREFIX/bin/openpkg build -kKBuZ -r \"$DIR\" -p \"$PLATTAG\" $DEFINE $PACKAGES | sh"
+    echo "   $PREFIX/bin/openpkg build -kKBuZ -r \"$PKGDIR\" -p \"$PLATTAG\" $DEFINE $PACKAGES | sh"
     echo
     echo "---------------------------------------"
-    "$PREFIX/bin/openpkg" build -kKBuZ -r "$DIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh || exit $?
+    "$PREFIX/bin/openpkg" build -kKBuZ -r "$PKGDIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh
+    rc=$?
+    echo "$PKGDIR now contains the installed packages."
+    echo "Previous contents were moved to $PKGBACKUP"
+    exit $?
 fi
 
 exit 0



From cvs at kolab.org  Wed Jun 30 15:57:33 2010
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 Jun 2010 15:57:33 +0200 (CEST)
Subject: wilde: utils/testing send_filtertest_emails.py,1.12,1.13 
Message-ID: <20100630135733.99A34600567@lists.intevation.de>

Author: wilde

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv15744

Modified Files:
	send_filtertest_emails.py 
Log Message:
Some minor text corrections.


Index: send_filtertest_emails.py
===================================================================
RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- send_filtertest_emails.py	16 Mar 2007 01:50:24 -0000	1.12
+++ send_filtertest_emails.py	30 Jun 2010 13:57:31 -0000	1.13
@@ -5,7 +5,7 @@
 with the real values for a test account on your server.
 
 Need to be run from a server that can give emails to postfix
-without authentification. 
+without authentication. 
 Typically use an IP of priviledge networks of your Kolab server.
 Attention: "envelope header from check" does not check mail from 127.0.0.1,
 so do NOT use localhost.
@@ -169,7 +169,7 @@
 	      loginname = loginname, password = password,
               text = "Kolab filter testmail.\nExpected result: delivery")
 
-    # 2: bounce mail: different from and host envelope
+    # 2: bounce mail: different envelope_from and header_from
     send_mail(envelope_from, envelope_to, "rumpelstilzchen at big.invalid", 
               header_to, 2,
               smtp_host = smtp_host, smtp_port = smtp_port,