From cvs at kolab.org  Fri Oct  2 12:50:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Oct 2009 12:50:02 +0200 (CEST)
Subject: thomas: doc/www/src/security kolab-vendor-notice-24.txt,NONE,1.1 
Message-ID: <20091002105002.EEB3F600815@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab-vendor-notice-24.txt 
Log Message:
Kolab Security Issue 24 20091002 (imapd)


--- NEW FILE: kolab-vendor-notice-24.txt ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Kolab Security Issue 24 20091002
================================

Package:              Kolab Server, Cyrus IMAP Server
Vulnerability:        various
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

The Cyrus IMAP mail server supports the SIEVE mail filtering language. Cyrus
IMAP versions 2.2 through 2.3.14 contain a buffer overflow vulnerability that
may be triggered by a specially crafted SIEVE script. To install this type of
script, the attacker would need to have direct access to a mail account on the
server.


Affected Versions
~~~~~~~~~~~~~~~~~

This affects versions of Cyrus IMAP Server up to version 2.3.14
Kolab Server 2.2.2 and previous releases are affected.


Fix
~~~

Upgrade Cyrus IMAP Server to imapd-2.3.13-20081020_kolab3, which
includes a patch to fix the problem.

OpenPKG packages for Kolab Server 2.2.2 are available from
http://files.kolab.org/server/security-updates/20091002/
or from the mirrors listed on http://kolab.org/mirrors.html

A binary RPM for Kolab Server 2.2.2 (ix86 Debian GNU/Linux Lenny)
is available as imapd-2.3.13-20081020_kolab3.ix86-debian5.0-kolab.rpm

A binary RPM for Kolab Server 2.2.2 (ix86 Debian GNU/Linux Etch)
is available as imapd-2.3.13-20081020_kolab3.ix86-debian4.0-kolab.rpm

Above source and binary packages have been verified to work with Kolab
Server 2.2.0, so you can upgrade the imapd package without doing a full
upgrade.

All other server versions: Please upgrade to Kolab Server 2.2.x and install
the updated imapd package.


You can check the integrity of the downloaded files with:

$ gpg --keyserver keys.gnupg.net --recv-key 5816791A
  or import the key from https://www.intevation.de/~thomas/gpg_pub_key.asc
$ gpg --verify SHA1SUMS.sig
$ sha1sum -c SHA1SUMS


The source package can be compiled and installed on your Kolab Server with:

# su - kolab
$ openpkg rpm --rebuild --define 'with_fsl yes' --define 'with_group yes' \
  --define 'with_group_igncase yes' --define 'with_atvdom yes' \
  --define 'with_ldap yes' --define 'with_annotate yes' \
  --define 'with_morelogging yes' --define 'with_kolab yes' \
  --define 'with_kolab_nocaps yes' \
  ...path/to.../imapd-2.3.13-20081020_kolab3.src.rpm
$ openpkg rpm \
  -Uvh /kolab/RPM/PKG/imapd-2.3.13-20081020_kolab3.<ARCH>-<OS>-kolab.rpm

To install a binary package, just skip the rebuild step:

# su - kolab
$ openpkg rpm \
  -Uvh ...path/to.../imapd-2.3.13-20081020_kolab3.<ARCH>-<OS>-kolab.rpm

Alternatively you can copy or symlink all source and binary rpms and
install-kolab.sh of your current installation and the source rpm of this
security advisory into a new directory and follow the instructions below
"Generating your own 00INDEX.rdf for installations or upgrades" in
1st.README to generate a new installer which can be used to compile and
install the new package without having to specify the "--define" options.


Details
~~~~~~~

http://lists.andrew.cmu.edu/pipermail/cyrus-announce/2009-September/000068.html
	Cyrus IMAPd 2.2.13p1 & 2.3.15 Released

https://lists.andrew.cmu.edu/pipermail/cyrus-cvs/2009-September/001253.html
https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/script.c.diff?r1=1.67&r2=1.68
	Upstream patch for src/sieve/script.c by Bron Gondwana

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2632
	CVE-2009-2632


Timeline
~~~~~~~~
    20090909 Cyrus IMAPd 2.2.13p1 & 2.3.15 released.
    20090922 Fix available via Kolab CVS, started testing.
    20091002 Kolab Server security advisory published.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkrF2pYACgkQW7P1GVgWeRr/9ACfTitATIM40tEJ+z66Awe5HrXX
upMAn2opjdaimN5H+YN/H/NnQbaUAntm
=cZj0
-----END PGP SIGNATURE-----



From cvs at kolab.org  Fri Oct  2 15:06:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Oct 2009 15:06:16 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.165,1.166 
Message-ID: <20091002130616.1890E600818@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Security Issue 24 for Kolab Server (imapd) on index page


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- index.html.m4	26 Jun 2009 10:54:46 -0000	1.165
+++ index.html.m4	2 Oct 2009 13:06:13 -0000	1.166
@@ -59,6 +59,21 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 <table>
+<tr><td class="newsd">October 2nd, 2009</td>
+<td class="newsh">&raquo;
+  Security Issue 24 for Kolab Server (imapd)
+</td></tr>
+</table>
+<div class="newsb">
+  A new imapd RPM with a fix for
+  <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2632">CVE-2009-2632</a>
+  is available.  See the
+  <a href="security/kolab-vendor-notice-24.txt">Kolab Security Issue 24</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">June 26th, 2009</td>
 <td class="newsh">&raquo;
   Kontact for Windows 20090605-7 (beta) released



From cvs at kolab.org  Wed Oct  7 23:01:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Oct 2009 23:01:48 +0200 (CEST)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.3.2.4,
	1.10.2.3.2.5 Makefile, 1.6.4.5, 1.6.4.6 kolab-webclient.spec,
	1.23.2.6.2.16, 1.23.2.6.2.17 
Message-ID: <20091007210148.68F0760014A@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: suc_branch
	ChangeLog Makefile kolab-webclient.spec 
Log Message:
Added functionality for anonymous
        java script based export of calendar data.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.3.2.4
retrieving revision 1.10.2.3.2.5
diff -u -d -r1.10.2.3.2.4 -r1.10.2.3.2.5
--- ChangeLog	28 May 2009 14:26:36 -0000	1.10.2.3.2.4
+++ ChangeLog	7 Oct 2009 21:01:46 -0000	1.10.2.3.2.5
@@ -1,3 +1,8 @@
+2009-10-07  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Added functionality for anonymous
+	java script based export of calendar data.
+
 2009-05-28  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: Added functionality for anonymous

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.6.4.5
retrieving revision 1.6.4.6
diff -u -d -r1.6.4.5 -r1.6.4.6
--- Makefile	26 Jun 2009 13:23:09 -0000	1.6.4.5
+++ Makefile	7 Oct 2009 21:01:46 -0000	1.6.4.6
@@ -26,7 +26,7 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
 SOURCE_VERSION = $(shell grep "%define[ ]*V_source_version" *.spec | sed -e "s/.*V_source_version\s*\([0-9._a-z-]*\).*/\1/")
 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}suc03
+RELEASE = ${YEAR}${MONTH}${DAY}suc01
 
 PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch
 TEMPLATES = $(shell find . -name "*.template")

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.6.2.16
retrieving revision 1.23.2.6.2.17
diff -u -d -r1.23.2.6.2.16 -r1.23.2.6.2.17
--- kolab-webclient.spec	26 Jun 2009 13:23:09 -0000	1.23.2.6.2.16
+++ kolab-webclient.spec	7 Oct 2009 21:01:46 -0000	1.23.2.6.2.17
@@ -2,13 +2,13 @@
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
 %define         V_year  2009
-%define         V_month 06
-%define         V_day   26
+%define         V_month 10
+%define         V_day   07
 %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}suc03
+%define         V_release %{V_year}%{V_month}%{V_day}suc01
 
 # Package Information
 Name:		%{V_package}



From cvs at kolab.org  Wed Oct  7 23:01:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Oct 2009 23:01:49 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_ExportEventList.diff, NONE, 1.1.2.1 series,
	1.5.2.3.2.3, 1.5.2.3.2.4 
Message-ID: <20091007210149.256E660014A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv8377/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: suc_branch
	series 
Added Files:
      Tag: suc_branch
	t_kronolith_HK_GW_ExportEventList.diff 
Log Message:
Added functionality for anonymous
        java script based export of calendar data.

--- NEW FILE: t_kronolith_HK_GW_ExportEventList.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/GW/ExportEventList

Export a list of events.

STATUS: OPEN

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

---
 horde-webmail/kronolith/imple_kolab.php         |   92 +++++++++
 horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
 horde-webmail/kronolith/themes/embed.css        |   51 +++++-
 horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
 4 files changed, 386 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
new file mode 100644
index 0000000..f18d2ad
--- /dev/null
+++ b/horde-webmail/kronolith/imple_kolab.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
+ *
+ * Copyright 2005-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author Michael Slusarz <slusarz at horde.org>
+ */
+if (!defined('HORDE_BASE')) {
+    define('HORDE_BASE', dirname(__FILE__) . '/..');
+}
+
+/* Load the Horde Framework core, and set up inclusion paths. */
+require_once HORDE_BASE . '/lib/core.php';
+
+ at define('AUTH_HANDLER', true);
+/* Registry. */
+$session_control = 'none';
+$registry = &Registry::singleton(HORDE_SESSION_NONE);
+
+$auth = &Auth::singleton($conf['auth']['driver']);
+
+if (isset($conf['ics']['default_user'])
+    && isset($conf['ics']['default_pass'])) {
+    $user = $conf['ics']['default_user'];
+    $pass = $conf['ics']['default_pass'];
+    $auth->authenticate($user,
+                        array('password' =>
+                              $pass));
+}   
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/Imple.php';
+
+
+$path = Util::getFormData('imple');
+if (!$path) {
+    exit;
+}
+if ($path[0] == '/') {
+    $path = substr($path, 1);
+}
+$path = explode('/', $path);
+$impleName = array_shift($path);
+
+$imple = Imple::factory($impleName);
+if (!$imple) {
+    exit;
+}
+
+$args = array();
+foreach ($path as $pair) {
+    if (strpos($pair, '=') === false) {
+        $args[$pair] = true;
+    } else {
+        list($name, $val) = explode('=', $pair);
+        $args[$name] = $val;
+    }
+}
+
+$result = $imple->handle($args);
+
+if (!empty($_SERVER['Content-Type'])) {
+    $ct = $_SERVER['Content-Type'];
+} else {
+    $ct = is_string($result) ? 'plain' : 'json';
+}
+
+switch ($ct) {
+case 'json':
+    header('Content-Type: text/x-json');
+    require_once KRONOLITH_BASE . '/lib/JSON.php';
+    echo Kronolith_Serialize_JSON::encode(String::convertCharset($result, NLS::getCharset(), 'utf-8'));
+    break;
+
+case 'plain':
+    header('Content-Type: text/plain');
+    echo $result;
+    break;
+
+case 'html':
+    header('Content-Type: text/html');
+    echo $result;
+    break;
+
+default:
+    echo $result;
+}
diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
new file mode 100644
index 0000000..420a984
--- /dev/null
+++ b/horde-webmail/kronolith/lib/Block/eventlist.php
@@ -0,0 +1,243 @@
+<?php
+
+$block_name = _("Calendar List View");
+
+/**
+ * Horde_Block_Kronolith_eventlist:: Implementation of the Horde_Block API to
+ * display a list of events.
+ *
+ * $Horde: kronolith/lib/Block/summary.php,v 1.41.2.14 2008/08/21 00:31:03 mrubinsk Exp $
+ *
+ * @package Horde_Block
+ */
+class Horde_Block_Kronolith_eventlist extends Horde_Block {
+
+    var $_app = 'kronolith';
+
+    function _params()
+    {
+        @define('KRONOLITH_BASE', dirname(__FILE__) . '/../..');
+        require_once KRONOLITH_BASE . '/lib/base.php';
+
+        $params = array('days' => array('name' => _("Days"),
+                                        'type' => 'int',
+                                        'default' => 42),
+                        'maxevents' => array('name' => _("Maximum number of events to display (0 = no limit)"),
+                                             'type' => 'int',
+                                             'default' => 0));
+
+        return $params;
+    }
+
+    /**
+     * The title to go in this block.
+     *
+     * @return string   The title text.
+     */
+    function _title()
+    {
+        global $registry;
+        return '';
+    }
+
+    /**
+     * The content to go in this block.
+     *
+     * @return string   The content
+     */
+    function _content()
+    {
+        global $kronolith_driver, $registry, $prefs;
+        require_once dirname(__FILE__) . '/../base.php';
+        require_once KRONOLITH_BASE . '/lib/Day.php';
+        require_once 'Horde/Prefs/CategoryManager.php';
+        require_once 'Horde/Text/Filter.php';
+
+        if (!empty($this->_params['days'])) {
+            $span = $this->_params['days'];
+        } else {
+            $span = 42;
+        }
+
+        $now = $_SERVER['REQUEST_TIME'];
+        $today = date('j');
+
+        $startDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j')));
+        $endDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j') + $span));
+        $endDate->correct();
+
+        if (isset($this->_params['calendar']) &&
+            $this->_params['calendar'] != '__all') {
+
+            $calendar = $GLOBALS['kronolith_shares']->getShare($this->_params['calendar']);
+            if (!is_a($calendar, 'PEAR_Error') && !$calendar->hasPermission(Auth::getAuth(), PERMS_SHOW)) {
+                return _("Permission Denied");
+            }
+
+            $all_events = Kronolith::listEvents($startDate,
+                                                $endDate,
+                                                array($this->_params['calendar']));
+        } else {
+            $calendars = Kronolith::listCalendars(false, PERMS_SHOW);
+            $all_events = Kronolith::listEvents($startDate,
+                                                $endDate,
+                                                array_keys($calendars));
+        }
+        if (is_a($all_events, 'PEAR_Error')) {
+            return '<em>' . $all_events->getMessage() . '</em>';
+        }
+
+        $iMax = $today + $span;
+
+        $html = '';
+        $firstday = true;
+        $olddayname = '';
+        $totalevents = 0;
+
+        $displayed = array();
+
+        for ($i = $today; $i < $iMax; ++$i) {
+            $day = new Kronolith_Day(date('n'), $i);
+
+            if ($day->isToday()) {
+                $dayname = _("Today");
+            } elseif ($day->isTomorrow()) {
+                $dayname = _("Tomorrow");
+            } elseif ($day->weekOfYear() == $startDate->weekOfYear()) {
+                $dayname = _("This week");
+            } elseif ($day->month == $startDate->month) {
+                if ($day->weekOfYear() == $startDate->weekOfYear() + 1) {
+                    $dayname = _("Next week");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 2) {
+                    $dayname = _("Two weeks from now");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 3) {
+                    $dayname = _("Three weeks from now");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 4) {
+                    $dayname = _("Four weeks from now");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 5) {
+                    $dayname = _("Five weeks from now");
+                }
+            } elseif ($day->month - 1 == $startDate->month
+                      || ($day->month == 1 && $startDate->month == 12)) {
+                $dayname = _("Next month");
+            } elseif ($day->year == $startDate->year) {
+                $dayname = $day->format('F');
+            } elseif ($day->year - 1 == $startDate->year) {
+                $dayname = _("Next year");
+            } else {
+                $dayname = _("After the next year");
+            }
+
+            if (empty($all_events[$day->getStamp()])) {
+                continue;
+            }
+
+            $events = &$all_events[$day->getStamp()];
+
+            $today12am = mktime(0, 0, 0,
+                                $day->month,
+                                $day->mday,
+                                $day->year);
+            $tomorrow12am = mktime(0, 0, 0,
+                                   $day->month,
+                                   $day->mday + 1,
+                                   $day->year);
+            foreach ($events as $event) {
+
+                if (!empty($this->_params['maxevents']) &&
+                    $totalevents >= $this->_params['maxevents']) {
+                    break 2;
+                }
+
+                if ($event->end->timestamp() < $now) {
+                    continue;
+                }
+                if ($dayname != $olddayname) {
+                    if (!$firstday) {
+                        $html .= '<tr><td colspan="3">&nbsp;</td></tr>';
+                    }
+                    $html .= '<tr align="center"><td colspan="3" class="section">';
+                    $html .= $dayname . '</td></tr>';
+                    $olddayname = $dayname;
+                    $firstday = false;
+                }
+
+                if (in_array($event->getId(), $displayed)) {
+                    continue;
+                }
+
+                $category = $event->getCategory();
+                if (!empty($category)) {
+                    $ctd = '<td class="category_bar category' . md5($category) . '" width="1%" />';
+                } else {
+                    $ctd = '<td />';
+                }
+
+                if ($event->isAllDay()) {
+                    $format = 'D, d M Y';
+                } else {
+                    $format = 'G:i T D, d M Y';
+                }
+
+                if ($event->start->timestamp() < $now) {
+                    $time = _('until') . date($format, $event->end->timestamp());
+                } else {
+                    $time = date($format, $event->start->timestamp()) . _(' to ') .
+                        date($format, $event->end->timestamp());
+                }
+
+                $html .= '<tr>' . $ctd . '<td class="event" style="vertical-align:top;"><div class="time">';
+
+                if ($event->start->timestamp() < $now &&
+                    $event->end->timestamp() > $now) {
+                    $html .= '<strong>';
+                }
+
+                $html .= $time;
+
+                if ($event->start->timestamp() < $now &&
+                    $event->end->timestamp() > $now) {
+                    $html .= '</strong>';
+                }
+
+                $html .= '</div><div class="location" style="vertical-align:top">';
+                $html .= $event->getLocation();
+                $html .= '</div></td><td style="vertical-align:top;" class="event"><div class="eventtitle">';
+                $html .= $event->getTitle();
+                $html .= '</div>';
+
+                $html .= '<div class="description">';
+                $desc = Text_Filter::filter($event->getDescription(), 'text2html', array('parselevel' => TEXT_HTML_MICRO, 'class' => 'text'));
+                $html .= strtr($desc, array("\n" => " ", "\r" => " "));
+                $html .= '</div>';
+
+                $html .= '</td></tr>';
+
+                $html .= '<tr>' . $ctd . '<td  class="linedRow"/><td class="linedRow annotation">';
+
+                if (!empty($category)) {
+                    $html .= '<div style="text-align:right;float:left;">';
+                    $html .= _("Category") . ': ' . $category;
+                    $html .= '</div>';
+                }
+
+                $html .= '<div style="text-align:right">';
+                $html .= _("Calendar") . ': ' . urldecode($event->getCalendar());
+                $html .= '</div>';
+
+                $html .= '</td></tr>';
+
+                $totalevents++;
+
+                $displayed[] = $event->getId();
+            }
+        }
+
+        if (empty($html)) {
+            return '<em>' . _("No events to display") . '</em>';
+        }
+
+        return '<link href="' . Horde::applicationUrl('themes/categoryCSS.php') . '" rel="stylesheet" type="text/css" /><table cellspacing="0" width="100%">' . $html . '</table>';
+    }
+
+}
diff --git a/horde-webmail/kronolith/themes/embed.css b/horde-webmail/kronolith/themes/embed.css
index 6ce8835..b084aa2 100644
--- a/horde-webmail/kronolith/themes/embed.css
+++ b/horde-webmail/kronolith/themes/embed.css
@@ -103,4 +103,53 @@ div.horde_nicetitle pre {
     text-align: left;
     font-size: 75%;
     font-family: "Lucida Console",Courier,"Courier New";
-}
\ No newline at end of file
+}
+
+.kronolith_embedded category_bar {
+}
+
+.kronolith_embedded .eventtitle {
+    font-weight: bold;
+    padding: 5px;
+}
+
+.kronolith_embedded .leftbar {
+    border-right:  1px solid #DDDDDD;
+    padding: 4px;
+}
+
+.kronolith_embedded .location {
+    font-size: 85%;
+    padding-top: 10px;
+    margin-left: 5px;
+}
+
+.kronolith_embedded .annotation {
+    font-size: 75%;
+    padding-top: 10px;
+    padding-left: 5px;
+}
+
+.kronolith_embedded .description {
+    font-size: 85%;
+    padding-top: 10px;
+    padding-left: 5px;
+}
+
+.kronolith_embedded .time {
+    font-size: 85%;
+    margin-top: 5px;
+    padding: 5px;
+    margin-left: 5px;
+    background: #ddddff;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+
+.kronolith_embedded .section {
+    font-weight: bold;
+    background: #eeeeee;
+    border-bottom: 1px solid #999999;
+    color: #000000;
+    padding: 1px;
+}
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/horde-webmail/lib/Horde/Kolab/Storage/List.php
+++ b/horde-webmail/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')) {
-- 
tg: (2f74c4c..) t/kronolith/HK/GW/ExportEventList (depends on: t/dimp/H/BL/CloseContextMenu)
-- 
TOPGIT patch commit log
=======================

commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Oct 7 22:22:07 2009 +0200

    Comment.

commit 787cac7fd3a7dd282ad66596c30fc0eaf67bbe20
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Oct 7 22:19:43 2009 +0200

    Export a list of events.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.3.2.3
retrieving revision 1.5.2.3.2.4
diff -u -d -r1.5.2.3.2.3 -r1.5.2.3.2.4
--- series	28 May 2009 14:26:36 -0000	1.5.2.3.2.3
+++ series	7 Oct 2009 21:01:46 -0000	1.5.2.3.2.4
@@ -71,3 +71,4 @@
 t_pear_HK_GW_AddNetLDAP2.diff -p1
 t_Kolab__Server_HK_GW_MappableAttributes.diff -p1
 t_kronolith_HK_GW_AnonymousiCalDownload.diff -p1
+t_kronolith_HK_GW_ExportEventList.diff -p1



From cvs at kolab.org  Wed Oct  7 23:01:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  7 Oct 2009 23:01:49 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.4.2.14, 1.32.2.4.2.15 
Message-ID: <20091007210149.290CB600806@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv8377/patches/horde-webmail/1.2.0

Modified Files:
      Tag: suc_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Added functionality for anonymous
        java script based export of calendar data.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.4.2.14
retrieving revision 1.32.2.4.2.15
diff -u -d -r1.32.2.4.2.14 -r1.32.2.4.2.15
--- horde-webmail-1.2.0_kolab_openpkg.patch	20 Jul 2009 08:39:06 -0000	1.32.2.4.2.14
+++ horde-webmail-1.2.0_kolab_openpkg.patch	7 Oct 2009 21:01:46 -0000	1.32.2.4.2.15
@@ -27122,6 +27122,459 @@
 Date:   Thu May 28 12:42:44 2009 +0200
 
     First version of the anonymous ics download patch.
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/kronolith/HK/GW/ExportEventList
+
+Export a list of events.
+
+STATUS: OPEN
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/kronolith/imple_kolab.php         |   92 +++++++++
+ horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
+ horde-webmail/kronolith/themes/embed.css        |   51 +++++-
+ horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
+ 4 files changed, 386 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
+new file mode 100644
+index 0000000..f18d2ad
+--- /dev/null
++++ b/horde-webmail/kronolith/imple_kolab.php
+@@ -0,0 +1,92 @@
++<?php
++/**
++ * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
++ *
++ * Copyright 2005-2008 The Horde Project (http://www.horde.org/)
++ *
++ * See the enclosed file COPYING for license information (GPL). If you
++ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
++ *
++ * @author Michael Slusarz <slusarz at horde.org>
++ */
++if (!defined('HORDE_BASE')) {
++    define('HORDE_BASE', dirname(__FILE__) . '/..');
++}
++
++/* Load the Horde Framework core, and set up inclusion paths. */
++require_once HORDE_BASE . '/lib/core.php';
++
++ at define('AUTH_HANDLER', true);
++/* Registry. */
++$session_control = 'none';
++$registry = &Registry::singleton(HORDE_SESSION_NONE);
++
++$auth = &Auth::singleton($conf['auth']['driver']);
++
++if (isset($conf['ics']['default_user'])
++    && isset($conf['ics']['default_pass'])) {
++    $user = $conf['ics']['default_user'];
++    $pass = $conf['ics']['default_pass'];
++    $auth->authenticate($user,
++                        array('password' =>
++                              $pass));
++}   
++
++ at define('KRONOLITH_BASE', dirname(__FILE__));
++require_once KRONOLITH_BASE . '/lib/base.php';
++require_once KRONOLITH_BASE . '/lib/Imple.php';
++
++
++$path = Util::getFormData('imple');
++if (!$path) {
++    exit;
++}
++if ($path[0] == '/') {
++    $path = substr($path, 1);
++}
++$path = explode('/', $path);
++$impleName = array_shift($path);
++
++$imple = Imple::factory($impleName);
++if (!$imple) {
++    exit;
++}
++
++$args = array();
++foreach ($path as $pair) {
++    if (strpos($pair, '=') === false) {
++        $args[$pair] = true;
++    } else {
++        list($name, $val) = explode('=', $pair);
++        $args[$name] = $val;
++    }
++}
++
++$result = $imple->handle($args);
++
++if (!empty($_SERVER['Content-Type'])) {
++    $ct = $_SERVER['Content-Type'];
++} else {
++    $ct = is_string($result) ? 'plain' : 'json';
++}
++
++switch ($ct) {
++case 'json':
++    header('Content-Type: text/x-json');
++    require_once KRONOLITH_BASE . '/lib/JSON.php';
++    echo Kronolith_Serialize_JSON::encode(String::convertCharset($result, NLS::getCharset(), 'utf-8'));
++    break;
++
++case 'plain':
++    header('Content-Type: text/plain');
++    echo $result;
++    break;
++
++case 'html':
++    header('Content-Type: text/html');
++    echo $result;
++    break;
++
++default:
++    echo $result;
++}
+diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
+new file mode 100644
+index 0000000..420a984
+--- /dev/null
++++ b/horde-webmail/kronolith/lib/Block/eventlist.php
+@@ -0,0 +1,243 @@
++<?php
++
++$block_name = _("Calendar List View");
++
++/**
++ * Horde_Block_Kronolith_eventlist:: Implementation of the Horde_Block API to
++ * display a list of events.
++ *
++ * $Horde: kronolith/lib/Block/summary.php,v 1.41.2.14 2008/08/21 00:31:03 mrubinsk Exp $
++ *
++ * @package Horde_Block
++ */
++class Horde_Block_Kronolith_eventlist extends Horde_Block {
++
++    var $_app = 'kronolith';
++
++    function _params()
++    {
++        @define('KRONOLITH_BASE', dirname(__FILE__) . '/../..');
++        require_once KRONOLITH_BASE . '/lib/base.php';
++
++        $params = array('days' => array('name' => _("Days"),
++                                        'type' => 'int',
++                                        'default' => 42),
++                        'maxevents' => array('name' => _("Maximum number of events to display (0 = no limit)"),
++                                             'type' => 'int',
++                                             'default' => 0));
++
++        return $params;
++    }
++
++    /**
++     * The title to go in this block.
++     *
++     * @return string   The title text.
++     */
++    function _title()
++    {
++        global $registry;
++        return '';
++    }
++
++    /**
++     * The content to go in this block.
++     *
++     * @return string   The content
++     */
++    function _content()
++    {
++        global $kronolith_driver, $registry, $prefs;
++        require_once dirname(__FILE__) . '/../base.php';
++        require_once KRONOLITH_BASE . '/lib/Day.php';
++        require_once 'Horde/Prefs/CategoryManager.php';
++        require_once 'Horde/Text/Filter.php';
++
++        if (!empty($this->_params['days'])) {
++            $span = $this->_params['days'];
++        } else {
++            $span = 42;
++        }
++
++        $now = $_SERVER['REQUEST_TIME'];
++        $today = date('j');
++
++        $startDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j')));
++        $endDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j') + $span));
++        $endDate->correct();
++
++        if (isset($this->_params['calendar']) &&
++            $this->_params['calendar'] != '__all') {
++
++            $calendar = $GLOBALS['kronolith_shares']->getShare($this->_params['calendar']);
++            if (!is_a($calendar, 'PEAR_Error') && !$calendar->hasPermission(Auth::getAuth(), PERMS_SHOW)) {
++                return _("Permission Denied");
++            }
++
++            $all_events = Kronolith::listEvents($startDate,
++                                                $endDate,
++                                                array($this->_params['calendar']));
++        } else {
++            $calendars = Kronolith::listCalendars(false, PERMS_SHOW);
++            $all_events = Kronolith::listEvents($startDate,
++                                                $endDate,
++                                                array_keys($calendars));
++        }
++        if (is_a($all_events, 'PEAR_Error')) {
++            return '<em>' . $all_events->getMessage() . '</em>';
++        }
++
++        $iMax = $today + $span;
++
++        $html = '';
++        $firstday = true;
++        $olddayname = '';
++        $totalevents = 0;
++
++        $displayed = array();
++
++        for ($i = $today; $i < $iMax; ++$i) {
++            $day = new Kronolith_Day(date('n'), $i);
++
++            if ($day->isToday()) {
++                $dayname = _("Today");
++            } elseif ($day->isTomorrow()) {
++                $dayname = _("Tomorrow");
++            } elseif ($day->weekOfYear() == $startDate->weekOfYear()) {
++                $dayname = _("This week");
++            } elseif ($day->month == $startDate->month) {
++                if ($day->weekOfYear() == $startDate->weekOfYear() + 1) {
++                    $dayname = _("Next week");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 2) {
++                    $dayname = _("Two weeks from now");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 3) {
++                    $dayname = _("Three weeks from now");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 4) {
++                    $dayname = _("Four weeks from now");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 5) {
++                    $dayname = _("Five weeks from now");
++                }
++            } elseif ($day->month - 1 == $startDate->month
++                      || ($day->month == 1 && $startDate->month == 12)) {
++                $dayname = _("Next month");
++            } elseif ($day->year == $startDate->year) {
++                $dayname = $day->format('F');
++            } elseif ($day->year - 1 == $startDate->year) {
++                $dayname = _("Next year");
++            } else {
++                $dayname = _("After the next year");
++            }
++
++            if (empty($all_events[$day->getStamp()])) {
++                continue;
++            }
++
++            $events = &$all_events[$day->getStamp()];
++
++            $today12am = mktime(0, 0, 0,
++                                $day->month,
++                                $day->mday,
++                                $day->year);
++            $tomorrow12am = mktime(0, 0, 0,
++                                   $day->month,
++                                   $day->mday + 1,
++                                   $day->year);
++            foreach ($events as $event) {
++
++                if (!empty($this->_params['maxevents']) &&
++                    $totalevents >= $this->_params['maxevents']) {
++                    break 2;
++                }
++
++                if ($event->end->timestamp() < $now) {
++                    continue;
++                }
++                if ($dayname != $olddayname) {
++                    if (!$firstday) {
++                        $html .= '<tr><td colspan="3">&nbsp;</td></tr>';
++                    }
++                    $html .= '<tr align="center"><td colspan="3" class="section">';
++                    $html .= $dayname . '</td></tr>';
++                    $olddayname = $dayname;
++                    $firstday = false;
++                }
++
++                if (in_array($event->getId(), $displayed)) {
++                    continue;
++                }
++
++                $category = $event->getCategory();
++                if (!empty($category)) {
++                    $ctd = '<td class="category_bar category' . md5($category) . '" width="1%" />';
++                } else {
++                    $ctd = '<td />';
++                }
++
++                if ($event->isAllDay()) {
++                    $format = 'D, d M Y';
++                } else {
++                    $format = 'G:i T D, d M Y';
++                }
++
++                if ($event->start->timestamp() < $now) {
++                    $time = _('until') . date($format, $event->end->timestamp());
++                } else {
++                    $time = date($format, $event->start->timestamp()) . _(' to ') .
++                        date($format, $event->end->timestamp());
++                }
++
++                $html .= '<tr>' . $ctd . '<td class="event" style="vertical-align:top;"><div class="time">';
++
++                if ($event->start->timestamp() < $now &&
++                    $event->end->timestamp() > $now) {
++                    $html .= '<strong>';
++                }
++
++                $html .= $time;
++
++                if ($event->start->timestamp() < $now &&
++                    $event->end->timestamp() > $now) {
++                    $html .= '</strong>';
++                }
++
++                $html .= '</div><div class="location" style="vertical-align:top">';
++                $html .= $event->getLocation();
++                $html .= '</div></td><td style="vertical-align:top;" class="event"><div class="eventtitle">';
++                $html .= $event->getTitle();
++                $html .= '</div>';
++
++                $html .= '<div class="description">';
++                $desc = Text_Filter::filter($event->getDescription(), 'text2html', array('parselevel' => TEXT_HTML_MICRO, 'class' => 'text'));
++                $html .= strtr($desc, array("\n" => " ", "\r" => " "));
++                $html .= '</div>';
++
++                $html .= '</td></tr>';
++
++                $html .= '<tr>' . $ctd . '<td  class="linedRow"/><td class="linedRow annotation">';
++
++                if (!empty($category)) {
++                    $html .= '<div style="text-align:right;float:left;">';
++                    $html .= _("Category") . ': ' . $category;
++                    $html .= '</div>';
++                }
++
++                $html .= '<div style="text-align:right">';
++                $html .= _("Calendar") . ': ' . urldecode($event->getCalendar());
++                $html .= '</div>';
++
++                $html .= '</td></tr>';
++
++                $totalevents++;
++
++                $displayed[] = $event->getId();
++            }
++        }
++
++        if (empty($html)) {
++            return '<em>' . _("No events to display") . '</em>';
++        }
++
++        return '<link href="' . Horde::applicationUrl('themes/categoryCSS.php') . '" rel="stylesheet" type="text/css" /><table cellspacing="0" width="100%">' . $html . '</table>';
++    }
++
++}
+diff --git a/horde-webmail/kronolith/themes/embed.css b/horde-webmail/kronolith/themes/embed.css
+index 6ce8835..b084aa2 100644
+--- a/horde-webmail/kronolith/themes/embed.css
++++ b/horde-webmail/kronolith/themes/embed.css
+@@ -103,4 +103,53 @@ div.horde_nicetitle pre {
+     text-align: left;
+     font-size: 75%;
+     font-family: "Lucida Console",Courier,"Courier New";
+-}
+\ No newline at end of file
++}
++
++.kronolith_embedded category_bar {
++}
++
++.kronolith_embedded .eventtitle {
++    font-weight: bold;
++    padding: 5px;
++}
++
++.kronolith_embedded .leftbar {
++    border-right:  1px solid #DDDDDD;
++    padding: 4px;
++}
++
++.kronolith_embedded .location {
++    font-size: 85%;
++    padding-top: 10px;
++    margin-left: 5px;
++}
++
++.kronolith_embedded .annotation {
++    font-size: 75%;
++    padding-top: 10px;
++    padding-left: 5px;
++}
++
++.kronolith_embedded .description {
++    font-size: 85%;
++    padding-top: 10px;
++    padding-left: 5px;
++}
++
++.kronolith_embedded .time {
++    font-size: 85%;
++    margin-top: 5px;
++    padding: 5px;
++    margin-left: 5px;
++    background: #ddddff;
++    -moz-border-radius: 5px;
++    -webkit-border-radius: 5px;
++}
++
++.kronolith_embedded .section {
++    font-weight: bold;
++    background: #eeeeee;
++    border-bottom: 1px solid #999999;
++    color: #000000;
++    padding: 1px;
++}
+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/horde-webmail/lib/Horde/Kolab/Storage/List.php
++++ b/horde-webmail/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')) {
+-- 
+tg: (2f74c4c..) t/kronolith/HK/GW/ExportEventList (depends on: t/dimp/H/BL/CloseContextMenu)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Wed Oct 7 22:22:07 2009 +0200
+
+    Comment.
+
+commit 787cac7fd3a7dd282ad66596c30fc0eaf67bbe20
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Wed Oct 7 22:19:43 2009 +0200
+
+    Export a list of events.
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Fri Oct  9 09:37:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 09:37:28 +0200 (CEST)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.3.2.5,
	1.10.2.3.2.6 kolab-webclient.spec, 1.23.2.6.2.17, 1.23.2.6.2.18 
Message-ID: <20091009073728.8AC04600801@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: suc_branch
	ChangeLog kolab-webclient.spec 
Log Message:
Cleaner session handling for the export.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.3.2.5
retrieving revision 1.10.2.3.2.6
diff -u -d -r1.10.2.3.2.5 -r1.10.2.3.2.6
--- ChangeLog	7 Oct 2009 21:01:46 -0000	1.10.2.3.2.5
+++ ChangeLog	9 Oct 2009 07:37:26 -0000	1.10.2.3.2.6
@@ -1,3 +1,7 @@
+2009-10-09  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Cleaner session handling for the export.
+
 2009-10-07  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: Added functionality for anonymous

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.6.2.17
retrieving revision 1.23.2.6.2.18
diff -u -d -r1.23.2.6.2.17 -r1.23.2.6.2.18
--- kolab-webclient.spec	7 Oct 2009 21:01:46 -0000	1.23.2.6.2.17
+++ kolab-webclient.spec	9 Oct 2009 07:37:26 -0000	1.23.2.6.2.18
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 10
-%define         V_day   07
+%define         V_day   09
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Fri Oct  9 09:37:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 09:37:29 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_ExportEventList.diff, 1.1.2.1, 1.1.2.2 
Message-ID: <20091009073729.6C623600803@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv566/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: suc_branch
	t_kronolith_HK_GW_ExportEventList.diff 
Log Message:
Cleaner session handling for the export.

Index: t_kronolith_HK_GW_ExportEventList.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/t_kronolith_HK_GW_ExportEventList.diff,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- t_kronolith_HK_GW_ExportEventList.diff	7 Oct 2009 21:01:46 -0000	1.1.2.1
+++ t_kronolith_HK_GW_ExportEventList.diff	9 Oct 2009 07:37:27 -0000	1.1.2.2
@@ -8,18 +8,18 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/imple_kolab.php         |   92 +++++++++
+ horde-webmail/kronolith/imple_kolab.php         |   96 +++++++++
  horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
  horde-webmail/kronolith/themes/embed.css        |   51 +++++-
  horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
- 4 files changed, 386 insertions(+), 2 deletions(-)
+ 4 files changed, 390 insertions(+), 2 deletions(-)
 
 diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
 new file mode 100644
-index 0000000..f18d2ad
+index 0000000..65db938
 --- /dev/null
 +++ b/horde-webmail/kronolith/imple_kolab.php
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,96 @@
 +<?php
 +/**
 + * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
@@ -31,27 +31,31 @@
 + *
 + * @author Michael Slusarz <slusarz at horde.org>
 + */
-+if (!defined('HORDE_BASE')) {
-+    define('HORDE_BASE', dirname(__FILE__) . '/..');
-+}
 +
-+/* Load the Horde Framework core, and set up inclusion paths. */
-+require_once HORDE_BASE . '/lib/core.php';
++function impleLogout() 
++{
++    Auth::clearAuth();
++    @session_destroy();
++}
 +
 + at define('AUTH_HANDLER', true);
-+/* Registry. */
-+$session_control = 'none';
-+$registry = &Registry::singleton(HORDE_SESSION_NONE);
++ at define('HORDE_BASE', dirname(__FILE__) . '/..');
++require_once HORDE_BASE . '/lib/base.php';
 +
-+$auth = &Auth::singleton($conf['auth']['driver']);
++// We want to always generate UTF-8 iCalendar data.
++NLS::setCharset('UTF-8');
++
++$auth = &Auth::singleton('kolab');
 +
 +if (isset($conf['ics']['default_user'])
 +    && isset($conf['ics']['default_pass'])) {
 +    $user = $conf['ics']['default_user'];
 +    $pass = $conf['ics']['default_pass'];
++    $_SESSION = array();
 +    $auth->authenticate($user,
 +                        array('password' =>
 +                              $pass));
++    register_shutdown_function('impleLogout');
 +}   
 +
 + at define('KRONOLITH_BASE', dirname(__FILE__));
@@ -112,6 +116,7 @@
 +default:
 +    echo $result;
 +}
+\ No newline at end of file
 diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
 new file mode 100644
 index 0000000..420a984
@@ -439,6 +444,18 @@
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 09:18:48 2009 +0200
+
+    Clean logout.
+
+commit c471608f1adfa116123b913959498d5b7f8defc6
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 08:45:58 2009 +0200
+
+    Cleaner session handling.
 
 commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Fri Oct  9 09:37:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 09:37:29 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.4.2.15, 1.32.2.4.2.16 
Message-ID: <20091009073729.775DE600804@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv566/patches/horde-webmail/1.2.0

Modified Files:
      Tag: suc_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Cleaner session handling for the export.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.4.2.15
retrieving revision 1.32.2.4.2.16
diff -u -d -r1.32.2.4.2.15 -r1.32.2.4.2.16
--- horde-webmail-1.2.0_kolab_openpkg.patch	7 Oct 2009 21:01:46 -0000	1.32.2.4.2.15
+++ horde-webmail-1.2.0_kolab_openpkg.patch	9 Oct 2009 07:37:26 -0000	1.32.2.4.2.16
@@ -27132,18 +27132,18 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/imple_kolab.php         |   92 +++++++++
+ horde-webmail/kronolith/imple_kolab.php         |   96 +++++++++
  horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
  horde-webmail/kronolith/themes/embed.css        |   51 +++++-
  horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
- 4 files changed, 386 insertions(+), 2 deletions(-)
+ 4 files changed, 390 insertions(+), 2 deletions(-)
 
 diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
 new file mode 100644
-index 0000000..f18d2ad
+index 0000000..65db938
 --- /dev/null
 +++ b/horde-webmail/kronolith/imple_kolab.php
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,96 @@
 +<?php
 +/**
 + * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
@@ -27155,27 +27155,31 @@
 + *
 + * @author Michael Slusarz <slusarz at horde.org>
 + */
-+if (!defined('HORDE_BASE')) {
-+    define('HORDE_BASE', dirname(__FILE__) . '/..');
-+}
 +
-+/* Load the Horde Framework core, and set up inclusion paths. */
-+require_once HORDE_BASE . '/lib/core.php';
++function impleLogout() 
++{
++    Auth::clearAuth();
++    @session_destroy();
++}
 +
 + at define('AUTH_HANDLER', true);
-+/* Registry. */
-+$session_control = 'none';
-+$registry = &Registry::singleton(HORDE_SESSION_NONE);
++ at define('HORDE_BASE', dirname(__FILE__) . '/..');
++require_once HORDE_BASE . '/lib/base.php';
 +
-+$auth = &Auth::singleton($conf['auth']['driver']);
++// We want to always generate UTF-8 iCalendar data.
++NLS::setCharset('UTF-8');
++
++$auth = &Auth::singleton('kolab');
 +
 +if (isset($conf['ics']['default_user'])
 +    && isset($conf['ics']['default_pass'])) {
 +    $user = $conf['ics']['default_user'];
 +    $pass = $conf['ics']['default_pass'];
++    $_SESSION = array();
 +    $auth->authenticate($user,
 +                        array('password' =>
 +                              $pass));
++    register_shutdown_function('impleLogout');
 +}   
 +
 + at define('KRONOLITH_BASE', dirname(__FILE__));
@@ -27236,6 +27240,7 @@
 +default:
 +    echo $result;
 +}
+\ No newline at end of file
 diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
 new file mode 100644
 index 0000000..420a984
@@ -27563,6 +27568,18 @@
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 09:18:48 2009 +0200
+
+    Clean logout.
+
+commit c471608f1adfa116123b913959498d5b7f8defc6
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 08:45:58 2009 +0200
+
+    Cleaner session handling.
 
 commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Fri Oct  9 18:11:53 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 18:11:53 +0200 (CEST)
Subject: wilde: server/kolab-webclient ChangeLog, 1.10.2.6,
	1.10.2.7 kolab-webclient.spec, 1.23.2.10,
	1.23.2.11 webclient-kolab-conf.template, 1.2, 1.2.2.1 
Message-ID: <20091009161153.32D7A600801@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec webclient-kolab-conf.template 
Log Message:
Added new anonymous web calendar. (Merged from suc_branch)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -d -r1.10.2.6 -r1.10.2.7
--- ChangeLog	10 Sep 2009 09:32:26 -0000	1.10.2.6
+++ ChangeLog	9 Oct 2009 16:11:50 -0000	1.10.2.7
@@ -1,3 +1,12 @@
+2009-10-09  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Cleaner session handling for the export.
+
+2009-10-07  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Added functionality for anonymous
+	java script based export of calendar data.
+
 2009-09-10  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.10
retrieving revision 1.23.2.11
diff -u -d -r1.23.2.10 -r1.23.2.11
--- kolab-webclient.spec	10 Sep 2009 09:32:26 -0000	1.23.2.10
+++ kolab-webclient.spec	9 Oct 2009 16:11:50 -0000	1.23.2.11
@@ -2,8 +2,8 @@
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
 %define         V_year  2009
-%define         V_month 09
-%define         V_day   10
+%define         V_month 10
+%define         V_day   09
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1

Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kolab-conf.template,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- webclient-kolab-conf.template	7 Feb 2009 15:51:27 -0000	1.2
+++ webclient-kolab-conf.template	9 Oct 2009 16:11:51 -0000	1.2.2.1
@@ -18,4 +18,14 @@
 $conf['kolab']['imap']['server'] = '@@@local_addr@@@';
 @@@endif@@@
 $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
+
+/* Credentials for a proxy user to allow quasi anonymous ICS access
+ * via /public-cal/ics. You will need to create this user first.
+ */
+//$conf['ics']['default_user'] = 'proxy@@@@postfix-mydomain@@@';
+//$conf['ics']['default_pass'] = 'proxy';
+/**
+ * Uncomment if you wish to hide the organizer which is currently the proxy user.
+ */
+//$conf['ics']['hide_organizer'] = true;
 ?>



From cvs at kolab.org  Fri Oct  9 18:11:53 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 18:11:53 +0200 (CEST)
Subject: wilde: server release-notes.txt,1.398.2.55,1.398.2.56 
Message-ID: <20091009161153.32DFE600803@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Added new anonymous web calendar. (Merged from suc_branch)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.55
retrieving revision 1.398.2.56
diff -u -d -r1.398.2.55 -r1.398.2.56
--- release-notes.txt	23 Sep 2009 16:29:48 -0000	1.398.2.55
+++ release-notes.txt	9 Oct 2009 16:11:50 -0000	1.398.2.56
@@ -60,6 +60,14 @@
 
     - kolab-webclient-1.2.0-20090514
 
+	A proxy user can now be defined in the
+	webclient-kolab-conf.template which allows anonymous read only
+	access to all the users calendars.
+
+	The proxy users calender-events can be integrated into third
+	party sites using the new client/kronolith/imple_kolab.php
+	feature.
+
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)



From cvs at kolab.org  Fri Oct  9 18:11:53 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 18:11:53 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_ExportEventList.diff, NONE, 1.1.4.1 series,
	1.5.2.4, 1.5.2.5 
Message-ID: <20091009161153.69DC4600801@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv25112/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_ExportEventList.diff 
Log Message:
Added new anonymous web calendar. (Merged from suc_branch)

--- NEW FILE: t_kronolith_HK_GW_ExportEventList.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/GW/ExportEventList

Export a list of events.

STATUS: OPEN

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

---
 horde-webmail/kronolith/imple_kolab.php         |   96 +++++++++
 horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
 horde-webmail/kronolith/themes/embed.css        |   51 +++++-
 horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
 4 files changed, 390 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
new file mode 100644
index 0000000..65db938
--- /dev/null
+++ b/horde-webmail/kronolith/imple_kolab.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
+ *
+ * Copyright 2005-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author Michael Slusarz <slusarz at horde.org>
+ */
+
+function impleLogout() 
+{
+    Auth::clearAuth();
+    @session_destroy();
+}
+
+ at define('AUTH_HANDLER', true);
+ at define('HORDE_BASE', dirname(__FILE__) . '/..');
+require_once HORDE_BASE . '/lib/base.php';
+
+// We want to always generate UTF-8 iCalendar data.
+NLS::setCharset('UTF-8');
+
+$auth = &Auth::singleton('kolab');
+
+if (isset($conf['ics']['default_user'])
+    && isset($conf['ics']['default_pass'])) {
+    $user = $conf['ics']['default_user'];
+    $pass = $conf['ics']['default_pass'];
+    $_SESSION = array();
+    $auth->authenticate($user,
+                        array('password' =>
+                              $pass));
+    register_shutdown_function('impleLogout');
+}   
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/Imple.php';
+
+
+$path = Util::getFormData('imple');
+if (!$path) {
+    exit;
+}
+if ($path[0] == '/') {
+    $path = substr($path, 1);
+}
+$path = explode('/', $path);
+$impleName = array_shift($path);
+
+$imple = Imple::factory($impleName);
+if (!$imple) {
+    exit;
+}
+
+$args = array();
+foreach ($path as $pair) {
+    if (strpos($pair, '=') === false) {
+        $args[$pair] = true;
+    } else {
+        list($name, $val) = explode('=', $pair);
+        $args[$name] = $val;
+    }
+}
+
+$result = $imple->handle($args);
+
+if (!empty($_SERVER['Content-Type'])) {
+    $ct = $_SERVER['Content-Type'];
+} else {
+    $ct = is_string($result) ? 'plain' : 'json';
+}
+
+switch ($ct) {
+case 'json':
+    header('Content-Type: text/x-json');
+    require_once KRONOLITH_BASE . '/lib/JSON.php';
+    echo Kronolith_Serialize_JSON::encode(String::convertCharset($result, NLS::getCharset(), 'utf-8'));
+    break;
+
+case 'plain':
+    header('Content-Type: text/plain');
+    echo $result;
+    break;
+
+case 'html':
+    header('Content-Type: text/html');
+    echo $result;
+    break;
+
+default:
+    echo $result;
+}
\ No newline at end of file
diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
new file mode 100644
index 0000000..420a984
--- /dev/null
+++ b/horde-webmail/kronolith/lib/Block/eventlist.php
@@ -0,0 +1,243 @@
+<?php
+
+$block_name = _("Calendar List View");
+
+/**
+ * Horde_Block_Kronolith_eventlist:: Implementation of the Horde_Block API to
+ * display a list of events.
+ *
+ * $Horde: kronolith/lib/Block/summary.php,v 1.41.2.14 2008/08/21 00:31:03 mrubinsk Exp $
+ *
+ * @package Horde_Block
+ */
+class Horde_Block_Kronolith_eventlist extends Horde_Block {
+
+    var $_app = 'kronolith';
+
+    function _params()
+    {
+        @define('KRONOLITH_BASE', dirname(__FILE__) . '/../..');
+        require_once KRONOLITH_BASE . '/lib/base.php';
+
+        $params = array('days' => array('name' => _("Days"),
+                                        'type' => 'int',
+                                        'default' => 42),
+                        'maxevents' => array('name' => _("Maximum number of events to display (0 = no limit)"),
+                                             'type' => 'int',
+                                             'default' => 0));
+
+        return $params;
+    }
+
+    /**
+     * The title to go in this block.
+     *
+     * @return string   The title text.
+     */
+    function _title()
+    {
+        global $registry;
+        return '';
+    }
+
+    /**
+     * The content to go in this block.
+     *
+     * @return string   The content
+     */
+    function _content()
+    {
+        global $kronolith_driver, $registry, $prefs;
+        require_once dirname(__FILE__) . '/../base.php';
+        require_once KRONOLITH_BASE . '/lib/Day.php';
+        require_once 'Horde/Prefs/CategoryManager.php';
+        require_once 'Horde/Text/Filter.php';
+
+        if (!empty($this->_params['days'])) {
+            $span = $this->_params['days'];
+        } else {
+            $span = 42;
+        }
+
+        $now = $_SERVER['REQUEST_TIME'];
+        $today = date('j');
+
+        $startDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j')));
+        $endDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j') + $span));
+        $endDate->correct();
+
+        if (isset($this->_params['calendar']) &&
+            $this->_params['calendar'] != '__all') {
+
+            $calendar = $GLOBALS['kronolith_shares']->getShare($this->_params['calendar']);
+            if (!is_a($calendar, 'PEAR_Error') && !$calendar->hasPermission(Auth::getAuth(), PERMS_SHOW)) {
+                return _("Permission Denied");
+            }
+
+            $all_events = Kronolith::listEvents($startDate,
+                                                $endDate,
+                                                array($this->_params['calendar']));
+        } else {
+            $calendars = Kronolith::listCalendars(false, PERMS_SHOW);
+            $all_events = Kronolith::listEvents($startDate,
+                                                $endDate,
+                                                array_keys($calendars));
+        }
+        if (is_a($all_events, 'PEAR_Error')) {
+            return '<em>' . $all_events->getMessage() . '</em>';
+        }
+
+        $iMax = $today + $span;
+
+        $html = '';
+        $firstday = true;
+        $olddayname = '';
+        $totalevents = 0;
+
+        $displayed = array();
+
+        for ($i = $today; $i < $iMax; ++$i) {
+            $day = new Kronolith_Day(date('n'), $i);
+
+            if ($day->isToday()) {
+                $dayname = _("Today");
+            } elseif ($day->isTomorrow()) {
+                $dayname = _("Tomorrow");
+            } elseif ($day->weekOfYear() == $startDate->weekOfYear()) {
+                $dayname = _("This week");
+            } elseif ($day->month == $startDate->month) {
+                if ($day->weekOfYear() == $startDate->weekOfYear() + 1) {
+                    $dayname = _("Next week");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 2) {
+                    $dayname = _("Two weeks from now");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 3) {
+                    $dayname = _("Three weeks from now");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 4) {
+                    $dayname = _("Four weeks from now");
+                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 5) {
+                    $dayname = _("Five weeks from now");
+                }
+            } elseif ($day->month - 1 == $startDate->month
+                      || ($day->month == 1 && $startDate->month == 12)) {
+                $dayname = _("Next month");
+            } elseif ($day->year == $startDate->year) {
+                $dayname = $day->format('F');
+            } elseif ($day->year - 1 == $startDate->year) {
+                $dayname = _("Next year");
+            } else {
+                $dayname = _("After the next year");
+            }
+
+            if (empty($all_events[$day->getStamp()])) {
+                continue;
+            }
+
+            $events = &$all_events[$day->getStamp()];
+
+            $today12am = mktime(0, 0, 0,
+                                $day->month,
+                                $day->mday,
+                                $day->year);
+            $tomorrow12am = mktime(0, 0, 0,
+                                   $day->month,
+                                   $day->mday + 1,
+                                   $day->year);
+            foreach ($events as $event) {
+
+                if (!empty($this->_params['maxevents']) &&
+                    $totalevents >= $this->_params['maxevents']) {
+                    break 2;
+                }
+
+                if ($event->end->timestamp() < $now) {
+                    continue;
+                }
+                if ($dayname != $olddayname) {
+                    if (!$firstday) {
+                        $html .= '<tr><td colspan="3">&nbsp;</td></tr>';
+                    }
+                    $html .= '<tr align="center"><td colspan="3" class="section">';
+                    $html .= $dayname . '</td></tr>';
+                    $olddayname = $dayname;
+                    $firstday = false;
+                }
+
+                if (in_array($event->getId(), $displayed)) {
+                    continue;
+                }
+
+                $category = $event->getCategory();
+                if (!empty($category)) {
+                    $ctd = '<td class="category_bar category' . md5($category) . '" width="1%" />';
+                } else {
+                    $ctd = '<td />';
+                }
+
+                if ($event->isAllDay()) {
+                    $format = 'D, d M Y';
+                } else {
+                    $format = 'G:i T D, d M Y';
+                }
+
+                if ($event->start->timestamp() < $now) {
+                    $time = _('until') . date($format, $event->end->timestamp());
+                } else {
+                    $time = date($format, $event->start->timestamp()) . _(' to ') .
+                        date($format, $event->end->timestamp());
+                }
+
+                $html .= '<tr>' . $ctd . '<td class="event" style="vertical-align:top;"><div class="time">';
+
+                if ($event->start->timestamp() < $now &&
+                    $event->end->timestamp() > $now) {
+                    $html .= '<strong>';
+                }
+
+                $html .= $time;
+
+                if ($event->start->timestamp() < $now &&
+                    $event->end->timestamp() > $now) {
+                    $html .= '</strong>';
+                }
+
+                $html .= '</div><div class="location" style="vertical-align:top">';
+                $html .= $event->getLocation();
+                $html .= '</div></td><td style="vertical-align:top;" class="event"><div class="eventtitle">';
+                $html .= $event->getTitle();
+                $html .= '</div>';
+
+                $html .= '<div class="description">';
+                $desc = Text_Filter::filter($event->getDescription(), 'text2html', array('parselevel' => TEXT_HTML_MICRO, 'class' => 'text'));
+                $html .= strtr($desc, array("\n" => " ", "\r" => " "));
+                $html .= '</div>';
+
+                $html .= '</td></tr>';
+
+                $html .= '<tr>' . $ctd . '<td  class="linedRow"/><td class="linedRow annotation">';
+
+                if (!empty($category)) {
+                    $html .= '<div style="text-align:right;float:left;">';
+                    $html .= _("Category") . ': ' . $category;
+                    $html .= '</div>';
+                }
+
+                $html .= '<div style="text-align:right">';
+                $html .= _("Calendar") . ': ' . urldecode($event->getCalendar());
+                $html .= '</div>';
+
+                $html .= '</td></tr>';
+
+                $totalevents++;
+
+                $displayed[] = $event->getId();
+            }
+        }
+
+        if (empty($html)) {
+            return '<em>' . _("No events to display") . '</em>';
+        }
+
+        return '<link href="' . Horde::applicationUrl('themes/categoryCSS.php') . '" rel="stylesheet" type="text/css" /><table cellspacing="0" width="100%">' . $html . '</table>';
+    }
+
+}
diff --git a/horde-webmail/kronolith/themes/embed.css b/horde-webmail/kronolith/themes/embed.css
index 6ce8835..b084aa2 100644
--- a/horde-webmail/kronolith/themes/embed.css
+++ b/horde-webmail/kronolith/themes/embed.css
@@ -103,4 +103,53 @@ div.horde_nicetitle pre {
     text-align: left;
     font-size: 75%;
     font-family: "Lucida Console",Courier,"Courier New";
-}
\ No newline at end of file
+}
+
+.kronolith_embedded category_bar {
+}
+
+.kronolith_embedded .eventtitle {
+    font-weight: bold;
+    padding: 5px;
+}
+
+.kronolith_embedded .leftbar {
+    border-right:  1px solid #DDDDDD;
+    padding: 4px;
+}
+
+.kronolith_embedded .location {
+    font-size: 85%;
+    padding-top: 10px;
+    margin-left: 5px;
+}
+
+.kronolith_embedded .annotation {
+    font-size: 75%;
+    padding-top: 10px;
+    padding-left: 5px;
+}
+
+.kronolith_embedded .description {
+    font-size: 85%;
+    padding-top: 10px;
+    padding-left: 5px;
+}
+
+.kronolith_embedded .time {
+    font-size: 85%;
+    margin-top: 5px;
+    padding: 5px;
+    margin-left: 5px;
+    background: #ddddff;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+
+.kronolith_embedded .section {
+    font-weight: bold;
+    background: #eeeeee;
+    border-bottom: 1px solid #999999;
+    color: #000000;
+    padding: 1px;
+}
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/horde-webmail/lib/Horde/Kolab/Storage/List.php
+++ b/horde-webmail/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')) {
-- 
tg: (2f74c4c..) t/kronolith/HK/GW/ExportEventList (depends on: t/dimp/H/BL/CloseContextMenu)
-- 
TOPGIT patch commit log
=======================

commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Oct 9 09:18:48 2009 +0200

    Clean logout.

commit c471608f1adfa116123b913959498d5b7f8defc6
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Oct 9 08:45:58 2009 +0200

    Cleaner session handling.

commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Oct 7 22:22:07 2009 +0200

    Comment.

commit 787cac7fd3a7dd282ad66596c30fc0eaf67bbe20
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Oct 7 22:19:43 2009 +0200

    Export a list of events.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -d -r1.5.2.4 -r1.5.2.5
--- series	10 Sep 2009 09:32:26 -0000	1.5.2.4
+++ series	9 Oct 2009 16:11:51 -0000	1.5.2.5
@@ -69,3 +69,4 @@
 t_imp_H_MS_bug7438.diff -p1
 t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff -p1
 t_framework_HK_GW_Prefs_FileDriverHotfix.diff -p1
+t_kronolith_HK_GW_ExportEventList.diff -p1



From cvs at kolab.org  Fri Oct  9 18:11:53 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 18:11:53 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.10, 1.32.2.11 
Message-ID: <20091009161153.A49B4600801@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv25112/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Added new anonymous web calendar. (Merged from suc_branch)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.10
retrieving revision 1.32.2.11
diff -u -d -r1.32.2.10 -r1.32.2.11
--- horde-webmail-1.2.0_kolab_openpkg.patch	23 Sep 2009 08:59:42 -0000	1.32.2.10
+++ horde-webmail-1.2.0_kolab_openpkg.patch	9 Oct 2009 16:11:51 -0000	1.32.2.11
@@ -20021,6 +20021,476 @@
              }
          }
  
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/kronolith/HK/GW/ExportEventList
+
+Export a list of events.
+
+STATUS: OPEN
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/kronolith/imple_kolab.php         |   96 +++++++++
+ horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
+ horde-webmail/kronolith/themes/embed.css        |   51 +++++-
+ horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
+ 4 files changed, 390 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
+new file mode 100644
+index 0000000..65db938
+--- /dev/null
++++ b/horde-webmail/kronolith/imple_kolab.php
+@@ -0,0 +1,96 @@
++<?php
++/**
++ * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
++ *
++ * Copyright 2005-2008 The Horde Project (http://www.horde.org/)
++ *
++ * See the enclosed file COPYING for license information (GPL). If you
++ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
++ *
++ * @author Michael Slusarz <slusarz at horde.org>
++ */
++
++function impleLogout() 
++{
++    Auth::clearAuth();
++    @session_destroy();
++}
++
++ at define('AUTH_HANDLER', true);
++ at define('HORDE_BASE', dirname(__FILE__) . '/..');
++require_once HORDE_BASE . '/lib/base.php';
++
++// We want to always generate UTF-8 iCalendar data.
++NLS::setCharset('UTF-8');
++
++$auth = &Auth::singleton('kolab');
++
++if (isset($conf['ics']['default_user'])
++    && isset($conf['ics']['default_pass'])) {
++    $user = $conf['ics']['default_user'];
++    $pass = $conf['ics']['default_pass'];
++    $_SESSION = array();
++    $auth->authenticate($user,
++                        array('password' =>
++                              $pass));
++    register_shutdown_function('impleLogout');
++}   
++
++ at define('KRONOLITH_BASE', dirname(__FILE__));
++require_once KRONOLITH_BASE . '/lib/base.php';
++require_once KRONOLITH_BASE . '/lib/Imple.php';
++
++
++$path = Util::getFormData('imple');
++if (!$path) {
++    exit;
++}
++if ($path[0] == '/') {
++    $path = substr($path, 1);
++}
++$path = explode('/', $path);
++$impleName = array_shift($path);
++
++$imple = Imple::factory($impleName);
++if (!$imple) {
++    exit;
++}
++
++$args = array();
++foreach ($path as $pair) {
++    if (strpos($pair, '=') === false) {
++        $args[$pair] = true;
++    } else {
++        list($name, $val) = explode('=', $pair);
++        $args[$name] = $val;
++    }
++}
++
++$result = $imple->handle($args);
++
++if (!empty($_SERVER['Content-Type'])) {
++    $ct = $_SERVER['Content-Type'];
++} else {
++    $ct = is_string($result) ? 'plain' : 'json';
++}
++
++switch ($ct) {
++case 'json':
++    header('Content-Type: text/x-json');
++    require_once KRONOLITH_BASE . '/lib/JSON.php';
++    echo Kronolith_Serialize_JSON::encode(String::convertCharset($result, NLS::getCharset(), 'utf-8'));
++    break;
++
++case 'plain':
++    header('Content-Type: text/plain');
++    echo $result;
++    break;
++
++case 'html':
++    header('Content-Type: text/html');
++    echo $result;
++    break;
++
++default:
++    echo $result;
++}
+\ No newline at end of file
+diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
+new file mode 100644
+index 0000000..420a984
+--- /dev/null
++++ b/horde-webmail/kronolith/lib/Block/eventlist.php
+@@ -0,0 +1,243 @@
++<?php
++
++$block_name = _("Calendar List View");
++
++/**
++ * Horde_Block_Kronolith_eventlist:: Implementation of the Horde_Block API to
++ * display a list of events.
++ *
++ * $Horde: kronolith/lib/Block/summary.php,v 1.41.2.14 2008/08/21 00:31:03 mrubinsk Exp $
++ *
++ * @package Horde_Block
++ */
++class Horde_Block_Kronolith_eventlist extends Horde_Block {
++
++    var $_app = 'kronolith';
++
++    function _params()
++    {
++        @define('KRONOLITH_BASE', dirname(__FILE__) . '/../..');
++        require_once KRONOLITH_BASE . '/lib/base.php';
++
++        $params = array('days' => array('name' => _("Days"),
++                                        'type' => 'int',
++                                        'default' => 42),
++                        'maxevents' => array('name' => _("Maximum number of events to display (0 = no limit)"),
++                                             'type' => 'int',
++                                             'default' => 0));
++
++        return $params;
++    }
++
++    /**
++     * The title to go in this block.
++     *
++     * @return string   The title text.
++     */
++    function _title()
++    {
++        global $registry;
++        return '';
++    }
++
++    /**
++     * The content to go in this block.
++     *
++     * @return string   The content
++     */
++    function _content()
++    {
++        global $kronolith_driver, $registry, $prefs;
++        require_once dirname(__FILE__) . '/../base.php';
++        require_once KRONOLITH_BASE . '/lib/Day.php';
++        require_once 'Horde/Prefs/CategoryManager.php';
++        require_once 'Horde/Text/Filter.php';
++
++        if (!empty($this->_params['days'])) {
++            $span = $this->_params['days'];
++        } else {
++            $span = 42;
++        }
++
++        $now = $_SERVER['REQUEST_TIME'];
++        $today = date('j');
++
++        $startDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j')));
++        $endDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j') + $span));
++        $endDate->correct();
++
++        if (isset($this->_params['calendar']) &&
++            $this->_params['calendar'] != '__all') {
++
++            $calendar = $GLOBALS['kronolith_shares']->getShare($this->_params['calendar']);
++            if (!is_a($calendar, 'PEAR_Error') && !$calendar->hasPermission(Auth::getAuth(), PERMS_SHOW)) {
++                return _("Permission Denied");
++            }
++
++            $all_events = Kronolith::listEvents($startDate,
++                                                $endDate,
++                                                array($this->_params['calendar']));
++        } else {
++            $calendars = Kronolith::listCalendars(false, PERMS_SHOW);
++            $all_events = Kronolith::listEvents($startDate,
++                                                $endDate,
++                                                array_keys($calendars));
++        }
++        if (is_a($all_events, 'PEAR_Error')) {
++            return '<em>' . $all_events->getMessage() . '</em>';
++        }
++
++        $iMax = $today + $span;
++
++        $html = '';
++        $firstday = true;
++        $olddayname = '';
++        $totalevents = 0;
++
++        $displayed = array();
++
++        for ($i = $today; $i < $iMax; ++$i) {
++            $day = new Kronolith_Day(date('n'), $i);
++
++            if ($day->isToday()) {
++                $dayname = _("Today");
++            } elseif ($day->isTomorrow()) {
++                $dayname = _("Tomorrow");
++            } elseif ($day->weekOfYear() == $startDate->weekOfYear()) {
++                $dayname = _("This week");
++            } elseif ($day->month == $startDate->month) {
++                if ($day->weekOfYear() == $startDate->weekOfYear() + 1) {
++                    $dayname = _("Next week");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 2) {
++                    $dayname = _("Two weeks from now");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 3) {
++                    $dayname = _("Three weeks from now");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 4) {
++                    $dayname = _("Four weeks from now");
++                } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 5) {
++                    $dayname = _("Five weeks from now");
++                }
++            } elseif ($day->month - 1 == $startDate->month
++                      || ($day->month == 1 && $startDate->month == 12)) {
++                $dayname = _("Next month");
++            } elseif ($day->year == $startDate->year) {
++                $dayname = $day->format('F');
++            } elseif ($day->year - 1 == $startDate->year) {
++                $dayname = _("Next year");
++            } else {
++                $dayname = _("After the next year");
++            }
++
++            if (empty($all_events[$day->getStamp()])) {
++                continue;
++            }
++
++            $events = &$all_events[$day->getStamp()];
++
++            $today12am = mktime(0, 0, 0,
++                                $day->month,
++                                $day->mday,
++                                $day->year);
++            $tomorrow12am = mktime(0, 0, 0,
++                                   $day->month,
++                                   $day->mday + 1,
++                                   $day->year);
++            foreach ($events as $event) {
++
++                if (!empty($this->_params['maxevents']) &&
++                    $totalevents >= $this->_params['maxevents']) {
++                    break 2;
++                }
++
++                if ($event->end->timestamp() < $now) {
++                    continue;
++                }
++                if ($dayname != $olddayname) {
++                    if (!$firstday) {
++                        $html .= '<tr><td colspan="3">&nbsp;</td></tr>';
++                    }
++                    $html .= '<tr align="center"><td colspan="3" class="section">';
++                    $html .= $dayname . '</td></tr>';
++                    $olddayname = $dayname;
++                    $firstday = false;
++                }
++
++                if (in_array($event->getId(), $displayed)) {
++                    continue;
++                }
++
++                $category = $event->getCategory();
++                if (!empty($category)) {
++                    $ctd = '<td class="category_bar category' . md5($category) . '" width="1%" />';
++                } else {
++                    $ctd = '<td />';
++                }
++
++                if ($event->isAllDay()) {
++                    $format = 'D, d M Y';
++                } else {
++                    $format = 'G:i T D, d M Y';
++                }
++
++                if ($event->start->timestamp() < $now) {
++                    $time = _('until') . date($format, $event->end->timestamp());
++                } else {
++                    $time = date($format, $event->start->timestamp()) . _(' to ') .
++                        date($format, $event->end->timestamp());
++                }
++
++                $html .= '<tr>' . $ctd . '<td class="event" style="vertical-align:top;"><div class="time">';
++
++                if ($event->start->timestamp() < $now &&
++                    $event->end->timestamp() > $now) {
++                    $html .= '<strong>';
++                }
++
++                $html .= $time;
++
++                if ($event->start->timestamp() < $now &&
++                    $event->end->timestamp() > $now) {
++                    $html .= '</strong>';
++                }
++
++                $html .= '</div><div class="location" style="vertical-align:top">';
++                $html .= $event->getLocation();
++                $html .= '</div></td><td style="vertical-align:top;" class="event"><div class="eventtitle">';
++                $html .= $event->getTitle();
++                $html .= '</div>';
++
++                $html .= '<div class="description">';
++                $desc = Text_Filter::filter($event->getDescription(), 'text2html', array('parselevel' => TEXT_HTML_MICRO, 'class' => 'text'));
++                $html .= strtr($desc, array("\n" => " ", "\r" => " "));
++                $html .= '</div>';
++
++                $html .= '</td></tr>';
++
++                $html .= '<tr>' . $ctd . '<td  class="linedRow"/><td class="linedRow annotation">';
++
++                if (!empty($category)) {
++                    $html .= '<div style="text-align:right;float:left;">';
++                    $html .= _("Category") . ': ' . $category;
++                    $html .= '</div>';
++                }
++
++                $html .= '<div style="text-align:right">';
++                $html .= _("Calendar") . ': ' . urldecode($event->getCalendar());
++                $html .= '</div>';
++
++                $html .= '</td></tr>';
++
++                $totalevents++;
++
++                $displayed[] = $event->getId();
++            }
++        }
++
++        if (empty($html)) {
++            return '<em>' . _("No events to display") . '</em>';
++        }
++
++        return '<link href="' . Horde::applicationUrl('themes/categoryCSS.php') . '" rel="stylesheet" type="text/css" /><table cellspacing="0" width="100%">' . $html . '</table>';
++    }
++
++}
+diff --git a/horde-webmail/kronolith/themes/embed.css b/horde-webmail/kronolith/themes/embed.css
+index 6ce8835..b084aa2 100644
+--- a/horde-webmail/kronolith/themes/embed.css
++++ b/horde-webmail/kronolith/themes/embed.css
+@@ -103,4 +103,53 @@ div.horde_nicetitle pre {
+     text-align: left;
+     font-size: 75%;
+     font-family: "Lucida Console",Courier,"Courier New";
+-}
+\ No newline at end of file
++}
++
++.kronolith_embedded category_bar {
++}
++
++.kronolith_embedded .eventtitle {
++    font-weight: bold;
++    padding: 5px;
++}
++
++.kronolith_embedded .leftbar {
++    border-right:  1px solid #DDDDDD;
++    padding: 4px;
++}
++
++.kronolith_embedded .location {
++    font-size: 85%;
++    padding-top: 10px;
++    margin-left: 5px;
++}
++
++.kronolith_embedded .annotation {
++    font-size: 75%;
++    padding-top: 10px;
++    padding-left: 5px;
++}
++
++.kronolith_embedded .description {
++    font-size: 85%;
++    padding-top: 10px;
++    padding-left: 5px;
++}
++
++.kronolith_embedded .time {
++    font-size: 85%;
++    margin-top: 5px;
++    padding: 5px;
++    margin-left: 5px;
++    background: #ddddff;
++    -moz-border-radius: 5px;
++    -webkit-border-radius: 5px;
++}
++
++.kronolith_embedded .section {
++    font-weight: bold;
++    background: #eeeeee;
++    border-bottom: 1px solid #999999;
++    color: #000000;
++    padding: 1px;
++}
+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/horde-webmail/lib/Horde/Kolab/Storage/List.php
++++ b/horde-webmail/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')) {
+-- 
+tg: (2f74c4c..) t/kronolith/HK/GW/ExportEventList (depends on: t/dimp/H/BL/CloseContextMenu)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 09:18:48 2009 +0200
+
+    Clean logout.
+
+commit c471608f1adfa116123b913959498d5b7f8defc6
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 08:45:58 2009 +0200
+
+    Cleaner session handling.
+
+commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Wed Oct 7 22:22:07 2009 +0200
+
+    Comment.
+
+commit 787cac7fd3a7dd282ad66596c30fc0eaf67bbe20
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Wed Oct 7 22:19:43 2009 +0200
+
+    Export a list of events.
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Fri Oct  9 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  9 Oct 2009 18:12:37 +0200 (CEST)
Subject: wilde: doc/raw-howtos web-calendar.txt,NONE,1.1 
Message-ID: <20091009161237.6694E600801@lists.intevation.de>

Author: wilde

Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv25228

Added Files:
	web-calendar.txt 
Log Message:
Added mini doc for new anonymous web calendar.


--- NEW FILE: web-calendar.txt ---
------------------------------------------------------------------------
                   The anonymous Kolab Web Calendar
------------------------------------------------------------------------
Sascha Wilde <wilde at intevation.de>


Since 2009/10/09 the CVS kolab_2_2_branch contains a new feature,
allowing to integrate a view of dedicated calendars into third party
web sites.


Concept:

A dedicated "proxy" user is created and the id and password of this
user is made known to certain parts of the webclient.

The proxy user is granted read access to one or more calendar by
regular Kolab users.

A view of the events in these shared calendars is offered for
anonymous (read: no authorization required) integration in websites.


Usage:

1. Create an new user account e.g. "proxy at example.com" with password
   "secret".

2. In /kolab/etc/kolab/templates/webclient-kolab-conf.template the
   lines
     $conf['ics']['default_user'] = 'proxy@@@@postfix-mydomain@@@';
     $conf['ics']['default_pass'] = 'proxy';
   must be uncommented and filled with the correct credentials a
   chosen in 1.

3. Grant list/read access for some calendar folders to the user
   "proxy at example.com".

4. Add to any web-page following lines:
     <div id="calendar"></div>
     <script type="text/javascript"
       src="https://KOLABSERVER.example.com/client/kronolith/imple_kolab.php?imple=Embed/container=calendar/view=eventlist">
     </script>
   The <div> tag will be replaced by an view of all upcoming events in
   the calendars accessible for the proxy user.


Security considerations:

One should note, that the data from calendars shared to the proxy user
is freely, world wide readable unless the access to the Kolab
Webclient server is restricted by other means.



From cvs at kolab.org  Mon Oct 12 14:46:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 14:46:49 +0200 (CEST)
Subject: wilde: server/kolab-webclient ChangeLog,1.10.2.7,1.10.2.8 
Message-ID: <20091012124649.BFAFE600174@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Unified formatting.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -u -d -r1.10.2.7 -r1.10.2.8
--- ChangeLog	9 Oct 2009 16:11:50 -0000	1.10.2.7
+++ ChangeLog	12 Oct 2009 12:46:47 -0000	1.10.2.8
@@ -10,20 +10,17 @@
 2009-09-10  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:
-
 	kolab/issue3555 (unable to save filter settings more than once)
 
 2009-09-09  Gunnar Wrobel  <p at rdus.de>
 
-	* webclient-kronolith-kolab-conf.template: 
-
+	* webclient-kronolith-kolab-conf.template:
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 
 2009-05-13  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:
-
 	kolab/issue3420 (web client prefs and hooks should be configurable
 	                 via templates)
 
@@ -43,7 +40,7 @@
 2008-02-07  Mathieu Parent <math.parent at gmail.com>
 
 	* webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template: 
-	  dist_conf configuration in kolab webclient templates (kolab/issue3387)
+	dist_conf configuration in kolab webclient templates (kolab/issue3387)
 
 2009-01-08  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Mon Oct 12 16:09:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 16:09:02 +0200 (CEST)
Subject: wilde: server/kolabd/kolabd/templates httpd.conf.template.in, 1.28,
	1.28.2.1 
Message-ID: <20091012140902.9353E600800@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	httpd.conf.template.in 
Log Message:
Added anonymous ICS export. (Merged from suc branch)


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- httpd.conf.template.in	3 Mar 2009 16:59:00 -0000	1.28
+++ httpd.conf.template.in	12 Oct 2009 14:09:00 -0000	1.28.2.1
@@ -191,6 +191,8 @@
 
 Alias /icons/ "@webserver_document_root@/icons/"
 
+Alias /public-cal/ics "@webserver_document_root@/client/kronolith/ics_kolab.php"
+
 <Directory "@webserver_document_root@/icons">
     Options Indexes MultiViews
     AllowOverride None



From cvs at kolab.org  Mon Oct 12 16:09:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 16:09:02 +0200 (CEST)
Subject: wilde: server/kolab-webclient ChangeLog,1.10.2.8,1.10.2.9 
Message-ID: <20091012140902.946D0600801@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Added anonymous ICS export. (Merged from suc branch)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -d -r1.10.2.8 -r1.10.2.9
--- ChangeLog	12 Oct 2009 12:46:47 -0000	1.10.2.8
+++ ChangeLog	12 Oct 2009 14:09:00 -0000	1.10.2.9
@@ -18,6 +18,11 @@
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 
+2009-05-28  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Added functionality for anonymous
+	ics (iCal data) download.
+
 2009-05-13  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:



From cvs at kolab.org  Mon Oct 12 16:09:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 16:09:02 +0200 (CEST)
Subject: wilde: server release-notes.txt,1.398.2.56,1.398.2.57 
Message-ID: <20091012140902.CCEA9600800@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Added anonymous ICS export. (Merged from suc branch)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.56
retrieving revision 1.398.2.57
diff -u -d -r1.398.2.56 -r1.398.2.57
--- release-notes.txt	9 Oct 2009 16:11:50 -0000	1.398.2.56
+++ release-notes.txt	12 Oct 2009 14:09:00 -0000	1.398.2.57
@@ -68,6 +68,9 @@
 	party sites using the new client/kronolith/imple_kolab.php
 	feature.
 
+	Calendars accessible for the proxy user can be anonymously
+	downloaded as ics files.
+
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)



From cvs at kolab.org  Mon Oct 12 16:09:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 16:09:03 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_AnonymousiCalDownload.diff, NONE,
	1.1.4.1 series, 1.5.2.5, 1.5.2.6 
Message-ID: <20091012140903.4B000600801@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv28743/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_AnonymousiCalDownload.diff 
Log Message:
Added anonymous ICS export. (Merged from suc branch)


--- NEW FILE: t_kronolith_HK_GW_AnonymousiCalDownload.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/GW/AnonymousiCalDownload

This patch allows anonymous access via kronolith/ics_kolab.php by
using a proxy user that needs to be given access to user calendars
that should be exported anonymously.

STATUS: HACK

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

---
 horde-webmail/config/kolab.php        |    4 +
 horde-webmail/kronolith/ics_kolab.php |  110 +++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 0 deletions(-)

diff --git a/horde-webmail/config/kolab.php b/horde-webmail/config/kolab.php
index ed41da4..118788a 100644
--- a/horde-webmail/config/kolab.php
+++ b/horde-webmail/config/kolab.php
@@ -35,6 +35,10 @@ $conf['kolab']['imap']['server'] = 'localhost';
 /* Primary mail domain of your Kolab server */
 $conf['kolab']['imap']['maildomain'] = 'example.com';
 
+/* Credentials for a proxy user to allow quasi anonymous ICS access via kronolith/ics_kolab.php */
+//$conf['ics']['default_user'] = '';
+//$conf['ics']['default_pass'] = '';
+
 if (file_exists(dirname(__FILE__) . '/kolab.local.php')) {
   require(dirname(__FILE__) . '/kolab.local.php');
 }
diff --git a/horde-webmail/kronolith/ics_kolab.php b/horde-webmail/kronolith/ics_kolab.php
new file mode 100644
index 0000000..2b81832
--- /dev/null
+++ b/horde-webmail/kronolith/ics_kolab.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * $Horde: kronolith/ics.php,v 1.5.2.10 2008/01/10 16:16:49 jan Exp $
+ *
+ * Copyright 1999-2008 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author Chuck Hagenbuch <chuck at horde.org>
+ */
+
+function logout() 
+{
+    Auth::clearAuth();
+    @session_destroy();
+}
+
+ at define('AUTH_HANDLER', true);
+ at define('HORDE_BASE', dirname(__FILE__) . '/..');
+require_once HORDE_BASE . '/lib/base.php';
+
+// We want to always generate UTF-8 iCalendar data.
+NLS::setCharset('UTF-8');
+
+// Determine which calendar to export.
+$calendar = Util::getFormData('c');
+if (empty($calendar) && !empty($_SERVER['PATH_INFO'])) {
+    $calendar = basename($_SERVER['PATH_INFO']);
+}
+
+// Authenticate.
+$auth = &Auth::singleton($conf['auth']['driver']);
+if (!isset($_SERVER['PHP_AUTH_USER'])) {
+    if (isset($conf['ics']['default_user'])
+        && isset($conf['ics']['default_pass'])) {
+        $user = $conf['ics']['default_user'];
+        $pass = $conf['ics']['default_pass'];
+        $proxied = true;
+    }   
+} else {
+    $user = $_SERVER['PHP_AUTH_USER'];
+    $pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : null;
+}
+
+if (!isset($user) || !$auth->authenticate($user, array('password' => $pass))) {
+    header('WWW-Authenticate: Basic realm="Kronolith iCalendar Interface"');
+    header('HTTP/1.0 401 Unauthorized');
+    echo '401 Unauthorized';
+    exit;
+}
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once 'Horde/Cache.php';
+require_once 'Horde/iCalendar.php';
+
+$share = $kronolith_shares->getShare($calendar);
+if (is_a($share, 'PEAR_Error')) {
+    header('HTTP/1.0 400 Bad Request');
+    echo '400 Bad Request';
+    if ($proxied) {
+        logout();
+    }
+    exit;
+}
+
+if (!$share->hasPermission(Auth::getAuth(), PERMS_READ)) {
+    header('WWW-Authenticate: Basic realm="Kronolith iCalendar Interface"');
+    header('HTTP/1.0 401 Unauthorized');
+    echo '401 Unauthorized';
+    exit;
+}
+
+$cache = &Horde_Cache::singleton($conf['cache']['driver'], Horde::getDriverConfig('cache', $conf['cache']['driver']));
+$key = 'kronolith.ics.' . $calendar;
+
+$ics = $cache->get($key, 360);
+if (!$ics) {
+    $kronolith_driver->open(urlencode($calendar));
+    $events = $kronolith_driver->listEvents();
+
+    $iCal = new Horde_iCalendar();
+    $iCal->setAttribute('X-WR-CALNAME', String::convertCharset($share->get('name'), NLS::getCharset(), 'utf-8'));
+
+    foreach ($events as $id) {
+        $event = &$kronolith_driver->getEvent($id);
+        if (is_a($event, 'PEAR_Error')) {
+            continue;
+        }
+        $iCalEvent = $event->toiCalendar($iCal);
+        if (!empty($conf['ics']['hide_organizer'])) {
+            $iCalEvent->removeAttribute('ORGANIZER');
+        }
+        $iCal->addComponent($iCalEvent);
+    }
+
+    $ics = $iCal->exportvCalendar();
+    $cache->set($key, $ics);
+}
+
+$browser->downloadHeaders($calendar . '.ics',
+                          'text/calendar; charset=' . NLS::getCharset(),
+                          true,
+                          strlen($ics));
+echo $ics;
+
+if ($proxied) {
+    logout();
+}
-- 
tg: (b5749f0..) t/kronolith/HK/GW/AnonymousiCalDownload (depends on: t/dimp/H/GW/AclView)
-- 
TOPGIT patch commit log
=======================

commit 4ac58a4d646865d74ac26c0439f29ceacfdfea82
Author: Gunnar Wrobel <p at rdus.de>
Date:   Thu Jun 4 09:40:25 2009 +0200

    Allow to hide the organizer.

commit 0df1aefd621efbe8a2d7e306fbc79dace5760280
Author: Gunnar Wrobel <p at rdus.de>
Date:   Thu May 28 12:42:44 2009 +0200

    First version of the anonymous ics download patch.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -d -r1.5.2.5 -r1.5.2.6
--- series	9 Oct 2009 16:11:51 -0000	1.5.2.5
+++ series	12 Oct 2009 14:09:01 -0000	1.5.2.6
@@ -69,4 +69,5 @@
 t_imp_H_MS_bug7438.diff -p1
 t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff -p1
 t_framework_HK_GW_Prefs_FileDriverHotfix.diff -p1
+t_kronolith_HK_GW_AnonymousiCalDownload.diff -p1
 t_kronolith_HK_GW_ExportEventList.diff -p1



From cvs at kolab.org  Mon Oct 12 16:09:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 16:09:03 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.11, 1.32.2.12 
Message-ID: <20091012140903.E7EC360081B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv28743/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Added anonymous ICS export. (Merged from suc branch)


Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.11
retrieving revision 1.32.2.12
diff -u -d -r1.32.2.11 -r1.32.2.12
--- horde-webmail-1.2.0_kolab_openpkg.patch	9 Oct 2009 16:11:51 -0000	1.32.2.11
+++ horde-webmail-1.2.0_kolab_openpkg.patch	12 Oct 2009 14:09:00 -0000	1.32.2.12
@@ -20022,6 +20022,170 @@
          }
  
 From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/kronolith/HK/GW/AnonymousiCalDownload
+
+This patch allows anonymous access via kronolith/ics_kolab.php by
+using a proxy user that needs to be given access to user calendars
+that should be exported anonymously.
+
+STATUS: HACK
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/config/kolab.php        |    4 +
+ horde-webmail/kronolith/ics_kolab.php |  110 +++++++++++++++++++++++++++++++++
+ 2 files changed, 114 insertions(+), 0 deletions(-)
+
+diff --git a/horde-webmail/config/kolab.php b/horde-webmail/config/kolab.php
+index ed41da4..118788a 100644
+--- a/horde-webmail/config/kolab.php
++++ b/horde-webmail/config/kolab.php
+@@ -35,6 +35,10 @@ $conf['kolab']['imap']['server'] = 'localhost';
+ /* Primary mail domain of your Kolab server */
+ $conf['kolab']['imap']['maildomain'] = 'example.com';
+ 
++/* Credentials for a proxy user to allow quasi anonymous ICS access via kronolith/ics_kolab.php */
++//$conf['ics']['default_user'] = '';
++//$conf['ics']['default_pass'] = '';
++
+ if (file_exists(dirname(__FILE__) . '/kolab.local.php')) {
+   require(dirname(__FILE__) . '/kolab.local.php');
+ }
+diff --git a/horde-webmail/kronolith/ics_kolab.php b/horde-webmail/kronolith/ics_kolab.php
+new file mode 100644
+index 0000000..2b81832
+--- /dev/null
++++ b/horde-webmail/kronolith/ics_kolab.php
+@@ -0,0 +1,110 @@
++<?php
++/**
++ * $Horde: kronolith/ics.php,v 1.5.2.10 2008/01/10 16:16:49 jan Exp $
++ *
++ * Copyright 1999-2008 The Horde Project (http://www.horde.org/)
++ *
++ * See the enclosed file COPYING for license information (GPL). If you
++ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
++ *
++ * @author Chuck Hagenbuch <chuck at horde.org>
++ */
++
++function logout() 
++{
++    Auth::clearAuth();
++    @session_destroy();
++}
++
++ at define('AUTH_HANDLER', true);
++ at define('HORDE_BASE', dirname(__FILE__) . '/..');
++require_once HORDE_BASE . '/lib/base.php';
++
++// We want to always generate UTF-8 iCalendar data.
++NLS::setCharset('UTF-8');
++
++// Determine which calendar to export.
++$calendar = Util::getFormData('c');
++if (empty($calendar) && !empty($_SERVER['PATH_INFO'])) {
++    $calendar = basename($_SERVER['PATH_INFO']);
++}
++
++// Authenticate.
++$auth = &Auth::singleton($conf['auth']['driver']);
++if (!isset($_SERVER['PHP_AUTH_USER'])) {
++    if (isset($conf['ics']['default_user'])
++        && isset($conf['ics']['default_pass'])) {
++        $user = $conf['ics']['default_user'];
++        $pass = $conf['ics']['default_pass'];
++        $proxied = true;
++    }   
++} else {
++    $user = $_SERVER['PHP_AUTH_USER'];
++    $pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : null;
++}
++
++if (!isset($user) || !$auth->authenticate($user, array('password' => $pass))) {
++    header('WWW-Authenticate: Basic realm="Kronolith iCalendar Interface"');
++    header('HTTP/1.0 401 Unauthorized');
++    echo '401 Unauthorized';
++    exit;
++}
++
++ at define('KRONOLITH_BASE', dirname(__FILE__));
++require_once KRONOLITH_BASE . '/lib/base.php';
++require_once 'Horde/Cache.php';
++require_once 'Horde/iCalendar.php';
++
++$share = $kronolith_shares->getShare($calendar);
++if (is_a($share, 'PEAR_Error')) {
++    header('HTTP/1.0 400 Bad Request');
++    echo '400 Bad Request';
++    if ($proxied) {
++        logout();
++    }
++    exit;
++}
++
++if (!$share->hasPermission(Auth::getAuth(), PERMS_READ)) {
++    header('WWW-Authenticate: Basic realm="Kronolith iCalendar Interface"');
++    header('HTTP/1.0 401 Unauthorized');
++    echo '401 Unauthorized';
++    exit;
++}
++
++$cache = &Horde_Cache::singleton($conf['cache']['driver'], Horde::getDriverConfig('cache', $conf['cache']['driver']));
++$key = 'kronolith.ics.' . $calendar;
++
++$ics = $cache->get($key, 360);
++if (!$ics) {
++    $kronolith_driver->open(urlencode($calendar));
++    $events = $kronolith_driver->listEvents();
++
++    $iCal = new Horde_iCalendar();
++    $iCal->setAttribute('X-WR-CALNAME', String::convertCharset($share->get('name'), NLS::getCharset(), 'utf-8'));
++
++    foreach ($events as $id) {
++        $event = &$kronolith_driver->getEvent($id);
++        if (is_a($event, 'PEAR_Error')) {
++            continue;
++        }
++        $iCalEvent = $event->toiCalendar($iCal);
++        if (!empty($conf['ics']['hide_organizer'])) {
++            $iCalEvent->removeAttribute('ORGANIZER');
++        }
++        $iCal->addComponent($iCalEvent);
++    }
++
++    $ics = $iCal->exportvCalendar();
++    $cache->set($key, $ics);
++}
++
++$browser->downloadHeaders($calendar . '.ics',
++                          'text/calendar; charset=' . NLS::getCharset(),
++                          true,
++                          strlen($ics));
++echo $ics;
++
++if ($proxied) {
++    logout();
++}
+-- 
+tg: (b5749f0..) t/kronolith/HK/GW/AnonymousiCalDownload (depends on: t/dimp/H/GW/AclView)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 4ac58a4d646865d74ac26c0439f29ceacfdfea82
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Jun 4 09:40:25 2009 +0200
+
+    Allow to hide the organizer.
+
+commit 0df1aefd621efbe8a2d7e306fbc79dace5760280
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu May 28 12:42:44 2009 +0200
+
+    First version of the anonymous ics download patch.
+From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/ExportEventList
 
 Export a list of events.



From cvs at kolab.org  Mon Oct 12 16:27:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 16:27:30 +0200 (CEST)
Subject: wilde: server/kolab-webclient kolab-webclient.spec, 1.23.2.11,
	1.23.2.12 
Message-ID: <20091012142730.82986600800@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab-webclient.spec 
Log Message:
Bumped up version of kolab-webclient.


Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.11
retrieving revision 1.23.2.12
diff -u -d -r1.23.2.11 -r1.23.2.12
--- kolab-webclient.spec	9 Oct 2009 16:11:50 -0000	1.23.2.11
+++ kolab-webclient.spec	12 Oct 2009 14:27:28 -0000	1.23.2.12
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 10
-%define         V_day   09
+%define         V_day   12
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Mon Oct 12 17:43:53 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 17:43:53 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.93,1.94 
Message-ID: <20091012154353.C144E600800@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
replace a bracket by a curly bracket

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- suse	27 Aug 2009 21:13:18 -0000	1.93
+++ suse	12 Oct 2009 15:43:51 -0000	1.94
@@ -85,7 +85,7 @@
 kolab_pkgs=spamassassin openldap2 clamav amavisd-new postfix kolab apache2 kolab-server kolab-freebusy kolab-filter perl-kolab kolab-format kolab-webadmin kolab-storage
 kolab_smtpdpolicy_conffile_usr=wwwrun
 kolab_smtpdpolicy_conffile_grp=root
-kolab_scriptsdir=$(datadir)/kolab/scripts
+kolab_scriptsdir=${datadir}/kolab/scripts
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just



From cvs at kolab.org  Mon Oct 12 18:02:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 18:02:16 +0200 (CEST)
Subject: wilde: doc/raw-howtos anonymous-ics-export.txt,NONE,1.1 
Message-ID: <20091012160216.2154B600800@lists.intevation.de>

Author: wilde

Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv32143

Added Files:
	anonymous-ics-export.txt 
Log Message:
Minimal documentation for the new anonymous ICS export.


--- NEW FILE: anonymous-ics-export.txt ---
------------------------------------------------------------------------
                      The anonymous ICS Calendar
------------------------------------------------------------------------
Sascha Wilde <wilde at intevation.de>


Since 2009/10/12 the CVS kolab_2_2_branch contains a new feature,
allowing the anonymous (read: no authentication required) export of
dedicated calendars as ics files.


Concept:

A dedicated "proxy" user is created and the id and password of this
user is made known to certain parts of the webclient.

The proxy user is granted read access to one or more calendar by
regular Kolab users.

An ics file with the exported events from one of the calendars
accessible for the proxy user can be downloaded anonymously from the
kolab server.


Usage:

1. Create an new user account e.g. "proxy at example.com" with password
   "secret".

2. In /kolab/etc/kolab/templates/webclient-kolab-conf.template the
   lines
     $conf['ics']['default_user'] = 'proxy@@@@postfix-mydomain@@@';
     $conf['ics']['default_pass'] = 'proxy';
   must be uncommented and filled with the correct credentials a
   chosen in 1.

3. Grant list/read access for some calendar folders to the user
   "proxy at example.com".  For example the user foo at example.com gives
   the proxy user access to his default calendar "Calendar"

4. Now anyone can retrieve the events from the users foo at example.com's
   calendar by downloading:
     http://kolab.example.com/public-cal/ics?c=user/foo/Calendar
   the url follows the pattern:
     http://KOLABSERVER/public-cal/ics?c=user/USERNAME/CALENDARNAME


Security considerations:

One should note, that the data from calendars shared to the proxy user
is freely, world wide readable unless the access to the Kolab
Webclient server is restricted by other means.



From cvs at kolab.org  Mon Oct 12 18:34:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Oct 2009 18:34:40 +0200 (CEST)
Subject: wilde: server/kolab-webclient kolab-webclient.spec, 1.23.2.12,
	1.23.2.13 
Message-ID: <20091012163440.15897600800@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab-webclient.spec 
Log Message:
Fore rebuild of web client translation files.  (Merged from suc branch)


Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.12
retrieving revision 1.23.2.13
diff -u -d -r1.23.2.12 -r1.23.2.13
--- kolab-webclient.spec	12 Oct 2009 14:27:28 -0000	1.23.2.12
+++ kolab-webclient.spec	12 Oct 2009 16:34:37 -0000	1.23.2.13
@@ -144,6 +144,10 @@
 	sed -i -e 's#@@@nag_confdir@@@#%{l_prefix}/var/kolab/www/client/nag/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 	sed -i -e 's#@@@turba_confdir@@@#%{l_prefix}/var/kolab/www/client/turba/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
+	# Refresh the translations
+	PATH="%{l_prefix}/bin" %{l_prefix}/bin/php -d safe_mode=0 -f $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/po/translation.php make --module dimp --no-compendium
+	PATH="%{l_prefix}/bin" %{l_prefix}/bin/php -d safe_mode=0 -f $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/po/translation.php make --module kronolith --no-compendium
+
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} %{S:5} \
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config
 



From cvs at kolab.org  Tue Oct 13 12:35:36 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 12:35:36 +0200 (CEST)
Subject: wilde: server/php-kolab/Kolab_Server Makefile,1.6,1.6.2.1 
Message-ID: <20091013103536.E494760081C@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Server
In directory doto:/tmp/cvs-serv9261

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Merged improved Makefile from suc branch.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile	24 Feb 2009 11:57:46 -0000	1.6
+++ Makefile	13 Oct 2009 10:35:34 -0000	1.6.2.1
@@ -1,50 +1,111 @@
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+# If home is unset this Makefile assumes the Kolab server installation
+# resides in /kolab. If this is not the case this Makefile must be
+# called using
+#
+# HOME="/mykolabroot" make TARGET
+#
+ifeq "x$(HOME)" "x"
+  HOME = /kolab
+endif
 
+# If HOME is set to /root it is likely that somebody is calling this
+# Makefile as root user. In this case this Makefile assumes that the
+# Kolab server installation resides in /kolab.
+#
+# In the (hopefully) unlikely event that somebody really installed the
+# Kolab server in /root this Makefile will fail.
+ifeq "x$(HOME)" "x/root"
+  HOME = /kolab
+endif
+
+# Set the location of the rpm binary
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
 endif
+
+# Set the location for rpm source package installations
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = $(HOME)/RPM/SRC
 endif
+
+# Set the location for rpm packages
 ifeq "x$(KOLABRPMPKG)" "x"
   KOLABRPMPKG = $(HOME)/RPM/PKG
 endif
+
+# Set the location for the rpm temporary directory
 ifeq "x$(KOLABRPMTMP)" "x"
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
+# Determine the suffix for binary packages on this system
 ifeq "x$(PLATTAG)" "x"
 	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
 endif
 
-SOURCE_URL=http://pear.horde.org/get
+# Determine the staging area for collecting new source rpms
+ifeq "x$(STAGING)" "x"
+  STAGING = ../../stage
+endif
+
+# Determine the package name from the *.spec file
+PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
+
+# Determine the package version from the *.spec file
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+
+# Determine the release number from the *.spec file
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+# Determine the download url for the PEAR package from the *.spec file
+SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*\(.*\)/\1/")
+
+# Get the list of patches if there are any in this directory
+PATCHES = $(shell ls *.patch 2> /dev/null)
+
+# Generate the full package name
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 
+# Generate a list of extra files for the package
+EXTRA=ChangeLog $(PATCHES)
+
+
+# Default target to generate the source rpm package
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
+# Target for placing the source rpm in the staging area
 .PHONY: dist
 dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+	test -d $(STAGING) || mkdir $(STAGING)
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
 
-.PHONY: clean
-clean:
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
+# Target for installing the binary rpm package in our current Kolab
+# server installation
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0):
+# Target for retrieving the source package
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): 
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+# Target for preparing the source area and building the package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
+# Target for fetching the source rpm into the current directory
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 	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
+# Target for cleaning up the files that can be generated with this Makefile
+.PHONY: clean
+clean:
+	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf *~
+



From cvs at kolab.org  Tue Oct 13 14:37:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 14:37:29 +0200 (CEST)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.234.2.9,1.234.2.10 
Message-ID: <20091013123729.D3F33600174@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.9
retrieving revision 1.234.2.10
diff -u -d -r1.234.2.9 -r1.234.2.10
--- ChangeLog	14 May 2009 10:52:35 -0000	1.234.2.9
+++ ChangeLog	13 Oct 2009 12:37:27 -0000	1.234.2.10
@@ -12,6 +12,14 @@
 	Updated templates for clamav-0.95.1-20090409 for
 	kolab/issue3513 (Clamav - new upstream version 0.95.1)
 
+2009-04-23  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/freebusy.conf.template.in: Configuration support for
+	LDAP attribute mapping.
+
+	* templates/resmgr.conf.template.in: Configuration support for
+	LDAP attribute mapping.
+
 2009-04-20  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/slapd.conf.template.in: Make kolabAllowSMTPRecipient



From cvs at kolab.org  Tue Oct 13 14:37:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 14:37:29 +0200 (CEST)
Subject: wilde: server/kolab-webclient ChangeLog, 1.10.2.9,
	1.10.2.10 kolab-webclient.spec, 1.23.2.13,
	1.23.2.14 webclient-kolab-conf.template, 1.2.2.1, 1.2.2.2 
Message-ID: <20091013123729.B7ABF600174@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec webclient-kolab-conf.template 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.9
retrieving revision 1.10.2.10
diff -u -d -r1.10.2.9 -r1.10.2.10
--- ChangeLog	12 Oct 2009 14:09:00 -0000	1.10.2.9
+++ ChangeLog	13 Oct 2009 12:37:27 -0000	1.10.2.10
@@ -29,6 +29,17 @@
 	kolab/issue3420 (web client prefs and hooks should be configurable
 	                 via templates)
 
+2009-04-24  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Additional fixes for configurable mapping
+	of LDAP attributes.
+
+2009-04-23  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Support for configurable mapping of LDAP
+	attributes.
+
+
 2009-04-02  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:
@@ -44,7 +55,7 @@
 
 2008-02-07  Mathieu Parent <math.parent at gmail.com>
 
-	* webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template: 
+	* webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template:
 	dist_conf configuration in kolab webclient templates (kolab/issue3387)
 
 2009-01-08  Gunnar Wrobel  <p at rdus.de>

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.13
retrieving revision 1.23.2.14
diff -u -d -r1.23.2.13 -r1.23.2.14
--- kolab-webclient.spec	12 Oct 2009 16:34:37 -0000	1.23.2.13
+++ kolab-webclient.spec	13 Oct 2009 12:37:27 -0000	1.23.2.14
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 10
-%define         V_day   12
+%define         V_day   13
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1

Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kolab-conf.template,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- webclient-kolab-conf.template	9 Oct 2009 16:11:51 -0000	1.2.2.1
+++ webclient-kolab-conf.template	13 Oct 2009 12:37:27 -0000	1.2.2.2
@@ -19,6 +19,24 @@
 @@@endif@@@
 $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
 
+/**
+ * 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';
+
 /* Credentials for a proxy user to allow quasi anonymous ICS access
  * via /public-cal/ics. You will need to create this user first.
  */



From cvs at kolab.org  Tue Oct 13 14:37:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 14:37:30 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/tg
	t_pear_HK_GW_AddNetLDAP2.diff, NONE, 1.1.4.1 series, 1.5.2.6, 1.5.2.7 
Message-ID: <20091013123730.C2B23600805@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv13310/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_pear_HK_GW_AddNetLDAP2.diff 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


--- NEW FILE: t_pear_HK_GW_AddNetLDAP2.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/pear/HK/GW/AddNetLDAP2

Adds the PEAR-Net_LDAP2 library.

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

---
 horde-webmail/pear/Net/LDAP2.php         | 1698 ++++++++++++++++++++++++++++++
 horde-webmail/pear/Net/LDAP2/Entry.php   | 1019 ++++++++++++++++++
 horde-webmail/pear/Net/LDAP2/Filter.php  |  447 ++++++++
 horde-webmail/pear/Net/LDAP2/LDIF.php    |  904 ++++++++++++++++
 horde-webmail/pear/Net/LDAP2/RootDSE.php |  221 ++++
 horde-webmail/pear/Net/LDAP2/Schema.php  |  502 +++++++++
 horde-webmail/pear/Net/LDAP2/Search.php  |  596 +++++++++++
 horde-webmail/pear/Net/LDAP2/Util.php    |  557 ++++++++++
 8 files changed, 5944 insertions(+), 0 deletions(-)

diff --git a/horde-webmail/pear/Net/LDAP2.php b/horde-webmail/pear/Net/LDAP2.php
[...5988 lines suppressed...]
+                }
+            }
+        }
+        return array_values($dn);
+    }
+}
+
+?>
\ No newline at end of file
-- 
tg: (031aea6..) t/pear/HK/GW/AddNetLDAP2 (depends on: t/dimp/H/GW/AclView)
-- 
TOPGIT patch commit log
=======================

commit 0ad87da8cf55073240d541edea74e6a60bbe3695
Author: Gunnar Wrobel <p at rdus.de>
Date:   Thu Apr 23 13:41:35 2009 +0200

    Add PEAR-Net_LDAP2

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -d -r1.5.2.6 -r1.5.2.7
--- series	12 Oct 2009 14:09:01 -0000	1.5.2.6
+++ series	13 Oct 2009 12:37:27 -0000	1.5.2.7
@@ -68,6 +68,7 @@
 t_imp_H_JS_bug7739.diff -p1
 t_imp_H_MS_bug7438.diff -p1
 t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff -p1
+t_pear_HK_GW_AddNetLDAP2.diff -p1
 t_framework_HK_GW_Prefs_FileDriverHotfix.diff -p1
 t_kronolith_HK_GW_AnonymousiCalDownload.diff -p1
 t_kronolith_HK_GW_ExportEventList.diff -p1



From cvs at kolab.org  Tue Oct 13 14:37:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 14:37:30 +0200 (CEST)
Subject: wilde: server/php-kolab/Kolab_Server mapping.patch, NONE,
	1.1.4.1 ChangeLog, 1.4, 1.4.2.1 Kolab_Server.spec, 1.9, 1.9.2.1 
Message-ID: <20091013123730.BE425600175@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Server
In directory doto:/tmp/cvs-serv13310/php-kolab/Kolab_Server

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Server.spec 
Added Files:
      Tag: kolab_2_2_branch
	mapping.patch 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


--- NEW FILE: mapping.patch ---
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index 941cbe6..4d77f11 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -159,9 +159,12 @@ class Horde_Kolab_Server {
             $driver = 'ldap';
 
             $server_params = array('server'  => $conf['kolab']['ldap']['server'],
-                                  'base_dn' => $conf['kolab']['ldap']['basedn'],
-                                  'uid'     => $conf['kolab']['ldap']['phpdn'],
-                                  'pass'    => $conf['kolab']['ldap']['phppw']);
+                                   'base_dn' => $conf['kolab']['ldap']['basedn'],
+                                   'uid'     => $conf['kolab']['ldap']['phpdn'],
+                                   'pass'    => $conf['kolab']['ldap']['phppw']);
+            if (isset($conf['kolab']['ldap']['map'])) {
+                $server_params['map'] = $conf['kolab']['ldap']['map'];
+            }
         } else {
             $driver        = null;
             $server_params = array();
@@ -473,7 +476,7 @@ class Horde_Kolab_Server {
     function uidForId($id,
                       $restrict = KOLAB_SERVER_RESULT_SINGLE)
     {
-        return $this->uidForAttr('uid', $id);
+        return $this->uidForAttr(KOLAB_ATTR_SID, $id);
     }
 
     /**
@@ -513,7 +516,7 @@ class Horde_Kolab_Server {
      */
     function uidForIdOrMail($id)
     {
-        $uid = $this->uidForAttr('uid', $id);
+        $uid = $this->uidForAttr(KOLAB_ATTR_SID, $id);
         if (!$uid) {
             $uid = $this->uidForAttr('mail', $id);
         }
@@ -562,7 +565,7 @@ class Horde_Kolab_Server {
      */
     function uidForMailOrIdOrAlias($id)
     {
-        $uid = $this->uidForAttr('uid', $id);
+        $uid = $this->uidForAttr(KOLAB_ATTR_SID, $id);
         if (!$uid) {
             $uid = $this->uidForAttr('mail', $id);
             if (!$uid) {
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
index 2b1237c..27993cc 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
@@ -26,6 +26,7 @@ define('KOLAB_OBJECT_USER',             'Horde_Kolab_Server_Object_user');
 define('KOLAB_OBJECT_SERVER',           'Horde_Kolab_Server_Object_server');
 
 /** Define the possible Kolab object attributes */
+define('KOLAB_ATTR_OC',           'objectClass');
 define('KOLAB_ATTR_UID',          'dn');
 define('KOLAB_ATTR_ID',           'id');
 define('KOLAB_ATTR_SN',           'sn');
@@ -35,6 +36,7 @@ define('KOLAB_ATTR_FN',           'fn');
 define('KOLAB_ATTR_LNFN',         'lnfn');
 define('KOLAB_ATTR_FNLN',         'fnln');
 define('KOLAB_ATTR_MAIL',         'mail');
+define('KOLAB_ATTR_ALIAS',        'alias');
 define('KOLAB_ATTR_SID',          'uid');
 define('KOLAB_ATTR_ACL',          'acl');
 define('KOLAB_ATTR_MEMBER',       'member');
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php
index 697a0c0..59d9ad4 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php
@@ -33,13 +33,6 @@
 class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(objectclass=inetOrgPerson)(!(uid=*))(sn=*))';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -86,6 +79,32 @@ class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
     );
 
     /**
+     * The LDAP filter to retrieve this object type
+     *
+     * @return string
+     */
+    function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_SN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_INETORGPERSON),
+                              array('NOT' => array(
+                                        array('field' => KOLAB_ATTR_SID,
+                                              'op'    => '=',
+                                              'test'  => '*'),
+                                    ),
+                              ),
+                          ),
+        );
+        return $criteria;
+    }
+
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
index cebfba2..f0b9f46 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
@@ -32,13 +32,6 @@
 class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(cn=*)(objectClass=inetOrgPerson)(!(uid=manager))(sn=*))';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -87,6 +80,34 @@ class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
     );
 
     /**
+     * The LDAP filter to retrieve this object type
+     *
+     * @return string
+     */
+    function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_CN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_SN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_INETORGPERSON),
+                              array('NOT' => array(
+                                        array('field' => KOLAB_ATTR_SID,
+                                              'op'    => '=',
+                                              'test'  => 'manager'),
+                                    ),
+                              ),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php
index e2c1c3e..04889b0 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/distlist.php
@@ -34,14 +34,6 @@ require_once 'Horde/Kolab/Server/Object/group.php';
 class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(objectClass=kolabGroupOfNames)(mail=*))';
-
-
-    /**
      * The attributes required when creating an object of this class.
      *
      * @var array
@@ -49,4 +41,26 @@ class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group
     var $_required_attributes = array(
         KOLAB_ATTR_MAIL,
     );
+
+    /**
+     * Return the filter string to retrieve this object type.
+     *
+     * @static
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
+     */
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_MAIL,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
+                          ),
+        );
+        return $criteria;
+    }
 };
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php
index e72604a..ea3d370 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php
@@ -32,13 +32,6 @@
 class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(objectClass=kolabGroupOfNames)';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -104,6 +97,22 @@ class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
     }
 
     /**
+     * Return the filter string to retrieve this object type.
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
+     */
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(array('field' => KOLAB_ATTR_OC,
+                                               'op'    => '=',
+                                               'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php
index 23549d5..b52a587 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php
@@ -32,11 +32,26 @@
 class Horde_Kolab_Server_Object_server extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
+     * Return the filter string to retrieve this object type.
      *
-     * @var string
+     * @static
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
      */
-    var $filter = '(&((k=kolab))(objectclass=kolab))';
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => 'k',
+                                    'op'    => '=',
+                                    'test'  => 'kolab'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_KOLAB),
+                          ),
+        );
+        return $criteria;
+    }
 
     /**
      * The attributes supported by this class
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php
index 81a68f6..ea8994b 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php
@@ -33,13 +33,6 @@
 class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(objectClass=kolabSharedFolder)';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -89,6 +82,22 @@ class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
     }
 
     /**
+     * Return the filter string to retrieve this object type.
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
+     */
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(array('field' => KOLAB_ATTR_OC,
+                                               'op'    => '=',
+                                               'test'  => KOLAB_OC_KOLABSHAREDFOLDER),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php
index a02b7fe..c648f65 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php
@@ -33,13 +33,6 @@
 class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(objectClass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -154,6 +147,31 @@ class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
     }
 
     /**
+     * The LDAP filter to retrieve this object type
+     *
+     * @return string
+     */
+    function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_SN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_MAIL,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_SID,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
index eee8f52..ea73b4f 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php
@@ -210,6 +210,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
         }
 
         if (isset($attrs)) {
+            $this->mapKeys($attrs);
             $result = @ldap_read($this->_connection, $dn, '(objectclass=*)', $attrs);
         } else {
             $result = @ldap_read($this->_connection, $dn, '(objectclass=*)');
@@ -220,7 +221,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
         }
         $entry = $this->_firstEntry($result);
         if (!$entry) {
-            ldap_free_result($result);
+            @ldap_free_result($result);
             return PEAR::raiseError(sprintf(_("LDAP Error: Empty result for: %s."),
                                             $dn));
         }
@@ -229,7 +230,10 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
             return PEAR::raiseError(sprintf(_("LDAP Error: No such dn: %s: %s"),
                                             $dn, $this->_error()));
         }
-        ldap_free_result($result);
+        @ldap_free_result($result);
+
+        $this->unmapAttributes($object);
+
         return $object;
     }
 
@@ -250,6 +254,8 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
             }
         }
 
+        $this->mapAttributes($data);
+
         return @ldap_add($this->_connection, $dn, $data);
     }
 
@@ -681,9 +687,25 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function mailForIdOrMail($id)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
-            Horde_LDAP::quote($id) . ')(mail=' .
-            Horde_LDAP::quote($id) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
+
         $result = $this->_attrsForFilter($filter, array('mail'),
                                          KOLAB_SERVER_RESULT_STRICT);
         if (is_a($result, 'PEAR_Error')) {
@@ -702,9 +724,24 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function uidForIdOrMail($id)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
-            Horde_LDAP::quote($id) . ')(mail=' .
-            Horde_LDAP::quote($id) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter, KOLAB_SERVER_RESULT_STRICT);
     }
 
@@ -717,9 +754,25 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function addrsForIdOrMail($id)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(mail='
-            . Horde_LDAP::quote($id) . ')(uid='
-            . Horde_LDAP::quote($id) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
+
         $result = $this->_attrsForFilter($filter, array('mail', 'alias'),
                                          KOLAB_SERVER_RESULT_STRICT);
         if (empty($result)) {
@@ -768,10 +821,27 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function uidForMailAddress($mail)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
-            Horde_LDAP::quote($mail) . ')(mail=' .
-            Horde_LDAP::quote($mail) . ')(alias=' .
-            Horde_LDAP::quote($mail) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_ALIAS,
+                                             'op'    => '=',
+                                             'test'  => $mail),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $mail),
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $mail),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter);
     }
 
@@ -788,8 +858,17 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
     function uidForAttr($attr, $value,
                        $restrict = KOLAB_SERVER_RESULT_SINGLE)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(' . $attr .
-            '=' . Horde_LDAP::quote($value) . '))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+			     array('field' => $attr,
+				   'op'    => '=',
+				   'test'  => $value),
+                             ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter, $restrict);
     }
 
@@ -806,8 +885,17 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
     function gidForAttr($attr, $value,
                        $restrict = KOLAB_SERVER_RESULT_SINGLE)
     {
-        $filter = '(&(objectClass=kolabGroupOfNames)(' . $attr .
-            '=' . Horde_LDAP::quote($value) . '))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
+			     array('field' => $attr,
+				   'op'    => '=',
+				   'test'  => $value),
+                             ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter, $restrict);
     }
 
@@ -874,7 +962,13 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
             return $result;
         }
         $vars   = get_class_vars($type);
-        $filter = $vars['filter'];
+        $methods = get_class_methods($type);
+        if (!in_array('getFilter', $methods)) {
+            $filter = $vars['filter'];
+        } else {
+            $criteria = call_user_func(array($type, 'getFilter'));
+            $filter   = $this->searchQuery($criteria);
+        }
         $sort   = $vars['sort_by'];
 
         if (isset($params['sort'])) {
@@ -993,4 +1087,176 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
         }
     }
 
+    /**
+     * Build a search query.
+     *
+     * Taken from the Turba LDAP driver.
+     *
+     * @param array $criteria The array of criteria.
+     *
+     * @return string  An LDAP query filter.
+     */
+    public function searchQuery($criteria)
+    {
+        require_once 'Net/LDAP2.php';
+
+        /* Accept everything. */
+        $filter = '(' . strtolower(KOLAB_ATTR_OC) . '=*)';
+
+        /* Build the LDAP filter. */
+        if (count($criteria)) {
+            $f = $this->buildSearchQuery($criteria);
+            if (is_a($f, 'Net_LDAP2_Filter')) {
+                $filter = $f->asString();
+            }
+        }
+        return $filter;
+    }
+
+    /**
+     * Build a piece of a search query.
+     *
+     * Taken from the Turba LDAP driver.
+     *
+     * @param array $criteria The array of criteria.
+     *
+     * @return string  An LDAP query fragment.
+     */
+    protected function &buildSearchQuery($criteria)
+    {
+        if (isset($criteria['field'])) {
+            require_once 'Horde/String.php';
+            require_once 'Horde/NLS.php';
+            $rhs     = $criteria['test'];
+            /* Keep this in for reference as we did not really test servers with different encoding yet */
+            //$rhs     = String::convertCharset($criteria['test'], NLS::getCharset(), $this->params['charset']);
+            switch ($criteria['op']) {
+            case '=':
+                $op = 'equals';
+                break;
+            }
+            return Net_LDAP2_Filter::create($this->mapField($criteria['field']),
+                                            $op, $rhs);
+        }
+        foreach ($criteria as $key => $vals) {
+            if (!empty($vals['OR'])
+                || !empty($vals['AND'])
+                || !empty($vals['NOT'])) {
+                $parts = $this->buildSearchQuery($vals);
+                if (count($parts) > 1) {
+                    if (!empty($vals['OR'])) {
+                        $operator = '|';
+                    } else if (!empty($vals['NOT'])) {
+                        $operator = '!';
+                    } else {
+                        $operator = '&';
+                    }
+                    return Net_LDAP2_Filter::combine($operator, $parts);
+                } else {
+                    return $parts[0];
+                }
+            } else {
+                $parts = array();
+                foreach ($vals as $test) {
+                    $parts[] = &$this->buildSearchQuery($test);
+                }
+                switch ($key) {
+                case 'OR':
+                    $operator = '|';
+                    break;
+                case 'AND':
+                    $operator = '&';
+                    break;
+                case 'NOT':
+                    $operator = '!';
+                    break;
+                }
+                if (count($parts) > 1) {
+                    return Net_LDAP2_Filter::combine($operator, $parts);
+                } else if ($operator == '!') {
+                    return Net_LDAP2_Filter::combine($operator, $parts[0]);
+                } else {
+                    return $parts[0];
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attributes defined within this library their their real world
+     * counterparts.
+     *
+     * @param array $data The data that has been read and needs to be mapped.
+     *
+     * @return NULL
+     */
+    protected function unmapAttributes(&$data)
+    {
+        if (!empty($this->_params['map'])) {
+            foreach ($this->_params['map'] as $attribute => $map) {
+                if (isset($data[$map])) {
+                    $data[$attribute] = $data[$map];
+                    unset($data[$map]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attributes defined within this library into their real world
+     * counterparts.
+     *
+     * @param array $data The data to be written.
+     *
+     * @return NULL
+     */
+    protected function mapAttributes(&$data)
+    {
+        if (!empty($this->_params['map'])) {
+            foreach ($this->_params['map'] as $attribute => $map) {
+                if (isset($data[$attribute])) {
+                    $data[$map] = $data[$attribute];
+                    unset($data[$attribute]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attribute keys defined within this library into their real world
+     * counterparts.
+     *
+     * @param array $keys The attribute keys.
+     *
+     * @return NULL
+     */
+    protected function mapKeys(&$keys)
+    {
+        if (!empty($this->_params['map'])) {
+            foreach ($this->_params['map'] as $attribute => $map) {
+                $key = array_search($attribute, $keys);
+                if ($key !== false) {
+                    $keys[$key] = $map;
+                }
+            }
+        }
+    }
+
+    /**
+     * Map a single attribute key defined within this library into its real
+     * world counterpart.
+     *
+     * @param array $field The attribute name.
+     *
+     * @return The real name of this attribute on the server we connect to.
+     */
+    protected function mapField($field)
+    {
+        if (!empty($this->_params['map'])
+            && isset($this->_params['map'][$field])) {
+            return $this->_params['map'][$field];
+        }
+        return $field;
+    }
+
 }
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
index 0127069..8d6d522 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
@@ -247,6 +247,10 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
             }
         }
 
+        if (!empty($attributes)) {
+            $this->mapKeys($attributes);
+        }
+
         $filter = $this->_parse($filter);
         if (is_a($filter, 'PEAR_Error')) {
             return $filter;
@@ -265,6 +269,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
             $result = $subtree;
         }
 
+        $this->unmapAttributes($result);
+
         return $result;
     }
 
@@ -286,7 +292,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
                     switch ($filter['log']) {
                     case '=':
                         $value = $element['data'][$filter['att']];
-                        if (($filter['val'] == '*' && !empty($value))
+                        if ((($filter['val'] == '*'  || $filter['val'] == '\2a')
+                             && !empty($value))
                             || $value == $filter['val']
                             || (is_array($value)
                                 && in_array($filter['val'], $value))) {
@@ -390,8 +397,12 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
                                             $dn));
         }
         if (empty($attrs)) {
-            return $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
+            $data = $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
+            $this->unmapAttributes($data);
+            return $data;
         } else {
+            $this->mapKeys($attrs);
+
             $result = array();
             $data   = $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
 
@@ -401,6 +412,9 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
                     array_push($result, $attr);
                 }
             }
+
+            $this->unmapAttributes($result);
+
             $result['count'] = 1;
             return $result;
         }
@@ -423,6 +437,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
             }
         }
 
+        $this->mapAttributes($data);
+
         $ldap_data = array();
         foreach ($data as $key => $val) {
             if (!is_array($val)) {

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- ChangeLog	24 Feb 2009 11:57:46 -0000	1.4
+++ ChangeLog	13 Oct 2009 12:37:28 -0000	1.4.2.1
@@ -1,3 +1,13 @@
+2009-04-24  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Server.spec: Additional fixes for configurable mapping of
+	LDAP attributes.
+
+2009-04-23  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Server.spec: Support for configurable mapping of LDAP
+	attributes.
+
 2009-02-24  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Server.spec: Update to 0.4.0.

Index: Kolab_Server.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/Kolab_Server.spec,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- Kolab_Server.spec	24 Feb 2009 11:57:46 -0000	1.9
+++ Kolab_Server.spec	13 Oct 2009 12:37:28 -0000	1.9.2.1
@@ -1,7 +1,8 @@
 # Variables
 %define         V_package Kolab_Server
 %define         V_version 0.4.0
-%define         V_release 20090224
+%define         V_release 20091013
+%define         V_sourceurl http://pear.horde.org/get
 
 # Package Information
 Name:	   %{V_package}
@@ -15,7 +16,10 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    %{V_sourceurl}/%{V_package}-%{V_version}.tgz
+
+# List of patches
+Patch0:    mapping.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -28,6 +32,7 @@
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
 PreReq:       Horde_LDAP
+PreReq:       PEAR-Net_LDAP2
 PreReq:       PHPUnit
 
 %description 
@@ -37,12 +42,16 @@
 %prep
 	%setup -n %{V_package}-%{V_version}
 
+	%patch -p3 -P 0
+
+	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
+
 %build
 
 %install
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 



From cvs at kolab.org  Tue Oct 13 14:57:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 14:57:58 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.12, 1.32.2.13 
Message-ID: <20091013125758.58139600174@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv13852

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.12
retrieving revision 1.32.2.13
diff -u -d -r1.32.2.12 -r1.32.2.13
--- horde-webmail-1.2.0_kolab_openpkg.patch	12 Oct 2009 14:09:00 -0000	1.32.2.12
+++ horde-webmail-1.2.0_kolab_openpkg.patch	13 Oct 2009 12:57:55 -0000	1.32.2.13
@@ -20001,6 +20001,6033 @@
     LINK: https://www.intevation.de/roundup/kolab/issue3525
     LINK: https://www.intevation.de/roundup/kolab/issue3528
 From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/pear/HK/GW/AddNetLDAP2
+
+Adds the PEAR-Net_LDAP2 library.
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/pear/Net/LDAP2.php         | 1698 ++++++++++++++++++++++++++++++
[...6002 lines suppressed...]
++    }
++}
++
++?>
+\ No newline at end of file
+-- 
+tg: (031aea6..) t/pear/HK/GW/AddNetLDAP2 (depends on: t/dimp/H/GW/AclView)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 0ad87da8cf55073240d541edea74e6a60bbe3695
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Apr 23 13:41:35 2009 +0200
+
+    Add PEAR-Net_LDAP2
+From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Prefs/FileDriverHotfix.diff
 
 A hotfix for https://issues.kolab.org/issue3555



From cvs at kolab.org  Tue Oct 13 15:24:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 15:24:09 +0200 (CEST)
Subject: wilde: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.21,
	1.21.2.1 resmgr.conf.template.in, 1.34, 1.34.2.1 
Message-ID: <20091013132409.54A21600801@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	freebusy.conf.template.in resmgr.conf.template.in 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- freebusy.conf.template.in	10 Feb 2009 22:41:14 -0000	1.21
+++ freebusy.conf.template.in	13 Oct 2009 13:24:07 -0000	1.21.2.1
@@ -58,6 +58,24 @@
 $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';
+
 /* Horde::Kolab::IMAP configuration */
 $conf['kolab']['imap']['server']   = '@@@fqdnhostname@@@';
 $conf['kolab']['imap']['port']     = 143;

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -d -r1.34 -r1.34.2.1
--- resmgr.conf.template.in	10 Feb 2009 22:41:14 -0000	1.34
+++ resmgr.conf.template.in	13 Oct 2009 13:24:07 -0000	1.34.2.1
@@ -138,6 +138,24 @@
 /* What password should we use with the above DN when binding? */
 $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';
+
 /* What account should we use to read/write calendar data? This
  * account should have access to the calendar mailbox of all
  * resource/group mailboxes.



From cvs at kolab.org  Tue Oct 13 15:24:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 15:24:10 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/tg
	t_Kolab__Server_HK_GW_MappableAttributes.diff, NONE,
	1.1.4.1 series, 1.5.2.7, 1.5.2.8 
Message-ID: <20091013132410.98FE9600801@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv14888/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_Kolab__Server_HK_GW_MappableAttributes.diff 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


--- NEW FILE: t_Kolab__Server_HK_GW_MappableAttributes.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/Kolab_Server/HK/GW/MappableAttributes

Allow to configure mapped LDAP attributes.

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

---
 horde-webmail/lib/Horde/Kolab/Server.php           |   15 +-
 horde-webmail/lib/Horde/Kolab/Server/Object.php    |    2 +
 .../lib/Horde/Kolab/Server/Object/address.php      |   33 ++-
 .../lib/Horde/Kolab/Server/Object/adminrole.php    |   35 ++-
 .../lib/Horde/Kolab/Server/Object/distlist.php     |   30 ++-
 .../lib/Horde/Kolab/Server/Object/group.php        |   23 +-
 .../lib/Horde/Kolab/Server/Object/server.php       |   21 ++-
 .../lib/Horde/Kolab/Server/Object/sharedfolder.php |   23 +-
 .../lib/Horde/Kolab/Server/Object/user.php         |   32 ++-
 horde-webmail/lib/Horde/Kolab/Server/ldap.php      |  308 ++++++++++++++++++--
 horde-webmail/lib/Horde/Kolab/Server/test.php      |   20 ++-
 11 files changed, 467 insertions(+), 75 deletions(-)

diff --git a/horde-webmail/lib/Horde/Kolab/Server.php b/horde-webmail/lib/Horde/Kolab/Server.php
index bf251f5..fd0bda7 100644
--- a/horde-webmail/lib/Horde/Kolab/Server.php
+++ b/horde-webmail/lib/Horde/Kolab/Server.php
@@ -159,9 +159,12 @@ class Horde_Kolab_Server {
             $driver = 'ldap';
 
             $server_params = array('server'  => $conf['kolab']['ldap']['server'],
-                                  'base_dn' => $conf['kolab']['ldap']['basedn'],
-                                  'uid'     => $conf['kolab']['ldap']['phpdn'],
-                                  'pass'    => $conf['kolab']['ldap']['phppw']);
+                                   'base_dn' => $conf['kolab']['ldap']['basedn'],
+                                   'uid'     => $conf['kolab']['ldap']['phpdn'],
+                                   'pass'    => $conf['kolab']['ldap']['phppw']);
+            if (isset($conf['kolab']['ldap']['map'])) {
+                $server_params['map'] = $conf['kolab']['ldap']['map'];
+            }
         } else {
             $driver        = null;
             $server_params = array();
@@ -473,7 +476,7 @@ class Horde_Kolab_Server {
     function uidForId($id,
                       $restrict = KOLAB_SERVER_RESULT_SINGLE)
     {
-        return $this->uidForAttr('uid', $id);
+        return $this->uidForAttr(KOLAB_ATTR_SID, $id);
     }
 
     /**
@@ -513,7 +516,7 @@ class Horde_Kolab_Server {
      */
     function uidForIdOrMail($id)
     {
-        $uid = $this->uidForAttr('uid', $id);
+        $uid = $this->uidForAttr(KOLAB_ATTR_SID, $id);
         if (!$uid) {
             $uid = $this->uidForAttr('mail', $id);
         }
@@ -562,7 +565,7 @@ class Horde_Kolab_Server {
      */
     function uidForMailOrIdOrAlias($id)
     {
-        $uid = $this->uidForAttr('uid', $id);
+        $uid = $this->uidForAttr(KOLAB_ATTR_SID, $id);
         if (!$uid) {
             $uid = $this->uidForAttr('mail', $id);
             if (!$uid) {
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object.php b/horde-webmail/lib/Horde/Kolab/Server/Object.php
index 2e5ada2..be9eca9 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object.php
@@ -26,6 +26,7 @@ define('KOLAB_OBJECT_USER',             'Horde_Kolab_Server_Object_user');
 define('KOLAB_OBJECT_SERVER',           'Horde_Kolab_Server_Object_server');
 
 /** Define the possible Kolab object attributes */
+define('KOLAB_ATTR_OC',           'objectClass');
 define('KOLAB_ATTR_UID',          'dn');
 define('KOLAB_ATTR_ID',           'id');
 define('KOLAB_ATTR_SN',           'sn');
@@ -35,6 +36,7 @@ define('KOLAB_ATTR_FN',           'fn');
 define('KOLAB_ATTR_LNFN',         'lnfn');
 define('KOLAB_ATTR_FNLN',         'fnln');
 define('KOLAB_ATTR_MAIL',         'mail');
+define('KOLAB_ATTR_ALIAS',        'alias');
 define('KOLAB_ATTR_SID',          'uid');
 define('KOLAB_ATTR_ACL',          'acl');
 define('KOLAB_ATTR_MEMBER',       'member');
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/address.php b/horde-webmail/lib/Horde/Kolab/Server/Object/address.php
index 98ed518..bd6128f 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/address.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/address.php
@@ -33,13 +33,6 @@
 class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(objectclass=inetOrgPerson)(!(uid=*))(sn=*))';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -86,6 +79,32 @@ class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
     );
 
     /**
+     * The LDAP filter to retrieve this object type
+     *
+     * @return string
+     */
+    function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_SN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_INETORGPERSON),
+                              array('NOT' => array(
+                                        array('field' => KOLAB_ATTR_SID,
+                                              'op'    => '=',
+                                              'test'  => '*'),
+                                    ),
+                              ),
+                          ),
+        );
+        return $criteria;
+    }
+
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php b/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php
index aea4410..b2571ff 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php
@@ -32,13 +32,6 @@
 class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(cn=*)(objectClass=inetOrgPerson)(!(uid=manager))(sn=*))';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -87,6 +80,34 @@ class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
     );
 
     /**
+     * The LDAP filter to retrieve this object type
+     *
+     * @return string
+     */
+    function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_CN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_SN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_INETORGPERSON),
+                              array('NOT' => array(
+                                        array('field' => KOLAB_ATTR_SID,
+                                              'op'    => '=',
+                                              'test'  => 'manager'),
+                                    ),
+                              ),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php b/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php
index 7965e0d..22e096e 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php
@@ -34,14 +34,6 @@ require_once 'Horde/Kolab/Server/Object/group.php';
 class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(objectClass=kolabGroupOfNames)(mail=*))';
-
-
-    /**
      * The attributes required when creating an object of this class.
      *
      * @var array
@@ -49,4 +41,26 @@ class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group
     var $_required_attributes = array(
         KOLAB_ATTR_MAIL,
     );
+
+    /**
+     * Return the filter string to retrieve this object type.
+     *
+     * @static
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
+     */
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_MAIL,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
+                          ),
+        );
+        return $criteria;
+    }
 };
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/group.php b/horde-webmail/lib/Horde/Kolab/Server/Object/group.php
index 91c1bd2..f58c905 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/group.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/group.php
@@ -32,13 +32,6 @@
 class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(objectClass=kolabGroupOfNames)';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -104,6 +97,22 @@ class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
     }
 
     /**
+     * Return the filter string to retrieve this object type.
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
+     */
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(array('field' => KOLAB_ATTR_OC,
+                                               'op'    => '=',
+                                               'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/server.php b/horde-webmail/lib/Horde/Kolab/Server/Object/server.php
index 965eb84..740417c 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/server.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/server.php
@@ -32,11 +32,26 @@
 class Horde_Kolab_Server_Object_server extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
+     * Return the filter string to retrieve this object type.
      *
-     * @var string
+     * @static
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
      */
-    var $filter = '(&((k=kolab))(objectclass=kolab))';
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => 'k',
+                                    'op'    => '=',
+                                    'test'  => 'kolab'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_KOLAB),
+                          ),
+        );
+        return $criteria;
+    }
 
     /**
      * The attributes supported by this class
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php b/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php
index 3b68862..b92f07b 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php
@@ -33,13 +33,6 @@
 class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(objectClass=kolabSharedFolder)';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -89,6 +82,22 @@ class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
     }
 
     /**
+     * Return the filter string to retrieve this object type.
+     *
+     * @return string The filter to retrieve this object type from the server
+     *                database.
+     */
+    public static function getFilter()
+    {
+        $criteria = array('AND' => array(array('field' => KOLAB_ATTR_OC,
+                                               'op'    => '=',
+                                               'test'  => KOLAB_OC_KOLABSHAREDFOLDER),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/user.php b/horde-webmail/lib/Horde/Kolab/Server/Object/user.php
index d4e57a0..b702a4f 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/Object/user.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/Object/user.php
@@ -33,13 +33,6 @@
 class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
 
     /**
-     * The LDAP filter to retrieve this object type
-     *
-     * @var string
-     */
-    var $filter = '(&(objectClass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))';
-
-    /**
      * The attributes supported by this class
      *
      * @var array
@@ -154,6 +147,31 @@ class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
     }
 
     /**
+     * The LDAP filter to retrieve this object type
+     *
+     * @return string
+     */
+    function getFilter()
+    {
+        $criteria = array('AND' => array(
+                              array('field' => KOLAB_ATTR_SN,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_MAIL,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_SID,
+                                    'op'    => '=',
+                                    'test'  => '*'),
+                              array('field' => KOLAB_ATTR_OC,
+                                    'op'    => '=',
+                                    'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                          ),
+        );
+        return $criteria;
+    }
+
+    /**
      * Convert the object attributes to a hash.
      *
      * @param string $attrs The attributes to return.
diff --git a/horde-webmail/lib/Horde/Kolab/Server/ldap.php b/horde-webmail/lib/Horde/Kolab/Server/ldap.php
index a50ba2c..ea73b4f 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/ldap.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/ldap.php
@@ -2,7 +2,7 @@
 /**
  * The driver for accessing the Kolab user database stored in LDAP.
  *
- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.2.2.2 2008/08/01 07:56:19 wrobel Exp $
+ * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.2.2.10 2009/02/24 07:39:47 wrobel Exp $
  *
  * PHP version 4
  *
@@ -210,6 +210,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
         }
 
         if (isset($attrs)) {
+            $this->mapKeys($attrs);
             $result = @ldap_read($this->_connection, $dn, '(objectclass=*)', $attrs);
         } else {
             $result = @ldap_read($this->_connection, $dn, '(objectclass=*)');
@@ -220,7 +221,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
         }
         $entry = $this->_firstEntry($result);
         if (!$entry) {
-            ldap_free_result($result);
+            @ldap_free_result($result);
             return PEAR::raiseError(sprintf(_("LDAP Error: Empty result for: %s."),
                                             $dn));
         }
@@ -229,7 +230,10 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
             return PEAR::raiseError(sprintf(_("LDAP Error: No such dn: %s: %s"),
                                             $dn, $this->_error()));
         }
-        ldap_free_result($result);
+        @ldap_free_result($result);
+
+        $this->unmapAttributes($object);
+
         return $object;
     }
 
@@ -250,6 +254,8 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
             }
         }
 
+        $this->mapAttributes($data);
+
         return @ldap_add($this->_connection, $dn, $data);
     }
 
@@ -681,9 +687,25 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function mailForIdOrMail($id)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
-            Horde_LDAP::quote($id) . ')(mail=' .
-            Horde_LDAP::quote($id) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
+
         $result = $this->_attrsForFilter($filter, array('mail'),
                                          KOLAB_SERVER_RESULT_STRICT);
         if (is_a($result, 'PEAR_Error')) {
@@ -702,9 +724,24 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function uidForIdOrMail($id)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
-            Horde_LDAP::quote($id) . ')(mail=' .
-            Horde_LDAP::quote($id) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter, KOLAB_SERVER_RESULT_STRICT);
     }
 
@@ -717,9 +754,25 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function addrsForIdOrMail($id)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(mail='
-            . Horde_LDAP::quote($id) . ')(uid='
-            . Horde_LDAP::quote($id) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $id),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
+
         $result = $this->_attrsForFilter($filter, array('mail', 'alias'),
                                          KOLAB_SERVER_RESULT_STRICT);
         if (empty($result)) {
@@ -768,10 +821,27 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
      */
     function uidForMailAddress($mail)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
-            Horde_LDAP::quote($mail) . ')(mail=' .
-            Horde_LDAP::quote($mail) . ')(alias=' .
-            Horde_LDAP::quote($mail) . ')))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+                             array('OR' =>
+                                   array(
+                                       array('field' => KOLAB_ATTR_ALIAS,
+                                             'op'    => '=',
+                                             'test'  => $mail),
+                                       array('field' => KOLAB_ATTR_MAIL,
+                                             'op'    => '=',
+                                             'test'  => $mail),
+                                       array('field' => KOLAB_ATTR_SID,
+                                             'op'    => '=',
+                                             'test'  => $mail),
+                                   ),
+                             ),
+                         ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter);
     }
 
@@ -788,8 +858,17 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
     function uidForAttr($attr, $value,
                        $restrict = KOLAB_SERVER_RESULT_SINGLE)
     {
-        $filter = '(&(objectClass=kolabInetOrgPerson)(' . $attr .
-            '=' . Horde_LDAP::quote($value) . '))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
+			     array('field' => $attr,
+				   'op'    => '=',
+				   'test'  => $value),
+                             ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter, $restrict);
     }
 
@@ -806,8 +885,17 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
     function gidForAttr($attr, $value,
                        $restrict = KOLAB_SERVER_RESULT_SINGLE)
     {
-        $filter = '(&(objectClass=kolabGroupOfNames)(' . $attr .
-            '=' . Horde_LDAP::quote($value) . '))';
+        $criteria = array('AND' =>
+                         array(
+                             array('field' => KOLAB_ATTR_OC,
+                                   'op'    => '=',
+                                   'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
+			     array('field' => $attr,
+				   'op'    => '=',
+				   'test'  => $value),
+                             ),
+        );
+        $filter   = $this->searchQuery($criteria);
         return $this->_dnForFilter($filter, $restrict);
     }
 
@@ -874,7 +962,13 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
             return $result;
         }
         $vars   = get_class_vars($type);
-        $filter = $vars['filter'];
+        $methods = get_class_methods($type);
+        if (!in_array('getFilter', $methods)) {
+            $filter = $vars['filter'];
+        } else {
+            $criteria = call_user_func(array($type, 'getFilter'));
+            $filter   = $this->searchQuery($criteria);
+        }
         $sort   = $vars['sort_by'];
 
         if (isset($params['sort'])) {
@@ -993,4 +1087,176 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
         }
     }
 
+    /**
+     * Build a search query.
+     *
+     * Taken from the Turba LDAP driver.
+     *
+     * @param array $criteria The array of criteria.
+     *
+     * @return string  An LDAP query filter.
+     */
+    public function searchQuery($criteria)
+    {
+        require_once 'Net/LDAP2.php';
+
+        /* Accept everything. */
+        $filter = '(' . strtolower(KOLAB_ATTR_OC) . '=*)';
+
+        /* Build the LDAP filter. */
+        if (count($criteria)) {
+            $f = $this->buildSearchQuery($criteria);
+            if (is_a($f, 'Net_LDAP2_Filter')) {
+                $filter = $f->asString();
+            }
+        }
+        return $filter;
+    }
+
+    /**
+     * Build a piece of a search query.
+     *
+     * Taken from the Turba LDAP driver.
+     *
+     * @param array $criteria The array of criteria.
+     *
+     * @return string  An LDAP query fragment.
+     */
+    protected function &buildSearchQuery($criteria)
+    {
+        if (isset($criteria['field'])) {
+            require_once 'Horde/String.php';
+            require_once 'Horde/NLS.php';
+            $rhs     = $criteria['test'];
+            /* Keep this in for reference as we did not really test servers with different encoding yet */
+            //$rhs     = String::convertCharset($criteria['test'], NLS::getCharset(), $this->params['charset']);
+            switch ($criteria['op']) {
+            case '=':
+                $op = 'equals';
+                break;
+            }
+            return Net_LDAP2_Filter::create($this->mapField($criteria['field']),
+                                            $op, $rhs);
+        }
+        foreach ($criteria as $key => $vals) {
+            if (!empty($vals['OR'])
+                || !empty($vals['AND'])
+                || !empty($vals['NOT'])) {
+                $parts = $this->buildSearchQuery($vals);
+                if (count($parts) > 1) {
+                    if (!empty($vals['OR'])) {
+                        $operator = '|';
+                    } else if (!empty($vals['NOT'])) {
+                        $operator = '!';
+                    } else {
+                        $operator = '&';
+                    }
+                    return Net_LDAP2_Filter::combine($operator, $parts);
+                } else {
+                    return $parts[0];
+                }
+            } else {
+                $parts = array();
+                foreach ($vals as $test) {
+                    $parts[] = &$this->buildSearchQuery($test);
+                }
+                switch ($key) {
+                case 'OR':
+                    $operator = '|';
+                    break;
+                case 'AND':
+                    $operator = '&';
+                    break;
+                case 'NOT':
+                    $operator = '!';
+                    break;
+                }
+                if (count($parts) > 1) {
+                    return Net_LDAP2_Filter::combine($operator, $parts);
+                } else if ($operator == '!') {
+                    return Net_LDAP2_Filter::combine($operator, $parts[0]);
+                } else {
+                    return $parts[0];
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attributes defined within this library their their real world
+     * counterparts.
+     *
+     * @param array $data The data that has been read and needs to be mapped.
+     *
+     * @return NULL
+     */
+    protected function unmapAttributes(&$data)
+    {
+        if (!empty($this->_params['map'])) {
+            foreach ($this->_params['map'] as $attribute => $map) {
+                if (isset($data[$map])) {
+                    $data[$attribute] = $data[$map];
+                    unset($data[$map]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attributes defined within this library into their real world
+     * counterparts.
+     *
+     * @param array $data The data to be written.
+     *
+     * @return NULL
+     */
+    protected function mapAttributes(&$data)
+    {
+        if (!empty($this->_params['map'])) {
+            foreach ($this->_params['map'] as $attribute => $map) {
+                if (isset($data[$attribute])) {
+                    $data[$map] = $data[$attribute];
+                    unset($data[$attribute]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attribute keys defined within this library into their real world
+     * counterparts.
+     *
+     * @param array $keys The attribute keys.
+     *
+     * @return NULL
+     */
+    protected function mapKeys(&$keys)
+    {
+        if (!empty($this->_params['map'])) {
+            foreach ($this->_params['map'] as $attribute => $map) {
+                $key = array_search($attribute, $keys);
+                if ($key !== false) {
+                    $keys[$key] = $map;
+                }
+            }
+        }
+    }
+
+    /**
+     * Map a single attribute key defined within this library into its real
+     * world counterpart.
+     *
+     * @param array $field The attribute name.
+     *
+     * @return The real name of this attribute on the server we connect to.
+     */
+    protected function mapField($field)
+    {
+        if (!empty($this->_params['map'])
+            && isset($this->_params['map'][$field])) {
+            return $this->_params['map'][$field];
+        }
+        return $field;
+    }
+
 }
diff --git a/horde-webmail/lib/Horde/Kolab/Server/test.php b/horde-webmail/lib/Horde/Kolab/Server/test.php
index 47f985a..fc19c80 100644
--- a/horde-webmail/lib/Horde/Kolab/Server/test.php
+++ b/horde-webmail/lib/Horde/Kolab/Server/test.php
@@ -247,6 +247,10 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
             }
         }
 
+        if (!empty($attributes)) {
+            $this->mapKeys($attributes);
+        }
+
         $filter = $this->_parse($filter);
         if (is_a($filter, 'PEAR_Error')) {
             return $filter;
@@ -265,6 +269,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
             $result = $subtree;
         }
 
+        $this->unmapAttributes($result);
+
         return $result;
     }
 
@@ -286,7 +292,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
                     switch ($filter['log']) {
                     case '=':
                         $value = $element['data'][$filter['att']];
-                        if (($filter['val'] == '*' && !empty($value))
+                        if ((($filter['val'] == '*'  || $filter['val'] == '\2a')
+                             && !empty($value))
                             || $value == $filter['val']
                             || (is_array($value)
                                 && in_array($filter['val'], $value))) {
@@ -390,8 +397,12 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
                                             $dn));
         }
         if (empty($attrs)) {
-            return $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
+            $data = $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
+            $this->unmapAttributes($data);
+            return $data;
         } else {
+            $this->mapKeys($attrs);
+
             $result = array();
             $data   = $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
 
@@ -401,6 +412,9 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
                     array_push($result, $attr);
                 }
             }
+
+            $this->unmapAttributes($result);
+
             $result['count'] = 1;
             return $result;
         }
@@ -423,6 +437,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
             }
         }
 
+        $this->mapAttributes($data);
+
         $ldap_data = array();
         foreach ($data as $key => $val) {
             if (!is_array($val)) {
-- 
tg: (0ad87da..) t/Kolab_Server/HK/GW/MappableAttributes (depends on: t/pear/HK/GW/AddNetLDAP2)
-- 
TOPGIT patch commit log
=======================

commit 296112ac1021e0433ca9578a700c8f066bc139a9
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Apr 24 19:30:10 2009 +0200

    Fixed mapping of attributes. Fixed uidForAttr and gidForAttr.

commit a2525f3bf8a77431e4cd28bd92e1cb9fec14e392
Author: Gunnar Wrobel <p at rdus.de>
Date:   Thu Apr 23 13:45:14 2009 +0200

    Allow to configurable LDAP attribute mapping.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -d -r1.5.2.7 -r1.5.2.8
--- series	13 Oct 2009 12:37:27 -0000	1.5.2.7
+++ series	13 Oct 2009 13:24:08 -0000	1.5.2.8
@@ -69,6 +69,7 @@
 t_imp_H_MS_bug7438.diff -p1
 t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff -p1
 t_pear_HK_GW_AddNetLDAP2.diff -p1
+t_Kolab__Server_HK_GW_MappableAttributes.diff -p1
 t_framework_HK_GW_Prefs_FileDriverHotfix.diff -p1
 t_kronolith_HK_GW_AnonymousiCalDownload.diff -p1
 t_kronolith_HK_GW_ExportEventList.diff -p1



From cvs at kolab.org  Tue Oct 13 15:24:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 15:24:11 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.13, 1.32.2.14 
Message-ID: <20091013132411.12A79600801@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv14888/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.13
retrieving revision 1.32.2.14
diff -u -d -r1.32.2.13 -r1.32.2.14
--- horde-webmail-1.2.0_kolab_openpkg.patch	13 Oct 2009 12:57:55 -0000	1.32.2.13
+++ horde-webmail-1.2.0_kolab_openpkg.patch	13 Oct 2009 13:24:07 -0000	1.32.2.14
@@ -26028,6 +26028,895 @@
 
     Add PEAR-Net_LDAP2
 From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/Kolab_Server/HK/GW/MappableAttributes
+
+Allow to configure mapped LDAP attributes.
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/lib/Horde/Kolab/Server.php           |   15 +-
+ horde-webmail/lib/Horde/Kolab/Server/Object.php    |    2 +
+ .../lib/Horde/Kolab/Server/Object/address.php      |   33 ++-
+ .../lib/Horde/Kolab/Server/Object/adminrole.php    |   35 ++-
+ .../lib/Horde/Kolab/Server/Object/distlist.php     |   30 ++-
+ .../lib/Horde/Kolab/Server/Object/group.php        |   23 +-
+ .../lib/Horde/Kolab/Server/Object/server.php       |   21 ++-
+ .../lib/Horde/Kolab/Server/Object/sharedfolder.php |   23 +-
+ .../lib/Horde/Kolab/Server/Object/user.php         |   32 ++-
+ horde-webmail/lib/Horde/Kolab/Server/ldap.php      |  308 ++++++++++++++++++--
+ horde-webmail/lib/Horde/Kolab/Server/test.php      |   20 ++-
+ 11 files changed, 467 insertions(+), 75 deletions(-)
+
+diff --git a/horde-webmail/lib/Horde/Kolab/Server.php b/horde-webmail/lib/Horde/Kolab/Server.php
+index bf251f5..fd0bda7 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server.php
++++ b/horde-webmail/lib/Horde/Kolab/Server.php
+@@ -159,9 +159,12 @@ class Horde_Kolab_Server {
+             $driver = 'ldap';
+ 
+             $server_params = array('server'  => $conf['kolab']['ldap']['server'],
+-                                  'base_dn' => $conf['kolab']['ldap']['basedn'],
+-                                  'uid'     => $conf['kolab']['ldap']['phpdn'],
+-                                  'pass'    => $conf['kolab']['ldap']['phppw']);
++                                   'base_dn' => $conf['kolab']['ldap']['basedn'],
++                                   'uid'     => $conf['kolab']['ldap']['phpdn'],
++                                   'pass'    => $conf['kolab']['ldap']['phppw']);
++            if (isset($conf['kolab']['ldap']['map'])) {
++                $server_params['map'] = $conf['kolab']['ldap']['map'];
++            }
+         } else {
+             $driver        = null;
+             $server_params = array();
+@@ -473,7 +476,7 @@ class Horde_Kolab_Server {
+     function uidForId($id,
+                       $restrict = KOLAB_SERVER_RESULT_SINGLE)
+     {
+-        return $this->uidForAttr('uid', $id);
++        return $this->uidForAttr(KOLAB_ATTR_SID, $id);
+     }
+ 
+     /**
+@@ -513,7 +516,7 @@ class Horde_Kolab_Server {
+      */
+     function uidForIdOrMail($id)
+     {
+-        $uid = $this->uidForAttr('uid', $id);
++        $uid = $this->uidForAttr(KOLAB_ATTR_SID, $id);
+         if (!$uid) {
+             $uid = $this->uidForAttr('mail', $id);
+         }
+@@ -562,7 +565,7 @@ class Horde_Kolab_Server {
+      */
+     function uidForMailOrIdOrAlias($id)
+     {
+-        $uid = $this->uidForAttr('uid', $id);
++        $uid = $this->uidForAttr(KOLAB_ATTR_SID, $id);
+         if (!$uid) {
+             $uid = $this->uidForAttr('mail', $id);
+             if (!$uid) {
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object.php b/horde-webmail/lib/Horde/Kolab/Server/Object.php
+index 2e5ada2..be9eca9 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object.php
+@@ -26,6 +26,7 @@ define('KOLAB_OBJECT_USER',             'Horde_Kolab_Server_Object_user');
+ define('KOLAB_OBJECT_SERVER',           'Horde_Kolab_Server_Object_server');
+ 
+ /** Define the possible Kolab object attributes */
++define('KOLAB_ATTR_OC',           'objectClass');
+ define('KOLAB_ATTR_UID',          'dn');
+ define('KOLAB_ATTR_ID',           'id');
+ define('KOLAB_ATTR_SN',           'sn');
+@@ -35,6 +36,7 @@ define('KOLAB_ATTR_FN',           'fn');
+ define('KOLAB_ATTR_LNFN',         'lnfn');
+ define('KOLAB_ATTR_FNLN',         'fnln');
+ define('KOLAB_ATTR_MAIL',         'mail');
++define('KOLAB_ATTR_ALIAS',        'alias');
+ define('KOLAB_ATTR_SID',          'uid');
+ define('KOLAB_ATTR_ACL',          'acl');
+ define('KOLAB_ATTR_MEMBER',       'member');
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/address.php b/horde-webmail/lib/Horde/Kolab/Server/Object/address.php
+index 98ed518..bd6128f 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/address.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/address.php
+@@ -33,13 +33,6 @@
+ class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
+-     *
+-     * @var string
+-     */
+-    var $filter = '(&(objectclass=inetOrgPerson)(!(uid=*))(sn=*))';
+-
+-    /**
+      * The attributes supported by this class
+      *
+      * @var array
+@@ -86,6 +79,32 @@ class Horde_Kolab_Server_Object_address extends Horde_Kolab_Server_Object {
+     );
+ 
+     /**
++     * The LDAP filter to retrieve this object type
++     *
++     * @return string
++     */
++    function getFilter()
++    {
++        $criteria = array('AND' => array(
++                              array('field' => KOLAB_ATTR_SN,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_OC,
++                                    'op'    => '=',
++                                    'test'  => KOLAB_OC_INETORGPERSON),
++                              array('NOT' => array(
++                                        array('field' => KOLAB_ATTR_SID,
++                                              'op'    => '=',
++                                              'test'  => '*'),
++                                    ),
++                              ),
++                          ),
++        );
++        return $criteria;
++    }
++
++
++    /**
+      * Convert the object attributes to a hash.
+      *
+      * @param string $attrs The attributes to return.
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php b/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php
+index aea4410..b2571ff 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/adminrole.php
+@@ -32,13 +32,6 @@
+ class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
+-     *
+-     * @var string
+-     */
+-    var $filter = '(&(cn=*)(objectClass=inetOrgPerson)(!(uid=manager))(sn=*))';
+-
+-    /**
+      * The attributes supported by this class
+      *
+      * @var array
+@@ -87,6 +80,34 @@ class Horde_Kolab_Server_Object_adminrole extends Horde_Kolab_Server_Object {
+     );
+ 
+     /**
++     * The LDAP filter to retrieve this object type
++     *
++     * @return string
++     */
++    function getFilter()
++    {
++        $criteria = array('AND' => array(
++                              array('field' => KOLAB_ATTR_CN,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_SN,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_OC,
++                                    'op'    => '=',
++                                    'test'  => KOLAB_OC_INETORGPERSON),
++                              array('NOT' => array(
++                                        array('field' => KOLAB_ATTR_SID,
++                                              'op'    => '=',
++                                              'test'  => 'manager'),
++                                    ),
++                              ),
++                          ),
++        );
++        return $criteria;
++    }
++
++    /**
+      * Convert the object attributes to a hash.
+      *
+      * @param string $attrs The attributes to return.
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php b/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php
+index 7965e0d..22e096e 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/distlist.php
+@@ -34,14 +34,6 @@ require_once 'Horde/Kolab/Server/Object/group.php';
+ class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
+-     *
+-     * @var string
+-     */
+-    var $filter = '(&(objectClass=kolabGroupOfNames)(mail=*))';
+-
+-
+-    /**
+      * The attributes required when creating an object of this class.
+      *
+      * @var array
+@@ -49,4 +41,26 @@ class Horde_Kolab_Server_Object_distlist extends Horde_Kolab_Server_Object_group
+     var $_required_attributes = array(
+         KOLAB_ATTR_MAIL,
+     );
++
++    /**
++     * Return the filter string to retrieve this object type.
++     *
++     * @static
++     *
++     * @return string The filter to retrieve this object type from the server
++     *                database.
++     */
++    public static function getFilter()
++    {
++        $criteria = array('AND' => array(
++                              array('field' => KOLAB_ATTR_MAIL,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_OC,
++                                    'op'    => '=',
++                                    'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
++                          ),
++        );
++        return $criteria;
++    }
+ };
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/group.php b/horde-webmail/lib/Horde/Kolab/Server/Object/group.php
+index 91c1bd2..f58c905 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/group.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/group.php
+@@ -32,13 +32,6 @@
+ class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
+-     *
+-     * @var string
+-     */
+-    var $filter = '(objectClass=kolabGroupOfNames)';
+-
+-    /**
+      * The attributes supported by this class
+      *
+      * @var array
+@@ -104,6 +97,22 @@ class Horde_Kolab_Server_Object_group extends Horde_Kolab_Server_Object {
+     }
+ 
+     /**
++     * Return the filter string to retrieve this object type.
++     *
++     * @return string The filter to retrieve this object type from the server
++     *                database.
++     */
++    public static function getFilter()
++    {
++        $criteria = array('AND' => array(array('field' => KOLAB_ATTR_OC,
++                                               'op'    => '=',
++                                               'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
++                          ),
++        );
++        return $criteria;
++    }
++
++    /**
+      * Convert the object attributes to a hash.
+      *
+      * @param string $attrs The attributes to return.
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/server.php b/horde-webmail/lib/Horde/Kolab/Server/Object/server.php
+index 965eb84..740417c 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/server.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/server.php
+@@ -32,11 +32,26 @@
+ class Horde_Kolab_Server_Object_server extends Horde_Kolab_Server_Object {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
++     * Return the filter string to retrieve this object type.
+      *
+-     * @var string
++     * @static
++     *
++     * @return string The filter to retrieve this object type from the server
++     *                database.
+      */
+-    var $filter = '(&((k=kolab))(objectclass=kolab))';
++    public static function getFilter()
++    {
++        $criteria = array('AND' => array(
++                              array('field' => 'k',
++                                    'op'    => '=',
++                                    'test'  => 'kolab'),
++                              array('field' => KOLAB_ATTR_OC,
++                                    'op'    => '=',
++                                    'test'  => KOLAB_OC_KOLAB),
++                          ),
++        );
++        return $criteria;
++    }
+ 
+     /**
+      * The attributes supported by this class
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php b/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php
+index 3b68862..b92f07b 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/sharedfolder.php
+@@ -33,13 +33,6 @@
+ class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
+-     *
+-     * @var string
+-     */
+-    var $filter = '(objectClass=kolabSharedFolder)';
+-
+-    /**
+      * The attributes supported by this class
+      *
+      * @var array
+@@ -89,6 +82,22 @@ class Horde_Kolab_Server_Object_sharedfolder extends Horde_Kolab_Server_Object {
+     }
+ 
+     /**
++     * Return the filter string to retrieve this object type.
++     *
++     * @return string The filter to retrieve this object type from the server
++     *                database.
++     */
++    public static function getFilter()
++    {
++        $criteria = array('AND' => array(array('field' => KOLAB_ATTR_OC,
++                                               'op'    => '=',
++                                               'test'  => KOLAB_OC_KOLABSHAREDFOLDER),
++                          ),
++        );
++        return $criteria;
++    }
++
++    /**
+      * Convert the object attributes to a hash.
+      *
+      * @param string $attrs The attributes to return.
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/Object/user.php b/horde-webmail/lib/Horde/Kolab/Server/Object/user.php
+index d4e57a0..b702a4f 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/Object/user.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/Object/user.php
+@@ -33,13 +33,6 @@
+ class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
+ 
+     /**
+-     * The LDAP filter to retrieve this object type
+-     *
+-     * @var string
+-     */
+-    var $filter = '(&(objectClass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))';
+-
+-    /**
+      * The attributes supported by this class
+      *
+      * @var array
+@@ -154,6 +147,31 @@ class Horde_Kolab_Server_Object_user extends Horde_Kolab_Server_Object {
+     }
+ 
+     /**
++     * The LDAP filter to retrieve this object type
++     *
++     * @return string
++     */
++    function getFilter()
++    {
++        $criteria = array('AND' => array(
++                              array('field' => KOLAB_ATTR_SN,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_MAIL,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_SID,
++                                    'op'    => '=',
++                                    'test'  => '*'),
++                              array('field' => KOLAB_ATTR_OC,
++                                    'op'    => '=',
++                                    'test'  => KOLAB_OC_KOLABINETORGPERSON),
++                          ),
++        );
++        return $criteria;
++    }
++
++    /**
+      * Convert the object attributes to a hash.
+      *
+      * @param string $attrs The attributes to return.
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/ldap.php b/horde-webmail/lib/Horde/Kolab/Server/ldap.php
+index a50ba2c..ea73b4f 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/ldap.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/ldap.php
+@@ -2,7 +2,7 @@
+ /**
+  * The driver for accessing the Kolab user database stored in LDAP.
+  *
+- * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.2.2.2 2008/08/01 07:56:19 wrobel Exp $
++ * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.2.2.10 2009/02/24 07:39:47 wrobel Exp $
+  *
+  * PHP version 4
+  *
+@@ -210,6 +210,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+         }
+ 
+         if (isset($attrs)) {
++            $this->mapKeys($attrs);
+             $result = @ldap_read($this->_connection, $dn, '(objectclass=*)', $attrs);
+         } else {
+             $result = @ldap_read($this->_connection, $dn, '(objectclass=*)');
+@@ -220,7 +221,7 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+         }
+         $entry = $this->_firstEntry($result);
+         if (!$entry) {
+-            ldap_free_result($result);
++            @ldap_free_result($result);
+             return PEAR::raiseError(sprintf(_("LDAP Error: Empty result for: %s."),
+                                             $dn));
+         }
+@@ -229,7 +230,10 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+             return PEAR::raiseError(sprintf(_("LDAP Error: No such dn: %s: %s"),
+                                             $dn, $this->_error()));
+         }
+-        ldap_free_result($result);
++        @ldap_free_result($result);
++
++        $this->unmapAttributes($object);
++
+         return $object;
+     }
+ 
+@@ -250,6 +254,8 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+             }
+         }
+ 
++        $this->mapAttributes($data);
++
+         return @ldap_add($this->_connection, $dn, $data);
+     }
+ 
+@@ -681,9 +687,25 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+      */
+     function mailForIdOrMail($id)
+     {
+-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
+-            Horde_LDAP::quote($id) . ')(mail=' .
+-            Horde_LDAP::quote($id) . ')))';
++        $criteria = array('AND' =>
++                         array(
++                             array('field' => KOLAB_ATTR_OC,
++                                   'op'    => '=',
++                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
++                             array('OR' =>
++                                   array(
++                                       array('field' => KOLAB_ATTR_SID,
++                                             'op'    => '=',
++                                             'test'  => $id),
++                                       array('field' => KOLAB_ATTR_MAIL,
++                                             'op'    => '=',
++                                             'test'  => $id),
++                                   ),
++                             ),
++                         ),
++        );
++        $filter   = $this->searchQuery($criteria);
++
+         $result = $this->_attrsForFilter($filter, array('mail'),
+                                          KOLAB_SERVER_RESULT_STRICT);
+         if (is_a($result, 'PEAR_Error')) {
+@@ -702,9 +724,24 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+      */
+     function uidForIdOrMail($id)
+     {
+-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
+-            Horde_LDAP::quote($id) . ')(mail=' .
+-            Horde_LDAP::quote($id) . ')))';
++        $criteria = array('AND' =>
++                         array(
++                             array('field' => KOLAB_ATTR_OC,
++                                   'op'    => '=',
++                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
++                             array('OR' =>
++                                   array(
++                                       array('field' => KOLAB_ATTR_SID,
++                                             'op'    => '=',
++                                             'test'  => $id),
++                                       array('field' => KOLAB_ATTR_MAIL,
++                                             'op'    => '=',
++                                             'test'  => $id),
++                                   ),
++                             ),
++                         ),
++        );
++        $filter   = $this->searchQuery($criteria);
+         return $this->_dnForFilter($filter, KOLAB_SERVER_RESULT_STRICT);
+     }
+ 
+@@ -717,9 +754,25 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+      */
+     function addrsForIdOrMail($id)
+     {
+-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(mail='
+-            . Horde_LDAP::quote($id) . ')(uid='
+-            . Horde_LDAP::quote($id) . ')))';
++        $criteria = array('AND' =>
++                         array(
++                             array('field' => KOLAB_ATTR_OC,
++                                   'op'    => '=',
++                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
++                             array('OR' =>
++                                   array(
++                                       array('field' => KOLAB_ATTR_SID,
++                                             'op'    => '=',
++                                             'test'  => $id),
++                                       array('field' => KOLAB_ATTR_MAIL,
++                                             'op'    => '=',
++                                             'test'  => $id),
++                                   ),
++                             ),
++                         ),
++        );
++        $filter   = $this->searchQuery($criteria);
++
+         $result = $this->_attrsForFilter($filter, array('mail', 'alias'),
+                                          KOLAB_SERVER_RESULT_STRICT);
+         if (empty($result)) {
+@@ -768,10 +821,27 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+      */
+     function uidForMailAddress($mail)
+     {
+-        $filter = '(&(objectClass=kolabInetOrgPerson)(|(uid='.
+-            Horde_LDAP::quote($mail) . ')(mail=' .
+-            Horde_LDAP::quote($mail) . ')(alias=' .
+-            Horde_LDAP::quote($mail) . ')))';
++        $criteria = array('AND' =>
++                         array(
++                             array('field' => KOLAB_ATTR_OC,
++                                   'op'    => '=',
++                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
++                             array('OR' =>
++                                   array(
++                                       array('field' => KOLAB_ATTR_ALIAS,
++                                             'op'    => '=',
++                                             'test'  => $mail),
++                                       array('field' => KOLAB_ATTR_MAIL,
++                                             'op'    => '=',
++                                             'test'  => $mail),
++                                       array('field' => KOLAB_ATTR_SID,
++                                             'op'    => '=',
++                                             'test'  => $mail),
++                                   ),
++                             ),
++                         ),
++        );
++        $filter   = $this->searchQuery($criteria);
+         return $this->_dnForFilter($filter);
+     }
+ 
+@@ -788,8 +858,17 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+     function uidForAttr($attr, $value,
+                        $restrict = KOLAB_SERVER_RESULT_SINGLE)
+     {
+-        $filter = '(&(objectClass=kolabInetOrgPerson)(' . $attr .
+-            '=' . Horde_LDAP::quote($value) . '))';
++        $criteria = array('AND' =>
++                         array(
++                             array('field' => KOLAB_ATTR_OC,
++                                   'op'    => '=',
++                                   'test'  => KOLAB_OC_KOLABINETORGPERSON),
++			     array('field' => $attr,
++				   'op'    => '=',
++				   'test'  => $value),
++                             ),
++        );
++        $filter   = $this->searchQuery($criteria);
+         return $this->_dnForFilter($filter, $restrict);
+     }
+ 
+@@ -806,8 +885,17 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+     function gidForAttr($attr, $value,
+                        $restrict = KOLAB_SERVER_RESULT_SINGLE)
+     {
+-        $filter = '(&(objectClass=kolabGroupOfNames)(' . $attr .
+-            '=' . Horde_LDAP::quote($value) . '))';
++        $criteria = array('AND' =>
++                         array(
++                             array('field' => KOLAB_ATTR_OC,
++                                   'op'    => '=',
++                                   'test'  => KOLAB_OC_KOLABGROUPOFNAMES),
++			     array('field' => $attr,
++				   'op'    => '=',
++				   'test'  => $value),
++                             ),
++        );
++        $filter   = $this->searchQuery($criteria);
+         return $this->_dnForFilter($filter, $restrict);
+     }
+ 
+@@ -874,7 +962,13 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+             return $result;
+         }
+         $vars   = get_class_vars($type);
+-        $filter = $vars['filter'];
++        $methods = get_class_methods($type);
++        if (!in_array('getFilter', $methods)) {
++            $filter = $vars['filter'];
++        } else {
++            $criteria = call_user_func(array($type, 'getFilter'));
++            $filter   = $this->searchQuery($criteria);
++        }
+         $sort   = $vars['sort_by'];
+ 
+         if (isset($params['sort'])) {
+@@ -993,4 +1087,176 @@ class Horde_Kolab_Server_ldap extends Horde_Kolab_Server {
+         }
+     }
+ 
++    /**
++     * Build a search query.
++     *
++     * Taken from the Turba LDAP driver.
++     *
++     * @param array $criteria The array of criteria.
++     *
++     * @return string  An LDAP query filter.
++     */
++    public function searchQuery($criteria)
++    {
++        require_once 'Net/LDAP2.php';
++
++        /* Accept everything. */
++        $filter = '(' . strtolower(KOLAB_ATTR_OC) . '=*)';
++
++        /* Build the LDAP filter. */
++        if (count($criteria)) {
++            $f = $this->buildSearchQuery($criteria);
++            if (is_a($f, 'Net_LDAP2_Filter')) {
++                $filter = $f->asString();
++            }
++        }
++        return $filter;
++    }
++
++    /**
++     * Build a piece of a search query.
++     *
++     * Taken from the Turba LDAP driver.
++     *
++     * @param array $criteria The array of criteria.
++     *
++     * @return string  An LDAP query fragment.
++     */
++    protected function &buildSearchQuery($criteria)
++    {
++        if (isset($criteria['field'])) {
++            require_once 'Horde/String.php';
++            require_once 'Horde/NLS.php';
++            $rhs     = $criteria['test'];
++            /* Keep this in for reference as we did not really test servers with different encoding yet */
++            //$rhs     = String::convertCharset($criteria['test'], NLS::getCharset(), $this->params['charset']);
++            switch ($criteria['op']) {
++            case '=':
++                $op = 'equals';
++                break;
++            }
++            return Net_LDAP2_Filter::create($this->mapField($criteria['field']),
++                                            $op, $rhs);
++        }
++        foreach ($criteria as $key => $vals) {
++            if (!empty($vals['OR'])
++                || !empty($vals['AND'])
++                || !empty($vals['NOT'])) {
++                $parts = $this->buildSearchQuery($vals);
++                if (count($parts) > 1) {
++                    if (!empty($vals['OR'])) {
++                        $operator = '|';
++                    } else if (!empty($vals['NOT'])) {
++                        $operator = '!';
++                    } else {
++                        $operator = '&';
++                    }
++                    return Net_LDAP2_Filter::combine($operator, $parts);
++                } else {
++                    return $parts[0];
++                }
++            } else {
++                $parts = array();
++                foreach ($vals as $test) {
++                    $parts[] = &$this->buildSearchQuery($test);
++                }
++                switch ($key) {
++                case 'OR':
++                    $operator = '|';
++                    break;
++                case 'AND':
++                    $operator = '&';
++                    break;
++                case 'NOT':
++                    $operator = '!';
++                    break;
++                }
++                if (count($parts) > 1) {
++                    return Net_LDAP2_Filter::combine($operator, $parts);
++                } else if ($operator == '!') {
++                    return Net_LDAP2_Filter::combine($operator, $parts[0]);
++                } else {
++                    return $parts[0];
++                }
++            }
++        }
++    }
++
++    /**
++     * Map attributes defined within this library their their real world
++     * counterparts.
++     *
++     * @param array $data The data that has been read and needs to be mapped.
++     *
++     * @return NULL
++     */
++    protected function unmapAttributes(&$data)
++    {
++        if (!empty($this->_params['map'])) {
++            foreach ($this->_params['map'] as $attribute => $map) {
++                if (isset($data[$map])) {
++                    $data[$attribute] = $data[$map];
++                    unset($data[$map]);
++                }
++            }
++        }
++    }
++
++    /**
++     * Map attributes defined within this library into their real world
++     * counterparts.
++     *
++     * @param array $data The data to be written.
++     *
++     * @return NULL
++     */
++    protected function mapAttributes(&$data)
++    {
++        if (!empty($this->_params['map'])) {
++            foreach ($this->_params['map'] as $attribute => $map) {
++                if (isset($data[$attribute])) {
++                    $data[$map] = $data[$attribute];
++                    unset($data[$attribute]);
++                }
++            }
++        }
++    }
++
++    /**
++     * Map attribute keys defined within this library into their real world
++     * counterparts.
++     *
++     * @param array $keys The attribute keys.
++     *
++     * @return NULL
++     */
++    protected function mapKeys(&$keys)
++    {
++        if (!empty($this->_params['map'])) {
++            foreach ($this->_params['map'] as $attribute => $map) {
++                $key = array_search($attribute, $keys);
++                if ($key !== false) {
++                    $keys[$key] = $map;
++                }
++            }
++        }
++    }
++
++    /**
++     * Map a single attribute key defined within this library into its real
++     * world counterpart.
++     *
++     * @param array $field The attribute name.
++     *
++     * @return The real name of this attribute on the server we connect to.
++     */
++    protected function mapField($field)
++    {
++        if (!empty($this->_params['map'])
++            && isset($this->_params['map'][$field])) {
++            return $this->_params['map'][$field];
++        }
++        return $field;
++    }
++
+ }
+diff --git a/horde-webmail/lib/Horde/Kolab/Server/test.php b/horde-webmail/lib/Horde/Kolab/Server/test.php
+index 47f985a..fc19c80 100644
+--- a/horde-webmail/lib/Horde/Kolab/Server/test.php
++++ b/horde-webmail/lib/Horde/Kolab/Server/test.php
+@@ -247,6 +247,10 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+             }
+         }
+ 
++        if (!empty($attributes)) {
++            $this->mapKeys($attributes);
++        }
++
+         $filter = $this->_parse($filter);
+         if (is_a($filter, 'PEAR_Error')) {
+             return $filter;
+@@ -265,6 +269,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+             $result = $subtree;
+         }
+ 
++        $this->unmapAttributes($result);
++
+         return $result;
+     }
+ 
+@@ -286,7 +292,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+                     switch ($filter['log']) {
+                     case '=':
+                         $value = $element['data'][$filter['att']];
+-                        if (($filter['val'] == '*' && !empty($value))
++                        if ((($filter['val'] == '*'  || $filter['val'] == '\2a')
++                             && !empty($value))
+                             || $value == $filter['val']
+                             || (is_array($value)
+                                 && in_array($filter['val'], $value))) {
+@@ -390,8 +397,12 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+                                             $dn));
+         }
+         if (empty($attrs)) {
+-            return $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
++            $data = $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
++            $this->unmapAttributes($data);
++            return $data;
+         } else {
++            $this->mapKeys($attrs);
++
+             $result = array();
+             $data   = $GLOBALS['KOLAB_SERVER_TEST_DATA'][$dn]['data'];
+ 
+@@ -401,6 +412,9 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+                     array_push($result, $attr);
+                 }
+             }
++
++            $this->unmapAttributes($result);
++
+             $result['count'] = 1;
+             return $result;
+         }
+@@ -423,6 +437,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap {
+             }
+         }
+ 
++        $this->mapAttributes($data);
++
+         $ldap_data = array();
+         foreach ($data as $key => $val) {
+             if (!is_array($val)) {
+-- 
+tg: (0ad87da..) t/Kolab_Server/HK/GW/MappableAttributes (depends on: t/pear/HK/GW/AddNetLDAP2)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 296112ac1021e0433ca9578a700c8f066bc139a9
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Apr 24 19:30:10 2009 +0200
+
+    Fixed mapping of attributes. Fixed uidForAttr and gidForAttr.
+
+commit a2525f3bf8a77431e4cd28bd92e1cb9fec14e392
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Apr 23 13:45:14 2009 +0200
+
+    Allow to configurable LDAP attribute mapping.
+From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Prefs/FileDriverHotfix.diff
 
 A hotfix for https://issues.kolab.org/issue3555



From cvs at kolab.org  Tue Oct 13 16:06:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 16:06:29 +0200 (CEST)
Subject: wilde: server/pear/PEAR-Net_LDAP2 .cvsignore, NONE, 1.4.2.1 ChangeLog,
	NONE, 1.3.2.1 Makefile, NONE, 1.3.2.1 PEAR-Net_LDAP2.spec, NONE,
	1.3.2.1 
Message-ID: <20091013140629.65D18600174@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_LDAP2
In directory doto:/tmp/cvs-serv16613/PEAR-Net_LDAP2

Added Files:
      Tag: kolab_2_2_branch
	.cvsignore ChangeLog Makefile PEAR-Net_LDAP2.spec 
Log Message:
Added new package PEAR-Net_LDAP2.  Needed for ldap attribute mapping.

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

--- NEW FILE: ChangeLog ---
2009-04-23  Gunnar Wrobel  <p at rdus.de>

	* PEAR-Net_LDAP2.spec: Added package to Kolab CVS.


--- NEW FILE: Makefile ---
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z0-9\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9RC.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")

ifeq "x$(RPM)" "x"
  RPM = $(HOME)/bin/openpkg rpm
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
  KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABRPMTMP)" "x"
  KOLABRPMTMP = $(HOME)/RPM/TMP
endif

SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz

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

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

.PHONY: clean
clean:
	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
	rm -rf /kolab/RPM/TMP/$(PACKAGE)
	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -rf *~

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

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

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

--- NEW FILE: PEAR-Net_LDAP2.spec ---
# Variables
%define         V_pear_name Net_LDAP2
%define         V_package PEAR-%{V_pear_name}
%define         V_version 2.0.0RC5
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Object oriented interface for searching and manipulating LDAP-entries
URL:       http://pear.php.net/package/%{V_pear_name}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL License
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz

# Build Info
Prefix:	   %{l_prefix}
BuildRoot: %{l_buildroot}

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:	      PEAR-Net_Socket >= 1.0
PreReq:	      PEAR-Auth_SASL

%description 
Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP
object interface to directory servers. It does contain most of Net::LDAPs
features but has some own too.
With Net_LDAP2 you have:
* A simple object-oriented interface to connections, searches entries and filters.
* Support for tls and ldap v3.
* Simple modification, deletion and creation of ldap entries.
* Support for schema handling.

%prep
	%setup -n %{V_pear_name}-%{V_version}

%build

%install
        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
            PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}

        %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 

%clean
	rm -rf $RPM_BUILD_ROOT

%files -f files



From cvs at kolab.org  Tue Oct 13 17:58:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 17:58:54 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_SB_SaveEventAttendees.diff, 1.3, 1.3.2.1 
Message-ID: <20091013155854.709A6600171@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv20591/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_SB_SaveEventAttendees.diff 
Log Message:
Translations and minor display improvements in dimp. (Merged from sug branch)


Index: t_kronolith_HK_SB_SaveEventAttendees.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/t_kronolith_HK_SB_SaveEventAttendees.diff,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- t_kronolith_HK_SB_SaveEventAttendees.diff	9 Feb 2009 14:25:55 -0000	1.3
+++ t_kronolith_HK_SB_SaveEventAttendees.diff	13 Oct 2009 15:58:52 -0000	1.3.2.1
@@ -10,11 +10,12 @@
 ---
  horde-webmail/kronolith/attendees.php              |   18 +++++
  horde-webmail/kronolith/config/prefs.php.dist      |    8 ++
+ horde-webmail/kronolith/po/de_DE.po                |    6 ++
  horde-webmail/kronolith/savedattlist.php           |   77 ++++++++++++++++++++
  .../kronolith/templates/attendees/attendees.inc    |    2 +
  .../templates/javascript/open_savedattlist_win.js  |   36 +++++++++
  .../templates/savedattlist/savedattlist.inc        |   68 +++++++++++++++++
- 6 files changed, 209 insertions(+), 0 deletions(-)
+ 7 files changed, 215 insertions(+), 0 deletions(-)
 
 diff --git a/horde-webmail/kronolith/attendees.php b/horde-webmail/kronolith/attendees.php
 index a2d8b3e..e1b15c0 100644
@@ -68,6 +69,20 @@
 +    'type' => 'implicit',
 +    'desc' => _("A saved list of attendees")
 +);
+diff --git a/horde-webmail/kronolith/po/de_DE.po b/horde-webmail/kronolith/po/de_DE.po
+index 2b555a2..68ed35c 100644
+--- a/horde-webmail/kronolith/po/de_DE.po
++++ b/horde-webmail/kronolith/po/de_DE.po
+@@ -2674,3 +2674,9 @@ msgstr "Jahr(e) am gleichen Jahrestag"
+ #: templates/view/view.inc:116 templates/edit/edit.inc:271
+ msgid "year(s) on the same weekday and month of the year"
+ msgstr "Jahr(e) am gleichen Wochentag und Monat des Jahres"
++
++msgid "Load Attendee List"
++msgstr "Teilnehmerliste laden"
++
++msgid "Save Attendee List"
++msgstr "Teilnehmerliste speichern"
 diff --git a/horde-webmail/kronolith/savedattlist.php b/horde-webmail/kronolith/savedattlist.php
 new file mode 100644
 index 0000000..631b994
@@ -282,3 +297,30 @@
 +</form>
 -- 
 tg: (6938161..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 3715013c5b1c184a72130bab132e3157d7e4b0ca
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Jun 26 12:06:46 2009 +0200
+
+    Fixed translations.
+
+commit ced8db79fc783d16931dfcecea9bc823c2f5737f
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Jun 26 11:15:43 2009 +0200
+
+    German translations.
+
+commit cd7f4fe16072b7b40a1a75bd5c9a296e23bca779
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sat Mar 14 01:10:10 2009 +0100
+
+    Remove stray .orig file.
+
+commit e508e429dcac35ef7ac223c771a9973f823db53f
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Feb 1 22:21:11 2009 +0000
+
+    Added patch kronolith/HK-SB-Fbview_save_attendees.patch  from the mercurial release queue.



From cvs at kolab.org  Tue Oct 13 17:58:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Oct 2009 17:58:54 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/merges
	t_dimp_H_GW_AclView.diff, 1.1.4.1,
	1.1.4.2 t_dimp_H_GW_FoldersView.diff, 1.1.4.1, 1.1.4.2 
Message-ID: <20091013155854.22C9D600171@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv20591/patches/horde-webmail/1.2.0/merges

Modified Files:
      Tag: kolab_2_2_branch
	t_dimp_H_GW_AclView.diff t_dimp_H_GW_FoldersView.diff 
Log Message:
Translations and minor display improvements in dimp. (Merged from sug branch)


Index: t_dimp_H_GW_AclView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/t_dimp_H_GW_AclView.diff,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- t_dimp_H_GW_AclView.diff	14 May 2009 16:17:37 -0000	1.1.4.1
+++ t_dimp_H_GW_AclView.diff	13 Oct 2009 15:58:51 -0000	1.1.4.2
@@ -12,12 +12,14 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/dimp/js/DimpBase.js            |    1 +
- horde-webmail/dimp/lib/DIMP.php              |    1 +
- horde-webmail/dimp/templates/index/index.inc |    1 +
- horde-webmail/imp/acl.php                    |   12 ++++++++++--
- horde-webmail/imp/templates/acl/acl.html     |    6 ++++++
- 5 files changed, 19 insertions(+), 2 deletions(-)
+ horde-webmail/dimp/js/DimpBase.js                  |    1 +
+ horde-webmail/dimp/lib/DIMP.php                    |    1 +
+ .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo          |  Bin 168731 -> 168778 bytes
+ horde-webmail/dimp/po/de_DE.po                     |    3 +++
+ horde-webmail/dimp/templates/index/index.inc       |    1 +
+ horde-webmail/imp/acl.php                          |   12 ++++++++++--
+ horde-webmail/imp/templates/acl/acl.html           |   13 +++++++++++++
+ 7 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
 index 39a728b..c4eb9f4 100644
@@ -43,6 +45,20 @@
  
              'sortthread' => SORTTHREAD,
              'sortdate' => SORTDATE,
+diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo
+index 2f1c11c..973776f 100644
+Binary files a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo and b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo differ
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index a536db6..0486297 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -791,3 +791,6 @@ msgstr "entfernen"
+ #: lib/DIMP.php:191
+ msgid "results found"
+ msgstr "Ergebnisse gefunden"
++
++msgid "Share Folder"
++msgstr "Berechtigungen"
 diff --git a/horde-webmail/dimp/templates/index/index.inc b/horde-webmail/dimp/templates/index/index.inc
 index 21939e0..7c02fe7 100644
 --- a/horde-webmail/dimp/templates/index/index.inc
@@ -85,26 +101,38 @@
  $t->set('sharedimg', Horde::img('shared.png', _("Change Folder")));
  $t->set('options', IMP::flistSelect('', true, array(), $folder));
 diff --git a/horde-webmail/imp/templates/acl/acl.html b/horde-webmail/imp/templates/acl/acl.html
-index 79580aa..72cf1c5 100644
+index 79580aa..ae85ff4 100644
 --- a/horde-webmail/imp/templates/acl/acl.html
 +++ b/horde-webmail/imp/templates/acl/acl.html
-@@ -7,6 +7,7 @@
+@@ -2,11 +2,14 @@
+ <input type="hidden" name="actionID" value="" />
+ <tag:forminput />
+ 
++<if:imp_view>
+ <div class="header">
+  <tag:aclnavcell />
   <gettext>Share mail folders</gettext>
  </div>
++</if:imp_view>
  
 +<if:imp_view>
  <div class="header">
   <ul>
    <li>
-@@ -17,6 +18,7 @@
+@@ -17,6 +20,12 @@
   <span class="smallheader"><tag:current /></span>
  </div>
  </form>
++<else:imp_view>
++<div class="header">
++ <span class="smallheader"><tag:current /></span>
++</div>
++</else:imp_view>
 +</if:imp_view>
  
  <form method="post" name="acl" id="acl" action="<tag:aclurl />">
  <input type="hidden" name="actionID" value="imp_acl_set" />
-@@ -76,9 +78,13 @@
+@@ -76,9 +85,13 @@
  </tr>
  <tr>
   <td colspan = "<tag:maxrule />" class="header" valign="middle">
@@ -119,10 +147,22 @@
   <td class="header">&nbsp;</td>
  </tr>
 -- 
-tg: (3c3721f..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
+tg: (f251c16..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit e9630629c7479c73d3eb156f00544c34e95f0597
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jul 20 09:36:01 2009 +0200
+
+    Fix translation and improve header.
+
+commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Jun 21 23:58:30 2009 +0200
+
+    German translation.
 
 commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5
 Author: Gunnar Wrobel <p at rdus.de>

Index: t_dimp_H_GW_FoldersView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/t_dimp_H_GW_FoldersView.diff,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- t_dimp_H_GW_FoldersView.diff	14 May 2009 16:22:39 -0000	1.1.4.1
+++ t_dimp_H_GW_FoldersView.diff	13 Oct 2009 15:58:51 -0000	1.1.4.2
@@ -12,28 +12,46 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/dimp/config/menu.php               |    6 ++++++
+ horde-webmail/dimp/config/menu.php               |    9 ++++++++-
+ horde-webmail/dimp/po/de_DE.po                   |    3 +++
  horde-webmail/imp/folders.php                    |   17 ++++++++++++-----
  horde-webmail/imp/templates/folders/actions.html |    2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ 4 files changed, 25 insertions(+), 6 deletions(-)
 
 diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
-index 5dcf354..99a4b8c 100644
+index 0c6ebe9..b5e0a5c 100644
 --- a/horde-webmail/dimp/config/menu.php
 +++ b/horde-webmail/dimp/config/menu.php
-@@ -28,6 +28,12 @@
+@@ -28,7 +28,14 @@
  //         'text' => 'Say Hi!',
  //         'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
  // );
++
 +$site_menu = array(
 +    'folders' => array(
 +        'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
-+        'text' => _('Folders'),
-+        'icon' => $GLOBALS['registry']->getImageDir('imp') . '/folders/folder.png'),
++        'text' => _('Folder Subscription'),
++        'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
 +);
++
  if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-   require_once(dirname(__FILE__) . '/menu.local.php');
+   require(dirname(__FILE__) . '/menu.local.php');
  }
+-
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index 65e8824..a536db6 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -16,6 +16,9 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ 
++msgid "Folder Subscription"
++msgstr "Ordner verwalten"
++
+ #: lib/Views/ShowMessage.php:295
+ #, php-format
+ msgid "%d Attachment"
 diff --git a/horde-webmail/imp/folders.php b/horde-webmail/imp/folders.php
 index a0425aa..c46b0e5 100644
 --- a/horde-webmail/imp/folders.php
@@ -103,10 +121,22 @@
       <option value="expunge_folder"><gettext>Purge</gettext></option>
  </if:notrash>
 -- 
-tg: (eff636a..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 93403a869ff14d7868d4cc9c4687ea1270e3c225
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jun 22 08:39:51 2009 +0200
+
+    Typo
+
+commit ad147a4b42d61800400a2a779e884ee050358811
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jun 22 00:06:14 2009 +0200
+
+    Fixed menu entry name, added translation, fixed image.
 
 commit a1966161022108d9bf4831a8613b1db9a4e68c4d
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Thu Oct 15 17:15:05 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Oct 2009 17:15:05 +0200 (CEST)
Subject: wilde: server/kolab-webclient kolab-webclient.spec, 1.23.2.14,
	1.23.2.15 
Message-ID: <20091015151505.B19FB60081F@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab-webclient.spec 
Log Message:
Fix to close context menu in dimp on outside clicks. (Merged from suc branch)

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.14
retrieving revision 1.23.2.15
diff -u -d -r1.23.2.14 -r1.23.2.15
--- kolab-webclient.spec	13 Oct 2009 12:37:27 -0000	1.23.2.14
+++ kolab-webclient.spec	15 Oct 2009 15:15:03 -0000	1.23.2.15
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 10
-%define         V_day   13
+%define         V_day   15
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Thu Oct 15 17:15:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Oct 2009 17:15:06 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0/merges
	t_dimp_H_BL_CloseContextMenu.diff, NONE, 1.1.4.1 series, 1.1.2.3,
	1.1.2.4 
Message-ID: <20091015151506.2AD2F60081F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv801/patches/horde-webmail/1.2.0/merges

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_dimp_H_BL_CloseContextMenu.diff 
Log Message:
Fix to close context menu in dimp on outside clicks. (Merged from suc branch)

--- NEW FILE: t_dimp_H_BL_CloseContextMenu.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/dimp/H/BL/CloseContextMenu

Close the context menu when clicking into the Dimp menu.

Provided by Boris Lorbeer <B.Lorbeer at science-computing.de>

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

---
 horde-webmail/dimp/config/menu.php |    2 +-
 horde-webmail/dimp/js/DimpBase.js  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
index b5e0a5c..a079da6 100644
--- a/horde-webmail/dimp/config/menu.php
+++ b/horde-webmail/dimp/config/menu.php
@@ -31,7 +31,7 @@
 
 $site_menu = array(
     'folders' => array(
-        'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
+        'action' => 'DimpCore.DMenu.close(); DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
         'text' => _('Folder Subscription'),
         'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
 );
diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
index c4eb9f4..d90f09b 100644
--- a/horde-webmail/dimp/js/DimpBase.js
+++ b/horde-webmail/dimp/js/DimpBase.js
@@ -1507,6 +1507,7 @@ var DimpBase = {
 
                 case 'folder':
                 case 'special':
+                    DimpCore.DMenu.close();
                     e.stop();
                     return this.go('folder:' + li.readAttribute('mbox'));
                     break;
@@ -1903,7 +1904,7 @@ var DimpBase = {
         tmp = $('applicationfolders');
         if (tmp) {
             tmp.select('ul li.custom a').each(function(s) {
-                C({ d: s, f: this.go.bind(this, 'app:' + s.readAttribute('app')) });
+                C({ d: s, f: function(data){DimpCore.DMenu.close(); this.go('app:' + s.readAttribute('app'), data)}.bind(this) });
             }, this);
         }
 
-- 
tg: (19ee6e6..) t/dimp/H/BL/CloseContextMenu (depends on: t/kronolith/HK/GW/AnonymousiCalDownload)
-- 
TOPGIT patch commit log
=======================

commit b4b3190a4fb88e1843ff86adde4897dea21046db
Author: Gunnar Wrobel <p at rdus.de>
Date:   Mon Jul 20 09:39:24 2009 +0200

    Close the context menu when clicking into the Dimp menu.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/series,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- series	14 May 2009 16:22:39 -0000	1.1.2.3
+++ series	15 Oct 2009 15:15:04 -0000	1.1.2.4
@@ -2,3 +2,4 @@
 issue3329.patch
 t_dimp_H_GW_AclView.diff
 t_dimp_H_GW_FoldersView.diff
+t_dimp_H_BL_CloseContextMenu.diff



From cvs at kolab.org  Thu Oct 15 17:15:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Oct 2009 17:15:06 +0200 (CEST)
Subject: wilde: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.14, 1.32.2.15 
Message-ID: <20091015151506.81EBB60081F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv801/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Fix to close context menu in dimp on outside clicks. (Merged from suc branch)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.14
retrieving revision 1.32.2.15
diff -u -d -r1.32.2.14 -r1.32.2.15
--- horde-webmail-1.2.0_kolab_openpkg.patch	13 Oct 2009 13:24:07 -0000	1.32.2.14
+++ horde-webmail-1.2.0_kolab_openpkg.patch	15 Oct 2009 15:15:03 -0000	1.32.2.15
@@ -14254,11 +14254,12 @@
 ---
  horde-webmail/kronolith/attendees.php              |   18 +++++
  horde-webmail/kronolith/config/prefs.php.dist      |    8 ++
+ horde-webmail/kronolith/po/de_DE.po                |    6 ++
  horde-webmail/kronolith/savedattlist.php           |   77 ++++++++++++++++++++
  .../kronolith/templates/attendees/attendees.inc    |    2 +
  .../templates/javascript/open_savedattlist_win.js  |   36 +++++++++
  .../templates/savedattlist/savedattlist.inc        |   68 +++++++++++++++++
- 6 files changed, 209 insertions(+), 0 deletions(-)
+ 7 files changed, 215 insertions(+), 0 deletions(-)
 
 diff --git a/horde-webmail/kronolith/attendees.php b/horde-webmail/kronolith/attendees.php
 index a2d8b3e..e1b15c0 100644
@@ -14312,6 +14313,20 @@
 +    'type' => 'implicit',
 +    'desc' => _("A saved list of attendees")
 +);
+diff --git a/horde-webmail/kronolith/po/de_DE.po b/horde-webmail/kronolith/po/de_DE.po
+index 2b555a2..68ed35c 100644
+--- a/horde-webmail/kronolith/po/de_DE.po
++++ b/horde-webmail/kronolith/po/de_DE.po
+@@ -2674,3 +2674,9 @@ msgstr "Jahr(e) am gleichen Jahrestag"
+ #: templates/view/view.inc:116 templates/edit/edit.inc:271
+ msgid "year(s) on the same weekday and month of the year"
+ msgstr "Jahr(e) am gleichen Wochentag und Monat des Jahres"
++
++msgid "Load Attendee List"
++msgstr "Teilnehmerliste laden"
++
++msgid "Save Attendee List"
++msgstr "Teilnehmerliste speichern"
 diff --git a/horde-webmail/kronolith/savedattlist.php b/horde-webmail/kronolith/savedattlist.php
 new file mode 100644
 index 0000000..631b994
@@ -14526,6 +14541,33 @@
 +</form>
 -- 
 tg: (6938161..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 3715013c5b1c184a72130bab132e3157d7e4b0ca
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Jun 26 12:06:46 2009 +0200
+
+    Fixed translations.
+
+commit ced8db79fc783d16931dfcecea9bc823c2f5737f
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Jun 26 11:15:43 2009 +0200
+
+    German translations.
+
+commit cd7f4fe16072b7b40a1a75bd5c9a296e23bca779
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sat Mar 14 01:10:10 2009 +0100
+
+    Remove stray .orig file.
+
+commit e508e429dcac35ef7ac223c771a9973f823db53f
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Feb 1 22:21:11 2009 +0000
+
+    Added patch kronolith/HK-SB-Fbview_save_attendees.patch  from the mercurial release queue.
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/SB/ExtraParameters
 
@@ -27656,12 +27698,14 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/dimp/js/DimpBase.js            |    1 +
- horde-webmail/dimp/lib/DIMP.php              |    1 +
- horde-webmail/dimp/templates/index/index.inc |    1 +
- horde-webmail/imp/acl.php                    |   12 ++++++++++--
- horde-webmail/imp/templates/acl/acl.html     |    6 ++++++
- 5 files changed, 19 insertions(+), 2 deletions(-)
+ horde-webmail/dimp/js/DimpBase.js                  |    1 +
+ horde-webmail/dimp/lib/DIMP.php                    |    1 +
+ .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo          |  Bin 168731 -> 168778 bytes
+ horde-webmail/dimp/po/de_DE.po                     |    3 +++
+ horde-webmail/dimp/templates/index/index.inc       |    1 +
+ horde-webmail/imp/acl.php                          |   12 ++++++++++--
+ horde-webmail/imp/templates/acl/acl.html           |   13 +++++++++++++
+ 7 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
 index 39a728b..c4eb9f4 100644
@@ -27687,6 +27731,20 @@
  
              'sortthread' => SORTTHREAD,
              'sortdate' => SORTDATE,
+diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo
+index 2f1c11c..973776f 100644
+Binary files a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo and b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo differ
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index a536db6..0486297 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -791,3 +791,6 @@ msgstr "entfernen"
+ #: lib/DIMP.php:191
+ msgid "results found"
+ msgstr "Ergebnisse gefunden"
++
++msgid "Share Folder"
++msgstr "Berechtigungen"
 diff --git a/horde-webmail/dimp/templates/index/index.inc b/horde-webmail/dimp/templates/index/index.inc
 index 21939e0..7c02fe7 100644
 --- a/horde-webmail/dimp/templates/index/index.inc
@@ -27729,26 +27787,38 @@
  $t->set('sharedimg', Horde::img('shared.png', _("Change Folder")));
  $t->set('options', IMP::flistSelect('', true, array(), $folder));
 diff --git a/horde-webmail/imp/templates/acl/acl.html b/horde-webmail/imp/templates/acl/acl.html
-index 79580aa..72cf1c5 100644
+index 79580aa..ae85ff4 100644
 --- a/horde-webmail/imp/templates/acl/acl.html
 +++ b/horde-webmail/imp/templates/acl/acl.html
-@@ -7,6 +7,7 @@
+@@ -2,11 +2,14 @@
+ <input type="hidden" name="actionID" value="" />
+ <tag:forminput />
+ 
++<if:imp_view>
+ <div class="header">
+  <tag:aclnavcell />
   <gettext>Share mail folders</gettext>
  </div>
++</if:imp_view>
  
 +<if:imp_view>
  <div class="header">
   <ul>
    <li>
-@@ -17,6 +18,7 @@
+@@ -17,6 +20,12 @@
   <span class="smallheader"><tag:current /></span>
  </div>
  </form>
++<else:imp_view>
++<div class="header">
++ <span class="smallheader"><tag:current /></span>
++</div>
++</else:imp_view>
 +</if:imp_view>
  
  <form method="post" name="acl" id="acl" action="<tag:aclurl />">
  <input type="hidden" name="actionID" value="imp_acl_set" />
-@@ -76,9 +78,13 @@
+@@ -76,9 +85,13 @@
  </tr>
  <tr>
   <td colspan = "<tag:maxrule />" class="header" valign="middle">
@@ -27763,11 +27833,23 @@
   <td class="header">&nbsp;</td>
  </tr>
 -- 
-tg: (3c3721f..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
+tg: (f251c16..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
 -- 
 TOPGIT patch commit log
 =======================
 
+commit e9630629c7479c73d3eb156f00544c34e95f0597
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jul 20 09:36:01 2009 +0200
+
+    Fix translation and improve header.
+
+commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Jun 21 23:58:30 2009 +0200
+
+    German translation.
+
 commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5
 Author: Gunnar Wrobel <p at rdus.de>
 Date:   Fri Mar 13 12:04:03 2009 +0000
@@ -27799,28 +27881,46 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/dimp/config/menu.php               |    6 ++++++
+ horde-webmail/dimp/config/menu.php               |    9 ++++++++-
+ horde-webmail/dimp/po/de_DE.po                   |    3 +++
  horde-webmail/imp/folders.php                    |   17 ++++++++++++-----
  horde-webmail/imp/templates/folders/actions.html |    2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ 4 files changed, 25 insertions(+), 6 deletions(-)
 
 diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
-index 5dcf354..99a4b8c 100644
+index 0c6ebe9..b5e0a5c 100644
 --- a/horde-webmail/dimp/config/menu.php
 +++ b/horde-webmail/dimp/config/menu.php
-@@ -28,6 +28,12 @@
+@@ -28,7 +28,14 @@
  //         'text' => 'Say Hi!',
  //         'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
  // );
++
 +$site_menu = array(
 +    'folders' => array(
 +        'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
-+        'text' => _('Folders'),
-+        'icon' => $GLOBALS['registry']->getImageDir('imp') . '/folders/folder.png'),
++        'text' => _('Folder Subscription'),
++        'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
 +);
++
  if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-   require_once(dirname(__FILE__) . '/menu.local.php');
+   require(dirname(__FILE__) . '/menu.local.php');
  }
+-
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index 65e8824..a536db6 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -16,6 +16,9 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ 
++msgid "Folder Subscription"
++msgstr "Ordner verwalten"
++
+ #: lib/Views/ShowMessage.php:295
+ #, php-format
+ msgid "%d Attachment"
 diff --git a/horde-webmail/imp/folders.php b/horde-webmail/imp/folders.php
 index a0425aa..c46b0e5 100644
 --- a/horde-webmail/imp/folders.php
@@ -27890,11 +27990,23 @@
       <option value="expunge_folder"><gettext>Purge</gettext></option>
  </if:notrash>
 -- 
-tg: (eff636a..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
 -- 
 TOPGIT patch commit log
 =======================
 
+commit 93403a869ff14d7868d4cc9c4687ea1270e3c225
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jun 22 08:39:51 2009 +0200
+
+    Typo
+
+commit ad147a4b42d61800400a2a779e884ee050358811
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jun 22 00:06:14 2009 +0200
+
+    Fixed menu entry name, added translation, fixed image.
+
 commit a1966161022108d9bf4831a8613b1db9a4e68c4d
 Author: Gunnar Wrobel <p at rdus.de>
 Date:   Fri Mar 13 11:06:45 2009 +0000
@@ -27918,3 +28030,62 @@
 Date:   Sun Mar 8 19:01:41 2009 +0000
 
     Completed the hack.
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/dimp/H/BL/CloseContextMenu
+
+Close the context menu when clicking into the Dimp menu.
+
+Provided by Boris Lorbeer <B.Lorbeer at science-computing.de>
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/dimp/config/menu.php |    2 +-
+ horde-webmail/dimp/js/DimpBase.js  |    3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
+index b5e0a5c..a079da6 100644
+--- a/horde-webmail/dimp/config/menu.php
++++ b/horde-webmail/dimp/config/menu.php
+@@ -31,7 +31,7 @@
+ 
+ $site_menu = array(
+     'folders' => array(
+-        'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
++        'action' => 'DimpCore.DMenu.close(); DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
+         'text' => _('Folder Subscription'),
+         'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
+ );
+diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
+index c4eb9f4..d90f09b 100644
+--- a/horde-webmail/dimp/js/DimpBase.js
++++ b/horde-webmail/dimp/js/DimpBase.js
+@@ -1507,6 +1507,7 @@ var DimpBase = {
+ 
+                 case 'folder':
+                 case 'special':
++                    DimpCore.DMenu.close();
+                     e.stop();
+                     return this.go('folder:' + li.readAttribute('mbox'));
+                     break;
+@@ -1903,7 +1904,7 @@ var DimpBase = {
+         tmp = $('applicationfolders');
+         if (tmp) {
+             tmp.select('ul li.custom a').each(function(s) {
+-                C({ d: s, f: this.go.bind(this, 'app:' + s.readAttribute('app')) });
++                C({ d: s, f: function(data){DimpCore.DMenu.close(); this.go('app:' + s.readAttribute('app'), data)}.bind(this) });
+             }, this);
+         }
+ 
+-- 
+tg: (19ee6e6..) t/dimp/H/BL/CloseContextMenu (depends on: t/kronolith/HK/GW/AnonymousiCalDownload)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit b4b3190a4fb88e1843ff86adde4897dea21046db
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Jul 20 09:39:24 2009 +0200
+
+    Close the context menu when clicking into the Dimp menu.



From cvs at kolab.org  Fri Oct 30 17:34:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 30 Oct 2009 17:34:03 +0100 (CET)
Subject: thomas: server release-notes.txt,1.398.2.57,1.398.2.58 
Message-ID: <20091030163403.4864C600148@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue3513 (Clamav - new upstream version 0.95.3)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.57
retrieving revision 1.398.2.58
diff -u -d -r1.398.2.57 -r1.398.2.58
--- release-notes.txt	12 Oct 2009 14:09:00 -0000	1.398.2.57
+++ release-notes.txt	30 Oct 2009 16:34:00 -0000	1.398.2.58
@@ -45,6 +45,10 @@
 
 Changes between 2.2.2 and 2.2.3:
 
+    - clamav-0.95.3-20091030
+
+	kolab/issue3513 (Clamav - new upstream version 0.95.3)
+
     - db-4.5.20.2-20070628_kolab1
 
 	kolab/issue2982 (OpenLDAP segmentation fault on 64bit)



From cvs at kolab.org  Fri Oct 30 17:34:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 30 Oct 2009 17:34:03 +0100 (CET)
Subject: thomas: server/clamav clamav.patch, 1.2, 1.2.2.1 clamav.spec, 1.6,
	1.6.2.1 
Message-ID: <20091030163403.6A248600148@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	clamav.patch clamav.spec 
Log Message:
kolab/issue3513 (Clamav - new upstream version 0.95.3)


Index: clamav.patch
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- clamav.patch	2 Dec 2008 14:59:15 -0000	1.2
+++ clamav.patch	30 Oct 2009 16:34:01 -0000	1.2.2.1
@@ -1,108 +1,43 @@
-diff -urN clamav-0.94.1.orig/clamav-milter/clamav-milter.c clamav-0.94.1/clamav-milter/clamav-milter.c
---- clamav-0.94.1.orig/clamav-milter/clamav-milter.c	2008-10-16 10:29:55.000000000 +0200
-+++ clamav-0.94.1/clamav-milter/clamav-milter.c	2008-11-17 12:29:53.149435000 +0100
-@@ -77,9 +77,7 @@
- #include <sys/un.h>
- #include <stdarg.h>
- #include <errno.h>
--#if	HAVE_LIBMILTER_MFAPI_H
+diff -urN clamav-0.95.3.orig/clamav-milter/clamav-milter.c clamav-0.95.3/clamav-milter/clamav-milter.c
+--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/clamav-milter/clamav-milter.c	2009-10-30 17:14:50.137580674 +0100
+@@ -32,7 +32,7 @@
+ #include <syslog.h>
+ #endif
+ #include <time.h>
 -#include <libmilter/mfapi.h>
--#endif
 +#include "milter/mfapi.h"
- #include <pthread.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -113,6 +111,8 @@
- 
- #ifdef	C_LINUX
- #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#endif
-+#if 0
- #include <libintl.h>
- #include <locale.h>
  
-@@ -435,6 +435,10 @@
- 				 * Send a 550 rejection when a virus is
- 				 * found
- 				 */
-+static	int	nosubject = 0;	/*
-+				 * Do not change the Subject header
-+				 * in case a virus is found.
-+				 */
- static	int	hflag = 0;	/*
- 				 * Include original message headers in
- 				 * report
-@@ -679,6 +683,7 @@
- 	puts(_("\t--max-childen\t\t-m\tMaximum number of concurrent scans."));
- 	puts(_("\t--outgoing\t\t-o\tScan outgoing messages from this machine."));
- 	puts(_("\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."));
-+	puts(_("\t--nosubject\t\t-N\tDon't change Subject header."));
- 	puts(_("\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."));
- 	puts(_("\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."));
- 	puts(_("\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."));
-@@ -774,7 +779,7 @@
- 	else
- 		progname = "clamav-milter";
- 
--#ifdef	C_LINUX
-+#if 0
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- 	textdomain(progname);
-@@ -863,6 +868,9 @@
- 				"noreject", 0, NULL, 'N'
- 			},
- 			{
-+				"nosubject", 0, NULL, 'Z'
-+			},
-+			{
- 				"noxheader", 0, NULL, 'n'
- 			},
- 			{
-@@ -1037,6 +1045,9 @@
- 			case 'N':	/* Do we reject mail or silently drop it */
- 				rejectmail = 0;
- 				break;
-+			case 'Z':
-+				nosubject = 1;
-+				break;
- 			case 'o':	/* scan outgoing mail */
- 				oflag++;
- 				break;
-@@ -1142,11 +1153,13 @@
- 	}
- 	port = argv[optind];
+ #include "clamav.h"
  
-+#if 0
- 	if(rootdir == NULL)	/* FIXME: Handle CHROOT */
- 		if(checkCF && verifyIncomingSocketName(port) < 0) {
- 			fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port);
- 			return EX_CONFIG;
- 		}
-+#endif
+diff -urN clamav-0.95.3.orig/clamav-milter/clamfi.c clamav-0.95.3/clamav-milter/clamfi.c
+--- clamav-0.95.3.orig/clamav-milter/clamfi.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/clamav-milter/clamfi.c	2009-10-30 17:14:50.137580674 +0100
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
  
- 	if(strncasecmp(port, "inet:", 5) == 0)
- 		if(!lflag) {
-@@ -5260,6 +5273,7 @@
- 	struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
- 	char subject[128];
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
  
-+	if (!nosubject) {
- 	if(privdata->subject)
- 		smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
+ #include "shared/optparser.h"
+ #include "shared/output.h"
+diff -urN clamav-0.95.3.orig/clamav-milter/clamfi.h clamav-0.95.3/clamav-milter/clamfi.h
+--- clamav-0.95.3.orig/clamav-milter/clamfi.h	2009-07-06 15:21:58.000000000 +0200
++++ clamav-0.95.3/clamav-milter/clamfi.h	2009-10-30 17:14:50.137580674 +0100
+@@ -22,7 +22,7 @@
+ #define _CLAMFI_H
  
-@@ -5268,6 +5282,7 @@
- 		smfi_chgheader(ctx, "Subject", 1, subject);
- 	else
- 		smfi_addheader(ctx, "Subject", subject);
-+	}
- }
+ #include "shared/optparser.h"
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
  
- #if	0
-diff -urN clamav-0.94.1.orig/configure clamav-0.94.1/configure
---- clamav-0.94.1.orig/configure	2008-10-30 17:12:07.000000000 +0100
-+++ clamav-0.94.1/configure	2008-11-17 12:32:01.499435000 +0100
-@@ -18454,9 +18454,6 @@
+ extern uint64_t maxfilesize;
+ extern int addxvirus;
+diff -urN clamav-0.95.3.orig/configure clamav-0.95.3/configure
+--- clamav-0.95.3.orig/configure	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/configure	2009-10-30 17:15:15.994173225 +0100
+@@ -16692,9 +16692,6 @@
  
          save_LIBS="$LIBS"
      CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
@@ -110,21 +45,49 @@
 -	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
 -    fi
      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
-     { echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
- echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6; }
-@@ -18684,7 +18681,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
+ $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
+@@ -16834,7 +16831,7 @@
+   CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"
+ else
+ 
+-	    as_fn_error "Cannot find libmilter" "$LINENO" 5
++	    as_fn_error "Cannot find milter" "$LINENO" 5
+ 
+ fi
+ 
+@@ -16842,10 +16839,10 @@
+ fi
  
      LIBS="$save_LIBS"
+-    for ac_header in libmilter/mfapi.h
++    for ac_header in milter/mfapi.h
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_milter_mfapi_h" "$ac_includes_default"
++if test "x$ac_cv_header_milter_mfapi_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBMILTER_MFAPI_H 1
+ _ACEOF
+diff -urN clamav-0.95.3.orig/libclamav/others.c clamav-0.95.3/libclamav/others.c
+--- clamav-0.95.3.orig/libclamav/others.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/libclamav/others.c	2009-10-30 17:14:50.141580766 +0100
+@@ -177,8 +177,10 @@
+     if(is_rar_initd) return;
+     is_rar_initd = 1;
  
--for ac_header in libmilter/mfapi.h
-+for ac_header in milter/mfapi.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-diff -urN clamav-0.94.1.orig/shared/output.c clamav-0.94.1/shared/output.c
---- clamav-0.94.1.orig/shared/output.c	2008-08-16 19:18:00.000000000 +0200
-+++ clamav-0.94.1/shared/output.c	2008-11-17 12:29:53.169435000 +0100
-@@ -61,7 +61,7 @@
++#if 0
+     rhandle = lt_dlfind("libclamunrar_iface", "unrar");
+     if (!rhandle)
++#endif
+ 	return;
+ 
+     if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
+diff -urN clamav-0.95.3.orig/shared/output.c clamav-0.95.3/shared/output.c
+--- clamav-0.95.3.orig/shared/output.c	2009-10-28 16:34:13.000000000 +0100
++++ clamav-0.95.3/shared/output.c	2009-10-30 17:14:50.141580766 +0100
+@@ -67,7 +67,7 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif
  

Index: clamav.spec
===================================================================
RCS file: /kolabrepository/server/clamav/clamav.spec,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- clamav.spec	12 Dec 2008 14:54:49 -0000	1.6
+++ clamav.spec	30 Oct 2009 16:34:01 -0000	1.6.2.1
@@ -1,6 +1,6 @@
 ##
 ##  clamav.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2009 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
@@ -29,8 +29,8 @@
 Packager:     Intevation GmbH
 Group:        AntiVirus
 License:      GPL
-Version:      0.94.2
-Release:      20081212
+Version:      0.95.3
+Release:      20091030
 
 #   package options
 %option       with_milter  no
@@ -43,8 +43,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2
-PreReq:       OpenPKG, openpkg >= 2.4.3
+BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc
+PreReq:       OpenPKG, openpkg >= 20060823
 BuildPreReq:  zlib, bzip2, curl, gmp, libiconv, openssl
 PreReq:       zlib, bzip2, curl, gmp, libiconv, openssl
 %if "%{with_milter}" == "yes"
@@ -67,7 +67,7 @@
 %track
     prog clamav = {
         version   = %{version}
-        url       = http://prdownloads.sourceforge.net/clamav/
+        url       = http://sourceforge.net/projects/clamav/files/
         regex     = clamav-(\d+\.\d+(\.\d+)*)\.tar\.gz
     }
 
@@ -78,7 +78,7 @@
 %build
     #   configure package
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags}" \
+    CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     GREP="grep" \
@@ -101,6 +101,7 @@
 %else
         --disable-milter \
 %endif
+        --disable-unrar \
         --disable-shared
 
     #   build package



From cvs at kolab.org  Thu Nov  5 12:14:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  5 Nov 2009 12:14:10 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.10,
	1.10.2.11 kolab-webclient.spec, 1.23.2.15, 1.23.2.16 
Message-ID: <20091105111410.A2F0E60081D@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
Log Message:
 kolab/issue3844 (New user preference to specify order of date input fields)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.10
retrieving revision 1.10.2.11
diff -u -d -r1.10.2.10 -r1.10.2.11
--- ChangeLog	13 Oct 2009 12:37:27 -0000	1.10.2.10
+++ ChangeLog	5 Nov 2009 11:14:08 -0000	1.10.2.11
@@ -1,3 +1,8 @@
+2009-11-05  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: kolab/issue3844 (New user preference to
+	specify order of date input fields)
+
 2009-10-09  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: Cleaner session handling for the export.

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.15
retrieving revision 1.23.2.16
diff -u -d -r1.23.2.15 -r1.23.2.16
--- kolab-webclient.spec	15 Oct 2009 15:15:03 -0000	1.23.2.15
+++ kolab-webclient.spec	5 Nov 2009 11:14:08 -0000	1.23.2.16
@@ -2,8 +2,8 @@
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
 %define         V_year  2009
-%define         V_month 10
-%define         V_day   15
+%define         V_month 11
+%define         V_day   05
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Thu Nov  5 12:14:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  5 Nov 2009 12:14:11 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_UV_dateInputFieldOrder.diff, NONE, 1.1.2.1 series,
	1.5.2.8, 1.5.2.9 
Message-ID: <20091105111411.1A0A060081D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv9695/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_UV_dateInputFieldOrder.diff 
Log Message:
 kolab/issue3844 (New user preference to specify order of date input fields)

--- NEW FILE: t_kronolith_HK_UV_dateInputFieldOrder.diff ---
From: Soenke Schwardt-Krummrich <schwardt at univention.de>
Subject: [PATCH] t/kronolith/HK/UV/dateInputFieldOrder

Currently in kronolith the order of date input fields is hardcoded to
year-month-day. Some parts of the world usually use a different order.
The attached patch adds a user preference to specify input field order.

REFERENCE_KOLAB: https://issues.kolab.org/issue3844
REFERENCE_HORDE:

STATUS_KOLAB_2.2:             UNTESTED
STATUS_KOLAB_2.3:             NONE
STATUS_HORDE_KRONOLITH_2.3.3: SUBMIT
STATUS_HORDE_KRONOLITH_3.0:   SUBMIT

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

---
 horde-webmail/config/prefs.php                     |   17 ++++++++++-
 horde-webmail/config/prefs.php.dist                |   17 ++++++++++-
 .../kronolith/templates/edit/edit_timespan.inc     |   30 +++++++++++++------
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/horde-webmail/config/prefs.php b/horde-webmail/config/prefs.php
index c9e5d80..e3c591b 100644
--- a/horde-webmail/config/prefs.php
+++ b/horde-webmail/config/prefs.php
@@ -105,7 +105,7 @@ $prefGroups['language'] = array(
     'column' => _("Your Information"),
     'label' => _("Locale and Time"),
     'desc' => _("Set your preferred language, timezone and date options."),
-    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'first_week_day')
+    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'date_input_format', 'first_week_day')
 );
 
 $prefGroups['categories'] = array(
@@ -346,6 +346,21 @@ $_prefs['date_format'] = array(
     'desc' => _("Choose how to display dates:"),
 );
 
+// date input format
+$_prefs['date_input_format'] = array(
+    'value' => 'year-month-day',
+    'locked' => false,
+    'shared' => true,
+    'type' => 'enum',
+    'enum' => array(
+        'day-month-year' => strftime('%d %b %Y'),
+        'month-day-year' => strftime('%b %d %Y'),
+        'year-day-month' => strftime('%Y %d %b'),
+        'year-month-day' => strftime('%Y %b %d'),
+    ),
+    'desc' => _("Choose order how to enter dates:"),
+);
+
 // what day should be displayed as the first day of the week?
 $_prefs['first_week_day'] = array(
     'value' => '0',
diff --git a/horde-webmail/config/prefs.php.dist b/horde-webmail/config/prefs.php.dist
index 6e513ae..2d745f9 100644
--- a/horde-webmail/config/prefs.php.dist
+++ b/horde-webmail/config/prefs.php.dist
@@ -105,7 +105,7 @@ $prefGroups['language'] = array(
     'column' => _("Your Information"),
     'label' => _("Locale and Time"),
     'desc' => _("Set your preferred language, timezone and date options."),
-    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'first_week_day')
+    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'date_input_format', 'first_week_day')
 );
 
 $prefGroups['categories'] = array(
@@ -344,6 +344,21 @@ $_prefs['date_format'] = array(
     'desc' => _("Choose how to display dates:"),
 );
 
+// date input format
+$_prefs['date_input_format'] = array(
+    'value' => 'year-month-day',
+    'locked' => false,
+    'shared' => true,
+    'type' => 'enum',
+    'enum' => array(
+        'day-month-year' => strftime('%d %b %Y'),
+        'month-day-year' => strftime('%b %d %Y'),
+        'year-day-month' => strftime('%Y %d %b'),
+        'year-month-day' => strftime('%Y %b %d'),
+    ),
+    'desc' => _("Choose order how to enter dates:"),
+);
+
 // what day should be displayed as the first day of the week?
 $_prefs['first_week_day'] = array(
     'value' => '0',
diff --git a/horde-webmail/kronolith/templates/edit/edit_timespan.inc b/horde-webmail/kronolith/templates/edit/edit_timespan.inc
index 9926617..05f5042 100644
--- a/horde-webmail/kronolith/templates/edit/edit_timespan.inc
+++ b/horde-webmail/kronolith/templates/edit/edit_timespan.inc
@@ -12,11 +12,16 @@
  </td>
  <td colspan="2" class="rightAlign"><?php echo _("On") ?>&nbsp;</td>
  <td>
-  <?php echo $event->html('start[year]') ?>
-  -
-  <?php echo $event->html('start[month]') ?>
-  -
-  <?php echo $event->html('start[day]') ?>
+ <?php
+     $dateorder = $GLOBALS['prefs']->getValue('date_input_format');
+     $dateorder = $dateorder != "" ? $dateorder : "year-month-day";
+     $dateorder = explode("-", $dateorder );
+     $datefields = array();
+     foreach ($dateorder as $fld) {
+	   $datefields[] = $event->html('start['.$fld.']');
+	 }
+     echo implode("-", $datefields);
+ ?>
 <?php if ($GLOBALS['browser']->hasFeature('dom')): ?>
   <span id="start_wday"></span>
   <script type="text/javascript">
@@ -62,11 +67,16 @@
   <?php echo Horde::label('end_year', _("On")) ?>&nbsp;
  </td>
  <td>
-  <?php echo $event->html('end[year]') ?>
-  -
-  <?php echo $event->html('end[month]') ?>
-  -
-  <?php echo $event->html('end[day]') ?>
+ <?php
+     $dateorder = $GLOBALS['prefs']->getValue('date_input_format');
+     $dateorder = $dateorder != "" ? $dateorder : "year-month-day";
+     $dateorder = explode("-", $dateorder );
+     $datefields = array();
+     foreach ($dateorder as $fld) {
+	   $datefields[] = $event->html('end['.$fld.']');
+	 }
+     echo implode("-", $datefields);
+ ?>
 <?php if ($GLOBALS['browser']->hasFeature('dom')): ?>
   <span id="end_wday"></span>
   <script type="text/javascript">
-- 
tg: (8d3a749..) t/kronolith/HK/UV/dateInputFieldOrder (depends on: t/kronolith/HK/GW/ExportEventList)
-- 
TOPGIT patch commit log
=======================

commit 09e3d2df656b820ae7fbaacce1060958e4b889b9
Author: Gunnar Wrobel <p at rdus.de>
Date:   Thu Nov 5 09:26:25 2009 +0100

    Imported patch from kolab/issue3844 (New user preference to specify order of date input fields)

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -d -r1.5.2.8 -r1.5.2.9
--- series	13 Oct 2009 13:24:08 -0000	1.5.2.8
+++ series	5 Nov 2009 11:14:09 -0000	1.5.2.9
@@ -73,3 +73,4 @@
 t_framework_HK_GW_Prefs_FileDriverHotfix.diff -p1
 t_kronolith_HK_GW_AnonymousiCalDownload.diff -p1
 t_kronolith_HK_GW_ExportEventList.diff -p1
+t_kronolith_HK_UV_dateInputFieldOrder.diff -p1



From cvs at kolab.org  Thu Nov  5 12:14:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  5 Nov 2009 12:14:11 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.15, 1.32.2.16 
Message-ID: <20091105111411.C7E6260081E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv9695/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3844 (New user preference to specify order of date input fields)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.15
retrieving revision 1.32.2.16
diff -u -d -r1.32.2.15 -r1.32.2.16
--- horde-webmail-1.2.0_kolab_openpkg.patch	15 Oct 2009 15:15:03 -0000	1.32.2.15
+++ horde-webmail-1.2.0_kolab_openpkg.patch	5 Nov 2009 11:14:08 -0000	1.32.2.16
@@ -27613,6 +27613,158 @@
 Date:   Wed Oct 7 22:19:43 2009 +0200
 
     Export a list of events.
+From: Soenke Schwardt-Krummrich <schwardt at univention.de>
+Subject: [PATCH] t/kronolith/HK/UV/dateInputFieldOrder
+
+Currently in kronolith the order of date input fields is hardcoded to
+year-month-day. Some parts of the world usually use a different order.
+The attached patch adds a user preference to specify input field order.
+
+REFERENCE_KOLAB: https://issues.kolab.org/issue3844
+REFERENCE_HORDE:
+
+STATUS_KOLAB_2.2:             UNTESTED
+STATUS_KOLAB_2.3:             NONE
+STATUS_HORDE_KRONOLITH_2.3.3: SUBMIT
+STATUS_HORDE_KRONOLITH_3.0:   SUBMIT
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/config/prefs.php                     |   17 ++++++++++-
+ horde-webmail/config/prefs.php.dist                |   17 ++++++++++-
+ .../kronolith/templates/edit/edit_timespan.inc     |   30 +++++++++++++------
+ 3 files changed, 52 insertions(+), 12 deletions(-)
+
+diff --git a/horde-webmail/config/prefs.php b/horde-webmail/config/prefs.php
+index c9e5d80..e3c591b 100644
+--- a/horde-webmail/config/prefs.php
++++ b/horde-webmail/config/prefs.php
+@@ -105,7 +105,7 @@ $prefGroups['language'] = array(
+     'column' => _("Your Information"),
+     'label' => _("Locale and Time"),
+     'desc' => _("Set your preferred language, timezone and date options."),
+-    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'first_week_day')
++    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'date_input_format', 'first_week_day')
+ );
+ 
+ $prefGroups['categories'] = array(
+@@ -346,6 +346,21 @@ $_prefs['date_format'] = array(
+     'desc' => _("Choose how to display dates:"),
+ );
+ 
++// date input format
++$_prefs['date_input_format'] = array(
++    'value' => 'year-month-day',
++    'locked' => false,
++    'shared' => true,
++    'type' => 'enum',
++    'enum' => array(
++        'day-month-year' => strftime('%d %b %Y'),
++        'month-day-year' => strftime('%b %d %Y'),
++        'year-day-month' => strftime('%Y %d %b'),
++        'year-month-day' => strftime('%Y %b %d'),
++    ),
++    'desc' => _("Choose order how to enter dates:"),
++);
++
+ // what day should be displayed as the first day of the week?
+ $_prefs['first_week_day'] = array(
+     'value' => '0',
+diff --git a/horde-webmail/config/prefs.php.dist b/horde-webmail/config/prefs.php.dist
+index 6e513ae..2d745f9 100644
+--- a/horde-webmail/config/prefs.php.dist
++++ b/horde-webmail/config/prefs.php.dist
+@@ -105,7 +105,7 @@ $prefGroups['language'] = array(
+     'column' => _("Your Information"),
+     'label' => _("Locale and Time"),
+     'desc' => _("Set your preferred language, timezone and date options."),
+-    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'first_week_day')
++    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'date_input_format', 'first_week_day')
+ );
+ 
+ $prefGroups['categories'] = array(
+@@ -344,6 +344,21 @@ $_prefs['date_format'] = array(
+     'desc' => _("Choose how to display dates:"),
+ );
+ 
++// date input format
++$_prefs['date_input_format'] = array(
++    'value' => 'year-month-day',
++    'locked' => false,
++    'shared' => true,
++    'type' => 'enum',
++    'enum' => array(
++        'day-month-year' => strftime('%d %b %Y'),
++        'month-day-year' => strftime('%b %d %Y'),
++        'year-day-month' => strftime('%Y %d %b'),
++        'year-month-day' => strftime('%Y %b %d'),
++    ),
++    'desc' => _("Choose order how to enter dates:"),
++);
++
+ // what day should be displayed as the first day of the week?
+ $_prefs['first_week_day'] = array(
+     'value' => '0',
+diff --git a/horde-webmail/kronolith/templates/edit/edit_timespan.inc b/horde-webmail/kronolith/templates/edit/edit_timespan.inc
+index 9926617..05f5042 100644
+--- a/horde-webmail/kronolith/templates/edit/edit_timespan.inc
++++ b/horde-webmail/kronolith/templates/edit/edit_timespan.inc
+@@ -12,11 +12,16 @@
+  </td>
+  <td colspan="2" class="rightAlign"><?php echo _("On") ?>&nbsp;</td>
+  <td>
+-  <?php echo $event->html('start[year]') ?>
+-  -
+-  <?php echo $event->html('start[month]') ?>
+-  -
+-  <?php echo $event->html('start[day]') ?>
++ <?php
++     $dateorder = $GLOBALS['prefs']->getValue('date_input_format');
++     $dateorder = $dateorder != "" ? $dateorder : "year-month-day";
++     $dateorder = explode("-", $dateorder );
++     $datefields = array();
++     foreach ($dateorder as $fld) {
++	   $datefields[] = $event->html('start['.$fld.']');
++	 }
++     echo implode("-", $datefields);
++ ?>
+ <?php if ($GLOBALS['browser']->hasFeature('dom')): ?>
+   <span id="start_wday"></span>
+   <script type="text/javascript">
+@@ -62,11 +67,16 @@
+   <?php echo Horde::label('end_year', _("On")) ?>&nbsp;
+  </td>
+  <td>
+-  <?php echo $event->html('end[year]') ?>
+-  -
+-  <?php echo $event->html('end[month]') ?>
+-  -
+-  <?php echo $event->html('end[day]') ?>
++ <?php
++     $dateorder = $GLOBALS['prefs']->getValue('date_input_format');
++     $dateorder = $dateorder != "" ? $dateorder : "year-month-day";
++     $dateorder = explode("-", $dateorder );
++     $datefields = array();
++     foreach ($dateorder as $fld) {
++	   $datefields[] = $event->html('end['.$fld.']');
++	 }
++     echo implode("-", $datefields);
++ ?>
+ <?php if ($GLOBALS['browser']->hasFeature('dom')): ?>
+   <span id="end_wday"></span>
+   <script type="text/javascript">
+-- 
+tg: (8d3a749..) t/kronolith/HK/UV/dateInputFieldOrder (depends on: t/kronolith/HK/GW/ExportEventList)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 09e3d2df656b820ae7fbaacce1060958e4b889b9
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Nov 5 09:26:25 2009 +0100
+
+    Imported patch from kolab/issue3844 (New user preference to specify order of date input fields)
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Thu Nov  5 12:14:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  5 Nov 2009 12:14:10 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.58,1.398.2.59 
Message-ID: <20091105111410.AB8F660081E@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3844 (New user preference to specify order of date input fields)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.58
retrieving revision 1.398.2.59
diff -u -d -r1.398.2.58 -r1.398.2.59
--- release-notes.txt	30 Oct 2009 16:34:00 -0000	1.398.2.58
+++ release-notes.txt	5 Nov 2009 11:14:08 -0000	1.398.2.59
@@ -78,6 +78,8 @@
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)
+	kolab/issue3844 (New user preference to specify order of date
+	                 input fields)
 
     - openpkg-20071227-20071227_kolab2
 



From cvs at kolab.org  Thu Nov  5 16:08:53 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  5 Nov 2009 16:08:53 +0100 (CET)
Subject: thomas: doc/www/src download.html.m4,1.21,1.22 
Message-ID: <20091105150853.21C4D600808@lists.intevation.de>

Author: thomas

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

Modified Files:
	download.html.m4 
Log Message:
learned something about m4 quoting, now the download tree source does not need HTML entities


Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- download.html.m4	1 Jun 2009 21:10:44 -0000	1.21
+++ download.html.m4	5 Nov 2009 15:08:50 -0000	1.22
@@ -68,18 +68,20 @@
 packages with all the numerous small differences.
 <p>
 
+m4_changequote(`[', `]')dnl
 <a name="packages">
 The most important directories for downloading server packages are:
 <pre>
   <a href="http://files.kolab.org/server/">server/</a>
    |--<a href="http://files.kolab.org/server/release/">release/</a>                      - stable releases of Kolab Server
    |   |--<a href="http://files.kolab.org/server/release/kolab-server-2.2.1/">kolab-server-2.2.1/</a>       - previous stable release 2.2.1
-   |   &#96;--<a href="http://files.kolab.org/server/release/kolab-server-2.2.2/">kolab-server-2.2.2/</a>       - current stable release 2.2.2
+   |   `--<a href="http://files.kolab.org/server/release/kolab-server-2.2.2/">kolab-server-2.2.2/</a>       - current stable release 2.2.2
    |--<a href="http://files.kolab.org/server/security-updates/">security-updates/</a>             - files referenced by <a href="http://kolab.org/security/">Kolab Security Issues</a>
-   &#96;--<a href="http://files.kolab.org/server/beta/">beta/</a>                         - beta versions and release candidates
+   `--<a href="http://files.kolab.org/server/beta/">beta/</a>                         - beta versions and release candidates
 </pre>
 (alternatively use one of our <a href="mirrors.html">download mirrors</a>)
 </a>
+m4_changequote([`],['])dnl
 
 <p>
 The release and beta directories will contain a <code>sources</code> subdirectory



From cvs at kolab.org  Sat Nov  7 21:46:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  7 Nov 2009 21:46:40 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.59,1.398.2.60 
Message-ID: <20091107204640.75562600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
        kolab/issue2499 (Notification messages by the resource manager
                         should be localized)
        kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
        kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
                         into From: header)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.59
retrieving revision 1.398.2.60
diff -u -d -r1.398.2.59 -r1.398.2.60
--- release-notes.txt	5 Nov 2009 11:14:08 -0000	1.398.2.59
+++ release-notes.txt	7 Nov 2009 20:46:38 -0000	1.398.2.60
@@ -59,6 +59,11 @@
 
     - Kolab_Filter-0.1.4-2009????
 
+	kolab/issue2499 (Notification messages by the resource manager
+	                 should be localized)
+	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
+	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
+	                 into From: header)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
 



From cvs at kolab.org  Sat Nov  7 21:46:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  7 Nov 2009 21:46:40 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter issue2499_2.patch, NONE,
	1.1.2.1 ChangeLog, 1.29.2.7, 1.29.2.8 Kolab_Filter.spec,
	1.19.2.10, 1.19.2.11 Makefile, 1.8.2.6, 1.8.2.7 issue3568.patch,
	1.1.2.1, 1.1.2.2 revert_issue2499.patch, 1.1.2.1, NONE 
Message-ID: <20091107204640.754EC600167@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile issue3568.patch 
Added Files:
      Tag: kolab_2_2_branch
	issue2499_2.patch 
Removed Files:
      Tag: kolab_2_2_branch
	revert_issue2499.patch 
Log Message:
        kolab/issue2499 (Notification messages by the resource manager
                         should be localized)
        kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
        kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
                         into From: header)


--- NEW FILE: issue2499_2.patch ---
diff -u -B -r1.4.2.3 Content.php
--- Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	5 Mar 2009 10:08:53 -0000	1.4.2.3
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	6 Nov 2009 11:07:34 -0000
@@ -439,8 +439,8 @@
                                 } else {
                                     $name = '';
                                 }
-                                $new_from = '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
-                                return '=?utf-8?B?' . base64_encode($new_from) . '?=';
+                                $new_from = '"' . $name . ' ' . $untrusted . '"';
+                                return '=?utf-8?B?' . base64_encode($new_from) . '?= <' . $from . '>';
                             } else {
                                 return true;
                             }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.7
retrieving revision 1.29.2.8
diff -u -d -r1.29.2.7 -r1.29.2.8
--- ChangeLog	22 Sep 2009 16:28:07 -0000	1.29.2.7
+++ ChangeLog	7 Nov 2009 20:46:38 -0000	1.29.2.8
@@ -1,3 +1,13 @@
+2009-11-07  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the
+	resource manager should be localized)
+
+	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8
+	code into From: header)
+
+	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
+
 2009-09-22  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue3868 (Resmgr eats up all memory

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.10
retrieving revision 1.19.2.11
diff -u -d -r1.19.2.10 -r1.19.2.11
--- Kolab_Filter.spec	22 Sep 2009 16:28:07 -0000	1.19.2.10
+++ Kolab_Filter.spec	7 Nov 2009 20:46:38 -0000	1.19.2.11
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20090922
+%define         V_release 20091107
 
 # Package Information
 Name:	   %{V_package}
@@ -23,7 +23,7 @@
 Patch1:    issue3192.patch
 Patch2:    issue3441.patch
 Patch3:    dovecotlda-quoting.patch
-Patch4:    revert_issue2499.patch
+Patch4:    issue2499_2.patch
 Patch5:    issue3521.patch
 Patch6:    issue3558.patch
 Patch7:    issue3568.patch
@@ -66,7 +66,7 @@
 	%patch -p1 -P 1
 	%patch -p1 -P 2
 	%patch -p1 -P 3
-	%patch -p3 -P 4
+	%patch -p1 -P 4
 	%patch -p3 -P 5
 	%patch -p1 -P 6
 	%patch -p1 -P 7

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/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	22 Sep 2009 16:28:07 -0000	1.8.2.6
+++ Makefile	7 Nov 2009 20:46:38 -0000	1.8.2.7
@@ -21,7 +21,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: issue3568.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Attic/issue3568.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
--- issue3568.patch	29 Apr 2009 16:06:21 -0000	1.1.2.1
+++ issue3568.patch	7 Nov 2009 20:46:38 -0000	1.1.2.2
@@ -1,11 +1,12 @@
 --- a/lib/Horde/Kolab/Filter/Base.php	2009-04-29 17:58:31.000000000 +0200
 +++ b/lib/Horde/Kolab/Filter/Base.php	2009-04-29 17:59:09.000000000 +0200
-@@ -243,6 +243,8 @@
+@@ -243,6 +243,9 @@
          Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)),
                            __FILE__, __LINE__, PEAR_LOG_DEBUG);
  
 +        require_once 'Horde/NLS.php';
 +        NLS::setCharset('utf-8');
- 
-         /* This is used as the default domain for unqualified adresses */
-         global $_SERVER;
++
+         if (!empty($conf['kolab']['filter']['locale_path'])
+             && !empty($conf['kolab']['filter']['locale'])) {
+             require_once 'Horde/NLS.php';

--- revert_issue2499.patch DELETED ---



From cvs at kolab.org  Sat Nov  7 22:41:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  7 Nov 2009 22:41:31 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.458,1.459 
Message-ID: <20091107214131.D089A600167@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Update to Kolab_Filter-0.1.6. This finally merges some long standing TODOs from the 2.2 branch to HEAD.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -d -r1.458 -r1.459
--- release-notes.txt	21 Sep 2009 09:37:55 -0000	1.458
+++ release-notes.txt	7 Nov 2009 21:41:28 -0000	1.459
@@ -21,16 +21,20 @@
 
 	kolab/issue3555 (unable to save filter settings more than once)
 
-    - Kolab_Filter-0.1.5-2009????
+    - Kolab_Filter-0.1.6-2009????
+
+	Added french translation. Submitted by Mathieu Parent
+	(mathieuparent at users.sourceforge.net).
 
 	kolab/issue1336 (Resource booking fails, if TRANSP:TRANSPARENT in the
 	                 invitation)
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
+	kolab/issue2499 (Notification messages by the resource manager sould be
+	                 localized)
 	kolab/issue3289 (resmgr dies when it should accept, but has not Calender
 	                 folder access)
 	kolab/issue3364 (manpages for kolabfilter and kolabmailboxfilter)
-	kolab/issue2499 (Notification messages by the resource manager sould be
-	                 localized)
+	kolab/issue3560 (php error when inviting outside of free/busy interval)
 
     - Kolab_Format-1.0.1-2009????
 
@@ -125,6 +129,16 @@
 
 Changes between 2.2.2 and 2.2.3:
 
+    - Kolab_Filter-0.1.4-2009????
+
+	kolab/issue2499 (Notification messages by the resource manager
+	                 should be localized)
+	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
+	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
+	                 into From: header)
+	kolab/issue3868 (Resmgr eats up all memory and dies on some
+	                 recuring events)
+
     - kolab-webclient-1.2.0-20090514
 
 	kolab/issue3509 (calender not displaying in horde if german
@@ -159,10 +173,13 @@
 	kolab/issue3549 (append_dot_mydomain allows circumventing
 	                 kolabfilter-verify-from-header)
 
-TODO:
+
     - Kolab_Filter-0.1.4-20090417
 
-TODO:	kolab/issue3558 (whole-day events broken for resources)
+	kolab/issue3521 (kolabmailboxfilter does not accept mail for
+	                 user+extension at example.com)
+	kolab/issue3558 (whole-day events broken for resources)
+	kolab/issue3568 (umlauts broken in automatically accepted events)
 
     - kolab-webadmin-2.2.2-20090514
 
@@ -345,7 +362,7 @@
 	                 configurable via templates)
 	kolab/issue3513 (Clamav - new upstream version 0.95)
 
-TODO:
+
     - Kolab_Filter-0.1.4-20090401
 
 	Fixed quoting of arguments to dovecot deliver command in the
@@ -353,7 +370,7 @@
 
 	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
 	                 into From: header)
-TODO:	kolab/issue3521 (kolabmailboxfilter does not accept mail for
+	kolab/issue3521 (kolabmailboxfilter does not accept mail for
 	                 user+extension at example.com)
 
     - Kolab_Format-1.0.0-20090402



From cvs at kolab.org  Sat Nov  7 22:41:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  7 Nov 2009 22:41:31 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.30,
	1.31 Kolab_Filter.spec, 1.22, 1.23 
Message-ID: <20091107214131.D1EFD600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_Filter.spec 
Log Message:
Update to Kolab_Filter-0.1.6. This finally merges some long standing TODOs from the 2.2 branch to HEAD.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	6 Mar 2009 09:17:05 -0000	1.30
+++ ChangeLog	7 Nov 2009 21:41:28 -0000	1.31
@@ -1,3 +1,7 @@
+2009-11-07  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: Update to 0.1.6.
+
 2009-03-06  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: Update to 0.1.5.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Kolab_Filter.spec	26 Apr 2009 10:33:21 -0000	1.22
+++ Kolab_Filter.spec	7 Nov 2009 21:41:28 -0000	1.23
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.1.5
-%define         V_release 20090317
+%define         V_version 0.1.6
+%define         V_release 20091107
 %define         V_sourceurl http://pear.horde.org/get
 
 # Package Information



From cvs at kolab.org  Sun Nov  8 14:55:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun,  8 Nov 2009 14:55:26 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.263,1.264 
Message-ID: <20091108135526.6C6CE600168@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added list option, to show the involved distribution related service,
and whether they are active or no.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- ChangeLog	27 Aug 2009 21:13:17 -0000	1.263
+++ ChangeLog	8 Nov 2009 13:55:24 -0000	1.264
@@ -1,3 +1,8 @@
+2009-11-08 Richard Bos <richard at radoeka.nl>
+
+	* dist_conf/kolabsrv.in: added list option, to show the involved 
+	  distribution related service, and whether they are active or no.
+
 2009-08-27  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/DB_CONFIG.slapd.template.in: dist_conf'iguration for openldap



From cvs at kolab.org  Sun Nov  8 14:55:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun,  8 Nov 2009 14:55:26 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.18,1.19 
Message-ID: <20091108135526.6D846600806@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
added list option, to show the involved distribution related service,
and whether they are active or no.



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolabsrv.in	3 May 2009 19:40:14 -0000	1.18
+++ kolabsrv.in	8 Nov 2009 13:55:24 -0000	1.19
@@ -1,5 +1,7 @@
 #!@BASH@
 
+PRGNAME=$(basename $0)
+
 # check if everything is correct
 function check() {
 	if [ -x "$RCDIR/$SERVICE" ]; then
@@ -22,7 +24,7 @@
 	retc=$?
 	if [ $retc -ne 0 ] && [ $retc -ne 3 ]; then
 		( echo "ERROR: $RCDIR/$SERVICE $PARAM failed"
-		  echo "Run: @KOLABRC@ rc all stop"
+		  echo "Run: $PRGNAME rc all stop"
 		  echo "to stop all services"
 		) >&2
 		exit 1
@@ -59,6 +61,8 @@
 	fi
 }	
 
+[[ -f /etc/kolab/profile.sh ]] && . /etc/kolab/profile.sh
+
 # variables
 RC=$1
 SERVICE=$2
@@ -74,11 +78,46 @@
 rc)
 	# okay
 	;;
+list)
+	for S in $SERVICES; do
+		getServiceName $S
+		case $S in
+		amavisd|clamav|freshclam|spamd)
+			DEFENSIVE_SERVICES="$DEFENSIVE_SERVICES $SERVICE"
+			;;
+		*)
+			GROUPWARE_SERVICES="$GROUPWARE_SERVICES $SERVICE"
+			;;
+		esac
+	done
+
+	echo "Groupware services:"
+	echo "-------------------"
+	chkconfig --list $GROUPWARE_SERVICES
+	echo "All the above listed groupware services must be active."
+	echo
+
+	echo "Defensive services:"
+	echo "-------------------"
+	chkconfig --list $DEFENSIVE_SERVICES
+
+	if [[ "$ENABLE_VIRUS_SCAN" == "no" ]]; then
+		echo "SPAM detection and virus scanning are disabled."
+		echo "Hence the above listed defensive services do not need to be active."
+	else
+		echo "SPAM detection and virus scanning are enabled."
+		echo "The above listed defensive services must be active."
+	fi
+	exit
+	;;
 *)
 	SERVICES=$(echo $SERVICES | tr -s " " | sed 's, ,|,'g)
 
-	( echo "ERROR: $RC not supported"
-	  echo "Use: @KOLABRC@ rc [all|$SERVICES] [stop|start|restart|status]"
+	( [[ -n "$RC" ]] && echo "ERROR: $RC not supported"
+	  echo "Use: $PRGNAME rc [all|$SERVICES] [stop|start|restart|status]"
+	  echo
+	  echo "Display the state of the all kolab related processes:"
+	  echo "  $PRGNAME list"
 	) >&2
 
 	exit 1
@@ -99,7 +138,7 @@
 
 	if [[ $SERVICE_FOUND == "no" ]]; then
 		( echo "ERROR: unknown service: $SERVICE"
-		  echo "Use: @KOLABRC@ rc [all|$SERVICES] [stop|start|restart|status]"
+		  echo "Use: $PRGNAME rc [all|$SERVICES] [stop|start|restart|status]"
 		) >&2
 
 		exit 1
@@ -109,8 +148,6 @@
 		SERVICES=$(tr " " "\n" <<< "$SERVICES" | tac)
 	fi
 fi
-
-[[ -f @sysconfdir@/kolab/profile.sh ]] && . @sysconfdir@/kolab/profile.sh
 
 RCDIR=@kolab_rcdir@
 



From cvs at kolab.org  Mon Nov  9 15:23:56 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:56 +0100 (CET)
Subject: wilde: server/pear/PEAR-Mail-mimeDecode Makefile,1.1,1.1.2.1 
Message-ID: <20091109142356.E3B9B600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Mail-mimeDecode
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Mail-mimeDecode

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail-mimeDecode/Attic/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:31:20 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.1.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_LDAP2 Makefile,1.3.2.1,1.3.2.2 
Message-ID: <20091109142357.27667600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_LDAP2
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Net_LDAP2

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_LDAP2/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	13 Oct 2009 14:06:27 -0000	1.3.2.1
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.3.2.2
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z0-9\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9RC.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_LMTP Makefile,1.2,1.2.2.1 
Message-ID: <20091109142357.30A76600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_LMTP
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Net_LMTP

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_LMTP/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.2.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_Socket Makefile,1.7,1.7.2.1 
Message-ID: <20091109142357.70A7C600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Net_Socket

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PEAR-PHPUnit-Channel Makefile,1.3,1.3.2.1 
Message-ID: <20091109142357.B501560081B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-PHPUnit-Channel
In directory doto:/tmp/cvs-serv21750/pear/PEAR-PHPUnit-Channel

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile	19 Jan 2009 16:35:53 -0000	1.3
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.3.2.1
@@ -1,14 +1,16 @@
+include ../../kolab.mk
+
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 PACKAGE = PEAR-PHPUnit-Channel



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_SMTP Makefile,1.2,1.2.2.1 
Message-ID: <20091109142357.6BC25600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_SMTP
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Net_SMTP

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_SMTP/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.2.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PHPUnit Makefile,1.1,1.1.2.1 
Message-ID: <20091109142357.D7314600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PHPUnit
In directory doto:/tmp/cvs-serv21750/pear/PHPUnit

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PHPUnit/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	10 Sep 2008 13:31:31 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.phpunit.de/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_URL Makefile,1.2,1.2.2.1 
Message-ID: <20091109142357.A0183600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_URL
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Net_URL

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_URL/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.2.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/perl-ldap Makefile,1.3,1.3.2.1 
Message-ID: <20091109142357.E136560081C@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/perl-ldap
In directory doto:/tmp/cvs-serv21750/perl-ldap

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/perl-ldap/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile	18 Feb 2009 17:09:37 -0000	1.3
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.3.2.1
@@ -1,3 +1,5 @@
+include ../kolab.mk
+
 NAME = perl-ldap
 PACKAGE = $(NAME)
 PKGVER = $(shell grep "%define[ ]*V_perl_" *.spec | sed -e "s/.*V_perl_[a-z]*\s*\([0-9.]*\).*/\1/")
@@ -5,16 +7,16 @@
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9a-z_]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(PKGVER).tar.gz



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/perl-kolab MANIFEST, 1.8, 1.8.2.1 Makefile.PL, 1.14.2.1,
	1.14.2.2 
Message-ID: <20091109142357.DD46860081B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	MANIFEST Makefile.PL 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- MANIFEST	10 Feb 2009 13:45:49 -0000	1.8
+++ MANIFEST	9 Nov 2009 14:23:55 -0000	1.8.2.1
@@ -22,5 +22,6 @@
 lib/Kolab/LDAP/Backend/fds.pm
 lib/Kolab/Util.pm
 Makefile.PL
+kolab.mk
 MANIFEST
 README

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- Makefile.PL	20 Mar 2009 10:23:31 -0000	1.14.2.1
+++ Makefile.PL	9 Nov 2009 14:23:55 -0000	1.14.2.2
@@ -4,6 +4,7 @@
 
 use ExtUtils::MakeMaker;
 use Getopt::Long;
+use File::Copy;
 
 my $HELP = 0;
 my $CONFIG = '/kolab/etc/kolab';
@@ -95,8 +96,13 @@
 }
 
 sub MY::postamble {
-    
-    my $add = "bin/%: bin/%.in
+    if (-e "../kolab.mk")
+    {
+	copy("../kolab.mk", "./") or die "Could not copy ../kolab.mk";
+    }
+    my $add = "include kolab.mk
+
+bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 sbin/%: sbin/%.in
@@ -119,20 +125,20 @@
 	done
 
 ifeq \"x\$(RPM)\" \"x\"
-  RPM = \$(HOME)/bin/openpkg rpm
+  RPM = \$(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq \"x\$(KOLABRPMSRC)\" \"x\"
-  KOLABRPMSRC = \$(HOME)/RPM/SRC
+  KOLABRPMSRC = \$(KOLABDIR)/RPM/SRC
 endif
 ifeq \"x\$(KOLABRPMPKG)\" \"x\"
-  KOLABRPMPKG = \$(HOME)/RPM/PKG
+  KOLABRPMPKG = \$(KOLABDIR)/RPM/PKG
 endif
 ifeq \"x\$(KOLABRPMTMP)\" \"x\"
-  KOLABRPMTMP = \$(HOME)/RPM/TMP
+  KOLABRPMTMP = \$(KOLABDIR)/RPM/TMP
 endif
 
 ifeq \"x\$(PLATTAG)\" \"x\"
-	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(HOME:/%=%)
+	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(KOLABDIR:/%=%)
 endif
 
 PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/php Makefile,1.18.2.1,1.18.2.2 
Message-ID: <20091109142358.382AF60081B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- Makefile	24 Mar 2009 16:29:25 -0000	1.18.2.1
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.18.2.2
@@ -1,21 +1,23 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 PACKAGE=php



From cvs at kolab.org  Mon Nov  9 15:23:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:57 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter Makefile,1.8.2.7,1.8.2.8 
Message-ID: <20091109142357.E926D60081E@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -u -d -r1.8.2.7 -r1.8.2.8
--- Makefile	7 Nov 2009 20:46:38 -0000	1.8.2.7
+++ Makefile	9 Nov 2009 14:23:55 -0000	1.8.2.8
@@ -1,22 +1,24 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 SOURCE_URL=http://pear.horde.org/get



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Format Makefile,1.6.2.1,1.6.2.2 
Message-ID: <20091109142358.92EC9600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv21750/php-kolab/Kolab_Format

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Makefile,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- Makefile	2 Apr 2009 07:29:21 -0000	1.6.2.1
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.2
@@ -1,46 +1,28 @@
-# If home is unset this Makefile assumes the Kolab server installation
-# resides in /kolab. If this is not the case this Makefile must be
-# called using
-#
-# HOME="/mykolabroot" make TARGET
-#
-ifeq "x$(HOME)" "x"
-  HOME = /kolab
-endif
-
-# If HOME is set to /root it is likely that somebody is calling this
-# Makefile as root user. In this case this Makefile assumes that the
-# Kolab server installation resides in /kolab.
-#
-# In the (hopefully) unlikely event that somebody really installed the
-# Kolab server in /root this Makefile will fail.
-ifeq "x$(HOME)" "x/root"
-  HOME = /kolab
-endif
+include ../../kolab.mk
 
 # Set the location of the rpm binary
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 # Set the location for rpm source package installations
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 
 # Set the location for rpm packages
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 
 # Set the location for the rpm temporary directory
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 # Determine the suffix for binary packages on this system
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 # Determine the staging area for collecting new source rpms



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Freebusy Makefile,1.6.2.2,1.6.2.3 
Message-ID: <20091109142358.9549260081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv21750/php-kolab/Kolab_Freebusy

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/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	6 Apr 2009 13:59:22 -0000	1.6.2.2
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.3
@@ -1,22 +1,24 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 SOURCE_URL=http://pear.horde.org/get



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/php-smarty Makefile,1.8,1.8.2.1 
Message-ID: <20091109142358.C8939600815@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-smarty/Makefile,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- Makefile	21 Oct 2008 17:03:57 -0000	1.8
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.8.2.1
@@ -1,3 +1,5 @@
+include ../kolab.mk
+
 NAME = Smarty
 PACKAGE = php-smarty
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
@@ -5,16 +7,16 @@
 KOLABRELEASE = $(RELEASE)
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 #SOURCE_0=http://www.smarty.net/distributions/$(NAME)-$(VERSION).tar.gz



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Storage Makefile,1.6,1.6.2.1 
Message-ID: <20091109142358.9A23E60081C@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile	24 Feb 2009 11:57:46 -0000	1.6
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.1
@@ -1,22 +1,24 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 SOURCE_URL=http://pear.horde.org/get



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Server Makefile,1.6.2.1,1.6.2.2 
Message-ID: <20091109142358.97CC260081B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Server
In directory doto:/tmp/cvs-serv21750/php-kolab/Kolab_Server

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/Makefile,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- Makefile	13 Oct 2009 10:35:34 -0000	1.6.2.1
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.2
@@ -1,46 +1,28 @@
-# If home is unset this Makefile assumes the Kolab server installation
-# resides in /kolab. If this is not the case this Makefile must be
-# called using
-#
-# HOME="/mykolabroot" make TARGET
-#
-ifeq "x$(HOME)" "x"
-  HOME = /kolab
-endif
-
-# If HOME is set to /root it is likely that somebody is calling this
-# Makefile as root user. In this case this Makefile assumes that the
-# Kolab server installation resides in /kolab.
-#
-# In the (hopefully) unlikely event that somebody really installed the
-# Kolab server in /root this Makefile will fail.
-ifeq "x$(HOME)" "x/root"
-  HOME = /kolab
-endif
+include ../../kolab.mk
 
 # Set the location of the rpm binary
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 # Set the location for rpm source package installations
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 
 # Set the location for rpm packages
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 
 # Set the location for the rpm temporary directory
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 # Determine the suffix for binary packages on this system
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 # Determine the staging area for collecting new source rpms



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/postfix Makefile,1.19.2.1,1.19.2.2 
Message-ID: <20091109142358.CB0C2600819@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- Makefile	24 Mar 2009 16:29:25 -0000	1.19.2.1
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.19.2.2
@@ -1,17 +1,19 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 PACKAGE=postfix



From cvs at kolab.org  Mon Nov  9 15:23:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:23:58 +0100 (CET)
Subject: wilde: server/sqlite Makefile,1.2,1.2.2.1 
Message-ID: <20091109142358.CFECE60081A@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/sqlite/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	27 Oct 2008 17:21:39 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:56 -0000	1.2.2.1
@@ -1,3 +1,5 @@
+include ../kolab.mk
+
 NAME = sqlite
 PACKAGE = $(NAME)
 VERSION3 = $(shell grep "define *V_v3" sqlite.spec | sed -e "s/.*V_v3\s*\([0-9.]*\).*/\1/")
@@ -6,16 +8,16 @@
 KOLABRELEASE = $(RELEASE)
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://www.sqlite.org/sqlite-$(VERSION2).tar.gz



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server/apache-php Makefile,1.8.2.1,1.8.2.2 
Message-ID: <20091109142422.5F1B7600819@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- Makefile	24 Mar 2009 16:29:25 -0000	1.8.2.1
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.8.2.2
@@ -1,21 +1,23 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 PACKAGE=apache-php



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server kolab.mk,NONE,1.1.2.1 Makefile,1.76.2.1,1.76.2.2 
Message-ID: <20091109142422.5CD18600815@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Added Files:
      Tag: kolab_2_2_branch
	kolab.mk 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

--- NEW FILE: kolab.mk ---
# Set KOLABDIR to the base directory of the OpenPKG/Kolab installation:
KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)

ifeq ($(KOLABDIR),)
  $(error Could not determine KOLABDIR!)
endif

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.76.2.1
retrieving revision 1.76.2.2
diff -u -d -r1.76.2.1 -r1.76.2.2
--- Makefile	23 Sep 2009 16:18:48 -0000	1.76.2.1
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.76.2.2
@@ -1,13 +1,4 @@
-ifeq "x$(HOME)" "x"
-  HOME = /kolab
-endif
-
-# Don't know if this is correct but if somebody
-# calls this makefile as root we assume that there
-# is an installation in /kolab
-ifeq "x$(HOME)" "x/root"
-  HOME = /kolab
-endif
+include kolab.mk
 
 BASE_PACKAGES=php-smarty              \
               openldap                \
@@ -89,13 +80,13 @@
         php-kolab/Kolab_Storage \
         kolab-webclient
 
-PHPUNIT=$(HOME)/bin/phpunit
+PHPUNIT=$(KOLABDIR)/bin/phpunit
 
-PHPUNIT_TESTS=$(HOME)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_Storage/Horde/Kolab/Storage/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
+PHPUNIT_TESTS=$(KOLABDIR)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_Storage/Horde/Kolab/Storage/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
 
 .PHONY: dist
 dist: stage base kolab pear files



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server/clamav Makefile,1.7,1.7.2.1 
Message-ID: <20091109142422.618AB60081A@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	19 Jan 2009 16:23:53 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../kolab.mk
+
 NAME = clamav
 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/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server/db Makefile,1.5.2.1,1.5.2.2 
Message-ID: <20091109142422.668F460081B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/db/Attic/Makefile,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- Makefile	23 Sep 2009 16:18:48 -0000	1.5.2.1
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.5.2.2
@@ -1,17 +1,19 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 PACKAGE=db



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server/imapd Makefile,1.40.2.3,1.40.2.4 
Message-ID: <20091109142422.C8336600815@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
diff -u -d -r1.40.2.3 -r1.40.2.4
--- Makefile	22 Sep 2009 14:28:21 -0000	1.40.2.3
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.40.2.4
@@ -1,21 +1,23 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 PACKAGE=imapd



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server/gmp Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109142422.88ABA600815@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/gmp/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	24 Mar 2009 16:29:25 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.1.2.2
@@ -1,17 +1,19 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 PACKAGE=gmp



From cvs at kolab.org  Mon Nov  9 15:24:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:22 +0100 (CET)
Subject: wilde: server/kolab-fbview Makefile,1.4,1.4.2.1 
Message-ID: <20091109142422.F1ACF600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/kolab-fbview
In directory doto:/tmp/cvs-serv21750/kolab-fbview

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	20 Nov 2008 17:46:57 -0000	1.4
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.4.2.1
@@ -1,14 +1,16 @@
+include ../kolab.mk
+
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")



From cvs at kolab.org  Mon Nov  9 15:24:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:23 +0100 (CET)
Subject: wilde: server/kolab-webadmin Makefile,1.17,1.17.2.1 
Message-ID: <20091109142423.08DF0600819@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- Makefile	4 Mar 2009 11:58:35 -0000	1.17
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.17.2.1
@@ -1,19 +1,21 @@
+include ../kolab.mk
+
 PACKAGE=kolab-webadmin
 VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
 RELEASE:=`date '+%Y%m%d'`
 KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\1/')
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 all:
@@ -38,7 +40,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf $(HOME)/RPM/TMP/$(PACKAGE)*
+	rm -rf $(KOLABDIR)/RPM/TMP/$(PACKAGE)*
 	find . -name "*~" | xargs rm -rf
 	rm -rf *.src.rpm
 	rm -rf *.tar.bz2



From cvs at kolab.org  Mon Nov  9 15:24:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:23 +0100 (CET)
Subject: wilde: server/kolabd Makefile,1.18,1.18.2.1 
Message-ID: <20091109142423.0C2B860081B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -d -r1.18 -r1.18.2.1
--- Makefile	4 Mar 2009 11:58:35 -0000	1.18
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.18.2.1
@@ -1,3 +1,5 @@
+include ../kolab.mk
+
 PWD := $(shell pwd)
 
 PACKAGE=kolabd
@@ -8,20 +10,20 @@
 MAKETAR = dist
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Nov  9 15:24:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:23 +0100 (CET)
Subject: wilde: server/openpkg Makefile,1.1.2.2,1.1.2.3 
Message-ID: <20091109142423.248E360081A@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openpkg/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	23 Sep 2009 15:46:01 -0000	1.1.2.2
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.1.2.3
@@ -1,17 +1,19 @@
+include ../kolab.mk
+
 ifeq "x$(KOLABPKGURI)" "x"
 	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(HOME)/RPM/SRC
+	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(HOME)/RPM/PKG
+	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
 	KOLABCVSDIR = $(CURDIR)
 endif
 ifeq "x$(RPM)" "x"
-	RPM = $(HOME)/bin/openpkg rpm
+	RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 
 PACKAGE=openpkg



From cvs at kolab.org  Mon Nov  9 15:24:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:23 +0100 (CET)
Subject: wilde: server/kolab-webclient Makefile,1.6,1.6.2.1 
Message-ID: <20091109142423.0A5D960081A@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile	5 Feb 2009 23:28:10 -0000	1.6
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.6.2.1
@@ -1,18 +1,20 @@
+include ../kolab.mk
+
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")



From cvs at kolab.org  Mon Nov  9 15:24:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:23 +0100 (CET)
Subject: wilde: server/pear/Horde_Argv Makefile,1.1,1.1.2.1 
Message-ID: <20091109142423.74DB7600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Argv
In directory doto:/tmp/cvs-serv21750/pear/Horde_Argv

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Argv/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	24 Sep 2008 16:46:34 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.1.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Auth Makefile,1.4,1.4.2.1 
Message-ID: <20091109142424.02808600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Auth
In directory doto:/tmp/cvs-serv21750/pear/Horde_Auth

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	22 Sep 2008 16:34:28 -0000	1.4
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.4.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:23 +0100 (CET)
Subject: wilde: server/openldap Makefile,1.24,1.24.2.1 
Message-ID: <20091109142423.2220C600819@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- Makefile	19 Jan 2009 16:23:53 -0000	1.24
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.24.2.1
@@ -1,3 +1,5 @@
+include ../kolab.mk
+
 NAME = openldap
 PACKAGE = $(NAME)
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
@@ -5,16 +7,16 @@
 KOLABRELEASE = $(RELEASE)
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=ftp://ftp.openldap.org/pub/openldap/openldap-release/$(NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_CLI Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.074CA60081E@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_CLI
In directory doto:/tmp/cvs-serv21750/pear/Horde_CLI

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_CLI/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:21:57 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Cache Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.09CFA60081F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Cache
In directory doto:/tmp/cvs-serv21750/pear/Horde_Cache

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Cache/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:23:46 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Cipher Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.0ECB7600820@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Cipher
In directory doto:/tmp/cvs-serv21750/pear/Horde_Cipher

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Cipher/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:26:09 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Browser Makefile,1.2,1.2.2.1 
Message-ID: <20091109142424.04E9660081D@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Browser
In directory doto:/tmp/cvs-serv21750/pear/Horde_Browser

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Browser/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	10 Sep 2008 10:57:01 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:51 -0000	1.2.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_DataTree Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.B110A60081B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_DataTree
In directory doto:/tmp/cvs-serv21750/pear/Horde_DataTree

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DataTree/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	12 Sep 2008 19:29:41 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_LDAP Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.B6CF8600821@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_LDAP
In directory doto:/tmp/cvs-serv21750/pear/Horde_LDAP

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_LDAP/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	10 Sep 2008 13:42:59 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Group Makefile,1.3,1.3.2.1 
Message-ID: <20091109142424.B49B060081F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Group
In directory doto:/tmp/cvs-serv21750/pear/Horde_Group

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile	16 Sep 2008 12:50:39 -0000	1.3
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.3.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_History Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.B54B2600820@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_History
In directory doto:/tmp/cvs-serv21750/pear/Horde_History

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_History/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:28:17 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_DOM Makefile,1.2,1.2.2.1 
Message-ID: <20091109142424.1216C600821@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_DOM
In directory doto:/tmp/cvs-serv21750/pear/Horde_DOM

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	10 Sep 2008 10:57:01 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.2.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_MIME Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.B88DF600822@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_MIME
In directory doto:/tmp/cvs-serv21750/pear/Horde_MIME

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:27:38 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Date Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.B32DD60081D@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Date
In directory doto:/tmp/cvs-serv21750/pear/Horde_Date

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Date/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	12 Sep 2008 18:46:46 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 #SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:24 +0100 (CET)
Subject: wilde: server/pear/Horde_Framework Makefile,1.1,1.1.2.1 
Message-ID: <20091109142424.B3E4260081E@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Framework
In directory doto:/tmp/cvs-serv21750/pear/Horde_Framework

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:26:09 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_NLS Makefile,1.2,1.2.2.1 
Message-ID: <20091109142425.12B2160081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_NLS
In directory doto:/tmp/cvs-serv21750/pear/Horde_NLS

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_NLS/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	10 Sep 2008 10:57:01 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.2.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_Notification Makefile,1.1,1.1.2.1 
Message-ID: <20091109142425.3AD82600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Notification
In directory doto:/tmp/cvs-serv21750/pear/Horde_Notification

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Notification/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	24 Feb 2009 11:57:46 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:52 -0000	1.1.2.1
@@ -1,22 +1,24 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 SOURCE_URL=http://pear.horde.org/get



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_Prefs Makefile,1.1,1.1.2.1 
Message-ID: <20091109142425.7A21C600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Prefs
In directory doto:/tmp/cvs-serv21750/pear/Horde_Prefs

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Prefs/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	24 Feb 2009 11:57:46 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.1.2.1
@@ -1,22 +1,24 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
 
 SOURCE_URL=http://pear.horde.org/get



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_Secret Makefile,1.1,1.1.2.1 
Message-ID: <20091109142425.7C8C660081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Secret
In directory doto:/tmp/cvs-serv21750/pear/Horde_Secret

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Secret/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:30:24 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_Serialize Makefile,1.1,1.1.2.1 
Message-ID: <20091109142425.81A8260081E@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Serialize
In directory doto:/tmp/cvs-serv21750/pear/Horde_Serialize

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Serialize/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:30:24 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_Util Makefile,1.4,1.4.2.1 
Message-ID: <20091109142425.C4697600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Util
In directory doto:/tmp/cvs-serv21750/pear/Horde_Util

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	26 Sep 2008 05:32:58 -0000	1.4
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.4.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_Perms Makefile,1.1,1.1.2.1 
Message-ID: <20091109142425.481F7600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Perms
In directory doto:/tmp/cvs-serv21750/pear/Horde_Perms

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Perms/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:29:02 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.1.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/Horde_iCalendar Makefile,1.4,1.4.2.1 
Message-ID: <20091109142426.18D82600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_iCalendar
In directory doto:/tmp/cvs-serv21750/pear/Horde_iCalendar

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	5 Dec 2008 16:17:15 -0000	1.4
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.4.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/PEAR-Auth_SASL Makefile,1.7,1.7.2.1 
Message-ID: <20091109142426.1AFE9600826@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Auth_SASL

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:25 +0100 (CET)
Subject: wilde: server/pear/Horde_SessionObjects Makefile,1.1,1.1.2.1 
Message-ID: <20091109142425.8513F60081F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_SessionObjects
In directory doto:/tmp/cvs-serv21750/pear/Horde_SessionObjects

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SessionObjects/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	11 Sep 2008 16:30:24 -0000	1.1
+++ Makefile	9 Nov 2009 14:23:53 -0000	1.1.2.1
@@ -1,18 +1,20 @@
+include ../../kolab.mk
+
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/PEAR-Horde-Channel Makefile,1.3,1.3.2.1 
Message-ID: <20091109142426.7BC04600828@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Horde-Channel
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Horde-Channel

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile	19 Jan 2009 16:35:53 -0000	1.3
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.3.2.1
@@ -1,14 +1,16 @@
+include ../../kolab.mk
+
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 PACKAGE = PEAR-Horde-Channel



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/PEAR-HTTP_Request Makefile,1.2,1.2.2.1 
Message-ID: <20091109142426.7B0EA600827@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-HTTP_Request
In directory doto:/tmp/cvs-serv21750/pear/PEAR-HTTP_Request

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-HTTP_Request/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.2
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.2.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/PEAR-Date Makefile,1.7,1.7.2.1 
Message-ID: <20091109142426.29A5360081B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Date

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/PEAR-Mail Makefile,1.7,1.7.2.1 
Message-ID: <20091109142426.BEDFA600819@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Mail

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 15:24:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 15:24:26 +0100 (CET)
Subject: wilde: server/pear/PEAR-Log Makefile,1.7,1.7.2.1 
Message-ID: <20091109142426.7C9B1600829@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv21750/pear/PEAR-Log

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
@@ -1,19 +1,21 @@
+include ../../kolab.mk
+
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
+  RPM = $(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
 endif
 ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
 endif
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz



From cvs at kolab.org  Mon Nov  9 18:08:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:46 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_URL Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170846.6A1E6600814@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_URL
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Net_URL

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_URL/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:55 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.2.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:08:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:46 +0100 (CET)
Subject: wilde: server/pear/PEAR-PHPUnit-Channel Makefile,1.3.2.1,1.3.2.2 
Message-ID: <20091109170846.6C674600815@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-PHPUnit-Channel
In directory doto:/tmp/cvs-serv27852/pear/PEAR-PHPUnit-Channel

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	9 Nov 2009 14:23:55 -0000	1.3.2.1
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.3.2.2
@@ -1,18 +1,5 @@
 include ../../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 PACKAGE = PEAR-PHPUnit-Channel
 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/")



From cvs at kolab.org  Mon Nov  9 18:08:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:46 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_Socket Makefile,1.7.2.1,1.7.2.2 
Message-ID: <20091109170846.68E19600806@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Net_Socket

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Makefile	9 Nov 2009 14:23:55 -0000	1.7.2.1
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.7.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:08:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:46 +0100 (CET)
Subject: wilde: server/perl-ldap Makefile,1.3.2.1,1.3.2.2 
Message-ID: <20091109170846.BBA16600814@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/perl-ldap
In directory doto:/tmp/cvs-serv27852/perl-ldap

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/perl-ldap/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	9 Nov 2009 14:23:55 -0000	1.3.2.1
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.3.2.2
@@ -6,19 +6,6 @@
 VERSION = $(shell grep "%define[ ]*V_perl " *.spec | sed -e "s/.*V_perl \s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9a-z_]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(PKGVER).tar.gz
 EXTRA=cookie_parsing_error.patch sync_refresh_required.patch
 



From cvs at kolab.org  Mon Nov  9 18:08:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:46 +0100 (CET)
Subject: wilde: server/perl-kolab Makefile.PL,1.14.2.2,1.14.2.3 
Message-ID: <20091109170846.B6CA9600806@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile.PL 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -d -r1.14.2.2 -r1.14.2.3
--- Makefile.PL	9 Nov 2009 14:23:55 -0000	1.14.2.2
+++ Makefile.PL	9 Nov 2009 17:08:44 -0000	1.14.2.3
@@ -124,19 +124,6 @@
 	  cp \$\$ETC \$(DESTDIR)/$INSTALLETC;        \\
 	done
 
-ifeq \"x\$(RPM)\" \"x\"
-  RPM = \$(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq \"x\$(KOLABRPMSRC)\" \"x\"
-  KOLABRPMSRC = \$(KOLABDIR)/RPM/SRC
-endif
-ifeq \"x\$(KOLABRPMPKG)\" \"x\"
-  KOLABRPMPKG = \$(KOLABDIR)/RPM/PKG
-endif
-ifeq \"x\$(KOLABRPMTMP)\" \"x\"
-  KOLABRPMTMP = \$(KOLABDIR)/RPM/TMP
-endif
-
 ifeq \"x\$(PLATTAG)\" \"x\"
 	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(KOLABDIR:/%=%)
 endif



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/php Makefile,1.18.2.2,1.18.2.3 
Message-ID: <20091109170847.0BE2E600806@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- Makefile	9 Nov 2009 14:23:55 -0000	1.18.2.2
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.18.2.3
@@ -1,25 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 PACKAGE=php
 VERSION=5.2.8
 RELEASE=20081209
@@ -31,12 +11,12 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+$(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
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/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' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
@@ -45,18 +25,18 @@
 	--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'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 .PHONY: clean
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
 .PHONY: install
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Freebusy Makefile,1.6.2.3,1.6.2.4 
Message-ID: <20091109170847.B8B89600818@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv27852/php-kolab/Kolab_Freebusy

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/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	9 Nov 2009 14:23:56 -0000	1.6.2.3
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.6.2.4
@@ -4,23 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 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



From cvs at kolab.org  Mon Nov  9 18:08:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:46 +0100 (CET)
Subject: wilde: server/pear/PHPUnit Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170846.8808D600816@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PHPUnit
In directory doto:/tmp/cvs-serv27852/pear/PHPUnit

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PHPUnit/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	9 Nov 2009 14:23:55 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:44 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.phpunit.de/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Format Makefile,1.6.2.2,1.6.2.3 
Message-ID: <20091109170847.B6CCF600817@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv27852/php-kolab/Kolab_Format

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/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 14:23:56 -0000	1.6.2.2
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.6.2.3
@@ -1,30 +1,5 @@
 include ../../kolab.mk
 
-# Set the location of the rpm binary
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-# Set the location for rpm source package installations
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-
-# Set the location for rpm packages
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-
-# Set the location for the rpm temporary directory
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-# Determine the suffix for binary packages on this system
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 # Determine the staging area for collecting new source rpms
 ifeq "x$(STAGING)" "x"
   STAGING = ../../stage



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/php-smarty Makefile,1.8.2.1,1.8.2.2 
Message-ID: <20091109170847.CD796600816@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-smarty/Makefile,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- Makefile	9 Nov 2009 14:23:56 -0000	1.8.2.1
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.8.2.2
@@ -6,19 +6,6 @@
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 #SOURCE_0=http://www.smarty.net/distributions/$(NAME)-$(VERSION).tar.gz
 SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
 



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter Makefile,1.8.2.8,1.8.2.9 
Message-ID: <20091109170847.B4E0E600816@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.8
retrieving revision 1.8.2.9
diff -u -d -r1.8.2.8 -r1.8.2.9
--- Makefile	9 Nov 2009 14:23:55 -0000	1.8.2.8
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.8.2.9
@@ -4,23 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 EXTRA=ChangeLog issue3521.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml



From cvs at kolab.org  Mon Nov  9 18:08:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:48 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Server Makefile,1.6.2.2,1.6.2.3 
Message-ID: <20091109170848.1CB71600817@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Server
In directory doto:/tmp/cvs-serv27852/php-kolab/Kolab_Server

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/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 14:23:56 -0000	1.6.2.2
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.6.2.3
@@ -1,30 +1,5 @@
 include ../../kolab.mk
 
-# Set the location of the rpm binary
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-# Set the location for rpm source package installations
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-
-# Set the location for rpm packages
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-
-# Set the location for the rpm temporary directory
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-# Determine the suffix for binary packages on this system
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 # Determine the staging area for collecting new source rpms
 ifeq "x$(STAGING)" "x"
   STAGING = ../../stage



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Storage Makefile,1.6.2.1,1.6.2.2 
Message-ID: <20091109170847.C732D600819@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Makefile,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.1
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.6.2.2
@@ -4,23 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 



From cvs at kolab.org  Mon Nov  9 18:08:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:48 +0100 (CET)
Subject: wilde: server/sqlite Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170848.243A3600818@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/sqlite/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:56 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.2.2.2
@@ -7,19 +7,6 @@
 RELEASE = $(shell grep "^Release:" sqlite.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://www.sqlite.org/sqlite-$(VERSION2).tar.gz
 SOURCE_1=http://www.sqlite.org/sqlite-$(VERSION3).tar.gz
 



From cvs at kolab.org  Mon Nov  9 18:08:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:08:47 +0100 (CET)
Subject: wilde: server/postfix Makefile,1.19.2.2,1.19.2.3 
Message-ID: <20091109170847.DA07A600817@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- Makefile	9 Nov 2009 14:23:56 -0000	1.19.2.2
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.19.2.3
@@ -1,21 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
 PACKAGE=postfix
 VERSION=2.4.6
 RELEASE=20080101
@@ -23,17 +7,17 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile
+$(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 < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	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'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server/clamav Makefile,1.7.2.1,1.7.2.2 
Message-ID: <20091109170910.A508F600818@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Makefile	9 Nov 2009 14:23:50 -0000	1.7.2.1
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.7.2.2
@@ -5,19 +5,6 @@
 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/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz
 EXTRA=clamav.patch rc.clamav
 



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server kolab.mk,1.1.2.1,1.1.2.2 
Message-ID: <20091109170910.A621C60081B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab.mk 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: kolab.mk
===================================================================
RCS file: /kolabrepository/server/Attic/kolab.mk,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.mk	9 Nov 2009 14:23:50 -0000	1.1.2.1
+++ kolab.mk	9 Nov 2009 17:08:38 -0000	1.1.2.2
@@ -4,3 +4,28 @@
 ifeq ($(KOLABDIR),)
   $(error Could not determine KOLABDIR!)
 endif
+
+ifeq ($(RPM),)
+  RPM = $(KOLABDIR)/bin/openpkg rpm
+endif
+ifeq ($(KOLABRPMSRC),)
+  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
+endif
+ifeq ($(KOLABRPMPKG),)
+  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
+endif
+ifeq ($(KOLABRPMTMP),)
+  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
+endif
+ifeq ($(CURSRCDIR),)
+  CURSRCDIR = $(CURDIR)
+endif
+ifeq ($(KOLABPKGURI),)
+  KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
+endif
+ifeq ($(OPENPKGURI),)
+  OPENPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
+endif
+ifeq ($(PLATTAG),)
+  PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
+endif



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server/db Makefile,1.5.2.2,1.5.2.3 
Message-ID: <20091109170910.A52F760081A@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/db/Attic/Makefile,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- Makefile	9 Nov 2009 14:23:50 -0000	1.5.2.2
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.5.2.3
@@ -1,21 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
 PACKAGE=db
 VERSION=4.5.20.2
 RELEASE=20070628
@@ -23,17 +7,17 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile
+$(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 < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(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 $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server/gmp Makefile,1.1.2.2,1.1.2.3 
Message-ID: <20091109170910.C2D0160081D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/gmp/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	9 Nov 2009 14:23:50 -0000	1.1.2.2
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.1.2.3
@@ -1,21 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
 PACKAGE=gmp
 VERSION=4.2.2
 RELEASE=20080101
@@ -23,17 +7,17 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile
+$(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 < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(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 $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server/apache-php Makefile,1.8.2.2,1.8.2.3 
Message-ID: <20091109170910.A4DBF600816@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- Makefile	9 Nov 2009 14:23:50 -0000	1.8.2.2
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.8.2.3
@@ -1,25 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 PACKAGE=apache-php
 VERSION=5.2.8
 RELEASE=20081209
@@ -31,12 +11,12 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+$(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
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/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' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
@@ -46,18 +26,18 @@
 	--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
 	--define 'with_sqlite yes' --define 'with_spl yes'
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 .PHONY: clean
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
 .PHONY: install
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server/kolab-fbview Makefile,1.4.2.1,1.4.2.2 
Message-ID: <20091109170910.DBD8F600816@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/kolab-fbview
In directory doto:/tmp/cvs-serv27852/kolab-fbview

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile	9 Nov 2009 14:23:50 -0000	1.4.2.1
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.4.2.2
@@ -1,18 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
 YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
 MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")



From cvs at kolab.org  Mon Nov  9 18:09:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:10 +0100 (CET)
Subject: wilde: server/imapd Makefile,1.40.2.4,1.40.2.5 
Message-ID: <20091109170910.C55A0600820@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.40.2.4
retrieving revision 1.40.2.5
diff -u -d -r1.40.2.4 -r1.40.2.5
--- Makefile	9 Nov 2009 14:23:50 -0000	1.40.2.4
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.40.2.5
@@ -1,25 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 PACKAGE=imapd
 VERSION=2.3.13
 RELEASE=20081020
@@ -37,24 +17,24 @@
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+$(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
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 .PHONY: clean
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
 .PHONY: install
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/kolab-webadmin Makefile,1.17.2.1,1.17.2.2 
Message-ID: <20091109170911.10949600816@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- Makefile	9 Nov 2009 14:23:50 -0000	1.17.2.1
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.17.2.2
@@ -5,19 +5,6 @@
 RELEASE:=`date '+%Y%m%d'`
 KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\1/')
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 all:
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/kolab-webclient Makefile,1.6.2.1,1.6.2.2 
Message-ID: <20091109170911.157E5600818@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.6.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.6.2.2
@@ -1,22 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
 YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
 MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/kolabd Makefile,1.18.2.1,1.18.2.2 
Message-ID: <20091109170911.639CC600816@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.18.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.18.2.2
@@ -9,23 +9,6 @@
 
 MAKETAR = dist
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/openpkg Makefile,1.1.2.3,1.1.2.4 
Message-ID: <20091109170911.6876F60081A@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openpkg/Makefile,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- Makefile	9 Nov 2009 14:23:51 -0000	1.1.2.3
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.1.2.4
@@ -1,21 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
 PACKAGE=openpkg
 VERSION=20071227
 RELEASE=20071227
@@ -28,12 +12,12 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch Makefile $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch -p1 < $(KOLABCVSDIR)/kolab.patch && rm $(PACKAGE2)-*.tar.gz && cp ../$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz ../$(PACKAGE2)/$(PACKAGE2).patch . && ./openpkg.boot -s
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh $(KOLABCVSDIR)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch -p1 < $(CURSRCDIR)/kolab.patch && rm $(PACKAGE2)-*.tar.gz && cp ../$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz ../$(PACKAGE2)/$(PACKAGE2).patch . && ./openpkg.boot -s
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -42,7 +26,7 @@
 	wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
 
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/
 
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/openldap Makefile,1.24.2.1,1.24.2.2 
Message-ID: <20091109170911.66087600818@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -d -r1.24.2.1 -r1.24.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.24.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.24.2.2
@@ -6,19 +6,6 @@
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=ftp://ftp.openldap.org/pub/openldap/openldap-release/$(NAME)-$(VERSION).tgz
 EXTRA=fsl.openldap openldap.patch openldap.pc rc.openldap
 



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/pear/Horde_Argv Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170911.DB387600818@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Argv
In directory doto:/tmp/cvs-serv27852/pear/Horde_Argv

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Argv/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	9 Nov 2009 14:23:51 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.1.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/pear/Horde_Browser Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170911.E29A060081B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Browser
In directory doto:/tmp/cvs-serv27852/pear/Horde_Browser

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Browser/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.2.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/pear/Horde_CLI Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170911.E61E260081D@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_CLI
In directory doto:/tmp/cvs-serv27852/pear/Horde_CLI

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_CLI/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/pear/Horde_Auth Makefile,1.4.2.1,1.4.2.2 
Message-ID: <20091109170911.E013360081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Auth
In directory doto:/tmp/cvs-serv27852/pear/Horde_Auth

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.4.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.4.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 



From cvs at kolab.org  Mon Nov  9 18:09:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:11 +0100 (CET)
Subject: wilde: server/pear/Horde_Cache Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170911.E76D0600820@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Cache
In directory doto:/tmp/cvs-serv27852/pear/Horde_Cache

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Cache/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:12 +0100 (CET)
Subject: wilde: server/pear/Horde_Cipher Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170912.9153E60081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Cipher
In directory doto:/tmp/cvs-serv27852/pear/Horde_Cipher

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Cipher/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:12 +0100 (CET)
Subject: wilde: server/pear/Horde_DOM Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170912.CCA4E60081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_DOM
In directory doto:/tmp/cvs-serv27852/pear/Horde_DOM

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:52 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.2.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:12 +0100 (CET)
Subject: wilde: server/pear/Horde_Group Makefile,1.3.2.1,1.3.2.2 
Message-ID: <20091109170912.E100C600824@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Group
In directory doto:/tmp/cvs-serv27852/pear/Horde_Group

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	9 Nov 2009 14:23:52 -0000	1.3.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.3.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:12 +0100 (CET)
Subject: wilde: server/pear/Horde_DataTree Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170912.CD4FD600821@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_DataTree
In directory doto:/tmp/cvs-serv27852/pear/Horde_DataTree

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DataTree/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:13 +0100 (CET)
Subject: wilde: server/pear/Horde_History Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170913.2494B600816@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_History
In directory doto:/tmp/cvs-serv27852/pear/Horde_History

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_History/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:13 +0100 (CET)
Subject: wilde: server/pear/Horde_LDAP Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170913.68D29600816@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_LDAP
In directory doto:/tmp/cvs-serv27852/pear/Horde_LDAP

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_LDAP/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:41 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:12 +0100 (CET)
Subject: wilde: server/pear/Horde_Framework Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170912.DF0A1600821@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Framework
In directory doto:/tmp/cvs-serv27852/pear/Horde_Framework

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:12 +0100 (CET)
Subject: wilde: server/pear/Horde_Date Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170912.DD5D560081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Date
In directory doto:/tmp/cvs-serv27852/pear/Horde_Date

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Date/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:40 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 #SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
 



From cvs at kolab.org  Mon Nov  9 18:09:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:13 +0100 (CET)
Subject: wilde: server/pear/Horde_Notification Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170913.C801660082A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Notification
In directory doto:/tmp/cvs-serv27852/pear/Horde_Notification

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Notification/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:41 -0000	1.1.2.2
@@ -4,23 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 



From cvs at kolab.org  Mon Nov  9 18:09:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:13 +0100 (CET)
Subject: wilde: server/pear/Horde_Perms Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170913.CD03860082B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Perms
In directory doto:/tmp/cvs-serv27852/pear/Horde_Perms

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Perms/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	9 Nov 2009 14:23:53 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:41 -0000	1.1.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:13 +0100 (CET)
Subject: wilde: server/pear/Horde_MIME Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170913.C08F7600827@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_MIME
In directory doto:/tmp/cvs-serv27852/pear/Horde_MIME

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/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	9 Nov 2009 14:23:52 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:41 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/Horde_Prefs Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170914.39E5D60081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Prefs
In directory doto:/tmp/cvs-serv27852/pear/Horde_Prefs

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Prefs/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	9 Nov 2009 14:23:53 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:41 -0000	1.1.2.2
@@ -4,23 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
 



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/Horde_Serialize Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170914.B670D60081D@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Serialize
In directory doto:/tmp/cvs-serv27852/pear/Horde_Serialize

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Serialize/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	9 Nov 2009 14:23:53 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:13 +0100 (CET)
Subject: wilde: server/pear/Horde_NLS Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170913.C1549600828@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_NLS
In directory doto:/tmp/cvs-serv27852/pear/Horde_NLS

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_NLS/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:52 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:41 -0000	1.2.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/Horde_Secret Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170914.4FDBC60081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Secret
In directory doto:/tmp/cvs-serv27852/pear/Horde_Secret

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Secret/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	9 Nov 2009 14:23:53 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/Horde_iCalendar Makefile,1.4.2.1,1.4.2.2 
Message-ID: <20091109170914.CB55760082A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_iCalendar
In directory doto:/tmp/cvs-serv27852/pear/Horde_iCalendar

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile	9 Nov 2009 14:23:53 -0000	1.4.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.4.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 EXTRA=ChangeLog HK-GW-iCalendar-Quoted_parameters.patch package.xml
 



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/Horde_SessionObjects Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170914.C9FA3600827@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_SessionObjects
In directory doto:/tmp/cvs-serv27852/pear/Horde_SessionObjects

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SessionObjects/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	9 Nov 2009 14:23:53 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.1.2.2
@@ -4,19 +4,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/PEAR-Date Makefile,1.7.2.1,1.7.2.2 
Message-ID: <20091109170914.E8659600828@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Date

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.7.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/PEAR-Auth_SASL Makefile,1.7.2.1,1.7.2.2 
Message-ID: <20091109170914.DD8A3600827@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Auth_SASL

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.7.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:14 +0100 (CET)
Subject: wilde: server/pear/Horde_Util Makefile,1.4.2.1,1.4.2.2 
Message-ID: <20091109170914.CAAB6600828@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/Horde_Util
In directory doto:/tmp/cvs-serv27852/pear/Horde_Util

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile	9 Nov 2009 14:23:53 -0000	1.4.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.4.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-Horde-Channel Makefile,1.3.2.1,1.3.2.2 
Message-ID: <20091109170915.6B32F60081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Horde-Channel
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Horde-Channel

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.3.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.3.2.2
@@ -1,18 +1,5 @@
 include ../../kolab.mk
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 PACKAGE = PEAR-Horde-Channel
 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/")



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-Log Makefile,1.7.2.1,1.7.2.2 
Message-ID: <20091109170915.8113860081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Log

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.7.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_LDAP2 Makefile,1.3.2.2,1.3.2.3 
Message-ID: <20091109170915.986F1600821@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_LDAP2
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Net_LDAP2

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_LDAP2/Makefile,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- Makefile	9 Nov 2009 14:23:54 -0000	1.3.2.2
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.3.2.3
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9RC.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-Mail Makefile,1.7.2.1,1.7.2.2 
Message-ID: <20091109170915.85699600821@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Mail

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.7.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.7.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-Mail-mimeDecode Makefile,1.1.2.1,1.1.2.2 
Message-ID: <20091109170915.97BE260081A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Mail-mimeDecode
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Mail-mimeDecode

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail-mimeDecode/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	9 Nov 2009 14:23:54 -0000	1.1.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.1.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:16 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_SMTP Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170916.2AF0B60081D@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_SMTP
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Net_SMTP

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_SMTP/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:55 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.2.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-Net_LMTP Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170915.D1A74600816@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-Net_LMTP
In directory doto:/tmp/cvs-serv27852/pear/PEAR-Net_LMTP

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_LMTP/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:55 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:43 -0000	1.2.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:09:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:09:15 +0100 (CET)
Subject: wilde: server/pear/PEAR-HTTP_Request Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20091109170915.2F373600816@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/pear/PEAR-HTTP_Request
In directory doto:/tmp/cvs-serv27852/pear/PEAR-HTTP_Request

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-HTTP_Request/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	9 Nov 2009 14:23:54 -0000	1.2.2.1
+++ Makefile	9 Nov 2009 17:08:42 -0000	1.2.2.2
@@ -5,19 +5,6 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([A-Za-z0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
 .PHONY: all



From cvs at kolab.org  Mon Nov  9 18:33:56 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 18:33:56 +0100 (CET)
Subject: wilde: server Makefile,1.76.2.2,1.76.2.3 
Message-ID: <20091109173356.614A3600806@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Removed broken target `files'.
This copied (currently two) additional files to the stage dir.
As it was broken and did never make stage into an complete
distribution anyway I removed it in mutual agreement with Thoma AH for
now.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.76.2.2
retrieving revision 1.76.2.3
diff -u -d -r1.76.2.2 -r1.76.2.3
--- Makefile	9 Nov 2009 14:23:50 -0000	1.76.2.2
+++ Makefile	9 Nov 2009 17:33:54 -0000	1.76.2.3
@@ -64,9 +64,6 @@
                php-kolab/Kolab_Freebusy \
                php-kolab/Kolab_Filter   \
 
-BASE_FILES=install-kolab.sh \
-           README.1st
-
 # These are the packages that already provide a "make install"
 # procedure that will allow to update packages from CVS.
 UPDATES=imapd                   \
@@ -89,7 +86,7 @@
               $(KOLABDIR)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
 
 .PHONY: dist
-dist: stage base kolab pear files
+dist: stage base kolab pear
 
 stage:
 	mkdir stage
@@ -117,11 +114,6 @@
 	do                                              \
 	  make -C $$PKG dist || exit $$?;               \
 	done
-
-.PHONY: files
-files: stage
-	cp $(BASE_FILES) stage/
-	echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
 
 .PHONY: clean
 clean: clean-base clean-kolab clean-pear clean-stage



From cvs at kolab.org  Mon Nov  9 23:52:05 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 23:52:05 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.11,
	1.10.2.12 kolab-webclient.spec, 1.23.2.16, 1.23.2.17 
Message-ID: <20091109225205.B7136600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
Log Message:
 kolab/issue3856 (IMP/DIMP folder navigator does not allow creating/deleting/... mail folders)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.11
retrieving revision 1.10.2.12
diff -u -d -r1.10.2.11 -r1.10.2.12
--- ChangeLog	5 Nov 2009 11:14:08 -0000	1.10.2.11
+++ ChangeLog	9 Nov 2009 22:52:03 -0000	1.10.2.12
@@ -1,3 +1,8 @@
+2009-11-09  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: kolab/issue3856 (IMP/DIMP folder navigator
+	does not allow creating/deleting/... mail folders)
+
 2009-11-05  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue3844 (New user preference to

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.16
retrieving revision 1.23.2.17
diff -u -d -r1.23.2.16 -r1.23.2.17
--- kolab-webclient.spec	5 Nov 2009 11:14:08 -0000	1.23.2.16
+++ kolab-webclient.spec	9 Nov 2009 22:52:03 -0000	1.23.2.17
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 11
-%define         V_day   05
+%define         V_day   09
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Mon Nov  9 23:52:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 23:52:06 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/merges
	t_dimp_H_GW_FoldersView.diff, 1.1.4.2, 1.1.4.3 
Message-ID: <20091109225206.3F0E7600806@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv4916/patches/horde-webmail/1.2.0/merges

Modified Files:
      Tag: kolab_2_2_branch
	t_dimp_H_GW_FoldersView.diff 
Log Message:
 kolab/issue3856 (IMP/DIMP folder navigator does not allow creating/deleting/... mail folders)

Index: t_dimp_H_GW_FoldersView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/t_dimp_H_GW_FoldersView.diff,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- t_dimp_H_GW_FoldersView.diff	13 Oct 2009 15:58:51 -0000	1.1.4.2
+++ t_dimp_H_GW_FoldersView.diff	9 Nov 2009 22:52:04 -0000	1.1.4.3
@@ -102,29 +102,35 @@
  
      $dir2 = _image($val, null, 'folder');
 diff --git a/horde-webmail/imp/templates/folders/actions.html b/horde-webmail/imp/templates/folders/actions.html
-index f882a82..8e39b8a 100644
+index f882a82..619e4de 100644
 --- a/horde-webmail/imp/templates/folders/actions.html
 +++ b/horde-webmail/imp/templates/folders/actions.html
 @@ -12,12 +12,14 @@
      <select id="action_choose<tag:id />">
       <option selected="selected"><gettext>Choose Action</gettext></option>
       <option value="">--------------------</option>
-+<if:view_imp>
++<if:imp_view>
  <if:create_folder>
       <option value="create_folder"><gettext>Create</gettext></option>
  </if:create_folder>
       <option value="rename_folder"><gettext>Rename</gettext></option>
       <option value="delete_folder_confirm"><gettext>Delete</gettext></option>
       <option value="folders_empty_mailbox_confirm"><gettext>Empty</gettext></option>
-+</if:view_imp>
++</if:imp_view>
  <if:notrash>
       <option value="expunge_folder"><gettext>Purge</gettext></option>
  </if:notrash>
 -- 
-tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (a6f8c8b..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit c16643e792c3b185bc74bef7a600c06857b19406
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Nov 9 23:16:11 2009 +0100
+
+    Fix tag name from view_imp to imp_view.
 
 commit 93403a869ff14d7868d4cc9c4687ea1270e3c225
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Mon Nov  9 23:52:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 23:52:06 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.16, 1.32.2.17 
Message-ID: <20091109225206.D2FD7600814@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv4916/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3856 (IMP/DIMP folder navigator does not allow creating/deleting/... mail folders)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.16
retrieving revision 1.32.2.17
diff -u -d -r1.32.2.16 -r1.32.2.17
--- horde-webmail-1.2.0_kolab_openpkg.patch	5 Nov 2009 11:14:08 -0000	1.32.2.16
+++ horde-webmail-1.2.0_kolab_openpkg.patch	9 Nov 2009 22:52:03 -0000	1.32.2.17
@@ -28123,29 +28123,35 @@
  
      $dir2 = _image($val, null, 'folder');
 diff --git a/horde-webmail/imp/templates/folders/actions.html b/horde-webmail/imp/templates/folders/actions.html
-index f882a82..8e39b8a 100644
+index f882a82..619e4de 100644
 --- a/horde-webmail/imp/templates/folders/actions.html
 +++ b/horde-webmail/imp/templates/folders/actions.html
 @@ -12,12 +12,14 @@
      <select id="action_choose<tag:id />">
       <option selected="selected"><gettext>Choose Action</gettext></option>
       <option value="">--------------------</option>
-+<if:view_imp>
++<if:imp_view>
  <if:create_folder>
       <option value="create_folder"><gettext>Create</gettext></option>
  </if:create_folder>
       <option value="rename_folder"><gettext>Rename</gettext></option>
       <option value="delete_folder_confirm"><gettext>Delete</gettext></option>
       <option value="folders_empty_mailbox_confirm"><gettext>Empty</gettext></option>
-+</if:view_imp>
++</if:imp_view>
  <if:notrash>
       <option value="expunge_folder"><gettext>Purge</gettext></option>
  </if:notrash>
 -- 
-tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (a6f8c8b..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit c16643e792c3b185bc74bef7a600c06857b19406
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Mon Nov 9 23:16:11 2009 +0100
+
+    Fix tag name from view_imp to imp_view.
 
 commit 93403a869ff14d7868d4cc9c4687ea1270e3c225
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Mon Nov  9 23:52:05 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Nov 2009 23:52:05 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.60,1.398.2.61 
Message-ID: <20091109225205.B7277600814@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3856 (IMP/DIMP folder navigator does not allow creating/deleting/... mail folders)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.60
retrieving revision 1.398.2.61
diff -u -d -r1.398.2.60 -r1.398.2.61
--- release-notes.txt	7 Nov 2009 20:46:38 -0000	1.398.2.60
+++ release-notes.txt	9 Nov 2009 22:52:03 -0000	1.398.2.61
@@ -85,6 +85,8 @@
 	kolab/issue3555 (unable to save filter settings more than once)
 	kolab/issue3844 (New user preference to specify order of date
 	                 input fields)
+	kolab/issue3856 (IMP/DIMP folder navigator does not allow
+                         creating/deleting/... mail folders)
 
     - openpkg-20071227-20071227_kolab2
 



From cvs at kolab.org  Tue Nov 10 10:59:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 10:59:09 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.61,1.398.2.62 
Message-ID: <20091110095909.2F79660081A@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident) and upstream http://bugs.horde.org/ticket/8546

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.61
retrieving revision 1.398.2.62
diff -u -d -r1.398.2.61 -r1.398.2.62
--- release-notes.txt	9 Nov 2009 22:52:03 -0000	1.398.2.61
+++ release-notes.txt	10 Nov 2009 09:59:06 -0000	1.398.2.62
@@ -85,6 +85,8 @@
 	kolab/issue3555 (unable to save filter settings more than once)
 	kolab/issue3844 (New user preference to specify order of date
 	                 input fields)
+	kolab/issue3846 (fix recurring events that are counted per week
+	                 and not per incident)
 	kolab/issue3856 (IMP/DIMP folder navigator does not allow
                          creating/deleting/... mail folders)
 



From cvs at kolab.org  Tue Nov 10 10:59:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 10:59:09 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff, NONE,
	1.1.2.1 series, 1.5.2.9, 1.5.2.10 
Message-ID: <20091110095909.283CD600819@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv4824/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident) and upstream http://bugs.horde.org/ticket/8546

--- NEW FILE: t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/kronolith/HK/GW/FixWeeklyRecurringEvents

kronolith: fix recurring events that are counted per week and not per incident

horde counts recurring events per week and not per incident. This gets a
problem if a recurring event with more than one incident per week is defined.
A recurring event with incidents on monday and friday with 3 incidents overall
is displayed correctly with 3 incidents over one and a half week in kontact
and Outlook. Without this patch horde displays 6 incidents over 3 weeks.

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

---
 horde-webmail/kronolith/lib/Recurrence.php  |   57 ++++++++++++++++++++++++--
 horde-webmail/lib/Horde/Date/Recurrence.php |   57 ++++++++++++++++++++++++--
 2 files changed, 104 insertions(+), 10 deletions(-)

diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
index f22351d..5aa5960 100644
--- a/horde-webmail/kronolith/lib/Recurrence.php
+++ b/horde-webmail/kronolith/lib/Recurrence.php
@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
 
             $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                         $after_week->mday, $after_week->month, $after_week->year);
-            $recur = $diff + ($diff % ($this->recurInterval * 7));
-            if ($this->recurCount &&
-                ceil($recur / 7) / $this->recurInterval >= $this->recurCount) {
-                return false;
+            $interval = $this->recurInterval * 7;
+            $repeats = floor($diff / $interval);
+            if ($diff % $interval < 7) {
+                $recur = $diff;
+            } else {
+                /**
+                 * If the after_week is not in the first week interval the
+                 * search needs to skip ahead a complete interval. The way it is
+                 * calculated here means that an event that occurs every second
+                 * week on Monday and Wednesday with the event actually starting
+                 * on Tuesday or Wednesday will only have one incidence in the
+                 * first week.
+                 */
+                $recur = $interval * ($repeats + 1);
             }
+
+            if ($this->hasRecurCount()) {
+                $recurrences = 0;
+                /**
+                 * Correct the number of recurrences by the number of events
+                 * that lay between the start of the start week and the
+                 * recurrence start.
+                 */
+                $next = new Horde_Date($start_week);
+                while ($next->compareDateTime($this->start) < 0) {
+                    if ($this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
+                        $recurrences--;
+                    }
+                    ++$next->mday;
+                }
+                if ($repeats > 0) {
+                    $weekdays = $this->recurData;
+                    $total_recurrences_per_week = 0;
+                    while ($weekdays > 0) {
+                        if ($weekdays % 2) {
+                            $total_recurrences_per_week++;
+                        }
+                        $weekdays = ($weekdays - ($weekdays % 2)) / 2;
+                    }
+                    $recurrences += $total_recurrences_per_week * $repeats;
+                }
+            }
+
             $next = $start_week;
-            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
+            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
             $next = new Horde_Date($next);
             while ($next->compareDateTime($after) < 0 &&
                    $next->compareDateTime($after_week_end) < 0) {
                 ++$next->mday;
                 $next->correct();
+                if ($this->hasRecurCount()
+                    && $next->compareDateTime($after) < 0
+                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
+                    $recurrences++;
+                }
+            }
+            if ($this->hasRecurCount() &&
+                $recurrences >= $this->recurCount) {
+                return false;
             }
             if (!$this->hasRecurEnd() ||
                 $next->compareDateTime($this->recurEnd) <= 0) {
diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
index 9dbf057..e21193f 100644
--- a/horde-webmail/lib/Horde/Date/Recurrence.php
+++ b/horde-webmail/lib/Horde/Date/Recurrence.php
@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
 
             $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                         $after_week->mday, $after_week->month, $after_week->year);
-            $recur = $diff + ($diff % ($this->recurInterval * 7));
-            if ($this->recurCount &&
-                ceil($recur / 7) / $this->recurInterval >= $this->recurCount) {
-                return false;
+            $interval = $this->recurInterval * 7;
+            $repeats = floor($diff / $interval);
+            if ($diff % $interval < 7) {
+                $recur = $diff;
+            } else {
+                /**
+                 * If the after_week is not in the first week interval the
+                 * search needs to skip ahead a complete interval. The way it is
+                 * calculated here means that an event that occurs every second
+                 * week on Monday and Wednesday with the event actually starting
+                 * on Tuesday or Wednesday will only have one incidence in the
+                 * first week.
+                 */
+                $recur = $interval * ($repeats + 1);
             }
+
+            if ($this->hasRecurCount()) {
+                $recurrences = 0;
+                /**
+                 * Correct the number of recurrences by the number of events
+                 * that lay between the start of the start week and the
+                 * recurrence start.
+                 */
+                $next = new Horde_Date($start_week);
+                while ($next->compareDateTime($this->start) < 0) {
+                    if ($this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
+                        $recurrences--;
+                    }
+                    ++$next->mday;
+                }
+                if ($repeats > 0) {
+                    $weekdays = $this->recurData;
+                    $total_recurrences_per_week = 0;
+                    while ($weekdays > 0) {
+                        if ($weekdays % 2) {
+                            $total_recurrences_per_week++;
+                        }
+                        $weekdays = ($weekdays - ($weekdays % 2)) / 2;
+                    }
+                    $recurrences += $total_recurrences_per_week * $repeats;
+                }
+            }
+
             $next = $start_week;
-            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
+            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
             $next = new Horde_Date($next);
             while ($next->compareDateTime($after) < 0 &&
                    $next->compareDateTime($after_week_end) < 0) {
                 ++$next->mday;
                 $next->correct();
+                if ($this->hasRecurCount()
+                    && $next->compareDateTime($after) < 0
+                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
+                    $recurrences++;
+                }
+            }
+            if ($this->hasRecurCount() &&
+                $recurrences >= $this->recurCount) {
+                return false;
             }
             if (!$this->hasRecurEnd() ||
                 $next->compareDateTime($this->recurEnd) <= 0) {
-- 
tg: (01f4e60..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
-- 
TOPGIT patch commit log
=======================

commit ecde0d9b33f53d7ed3a3d5bdd358118213d4abe1
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Nov 10 10:38:20 2009 +0100

    Another fix for another corner case.

commit 3b0550f0c84354d9210fa097397af9cd424d8c35
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Nov 10 09:46:38 2009 +0100

    Fix another problem found when testing recurrences with multiple incidences per week.

commit c5b9c97a29db689afadf411fa2eacce06b3e9022
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Nov 10 08:09:47 2009 +0100

    Remove stray patch file.

commit 1d1005e3b0e81a0b74edaca7b242919e8f79336f
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Nov 10 07:25:22 2009 +0100

     kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -d -r1.5.2.9 -r1.5.2.10
--- series	5 Nov 2009 11:14:09 -0000	1.5.2.9
+++ series	10 Nov 2009 09:59:07 -0000	1.5.2.10
@@ -74,3 +74,4 @@
 t_kronolith_HK_GW_AnonymousiCalDownload.diff -p1
 t_kronolith_HK_GW_ExportEventList.diff -p1
 t_kronolith_HK_UV_dateInputFieldOrder.diff -p1
+t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff -p1



From cvs at kolab.org  Tue Nov 10 10:59:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 10:59:09 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.12,
	1.10.2.13 kolab-webclient.spec, 1.23.2.17, 1.23.2.18 
Message-ID: <20091110095909.32D88600819@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident) and upstream http://bugs.horde.org/ticket/8546

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.12
retrieving revision 1.10.2.13
diff -u -d -r1.10.2.12 -r1.10.2.13
--- ChangeLog	9 Nov 2009 22:52:03 -0000	1.10.2.12
+++ ChangeLog	10 Nov 2009 09:59:07 -0000	1.10.2.13
@@ -1,3 +1,8 @@
+2009-11-10  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that
+	are counted per week and not per incident)
+
 2009-11-09  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue3856 (IMP/DIMP folder navigator

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.17
retrieving revision 1.23.2.18
diff -u -d -r1.23.2.17 -r1.23.2.18
--- kolab-webclient.spec	9 Nov 2009 22:52:03 -0000	1.23.2.17
+++ kolab-webclient.spec	10 Nov 2009 09:59:07 -0000	1.23.2.18
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 11
-%define         V_day   09
+%define         V_day   10
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Tue Nov 10 10:59:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 10:59:10 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.17, 1.32.2.18 
Message-ID: <20091110095910.888AD600819@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv4824/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident) and upstream http://bugs.horde.org/ticket/8546

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.17
retrieving revision 1.32.2.18
diff -u -d -r1.32.2.17 -r1.32.2.18
--- horde-webmail-1.2.0_kolab_openpkg.patch	9 Nov 2009 22:52:03 -0000	1.32.2.17
+++ horde-webmail-1.2.0_kolab_openpkg.patch	10 Nov 2009 09:59:07 -0000	1.32.2.18
@@ -27765,6 +27765,203 @@
 Date:   Thu Nov 5 09:26:25 2009 +0100
 
     Imported patch from kolab/issue3844 (New user preference to specify order of date input fields)
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/kronolith/HK/GW/FixWeeklyRecurringEvents
+
+kronolith: fix recurring events that are counted per week and not per incident
+
+horde counts recurring events per week and not per incident. This gets a
+problem if a recurring event with more than one incident per week is defined.
+A recurring event with incidents on monday and friday with 3 incidents overall
+is displayed correctly with 3 incidents over one and a half week in kontact
+and Outlook. Without this patch horde displays 6 incidents over 3 weeks.
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/kronolith/lib/Recurrence.php  |   57 ++++++++++++++++++++++++--
+ horde-webmail/lib/Horde/Date/Recurrence.php |   57 ++++++++++++++++++++++++--
+ 2 files changed, 104 insertions(+), 10 deletions(-)
+
+diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
+index f22351d..5aa5960 100644
+--- a/horde-webmail/kronolith/lib/Recurrence.php
++++ b/horde-webmail/kronolith/lib/Recurrence.php
+@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+ 
+             $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
+                                         $after_week->mday, $after_week->month, $after_week->year);
+-            $recur = $diff + ($diff % ($this->recurInterval * 7));
+-            if ($this->recurCount &&
+-                ceil($recur / 7) / $this->recurInterval >= $this->recurCount) {
+-                return false;
++            $interval = $this->recurInterval * 7;
++            $repeats = floor($diff / $interval);
++            if ($diff % $interval < 7) {
++                $recur = $diff;
++            } else {
++                /**
++                 * If the after_week is not in the first week interval the
++                 * search needs to skip ahead a complete interval. The way it is
++                 * calculated here means that an event that occurs every second
++                 * week on Monday and Wednesday with the event actually starting
++                 * on Tuesday or Wednesday will only have one incidence in the
++                 * first week.
++                 */
++                $recur = $interval * ($repeats + 1);
+             }
++
++            if ($this->hasRecurCount()) {
++                $recurrences = 0;
++                /**
++                 * Correct the number of recurrences by the number of events
++                 * that lay between the start of the start week and the
++                 * recurrence start.
++                 */
++                $next = new Horde_Date($start_week);
++                while ($next->compareDateTime($this->start) < 0) {
++                    if ($this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
++                        $recurrences--;
++                    }
++                    ++$next->mday;
++                }
++                if ($repeats > 0) {
++                    $weekdays = $this->recurData;
++                    $total_recurrences_per_week = 0;
++                    while ($weekdays > 0) {
++                        if ($weekdays % 2) {
++                            $total_recurrences_per_week++;
++                        }
++                        $weekdays = ($weekdays - ($weekdays % 2)) / 2;
++                    }
++                    $recurrences += $total_recurrences_per_week * $repeats;
++                }
++            }
++
+             $next = $start_week;
+-            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
++            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
+             $next = new Horde_Date($next);
+             while ($next->compareDateTime($after) < 0 &&
+                    $next->compareDateTime($after_week_end) < 0) {
+                 ++$next->mday;
+                 $next->correct();
++                if ($this->hasRecurCount()
++                    && $next->compareDateTime($after) < 0
++                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
++                    $recurrences++;
++                }
++            }
++            if ($this->hasRecurCount() &&
++                $recurrences >= $this->recurCount) {
++                return false;
+             }
+             if (!$this->hasRecurEnd() ||
+                 $next->compareDateTime($this->recurEnd) <= 0) {
+diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
+index 9dbf057..e21193f 100644
+--- a/horde-webmail/lib/Horde/Date/Recurrence.php
++++ b/horde-webmail/lib/Horde/Date/Recurrence.php
+@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+ 
+             $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
+                                         $after_week->mday, $after_week->month, $after_week->year);
+-            $recur = $diff + ($diff % ($this->recurInterval * 7));
+-            if ($this->recurCount &&
+-                ceil($recur / 7) / $this->recurInterval >= $this->recurCount) {
+-                return false;
++            $interval = $this->recurInterval * 7;
++            $repeats = floor($diff / $interval);
++            if ($diff % $interval < 7) {
++                $recur = $diff;
++            } else {
++                /**
++                 * If the after_week is not in the first week interval the
++                 * search needs to skip ahead a complete interval. The way it is
++                 * calculated here means that an event that occurs every second
++                 * week on Monday and Wednesday with the event actually starting
++                 * on Tuesday or Wednesday will only have one incidence in the
++                 * first week.
++                 */
++                $recur = $interval * ($repeats + 1);
+             }
++
++            if ($this->hasRecurCount()) {
++                $recurrences = 0;
++                /**
++                 * Correct the number of recurrences by the number of events
++                 * that lay between the start of the start week and the
++                 * recurrence start.
++                 */
++                $next = new Horde_Date($start_week);
++                while ($next->compareDateTime($this->start) < 0) {
++                    if ($this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
++                        $recurrences--;
++                    }
++                    ++$next->mday;
++                }
++                if ($repeats > 0) {
++                    $weekdays = $this->recurData;
++                    $total_recurrences_per_week = 0;
++                    while ($weekdays > 0) {
++                        if ($weekdays % 2) {
++                            $total_recurrences_per_week++;
++                        }
++                        $weekdays = ($weekdays - ($weekdays % 2)) / 2;
++                    }
++                    $recurrences += $total_recurrences_per_week * $repeats;
++                }
++            }
++
+             $next = $start_week;
+-            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
++            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
+             $next = new Horde_Date($next);
+             while ($next->compareDateTime($after) < 0 &&
+                    $next->compareDateTime($after_week_end) < 0) {
+                 ++$next->mday;
+                 $next->correct();
++                if ($this->hasRecurCount()
++                    && $next->compareDateTime($after) < 0
++                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
++                    $recurrences++;
++                }
++            }
++            if ($this->hasRecurCount() &&
++                $recurrences >= $this->recurCount) {
++                return false;
+             }
+             if (!$this->hasRecurEnd() ||
+                 $next->compareDateTime($this->recurEnd) <= 0) {
+-- 
+tg: (01f4e60..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit ecde0d9b33f53d7ed3a3d5bdd358118213d4abe1
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Tue Nov 10 10:38:20 2009 +0100
+
+    Another fix for another corner case.
+
+commit 3b0550f0c84354d9210fa097397af9cd424d8c35
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Tue Nov 10 09:46:38 2009 +0100
+
+    Fix another problem found when testing recurrences with multiple incidences per week.
+
+commit c5b9c97a29db689afadf411fa2eacce06b3e9022
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Tue Nov 10 08:09:47 2009 +0100
+
+    Remove stray patch file.
+
+commit 1d1005e3b0e81a0b74edaca7b242919e8f79336f
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Tue Nov 10 07:25:22 2009 +0100
+
+     kolab/issue3846 (fix recurring events that are counted per week and not per incident)
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Tue Nov 10 17:36:34 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 17:36:34 +0100 (CET)
Subject: gunnar: server/pear/Horde_Controller .cvsignore, 1.2, NONE ChangeLog,
	1.1, NONE Makefile, 1.1, NONE package.info, 1.2, NONE 
Message-ID: <20091110163634.7175D600814@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Controller
In directory doto:/tmp/cvs-serv19869/Horde_Controller

Removed Files:
	.cvsignore ChangeLog Makefile package.info 
Log Message:
These are Horde4 packages remove them for now.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- package.info DELETED ---



From cvs at kolab.org  Tue Nov 10 17:36:34 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 17:36:34 +0100 (CET)
Subject: gunnar: server/pear/Horde_Autoloader .cvsignore, 1.3, NONE ChangeLog,
	1.2, NONE Makefile, 1.2, NONE package.info, 1.2, NONE 
Message-ID: <20091110163634.73A5A600816@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Autoloader
In directory doto:/tmp/cvs-serv19869/Horde_Autoloader

Removed Files:
	.cvsignore ChangeLog Makefile package.info 
Log Message:
These are Horde4 packages remove them for now.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- package.info DELETED ---



From cvs at kolab.org  Tue Nov 10 18:09:00 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 18:09:00 +0100 (CET)
Subject: gunnar: server/pear/Horde_MIME package.info, NONE, 1.1 ChangeLog, 1.1,
	1.2 Makefile, 1.1, 1.2 Horde_MIME.spec, 1.4, NONE 
Message-ID: <20091110170900.19C14600806@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_MIME
In directory doto:/tmp/cvs-serv21405

Modified Files:
	ChangeLog Makefile 
Added Files:
	package.info 
Removed Files:
	Horde_MIME.spec 
Log Message:
Convert to new packaging style.

--- NEW FILE: package.info ---
# The name of Horde source package
pear_package='Horde_MIME'

# The name of the RPM package
package='Horde_MIME'

# 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-CVS'

# The name of the package in the source repository
pear_pkgdir='MIME'

# Commit tag or date to user
repo_commit='HORDE_3_3_4'

# What release number should the source snapshot get (usually a date)?
repo_release='20090501'

# Version number
version='0.0.2dev20090501'

# Package release number
release='20090713'

# Source URL to download from
sourceurl='http://files.kolab.org/incoming/wrobel/'

# 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           \
PreReq:       PEAR-Mail_mimeDecode         \
PreReq:       Horde_Util                   \
'

# Package summary description
summary='Horde Mime Library'

# Long package description
description=' \
The Horde_MIME:: class provides methods for dealing with MIME standards.\
'

# Source code license
license='LGPL'

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	11 Sep 2008 16:27:38 -0000	1.1
+++ ChangeLog	10 Nov 2009 17:08:57 -0000	1.2
@@ -1,3 +1,8 @@
+2009-11-10  Gunnar Wrobel  <p at rdus.de>
+
+	* package.info: Converted to new pacakging style. Updated to tag
+	HORDE_3_3_4.
+
 2008-09-11  Gunnar Wrobel  <p at rdus.de>
 
 	* Horde_DOM.spec: Added package to Kolab CVS.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Sep 2008 16:27:38 -0000	1.1
+++ Makefile	10 Nov 2009 17:08:57 -0000	1.2
@@ -1,40 +1 @@
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-.PHONY: clean
-clean:
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
-
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+include ../Pear.mk

--- Horde_MIME.spec DELETED ---



From cvs at kolab.org  Tue Nov 10 18:33:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 18:33:27 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.62,1.398.2.63 
Message-ID: <20091110173327.66CCB600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
SECURITY: Fixed image upload form issue.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.62
retrieving revision 1.398.2.63
diff -u -d -r1.398.2.62 -r1.398.2.63
--- release-notes.txt	10 Nov 2009 09:59:06 -0000	1.398.2.62
+++ release-notes.txt	10 Nov 2009 17:33:25 -0000	1.398.2.63
@@ -69,6 +69,8 @@
 
     - kolab-webclient-1.2.0-20090514
 
+	SECURITY: Fixed image upload form issue.
+
 	A proxy user can now be defined in the
 	webclient-kolab-conf.template which allows anonymous read only
 	access to all the users calendars.



From cvs at kolab.org  Tue Nov 10 18:33:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 18:33:27 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog,1.10.2.13,1.10.2.14 
Message-ID: <20091110173327.9D3E1600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
SECURITY: Fixed image upload form issue.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.13
retrieving revision 1.10.2.14
diff -u -d -r1.10.2.13 -r1.10.2.14
--- ChangeLog	10 Nov 2009 09:59:07 -0000	1.10.2.13
+++ ChangeLog	10 Nov 2009 17:33:25 -0000	1.10.2.14
@@ -3,6 +3,8 @@
 	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that
 	are counted per week and not per incident)
 
+	SECURITY: Fixed image upload form issue.
+
 2009-11-09  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue3856 (IMP/DIMP folder navigator



From cvs at kolab.org  Tue Nov 10 18:33:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 18:33:27 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff, NONE,
	1.1.2.1 series, 1.5.2.10, 1.5.2.11 
Message-ID: <20091110173327.5D1F4600806@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv22121/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff 
Log Message:
SECURITY: Fixed image upload form issue.

--- NEW FILE: t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/framework/H/JS/Form/FixFormSecurityForImageUploads

SECURITY: Fix vulnerability in image form fields that allows overwriting
          of arbitrary local files.

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

---
 horde-webmail/lib/Horde/Form.php                |   95 +++++++++++++++++------
 horde-webmail/lib/Horde/UI/VarRenderer/html.php |   20 +----
 2 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/horde-webmail/lib/Horde/Form.php b/horde-webmail/lib/Horde/Form.php
index c8547cd..a5f13dc 100644
--- a/horde-webmail/lib/Horde/Form.php
+++ b/horde-webmail/lib/Horde/Form.php
@@ -1773,7 +1773,14 @@ class Horde_Form_Type_image extends Horde_Form_Type {
      *
      * @var array
      */
-    var $_img = array();
+    var $_img;
+
+    /**
+     * A random id that identifies the image information in the session data.
+     *
+     * @var string
+     */
+    var $_random;
 
     function init($show_upload = true, $show_keeporig = false, $max_filesize = null)
     {
@@ -1785,7 +1792,7 @@ class Horde_Form_Type_image extends Horde_Form_Type {
     function onSubmit(&$var, &$vars)
     {
         /* Get the upload. */
-        $this->_getUpload($vars, $var);
+        $this->getImage($vars, $var);
 
         /* If this was done through the upload button override the submitted
          * value of the form. */
@@ -1796,25 +1803,24 @@ class Horde_Form_Type_image extends Horde_Form_Type {
 
     function isValid(&$var, &$vars, $value, &$message)
     {
-        $field = $vars->get($var->getVarName());
-
         /* Get the upload. */
-        $this->_getUpload($vars, $var);
+        $this->getImage($vars, $var);
+        $field = $vars->get($var->getVarName());
 
         /* The upload generated a PEAR Error. */
         if (is_a($this->_uploaded, 'PEAR_Error')) {
             /* Not required and no image upload attempted. */
-            if (!$var->isRequired() && empty($field['img']) &&
+            if (!$var->isRequired() && empty($field['hash']) &&
                 $this->_uploaded->getCode() == UPLOAD_ERR_NO_FILE) {
                 return true;
             }
 
             if (($this->_uploaded->getCode() == UPLOAD_ERR_NO_FILE) &&
-                empty($field['img'])) {
+                empty($field['hash'])) {
                 /* Nothing uploaded and no older upload. */
                 $message = _("This field is required.");
                 return false;
-            } elseif (!empty($field['img'])) {
+            } elseif (!empty($field['hash'])) {
                 /* Nothing uploaded but older upload present. */
                 return true;
             } else {
@@ -1822,11 +1828,11 @@ class Horde_Form_Type_image extends Horde_Form_Type {
                 $message = $this->_uploaded->getMessage();
                 return false;
             }
-        } elseif (empty($this->_img['size'])) {
+        } elseif (empty($this->_img['img']['size'])) {
             $message = _("The image file size could not be determined or it was 0 bytes. The upload may have been interrupted.");
             return false;
         } elseif ($this->_max_filesize &&
-                  $this->_img['size'] > $this->_max_filesize) {
+                  $this->_img['img']['size'] > $this->_max_filesize) {
             $message = sprintf(_("The image file was larger than the maximum allowed size (%d bytes)."), $this->_max_filesize);
             return false;
         }
@@ -1837,11 +1843,11 @@ class Horde_Form_Type_image extends Horde_Form_Type {
     function getInfo(&$vars, &$var, &$info)
     {
         /* Get the upload. */
-        $this->_getUpload($vars, $var);
+        $this->getImage($vars, $var);
 
         /* Get image params stored in the hidden field. */
         $value = $var->getValue($vars);
-        $info = $this->_img;
+        $info = $this->_img['img'];
         if (empty($info['file'])) {
             unset($info['file']);
             return;
@@ -1896,7 +1902,7 @@ class Horde_Form_Type_image extends Horde_Form_Type {
         if ($this->_uploaded === true) {
             /* A file has been uploaded on this submit. Save to temp dir for
              * preview work. */
-            $this->_img['type'] = $this->getUploadedFileType($varname . '[new]');
+            $this->_img['img']['type'] = $this->getUploadedFileType($varname . '[new]');
 
             /* Get the other parts of the upload. */
             require_once 'Horde/Array.php';
@@ -1904,19 +1910,22 @@ class Horde_Form_Type_image extends Horde_Form_Type {
 
             /* Get the temporary file name. */
             $keys_path = array_merge(array($base, 'tmp_name'), $keys);
-            $this->_img['file'] = Horde_Array::getElement($_FILES, $keys_path);
+            $this->_img['img']['file'] = Horde_Array::getElement($_FILES, $keys_path);
 
             /* Get the actual file name. */
-            $keys_path= array_merge(array($base, 'name'), $keys);
-            $this->_img['name'] = Horde_Array::getElement($_FILES, $keys_path);
+            $keys_path = array_merge(array($base, 'name'), $keys);
+            $this->_img['img']['name'] = Horde_Array::getElement($_FILES, $keys_path);
 
             /* Get the file size. */
-            $keys_path= array_merge(array($base, 'size'), $keys);
-            $this->_img['size'] = Horde_Array::getElement($_FILES, $keys_path);
+            $keys_path = array_merge(array($base, 'size'), $keys);
+            $this->_img['img']['size'] = Horde_Array::getElement($_FILES, $keys_path);
 
             /* Get any existing values for the image upload field. */
             $upload = $vars->get($var->getVarName());
-            $upload['img'] = @unserialize($upload['img']);
+            if (!empty($upload['hash'])) {
+                $upload['img'] = $_SESSION['horde_form'][$upload['hash']];
+                unset($_SESSION['horde_form'][$upload['hash']]);
+            }
 
             /* Get the temp file if already one uploaded, otherwise create a
              * new temporary file. */
@@ -1927,8 +1936,8 @@ class Horde_Form_Type_image extends Horde_Form_Type {
             }
 
             /* Move the browser created temp file to the new temp file. */
-            move_uploaded_file($this->_img['file'], $tmp_file);
-            $this->_img['file'] = basename($tmp_file);
+            move_uploaded_file($this->_img['img']['file'], $tmp_file);
+            $this->_img['img']['file'] = basename($tmp_file);
 
             /* Store the uploaded image file data to the hidden field. */
             $upload['img'] = serialize($this->_img);
@@ -1936,10 +1945,19 @@ class Horde_Form_Type_image extends Horde_Form_Type {
         } elseif ($this->_uploaded) {
             /* File has not been uploaded. */
             $upload = $vars->get($var->getVarName());
-            if ($this->_uploaded->getCode() == 4 && !empty($upload['img'])) {
-                $this->_img = @unserialize($upload['img']);
+            if ($this->_uploaded->getCode() == 4 &&
+                !empty($upload['hash']) &&
+                isset($_SESSION['horde_form'][$upload['hash']])) {
+                $this->_img['img'] = $_SESSION['horde_form'][$upload['hash']];
+                unset($_SESSION['horde_form'][$upload['hash']]);
+                if (isset($this->_img['error'])) {
+                    $this->_uploaded = PEAR::raiseError($this->_img['error']);
+                }
             }
         }
+        if (isset($this->_img['img'])) {
+            $_SESSION['horde_form'][$this->getRandomId()] = $this->_img['img'];
+        }
     }
 
     function getUploadedFileType($field)
@@ -1990,6 +2008,27 @@ class Horde_Form_Type_image extends Horde_Form_Type {
     }
 
     /**
+     * Returns the current image information.
+     *
+     * @return array  The current image hash.
+     */
+    function getImage($vars, $var)
+    {
+        $this->_getUpload($vars, $var);
+        if (!isset($this->_img)) {
+            $image = $vars->get($var->getVarName());
+            if ($image) {
+                $this->loadImageData($image);
+                if (isset($image['img'])) {
+                    $this->_img = $image;
+                    $_SESSION['horde_form'][$this->getRandomId()] = $this->_img['img'];
+                }
+            }
+        }
+        return $this->_img;
+    }
+
+    /**
      * Loads any existing image data into the image field. Requires that the
      * array $image passed to it contains the structure:
      *   $image['load']['file'] - the filename of the image;
@@ -2011,10 +2050,18 @@ class Horde_Form_Type_image extends Horde_Form_Type {
             fclose($fd);
         }
 
-        $image['img'] = serialize(array('file' => $image['load']['file']));
+        $image['img'] = array('file' => $image['load']['file']);
         unset($image['load']);
     }
 
+    function getRandomId()
+    {
+        if (!isset($this->_random)) {
+            $this->_random = uniqid(mt_rand());
+        }
+        return $this->_random;
+    }
+
     /**
      * Return info about field type.
      */
diff --git a/horde-webmail/lib/Horde/UI/VarRenderer/html.php b/horde-webmail/lib/Horde/UI/VarRenderer/html.php
index 40e430f..6063864 100644
--- a/horde-webmail/lib/Horde/UI/VarRenderer/html.php
+++ b/horde-webmail/lib/Horde/UI/VarRenderer/html.php
@@ -157,10 +157,7 @@ class Horde_UI_VarRenderer_html extends Horde_UI_VarRenderer {
     function _renderVarInput_image($form, &$var, &$vars)
     {
         $varname = htmlspecialchars($var->getVarName());
-        $image = $var->getValue($vars);
-
-        /* Check if existing image data is being loaded. */
-        $var->type->loadImageData($image);
+        $image = $var->type->getImage($vars, $var);
 
         Horde::addScriptFile('image.js', 'horde', true);
         $graphics_dir = $GLOBALS['registry']->getImageDir('horde');
@@ -170,13 +167,11 @@ class Horde_UI_VarRenderer_html extends Horde_UI_VarRenderer {
 
         /* Check if there is existing img information stored. */
         if (isset($image['img'])) {
-            /* Hidden tag to store the preview image filename. */
+            /* Hidden tag to store the preview image id. */
             $html = sprintf('<input type="hidden" name="%s" id="%s" value="%s" />',
-                            $varname . '[img]',
-                            $varname . '[img]',
-                            @htmlspecialchars($image['img'], ENT_QUOTES, $this->_charset));
-            /* Unserialize the img information to get the full array. */
-            $image['img'] = @unserialize($image['img']);
+                            $varname . '[hash]',
+                            $varname . '[hash]',
+                            $var->type->getRandomId());
         }
 
         /* Output MAX_FILE_SIZE parameter to limit large files. */
@@ -1136,11 +1131,6 @@ EOT;
         /* Check if existing image data is being loaded. */
         $var->type->loadImageData($image);
 
-        if (isset($image['img'])) {
-            /* Unserialize the img information to get the full array. */
-            $image['img'] = @unserialize($image['img']);
-        }
-
         if (empty($image['img'])) {
             return '';
         }
-- 
tg: (ecde0d9..) t/framework/H/JS/Form/FixFormSecurityForImageUploads (depends on: t/kronolith/HK/GW/FixWeeklyRecurringEvents)
-- 
TOPGIT patch commit log
=======================

commit e6faeaf99ac92e1d3ad4ac7b7a4ad93bf99f5392
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Nov 10 18:01:37 2009 +0100

    Fix patch.

commit 7bedc614e8d7a953e9fed9e1aec26b1e9b6bd3cb
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Nov 10 17:22:32 2009 +0100

    SECURITY: Fix vulnerability in image form fields that allows overwriting
          of arbitrary local files.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -d -r1.5.2.10 -r1.5.2.11
--- series	10 Nov 2009 09:59:07 -0000	1.5.2.10
+++ series	10 Nov 2009 17:33:25 -0000	1.5.2.11
@@ -75,3 +75,4 @@
 t_kronolith_HK_GW_ExportEventList.diff -p1
 t_kronolith_HK_UV_dateInputFieldOrder.diff -p1
 t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff -p1
+t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff -p1



From cvs at kolab.org  Tue Nov 10 18:33:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 18:33:30 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.18, 1.32.2.19 
Message-ID: <20091110173330.B18B6600819@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv22121/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
SECURITY: Fixed image upload form issue.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.18
retrieving revision 1.32.2.19
diff -u -d -r1.32.2.18 -r1.32.2.19
--- horde-webmail-1.2.0_kolab_openpkg.patch	10 Nov 2009 09:59:07 -0000	1.32.2.18
+++ horde-webmail-1.2.0_kolab_openpkg.patch	10 Nov 2009 17:33:25 -0000	1.32.2.19
@@ -27962,6 +27962,290 @@
 Date:   Tue Nov 10 07:25:22 2009 +0100
 
      kolab/issue3846 (fix recurring events that are counted per week and not per incident)
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/framework/H/JS/Form/FixFormSecurityForImageUploads
+
+SECURITY: Fix vulnerability in image form fields that allows overwriting
+          of arbitrary local files.
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/lib/Horde/Form.php                |   95 +++++++++++++++++------
+ horde-webmail/lib/Horde/UI/VarRenderer/html.php |   20 +----
+ 2 files changed, 76 insertions(+), 39 deletions(-)
+
+diff --git a/horde-webmail/lib/Horde/Form.php b/horde-webmail/lib/Horde/Form.php
+index c8547cd..a5f13dc 100644
+--- a/horde-webmail/lib/Horde/Form.php
++++ b/horde-webmail/lib/Horde/Form.php
+@@ -1773,7 +1773,14 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+      *
+      * @var array
+      */
+-    var $_img = array();
++    var $_img;
++
++    /**
++     * A random id that identifies the image information in the session data.
++     *
++     * @var string
++     */
++    var $_random;
+ 
+     function init($show_upload = true, $show_keeporig = false, $max_filesize = null)
+     {
+@@ -1785,7 +1792,7 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+     function onSubmit(&$var, &$vars)
+     {
+         /* Get the upload. */
+-        $this->_getUpload($vars, $var);
++        $this->getImage($vars, $var);
+ 
+         /* If this was done through the upload button override the submitted
+          * value of the form. */
+@@ -1796,25 +1803,24 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+ 
+     function isValid(&$var, &$vars, $value, &$message)
+     {
+-        $field = $vars->get($var->getVarName());
+-
+         /* Get the upload. */
+-        $this->_getUpload($vars, $var);
++        $this->getImage($vars, $var);
++        $field = $vars->get($var->getVarName());
+ 
+         /* The upload generated a PEAR Error. */
+         if (is_a($this->_uploaded, 'PEAR_Error')) {
+             /* Not required and no image upload attempted. */
+-            if (!$var->isRequired() && empty($field['img']) &&
++            if (!$var->isRequired() && empty($field['hash']) &&
+                 $this->_uploaded->getCode() == UPLOAD_ERR_NO_FILE) {
+                 return true;
+             }
+ 
+             if (($this->_uploaded->getCode() == UPLOAD_ERR_NO_FILE) &&
+-                empty($field['img'])) {
++                empty($field['hash'])) {
+                 /* Nothing uploaded and no older upload. */
+                 $message = _("This field is required.");
+                 return false;
+-            } elseif (!empty($field['img'])) {
++            } elseif (!empty($field['hash'])) {
+                 /* Nothing uploaded but older upload present. */
+                 return true;
+             } else {
+@@ -1822,11 +1828,11 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+                 $message = $this->_uploaded->getMessage();
+                 return false;
+             }
+-        } elseif (empty($this->_img['size'])) {
++        } elseif (empty($this->_img['img']['size'])) {
+             $message = _("The image file size could not be determined or it was 0 bytes. The upload may have been interrupted.");
+             return false;
+         } elseif ($this->_max_filesize &&
+-                  $this->_img['size'] > $this->_max_filesize) {
++                  $this->_img['img']['size'] > $this->_max_filesize) {
+             $message = sprintf(_("The image file was larger than the maximum allowed size (%d bytes)."), $this->_max_filesize);
+             return false;
+         }
+@@ -1837,11 +1843,11 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+     function getInfo(&$vars, &$var, &$info)
+     {
+         /* Get the upload. */
+-        $this->_getUpload($vars, $var);
++        $this->getImage($vars, $var);
+ 
+         /* Get image params stored in the hidden field. */
+         $value = $var->getValue($vars);
+-        $info = $this->_img;
++        $info = $this->_img['img'];
+         if (empty($info['file'])) {
+             unset($info['file']);
+             return;
+@@ -1896,7 +1902,7 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+         if ($this->_uploaded === true) {
+             /* A file has been uploaded on this submit. Save to temp dir for
+              * preview work. */
+-            $this->_img['type'] = $this->getUploadedFileType($varname . '[new]');
++            $this->_img['img']['type'] = $this->getUploadedFileType($varname . '[new]');
+ 
+             /* Get the other parts of the upload. */
+             require_once 'Horde/Array.php';
+@@ -1904,19 +1910,22 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+ 
+             /* Get the temporary file name. */
+             $keys_path = array_merge(array($base, 'tmp_name'), $keys);
+-            $this->_img['file'] = Horde_Array::getElement($_FILES, $keys_path);
++            $this->_img['img']['file'] = Horde_Array::getElement($_FILES, $keys_path);
+ 
+             /* Get the actual file name. */
+-            $keys_path= array_merge(array($base, 'name'), $keys);
+-            $this->_img['name'] = Horde_Array::getElement($_FILES, $keys_path);
++            $keys_path = array_merge(array($base, 'name'), $keys);
++            $this->_img['img']['name'] = Horde_Array::getElement($_FILES, $keys_path);
+ 
+             /* Get the file size. */
+-            $keys_path= array_merge(array($base, 'size'), $keys);
+-            $this->_img['size'] = Horde_Array::getElement($_FILES, $keys_path);
++            $keys_path = array_merge(array($base, 'size'), $keys);
++            $this->_img['img']['size'] = Horde_Array::getElement($_FILES, $keys_path);
+ 
+             /* Get any existing values for the image upload field. */
+             $upload = $vars->get($var->getVarName());
+-            $upload['img'] = @unserialize($upload['img']);
++            if (!empty($upload['hash'])) {
++                $upload['img'] = $_SESSION['horde_form'][$upload['hash']];
++                unset($_SESSION['horde_form'][$upload['hash']]);
++            }
+ 
+             /* Get the temp file if already one uploaded, otherwise create a
+              * new temporary file. */
+@@ -1927,8 +1936,8 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+             }
+ 
+             /* Move the browser created temp file to the new temp file. */
+-            move_uploaded_file($this->_img['file'], $tmp_file);
+-            $this->_img['file'] = basename($tmp_file);
++            move_uploaded_file($this->_img['img']['file'], $tmp_file);
++            $this->_img['img']['file'] = basename($tmp_file);
+ 
+             /* Store the uploaded image file data to the hidden field. */
+             $upload['img'] = serialize($this->_img);
+@@ -1936,10 +1945,19 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+         } elseif ($this->_uploaded) {
+             /* File has not been uploaded. */
+             $upload = $vars->get($var->getVarName());
+-            if ($this->_uploaded->getCode() == 4 && !empty($upload['img'])) {
+-                $this->_img = @unserialize($upload['img']);
++            if ($this->_uploaded->getCode() == 4 &&
++                !empty($upload['hash']) &&
++                isset($_SESSION['horde_form'][$upload['hash']])) {
++                $this->_img['img'] = $_SESSION['horde_form'][$upload['hash']];
++                unset($_SESSION['horde_form'][$upload['hash']]);
++                if (isset($this->_img['error'])) {
++                    $this->_uploaded = PEAR::raiseError($this->_img['error']);
++                }
+             }
+         }
++        if (isset($this->_img['img'])) {
++            $_SESSION['horde_form'][$this->getRandomId()] = $this->_img['img'];
++        }
+     }
+ 
+     function getUploadedFileType($field)
+@@ -1990,6 +2008,27 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+     }
+ 
+     /**
++     * Returns the current image information.
++     *
++     * @return array  The current image hash.
++     */
++    function getImage($vars, $var)
++    {
++        $this->_getUpload($vars, $var);
++        if (!isset($this->_img)) {
++            $image = $vars->get($var->getVarName());
++            if ($image) {
++                $this->loadImageData($image);
++                if (isset($image['img'])) {
++                    $this->_img = $image;
++                    $_SESSION['horde_form'][$this->getRandomId()] = $this->_img['img'];
++                }
++            }
++        }
++        return $this->_img;
++    }
++
++    /**
+      * Loads any existing image data into the image field. Requires that the
+      * array $image passed to it contains the structure:
+      *   $image['load']['file'] - the filename of the image;
+@@ -2011,10 +2050,18 @@ class Horde_Form_Type_image extends Horde_Form_Type {
+             fclose($fd);
+         }
+ 
+-        $image['img'] = serialize(array('file' => $image['load']['file']));
++        $image['img'] = array('file' => $image['load']['file']);
+         unset($image['load']);
+     }
+ 
++    function getRandomId()
++    {
++        if (!isset($this->_random)) {
++            $this->_random = uniqid(mt_rand());
++        }
++        return $this->_random;
++    }
++
+     /**
+      * Return info about field type.
+      */
+diff --git a/horde-webmail/lib/Horde/UI/VarRenderer/html.php b/horde-webmail/lib/Horde/UI/VarRenderer/html.php
+index 40e430f..6063864 100644
+--- a/horde-webmail/lib/Horde/UI/VarRenderer/html.php
++++ b/horde-webmail/lib/Horde/UI/VarRenderer/html.php
+@@ -157,10 +157,7 @@ class Horde_UI_VarRenderer_html extends Horde_UI_VarRenderer {
+     function _renderVarInput_image($form, &$var, &$vars)
+     {
+         $varname = htmlspecialchars($var->getVarName());
+-        $image = $var->getValue($vars);
+-
+-        /* Check if existing image data is being loaded. */
+-        $var->type->loadImageData($image);
++        $image = $var->type->getImage($vars, $var);
+ 
+         Horde::addScriptFile('image.js', 'horde', true);
+         $graphics_dir = $GLOBALS['registry']->getImageDir('horde');
+@@ -170,13 +167,11 @@ class Horde_UI_VarRenderer_html extends Horde_UI_VarRenderer {
+ 
+         /* Check if there is existing img information stored. */
+         if (isset($image['img'])) {
+-            /* Hidden tag to store the preview image filename. */
++            /* Hidden tag to store the preview image id. */
+             $html = sprintf('<input type="hidden" name="%s" id="%s" value="%s" />',
+-                            $varname . '[img]',
+-                            $varname . '[img]',
+-                            @htmlspecialchars($image['img'], ENT_QUOTES, $this->_charset));
+-            /* Unserialize the img information to get the full array. */
+-            $image['img'] = @unserialize($image['img']);
++                            $varname . '[hash]',
++                            $varname . '[hash]',
++                            $var->type->getRandomId());
+         }
+ 
+         /* Output MAX_FILE_SIZE parameter to limit large files. */
+@@ -1136,11 +1131,6 @@ EOT;
+         /* Check if existing image data is being loaded. */
+         $var->type->loadImageData($image);
+ 
+-        if (isset($image['img'])) {
+-            /* Unserialize the img information to get the full array. */
+-            $image['img'] = @unserialize($image['img']);
+-        }
+-
+         if (empty($image['img'])) {
+             return '';
+         }
+-- 
+tg: (ecde0d9..) t/framework/H/JS/Form/FixFormSecurityForImageUploads (depends on: t/kronolith/HK/GW/FixWeeklyRecurringEvents)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit e6faeaf99ac92e1d3ad4ac7b7a4ad93bf99f5392
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Tue Nov 10 18:01:37 2009 +0100
+
+    Fix patch.
+
+commit 7bedc614e8d7a953e9fed9e1aec26b1e9b6bd3cb
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Tue Nov 10 17:22:32 2009 +0100
+
+    SECURITY: Fix vulnerability in image form fields that allows overwriting
+          of arbitrary local files.
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Tue Nov 10 21:42:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 21:42:02 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in,
	1.34.2.1, 1.34.2.2 
Message-ID: <20091110204202.2255F600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	resmgr.conf.template.in 
Log Message:
Merge configuration for kolab/issue2499 from HEAD

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -d -r1.34.2.1 -r1.34.2.2
--- resmgr.conf.template.in	13 Oct 2009 13:24:07 -0000	1.34.2.1
+++ resmgr.conf.template.in	10 Nov 2009 20:42:00 -0000	1.34.2.2
@@ -175,6 +175,10 @@
 /* Temporary data storage for the scripts */
 $conf['kolab']['filter']['tempdir'] = '@resmgr_tmpdir@';
 
+/* Uncomment if the resource manager should generate translated messages. */
+//$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
+//$conf['kolab']['filter']['locale'] = 'de_DE';
+
 /* PHP error logging */
 $conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
 



From cvs at kolab.org  Tue Nov 10 21:42:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 21:42:02 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.63,1.398.2.64 
Message-ID: <20091110204202.248DF600814@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Merge configuration for kolab/issue2499 from HEAD

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.63
retrieving revision 1.398.2.64
diff -u -d -r1.398.2.63 -r1.398.2.64
--- release-notes.txt	10 Nov 2009 17:33:25 -0000	1.398.2.63
+++ release-notes.txt	10 Nov 2009 20:41:59 -0000	1.398.2.64
@@ -57,6 +57,11 @@
 
 	Fix buffer size calculations for sieve actions_string (CVE-2009-2632)
 
+    - kolabd-2.2.3-2009????
+
+	kolab/issue2499 (Notification messages by the resource manager
+	                 should be localized)
+
     - Kolab_Filter-0.1.4-2009????
 
 	kolab/issue2499 (Notification messages by the resource manager



From cvs at kolab.org  Tue Nov 10 21:42:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 21:42:02 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/dist_conf common, 1.53.2.1,
	1.53.2.2 kolab, 1.70.2.1, 1.70.2.2 
Message-ID: <20091110204202.25F23600815@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	common kolab 
Log Message:
Merge configuration for kolab/issue2499 from HEAD

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -d -r1.53.2.1 -r1.53.2.2
--- common	26 Mar 2009 21:29:45 -0000	1.53.2.1
+++ common	10 Nov 2009 20:42:00 -0000	1.53.2.2
@@ -120,6 +120,7 @@
 	-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
 	-e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+	-e 's,[@]resmgr_localedir[@],$(resmgr_localedir),g' \
 	-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
 	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.70.2.1
retrieving revision 1.70.2.2
diff -u -d -r1.70.2.1 -r1.70.2.2
--- kolab	26 Mar 2009 21:29:45 -0000	1.70.2.1
+++ kolab	10 Nov 2009 20:42:00 -0000	1.70.2.2
@@ -175,6 +175,7 @@
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 resmgr_tmpdir=${localstatedir}/kolab-filter/tmp
+resmgr_localedir=${libdir}/php/data/Kolab_Filter/locale
 resmgr_scriptsdir=${bindir}
 # @l_musr@
 resmgr_usr=${kolab_musr}



From cvs at kolab.org  Tue Nov 10 23:14:08 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Nov 2009 23:14:08 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.94,1.95 
Message-ID: <20091110221408.E87CC600806@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
add resmgr_localedir, for kolab/issue2499

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- suse	12 Oct 2009 15:43:51 -0000	1.94
+++ suse	10 Nov 2009 22:14:06 -0000	1.95
@@ -168,6 +168,7 @@
 resmgr_log_type=file
 resmgr_log_name=${resmgr_logdir}/filter.log
 resmgr_locksdir=${localstatedir}/lock/kolab
+resmgr_localedir=${phppeardir}/data/Kolab_Filter/locale
 #resmgr_tmpdir=
 
 fbview_logfile=${localstatedir}/log/kolab/fbview.log



From cvs at kolab.org  Thu Nov 12 11:20:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Nov 2009 11:20:48 +0100 (CET)
Subject: bernhard: doc/www/src roadmap.html.m4,1.29,1.30 
Message-ID: <20091112102048.E360B600803@lists.intevation.de>

Author: bernhard

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

Modified Files:
	roadmap.html.m4 
Log Message:
Updated the roadmap. Mainly to make PE5 more visible.


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- roadmap.html.m4	15 May 2009 13:48:21 -0000	1.29
+++ roadmap.html.m4	12 Nov 2009 10:20:46 -0000	1.30
@@ -28,7 +28,8 @@
 2.2.2 was published on May 15th, 2009.
 It contains some bugfixes and small improvements.
 <p>
-It is planned to have further improvements in a release 2.3.0 in the second half of 2009.
+It is planned to have further improvements in a release 
+2.2.3 or 2.3.0 end of 2009.
 
 <h3>Kolab Server 2.1 release series</h3>
 Current is 2.1.0 Final. No further releases planned.
@@ -37,6 +38,22 @@
 <a name="kdekolabclients">
 <h2>KDE Kolab Clients</h2></a>
 
+<div class="logo-left">
+    <a href="http://www.kontact.org">
+     <img alt="Kontact" src="images/logo-kontact.png">
+    </a> 
+</div>
+<div class="logo-text-right">
+
+During 2009 a prototype for an Enterprise5 client was developed based
+on the modern KDE4 Akonadi backend.
+The goal of this <stron>Prototype-E5</strong> project was
+to bring in 10 years of experience with Kontact in order to overcome
+important design limitations. The project is running better as anticipated
+so early betas of Enterprise5 on all platforms are scheduled to be released
+in Q1 2010 and will most likly supercede the Enterprise4 Kolab Client series.
+</div>
+
 <!--Kontact for Windows-->
 <div class="logo-left">
     <a href="http://www.kontact.org">
@@ -46,8 +63,11 @@
 
 <div class="logo-text-right">
 <h3>Kontact for Windows (enterprise4 | beta)</h3>
-A first beta was published December 2008. We expect it to be
-production ready within Q2 2009.
+Four betas were published between December 2008 and mid 2009.
+Another more usable beta is planned in Q1 2010 in parallel to
+the Enterprise5 betas. One of the two version will is expected
+to get production ready in Q2 2010.
+
 </div>
 
 <!--KDE Kontact for Linux-->
@@ -59,23 +79,31 @@
 <div class="logo-text-right">
 <h3>Kontact for GNU/Linux</h3>
 
+<h4>Prototype Enterprise5</h4>
+
+In <strong>development</strong>, based on KDE4 and Akonadi. Betas are expected
+in Q1 2010. Production readiness will follow within the next quarter after
+the betas.
+
 <h4>Enterprise4</h4>
-This is the next generation in <b>beta</b> state. The client is based
-on KDE4 technology, but without Akonadi. 
-We expect it to be production ready in Q2 2009.
+This client is in <b>beta</b> state. The client is based
+on KDE4 technology, but without Akonadi. There are minor releases
+every few weeks.
 
 <h4>Enterprise35</h4>
 This series is <b>production ready</b> and in maintenance mode.
 and contains a large number of improvements over Proko2. 
-Currently intermediate releases happen very few weeks to fix a few remaining
-issues. Packagers have already picked this up; a significant number of
-people are using this in production.
+Currently intermediate releases happen very few weeks to address issues,
+over 2009 a number of new featues have also be introduced by 
+customer demand.
+Packagers have already picked this up; this is used widely on production.
+It is good to use even on KDE4 Desktops if a rock solid business-ready
+client is required.
 
 <h4>Proko2</h4>
-This series is <b>old stable</b> and in deep maintenance mode.
-Only very important updates will happen occasionally - governed
-by the urgency of the changes for enterprise users. Go for Enterpise35
-for new setups.
+This series is <b>old stable</b> and maintenance will be phased 
+out end of 2009 unless somebody steps up. Kolab-Konsortium customers
+all have moved to newer versions. Go for Enterpise35 for new setups.
 </div>
 
 <!--Kontact for MacOSX-->
@@ -85,9 +113,12 @@
     </a>
 </div>
 <div class="logo-text-right">
+Newer versions of Kontact for Mac OS X are additionally added
+to the MacPorts packaging initiative. 
+
 <h3>Kontact for Mac OS X (enterprise4 | beta)</h3>
-This version is in beta testing a beta was published December 2008.
-We expect it to be production ready within Q2 2009.
+This version is in <strong>beta</strong> since December 2008.
+It might get superceded by the Enterprise5 for Mac OS X. 
 </div>
 
 



From cvs at kolab.org  Thu Nov 12 15:05:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Nov 2009 15:05:16 +0100 (CET)
Subject: bernhard: doc/www/src roadmap.html.m4,1.30,1.31 
Message-ID: <20091112140516.DF89B600803@lists.intevation.de>

Author: bernhard

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

Modified Files:
	roadmap.html.m4 
Log Message:
Typeo fix in roadmap (Thanks Till).


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- roadmap.html.m4	12 Nov 2009 10:20:46 -0000	1.30
+++ roadmap.html.m4	12 Nov 2009 14:05:14 -0000	1.31
@@ -65,7 +65,7 @@
 <h3>Kontact for Windows (enterprise4 | beta)</h3>
 Four betas were published between December 2008 and mid 2009.
 Another more usable beta is planned in Q1 2010 in parallel to
-the Enterprise5 betas. One of the two version will is expected
+the Enterprise5 betas. One of the two version is expected
 to get production ready in Q2 2010.
 
 </div>



From cvs at kolab.org  Sun Nov 15 21:39:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 15 Nov 2009 21:39:40 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.115,1.116 
Message-ID: <20091115203940.4B40A60014C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
nicer, friendlier web interface color
kolab/issue3401




Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- ChangeLog	27 Aug 2009 21:33:01 -0000	1.115
+++ ChangeLog	15 Nov 2009 20:39:37 -0000	1.116
@@ -1,3 +1,8 @@
+2009-02-16 Richard Bos <richard at radoeka.nl>
+
+	* www/admin/style.css: nicer, friendlier web interface color
+	  kolab/issue3401
+
 2009-08-27  Mathieu Parent  <math.parent at gmail.com>
 
 	* www/admin/user/{deliver,forward,vacation}.php.in: Better error



From cvs at kolab.org  Sun Nov 15 21:39:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 15 Nov 2009 21:39:40 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin style.css,
	1.11, 1.12 
Message-ID: <20091115203940.4D5BE600805@lists.intevation.de>

Author: richard

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

Modified Files:
	style.css 
Log Message:
nicer, friendlier web interface color
kolab/issue3401




Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- style.css	20 May 2008 17:32:32 -0000	1.11
+++ style.css	15 Nov 2009 20:39:38 -0000	1.12
@@ -4,7 +4,7 @@
   End:
 */
 body {
-  color: black;
+  color: #001155;
   background-color: #F8FCF8;
   font-family: verdana,arial,helvetica,sans-serif;
   font-size: 95%;



From cvs at kolab.org  Sun Nov 15 22:35:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 15 Nov 2009 22:35:25 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.116,1.117 
Message-ID: <20091115213525.1412960014C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Use a table to separate the checkbox and text, for nicer formatting.
kolab/issue3428



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- ChangeLog	15 Nov 2009 20:39:37 -0000	1.116
+++ ChangeLog	15 Nov 2009 21:35:23 -0000	1.117
@@ -2,6 +2,8 @@
 
 	* www/admin/style.css: nicer, friendlier web interface color
 	  kolab/issue3401
+	* php/admin/templates/settings.tpl: Use a table to separate the
+	  checkbox and text, for nicer formatting.  kolab/issue3428
 
 2009-08-27  Mathieu Parent  <math.parent at gmail.com>
 



From cvs at kolab.org  Sun Nov 15 22:35:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 15 Nov 2009 22:35:25 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	settings.tpl, 1.4, 1.5 
Message-ID: <20091115213525.1E83D600801@lists.intevation.de>

Author: richard

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

Modified Files:
	settings.tpl 
Log Message:
Use a table to separate the checkbox and text, for nicer formatting.
kolab/issue3428



Index: settings.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/settings.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- settings.tpl	16 Feb 2009 19:44:25 -0000	1.4
+++ settings.tpl	15 Nov 2009 21:35:23 -0000	1.5
@@ -104,13 +104,22 @@
 <br />
 <h2>{tr msg="Accept Internet Mail"}</h2>
 <div class="contentform">
-<form id="postfixallowunauthform" method="post" action="">
-<div>
-<input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked="checked"{/if} />
-{tr msg="Accept mail from other domains over unauthenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the privileged network."}
-<div class="align_right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" /></div>
-</div>
-</form>
+ <form id="postfixallowunauthform" method="post" action="">
+  <div>
+   <table border="0">
+    <tr>
+     <td valign="top"><input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked="checked"{/if} />
+     </td>
+     <td>{tr msg="Accept mail from other domains over unauthenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the privileged network."}
+     </td>
+    </tr>
+    <tr>
+     <td colspan="2" align="right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" />
+     </td>
+    </tr>
+   </table>
+  </div>
+ </form>
 </div>
 <br />
 <h2>{tr msg="Domains"}</h2>



From cvs at kolab.org  Mon Nov 16 11:09:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 11:09:52 +0100 (CET)
Subject: wilde: doc/www/src cvs-kolab.html.m4,1.13,1.14 
Message-ID: <20091116100952.4B56A60014C@lists.intevation.de>

Author: wilde

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

Modified Files:
	cvs-kolab.html.m4 
Log Message:
Updated section on branches.


Index: cvs-kolab.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/cvs-kolab.html.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cvs-kolab.html.m4	27 Feb 2007 18:20:03 -0000	1.13
+++ cvs-kolab.html.m4	16 Nov 2009 10:09:50 -0000	1.14
@@ -47,14 +47,16 @@
  To checkout use : <code>cvs checkout</code>
 </p>
 </li>
-<li><strong>Kolab-2.0 Stable</strong><p>
- This is the current status of Kolab 2.0 and is used for bugfixes.<br>
- To checkout use : <code>cvs checkout -r kolab_2_0_branch modulename</code>
+<li><strong>Kolab-2.2 Stable</strong><p>
+ This is the current status of Kolab 2.2.x and is mainly used for bugfixes.<br>
+ To checkout use : <code>cvs checkout -r kolab_2_2_branch modulename</code>
  </p>
 </li>
-<li><strong>Kolab-1 Stable</strong> (inactive)<p>
- This is the last status of Kolab 1.0 and was used for bugfixes.<br>
- To checkout use : <code>cvs checkout -r KOLAB_1_0 modulename</code>
+<li><strong>Other Branches</strong><p>
+ There are many more branches, mainly of historic intrest and mostly inactive.  
+ To discover them all one can have a look at the "Show files using tag:" menu 
+ at the button of the servers 
+ <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/">view-cvs page</a>.
  </p>
 </li>
 </ul>



From cvs at kolab.org  Mon Nov 16 11:50:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 11:50:03 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.64,1.398.2.65 
Message-ID: <20091116105003.C877160014C@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
        kolab/issue2495 (The reply to an invitation with umlauts of a
                         group account doesn't display the umlauts.)
        kolab/issue2499 (Notification messages by the resource manager
                         should be localized)
        kolab/issue2544 (Encoding problem in cancelled appointments)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.64
retrieving revision 1.398.2.65
diff -u -d -r1.398.2.64 -r1.398.2.65
--- release-notes.txt	10 Nov 2009 20:41:59 -0000	1.398.2.64
+++ release-notes.txt	16 Nov 2009 10:50:01 -0000	1.398.2.65
@@ -64,8 +64,11 @@
 
     - Kolab_Filter-0.1.4-2009????
 
+	kolab/issue2495 (The reply to an invitation with umlauts of a
+	                 group account doesn't display the umlauts.)
 	kolab/issue2499 (Notification messages by the resource manager
 	                 should be localized)
+	kolab/issue2544 (Encoding problem in cancelled appointments)
 	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
 	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
 	                 into From: header)



From cvs at kolab.org  Mon Nov 16 11:50:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 11:50:03 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter revert_issue2495.patch, NONE,
	1.1.2.1 Makefile, 1.8.2.9, 1.8.2.10 ChangeLog, 1.29.2.8,
	1.29.2.9 Kolab_Filter.spec, 1.19.2.11, 1.19.2.12 
Message-ID: <20091116105003.CD739600801@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile ChangeLog Kolab_Filter.spec 
Added Files:
      Tag: kolab_2_2_branch
	revert_issue2495.patch 
Log Message:
        kolab/issue2495 (The reply to an invitation with umlauts of a
                         group account doesn't display the umlauts.)
        kolab/issue2499 (Notification messages by the resource manager
                         should be localized)
        kolab/issue2544 (Encoding problem in cancelled appointments)


--- NEW FILE: revert_issue2495.patch ---
diff -u -B -r1.15.2.7 Resource.php
--- Kolab_Filter/lib/Horde/Kolab/Resource.php	22 Sep 2009 16:29:55 -0000	1.15.2.7
+++ Kolab_Filter/lib/Horde/Kolab/Resource.php	16 Nov 2009 10:15:24 -0000
@@ -675,11 +675,6 @@
             Horde::logMessage(sprintf('Removing event %s', $uid),
                               __FILE__, __LINE__, PEAR_LOG_INFO);
 
-            /* Ensure that $summary is single byte here, else we get
-             * problems with sprintf()
-             */
-            $summary = String::convertCharset($summary, 'utf-8', 'iso-8859-1');
-
             if (!$data->objectUidExists($uid)) {
                 Horde::logMessage(sprintf('Canceled event %s is not present in %s\'s calendar',
                                           $uid, $resource),
@@ -709,10 +704,6 @@
                 $subject = sprintf(_("%s has been cancelled"), $summary);
             }
 
-            /* Switch back to utf-8 */
-            $body = String::convertCharset($body, 'iso-8859-1');
-            $subject = String::convertCharset($subject, 'iso-8859-1');
-
             Horde::logMessage(sprintf('Sending confirmation of cancelation to %s', $organiser),
                               __FILE__, __LINE__, PEAR_LOG_WARNING);
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.9
retrieving revision 1.8.2.10
diff -u -d -r1.8.2.9 -r1.8.2.10
--- Makefile	9 Nov 2009 17:08:45 -0000	1.8.2.9
+++ Makefile	16 Nov 2009 10:50:01 -0000	1.8.2.10
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.8
retrieving revision 1.29.2.9
diff -u -d -r1.29.2.8 -r1.29.2.9
--- ChangeLog	7 Nov 2009 20:46:38 -0000	1.29.2.8
+++ ChangeLog	16 Nov 2009 10:50:01 -0000	1.29.2.9
@@ -1,3 +1,13 @@
+2009-11-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the
+	resource manager should be localized)
+
+	kolab/issue2495 (The reply to an invitation with umlauts of a
+	group account doesn't display the umlauts.)
+
+	kolab/issue2544 (Encoding problem in cancelled appointments)
+	
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.11
retrieving revision 1.19.2.12
diff -u -d -r1.19.2.11 -r1.19.2.12
--- Kolab_Filter.spec	7 Nov 2009 20:46:38 -0000	1.19.2.11
+++ Kolab_Filter.spec	16 Nov 2009 10:50:01 -0000	1.19.2.12
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091107
+%define         V_release 20091116
 
 # Package Information
 Name:	   %{V_package}
@@ -28,6 +28,7 @@
 Patch6:    issue3558.patch
 Patch7:    issue3568.patch
 Patch8:    issue3868.patch
+Patch9:    revert_issue2495.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -71,6 +72,7 @@
 	%patch -p1 -P 6
 	%patch -p1 -P 7
 	%patch -p1 -P 8
+	%patch -p1 -P 9
 	cp %{S:1} .
 %build
 



From cvs at kolab.org  Mon Nov 16 13:45:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 13:45:54 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.65,1.398.2.66 
Message-ID: <20091116124554.4D9AC60014C@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3610 (Mail to unknown at something.example.com gets accepted and yields kolabmailboxfilter exit 38)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.65
retrieving revision 1.398.2.66
diff -u -d -r1.398.2.65 -r1.398.2.66
--- release-notes.txt	16 Nov 2009 10:50:01 -0000	1.398.2.65
+++ release-notes.txt	16 Nov 2009 12:45:52 -0000	1.398.2.66
@@ -72,6 +72,8 @@
 	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
 	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
 	                 into From: header)
+	kolab/issue3610 (Mail to unknown at something.example.com gets
+	                 accepted and yields kolabmailboxfilter exit 38)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
 



From cvs at kolab.org  Mon Nov 16 13:45:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 13:45:54 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter issue3610.patch, NONE,
	1.1.2.1 Makefile, 1.8.2.10, 1.8.2.11 Kolab_Filter.spec,
	1.19.2.12, 1.19.2.13 ChangeLog, 1.29.2.9, 1.29.2.10 
Message-ID: <20091116124554.4FECD600805@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile Kolab_Filter.spec ChangeLog 
Added Files:
      Tag: kolab_2_2_branch
	issue3610.patch 
Log Message:
 kolab/issue3610 (Mail to unknown at something.example.com gets accepted and yields kolabmailboxfilter exit 38)


--- NEW FILE: issue3610.patch ---
diff -u -B -r1.4.2.1 Transport.php
--- Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php	20 Feb 2009 22:37:15 -0000	1.4.2.1
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php	16 Nov 2009 12:28:29 -0000
@@ -140,7 +140,7 @@
             /* OK, all failed, just give up */
             if (count($reciperrors) == 1) {
                 /* Only one failure, just return that */
-                return $reciperrors[0];
+                return $this->rewriteCode($reciperrors[0]);
             }
             /* Multiple errors */
             $error = $this->createErrorObject($reciperrors,

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.10
retrieving revision 1.8.2.11
diff -u -d -r1.8.2.10 -r1.8.2.11
--- Makefile	16 Nov 2009 10:50:01 -0000	1.8.2.10
+++ Makefile	16 Nov 2009 12:45:52 -0000	1.8.2.11
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3610.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.12
retrieving revision 1.19.2.13
diff -u -d -r1.19.2.12 -r1.19.2.13
--- Kolab_Filter.spec	16 Nov 2009 10:50:01 -0000	1.19.2.12
+++ Kolab_Filter.spec	16 Nov 2009 12:45:52 -0000	1.19.2.13
@@ -29,6 +29,7 @@
 Patch7:    issue3568.patch
 Patch8:    issue3868.patch
 Patch9:    revert_issue2495.patch
+Patch10:    issue3610.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -73,6 +74,7 @@
 	%patch -p1 -P 7
 	%patch -p1 -P 8
 	%patch -p1 -P 9
+	%patch -p1 -P 10
 	cp %{S:1} .
 %build
 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.9
retrieving revision 1.29.2.10
diff -u -d -r1.29.2.9 -r1.29.2.10
--- ChangeLog	16 Nov 2009 10:50:01 -0000	1.29.2.9
+++ ChangeLog	16 Nov 2009 12:45:52 -0000	1.29.2.10
@@ -7,6 +7,9 @@
 	group account doesn't display the umlauts.)
 
 	kolab/issue2544 (Encoding problem in cancelled appointments)
+
+	kolab/issue3610 (Mail to unknown at something.example.com gets
+	accepted and yields kolabmailboxfilter exit 38)
 	
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Mon Nov 16 19:33:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 19:33:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	settings.tpl, 1.4, 1.4.2.1 
Message-ID: <20091116183326.054AA600817@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	settings.tpl 
Log Message:
- nicer, friendlier web interface color (kolab/issue3401)
- Use a table to separate the checkbox and text, for nicer
  formatting. (kolab/issue3428)



Index: settings.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/settings.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- settings.tpl	16 Feb 2009 19:44:25 -0000	1.4
+++ settings.tpl	16 Nov 2009 18:33:23 -0000	1.4.2.1
@@ -104,13 +104,22 @@
 <br />
 <h2>{tr msg="Accept Internet Mail"}</h2>
 <div class="contentform">
-<form id="postfixallowunauthform" method="post" action="">
-<div>
-<input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked="checked"{/if} />
-{tr msg="Accept mail from other domains over unauthenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the privileged network."}
-<div class="align_right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" /></div>
-</div>
-</form>
+ <form id="postfixallowunauthform" method="post" action="">
+  <div>
+   <table border="0">
+    <tr>
+     <td valign="top"><input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked="checked"{/if} />
+     </td>
+     <td>{tr msg="Accept mail from other domains over unauthenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the privileged network."}
+     </td>
+    </tr>
+    <tr>
+     <td colspan="2" align="right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" />
+     </td>
+    </tr>
+   </table>
+  </div>
+ </form>
 </div>
 <br />
 <h2>{tr msg="Domains"}</h2>



From cvs at kolab.org  Mon Nov 16 19:33:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 19:33:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.4,
	1.110.2.5 
Message-ID: <20091116183326.065E360081C@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
- nicer, friendlier web interface color (kolab/issue3401)
- Use a table to separate the checkbox and text, for nicer
  formatting. (kolab/issue3428)



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.110.2.4
retrieving revision 1.110.2.5
diff -u -d -r1.110.2.4 -r1.110.2.5
--- ChangeLog	14 May 2009 14:36:02 -0000	1.110.2.4
+++ ChangeLog	16 Nov 2009 18:33:23 -0000	1.110.2.5
@@ -1,3 +1,9 @@
+2009-11-16 Richard Bos <richard at radoeka.nl>
+	* www/admin/style.css: nicer, friendlier web interface color
+	  kolab/issue3401
+	* php/admin/templates/settings.tpl: Use a table to separate the
+	  checkbox and text, for nicer formatting.  kolab/issue3428
+
 2009-05-14  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* php/admin/locale/fr/LC_MESSAGES/messages.po: Updated french



From cvs at kolab.org  Mon Nov 16 19:33:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 19:33:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin style.css,
	1.11, 1.11.2.1 
Message-ID: <20091116183326.03069600801@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	style.css 
Log Message:
- nicer, friendlier web interface color (kolab/issue3401)
- Use a table to separate the checkbox and text, for nicer
  formatting. (kolab/issue3428)



Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- style.css	20 May 2008 17:32:32 -0000	1.11
+++ style.css	16 Nov 2009 18:33:23 -0000	1.11.2.1
@@ -4,7 +4,7 @@
   End:
 */
 body {
-  color: black;
+  color: #001155;
   background-color: #F8FCF8;
   font-family: verdana,arial,helvetica,sans-serif;
   font-size: 95%;



From cvs at kolab.org  Mon Nov 16 19:39:17 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 19:39:17 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.66,1.398.2.67 
Message-ID: <20091116183917.03F3D600801@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event attendee status values),  kolab/issue3768 (Kolab server 2.2.2 resmgr doesn't copy attendee status (rt#5801))

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.66
retrieving revision 1.398.2.67
diff -u -d -r1.398.2.66 -r1.398.2.67
--- release-notes.txt	16 Nov 2009 12:45:52 -0000	1.398.2.66
+++ release-notes.txt	16 Nov 2009 18:39:14 -0000	1.398.2.67
@@ -95,6 +95,10 @@
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)
+	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  Mon Nov 16 19:39:17 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 19:39:17 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.29.2.10,
	1.29.2.11 Kolab_Filter.spec, 1.19.2.13, 1.19.2.14 Makefile,
	1.8.2.11, 1.8.2.12 
Message-ID: <20091116183917.AE1C0600817@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Log Message:
 kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event attendee status values),  kolab/issue3768 (Kolab server 2.2.2 resmgr doesn't copy attendee status (rt#5801))

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.10
retrieving revision 1.29.2.11
diff -u -d -r1.29.2.10 -r1.29.2.11
--- ChangeLog	16 Nov 2009 12:45:52 -0000	1.29.2.10
+++ ChangeLog	16 Nov 2009 18:39:14 -0000	1.29.2.11
@@ -10,6 +10,12 @@
 
 	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)
 	
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.13
retrieving revision 1.19.2.14
diff -u -d -r1.19.2.13 -r1.19.2.14
--- Kolab_Filter.spec	16 Nov 2009 12:45:52 -0000	1.19.2.13
+++ Kolab_Filter.spec	16 Nov 2009 18:39:15 -0000	1.19.2.14
@@ -29,7 +29,8 @@
 Patch7:    issue3568.patch
 Patch8:    issue3868.patch
 Patch9:    revert_issue2495.patch
-Patch10:    issue3610.patch
+Patch10:   issue3610.patch
+Patch11:   issue3768.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -75,6 +76,7 @@
 	%patch -p1 -P 8
 	%patch -p1 -P 9
 	%patch -p1 -P 10
+	%patch -p1 -P 11
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.11
retrieving revision 1.8.2.12
diff -u -d -r1.8.2.11 -r1.8.2.12
--- Makefile	16 Nov 2009 12:45:52 -0000	1.8.2.11
+++ Makefile	16 Nov 2009 18:39:15 -0000	1.8.2.12
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3610.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Nov 16 21:33:42 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 21:33:42 +0100 (CET)
Subject: richard: server release-notes.txt,1.459,1.460 
Message-ID: <20091116203342.8F93360014C@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added issue3401 and 3428 for HEAD and the 2.2 branch

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -d -r1.459 -r1.460
--- release-notes.txt	7 Nov 2009 21:41:28 -0000	1.459
+++ release-notes.txt	16 Nov 2009 20:33:40 -0000	1.460
@@ -21,6 +21,12 @@
 
 	kolab/issue3555 (unable to save filter settings more than once)
 
+    - kolab-webadmin-2.2.3-2009????
+
+	kolab/issue3401 Change font color of the kolab-webadmin
+	kolab/issue3428 Present the checkbox in the "accept internet email"
+			nicer
+
     - Kolab_Filter-0.1.6-2009????
 
 	Added french translation. Submitted by Mathieu Parent
@@ -128,6 +134,12 @@
 
 
 Changes between 2.2.2 and 2.2.3:
+
+    - kolab-webadmin-2.2.3-2009????
+
+	kolab/issue3401 Change font color of the kolab-webadmin
+	kolab/issue3428 Present the checkbox in the "accept internet email"
+			nicer
 
     - Kolab_Filter-0.1.4-2009????
 



From cvs at kolab.org  Mon Nov 16 21:34:32 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 21:34:32 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.117,1.118 
Message-ID: <20091116203432.113C060014C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
corrected typo in date

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- ChangeLog	15 Nov 2009 21:35:23 -0000	1.117
+++ ChangeLog	16 Nov 2009 20:34:30 -0000	1.118
@@ -1,4 +1,4 @@
-2009-02-16 Richard Bos <richard at radoeka.nl>
+2009-11-16 Richard Bos <richard at radoeka.nl>
 
 	* www/admin/style.css: nicer, friendlier web interface color
 	  kolab/issue3401



From cvs at kolab.org  Mon Nov 16 22:19:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 22:19:48 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter issue3464.patch, NONE,
	1.1.2.1 issue3768.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.11,
	1.29.2.12 Kolab_Filter.spec, 1.19.2.14, 1.19.2.15 Makefile,
	1.8.2.12, 1.8.2.13 
Message-ID: <20091116211948.6B913600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3464.patch issue3768.patch 
Log Message:
 kolab/issue3464 (kolab-filter inserts double encoded utf-8 code  into From: header)

--- NEW FILE: issue3464.patch ---
diff -u -B -r1.4.2.4 -r1.4.2.7
--- Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	6 Nov 2009 11:07:57 -0000	1.4.2.4
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	16 Nov 2009 21:05:49 -0000	1.4.2.7
@@ -428,6 +428,9 @@
                                                       $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
                             return false;
                         } else {
+                            require_once 'Horde/String.php';
+                            require_once 'Horde/MIME.php';
+
                             /* Rewrite */
                             Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", 
                                                       $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -435,12 +438,12 @@
                                 if (property_exists($adr, 'personal')) {
                                     $name = str_replace(array("\\", '"'), 
                                                         array("\\\\",'\"'), 
-                                                        $adr->personal);
+                                                        MIME::decode($adr->personal, 'utf-8'));
                                 } else {
                                     $name = '';
                                 }
-                                $new_from = '"' . $name . ' ' . $untrusted . '"';
-                                return '=?utf-8?B?' . base64_encode($new_from) . '?= <' . $from . '>';
+                                $new_from = '"' . MIME::encode($name . ' ' . $untrusted) . '"';
+                                return  $new_from . ' <' . $from . '>';
                             } else {
                                 return true;
                             }

--- NEW FILE: issue3768.patch ---
diff -u -B -r1.15.2.8 -r1.15.2.9
--- Kolab_Filter/lib/Horde/Kolab/Resource.php	16 Nov 2009 10:18:05 -0000	1.15.2.8
+++ Kolab_Filter/lib/Horde/Kolab/Resource.php	16 Nov 2009 17:23:06 -0000	1.15.2.9
@@ -286,6 +286,20 @@
                 if (isset($attendees_params[$i]['ROLE'])) {
                     $attendee['role'] = $attendees_params[$i]['ROLE'];
                 }
+
+                if (isset($attendees_params[$i]['PARTSTAT'])) {
+                    $status = strtolower($attendees_params[$i]['PARTSTAT']);
+                    switch ($status) {
+                    case 'needs-action':
+                    case 'delegated':
+                        $attendee['status'] = 'none';
+                        break;
+                    default:
+                        $attendee['status'] = $status;
+                        break;
+                    }
+                }
+
                 $object['attendee'][] = $attendee;
             }
         }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.11
retrieving revision 1.29.2.12
diff -u -d -r1.29.2.11 -r1.29.2.12
--- ChangeLog	16 Nov 2009 18:39:14 -0000	1.29.2.11
+++ ChangeLog	16 Nov 2009 21:19:46 -0000	1.29.2.12
@@ -16,7 +16,10 @@
 
 	kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event
 	attendee status values)
-	
+
+	kolab/issue3464 (kolab-filter inserts double encoded utf-8 code
+	into From: header)
+
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.14
retrieving revision 1.19.2.15
diff -u -d -r1.19.2.14 -r1.19.2.15
--- Kolab_Filter.spec	16 Nov 2009 18:39:15 -0000	1.19.2.14
+++ Kolab_Filter.spec	16 Nov 2009 21:19:46 -0000	1.19.2.15
@@ -31,6 +31,7 @@
 Patch9:    revert_issue2495.patch
 Patch10:   issue3610.patch
 Patch11:   issue3768.patch
+Patch12:   issue3464.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -77,6 +78,7 @@
 	%patch -p1 -P 9
 	%patch -p1 -P 10
 	%patch -p1 -P 11
+	%patch -p1 -P 12
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.12
retrieving revision 1.8.2.13
diff -u -d -r1.8.2.12 -r1.8.2.13
--- Makefile	16 Nov 2009 18:39:15 -0000	1.8.2.12
+++ Makefile	16 Nov 2009 21:19:46 -0000	1.8.2.13
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3610.patch issue3768.patch issue3868.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 issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Nov 16 22:40:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 22:40:16 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.31,
	1.32 Kolab_Filter.spec, 1.23, 1.24 
Message-ID: <20091116214016.014B6600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_Filter.spec 
Log Message:
Update to Kolab_Filter-0.1.7.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	7 Nov 2009 21:41:28 -0000	1.31
+++ ChangeLog	16 Nov 2009 21:40:13 -0000	1.32
@@ -1,3 +1,7 @@
+2009-11-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: Update to 0.1.7.
+
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: Update to 0.1.6.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Kolab_Filter.spec	7 Nov 2009 21:41:28 -0000	1.23
+++ Kolab_Filter.spec	16 Nov 2009 21:40:13 -0000	1.24
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.1.6
-%define         V_release 20091107
+%define         V_version 0.1.7
+%define         V_release 20091116
 %define         V_sourceurl http://pear.horde.org/get
 
 # Package Information



From cvs at kolab.org  Mon Nov 16 22:44:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Nov 2009 22:44:24 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.460,1.461 
Message-ID: <20091116214424.1E989600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Update release notes for Kolab_Filter-0.1.7

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -d -r1.460 -r1.461
--- release-notes.txt	16 Nov 2009 20:33:40 -0000	1.460
+++ release-notes.txt	16 Nov 2009 21:44:22 -0000	1.461
@@ -27,7 +27,7 @@
 	kolab/issue3428 Present the checkbox in the "accept internet email"
 			nicer
 
-    - Kolab_Filter-0.1.6-2009????
+    - Kolab_Filter-0.1.7-2009????
 
 	Added french translation. Submitted by Mathieu Parent
 	(mathieuparent at users.sourceforge.net).
@@ -35,12 +35,12 @@
 	kolab/issue1336 (Resource booking fails, if TRANSP:TRANSPARENT in the
 	                 invitation)
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
-	kolab/issue2499 (Notification messages by the resource manager sould be
-	                 localized)
 	kolab/issue3289 (resmgr dies when it should accept, but has not Calender
 	                 folder access)
 	kolab/issue3364 (manpages for kolabfilter and kolabmailboxfilter)
 	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_Format-1.0.1-2009????
 
@@ -143,11 +143,16 @@
 
     - Kolab_Filter-0.1.4-2009????
 
+	kolab/issue2495 (The reply to an invitation with umlauts of a
+	                 group account doesn't display the umlauts.)
 	kolab/issue2499 (Notification messages by the resource manager
 	                 should be localized)
+	kolab/issue2544 (Encoding problem in cancelled appointments)
 	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
 	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
 	                 into From: header)
+	kolab/issue3610 (Mail to unknown at something.example.com gets
+	                 accepted and yields kolabmailboxfilter exit 38)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
 



From cvs at kolab.org  Tue Nov 17 10:18:59 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 10:18:59 +0100 (CET)
Subject: gunnar: server/clamav Makefile,1.7.2.2,1.7.2.3 
Message-ID: <20091117091859.266EF600811@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add an install target. The Makefile organisation is still suboptimal as the targets for source and binary packages should always be separated. But this is something for 2.3.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- Makefile	9 Nov 2009 17:08:38 -0000	1.7.2.2
+++ Makefile	17 Nov 2009 09:18:56 -0000	1.7.2.3
@@ -22,7 +22,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)
 	rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/
 
@@ -30,3 +30,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 Nov 17 10:18:59 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 10:18:59 +0100 (CET)
Subject: gunnar: server/db Makefile,1.5.2.3,1.5.2.4 
Message-ID: <20091117091859.253BD60080D@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Add an install target. The Makefile organisation is still suboptimal as the targets for source and binary packages should always be separated. But this is something for 2.3.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/db/Attic/Makefile,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- Makefile	9 Nov 2009 17:08:38 -0000	1.5.2.3
+++ Makefile	17 Nov 2009 09:18:57 -0000	1.5.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
@@ -21,3 +21,7 @@
 
 clean:
 	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).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 Nov 17 10:20:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 10:20:23 +0100 (CET)
Subject: gunnar: server update.mk,NONE,1.1.2.1 Makefile,1.76.2.3,1.76.2.4 
Message-ID: <20091117092023.1C85960080D@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Added Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
Added a preliminary update target. Does not work completely yet as some packages still have structural problems.

--- NEW FILE: update.mk ---
# Declare the packages that were updated between versions here. Each
# package must provide a "make install" procedure that will allow to
# update packages from CVS. Currently

# 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                   \
                    kolabd                  \
                    php-kolab/Kolab_Filter  \
                    kolab-webclient         \
# Hm, we can't update these automatically...
#                    openpkg                 \
#                    perl-kolab

# Set the new version we are aiming at after each release.
CVS_VERSION=2.2.3
# Determines the current version
CURRENT_VERSION=$(shell $(KOLABDIR)/bin/openpkg rpm -q kolabd | sed -e 's/kolabd-\([0-9.]*\)-[0-9]*/\1/')

KOLAB_SERVER_CVS=KOLAB_SERVER-$(CVS_VERSION)
KOLAB_SERVER_CURRENT=KOLAB_SERVER-$(CURRENT_VERSION)


.PHONY: update
update: current

.PHONY:current
current: $(KOLAB_SERVER_CVS)

.PHONY:$(KOLAB_SERVER_CVS)
$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.2
	for UPDATE in $(UPDATES_2.2.2_2.2.3);   \
	do                                      \
	  make -C $$UPDATE install || exit $$?; \
	done


ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.2"
.PHONY:KOLAB_SERVER-2.2.2
KOLAB_SERVER-2.2.2:
	@echo "You are using Kolab Server 2.2.2. Updating from there..."
else
.PHONY:KOLAB_SERVER-2.2.2
KOLAB_SERVER-2.2.2:
	@echo "You are using Kolab Server $(CURRENT_VERSION)."
	@echo "The update operation is not supported for server versions below 2.2.2"
	@exit 1
endif
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.76.2.3
retrieving revision 1.76.2.4
diff -u -d -r1.76.2.3 -r1.76.2.4
--- Makefile	9 Nov 2009 17:33:54 -0000	1.76.2.3
+++ Makefile	17 Nov 2009 09:20:21 -0000	1.76.2.4
@@ -1,4 +1,5 @@
 include kolab.mk
+include update.mk
 
 BASE_PACKAGES=php-smarty              \
               openldap                \
@@ -64,19 +65,6 @@
                php-kolab/Kolab_Freebusy \
                php-kolab/Kolab_Filter   \
 
-# These are the packages that already provide a "make install"
-# procedure that will allow to update packages from CVS.
-UPDATES=imapd                   \
-        apache-php              \
-        php                     \
-        kolabd                  \
-        pear/Horde_Notification \
-        pear/Horde_Prefs        \
-        php-kolab/Kolab_Filter  \
-        php-kolab/Kolab_Server  \
-        php-kolab/Kolab_Storage \
-        kolab-webclient
-
 PHPUNIT=$(KOLABDIR)/bin/phpunit
 
 PHPUNIT_TESTS=$(KOLABDIR)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
@@ -142,13 +130,6 @@
 	for PKG in $(PEAR_PACKAGES);                   \
 	do                                              \
 	  make -C $$PKG clean || exit $$?;              \
-	done
-
-.PHONY: update
-update:
-	for UPDATE in $(UPDATES);               \
-	do                                      \
-	  make -C $$UPDATE install || exit $$?; \
 	done
 
 .PHONY: test



From cvs at kolab.org  Tue Nov 17 17:23:50 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 17:23:50 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.166,1.167 
Message-ID: <20091117162350.50753600820@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Kolab Security Issue 25 20091117 (clamav)


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- index.html.m4	2 Oct 2009 13:06:13 -0000	1.166
+++ index.html.m4	17 Nov 2009 16:23:47 -0000	1.167
@@ -59,6 +59,19 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 <table>
+<tr><td class="newsd">November 17th, 2009</td>
+<td class="newsh">&raquo;
+  Security Issue 25 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  A new ClamAV RPM with various fixes is available.  See the
+  <a href="security/kolab-vendor-notice-25.txt">Kolab Security Issue 25</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">October 2nd, 2009</td>
 <td class="newsh">&raquo;
   Security Issue 24 for Kolab Server (imapd)



From cvs at kolab.org  Tue Nov 17 17:23:50 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 17:23:50 +0100 (CET)
Subject: thomas: doc/www/src/security kolab-vendor-notice-25.txt,NONE,1.1 
Message-ID: <20091117162350.4FF37600819@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab-vendor-notice-25.txt 
Log Message:
Kolab Security Issue 25 20091117 (clamav)


--- NEW FILE: kolab-vendor-notice-25.txt ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Kolab Security Issue 25 20091117
================================

Package:              Kolab Server, ClamAV
Vulnerability:        various
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

ClamAV is prone to multiple vulnerabilities because it fails to properly
restrict certain files after scanning them. A successful attack may allow
malicious users to bypass security restrictions placed on certain files.

Further unpublished vulnerabilities may habe been fixed.


Affected Versions
~~~~~~~~~~~~~~~~~

This affects versions of ClamAV up to version 0.95.1
Kolab Server 2.2.2 and previous releases are affected.


Fix
~~~

Upgrade to ClamAV 0.95.3.

OpenPKG packages for Kolab Server 2.2.2 are available from
http://files.kolab.org/server/security-updates/20091117/
or from the mirrors listed on http://kolab.org/mirrors.html

A binary RPM for Kolab Server 2.2.2 (ix86 Debian GNU/Linux Lenny)
is available as clamav-0.95.3-20091030.ix86-debian5.0-kolab.rpm

A binary RPM for Kolab Server 2.2.2 (ix86 Debian GNU/Linux Etch)
is available as clamav-0.95.3-20091030.ix86-debian4.0-kolab.rpm

The source and binary packages have been verified to work with Kolab Server
2.2.0, so you can upgrade this package without doing a full upgrade.

All other server versions: Please upgrade to Kolab Server 2.2.x and install
the updated package.


You can check the integrity of the downloaded files with:

$ gpg --keyserver keys.gnupg.net --recv-key 5816791A
  or import the key from https://www.intevation.de/~thomas/gpg_pub_key.asc
$ gpg --verify SHA1SUMS.sig
$ sha1sum -c SHA1SUMS


The source package can be compiled and installed on your Kolab Server with:

# su - kolab
$ openpkg rpm --rebuild ...path/to.../clamav-0.95.3-20091030.src.rpm
$ openpkg rpm -Uvh /kolab/RPM/PKG/clamav-0.95.3-20091030.<ARCH>-<OS>-kolab.rpm
$ rm /kolab/etc/clamav/*.rpmsave
$ openpkg rc clamav stop
$ openpkg rc clamav start
$ exit
# su - kolab-r
$ freshclam
$ rm -r /kolab/share/clamav/*.inc

To install a binary package, just skip the --rebuild step.


Details
~~~~~~~

http://sourceforge.net/project/shownotes.php?release_id=688880
	ClamAV 0.95.2 release notes

(bugfix release, only the ChangeLog has been published)
	ClamAV 0.95.3 release notes

http://www.securityfocus.com/bid/35426
	ClamAV CAB/RAR/ZIP File Scan Evasion Vulnerability

http://www.securityfocus.com/bid/35398
	ClamAV Embedded Archive File Scan Evasion Vulnerability

http://www.securityfocus.com/bid/35410
	ClamAV Prior to 0.95.2 Multiple Scanner Bypass Vulnerabilities


Timeline
~~~~~~~~
    20090610 ClamAV release 0.95.2.
    20091028 ClamAV release 0.95.3.
    20091030 Update available via Kolab CVS, started testing.
    20091117 Kolab Server security advisory published.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAksCzQ0ACgkQW7P1GVgWeRqF7ACfYpZy6hiKZRgfRpiM6VQSmRS7
uUYAoInVoYSjG5adf9IszUFDjV9zmsDL
=a8+C
-----END PGP SIGNATURE-----



From cvs at kolab.org  Tue Nov 17 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 18:12:37 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.67,1.398.2.68 
Message-ID: <20091117171237.2FA18600805@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.67
retrieving revision 1.398.2.68
diff -u -d -r1.398.2.67 -r1.398.2.68
--- release-notes.txt	16 Nov 2009 18:39:14 -0000	1.398.2.67
+++ release-notes.txt	17 Nov 2009 17:12:35 -0000	1.398.2.68
@@ -77,6 +77,11 @@
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
 
+    - kolab-webadmin-2.2.2-2009????
+
+	kolab/issue919 (kolab server has problems with some characters in
+	                passwords)
+
     - kolab-webclient-1.2.0-20090514
 
 	SECURITY: Fixed image upload form issue.
@@ -113,6 +118,8 @@
 
     - perl-kolab-2.2.3-2009????
 
+	kolab/issue919 (kolab server has problems with some characters in
+	                passwords)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
 



From cvs at kolab.org  Tue Nov 17 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 18:12:37 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.5,
	1.110.2.6 
Message-ID: <20091117171237.348E460080D@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.110.2.5
retrieving revision 1.110.2.6
diff -u -d -r1.110.2.5 -r1.110.2.6
--- ChangeLog	16 Nov 2009 18:33:23 -0000	1.110.2.5
+++ ChangeLog	17 Nov 2009 17:12:35 -0000	1.110.2.6
@@ -1,3 +1,8 @@
+2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
+
+	* php/admin/include/auth.class.php.in: kolab/issue919 (kolab
+	server has problems with some characters in passwords)
+
 2009-11-16 Richard Bos <richard at radoeka.nl>
 	* www/admin/style.css: nicer, friendlier web interface color
 	  kolab/issue3401



From cvs at kolab.org  Tue Nov 17 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 18:12:37 +0100 (CET)
Subject: gunnar: server/perl-kolab/bin kolabpasswd.in,1.2,1.2.2.1 
Message-ID: <20091117171237.3DD0E600812@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolabpasswd.in 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords)

Index: kolabpasswd.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolabpasswd.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- kolabpasswd.in	20 Jan 2009 17:22:12 -0000	1.2
+++ kolabpasswd.in	17 Nov 2009 17:12:35 -0000	1.2.2.1
@@ -49,6 +49,8 @@
 use IO::File;
 use File::Temp;
 use Net::LDAP;
+use Digest::SHA1;
+use MIME::Base64;
 use Kolab::Util;
 use Kolab;
 
@@ -79,6 +81,36 @@
   return $hashpw;
 }
 
+# Taken from Crypt::SaltedHash
+sub __generate_hex_salt {
+
+    my @keychars = (
+        "0", "1", "2", "3", "4", "5", "6", "7",
+        "8", "9", "a", "b", "c", "d", "e", "f"
+    );
+    my $length = shift || 8;
+
+    my $salt = '';
+    my $max  = scalar @keychars;
+    for my $i ( 0 .. $length - 1 ) {
+        my $skip = $i == 0 ? 1 : 0;    # don't let the first be 0
+        $salt .= $keychars[ $skip + int( rand( $max - $skip ) ) ];
+    }
+
+    return pack( "H*", $salt);
+}
+
+# Hash a password without using slappasswd
+sub hashPassword2 {
+  my $pw = shift;
+  my $ctx = Digest::SHA1->new;
+  my $salt = __generate_hex_salt();
+  $ctx->add($pw);
+  $ctx->add($salt);
+  my $hashpw = '{SSHA}' . encode_base64($ctx->digest . $salt ,'');
+  return $hashpw;
+}
+
 # open old kolab master config file
 my $kolabconfname = "@CONFIG_DIR@/kolab.conf";
 
@@ -129,7 +161,7 @@
 my $tmp = new File::Temp( TEMPLATE => 'tempXXXXX', DIR => '@CONFIG_DIR@', UNLINK => 0, SUFFIX => '.conf')
      || die "Error: could not create temporary file under @CONFIG_DIR@";
 $tmpfilename = $tmp->filename;
-$bind_pw_hash = hashPassword($new_password);
+$bind_pw_hash = hashPassword2($new_password);
 
 # copy and replace old config to temporary file
 foreach ($kolabconf->getlines()) {



From cvs at kolab.org  Tue Nov 17 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 18:12:37 +0100 (CET)
Subject: gunnar: server/perl-kolab/sbin kolab_bootstrap.in,1.7.2.1,1.7.2.2 
Message-ID: <20091117171237.42574600818@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab_bootstrap.in 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords)

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- kolab_bootstrap.in	17 Jul 2009 14:44:27 -0000	1.7.2.1
+++ kolab_bootstrap.in	17 Nov 2009 17:12:35 -0000	1.7.2.2
@@ -63,6 +63,8 @@
 use Term::ReadKey;
 use Time::Local;
 use Time::localtime;
+use Digest::SHA1;
+use MIME::Base64;
 
 # Reload only kolab.globals into our configuration.
 Kolab::reloadConfig("@CONFIG_DIR@/kolab.globals", 1);
@@ -123,6 +125,36 @@
   return $hashpw;
 }
 
+# Taken from Crypt::SaltedHash
+sub __generate_hex_salt {
+
+    my @keychars = (
+        "0", "1", "2", "3", "4", "5", "6", "7",
+        "8", "9", "a", "b", "c", "d", "e", "f"
+    );
+    my $length = shift || 8;
+
+    my $salt = '';
+    my $max  = scalar @keychars;
+    for my $i ( 0 .. $length - 1 ) {
+        my $skip = $i == 0 ? 1 : 0;    # don't let the first be 0
+        $salt .= $keychars[ $skip + int( rand( $max - $skip ) ) ];
+    }
+
+    return pack( "H*", $salt);
+}
+
+# Hash a password without using slappasswd
+sub hashPassword2 {
+  my $pw = shift;
+  my $ctx = Digest::SHA1->new;
+  my $salt = __generate_hex_salt();
+  $ctx->add($pw);
+  $ctx->add($salt);
+  my $hashpw = '{SSHA}' . encode_base64($ctx->digest . $salt ,'');
+  return $hashpw;
+}
+
 # Ask the user a question
 sub getUserInput {
   my $text = shift;
@@ -276,7 +308,7 @@
 my $is_master = $kolab_config{'is_master'} || "true";
 my $bind_dn = $kolab_config{'bind_dn'} || die "could not read bind_dn from $kolab_config";
 my $bind_pw = $kolab_config{'bind_pw'} || die "could not read bind_pw from $kolab_config";
-my $bind_pw_hash = $kolab_config{'bind_pw_hash'} || hashPassword( $bind_pw );
+my $bind_pw_hash = $kolab_config{'bind_pw_hash'} || hashPassword2( $bind_pw );
 my $ldap_uri = $kolab_config{'ldap_uri'} || die "could not read ldap_uri from $kolab_config";
 my $base_dn = $kolab_config{'base_dn'} || die "could not read base_dn from $kolab_config";
 my $php_dn = $kolab_config{'php_dn'} || die "could not read php_dn from $kolab_config";
@@ -354,7 +386,7 @@
       chomp $bind_pw;
       $bind_pw = getUserInput("Please choose a manager password", $bind_pw);
       print " bind_pw : $bind_pw\n";
-      $bind_pw_hash = hashPassword($bind_pw);
+      $bind_pw_hash = hashPassword2($bind_pw);
     }
 
     # Generate passwords
@@ -430,7 +462,7 @@
       $Kolab::config{'directory_replication_mode_is_syncrepl'} = 'true' if ($Kolab::config{'directory_mode'} eq 'syncrepl');
       $Kolab::config{"base_dn"} = $base_dn;
       $Kolab::config{"bind_dn"} = $bind_dn;
-      $Kolab::config{"bind_pw_hash"} = $bind_pw;
+      $Kolab::config{"bind_pw_hash"} = $bind_pw_hash;
       $Kolab::config{"slurpd_addr"} = $slurpd_addr;
       $Kolab::config{"slurpd_port"} = $slurpd_port;
 
@@ -556,7 +588,7 @@
       # create php read-only user
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,cn=internal,$base_dn" );
       $ldapobject->replace('cn' => 'nobody', 'sn' => 'n/a n/a', 'uid' => 'nobody',
-                           'userPassword' => hashPassword($php_pw),
+                           'userPassword' => hashPassword2($php_pw),
                            'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn("cn=nobody,cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
@@ -566,7 +598,7 @@
       # create calendar user
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=$calendar_id@" . $domain . ",cn=internal,$base_dn" );
       $ldapobject->replace('cn' => $calendar_id . '@' . $domain, 'sn' => 'n/a n/a', 'uid' => $calendar_id . '@' . $domain,
-                           'userPassword' => hashPassword($calendar_pw),
+                           'userPassword' => hashPassword2($calendar_pw),
                            'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn("cn=$calendar_id@" . $domain . ",cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
@@ -693,7 +725,7 @@
 
   $bind_dn = "cn=manager,cn=internal,$base_dn";
   $bind_pw = getUserInput("Manager password");
-  $bind_pw_hash = hashPassword($bind_pw);
+  $bind_pw_hash = hashPassword2($bind_pw);
 
   my $confname = "$Kolab::config{'sasl_smtpconffile'}";
   copy("@CONFIG_DIR@/templates/smtpd.conf.template", $confname) || die "could not write to $confname";



From cvs at kolab.org  Tue Nov 17 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 18:12:37 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.3,1.56.2.4 
Message-ID: <20091117171237.4824B600819@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.3
retrieving revision 1.56.2.4
diff -u -d -r1.56.2.3 -r1.56.2.4
--- ChangeLog	17 Jul 2009 14:49:47 -0000	1.56.2.3
+++ ChangeLog	17 Nov 2009 17:12:35 -0000	1.56.2.4
@@ -1,3 +1,11 @@
+2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
+
+	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems
+	with some characters in passwords)
+
+	* sbin/kolab_bootstrap.in: kolab/issue919 (kolab server has
+	problems with some characters in passwords)
+
 2009-07-17  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* sbin/kolab_bootstrap.in: Read bind_pw_hash from Kolab master server,



From cvs at kolab.org  Tue Nov 17 18:12:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Nov 2009 18:12:37 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
	auth.class.php.in, 1.4, 1.4.2.1 
Message-ID: <20091117171237.3844E600811@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	auth.class.php.in 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords)

Index: auth.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- auth.class.php.in	8 Sep 2008 17:52:30 -0000	1.4
+++ auth.class.php.in	17 Nov 2009 17:12:35 -0000	1.4.2.1
@@ -70,12 +70,12 @@
 						$this->error_string = _("User class '$tmp_group' is denied access");
 						$this->gotoLoginPage();					  
 					}
-					$bind_result = $ldap->bind( $dn, $_POST['password'] );
+					$bind_result = $ldap->bind( $dn, stripslashes($_POST['password']));
 					if( $bind_result ) {
 						// All OK!
 						$_SESSION['auth_dn'] = $dn;
 						$_SESSION['auth_user'] = $auth_user;
-						$_SESSION['auth_pw'] = $_POST['password'];
+						$_SESSION['auth_pw'] = stripslashes($_POST['password']);
 						$_SESSION['auth_group'] = $auth_group;
 						$_SESSION['remote_ip'] = $_SERVER['REMOTE_ADDR'];
 						return true;



From cvs at kolab.org  Wed Nov 18 21:55:36 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 18 Nov 2009 21:55:36 +0100 (CET)
Subject: richard: server release-notes.txt,1.398.2.68,1.398.2.69 
Message-ID: <20091118205536.77E7B600812@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Added issues 3401 and 3428 for kolab_2_2_branch

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.68
retrieving revision 1.398.2.69
diff -u -d -r1.398.2.68 -r1.398.2.69
--- release-notes.txt	17 Nov 2009 17:12:35 -0000	1.398.2.68
+++ release-notes.txt	18 Nov 2009 20:55:34 -0000	1.398.2.69
@@ -62,6 +62,12 @@
 	kolab/issue2499 (Notification messages by the resource manager
 	                 should be localized)
 
+    - kolab-webadmin-2.2.3-2009????
+
+	kolab/issue3401 Change font color of the kolab-webadmin
+	kolab/issue3428 Present the checkbox in the "accept internet email"
+			nicer
+
     - Kolab_Filter-0.1.4-2009????
 
 	kolab/issue2495 (The reply to an invitation with umlauts of a



From cvs at kolab.org  Thu Nov 19 21:06:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Nov 2009 21:06:09 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.6,
	1.110.2.7 
Message-ID: <20091119200609.DEC0F60015E@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Revert the font color back to black, as it used to be.
The revert is discussed in issue/kolab3401.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.110.2.6
retrieving revision 1.110.2.7
diff -u -d -r1.110.2.6 -r1.110.2.7
--- ChangeLog	17 Nov 2009 17:12:35 -0000	1.110.2.6
+++ ChangeLog	19 Nov 2009 20:06:07 -0000	1.110.2.7
@@ -4,8 +4,6 @@
 	server has problems with some characters in passwords)
 
 2009-11-16 Richard Bos <richard at radoeka.nl>
-	* www/admin/style.css: nicer, friendlier web interface color
-	  kolab/issue3401
 	* php/admin/templates/settings.tpl: Use a table to separate the
 	  checkbox and text, for nicer formatting.  kolab/issue3428
 



From cvs at kolab.org  Thu Nov 19 21:06:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Nov 2009 21:06:09 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin style.css,
	1.11.2.1, 1.11.2.2 
Message-ID: <20091119200609.DFA69600800@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	style.css 
Log Message:
Revert the font color back to black, as it used to be.
The revert is discussed in issue/kolab3401.



Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- style.css	16 Nov 2009 18:33:23 -0000	1.11.2.1
+++ style.css	19 Nov 2009 20:06:07 -0000	1.11.2.2
@@ -4,7 +4,7 @@
   End:
 */
 body {
-  color: #001155;
+  color: black;
   background-color: #F8FCF8;
   font-family: verdana,arial,helvetica,sans-serif;
   font-size: 95%;



From cvs at kolab.org  Thu Nov 19 21:06:58 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Nov 2009 21:06:58 +0100 (CET)
Subject: richard: server release-notes.txt,1.398.2.69,1.398.2.70 
Message-ID: <20091119200658.AD32060015E@lists.intevation.de>

Author: richard

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
The change by kolab/issue3401 has been reverted

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.69
retrieving revision 1.398.2.70
diff -u -d -r1.398.2.69 -r1.398.2.70
--- release-notes.txt	18 Nov 2009 20:55:34 -0000	1.398.2.69
+++ release-notes.txt	19 Nov 2009 20:06:56 -0000	1.398.2.70
@@ -64,7 +64,6 @@
 
     - kolab-webadmin-2.2.3-2009????
 
-	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  Sat Nov 21 10:50:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 21 Nov 2009 10:50:09 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.19,1.20 
Message-ID: <20091121095009.DCA7760015E@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
Renamed the argument list to status, and made the output alphanumeric.

The argument list now displays the list of related kolab processes.



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolabsrv.in	8 Nov 2009 13:55:24 -0000	1.19
+++ kolabsrv.in	21 Nov 2009 09:50:07 -0000	1.20
@@ -69,7 +69,7 @@
 PARAM=$3
 
 # Use the service name as defined in the openpkg environment
-# Kolab installations on native distributions, should adap service names
+# Kolab installations on native distributions, should adapt service names
 # with the function getServiceName
 SERVICES="openldap sasl spamd amavisd apache freshclam imapd postfix"
 SERVICES="$SERVICES clamav kolabd"
@@ -79,6 +79,15 @@
 	# okay
 	;;
 list)
+	# Provide an alphanumerical list of services.
+	for S in $SERVICES; do
+		getServiceName $S
+		echo $SERVICE
+	done | tr " " "\n" | sort | tr "\n" " "
+	echo
+	exit
+	;;
+status)
 	for S in $SERVICES; do
 		getServiceName $S
 		case $S in
@@ -93,13 +102,13 @@
 
 	echo "Groupware services:"
 	echo "-------------------"
-	chkconfig --list $GROUPWARE_SERVICES
+	chkconfig --list $(tr " " "\n" <<< $GROUPWARE_SERVICES | sort)
 	echo "All the above listed groupware services must be active."
 	echo
 
 	echo "Defensive services:"
 	echo "-------------------"
-	chkconfig --list $DEFENSIVE_SERVICES
+	chkconfig --list $(tr " " "\n" <<< $DEFENSIVE_SERVICES | sort)
 
 	if [[ "$ENABLE_VIRUS_SCAN" == "no" ]]; then
 		echo "SPAM detection and virus scanning are disabled."
@@ -116,8 +125,11 @@
 	( [[ -n "$RC" ]] && echo "ERROR: $RC not supported"
 	  echo "Use: $PRGNAME rc [all|$SERVICES] [stop|start|restart|status]"
 	  echo
-	  echo "Display the state of the all kolab related processes:"
+	  echo "Obtain a list of all kolab related processes:"
 	  echo "  $PRGNAME list"
+	  echo
+	  echo "Display the state of the all kolab related processes:"
+	  echo "  $PRGNAME status"
 	) >&2
 
 	exit 1



From cvs at kolab.org  Mon Nov 23 22:55:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 22:55:23 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.264,1.265 
Message-ID: <20091123215523.2A866600805@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
- remove spamd as service, for more info refer to
  https://issues.kolab.org/issue3953
- services can be listed in execution and alphabetical order
- changed the method to determine a distribution



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- ChangeLog	8 Nov 2009 13:55:24 -0000	1.264
+++ ChangeLog	23 Nov 2009 21:55:20 -0000	1.265
@@ -1,3 +1,10 @@
+2009-11-23 Richard Bos <richard at radoeka.nl>
+
+	* dist_conf/kolabsrv.in: remove spamd as service, for more info
+	  refer to https://issues.kolab.org/issue3953
+	  - services can be listed in execution and alphabetical order
+	  - changed the method to determine a distribution
+
 2009-11-08 Richard Bos <richard at radoeka.nl>
 
 	* dist_conf/kolabsrv.in: added list option, to show the involved 



From cvs at kolab.org  Mon Nov 23 22:55:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 22:55:23 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.20,1.21 
Message-ID: <20091123215523.2CC8A600806@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
- remove spamd as service, for more info refer to
  https://issues.kolab.org/issue3953
- services can be listed in execution and alphabetical order
- changed the method to determine a distribution



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolabsrv.in	21 Nov 2009 09:50:07 -0000	1.20
+++ kolabsrv.in	23 Nov 2009 21:55:21 -0000	1.21
@@ -36,7 +36,8 @@
 	sname=$1
 	# Perhaps better use:
 	# lsb_release -i | cut -f2
-	if [ -e /etc/SuSE-release ]; then
+	case $system in
+	opensuse)
 		case $sname in
 			apache) SERVICE="apache2" ;;
 			openldap) SERVICE="@LDAPD@" ;;
@@ -46,7 +47,8 @@
 			clamav) SERVICE="clamd" ;;
 			*) SERVICE=$sname
 		esac
-	elif [ -e /etc/debian_version ]; then
+		;;
+	debian)
 		case $sname in
 			apache) SERVICE="apache2" ;;
 			openldap) SERVICE="@LDAPD@" ;;
@@ -58,9 +60,29 @@
 			freshclam) SERVICE="clamav-freshclam" ;;
 			*) SERVICE=$sname
 		esac
-	fi
+		;;
+	esac
 }	
 
+# Copied from the script /etc/init.d/vboxadd from Virtualbox
+# That script has more nice code, for e.g. displaying the result of
+# executed commands.
+if [ -f /etc/arch-release ]; then
+	system=arch
+elif [ -f /etc/redhat-release ]; then
+	system=redhat
+elif [ -f /etc/SuSE-release ]; then
+	system=opensuse
+elif [ -f /etc/gentoo-release ]; then
+	system=gentoo
+elif [ -e /etc/debian_version ]; then
+	system=debian  
+elif [ -f /etc/lfs-release -a -d /etc/rc.d/init.d ]; then
+	system=lfs
+else
+	system=other
+fi
+
 [[ -f /etc/kolab/profile.sh ]] && . /etc/kolab/profile.sh
 
 # variables
@@ -71,20 +93,33 @@
 # Use the service name as defined in the openpkg environment
 # Kolab installations on native distributions, should adapt service names
 # with the function getServiceName
-SERVICES="openldap sasl spamd amavisd apache freshclam imapd postfix"
+#
+# In earlier days, spamd was part of the services as well.  But as
+# spamassassin is used as library for amavisd, it is not needed to run it
+# as a seperate service.  More information about this topic can be found
+# at https://issues.kolab.org/issue3953
+SERVICES="openldap sasl amavisd apache freshclam imapd postfix"
 SERVICES="$SERVICES clamav kolabd"
 
 case $RC in 
 rc)
 	# okay
 	;;
-list)
+*list)
 	# Provide an alphanumerical list of services.
 	for S in $SERVICES; do
 		getServiceName $S
-		echo $SERVICE
-	done | tr " " "\n" | sort | tr "\n" " "
-	echo
+		DIST_SERVICES="$DIST_SERVICES $SERVICE"
+	done
+	case $RC in
+	alphalist)
+		echo $DIST_SERVICES | tr " " "\n" | sort | tr "\n" " "
+		echo
+		;;
+	*)
+		echo $DIST_SERVICES
+		;;
+	esac
 	exit
 	;;
 status)
@@ -125,8 +160,12 @@
 	( [[ -n "$RC" ]] && echo "ERROR: $RC not supported"
 	  echo "Use: $PRGNAME rc [all|$SERVICES] [stop|start|restart|status]"
 	  echo
-	  echo "Obtain a list of all kolab related processes:"
+	  echo "Obtain a list of all kolab related processes;"
+	  echo "- in execution order:"
 	  echo "  $PRGNAME list"
+	  echo
+	  echo "- in alphabetical order:"
+	  echo "  $PRGNAME alphalist"
 	  echo
 	  echo "Display the state of the all kolab related processes:"
 	  echo "  $PRGNAME status"



From cvs at kolab.org  Mon Nov 23 23:32:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:32:15 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
	auth.class.php.in, 1.4.2.1, 1.4.2.2 
Message-ID: <20091123223215.AE1B860081B@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	auth.class.php.in 
Log Message:
Revert the commit for kolab/issue919 as the kolab-webadmin specific part of the problem needs to be addressed in a different way.

Index: auth.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php.in,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- auth.class.php.in	17 Nov 2009 17:12:35 -0000	1.4.2.1
+++ auth.class.php.in	23 Nov 2009 22:32:13 -0000	1.4.2.2
@@ -70,12 +70,12 @@
 						$this->error_string = _("User class '$tmp_group' is denied access");
 						$this->gotoLoginPage();					  
 					}
-					$bind_result = $ldap->bind( $dn, stripslashes($_POST['password']));
+					$bind_result = $ldap->bind( $dn, $_POST['password'] );
 					if( $bind_result ) {
 						// All OK!
 						$_SESSION['auth_dn'] = $dn;
 						$_SESSION['auth_user'] = $auth_user;
-						$_SESSION['auth_pw'] = stripslashes($_POST['password']);
+						$_SESSION['auth_pw'] = $_POST['password'];
 						$_SESSION['auth_group'] = $auth_group;
 						$_SESSION['remote_ip'] = $_SERVER['REMOTE_ADDR'];
 						return true;



From cvs at kolab.org  Mon Nov 23 23:32:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:32:15 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.7,
	1.110.2.8 
Message-ID: <20091123223215.A9A9F600805@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Revert the commit for kolab/issue919 as the kolab-webadmin specific part of the problem needs to be addressed in a different way.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.110.2.7
retrieving revision 1.110.2.8
diff -u -d -r1.110.2.7 -r1.110.2.8
--- ChangeLog	19 Nov 2009 20:06:07 -0000	1.110.2.7
+++ ChangeLog	23 Nov 2009 22:32:13 -0000	1.110.2.8
@@ -1,8 +1,3 @@
-2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
-
-	* php/admin/include/auth.class.php.in: kolab/issue919 (kolab
-	server has problems with some characters in passwords)
-
 2009-11-16 Richard Bos <richard at radoeka.nl>
 	* php/admin/templates/settings.tpl: Use a table to separate the
 	  checkbox and text, for nicer formatting.  kolab/issue3428



From cvs at kolab.org  Mon Nov 23 23:35:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:35:03 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.234.2.10,1.234.2.11 
Message-ID: <20091123223503.C8C95600805@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
        kolab/issue919 (kolab server has problems with some characters in
        passwords)

        kolab/issue1880 (Poor handling of apostrophes in ldap and admin
        webpages)

        kolab/issue3654 (Special character issue in Kolab web
        interface (e.g. vacation message))

        kolab/issue3499 (creating/modifying users with special characters
        in name confuses web admin)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.10
retrieving revision 1.234.2.11
diff -u -d -r1.234.2.10 -r1.234.2.11
--- ChangeLog	13 Oct 2009 12:37:27 -0000	1.234.2.10
+++ ChangeLog	23 Nov 2009 22:35:01 -0000	1.234.2.11
@@ -1,3 +1,19 @@
+2009-11-23  Gunnar Wrobel <wrobel at pardus.de>
+
+	* templates/php.ini.template.in (magic_quotes_gpc):
+
+	kolab/issue919 (kolab server has problems with some characters in
+	passwords)
+
+	kolab/issue1880 (Poor handling of apostrophes in ldap and admin
+	webpages)
+
+	kolab/issue3654 (Special character issue in Kolab web
+	interface (e.g. vacation message))
+
+	kolab/issue3499 (creating/modifying users with special characters
+	in name confuses web admin)
+
 2009-05-14  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/main.cf.template.in, templates/master.cf.template.in:



From cvs at kolab.org  Mon Nov 23 23:35:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:35:03 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates php.ini.template.in, 1.7,
	1.7.2.1 
Message-ID: <20091123223503.CA867600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	php.ini.template.in 
Log Message:
        kolab/issue919 (kolab server has problems with some characters in
        passwords)

        kolab/issue1880 (Poor handling of apostrophes in ldap and admin
        webpages)

        kolab/issue3654 (Special character issue in Kolab web
        interface (e.g. vacation message))

        kolab/issue3499 (creating/modifying users with special characters
        in name confuses web admin)


Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- php.ini.template.in	7 Nov 2007 10:37:53 -0000	1.7
+++ php.ini.template.in	23 Nov 2009 22:35:01 -0000	1.7.2.1
@@ -21,6 +21,11 @@
 memory_limit       = 64M    ; Maximum amount of memory a script may consume
 post_max_size      = 8M     ; Maximum amount of POST data accepted
 
+magic_quotes_gpc   = 0      ; Automatically quote posted variables. Required to be "0" for the
+                            ; webadmin to work. Horde does not care and removes them anyway if
+                            ; the setting is "1". The setting will be removed in PHP 6 and "0"
+                            ; will be the default then.
+
 error_reporting    = E_ALL
 error_log          = @webserver_logdir@/php/php-errors.log
 upload_tmp_dir     = @webserver_tmpdir@



From cvs at kolab.org  Mon Nov 23 23:35:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:35:03 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.70,1.398.2.71 
Message-ID: <20091123223503.BDCB0600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
        kolab/issue919 (kolab server has problems with some characters in
        passwords)

        kolab/issue1880 (Poor handling of apostrophes in ldap and admin
        webpages)

        kolab/issue3654 (Special character issue in Kolab web
        interface (e.g. vacation message))

        kolab/issue3499 (creating/modifying users with special characters
        in name confuses web admin)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.70
retrieving revision 1.398.2.71
diff -u -d -r1.398.2.70 -r1.398.2.71
--- release-notes.txt	19 Nov 2009 20:06:56 -0000	1.398.2.70
+++ release-notes.txt	23 Nov 2009 22:35:01 -0000	1.398.2.71
@@ -59,8 +59,16 @@
 
     - kolabd-2.2.3-2009????
 
+	kolab/issue919  (kolab server has problems with some characters in
+	                 passwords)
+	kolab/issue1880 (Poor handling of apostrophes in ldap and admin
+	                 webpages)
 	kolab/issue2499 (Notification messages by the resource manager
 	                 should be localized)
+	kolab/issue3654 (Special character issue in Kolab web
+	                 interface (e.g. vacation message))
+	kolab/issue3499 (creating/modifying users with special characters
+	                 in name confuses web admin)
 
     - kolab-webadmin-2.2.3-2009????
 
@@ -81,11 +89,6 @@
 	                 accepted and yields kolabmailboxfilter exit 38)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
-
-    - kolab-webadmin-2.2.2-2009????
-
-	kolab/issue919 (kolab server has problems with some characters in
-	                passwords)
 
     - kolab-webclient-1.2.0-20090514
 



From cvs at kolab.org  Mon Nov 23 23:42:17 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:42:17 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.461,1.462 
Message-ID: <20091123224217.D404E600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)

        kolab/issue1880 (Poor handling of apostrophes in ldap and admin
        webpages)

        kolab/issue3654 (Special character issue in Kolab web
        interface (e.g. vacation message))

        kolab/issue3499 (creating/modifying users with special characters
        in name confuses web admin)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -d -r1.461 -r1.462
--- release-notes.txt	16 Nov 2009 21:44:22 -0000	1.461
+++ release-notes.txt	23 Nov 2009 22:42:15 -0000	1.462
@@ -134,6 +134,20 @@
 
 
 Changes between 2.2.2 and 2.2.3:
+(TODOs might need to be merged from kolab_2_2_branch!)
+
+      - kolabd-2.2.3-2009????
+  
+	kolab/issue919  (kolab server has problems with some characters in
+	                 passwords)
+	kolab/issue1880 (Poor handling of apostrophes in ldap and admin
+	                 webpages)
+TODO:	kolab/issue2499 (Notification messages by the resource manager
+	                 should be localized)
+	kolab/issue3654 (Special character issue in Kolab web
+	                 interface (e.g. vacation message))
+	kolab/issue3499 (creating/modifying users with special characters
+	                 in name confuses web admin)
 
     - kolab-webadmin-2.2.3-2009????
 



From cvs at kolab.org  Mon Nov 23 23:42:17 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:42:17 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.265,1.266 
Message-ID: <20091123224217.DB9EB600805@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)

        kolab/issue1880 (Poor handling of apostrophes in ldap and admin
        webpages)

        kolab/issue3654 (Special character issue in Kolab web
        interface (e.g. vacation message))

        kolab/issue3499 (creating/modifying users with special characters
        in name confuses web admin)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- ChangeLog	23 Nov 2009 21:55:20 -0000	1.265
+++ ChangeLog	23 Nov 2009 22:42:15 -0000	1.266
@@ -1,3 +1,19 @@
+2009-11-23  Gunnar Wrobel <wrobel at pardus.de>
+
+	* templates/php.ini.template.in (magic_quotes_gpc):
+
+	kolab/issue919 (kolab server has problems with some characters in
+	passwords)
+
+	kolab/issue1880 (Poor handling of apostrophes in ldap and admin
+	webpages)
+
+	kolab/issue3654 (Special character issue in Kolab web
+	interface (e.g. vacation message))
+
+	kolab/issue3499 (creating/modifying users with special characters
+	in name confuses web admin)
+
 2009-11-23 Richard Bos <richard at radoeka.nl>
 
 	* dist_conf/kolabsrv.in: remove spamd as service, for more info



From cvs at kolab.org  Mon Nov 23 23:42:17 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:42:17 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates php.ini.template.in,1.8,1.9 
Message-ID: <20091123224217.DC817600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
	php.ini.template.in 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)

        kolab/issue1880 (Poor handling of apostrophes in ldap and admin
        webpages)

        kolab/issue3654 (Special character issue in Kolab web
        interface (e.g. vacation message))

        kolab/issue3499 (creating/modifying users with special characters
        in name confuses web admin)


Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- php.ini.template.in	17 Mar 2009 13:15:16 -0000	1.8
+++ php.ini.template.in	23 Nov 2009 22:42:15 -0000	1.9
@@ -22,6 +22,11 @@
 memory_limit       = 64M    ; Maximum amount of memory a script may consume
 post_max_size      = 8M     ; Maximum amount of POST data accepted
 
+magic_quotes_gpc   = 0      ; Automatically quote posted variables. Required to be "0" for the
+                            ; webadmin to work. Horde does not care and removes them anyway if
+                            ; the setting is "1". The setting will be removed in PHP 6 and "0"
+                            ; will be the default then.
+
 error_reporting    = E_ALL
 error_log          = @webserver_logdir@/php/php-errors.log
 upload_tmp_dir     = @webserver_tmpdir@



From cvs at kolab.org  Mon Nov 23 23:47:07 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:47:07 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.462,1.463 
Message-ID: <20091123224707.357B3600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -d -r1.462 -r1.463
--- release-notes.txt	23 Nov 2009 22:42:15 -0000	1.462
+++ release-notes.txt	23 Nov 2009 22:47:05 -0000	1.463
@@ -178,6 +178,8 @@
 
     - perl-kolab-2.2.3-2009????
 
+	kolab/issue919  (kolab server has problems with some characters in
+	                 passwords)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
 



From cvs at kolab.org  Mon Nov 23 23:47:07 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:47:07 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.67,1.68 
Message-ID: <20091123224707.3A25F600805@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- ChangeLog	17 Jul 2009 14:52:24 -0000	1.67
+++ ChangeLog	23 Nov 2009 22:47:05 -0000	1.68
@@ -1,3 +1,11 @@
+2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
+
+	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems
+	with some characters in passwords)
+
+	* sbin/kolab_bootstrap.in: kolab/issue919 (kolab server has
+	problems with some characters in passwords)
+
 2009-07-17  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* sbin/kolab_bootstrap.in: Read bind_pw_hash from Kolab master server,



From cvs at kolab.org  Mon Nov 23 23:47:07 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:47:07 +0100 (CET)
Subject: gunnar: server/perl-kolab/bin kolabpasswd.in,1.2,1.3 
Message-ID: <20091123224707.3DE8B600806@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolabpasswd.in 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)


Index: kolabpasswd.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolabpasswd.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabpasswd.in	20 Jan 2009 17:22:12 -0000	1.2
+++ kolabpasswd.in	23 Nov 2009 22:47:05 -0000	1.3
@@ -49,6 +49,8 @@
 use IO::File;
 use File::Temp;
 use Net::LDAP;
+use Digest::SHA1;
+use MIME::Base64;
 use Kolab::Util;
 use Kolab;
 
@@ -79,6 +81,36 @@
   return $hashpw;
 }
 
+# Taken from Crypt::SaltedHash
+sub __generate_hex_salt {
+
+    my @keychars = (
+        "0", "1", "2", "3", "4", "5", "6", "7",
+        "8", "9", "a", "b", "c", "d", "e", "f"
+    );
+    my $length = shift || 8;
+
+    my $salt = '';
+    my $max  = scalar @keychars;
+    for my $i ( 0 .. $length - 1 ) {
+        my $skip = $i == 0 ? 1 : 0;    # don't let the first be 0
+        $salt .= $keychars[ $skip + int( rand( $max - $skip ) ) ];
+    }
+
+    return pack( "H*", $salt);
+}
+
+# Hash a password without using slappasswd
+sub hashPassword2 {
+  my $pw = shift;
+  my $ctx = Digest::SHA1->new;
+  my $salt = __generate_hex_salt();
+  $ctx->add($pw);
+  $ctx->add($salt);
+  my $hashpw = '{SSHA}' . encode_base64($ctx->digest . $salt ,'');
+  return $hashpw;
+}
+
 # open old kolab master config file
 my $kolabconfname = "@CONFIG_DIR@/kolab.conf";
 
@@ -129,7 +161,7 @@
 my $tmp = new File::Temp( TEMPLATE => 'tempXXXXX', DIR => '@CONFIG_DIR@', UNLINK => 0, SUFFIX => '.conf')
      || die "Error: could not create temporary file under @CONFIG_DIR@";
 $tmpfilename = $tmp->filename;
-$bind_pw_hash = hashPassword($new_password);
+$bind_pw_hash = hashPassword2($new_password);
 
 # copy and replace old config to temporary file
 foreach ($kolabconf->getlines()) {



From cvs at kolab.org  Mon Nov 23 23:47:07 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:47:07 +0100 (CET)
Subject: gunnar: server/perl-kolab/sbin kolab_bootstrap.in,1.11,1.12 
Message-ID: <20091123224707.4564C60081B@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
MFB:         kolab/issue919 (kolab server has problems with some characters in
        passwords)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab_bootstrap.in	17 Jul 2009 14:52:24 -0000	1.11
+++ kolab_bootstrap.in	23 Nov 2009 22:47:05 -0000	1.12
@@ -63,6 +63,8 @@
 use Term::ReadKey;
 use Time::Local;
 use Time::localtime;
+use Digest::SHA1;
+use MIME::Base64;
 
 # Reload only kolab.globals into our configuration.
 Kolab::reloadConfig("@CONFIG_DIR@/kolab.globals", 1);
@@ -123,6 +125,36 @@
   return $hashpw;
 }
 
+# Taken from Crypt::SaltedHash
+sub __generate_hex_salt {
+
+    my @keychars = (
+        "0", "1", "2", "3", "4", "5", "6", "7",
+        "8", "9", "a", "b", "c", "d", "e", "f"
+    );
+    my $length = shift || 8;
+
+    my $salt = '';
+    my $max  = scalar @keychars;
+    for my $i ( 0 .. $length - 1 ) {
+        my $skip = $i == 0 ? 1 : 0;    # don't let the first be 0
+        $salt .= $keychars[ $skip + int( rand( $max - $skip ) ) ];
+    }
+
+    return pack( "H*", $salt);
+}
+
+# Hash a password without using slappasswd
+sub hashPassword2 {
+  my $pw = shift;
+  my $ctx = Digest::SHA1->new;
+  my $salt = __generate_hex_salt();
+  $ctx->add($pw);
+  $ctx->add($salt);
+  my $hashpw = '{SSHA}' . encode_base64($ctx->digest . $salt ,'');
+  return $hashpw;
+}
+
 # Ask the user a question
 sub getUserInput {
   my $text = shift;
@@ -276,7 +308,7 @@
 my $is_master = $kolab_config{'is_master'} || "true";
 my $bind_dn = $kolab_config{'bind_dn'} || die "could not read bind_dn from $kolab_config";
 my $bind_pw = $kolab_config{'bind_pw'} || die "could not read bind_pw from $kolab_config";
-my $bind_pw_hash = $kolab_config{'bind_pw_hash'} || hashPassword( $bind_pw );
+my $bind_pw_hash = $kolab_config{'bind_pw_hash'} || hashPassword2( $bind_pw );
 my $ldap_uri = $kolab_config{'ldap_uri'} || die "could not read ldap_uri from $kolab_config";
 my $base_dn = $kolab_config{'base_dn'} || die "could not read base_dn from $kolab_config";
 my $php_dn = $kolab_config{'php_dn'} || die "could not read php_dn from $kolab_config";
@@ -354,7 +386,7 @@
       chomp $bind_pw;
       $bind_pw = getUserInput("Please choose a manager password", $bind_pw);
       print " bind_pw : $bind_pw\n";
-      $bind_pw_hash = hashPassword($bind_pw);
+      $bind_pw_hash = hashPassword2($bind_pw);
     }
 
     # Generate passwords
@@ -430,7 +462,7 @@
       $Kolab::config{'directory_replication_mode_is_syncrepl'} = 'true' if ($Kolab::config{'directory_mode'} eq 'syncrepl');
       $Kolab::config{"base_dn"} = $base_dn;
       $Kolab::config{"bind_dn"} = $bind_dn;
-      $Kolab::config{"bind_pw_hash"} = $bind_pw;
+      $Kolab::config{"bind_pw_hash"} = $bind_pw_hash;
       $Kolab::config{"slurpd_addr"} = $slurpd_addr;
       $Kolab::config{"slurpd_port"} = $slurpd_port;
 
@@ -556,7 +588,7 @@
       # create php read-only user
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,cn=internal,$base_dn" );
       $ldapobject->replace('cn' => 'nobody', 'sn' => 'n/a n/a', 'uid' => 'nobody',
-                           'userPassword' => hashPassword($php_pw),
+                           'userPassword' => hashPassword2($php_pw),
                            'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn("cn=nobody,cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
@@ -566,7 +598,7 @@
       # create calendar user
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=$calendar_id@" . $domain . ",cn=internal,$base_dn" );
       $ldapobject->replace('cn' => $calendar_id . '@' . $domain, 'sn' => 'n/a n/a', 'uid' => $calendar_id . '@' . $domain,
-                           'userPassword' => hashPassword($calendar_pw),
+                           'userPassword' => hashPassword2($calendar_pw),
                            'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn("cn=$calendar_id@" . $domain . ",cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
@@ -693,7 +725,7 @@
 
   $bind_dn = "cn=manager,cn=internal,$base_dn";
   $bind_pw = getUserInput("Manager password");
-  $bind_pw_hash = hashPassword($bind_pw);
+  $bind_pw_hash = hashPassword2($bind_pw);
 
   my $confname = "$Kolab::config{'sasl_smtpconffile'}";
   copy("@CONFIG_DIR@/templates/smtpd.conf.template", $confname) || die "could not write to $confname";



From cvs at kolab.org  Mon Nov 23 23:47:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:47:10 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.21,1.22 
Message-ID: <20091123224710.99765600806@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
- re-arrange the execution order of the services
- make it possible to skip the services freshclam and clamd used on
  Debian



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolabsrv.in	23 Nov 2009 21:55:21 -0000	1.21
+++ kolabsrv.in	23 Nov 2009 22:47:08 -0000	1.22
@@ -83,6 +83,12 @@
 	system=other
 fi
 
+# Some distributions run / control the services clamav and freshclam from
+# amavisd.  The services can be unset in @sysconfdir@/kolab/profile.sh,
+# when unset, they are not called obviously. 
+CLAMAV=clamav
+FRESHCLAM=freshclam
+
 [[ -f /etc/kolab/profile.sh ]] && . /etc/kolab/profile.sh
 
 # variables
@@ -94,12 +100,23 @@
 # Kolab installations on native distributions, should adapt service names
 # with the function getServiceName
 #
+# The order in which the services get started in openSUSE is as follows:
+# S08ldap
+# S08saslauthd
+# S08clamd
+# S10amavis
+# S10cyrus
+# S11postfix
+# S12apache2
+# S13kolabd
+# S13freshclam
+# 
 # In earlier days, spamd was part of the services as well.  But as
 # spamassassin is used as library for amavisd, it is not needed to run it
 # as a seperate service.  More information about this topic can be found
 # at https://issues.kolab.org/issue3953
-SERVICES="openldap sasl amavisd apache freshclam imapd postfix"
-SERVICES="$SERVICES clamav kolabd"
+SERVICES="openldap sasl $CLAMAV amavisd imapd postfix apache"
+SERVICES="$SERVICES kolabd $FRESHCLAM"
 
 case $RC in 
 rc)



From cvs at kolab.org  Mon Nov 23 23:47:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Nov 2009 23:47:10 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.266,1.267 
Message-ID: <20091123224710.89107600823@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
- re-arrange the execution order of the services
- make it possible to skip the services freshclam and clamd used on
  Debian



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- ChangeLog	23 Nov 2009 22:42:15 -0000	1.266
+++ ChangeLog	23 Nov 2009 22:47:08 -0000	1.267
@@ -20,6 +20,8 @@
 	  refer to https://issues.kolab.org/issue3953
 	  - services can be listed in execution and alphabetical order
 	  - changed the method to determine a distribution
+	  - re-arrange the execution order of the services
+	  - make it possible to skip the services freshclam and clamd
 
 2009-11-08 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Tue Nov 24 08:04:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 08:04:47 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.14,
	1.10.2.15 kolab-webclient.spec, 1.23.2.18, 1.23.2.19 
Message-ID: <20091124070447.7C59A600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
Log Message:
 kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error compareDateTime())

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.14
retrieving revision 1.10.2.15
diff -u -d -r1.10.2.14 -r1.10.2.15
--- ChangeLog	10 Nov 2009 17:33:25 -0000	1.10.2.14
+++ ChangeLog	24 Nov 2009 07:04:45 -0000	1.10.2.15
@@ -1,3 +1,8 @@
+2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+
+	* kolab-webclient.spec: kolab/issue3656 (Unable to SyncML Calendar
+	/ PHP Fatal error compareDateTime())
+
 2009-11-10  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.18
retrieving revision 1.23.2.19
diff -u -d -r1.23.2.18 -r1.23.2.19
--- kolab-webclient.spec	10 Nov 2009 09:59:07 -0000	1.23.2.18
+++ kolab-webclient.spec	24 Nov 2009 07:04:45 -0000	1.23.2.19
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 11
-%define         V_day   10
+%define         V_day   24
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Tue Nov 24 08:04:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 08:04:48 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_HandleEmptyDates.diff, NONE, 1.1.2.1 series,
	1.5.2.11, 1.5.2.12 
Message-ID: <20091124070448.1BA3B600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv23367/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_HandleEmptyDates.diff 
Log Message:
 kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error compareDateTime())

--- NEW FILE: t_kronolith_HK_GW_HandleEmptyDates.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/kronolith/HK/GW/HandleEmptyDates

Enables the Kolab driver to handle empty start and/or end dates
correctly.

REF: https://issues.kolab.org/issue3656

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

---
 horde-webmail/kronolith/lib/Driver/kolab.php |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/kronolith/lib/Driver/kolab.php b/horde-webmail/kronolith/lib/Driver/kolab.php
index de49c81..e915475 100644
--- a/horde-webmail/kronolith/lib/Driver/kolab.php
+++ b/horde-webmail/kronolith/lib/Driver/kolab.php
@@ -1134,12 +1134,18 @@ class Kronolith_Driver_kolab_wrapper_new extends Kronolith_Driver_kolab_wrapper
             return $result;
         }
 
-        if (is_null($startDate)) {
+        if (empty($startDate)) {
             $startDate = &new Horde_Date(array('mday' => 1, 'month' => 1, 'year' => 0000));
         }
-        if (is_null($endDate)) {
+        if (empty($endDate)) {
             $endDate = &new Horde_Date(array('mday' => 31, 'month' => 12, 'year' => 9999));
         }
+        if (!is_a($startDate, 'Horde_Date')) {
+            $startDate = &new Horde_Date($startDate);
+        }
+        if (!is_a($endDate, 'Horde_Date')) {
+            $endDate = &new Horde_Date($endDate);
+        }
 
         $ids = array();
 
-- 
tg: (e6faeaf..) t/kronolith/HK/GW/HandleEmptyDates (depends on: t/framework/H/JS/Form/FixFormSecurityForImageUploads)
-- 
TOPGIT patch commit log
=======================

commit be56600b19e429f4ece1ca685c1e25550b5a02f6
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 07:37:58 2009 +0100

    Enables the Kolab driver to handle empty start and/or end dates
    correctly.
    
    REF: https://issues.kolab.org/issue3656

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -d -r1.5.2.11 -r1.5.2.12
--- series	10 Nov 2009 17:33:25 -0000	1.5.2.11
+++ series	24 Nov 2009 07:04:45 -0000	1.5.2.12
@@ -76,3 +76,4 @@
 t_kronolith_HK_UV_dateInputFieldOrder.diff -p1
 t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff -p1
 t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff -p1
+t_kronolith_HK_GW_HandleEmptyDates.diff -p1
\ No newline at end of file



From cvs at kolab.org  Tue Nov 24 08:04:47 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 08:04:47 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.71,1.398.2.72 
Message-ID: <20091124070447.7A32A600161@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error compareDateTime())

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.71
retrieving revision 1.398.2.72
diff -u -d -r1.398.2.71 -r1.398.2.72
--- release-notes.txt	23 Nov 2009 22:35:01 -0000	1.398.2.71
+++ release-notes.txt	24 Nov 2009 07:04:45 -0000	1.398.2.72
@@ -108,6 +108,8 @@
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)
+	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



From cvs at kolab.org  Tue Nov 24 08:04:48 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 08:04:48 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.19, 1.32.2.20 
Message-ID: <20091124070448.447A3600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv23367/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error compareDateTime())

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.19
retrieving revision 1.32.2.20
diff -u -d -r1.32.2.19 -r1.32.2.20
--- horde-webmail-1.2.0_kolab_openpkg.patch	10 Nov 2009 17:33:25 -0000	1.32.2.19
+++ horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 07:04:45 -0000	1.32.2.20
@@ -28246,6 +28246,59 @@
 
     SECURITY: Fix vulnerability in image form fields that allows overwriting
           of arbitrary local files.
+From: root <Gunnar Wrobel wrobel at pardus.de>
+Subject: [PATCH] t/kronolith/HK/GW/HandleEmptyDates
+
+Enables the Kolab driver to handle empty start and/or end dates
+correctly.
+
+REF: https://issues.kolab.org/issue3656
+
+Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>
+
+---
+ horde-webmail/kronolith/lib/Driver/kolab.php |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/kronolith/lib/Driver/kolab.php b/horde-webmail/kronolith/lib/Driver/kolab.php
+index de49c81..e915475 100644
+--- a/horde-webmail/kronolith/lib/Driver/kolab.php
++++ b/horde-webmail/kronolith/lib/Driver/kolab.php
+@@ -1134,12 +1134,18 @@ class Kronolith_Driver_kolab_wrapper_new extends Kronolith_Driver_kolab_wrapper
+             return $result;
+         }
+ 
+-        if (is_null($startDate)) {
++        if (empty($startDate)) {
+             $startDate = &new Horde_Date(array('mday' => 1, 'month' => 1, 'year' => 0000));
+         }
+-        if (is_null($endDate)) {
++        if (empty($endDate)) {
+             $endDate = &new Horde_Date(array('mday' => 31, 'month' => 12, 'year' => 9999));
+         }
++        if (!is_a($startDate, 'Horde_Date')) {
++            $startDate = &new Horde_Date($startDate);
++        }
++        if (!is_a($endDate, 'Horde_Date')) {
++            $endDate = &new Horde_Date($endDate);
++        }
+ 
+         $ids = array();
+ 
+-- 
+tg: (e6faeaf..) t/kronolith/HK/GW/HandleEmptyDates (depends on: t/framework/H/JS/Form/FixFormSecurityForImageUploads)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit be56600b19e429f4ece1ca685c1e25550b5a02f6
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Tue Nov 24 07:37:58 2009 +0100
+
+    Enables the Kolab driver to handle empty start and/or end dates
+    correctly.
+    
+    REF: https://issues.kolab.org/issue3656
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Tue Nov 24 09:34:41 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 09:34:41 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.72,1.398.2.73 
Message-ID: <20091124083441.9A883600161@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.72
retrieving revision 1.398.2.73
diff -u -d -r1.398.2.72 -r1.398.2.73
--- release-notes.txt	24 Nov 2009 07:04:45 -0000	1.398.2.72
+++ release-notes.txt	24 Nov 2009 08:34:39 -0000	1.398.2.73
@@ -120,6 +120,8 @@
 	                 and not per incident)
 	kolab/issue3856 (IMP/DIMP folder navigator does not allow
                          creating/deleting/... mail folders)
+	kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch
+	                 update needed)
 
     - openpkg-20071227-20071227_kolab2
 



From cvs at kolab.org  Tue Nov 24 09:34:41 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 09:34:41 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog,1.10.2.15,1.10.2.16 
Message-ID: <20091124083441.B7655600161@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.15
retrieving revision 1.10.2.16
diff -u -d -r1.10.2.15 -r1.10.2.16
--- ChangeLog	24 Nov 2009 07:04:45 -0000	1.10.2.15
+++ ChangeLog	24 Nov 2009 08:34:39 -0000	1.10.2.16
@@ -1,7 +1,12 @@
 2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
 
-	* kolab-webclient.spec: kolab/issue3656 (Unable to SyncML Calendar
-	/ PHP Fatal error compareDateTime())
+	* kolab-webclient.spec:
+
+	kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error
+	compareDateTime())
+
+	kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch
+	update needed)
 
 2009-11-10  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Tue Nov 24 09:34:42 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 09:34:42 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_SyncML_HK_GW_CombinedFixes.diff, 1.3, 1.3.2.1 
Message-ID: <20091124083442.54557600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv26880/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	t_SyncML_HK_GW_CombinedFixes.diff 
Log Message:
 kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)

Index: t_SyncML_HK_GW_CombinedFixes.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/t_SyncML_HK_GW_CombinedFixes.diff,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- t_SyncML_HK_GW_CombinedFixes.diff	9 Feb 2009 14:25:55 -0000	1.3
+++ t_SyncML_HK_GW_CombinedFixes.diff	24 Nov 2009 08:34:40 -0000	1.3.2.1
@@ -93,14 +93,14 @@
       *
       * For some types of authentications (notably auth:basic) the username
 diff --git a/horde-webmail/lib/SyncML/Backend/Horde.php b/horde-webmail/lib/SyncML/Backend/Horde.php
-index a9be55d..a71b5f8 100644
+index a9be55d..ed07580 100644
 --- a/horde-webmail/lib/SyncML/Backend/Horde.php
 +++ b/horde-webmail/lib/SyncML/Backend/Horde.php
 @@ -204,6 +204,11 @@ class SyncML_Backend_Horde extends SyncML_Backend {
                                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
                  continue;
              }
-+            if ($suid_ts > $to_ts) {
++            if ($add_ts[$suid] > $to_ts) {
 +                // Add delayed to the next sync operation
 +                $this->logMessage("Add ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                continue;
@@ -112,7 +112,7 @@
                                        __FILE__, __LINE__, PEAR_LOG_DEBUG);
                      continue;
                  }
-+                if ($suid_ts > $to_ts) {
++                if ($mod_ts[$suid] > $to_ts) {
 +                    // Change delayed to the next sync operation
 +                    $this->logMessage("Change ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                    continue;
@@ -366,3 +366,18 @@
  
 -- 
 tg: (6938161..) t/SyncML/HK/GW/CombinedFixes (depends on: master)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 88d1593c0f1491f19478863ffeb348c87cb2c3b8
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Tue Nov 24 08:16:48 2009 +0100
+
+    Fix patch according to  kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)
+
+commit 3c12e523cdbac5e2d0c1add78fcb25f500af2877
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Feb 1 18:22:13 2009 +0000
+
+    Added patch release/HK-GW-SyncML.patch from the mercurial release queue.



From cvs at kolab.org  Tue Nov 24 09:34:42 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 09:34:42 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.20, 1.32.2.21 
Message-ID: <20091124083442.5E038600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv26880/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.20
retrieving revision 1.32.2.21
diff -u -d -r1.32.2.20 -r1.32.2.21
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 07:04:45 -0000	1.32.2.20
+++ horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 08:34:39 -0000	1.32.2.21
@@ -13643,14 +13643,14 @@
       *
       * For some types of authentications (notably auth:basic) the username
 diff --git a/horde-webmail/lib/SyncML/Backend/Horde.php b/horde-webmail/lib/SyncML/Backend/Horde.php
-index a9be55d..a71b5f8 100644
+index a9be55d..ed07580 100644
 --- a/horde-webmail/lib/SyncML/Backend/Horde.php
 +++ b/horde-webmail/lib/SyncML/Backend/Horde.php
 @@ -204,6 +204,11 @@ class SyncML_Backend_Horde extends SyncML_Backend {
                                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
                  continue;
              }
-+            if ($suid_ts > $to_ts) {
++            if ($add_ts[$suid] > $to_ts) {
 +                // Add delayed to the next sync operation
 +                $this->logMessage("Add ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                continue;
@@ -13662,7 +13662,7 @@
                                        __FILE__, __LINE__, PEAR_LOG_DEBUG);
                      continue;
                  }
-+                if ($suid_ts > $to_ts) {
++                if ($mod_ts[$suid] > $to_ts) {
 +                    // Change delayed to the next sync operation
 +                    $this->logMessage("Change ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                    continue;
@@ -13916,6 +13916,21 @@
  
 -- 
 tg: (6938161..) t/SyncML/HK/GW/CombinedFixes (depends on: master)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 88d1593c0f1491f19478863ffeb348c87cb2c3b8
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Tue Nov 24 08:16:48 2009 +0100
+
+    Fix patch according to  kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)
+
+commit 3c12e523cdbac5e2d0c1add78fcb25f500af2877
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Feb 1 18:22:13 2009 +0000
+
+    Added patch release/HK-GW-SyncML.patch from the mercurial release queue.
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/Prefs/HK/GW/FixLDAPAuthForIngo
 



From cvs at kolab.org  Tue Nov 24 10:51:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 10:51:14 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.73,1.398.2.74 
Message-ID: <20091124095114.BD4AF600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3237 (Double Sync with SyncML when using external client),  kolab/issue3238 (Double Entries with SyncML when the folder uid validity changes),  kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.73
retrieving revision 1.398.2.74
diff -u -d -r1.398.2.73 -r1.398.2.74
--- release-notes.txt	24 Nov 2009 08:34:39 -0000	1.398.2.73
+++ release-notes.txt	24 Nov 2009 09:51:12 -0000	1.398.2.74
@@ -105,6 +105,10 @@
 	Calendars accessible for the proxy user can be anonymously
 	downloaded as ics files.
 
+	kolab/issue3237 (Double Sync with SyncML when using external
+	                 client)
+	kolab/issue3238 (Double Entries with SyncML when the folder uid
+	                 validity changes)
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)
@@ -122,6 +126,8 @@
                          creating/deleting/... mail folders)
 	kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch
 	                 update needed)
+	kolab/issue3892 (Patch enabling SyncML support for the SE P1i
+	                 mobile phone)
 
     - openpkg-20071227-20071227_kolab2
 



From cvs at kolab.org  Tue Nov 24 10:51:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 10:51:15 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_SyncML_HK_GW_DoubleSyncFix.diff, NONE,
	1.1.2.1 t_SyncML_UV_message_size_p1i.diff, NONE, 1.1.2.1 series,
	1.5.2.12, 1.5.2.13 
Message-ID: <20091124095115.5F12F600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv29387/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_SyncML_HK_GW_DoubleSyncFix.diff 
	t_SyncML_UV_message_size_p1i.diff 
Log Message:
 kolab/issue3237 (Double Sync with SyncML when using external client),  kolab/issue3238 (Double Entries with SyncML when the folder uid validity changes),  kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

--- NEW FILE: t_SyncML_HK_GW_DoubleSyncFix.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

Horde is currently agnostic of external clients to the storage backend used by
Horde/Kolab. For SyncML any storage changes need to get logged in order to be
exchanged with the mobile clients.

Currently the Kolab drivers within Horde will create the necessary changelog.
But this currently only happens after Synchronization started. Which means that
you need to sync twice in order to get changes from an external client if you
did not log in via Horde after changing something with an external client.

The attached patch has been provided by Univention but needs some cleanup to go
[...980 lines suppressed...]

    Fix patch for newer Kolab_Storage library.

commit 3ea975a913f3db5ee5ee511cf4280eb811f23c91
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:48:03 2009 +0100

    Remove stray file.

commit 308c073c0765af8979d1c511201f99f8d1b88046
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:47:17 2009 +0100

     kolab/issue3237 (Double Sync with SyncML when using external client)

commit a24c1cd0702833a1fa658b58bddb67971250f86d
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:41:07 2009 +0100

     kolab/issue3237 (Double Sync with SyncML when using external client)

--- NEW FILE: t_SyncML_UV_message_size_p1i.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/SyncML/UV/message/size/p1i

The attached patch was necessary to make the SE P1i mobile phone work with SyncML.

REF: https://issues.kolab.org/issue3892

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

---
 horde-webmail/lib/SyncML/Sync.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/horde-webmail/lib/SyncML/Sync.php b/horde-webmail/lib/SyncML/Sync.php
index 57e233b..66113a6 100644
--- a/horde-webmail/lib/SyncML/Sync.php
+++ b/horde-webmail/lib/SyncML/Sync.php
@@ -217,7 +217,9 @@ class SyncML_Sync {
                  * sends an item with length n and size tag=n+1 and expects us
                  * the accept it. Happens in test 1301.  So ignore this to be
                  * conformant (and wrong). */
-                strlen($item->content) + 1 != $item->size) {
+				/* The Sony Ericsson P1i sends a message with 'n+2':
+				   http://thread.gmane.org/gmane.comp.horde.sync/1842 */
+                strlen($item->content) + 1 != $item->size && strlen($item->content) + 2 != $item->size) {
                 $item->responseCode = RESPONSE_SIZE_MISMATCH;
                 $backend->logMessage(
                     'Item size mismatch. Size reported as ' . $item->size
-- 
tg: (3ea975a..) t/SyncML/UV/message/size/p1i (depends on: t/SyncML/HK/GW/DoubleSyncFix)
-- 
TOPGIT patch commit log
=======================

commit 9c4774daeda478381852c36f7d53c8f3b2d68756
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 09:51:20 2009 +0100

     kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -d -r1.5.2.12 -r1.5.2.13
--- series	24 Nov 2009 07:04:45 -0000	1.5.2.12
+++ series	24 Nov 2009 09:51:13 -0000	1.5.2.13
@@ -76,4 +76,6 @@
 t_kronolith_HK_UV_dateInputFieldOrder.diff -p1
 t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff -p1
 t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff -p1
-t_kronolith_HK_GW_HandleEmptyDates.diff -p1
\ No newline at end of file
+t_kronolith_HK_GW_HandleEmptyDates.diff -p1
+t_SyncML_HK_GW_DoubleSyncFix.diff -p1
+t_SyncML_UV_message_size_p1i.diff -p1
\ No newline at end of file



From cvs at kolab.org  Tue Nov 24 10:51:15 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 10:51:15 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.21, 1.32.2.22 
Message-ID: <20091124095115.A024E60081B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv29387/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3237 (Double Sync with SyncML when using external client),  kolab/issue3238 (Double Entries with SyncML when the folder uid validity changes),  kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.21
retrieving revision 1.32.2.22
diff -u -d -r1.32.2.21 -r1.32.2.22
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 08:34:39 -0000	1.32.2.21
+++ horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 09:51:12 -0000	1.32.2.22
@@ -28314,6 +28314,1064 @@
     correctly.
     
     REF: https://issues.kolab.org/issue3656
+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
[...1033 lines suppressed...]
++				/* The Sony Ericsson P1i sends a message with 'n+2':
++				   http://thread.gmane.org/gmane.comp.horde.sync/1842 */
++                strlen($item->content) + 1 != $item->size && strlen($item->content) + 2 != $item->size) {
+                 $item->responseCode = RESPONSE_SIZE_MISMATCH;
+                 $backend->logMessage(
+                     'Item size mismatch. Size reported as ' . $item->size
+-- 
+tg: (3ea975a..) t/SyncML/UV/message/size/p1i (depends on: t/SyncML/HK/GW/DoubleSyncFix)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 9c4774daeda478381852c36f7d53c8f3b2d68756
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Tue Nov 24 09:51:20 2009 +0100
+
+     kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Tue Nov 24 10:51:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 10:51:14 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog,1.10.2.16,1.10.2.17 
Message-ID: <20091124095114.BD68260081B@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue3237 (Double Sync with SyncML when using external client),  kolab/issue3238 (Double Entries with SyncML when the folder uid validity changes),  kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.16
retrieving revision 1.10.2.17
diff -u -d -r1.10.2.16 -r1.10.2.17
--- ChangeLog	24 Nov 2009 08:34:39 -0000	1.10.2.16
+++ ChangeLog	24 Nov 2009 09:51:12 -0000	1.10.2.17
@@ -1,12 +1,21 @@
-2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
 
 	* kolab-webclient.spec:
 
+	kolab/issue3237 (Double Sync with SyncML when using external
+	client)
+
+	kolab/issue3238 (Double Entries with SyncML when the folder uid
+	validity changes)
+
 	kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error
 	compareDateTime())
 
 	kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch
 	update needed)
+
+	kolab/issue3892 (Patch enabling SyncML support for the SE P1i
+	mobile phone)
 
 2009-11-10  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Tue Nov 24 14:55:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 14:55:03 +0100 (CET)
Subject: gunnar: utils/testing test-nul-byte-issue3594.py, NONE,
	1.1 test-invitation-forwarding-issue3192.py, 1.5, 1.6 
Message-ID: <20091124135503.01E26600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv5093

Modified Files:
	test-invitation-forwarding-issue3192.py 
Added Files:
	test-nul-byte-issue3594.py 
Log Message:
Add test for issue 3594.

--- NEW FILE: test-nul-byte-issue3594.py ---
#!/usr/bin/env python
"""NUL byte message trying to trigger kolab/issue3594

(Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)

Usage $progname <senderemailaddress> <recipientemailaddress>

This script is Free Software under the GNU General Public License >=v2.
thomas at intevation.de (initial 20091124)
"""

__version__="$Revision: 1.1 $"
# $Source: /kolabrepository/utils/testing/test-nul-byte-issue3594.py,v $

import sys
import os
import pwd
import smtplib

msg = r"""From: %s
Sender: %s
To: <%s>
Subject: kolab/issue3594
Date: Mon, 23 Feb 2009 15:16:14 +0100
Message-ID: <000001c995c1$49c4a2a0$140ba8c0 at invalid>
MIME-Version: 15B.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Test
"""

msg = msg + u'\0 Test';

fromaddr = sys.argv[1]
toaddr   = sys.argv[2]
smtpserver='localhost'
# if you set a loginname, a connection via TLS and authentification is tried
loginname = None
password  = None

server=smtplib.SMTP(smtpserver)
#server.set_debuglevel(1)

if loginname != None and password != None:
    server.starttls()
    server.login(loginname,password)

server.sendmail(fromaddr, [toaddr], msg % (fromaddr, fromaddr, toaddr))

server.quit()

Index: test-invitation-forwarding-issue3192.py
===================================================================
RCS file: /kolabrepository/utils/testing/test-invitation-forwarding-issue3192.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test-invitation-forwarding-issue3192.py	27 Jul 2009 13:17:33 -0000	1.5
+++ test-invitation-forwarding-issue3192.py	24 Nov 2009 13:55:00 -0000	1.6
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-"""Forwarded iTIP invitation trying to trigger kolab/issue3192
+"""NUL byte message trying to trigger kolab/issue3594
 
-(Forwarding an invitation with Outlook failed)
+(Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)
 
 Usage $progname <recipientemailaddress>
 
 This script is Free Software under the GNU General Public License >=v2.
-thomas at intevation.de (initial 20090223)
+thomas at intevation.de (initial 20091124)
 """
 
 __version__="$Revision$"
@@ -19,7 +19,7 @@
 msg = r"""From: User1 <%(user1)s>
 Sender: User2 <%(user2)s>
 To: <%(user3)s>
-Subject: kolab/issue3192
+Subject: kolab/issue3594
 Date: Mon, 23 Feb 2009 15:16:14 +0100
 Message-ID: <000001c995c1$49c4a2a0$140ba8c0 at invalid>
 MIME-Version: 1.0
@@ -30,31 +30,7 @@
 Thread-Index: AcmVuGgcYR9Pp2HUSHalFjSgcQETAwAAAq8gAAIyVwA=
 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2670
 
-BEGIN:VCALENDAR
-PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VEVENT
-ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:%(user3)s
-DTSTART:20090223T140000Z
-DTEND:20090223T150000Z
-TRANSP:OPAQUE
-SEQUENCE:0
-UID:libkcal-910600374.601
-DTSTAMP:20090223T131221Z
-DESCRIPTION:Zeit: Montag\, 23. Februar 2009 15:00-16:00 (GMT+01:00)
-  Amsterdam\, Berlin\, Bern\, Rom\, Stockholm\,
-  Wien.\n\n*~*~*~*~*~*~*~*~*~*\n\n\n\n>_____________________________________
- ________\n>Von: 	User1  \n>Gesendet:	Montag\, 23. Februar 2009
-  14:12\n>An:	User1\; %(user2)s\n>Betreff:	kolab/issue3192\n>Zeit:
- 	Montag\, 23. Februar 2009 15:00-16:00 (GMT+01:00) Amsterdam\, Berlin\,
-  Bern\, Rom\, Stockholm\, Wien.\n>Ort:	\n>\n>\n
-SUMMARY:WG: kolab/issue3192
-PRIORITY:5
-X-MICROSOFT-CDO-IMPORTANCE:1
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR
+Test \0
 """
 
 # Kolab Server 2.2.1+:



From cvs at kolab.org  Tue Nov 24 14:55:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 14:55:49 +0100 (CET)
Subject: gunnar: utils/testing test-invitation-forwarding-issue3192.py, 1.6,
	1.7 
Message-ID: <20091124135549.58C53600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv5159

Modified Files:
	test-invitation-forwarding-issue3192.py 
Log Message:
Revert cvs diff -r 1.5 -r 1.6 test-invitation-forwarding-issue3192.py

Index: test-invitation-forwarding-issue3192.py
===================================================================
RCS file: /kolabrepository/utils/testing/test-invitation-forwarding-issue3192.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test-invitation-forwarding-issue3192.py	24 Nov 2009 13:55:00 -0000	1.6
+++ test-invitation-forwarding-issue3192.py	24 Nov 2009 13:55:47 -0000	1.7
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-"""NUL byte message trying to trigger kolab/issue3594
+"""Forwarded iTIP invitation trying to trigger kolab/issue3192
 
-(Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)
+(Forwarding an invitation with Outlook failed)
 
 Usage $progname <recipientemailaddress>
 
 This script is Free Software under the GNU General Public License >=v2.
-thomas at intevation.de (initial 20091124)
+thomas at intevation.de (initial 20090223)
 """
 
 __version__="$Revision$"
@@ -19,7 +19,7 @@
 msg = r"""From: User1 <%(user1)s>
 Sender: User2 <%(user2)s>
 To: <%(user3)s>
-Subject: kolab/issue3594
+Subject: kolab/issue3192
 Date: Mon, 23 Feb 2009 15:16:14 +0100
 Message-ID: <000001c995c1$49c4a2a0$140ba8c0 at invalid>
 MIME-Version: 1.0
@@ -30,7 +30,31 @@
 Thread-Index: AcmVuGgcYR9Pp2HUSHalFjSgcQETAwAAAq8gAAIyVwA=
 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2670
 
-Test \0
+BEGIN:VCALENDAR
+PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VEVENT
+ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:%(user3)s
+DTSTART:20090223T140000Z
+DTEND:20090223T150000Z
+TRANSP:OPAQUE
+SEQUENCE:0
+UID:libkcal-910600374.601
+DTSTAMP:20090223T131221Z
+DESCRIPTION:Zeit: Montag\, 23. Februar 2009 15:00-16:00 (GMT+01:00)
+  Amsterdam\, Berlin\, Bern\, Rom\, Stockholm\,
+  Wien.\n\n*~*~*~*~*~*~*~*~*~*\n\n\n\n>_____________________________________
+ ________\n>Von: 	User1  \n>Gesendet:	Montag\, 23. Februar 2009
+  14:12\n>An:	User1\; %(user2)s\n>Betreff:	kolab/issue3192\n>Zeit:
+ 	Montag\, 23. Februar 2009 15:00-16:00 (GMT+01:00) Amsterdam\, Berlin\,
+  Bern\, Rom\, Stockholm\, Wien.\n>Ort:	\n>\n>\n
+SUMMARY:WG: kolab/issue3192
+PRIORITY:5
+X-MICROSOFT-CDO-IMPORTANCE:1
+CLASS:PUBLIC
+END:VEVENT
+END:VCALENDAR
 """
 
 # Kolab Server 2.2.1+:



From cvs at kolab.org  Tue Nov 24 15:00:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 15:00:27 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.74,1.398.2.75 
Message-ID: <20091124140027.E4AE2600161@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.74
retrieving revision 1.398.2.75
diff -u -d -r1.398.2.74 -r1.398.2.75
--- release-notes.txt	24 Nov 2009 09:51:12 -0000	1.398.2.74
+++ release-notes.txt	24 Nov 2009 14:00:25 -0000	1.398.2.75
@@ -85,6 +85,8 @@
 	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
 	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
 	                 into From: header)
+	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
+	                 Filter does not report lmtp error)
 	kolab/issue3610 (Mail to unknown at something.example.com gets
 	                 accepted and yields kolabmailboxfilter exit 38)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some



From cvs at kolab.org  Tue Nov 24 15:00:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 15:00:27 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter issue3594.patch, NONE,
	1.1.2.1 ChangeLog, 1.29.2.12, 1.29.2.13 Kolab_Filter.spec,
	1.19.2.15, 1.19.2.16 Makefile, 1.8.2.13, 1.8.2.14 
Message-ID: <20091124140027.EE6C7600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3594.patch 
Log Message:
 kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)

--- NEW FILE: issue3594.patch ---
diff -u -B -r1.4.2.2 -r1.4.2.3
--- Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php	16 Nov 2009 12:29:37 -0000	1.4.2.2
+++ Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php	24 Nov 2009 13:53:40 -0000	1.4.2.3
@@ -281,12 +281,13 @@
      */
     function rewriteCode($result) 
     {
-        if ($result->getCode() < 500) {
+        list($resultcode, $resultmessage) = $this->_transport->getResponse();
+        if ($resultcode < 500) {
             $code = EX_TEMPFAIL;
         } else {
             $code = EX_UNAVAILABLE;
         }
-        $append = sprintf(', original code %s', $result->getCode());
+        $append = sprintf(': %s, original code %s', $resultmessage, $resultcode);
         $result->message = $result->getMessage() . $append;
         $result->code = OUT_LOG | OUT_STDOUT | $code;
         return $result;

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.12
retrieving revision 1.29.2.13
diff -u -d -r1.29.2.12 -r1.29.2.13
--- ChangeLog	16 Nov 2009 21:19:46 -0000	1.29.2.12
+++ ChangeLog	24 Nov 2009 14:00:25 -0000	1.29.2.13
@@ -1,3 +1,8 @@
+2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+
+	* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not
+	delivered, Kolab Filter does not report lmtp error)
+
 2009-11-16  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.15
retrieving revision 1.19.2.16
diff -u -d -r1.19.2.15 -r1.19.2.16
--- Kolab_Filter.spec	16 Nov 2009 21:19:46 -0000	1.19.2.15
+++ Kolab_Filter.spec	24 Nov 2009 14:00:25 -0000	1.19.2.16
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091116
+%define         V_release 20091124
 
 # Package Information
 Name:	   %{V_package}
@@ -32,6 +32,7 @@
 Patch10:   issue3610.patch
 Patch11:   issue3768.patch
 Patch12:   issue3464.patch
+Patch13:   issue3594.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -79,6 +80,7 @@
 	%patch -p1 -P 10
 	%patch -p1 -P 11
 	%patch -p1 -P 12
+	%patch -p1 -P 13
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.13
retrieving revision 1.8.2.14
diff -u -d -r1.8.2.13 -r1.8.2.14
--- Makefile	16 Nov 2009 21:19:46 -0000	1.8.2.13
+++ Makefile	24 Nov 2009 14:00:25 -0000	1.8.2.14
@@ -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 issue3610.patch issue3768.patch issue3868.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 dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Tue Nov 24 16:06:01 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 16:06:01 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog,1.10.2.17,1.10.2.18 
Message-ID: <20091124150601.192A6600161@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.17
retrieving revision 1.10.2.18
diff -u -d -r1.10.2.17 -r1.10.2.18
--- ChangeLog	24 Nov 2009 09:51:12 -0000	1.10.2.17
+++ ChangeLog	24 Nov 2009 15:05:58 -0000	1.10.2.18
@@ -17,6 +17,9 @@
 	kolab/issue3892 (Patch enabling SyncML support for the SE P1i
 	mobile phone)
 
+	kolab/issue3894 (kronolith writes recurrent event data
+	non-conformant to vCal (1.0) standard)
+
 2009-11-10  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that



From cvs at kolab.org  Tue Nov 24 16:06:01 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 16:06:01 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.22, 1.32.2.23 
Message-ID: <20091124150601.BDB14600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv8323/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.22
retrieving revision 1.32.2.23
diff -u -d -r1.32.2.22 -r1.32.2.23
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 09:51:12 -0000	1.32.2.22
+++ horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 15:05:58 -0000	1.32.2.23
@@ -29372,6 +29372,77 @@
 Date:   Tue Nov 24 09:51:20 2009 +0100
 
      kolab/issue3892 (Patch enabling SyncML support for the SE P1i mobile phone)
+From: root <Gunnar Wrobel wrobel at pardus.de>
+Subject: [PATCH] t/SyncML/UV/RecurringEventsWeekCount
+
+The attached patch fixes two Bugs in the SyncML code that affect the same
+function. The Patch for A) only changes one line.
+
+A) SyncML sends end dates not as DateTime, causing BB SyncJE to drop events
+B) For recurring events SyncML sends number of incedences in vCal duration
+   instead of the number of weeks.
+
+REF: https://issues.kolab.org/issue3894
+
+Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>
+
+---
+ horde-webmail/kronolith/lib/Recurrence.php |   17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
+index 5aa5960..acbbee7 100644
+--- a/horde-webmail/kronolith/lib/Recurrence.php
++++ b/horde-webmail/kronolith/lib/Recurrence.php
+@@ -944,6 +944,7 @@ class Horde_Date_Recurrence {
+      */
+     function toRRule10($calendar)
+     {
++        $rec_days_per_week = 0;
+         switch ($this->recurType) {
+         case HORDE_DATE_RECUR_NONE:
+             return '';
+@@ -959,6 +960,7 @@ class Horde_Date_Recurrence {
+             for ($i = 0; $i <= 7 ; ++$i) {
+                 if ($this->recurOnDay(pow(2, $i))) {
+                     $rrule .= ' ' . $vcaldays[$i];
++                    $rec_days_per_week++;
+                 }
+             }
+             break;
+@@ -997,9 +999,18 @@ class Horde_Date_Recurrence {
+             return '';
+         }
+ 
+-        return $this->hasRecurEnd() ?
+-            $rrule . ' ' . $calendar->_exportDate($this->recurEnd) :
+-            $rrule . ' #' . (int)$this->getRecurCount();
++        if ( $this->hasRecurEnd() ) {
++            $rrule .= ' ' . $calendar->_exportDateTime($this->recurEnd);
++        } else {
++            if ($rec_days_per_week > 1) {
++                $rec_weeks= (int)floor((int)$this->getRecurCount() / $rec_days_per_week);
++                $rrule .= ' #' . $rec_weeks;
++	    } else {
++                $rrule .= ' #' . (int)$this->getRecurCount();
++            }
++        }
++
++        return $rrule;
+     }
+ 
+     /**
+-- 
+tg: (29677b1..) t/SyncML/UV/RecurringEventsWeekCount (depends on: t/SyncML/UV/message/size/p1i)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit c454efe2987e3f5e735247bffc16e40b282672dc
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Tue Nov 24 15:46:04 2009 +0100
+
+     kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)
 diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 --- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
 +++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php



From cvs at kolab.org  Tue Nov 24 16:06:01 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 16:06:01 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.75,1.398.2.76 
Message-ID: <20091124150601.1C0E8600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.75
retrieving revision 1.398.2.76
diff -u -d -r1.398.2.75 -r1.398.2.76
--- release-notes.txt	24 Nov 2009 14:00:25 -0000	1.398.2.75
+++ release-notes.txt	24 Nov 2009 15:05:58 -0000	1.398.2.76
@@ -130,6 +130,8 @@
 	                 update needed)
 	kolab/issue3892 (Patch enabling SyncML support for the SE P1i
 	                 mobile phone)
+	kolab/issue3894 (kronolith writes recurrent event data
+	                 non-conformant to vCal (1.0) standard)
 
     - openpkg-20071227-20071227_kolab2
 



From cvs at kolab.org  Tue Nov 24 16:06:01 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 16:06:01 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_SyncML_UV_RecurringEventsWeekCount.diff, NONE, 1.1.2.1 series,
	1.5.2.13, 1.5.2.14 
Message-ID: <20091124150601.4D440600161@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv8323/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_SyncML_UV_RecurringEventsWeekCount.diff 
Log Message:
 kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)

--- NEW FILE: t_SyncML_UV_RecurringEventsWeekCount.diff ---
From: root <Gunnar Wrobel wrobel at pardus.de>
Subject: [PATCH] t/SyncML/UV/RecurringEventsWeekCount

The attached patch fixes two Bugs in the SyncML code that affect the same
function. The Patch for A) only changes one line.

A) SyncML sends end dates not as DateTime, causing BB SyncJE to drop events
B) For recurring events SyncML sends number of incedences in vCal duration
   instead of the number of weeks.

REF: https://issues.kolab.org/issue3894

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

---
 horde-webmail/kronolith/lib/Recurrence.php |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
index 5aa5960..acbbee7 100644
--- a/horde-webmail/kronolith/lib/Recurrence.php
+++ b/horde-webmail/kronolith/lib/Recurrence.php
@@ -944,6 +944,7 @@ class Horde_Date_Recurrence {
      */
     function toRRule10($calendar)
     {
+        $rec_days_per_week = 0;
         switch ($this->recurType) {
         case HORDE_DATE_RECUR_NONE:
             return '';
@@ -959,6 +960,7 @@ class Horde_Date_Recurrence {
             for ($i = 0; $i <= 7 ; ++$i) {
                 if ($this->recurOnDay(pow(2, $i))) {
                     $rrule .= ' ' . $vcaldays[$i];
+                    $rec_days_per_week++;
                 }
             }
             break;
@@ -997,9 +999,18 @@ class Horde_Date_Recurrence {
             return '';
         }
 
-        return $this->hasRecurEnd() ?
-            $rrule . ' ' . $calendar->_exportDate($this->recurEnd) :
-            $rrule . ' #' . (int)$this->getRecurCount();
+        if ( $this->hasRecurEnd() ) {
+            $rrule .= ' ' . $calendar->_exportDateTime($this->recurEnd);
+        } else {
+            if ($rec_days_per_week > 1) {
+                $rec_weeks= (int)floor((int)$this->getRecurCount() / $rec_days_per_week);
+                $rrule .= ' #' . $rec_weeks;
+	    } else {
+                $rrule .= ' #' . (int)$this->getRecurCount();
+            }
+        }
+
+        return $rrule;
     }
 
     /**
-- 
tg: (29677b1..) t/SyncML/UV/RecurringEventsWeekCount (depends on: t/SyncML/UV/message/size/p1i)
-- 
TOPGIT patch commit log
=======================

commit c454efe2987e3f5e735247bffc16e40b282672dc
Author: root <Gunnar Wrobel wrobel at pardus.de>
Date:   Tue Nov 24 15:46:04 2009 +0100

     kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/series,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -d -r1.5.2.13 -r1.5.2.14
--- series	24 Nov 2009 09:51:13 -0000	1.5.2.13
+++ series	24 Nov 2009 15:05:59 -0000	1.5.2.14
@@ -78,4 +78,5 @@
 t_framework_H_JS_Form_FixFormSecurityForImageUploads.diff -p1
 t_kronolith_HK_GW_HandleEmptyDates.diff -p1
 t_SyncML_HK_GW_DoubleSyncFix.diff -p1
-t_SyncML_UV_message_size_p1i.diff -p1
\ No newline at end of file
+t_SyncML_UV_message_size_p1i.diff -p1
+t_SyncML_UV_RecurringEventsWeekCount.diff -p1
\ No newline at end of file



From cvs at kolab.org  Tue Nov 24 19:45:00 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 19:45:00 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.68,1.69 
Message-ID: <20091124184500.69C89600161@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Renamed variable do_reload to $Kolab::do_reload, to make it a global variable.
This is needed to solve kolab/issue3951: kolabconf -n (noreload) restarts
services if RUNONCHANGE is used



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ChangeLog	23 Nov 2009 22:47:05 -0000	1.68
+++ ChangeLog	24 Nov 2009 18:44:58 -0000	1.69
@@ -1,3 +1,10 @@
+2009-11-24 Richard Bos <richard at radoeka.nl>
+
+	* sbin/kolabconf.in, lib/Kolab/Conf.pm: renamed variable do_reload
+	  to $Kolab::do_reload, to make it a global variable.  This is needed
+	  to solve kolab/issue3951: kolabconf -n (noreload) restarts services
+	  if RUNONCHANGE is used
+
 2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
 
 	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems



From cvs at kolab.org  Tue Nov 24 19:45:00 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 19:45:00 +0100 (CET)
Subject: richard: server/perl-kolab/sbin kolabconf.in,1.2,1.3 
Message-ID: <20091124184500.6AF1B600171@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabconf.in 
Log Message:
Renamed variable do_reload to $Kolab::do_reload, to make it a global variable.
This is needed to solve kolab/issue3951: kolabconf -n (noreload) restarts
services if RUNONCHANGE is used



Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolabconf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf.in	20 Jan 2009 17:22:12 -0000	1.2
+++ kolabconf.in	24 Nov 2009 18:44:58 -0000	1.3
@@ -93,9 +93,9 @@
     exit 0;
 }
 
-my $do_reload = 1;
+$Kolab::do_reload = 1;
 if($opt_n) {
-    $do_reload = 0;
+    $Kolab::do_reload = 0;
 }
 
 if( !$Kolab::reloadOk ) {
@@ -109,8 +109,9 @@
 Kolab::Conf::rebuildTemplates;
 Kolab::log('KC', 'Reloading kolab components');
 
-if( $do_reload ) {
+if( $Kolab::do_reload ) {
     Kolab::Conf::reload;
 }
 
 Kolab::log('KC', 'Finished');
+



From cvs at kolab.org  Tue Nov 24 19:45:00 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 19:45:00 +0100 (CET)
Subject: richard: server/perl-kolab/lib/Kolab Conf.pm,1.10,1.11 
Message-ID: <20091124184500.75E5760081B@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv14677/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Renamed variable do_reload to $Kolab::do_reload, to make it a global variable.
This is needed to solve kolab/issue3951: kolabconf -n (noreload) restarts
services if RUNONCHANGE is used



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Conf.pm	7 May 2009 16:13:33 -0000	1.10
+++ Conf.pm	24 Nov 2009 18:44:58 -0000	1.11
@@ -741,8 +741,18 @@
     }
     my $cmd;
     foreach $cmd (keys %cmds) {
-	Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
-	system($cmd);
+        # $cmd can contain:
+        # - /usr/sbin/postmap: should always be executed
+        # - openpkg rc imapd restart (in openpkg distribution)
+        # - kolabsrv rc post reload  (in other distributions)
+        # The commands with ' rc ' may only be executed when reloading is not
+        # prohibited by the user with the "-n" option.
+        if ($Kolab::do_reload || $cmd !~ / rc \S+ re(start|load)/) {
+            Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
+            system($cmd);
+        } else {
+            Kolab::log('T', 'Reload not allowed, not executing command: '.$cmd, KOLAB_DEBUG );
+        }
     }
 }
 



From cvs at kolab.org  Tue Nov 24 19:57:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 19:57:10 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog, 1.56.2.4, 1.56.2.5 Makefile.PL,
	1.14.2.3, 1.14.2.4 
Message-ID: <20091124185710.D98C5600161@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Makefile.PL 
Log Message:
 kolab/issue3952 (Version in kolabconf is not replaced in the build process)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.4
retrieving revision 1.56.2.5
diff -u -d -r1.56.2.4 -r1.56.2.5
--- ChangeLog	17 Nov 2009 17:12:35 -0000	1.56.2.4
+++ ChangeLog	24 Nov 2009 18:57:08 -0000	1.56.2.5
@@ -1,3 +1,8 @@
+2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
+
+	* Makefile.PL: kolab/issue3952 (Version in kolabconf is not
+	replaced in the build process)
+
 2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
 
 	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- Makefile.PL	9 Nov 2009 17:08:44 -0000	1.14.2.3
+++ Makefile.PL	24 Nov 2009 18:57:08 -0000	1.14.2.4
@@ -102,11 +102,18 @@
     }
     my $add = "include kolab.mk
 
+PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
+VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
+RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
+SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
+
 bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 sbin/%: sbin/%.in
-	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@.tmp
+	cat \$@.tmp | sed -e 's#\@VERSION@#\$(VERSION)#g' > \$@
+	rm \$@.tmp
 	\$(FIXIN) \$@
 
 SBIN_TARGETS=sbin/kolabconf sbin/kolab_bootstrap sbin/kolabd sbin/kolabcheckperm
@@ -127,11 +134,6 @@
 ifeq \"x\$(PLATTAG)\" \"x\"
 	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(KOLABDIR:/%=%)
 endif
-
-PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
-VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
-RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
-SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
 
 clean_tardist:
 	rm -rf *.tar.gz



From cvs at kolab.org  Tue Nov 24 19:57:10 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 19:57:10 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.76,1.398.2.77 
Message-ID: <20091124185710.DE343600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3952 (Version in kolabconf is not replaced in the build process)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.76
retrieving revision 1.398.2.77
diff -u -d -r1.398.2.76 -r1.398.2.77
--- release-notes.txt	24 Nov 2009 15:05:58 -0000	1.398.2.76
+++ release-notes.txt	24 Nov 2009 18:57:08 -0000	1.398.2.77
@@ -144,6 +144,8 @@
 	                passwords)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
+	kolab/issue3952 (Version in kolabconf is not replaced in the build
+	                 process)
 
 
     Packages in the OpenPKG based Kolab server release:



From cvs at kolab.org  Tue Nov 24 20:39:34 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 20:39:34 +0100 (CET)
Subject: richard: server release-notes.txt,1.463,1.464 
Message-ID: <20091124193934.560F8600161@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added kolab/issue3951 to HEAD

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -d -r1.463 -r1.464
--- release-notes.txt	23 Nov 2009 22:47:05 -0000	1.463
+++ release-notes.txt	24 Nov 2009 19:39:32 -0000	1.464
@@ -123,6 +123,10 @@
 
 	Execute duplicate RUNONCHANGE commands only once.
 
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE
+			 is used)
+
+
     - php-5.2.8-20081209_kolab3
 
 	Activated the HASH and JSON modules.



From cvs at kolab.org  Tue Nov 24 20:55:19 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 20:55:19 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.77,1.398.2.78 
Message-ID: <20091124195519.E0C68600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3567 (Migrate Horde prefs 2.2.0 -> 2.2.1, 2.2.2)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.77
retrieving revision 1.398.2.78
diff -u -d -r1.398.2.77 -r1.398.2.78
--- release-notes.txt	24 Nov 2009 18:57:08 -0000	1.398.2.77
+++ release-notes.txt	24 Nov 2009 19:55:17 -0000	1.398.2.78
@@ -114,6 +114,7 @@
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)
+	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



From cvs at kolab.org  Tue Nov 24 20:55:19 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 20:55:19 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.18,
	1.10.2.19 webclient-kolab-conf.template, 1.2.2.2, 1.2.2.3 
Message-ID: <20091124195519.E713B60081D@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog webclient-kolab-conf.template 
Log Message:
 kolab/issue3567 (Migrate Horde prefs 2.2.0 -> 2.2.1, 2.2.2)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.18
retrieving revision 1.10.2.19
diff -u -d -r1.10.2.18 -r1.10.2.19
--- ChangeLog	24 Nov 2009 15:05:58 -0000	1.10.2.18
+++ ChangeLog	24 Nov 2009 19:55:17 -0000	1.10.2.19
@@ -1,3 +1,8 @@
+2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+
+	* webclient-kolab-conf.template: kolab/issue3567 (Migrate Horde
+	prefs 2.2.0 -> 2.2.1, 2.2.2)
+
 2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
 
 	* kolab-webclient.spec:

Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kolab-conf.template,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- webclient-kolab-conf.template	13 Oct 2009 12:37:27 -0000	1.2.2.2
+++ webclient-kolab-conf.template	24 Nov 2009 19:55:17 -0000	1.2.2.3
@@ -46,4 +46,12 @@
  * Uncomment if you wish to hide the organizer which is currently the proxy user.
  */
 //$conf['ics']['hide_organizer'] = true;
+
+/**
+ * Uncomment if you wish to keep user preferences in LDAP rather than in
+ * file based storage.
+ *
+ * See https://issues.kolab.org/issue3567
+ */
+//$conf['prefs']['driver'] = 'kolab';
 ?>



From cvs at kolab.org  Tue Nov 24 21:34:35 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 21:34:35 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.267,1.268 
Message-ID: <20091124203435.21F0F60081D@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Modify the hardcoded location /kolab/etc/spamassassin/local.cf to one that is
updated by the build process.  kolab/issue3953: use spamassassin_confdir in
local.cf.template comment



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- ChangeLog	23 Nov 2009 22:47:08 -0000	1.267
+++ ChangeLog	24 Nov 2009 20:34:33 -0000	1.268
@@ -1,3 +1,10 @@
+2009-11-24 Richard Bos <richard at radoeka.nl>
+
+	* templates/local.cf.template.in: Modify the hardcoded location
+	  /kolab/etc/spamassassin/local.cf to one that is updated by the
+	  build process.  kolab/issue3953: use spamassassin_confdir in
+	  local.cf.template comment
+
 2009-11-23  Gunnar Wrobel <wrobel at pardus.de>
 
 	* templates/php.ini.template.in (magic_quotes_gpc):



From cvs at kolab.org  Tue Nov 24 21:34:35 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 21:34:35 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates local.cf.template.in, 1.1,
	1.2 
Message-ID: <20091124203435.262DD60081E@lists.intevation.de>

Author: richard

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

Modified Files:
	local.cf.template.in 
Log Message:
Modify the hardcoded location /kolab/etc/spamassassin/local.cf to one that is
updated by the build process.  kolab/issue3953: use spamassassin_confdir in
local.cf.template comment



Index: local.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/local.cf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- local.cf.template.in	29 Apr 2008 14:50:49 -0000	1.1
+++ local.cf.template.in	24 Nov 2009 20:34:33 -0000	1.2
@@ -13,7 +13,7 @@
 # directory
 # The template is  @sysconfdir@/kolab/templates/local.cf.template
 ##
-##  /kolab/etc/spamassassin/local.cf -- site-wide defaults for SpamAssassin
+##  @spamassassin_confdir@/local.cf -- site-wide defaults for SpamAssassin
 ##  (see 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked)
 ##
 



From cvs at kolab.org  Tue Nov 24 21:36:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Nov 2009 21:36:31 +0100 (CET)
Subject: richard: server release-notes.txt,1.464,1.465 
Message-ID: <20091124203631.75E35600171@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added kolab/issue3953

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -d -r1.464 -r1.465
--- release-notes.txt	24 Nov 2009 19:39:32 -0000	1.464
+++ release-notes.txt	24 Nov 2009 20:36:29 -0000	1.465
@@ -88,6 +88,7 @@
 	                 packages)
 	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-fbview-1.2.0-2009????
 



From cvs at kolab.org  Wed Nov 25 14:42:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Nov 2009 14:42:22 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates resmgr.conf.template.in,
	1.34.2.2, 1.34.2.3 
Message-ID: <20091125134222.5FAFC60081D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	resmgr.conf.template.in 
Log Message:
Made configuration of untrusted messages more flexible. 
Fixes kolab/issue973 (Rewritten from shown inconveniently in kontact)

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -u -d -r1.34.2.2 -r1.34.2.3
--- resmgr.conf.template.in	10 Nov 2009 20:42:00 -0000	1.34.2.2
+++ resmgr.conf.template.in	25 Nov 2009 13:42:20 -0000	1.34.2.3
@@ -115,9 +115,14 @@
 $conf['kolab']['filter']['reject_forged_from_header'] = false;
 @@@endif@@@
 
-/* Text to be inserted in From: when rewriting untrusted mails */
-// $conf['kolab']['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-// $conf['kolab']['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+/* Text to be inserted in From: when rewriting untrusted mails
+ * The following format specifiers can be used: 
+ * -  %1$s denotes the envelope sender
+ * -  %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)";
 
 /* Should we allow forwarded ical messages from Outlook
  * by encapsulating them in a MIME multipart



From cvs at kolab.org  Wed Nov 25 14:42:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Nov 2009 14:42:22 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.234.2.11,1.234.2.12 
Message-ID: <20091125134222.58804600171@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Made configuration of untrusted messages more flexible. 
Fixes kolab/issue973 (Rewritten from shown inconveniently in kontact)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.11
retrieving revision 1.234.2.12
diff -u -d -r1.234.2.11 -r1.234.2.12
--- ChangeLog	23 Nov 2009 22:35:01 -0000	1.234.2.11
+++ ChangeLog	25 Nov 2009 13:42:20 -0000	1.234.2.12
@@ -1,3 +1,8 @@
+2009-11-25  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/resmgr.conf.template.in: kolab/issue973 (Rewritten
+	from shown inconveniently in kontact)
+
 2009-11-23  Gunnar Wrobel <wrobel at pardus.de>
 
 	* templates/php.ini.template.in (magic_quotes_gpc):



From cvs at kolab.org  Wed Nov 25 14:42:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Nov 2009 14:42:22 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter issue973.patch, NONE,
	1.1.2.1 ChangeLog, 1.29.2.13, 1.29.2.14 Kolab_Filter.spec,
	1.19.2.16, 1.19.2.17 Makefile, 1.8.2.14, 1.8.2.15 
Message-ID: <20091125134222.66CC360081E@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue973.patch 
Log Message:
Made configuration of untrusted messages more flexible. 
Fixes kolab/issue973 (Rewritten from shown inconveniently in kontact)

--- NEW FILE: issue973.patch ---
--- a/lib/Horde/Kolab/Filter/Content.php
+++ b/lib/Horde/Kolab/Filter/Content.php
@@ -403,7 +403,6 @@
                 $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
             }
         }
-        $untrusted = sprintf($fmt, $sender);
 
         $adrs = imap_rfc822_parse_adrlist($fromhdr, $domains[0]);
 
@@ -433,15 +432,22 @@
                             /* Rewrite */
                             Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", 
                                                       $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+                            if (property_exists($adr, 'personal')) {
+                                $name = str_replace(array("\\", '"'), 
+                                                    array("\\\\",'\"'), 
+                                                    MIME::decode($adr->personal, 'utf-8'));
+                            } else {
+                                $name = '';
+                            }
+
+                            $untrusted = sprintf($fmt, $sender, $from, $name);
+
+                            // Is this test really correct?  Is $fromhdr a _decoded_ string?
+                            // If not comparing with the unencoded $untrusted is wrong.
+                            // sw - 20091125
                             if (strpos( $fromhdr, $untrusted )===false) {
-                                if (property_exists($adr, 'personal')) {
-                                    $name = str_replace(array("\\", '"'), 
-                                                        array("\\\\",'\"'), 
-                                                        MIME::decode($adr->personal, 'utf-8'));
-                                } else {
-                                    $name = '';
-                                }
-                                $new_from = '"' . MIME::encode($name . ' ' . $untrusted) . '"';
+                                $new_from = '"' . MIME::encode($untrusted) . '"';
                                 return  $new_from . ' <' . $from . '>';
                             } else {
                                 return true;

Diff finished.  Wed Nov 25 14:12:47 2009

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.13
retrieving revision 1.29.2.14
diff -u -d -r1.29.2.13 -r1.29.2.14
--- ChangeLog	24 Nov 2009 14:00:25 -0000	1.29.2.13
+++ ChangeLog	25 Nov 2009 13:42:20 -0000	1.29.2.14
@@ -1,3 +1,8 @@
+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>>
 
 	* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.16
retrieving revision 1.19.2.17
diff -u -d -r1.19.2.16 -r1.19.2.17
--- Kolab_Filter.spec	24 Nov 2009 14:00:25 -0000	1.19.2.16
+++ Kolab_Filter.spec	25 Nov 2009 13:42:20 -0000	1.19.2.17
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091124
+%define         V_release 20091125
 
 # Package Information
 Name:	   %{V_package}
@@ -33,6 +33,7 @@
 Patch11:   issue3768.patch
 Patch12:   issue3464.patch
 Patch13:   issue3594.patch
+Patch14:   issue973.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -81,6 +82,7 @@
 	%patch -p1 -P 11
 	%patch -p1 -P 12
 	%patch -p1 -P 13
+	%patch -p1 -P 14
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.14
retrieving revision 1.8.2.15
diff -u -d -r1.8.2.14 -r1.8.2.15
--- Makefile	24 Nov 2009 14:00:25 -0000	1.8.2.14
+++ Makefile	25 Nov 2009 13:42:20 -0000	1.8.2.15
@@ -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 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 issue973.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Wed Nov 25 14:42:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Nov 2009 14:42:22 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.78,1.398.2.79 
Message-ID: <20091125134222.5FA5660081B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Made configuration of untrusted messages more flexible. 
Fixes kolab/issue973 (Rewritten from shown inconveniently in kontact)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.78
retrieving revision 1.398.2.79
diff -u -d -r1.398.2.78 -r1.398.2.79
--- release-notes.txt	24 Nov 2009 19:55:17 -0000	1.398.2.78
+++ release-notes.txt	25 Nov 2009 13:42:19 -0000	1.398.2.79
@@ -61,6 +61,7 @@
 
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
+	kolab/issue973  (Rewritten from shown inconveniently in kontact)
 	kolab/issue1880 (Poor handling of apostrophes in ldap and admin
 	                 webpages)
 	kolab/issue2499 (Notification messages by the resource manager
@@ -77,6 +78,7 @@
 
     - Kolab_Filter-0.1.4-2009????
 
+	kolab/issue973  (Rewritten from shown inconveniently in kontact)
 	kolab/issue2495 (The reply to an invitation with umlauts of a
 	                 group account doesn't display the umlauts.)
 	kolab/issue2499 (Notification messages by the resource manager



From cvs at kolab.org  Wed Nov 25 20:18:50 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Nov 2009 20:18:50 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin style.css,
	1.12, 1.13 
Message-ID: <20091125191850.19DBD60081E@lists.intevation.de>

Author: richard

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

Modified Files:
	style.css 
Log Message:
a better implemention of kolab/issue3401.
Links are now directly visible and change when hovered.



Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- style.css	15 Nov 2009 20:39:38 -0000	1.12
+++ style.css	25 Nov 2009 19:18:47 -0000	1.13
@@ -135,10 +135,17 @@
 .contenttext {
   margin: 10px;
 }
+div.contenttext a {
+ font-weight: bold;
+}
 .contenttable {
   width: 100%;
   background-color: black;
   border: 0px;
+}
+.contenttable tr a {
+  font-weight: bold;
+  text-decoration: none;
 }
 .contentroweven {
   background-color: #C0CDE0;



From cvs at kolab.org  Wed Nov 25 20:18:50 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Nov 2009 20:18:50 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.118,1.119 
Message-ID: <20091125191850.19F76600820@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
a better implemention of kolab/issue3401.
Links are now directly visible and change when hovered.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- ChangeLog	16 Nov 2009 20:34:30 -0000	1.118
+++ ChangeLog	25 Nov 2009 19:18:47 -0000	1.119
@@ -1,3 +1,8 @@
+2009-11-25 Richard Bos <richard at radoeka.nl>
+
+	* www/admin/style.css: a better implemention of kolab/issue3401.
+	  Links are now directly visible and change when hovered.
+
 2009-11-16 Richard Bos <richard at radoeka.nl>
 
 	* www/admin/style.css: nicer, friendlier web interface color



From cvs at kolab.org  Thu Nov 26 15:54:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 15:54:16 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates main.cf.template.in, 1.22.2.1,
	1.22.2.2 
Message-ID: <20091126145416.3880F60014D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	main.cf.template.in 
Log Message:
Disallow NUL in mails. kolab/issue3594

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- main.cf.template.in	14 May 2009 10:52:36 -0000	1.22.2.1
+++ main.cf.template.in	26 Nov 2009 14:54:14 -0000	1.22.2.2
@@ -180,4 +180,8 @@
 # useful for checking authentication status esp. when using dynamic IPs for the sending client and doing authorization
 smtpd_sasl_authenticated_header = yes
 
+# Verbatim NUL bytes violate RfC 2822 and later and dont work with IMAP.
+# So we reject messages containing them (see kolab/issue3594).
+message_reject_characters = \0
+
 content_filter = kolabfilter



From cvs at kolab.org  Thu Nov 26 15:54:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 15:54:16 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.79,1.398.2.80 
Message-ID: <20091126145416.39675600820@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Disallow NUL in mails. kolab/issue3594

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.79
retrieving revision 1.398.2.80
diff -u -d -r1.398.2.79 -r1.398.2.80
--- release-notes.txt	25 Nov 2009 13:42:19 -0000	1.398.2.79
+++ release-notes.txt	26 Nov 2009 14:54:13 -0000	1.398.2.80
@@ -70,6 +70,8 @@
 	                 interface (e.g. vacation message))
 	kolab/issue3499 (creating/modifying users with special characters
 	                 in name confuses web admin)
+	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
+	                 Filter does not report lmtp error) 
 
     - kolab-webadmin-2.2.3-2009????
 



From cvs at kolab.org  Thu Nov 26 15:54:16 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 15:54:16 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.234.2.12,1.234.2.13 
Message-ID: <20091126145416.388D160081E@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Disallow NUL in mails. kolab/issue3594

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.12
retrieving revision 1.234.2.13
diff -u -d -r1.234.2.12 -r1.234.2.13
--- ChangeLog	25 Nov 2009 13:42:20 -0000	1.234.2.12
+++ ChangeLog	26 Nov 2009 14:54:14 -0000	1.234.2.13
@@ -1,3 +1,9 @@
+2009-11-26  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/main.cf.template.in: Added `message_reject_characters'
+	directive, see kolab/issue3594 (Mail containing NUL byte not
+	delivered, Kolab Filter does not report lmtp error)
+
 2009-11-25  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/resmgr.conf.template.in: kolab/issue973 (Rewritten



From cvs at kolab.org  Thu Nov 26 16:01:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 16:01:20 +0100 (CET)
Subject: wilde: server release-notes.txt,1.465,1.466 
Message-ID: <20091126150120.5B5B460014D@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Disallow NUL in mails. kolab/issue3594

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -d -r1.465 -r1.466
--- release-notes.txt	24 Nov 2009 20:36:29 -0000	1.465
+++ release-notes.txt	26 Nov 2009 15:01:18 -0000	1.466
@@ -153,6 +153,8 @@
 	                 interface (e.g. vacation message))
 	kolab/issue3499 (creating/modifying users with special characters
 	                 in name confuses web admin)
+	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
+	                 Filter does not report lmtp error) 
 
     - kolab-webadmin-2.2.3-2009????
 



From cvs at kolab.org  Thu Nov 26 16:01:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 16:01:20 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.268,1.269 
Message-ID: <20091126150120.606B660081E@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Disallow NUL in mails. kolab/issue3594

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -d -r1.268 -r1.269
--- ChangeLog	24 Nov 2009 20:34:33 -0000	1.268
+++ ChangeLog	26 Nov 2009 15:01:18 -0000	1.269
@@ -1,3 +1,9 @@
+2009-11-26  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/main.cf.template.in: Added `message_reject_characters'
+	directive, see kolab/issue3594 (Mail containing NUL byte not
+	delivered, Kolab Filter does not report lmtp error)
+
 2009-11-24 Richard Bos <richard at radoeka.nl>
 
 	* templates/local.cf.template.in: Modify the hardcoded location



From cvs at kolab.org  Thu Nov 26 16:01:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 16:01:20 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates main.cf.template.in,1.24,1.25 
Message-ID: <20091126150120.64190600820@lists.intevation.de>

Author: wilde

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

Modified Files:
	main.cf.template.in 
Log Message:
Disallow NUL in mails. kolab/issue3594

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- main.cf.template.in	14 May 2009 10:58:33 -0000	1.24
+++ main.cf.template.in	26 Nov 2009 15:01:18 -0000	1.25
@@ -181,4 +181,8 @@
 # useful for checking authentication status esp. when using dynamic IPs for the sending client and doing authorization
 smtpd_sasl_authenticated_header = yes
 
+# Verbatim NUL bytes violate RfC 2822 and later and dont work with IMAP.
+# So we reject messages containing them (see kolab/issue3594).
+message_reject_characters = \0
+
 content_filter = kolabfilter



From cvs at kolab.org  Thu Nov 26 16:07:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Nov 2009 16:07:13 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates resmgr.conf.template.in,
	1.34.2.3, 1.34.2.4 
Message-ID: <20091126150713.401A160014E@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	resmgr.conf.template.in 
Log Message:
Fixed quoting in resmgr.conf.template, kolab/issue973

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -d -r1.34.2.3 -r1.34.2.4
--- resmgr.conf.template.in	25 Nov 2009 13:42:20 -0000	1.34.2.3
+++ resmgr.conf.template.in	26 Nov 2009 15:07:10 -0000	1.34.2.4
@@ -121,8 +121,8 @@
  * -  %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']['untrusted_subject_insert'] = '(UNTRUSTED, sender is <%1$s>)';
+// $conf['kolab']['filter']['unauthenticated_subject_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  Fri Nov 27 18:42:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 18:42:33 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.80,1.398.2.81 
Message-ID: <20091127174233.302CC60014B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.80
retrieving revision 1.398.2.81
diff -u -d -r1.398.2.80 -r1.398.2.81
--- release-notes.txt	26 Nov 2009 14:54:13 -0000	1.398.2.80
+++ release-notes.txt	27 Nov 2009 17:42:30 -0000	1.398.2.81
@@ -71,7 +71,9 @@
 	kolab/issue3499 (creating/modifying users with special characters
 	                 in name confuses web admin)
 	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
-	                 Filter does not report lmtp error) 
+	                 Filter does not report lmtp error)
+	kolab/issue3895 (Openldap: loglevel should be set to none in
+	                 slapd.conf)
 
     - kolab-webadmin-2.2.3-2009????
 



From cvs at kolab.org  Fri Nov 27 18:42:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 18:42:33 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.234.2.13,1.234.2.14 
Message-ID: <20091127174233.39C6660014C@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.13
retrieving revision 1.234.2.14
diff -u -d -r1.234.2.13 -r1.234.2.14
--- ChangeLog	26 Nov 2009 14:54:14 -0000	1.234.2.13
+++ ChangeLog	27 Nov 2009 17:42:31 -0000	1.234.2.14
@@ -1,3 +1,9 @@
+2009-11-27  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/slapd.conf.template.in: loglevel none, see
+	kolab/issue3895 (Openldap: loglevel should be set to none in
+	slapd.conf)
+
 2009-11-26  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/main.cf.template.in: Added `message_reject_characters'



From cvs at kolab.org  Fri Nov 27 18:42:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 18:42:33 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates slapd.conf.template.in, 1.25.2.1,
	1.25.2.2 
Message-ID: <20091127174233.4609960014B@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	slapd.conf.template.in 
Log Message:
kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- slapd.conf.template.in	20 Apr 2009 16:22:37 -0000	1.25.2.1
+++ slapd.conf.template.in	27 Nov 2009 17:42:31 -0000	1.25.2.2
@@ -51,7 +51,7 @@
 #require 	none
 allow 		bind_v2
 
-loglevel	0
+loglevel	none
 
 database	bdb
 suffix		"@@@base_dn@@@"



From cvs at kolab.org  Fri Nov 27 18:43:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 18:43:33 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates slapd.conf.template.in, 1.27,
	1.28 
Message-ID: <20091127174333.8833060014D@lists.intevation.de>

Author: wilde

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

Modified Files:
	slapd.conf.template.in 
Log Message:
kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- slapd.conf.template.in	27 Aug 2009 21:13:18 -0000	1.27
+++ slapd.conf.template.in	27 Nov 2009 17:43:31 -0000	1.28
@@ -63,7 +63,7 @@
 #require 	none
 allow 		bind_v2
 
-loglevel	0
+loglevel	none
 
 database	bdb
 suffix		"@@@base_dn@@@"



From cvs at kolab.org  Fri Nov 27 18:43:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 18:43:33 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.269,1.270 
Message-ID: <20091127174333.844D660014C@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- ChangeLog	26 Nov 2009 15:01:18 -0000	1.269
+++ ChangeLog	27 Nov 2009 17:43:31 -0000	1.270
@@ -1,3 +1,9 @@
+2009-11-27  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/slapd.conf.template.in: loglevel none, see
+	kolab/issue3895 (Openldap: loglevel should be set to none in
+	slapd.conf)
+
 2009-11-26  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/main.cf.template.in: Added `message_reject_characters'



From cvs at kolab.org  Fri Nov 27 18:43:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 18:43:33 +0100 (CET)
Subject: wilde: server release-notes.txt,1.466,1.467 
Message-ID: <20091127174333.81E7660014B@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -d -r1.466 -r1.467
--- release-notes.txt	26 Nov 2009 15:01:18 -0000	1.466
+++ release-notes.txt	27 Nov 2009 17:43:31 -0000	1.467
@@ -154,7 +154,9 @@
 	kolab/issue3499 (creating/modifying users with special characters
 	                 in name confuses web admin)
 	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
-	                 Filter does not report lmtp error) 
+	                 Filter does not report lmtp error)
+	kolab/issue3895 (Openldap: loglevel should be set to none in
+	                 slapd.conf)
 
     - kolab-webadmin-2.2.3-2009????
 



From cvs at kolab.org  Fri Nov 27 19:51:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 19:51:52 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.19,
	1.10.2.20 kolab-webclient.spec, 1.23.2.19, 1.23.2.20 
Message-ID: <20091127185152.0ECA160014B@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.19
retrieving revision 1.10.2.20
diff -u -d -r1.10.2.19 -r1.10.2.20
--- ChangeLog	24 Nov 2009 19:55:17 -0000	1.10.2.19
+++ ChangeLog	27 Nov 2009 18:51:49 -0000	1.10.2.20
@@ -1,4 +1,9 @@
-2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+2009-11-27  Gunnar Wrobel <wrobel at pardus.de>
+
+	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that
+	are counted per week and not per incident)
+
+2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
 
 	* webclient-kolab-conf.template: kolab/issue3567 (Migrate Horde
 	prefs 2.2.0 -> 2.2.1, 2.2.2)

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.19
retrieving revision 1.23.2.20
diff -u -d -r1.23.2.19 -r1.23.2.20
--- kolab-webclient.spec	24 Nov 2009 07:04:45 -0000	1.23.2.19
+++ kolab-webclient.spec	27 Nov 2009 18:51:49 -0000	1.23.2.20
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 11
-%define         V_day   24
+%define         V_day   27
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Fri Nov 27 19:51:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 19:51:52 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.23, 1.32.2.24 
Message-ID: <20091127185152.A101760014C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv31785/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.23
retrieving revision 1.32.2.24
diff -u -d -r1.32.2.23 -r1.32.2.24
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 15:05:58 -0000	1.32.2.23
+++ horde-webmail-1.2.0_kolab_openpkg.patch	27 Nov 2009 18:51:49 -0000	1.32.2.24
@@ -27794,15 +27794,15 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/lib/Recurrence.php  |   57 ++++++++++++++++++++++++--
- horde-webmail/lib/Horde/Date/Recurrence.php |   57 ++++++++++++++++++++++++--
- 2 files changed, 104 insertions(+), 10 deletions(-)
+ horde-webmail/kronolith/lib/Recurrence.php  |   58 ++++++++++++++++++++++++--
+ horde-webmail/lib/Horde/Date/Recurrence.php |   58 ++++++++++++++++++++++++--
+ 2 files changed, 106 insertions(+), 10 deletions(-)
 
 diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
-index f22351d..5aa5960 100644
+index f22351d..409063f 100644
 --- a/horde-webmail/kronolith/lib/Recurrence.php
 +++ b/horde-webmail/kronolith/lib/Recurrence.php
-@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -27824,7 +27824,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-             }
++            }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -27839,6 +27839,7 @@
 +                        $recurrences--;
 +                    }
 +                    ++$next->mday;
++                    $next->correct();
 +                }
 +                if ($repeats > 0) {
 +                    $weekdays = $this->recurData;
@@ -27851,7 +27852,7 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-+            }
+             }
 +
              $next = $start_week;
 -            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
@@ -27874,10 +27875,10 @@
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
 diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
-index 9dbf057..e21193f 100644
+index 9dbf057..c11624b 100644
 --- a/horde-webmail/lib/Horde/Date/Recurrence.php
 +++ b/horde-webmail/lib/Horde/Date/Recurrence.php
-@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -27899,7 +27900,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-             }
++            }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -27914,6 +27915,7 @@
 +                        $recurrences--;
 +                    }
 +                    ++$next->mday;
++                    $next->correct();
 +                }
 +                if ($repeats > 0) {
 +                    $weekdays = $this->recurData;
@@ -27926,7 +27928,7 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-+            }
+             }
 +
              $next = $start_week;
 -            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
@@ -27949,10 +27951,17 @@
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
 -- 
-tg: (01f4e60..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
+tg: (1f477b1..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 2b3d01e220c0a2f5a80f68e5ac7eb759d6090fe3
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Fri Nov 27 19:28:59 2009 +0100
+
+    In FW3 dates need to be corrected after modifying them. Missed one
+    such call. Bug #8702: Infinite loop because of a recurring event.
 
 commit ecde0d9b33f53d7ed3a3d5bdd358118213d4abe1
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Fri Nov 27 19:51:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 19:51:52 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff, 1.1.2.1, 1.1.2.2 
Message-ID: <20091127185152.96D8960014B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv31785/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff	10 Nov 2009 09:59:07 -0000	1.1.2.1
+++ t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff	27 Nov 2009 18:51:50 -0000	1.1.2.2
@@ -12,15 +12,15 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/lib/Recurrence.php  |   57 ++++++++++++++++++++++++--
- horde-webmail/lib/Horde/Date/Recurrence.php |   57 ++++++++++++++++++++++++--
- 2 files changed, 104 insertions(+), 10 deletions(-)
+ horde-webmail/kronolith/lib/Recurrence.php  |   58 ++++++++++++++++++++++++--
+ horde-webmail/lib/Horde/Date/Recurrence.php |   58 ++++++++++++++++++++++++--
+ 2 files changed, 106 insertions(+), 10 deletions(-)
 
 diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
-index f22351d..5aa5960 100644
+index f22351d..409063f 100644
 --- a/horde-webmail/kronolith/lib/Recurrence.php
 +++ b/horde-webmail/kronolith/lib/Recurrence.php
-@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -42,7 +42,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-             }
++            }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -57,6 +57,7 @@
 +                        $recurrences--;
 +                    }
 +                    ++$next->mday;
++                    $next->correct();
 +                }
 +                if ($repeats > 0) {
 +                    $weekdays = $this->recurData;
@@ -69,7 +70,7 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-+            }
+             }
 +
              $next = $start_week;
 -            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
@@ -92,10 +93,10 @@
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
 diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
-index 9dbf057..e21193f 100644
+index 9dbf057..c11624b 100644
 --- a/horde-webmail/lib/Horde/Date/Recurrence.php
 +++ b/horde-webmail/lib/Horde/Date/Recurrence.php
-@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -117,7 +118,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-             }
++            }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -132,6 +133,7 @@
 +                        $recurrences--;
 +                    }
 +                    ++$next->mday;
++                    $next->correct();
 +                }
 +                if ($repeats > 0) {
 +                    $weekdays = $this->recurData;
@@ -144,7 +146,7 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-+            }
+             }
 +
              $next = $start_week;
 -            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
@@ -167,10 +169,17 @@
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
 -- 
-tg: (01f4e60..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
+tg: (1f477b1..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 2b3d01e220c0a2f5a80f68e5ac7eb759d6090fe3
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Fri Nov 27 19:28:59 2009 +0100
+
+    In FW3 dates need to be corrected after modifying them. Missed one
+    such call. Bug #8702: Infinite loop because of a recurring event.
 
 commit ecde0d9b33f53d7ed3a3d5bdd358118213d4abe1
 Author: Gunnar Wrobel <p at rdus.de>



From cvs at kolab.org  Fri Nov 27 20:16:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Nov 2009 20:16:14 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.270, 1.271 kolab_ca.sh.in,
	1.3, 1.4 
Message-ID: <20091127191614.2AF9C60014B@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_ca.sh.in 
Log Message:
prevent /root being printed during bootstrap:
 = kolab/issue3979 Confusing /root in the output of kolab_bootstrap



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- ChangeLog	27 Nov 2009 17:43:31 -0000	1.270
+++ ChangeLog	27 Nov 2009 19:16:12 -0000	1.271
@@ -1,14 +1,19 @@
+2009-11-27 Richard Bos <richard at radoeka.nl>
+
+	* kolab_ca.sh.in: prevent /root being printed during bootstrap:
+	  kolab/issue3979 Confusing /root in the output of kolab_bootstrap
+
 2009-11-27  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/slapd.conf.template.in: loglevel none, see
-	kolab/issue3895 (Openldap: loglevel should be set to none in
-	slapd.conf)
+	  kolab/issue3895 (Openldap: loglevel should be set to none in
+	  slapd.conf)
 
 2009-11-26  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/main.cf.template.in: Added `message_reject_characters'
-	directive, see kolab/issue3594 (Mail containing NUL byte not
-	delivered, Kolab Filter does not report lmtp error)
+	  directive, see kolab/issue3594 (Mail containing NUL byte not
+	  delivered, Kolab Filter does not report lmtp error)
 
 2009-11-24 Richard Bos <richard at radoeka.nl>
 

Index: kolab_ca.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_ca.sh.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_ca.sh.in	27 Dec 2005 13:09:30 -0000	1.3
+++ kolab_ca.sh.in	27 Nov 2009 19:16:12 -0000	1.4
@@ -21,6 +21,7 @@
 # Make sure not to create world readable files
 umask 0077
 
+OLD_DIR=$PWD
 cd @sysconfdir@/kolab
 
 # Config
@@ -274,7 +275,7 @@
 shift
 done
 
-cd -
+cd $OLD_DIR
 
 exit $RET
 



From cvs at kolab.org  Wed Dec  2 19:10:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  2 Dec 2009 19:10:33 +0100 (CET)
Subject: mathieu: server/kolabd/kolabd ChangeLog,1.271,1.272 
Message-ID: <20091202181033.8A218600561@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
dist_conf'iguration for safe_mode_include_dir. End with slash as recommended
in http://php.net/ini.sect.safe-mode


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- ChangeLog	27 Nov 2009 19:16:12 -0000	1.271
+++ ChangeLog	2 Dec 2009 18:10:31 -0000	1.272
@@ -1,3 +1,9 @@
+2009-12-02  Mathieu Parent <math.parent at gmail.com>
+
+	* templates/php.ini.template.in: dist_conf'iguration for
+	  safe_mode_include_dir. End with slash as recommended in
+	  http://php.net/ini.sect.safe-mode
+
 2009-11-27 Richard Bos <richard at radoeka.nl>
 
 	* kolab_ca.sh.in: prevent /root being printed during bootstrap:



From cvs at kolab.org  Wed Dec  2 19:10:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  2 Dec 2009 19:10:33 +0100 (CET)
Subject: mathieu: server/kolabd/kolabd/templates php.ini.template.in, 1.9,
	1.10 
Message-ID: <20091202181033.8DA3A600564@lists.intevation.de>

Author: mathieu

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

Modified Files:
	php.ini.template.in 
Log Message:
dist_conf'iguration for safe_mode_include_dir. End with slash as recommended
in http://php.net/ini.sect.safe-mode


Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- php.ini.template.in	23 Nov 2009 22:42:15 -0000	1.9
+++ php.ini.template.in	2 Dec 2009 18:10:31 -0000	1.10
@@ -34,7 +34,7 @@
 ;   Include Paths
 ;include_path          = ".:/kolab/lib/php"
 include_path          = ".:@phplibdir@:@phplibdir2@:@phppeardir@"
-safe_mode_include_dir = "/kolab/lib/php"
+safe_mode_include_dir = "@phplibdir@/"
 
 [Session]
 session.save_path = @webserver_sessions@



From cvs at kolab.org  Wed Dec  2 19:10:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  2 Dec 2009 19:10:33 +0100 (CET)
Subject: mathieu: server release-notes.txt,1.467,1.468 
Message-ID: <20091202181033.8B941600562@lists.intevation.de>

Author: mathieu

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

Modified Files:
	release-notes.txt 
Log Message:
dist_conf'iguration for safe_mode_include_dir. End with slash as recommended
in http://php.net/ini.sect.safe-mode


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -d -r1.467 -r1.468
--- release-notes.txt	27 Nov 2009 17:43:31 -0000	1.467
+++ release-notes.txt	2 Dec 2009 18:10:31 -0000	1.468
@@ -79,6 +79,9 @@
 
 	Use RUNONCHANGE mechanism to restart or reload sasl, apache, amavisd,
 	clamav, postfix and imapd.
+	
+	dist_conf'iguration of php.ini.template.in for safe_mode_include_dir. End
+	with slash as recommended in http://php.net/ini.sect.safe-mode
 
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
 	kolab/issue1755 (syncrepl support (for OpenLDAP >=2.4.6))



From cvs at kolab.org  Thu Dec  3 10:52:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 10:52:27 +0100 (CET)
Subject: gunnar: server/kolab-webclient ChangeLog, 1.10.2.20,
	1.10.2.21 kolab-webclient.spec, 1.23.2.20, 1.23.2.21 
Message-ID: <20091203095227.8CD2D600564@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
Log Message:
kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.20
retrieving revision 1.10.2.21
diff -u -d -r1.10.2.20 -r1.10.2.21
--- ChangeLog	27 Nov 2009 18:51:49 -0000	1.10.2.20
+++ ChangeLog	3 Dec 2009 09:52:25 -0000	1.10.2.21
@@ -1,3 +1,8 @@
+2009-12-03  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that
+	are counted per week and not per incident)
+
 2009-11-27  Gunnar Wrobel <wrobel at pardus.de>
 
 	* kolab-webclient.spec: kolab/issue3846 (fix recurring events that

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.20
retrieving revision 1.23.2.21
diff -u -d -r1.23.2.20 -r1.23.2.21
--- kolab-webclient.spec	27 Nov 2009 18:51:49 -0000	1.23.2.20
+++ kolab-webclient.spec	3 Dec 2009 09:52:25 -0000	1.23.2.21
@@ -2,8 +2,8 @@
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
 %define         V_year  2009
-%define         V_month 11
-%define         V_day   27
+%define         V_month 12
+%define         V_day   02
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1



From cvs at kolab.org  Thu Dec  3 10:52:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 10:52:28 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0/tg
	t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff, 1.1.2.2, 1.1.2.3 
Message-ID: <20091203095228.6C51460057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv7108/patches/horde-webmail/1.2.0/tg

Modified Files:
      Tag: kolab_2_2_branch
	t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff 
Log Message:
kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff	27 Nov 2009 18:51:50 -0000	1.1.2.2
+++ t_kronolith_HK_GW_FixWeeklyRecurringEvents.diff	3 Dec 2009 09:52:26 -0000	1.1.2.3
@@ -12,15 +12,15 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/lib/Recurrence.php  |   58 ++++++++++++++++++++++++--
- horde-webmail/lib/Horde/Date/Recurrence.php |   58 ++++++++++++++++++++++++--
- 2 files changed, 106 insertions(+), 10 deletions(-)
+ horde-webmail/kronolith/lib/Recurrence.php  |   56 +++++++++++++++++++++++++--
+ horde-webmail/lib/Horde/Date/Recurrence.php |   56 +++++++++++++++++++++++++--
+ 2 files changed, 104 insertions(+), 8 deletions(-)
 
 diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
-index f22351d..409063f 100644
+index f22351d..63dcb34 100644
 --- a/horde-webmail/kronolith/lib/Recurrence.php
 +++ b/horde-webmail/kronolith/lib/Recurrence.php
-@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
+@@ -374,19 +374,67 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -42,7 +42,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-+            }
+             }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -70,33 +70,33 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-             }
++            }
 +
              $next = $start_week;
--            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
-+            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
+             list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
              $next = new Horde_Date($next);
              while ($next->compareDateTime($after) < 0 &&
                     $next->compareDateTime($after_week_end) < 0) {
-                 ++$next->mday;
-                 $next->correct();
 +                if ($this->hasRecurCount()
 +                    && $next->compareDateTime($after) < 0
 +                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
 +                    $recurrences++;
 +                }
-+            }
+                 ++$next->mday;
+                 $next->correct();
+             }
 +            if ($this->hasRecurCount() &&
 +                $recurrences >= $this->recurCount) {
 +                return false;
-             }
++            }
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
+                 if ($next->compareDateTime($after_week_end) >= 0) {
 diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
-index 9dbf057..c11624b 100644
+index 9dbf057..0d6aba4 100644
 --- a/horde-webmail/lib/Horde/Date/Recurrence.php
 +++ b/horde-webmail/lib/Horde/Date/Recurrence.php
-@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
+@@ -374,19 +374,67 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -118,7 +118,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-+            }
+             }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -146,33 +146,39 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-             }
++            }
 +
              $next = $start_week;
--            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
-+            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
+             list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
              $next = new Horde_Date($next);
              while ($next->compareDateTime($after) < 0 &&
                     $next->compareDateTime($after_week_end) < 0) {
-                 ++$next->mday;
-                 $next->correct();
 +                if ($this->hasRecurCount()
 +                    && $next->compareDateTime($after) < 0
 +                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
 +                    $recurrences++;
 +                }
-+            }
+                 ++$next->mday;
+                 $next->correct();
+             }
 +            if ($this->hasRecurCount() &&
 +                $recurrences >= $this->recurCount) {
 +                return false;
-             }
++            }
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
+                 if ($next->compareDateTime($after_week_end) >= 0) {
 -- 
 tg: (1f477b1..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 5d178150de61ceac66f978563ddd105f1cafeae9
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Dec 3 10:02:11 2009 +0100
+
+    Fixed biweekly sunday events.
 
 commit 2b3d01e220c0a2f5a80f68e5ac7eb759d6090fe3
 Author: root <Gunnar Wrobel wrobel at pardus.de>



From cvs at kolab.org  Thu Dec  3 10:52:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 10:52:28 +0100 (CET)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.24, 1.32.2.25 
Message-ID: <20091203095228.BE8D460057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv7108/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
kolab/issue3846 (fix recurring events that are counted per week and not per incident)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.24
retrieving revision 1.32.2.25
diff -u -d -r1.32.2.24 -r1.32.2.25
--- horde-webmail-1.2.0_kolab_openpkg.patch	27 Nov 2009 18:51:49 -0000	1.32.2.24
+++ horde-webmail-1.2.0_kolab_openpkg.patch	3 Dec 2009 09:52:25 -0000	1.32.2.25
@@ -27794,15 +27794,15 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/lib/Recurrence.php  |   58 ++++++++++++++++++++++++--
- horde-webmail/lib/Horde/Date/Recurrence.php |   58 ++++++++++++++++++++++++--
- 2 files changed, 106 insertions(+), 10 deletions(-)
+ horde-webmail/kronolith/lib/Recurrence.php  |   56 +++++++++++++++++++++++++--
+ horde-webmail/lib/Horde/Date/Recurrence.php |   56 +++++++++++++++++++++++++--
+ 2 files changed, 104 insertions(+), 8 deletions(-)
 
 diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
-index f22351d..409063f 100644
+index f22351d..63dcb34 100644
 --- a/horde-webmail/kronolith/lib/Recurrence.php
 +++ b/horde-webmail/kronolith/lib/Recurrence.php
-@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
+@@ -374,19 +374,67 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -27824,7 +27824,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-+            }
+             }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -27852,33 +27852,33 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-             }
++            }
 +
              $next = $start_week;
--            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
-+            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
+             list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
              $next = new Horde_Date($next);
              while ($next->compareDateTime($after) < 0 &&
                     $next->compareDateTime($after_week_end) < 0) {
-                 ++$next->mday;
-                 $next->correct();
 +                if ($this->hasRecurCount()
 +                    && $next->compareDateTime($after) < 0
 +                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
 +                    $recurrences++;
 +                }
-+            }
+                 ++$next->mday;
+                 $next->correct();
+             }
 +            if ($this->hasRecurCount() &&
 +                $recurrences >= $this->recurCount) {
 +                return false;
-             }
++            }
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
+                 if ($next->compareDateTime($after_week_end) >= 0) {
 diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
-index 9dbf057..c11624b 100644
+index 9dbf057..0d6aba4 100644
 --- a/horde-webmail/lib/Horde/Date/Recurrence.php
 +++ b/horde-webmail/lib/Horde/Date/Recurrence.php
-@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
+@@ -374,19 +374,67 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -27900,7 +27900,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-+            }
+             }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -27928,33 +27928,39 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-             }
++            }
 +
              $next = $start_week;
--            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
-+            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur - 1, '%e/%m/%Y'));
+             list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
              $next = new Horde_Date($next);
              while ($next->compareDateTime($after) < 0 &&
                     $next->compareDateTime($after_week_end) < 0) {
-                 ++$next->mday;
-                 $next->correct();
 +                if ($this->hasRecurCount()
 +                    && $next->compareDateTime($after) < 0
 +                    && $this->recurOnDay((int)pow(2, $next->dayOfWeek()))) {
 +                    $recurrences++;
 +                }
-+            }
+                 ++$next->mday;
+                 $next->correct();
+             }
 +            if ($this->hasRecurCount() &&
 +                $recurrences >= $this->recurCount) {
 +                return false;
-             }
++            }
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
+                 if ($next->compareDateTime($after_week_end) >= 0) {
 -- 
 tg: (1f477b1..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 5d178150de61ceac66f978563ddd105f1cafeae9
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Dec 3 10:02:11 2009 +0100
+
+    Fixed biweekly sunday events.
 
 commit 2b3d01e220c0a2f5a80f68e5ac7eb759d6090fe3
 Author: root <Gunnar Wrobel wrobel at pardus.de>



From cvs at kolab.org  Thu Dec  3 15:11:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 15:11:03 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter issue3965.patch, NONE,
	1.1.2.1 Kolab_Filter.spec, 1.19.2.17, 1.19.2.18 Makefile,
	1.8.2.15, 1.8.2.16 
Message-ID: <20091203141103.9294E600562@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3965.patch 
Log Message:
 kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user)

--- NEW FILE: issue3965.patch ---
diff -u -B -r1.15.2.10 Resource.php
--- a/lib/Horde/Kolab/Resource.php	16 Nov 2009 19:26:34 -0000	1.15.2.10
+++ b/lib/Horde/Kolab/Resource.php	3 Dec 2009 14:04:55 -0000
@@ -211,7 +211,7 @@
         require_once 'Horde/Kolab/Storage/List.php';
         $list = &Kolab_List::singleton();
         $default = $list->getForeignDefault($id, 'event');
-        if (!$default) {
+        if (!$default || is_a($default, 'PEAR_Error')) {
             $default = &new Kolab_Folder();
             $default->setList($list);
             $default->setName($conf['kolab']['filter']['calendar_store']);

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.17
retrieving revision 1.19.2.18
diff -u -d -r1.19.2.17 -r1.19.2.18
--- Kolab_Filter.spec	25 Nov 2009 13:42:20 -0000	1.19.2.17
+++ Kolab_Filter.spec	3 Dec 2009 14:11:01 -0000	1.19.2.18
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091125
+%define         V_release 20091203
 
 # Package Information
 Name:	   %{V_package}
@@ -34,6 +34,7 @@
 Patch12:   issue3464.patch
 Patch13:   issue3594.patch
 Patch14:   issue973.patch
+Patch15:   issue3965.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -83,6 +84,7 @@
 	%patch -p1 -P 12
 	%patch -p1 -P 13
 	%patch -p1 -P 14
+	%patch -p1 -P 15
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.15
retrieving revision 1.8.2.16
diff -u -d -r1.8.2.15 -r1.8.2.16
--- Makefile	25 Nov 2009 13:42:20 -0000	1.8.2.15
+++ Makefile	3 Dec 2009 14:11:01 -0000	1.8.2.16
@@ -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 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 issue973.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Thu Dec  3 15:11:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 15:11:03 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.81,1.398.2.82 
Message-ID: <20091203141103.9016E600561@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.81
retrieving revision 1.398.2.82
diff -u -d -r1.398.2.81 -r1.398.2.82
--- release-notes.txt	27 Nov 2009 17:42:30 -0000	1.398.2.81
+++ release-notes.txt	3 Dec 2009 14:11:01 -0000	1.398.2.82
@@ -97,6 +97,9 @@
 	                 accepted and yields kolabmailboxfilter exit 38)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
+	kolab/issue3965 (Always accept: invitations get lost when
+	                 Calendar folder ist not writable for the
+	                 calendar user)
 
     - kolab-webclient-1.2.0-20090514
 



From cvs at kolab.org  Thu Dec  3 16:49:35 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 16:49:35 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	list.php.in, 1.4, 1.4.4.1 
Message-ID: <20091203154935.9FBB1600561@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	list.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping) - Partial fix: Remove the white screen of death.

Index: list.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- list.php.in	16 Mar 2007 12:17:24 -0000	1.4
+++ list.php.in	3 Dec 2009 15:49:33 -0000	1.4.4.1
@@ -242,7 +242,7 @@
 				if( $ldap->countMail( $_SESSION['base_dn'], $ldap_object['cn'].'@'.$domain, $dn ) > 0 ) {
 				  // Ups!!!
 				  $cn = $ldap_object['cn'];
-				  $newcn = md5sum( $dn.$cn );
+				  $newcn = md5( $dn.$cn );
 				  $ldap_object['cn'] = $newcn; 
 				  $ldap_object['dn'] = 'cn='.$ldap->escape($newcn).','.$dl_root;
 				  if (!ldap_rename($ldap->connection, $dn, 'cn='.$ldap->escape($newcn), $dl_root,true)) {



From cvs at kolab.org  Thu Dec  3 16:49:35 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 16:49:35 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.28, 1.28.2.1 
Message-ID: <20091203154935.AA4AD600562@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	user.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping) - Partial fix: Remove the white screen of death.

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- user.php.in	4 Mar 2008 18:12:03 -0000	1.28
+++ user.php.in	3 Dec 2009 15:49:33 -0000	1.28.2.1
@@ -656,7 +656,7 @@
 			 if( $ldap->countMail( $_SESSION['base_dn'], $alias, $dn ) > 0 ) {
 			   // Ups!!!
 			   $alias = $ldap_object['alias'][$i];
-			   $newalias = md5sum( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
+			   $newalias = md5( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
 			   $ldap_object['alias'][$i] = $newalias;
 			   if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
 				 $errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, 
@@ -693,7 +693,7 @@
 		   if( $ldap->countMail( $_SESSION['base_dn'], $ldap_object['mail'], $dn ) > 0 ) {
 			 // Ups!!!
 			 $mail = $ldap_object['mail'];
-			 $newmail = md5sum( $dn.$mail ).'@'.substr( $mail, 0, strpos( $mail, '@' ) );
+			 $newmail = md5( $dn.$mail ).'@'.substr( $mail, 0, strpos( $mail, '@' ) );
 			 $ldap_object['uid'] = $ldap_object['mail'] = $newmail;
 			 if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
 			   $errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, 
@@ -708,7 +708,7 @@
 			 if( $ldap->countMail( $_SESSION['base_dn'], $alias, $dn ) > 0 ) {
 			   // Ups!!!
 			   $alias = $ldap_object['alias'][$i];
-			   $newalias = md5sum( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
+			   $newalias = md5( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) );
 			   $ldap_object['alias'][$i] = $newalias;
 			   if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
 				 $errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,



From cvs at kolab.org  Thu Dec  3 19:10:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 19:10:22 +0100 (CET)
Subject: mathieu: utils/testing kolab-test-toolbox.ini, NONE,
	1.1 kolab-test-toolbox.pl, NONE, 1.1 
Message-ID: <20091203181022.E01EB600561@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv27069

Added Files:
	kolab-test-toolbox.ini kolab-test-toolbox.pl 
Log Message:
Moving kolab testuite here from Debian's pkg-kolab

Previous changelog is at: http://svn.debian.org/wsvn/pkg-kolab/pkg-kolab_testsuite/?rev=1464


--- NEW FILE: kolab-test-toolbox.ini ---
[default]
; general
slave_count=1
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/unknown
;$<  # $REAL_USER_ID
user=mathieu
group=disk

; vm
vm_memory=256Mb
vm_size=1Gb
vm_swap=128Mb
; debootstrap
vm_install_method=debootstrap
vm_dist=sid

; virt
virt_uri=vbox:///session
virt_type=vbox

; network
bridge=br0
dns_domain=local.tld
ip_offset=10

;common dirs
usr_bin_dir=/usr/bin
usr_sbin_dir=/usr/sbin
php_test_dir=/usr/share/php/tests

; kolab conf
; native|openpkg
kolab_installation_method=native
kolabsrv=kolabsrv
kolab_bootstrap=kolab_bootstrap
kolab_manager_password=12345
ca_passphrase=12345678

[debian-lenny-openpkg]
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-lenny-openpkg

; more for compilation
vm_memory=512Mb
; more for all the source and compiled packages
vm_size=3Gb
vm_install_method=debootstrap
vm_dist=lenny

ip_offset=10

usr_bin_dir=/kolab/bin
usr_sbin_dir=/kolab/sbin
php_test_dir=/kolab/lib/php/test

kolab_installation_method=openpkg
kolabsrv=/kolab/bin/openpkg
kolab_bootstrap=/kolab/sbin/kolab_bootstrap

[debian-lenny-native]
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-lenny-native

vm_install_method=debootstrap
vm_dist=lenny

ip_offset=15

kolab_installation_method=native

[debian-sid-native]
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-native

vm_install_method=debootstrap
vm_dist=sid

ip_offset=20

kolab_installation_method=native


--- NEW FILE: kolab-test-toolbox.pl ---
#!/usr/bin/perl

=head1 NAME

kolab-test-toolbox - Script to test Debian native kolab packages using virtual machines.

=head1 SYNOPSIS

B<kolab-test-toolbox> [options] command [[options] command] ...

=head1 ARGUMENTS

=over 8

=item I<bootstrap>

Step 1: Bootstrap the domain

=item I<preboot_install>
[...1016 lines suppressed...]
            }
            domain_bootstrap($domid, $domname);
        } elsif ($action eq 'preboot_install') {
            domain_preboot_install($domid, $domname);
        } elsif ($action eq 'boot') {
            domain_boot($domid, $domname);
        } elsif ($action eq 'install') {
            domain_install($domid, $domname);
        } elsif ($action eq 'test') {
            domain_test($domid, $domname);
        } elsif ($action eq 'chroot') {
            domain_chroot($domid, $domname);
        } elsif ($action eq 'login') {
            domain_login($domid, $domname);
        } else {
            print "Unknow action: $action\n";
        }
    }
}




From cvs at kolab.org  Thu Dec  3 20:58:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 20:58:14 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
	ldap.class.php.in, 1.1.2.1, 1.1.2.2 
Message-ID: <20091203195814.27957600579@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ldap.class.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping) - Allow creating a user with comma (",").

Index: ldap.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php.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
--- ldap.class.php.in	13 Mar 2009 11:45:32 -0000	1.1.2.1
+++ ldap.class.php.in	3 Dec 2009 19:58:11 -0000	1.1.2.2
@@ -361,7 +361,7 @@
                      )
                      (uid='.$this->escape($mail).')
                    )';
-	$res = $this->search( $base, $filter, array( 'dn' ) );
+	$res = $this->search( $this->dn_escape($base), $filter, array( 'dn' ) );
 	$count = 0;
 
 	$entries = ldap_get_entries( $this->connection, $res );



From cvs at kolab.org  Thu Dec  3 21:34:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 21:34:33 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.28.2.1, 1.28.2.2 
Message-ID: <20091203203433.B7DCD60057E@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	user.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping) - Fixed handling users with a comma in first or last name.

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -d -r1.28.2.1 -r1.28.2.2
--- user.php.in	3 Dec 2009 15:49:33 -0000	1.28.2.1
+++ user.php.in	3 Dec 2009 20:34:31 -0000	1.28.2.2
@@ -613,7 +613,7 @@
 
 			   if ( !$errors ) {
 				 // Try to rename the object
-				 if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $domain_dn, true)) {
+				 if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $domain_dn, true)) {
 				   array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											   $newdn, ldap_error($ldap->connection)));
 				 }



From cvs at kolab.org  Thu Dec  3 21:34:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 21:34:33 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
	ldap.class.php.in, 1.1.2.2, 1.1.2.3 
Message-ID: <20091203203433.B607360057A@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ldap.class.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping) - Fixed handling users with a comma in first or last name.

Index: ldap.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- ldap.class.php.in	3 Dec 2009 19:58:11 -0000	1.1.2.2
+++ ldap.class.php.in	3 Dec 2009 20:34:31 -0000	1.1.2.3
@@ -111,6 +111,31 @@
 	return $str;
   }
   
+
+  // Taken from PEAR_Net_LDAP2
+  function unescape_dn_value($val)
+  {
+	  // strip slashes from special chars
+	  $val = str_replace('\\\\', '\\', $val);
+	  $val = str_replace('\,',    ',', $val);
+	  $val = str_replace('\+',    '+', $val);
+	  $val = str_replace('\"',    '"', $val);
+	  $val = str_replace('\<',    '<', $val);
+	  $val = str_replace('\>',    '>', $val);
+	  $val = str_replace('\;',    ';', $val);
+	  $val = str_replace('\#',    '#', $val);
+	  $val = str_replace('\=',    '=', $val);
+
+	  return KolabLDAP::hex2asc($val);
+  }
+
+  // Taken from PEAR_Net_LDAP2
+  function hex2asc($string)
+  {
+	$string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string);
+	return $string;
+  }
+
   function bind( $dn = false , $pw = '' ) {
     if( !$dn ) {
       // Default ldap auth
@@ -368,7 +393,7 @@
 	if( $excludedn ) {
 	  for ( $i = 0; $i < count( $entries ); $i++ ) {
 		if( is_null( $entries[$i] ) ) continue;
-		if( $entries[$i]['dn'] == $excludedn ) continue;	   
+		if( KolabLDAP::unescape_dn_value($entries[$i]['dn']) == KolabLDAP::unescape_dn_value($excludedn) ) continue;	   
 		debug("found ".$entries[$i]['dn'] );
 		$count++;
 	  } 



From cvs at kolab.org  Thu Dec  3 21:47:08 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 21:47:08 +0100 (CET)
Subject: mathieu: utils/testing kolab-test-toolbox.ini, 1.1,
	1.2 kolab-test-toolbox.pl, 1.1, 1.2 
Message-ID: <20091203204708.1CE4460057A@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv32395

Modified Files:
	kolab-test-toolbox.ini kolab-test-toolbox.pl 
Log Message:
renamed native to native_debian: this is not the only native port!

Index: kolab-test-toolbox.ini
===================================================================
RCS file: /kolabrepository/utils/testing/kolab-test-toolbox.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-test-toolbox.ini	3 Dec 2009 18:10:20 -0000	1.1
+++ kolab-test-toolbox.ini	3 Dec 2009 20:47:06 -0000	1.2
@@ -29,8 +29,8 @@
 php_test_dir=/usr/share/php/tests
 
 ; kolab conf
-; native|openpkg
-kolab_installation_method=native
+; native_debian|openpkg
+kolab_installation_method=openpkg
 kolabsrv=kolabsrv
 kolab_bootstrap=kolab_bootstrap
 kolab_manager_password=12345
@@ -64,7 +64,7 @@
 
 ip_offset=15
 
-kolab_installation_method=native
+kolab_installation_method=native_debian
 
 [debian-sid-native]
 storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-native
@@ -74,5 +74,5 @@
 
 ip_offset=20
 
-kolab_installation_method=native
+kolab_installation_method=native_debian
 

Index: kolab-test-toolbox.pl
===================================================================
RCS file: /kolabrepository/utils/testing/kolab-test-toolbox.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-test-toolbox.pl	3 Dec 2009 18:10:20 -0000	1.1
+++ kolab-test-toolbox.pl	3 Dec 2009 20:47:06 -0000	1.2
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-kolab-test-toolbox - Script to test Debian native kolab packages using virtual machines.
+kolab-test-toolbox - Script to test kolab packages using virtual machines.
 
 =head1 SYNOPSIS
 
@@ -511,7 +511,7 @@
 EOF");
     # ====
     print "* Preparing packages:\n";
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         if(conf('vm_dist') eq 'lenny') {
             print "* Using packages from squeeze:\n";
             remote_command($domip, 'cat <<EOF > /etc/apt/sources.list.d/squeeze.list
@@ -554,7 +554,7 @@
     
     # ====
     print "* Installing:\n";
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         remote_command($domip, 'DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install kolabd postfix slapd');
     } elsif(conf('kolab_installation_method') eq 'openpkg') {
         remote_command($domip, 'mkdir /kolab');
@@ -568,7 +568,7 @@
     }
     
     # ====
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         print "* Stopping services:\n";
         remote_command($domip, '/etc/init.d/apache2 stop');
         remote_command($domip, '/etc/init.d/kolabd stop');
@@ -897,7 +897,7 @@
 
     # ====
     print "* Starting services:\n";
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         remote_command($domip, '/etc/init.d/amavis start #optionally');
         remote_command($domip, '/etc/init.d/slapd start');
         remote_command($domip, '/etc/init.d/saslauthd start');
@@ -910,13 +910,13 @@
     }
 
     # ====
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         print "* Installing PHP Unit:\n";
         remote_command($domip, 'apt-get -qy install phpunit');
     }
 
     # ====
-    if(conf('kolab_installation_method') eq 'native') {
+    if(conf('kolab_installation_method') eq 'native_debian') {
         print "* Installing kolab-webadmin:\n";
         remote_command($domip, 'DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install kolab-webadmin');
         



From cvs at kolab.org  Thu Dec  3 22:08:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:30 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
	ldap.class.php.in, 1.1.2.3, 1.1.2.4 
Message-ID: <20091203210830.BE7E060057B@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ldap.class.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: ldap.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php.in,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ldap.class.php.in	3 Dec 2009 20:34:31 -0000	1.1.2.3
+++ ldap.class.php.in	3 Dec 2009 21:08:28 -0000	1.1.2.4
@@ -96,21 +96,53 @@
     return $str;
   }
 
-  function dn_escape( $str ) {
-	/*
-	 DN component escaping as described in RFC-2253
-	 */
-	$str = str_replace( '\\', '\\\\', $str );
-	$str = str_replace( ',', '\\,', $str );
-	$str = str_replace( '+', '\\,', $str );
-	$str = str_replace( '<', '\\<', $str );
-	$str = str_replace( '>', '\\>', $str );
-	$str = str_replace( ';', '\\;', $str );
-	if( $str[0] == '#' ) $str = '\\'.$str;
-	// PENDING(steffen): Escape leading/trailing spaces
-	return $str;
+  // Taken from PEAR_Net_LDAP2
+  public function dn_escape($val)
+  {
+	  // Escaping of filter meta characters
+	  $val = str_replace('\\', '\\\\', $val);
+	  $val = str_replace(',',    '\,', $val);
+	  $val = str_replace('+',    '\+', $val);
+	  $val = str_replace('"',    '\"', $val);
+	  $val = str_replace('<',    '\<', $val);
+	  $val = str_replace('>',    '\>', $val);
+	  $val = str_replace(';',    '\;', $val);
+	  $val = str_replace('#',    '\#', $val);
+	  $val = str_replace('=',    '\=', $val);
+
+	  // ASCII < 32 escaping                                                                                                                                        
+	  $val = KolabLDAP::asc2hex32($val);
+
+	  // Convert all leading and trailing spaces to sequences of \20.
+	  if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) {
+		$val = $matches[2];
+		for ($i = 0; $i < strlen($matches[1]); $i++) {
+		  $val = '\20'.$val;
+		}
+		for ($i = 0; $i < strlen($matches[3]); $i++) {
+		  $val = $val.'\20';
+		}
+	  }
+
+	  if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
+
+	  return $val;
   }
-  
+
+  // Taken from PEAR_Net_LDAP2
+  public function asc2hex32($string)
+  {
+	for ($i = 0; $i < strlen($string); $i++) {
+	  $char = substr($string, $i, 1);
+	  if (ord($char) < 32) {
+		$hex = dechex(ord($char));
+		if (strlen($hex) == 1) $hex = '0'.$hex;
+		$string = str_replace($char, '\\'.$hex, $string);
+	  }
+	}
+	return $string;
+  }
+
 
   // Taken from PEAR_Net_LDAP2
   function unescape_dn_value($val)



From cvs at kolab.org  Thu Dec  3 22:08:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:30 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	admin.php.in, 1.8, 1.8.2.1 
Message-ID: <20091203210830.C049460057F@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	admin.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- admin.php.in	21 Nov 2007 18:11:37 -0000	1.8
+++ admin.php.in	3 Dec 2009 21:08:28 -0000	1.8.2.1
@@ -197,7 +197,7 @@
 	   
        if ($action == "save") {
 		 if (!$errors) {
-		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn;
 		   else $newdn = $dn;
 		   if (!$visible && !strstr($newdn,$dn_add)) {
 			 list($cn,$rest) = split(',', $newdn, 2); 
@@ -212,7 +212,7 @@
 				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
 
 			   // Try to rename the object
-			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) {
+			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), "cn=internal,".$domain_dn, true)) {
 				 array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											 $newdn, ldap_error($ldap->connection)));
 			   }
@@ -249,7 +249,7 @@
        } else {
 		 // firstsave
 		 if (!$errors) {
-		   $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+		   $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn;
 		   debug("Calling ldap_add with dn=$dn");
 		   // Add object to db
 		   if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) 



From cvs at kolab.org  Thu Dec  3 22:08:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:30 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, 1.10.2.1, 1.10.2.2 
Message-ID: <20091203210830.BFC1E60057E@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	addr.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- addr.php.in	14 May 2009 14:36:02 -0000	1.10.2.1
+++ addr.php.in	3 Dec 2009 21:08:28 -0000	1.10.2.2
@@ -163,7 +163,7 @@
 
 		if ($action == "save") {
 		  if (!$errors) {
-			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$addressbook_root;
+			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$addressbook_root;
 			else $newdn = $dn;
 			debug("action=save, dn=$dn, newdn=$newdn<br/>\n");
 			if (strcmp($dn,$newdn) != 0) {
@@ -185,7 +185,7 @@
 				  foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
 
 				  // Try to rename the object
-				  if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $addressbook_root, true)) {
+				  if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $addressbook_root, true)) {
 					array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 												$newdn, ldap_error($ldap->connection)));
 				  }
@@ -221,7 +221,7 @@
 		  } 
 		} else {
 		  if (!$errors) {
-			$dn = "cn=".$ldap_object['cn'].",".$addressbook_root;
+			$dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$addressbook_root;
 			foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
 			if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) {
 			  array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn,



From cvs at kolab.org  Thu Dec  3 22:08:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:31 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	maintainer.php.in, 1.10, 1.10.2.1 
Message-ID: <20091203210831.AE41460057F@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	maintainer.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- maintainer.php.in	21 Nov 2007 18:11:37 -0000	1.10
+++ maintainer.php.in	3 Dec 2009 21:08:29 -0000	1.10.2.1
@@ -194,7 +194,7 @@
 	   
        if ($action == "save") {
 		 if (!$errors) {
-		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn;
 		   else $newdn = $dn;
 		   if (!$visible && !strstr($newdn,$dn_add)) {
 			 list($cn,$rest) = split(',', $newdn, 2); 
@@ -209,7 +209,7 @@
 				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
 
 			   // Try to rename the object
-			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) {
+			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), "cn=internal,".$domain_dn, true)) {
 				 array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											 $newdn, ldap_error($ldap->connection)));
 			   }
@@ -251,7 +251,7 @@
        } else {
 		 // firstsave
 		 if (!$errors) {
-		   $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+		   $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn;
 		   debug("Calling ldap_add with dn=$dn");
 		   if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) 
 			 array_push($errors, sprintf( _("LDAP Error: could not add object %s: %s"), $dn,



From cvs at kolab.org  Thu Dec  3 22:08:30 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:30 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.8,
	1.110.2.9 
Message-ID: <20091203210830.BE67A60057A@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.110.2.8
retrieving revision 1.110.2.9
diff -u -d -r1.110.2.8 -r1.110.2.9
--- ChangeLog	23 Nov 2009 22:32:13 -0000	1.110.2.8
+++ ChangeLog	3 Dec 2009 21:08:28 -0000	1.110.2.9
@@ -1,3 +1,10 @@
+2009-12-03  Gunnar Wrobel  <p at rdus.de>
+
+	* php/admin/include/ldap.class.php.in: 
+	* www/admin/*: 
+
+	 kolab/issue3499 (Kolab web admin does not use LDAP escaping)
+
 2009-11-16 Richard Bos <richard at radoeka.nl>
 	* php/admin/templates/settings.tpl: Use a table to separate the
 	  checkbox and text, for nicer formatting.  kolab/issue3428



From cvs at kolab.org  Thu Dec  3 22:08:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:31 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.15, 1.15.2.1 
Message-ID: <20091203210831.A999260057B@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	domainmaintainer.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- domainmaintainer.php.in	21 Nov 2007 18:11:37 -0000	1.15
+++ domainmaintainer.php.in	3 Dec 2009 21:08:29 -0000	1.15.2.1
@@ -181,7 +181,7 @@
 	   
        if ($action == "save") {
 		 if (!$errors) {
-		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn;
 		   else $newdn = $dn;
 		   if (!$visible && !strstr($newdn,$dn_add)) {
 			 list($cn,$rest) = split(',', $newdn, 2); 
@@ -196,7 +196,7 @@
 				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
 
 			   // Try to rename the object
-			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) {
+			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), "cn=internal,".$domain_dn, true)) {
 				 array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											 $newdn, ldap_error($ldap->connection)));
 			   }
@@ -255,7 +255,7 @@
        } else {
 		 // firstsave
 		 if (!$errors) {
-		   $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
+		   $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn;
 		   debug("Calling ldap_add with dn=$dn");
 		   if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) 
 			 array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn,



From cvs at kolab.org  Thu Dec  3 22:08:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:31 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	list.php.in, 1.4.4.1, 1.4.4.2 
Message-ID: <20091203210831.B6220600580@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	list.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: list.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -d -r1.4.4.1 -r1.4.4.2
--- list.php.in	3 Dec 2009 15:49:33 -0000	1.4.4.1
+++ list.php.in	3 Dec 2009 21:08:28 -0000	1.4.4.2
@@ -184,7 +184,7 @@
 
 		if ($action == "save") {
 		  if (!$errors) {
-			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$dl_root;
+			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$dl_root;
 			else $newdn = $dn;
 			if (strcmp($dn,$newdn) != 0) {
 			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
@@ -192,7 +192,7 @@
 				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
 
 				// Try to rename the object
-				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $dl_root, true)) {
+				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $dl_root, true)) {
 				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											  $newdn, ldap_error($ldap->connection)));
 				}
@@ -226,7 +226,7 @@
 		  // firstsave
 		  if (!$errors) {
 			if( !$ldap_object['member'] ) unset($ldap_object['member']); 
-			$dn = "cn=".$ldap_object['cn'].",".$dl_root;
+			$dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$dl_root;
 			if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) {
 			  array_push($errors, sprintf( _("LDAP Error: Could not add object %s: %s"), $dn,
 										   ldap_error($ldap->connection)));



From cvs at kolab.org  Thu Dec  3 22:08:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:31 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
	sf.php.in, 1.10, 1.10.4.1 
Message-ID: <20091203210831.AD4BA60057E@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	sf.php.in 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -d -r1.10 -r1.10.4.1
--- sf.php.in	12 Jul 2007 16:28:23 -0000	1.10
+++ sf.php.in	3 Dec 2009 21:08:29 -0000	1.10.4.1
@@ -215,7 +215,7 @@
 
 		if ($action == "save") {
 		  if (!$errors) {
-			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$sf_root;
+			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$sf_root;
 			else $newdn = $dn;
 			if (strcmp($dn,$newdn) != 0) {
 			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
@@ -223,7 +223,7 @@
 				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
 
 				// Try to rename the object
-				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $sf_root, true)) {
+				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $sf_root, true)) {
 				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											  $newdn, ldap_error($ldap->connection)));
 				}
@@ -255,7 +255,7 @@
 		  } 
 		} else {
 		  if (!$errors) {
-			$dn = "cn=".$ldap_object['cn'].",".$sf_root;
+			$dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$sf_root;
 			$ldap_object['kolabHomeServer'] = trim($_POST['kolabhomeserver']);
 			if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) 
 			  array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn, 



From cvs at kolab.org  Thu Dec  3 22:08:45 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Dec 2009 22:08:45 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.82,1.398.2.83 
Message-ID: <20091203210845.AD11960057A@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.82
retrieving revision 1.398.2.83
diff -u -d -r1.398.2.82 -r1.398.2.83
--- release-notes.txt	3 Dec 2009 14:11:01 -0000	1.398.2.82
+++ release-notes.txt	3 Dec 2009 21:08:43 -0000	1.398.2.83
@@ -77,8 +77,9 @@
 
     - kolab-webadmin-2.2.3-2009????
 
-	kolab/issue3428 Present the checkbox in the "accept internet email"
-			nicer
+	kolab/issue3428 (Present the checkbox in the "accept internet email"
+			 nicer)
+	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
     - Kolab_Filter-0.1.4-2009????
 



From cvs at kolab.org  Fri Dec  4 08:30:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:30:52 +0100 (CET)
Subject: gunnar: utils/ec2 ec2.config,1.2,1.3 
Message-ID: <20091204073052.3BE1F60057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/ec2
In directory doto:/tmp/cvs-serv32024

Modified Files:
	ec2.config 
Log Message:
Commit an older correction.

Index: ec2.config
===================================================================
RCS file: /kolabrepository/utils/ec2/ec2.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ec2.config	22 Jan 2009 19:54:08 -0000	1.2
+++ ec2.config	4 Dec 2009 07:30:49 -0000	1.3
@@ -27,17 +27,10 @@
 #
 # ami-6e2eca07 : Kolab-Server-2.1
 # ami-c910f4a0 : Kolab-Server-2.2
-# ami-4748ac2e : Kolab-Server-2.2.1-beta-1
-
-#FIXME: 
-#
-# Current AMI issues:
-#
-# - Fix /tmp rights
-# - Install cvs by default
-# - Fix /etc/hosts on init
+# ami-7d23c414 : Kolab-Server-2.2.1-rc1
+# ami-412cca28 : Kolab-Server-2.2.2
 
-AMI_ID=ami-4748ac2e
+AMI_ID=ami-412cca28
 
 ####
 # The security group the instance should be launched in. If the



From cvs at kolab.org  Fri Dec  4 08:31:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:31:06 +0100 (CET)
Subject: gunnar: utils/ci - New directory 
Message-ID: <20091204073106.3533760057A@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/utils/ci added to the repository




From cvs at kolab.org  Fri Dec  4 08:31:32 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:31:32 +0100 (CET)
Subject: gunnar: utils/ci/ec2 - New directory 
Message-ID: <20091204073132.40A1760057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/ci/ec2
In directory doto:/tmp/cvs-serv32091/ec2

Log Message:
Directory /kolabrepository/utils/ci/ec2 added to the repository




From cvs at kolab.org  Fri Dec  4 08:31:32 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:31:32 +0100 (CET)
Subject: gunnar: utils/ci/toolbox - New directory 
Message-ID: <20091204073132.4357F60057E@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/utils/ci/toolbox added to the repository




From cvs at kolab.org  Fri Dec  4 08:35:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:35:06 +0100 (CET)
Subject: gunnar: utils/testing kolab-test-toolbox.ini, 1.2,
	NONE kolab-test-toolbox.pl, 1.2, NONE 
Message-ID: <20091204073506.1B1E7600580@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv32245/testing

Removed Files:
	kolab-test-toolbox.ini kolab-test-toolbox.pl 
Log Message:
Started a ci (continuous integration) hierarchy.

--- kolab-test-toolbox.ini DELETED ---

--- kolab-test-toolbox.pl DELETED ---



From cvs at kolab.org  Fri Dec  4 08:35:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:35:06 +0100 (CET)
Subject: gunnar: utils/ec2 .cvsignore, 1.1, NONE ec2-init-dev-instance.sh, 1.2,
	NONE ec2-kill-dev-instance.sh, 1.1, NONE ec2.config, 1.3, NONE 
Message-ID: <20091204073506.1660260057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/ec2
In directory doto:/tmp/cvs-serv32245/ec2

Removed Files:
	.cvsignore ec2-init-dev-instance.sh ec2-kill-dev-instance.sh 
	ec2.config 
Log Message:
Started a ci (continuous integration) hierarchy.

--- .cvsignore DELETED ---

--- ec2-init-dev-instance.sh DELETED ---

--- ec2-kill-dev-instance.sh DELETED ---

--- ec2.config DELETED ---



From cvs at kolab.org  Fri Dec  4 08:35:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:35:06 +0100 (CET)
Subject: gunnar: utils/ci/ec2 .cvsignore, NONE, 1.1 ec2-init-dev-instance.sh,
	NONE, 1.1 ec2-kill-dev-instance.sh, NONE, 1.1 ec2.config, NONE, 1.1 
Message-ID: <20091204073506.0E8FB60057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/utils/ci/ec2
In directory doto:/tmp/cvs-serv32245/ci/ec2

Added Files:
	.cvsignore ec2-init-dev-instance.sh ec2-kill-dev-instance.sh 
	ec2.config 
Log Message:
Started a ci (continuous integration) hierarchy.

--- NEW FILE: .cvsignore ---
ec2.local.config
*.pem
.current

--- NEW FILE: ec2-init-dev-instance.sh ---
#!/bin/bash

if [ -f .current ]; then
    echo "You already have an instance running! See file .current"
    exit 1
fi

if [ -f ec2.config ]; then
    source ec2.config
fi

echo "Testing for group \"$SEC_GROUP\" ..."
echo 

ec2-describe-group "${SEC_GROUP}" > /dev/null

if [ "$?" -ne "0" ]; then
    echo "Group \"$SEC_GROUP\" does not exist. Creating it ..."
    echo 
    ec2-add-group "${SEC_GROUP}" -d "Kolab default access permissions."
    ec2-authorize "${SEC_GROUP}" -P tcp -p   22 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p   25 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p   80 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  110 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  143 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  389 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  443 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  465 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  636 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  993 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p  995 -s 0.0.0.0/0
    ec2-authorize "${SEC_GROUP}" -P tcp -p 2000 -s 0.0.0.0/0
    echo 
fi

echo "Testing for keypair \"$SSH_KEY\" ..."
echo 

test -f "${SSH_KEY}.pem"
KEY_PRESENT=$?
ec2-describe-keypairs "${SSH_KEY}" > /dev/null
KEY_AWS=$?

if [ \( "$KEY_AWS" -ne "0" \) -o \( "$KEY_PRESENT" -ne "0" \) ]; then
    echo
    echo "Keypair \"$SSH_KEY\" does not exist. Creating it ..."
    if [ "$KEY_AWS" == "0" ]; then
	ec2-delete-keypair "${SSH_KEY}"
    fi

    if [ "$KEY_PRESENT" == "0" ]; then
	rm "${SSH_KEY}.pem"
    fi

    ec2-add-keypair "${SSH_KEY}" > "${SSH_KEY}.pem"
    chmod 600 "${SSH_KEY}.pem"

    echo 
fi

echo "Launching instance ..."
echo 

RESULT=`ec2-run-instances "${AMI_ID}" -g "${SEC_GROUP}" -k "${SSH_KEY}" | tail -n 1`

INSTANCE=`echo ${RESULT} | awk '{print $2;}'`

if [ "$?" == "0" ]; then
    echo "Successfullly started instance \"$INSTANCE\"!"
    echo
    echo ${INSTANCE} > .current
else
    echo "Failed to start the instance!"
    exit 1
fi

CURRENT_STATUS=""

echo -n "Initializing "

while [ "x$CURRENT_STATUS" != "xOK" ]
do
    CURRENT_STATUS=`ec2-describe-instances "${INSTANCE}" | tail -n 1 | sed -e 's/.*running.*/OK/'`

    sleep 3

    echo -n "."
done

echo

FQDN=`ec2-describe-instances "${INSTANCE}" | tail -n 1 | awk '{print $4;}'`

if [ "$?" == "0" ]; then
    echo
    echo "Instance \"$INSTANCE\" has booted!"
    echo
    echo "You may connect to it using:"
    echo
    echo "ssh -A -i ${SSH_KEY}.pem root@${FQDN}"
    echo
else
    echo "Instance does not respond!"
    exit 1
fi

if [ "x${SSH_CONFIG}" != "x" ]; then
    scp -i ${SSH_KEY}.pem ${SSH_CONFIG} root@${FQDN}:~/.ssh
fi

if [ "x${SSH_KNOWN_HOSTS}" != "x" ]; then
    scp -i ${SSH_KEY}.pem ${SSH_KNOWN_HOSTS} root@${FQDN}:~/.ssh
fi

ssh -A -i ${SSH_KEY}.pem root@${FQDN} "mkdir /CVS"
ssh -A -i ${SSH_KEY}.pem root@${FQDN} "cd /CVS && cvs -d ${CVS_SERVER} co server"
ssh -A -i ${SSH_KEY}.pem root@${FQDN} "cd /CVS && cvs -d ${CVS_SERVER} co utils"

--- NEW FILE: ec2-kill-dev-instance.sh ---
#!/bin/bash

if [ ! -f .current ]; then
    echo "You have no instance running!"
    exit 1
fi

if [ -f ec2.config ]; then
    source ec2.config
fi

INSTANCE=`cat .current`

echo "Terminating instance ..."
echo 

INFO=`ec2-terminate-instances "${INSTANCE}"`

if [ "$?" == "0" ]; then
    echo "Successfullly terminated instance \"$INSTANCE\"!"
    echo
    rm .current
else
    echo "Failed to terminate instance \"$INSTANCE\"!"
    exit 1
fi

echo "Removing keypair \"$SSH_KEY\" ..."
echo 

test -f "${SSH_KEY}.pem"
KEY_PRESENT=$?
ec2-describe-keypairs "${SSH_KEY}" > /dev/null
KEY_AWS=$?

if [ "$KEY_AWS" == "0" ]; then
    ec2-delete-keypair "${SSH_KEY}" > /dev/null
fi

if [ "$KEY_PRESENT" == "0" ]; then
    rm "${SSH_KEY}.pem"
fi

--- NEW FILE: ec2.config ---
#!/bin/bash
#
# CONFIGURATION FILE FOR DEVELOPMENT ON EC2
#
# --
#
# Override the settings described here in ec2.local.config

####
# The path to your private AWS key
#
# You should have reveived this key from your account details on the
# AWS site.

export EC2_PRIVATE_KEY=/home/user/.ec2/MY_SECRET_PRIVATE_KEY.pem

####
# The path to your AWS certificate
#
# You should have reveived this key from your account details on the
# AWS site.

export EC2_CERT=/home/user/.ec2/MY_CERTIFICATE.pem

####
# The AMI ID of the base system that should be used for development
#
# ami-6e2eca07 : Kolab-Server-2.1
# ami-c910f4a0 : Kolab-Server-2.2
# ami-7d23c414 : Kolab-Server-2.2.1-rc1
# ami-412cca28 : Kolab-Server-2.2.2

AMI_ID=ami-412cca28

####
# The security group the instance should be launched in. If the
# specified group does not exist, it will get created with the default
# permissions.
#
# The following permissions are the default:
#
# PERMISSION    ALLOWS  tcp     22      22      FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     25      25      FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     80      80      FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     110     110     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     143     143     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     389     389     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     443     443     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     465     465     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     636     636     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     993     993     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     995     995     FROM    CIDR    0.0.0.0/0
# PERMISSION    ALLOWS  tcp     2000    2000    FROM    CIDR    0.0.0.0/0

SEC_GROUP=kolab

####
# The name of the SSH key used for accessing the instance. It will be
# created if it is either missing on the local disk or not present
# within your AWS account.

SSH_KEY=kolab

####
# Path to your SSH configuration files. If set they will be copied
# over to the new instance.

SSH_CONFIG=""
SSH_KNOWN_HOSTS=""

####
# Location of the Kolab source repository

CVS_SERVER=":pserver:anonymous at intevation.de:/home/kroupware/jail/kolabrepository"


####
# Now load the personal overrides

if [ -f ec2.local.config ]; then
   source ec2.local.config
fi



From cvs at kolab.org  Fri Dec  4 08:35:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 08:35:06 +0100 (CET)
Subject: gunnar: utils/ci/toolbox kolab-test-toolbox.ini, NONE,
	1.1 kolab-test-toolbox.pl, NONE, 1.1 
Message-ID: <20091204073506.1371060057E@lists.intevation.de>

Author: gunnar

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

Added Files:
	kolab-test-toolbox.ini kolab-test-toolbox.pl 
Log Message:
Started a ci (continuous integration) hierarchy.

--- NEW FILE: kolab-test-toolbox.ini ---
[default]
; general
slave_count=1
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/unknown
;$<  # $REAL_USER_ID
user=mathieu
group=disk

; vm
vm_memory=256Mb
vm_size=1Gb
vm_swap=128Mb
; debootstrap
vm_install_method=debootstrap
vm_dist=sid

; virt
virt_uri=vbox:///session
virt_type=vbox

; network
bridge=br0
dns_domain=local.tld
ip_offset=10

;common dirs
usr_bin_dir=/usr/bin
usr_sbin_dir=/usr/sbin
php_test_dir=/usr/share/php/tests

; kolab conf
; native_debian|openpkg
kolab_installation_method=openpkg
kolabsrv=kolabsrv
kolab_bootstrap=kolab_bootstrap
kolab_manager_password=12345
ca_passphrase=12345678

[debian-lenny-openpkg]
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-lenny-openpkg

; more for compilation
vm_memory=512Mb
; more for all the source and compiled packages
vm_size=3Gb
vm_install_method=debootstrap
vm_dist=lenny

ip_offset=10

usr_bin_dir=/kolab/bin
usr_sbin_dir=/kolab/sbin
php_test_dir=/kolab/lib/php/test

kolab_installation_method=openpkg
kolabsrv=/kolab/bin/openpkg
kolab_bootstrap=/kolab/sbin/kolab_bootstrap

[debian-lenny-native]
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-lenny-native

vm_install_method=debootstrap
vm_dist=lenny

ip_offset=15

kolab_installation_method=native_debian

[debian-sid-native]
storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-native

vm_install_method=debootstrap
vm_dist=sid

ip_offset=20

kolab_installation_method=native_debian


--- NEW FILE: kolab-test-toolbox.pl ---
#!/usr/bin/perl

=head1 NAME

kolab-test-toolbox - Script to test kolab packages using virtual machines.

=head1 SYNOPSIS

B<kolab-test-toolbox> [options] command [[options] command] ...

=head1 ARGUMENTS

=over 8

=item I<bootstrap>

Step 1: Bootstrap the domain

=item I<preboot_install>
[...1016 lines suppressed...]
            }
            domain_bootstrap($domid, $domname);
        } elsif ($action eq 'preboot_install') {
            domain_preboot_install($domid, $domname);
        } elsif ($action eq 'boot') {
            domain_boot($domid, $domname);
        } elsif ($action eq 'install') {
            domain_install($domid, $domname);
        } elsif ($action eq 'test') {
            domain_test($domid, $domname);
        } elsif ($action eq 'chroot') {
            domain_chroot($domid, $domname);
        } elsif ($action eq 'login') {
            domain_login($domid, $domname);
        } else {
            print "Unknow action: $action\n";
        }
    }
}




From cvs at kolab.org  Fri Dec  4 10:00:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:00:51 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.83,1.398.2.84 
Message-ID: <20091204090051.B134A60057F@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
 kolab/issue3838 (no logging for pop3)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.83
retrieving revision 1.398.2.84
diff -u -d -r1.398.2.83 -r1.398.2.84
--- release-notes.txt	3 Dec 2009 21:08:43 -0000	1.398.2.83
+++ release-notes.txt	4 Dec 2009 09:00:49 -0000	1.398.2.84
@@ -57,6 +57,8 @@
 
 	Fix buffer size calculations for sieve actions_string (CVE-2009-2632)
 
+	kolab/issue3838 (no logging for pop3)
+
     - kolabd-2.2.3-2009????
 
 	kolab/issue919  (kolab server has problems with some characters in



From cvs at kolab.org  Fri Dec  4 10:00:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:00:51 +0100 (CET)
Subject: gunnar: server/imapd kolab.patch,1.39.2.2,1.39.2.3 
Message-ID: <20091204090051.B337C600580@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab.patch 
Log Message:
 kolab/issue3838 (no logging for pop3)

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -d -r1.39.2.2 -r1.39.2.3
--- kolab.patch	22 Sep 2009 14:28:21 -0000	1.39.2.2
+++ kolab.patch	4 Dec 2009 09:00:49 -0000	1.39.2.3
@@ -5,7 +5,7 @@
  License:      BSD
  Version:      2.3.13
 -Release:      20081020
-+Release:      20081020_kolab3
++Release:      20081020_kolab4
  
  #   package options
  %option       with_fsl           yes
@@ -103,3 +103,14 @@
          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
+@@ -14,7 +14,7 @@
+     }
+ };
+ 
+-ident (pop3.)/.+ q{
++ident (pop3d|pop3s|pop3)/.+ q{
+     prefix(
+         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+     )



From cvs at kolab.org  Fri Dec  4 10:37:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:37:40 +0100 (CET)
Subject: gunnar: server/make-helper - New directory 
Message-ID: <20091204093740.C32DD60057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv4511/make-helper

Log Message:
Directory /kolabrepository/server/make-helper added to the repository




From cvs at kolab.org  Fri Dec  4 10:43:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:43:23 +0100 (CET)
Subject: gunnar: server/make-helper hg-patch-queue.mk,NONE,1.1 
Message-ID: <20091204094323.B7C9260057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv4777

Added Files:
	hg-patch-queue.mk 
Log Message:
Add a makefile definition for managing a patch queue with hg.

--- NEW FILE: hg-patch-queue.mk ---
# This is a very rough draft for updating a patch series using
# mercurial queues. The Makefile could see some optimizations but for
# the occasional upstream update it hopefully does fine.
#
# Author: G. Wrobel

.PHONY: update
update:
	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
	rm -rf tmp
	mkdir -p tmp
ifeq "x$(COMPRESSION)" "xGZ"
	cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.gz
	cd tmp && tar xfz $(PN)-$(OLD_VERSION).tar.gz
endif
ifeq "x$(COMPRESSION)" "xBZ2"
	cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.bz2
	cd tmp && tar xfj $(PN)-$(OLD_VERSION).tar.bz2
endif
	cd tmp/$(PN)-$(OLD_VERSION) && hg init && hg commit --addremove -m "$(PN)-$(OLD_VERSION)"
	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-PATCHED
	printf "[extensions]\nhgext.mq =\n" > tmp/$(PN)-PATCHED/.hg/hgrc
	cd tmp/$(PN)-PATCHED && hg qinit
	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
	cd $(PN)-$(OLD_VERSION); \
	for FL in KOLAB*; do \
	  cp $$FL ../tmp/$(PN)-PATCHED/.hg/patches/$${FL/$(PN)-$(OLD_VERSION)_/}; \
	done
	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
	cd tmp/$(PN)-PATCHED && hg qpush -a && hg qpop -a
	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-$(NEW_VERSION)
	cd tmp/$(PN)-$(NEW_VERSION) && hg locate -0 | xargs -0 rm
ifeq "x$(COMPRESSION)" "xGZ"
	cd tmp && wget $(SOURCE_URL)/$(PN)-$(NEW_VERSION).tar.gz
	cd tmp && tar xfz $(PN)-$(NEW_VERSION).tar.gz
endif
ifeq "x$(COMPRESSION)" "xBZ2"
	cd tmp && wget $(SOURCE_URL)/$(PN)-$(NEW_VERSION).tar.bz2
	cd tmp && tar xfj $(PN)-$(NEW_VERSION).tar.bz2
endif
	cd tmp/$(PN)-$(NEW_VERSION) && hg commit --addremove -m "$(PN)-$(NEW_VERSION)"
	cd tmp/$(PN)-PATCHED && hg pull ../$(PN)-$(NEW_VERSION) && hg update
	@echo
	@echo
	@echo "The patch series will be pushed now. If errors occur you will need to "
	@echo "move into the directory tmp/$(PN)-PATCHED:"
	@echo
	@echo "cd tmp/$(PN)-PATCHED"
	@echo
	@echo "and fix the merge conflicts. Once you did that you will need to run"
	@echo "run \"hg qrefresh\" and continue with \"hg qpush\" until the full series applied"
	@echo "successfully. Finally you may move back to the current directory and run \"make patches\""
	@echo
	@echo
	cd tmp/$(PN)-PATCHED && hg qpush -a

.PHONY: patches
patches:
	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
	mkdir $(PN)-$(NEW_VERSION)
	cd tmp/$(PN)-PATCHED/.hg/patches; \
	for FL in KOLAB*; do \
	  cp $$FL ../../../../$(PN)-$(NEW_VERSION)/$${FL/KOLAB_/KOLAB_$(PN)-$(NEW_VERSION)_}; \
	done
	cp tmp/$(PN)-PATCHED/.hg/patches/series $(PN)-$(NEW_VERSION)/ 
	rm -rf tmp




From cvs at kolab.org  Fri Dec  4 10:46:56 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:46:56 +0100 (CET)
Subject: gunnar: server/imapd/patches Makefile,1.2,1.3 
Message-ID: <20091204094656.7CB68600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/imapd/patches
In directory doto:/tmp/cvs-serv4978

Modified Files:
	Makefile 
Log Message:
Update makefile for cyrus imapd 2.3.15

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/patches/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 Jul 2009 13:15:44 -0000	1.2
+++ Makefile	4 Dec 2009 09:46:54 -0000	1.3
@@ -1,57 +1,10 @@
-# This is a very rough draft for updating a patch series using
-# mercurial queues. The Makefile could see some optimizations but for
-# the occasional upstream update it hopefully does fine.
-#
-# Author: G. Wrobel
-
-OLD_VERSION=2.3.13
-NEW_VERSION=2.3.14
+OLD_VERSION=2.3.14
+NEW_VERSION=2.3.15
 
 PN=cyrus-imapd
 
 SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus/
 
-.PHONY: update
-update:
-	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
-	rm -rf tmp
-	mkdir -p tmp
-	cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.gz
-	cd tmp && tar xfz $(PN)-$(OLD_VERSION).tar.gz
-	cd tmp/$(PN)-$(OLD_VERSION) && hg init && hg commit --addremove -m "$(PN)-$(OLD_VERSION)"
-	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-PATCHED
-	printf "[extensions]\nhgext.mq =\n" > tmp/$(PN)-PATCHED/.hg/hgrc
-	cd tmp/$(PN)-PATCHED && hg qinit
-	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
-	cd $(PN)-$(OLD_VERSION); \
-	for FL in KOLAB*; do \
-	  cp $$FL ../tmp/$(PN)-PATCHED/.hg/patches/$${FL/$(PN)-$(OLD_VERSION)_/}; \
-	done
-	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
-	cd tmp/$(PN)-PATCHED && hg qpush -a && hg qpop -a
-	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-$(NEW_VERSION)
-	cd tmp/$(PN)-$(NEW_VERSION) && hg locate -0 | xargs -0 rm
-	cd tmp && wget $(SOURCE_URL)/$(PN)-$(NEW_VERSION).tar.gz
-	cd tmp && tar xfz $(PN)-$(NEW_VERSION).tar.gz
-	cd tmp/$(PN)-$(NEW_VERSION) && hg commit --addremove -m "$(PN)-$(NEW_VERSION)"
-	cd tmp/$(PN)-PATCHED && hg pull ../$(PN)-$(NEW_VERSION) && hg update
-	@echo
-	@echo
-	@echo "The patch series will be pushed now. If errors occur you will need to fix them"
-	@echo "run \"hg qrefresh\" and continue with \"hg qpush\" until the full series applied"
-	@echo "successfully. Finally you may move back to the current directory and run \"make patches\""
-	@echo
-	@echo
-	cd tmp/$(PN)-PATCHED && hg qpush -a
-
-.PHONY: patches
-patches:
-	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
-	mkdir $(PN)-$(NEW_VERSION)
-	cd tmp/$(PN)-PATCHED/.hg/patches; \
-	for FL in KOLAB*; do \
-	  cp $$FL ../../../../$(PN)-$(NEW_VERSION)/$${FL/KOLAB_/KOLAB_$(PN)-$(NEW_VERSION)_}; \
-	done
-	cp tmp/$(PN)-PATCHED/.hg/patches/series $(PN)-$(NEW_VERSION)/ 
-	rm -rf tmp
+COMPRESSION=GZ
 
+include ../../make-helper/hg-patch-queue.mk



From cvs at kolab.org  Fri Dec  4 10:47:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:47:02 +0100 (CET)
Subject: gunnar: server/imapd/patches/cyrus-imapd-2.3.15 - New directory 
Message-ID: <20091204094702.DA2FE600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/imapd/patches/cyrus-imapd-2.3.15
In directory doto:/tmp/cvs-serv5026/cyrus-imapd-2.3.15

Log Message:
Directory /kolabrepository/server/imapd/patches/cyrus-imapd-2.3.15 added to the repository




From cvs at kolab.org  Fri Dec  4 10:47:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 10:47:24 +0100 (CET)
Subject: gunnar: server/imapd/patches/cyrus-imapd-2.3.15
	KOLAB_cyrus-imapd-2.3.15_Annotations2.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.15_Cyradm_Annotations.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.15_Folder-names.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.15_Groups2.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.15_Logging.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.15_UID.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.15_timsieved_starttls-sendcaps.patch,
	NONE, 1.1 series, NONE, 1.1 
Message-ID: <20091204094724.B5E1A600561@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/imapd/patches/cyrus-imapd-2.3.15
In directory doto:/tmp/cvs-serv5062

Added Files:
	KOLAB_cyrus-imapd-2.3.15_Annotations2.patch 
	KOLAB_cyrus-imapd-2.3.15_Cyradm_Annotations.patch 
	KOLAB_cyrus-imapd-2.3.15_Folder-names.patch 
	KOLAB_cyrus-imapd-2.3.15_Groups2.patch 
	KOLAB_cyrus-imapd-2.3.15_Logging.patch 
	KOLAB_cyrus-imapd-2.3.15_UID.patch 
	KOLAB_cyrus-imapd-2.3.15_timsieved_starttls-sendcaps.patch 
	series 
Log Message:
Add patches for 2.3.15

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_Annotations2.patch ---
Provides a new version of annotation support for the cyrus imapd server [Version: 2.3.9]

diff -r 321cda1d6136 imap/annotate.c
--- a/imap/annotate.c	Tue Apr 22 10:44:56 2008 +0200
+++ b/imap/annotate.c	Tue Apr 22 10:47:04 2008 +0200
@@ -90,6 +90,8 @@ int (*proxy_fetch_func)(const char *serv
 			struct strlist *attribute_pat) = NULL;
 int (*proxy_store_func)(const char *server, const char *mbox_pat,
 			struct entryattlist *entryatts) = NULL;
+
+void init_annotation_definitions();
 
 /* String List Management */
 /*
@@ -237,6 +239,8 @@ void annotatemore_init(int myflags,
     if (store_func) {
 	proxy_store_func = store_func;
     }
+    
+    init_annotation_definitions();
 }
 
 void annotatemore_open(char *fname)
@@ -1832,6 +1836,224 @@ const struct annotate_st_entry mailbox_r
     { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
 };
 
+struct annotate_st_entry_list *server_entries_list = NULL;
+struct annotate_st_entry_list *mailbox_rw_entries_list = NULL;
+
+enum {
+  ANNOTATION_SCOPE_SERVER = 1,
+  ANNOTATION_SCOPE_MAILBOX = 2
+};
+
+const struct annotate_attrib annotation_scope_names[] =
+{
+    { "server", ANNOTATION_SCOPE_SERVER },
+    { "mailbox", ANNOTATION_SCOPE_MAILBOX },
+    { NULL, 0 }
+};
+
+const struct annotate_attrib annotation_proxy_type_names[] =
+{
+    { "proxy", PROXY_ONLY },
+    { "backend", BACKEND_ONLY },
+    { "proxy_and_backend", PROXY_AND_BACKEND },
+    { NULL, 0 }
+};
+
+const struct annotate_attrib attribute_type_names[] = 
+{
+    { "content-type", ATTRIB_TYPE_CONTENTTYPE },
+    { "string", ATTRIB_TYPE_STRING },
+    { "boolean", ATTRIB_TYPE_BOOLEAN },
+    { "uint", ATTRIB_TYPE_UINT },
+    { "int", ATTRIB_TYPE_INT },
+    { NULL, 0 }
+};
+
+#define ANNOT_DEF_MAXLINELEN 1024
+
+int table_lookup(const struct annotate_attrib *table,
+                                  char* name,
+                                  size_t namelen,
+                                  char* errmsg) 
+/* search in table for the value given by name and namelen (name is null-terminated,
+   but possibly more than just the key). errmsg is used to hint the user where we failed */
+{
+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
+  int entry;
+  
+  for (entry = 0; table[entry].name &&
+                  (strncasecmp(table[entry].name, name, namelen)
+                   || table[entry].name[namelen] != '\0'); entry++);
+
+  if (! table[entry].name) {
+    sprintf(errbuf, "invalid %s at '%s'", errmsg, name);
+    fatal(errbuf, EC_CONFIG);
+  }
+  return table[entry].entry;
+}
+
+char *consume_comma(char* p)
+  /* advance beyond the next ',', skipping whitespace, fail if next non-space is no comma */
+{
+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
+
+  for (; *p && isspace(*p); p++);  
+  if (*p != ',') {
+    sprintf(errbuf, "',' expected, '%s' found parsing annotation definition",
+            p);
+    fatal(errbuf, EC_CONFIG);
+  }
+  p++;
+  for (; *p && isspace(*p); p++);  
+  
+  return p;
+}
+
+int parse_table_lookup_bitmask(const struct annotate_attrib *table,
+                               char** s,
+                               char* errmsg) 
+  /* parses strings of the form value1 [ value2 [ ... ]]
+     value1 is mapped via table to ints and the result ored
+     whitespace is allowed between value names and punctuation
+     the field must end in '\0' or ','
+     s is advanced to '\0' or ','
+     on error errmsg is used to identify item to be parsed
+   */
+{
+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
+  int result = 0;
+  char *p, *p2;
+
+  p = *s;
+  do {
+    p2 = p;
+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
+    result |= table_lookup(table, p2, p-p2, errmsg);
+    for (; *p && isspace(*p); p++);
+  } while (*p && *p != ',');
+
+  *s = p;
+  return result;
+}
+
+void init_annotation_definitions()
+{
+  char *p, *p2, *tmp;
+  const char *filename;
+  char aline[ANNOT_DEF_MAXLINELEN];
+  char errbuf[ANNOT_DEF_MAXLINELEN*2];
+  struct annotate_st_entry_list *se, *me;
+  struct annotate_st_entry *ae;
+  int i;
+  FILE* f;
+
+  /* NOTE: we assume # static entries > 0 */
+  server_entries_list = xmalloc(sizeof(struct annotate_st_entry_list));
+  mailbox_rw_entries_list = xmalloc(sizeof(struct annotate_st_entry_list));
+  se = server_entries_list;
+  me = mailbox_rw_entries_list;
+  /* copy static entries into list */
+  for (i = 0; server_entries[i].name;i++) {
+    se->entry = &server_entries[i];
+    if (server_entries[i+1].name) {
+      se->next = xmalloc(sizeof(struct annotate_st_entry_list));
+      se = se->next;
+    }
+  }
+  /* copy static entries into list */
+  for (i = 0; mailbox_rw_entries[i].name;i++) {
+    me->entry = &mailbox_rw_entries[i];
+    if (mailbox_rw_entries[i+1].name) {
+      me->next = xmalloc(sizeof(struct annotate_st_entry_list));
+      me = me->next;
+    }
+  }
+
+  /* parse config file */
+  filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS);
+
+  if (! filename) {
+    se->next = NULL;
+    me->next = NULL;
+    return;
+  }
+  
+  f = fopen(filename,"r");
+  if (! f) {
+    sprintf(errbuf, "could not open annotation definiton %s", filename);
+    fatal(errbuf, EC_CONFIG);
+  }
+  
+  while (fgets(aline, sizeof(aline), f)) {
+    // remove leading space, skip blank lines and comments
+    for (p = aline; *p && isspace(*p); p++);
+    if (!*p || *p == '#') continue;
+
+    // note, we only do the most basic validity checking and may
+    // be more restrictive than neccessary
+
+    ae = xmalloc(sizeof(struct annotate_st_entry));
+
+    p2 = p;
+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
+    // TV-TODO: should test for empty
+    ae->name = xstrndup(p2, p-p2);
+
+    p = consume_comma(p);
+  
+    p2 = p;
+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
+
+    if (table_lookup(annotation_scope_names, p2, p-p2,
+                     "annotation scope")==ANNOTATION_SCOPE_SERVER) {
+      se->next = xmalloc(sizeof(struct annotate_st_entry_list));
+      se = se->next;
+      se->entry = ae;
+    }
+    else {
+      me->next = xmalloc(sizeof(struct annotate_st_entry_list));
+      me = me->next;      
+      me->entry = ae;
+    }
+    
+    p = consume_comma(p);
+    p2 = p;
+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
+    ae->type = table_lookup(attribute_type_names, p2, p-p2,
+                                  "attribute type");
+  
+    p = consume_comma(p);
+    ae->proxytype = parse_table_lookup_bitmask(annotation_proxy_type_names,
+                                               &p,
+                                               "annotation proxy type");
+
+    p = consume_comma(p);
+    ae->attribs = parse_table_lookup_bitmask(annotation_attributes,
+                                             &p,
+                                             "annotation attributes");
+    
+    p = consume_comma(p);
+    p2 = p;
+    for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++);
+    tmp = xstrndup(p2, p-p2);
+    ae->acl = cyrus_acl_strtomask(tmp);
+    free(tmp);
+
+    for (; *p && isspace(*p); p++);
+    if (*p) {
+      sprintf(errbuf, "junk at end of line: '%s'", p);
+      fatal(errbuf, EC_CONFIG);
+    }
+    
+    ae->set = annotation_set_todb;
+    ae->rock = NULL;
+  }
+
+  fclose(f);
+  se->next = NULL;
+  me->next = NULL;
+}
+
 int annotatemore_store(char *mailbox,
 		       struct entryattlist *l,
 		       struct namespace *namespace,
@@ -1843,7 +2065,7 @@ int annotatemore_store(char *mailbox,
     struct entryattlist *e = l;
     struct attvaluelist *av;
     struct storedata sdata;
-    const struct annotate_st_entry *entries;
+    const struct annotate_st_entry_list *entries, *currententry;
     time_t now = time(0);
 
     memset(&sdata, 0, sizeof(struct storedata));
@@ -1854,45 +2076,45 @@ int annotatemore_store(char *mailbox,
 
     if (!mailbox[0]) {
 	/* server annotations */
-	entries = server_entries;
+	entries = server_entries_list;
     }
     else {
 	/* mailbox annotation(s) */
-	entries = mailbox_rw_entries;
+	entries = mailbox_rw_entries_list;
     }
 
     /* Build a list of callbacks for storing the annotations */
     while (e) {
-	int entrycount, attribs;
+	int attribs;
 	struct annotate_st_entry_list *nentry = NULL;
 
 	/* See if we support this entry */
-	for (entrycount = 0;
-	     entries[entrycount].name;
-	     entrycount++) {
-	    if (!strcmp(e->entry, entries[entrycount].name)) {
+	for (currententry = entries;
+	     currententry;
+	     currententry = currententry->next) {
+	    if (!strcmp(e->entry, currententry->entry->name)) {
 		break;
 	    }
 	}
-	if (!entries[entrycount].name) {
+	if (!currententry) {
 	    /* unknown annotation */
 	    return IMAP_PERMISSION_DENIED;
 	}
 
 	/* Add this entry to our list only if it
 	   applies to our particular server type */
-	if ((entries[entrycount].proxytype != PROXY_ONLY)
+	if ((currententry->entry->proxytype != PROXY_ONLY)
 	    || proxy_store_func) {
 	    nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
 	    nentry->next = sdata.entry_list;
-	    nentry->entry = &(entries[entrycount]);
+	    nentry->entry = currententry->entry;
 	    nentry->shared.modifiedsince = now;
 	    nentry->priv.modifiedsince = now;
 	    sdata.entry_list = nentry;
 	}
 
 	/* See if we are allowed to set the given attributes. */
-	attribs = entries[entrycount].attribs;
+	attribs = currententry->entry->attribs;
 	av = e->attvalues;
 	while (av) {
 	    const char *value;
@@ -1902,7 +2124,7 @@ int annotatemore_store(char *mailbox,
 		    goto cleanup;
 		}
 		value = annotate_canon_value(av->value,
-					     entries[entrycount].type);
+					     currententry->entry->type);
 		if (!value) {
 		    r = IMAP_ANNOTATION_BADVALUE;
 		    goto cleanup;
@@ -1928,7 +2150,7 @@ int annotatemore_store(char *mailbox,
 		    goto cleanup;
 		}
 		value = annotate_canon_value(av->value,
-					     entries[entrycount].type);
+					     currententry->entry->type);
 		if (!value) {
 		    r = IMAP_ANNOTATION_BADVALUE;
 		    goto cleanup;
@@ -2110,3 +2332,10 @@ int annotatemore_delete(const char *mbox
 
     return annotatemore_rename(mboxname, NULL, NULL, NULL);
 }
+
+/* This file contains code Copyright (c) 2006 by Thomas Viehmann.
+ * You may distribute source code or binaries under the conditions
+ * conditions given in the CMU license, provided this note stays intact
+ * in the distributed source. If you want to distribute my code without
+ * this notice, do contact me at <tv at beamnet.de>.
+ */
diff -r 321cda1d6136 lib/imapoptions
--- a/lib/imapoptions	Tue Apr 22 10:44:56 2008 +0200
+++ b/lib/imapoptions	Tue Apr 22 10:47:04 2008 +0200
@@ -172,6 +172,9 @@ are listed with ``<none>''.
 /* Should non-admin users be allowed to set ACLs for the 'anyone'
    user on their mailboxes?  In a large organization this can cause
    support problems, but it's enabled by default. */
+
+{ "annotation_definitions", NULL, STRING }
+/* File containing annotation definitions. */
 
 { "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")}
 /* The authorization mechanism to use. */

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_Cyradm_Annotations.patch ---
Allows to use arbitrary annotations with the cyradm tool.

diff -r 69927cac0b1b doc/man/cyradm.1.html
--- a/doc/man/cyradm.1.html	Fri Dec 04 10:32:26 2009 +0100
+++ b/doc/man/cyradm.1.html	Fri Dec 04 10:32:33 2009 +0100
@@ -220,6 +220,13 @@
 <dd>
 <p>Sets an email address to which messages injected into the server via NNTP 
 will be sent.</p>
+</dd>
+</li>
+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
+
+<dd>
+<p>Sets the annotation <em>/explicit/annotation</em>
+on <em>mailbox</em> to <em>value</em>.</p>
 </dd>
 <dt><strong><a name="sharedseen" class="item"><code>sharedseen</code></a></strong></dt>
 
diff -r 69927cac0b1b perl/imap/IMAP/Admin.pm
--- a/perl/imap/IMAP/Admin.pm	Fri Dec 04 10:32:26 2009 +0100
+++ b/perl/imap/IMAP/Admin.pm	Fri Dec 04 10:32:33 2009 +0100
@@ -797,11 +797,11 @@
     return undef;
   }
 
-  if(!exists($values{$entry})) {
-    $self->{error} = "Unknown parameter $entry";
+  if(exists($values{$entry})) {
+    $entry = $values{$entry};    
+  } else {
+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
   }
-
-  $entry = $values{$entry};
 
   my ($rc, $msg);
 
diff -r 69927cac0b1b perl/imap/IMAP/Shell.pm
--- a/perl/imap/IMAP/Shell.pm	Fri Dec 04 10:32:26 2009 +0100
+++ b/perl/imap/IMAP/Shell.pm	Fri Dec 04 10:32:33 2009 +0100
@@ -127,7 +127,7 @@
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1437,7 +1437,7 @@
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1446,7 +1446,7 @@
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";
diff -r 69927cac0b1b perl/imap/cyradm.sh
--- a/perl/imap/cyradm.sh	Fri Dec 04 10:32:26 2009 +0100
+++ b/perl/imap/cyradm.sh	Fri Dec 04 10:32:33 2009 +0100
@@ -241,6 +241,10 @@
 
 Indicates that the mailbox should have a squat index created for it.
 
+=item C</explicit/annotation>
+
+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
+
 =back 
 
 =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_Folder-names.patch ---
Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9]

diff -r 17e54b46d7b6 imap/mboxname.c
--- a/imap/mboxname.c	Mon Oct 27 18:44:56 2008 +0100
+++ b/imap/mboxname.c	Mon Oct 27 18:47:11 2008 +0100
@@ -713,8 +713,10 @@
 /*
  * Apply site policy restrictions on mailbox names.
  * Restrictions are hardwired for now.
+ * original definition 
+#define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
  */
-#define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
 int mboxname_policycheck(char *name)
 {
     unsigned i;

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_Groups2.patch ---
diff -r 37030bf2b2bb lib/auth_unix.c
--- a/lib/auth_unix.c	Fri Dec 04 10:25:24 2009 +0100
+++ b/lib/auth_unix.c	Fri Dec 04 10:32:19 2009 +0100
@@ -46,6 +46,7 @@
 #include <stdlib.h>
 #include <pwd.h>
 #include <grp.h>
+#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
@@ -54,6 +55,126 @@
 #include "xmalloc.h"
 #include "util.h"
 
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+/*
+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
+ * Copyright (C) 1995, 1996 Nat Friedman <ndf at linux.mit.edu>.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+static struct group *__getgrent(int grp_fd, char *line_buff, char **members)
+{
+    short line_index;
+    short buff_size;
+    static struct group group;
+    register char *ptr;
+    char *field_begin;
+    short member_num;
+    char *endptr;
+    int line_len;
+
+    /* We use the restart label to handle malformatted lines */
+    restart:
+    line_index = 0;
+    buff_size = 256;
+
+    line_buff = realloc(line_buff, buff_size);
+    while (1) {
+        if ((line_len = read(grp_fd, line_buff + line_index,
+                        buff_size - line_index)) <= 0) {
+            return NULL;
+        }
+        field_begin = strchr(line_buff, '\n');
+        if (field_begin != NULL) {
+            lseek(grp_fd,
+                    (long) (1 + field_begin -
+                            (line_len + line_index + line_buff)), SEEK_CUR);
+            *field_begin = '\0';
+            if (*line_buff == '#' || *line_buff == ' '
+                    || *line_buff == '\n' || *line_buff == '\t')
+                goto restart;
+            break;
+        } else {
+            /* Allocate some more space */
+            line_index = buff_size;
+            buff_size += 256;
+            line_buff = realloc(line_buff, buff_size);
+        }
+    }
+
+    /* Now parse the line */
+    group.gr_name = line_buff;
+    ptr = strchr(line_buff, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    group.gr_passwd = ptr;
+    ptr = strchr(ptr, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    field_begin = ptr;
+    ptr = strchr(ptr, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10);
+    if (*endptr != '\0')
+        goto restart;
+
+    member_num = 0;
+    field_begin = ptr;
+
+    if (members != NULL)
+        free(members);
+    members = (char **) malloc((member_num + 1) * sizeof(char *));
+    for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) {
+        if ((ptr = strchr(field_begin, ',')) != NULL)
+            *ptr++ = '\0';
+        members[member_num++] = field_begin;
+        members = (char **) realloc(members,
+                (member_num + 1) * sizeof(char *));
+    }
+    members[member_num] = NULL;
+
+    group.gr_mem = members;
+    return &group;
+}
+
+static char *line_buff = NULL;
+static char **members  = NULL;
+
+struct group *fgetgrent(FILE *file)
+{
+    if (file == NULL) {
+        errno = EINTR;
+        return NULL;
+    }
+    return __getgrent(fileno(file), line_buff, members);
+}
+#endif /* __FreeBSD__ */
+ 
 struct auth_state {
     char userid[81];
     char **group;
@@ -141,6 +262,25 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
+static struct group* fgetgrnam(const char* name)
+{
+    struct group *grp;
+    FILE *groupfile;
+
+    groupfile = fopen("/etc/imapd.group", "r");
+    if (!groupfile) groupfile = fopen("/etc/group", "r");
+    if (groupfile) {
+       while ((grp = fgetgrent(groupfile))) {
+         if (strcmp(grp->gr_name, name) == 0) {
+           fclose(groupfile);
+           return grp;
+         }
+       }
+    } 
+    if (groupfile) fclose(groupfile);
+    return NULL;
+} 
+
 /*
  * Convert 'identifier' into canonical form.
  * Returns a pointer to a static buffer containing the canonical form
@@ -176,7 +316,7 @@
      */
     
     if (!strncmp(retbuf, "group:", 6)) {
-	grp = getgrnam(retbuf+6);
+	grp = fgetgrnam(retbuf+6);
 	if (!grp) return NULL;
 	if (strlen(grp->gr_name) >= sizeof(retbuf)-6)
 		return NULL;
@@ -224,11 +364,12 @@
     struct auth_state *newstate;
     struct passwd *pwd;
     struct group *grp;
-#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+#if 0 && defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
     gid_t gid, *groupids = NULL;
     int ret, ngroups = 10;
 #else
     char **mem;
+    FILE *groupfile;
 #endif
 
     identifier = mycanonifyid(identifier, 0);
@@ -246,7 +387,7 @@
 
     pwd = getpwnam(identifier);
 
-#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+#if 0 && defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
     gid = pwd ? pwd->pw_gid : (gid_t) -1;
 
     /* get the group ids */
@@ -284,20 +425,23 @@
     if (groupids) free(groupids);
 
 #else /* !HAVE_GETGROUPLIST */
-    setgrent();
-    while ((grp = getgrent())) {
-	for (mem = grp->gr_mem; *mem; mem++) {
-	    if (!strcmp(*mem, identifier)) break;
-	}
+    groupfile = fopen("/etc/imapd.group", "r");
+    if (!groupfile) groupfile = fopen("/etc/group", "r");
+    if (groupfile) {
+       while ((grp = fgetgrent(groupfile))) {
+         for (mem = grp->gr_mem; *mem; mem++) {
+            if (!strcmp(*mem, identifier)) break;
+         }
 
-	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
-	    newstate->ngroups++;
-	    newstate->group = (char **)xrealloc((char *)newstate->group,
-						newstate->ngroups * sizeof(char *));
-	    newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
-	}
-    }
-    endgrent();
+         if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
+            newstate->ngroups++;
+            newstate->group = (char **)xrealloc((char *)newstate->group,
+                                                newstate->ngroups * sizeof(char *));
+            newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+         }
+       }
+       fclose(groupfile);
+    } 
 #endif /* HAVE_GETGROUPLIST */
 
     return newstate;

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_Logging.patch ---
Provides improved logging for the cyrus imapd server [Version: 2.3.9]

diff -r 6162fc947b22 imap/append.c
--- a/imap/append.c	Tue Dec 11 11:22:03 2007 +0100
+++ b/imap/append.c	Tue Dec 11 11:22:13 2007 +0100
@@ -648,6 +648,9 @@ int append_fromstage(struct appendstate 
 
     /* ok, we've successfully added a message */
     as->quota_used += message_index.size;
+
+    syslog(LOG_DEBUG, "append_fromstage: message %d added to %s",
+	   message_index.uid, mailbox->name );
 
     return 0;
 }
diff -r 6162fc947b22 imap/imapd.c
--- a/imap/imapd.c	Tue Dec 11 11:22:03 2007 +0100
+++ b/imap/imapd.c	Tue Dec 11 11:22:13 2007 +0100
@@ -3509,17 +3509,19 @@ void cmd_close(char *tag)
 	if (!r) sync_log_mailbox(imapd_mailbox->name);
     }
 
+    if (r) {
+	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+    }
+    else {
+	prot_printf(imapd_out, "%s OK %s\r\n", tag,
+		    error_message(IMAP_OK_COMPLETED));
+	syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s",
+	       imapd_userid, imapd_mailbox->name, "''");
+    }
+
     index_closemailbox(imapd_mailbox);
     mailbox_close(imapd_mailbox);
     imapd_mailbox = 0;
-
-    if (r) {
-	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
-    }
-    else {
-	prot_printf(imapd_out, "%s OK %s\r\n", tag,
-		    error_message(IMAP_OK_COMPLETED));
-    }
 }    
 
 /*
diff -r 6162fc947b22 imap/mailbox.c
--- a/imap/mailbox.c	Tue Dec 11 11:22:03 2007 +0100
+++ b/imap/mailbox.c	Tue Dec 11 11:22:13 2007 +0100
@@ -2520,6 +2520,8 @@ int mailbox_expunge(struct mailbox *mail
 	*(fname->tail)++ = '/';
 	fname->len++;
 	for (msgno = 0; msgno < numdeleted; msgno++) {
+	    syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d",
+		   mailbox->name, deleted[msgno]);
 	    mailbox_message_get_fname(mailbox, deleted[msgno],
 				      fname->tail,
 				      sizeof(fname->buf) - fname->len);

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_UID.patch ---
Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9]

diff -r 2ebe14b7db9d configure
--- a/configure	Mon Oct 27 18:47:12 2008 +0100
+++ b/configure	Mon Oct 27 18:48:18 2008 +0100
@@ -19667,7 +19667,7 @@
 done
 
 IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
+IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS} ${SQL_LIBS}"
 
 
 
diff -r 2ebe14b7db9d imap/global.c
--- a/imap/global.c	Mon Oct 27 18:47:12 2008 +0100
+++ b/imap/global.c	Mon Oct 27 18:48:18 2008 +0100
@@ -52,6 +52,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
+
+#include <ldap.h>
+#include <lber.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -378,6 +381,18 @@
     char *domain = NULL;
     int len = strlen(user);
     char buf[81];
+    const char *uri;
+    const char *base;
+    const char *binddn;
+    const char *bindpw;
+    struct timeval timeout;
+    char filter[255];
+    LDAP *handle;
+    LDAPMessage *res;
+    LDAPMessage *entry;
+    struct berval** vals;
+
+    int rc;
 
     /* check for domain */
     if (config_virtdomains &&
@@ -396,6 +411,49 @@
     }
 
     if (config_virtdomains) {
+        if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) {
+           uri = config_getstring(IMAPOPT_LDAP_URI);
+           base = config_getstring(IMAPOPT_LDAP_BASE);
+           binddn = config_getstring(IMAPOPT_LDAP_BIND_DN);
+           bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD);
+           timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT);
+           timeout.tv_usec = 0;
+           sprintf(filter, "(uid=%s)", user);
+           rc = ldap_initialize(&handle, uri);
+           if (rc != LDAP_SUCCESS) {
+                syslog(LOG_ERR, "ldap_initialize failed (%s)", uri);
+           } else {
+	        rc = ldap_simple_bind_s(handle, binddn, bindpw);
+	        if (rc != LDAP_SUCCESS) {
+                     syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc));
+	        } else {
+	             rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res);
+                     if (rc != LDAP_SUCCESS) {
+                          syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc));
+                     } else {
+	                  if ( (entry = ldap_first_entry(handle, res)) != NULL ) {
+			       // read mail attribute from entry
+			       if ( (vals = ldap_get_values_len(handle, entry, "mail")) ) {
+  				    if (memchr(vals[0]->bv_val, '@', vals[0]->bv_len)) {
+				        static char buf[81]; /* same size as in auth_canonifyid */
+					   int len = ((sizeof(buf) - 1) > vals[0]->bv_len ? vals[0]->bv_len : sizeof(buf) - 1);
+					strncpy( buf, vals[0]->bv_val, len);
+					buf[len] = '\0'; /* make sure it's null-terminated */
+					ldap_value_free_len( vals );
+				        ldap_msgfree( res );
+					ldap_unbind_s(handle); /* also frees handle */
+					syslog(LOG_DEBUG, "canonify: '%s'\n", buf);
+				        return auth_canonifyid( buf, 0) ;
+				    }
+				    ldap_value_free_len( vals );
+			       }			       	
+   	                  }
+			  ldap_msgfree( res );
+                     }
+                }
+		ldap_unbind_s(handle); /* also frees handle */
+           }
+        }
 	if (domain) {
 	    if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) {
 		*domain = '\0'; /* trim the default domain */
@@ -408,7 +466,7 @@
 		user = buf;
 	    }
 	}
-	else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) {
+	else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) {
 	    socklen_t salen;
 	    int error;
 	    struct sockaddr_storage localaddr;
diff -r 2ebe14b7db9d lib/imapoptions
--- a/lib/imapoptions	Mon Oct 27 18:47:12 2008 +0100
+++ b/lib/imapoptions	Mon Oct 27 18:48:18 2008 +0100
@@ -1114,7 +1114,7 @@
    mailbox hierarchy.  The default is to use the netnews separator
    character '.'. */
 
-{ "virtdomains", "off", ENUM("off", "userid", "on") }
+{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") }
 /* Enable virtual domain support.  If enabled, the user's domain will
    be determined by splitting a fully qualified userid at the last '@'
    or '%' symbol.  If the userid is unqualified, and the virtdomains

--- NEW FILE: KOLAB_cyrus-imapd-2.3.15_timsieved_starttls-sendcaps.patch ---
This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
(minus the CVS keywords)

It should be reverse-applied with patch -p2 -R to work around the kontact
behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
capabilities after starttls) and can be dropped as soon as kontact has a way
to work with old and new cyrus imapd servers.

diff -r 1688e25afb65 timsieved/parser.c
--- a/timsieved/parser.c	Thu Apr 23 23:28:07 2009 +0200
+++ b/timsieved/parser.c	Thu Apr 23 23:28:54 2009 +0200
@@ -908,8 +908,7 @@
 
     starttls_done = 1;
 
-    return capabilities(sieved_out, sieved_saslconn, starttls_done,
-			authenticated, sasl_ssf);
+    return result;
 }
 #else
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)

--- NEW FILE: series ---
KOLAB_Groups2.patch
KOLAB_Annotations2.patch
KOLAB_Logging.patch
KOLAB_Folder-names.patch
KOLAB_UID.patch
KOLAB_Cyradm_Annotations.patch
KOLAB_timsieved_starttls-sendcaps.patch




From cvs at kolab.org  Fri Dec  4 11:58:03 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 11:58:03 +0100 (CET)
Subject: gunnar: server/imapd imapd.patch, 1.2, 1.3 Makefile, 1.44,
	1.45 kolab.patch, 1.41, 1.42 
Message-ID: <20091204105803.B66C660057F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile kolab.patch 
Added Files:
	imapd.patch 
Log Message:
Update to cyrus-imapd-2.3.15 and merge bug fix for  kolab/issue3838 (no logging for pop3).

Remarks:

 OpenPKG did not update cyrus imapd in a while. Maybe it is still considered unstable or maybe they did not have the man power to maintain the package.
 In order to update now I had to add the imapd.patch from 2.3.14 that they provide (we could also offer the cyrus-imapd-2.3.14 src RPM from the
 Kolab download site instead). In case the versions available from OpenPKG lag behind even more we might consider pulling in the complete source from
 there.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile	9 Jul 2009 15:31:59 -0000	1.44
+++ Makefile	4 Dec 2009 10:58:01 -0000	1.45
@@ -1,9 +1,12 @@
 include ../Base.mk
 
 PACKAGE=imapd
-VERSION=2.3.13
+DOWNLOAD_VERSION=2.3.13
+VERSION=2.3.15
 RELEASE=20081020
-KOLABRELEASE=20081020_kolab2
+KOLABRELEASE=20081020_kolab5
+
+SOURCE_0=ftp://ftp.andrew.cmu.edu/pub/cyrus/cyrus-imapd-2.3.15.tar.gz
 
 PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
 	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
@@ -12,21 +15,23 @@
 	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
 	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
 	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch \
-	kolab.patch
+	kolab.patch \
+	imapd.patch
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
+	$(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget $(SOURCE_0)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm .
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm:
+	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kolab.patch	23 Apr 2009 21:43:17 -0000	1.41
+++ kolab.patch	4 Dec 2009 10:58:01 -0000	1.42
@@ -3,9 +3,10 @@
 @@ -32,7 +32,7 @@
  Group:        Mail
  License:      BSD
- Version:      2.3.13
+-Version:      2.3.13
 -Release:      20081020
-+Release:      20081020_kolab2
++Version:      2.3.15
++Release:      20081020_kolab5
  
  #   package options
  %option       with_fsl           yes
@@ -93,3 +94,14 @@
          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
+@@ -14,7 +14,7 @@
+     }
+ };
+ 
+-ident (pop3.)/.+ q{
++ident (pop3d|pop3s|pop3)/.+ q{
+     prefix(
+         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+     )



From cvs at kolab.org  Fri Dec  4 12:09:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 12:09:40 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.69,1.70 Makefile.PL,1.16,1.17 
Message-ID: <20091204110940.956A8600561@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Makefile.PL 
Log Message:
kolab/issue3952 (Version in kolabconf is not replaced in the build process)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- ChangeLog	24 Nov 2009 18:44:58 -0000	1.69
+++ ChangeLog	4 Dec 2009 11:09:38 -0000	1.70
@@ -1,3 +1,8 @@
+2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
+
+	* Makefile.PL: kolab/issue3952 (Version in kolabconf is not
+	replaced in the build process)
+
 2009-11-24 Richard Bos <richard at radoeka.nl>
 
 	* sbin/kolabconf.in, lib/Kolab/Conf.pm: renamed variable do_reload

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.PL	16 Apr 2009 08:57:13 -0000	1.16
+++ Makefile.PL	4 Dec 2009 11:09:38 -0000	1.17
@@ -135,11 +135,6 @@
 	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(HOME:/%=%)
 endif
 
-PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
-VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
-RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
-SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
-
 clean_tardist:
 	rm -rf *.tar.gz
 



From cvs at kolab.org  Fri Dec  4 12:10:01 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 12:10:01 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.468,1.469 
Message-ID: <20091204111001.AEF07600561@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Update release-notes for kolab/issue3952 (Version in kolabconf is not replaced in the build process) and kolab/issue3838 (no logging for pop3)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -d -r1.468 -r1.469
--- release-notes.txt	2 Dec 2009 18:10:31 -0000	1.468
+++ release-notes.txt	4 Dec 2009 11:09:59 -0000	1.469
@@ -144,6 +144,12 @@
 Changes between 2.2.2 and 2.2.3:
 (TODOs might need to be merged from kolab_2_2_branch!)
 
+    - imapd-2.3.13-20081020_kolab3
+
+TODO:	Fix buffer size calculations for sieve actions_string (CVE-2009-2632)
+
+	kolab/issue3838 (no logging for pop3)
+
       - kolabd-2.2.3-2009????
   
 	kolab/issue919  (kolab server has problems with some characters in
@@ -194,6 +200,8 @@
 	                 passwords)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
+	kolab/issue3952 (Version in kolabconf is not replaced in the build
+	                 process)
 
 
     Packages in the OpenPKG based Kolab server release:



From cvs at kolab.org  Fri Dec  4 12:23:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 12:23:21 +0100 (CET)
Subject: gunnar: server/perl-kolab MANIFEST,1.9,1.10 Makefile.PL,1.17,1.18 
Message-ID: <20091204112321.CE25D60057F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	MANIFEST Makefile.PL 
Log Message:
Complete  kolab/issue3952 (Version in kolabconf is not replaced in the build process)

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MANIFEST	16 Mar 2009 17:17:34 -0000	1.9
+++ MANIFEST	4 Dec 2009 11:23:19 -0000	1.10
@@ -1,4 +1,5 @@
 AUTHORS
+Base.mk
 ChangeLog
 INSTALL
 bin/kolabdcachetool.in

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.PL	4 Dec 2009 11:09:38 -0000	1.17
+++ Makefile.PL	4 Dec 2009 11:23:19 -0000	1.18
@@ -4,6 +4,7 @@
 
 use ExtUtils::MakeMaker;
 use Getopt::Long;
+use File::Copy;
 
 my $HELP = 0;
 my $CONFIG = '/kolab/etc/kolab';
@@ -95,12 +96,24 @@
 }
 
 sub MY::postamble {
-    
-    my $add = "bin/%: bin/%.in
+    if (-e "../Base.mk")
+    {
+        copy("../Base.mk", "./") or die "Could not copy ../Base.mk";
+    }
+    my $add = "include Base.mk
+
+PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
+VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
+RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
+SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
+
+bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 sbin/%: sbin/%.in
-	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@.tmp
+	cat \$@.tmp | sed -e 's#\@VERSION@#\$(VERSION)#g' > \$@
+	rm \$@.tmp
 	\$(FIXIN) \$@
 
 SBIN_TARGETS=sbin/kolabconf sbin/kolab_bootstrap sbin/kolab_imappartitions sbin/kolabd sbin/kolabcheckperm



From cvs at kolab.org  Fri Dec  4 13:37:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 13:37:52 +0100 (CET)
Subject: gunnar: server TODO,NONE,1.1.2.1 
Message-ID: <20091204123752.49B0B60057F@lists.intevation.de>

Author: gunnar

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

Added Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Add our TODO list to CVS

--- NEW FILE: TODO ---
Kolab Server 2.2.3 TODO list
============================

Thomas (thomas):

    - small effort:

	switch imapd databases back from berkeley to skiplist
	    (skiplist has proven to cause less performance and stability issues)
	kolab/issue3513 (Clamav - new upstream version 0.95.3)
	    (needs cleanup: release-notes, Makefile)
	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
	    (updated OpenPKG package available)
	kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP)
	    (workaround exists, needs real fix)

    - larger effort:

	(no public issue) Option to restrict MDNs to local server
	    (new feature, but requested by customer)
	kolab/issue3138 (problems with server upgrade from sarge to etch)
	    (we have done this a couple of times from sarge or etch to lenny now)

Gunnar (wrobel):

    - small effort:

	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
	    (probably just adjust ACLs)

    - larger effort:

	kolab/issue919  (kolab server has problems with some characters in passwords)
	kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)
	    (new feature, but requested by customers)
	kolab/issue3751 (Empty page in Firefox instead of login screen)
	    (caused by a broken event or contact, needs further investigation)
	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
	    (rbos provided a patch)

Sascha (wilde):

	DONE

Additional targets that might be done:

	kolab/issue2991 (The Kolab web client is always in the privileged networks)
	kolab/issue2919 (domain maintainer can't edit quota of his users)
	kolab/issue3445 (web client does not work with Konqueror)
	kolab/issue3567 (Migrate Horde prefs 2.2.0 -> 2.2.1, 2.2.2)
	    (requested by many people, though not customers)
	improve build process:
	    - Makefile target for 2.2.2 -> 2.2.3
	    - SHA1 checksums for things downloaded during build process

Some of the issues that need testing are:

	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)
	kolab/issue3846 (fix recurring events that are counted per week and not per incident)
	kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user)
	kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)
	    (small change, big benefit)
	kolab/issue3838 (no logging for pop3)
	    (small change in imapd package required)

Link for all server and web client issues on testing:

	https://issues.kolab.org/issue?:columns=title,id,keyword&:group=priority&:filter=keyword,status&status=6&keyword=1,19




From cvs at kolab.org  Fri Dec  4 14:31:32 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 14:31:32 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.84,1.398.2.85 
Message-ID: <20091204133132.0B431600581@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
WS

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.84
retrieving revision 1.398.2.85
diff -u -d -r1.398.2.84 -r1.398.2.85
--- release-notes.txt	4 Dec 2009 09:00:49 -0000	1.398.2.84
+++ release-notes.txt	4 Dec 2009 13:31:29 -0000	1.398.2.85
@@ -153,8 +153,8 @@
 
     - perl-kolab-2.2.3-2009????
 
-	kolab/issue919 (kolab server has problems with some characters in
-	                passwords)
+	kolab/issue919  (kolab server has problems with some characters in
+	                 passwords)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build



From cvs at kolab.org  Fri Dec  4 14:44:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 14:44:46 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.469,1.470 
Message-ID: <20091204134446.3FD8D600584@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Sync release-notes.txt with kolab_2_2_branch, marking the merge TODOs.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -d -r1.469 -r1.470
--- release-notes.txt	4 Dec 2009 11:09:59 -0000	1.469
+++ release-notes.txt	4 Dec 2009 13:44:44 -0000	1.470
@@ -144,16 +144,25 @@
 Changes between 2.2.2 and 2.2.3:
 (TODOs might need to be merged from kolab_2_2_branch!)
 
+    - clamav-0.95.3-20091030
+
+TODO:	kolab/issue3513 (Clamav - new upstream version 0.95.3)
+
+    - db-4.5.20.2-20070628_kolab1
+
+TODO:	kolab/issue2982 (OpenLDAP segmentation fault on 64bit)
+
     - imapd-2.3.13-20081020_kolab3
 
 TODO:	Fix buffer size calculations for sieve actions_string (CVE-2009-2632)
 
 	kolab/issue3838 (no logging for pop3)
 
-      - kolabd-2.2.3-2009????
-  
+    - kolabd-2.2.3-2009????
+
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
+TODO:	kolab/issue973  (Rewritten from shown inconveniently in kontact)
 	kolab/issue1880 (Poor handling of apostrophes in ldap and admin
 	                 webpages)
 TODO:	kolab/issue2499 (Notification messages by the resource manager
@@ -169,12 +178,14 @@
 
     - kolab-webadmin-2.2.3-2009????
 
-	kolab/issue3401 Change font color of the kolab-webadmin
-	kolab/issue3428 Present the checkbox in the "accept internet email"
-			nicer
+	kolab/issue3401 (Change font color of the kolab-webadmin)
+	kolab/issue3428 (Present the checkbox in the "accept internet email"
+			 nicer)
+TODO:	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
     - Kolab_Filter-0.1.4-2009????
 
+TODO:	kolab/issue973  (Rewritten from shown inconveniently in kontact)
 	kolab/issue2495 (The reply to an invitation with umlauts of a
 	                 group account doesn't display the umlauts.)
 	kolab/issue2499 (Notification messages by the resource manager
@@ -183,16 +194,62 @@
 	kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers)
 	kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code
 	                 into From: header)
+TODO:	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
+	                 Filter does not report lmtp error)
 	kolab/issue3610 (Mail to unknown at something.example.com gets
 	                 accepted and yields kolabmailboxfilter exit 38)
 	kolab/issue3868 (Resmgr eats up all memory and dies on some
 	                 recuring events)
+TODO:	kolab/issue3965 (Always accept: invitations get lost when
+	                 Calendar folder ist not writable for the
+	                 calendar user)
 
     - kolab-webclient-1.2.0-20090514
 
+TODO:	SECURITY: Fixed image upload form issue.
+
+TODO:	A proxy user can now be defined in the
+	webclient-kolab-conf.template which allows anonymous read only
+	access to all the users calendars.
+
+TODO:	The proxy users calender-events can be integrated into third
+	party sites using the new client/kronolith/imple_kolab.php
+	feature.
+
+TODO:	Calendars accessible for the proxy user can be anonymously
+	downloaded as ics files.
+
+TODO:	kolab/issue3237 (Double Sync with SyncML when using external
+	                 client)
+TODO:	kolab/issue3238 (Double Entries with SyncML when the folder uid
+	                 validity changes)
 	kolab/issue3509 (calender not displaying in horde if german
 	                 holidays are selected)
 	kolab/issue3555 (unable to save filter settings more than once)
+TODO:	kolab/issue3567 (Migrate Horde prefs 2.2.0 -> 2.2.1, 2.2.2)
+TODO:	kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error
+	                 compareDateTime())
+TODO:	kolab/issue3768 (Kolab server 2.2.2 resmgr doesn't copy attendee
+	                 status (rt#5801))
+TODO:	kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event
+	                 attendee status values)
+TODO:	kolab/issue3844 (New user preference to specify order of date
+	                 input fields)
+TODO:	kolab/issue3846 (fix recurring events that are counted per week
+	                 and not per incident)
+TODO:	kolab/issue3856 (IMP/DIMP folder navigator does not allow
+                         creating/deleting/... mail folders)
+TODO:	kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch
+	                 update needed)
+TODO:	kolab/issue3892 (Patch enabling SyncML support for the SE P1i
+	                 mobile phone)
+TODO:	kolab/issue3894 (kronolith writes recurrent event data
+	                 non-conformant to vCal (1.0) standard)
+
+    - openpkg-20071227-20071227_kolab2
+
+TODO:	Fixed cflags for amd64 systems.  Related to:
+	kolab/issue2982 (OpenLDAP segmentation fault on 64bit)
 
     - perl-kolab-2.2.3-2009????
 
@@ -227,7 +284,7 @@
 	                 kolabfilter-verify-from-header)
 
 
-    - Kolab_Filter-0.1.4-20090417
+    - Kolab_Filter-0.1.4-20090504
 
 	kolab/issue3521 (kolabmailboxfilter does not accept mail for
 	                 user+extension at example.com)
@@ -240,6 +297,16 @@
 	kolab/issue3570 (Viewing external addresses fails to display phone
 	                 numbers and some other values)
 
+    - kolab-webclient-1.2.0-20090514
+
+TODO:	kolab/issue3329 (Can not accept/deny invitations in Dimp)
+TODO:	kolab/issue3420 (web client prefs and hooks should be
+	                 configurable via templates)
+TODO:	kolab/issue3455 (There is no convenient/dimp-like way in dimp
+	                 to set folder acls)
+TODO:	kolab/issue3456 (There is no view in dimp that allows folder
+	                 subscription)
+
 
     Packages in the OpenPKG based Kolab server release:
 
@@ -389,7 +456,6 @@
 
 
 Changes between 2.2.1-rc-1 and 2.2.1:
-(TODOs might need to be merged from kolab_2_2_branch!)
 
     - clamav-0.95-20090323
 



From cvs at kolab.org  Fri Dec  4 14:45:02 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 14:45:02 +0100 (CET)
Subject: gunnar: server TODO,1.1,1.2 
Message-ID: <20091204134502.E3AEC600584@lists.intevation.de>

Author: gunnar

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

Added Files:
	TODO 
Log Message:
Add stub TODO for HEAD




From cvs at kolab.org  Fri Dec  4 14:55:18 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 14:55:18 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.5,1.56.2.6 
Message-ID: <20091204135518.4F040600561@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
Apparently forgot the ChangeLog entry for kolab/issue3472 in the branch.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.5
retrieving revision 1.56.2.6
diff -u -d -r1.56.2.5 -r1.56.2.6
--- ChangeLog	24 Nov 2009 18:57:08 -0000	1.56.2.5
+++ ChangeLog	4 Dec 2009 13:55:16 -0000	1.56.2.6
@@ -18,6 +18,10 @@
 	causes OpenLDAP restarts)
 	* lib/Kolab.pm: bump version number
 
+2009-04-16  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP.pm (deleteObject): Workaround for kolab/issue3472.
+
 2009-03-16  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* lib/Kolab/LDAP.pm: Creating the Calendar folder caused an



From cvs at kolab.org  Fri Dec  4 15:00:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 15:00:52 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.470,1.471 
Message-ID: <20091204140052.4C7C7600585@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Thomas worked on kolab/issue1679 (Update template META mechanism to support service  restarts) in HEAD

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -d -r1.470 -r1.471
--- release-notes.txt	4 Dec 2009 13:44:44 -0000	1.470
+++ release-notes.txt	4 Dec 2009 14:00:50 -0000	1.471
@@ -127,6 +127,8 @@
 
 	Execute duplicate RUNONCHANGE commands only once.
 
+	kolab/issue1679 (Update template META mechanism to support service
+	                 restarts)
 	kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE
 			 is used)
 



From cvs at kolab.org  Fri Dec  4 15:03:01 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 15:03:01 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.471,1.472 
Message-ID: <20091204140301.8AEE0600585@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Richard worked on kolab/issue3604 (Change LDAPD in kolab_bootstrap to just openldap) in HEAD

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -d -r1.471 -r1.472
--- release-notes.txt	4 Dec 2009 14:00:50 -0000	1.471
+++ release-notes.txt	4 Dec 2009 14:02:59 -0000	1.472
@@ -129,6 +129,7 @@
 
 	kolab/issue1679 (Update template META mechanism to support service
 	                 restarts)
+	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  Fri Dec  4 15:06:17 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 15:06:17 +0100 (CET)
Subject: gunnar: server/perl-kolab .cvsignore,1.2,1.3 
Message-ID: <20091204140617.095D5600583@lists.intevation.de>

Author: gunnar

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

Modified Files:
	.cvsignore 
Log Message:
Add Base.mk to the files being ignored.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/perl-kolab/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	1 Aug 2007 14:57:41 -0000	1.2
+++ .cvsignore	4 Dec 2009 14:06:15 -0000	1.3
@@ -3,3 +3,4 @@
 blib
 pm_to_blib
 *.src.rpm
+Base.mk
\ No newline at end of file



From cvs at kolab.org  Fri Dec  4 15:06:43 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 15:06:43 +0100 (CET)
Subject: gunnar: server/perl-kolab Makefile.PL,1.18,1.19 
Message-ID: <20091204140643.082A5600583@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile.PL 
Log Message:
Not required when using Base.mk

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.PL	4 Dec 2009 11:23:19 -0000	1.18
+++ Makefile.PL	4 Dec 2009 14:06:40 -0000	1.19
@@ -131,19 +131,6 @@
 	  cp \$\$ETC \$(DESTDIR)/$INSTALLETC;        \\
 	done
 
-ifeq \"x\$(RPM)\" \"x\"
-  RPM = \$(HOME)/bin/openpkg rpm
-endif
-ifeq \"x\$(KOLABRPMSRC)\" \"x\"
-  KOLABRPMSRC = \$(HOME)/RPM/SRC
-endif
-ifeq \"x\$(KOLABRPMPKG)\" \"x\"
-  KOLABRPMPKG = \$(HOME)/RPM/PKG
-endif
-ifeq \"x\$(KOLABRPMTMP)\" \"x\"
-  KOLABRPMTMP = \$(HOME)/RPM/TMP
-endif
-
 ifeq \"x\$(PLATTAG)\" \"x\"
 	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(HOME:/%=%)
 endif



From cvs at kolab.org  Fri Dec  4 15:29:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 15:29:57 +0100 (CET)
Subject: gunnar: server TODO,1.1.2.1,1.1.2.2 
Message-ID: <20091204142957.EC939600584@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Give kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
 and kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used) back to Thomas as he probably will me much quicker than me with these.

Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- TODO	4 Dec 2009 12:37:50 -0000	1.1.2.1
+++ TODO	4 Dec 2009 14:29:55 -0000	1.1.2.2
@@ -7,10 +7,14 @@
 
 	switch imapd databases back from berkeley to skiplist
 	    (skiplist has proven to cause less performance and stability issues)
+	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
+	    (probably just adjust ACLs)
 	kolab/issue3513 (Clamav - new upstream version 0.95.3)
 	    (needs cleanup: release-notes, Makefile)
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
 	    (updated OpenPKG package available)
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
+	    (rbos provided a patch)
 	kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP)
 	    (workaround exists, needs real fix)
 
@@ -25,9 +29,6 @@
 
     - small effort:
 
-	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
-	    (probably just adjust ACLs)
-
     - larger effort:
 
 	kolab/issue919  (kolab server has problems with some characters in passwords)
@@ -35,8 +36,6 @@
 	    (new feature, but requested by customers)
 	kolab/issue3751 (Empty page in Firefox instead of login screen)
 	    (caused by a broken event or contact, needs further investigation)
-	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
-	    (rbos provided a patch)
 
 Sascha (wilde):
 



From cvs at kolab.org  Fri Dec  4 16:38:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 16:38:24 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.6,1.56.2.7 
Message-ID: <20091204153824.20162600584@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) - A first stub for the policy daemon.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.6
retrieving revision 1.56.2.7
diff -u -d -r1.56.2.6 -r1.56.2.7
--- ChangeLog	4 Dec 2009 13:55:16 -0000	1.56.2.6
+++ ChangeLog	4 Dec 2009 15:38:22 -0000	1.56.2.7
@@ -1,3 +1,11 @@
+2009-12-04  Gunnar Wrobel <wrobel at pardus.de>
+
+	* bin/kolab_smtpdpolicy.in (check_restricted_sender):
+	kolab/issue1340 (RFC: restrict users to sending mail only to
+	internal recipients)
+
+	Only the first stub yet that takes no action.
+
 2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
 
 	* Makefile.PL: kolab/issue3952 (Version in kolabconf is not



From cvs at kolab.org  Fri Dec  4 16:38:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 16:38:24 +0100 (CET)
Subject: gunnar: server/perl-kolab/bin kolab_smtpdpolicy.in,1.2,1.2.2.1 
Message-ID: <20091204153824.33994600584@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab_smtpdpolicy.in 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) - A first stub for the policy daemon.

Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolab_smtpdpolicy.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- kolab_smtpdpolicy.in	20 Jan 2009 17:22:12 -0000	1.2
+++ kolab_smtpdpolicy.in	4 Dec 2009 15:38:22 -0000	1.2.2.1
@@ -281,6 +281,40 @@
   return 1;
 }
 
+sub check_restricted_sender {
+  my $username = shift;
+  my $recipient = shift;
+  my $tries = 0;
+ AGAIN:
+  my $mesg = $ldap->search( base=> $conf_basedn,
+			    scope=> 'sub',
+			    filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$sender)(alias=$sender)))",
+			    attrs => [ 'kolabAllowSMTPRecipient' ]);
+  if( !$mesg->code && $mesg->count() > 0 ) {
+    mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
+    foreach my $entry ( $mesg->entries ) {
+      mylog($syslog_priority, lc($entry->get_value('uid')." is the uid of ".$sender)) if $verbose;
+      my $allowed_recipient;
+      for $allowed_recipient ($entry->get_value('kolabAllowSMTPRecipient')) {
+
+	  # TODO
+
+      }
+      # Allow sending if there was no entry or no entry rejcted
+      return 1;
+    }
+    } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
+      mylog($syslog_priority, "LDAP Connection error during CHECKRESTRICTEDSENDER: ".$mesg->error.", trying to reconnect" );
+      ldap_connect;
+      goto AGAIN;
+    } elsif( $mesg->code ) {
+      mylog( $syslog_priority, "LDAP Error during CHECKRESTRICTEDSENDER: ".$mesg->error ) if $verbose;
+      # Just fall through and accept the message in case there was an LDAP problem.
+    }
+  }
+  return 1;
+}
+
 #
 # SMTPD access policy routine. The result is an action just like
 # it would be specified on the right-hand side of a Postfix access
@@ -335,6 +369,9 @@
 
   # Check for valid access to restricted distribution lists
   return "REJECT Access denied" unless check_dist_list($username, $recipient);
+
+  # Check for valid access from a restricted sender
+  return "REJECT Recipient denied" unless check_restricted_sender($username, $recipient);
 
   # The result can be any action that is allowed in a Postfix access(5) map.
   #



From cvs at kolab.org  Fri Dec  4 17:33:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 17:33:54 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.7,1.56.2.8 
Message-ID: <20091204163354.CF14F600584@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) - Doh, shouldn't test this with the webclient as it is always in the permit hosts. This next step reacts toward a single - which denies all recipients.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.7
retrieving revision 1.56.2.8
diff -u -d -r1.56.2.7 -r1.56.2.8
--- ChangeLog	4 Dec 2009 15:38:22 -0000	1.56.2.7
+++ ChangeLog	4 Dec 2009 16:33:52 -0000	1.56.2.8
@@ -4,7 +4,8 @@
 	kolab/issue1340 (RFC: restrict users to sending mail only to
 	internal recipients)
 
-	Only the first stub yet that takes no action.
+	Only the first stub yeat reacts solely to "-" (Denying all
+	recipients).
 
 2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
 



From cvs at kolab.org  Fri Dec  4 17:33:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Dec 2009 17:33:54 +0100 (CET)
Subject: gunnar: server/perl-kolab/bin kolab_smtpdpolicy.in,1.2.2.1,1.2.2.2 
Message-ID: <20091204163354.DD8C3600585@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab_smtpdpolicy.in 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) - Doh, shouldn't test this with the webclient as it is always in the permit hosts. This next step reacts toward a single - which denies all recipients.

Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolab_smtpdpolicy.in,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- kolab_smtpdpolicy.in	4 Dec 2009 15:38:22 -0000	1.2.2.1
+++ kolab_smtpdpolicy.in	4 Dec 2009 16:33:52 -0000	1.2.2.2
@@ -288,29 +288,28 @@
  AGAIN:
   my $mesg = $ldap->search( base=> $conf_basedn,
 			    scope=> 'sub',
-			    filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$sender)(alias=$sender)))",
+			    filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$username)(uid=$username)))",
 			    attrs => [ 'kolabAllowSMTPRecipient' ]);
   if( !$mesg->code && $mesg->count() > 0 ) {
     mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
     foreach my $entry ( $mesg->entries ) {
-      mylog($syslog_priority, lc($entry->get_value('uid')." is the uid of ".$sender)) if $verbose;
       my $allowed_recipient;
       for $allowed_recipient ($entry->get_value('kolabAllowSMTPRecipient')) {
-
+          mylog($syslog_priority, lc($entry->get_value('uid')." has allowed recipient ".$allowed_recipient)) if $verbose;
+	  return undef if $allowed_recipient eq '-';
 	  # TODO
 
       }
-      # Allow sending if there was no entry or no entry rejcted
-      return 1;
-    }
-    } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
-      mylog($syslog_priority, "LDAP Connection error during CHECKRESTRICTEDSENDER: ".$mesg->error.", trying to reconnect" );
-      ldap_connect;
-      goto AGAIN;
-    } elsif( $mesg->code ) {
-      mylog( $syslog_priority, "LDAP Error during CHECKRESTRICTEDSENDER: ".$mesg->error ) if $verbose;
-      # Just fall through and accept the message in case there was an LDAP problem.
     }
+    # Allow sending if there was no entry or no entry rejcted
+    return 1;
+  } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
+    mylog($syslog_priority, "LDAP Connection error during CHECKRESTRICTEDSENDER: ".$mesg->error.", trying to reconnect" );
+    ldap_connect;
+    goto AGAIN;
+  } elsif( $mesg->code ) {
+    mylog( $syslog_priority, "LDAP Error during CHECKRESTRICTEDSENDER: ".$mesg->error ) if $verbose;
+    # Just fall through and accept the message in case there was an LDAP problem.
   }
   return 1;
 }
@@ -341,6 +340,9 @@
 
   eval{ $username = lookup_uid($username) }; return "DEFER_IF_PERMIT $@" if $@;
 
+  # Check for valid access from a restricted sender
+  return "REJECT Recipient denied" unless check_restricted_sender($username, $recipient);
+
   # See if sender is owned by someone
   my @uids;
   eval { @uids = lookup_sender_uids($sender) }; return "DEFER_IF_PERMIT $@" if $@;
@@ -369,9 +371,6 @@
 
   # Check for valid access to restricted distribution lists
   return "REJECT Access denied" unless check_dist_list($username, $recipient);
-
-  # Check for valid access from a restricted sender
-  return "REJECT Recipient denied" unless check_restricted_sender($username, $recipient);
 
   # The result can be any action that is allowed in a Postfix access(5) map.
   #



From cvs at kolab.org  Mon Dec  7 09:41:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 09:41:20 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.8,1.56.2.9 
Message-ID: <20091207084120.50701600575@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.8
retrieving revision 1.56.2.9
diff -u -d -r1.56.2.8 -r1.56.2.9
--- ChangeLog	4 Dec 2009 16:33:52 -0000	1.56.2.8
+++ ChangeLog	7 Dec 2009 08:41:17 -0000	1.56.2.9
@@ -1,3 +1,9 @@
+2009-12-07  root  <Gunnar Wrobel <wrobel at pardus.de>>
+
+	* bin/kolab_smtpdpolicy.in (check_restricted_sender): 
+	kolab/issue1340 (RFC: restrict users to sending mail only to
+	internal recipients)
+
 2009-12-04  Gunnar Wrobel <wrobel at pardus.de>
 
 	* bin/kolab_smtpdpolicy.in (check_restricted_sender):



From cvs at kolab.org  Mon Dec  7 09:41:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 09:41:20 +0100 (CET)
Subject: gunnar: server/perl-kolab/bin kolab_smtpdpolicy.in,1.2.2.2,1.2.2.3 
Message-ID: <20091207084120.5C721600576@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab_smtpdpolicy.in 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)

Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolab_smtpdpolicy.in,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- kolab_smtpdpolicy.in	4 Dec 2009 16:33:52 -0000	1.2.2.2
+++ kolab_smtpdpolicy.in	7 Dec 2009 08:41:18 -0000	1.2.2.3
@@ -292,17 +292,37 @@
 			    attrs => [ 'kolabAllowSMTPRecipient' ]);
   if( !$mesg->code && $mesg->count() > 0 ) {
     mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
+    my $global_permit = 1;
     foreach my $entry ( $mesg->entries ) {
       my $allowed_recipient;
+      my $permit;
       for $allowed_recipient ($entry->get_value('kolabAllowSMTPRecipient')) {
-          mylog($syslog_priority, lc($entry->get_value('uid')." has allowed recipient ".$allowed_recipient)) if $verbose;
+          mylog($syslog_priority, lc($username." has allowed recipient ".$allowed_recipient)) if $verbose;
+	  # Return early with REJECT if the sender may not send at all ('-')
 	  return undef if $allowed_recipient eq '-';
-	  # TODO
-
+	  # Check if the entry is a negation (leading '-')
+	  if ( $allowed_recipient =~ /^-(.*)/ ) {
+	      $permit = undef;
+	      $allowed_recipient = $1;
+	  } else {
+	      # Once there is a non-negating entry we need REJECT if no rule matched
+	      $global_permit = undef;
+	      $permit = 1;
+	  }
+	  if ( $allowed_recipient =~ /@/ ) {
+	      # If the entry contains '@' the leading segment must match
+	      return $permit if  $recipient =~ /^$allowed_recipient/;
+	  } elsif ( $allowed_recipient =~ /^\.(.*)/ ) {
+	      # If the entry starts with '.' the trailing domain must match
+	      return $permit if $recipient =~ /${1}$/;
+	  } else {
+	      # All other entries must match the last part of the mail address
+	      return $permit if $recipient =~ /\@${allowed_recipient}$/;
+	  }
       }
     }
-    # Allow sending if there was no entry or no entry rejcted
-    return 1;
+    # Allow sending if there was no entry or no negated entry rejected
+    return $global_permit;
   } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
     mylog($syslog_priority, "LDAP Connection error during CHECKRESTRICTEDSENDER: ".$mesg->error.", trying to reconnect" );
     ldap_connect;



From cvs at kolab.org  Mon Dec  7 10:14:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 10:14:49 +0100 (CET)
Subject: gunnar: server TODO,1.1.2.2,1.1.2.3 
Message-ID: <20091207091449.DB166600575@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Back to me as discussed on phone.

Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- TODO	4 Dec 2009 14:29:55 -0000	1.1.2.2
+++ TODO	7 Dec 2009 09:14:47 -0000	1.1.2.3
@@ -7,14 +7,10 @@
 
 	switch imapd databases back from berkeley to skiplist
 	    (skiplist has proven to cause less performance and stability issues)
-	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
-	    (probably just adjust ACLs)
 	kolab/issue3513 (Clamav - new upstream version 0.95.3)
 	    (needs cleanup: release-notes, Makefile)
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
 	    (updated OpenPKG package available)
-	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
-	    (rbos provided a patch)
 	kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP)
 	    (workaround exists, needs real fix)
 
@@ -28,6 +24,11 @@
 Gunnar (wrobel):
 
     - small effort:
+
+	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
+	    (probably just adjust ACLs)
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
+	    (rbos provided a patch)
 
     - larger effort:
 



From cvs at kolab.org  Mon Dec  7 14:17:04 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 14:17:04 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.9,
	1.110.2.10 
Message-ID: <20091207131704.2A310600560@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.110.2.9
retrieving revision 1.110.2.10
diff -u -d -r1.110.2.9 -r1.110.2.10
--- ChangeLog	3 Dec 2009 21:08:28 -0000	1.110.2.9
+++ ChangeLog	7 Dec 2009 13:17:02 -0000	1.110.2.10
@@ -1,3 +1,8 @@
+2009-12-07  root  <Gunnar Wrobel <wrobel at pardus.de>>
+
+	* www/admin/user/user.php.in: kolab/issue1340 (RFC: restrict users
+	to sending mail only to internal recipients)
+
 2009-12-03  Gunnar Wrobel  <p at rdus.de>
 
 	* php/admin/include/ldap.class.php.in: 



From cvs at kolab.org  Mon Dec  7 14:17:04 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 14:17:04 +0100 (CET)
Subject: gunnar: server TODO, 1.1.2.3, 1.1.2.4 release-notes.txt, 1.398.2.85,
	1.398.2.86 
Message-ID: <20091207131704.2C6B1600576@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO release-notes.txt 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)

Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- TODO	7 Dec 2009 09:14:47 -0000	1.1.2.3
+++ TODO	7 Dec 2009 13:17:01 -0000	1.1.2.4
@@ -33,8 +33,6 @@
     - larger effort:
 
 	kolab/issue919  (kolab server has problems with some characters in passwords)
-	kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)
-	    (new feature, but requested by customers)
 	kolab/issue3751 (Empty page in Firefox instead of login screen)
 	    (caused by a broken event or contact, needs further investigation)
 
@@ -55,6 +53,8 @@
 
 Some of the issues that need testing are:
 
+	kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)
+	    (new feature, but requested by customers)
 	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)
 	kolab/issue3846 (fix recurring events that are counted per week and not per incident)
 	kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.85
retrieving revision 1.398.2.86
diff -u -d -r1.398.2.85 -r1.398.2.86
--- release-notes.txt	4 Dec 2009 13:31:29 -0000	1.398.2.85
+++ release-notes.txt	7 Dec 2009 13:17:01 -0000	1.398.2.86
@@ -79,6 +79,8 @@
 
     - kolab-webadmin-2.2.3-2009????
 
+	kolab/issue1340 (RFC: restrict users to sending mail only to
+	                 internal recipients)
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
 			 nicer)
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)



From cvs at kolab.org  Mon Dec  7 14:17:04 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 14:17:04 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.28.2.2, 1.28.2.3 
Message-ID: <20091207131704.2B4BD600573@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	user.php.in 
Log Message:
 kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -d -r1.28.2.2 -r1.28.2.3
--- user.php.in	3 Dec 2009 20:34:31 -0000	1.28.2.2
+++ user.php.in	7 Dec 2009 13:17:02 -0000	1.28.2.3
@@ -148,6 +148,59 @@
   return '';
 }
 
+function checksmtprecipient ( $form, $key, $value ) {
+  $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
+  $str = '';
+  require_once 'Mail/RFC822.php';
+  foreach( $lst as $SMTPRecipient ) {
+    $trimmed = ltrim($SMTPRecipient, "-."); // potentially every entry is negated with a '-'
+    // $SMTPRecipient is either an 
+    // - email address
+    // - local part of an email address with an @ suffix
+    // - a domain part
+	if (valid_domain($SMTPRecipient)) {
+	  return '';
+	}
+	if (valid_local_part($SMTPRecipient)) {
+      return sprintf(_("Syntax for Recipient %s is invalid"), $SMTPRecipient);
+    }
+    $result = valid_email_address($SMTPRecipient);
+	if (is_a($result, 'PEAR_Error')) {
+	  return $result->getMessage();
+	} else {
+	  return '';
+	}
+  }
+  return '';
+}
+
+
+function valid_email_address($address) {
+// the following addresses are invalid
+// email1.. at kolab.org
+// email1.- at kolab.org
+// email1._ at kolab.org
+// email1 at 2sub.kolab.org
+// email1 at sub.sub.2sub.kolab.org
+  $check = new Mail_RFC822($address);
+  return $check->parseAddressList(null, null, null, true);
+}
+
+function valid_domain($domain) {
+// the following subdomains are invalid
+// 2sub.kolab.org
+// sub.sub.2sub.kolab.org
+  $check = new Mail_RFC822();
+  return $check->_validateDomain($domain);
+}
+
+function valid_local_part($local_part) {
+  // the local part always has an @ appended
+  $local_part = rtrim($local_part, '@'); 
+  $check = new Mail_RFC822();
+  return $check->_validateLocalPart($local_part);
+}
+
 // Check uid/gid used in invitation policy
 // We're pretty relaxed about what is entered 
 // here and only check some basic syntax
@@ -302,6 +355,15 @@
   else $v = "";
   if(array_key_exists('kolabdelegate',$form->entries)) $form->entries['kolabdelegate']['value'] = $v;
 
+  // kolabAllowSMTPRecipient
+  if (is_array($ldap_object['kolabAllowSMTPRecipient'])) {
+	$arr = $ldap_object['kolabAllowSMTPRecipient'];
+	unset( $arr['count'] );
+	$v = join("\n", $arr );
+  }
+  else $v = "";
+  if(array_key_exists('kolabAllowSMTPRecipient',$form->entries)) $form->entries['kolabAllowSMTPRecipient']['value'] = $v;
+
   // kolabhomeserver
   if(array_key_exists('kolabhomeserver',$form->entries)) {
 	  if( is_array($ldap_object['kolabHomeServer']) ) {
@@ -430,6 +492,12 @@
 		'comment' => _('Others allowed to send emails with a "from" address of this account.') . '<br/>' .
 			_('One email address per line.') );
 
+$entries['kolabAllowSMTPRecipient'] =array( 'name' => _('Allowed Recipients'),
+                'type' => 'textarea',
+                'validation' => 'checksmtprecipient',
+                'comment' => _('Restrict allowed recipients of SMTP messages') . '<br/>' .
+                        _('One entry per line.') );
+ 
 $entries['title_0'] = array( 'name' => _('Title') );
 $entries['o_0'] = array( 'name' => _('Organisation') );
 $entries['ou_0'] = array( 'name' => _('Organisational Unit') );
@@ -552,6 +620,11 @@
 	   $ldap_object['kolabDelegate'] = array_unique( array_filter( array_map( 'trim', 
 												preg_split( '/\n/', $_POST['kolabdelegate'] ) ), 'strlen') );
 	   if( !$ldap_object['kolabDelegate'] && $action == 'firstsave' ) unset($ldap_object['kolabDelegate']);
+
+	   // kolabAllowSMTPRecipient
+	   $ldap_object['kolabAllowSMTPRecipient'] = array_unique( array_filter( array_map( 'trim', 
+												preg_split( '/\n/', $_POST['kolabAllowSMTPRecipient'] ) ), 'strlen') );
+	   if( !$ldap_object['kolabAllowSMTPRecipient'] && $action == 'firstsave' ) unset($ldap_object['kolabAllowSMTPRecipient']);
 
 
        if ($auth->group() == "maintainer" || $auth->group() == "admin") {



From cvs at kolab.org  Mon Dec  7 14:59:05 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 14:59:05 +0100 (CET)
Subject: gunnar: server TODO,1.1.2.4,1.1.2.5 
Message-ID: <20091207135905.D01C0600560@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Leave 3751 with Thomas as I don't have a good idea yet

Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- TODO	7 Dec 2009 13:17:01 -0000	1.1.2.4
+++ TODO	7 Dec 2009 13:59:03 -0000	1.1.2.5
@@ -20,6 +20,8 @@
 	    (new feature, but requested by customer)
 	kolab/issue3138 (problems with server upgrade from sarge to etch)
 	    (we have done this a couple of times from sarge or etch to lenny now)
+	kolab/issue3751 (Empty page in Firefox instead of login screen)
+	    (caused by a broken event or contact, needs further investigation)
 
 Gunnar (wrobel):
 
@@ -33,8 +35,6 @@
     - larger effort:
 
 	kolab/issue919  (kolab server has problems with some characters in passwords)
-	kolab/issue3751 (Empty page in Firefox instead of login screen)
-	    (caused by a broken event or contact, needs further investigation)
 
 Sascha (wilde):
 



From cvs at kolab.org  Mon Dec  7 15:04:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 15:04:26 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.9,1.56.2.10 
Message-ID: <20091207140426.B89DA600560@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.9
retrieving revision 1.56.2.10
diff -u -d -r1.56.2.9 -r1.56.2.10
--- ChangeLog	7 Dec 2009 08:41:17 -0000	1.56.2.9
+++ ChangeLog	7 Dec 2009 14:04:24 -0000	1.56.2.10
@@ -1,5 +1,8 @@
 2009-12-07  root  <Gunnar Wrobel <wrobel at pardus.de>>
 
+	* lib/Kolab/LDAP.pm (createObject): kolab/issue1448 (Users might
+	add an account on the nonHome Server and write emails in there.)
+
 	* bin/kolab_smtpdpolicy.in (check_restricted_sender): 
 	kolab/issue1340 (RFC: restrict users to sending mail only to
 	internal recipients)



From cvs at kolab.org  Mon Dec  7 15:04:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 15:04:26 +0100 (CET)
Subject: gunnar: server/perl-kolab/lib/Kolab LDAP.pm,1.11.2.2,1.11.2.3 
Message-ID: <20091207140426.BD49E600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv19688/perl-kolab/lib/Kolab

Modified Files:
      Tag: kolab_2_2_branch
	LDAP.pm 
Log Message:
 kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- LDAP.pm	20 Mar 2009 10:22:10 -0000	1.11.2.2
+++ LDAP.pm	7 Dec 2009 14:04:24 -0000	1.11.2.3
@@ -537,7 +537,7 @@
             }
             if( $p ne 'sf' && !$islocal ) {
                 # Hide user mailboxes on other servers
-                Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rswipcda"]);
+                Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rs"]);
             } elsif( $p ne 'sf' ) {
                 # Deal with group and resource accounts
                 my $edn = Net::LDAP::Util::ldap_explode_dn($object->dn(), casefold=>'lower' );



From cvs at kolab.org  Mon Dec  7 15:04:26 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 15:04:26 +0100 (CET)
Subject: gunnar: server TODO, 1.1.2.5, 1.1.2.6 release-notes.txt, 1.398.2.86,
	1.398.2.87 
Message-ID: <20091207140426.BE4BB600576@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO release-notes.txt 
Log Message:
 kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)

Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- TODO	7 Dec 2009 13:59:03 -0000	1.1.2.5
+++ TODO	7 Dec 2009 14:04:24 -0000	1.1.2.6
@@ -27,8 +27,6 @@
 
     - small effort:
 
-	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
-	    (probably just adjust ACLs)
 	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
 	    (rbos provided a patch)
 
@@ -55,6 +53,8 @@
 
 	kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)
 	    (new feature, but requested by customers)
+	kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)
+	    (probably just adjust ACLs)
 	kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error)
 	kolab/issue3846 (fix recurring events that are counted per week and not per incident)
 	kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.86
retrieving revision 1.398.2.87
diff -u -d -r1.398.2.86 -r1.398.2.87
--- release-notes.txt	7 Dec 2009 13:17:01 -0000	1.398.2.86
+++ release-notes.txt	7 Dec 2009 14:04:24 -0000	1.398.2.87
@@ -157,6 +157,8 @@
 
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
+	kolab/issue1448 (Users might add an account on the nonHome Server
+	                 and write emails in there.)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build



From cvs at kolab.org  Mon Dec  7 16:17:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 16:17:21 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.87,1.398.2.88 
Message-ID: <20091207151721.D3872600573@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
MFH:  kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE is used)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.87
retrieving revision 1.398.2.88
diff -u -d -r1.398.2.87 -r1.398.2.88
--- release-notes.txt	7 Dec 2009 14:04:24 -0000	1.398.2.87
+++ release-notes.txt	7 Dec 2009 15:17:19 -0000	1.398.2.88
@@ -161,6 +161,8 @@
 	                 and write emails in there.)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if
+	                 RUNONCHANGE is used)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build
 	                 process)
 



From cvs at kolab.org  Mon Dec  7 16:17:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 16:17:21 +0100 (CET)
Subject: gunnar: server/perl-kolab/lib/Kolab Conf.pm,1.4,1.4.2.1 
Message-ID: <20091207151721.D5869600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv22801/perl-kolab/lib/Kolab

Modified Files:
      Tag: kolab_2_2_branch
	Conf.pm 
Log Message:
MFH:  kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE is used)

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Conf.pm	4 Mar 2009 11:51:36 -0000	1.4
+++ Conf.pm	7 Dec 2009 15:17:19 -0000	1.4.2.1
@@ -774,6 +774,18 @@
 	{
 	    Kolab::log('T', 'Actioning RUNONCHANGE for '.$key, KOLAB_DEBUG );
 	    my $cmd = $runonchange{$key};
+	    # $cmd can contain:
+	    # - /usr/sbin/postmap: should always be executed
+	    # - openpkg rc imapd restart (in openpkg distribution)
+	    # - kolabsrv rc post reload  (in other distributions)
+	    # The commands with ' rc ' may only be executed when reloading is not
+	    # prohibited by the user with the "-n" option.
+	    if ($Kolab::do_reload || $cmd !~ / rc \S+ re(start|load)/) {
+		Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
+		system($cmd);
+	    } else {
+		Kolab::log('T', 'Reload not allowed, not executing command: '.$cmd, KOLAB_DEBUG );
+	    }
 	    system($cmd);
 	    Kolab::log('T', 'Executing command', KOLAB_DEBUG );
 	}



From cvs at kolab.org  Mon Dec  7 16:17:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 16:17:21 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.10,1.56.2.11 
Message-ID: <20091207151721.D4214600574@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
MFH:  kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE is used)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.10
retrieving revision 1.56.2.11
diff -u -d -r1.56.2.10 -r1.56.2.11
--- ChangeLog	7 Dec 2009 14:04:24 -0000	1.56.2.10
+++ ChangeLog	7 Dec 2009 15:17:19 -0000	1.56.2.11
@@ -1,4 +1,4 @@
-2009-12-07  root  <Gunnar Wrobel <wrobel at pardus.de>>
+2009-12-07  Gunnar Wrobel <wrobel at pardus.de>
 
 	* lib/Kolab/LDAP.pm (createObject): kolab/issue1448 (Users might
 	add an account on the nonHome Server and write emails in there.)
@@ -20,6 +20,13 @@
 
 	* Makefile.PL: kolab/issue3952 (Version in kolabconf is not
 	replaced in the build process)
+
+2009-11-24 Richard Bos <richard at radoeka.nl>
+
+	* sbin/kolabconf.in, lib/Kolab/Conf.pm: renamed variable do_reload
+	  to $Kolab::do_reload, to make it a global variable.  This is needed
+	  to solve kolab/issue3951: kolabconf -n (noreload) restarts services
+	  if RUNONCHANGE is used
 
 2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
 



From cvs at kolab.org  Mon Dec  7 16:17:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Dec 2009 16:17:21 +0100 (CET)
Subject: gunnar: server/perl-kolab/sbin kolabconf.in,1.2,1.2.2.1 
Message-ID: <20091207151721.D6F16600577@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolabconf.in 
Log Message:
MFH:  kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE is used)

Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolabconf.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- kolabconf.in	20 Jan 2009 17:22:12 -0000	1.2
+++ kolabconf.in	7 Dec 2009 15:17:19 -0000	1.2.2.1
@@ -93,9 +93,9 @@
     exit 0;
 }
 
-my $do_reload = 1;
+$Kolab::do_reload = 1;
 if($opt_n) {
-    $do_reload = 0;
+    $Kolab::do_reload = 0;
 }
 
 if( !$Kolab::reloadOk ) {
@@ -109,7 +109,7 @@
 Kolab::Conf::rebuildTemplates;
 Kolab::log('KC', 'Reloading kolab components');
 
-if( $do_reload ) {
+if( $Kolab::do_reload ) {
     Kolab::Conf::reload;
 }
 



From cvs at kolab.org  Tue Dec  8 07:55:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 07:55:39 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.398.2.88,1.398.2.89 
Message-ID: <20091208065539.11F5B600560@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Update release notes (kolab/issue1340)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.88
retrieving revision 1.398.2.89
diff -u -d -r1.398.2.88 -r1.398.2.89
--- release-notes.txt	7 Dec 2009 15:17:19 -0000	1.398.2.88
+++ release-notes.txt	8 Dec 2009 06:55:36 -0000	1.398.2.89
@@ -157,6 +157,8 @@
 
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
+	kolab/issue1340 (RFC: restrict users to sending mail only to
+	                 internal recipients)
 	kolab/issue1448 (Users might add an account on the nonHome Server
 	                 and write emails in there.)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes



From cvs at kolab.org  Tue Dec  8 07:55:46 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 07:55:46 +0100 (CET)
Subject: gunnar: server TODO,1.1.2.6,1.1.2.7 
Message-ID: <20091208065546.34901600560@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Update TODO

Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- TODO	7 Dec 2009 14:04:24 -0000	1.1.2.6
+++ TODO	8 Dec 2009 06:55:42 -0000	1.1.2.7
@@ -27,9 +27,6 @@
 
     - small effort:
 
-	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
-	    (rbos provided a patch)
-
     - larger effort:
 
 	kolab/issue919  (kolab server has problems with some characters in passwords)
@@ -62,6 +59,8 @@
 	    (small change, big benefit)
 	kolab/issue3838 (no logging for pop3)
 	    (small change in imapd package required)
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if  RUNONCHANGE is used)
+	    (rbos provided a patch)
 
 Link for all server and web client issues on testing:
 



From cvs at kolab.org  Tue Dec  8 07:58:59 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 07:58:59 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.472,1.473 
Message-ID: <20091208065859.5FD49600560@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Sync release notes with kolab_2_2_branch

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -d -r1.472 -r1.473
--- release-notes.txt	4 Dec 2009 14:02:59 -0000	1.472
+++ release-notes.txt	8 Dec 2009 06:58:57 -0000	1.473
@@ -181,6 +181,8 @@
 
     - kolab-webadmin-2.2.3-2009????
 
+TODO:	kolab/issue1340 (RFC: restrict users to sending mail only to
+	                 internal recipients)
 	kolab/issue3401 (Change font color of the kolab-webadmin)
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
 			 nicer)
@@ -258,8 +260,14 @@
 
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
+TODO:	kolab/issue1340 (RFC: restrict users to sending mail only to
+	                 internal recipients)
+TODO:	kolab/issue1448 (Users might add an account on the nonHome Server
+	                 and write emails in there.)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if
+	                 RUNONCHANGE is used)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build
 	                 process)
 



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_Alarm package.info,1.3,1.4 
Message-ID: <20091208071220.C1EC6600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Alarm
In directory doto:/tmp/cvs-serv7903/Horde_Alarm

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Alarm/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:11 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Alarm'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_Argv package.info,1.3,1.4 
Message-ID: <20091208071220.D0208600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Argv
In directory doto:/tmp/cvs-serv7903/Horde_Argv

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Argv/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:11 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Argv'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_Block package.info,1.3,1.4 
Message-ID: <20091208071220.CC8E4600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Block
In directory doto:/tmp/cvs-serv7903/Horde_Block

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Block/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:12 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Block'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_CLI package.info,1.3,1.4 
Message-ID: <20091208071220.D8320600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_CLI
In directory doto:/tmp/cvs-serv7903/Horde_CLI

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_CLI/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:13 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='CLI'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_Cache package.info,1.3,1.4 
Message-ID: <20091208071220.DC7FA600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Cache
In directory doto:/tmp/cvs-serv7903/Horde_Cache

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Cache/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:13 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Cache'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_DataTree package.info,1.4,1.5 
Message-ID: <20091208071220.EFE10600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_DataTree
In directory doto:/tmp/cvs-serv7903/Horde_DataTree

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DataTree/package.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.info	23 Jul 2009 08:10:09 -0000	1.4
+++ package.info	8 Dec 2009 07:12:18 -0000	1.5
@@ -16,16 +16,16 @@
 pear_pkgdir='DataTree'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_Data package.info,1.4,1.5 
Message-ID: <20091208071220.EBE68600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Data
In directory doto:/tmp/cvs-serv7903/Horde_Data

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Data/package.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.info	24 Jul 2009 07:27:16 -0000	1.4
+++ package.info	8 Dec 2009 07:12:18 -0000	1.5
@@ -16,16 +16,16 @@
 pear_pkgdir='Data'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_File_PDF package.info,1.3,1.4 
Message-ID: <20091208071221.06E39600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_File_PDF
In directory doto:/tmp/cvs-serv7903/Horde_File_PDF

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_File_PDF/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='File_PDF'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.3.2dev20090501'
+version='0.3.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Date package.info,1.2,1.3 
Message-ID: <20091208071221.F306F600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Date
In directory doto:/tmp/cvs-serv7903/Horde_Date

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Date/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:18 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Date'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_History package.info,1.3,1.4 
Message-ID: <20091208071221.13E1B60057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_History
In directory doto:/tmp/cvs-serv7903/Horde_History

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_History/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:19 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='History'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:20 +0100 (CET)
Subject: gunnar: server/pear/Horde_Crypt package.info,1.3,1.4 
Message-ID: <20091208071220.E62CC600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Crypt
In directory doto:/tmp/cvs-serv7903/Horde_Crypt

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Crypt/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Crypt'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Feed package.info,1.2,1.3 
Message-ID: <20091208071221.0C454600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Feed
In directory doto:/tmp/cvs-serv7903/Horde_Feed

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Feed/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:18 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Feed'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.2.1dev20090501'
+version='0.2.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Http_Client package.info,1.3,1.4 
Message-ID: <20091208071221.16846600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Http_Client
In directory doto:/tmp/cvs-serv7903/Horde_Http_Client

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Http_Client/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	24 Jul 2009 07:27:42 -0000	1.3
+++ package.info	8 Dec 2009 07:12:19 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Http_Client'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.3.0dev20090501'
+version='0.3.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Group package.info,1.3,1.4 
Message-ID: <20091208071221.11CA2600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Group
In directory doto:/tmp/cvs-serv7903/Horde_Group

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:19 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Group'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_LDAP package.info,1.2,1.3 
Message-ID: <20091208071221.2FA9B600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_LDAP
In directory doto:/tmp/cvs-serv7903/Horde_LDAP

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_LDAP/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='LDAP'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Image package.info,1.2,1.3 
Message-ID: <20091208071221.1D17C600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Image
In directory doto:/tmp/cvs-serv7903/Horde_Image

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Image/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Image'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Log package.info,1.2,1.3 
Message-ID: <20091208071221.320E7600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Log
In directory doto:/tmp/cvs-serv7903/Horde_Log

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Log/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Log'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_DOM package.info,1.3,1.4 
Message-ID: <20091208071221.38A9460057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_DOM
In directory doto:/tmp/cvs-serv7903/Horde_DOM

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='DOM'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.2.0dev20090501'
+version='0.2.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Kolab_FreeBusy package.info,1.2,1.3 
Message-ID: <20091208071221.2B607600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Kolab_FreeBusy
In directory doto:/tmp/cvs-serv7903/Horde_Kolab_FreeBusy

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Kolab_FreeBusy/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Kolab_FreeBusy'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.5dev20090501'
+version='0.1.5dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Lock package.info,1.2,1.3 
Message-ID: <20091208071221.2E036600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Lock
In directory doto:/tmp/cvs-serv7903/Horde_Lock

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Lock/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Lock'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.1dev20090501'
+version='0.0.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_MIME package.info,1.1,1.2 
Message-ID: <20091208071221.34191600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_MIME
In directory doto:/tmp/cvs-serv7903/Horde_MIME

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/package.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- package.info	10 Nov 2009 17:08:57 -0000	1.1
+++ package.info	8 Dec 2009 07:12:19 -0000	1.2
@@ -16,16 +16,16 @@
 pear_pkgdir='MIME'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_SessionHandler package.info,1.2,1.3 
Message-ID: <20091208071221.66824600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_SessionHandler
In directory doto:/tmp/cvs-serv7903/Horde_SessionHandler

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SessionHandler/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='SessionHandler'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Net_SMS package.info,1.2,1.3 
Message-ID: <20091208071221.4C641600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Net_SMS
In directory doto:/tmp/cvs-serv7903/Horde_Net_SMS

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Net_SMS/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Net_SMS'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.2.0dev20090501'
+version='0.2.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Browser package.info,1.3,1.4 
Message-ID: <20091208071221.36B70600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Browser
In directory doto:/tmp/cvs-serv7903/Horde_Browser

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Browser/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:12 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Browser'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Mobile package.info,1.2,1.3 
Message-ID: <20091208071221.4568A600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Mobile
In directory doto:/tmp/cvs-serv7903/Horde_Mobile

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Mobile/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Mobile'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Share package.info,1.2,1.3 
Message-ID: <20091208071221.6C313600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share
In directory doto:/tmp/cvs-serv7903/Horde_Share

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Share/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Share'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_SessionObjects package.info,1.2,1.3 
Message-ID: <20091208071221.6A1BC60057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_SessionObjects
In directory doto:/tmp/cvs-serv7903/Horde_SessionObjects

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SessionObjects/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='SessionObjects'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_RPC package.info,1.1,1.2 
Message-ID: <20091208071221.5DCB5600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_RPC
In directory doto:/tmp/cvs-serv7903/Horde_RPC

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_RPC/package.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- package.info	24 Jul 2009 07:29:02 -0000	1.1
+++ package.info	8 Dec 2009 07:12:19 -0000	1.2
@@ -16,16 +16,16 @@
 pear_pkgdir='RPC'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Text_Diff package.info,1.2,1.3 
Message-ID: <20091208071221.78DE5600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Text_Diff
In directory doto:/tmp/cvs-serv7903/Horde_Text_Diff

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Text_Diff/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Text_Diff'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='1.1.0dev20090501'
+version='1.2.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Net_IMSP package.info,1.2,1.3 
Message-ID: <20091208071221.4A2EE600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Net_IMSP
In directory doto:/tmp/cvs-serv7903/Horde_Net_IMSP

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Net_IMSP/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Net_IMSP'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.6dev20090501'
+version='0.0.6dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Auth package.info,1.4,1.5 
Message-ID: <20091208071221.35BC5600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Auth
In directory doto:/tmp/cvs-serv7903/Horde_Auth

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/package.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.info	22 Jul 2009 07:53:11 -0000	1.4
+++ package.info	8 Dec 2009 07:12:18 -0000	1.5
@@ -16,16 +16,16 @@
 pear_pkgdir='Auth'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.1dev20090501'
+version='0.1.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Text_Filter package.info,1.2,1.3 
Message-ID: <20091208071221.7B349600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Text_Filter
In directory doto:/tmp/cvs-serv7903/Horde_Text_Filter

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Text_Filter/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Text_Filter'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_SyncML package.info,1.2,1.3 
Message-ID: <20091208071221.75EC4600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_SyncML
In directory doto:/tmp/cvs-serv7903/Horde_SyncML

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SyncML/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='SyncML'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.7.0dev20090501'
+version='0.7.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Text_Flowed package.info,1.2,1.3 
Message-ID: <20091208071221.7E247600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Text_Flowed
In directory doto:/tmp/cvs-serv7903/Horde_Text_Flowed

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Text_Flowed/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Text_Flowed'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Memcache package.info,1.2,1.3 
Message-ID: <20091208071221.3E88860057B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Memcache
In directory doto:/tmp/cvs-serv7903/Horde_Memcache

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Memcache/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Memcache'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Prefs package.info,1.3,1.4 
Message-ID: <20091208071221.55D80600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Prefs
In directory doto:/tmp/cvs-serv7903/Horde_Prefs

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Prefs/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	10 Sep 2009 10:06:04 -0000	1.3
+++ package.info	8 Dec 2009 07:12:19 -0000	1.4
@@ -16,13 +16,13 @@
 pear_pkgdir='Prefs'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
 release='20090910'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_IMAP package.info,1.2,1.3 
Message-ID: <20091208071221.1A349600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_IMAP
In directory doto:/tmp/cvs-serv7903/Horde_IMAP

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_IMAP/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='IMAP'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.3dev20090501'
+version='0.0.3dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Template package.info,1.2,1.3 
Message-ID: <20091208071221.709AC600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Template
In directory doto:/tmp/cvs-serv7903/Horde_Template

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Template/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Template'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Notification package.info,1.2,1.3 
Message-ID: <20091208071221.50DAD600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Notification
In directory doto:/tmp/cvs-serv7903/Horde_Notification

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Notification/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Notification'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Tree package.info,1.2,1.3 
Message-ID: <20091208071221.8527F600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Tree
In directory doto:/tmp/cvs-serv7903/Horde_Tree

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Tree/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Tree'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_View package.info,1.2,1.3 
Message-ID: <20091208071221.93167600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_View
In directory doto:/tmp/cvs-serv7903/Horde_View

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_View/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='View'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.2.1dev20090501'
+version='0.2.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_iCalendar package.info,1.2,1.3 
Message-ID: <20091208071221.9E7F1600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_iCalendar
In directory doto:/tmp/cvs-serv7903/Horde_iCalendar

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:11 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='iCalendar'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/PEAR-Log .cvsignore, 1.2, 1.3 Makefile, 1.7,
	1.8 PEAR-Log.spec, 1.7, NONE 
Message-ID: <20091208071221.A584E600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv7903/PEAR-Log

Modified Files:
	.cvsignore Makefile 
Removed Files:
	PEAR-Log.spec 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	22 Jul 2009 06:46:07 -0000	1.2
+++ .cvsignore	8 Dec 2009 07:12:19 -0000	1.3
@@ -1,2 +1,5 @@
 *.src.rpm
+*.tgz
+*.spec
+package.patch
 tmp

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	8 Dec 2009 07:12:19 -0000	1.8
@@ -1,42 +1 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = PEAR-$(PEAR_NAME)
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-.PHONY: clean
-clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
-
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+include ../Pear.mk

--- PEAR-Log.spec DELETED ---



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_SQL package.info,1.2,1.3 
Message-ID: <20091208071221.5F87E600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_SQL
In directory doto:/tmp/cvs-serv7903/Horde_SQL

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SQL/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='SQL'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Yaml package.info,1.2,1.3 
Message-ID: <20091208071221.9B567600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Yaml
In directory doto:/tmp/cvs-serv7903/Horde_Yaml

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Yaml/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Yaml'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='1.0.1dev20090501'
+version='1.0.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Serialize package.info,1.2,1.3 
Message-ID: <20091208071221.64746600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Serialize
In directory doto:/tmp/cvs-serv7903/Horde_Serialize

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Serialize/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Serialize'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Framework package.info,1.3,1.4 
Message-ID: <20091208071221.BC23160057C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Framework
In directory doto:/tmp/cvs-serv7903/Horde_Framework

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	10 Aug 2009 15:02:44 -0000	1.3
+++ package.info	8 Dec 2009 07:12:19 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Horde'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/PEAR-PHPUnit-Channel Makefile,1.3,1.4 
Message-ID: <20091208071221.AB66C600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PEAR-PHPUnit-Channel
In directory doto:/tmp/cvs-serv7903/PEAR-PHPUnit-Channel

Modified Files:
	Makefile 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	19 Jan 2009 16:35:53 -0000	1.3
+++ Makefile	8 Dec 2009 07:12:19 -0000	1.4
@@ -1,15 +1,4 @@
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
+include ../../Base.mk
 
 PACKAGE = PEAR-PHPUnit-Channel
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
@@ -24,11 +13,31 @@
 dist: all
 	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
 
+# Target for installing the binary rpm package in our current Kolab
+# server installation
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+
 .PHONY: clean
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
+
+# Target for the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE):
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+
+# Target for preparing the source area and building the package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE) Makefile $(PACKAGE).spec $(EXTRA)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+# Target for fetching the source rpm into the current directory
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Form package.info,1.3,1.4 
Message-ID: <20091208071221.BA63960057A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Form
In directory doto:/tmp/cvs-serv7903/Horde_Form

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Form/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:19 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Form'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/PHPUnit Makefile,1.1,1.2 PHPUnit.spec,1.2,NONE 
Message-ID: <20091208071221.B71BA600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PHPUnit
In directory doto:/tmp/cvs-serv7903/PHPUnit

Modified Files:
	Makefile 
Removed Files:
	PHPUnit.spec 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PHPUnit/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 13:31:31 -0000	1.1
+++ Makefile	8 Dec 2009 07:12:19 -0000	1.2
@@ -1,40 +1 @@
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-SOURCE_0=http://pear.phpunit.de/get/$(PACKAGE)-$(VERSION).tgz
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-.PHONY: clean
-clean:
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
-
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+include ../Pear.mk

--- PHPUnit.spec DELETED ---



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Text_Textile package.info,1.2,1.3 
Message-ID: <20091208071221.82694600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Text_Textile
In directory doto:/tmp/cvs-serv7903/Horde_Text_Textile

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Text_Textile/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Text_Textile'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'
@@ -54,7 +54,7 @@
 description=' \
 _____________ T E X T I L E A Humane Web Text Generator Version 2.0 \
 Copyright 2003-2004, Dean Allen dean at textism.com All rights reserved. \
-Thanks to Carlo Zottmann carlo at g-blog.net for refactoring Textile's \
+Thanks to Carlo Zottmann carlo at g-blog.net for refactoring Textiles \
 procedural code into a class framework Additions and fixes Copyright 2006 \
 Alex Shiels http://thresholdstate.com/ _____________ L I C E N S E \
 Redistribution and use in source and binary forms, with or without \



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_File_CSV package.info,1.2,1.3 
Message-ID: <20091208071221.BB49360057B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_File_CSV
In directory doto:/tmp/cvs-serv7903/Horde_File_CSV

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_File_CSV/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:18 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='File_CSV'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.1dev20090501'
+version='0.1.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Perms package.info,1.2,1.3 
Message-ID: <20091208071221.53C72600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Perms
In directory doto:/tmp/cvs-serv7903/Horde_Perms

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Perms/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Perms'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Util package.info,1.2,1.3 
Message-ID: <20091208071221.8CB56600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Util
In directory doto:/tmp/cvs-serv7903/Horde_Util

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Util'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Kolab_Filter package.info,1.2,1.3 
Message-ID: <20091208071221.BDF4760057E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Kolab_Filter
In directory doto:/tmp/cvs-serv7903/Horde_Kolab_Filter

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Kolab_Filter/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Kolab_Filter'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.6dev20090501'
+version='0.1.6dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Compress package.info,1.3,1.4 
Message-ID: <20091208071221.B95B7600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Compress
In directory doto:/tmp/cvs-serv7903/Horde_Compress

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Compress/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	23 Jul 2009 08:10:09 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Compress'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Editor package.info,1.2,1.3 
Message-ID: <20091208071221.CC528600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Editor
In directory doto:/tmp/cvs-serv7903/Horde_Editor

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Editor/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:18 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Editor'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_UI package.info,1.2,1.3 
Message-ID: <20091208071221.88409600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_UI
In directory doto:/tmp/cvs-serv7903/Horde_UI

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_UI/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='UI'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Token package.info,1.2,1.3 
Message-ID: <20091208071221.D01F7600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Token
In directory doto:/tmp/cvs-serv7903/Horde_Token

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Token/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Token'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.4dev20090501'
+version='0.0.4dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_SpellChecker package.info,1.2,1.3 
Message-ID: <20091208071221.CDA8F600577@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_SpellChecker
In directory doto:/tmp/cvs-serv7903/Horde_SpellChecker

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SpellChecker/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='SpellChecker'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Cipher package.info,1.3,1.4 
Message-ID: <20091208071221.C3F9B600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Cipher
In directory doto:/tmp/cvs-serv7903/Horde_Cipher

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Cipher/package.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.info	22 Jul 2009 07:53:13 -0000	1.3
+++ package.info	8 Dec 2009 07:12:18 -0000	1.4
@@ -16,16 +16,16 @@
 pear_pkgdir='Cipher'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_NLS package.info,1.2,1.3 
Message-ID: <20091208071221.CCF9A600576@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_NLS
In directory doto:/tmp/cvs-serv7903/Horde_NLS

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_NLS/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='NLS'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Maintenance package.info,1.2,1.3 
Message-ID: <20091208071221.3BAF7600573@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Maintenance
In directory doto:/tmp/cvs-serv7903/Horde_Maintenance

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Maintenance/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Maintenance'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_VC package.info,1.2,1.3 
Message-ID: <20091208071221.9102E600574@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_VC
In directory doto:/tmp/cvs-serv7903/Horde_VC

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_VC/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='VC'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.4dev20090501'
+version='0.0.4dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_XML_WBXML package.info,1.2,1.3 
Message-ID: <20091208071221.964D9600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_XML_WBXML
In directory doto:/tmp/cvs-serv7903/Horde_XML_WBXML

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_XML_WBXML/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='XML_WBXML'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.5.1dev20090501'
+version='0.5.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Secret package.info,1.2,1.3 
Message-ID: <20091208071221.626BD600575@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Secret
In directory doto:/tmp/cvs-serv7903/Horde_Secret

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Secret/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Secret'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.2dev20090501'
+version='0.0.2dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Xml_Element package.info,1.2,1.3 
Message-ID: <20091208071221.D198B600579@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Xml_Element
In directory doto:/tmp/cvs-serv7903/Horde_Xml_Element

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Xml_Element/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:10 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Xml_Element'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.1.0dev20090501'
+version='0.1.0dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Kolab_Format package.info,1.2,1.3 
Message-ID: <20091208071221.BFB4F60057F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Kolab_Format
In directory doto:/tmp/cvs-serv7903/Horde_Kolab_Format

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Kolab_Format/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Kolab_Format'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='1.0.1dev20090501'
+version='1.0.1dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Tue Dec  8 08:12:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Dec 2009 08:12:21 +0100 (CET)
Subject: gunnar: server/pear/Horde_Kolab package.info,1.2,1.3 
Message-ID: <20091208071221.BCF7F60057D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Kolab
In directory doto:/tmp/cvs-serv7903/Horde_Kolab

Modified Files:
	package.info 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: package.info
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Kolab/package.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package.info	23 Jul 2009 08:10:09 -0000	1.2
+++ package.info	8 Dec 2009 07:12:19 -0000	1.3
@@ -16,16 +16,16 @@
 pear_pkgdir='Kolab'
 
 # Commit tag or date to user
-repo_commit='HORDE_3_3_4'
+repo_commit='HORDE_3_3_5'
 
 # What release number should the source snapshot get (usually a date)?
-repo_release='20090501'
+repo_release='20090914'
 
 # Version number
-version='0.0.6dev20090501'
+version='0.0.6dev20090914'
 
 # Package release number
-release='20090713'
+release='20091110'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel/'



From cvs at kolab.org  Wed Dec  9 22:52:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Dec 2009 22:52:51 +0100 (CET)
Subject: gunnar: server/make-helper kolab.mk,NONE,1.1 
Message-ID: <20091209215251.EB67B60014A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv17544/make-helper

Added Files:
	kolab.mk 
Log Message:
Add the kolab.mk from the kolab_2_2 branch. Added comments and an initial sanity check for the openpkg tool.

--- NEW FILE: kolab.mk ---
# 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

# Set KOLABDIR to the base directory of the OpenPKG/Kolab installation:
KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)

# Error out if there is no kolab directory
ifeq ($(KOLABDIR),)
  $(error Could not determine KOLABDIR!)
endif

# Set the location of the rpm binary
ifeq ($(RPM),)
  RPM = $(KOLABDIR)/bin/openpkg rpm
endif

# Set the location for rpm source package installations
ifeq ($(KOLABRPMSRC),)
  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
endif

# Set the location for rpm packages
ifeq ($(KOLABRPMPKG),)
  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
endif

# Set the location for the rpm temporary directory
ifeq ($(KOLABRPMTMP),)
  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
endif

# Set the current working directory
ifeq ($(CURSRCDIR),)
  CURSRCDIR = $(CURDIR)
endif

# Set the download location for Kolab source RPMs
ifeq ($(KOLABPKGURI),)
  KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
endif

# Set the download location for OpenPKG source RPMs
ifeq ($(OPENPKGURI),)
  OPENPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
endif

# Determine the suffix for binary packages on this system
ifeq ($(PLATTAG),)
  PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
endif



From cvs at kolab.org  Thu Dec 10 00:08:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Dec 2009 00:08:09 +0100 (CET)
Subject: gunnar: server/make-helper openpkg-patched.mk, NONE, 1.1 package.mk,
	NONE, 1.1 
Message-ID: <20091209230809.D398B600173@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv21324/make-helper

Added Files:
	openpkg-patched.mk package.mk 
Log Message:
Reduce a first Makefile to its essential information while moving the functions duplicated in many of the other makefiles into a central helper that can be included. While this makes it less obvious how a single makefile works we only have three or four different package build types. Maintaining these at only one location rather than at twenty different ones seems useful. Especially if we should ever consider switching our base distribution.

--- NEW FILE: openpkg-patched.mk ---
# Target for preparing the source area and building the package
$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
	cp $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)

# Target for fetching the original openpkg package
$(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm:
	wget -c $(OPENPKGURI)/$(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm

# Target for the src rpm directory.
$(KOLABRPMSRC)/$(PACKAGE): $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm
	$(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm

# Target for patching the spec file
$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch
	touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched

# Target for building the source package
$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec

# Target for building the binary package
$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)


--- NEW FILE: package.mk ---
# Default target to generate the source rpm package
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

# Target for placing the source rpm in the staging area. This target
# includes building the binary package which is an additional check for
# the final release. Thus it is the default target.
.PHONY: dist
dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm all
	test -d $(STAGING) || mkdir $(STAGING)
	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)

# Target for placing the source rpm in the staging area. This is the soft
# variant that is quicker and omits the binary package.
.PHONY: sdist
sdist: all
	test -d $(STAGING) || mkdir $(STAGING)
	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)

# Target for installing the binary rpm package in our current Kolab
# server installation
.PHONY: install
install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm

# Target for cleaning up the files that can be generated with this Makefile
.PHONY: clean
clean:
	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
	rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
	rm -f $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -f *.tar.gz
	rm -f *~
	rm -f package.patch

# Target for fetching the source rpm into the current directory
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

# Target for the source file in the src rpm directory.
$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0)
	cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/

# Target for retrieving the source package
$(SOURCE_0):
	wget -c "$(SOURCE_URL)/$(SOURCE_0)"

# Prepare the patch for the package.
package.patch: $(PATCHES)
	echo > package.patch
	for PATCH in $(PATCHES);        \
	do                              \
	  cat $$PATCH >> package.patch; \
	done



From cvs at kolab.org  Thu Dec 10 00:08:09 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Dec 2009 00:08:09 +0100 (CET)
Subject: gunnar: server/imapd .cvsignore,1.3,1.4 Makefile,1.45,1.46 
Message-ID: <20091209230809.D8799600572@lists.intevation.de>

Author: gunnar

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

Modified Files:
	.cvsignore Makefile 
Log Message:
Reduce a first Makefile to its essential information while moving the functions duplicated in many of the other makefiles into a central helper that can be included. While this makes it less obvious how a single makefile works we only have three or four different package build types. Maintaining these at only one location rather than at twenty different ones seems useful. Especially if we should ever consider switching our base distribution.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/imapd/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	11 Mar 2008 15:42:19 -0000	1.3
+++ .cvsignore	9 Dec 2009 23:08:07 -0000	1.4
@@ -1 +1,2 @@
 *.src.rpm
+*.tar.gz
\ No newline at end of file

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile	4 Dec 2009 10:58:01 -0000	1.45
+++ Makefile	9 Dec 2009 23:08:07 -0000	1.46
@@ -1,46 +1,25 @@
-include ../Base.mk
+include ../make-helper/kolab.mk
 
 PACKAGE=imapd
 DOWNLOAD_VERSION=2.3.13
+OPENPKG_RELEASE=20081020
 VERSION=2.3.15
-RELEASE=20081020
-KOLABRELEASE=20081020_kolab5
+RELEASE=20081020_kolab5
 
-SOURCE_0=ftp://ftp.andrew.cmu.edu/pub/cyrus/cyrus-imapd-2.3.15.tar.gz
+SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus
+SOURCE_0=cyrus-imapd-2.3.15.tar.gz
 
 PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch \
-	kolab.patch \
-	imapd.patch
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
-
-	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
-
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget $(SOURCE_0)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm .
-
-$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch
 
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+EXTRA=$(PATCHES) kolab.patch imapd.patch
 
-.PHONY: clean
-clean:
-	rm -f $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
 
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
-	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk



From cvs at kolab.org  Thu Dec 10 18:43:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Dec 2009 18:43:39 +0100 (CET)
Subject: mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.11,1.12 
Message-ID: <20091210174339.CF2D260014A@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv14804/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Reindent and remove old comments


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Conf.pm	24 Nov 2009 18:44:58 -0000	1.11
+++ Conf.pm	10 Dec 2009 17:43:37 -0000	1.12
@@ -128,11 +128,11 @@
     my $templatedir = $Kolab::config{"templatedir"};
 
     my %special_templates = (
-	"$templatedir/transport.template"      => 1,
-	"$templatedir/virtual.template"        => 1,
-	"$templatedir/imapd.group.template"    => 1,
-	"$templatedir/slapd.access.template"   => 1,
-	"$templatedir/slapd.replicas.template" => 1
+	    "$templatedir/transport.template"      => 1,
+	    "$templatedir/virtual.template"        => 1,
+	    "$templatedir/imapd.group.template"    => 1,
+	    "$templatedir/slapd.access.template"   => 1,
+	    "$templatedir/slapd.replicas.template" => 1
 	);
 
     my $oldmask = umask 077;
@@ -142,44 +142,40 @@
         Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG );
     }
     copy($cfg, $oldcfg);
-    #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
     # To avoid warnings, the backup files must be owned by root
     chown(0, 0, $oldcfg);
     umask $oldmask;
     #chmod(0600, $oldcfg) if ($oldcfg =~ /openldap/);
 
     Kolab::log('T', "Creating new configuration file `$cfg' from template `$tmpl'", KOLAB_DEBUG );
-    #print STDERR "Creating new configuration file `$cfg' from template `$tmpl'\n";
 
     my $template;
     if (!($template = IO::File->new($tmpl, 'r'))) {
         Kolab::log('T', "Unable to open template file `$tmpl': $!", KOLAB_ERROR);
-	# Error, fail gracefully
-	return;
+        # Error, fail gracefully
+        return;
     }
     my $config;
     if (!($config = new File::Temp( TEMPLATE => 'tmpXXXXX',
-				    DIR => $Kolab::config{"kolabdir"},
-				    SUFFIX => '.kolabtmp',
-				    UNLINK => 0 ))) {
+                                    DIR => $Kolab::config{"kolabdir"},
+                                    SUFFIX => '.kolabtmp',
+                                    UNLINK => 0 ))) {
         Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
         exit(1);
     }
 
-    #Kolab::log('T', "Using temporary file '".$config->filename."'", KOLAB_DEBUG );
-
     my $skip = 0;
     my $keep = 0;
     while (<$template>) {
-    	#Eat the meta data sections
-	if (/^KOLAB_META_START$/) {
-	    my $found_end;
-	    while (!$found_end) {	
-		$_ = <$template>;
-		$found_end = /^KOLAB_META_END$/;
-	    }
-	    $_ = <$template>;
-	}
+        #Eat the meta data sections
+        if (/^KOLAB_META_START$/) {
+            my $found_end;
+            while (!$found_end) {	
+            $_ = <$template>;
+            $found_end = /^KOLAB_META_END$/;
+            }
+            $_ = <$template>;
+        }
 
         if (/\@{3}if\s+exists\(\s*(\S+?)\s*\)\@{3}/) {
             # @@@if exists(/full/path/to/file)@@@
@@ -198,82 +194,82 @@
             # its value set to either 'false' or 'true'
             if ($Kolab::config{$1} && lc($Kolab::config{$1}) ne "false" ) {
                 # Keep text
-		$keep = 1;
+                $keep = 1;
             } else {
                 # Skip text
                 $skip++;
-		$keep = 0;
+                $keep = 0;
             }
             s/\@{3}if (\S+?)\@{3}\n?//;
-	} elsif (/\@{3}else\@{3}/) {
-	    if( $keep == 0 ) {
-		# Now keep
-		$keep = 1;
-		$skip--;
-	    } else {
-		# Now skip
-		$keep = 0;
-                $skip++;
-	    }
-            s/\@{3}else\@{3}\n?//;
+        } elsif (/\@{3}else\@{3}/) {
+            if( $keep == 0 ) {
+            # Now keep
+            $keep = 1;
+            $skip--;
+            } else {
+            # Now skip
+            $keep = 0;
+                    $skip++;
+            }
+                s/\@{3}else\@{3}\n?//;
 
         } elsif (/\@{3}endif\@{3}/) {
             ($skip > 0) && $skip--;
             s/\@{3}endif\@{3}\n?//;
 
-        } elsif (/\@{3}warning\@{3}/) { 
+        } elsif (/\@{3}warning\@{3}/) {
 
             printWarning($config, $tmpl, $cchr);
 
         } else {
             while (/\@{3}([^\s\@]+?)(\|(.+?)\((.*)\))?\@{3}/) {
-		my $attr = $1;
-		my $fct  = $3;
-		my $args = $4;
-		#print STDERR "attr=\"$attr\", fct=\"$fct\", args=\"$args\"\n";
-		if ($Kolab::config{$attr}) {
-		    my $val = "";
-		    if( !$fct ) {
-			if (ref $Kolab::config{$attr} eq "ARRAY") {
-			    $val = $Kolab::config{$attr}->[0];
-			} else {
-			    $val = $Kolab::config{$attr};
-			}
-		    } else {
-			# Modifier functions
-		      SWITCH: {
-			  # Join function 
-			  $fct eq 'join' && do {
-			      if (ref $Kolab::config{$attr} eq "ARRAY") {
-				  my @vals = @{$Kolab::config{$attr}} ;
-				  # We want to make sure subdomain.domain.tld comes before domain.tld
-				  my @length_sorted_vals = sort {length $b cmp length $a} @vals;
-				  $val = join ($args, @length_sorted_vals) ;
-			      } else {
-				  $val = $Kolab::config{$attr};
-			      }
-			      last SWITCH;
-			  };
-			  # Quote function
-			  $fct eq 'quote' && do {
-			      # slapd.conf compatible quoting
-			      $val = $Kolab::config{$attr};
-			      $val =~ s/"/\"/g;
-			      $val = '"'.$val.'"';
-			      last SWITCH;
-			  }
-			}
-		    }
-		    s/\@{3}([^\s\@]+?)(\|.+?)?\@{3}/$val/;
-		    last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop
-		} else {
-		    # Only warn the user in case we are not skipping the section
-		    ($skip == 0) && Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
-		    s/\@{3}([^\s\@]+?)\@{3}//;
-		}
-	    }
-	    ($skip == 0) && print $config $_;
-	}
+                my $attr = $1;
+                my $fct  = $3;
+                my $args = $4;
+                #print STDERR "attr=\"$attr\", fct=\"$fct\", args=\"$args\"\n";
+                if ($Kolab::config{$attr}) {
+                    my $val = "";
+                    if( !$fct ) {
+                        if (ref $Kolab::config{$attr} eq "ARRAY") {
+                            $val = $Kolab::config{$attr}->[0];
+                        } else {
+                            $val = $Kolab::config{$attr};
+                        }
+                    } else {
+                        # Modifier functions
+                        SWITCH: {
+                            # Join function 
+                            $fct eq 'join' && do {
+                                if (ref $Kolab::config{$attr} eq "ARRAY") {
+                                my @vals = @{$Kolab::config{$attr}} ;
+                                # We want to make sure subdomain.domain.tld comes before domain.tld
+                                my @length_sorted_vals = sort {length $b cmp length $a} @vals;
+                                $val = join ($args, @length_sorted_vals) ;
+                                } else {
+                                $val = $Kolab::config{$attr};
+                                }
+                                last SWITCH;
+                            };
+                            # Quote function
+                            $fct eq 'quote' && do {
+                                # slapd.conf compatible quoting
+                                $val = $Kolab::config{$attr};
+                                $val =~ s/"/\"/g;
+                                $val = '"'.$val.'"';
+                                last SWITCH;
+                            }
+                        }
+                    }
+                    s/\@{3}([^\s\@]+?)(\|.+?)?\@{3}/$val/;
+                    last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop
+                } else {
+                    # Only warn the user in case we are not skipping the section
+                    ($skip == 0) && Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
+                    s/\@{3}([^\s\@]+?)\@{3}//;
+                }
+            }
+            ($skip == 0) && print $config $_;
+        }
     }
     
     $template->close;



From cvs at kolab.org  Thu Dec 10 19:27:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Dec 2009 19:27:20 +0100 (CET)
Subject: mathieu: utils/ci/toolbox kolab-test-toolbox.pl,1.1,1.2 
Message-ID: <20091210182720.26A3960014A@lists.intevation.de>

Author: mathieu

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

Modified Files:
	kolab-test-toolbox.pl 
Log Message:
Show help if no action specified

Index: kolab-test-toolbox.pl
===================================================================
RCS file: /kolabrepository/utils/ci/toolbox/kolab-test-toolbox.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-test-toolbox.pl	4 Dec 2009 07:35:04 -0000	1.1
+++ kolab-test-toolbox.pl	10 Dec 2009 18:27:16 -0000	1.2
@@ -963,6 +963,7 @@
 #-------------------------------------------------------
 my $o_help = 0;
 my $o_man = 0;
+my $action;
 my $result = GetOptions(
     'help|?' => \$o_help,
     'man' => \$o_man,
@@ -972,12 +973,13 @@
 
 pod2usage(-exitstatus => 0, -verbose => 2) if $o_man;
 pod2usage(-exitstatus => 0, -verbose => 1) if $o_help;
+pod2usage(-exitstatus => 0, -verbose => 1) if !$action;
 
 #-------------------------------------------------------
 
 sub process
 {
-    my $action = shift;
+    $action = shift;
     
     if(!defined($vmm)) {
         initial_check();



From cvs at kolab.org  Thu Dec 10 19:42:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Dec 2009 19:42:28 +0100 (CET)
Subject: mathieu: utils/ci/toolbox kolab-test-toolbox.pl,1.2,1.3 
Message-ID: <20091210184228.D8A9960014A@lists.intevation.de>

Author: mathieu

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

Modified Files:
	kolab-test-toolbox.pl 
Log Message:
don't print usage when fatal error. Also avoid unitialized $command

Index: kolab-test-toolbox.pl
===================================================================
RCS file: /kolabrepository/utils/ci/toolbox/kolab-test-toolbox.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab-test-toolbox.pl	10 Dec 2009 18:27:16 -0000	1.2
+++ kolab-test-toolbox.pl	10 Dec 2009 18:42:26 -0000	1.3
@@ -157,11 +157,11 @@
 sub remote_command
 {
     my $domip = shift;
-    my $command = shift || undef;
+    my $command = shift || '';
     my $no_die_on_error = shift || 0;
     
     my $ret;
-    if(defined($command)) {
+    if($command ne '') {
         $ret = system('ssh',
             '-i', conf('storage_pool_dir').'/key',
             '-o', 'StrictHostKeyChecking=no',
@@ -969,7 +969,7 @@
     'man' => \$o_man,
     'platform=s' => \$platform,
     '<>' => \&process,
-    ) or pod2usage(2);
+    );
 
 pod2usage(-exitstatus => 0, -verbose => 2) if $o_man;
 pod2usage(-exitstatus => 0, -verbose => 1) if $o_help;



From cvs at kolab.org  Sun Dec 13 16:19:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 16:19:25 +0100 (CET)
Subject: mathieu: server release-notes.txt,1.473,1.474 
Message-ID: <20091213151925.23E8660056E@lists.intevation.de>

Author: mathieu

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

Modified Files:
	release-notes.txt 
Log Message:
perl-kolab:
    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
    getCyrusGroups(), getPostfixMap(map). This removed the use of
   %special_templates, %haschanged, Kolab::Conf::reload().

kolabd:
 
    kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                    virtual and imapd.groups by templates) using the new
                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.



Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -d -r1.473 -r1.474
--- release-notes.txt	8 Dec 2009 06:58:57 -0000	1.473
+++ release-notes.txt	13 Dec 2009 15:19:22 -0000	1.474
@@ -92,6 +92,9 @@
 	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/issue1740 (fully generate slapd.access, slapd.replicas, transport,
+                    virtual and imapd.groups by templates) using the new
+                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.
 
     - kolab-fbview-1.2.0-2009????
 
@@ -126,6 +129,10 @@
 	Do not handle postfix reload and postmap calls.
 
 	Execute duplicate RUNONCHANGE commands only once.
+
+    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
+    getCyrusGroups(), getPostfixMap(map). This removed the use of
+    %special_templates, %haschanged, Kolab::Conf::reload().
 
 	kolab/issue1679 (Update template META mechanism to support service
 	                 restarts)



From cvs at kolab.org  Sun Dec 13 16:19:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 16:19:25 +0100 (CET)
Subject: mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.12,1.13 
Message-ID: <20091213151925.420EE60057B@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv22798/perl-kolab/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
perl-kolab:
    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
    getCyrusGroups(), getPostfixMap(map). This removed the use of
   %special_templates, %haschanged, Kolab::Conf::reload().

kolabd:
 
    kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                    virtual and imapd.groups by templates) using the new
                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Conf.pm	10 Dec 2009 17:43:37 -0000	1.12
+++ Conf.pm	13 Dec 2009 15:19:23 -0000	1.13
@@ -42,10 +42,8 @@
 
 our %EXPORT_TAGS = (
     'all' => [ qw(
-        &buildCyrusGroups
-        &buildLDAPReplicas
         &rebuildTemplates
-	&checkPermissions
+        &checkPermissions
     ) ]
     );
 
@@ -59,7 +57,6 @@
 my %ownership = ();
 my %permissions = ();
 my %templatehaschanged = ();
-my %haschanged = ();
 my %commentchar = ();
 
 sub fixup {
@@ -92,7 +89,6 @@
     $cc = "#" if (!defined $cc);
 
     # Different warnings during bootstrapping and regular configuration
-# $Kolab::config{"bootstrap_config"} = "true";
     if ((defined $Kolab::config{"bootstrap_config"}) &&
         ($Kolab::config{"bootstrap_config"} eq "true")) {
 
@@ -127,14 +123,6 @@
     my $oldcfg = $cfg . '.old';
     my $templatedir = $Kolab::config{"templatedir"};
 
-    my %special_templates = (
-	    "$templatedir/transport.template"      => 1,
-	    "$templatedir/virtual.template"        => 1,
-	    "$templatedir/imapd.group.template"    => 1,
-	    "$templatedir/slapd.access.template"   => 1,
-	    "$templatedir/slapd.replicas.template" => 1
-	);
-
     my $oldmask = umask 077;
     #creating the config file is changing it
     if (! -f $cfg) { 
@@ -145,7 +133,6 @@
     # To avoid warnings, the backup files must be owned by root
     chown(0, 0, $oldcfg);
     umask $oldmask;
-    #chmod(0600, $oldcfg) if ($oldcfg =~ /openldap/);
 
     Kolab::log('T', "Creating new configuration file `$cfg' from template `$tmpl'", KOLAB_DEBUG );
 
@@ -202,6 +189,7 @@
             }
             s/\@{3}if (\S+?)\@{3}\n?//;
         } elsif (/\@{3}else\@{3}/) {
+            # @@@else@@@
             if( $keep == 0 ) {
             # Now keep
             $keep = 1;
@@ -214,15 +202,28 @@
                 s/\@{3}else\@{3}\n?//;
 
         } elsif (/\@{3}endif\@{3}/) {
+            # @@@endif@@@
             ($skip > 0) && $skip--;
             s/\@{3}endif\@{3}\n?//;
 
         } elsif (/\@{3}warning\@{3}/) {
-
+            # @@@warning@@@
             printWarning($config, $tmpl, $cchr);
 
+        } elsif (/\@{3}print\s+([^\s()]+?)\s*\(([^,]+)?\)\@{3}/) {
+            # @@@print func([arg])@@@
+            my $val;
+            if ($1 eq 'getLDAPReplicas') {$val = getLDAPReplicas();}
+            elsif ($1 eq 'getLDAPAccess') {$val = getLDAPAccess();}
+            elsif ($1 eq 'getCyrusGroups') {$val = getCyrusGroups();}
+            elsif ($1 eq 'getPostfixMap') {$val = getPostfixMap($2);}
+            else {Kolab::log('T', "Unknown printable value `$1'", KOLAB_WARN);}
+            s/\@{3}print\s+(\S+?)\@{3}//;
+            ($skip == 0) && print $config $val;
         } else {
             while (/\@{3}([^\s\@]+?)(\|(.+?)\((.*)\))?\@{3}/) {
+                # @@@attr@@@
+                # @@@attr|function(args)@@@
                 my $attr = $1;
                 my $fct  = $3;
                 my $args = $4;
@@ -278,13 +279,10 @@
     move($config->filename, $cfg) || Kolab::log('T', "Error moving configfile to $cfg, error: $!", KOLAB_ERROR );
     fixup( $cfg, $owner, $perm );
 
-    if (-f $oldcfg && !defined $special_templates{$tmpl} ) {
+    if (-f $oldcfg) {
         my $rc = `diff -q $cfg $oldcfg`;
         chomp($rc);
         if ($rc) {
-            if ($cfg =~ /openldap/) {
-                $haschanged{'slapd'} = 1;
-            }
             $templatehaschanged{$tmpl} = 1;
 
             Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
@@ -294,23 +292,12 @@
     Kolab::log('T', "Finished creating configuration file `$cfg'", KOLAB_DEBUG );
 }
 
-sub buildPostfixMap
+sub getPostfixMap
 {
     my $map = shift;
+    my $ret = '';
     Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG);
 
-    my $templatedir = $Kolab::config{"templatedir"};
-
-    my $keytemplate = "$templatedir/$map.template";
-    my $cfg = $templates{$keytemplate};
-    my $oldcfg = $cfg . '.old';
-
-    my $cfgfile;
-    if (!($cfgfile = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to create Postfix $map map: $!", KOLAB_ERROR);
-        exit(1);
-    }
-
     my $ldap = Kolab::LDAP::create(
         $Kolab::config{'ldap_ip'},
         $Kolab::config{'ldap_port'},
@@ -335,7 +322,7 @@
             foreach (@$routes) {
                 $_ = trim($_);
                 Kolab::log('T', "Adding entry `$_' to $map");
-                print $cfgfile $_ . "\n";
+                $ret .= $_ . "\n";
             }
         }
     } else {
@@ -343,45 +330,15 @@
     }
 
     Kolab::LDAP::destroy($ldap);
-    $cfgfile->close;
-
-    if (-f $oldcfg) {
-        my $rc = `diff -q $cfg $oldcfg`;
-        chomp($rc);
-        if ($rc) {
-            Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
-            $templatehaschanged{$keytemplate} = 1;
-        }
-    } else {
-        Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG);
-        $templatehaschanged{$keytemplate} = 1;
-    }
-
     Kolab::log('T', "Finished building Postfix $map map", KOLAB_DEBUG);
+    return $ret;
 }
 
-sub buildCyrusGroups
+sub getCyrusGroups
 {
+    my $ret ='';
     Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
 
-    my $templatedir = $Kolab::config{"templatedir"};
-
-    my $keytemplate = "$templatedir/imapd.group.template";
-    my $cfg = $templates{$keytemplate};
-    my $oldcfg = $cfg . '.old';
-    #delete $templates{$keytemplate};
-
-    #my $oldmask = umask 077;
-    #copy($cfg, $oldcfg);
-    #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
-    #umask $oldmask;
-
-    my $groupconf;
-    if (!($groupconf = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
-        exit(1);
-    }
-
     my $ldap = Kolab::LDAP::create(
         $Kolab::config{'ldap_ip'},
         $Kolab::config{'ldap_port'},
@@ -419,7 +376,7 @@
 		}
 	    }
             $group =~ s/,$//;
-            print $groupconf $group . "\n";
+            $ret .= $group . "\n";
             Kolab::log('T', "Adding cyrus group `$group'");
             $count++;
         }
@@ -427,33 +384,17 @@
         Kolab::log('T', 'No Cyrus groups found');
     }
 
-    $groupconf->close;
     Kolab::LDAP::destroy($ldap);
 
-    fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
-
     Kolab::log('T', 'Finished building Cyrus groups', KOLAB_DEBUG );
+    return $ret;
 }
 
-sub buildLDAPAccess
+sub getLDAPAccess
 {
+    my $ret = '';
     Kolab::log('T', 'Building LDAP access file', KOLAB_DEBUG);
 
-    my $templatedir = $Kolab::config{"templatedir"};
-
-    my $keytemplate = "$templatedir/slapd.access.template";
-    if( ! -f $keytemplate ) {
-        Kolab::log('T', "No LDAP access file `$keytemplate', skipping", KOLAB_DEBUG);
-        return;
-    }
-    my $cfg = $templates{$keytemplate};
-    my $oldcfg = $cfg . '.old';
-
-    my $access;
-    if (!($access = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
-        exit(1);
-    }
 
 my $global_acl = <<'EOS';
 # Domain specific access
@@ -497,68 +438,37 @@
     }
 
     ($str = $dom_acl1) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
-    print $access $str;
+    $ret .= $str;
 
     foreach $domain (@domains) {
 	($str = $dom_acl2) =~ s/\@{3}domain\@{3}/$domain/g;
 	$str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;	
-	print $access $str;
+	$ret .= $str;
     }
 
     ($str = $dom_acl3) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
-    print $access $str;
+    $ret .= $str;
 
     foreach $domain (@domains) {
 	($str = $global_acl) =~ s/\@{3}domain\@{3}/$domain/g;
 	$str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;	
-	print $access $str;
+	$ret .= $str;
 	Kolab::log('T', "Adding acl for domain '$str'");
     }
-
-    $access->close;
-
-    if (-f $oldcfg) {
-        my $rc = `diff -q $cfg $oldcfg`;
-        chomp($rc);
-        if ($rc) {
-	    Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
-	    $haschanged{'slapd'} = 1;
-        }
-    } else {
-        $haschanged{'slapd'} = 1;
-    }
-
-    fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
-
-    Kolab::log('T', 'Finished building LDAP access file', KOLAB_DEBUG );
+    return $ret;
 }
 
-sub buildLDAPReplicas
+sub getLDAPReplicas
 {
+    my $ret = '';
     Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
 
-    my $templatedir = $Kolab::config{"templatedir"};
-
-    my $keytemplate = "$templatedir/slapd.replicas.template";
-    if( ! -f $keytemplate ) {
-        Kolab::log('T', "No LDAP replicas `$keytemplate', skipping", KOLAB_DEBUG);
-        return;
-    }
-    my $cfg = $templates{$keytemplate};
-    my $oldcfg = $cfg . '.old';
-
-    my $repl;
-    if (!($repl = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
-        exit(1);
-    }
-
     # directory_mode syncrepl is supported from openldap-2.3.x and beyond
     if ($Kolab::config{'directory_mode'} eq "syncrepl") {
 
       if ( $Kolab::config{'is_master'} eq "false" ) {
         # Output a syncrepl statement for database synchronisation
-        print $repl "syncrepl rid=0 \n"
+        $ret .=   "syncrepl rid=0 \n"
                  ."         provider=".$Kolab::config{"ldap_master_uri"}."\n"
                  ."         type=refreshAndPersist\n"
                  ."         retry=\"60 10 300 +\"\n"
@@ -582,34 +492,20 @@
   	}
   	for my $h ( @kh ) {
   	    next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
-  	    print $repl "replica uri=ldaps://$h\n"
+  	    $ret .= "replica uri=ldaps://$h\n"
   		."  binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
   		."  bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
   	}
       } else {
   	# Slave setup
   	# Output an update dn statement instead
-  	print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
-  	print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
+  	$ret .= "updatedn ".$Kolab::config{'bind_dn'}."\n";
+  	$ret .= "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
       }
     }
 
-    $repl->close;
-
-    fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
-
-    if (-f $oldcfg) {
-        my $rc = `diff -q $cfg $oldcfg`;
-        chomp($rc);
-        if ($rc) {
-	    Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
-	    $haschanged{'slapd'} = 1;
-        }
-    } else {
-        $haschanged{'slapd'} = 1;
-    }
-
     Kolab::log('T', 'Finished building LDAP replicas', KOLAB_DEBUG);
+    return $ret;
 }
 
 sub replaceMetaVar
@@ -715,16 +611,9 @@
     my $tpl;
     foreach $tpl (keys %templates) {
         $cfg = $templates{$tpl};
-        #print STDOUT "Rebuilding $tpl => $cfg\n";
         build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg}, $commentchar{$cfg});
      }
 
-    buildPostfixMap('transport');
-    buildPostfixMap('virtual');
-    buildLDAPAccess;
-    buildLDAPReplicas;
-    buildCyrusGroups;
-
     Kolab::log('T', 'Finished regenerating configuration files', KOLAB_DEBUG );
 
     my %cmds = ();
@@ -770,7 +659,6 @@
     my $out;
     foreach my $tpl (@templ) {
       $cfg = $templates{$tpl};
-      # print STDOUT "Rebuilding $tpl => $cfg\n";
       build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg}, $commentchar{$cfg});
     }
 }
@@ -809,18 +697,6 @@
 	}
     }
     return $ok;
-}
-
-sub reload
-{
-    if ($haschanged{'slapd'}) {
-        &Kolab::log('K', 'Restarting OpenLDAP...');
-        system("$Kolab::config{'KOLABRC'} rc openldap restart &");
-    }
-
-    %Kolab::Conf::haschanged = ();
-
-    &Kolab::log('K', 'Reload finished');
 }
 
 1;



From cvs at kolab.org  Sun Dec 13 16:19:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 16:19:25 +0100 (CET)
Subject: mathieu: server/perl-kolab/sbin kolabconf.in,1.3,1.4 
Message-ID: <20091213151925.3EA98600570@lists.intevation.de>

Author: mathieu

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

Modified Files:
	kolabconf.in 
Log Message:
perl-kolab:
    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
    getCyrusGroups(), getPostfixMap(map). This removed the use of
   %special_templates, %haschanged, Kolab::Conf::reload().

kolabd:
 
    kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                    virtual and imapd.groups by templates) using the new
                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.



Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolabconf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabconf.in	24 Nov 2009 18:44:58 -0000	1.3
+++ kolabconf.in	13 Dec 2009 15:19:23 -0000	1.4
@@ -107,11 +107,5 @@
 
 Kolab::log('KC', 'Rebuilding templates');
 Kolab::Conf::rebuildTemplates;
-Kolab::log('KC', 'Reloading kolab components');
-
-if( $Kolab::do_reload ) {
-    Kolab::Conf::reload;
-}
-
 Kolab::log('KC', 'Finished');
 



From cvs at kolab.org  Sun Dec 13 16:19:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 16:19:25 +0100 (CET)
Subject: mathieu: server/kolabd/kolabd/templates DB_CONFIG.slapd.template.in,
	1.5, 1.6 access.template.in, 1.1, 1.2 imapd.group.template.in,
	1.1, 1.2 slapd.access.template.in, 1.1,
	1.2 slapd.conf.template.in, 1.28,
	1.29 slapd.replicas.template.in, 1.3, 1.4 transport.template.in,
	1.7, 1.8 virtual.template.in, 1.7, 1.8 
Message-ID: <20091213151925.413CB600579@lists.intevation.de>

Author: mathieu

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

Modified Files:
	DB_CONFIG.slapd.template.in access.template.in 
	imapd.group.template.in slapd.access.template.in 
	slapd.conf.template.in slapd.replicas.template.in 
	transport.template.in virtual.template.in 
Log Message:
perl-kolab:
    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
    getCyrusGroups(), getPostfixMap(map). This removed the use of
   %special_templates, %haschanged, Kolab::Conf::reload().

kolabd:
 
    kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                    virtual and imapd.groups by templates) using the new
                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.



Index: DB_CONFIG.slapd.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DB_CONFIG.slapd.template.in	17 Jul 2009 22:19:04 -0000	1.5
+++ DB_CONFIG.slapd.template.in	13 Dec 2009 15:19:23 -0000	1.6
@@ -2,6 +2,7 @@
 TARGET=@ldapserver_dir@/DB_CONFIG
 PERMISSIONS=0640
 OWNERSHIP=@ldapserver_usr@:@ldapserver_rgrp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
 KOLAB_META_END
 # (c) 2005 Klaraelvdalens Datakonsult AB
 #     Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>

Index: access.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/access.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access.template.in	17 Nov 2008 18:28:40 -0000	1.1
+++ access.template.in	13 Dec 2009 15:19:23 -0000	1.2
@@ -12,3 +12,4 @@
 # manual additions are lost unless made to the template in the Kolab config
 # directory
 # The template is  @sysconfdir@/kolab/templates/access.template
+

Index: imapd.group.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.group.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imapd.group.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ imapd.group.template.in	13 Dec 2009 15:19:23 -0000	1.2
@@ -9,4 +9,5 @@
 ## Read the file COPYING that comes with this packages for details.
 
 # gid's over 60000 are reserved for LDAP groups !
+@@@print getCyrusGroups()@@@
 

Index: slapd.access.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.access.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- slapd.access.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ slapd.access.template.in	13 Dec 2009 15:19:23 -0000	1.2
@@ -2,6 +2,7 @@
 TARGET=@ldapserver_confdir@/slapd.access
 PERMISSIONS=0640
 OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
 KOLAB_META_END
 ##  Copyright (c) 2005 Klaraelvdalens Datakonsult AB
 ##     Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
@@ -10,4 +11,5 @@
 ## Read the file COPYING that comes with this packages for details.
 
 # Domain ACL statements for inclusion in slapd.conf
+@@@print getLDAPAccess()@@@
 

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- slapd.conf.template.in	27 Nov 2009 17:43:31 -0000	1.28
+++ slapd.conf.template.in	13 Dec 2009 15:19:23 -0000	1.29
@@ -2,6 +2,7 @@
 TARGET=@ldapserver_confdir@/slapd.conf
 PERMISSIONS=0640
 OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003-2007 Martin Konold <martin.konold at erfrakon.de>

Index: slapd.replicas.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.replicas.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- slapd.replicas.template.in	22 Nov 2005 23:01:46 -0000	1.3
+++ slapd.replicas.template.in	13 Dec 2009 15:19:23 -0000	1.4
@@ -2,6 +2,7 @@
 TARGET=@ldapserver_confdir@/slapd.replicas
 PERMISSIONS=0640
 OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
 KOLAB_META_END
 ##  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
 ##     Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
@@ -13,4 +14,5 @@
 # the template is  @sysconfdir@/kolab/templates/slapd.replicas.template
 
 # Replica statements for inclusion in slapd.conf
+@@@print getLDAPReplicas()@@@
 

Index: transport.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/transport.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- transport.template.in	17 Nov 2008 18:28:40 -0000	1.7
+++ transport.template.in	13 Dec 2009 15:19:23 -0000	1.8
@@ -13,3 +13,5 @@
 # manual additions are lost unless made to the template in the Kolab config
 # directory
 # The template is  @sysconfdir@/kolab/templates/transport.template
+@@@print getPostfixMap(transport)@@@
+

Index: virtual.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/virtual.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- virtual.template.in	17 Nov 2008 18:28:40 -0000	1.7
+++ virtual.template.in	13 Dec 2009 15:19:23 -0000	1.8
@@ -13,4 +13,5 @@
 # manual additions are lost unless made to the template in the Kolab config
 # directory
 # The template is  @sysconfdir@/kolab/templates/virtual.template
+@@@print getPostfixMap(virtual)@@@
 



From cvs at kolab.org  Sun Dec 13 16:19:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 16:19:25 +0100 (CET)
Subject: mathieu: server/perl-kolab ChangeLog,1.70,1.71 
Message-ID: <20091213151925.422FF60057C@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
perl-kolab:
    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
    getCyrusGroups(), getPostfixMap(map). This removed the use of
   %special_templates, %haschanged, Kolab::Conf::reload().

kolabd:
 
    kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                    virtual and imapd.groups by templates) using the new
                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- ChangeLog	4 Dec 2009 11:09:38 -0000	1.70
+++ ChangeLog	13 Dec 2009 15:19:23 -0000	1.71
@@ -1,3 +1,10 @@
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
+
+	* lib/Kolab/Conf.pm, sbin/kolabconf.in: new @@@print@@@ macro
+      available for: getLDAPReplicas(), getLDAPAccess(),
+      getCyrusGroups(), getPostfixMap(map). This removed the use of
+      %special_templates, %haschanged, Kolab::Conf::reload()
+
 2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
 
 	* Makefile.PL: kolab/issue3952 (Version in kolabconf is not



From cvs at kolab.org  Sun Dec 13 16:19:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 16:19:25 +0100 (CET)
Subject: mathieu: server/kolabd/kolabd ChangeLog,1.272,1.273 
Message-ID: <20091213151925.23F0660056F@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
perl-kolab:
    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
    getCyrusGroups(), getPostfixMap(map). This removed the use of
   %special_templates, %haschanged, Kolab::Conf::reload().

kolabd:
 
    kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                    virtual and imapd.groups by templates) using the new
                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- ChangeLog	2 Dec 2009 18:10:31 -0000	1.272
+++ ChangeLog	13 Dec 2009 15:19:22 -0000	1.273
@@ -1,3 +1,11 @@
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
+
+	* templates/{DB_CONFIG.slapd,imapd.group,slapd.access,slapd.conf,
+      slapd.replicas,transport,virtual}.template.in: use the new
+      @@@print@@@ macro (perl-kolab) to behave like other templates
+      (solved kolab/issue1740).
+      Use RUNONCHANGE for OpenLDAP configuration files.
+
 2009-12-02  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/php.ini.template.in: dist_conf'iguration for



From cvs at kolab.org  Sun Dec 13 17:05:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 17:05:40 +0100 (CET)
Subject: mathieu: server/perl-kolab/sbin kolabconf.in,1.4,1.5 
Message-ID: <20091213160540.757C7600570@lists.intevation.de>

Author: mathieu

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

Modified Files:
	kolabconf.in 
Log Message:
$Kolab::do_reload is now an argument to Kolab::Conf::rebuildTemplates().


Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolabconf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabconf.in	13 Dec 2009 15:19:23 -0000	1.4
+++ kolabconf.in	13 Dec 2009 16:05:38 -0000	1.5
@@ -93,9 +93,9 @@
     exit 0;
 }
 
-$Kolab::do_reload = 1;
+my $do_reload = 1;
 if($opt_n) {
-    $Kolab::do_reload = 0;
+    $do_reload = 0;
 }
 
 if( !$Kolab::reloadOk ) {
@@ -106,6 +106,6 @@
 }
 
 Kolab::log('KC', 'Rebuilding templates');
-Kolab::Conf::rebuildTemplates;
+Kolab::Conf::rebuildTemplates(doreload => $do_reload);
 Kolab::log('KC', 'Finished');
 



From cvs at kolab.org  Sun Dec 13 17:05:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 17:05:40 +0100 (CET)
Subject: mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.13,1.14 
Message-ID: <20091213160540.6E96060056F@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv24275/perl-kolab/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
$Kolab::do_reload is now an argument to Kolab::Conf::rebuildTemplates().


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Conf.pm	13 Dec 2009 15:19:23 -0000	1.13
+++ Conf.pm	13 Dec 2009 16:05:38 -0000	1.14
@@ -595,6 +595,9 @@
 
 sub rebuildTemplates
 {
+    my %args = @_;
+    $args{doreload} = 1 if !exists $args{doreload};
+
     my $key;
     my $value;
     my $section="";
@@ -632,7 +635,7 @@
         # - kolabsrv rc post reload  (in other distributions)
         # The commands with ' rc ' may only be executed when reloading is not
         # prohibited by the user with the "-n" option.
-        if ($Kolab::do_reload || $cmd !~ / rc \S+ re(start|load)/) {
+        if ($args{doreload} || $cmd !~ / rc \S+ re(start|load)/) {
             Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
             system($cmd);
         } else {



From cvs at kolab.org  Sun Dec 13 17:05:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 17:05:40 +0100 (CET)
Subject: mathieu: server/perl-kolab ChangeLog,1.71,1.72 
Message-ID: <20091213160540.683F660056E@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
$Kolab::do_reload is now an argument to Kolab::Conf::rebuildTemplates().


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- ChangeLog	13 Dec 2009 15:19:23 -0000	1.71
+++ ChangeLog	13 Dec 2009 16:05:38 -0000	1.72
@@ -1,5 +1,10 @@
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
+	* lib/Kolab/Conf.pm, sbin/kolabconf.in: $Kolab::do_reload is now an
+      argument to Kolab::Conf::rebuildTemplates().
+
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
+
 	* lib/Kolab/Conf.pm, sbin/kolabconf.in: new @@@print@@@ macro
       available for: getLDAPReplicas(), getLDAPAccess(),
       getCyrusGroups(), getPostfixMap(map). This removed the use of



From cvs at kolab.org  Sun Dec 13 18:54:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 18:54:25 +0100 (CET)
Subject: mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.14,1.15 
Message-ID: <20091213175425.98F6060056E@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv26677/perl-kolab/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
    Touch configuration only when there is a change. This avoid postfix
    complaining about "database X.db is older than source file X".



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Conf.pm	13 Dec 2009 16:05:38 -0000	1.14
+++ Conf.pm	13 Dec 2009 17:54:23 -0000	1.15
@@ -56,7 +56,7 @@
 my %templates = ();
 my %ownership = ();
 my %permissions = ();
-my %templatehaschanged = ();
+my %confighaschanged = ();
 my %commentchar = ();
 
 sub fixup {
@@ -120,20 +120,8 @@
     my $perm = shift;
     my $cchr = shift;  # comment character
 
-    my $oldcfg = $cfg . '.old';
     my $templatedir = $Kolab::config{"templatedir"};
 
-    my $oldmask = umask 077;
-    #creating the config file is changing it
-    if (! -f $cfg) { 
-        $templatehaschanged{$tmpl} = 1;
-        Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG );
-    }
-    copy($cfg, $oldcfg);
-    # To avoid warnings, the backup files must be owned by root
-    chown(0, 0, $oldcfg);
-    umask $oldmask;
-
     Kolab::log('T', "Creating new configuration file `$cfg' from template `$tmpl'", KOLAB_DEBUG );
 
     my $template;
@@ -276,17 +264,30 @@
     $template->close;
     $config->close;
 
-    move($config->filename, $cfg) || Kolab::log('T', "Error moving configfile to $cfg, error: $!", KOLAB_ERROR );
-    fixup( $cfg, $owner, $perm );
 
-    if (-f $oldcfg) {
-        my $rc = `diff -q $cfg $oldcfg`;
+    if (-f $cfg) {
+        my $cfgtemp = $config->filename;
+        my $rc = `diff -q $cfg $cfgtemp`;
         chomp($rc);
         if ($rc) {
-            $templatehaschanged{$tmpl} = 1;
-
             Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
+            $confighaschanged{$tmpl} = 1;
+            #making backup
+            my $cfgbackup = $cfg . '.old';
+            my $oldmask = umask 077;
+            move($cfg, $cfgbackup) || Kolab::log('T', "Error backuping configfile to $cfgbackup, error: $!", KOLAB_ERROR );
+            # To avoid warnings, the backup files must be owned by root
+            chown(0, 0, $cfgbackup);
+            umask $oldmask;
         }
+    } else {
+        Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG );
+        $confighaschanged{$tmpl} = 1;
+    }
+
+    if($confighaschanged{$tmpl}) {
+        move($config->filename, $cfg) || Kolab::log('T', "Error moving configfile to $cfg, error: $!", KOLAB_ERROR );
+        fixup( $cfg, $owner, $perm );
     }
 
     Kolab::log('T', "Finished creating configuration file `$cfg'", KOLAB_DEBUG );
@@ -621,7 +622,7 @@
 
     my %cmds = ();
     foreach $key (keys %runonchange) {
-	if (defined $templatehaschanged{$key})
+	if (defined $confighaschanged{$key})
 	{
 	    Kolab::log('T', 'Queueing RUNONCHANGE for '.$key, KOLAB_DEBUG );
 	    $cmds{$runonchange{$key}} = 1;



From cvs at kolab.org  Sun Dec 13 18:54:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 18:54:25 +0100 (CET)
Subject: mathieu: server release-notes.txt,1.474,1.475 
Message-ID: <20091213175425.9BC6E60056F@lists.intevation.de>

Author: mathieu

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

Modified Files:
	release-notes.txt 
Log Message:
    Touch configuration only when there is a change. This avoid postfix
    complaining about "database X.db is older than source file X".



Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -d -r1.474 -r1.475
--- release-notes.txt	13 Dec 2009 15:19:22 -0000	1.474
+++ release-notes.txt	13 Dec 2009 17:54:23 -0000	1.475
@@ -134,6 +134,9 @@
     getCyrusGroups(), getPostfixMap(map). This removed the use of
     %special_templates, %haschanged, Kolab::Conf::reload().
 
+    Touch configuration only when there is a change. This avoid postfix
+    complaining about "database X.db is older than source file X".
+
 	kolab/issue1679 (Update template META mechanism to support service
 	                 restarts)
 	kolab/issue3604 (Change LDAPD in kolab_bootstrap to just openldap)



From cvs at kolab.org  Sun Dec 13 18:54:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 18:54:25 +0100 (CET)
Subject: mathieu: server/perl-kolab ChangeLog,1.72,1.73 
Message-ID: <20091213175425.9D3C2600570@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
    Touch configuration only when there is a change. This avoid postfix
    complaining about "database X.db is older than source file X".



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- ChangeLog	13 Dec 2009 16:05:38 -0000	1.72
+++ ChangeLog	13 Dec 2009 17:54:23 -0000	1.73
@@ -1,5 +1,12 @@
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
+	* lib/Kolab/Conf.pm: Touch configuration only when there is a change.
+      This avoid postfix complaining about "database X.db is older than 
+      source file X".
+      Additionnay, renamed %templatehaschanged to %confighaschanged.
+
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
+
 	* lib/Kolab/Conf.pm, sbin/kolabconf.in: $Kolab::do_reload is now an
       argument to Kolab::Conf::rebuildTemplates().
 



From cvs at kolab.org  Sun Dec 13 19:04:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 19:04:39 +0100 (CET)
Subject: mathieu: server release-notes.txt,1.475,1.476 
Message-ID: <20091213180439.A533D60056E@lists.intevation.de>

Author: mathieu

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue1671 (Improving the warning about kolab templates within
                 configuration files)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- release-notes.txt	13 Dec 2009 17:54:23 -0000	1.475
+++ release-notes.txt	13 Dec 2009 18:04:37 -0000	1.476
@@ -95,6 +95,8 @@
     kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                     virtual and imapd.groups by templates) using the new
                     @@@print@@@ macro (perl-kolab) and RUNONCHANGE.
+    kolab/issue1671 (Improving the warning about kolab templates within
+                     configuration files)
 
     - kolab-fbview-1.2.0-2009????
 



From cvs at kolab.org  Sun Dec 13 19:04:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 19:04:39 +0100 (CET)
Subject: mathieu: server/kolabd/kolabd ChangeLog,1.273,1.274 
Message-ID: <20091213180439.B0C5560056F@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
kolab/issue1671 (Improving the warning about kolab templates within
                 configuration files)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- ChangeLog	13 Dec 2009 15:19:22 -0000	1.273
+++ ChangeLog	13 Dec 2009 18:04:37 -0000	1.274
@@ -1,3 +1,9 @@
+2009-12-02  Mathieu Parent <math.parent at gmail.com>
+
+	* templates/*.template.in: Use @@@warning@@@ macro, improving the
+      warning about kolab templates within configuration files
+      (kolab/issue1671).
+
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/{DB_CONFIG.slapd,imapd.group,slapd.access,slapd.conf,



From cvs at kolab.org  Sun Dec 13 19:04:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 19:04:40 +0100 (CET)
Subject: mathieu: server/kolabd/kolabd/templates DB_CONFIG.slapd.template.in,
	1.6, 1.7 access.template.in, 1.2, 1.3 amavisd.conf.template.in,
	1.15, 1.16 canonical.template.in, 1.1,
	1.2 clamd.conf.template.in, 1.6, 1.7 cyrus.conf.template.in, 1.8,
	1.9 freebusy.conf.template.in, 1.21,
	1.22 freshclam.conf.template.in, 1.3,
	1.4 header_checks.template.in, 1.1, 1.2 httpd.conf.template.in,
	1.30, 1.31 httpd.local.template.in, 1.4,
	1.5 imapd.conf.template.in, 1.17, 1.18 imapd.group.template.in,
	1.2, 1.3 kolab_smtpdpolicy.conf.template.in, 1.3,
	1.4 ldap.conf.template.in, 1.2, 1.3 ldapdistlist.cf.template.in,
	1.4, 1.5 ldaptransport.cf.template.in, 1.2,
	1.3 ldapvirtual.cf.template.in, 1.2, 1.3 local.cf.template.in,
	1.2, 1.3 main.cf.template.in, 1.25, 1.26 master.cf.template.in,
	1.27, 1.28 php.ini.template.in, 1.10, 1.11 rc.conf.template.in,
	1.6, 1.7 relocated.template.in, 1.1, 1.2 resmgr.conf.template.in,
	1.36, 1.37 saslauthd.conf.template.in, 1.5,
	1.6 session_vars.php.template.in, 1.6,
	1.7 slapd.access.template.in, 1.2, 1.3 slapd.conf.templa
	te.in, 1.29, 1.30 slapd.replicas.template.in, 1.4,
	1.5 transport.template.in, 1.8, 1.9 virtual.template.in, 1.8, 1.9 
Message-ID: <20091213180440.1206560056E@lists.intevation.de>

Author: mathieu

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

Modified Files:
	DB_CONFIG.slapd.template.in access.template.in 
	amavisd.conf.template.in canonical.template.in 
	clamd.conf.template.in cyrus.conf.template.in 
	freebusy.conf.template.in freshclam.conf.template.in 
	header_checks.template.in httpd.conf.template.in 
	httpd.local.template.in imapd.conf.template.in 
	imapd.group.template.in kolab_smtpdpolicy.conf.template.in 
	ldap.conf.template.in ldapdistlist.cf.template.in 
	ldaptransport.cf.template.in ldapvirtual.cf.template.in 
	local.cf.template.in main.cf.template.in master.cf.template.in 
	php.ini.template.in rc.conf.template.in relocated.template.in 
	resmgr.conf.template.in saslauthd.conf.template.in 
	session_vars.php.template.in slapd.access.template.in 
	slapd.conf.template.in slapd.replicas.template.in 
	transport.template.in virtual.template.in 
Log Message:
kolab/issue1671 (Improving the warning about kolab templates within
                 configuration files)


Index: DB_CONFIG.slapd.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DB_CONFIG.slapd.template.in	13 Dec 2009 15:19:23 -0000	1.6
+++ DB_CONFIG.slapd.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -10,8 +10,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend and should have the
-# file mode 0640
+@@@warning@@@
 
 set_cachesize   0       26214400        1
 set_tmp_dir /dev/shm

Index: access.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/access.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- access.template.in	13 Dec 2009 15:19:23 -0000	1.2
+++ access.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,8 +8,5 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/access.template
+@@@warning@@@
 

Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- amavisd.conf.template.in	7 Apr 2009 13:31:16 -0000	1.15
+++ amavisd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.16
@@ -4,8 +4,7 @@
 OWNERSHIP=@amavisd_usr@:@amavisd_grp@
 RUNONCHANGE=@KOLABRC@ rc amavisd restart
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 use strict;
 

Index: canonical.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/canonical.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- canonical.template.in	17 Nov 2008 18:28:40 -0000	1.1
+++ canonical.template.in	13 Dec 2009 18:04:37 -0000	1.2
@@ -8,7 +8,5 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/canonical.template
+@@@warning@@@
+

Index: clamd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/clamd.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clamd.conf.template.in	13 May 2009 11:11:51 -0000	1.6
+++ clamd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -4,8 +4,8 @@
 OWNERSHIP=@clamav_usr@:@clamav_grp@
 RUNONCHANGE=@KOLABRC@ rc clamav restart
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
+
 ##
 ## Example config file for the Clam AV daemon
 ## Please read the clamd.conf(5) manual before editing this file.

Index: cyrus.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/cyrus.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cyrus.conf.template.in	7 May 2009 16:13:33 -0000	1.8
+++ cyrus.conf.template.in	13 Dec 2009 18:04:37 -0000	1.9
@@ -10,9 +10,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
-
+@@@warning@@@
 
 START {
   # do not delete this entry!

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- freebusy.conf.template.in	10 Feb 2009 22:41:14 -0000	1.21
+++ freebusy.conf.template.in	13 Dec 2009 18:04:37 -0000	1.22
@@ -4,6 +4,7 @@
 OWNERSHIP=@freebusy_usr@:@freebusy_grp@
 KOLAB_META_END
 <?php
+@@@warning@@@
 
 /*  
  *  COPYRIGHT

Index: freshclam.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freshclam.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freshclam.conf.template.in	26 Mar 2009 16:17:15 -0000	1.3
+++ freshclam.conf.template.in	13 Dec 2009 18:04:37 -0000	1.4
@@ -3,8 +3,8 @@
 PERMISSIONS=0640
 OWNERSHIP=@clamav_usr@:@clamav_grp@
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
+
 ##
 ## Example config file for freshclam
 ## Please read the freshclam.conf(5) manual before editing this file.

Index: header_checks.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/header_checks.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- header_checks.template.in	5 Mar 2008 17:13:15 -0000	1.1
+++ header_checks.template.in	13 Dec 2009 18:04:37 -0000	1.2
@@ -3,10 +3,7 @@
 PERMISSIONS=0640
 OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/header_checks.template
+@@@warning@@@
 
 # Cyrus does not like empty Message-Id: headers, see kolab/issue2350
 /^Message-Id:[[:space:]]*$/	IGNORE

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- httpd.conf.template.in	22 May 2009 19:10:28 -0000	1.30
+++ httpd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.31
@@ -10,8 +10,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 ### Section 1: Global Environment
 ServerRoot "@prefix@"

Index: httpd.local.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.local.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- httpd.local.template.in	17 Mar 2009 13:15:16 -0000	1.4
+++ httpd.local.template.in	13 Dec 2009 18:04:37 -0000	1.5
@@ -8,9 +8,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-
-# this file is initially automatically written by the Kolab config backend
-# manualy additions are kept between rpm updates
+@@@warning@@@
 
 # The purpose of this file is to add local non Kolab specific extensions to 
 # the Apache installation. This file gets included at the end of the Apache

Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- imapd.conf.template.in	7 May 2009 16:13:33 -0000	1.17
+++ imapd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.18
@@ -10,10 +10,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# This file is automatically written by the Kolab config backend.
-# Manual additions are lost unless made to the template in the Kolab config directory.
-# The template is @sysconfdir@/kolab/templates/imapd.conf.template
-
+@@@warning@@@
 
 #   Warning: Do not use a trailing slash in paths!
 configdirectory:        @imap_statedir@

Index: imapd.group.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.group.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imapd.group.template.in	13 Dec 2009 15:19:23 -0000	1.2
+++ imapd.group.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,6 +8,8 @@
 ## This program is Free Software under the GNU General Public License (>=v2).
 ## Read the file COPYING that comes with this packages for details.
 
+@@@warning@@@
+
 # gid's over 60000 are reserved for LDAP groups !
 @@@print getCyrusGroups()@@@
 

Index: kolab_smtpdpolicy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/kolab_smtpdpolicy.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_smtpdpolicy.conf.template.in	31 Jan 2006 22:20:16 -0000	1.3
+++ kolab_smtpdpolicy.conf.template.in	13 Dec 2009 18:04:37 -0000	1.4
@@ -8,8 +8,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 ldap_uri: @@@ldap_uri@@@
 basedn: @@@user_dn_list@@@

Index: ldap.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldap.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldap.conf.template.in	22 Nov 2005 22:54:09 -0000	1.2
+++ ldap.conf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -7,11 +7,8 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend and should have the 
-# file mode 0644
+@@@warning@@@
 
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is  @sysconfdir@/kolab/templates/ldap.conf.template
 #
 # LDAP Defaults
 #

Index: ldapdistlist.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldapdistlist.cf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ldapdistlist.cf.template.in	30 Nov 2007 11:14:58 -0000	1.4
+++ ldapdistlist.cf.template.in	13 Dec 2009 18:04:37 -0000	1.5
@@ -8,9 +8,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template file ldapdistlist.cf.template
-# in the Kolab config directory
+@@@warning@@@
 
 #
 # LDAP Distributionlist support for postfix

Index: ldaptransport.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldaptransport.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldaptransport.cf.template.in	17 Mar 2009 16:46:31 -0000	1.2
+++ ldaptransport.cf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -9,8 +9,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 #
 # LDAP Transport for multilocation support

Index: ldapvirtual.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldapvirtual.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldapvirtual.cf.template.in	27 Mar 2009 12:09:27 -0000	1.2
+++ ldapvirtual.cf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,8 +8,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 #
 # LDAP Alias support for postfix

Index: local.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/local.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- local.cf.template.in	24 Nov 2009 20:34:33 -0000	1.2
+++ local.cf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,10 +8,8 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/local.cf.template
+@@@warning@@@
+
 ##
 ##  @spamassassin_confdir@/local.cf -- site-wide defaults for SpamAssassin
 ##  (see 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked)

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- main.cf.template.in	26 Nov 2009 15:01:18 -0000	1.25
+++ main.cf.template.in	13 Dec 2009 18:04:37 -0000	1.26
@@ -11,9 +11,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 # postfix default is 10 240 000 Byte = 10.24 Megabyte, 
 # we use 20 Megabyte = 20*2^20 Byte as Kolab default

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- master.cf.template.in	14 May 2009 10:58:33 -0000	1.27
+++ master.cf.template.in	13 Dec 2009 18:04:37 -0000	1.28
@@ -11,9 +11,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 # ==========================================================================
 # service type  private unpriv  chroot  wakeup  maxproc command + args

Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- php.ini.template.in	2 Dec 2009 18:10:31 -0000	1.10
+++ php.ini.template.in	13 Dec 2009 18:04:37 -0000	1.11
@@ -3,7 +3,10 @@
 PERMISSIONS=0640
 OWNERSHIP=@webserver_musr@:@webserver_grp@
 RUNONCHANGE=@KOLABRC@ rc apache reload
+COMMENT_CHAR=;
 KOLAB_META_END
+@@@warning@@@
+
 ;;
 ;;  php.ini -- PHP Configuration
 ;;

Index: rc.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/rc.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rc.conf.template.in	17 Mar 2009 11:20:57 -0000	1.6
+++ rc.conf.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -8,8 +8,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 openldap_url="ldap://@@@bind_addr@@@/ ldaps://@@@bind_addr@@@/"
 sasl_authmech="ldap"

Index: relocated.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/relocated.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- relocated.template.in	17 Nov 2008 18:28:40 -0000	1.1
+++ relocated.template.in	13 Dec 2009 18:04:37 -0000	1.2
@@ -8,7 +8,5 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/relocated.template
+@@@warning@@@
+

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- resmgr.conf.template.in	5 Jun 2009 12:54:02 -0000	1.36
+++ resmgr.conf.template.in	13 Dec 2009 18:04:37 -0000	1.37
@@ -4,6 +4,7 @@
 OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
 KOLAB_META_END
 <?php
+@@@warning@@@
 
 /*  
  *  COPYRIGHT

Index: saslauthd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/saslauthd.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- saslauthd.conf.template.in	15 Jun 2009 21:16:46 -0000	1.5
+++ saslauthd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.6
@@ -10,9 +10,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 ldap_servers: @@@user_ldap_uri@@@
 #ldap_servers: <ldap://localhost/>

Index: session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- session_vars.php.template.in	6 Mar 2008 11:47:54 -0000	1.6
+++ session_vars.php.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -4,6 +4,8 @@
 OWNERSHIP=@webserver_musr@:@kolab_grp@
 KOLAB_META_END
 <?php
+@@@warning@@@
+
 /*
 # (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>

Index: slapd.access.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.access.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slapd.access.template.in	13 Dec 2009 15:19:23 -0000	1.2
+++ slapd.access.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -10,6 +10,8 @@
 ## This program is Free Software under the GNU General Public License (>=v2).
 ## Read the file COPYING that comes with this packages for details.
 
+@@@warning@@@
+
 # Domain ACL statements for inclusion in slapd.conf
 @@@print getLDAPAccess()@@@
 

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- slapd.conf.template.in	13 Dec 2009 15:19:23 -0000	1.29
+++ slapd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.30
@@ -10,9 +10,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-
-# this file is automatically written by the Kolab config backend and should have the 
-# file mode 0640
+@@@warning@@@
 
 @@@if ldapserver_modulepath@@@
 modulepath     @@@ldapserver_modulepath@@@

Index: slapd.replicas.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.replicas.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- slapd.replicas.template.in	13 Dec 2009 15:19:23 -0000	1.4
+++ slapd.replicas.template.in	13 Dec 2009 18:04:37 -0000	1.5
@@ -10,8 +10,7 @@
 ## This program is Free Software under the GNU General Public License (>=v2).
 ## Read the file COPYING that comes with this packages for details.
 
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is  @sysconfdir@/kolab/templates/slapd.replicas.template
+@@@warning@@@
 
 # Replica statements for inclusion in slapd.conf
 @@@print getLDAPReplicas()@@@

Index: transport.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/transport.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- transport.template.in	13 Dec 2009 15:19:23 -0000	1.8
+++ transport.template.in	13 Dec 2009 18:04:37 -0000	1.9
@@ -9,9 +9,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/transport.template
+@@@warning@@@
+
 @@@print getPostfixMap(transport)@@@
 

Index: virtual.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/virtual.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- virtual.template.in	13 Dec 2009 15:19:23 -0000	1.8
+++ virtual.template.in	13 Dec 2009 18:04:37 -0000	1.9
@@ -9,9 +9,7 @@
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/virtual.template
+@@@warning@@@
+
 @@@print getPostfixMap(virtual)@@@
 



From cvs at kolab.org  Sun Dec 13 19:27:11 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 19:27:11 +0100 (CET)
Subject: mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.15,1.16 
Message-ID: <20091213182711.027C660056E@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv27781/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Correct indentation: tab -> 4 spaces


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Conf.pm	13 Dec 2009 17:54:23 -0000	1.15
+++ Conf.pm	13 Dec 2009 18:27:08 -0000	1.16
@@ -69,13 +69,13 @@
     my $gid = (getgrnam($group))[2];
     Kolab::log('T', sprintf("Changing permissions of %s to 0%o", $file, $perm ), KOLAB_DEBUG );
     if( chmod($perm, $file) != 1 ) {
-	Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm) . ": $!", KOLAB_ERROR);
-	exit(1);
+        Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm) . ": $!", KOLAB_ERROR);
+        exit(1);
     }
     Kolab::log('T', "Changing owner of $file to $owner:$group ($uid:$gid)", KOLAB_DEBUG );
     if( chown($uid,$gid,$file) != 1 ) {
-	Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid: $!", KOLAB_ERROR);
-	exit(1);
+        Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid: $!", KOLAB_ERROR);
+        exit(1);
     }
 }
 
@@ -145,7 +145,7 @@
         #Eat the meta data sections
         if (/^KOLAB_META_START$/) {
             my $found_end;
-            while (!$found_end) {	
+            while (!$found_end) {
             $_ = <$template>;
             $found_end = /^KOLAB_META_END$/;
             }
@@ -304,13 +304,13 @@
         $Kolab::config{'ldap_port'},
         $Kolab::config{'bind_dn'},
         $Kolab::config{'bind_pw'}
-	);
+    );
 
     my $mesg = $ldap->search(
         base    => 'k=kolab,'.$Kolab::config{'base_dn'},
         scope   => 'base',
         filter  => '(objectclass=*)'
-	);
+    );
     if ($mesg->code) {
         Kolab::log('T', "Unable to locate Postfix $map map entries in LDAP", KOLAB_ERROR);
         exit(1);
@@ -345,13 +345,13 @@
         $Kolab::config{'ldap_port'},
         $Kolab::config{'bind_dn'},
         $Kolab::config{'bind_pw'}
-	);
+    );
 
     my $mesg = $ldap->search(
         base    => $Kolab::config{'base_dn'},
         scope   => 'sub',
         filter  => '(&(mail=*)(objectclass=kolabgroupofnames))'
-	);
+    );
     if ($mesg->code) {
         Kolab::log('T', 'Unable to locate Cyrus groups in LDAP', KOLAB_ERROR);
         exit(1);
@@ -362,20 +362,20 @@
     if ($mesg->code <= 0) {
         foreach $ldapobject ($mesg->entries) {
             #my $group = $ldapobject->get_value('cn') . '@'.join('.',reverse(@dn)) . ":*:$count:";
-	    my $group = lc($ldapobject->get_value('mail')).":*:$count:";
+            my $group = lc($ldapobject->get_value('mail')).":*:$count:";
             my $userlist = $ldapobject->get_value('member', asref => 1);
             foreach (@$userlist) {
-		my $uid = $_;
-		my $umesg = $ldap->search( base => $uid,
-					   scope => 'base', 
-					   filter => '(objectClass=*)' );
-		if ( $umesg && $umesg->code() <= 0 && $umesg->count() == 1 ) {
-		    my $mail;
-		    ($mail = $umesg->entry(0)->get_value('mail')) or
-			($mail = $umesg->entry(0)->get_value('uid'));
-		    $group .= lc($mail).',';		
-		}
-	    }
+                my $uid = $_;
+                my $umesg = $ldap->search( base => $uid,
+                    scope => 'base', 
+                    filter => '(objectClass=*)' );
+                if ( $umesg && $umesg->code() <= 0 && $umesg->count() == 1 ) {
+                    my $mail;
+                    ($mail = $umesg->entry(0)->get_value('mail')) or
+                    ($mail = $umesg->entry(0)->get_value('uid'));
+                    $group .= lc($mail).',';
+                }
+            }
             $group =~ s/,$//;
             $ret .= $group . "\n";
             Kolab::log('T', "Adding cyrus group `$group'");
@@ -429,32 +429,32 @@
          by * search stop
 EOS
 
-	my $str;
+    my $str;
     my $domain;
     my @domains;
     if( ref($Kolab::config{'postfix-mydestination'}) eq 'ARRAY' ) {
-	@domains = @{$Kolab::config{'postfix-mydestination'}};
+        @domains = @{$Kolab::config{'postfix-mydestination'}};
     } else {
-	@domains =( $Kolab::config{'postfix-mydestination'} );
+        @domains =( $Kolab::config{'postfix-mydestination'} );
     }
 
     ($str = $dom_acl1) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
     $ret .= $str;
 
     foreach $domain (@domains) {
-	($str = $dom_acl2) =~ s/\@{3}domain\@{3}/$domain/g;
-	$str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;	
-	$ret .= $str;
+        ($str = $dom_acl2) =~ s/\@{3}domain\@{3}/$domain/g;
+        $str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
+        $ret .= $str;
     }
 
     ($str = $dom_acl3) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
     $ret .= $str;
 
     foreach $domain (@domains) {
-	($str = $global_acl) =~ s/\@{3}domain\@{3}/$domain/g;
-	$str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;	
-	$ret .= $str;
-	Kolab::log('T', "Adding acl for domain '$str'");
+        ($str = $global_acl) =~ s/\@{3}domain\@{3}/$domain/g;
+        $str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
+        $ret .= $str;
+        Kolab::log('T', "Adding acl for domain '$str'");
     }
     return $ret;
 }
@@ -483,26 +483,26 @@
 
     } else {
 
-      if( $Kolab::config{'is_master'} eq "true" ) {
-  	# Master setup
-  	my @kh;
-  	if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
-  	    @kh = @{$Kolab::config{'kolabhost'}};
-  	} else {
-  	    @kh = ( $Kolab::config{'kolabhost'} );
-  	}
-  	for my $h ( @kh ) {
-  	    next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
-  	    $ret .= "replica uri=ldaps://$h\n"
-  		."  binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
-  		."  bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
-  	}
-      } else {
-  	# Slave setup
-  	# Output an update dn statement instead
-  	$ret .= "updatedn ".$Kolab::config{'bind_dn'}."\n";
-  	$ret .= "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
-      }
+        if( $Kolab::config{'is_master'} eq "true" ) {
+            # Master setup
+            my @kh;
+            if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
+                @kh = @{$Kolab::config{'kolabhost'}};
+            } else {
+                @kh = ( $Kolab::config{'kolabhost'} );
+            }
+            for my $h ( @kh ) {
+                next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
+                $ret .= "replica uri=ldaps://$h\n"
+                ."  binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
+                ."  bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
+            }
+        } else {
+            # Slave setup
+            # Output an update dn statement instead
+            $ret .= "updatedn ".$Kolab::config{'bind_dn'}."\n";
+            $ret .= "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
+        }
     }
 
     Kolab::log('T', 'Finished building LDAP replicas', KOLAB_DEBUG);
@@ -510,24 +510,24 @@
 }
 
 sub replaceMetaVar
-{	
+{
     my $var = shift;
 
     while ($var =~ /\@{3}([^\s\@]+?)\@{3}/) {
-	my $attr = $1;
-	if ($Kolab::config{$attr}) {
-	    my $val = $Kolab::config{$attr};
-	    $var =~ s/\@{3}([^\s\@]+?)\@{3}/$val/;
-	} else {
-	    Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
-	}
+        my $attr = $1;
+        if ($Kolab::config{$attr}) {
+            my $val = $Kolab::config{$attr};
+            $var =~ s/\@{3}([^\s\@]+?)\@{3}/$val/;
+        } else {
+            Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
+        }
     }
     return $var;
 }
 
 
 sub loadMetaTemplates
-{	
+{
     my $templatedir = shift;
     my ($tref, $pref, $oref, $cmdref, $ccharref) = @_;
 
@@ -537,59 +537,58 @@
     closedir(DIR);
 
     foreach my $template (@metatemplates) {
-	my $runonchange = undef;
-	my $commentchar = undef;
-	#Open each file and check for the META
-	if (open (TEMPLATE, "$templatedir/$template" )) {
-	    my $line = <TEMPLATE>;
-	    if ($line =~ /^KOLAB_META_START$/) {
-		Kolab::log('T', 'Processing META template :'.$template, KOLAB_DEBUG );
-		my ($found_end, $target, $permissions, $ownership);
-		while (<TEMPLATE>) {
-		    $line = $_;
-		    
-		    if (!$found_end) {
-			$found_end = $line =~ /^KOLAB_META_END$/;
-			if (!$found_end && $line) {
-			    my ($key,$value) = split(/=/,$line);
-			    chomp($value);
-			    Kolab::log('T', 'META Key: '.$key.' Value: '.$value, KOLAB_DEBUG );
-			    if ($key =~ /^TARGET$/) {
-				$target = replaceMetaVar($value);
-				Kolab::log('T', 'META Target '.$target, KOLAB_DEBUG );
-			    } elsif ($key =~ /^PERMISSIONS$/) {
-				$permissions = replaceMetaVar($value);
-				Kolab::log('T', 'META Permissions '.$permissions, KOLAB_DEBUG );
-			    } elsif ($key =~ /^OWNERSHIP$/) {
-				$ownership = replaceMetaVar($value);
-				Kolab::log('T', 'META Ownership '.$ownership, KOLAB_DEBUG );
-			    } elsif ($key =~ /^RUNONCHANGE$/) {
-				$runonchange = replaceMetaVar($value);
-				Kolab::log('T', 'META Cmd to execute '.$runonchange, KOLAB_DEBUG );
-			    } elsif ($key =~ /^COMMENT_CHAR$/) {
-			      $commentchar = replaceMetaVar($value);
-			      Kolab::log('T', 'META CommentChar to use: '.$commentchar, KOLAB_DEBUG );
-			    } else {
-			        Kolab::log('T', 'incorrect META key "'.$key.'" in: '.$template, KOLAB_WARN );
-			    }
-			}
-		    }
-		}
-		if ($found_end && $target && $permissions && $ownership) {
-		    Kolab::log('T', 'All mandatory fields populated in '.$template, KOLAB_DEBUG );
-		    $$tref{$templatedir . "/" . $template} = $target;
-		    $$oref{$target} = $ownership;
-		    $permissions = oct($permissions);
-		    $$pref{$target} = $permissions;
-		    my $runcmdtemplate = $templatedir."/".$template;
-		    $$cmdref{$runcmdtemplate} = $runonchange if (defined $runonchange);
-		    $$ccharref{$target} = $commentchar if (defined $commentchar);
-		}
-		
-	    }
-	} else {
-	    Kolab::log('T', 'Could not open template file: '. $template, KOLAB_WARN);
-	}
+        my $runonchange = undef;
+        my $commentchar = undef;
+        #Open each file and check for the META
+        if (open (TEMPLATE, "$templatedir/$template" )) {
+            my $line = <TEMPLATE>;
+            if ($line =~ /^KOLAB_META_START$/) {
+                Kolab::log('T', 'Processing META template :'.$template, KOLAB_DEBUG );
+                my ($found_end, $target, $permissions, $ownership);
+                while (<TEMPLATE>) {
+                    $line = $_;
+                    
+                    if (!$found_end) {
+                        $found_end = $line =~ /^KOLAB_META_END$/;
+                        if (!$found_end && $line) {
+                            my ($key,$value) = split(/=/,$line);
+                            chomp($value);
+                            Kolab::log('T', 'META Key: '.$key.' Value: '.$value, KOLAB_DEBUG );
+                            if ($key =~ /^TARGET$/) {
+                                $target = replaceMetaVar($value);
+                                Kolab::log('T', 'META Target '.$target, KOLAB_DEBUG );
+                            } elsif ($key =~ /^PERMISSIONS$/) {
+                                $permissions = replaceMetaVar($value);
+                                Kolab::log('T', 'META Permissions '.$permissions, KOLAB_DEBUG );
+                            } elsif ($key =~ /^OWNERSHIP$/) {
+                                $ownership = replaceMetaVar($value);
+                                Kolab::log('T', 'META Ownership '.$ownership, KOLAB_DEBUG );
+                            } elsif ($key =~ /^RUNONCHANGE$/) {
+                                $runonchange = replaceMetaVar($value);
+                                Kolab::log('T', 'META Cmd to execute '.$runonchange, KOLAB_DEBUG );
+                            } elsif ($key =~ /^COMMENT_CHAR$/) {
+                                $commentchar = replaceMetaVar($value);
+                                Kolab::log('T', 'META CommentChar to use: '.$commentchar, KOLAB_DEBUG );
+                            } else {
+                                Kolab::log('T', 'incorrect META key "'.$key.'" in: '.$template, KOLAB_WARN );
+                            }
+                        }
+                    }
+                }
+                if ($found_end && $target && $permissions && $ownership) {
+                    Kolab::log('T', 'All mandatory fields populated in '.$template, KOLAB_DEBUG );
+                    $$tref{$templatedir . "/" . $template} = $target;
+                    $$oref{$target} = $ownership;
+                    $permissions = oct($permissions);
+                    $$pref{$target} = $permissions;
+                    my $runcmdtemplate = $templatedir."/".$template;
+                    $$cmdref{$runcmdtemplate} = $runonchange if (defined $runonchange);
+                    $$ccharref{$target} = $commentchar if (defined $commentchar);
+                }
+            }
+        } else {
+            Kolab::log('T', 'Could not open template file: '. $template, KOLAB_WARN);
+        }
     }
 
 }
@@ -622,11 +621,10 @@
 
     my %cmds = ();
     foreach $key (keys %runonchange) {
-	if (defined $confighaschanged{$key})
-	{
-	    Kolab::log('T', 'Queueing RUNONCHANGE for '.$key, KOLAB_DEBUG );
-	    $cmds{$runonchange{$key}} = 1;
-	}
+        if (defined $confighaschanged{$key}) {
+            Kolab::log('T', 'Queueing RUNONCHANGE for '.$key, KOLAB_DEBUG );
+            $cmds{$runonchange{$key}} = 1;
+        }
     }
     my $cmd;
     foreach $cmd (keys %cmds) {
@@ -680,25 +678,25 @@
     my $ok = 1;
 
     foreach $key (keys %templates) {
-	my $tpl = $templates{$key};
+        my $tpl = $templates{$key};
 
-	if (-r $tpl) {
-	    my $st = stat($tpl);
-	    my $owner = getpwuid($st->uid).':'.getgrgid($st->gid);
-	    if( ( ($st->mode & 07777) != $permissions{$tpl}) ||
-		($owner ne $ownership{$tpl}) ) {
-		my $str = 'File '.$tpl.' has the wrong persmissions/owner. Found '
-		    .sprintf("%lo", $st->mode&07777).' '.$owner.', expected '
-		    .sprintf("%lo",$permissions{$tpl}).' '.$ownership{$tpl};
-		print( "$str\n" );
-		Kolab::log('T', $str, KOLAB_ERROR );
-		$ok = 0;
-	    }
-	} else {
-	    my $str = "File $tpl does not exist";
-	    print "$str\n";
-	    Kolab::log('T', "$str", KOLAB_ERROR );
-	}
+        if (-r $tpl) {
+            my $st = stat($tpl);
+            my $owner = getpwuid($st->uid).':'.getgrgid($st->gid);
+            if( ( ($st->mode & 07777) != $permissions{$tpl}) ||
+                    ($owner ne $ownership{$tpl}) ) {
+                my $str = 'File '.$tpl.' has the wrong persmissions/owner. Found '
+                    .sprintf("%lo", $st->mode&07777).' '.$owner.', expected '
+                    .sprintf("%lo",$permissions{$tpl}).' '.$ownership{$tpl};
+                print( "$str\n" );
+                Kolab::log('T', $str, KOLAB_ERROR );
+                $ok = 0;
+            }
+        } else {
+            my $str = "File $tpl does not exist";
+            print "$str\n";
+            Kolab::log('T', "$str", KOLAB_ERROR );
+        }
     }
     return $ok;
 }



From cvs at kolab.org  Sun Dec 13 20:48:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 20:48:28 +0100 (CET)
Subject: mathieu: server release-notes.txt,1.476,1.477 
Message-ID: <20091213194828.D456560056F@lists.intevation.de>

Author: mathieu

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

Modified Files:
	release-notes.txt 
Log Message:
    Added arguments to rebuildTemplates(): dorunonchange and templates.
    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).




Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -d -r1.476 -r1.477
--- release-notes.txt	13 Dec 2009 18:04:37 -0000	1.476
+++ release-notes.txt	13 Dec 2009 19:48:26 -0000	1.477
@@ -139,6 +139,9 @@
     Touch configuration only when there is a change. This avoid postfix
     complaining about "database X.db is older than source file X".
 
+    Added arguments to rebuildTemplates(): dorunonchange and templates.
+    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).
+
 	kolab/issue1679 (Update template META mechanism to support service
 	                 restarts)
 	kolab/issue3604 (Change LDAPD in kolab_bootstrap to just openldap)



From cvs at kolab.org  Sun Dec 13 20:48:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 20:48:28 +0100 (CET)
Subject: mathieu: server/perl-kolab ChangeLog,1.73,1.74 
Message-ID: <20091213194828.D6A8C600570@lists.intevation.de>

Author: mathieu

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

Modified Files:
	ChangeLog 
Log Message:
    Added arguments to rebuildTemplates(): dorunonchange and templates.
    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).




Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ChangeLog	13 Dec 2009 17:54:23 -0000	1.73
+++ ChangeLog	13 Dec 2009 19:48:26 -0000	1.74
@@ -1,5 +1,11 @@
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
+	* lib/Kolab/Conf.pm, sbin/kolab_bootstrap.in:
+      Added arguments to rebuildTemplates(): dorunonchange and templates.
+      Use those in kolab_bootstrap (in replacement of bootstrapConfig()).
+
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
+
 	* lib/Kolab/Conf.pm: Touch configuration only when there is a change.
       This avoid postfix complaining about "database X.db is older than 
       source file X".



From cvs at kolab.org  Sun Dec 13 20:48:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 20:48:28 +0100 (CET)
Subject: mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.16,1.17 
Message-ID: <20091213194828.D7C18600579@lists.intevation.de>

Author: mathieu

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv29641/perl-kolab/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
    Added arguments to rebuildTemplates(): dorunonchange and templates.
    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).




Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Conf.pm	13 Dec 2009 18:27:08 -0000	1.16
+++ Conf.pm	13 Dec 2009 19:48:26 -0000	1.17
@@ -597,6 +597,8 @@
 {
     my %args = @_;
     $args{doreload} = 1 if !exists $args{doreload};
+    $args{dorunonchange} = 1 if !exists $args{dorunonchange};
+    #$args{templates} = ALL if !exists $args{templates};
 
     my $key;
     my $value;
@@ -610,15 +612,22 @@
     Kolab::log('T', 'Loading meta-template data', KOLAB_DEBUG );
     loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange, \%commentchar );
 
+    # defaults to all templates
+    $args{templates} = [ keys %templates ] if !exists $args{templates};
     my $cfg;
     my $tpl;
-    foreach $tpl (keys %templates) {
+    foreach $tpl (@{$args{templates}}) {
         $cfg = $templates{$tpl};
         build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg}, $commentchar{$cfg});
      }
 
     Kolab::log('T', 'Finished regenerating configuration files', KOLAB_DEBUG );
 
+    if(!$args{dorunonchange}) {
+        Kolab::log('T', 'RUNONCHANGE will not be executed, as requested.', KOLAB_DEBUG );
+        return;
+    }
+
     my %cmds = ();
     foreach $key (keys %runonchange) {
         if (defined $confighaschanged{$key}) {
@@ -640,28 +649,6 @@
         } else {
             Kolab::log('T', 'Reload not allowed, not executing command: '.$cmd, KOLAB_DEBUG );
         }
-    }
-}
-
-sub bootstrapConfig
-{
-    my $templatedir = $Kolab::config{"templatedir"};
-
-    # FIXME: it would be better if the templates can be given as an
-    # argument to this function.
-    my @templ = ("$templatedir/slapd.access.template",
-      "$templatedir/slapd.conf.template",
-      "$templatedir/slapd.replicas.template");
- 
-    my %runonchange;
-
-    loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange, \%commentchar );
-
-    my $cfg;
-    my $out;
-    foreach my $tpl (@templ) {
-      $cfg = $templates{$tpl};
-      build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg}, $commentchar{$cfg});
     }
 }
 



From cvs at kolab.org  Sun Dec 13 20:48:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 13 Dec 2009 20:48:28 +0100 (CET)
Subject: mathieu: server/perl-kolab/sbin kolab_bootstrap.in,1.12,1.13 
Message-ID: <20091213194828.D954860057B@lists.intevation.de>

Author: mathieu

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
    Added arguments to rebuildTemplates(): dorunonchange and templates.
    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).




Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_bootstrap.in	23 Nov 2009 22:47:05 -0000	1.12
+++ kolab_bootstrap.in	13 Dec 2009 19:48:26 -0000	1.13
@@ -470,7 +470,15 @@
       # hence can't be used, these definitons are skipped when
       # bootstrap_config = true
       $Kolab::config{"bootstrap_config"} = 'true';
-      Kolab::Conf::bootstrapConfig();
+      my $templatedir = $Kolab::config{"templatedir"};
+      Kolab::Conf::rebuildTemplates(
+            dorunonchange =>0,
+            templates => [
+              "$templatedir/slapd.access.template.in",
+              "$templatedir/slapd.conf.template.in",
+              "$templatedir/slapd.replicas.template.in"
+            ],
+        );
       $Kolab::config{"bootstrap_config"} = 'false';
 
       # now we must startup slapd



From cvs at kolab.org  Mon Dec 14 06:03:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 Dec 2009 06:03:51 +0100 (CET)
Subject: gunnar: server/perl-kolab/bin kolabpasswd.in,1.2.2.1,1.2.2.2 
Message-ID: <20091214050351.A15CE60056F@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolabpasswd.in 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))

Index: kolabpasswd.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolabpasswd.in,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- kolabpasswd.in	17 Nov 2009 17:12:35 -0000	1.2.2.1
+++ kolabpasswd.in	14 Dec 2009 05:03:49 -0000	1.2.2.2
@@ -140,6 +140,8 @@
   ReadMode 'noecho';
   my $old_password = ReadLine 0; chomp $old_password;
 
+  $old_password = Encode::encode_utf8($old_password);
+
   $mesg = $ldap->bind( $account_dn, password => $old_password ) || die "\nkolabpasswd: Failed to bind to LDAP server";
   if( $mesg->code ) { print "\nError: ".$mesg->error.". Please try again\n"; }
 } while ( $mesg->code );
@@ -154,6 +156,8 @@
 print "\n";
 ReadMode 'normal';
 ($new_password eq $new_password2) || die "Sorry, passwords do not match.\n";
+
+$new_password = Encode::encode_utf8($new_password);
 
 my $bind_pw_hash;
 



From cvs at kolab.org  Mon Dec 14 06:03:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 Dec 2009 06:03:51 +0100 (CET)
Subject: gunnar: server/perl-kolab/sbin kolab_bootstrap.in,1.7.2.2,1.7.2.3 
Message-ID: <20091214050351.A22C0600570@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	kolab_bootstrap.in 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- kolab_bootstrap.in	17 Nov 2009 17:12:35 -0000	1.7.2.2
+++ kolab_bootstrap.in	14 Dec 2009 05:03:49 -0000	1.7.2.3
@@ -65,6 +65,7 @@
 use Time::localtime;
 use Digest::SHA1;
 use MIME::Base64;
+use Encode;
 
 # Reload only kolab.globals into our configuration.
 Kolab::reloadConfig("@CONFIG_DIR@/kolab.globals", 1);
@@ -384,8 +385,8 @@
     if ($bind_pw =~ /\@\@\@/) {
       $bind_pw = `$Kolab::config{'bindir'}/openssl rand -base64 12`;
       chomp $bind_pw;
-      $bind_pw = getUserInput("Please choose a manager password", $bind_pw);
-      print " bind_pw : $bind_pw\n";
+      $bind_pw = Encode::encode_utf8(getUserInput("Please choose a manager password", $bind_pw));
+      print " bind_pw : " . Encode::decode_utf8($bind_pw) . "\n";
       $bind_pw_hash = hashPassword2($bind_pw);
     }
 
@@ -423,7 +424,7 @@
     chmod 0600, $kolab_config;
     kolab_chown "$Kolab::config{'kolab_musr'}","$Kolab::config{'kolab_mgrp'}", $kolab_config;
     print "IMPORTANT NOTE:\n";
-    print "use login=manager and passwd=$bind_pw when you log into the webinterface!\n\n";
+    print "use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into the webinterface!\n\n";
   }
 
   # Set up slapd to replicate to slave server's kolabds
@@ -724,7 +725,7 @@
   print "proceeding with base DN $base_dn\n";
 
   $bind_dn = "cn=manager,cn=internal,$base_dn";
-  $bind_pw = getUserInput("Manager password");
+  $bind_pw = Encode::encode_utf8(getUserInput("Manager password"));
   $bind_pw_hash = hashPassword2($bind_pw);
 
   my $confname = "$Kolab::config{'sasl_smtpconffile'}";
@@ -916,5 +917,5 @@
 #system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
 print "kolab is now ready to run!\n";
 print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";
-print ("Use login=manager and passwd=$bind_pw when you log into\n");
+print ("Use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into\n");
 print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");



From cvs at kolab.org  Mon Dec 14 06:03:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 Dec 2009 06:03:51 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.56.2.11,1.56.2.12 
Message-ID: <20091214050351.A2382600579@lists.intevation.de>

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.11
retrieving revision 1.56.2.12
diff -u -d -r1.56.2.11 -r1.56.2.12
--- ChangeLog	7 Dec 2009 15:17:19 -0000	1.56.2.11
+++ ChangeLog	14 Dec 2009 05:03:49 -0000	1.56.2.12
@@ -1,3 +1,11 @@
+2009-12-14  Gunnar Wrobel <wrobel at pardus.de>
+
+	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems
+	with some characters in passwords)
+
+	* sbin/kolab_bootstrap.in: kolab/issue919 (kolab server has
+	problems with some characters in passwords)
+
 2009-12-07  Gunnar Wrobel <wrobel at pardus.de>
 
 	* lib/Kolab/LDAP.pm (createObject): kolab/issue1448 (Users might



From cvs at kolab.org  Tue Dec 15 16:06:27 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 15 Dec 2009 16:06:27 +0100 (CET)
Subject: thomas: server TODO,1.1.2.7,1.1.2.8 
Message-ID: <20091215150627.417E9600597@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
TODO: issue3940 was assigned to wilde


Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- TODO	8 Dec 2009 06:55:42 -0000	1.1.2.7
+++ TODO	15 Dec 2009 15:06:24 -0000	1.1.2.8
@@ -11,8 +11,6 @@
 	    (needs cleanup: release-notes, Makefile)
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
 	    (updated OpenPKG package available)
-	kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP)
-	    (workaround exists, needs real fix)
 
     - larger effort:
 
@@ -33,7 +31,11 @@
 
 Sascha (wilde):
 
-	DONE
+    - small effort:
+
+	kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP)
+	    (workaround exists, needs real fix)
+
 
 Additional targets that might be done:
 



From cvs at kolab.org  Tue Dec 15 16:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 15 Dec 2009 16:09:12 +0100 (CET)
Subject: thomas: server install-kolab.sh,1.54.2.7,1.54.2.8 
Message-ID: <20091215150912.A78BA600597@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh 
Log Message:
Bump version numbers to 2.2.3 (no, CVS is not yet final)


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.7
retrieving revision 1.54.2.8
diff -u -d -r1.54.2.7 -r1.54.2.8
--- install-kolab.sh	14 May 2009 14:38:21 -0000	1.54.2.7
+++ install-kolab.sh	15 Dec 2009 15:09:10 -0000	1.54.2.8
@@ -12,7 +12,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2.2"
+KOLAB_VERSION="2.2.3"
 KID="19414"
 
 TAG="kolab"



From cvs at kolab.org  Tue Dec 15 16:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 15 Dec 2009 16:09:12 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin configure.ac, 1.30.2.1,
	1.30.2.2 
Message-ID: <20091215150912.AB4FB600599@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	configure.ac 
Log Message:
Bump version numbers to 2.2.3 (no, CVS is not yet final)


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -d -r1.30.2.1 -r1.30.2.2
--- configure.ac	14 May 2009 14:38:21 -0000	1.30.2.1
+++ configure.ac	15 Dec 2009 15:09:10 -0000	1.30.2.2
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-m4_define(_VERSION,2.2.2)
+m4_define(_VERSION,2.2.3)
 AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 



From cvs at kolab.org  Tue Dec 15 16:09:12 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 15 Dec 2009 16:09:12 +0100 (CET)
Subject: thomas: server/kolabd/kolabd configure.ac,1.12.2.1,1.12.2.2 
Message-ID: <20091215150912.AF16160059A@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	configure.ac 
Log Message:
Bump version numbers to 2.2.3 (no, CVS is not yet final)


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- configure.ac	14 May 2009 14:41:26 -0000	1.12.2.1
+++ configure.ac	15 Dec 2009 15:09:10 -0000	1.12.2.2
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 
 # not the real version
-m4_define(_VERSION,2.2.2)
+m4_define(_VERSION,2.2.3)
 AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 



From cvs at kolab.org  Wed Dec 16 12:14:51 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 12:14:51 +0100 (CET)
Subject: thomas: server release-notes.txt,1.398.2.89,1.398.2.90 
Message-ID: <20091216111451.E9E7960056C@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
tabs/spaces


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.89
retrieving revision 1.398.2.90
diff -u -d -r1.398.2.89 -r1.398.2.90
--- release-notes.txt	8 Dec 2009 06:55:36 -0000	1.398.2.89
+++ release-notes.txt	16 Dec 2009 11:14:48 -0000	1.398.2.90
@@ -82,7 +82,7 @@
 	kolab/issue1340 (RFC: restrict users to sending mail only to
 	                 internal recipients)
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
-			 nicer)
+	                 nicer)
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
     - Kolab_Filter-0.1.4-2009????



From cvs at kolab.org  Wed Dec 16 12:16:07 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 12:16:07 +0100 (CET)
Subject: thomas: server update.mk,1.1.2.1,1.1.2.2 
Message-ID: <20091216111607.3407160056C@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
added kolab-webadmin to update.mk


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- update.mk	17 Nov 2009 09:20:21 -0000	1.1.2.1
+++ update.mk	16 Dec 2009 11:16:05 -0000	1.1.2.2
@@ -9,6 +9,7 @@
                     imapd                   \
                     kolabd                  \
                     php-kolab/Kolab_Filter  \
+                    kolab-admin             \
                     kolab-webclient         \
 # Hm, we can't update these automatically...
 #                    openpkg                 \
@@ -47,4 +48,4 @@
 	@echo "You are using Kolab Server $(CURRENT_VERSION)."
 	@echo "The update operation is not supported for server versions below 2.2.2"
 	@exit 1
-endif
\ No newline at end of file
+endif



From cvs at kolab.org  Wed Dec 16 16:29:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:29:21 +0100 (CET)
Subject: wilde: server/perl-kolab ChangeLog,1.56.2.12,1.56.2.13 
Message-ID: <20091216152921.011D160056D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.12
retrieving revision 1.56.2.13
diff -u -d -r1.56.2.12 -r1.56.2.13
--- ChangeLog	14 Dec 2009 05:03:49 -0000	1.56.2.12
+++ ChangeLog	16 Dec 2009 15:29:18 -0000	1.56.2.13
@@ -1,3 +1,9 @@
+2009-12-16  Sascha Wilde  <wilde at intevation.de>
+
+	* lib/Kolab/LDAP.pm (deleteObject): kolab/issue3940 (Deleting
+	users does not work if master Kolab server is not master LDAP
+	(rt5889))
+
 2009-12-14  Gunnar Wrobel <wrobel at pardus.de>
 
 	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems



From cvs at kolab.org  Wed Dec 16 16:29:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:29:20 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.90,1.398.2.91 
Message-ID: <20091216152920.F2CF860056C@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.90
retrieving revision 1.398.2.91
diff -u -d -r1.398.2.90 -r1.398.2.91
--- release-notes.txt	16 Dec 2009 11:14:48 -0000	1.398.2.90
+++ release-notes.txt	16 Dec 2009 15:29:18 -0000	1.398.2.91
@@ -163,11 +163,12 @@
 	                 and write emails in there.)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
+        kolab/issue3940 (Deleting users does not work if master Kolab
+	                 server is not master LDAP (rt5889))
 	kolab/issue3951 (kolabconf -n (noreload) restarts services if
 	                 RUNONCHANGE is used)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build
 	                 process)
-
 
     Packages in the OpenPKG based Kolab server release:
 



From cvs at kolab.org  Wed Dec 16 16:29:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:29:21 +0100 (CET)
Subject: wilde: server/perl-kolab/lib/Kolab LDAP.pm,1.11.2.3,1.11.2.4 
Message-ID: <20091216152921.02A0960056E@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv30593/perl-kolab/lib/Kolab

Modified Files:
      Tag: kolab_2_2_branch
	LDAP.pm 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -d -r1.11.2.3 -r1.11.2.4
--- LDAP.pm	7 Dec 2009 14:04:24 -0000	1.11.2.3
+++ LDAP.pm	16 Dec 2009 15:29:18 -0000	1.11.2.4
@@ -633,8 +633,8 @@
         my $dn = $object->dn;
 	my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
 	my $masterldap;
-	if( lc($Kolab::config{'is_master'}) eq 'true' ) {
-	  # We are the master, just go ahead
+	if( $Kolab::config{'ldap_master_uri'} eq $Kolab::config{'ldap_uri'} ) {
+	  # We are the LDAP master, just go ahead
 	  $masterldap = $ldap;
 	} else {
 	  $masterldap = createMasterLDAP;



From cvs at kolab.org  Wed Dec 16 16:42:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:42:13 +0100 (CET)
Subject: wilde: server release-notes.txt,1.477,1.478 
Message-ID: <20091216154213.7E34260056C@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -d -r1.477 -r1.478
--- release-notes.txt	13 Dec 2009 19:48:26 -0000	1.477
+++ release-notes.txt	16 Dec 2009 15:42:11 -0000	1.478
@@ -281,6 +281,8 @@
 	                 and write emails in there.)
 	kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes
 	                 OpenLDAP restarts)
+        kolab/issue3940 (Deleting users does not work if master Kolab
+	                 server is not master LDAP (rt5889))
 	kolab/issue3951 (kolabconf -n (noreload) restarts services if
 	                 RUNONCHANGE is used)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build



From cvs at kolab.org  Wed Dec 16 16:42:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:42:13 +0100 (CET)
Subject: wilde: server/perl-kolab/lib/Kolab LDAP.pm,1.14,1.15 
Message-ID: <20091216154213.87A4260056E@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv31048/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- LDAP.pm	16 Apr 2009 08:55:18 -0000	1.14
+++ LDAP.pm	16 Dec 2009 15:42:11 -0000	1.15
@@ -644,8 +644,8 @@
         my $dn = $object->dn;
 	my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
 	my $masterldap;
-	if( lc($Kolab::config{'is_master'}) eq 'true' ) {
-	  # We are the master, just go ahead
+	if( $Kolab::config{'ldap_master_uri'} eq $Kolab::config{'ldap_uri'} ) {
+	  # We are the LDAP master, just go ahead
 	  $masterldap = $ldap;
 	} else {
 	  $masterldap = createMasterLDAP;



From cvs at kolab.org  Wed Dec 16 16:42:13 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:42:13 +0100 (CET)
Subject: wilde: server/perl-kolab ChangeLog,1.74,1.75 
Message-ID: <20091216154213.8381960056D@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- ChangeLog	13 Dec 2009 19:48:26 -0000	1.74
+++ ChangeLog	16 Dec 2009 15:42:11 -0000	1.75
@@ -1,3 +1,9 @@
+2009-12-16  Sascha Wilde  <wilde at intevation.de>
+
+	* lib/Kolab/LDAP.pm (deleteObject): kolab/issue3940 (Deleting
+	users does not work if master Kolab server is not master LDAP
+	(rt5889))
+
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
 	* lib/Kolab/Conf.pm, sbin/kolab_bootstrap.in:



From cvs at kolab.org  Wed Dec 16 16:50:59 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 16:50:59 +0100 (CET)
Subject: wilde: server TODO,1.1.2.8,1.1.2.9 
Message-ID: <20091216155059.B24B660056C@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Updated TODO for release.


Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- TODO	15 Dec 2009 15:06:24 -0000	1.1.2.8
+++ TODO	16 Dec 2009 15:50:57 -0000	1.1.2.9
@@ -5,8 +5,6 @@
 
     - small effort:
 
-	switch imapd databases back from berkeley to skiplist
-	    (skiplist has proven to cause less performance and stability issues)
 	kolab/issue3513 (Clamav - new upstream version 0.95.3)
 	    (needs cleanup: release-notes, Makefile)
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
@@ -31,11 +29,8 @@
 
 Sascha (wilde):
 
-    - small effort:
-
-	kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP)
-	    (workaround exists, needs real fix)
-
+	switch imapd databases back from berkeley to skiplist
+	    (skiplist has proven to cause less performance and stability issues)
 
 Additional targets that might be done:
 



From cvs at kolab.org  Wed Dec 16 17:08:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 17:08:49 +0100 (CET)
Subject: thomas: server/perl-kolab/lib/Kolab LDAP.pm,1.11.2.4,1.11.2.5 
Message-ID: <20091216160849.C5C9760056E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv32277/perl-kolab/lib/Kolab

Modified Files:
      Tag: kolab_2_2_branch
	LDAP.pm 
Log Message:
Adjusted comment in change for kolab/issue3940


Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -d -r1.11.2.4 -r1.11.2.5
--- LDAP.pm	16 Dec 2009 15:29:18 -0000	1.11.2.4
+++ LDAP.pm	16 Dec 2009 16:08:47 -0000	1.11.2.5
@@ -634,7 +634,7 @@
 	my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
 	my $masterldap;
 	if( $Kolab::config{'ldap_master_uri'} eq $Kolab::config{'ldap_uri'} ) {
-	  # We are the LDAP master, just go ahead
+	  # We are already connected to the LDAP master, just go ahead
 	  $masterldap = $ldap;
 	} else {
 	  $masterldap = createMasterLDAP;



From cvs at kolab.org  Wed Dec 16 17:08:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 17:08:57 +0100 (CET)
Subject: thomas: server/perl-kolab/lib/Kolab LDAP.pm,1.15,1.16 
Message-ID: <20091216160857.87FFD60056E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv32299/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
Adjusted comment in change for kolab/issue3940


Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- LDAP.pm	16 Dec 2009 15:42:11 -0000	1.15
+++ LDAP.pm	16 Dec 2009 16:08:55 -0000	1.16
@@ -645,7 +645,7 @@
 	my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
 	my $masterldap;
 	if( $Kolab::config{'ldap_master_uri'} eq $Kolab::config{'ldap_uri'} ) {
-	  # We are the LDAP master, just go ahead
+	  # We are already connected to the LDAP master, just go ahead
 	  $masterldap = $ldap;
 	} else {
 	  $masterldap = createMasterLDAP;



From cvs at kolab.org  Wed Dec 16 17:30:37 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 17:30:37 +0100 (CET)
Subject: thomas: server install-kolab.sh, 1.54.2.8, 1.54.2.9 release-notes.txt,
	1.398.2.91, 1.398.2.92 
Message-ID: <20091216163037.D9CE860056C@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh release-notes.txt 
Log Message:
Backported kolab/issue2924 from HEAD
(install-kolab.sh: -maxdepth/-mindepth not supported by all find implementations)


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.8
retrieving revision 1.54.2.9
diff -u -d -r1.54.2.8 -r1.54.2.9
--- install-kolab.sh	15 Dec 2009 15:09:10 -0000	1.54.2.8
+++ install-kolab.sh	16 Dec 2009 16:30:35 -0000	1.54.2.9
@@ -36,6 +36,9 @@
     echo
     echo "Options:"
     echo
+    echo "  Some of these options (for example UID, installation prefix)"
+    echo "  only work as expected when installing from source packages."
+    echo
     echo "  -t TAG     (alternate binary tag;          default is kolab)"
     echo "  -I UID     (alternate base uid;            default is 19414)"
     echo
@@ -59,6 +62,16 @@
     echo "  -h         (display this help)"
 }
 
+# check if find command supports -mindepth and -maxdepth, see
+# kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all find implementations)
+if [ "`find / -mindepth 0 -maxdepth 0 2>/dev/null`" = "/" ]; then
+    FIND1="-mindepth 1 -maxdepth 1"
+else
+    echo "WARNING: Your find does not support -mindepth/-maxdepth, make sure" >&2
+    echo "you are in the correct directory, see issues.kolab.org/issue2924" >&2
+    FIND1=""
+fi
+
 mktmpdir() {
   newtmp="${TMPDIR-/tmp}/install-kolab.$RANDOM.$RANDOM.$RANDOM.$$"
   mkdir "$newtmp" || {
@@ -81,7 +94,7 @@
   cp "$SRCDIR"/openpkg-2*.rpm "$WORKDIR"
   cp "$SRCDIR"/openpkg-*.sh "$WORKDIR"
   ln -sf "$SRCDIR/00INDEX.rdf" "$WORKDIR"
-  find "$SRCDIR" -mindepth 1 -maxdepth 1 -name "*.rpm" \! -name "openpkg-2*.rpm" -exec ln -sf '{}' "$WORKDIR" \;
+  find "$SRCDIR" $FIND1 -name "*.rpm" \! -name "openpkg-2*.rpm" -exec ln -sf '{}' "$WORKDIR" \;
 }
 
 remove_from_list() {
@@ -174,7 +187,7 @@
                 exit 0
             fi
         elif [ "$FLAG_INDEX" ]; then
-            BINARY=`find . -mindepth 1 -maxdepth 1 -name "openpkg-2*.rpm" \! -name "openpkg-*.src.rpm" -print`
+            BINARY=`find . $FIND1 -name "openpkg-2*.rpm" \! -name "openpkg-*.src.rpm" -print`
             if [ -z "$BINARY" ]; then
                 echo "Generating 00INDEX.rdf for source distribution ..."
                 exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -C $PREFIX/RPM/DB/00INDEX-cache.db -i .
@@ -216,8 +229,8 @@
         INSTALL=`pwd`
         echo "Found an OpenPKG environment. Assuming upgrade..."
     else
-        INSTALLER=`find . -name "openpkg-*.src.sh" -print`
-        BINARY=`find . -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print`
+        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
@@ -302,7 +315,7 @@
 
     PACKAGES=`remove_from_list "$EXCLUDEPKGS" "$PACKAGES"`
 
-    find "$DIR" -mindepth 1 -maxdepth 1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
+    find "$DIR" $FIND1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
     echo "----------- SETUP COMPLETED -----------"
     echo
     echo " Now running:"

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.91
retrieving revision 1.398.2.92
diff -u -d -r1.398.2.91 -r1.398.2.92
--- release-notes.txt	16 Dec 2009 15:29:18 -0000	1.398.2.91
+++ release-notes.txt	16 Dec 2009 16:30:35 -0000	1.398.2.92
@@ -59,6 +59,11 @@
 
 	kolab/issue3838 (no logging for pop3)
 
+    - install-kolab.sh
+
+	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
+	                 find implementations)
+
     - kolabd-2.2.3-2009????
 
 	kolab/issue919  (kolab server has problems with some characters in



From cvs at kolab.org  Wed Dec 16 17:31:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 17:31:06 +0100 (CET)
Subject: thomas: server release-notes.txt,1.478,1.479 
Message-ID: <20091216163106.6F34A60056C@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2924 was backported to stable


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -d -r1.478 -r1.479
--- release-notes.txt	16 Dec 2009 15:42:11 -0000	1.478
+++ release-notes.txt	16 Dec 2009 16:31:04 -0000	1.479
@@ -12,11 +12,6 @@
 
 	Activated the HASH and JSON modules.
 
-    - install-kolab.sh
-
-	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
-	                 find implementations)
-
     - Horde_Prefs-0.0.3dev20090501-2009????
 
 	kolab/issue3555 (unable to save filter settings more than once)
@@ -175,6 +170,11 @@
 TODO:	Fix buffer size calculations for sieve actions_string (CVE-2009-2632)
 
 	kolab/issue3838 (no logging for pop3)
+
+    - install-kolab.sh
+
+	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
+	                 find implementations)
 
     - kolabd-2.2.3-2009????
 



From cvs at kolab.org  Wed Dec 16 18:26:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 18:26:25 +0100 (CET)
Subject: wilde: server 1st.README, 1.1.2.10, 1.1.2.11 release-notes.txt,
	1.398.2.92, 1.398.2.93 
Message-ID: <20091216172625.D7C5360056D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	1st.README release-notes.txt 
Log Message:
Changed default format for imapd databses back to skiplist. (kolab/issue840)

Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- 1st.README	17 Jul 2009 14:49:47 -0000	1.1.2.10
+++ 1st.README	16 Dec 2009 17:26:23 -0000	1.1.2.11
@@ -128,7 +128,24 @@
 Upgrade from 2.2.2 to 2.2.3
 ---------------------------
 
-Nothing special has to be done for this upgrade.
+The default format for the mailboxes.db and annotations.db of the
+imapd (originally changed to berkeley-db in Kolab Server 2.1-beta3)
+was changed back to skiplist.
+
+When upgrading from an existing Kolab Server installation you should
+check /kolab/etc/kolab/templates/imapd.conf.template before upgrading,
+if it contains the lines:
+annotation_db: berkeley
+mboxlist_db: berkeley
+you should make sure, that these lines are put back in the file after
+upgrading (they are included as an commented out example in the new
+template), otherwise the IMAP server will not be able to act upon the
+mail spool.
+
+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
+the actual conversion is beyond the scope of this document.
 
 
 Upgrade from 2.2.1 to 2.2.2

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.92
retrieving revision 1.398.2.93
diff -u -d -r1.398.2.92 -r1.398.2.93
--- release-notes.txt	16 Dec 2009 16:30:35 -0000	1.398.2.92
+++ release-notes.txt	16 Dec 2009 17:26:23 -0000	1.398.2.93
@@ -66,6 +66,12 @@
 
     - kolabd-2.2.3-2009????
 
+	kolab/issue840  (Annotations needs to be more robust (skiplist
+			 problems)) as the now integrated imapd-2.3.13
+			 (see below) has additional skiplist fixes and
+			 the switch to berkeley-db for mailboxes.db
+			 and annotations.db introduced new problems we
+			 switched back to skiplist as default.
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
 	kolab/issue973  (Rewritten from shown inconveniently in kontact)



From cvs at kolab.org  Wed Dec 16 18:26:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Dec 2009 18:26:25 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates imapd.conf.template.in, 1.16,
	1.16.2.1 
Message-ID: <20091216172625.D67FA60056C@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	imapd.conf.template.in 
Log Message:
Changed default format for imapd databses back to skiplist. (kolab/issue840)

Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- imapd.conf.template.in	9 Jul 2008 14:46:15 -0000	1.16
+++ imapd.conf.template.in	16 Dec 2009 17:26:23 -0000	1.16.2.1
@@ -81,9 +81,9 @@
 # the sieve extensions that should be enabled on the server
 sieve_extensions: fileinto reject vacation imapflags notify include envelope body relational regex subaddress copy
 
-# use berkeley db backend instead of skiplist
-annotation_db: berkeley
-mboxlist_db: berkeley
+# Uncomment to use berkeley db backend instead of skiplist:
+#annotation_db: berkeley
+#mboxlist_db: berkeley
 
 # Don't discard emails with identical message-id header (enabled by default):
 duplicatesuppression: 0



From cvs at kolab.org  Thu Dec 17 10:45:08 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 10:45:08 +0100 (CET)
Subject: thomas: server install-kolab.sh,1.54.2.9,1.54.2.10 
Message-ID: <20091217094508.004B560056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh 
Log Message:
Some cleanup in install-kolab.sh, no functional changes


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.9
retrieving revision 1.54.2.10
diff -u -d -r1.54.2.9 -r1.54.2.10
--- install-kolab.sh	16 Dec 2009 16:30:35 -0000	1.54.2.9
+++ install-kolab.sh	17 Dec 2009 09:45:05 -0000	1.54.2.10
@@ -19,14 +19,12 @@
 USER=""
 PREFIX=""
 
-INSTALL=""
-
 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"
 EXCLUDEPKGS=""
 
 #Flags
-FLAG_BASE=""
+FLAG_BOOTSTRAP=""
 FLAG_ENV=""
 FLAG_CLEAN=""
 
@@ -54,10 +52,10 @@
     echo "  -X         (generate 00INDEX.rdf for packages in the current directory"
     echo "              using the OpenPKG installation in /\$PREFIX)"
     echo
-    echo "  -B         (abort after generating the basic openpkg binary)"
-    echo "  -E         (abort after generating the openpkg environment)"
+    echo "  -B         (abort after generating the binary OpenPKG bootstrap package)"
+    echo "  -E         (abort after generating the OpenPKG environment)"
     echo
-    echo "  -O         (additional build options, used for openpkg bootstraping from source)"
+    echo "  -O         (additional build options, used for OpenPKG bootstraping from source)"
     echo
     echo "  -h         (display this help)"
 }
@@ -134,13 +132,13 @@
         t) # User specified an alternative tag
             TAG="$OPTARG"
             ;;
-        B) # User only wants the basic openpkg package in binary form
-            FLAG_BASE="Yes"
+        B) # User only wants the binary OpenPKG bootstrap package
+            FLAG_BOOTSTRAP="Yes"
             ;;
-        E) # User only wants the basic openpkg environment
+        E) # User only wants the OpenPKG environment
             FLAG_ENV="Yes"
             ;;
-        c) # User wants to erase the openpkg environment
+        c) # User wants to erase the OpenPKG environment
             FLAG_CLEAN="Yes"
             ;;
         x) # exclude from installation
@@ -221,40 +219,37 @@
 echo "Exclude following Kolab packages:   $EXCLUDEPKGS"
 echo
 
-if [ -z "$INSTALL" ]; then
-    # Hm, user wants us to figure out what we should do
-    echo "Received no instructions. Trying to determine required action..."
-    if [ -d "$PREFIX/etc/openpkg" ]; then
-        # Assume an upgrade based on the current directory
-        INSTALL=`pwd`
-        echo "Found an OpenPKG environment. Assuming upgrade..."
+echo "Received no instructions. Trying to determine required action..."
+if [ -d "$PREFIX/etc/openpkg" ]; then
+    # Assume an upgrade based on the current directory
+    INSTALL=`pwd`
+    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
+            # 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
-        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
-                # 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
+        # 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
+            # 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
-            # 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
-                # 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 from source
-                INSTALL=$INSTALLER
-                echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
-            fi
+            # Install from source
+            INSTALL=$INSTALLER
+            echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
         fi
     fi
 fi
@@ -290,8 +285,8 @@
         --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \
         --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \
         || exit $?
-    if [ "$FLAG_BASE" ]; then
-        echo "Created basic openpkg binary for you platform!"
+    if [ "$FLAG_BOOTSTRAP" ]; then
+        echo "Created the binary OpenPKG bootstrap package for you platform!"
         exit 0
     fi
 fi
@@ -299,7 +294,7 @@
 if [ -n "$BIN" ]; then
     sh "$BIN" || exit $?
     if [ "$FLAG_ENV" ]; then
-        echo "Created basic openpkg environment!"
+        echo "Created the OpenPKG environment!"
         exit 0
     fi
 fi



From cvs at kolab.org  Thu Dec 17 11:12:31 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 11:12:31 +0100 (CET)
Subject: thomas: server release-notes.txt, 1.398.2.93,
	1.398.2.94 install-kolab.sh, 1.54.2.10, 1.54.2.11 
Message-ID: <20091217101231.4D17A60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt install-kolab.sh 
Log Message:
Fix handling of -B and -E with existing OpenPKG installations.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.93
retrieving revision 1.398.2.94
diff -u -d -r1.398.2.93 -r1.398.2.94
--- release-notes.txt	16 Dec 2009 17:26:23 -0000	1.398.2.93
+++ release-notes.txt	17 Dec 2009 10:12:29 -0000	1.398.2.94
@@ -61,6 +61,8 @@
 
     - install-kolab.sh
 
+	Fix handling of -B and -E with existing OpenPKG installations.
+
 	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
 	                 find implementations)
 

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.10
retrieving revision 1.54.2.11
diff -u -d -r1.54.2.10 -r1.54.2.11
--- install-kolab.sh	17 Dec 2009 09:45:05 -0000	1.54.2.10
+++ install-kolab.sh	17 Dec 2009 10:12:29 -0000	1.54.2.11
@@ -52,7 +52,7 @@
     echo "  -X         (generate 00INDEX.rdf for packages in the current directory"
     echo "              using the OpenPKG installation in /\$PREFIX)"
     echo
-    echo "  -B         (abort after generating the binary OpenPKG bootstrap package)"
+    echo "  -B         (abort after generating the OpenPKG bootstrap packages)"
     echo "  -E         (abort after generating the OpenPKG environment)"
     echo
     echo "  -O         (additional build options, used for OpenPKG bootstraping from source)"
@@ -132,7 +132,7 @@
         t) # User specified an alternative tag
             TAG="$OPTARG"
             ;;
-        B) # User only wants the binary OpenPKG bootstrap package
+        B) # User only wants the OpenPKG bootstrap packages
             FLAG_BOOTSTRAP="Yes"
             ;;
         E) # User only wants the OpenPKG environment
@@ -220,9 +220,13 @@
 echo
 
 echo "Received no instructions. Trying to determine required action..."
-if [ -d "$PREFIX/etc/openpkg" ]; then
+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`
@@ -286,7 +290,8 @@
         --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \
         || exit $?
     if [ "$FLAG_BOOTSTRAP" ]; then
-        echo "Created the binary OpenPKG bootstrap package for you platform!"
+        echo "Created the OpenPKG bootstrap packages, they are available in"
+        echo "$DIR"
         exit 0
     fi
 fi



From cvs at kolab.org  Thu Dec 17 11:13:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 11:13:40 +0100 (CET)
Subject: thomas: server install-kolab.sh,1.54.2.11,1.54.2.12 
Message-ID: <20091217101340.5445360056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh 
Log Message:
minor cleanup


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.11
retrieving revision 1.54.2.12
diff -u -d -r1.54.2.11 -r1.54.2.12
--- install-kolab.sh	17 Dec 2009 10:12:29 -0000	1.54.2.11
+++ install-kolab.sh	17 Dec 2009 10:13:38 -0000	1.54.2.12
@@ -86,8 +86,8 @@
 
 populate_workdir() {
   if [ -z "$SRCDIR" -o -z "$WORKDIR" ] ; then
-    echo "Source- or working-directory missing." 1>&2 
-    exit 1 
+    echo "Source or working directory missing." 1>&2
+    exit 1
   fi
   cp "$SRCDIR"/openpkg-2*.rpm "$WORKDIR"
   cp "$SRCDIR"/openpkg-*.sh "$WORKDIR"
@@ -104,7 +104,7 @@
       if [ "$element" = "$remove" ] ; then
         delelt="t"
         break
-      fi      
+      fi
     done
     [ "$delelt" ] || newlist="$newlist $element"
   done



From cvs at kolab.org  Thu Dec 17 11:15:14 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 11:15:14 +0100 (CET)
Subject: thomas: server install-kolab.sh, 1.63, 1.64 release-notes.txt, 1.479,
	1.480 
Message-ID: <20091217101514.8BBAD60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh release-notes.txt 
Log Message:
Fix handling of -B and -E with existing OpenPKG installations.
(and cleanups)


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- install-kolab.sh	17 Jul 2009 14:53:05 -0000	1.63
+++ install-kolab.sh	17 Dec 2009 10:15:12 -0000	1.64
@@ -19,14 +19,12 @@
 USER=""
 PREFIX=""
 
-INSTALL=""
-
 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"
 EXCLUDEPKGS=""
 
 #Flags
-FLAG_BASE=""
+FLAG_BOOTSTRAP=""
 FLAG_ENV=""
 FLAG_CLEAN=""
 
@@ -54,10 +52,10 @@
     echo "  -X         (generate 00INDEX.rdf for packages in the current directory"
     echo "              using the OpenPKG installation in /\$PREFIX)"
     echo
-    echo "  -B         (abort after generating the basic openpkg binary)"
-    echo "  -E         (abort after generating the openpkg environment)"
+    echo "  -B         (abort after generating the OpenPKG bootstrap packages)"
+    echo "  -E         (abort after generating the OpenPKG environment)"
     echo
-    echo "  -O         (additional build options, used for openpkg bootstraping from source)"
+    echo "  -O         (additional build options, used for OpenPKG bootstraping from source)"
     echo
     echo "  -h         (display this help)"
 }
@@ -88,8 +86,8 @@
 
 populate_workdir() {
   if [ -z "$SRCDIR" -o -z "$WORKDIR" ] ; then
-    echo "Source- or working-directory missing." 1>&2 
-    exit 1 
+    echo "Source or working directory missing." 1>&2
+    exit 1
   fi
   cp "$SRCDIR"/openpkg-2*.rpm "$WORKDIR"
   cp "$SRCDIR"/openpkg-*.sh "$WORKDIR"
@@ -106,7 +104,7 @@
       if [ "$element" = "$remove" ] ; then
         delelt="t"
         break
-      fi      
+      fi
     done
     [ "$delelt" ] || newlist="$newlist $element"
   done
@@ -134,13 +132,13 @@
         t) # User specified an alternative tag
             TAG="$OPTARG"
             ;;
-        B) # User only wants the basic openpkg package in binary form
-            FLAG_BASE="Yes"
+        B) # User only wants the OpenPKG bootstrap packages
+            FLAG_BOOTSTRAP="Yes"
             ;;
-        E) # User only wants the basic openpkg environment
+        E) # User only wants the OpenPKG environment
             FLAG_ENV="Yes"
             ;;
-        c) # User wants to erase the openpkg environment
+        c) # User wants to erase the OpenPKG environment
             FLAG_CLEAN="Yes"
             ;;
         x) # exclude from installation
@@ -221,40 +219,41 @@
 echo "Exclude following Kolab packages:   $EXCLUDEPKGS"
 echo
 
-if [ -z "$INSTALL" ]; then
-    # Hm, user wants us to figure out what we should do
-    echo "Received no instructions. Trying to determine required action..."
-    if [ -d "$PREFIX/etc/openpkg" ]; then
-        # Assume an upgrade based on the current directory
-        INSTALL=`pwd`
-        echo "Found an OpenPKG environment. Assuming upgrade..."
+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
+        # 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
+            # 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
-        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
-                # 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
+        # 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
+            # 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
-            # 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
-                # 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 from source
-                INSTALL=$INSTALLER
-                echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
-            fi
+            # Install from source
+            INSTALL=$INSTALLER
+            echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
         fi
     fi
 fi
@@ -290,8 +289,9 @@
         --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \
         --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \
         || exit $?
-    if [ "$FLAG_BASE" ]; then
-        echo "Created basic openpkg binary for you platform!"
+    if [ "$FLAG_BOOTSTRAP" ]; then
+        echo "Created the OpenPKG bootstrap packages, they are available in"
+        echo "$DIR"
         exit 0
     fi
 fi
@@ -299,7 +299,7 @@
 if [ -n "$BIN" ]; then
     sh "$BIN" || exit $?
     if [ "$FLAG_ENV" ]; then
-        echo "Created basic openpkg environment!"
+        echo "Created the OpenPKG environment!"
         exit 0
     fi
 fi

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -d -r1.479 -r1.480
--- release-notes.txt	16 Dec 2009 16:31:04 -0000	1.479
+++ release-notes.txt	17 Dec 2009 10:15:12 -0000	1.480
@@ -173,6 +173,8 @@
 
     - install-kolab.sh
 
+	Fix handling of -B and -E with existing OpenPKG installations.
+
 	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
 	                 find implementations)
 



From cvs at kolab.org  Thu Dec 17 11:26:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 11:26:39 +0100 (CET)
Subject: thomas: server 1st.README,1.1.2.11,1.1.2.12 
Message-ID: <20091217102639.7A6CD60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	1st.README 
Log Message:
therefor -> therefore


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- 1st.README	16 Dec 2009 17:26:23 -0000	1.1.2.11
+++ 1st.README	17 Dec 2009 10:26:37 -0000	1.1.2.12
@@ -144,7 +144,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  Thu Dec 17 11:59:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 11:59:39 +0100 (CET)
Subject: thomas: server release-notes.txt,1.398.2.94,1.398.2.95 
Message-ID: <20091217105939.A360360056E@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
formatting


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.94
retrieving revision 1.398.2.95
diff -u -d -r1.398.2.94 -r1.398.2.95
--- release-notes.txt	17 Dec 2009 10:12:29 -0000	1.398.2.94
+++ release-notes.txt	17 Dec 2009 10:59:37 -0000	1.398.2.95
@@ -63,17 +63,17 @@
 
 	Fix handling of -B and -E with existing OpenPKG installations.
 
-	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
-	                 find implementations)
+	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported
+	                 by all find implementations)
 
     - kolabd-2.2.3-2009????
 
 	kolab/issue840  (Annotations needs to be more robust (skiplist
-			 problems)) as the now integrated imapd-2.3.13
-			 (see below) has additional skiplist fixes and
-			 the switch to berkeley-db for mailboxes.db
-			 and annotations.db introduced new problems we
-			 switched back to skiplist as default.
+	                 problems)) as the now integrated imapd-2.3.13
+	                 (see below) has additional skiplist fixes and
+	                 the switch to berkeley-db for mailboxes.db
+	                 and annotations.db introduced new problems we
+	                 switched back to skiplist as default.
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
 	kolab/issue973  (Rewritten from shown inconveniently in kontact)



From cvs at kolab.org  Thu Dec 17 12:02:40 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:02:40 +0100 (CET)
Subject: thomas: server release-notes.txt,1.480,1.481 
Message-ID: <20091217110240.7D529600573@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -d -r1.480 -r1.481
--- release-notes.txt	17 Dec 2009 10:15:12 -0000	1.480
+++ release-notes.txt	17 Dec 2009 11:02:38 -0000	1.481
@@ -18,9 +18,9 @@
 
     - kolab-webadmin-2.2.3-2009????
 
-	kolab/issue3401 Change font color of the kolab-webadmin
-	kolab/issue3428 Present the checkbox in the "accept internet email"
-			nicer
+	kolab/issue3401 (Change font color of the kolab-webadmin)
+	kolab/issue3428 (Present the checkbox in the "accept internet email"
+	                 nicer)
 
     - Kolab_Filter-0.1.7-2009????
 
@@ -75,8 +75,8 @@
 	Use RUNONCHANGE mechanism to restart or reload sasl, apache, amavisd,
 	clamav, postfix and imapd.
 	
-	dist_conf'iguration of php.ini.template.in for safe_mode_include_dir. End
-	with slash as recommended in http://php.net/ini.sect.safe-mode
+	dist_conf'iguration of php.ini.template.in for safe_mode_include_dir.
+	End with slash as recommended in http://php.net/ini.sect.safe-mode
 
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
 	kolab/issue1755 (syncrepl support (for OpenLDAP >=2.4.6))
@@ -87,11 +87,12 @@
 	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/issue1740 (fully generate slapd.access, slapd.replicas, transport,
-                    virtual and imapd.groups by templates) using the new
-                    @@@print@@@ macro (perl-kolab) and RUNONCHANGE.
-    kolab/issue1671 (Improving the warning about kolab templates within
-                     configuration files)
+	kolab/issue1740 (fully generate slapd.access, slapd.replicas,
+	                 transport, virtual and imapd.groups by templates)
+	                 using the new @@@print@@@ macro (perl-kolab) and
+	                 RUNONCHANGE.
+	kolab/issue1671 (Improving the warning about kolab templates within
+	                 configuration files)
 
     - kolab-fbview-1.2.0-2009????
 
@@ -127,22 +128,21 @@
 
 	Execute duplicate RUNONCHANGE commands only once.
 
-    new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
-    getCyrusGroups(), getPostfixMap(map). This removed the use of
-    %special_templates, %haschanged, Kolab::Conf::reload().
+	new @@@print@@@ macro available for: getLDAPReplicas(),
+	getLDAPAccess(), getCyrusGroups(), getPostfixMap(map).  This removed
+	the use of %special_templates, %haschanged, Kolab::Conf::reload().
 
-    Touch configuration only when there is a change. This avoid postfix
-    complaining about "database X.db is older than source file X".
+	Touch configuration only when there is a change. This avoid postfix
+	complaining about "database X.db is older than source file X".
 
-    Added arguments to rebuildTemplates(): dorunonchange and templates.
-    Use those in kolab_bootstrap (in replacement of bootstrapConfig()).
+	Added arguments to rebuildTemplates(): dorunonchange and templates.
+	Use those in kolab_bootstrap (in replacement of bootstrapConfig()).
 
 	kolab/issue1679 (Update template META mechanism to support service
 	                 restarts)
 	kolab/issue3604 (Change LDAPD in kolab_bootstrap to just openldap)
-	kolab/issue3951 (kolabconf -n (noreload) restarts services if RUNONCHANGE
-			 is used)
-
+	kolab/issue3951 (kolabconf -n (noreload) restarts services if
+	                 RUNONCHANGE is used)
 
     - php-5.2.8-20081209_kolab3
 
@@ -175,8 +175,8 @@
 
 	Fix handling of -B and -E with existing OpenPKG installations.
 
-	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
-	                 find implementations)
+	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported
+	                 by all find implementations)
 
     - kolabd-2.2.3-2009????
 
@@ -202,7 +202,7 @@
 	                 internal recipients)
 	kolab/issue3401 (Change font color of the kolab-webadmin)
 	kolab/issue3428 (Present the checkbox in the "accept internet email"
-			 nicer)
+	                 nicer)
 TODO:	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
     - Kolab_Filter-0.1.4-2009????



From cvs at kolab.org  Thu Dec 17 12:09:43 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:09:43 +0100 (CET)
Subject: thomas: server/imapd Makefile,1.40.2.5,1.40.2.6 
Message-ID: <20091217110943.EC091600573@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Bump imapd-2.3.13 revision to _kolab4 everywhere it is needed


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.40.2.5
retrieving revision 1.40.2.6
diff -u -d -r1.40.2.5 -r1.40.2.6
--- Makefile	9 Nov 2009 17:08:38 -0000	1.40.2.5
+++ Makefile	17 Dec 2009 11:09:41 -0000	1.40.2.6
@@ -3,7 +3,7 @@
 PACKAGE=imapd
 VERSION=2.3.13
 RELEASE=20081020
-KOLABRELEASE=20081020_kolab3
+KOLABRELEASE=20081020_kolab4
 
 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 \



From cvs at kolab.org  Thu Dec 17 12:09:43 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:09:43 +0100 (CET)
Subject: thomas: server release-notes.txt,1.398.2.95,1.398.2.96 
Message-ID: <20091217110943.E838F60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Bump imapd-2.3.13 revision to _kolab4 everywhere it is needed


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.95
retrieving revision 1.398.2.96
diff -u -d -r1.398.2.95 -r1.398.2.96
--- release-notes.txt	17 Dec 2009 10:59:37 -0000	1.398.2.95
+++ release-notes.txt	17 Dec 2009 11:09:41 -0000	1.398.2.96
@@ -53,7 +53,7 @@
 
 	kolab/issue2982 (OpenLDAP segmentation fault on 64bit)
 
-    - imapd-2.3.13-20081020_kolab3
+    - imapd-2.3.13-20081020_kolab4
 
 	Fix buffer size calculations for sieve actions_string (CVE-2009-2632)
 



From cvs at kolab.org  Thu Dec 17 12:16:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:16:23 +0100 (CET)
Subject: thomas: server update.mk,1.1.2.2,1.1.2.3 
Message-ID: <20091217111623.F009A60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
kolab-admin -> kolab-webadmin


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- update.mk	16 Dec 2009 11:16:05 -0000	1.1.2.2
+++ update.mk	17 Dec 2009 11:16:21 -0000	1.1.2.3
@@ -9,7 +9,7 @@
                     imapd                   \
                     kolabd                  \
                     php-kolab/Kolab_Filter  \
-                    kolab-admin             \
+                    kolab-webadmin          \
                     kolab-webclient         \
 # Hm, we can't update these automatically...
 #                    openpkg                 \



From cvs at kolab.org  Thu Dec 17 12:17:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:17:39 +0100 (CET)
Subject: wilde: server 1st.README,1.9,1.10 release-notes.txt,1.481,1.482 
Message-ID: <20091217111739.24BB9600573@lists.intevation.de>

Author: wilde

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

Modified Files:
	1st.README release-notes.txt 
Log Message:
Changed default format for imapd databses back to skiplist. (kolab/issue840)

Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- 1st.README	17 Jul 2009 14:52:24 -0000	1.9
+++ 1st.README	17 Dec 2009 11:17:37 -0000	1.10
@@ -128,7 +128,24 @@
 Upgrade from 2.2.2 to 2.2.3
 ---------------------------
 
-Nothing special has to be done for this upgrade.
+The default format for the mailboxes.db and annotations.db of the
+imapd (originally changed to berkeley-db in Kolab Server 2.1-beta3)
+was changed back to skiplist.
+
+When upgrading from an existing Kolab Server installation you should
+check /kolab/etc/kolab/templates/imapd.conf.template before upgrading,
+if it contains the lines:
+annotation_db: berkeley
+mboxlist_db: berkeley
+you should make sure, that these lines are put back in the file after
+upgrading (they are included as an commented out example in the new
+template), otherwise the IMAP server will not be able to act upon the
+mail spool.
+
+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
+the actual conversion is beyond the scope of this document.
 
 
 Upgrade from 2.2.1 to 2.2.2

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -d -r1.481 -r1.482
--- release-notes.txt	17 Dec 2009 11:02:38 -0000	1.481
+++ release-notes.txt	17 Dec 2009 11:17:37 -0000	1.482
@@ -180,6 +180,12 @@
 
     - kolabd-2.2.3-2009????
 
+	kolab/issue840  (Annotations needs to be more robust (skiplist
+	                 problems)) as the now integrated imapd-2.3.13
+	                 (see below) has additional skiplist fixes and
+	                 the switch to berkeley-db for mailboxes.db
+	                 and annotations.db introduced new problems we
+	                 switched back to skiplist as default.
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
 TODO:	kolab/issue973  (Rewritten from shown inconveniently in kontact)



From cvs at kolab.org  Thu Dec 17 12:17:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:17:39 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates imapd.conf.template.in, 1.18,
	1.19 
Message-ID: <20091217111739.225F5600570@lists.intevation.de>

Author: wilde

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

Modified Files:
	imapd.conf.template.in 
Log Message:
Changed default format for imapd databses back to skiplist. (kolab/issue840)

Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- imapd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.18
+++ imapd.conf.template.in	17 Dec 2009 11:17:37 -0000	1.19
@@ -79,9 +79,9 @@
 # the sieve extensions that should be enabled on the server
 sieve_extensions: fileinto reject vacation imapflags notify include envelope body relational regex subaddress copy
 
-# use berkeley db backend instead of skiplist
-annotation_db: berkeley
-mboxlist_db: berkeley
+# Uncomment to use berkeley db backend instead of skiplist:
+#annotation_db: berkeley
+#mboxlist_db: berkeley
 
 # Don't discard emails with identical message-id header (enabled by default):
 duplicatesuppression: 0



From cvs at kolab.org  Thu Dec 17 12:25:42 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:25:42 +0100 (CET)
Subject: wilde: server TODO,1.1.2.9,1.1.2.10 
Message-ID: <20091217112542.8067760056D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	TODO 
Log Message:
Updated release TODOs.


Index: TODO
===================================================================
RCS file: /kolabrepository/server/TODO,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- TODO	16 Dec 2009 15:50:57 -0000	1.1.2.9
+++ TODO	17 Dec 2009 11:25:40 -0000	1.1.2.10
@@ -29,8 +29,6 @@
 
 Sascha (wilde):
 
-	switch imapd databases back from berkeley to skiplist
-	    (skiplist has proven to cause less performance and stability issues)
 
 Additional targets that might be done:
 



From cvs at kolab.org  Thu Dec 17 12:25:50 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:25:50 +0100 (CET)
Subject: thomas: server update.mk,1.1.2.3,1.1.2.4 
Message-ID: <20091217112550.9B72860056E@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
php-kolab/Kolab_Server was changed, too


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- update.mk	17 Dec 2009 11:16:21 -0000	1.1.2.3
+++ update.mk	17 Dec 2009 11:25:48 -0000	1.1.2.4
@@ -9,6 +9,7 @@
                     imapd                   \
                     kolabd                  \
                     php-kolab/Kolab_Filter  \
+                    php-kolab/Kolab_Server  \
                     kolab-webadmin          \
                     kolab-webclient         \
 # Hm, we can't update these automatically...



From cvs at kolab.org  Thu Dec 17 12:38:23 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:38:23 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.96,1.398.2.97 
Message-ID: <20091217113823.E8B9660056D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Updated release notes (added missing for merge from 2009/10/13).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.96
retrieving revision 1.398.2.97
diff -u -d -r1.398.2.96 -r1.398.2.97
--- release-notes.txt	17 Dec 2009 11:09:41 -0000	1.398.2.96
+++ release-notes.txt	17 Dec 2009 11:38:21 -0000	1.398.2.97
@@ -90,14 +90,6 @@
 	kolab/issue3895 (Openldap: loglevel should be set to none in
 	                 slapd.conf)
 
-    - kolab-webadmin-2.2.3-2009????
-
-	kolab/issue1340 (RFC: restrict users to sending mail only to
-	                 internal recipients)
-	kolab/issue3428 (Present the checkbox in the "accept internet email"
-	                 nicer)
-	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
-
     - Kolab_Filter-0.1.4-2009????
 
 	kolab/issue973  (Rewritten from shown inconveniently in kontact)
@@ -118,6 +110,21 @@
 	kolab/issue3965 (Always accept: invitations get lost when
 	                 Calendar folder ist not writable for the
 	                 calendar user)
+
+    - Kolab_Server-0.4.0-20091013
+
+	Added ability to map arbitrary ldap attributes to those
+	expected by kolab.  This feature is experimental and very
+	little tested.
+
+    - kolab-webadmin-2.2.3-2009????
+
+	kolab/issue1340 (RFC: restrict users to sending mail only to
+	                 internal recipients)
+	kolab/issue3428 (Present the checkbox in the "accept internet email"
+	                 nicer)
+	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
+
 
     - kolab-webclient-1.2.0-20090514
 



From cvs at kolab.org  Thu Dec 17 12:39:06 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 12:39:06 +0100 (CET)
Subject: thomas: server update.mk,1.1.2.4,1.1.2.5 
Message-ID: <20091217113906.796BB60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	update.mk 
Log Message:
PEAR-Net_LDAP2 is a new dependency of Kolab_Server


Index: update.mk
===================================================================
RCS file: /kolabrepository/server/Attic/update.mk,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- update.mk	17 Dec 2009 11:25:48 -0000	1.1.2.4
+++ update.mk	17 Dec 2009 11:39:04 -0000	1.1.2.5
@@ -8,6 +8,7 @@
                     db                      \
                     imapd                   \
                     kolabd                  \
+                    pear/PEAR-Net_LDAP2     \
                     php-kolab/Kolab_Filter  \
                     php-kolab/Kolab_Server  \
                     kolab-webadmin          \



From cvs at kolab.org  Thu Dec 17 13:06:20 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 13:06:20 +0100 (CET)
Subject: thomas: server release-notes.txt,1.398.2.97,1.398.2.98 
Message-ID: <20091217120620.99B7F60056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Updated package: procmail-3.22-20090727


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.97
retrieving revision 1.398.2.98
diff -u -d -r1.398.2.97 -r1.398.2.98
--- release-notes.txt	17 Dec 2009 11:38:21 -0000	1.398.2.97
+++ release-notes.txt	17 Dec 2009 12:06:18 -0000	1.398.2.98
@@ -125,7 +125,6 @@
 	                 nicer)
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
-
     - kolab-webclient-1.2.0-20090514
 
 	SECURITY: Fixed image upload form issue.
@@ -189,6 +188,11 @@
 	                 RUNONCHANGE is used)
 	kolab/issue3952 (Version in kolabconf is not replaced in the build
 	                 process)
+
+    - procmail-3.22-20090727
+
+	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
+
 
     Packages in the OpenPKG based Kolab server release:
 



From cvs at kolab.org  Thu Dec 17 13:07:49 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 13:07:49 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.98,1.398.2.99 
Message-ID: <20091217120749.7C80460056D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Updated release notes (added new package from 2009/10/13).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.98
retrieving revision 1.398.2.99
diff -u -d -r1.398.2.98 -r1.398.2.99
--- release-notes.txt	17 Dec 2009 12:06:18 -0000	1.398.2.98
+++ release-notes.txt	17 Dec 2009 12:07:47 -0000	1.398.2.99
@@ -755,6 +755,10 @@
 	kolab/issue2441 (/kolab/RPM/TMP/pear/temp created owned by root)
 	kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10)
 
+    - PEAR-Net_LDAP2-2.0.0RC5-1
+
+	New package, needed for ldap attribute mapping.
+
     - PEAR-PHPUnit-Channel-1.0-20090119
 
 	kolab/issue2441 (/kolab/RPM/TMP/pear/temp created owned by root)



From cvs at kolab.org  Thu Dec 17 13:09:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 13:09:24 +0100 (CET)
Subject: wilde: server release-notes.txt,1.398.2.99,1.398.2.100 
Message-ID: <20091217120924.6B13560056D@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Moved the last new entry to the right position.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.99
retrieving revision 1.398.2.100
diff -u -d -r1.398.2.99 -r1.398.2.100
--- release-notes.txt	17 Dec 2009 12:07:47 -0000	1.398.2.99
+++ release-notes.txt	17 Dec 2009 12:09:22 -0000	1.398.2.100
@@ -189,6 +189,10 @@
 	kolab/issue3952 (Version in kolabconf is not replaced in the build
 	                 process)
 
+    - PEAR-Net_LDAP2-2.0.0RC5-1
+
+	New package, needed for ldap attribute mapping.
+
     - procmail-3.22-20090727
 
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
@@ -754,10 +758,6 @@
 
 	kolab/issue2441 (/kolab/RPM/TMP/pear/temp created owned by root)
 	kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10)
-
-    - PEAR-Net_LDAP2-2.0.0RC5-1
-
-	New package, needed for ldap attribute mapping.
 
     - PEAR-PHPUnit-Channel-1.0-20090119
 



From cvs at kolab.org  Thu Dec 17 13:11:39 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 13:11:39 +0100 (CET)
Subject: thomas: server/perl-kolab .cvsignore,1.2,1.2.2.1 
Message-ID: <20091217121139.0B91960056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	.cvsignore 
Log Message:
ignore copied kolab.mk


Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/perl-kolab/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- .cvsignore	1 Aug 2007 14:57:41 -0000	1.2
+++ .cvsignore	17 Dec 2009 12:11:37 -0000	1.2.2.1
@@ -3,3 +3,4 @@
 blib
 pm_to_blib
 *.src.rpm
+kolab.mk



From cvs at kolab.org  Thu Dec 17 13:15:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 13:15:54 +0100 (CET)
Subject: thomas: server release-notes.txt,1.398.2.100,1.398.2.101 
Message-ID: <20091217121554.0018360056D@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_2_branch
	release-notes.txt 
Log Message:
Updated package versions and generaded package list


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.100
retrieving revision 1.398.2.101
diff -u -d -r1.398.2.100 -r1.398.2.101
--- release-notes.txt	17 Dec 2009 12:09:22 -0000	1.398.2.100
+++ release-notes.txt	17 Dec 2009 12:15:51 -0000	1.398.2.101
@@ -66,7 +66,7 @@
 	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported
 	                 by all find implementations)
 
-    - kolabd-2.2.3-2009????
+    - kolabd-2.2.3-20091217
 
 	kolab/issue840  (Annotations needs to be more robust (skiplist
 	                 problems)) as the now integrated imapd-2.3.13
@@ -90,7 +90,7 @@
 	kolab/issue3895 (Openldap: loglevel should be set to none in
 	                 slapd.conf)
 
-    - Kolab_Filter-0.1.4-2009????
+    - Kolab_Filter-0.1.4-20091203
 
 	kolab/issue973  (Rewritten from shown inconveniently in kontact)
 	kolab/issue2495 (The reply to an invitation with umlauts of a
@@ -117,7 +117,7 @@
 	expected by kolab.  This feature is experimental and very
 	little tested.
 
-    - kolab-webadmin-2.2.3-2009????
+    - kolab-webadmin-2.2.3-20091217
 
 	kolab/issue1340 (RFC: restrict users to sending mail only to
 	                 internal recipients)
@@ -125,7 +125,7 @@
 	                 nicer)
 	kolab/issue3499 (Kolab web admin does not use LDAP escaping)
 
-    - kolab-webclient-1.2.0-20090514
+    - kolab-webclient-1.2.0-20091202
 
 	SECURITY: Fixed image upload form issue.
 
@@ -172,7 +172,11 @@
 	Fixed cflags for amd64 systems.  Related to:
 	kolab/issue2982 (OpenLDAP segmentation fault on 64bit)
 
-    - perl-kolab-2.2.3-2009????
+    - PEAR-Net_LDAP2-2.0.0RC5-1
+
+	New package, needed for ldap attribute mapping.
+
+    - perl-kolab-2.2.3-20091217
 
 	kolab/issue919  (kolab server has problems with some characters in
 	                 passwords)
@@ -189,10 +193,6 @@
 	kolab/issue3952 (Version in kolabconf is not replaced in the build
 	                 process)
 
-    - PEAR-Net_LDAP2-2.0.0RC5-1
-
-	New package, needed for ldap attribute mapping.
-
     - procmail-3.22-20090727
 
 	kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic)
@@ -200,7 +200,153 @@
 
     Packages in the OpenPKG based Kolab server release:
 
-    ???
+    - Kolab packages:
+
+      Added:
+
+	PEAR-Net_LDAP2-2.0.0RC5-1
+
+      Updated:
+
+	Kolab_Filter-0.1.4-20091203
+	Kolab_Server-0.4.0-20091013
+	clamav-0.95.3-20091030
+	kolab-webadmin-2.2.3-20091217
+	kolab-webclient-1.2.0-20091202
+	kolabd-2.2.3-20091217
+	perl-kolab-2.2.3-20091217
+
+      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_Format-1.0.0-20090402
+	Kolab_FreeBusy-0.1.2-20090406
+	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_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
+	openldap-2.3.43-20081212
+	perl-ldap-5.10.0-20081028_kolab1
+	php-smarty-2.6.20-20081212
+	sqlite-3.6.4-20081212
+
+    - OpenPKG packages:
+
+      Updated:
+
+	db-4.5.20.2-20070628_kolab1
+	imapd-2.3.13-20081020_kolab4
+	openpkg-20071227-20071227_kolab2
+	procmail-3.22-20090727
+
+      Unchanged:
+
+	amavisd-2.5.3-20080101
+	apache-2.2.10-20081111
+	apache-php-5.2.8-20081209_kolab2
+	apr-1.2.12-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
+	curl-7.17.1-20080101
+	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
+	imap-2006k-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-tools-1.4.6-20071231
+	openssl-0.9.8g-20080101
+	pcre-7.5-20080110
+	perl-5.10.0-20080103
+	perl-comp-5.10.0-20080110
+	perl-conv-5.10.0-20080101
+	perl-crypto-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-ssl-5.10.0-20080101
+	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
+	php-5.2.8-20081209_kolab2
+	pkgconfig-0.23-20080117
+	png-1.2.24-20080101
+	postfix-2.4.6-20080101_kolab
+	readline-5.2.12-20080101
+	sasl-2.1.22-20080101
+	sed-4.1.5-20080101
+	spamassassin-3.2.4-20080107
+	texinfo-4.11-20080101
+	zlib-1.2.3-20080101
 
 
 Changes between 2.2.1 and 2.2.2:



From cvs at kolab.org  Thu Dec 17 15:35:18 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 15:35:18 +0100 (CET)
Subject: emanuel: doc/www/src index.html.m4,1.167,1.168 
Message-ID: <20091217143518.EFA91600570@lists.intevation.de>

Author: emanuel

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

Modified Files:
	index.html.m4 
Log Message:
Added news for Kontact e4 Windows 20091204-3 release.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- index.html.m4	17 Nov 2009 16:23:47 -0000	1.167
+++ index.html.m4	17 Dec 2009 14:35:16 -0000	1.168
@@ -59,6 +59,23 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 <table>
+<tr><td class="newsd">December 17th, 2009</td>
+<td class="newsh">&raquo;
+  Kontact enterprise4 for Windows 20091204-3 (beta) Release
+</td></tr>
+</table>
+<div class="newsb">
+  A new Kontact e4 Installer for Windows is available from the  <a href="http://files.kolab.org/clients/kontact-enterprise4/windows/beta-huge-debug/20091204-3/">Kolab
+download server</a>.<br>
+  See the corresponding <a
+href="http://files.kolab.org/clients/kontact-enterprise4/windows/beta-huge-debug/20091204-3/README-kontact-20091204-3-en.txt">readme</a>
+and
+  <a href="https://wiki.kolab.org/index.php/Kontact_for_Windows_(beta-huge-debug)"
+  >wiki page</a> for details.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">November 17th, 2009</td>
 <td class="newsh">&raquo;
   Security Issue 25 for Kolab Server (ClamAV)
@@ -70,7 +87,6 @@
 </div>
 <p>
 
-
 <table>
 <tr><td class="newsd">October 2nd, 2009</td>
 <td class="newsh">&raquo;
@@ -86,6 +102,11 @@
 <p>
 
 
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
 <table>
 <tr><td class="newsd">June 26th, 2009</td>
 <td class="newsh">&raquo;
@@ -115,11 +136,6 @@
   See the <a href="http://www.kolab.org/pipermail/kolab-announce/2009/000084.html">announcement</a> for details.
 </div>
 <p>
-
-
-</div> <!-- END LATEST BLOCK -->
-<p>
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 
 <table>



From cvs at kolab.org  Thu Dec 17 16:36:59 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Dec 2009 16:36:59 +0100 (CET)
Subject: wilde: server 1st.README, 1.1.2.12, 1.1.2.13 release-notes.txt,
	1.398.2.101, 1.398.2.102 
Message-ID: <20091217153659.F360C600573@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	1st.README release-notes.txt 
Log Message:
Updated date in documentation for release.


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- 1st.README	17 Dec 2009 10:26:37 -0000	1.1.2.12
+++ 1st.README	17 Dec 2009 15:36:57 -0000	1.1.2.13
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Install and Upgrade Information
 ================================================
-(Version 2009????, Kolab Server 2.2.3)
+(Version 20091217, Kolab Server 2.2.3)
 
 See http://kolab.org/ for general information about Kolab,
 or look at http://wiki.kolab.org/ for specific topics.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.101
retrieving revision 1.398.2.102
diff -u -d -r1.398.2.101 -r1.398.2.102
--- release-notes.txt	17 Dec 2009 12:15:51 -0000	1.398.2.101
+++ release-notes.txt	17 Dec 2009 15:36:57 -0000	1.398.2.102
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 2009????, Kolab Server 2.2.3)
+(Version 20091217, Kolab Server 2.2.3)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.



From cvs at kolab.org  Sat Dec 19 12:50:04 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 19 Dec 2009 12:50:04 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.274, 1.275 kolab_ca.sh.in,
	1.4, 1.5 
Message-ID: <20091219115004.2384560057B@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_ca.sh.in 
Log Message:
better usage output. kolab/issue3979



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- ChangeLog	13 Dec 2009 18:04:37 -0000	1.274
+++ ChangeLog	19 Dec 2009 11:50:01 -0000	1.275
@@ -1,16 +1,20 @@
-2009-12-02  Mathieu Parent <math.parent at gmail.com>
+2009-12-19 Richard Bos <richard at radoeka.nl>
+
+	* kolab_ca.sh.in: better usage output. kolab/issue3979 
+
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/*.template.in: Use @@@warning@@@ macro, improving the
-      warning about kolab templates within configuration files
-      (kolab/issue1671).
+	  warning about kolab templates within configuration files
+	  (kolab/issue1671).
 
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/{DB_CONFIG.slapd,imapd.group,slapd.access,slapd.conf,
-      slapd.replicas,transport,virtual}.template.in: use the new
-      @@@print@@@ macro (perl-kolab) to behave like other templates
-      (solved kolab/issue1740).
-      Use RUNONCHANGE for OpenLDAP configuration files.
+	  slapd.replicas,transport,virtual}.template.in: use the new
+	  @@@print@@@ macro (perl-kolab) to behave like other templates
+	  (solved kolab/issue1740).
+	  Use RUNONCHANGE for OpenLDAP configuration files.
 
 2009-12-02  Mathieu Parent <math.parent at gmail.com>
 

Index: kolab_ca.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_ca.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_ca.sh.in	27 Nov 2009 19:16:12 -0000	1.4
+++ kolab_ca.sh.in	19 Dec 2009 11:50:01 -0000	1.5
@@ -148,11 +148,25 @@
     fi
 }
 
-appname=$0
+function usage() {
+    echo "Usage:"
+    echo "       $appname -newca hostname [organization organizational-unit]"
+    echo "       $appname -newreq hostname [keyfile] [certfile]"
+    echo "       $appname -sign [filename]"
+    echo "       $appname -verify [filename]"
+    echo
+    echo "       -h|--help: this help text"
+    exit 0
+}
+
+appname=$(basename $0)
+
+[[ $# == 0 ]] && usage
+
 while [ $# -gt 0 ]; do
 case $1 in
 -h|-help|--help)
-    echo "Usage: $appname {-newca hostname [organization organizational-unit]|-newreq hostname [keyfile] [certfile]|-sign [filename]|-verify [filename]|-help}"
+    usage
     ;;
 -newca)
     if [ ! -f ${CATOP}/serial ]; then



From cvs at kolab.org  Sat Dec 19 12:53:32 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 19 Dec 2009 12:53:32 +0100 (CET)
Subject: richard: server release-notes.txt,1.482,1.483 
Message-ID: <20091219115332.CB1D260057B@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added kolab/issue3979 and re-ordered

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -d -r1.482 -r1.483
--- release-notes.txt	17 Dec 2009 11:17:37 -0000	1.482
+++ release-notes.txt	19 Dec 2009 11:53:30 -0000	1.483
@@ -79,6 +79,12 @@
 	End with slash as recommended in http://php.net/ini.sect.safe-mode
 
 	kolab/issue1382 (resmgr accepts concurrent overlapping invitations)
+	kolab/issue1671 (Improving the warning about kolab templates within
+	                 configuration files)
+	kolab/issue1740 (fully generate slapd.access, slapd.replicas,
+	                 transport, virtual and imapd.groups by templates)
+	                 using the new @@@print@@@ macro (perl-kolab) and
+	                 RUNONCHANGE.
 	kolab/issue1755 (syncrepl support (for OpenLDAP >=2.4.6))
 	kolab/issue2499 (Notification messages by the resource manager sould be
 	                 localized)
@@ -87,12 +93,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/issue1740 (fully generate slapd.access, slapd.replicas,
-	                 transport, virtual and imapd.groups by templates)
-	                 using the new @@@print@@@ macro (perl-kolab) and
-	                 RUNONCHANGE.
-	kolab/issue1671 (Improving the warning about kolab templates within
-	                 configuration files)
+	kolab/issue3979 (improve kolab_ca.sh usability)
 
     - kolab-fbview-1.2.0-2009????
 



From cvs at kolab.org  Wed Dec 23 17:56:55 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 17:56:55 +0100 (CET)
Subject: thomas: doc/www/src download.html.m4, 1.22, 1.23 index.html.m4, 1.168,
	1.169 roadmap.html.m4, 1.31, 1.32 
Message-ID: <20091223165655.F3512600174@lists.intevation.de>

Author: thomas

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

Modified Files:
	download.html.m4 index.html.m4 roadmap.html.m4 
Log Message:
kolab server 2.2.3 released

Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- download.html.m4	5 Nov 2009 15:08:50 -0000	1.22
+++ download.html.m4	23 Dec 2009 16:56:52 -0000	1.23
@@ -74,8 +74,8 @@
 <pre>
   <a href="http://files.kolab.org/server/">server/</a>
    |--<a href="http://files.kolab.org/server/release/">release/</a>                      - stable releases of Kolab Server
-   |   |--<a href="http://files.kolab.org/server/release/kolab-server-2.2.1/">kolab-server-2.2.1/</a>       - previous stable release 2.2.1
-   |   `--<a href="http://files.kolab.org/server/release/kolab-server-2.2.2/">kolab-server-2.2.2/</a>       - current stable release 2.2.2
+   |   `--<a href="http://files.kolab.org/server/release/kolab-server-2.2.2/">kolab-server-2.2.2/</a>       - previous stable release 2.2.2
+   |   `--<a href="http://files.kolab.org/server/release/kolab-server-2.2.3/">kolab-server-2.2.3/</a>       - current stable release 2.2.3
    |--<a href="http://files.kolab.org/server/security-updates/">security-updates/</a>             - files referenced by <a href="http://kolab.org/security/">Kolab Security Issues</a>
    `--<a href="http://files.kolab.org/server/beta/">beta/</a>                         - beta versions and release candidates
 </pre>

Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- index.html.m4	17 Dec 2009 14:35:16 -0000	1.168
+++ index.html.m4	23 Dec 2009 16:56:52 -0000	1.169
@@ -59,6 +59,20 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 <table>
+<tr><td class="newsd">December 23rd, 2009</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.2.3 Final Release
+</td></tr>
+</table>
+<div class="newsb">
+  This release contains 50 enhancements and fixes compared to 2.2.2.<br>
+  Source and binary packages are available from the <a href="download.html">download page</a>.<br>
+  See the <a href="http://www.kolab.org/pipermail/kolab-announce/2009/000088.html">announcement</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">December 17th, 2009</td>
 <td class="newsh">&raquo;
   Kontact enterprise4 for Windows 20091204-3 (beta) Release
@@ -75,6 +89,12 @@
 </div>
 <p>
 
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
 <table>
 <tr><td class="newsd">November 17th, 2009</td>
 <td class="newsh">&raquo;
@@ -100,11 +120,6 @@
   <a href="security/kolab-vendor-notice-24.txt">Kolab Security Issue 24</a> for details.
 </div>
 <p>
-
-
-</div> <!-- END LATEST BLOCK -->
-<p>
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 
 <table>

Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- roadmap.html.m4	12 Nov 2009 14:05:14 -0000	1.31
+++ roadmap.html.m4	23 Dec 2009 16:56:52 -0000	1.32
@@ -28,8 +28,11 @@
 2.2.2 was published on May 15th, 2009.
 It contains some bugfixes and small improvements.
 <p>
-It is planned to have further improvements in a release 
-2.2.3 or 2.3.0 end of 2009.
+2.2.3 was published on December 23rd, 2009.
+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.
 
 <h3>Kolab Server 2.1 release series</h3>
 Current is 2.1.0 Final. No further releases planned.



From cvs at kolab.org  Wed Dec 23 20:51:00 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 20:51:00 +0100 (CET)
Subject: gunnar: server/imapd/patches/cyrus-imapd-2.3.16 - New directory 
Message-ID: <20091223195100.9D4F160015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/imapd/patches/cyrus-imapd-2.3.16
In directory doto:/tmp/cvs-serv31182/cyrus-imapd-2.3.16

Log Message:
Directory /kolabrepository/server/imapd/patches/cyrus-imapd-2.3.16 added to the repository




From cvs at kolab.org  Wed Dec 23 20:53:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 20:53:21 +0100 (CET)
Subject: gunnar: server/imapd/patches Makefile,1.3,1.4 
Message-ID: <20091223195321.1987D60015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/imapd/patches
In directory doto:/tmp/cvs-serv31284

Modified Files:
	Makefile 
Log Message:
Kolab patches for cyrus-imapd-2.3.16.

KOLAB_cyrus-imapd-2.3.15_Annotations2.patch really went upstream. Unbelievable...

KOLAB_cyrus-imapd-2.3.16_Logging.patch was modified and logging the expunge operation when closing a mailbox should be tested again.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/patches/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	4 Dec 2009 09:46:54 -0000	1.3
+++ Makefile	23 Dec 2009 19:53:19 -0000	1.4
@@ -1,5 +1,5 @@
-OLD_VERSION=2.3.14
-NEW_VERSION=2.3.15
+OLD_VERSION=2.3.15
+NEW_VERSION=2.3.16
 
 PN=cyrus-imapd
 



From cvs at kolab.org  Wed Dec 23 20:53:21 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 20:53:21 +0100 (CET)
Subject: gunnar: server/imapd/patches/cyrus-imapd-2.3.16
	KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.16_Folder-names.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.16_Groups2.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.16_Logging.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.16_UID.patch, NONE,
	1.1 KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch,
	NONE, 1.1 series, NONE, 1.1 
Message-ID: <20091223195321.1E0EF600174@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/imapd/patches/cyrus-imapd-2.3.16
In directory doto:/tmp/cvs-serv31284/cyrus-imapd-2.3.16

Added Files:
	KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch 
	KOLAB_cyrus-imapd-2.3.16_Folder-names.patch 
	KOLAB_cyrus-imapd-2.3.16_Groups2.patch 
	KOLAB_cyrus-imapd-2.3.16_Logging.patch 
	KOLAB_cyrus-imapd-2.3.16_UID.patch 
	KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch 
	series 
Log Message:
Kolab patches for cyrus-imapd-2.3.16.

KOLAB_cyrus-imapd-2.3.15_Annotations2.patch really went upstream. Unbelievable...

KOLAB_cyrus-imapd-2.3.16_Logging.patch was modified and logging the expunge operation when closing a mailbox should be tested again.


--- NEW FILE: KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch ---
Allows to use arbitrary annotations with the cyradm tool.

diff -r 69927cac0b1b doc/man/cyradm.1.html
--- a/doc/man/cyradm.1.html	Fri Dec 04 10:32:26 2009 +0100
+++ b/doc/man/cyradm.1.html	Fri Dec 04 10:32:33 2009 +0100
@@ -220,6 +220,13 @@
 <dd>
 <p>Sets an email address to which messages injected into the server via NNTP 
 will be sent.</p>
+</dd>
+</li>
+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
+
+<dd>
+<p>Sets the annotation <em>/explicit/annotation</em>
+on <em>mailbox</em> to <em>value</em>.</p>
 </dd>
 <dt><strong><a name="sharedseen" class="item"><code>sharedseen</code></a></strong></dt>
 
diff -r 69927cac0b1b perl/imap/IMAP/Admin.pm
--- a/perl/imap/IMAP/Admin.pm	Fri Dec 04 10:32:26 2009 +0100
+++ b/perl/imap/IMAP/Admin.pm	Fri Dec 04 10:32:33 2009 +0100
@@ -797,11 +797,11 @@
     return undef;
   }
 
-  if(!exists($values{$entry})) {
-    $self->{error} = "Unknown parameter $entry";
+  if(exists($values{$entry})) {
+    $entry = $values{$entry};    
+  } else {
+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
   }
-
-  $entry = $values{$entry};
 
   my ($rc, $msg);
 
diff -r 69927cac0b1b perl/imap/IMAP/Shell.pm
--- a/perl/imap/IMAP/Shell.pm	Fri Dec 04 10:32:26 2009 +0100
+++ b/perl/imap/IMAP/Shell.pm	Fri Dec 04 10:32:33 2009 +0100
@@ -127,7 +127,7 @@
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1437,7 +1437,7 @@
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1446,7 +1446,7 @@
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";
diff -r 69927cac0b1b perl/imap/cyradm.sh
--- a/perl/imap/cyradm.sh	Fri Dec 04 10:32:26 2009 +0100
+++ b/perl/imap/cyradm.sh	Fri Dec 04 10:32:33 2009 +0100
@@ -241,6 +241,10 @@
 
 Indicates that the mailbox should have a squat index created for it.
 
+=item C</explicit/annotation>
+
+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
+
 =back 
 
 =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>

--- NEW FILE: KOLAB_cyrus-imapd-2.3.16_Folder-names.patch ---
Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9]

diff -r 17e54b46d7b6 imap/mboxname.c
--- a/imap/mboxname.c	Mon Oct 27 18:44:56 2008 +0100
+++ b/imap/mboxname.c	Mon Oct 27 18:47:11 2008 +0100
@@ -713,8 +713,10 @@
 /*
  * Apply site policy restrictions on mailbox names.
  * Restrictions are hardwired for now.
+ * original definition 
+#define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
  */
-#define GOODCHARS " #$'+,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
 int mboxname_policycheck(char *name)
 {
     unsigned i;

--- NEW FILE: KOLAB_cyrus-imapd-2.3.16_Groups2.patch ---
diff -r 37030bf2b2bb lib/auth_unix.c
--- a/lib/auth_unix.c	Fri Dec 04 10:25:24 2009 +0100
+++ b/lib/auth_unix.c	Fri Dec 04 10:32:19 2009 +0100
@@ -46,6 +46,7 @@
 #include <stdlib.h>
 #include <pwd.h>
 #include <grp.h>
+#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
@@ -54,6 +55,126 @@
 #include "xmalloc.h"
 #include "util.h"
 
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+/*
+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
+ * Copyright (C) 1995, 1996 Nat Friedman <ndf at linux.mit.edu>.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+static struct group *__getgrent(int grp_fd, char *line_buff, char **members)
+{
+    short line_index;
+    short buff_size;
+    static struct group group;
+    register char *ptr;
+    char *field_begin;
+    short member_num;
+    char *endptr;
+    int line_len;
+
+    /* We use the restart label to handle malformatted lines */
+    restart:
+    line_index = 0;
+    buff_size = 256;
+
+    line_buff = realloc(line_buff, buff_size);
+    while (1) {
+        if ((line_len = read(grp_fd, line_buff + line_index,
+                        buff_size - line_index)) <= 0) {
+            return NULL;
+        }
+        field_begin = strchr(line_buff, '\n');
+        if (field_begin != NULL) {
+            lseek(grp_fd,
+                    (long) (1 + field_begin -
+                            (line_len + line_index + line_buff)), SEEK_CUR);
+            *field_begin = '\0';
+            if (*line_buff == '#' || *line_buff == ' '
+                    || *line_buff == '\n' || *line_buff == '\t')
+                goto restart;
+            break;
+        } else {
+            /* Allocate some more space */
+            line_index = buff_size;
+            buff_size += 256;
+            line_buff = realloc(line_buff, buff_size);
+        }
+    }
+
+    /* Now parse the line */
+    group.gr_name = line_buff;
+    ptr = strchr(line_buff, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    group.gr_passwd = ptr;
+    ptr = strchr(ptr, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    field_begin = ptr;
+    ptr = strchr(ptr, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10);
+    if (*endptr != '\0')
+        goto restart;
+
+    member_num = 0;
+    field_begin = ptr;
+
+    if (members != NULL)
+        free(members);
+    members = (char **) malloc((member_num + 1) * sizeof(char *));
+    for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) {
+        if ((ptr = strchr(field_begin, ',')) != NULL)
+            *ptr++ = '\0';
+        members[member_num++] = field_begin;
+        members = (char **) realloc(members,
+                (member_num + 1) * sizeof(char *));
+    }
+    members[member_num] = NULL;
+
+    group.gr_mem = members;
+    return &group;
+}
+
+static char *line_buff = NULL;
+static char **members  = NULL;
+
+struct group *fgetgrent(FILE *file)
+{
+    if (file == NULL) {
+        errno = EINTR;
+        return NULL;
+    }
+    return __getgrent(fileno(file), line_buff, members);
+}
+#endif /* __FreeBSD__ */
+ 
 struct auth_state {
     char userid[81];
     char **group;
@@ -141,6 +262,25 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
+static struct group* fgetgrnam(const char* name)
+{
+    struct group *grp;
+    FILE *groupfile;
+
+    groupfile = fopen("/etc/imapd.group", "r");
+    if (!groupfile) groupfile = fopen("/etc/group", "r");
+    if (groupfile) {
+       while ((grp = fgetgrent(groupfile))) {
+         if (strcmp(grp->gr_name, name) == 0) {
+           fclose(groupfile);
+           return grp;
+         }
+       }
+    } 
+    if (groupfile) fclose(groupfile);
+    return NULL;
+} 
+
 /*
  * Convert 'identifier' into canonical form.
  * Returns a pointer to a static buffer containing the canonical form
@@ -176,7 +316,7 @@
      */
     
     if (!strncmp(retbuf, "group:", 6)) {
-	grp = getgrnam(retbuf+6);
+	grp = fgetgrnam(retbuf+6);
 	if (!grp) return NULL;
 	if (strlen(grp->gr_name) >= sizeof(retbuf)-6)
 		return NULL;
@@ -224,11 +364,12 @@
     struct auth_state *newstate;
     struct passwd *pwd;
     struct group *grp;
-#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+#if 0 && defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
     gid_t gid, *groupids = NULL;
     int ret, ngroups = 10;
 #else
     char **mem;
+    FILE *groupfile;
 #endif
 
     identifier = mycanonifyid(identifier, 0);
@@ -246,7 +387,7 @@
 
     pwd = getpwnam(identifier);
 
-#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+#if 0 && defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
     gid = pwd ? pwd->pw_gid : (gid_t) -1;
 
     /* get the group ids */
@@ -284,20 +425,23 @@
     if (groupids) free(groupids);
 
 #else /* !HAVE_GETGROUPLIST */
-    setgrent();
-    while ((grp = getgrent())) {
-	for (mem = grp->gr_mem; *mem; mem++) {
-	    if (!strcmp(*mem, identifier)) break;
-	}
+    groupfile = fopen("/etc/imapd.group", "r");
+    if (!groupfile) groupfile = fopen("/etc/group", "r");
+    if (groupfile) {
+       while ((grp = fgetgrent(groupfile))) {
+         for (mem = grp->gr_mem; *mem; mem++) {
+            if (!strcmp(*mem, identifier)) break;
+         }
 
-	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
-	    newstate->ngroups++;
-	    newstate->group = (char **)xrealloc((char *)newstate->group,
-						newstate->ngroups * sizeof(char *));
-	    newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
-	}
-    }
-    endgrent();
+         if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
+            newstate->ngroups++;
+            newstate->group = (char **)xrealloc((char *)newstate->group,
+                                                newstate->ngroups * sizeof(char *));
+            newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+         }
+       }
+       fclose(groupfile);
+    } 
 #endif /* HAVE_GETGROUPLIST */
 
     return newstate;

--- NEW FILE: KOLAB_cyrus-imapd-2.3.16_Logging.patch ---
Provides improved logging for the cyrus imapd server [Version: 2.3.9]

diff -r e17e42827afc imap/append.c
--- a/imap/append.c	Wed Dec 23 20:17:41 2009 +0100
+++ b/imap/append.c	Wed Dec 23 20:49:56 2009 +0100
@@ -654,6 +654,9 @@
     /* ok, we've successfully added a message */
     as->quota_used += message_index.size;
 
+    syslog(LOG_DEBUG, "append_fromstage: message %d added to %s",
+	   message_index.uid, mailbox->name );
+
     return 0;
 }
 
diff -r e17e42827afc imap/imapd.c
--- a/imap/imapd.c	Wed Dec 23 20:17:41 2009 +0100
+++ b/imap/imapd.c	Wed Dec 23 20:49:56 2009 +0100
@@ -3638,6 +3638,8 @@
     if ((cmd[0] == 'C') && (imapd_mailbox->myrights & ACL_EXPUNGE)) {
 	if (!mailbox_expunge(imapd_mailbox, NULL, NULL, 0)) {
 	    sync_log_mailbox(imapd_mailbox->name);
+	    syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s",
+		   imapd_userid, imapd_mailbox->name, "''");
 	}
     }
 
diff -r e17e42827afc imap/mailbox.c
--- a/imap/mailbox.c	Wed Dec 23 20:17:41 2009 +0100
+++ b/imap/mailbox.c	Wed Dec 23 20:49:56 2009 +0100
@@ -2575,6 +2575,8 @@
 	*(fname->tail)++ = '/';
 	fname->len++;
 	for (msgno = 0; msgno < numdeleted; msgno++) {
+	    syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d",
+		   mailbox->name, deleted[msgno]);
 	    mailbox_message_get_fname(mailbox, deleted[msgno],
 				      fname->tail,
 				      sizeof(fname->buf) - fname->len);

--- NEW FILE: KOLAB_cyrus-imapd-2.3.16_UID.patch ---
Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9]

diff -r 2ebe14b7db9d configure
--- a/configure	Mon Oct 27 18:47:12 2008 +0100
+++ b/configure	Mon Oct 27 18:48:18 2008 +0100
@@ -19667,7 +19667,7 @@
 done
 
 IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-IMAP_LIBS="${LIB_SASL} ${LIBS} ${SQL_LIBS}"
+IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS} ${SQL_LIBS}"
 
 
 
diff -r 2ebe14b7db9d imap/global.c
--- a/imap/global.c	Mon Oct 27 18:47:12 2008 +0100
+++ b/imap/global.c	Mon Oct 27 18:48:18 2008 +0100
@@ -52,6 +52,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
+
+#include <ldap.h>
+#include <lber.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -378,6 +381,18 @@
     char *domain = NULL;
     int len = strlen(user);
     char buf[81];
+    const char *uri;
+    const char *base;
+    const char *binddn;
+    const char *bindpw;
+    struct timeval timeout;
+    char filter[255];
+    LDAP *handle;
+    LDAPMessage *res;
+    LDAPMessage *entry;
+    struct berval** vals;
+
+    int rc;
 
     /* check for domain */
     if (config_virtdomains &&
@@ -396,6 +411,49 @@
     }
 
     if (config_virtdomains) {
+        if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) {
+           uri = config_getstring(IMAPOPT_LDAP_URI);
+           base = config_getstring(IMAPOPT_LDAP_BASE);
+           binddn = config_getstring(IMAPOPT_LDAP_BIND_DN);
+           bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD);
+           timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT);
+           timeout.tv_usec = 0;
+           sprintf(filter, "(uid=%s)", user);
+           rc = ldap_initialize(&handle, uri);
+           if (rc != LDAP_SUCCESS) {
+                syslog(LOG_ERR, "ldap_initialize failed (%s)", uri);
+           } else {
+	        rc = ldap_simple_bind_s(handle, binddn, bindpw);
+	        if (rc != LDAP_SUCCESS) {
+                     syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc));
+	        } else {
+	             rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res);
+                     if (rc != LDAP_SUCCESS) {
+                          syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc));
+                     } else {
+	                  if ( (entry = ldap_first_entry(handle, res)) != NULL ) {
+			       // read mail attribute from entry
+			       if ( (vals = ldap_get_values_len(handle, entry, "mail")) ) {
+  				    if (memchr(vals[0]->bv_val, '@', vals[0]->bv_len)) {
+				        static char buf[81]; /* same size as in auth_canonifyid */
+					   int len = ((sizeof(buf) - 1) > vals[0]->bv_len ? vals[0]->bv_len : sizeof(buf) - 1);
+					strncpy( buf, vals[0]->bv_val, len);
+					buf[len] = '\0'; /* make sure it's null-terminated */
+					ldap_value_free_len( vals );
+				        ldap_msgfree( res );
+					ldap_unbind_s(handle); /* also frees handle */
+					syslog(LOG_DEBUG, "canonify: '%s'\n", buf);
+				        return auth_canonifyid( buf, 0) ;
+				    }
+				    ldap_value_free_len( vals );
+			       }			       	
+   	                  }
+			  ldap_msgfree( res );
+                     }
+                }
+		ldap_unbind_s(handle); /* also frees handle */
+           }
+        }
 	if (domain) {
 	    if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) {
 		*domain = '\0'; /* trim the default domain */
@@ -408,7 +466,7 @@
 		user = buf;
 	    }
 	}
-	else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) {
+	else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) {
 	    socklen_t salen;
 	    int error;
 	    struct sockaddr_storage localaddr;
diff -r 2ebe14b7db9d lib/imapoptions
--- a/lib/imapoptions	Mon Oct 27 18:47:12 2008 +0100
+++ b/lib/imapoptions	Mon Oct 27 18:48:18 2008 +0100
@@ -1114,7 +1114,7 @@
    mailbox hierarchy.  The default is to use the netnews separator
    character '.'. */
 
-{ "virtdomains", "off", ENUM("off", "userid", "on") }
+{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") }
 /* Enable virtual domain support.  If enabled, the user's domain will
    be determined by splitting a fully qualified userid at the last '@'
    or '%' symbol.  If the userid is unqualified, and the virtdomains

--- NEW FILE: KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch ---
This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
(minus the CVS keywords)

It should be reverse-applied with patch -p2 -R to work around the kontact
behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
capabilities after starttls) and can be dropped as soon as kontact has a way
to work with old and new cyrus imapd servers.

diff -r 1688e25afb65 timsieved/parser.c
--- a/timsieved/parser.c	Thu Apr 23 23:28:07 2009 +0200
+++ b/timsieved/parser.c	Thu Apr 23 23:28:54 2009 +0200
@@ -908,8 +908,7 @@
 
     starttls_done = 1;
 
-    return capabilities(sieved_out, sieved_saslconn, starttls_done,
-			authenticated, sasl_ssf);
+    return result;
 }
 #else
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)

--- NEW FILE: series ---
KOLAB_Groups2.patch
KOLAB_Logging.patch
KOLAB_Folder-names.patch
KOLAB_UID.patch
KOLAB_Cyradm_Annotations.patch
KOLAB_timsieved_starttls-sendcaps.patch




From cvs at kolab.org  Wed Dec 23 21:22:59 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 21:22:59 +0100 (CET)
Subject: gunnar: server/imapd Makefile,1.46,1.47 kolab.patch,1.42,1.43 
Message-ID: <20091223202259.EEB2860015E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Update to cyrus-imapd-2.3.16

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile	9 Dec 2009 23:08:07 -0000	1.46
+++ Makefile	23 Dec 2009 20:22:57 -0000	1.47
@@ -3,14 +3,13 @@
 PACKAGE=imapd
 DOWNLOAD_VERSION=2.3.13
 OPENPKG_RELEASE=20081020
-VERSION=2.3.15
-RELEASE=20081020_kolab5
+VERSION=2.3.16
+RELEASE=20081020_kolab6
 
 SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus
-SOURCE_0=cyrus-imapd-2.3.15.tar.gz
+SOURCE_0=cyrus-imapd-2.3.16.tar.gz
 
 PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
-        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
         patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
         patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
         patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- kolab.patch	4 Dec 2009 10:58:01 -0000	1.42
+++ kolab.patch	23 Dec 2009 20:22:57 -0000	1.43
@@ -5,8 +5,8 @@
  License:      BSD
 -Version:      2.3.13
 -Release:      20081020
-+Version:      2.3.15
-+Release:      20081020_kolab5
++Version:      2.3.16
++Release:      20081020_kolab6
  
  #   package options
  %option       with_fsl           yes
@@ -18,7 +18,7 @@
  
  #   fixing implicit inter-module dependencies and correlations
  %if "%{with_kolab}" == "yes"
-@@ -67,12 +68,13 @@
+@@ -67,12 +68,14 @@
  Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
@@ -29,7 +29,8 @@
 -Patch5:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
 -Patch6:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
 +Patch1:       patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
-+Patch2:       patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Annotations2.patch
++#Patch2 is just a duplicated dummy entry to avoid rewriting the whole patch. The patch number 2 is not used anymore.
++Patch2:       patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
 +Patch3:       patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Cyradm_Annotations.patch
 +Patch4:       patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Logging.patch
 +Patch5:       patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_UID.patch
@@ -51,12 +52,11 @@
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
-@@ -132,7 +130,7 @@
+@@ -132,7 +130,6 @@
  
      #   add optional folder annotation support
  %if "%{with_annotate}" == "yes"
 -    sed <%{PATCH2} -e '5,27d' | %{l_patch} -p1
-+    %patch -p1 -P 2
      %patch -p1 -P 3
  %endif
  



From cvs at kolab.org  Wed Dec 23 21:25:42 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 21:25:42 +0100 (CET)
Subject: gunnar: server kolab.mk,1.1.2.2,NONE 
Message-ID: <20091223202542.1D6FB60015E@lists.intevation.de>

Author: gunnar

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

Removed Files:
      Tag: kolab_2_2_branch
	kolab.mk 
Log Message:
Remove the global kolab.mk. Use the one in make-helper instead.

--- kolab.mk DELETED ---



From cvs at kolab.org  Wed Dec 23 21:25:42 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Dec 2009 21:25:42 +0100 (CET)
Subject: gunnar: server/make-helper kolab.mk,1.1,1.2 
Message-ID: <20091223202542.21798600174@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv32399/make-helper

Modified Files:
	kolab.mk 
Log Message:
Remove the global kolab.mk. Use the one in make-helper instead.

Index: kolab.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/kolab.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.mk	9 Dec 2009 21:52:48 -0000	1.1
+++ kolab.mk	23 Dec 2009 20:25:40 -0000	1.2
@@ -51,3 +51,8 @@
 ifeq ($(PLATTAG),)
   PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
 endif
+
+# Determine the staging area for collecting new source rpms
+ifeq "x$(STAGING)" "x"
+  STAGING = ../stage
+endif



From cvs at kolab.org  Thu Dec 24 00:25:33 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 00:25:33 +0100 (CET)
Subject: gunnar: server/php/patches/php-5.3.1 - New directory 
Message-ID: <20091223232533.DB97360015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php/patches/php-5.3.1
In directory doto:/tmp/cvs-serv4920/php-5.3.1

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




From cvs at kolab.org  Thu Dec 24 00:25:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 00:25:57 +0100 (CET)
Subject: gunnar: server/php/patches Makefile,1.2,1.3 
Message-ID: <20091223232557.A3F0060015E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Patches for PHP 5.3.1.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/patches/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 Jul 2009 13:15:44 -0000	1.2
+++ Makefile	23 Dec 2009 23:25:55 -0000	1.3
@@ -1,57 +1,10 @@
-# This is a very rough draft for updating a patch series using
-# mercurial queues. The Makefile could see some optimizations but for
-# the occasional upstream update it hopefully does fine.
-#
-# Author: G. Wrobel
-
-OLD_VERSION=5.2.8
-NEW_VERSION=5.2.9
+OLD_VERSION=5.2.9
+NEW_VERSION=5.3.1
 
 PN=php
 
-SOURCE_URL=http://www.php.net/distributions/
-
-.PHONY: update
-update:
-	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
-	rm -rf tmp
-	mkdir -p tmp
-	cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.bz2
-	cd tmp && tar xfj $(PN)-$(OLD_VERSION).tar.bz2
-	cd tmp/$(PN)-$(OLD_VERSION) && hg init && hg commit --addremove -m "$(PN)-$(OLD_VERSION)"
-	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-PATCHED
-	printf "[extensions]\nhgext.mq =\n" > tmp/$(PN)-PATCHED/.hg/hgrc
-	cd tmp/$(PN)-PATCHED && hg qinit
-	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
-	cd $(PN)-$(OLD_VERSION); \
-	for FL in KOLAB*; do \
-	  cp $$FL ../tmp/$(PN)-PATCHED/.hg/patches/$${FL/$(PN)-$(OLD_VERSION)_/}; \
-	done
-	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
-	cd tmp/$(PN)-PATCHED && hg qpush -a && hg qpop -a
-	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-$(NEW_VERSION)
-	cd tmp/$(PN)-$(NEW_VERSION) && hg locate -0 | xargs -0 rm
-	cd tmp && wget $(SOURCE_URL)/$(PN)-$(NEW_VERSION).tar.bz2
-	cd tmp && tar xfj $(PN)-$(NEW_VERSION).tar.bz2
-	cd tmp/$(PN)-$(NEW_VERSION) && hg commit --addremove -m "$(PN)-$(NEW_VERSION)"
-	cd tmp/$(PN)-PATCHED && hg pull ../$(PN)-$(NEW_VERSION) && hg update
-	@echo
-	@echo
-	@echo "The patch series will be pushed now. If errors occur you will need to fix them"
-	@echo "run \"hg qrefresh\" and continue with \"hg qpush\" until the full series applied"
-	@echo "successfully. Finally you may move back to the current directory and run \"make patches\""
-	@echo
-	@echo
-	cd tmp/$(PN)-PATCHED && hg qpush -a
+SOURCE_URL=http://www.php.net/distributions
 
-.PHONY: patches
-patches:
-	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
-	mkdir $(PN)-$(NEW_VERSION)
-	cd tmp/$(PN)-PATCHED/.hg/patches; \
-	for FL in KOLAB*; do \
-	  cp $$FL ../../../../$(PN)-$(NEW_VERSION)/$${FL/KOLAB_/KOLAB_$(PN)-$(NEW_VERSION)_}; \
-	done
-	cp tmp/$(PN)-PATCHED/.hg/patches/series $(PN)-$(NEW_VERSION)/ 
-	rm -rf tmp
+COMPRESSION=BZ2
 
+include ../../make-helper/hg-patch-queue.mk



From cvs at kolab.org  Thu Dec 24 00:25:57 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 00:25:57 +0100 (CET)
Subject: gunnar: server/php/patches/php-5.3.1
	KOLAB_php-5.3.1_Annotations.patch, NONE,
	1.1 KOLAB_php-5.3.1_myrights.patch, NONE, 1.1 series, NONE, 1.1 
Message-ID: <20091223232557.A8FEF600174@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php/patches/php-5.3.1
In directory doto:/tmp/cvs-serv4970/php-5.3.1

Added Files:
	KOLAB_php-5.3.1_Annotations.patch 
	KOLAB_php-5.3.1_myrights.patch series 
Log Message:
Patches for PHP 5.3.1.

--- NEW FILE: KOLAB_php-5.3.1_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.1_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);

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



From cvs at kolab.org  Thu Dec 24 00:27:18 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 00:27:18 +0100 (CET)
Subject: gunnar: server/php Makefile,1.23,1.24 kolab.patch,1.16,1.17 
Message-ID: <20091223232718.9685460015E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Update to PHP 5.3.1.

with-spl is obsolete as this is always activated now. The kolabd and PHPUnit packages still need to get fixed for that.
with-mhash is replaced by with-hash. The kolabd package still needs to be fixed for that.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	9 Jul 2009 16:02:01 -0000	1.23
+++ Makefile	23 Dec 2009 23:27:16 -0000	1.24
@@ -1,46 +1,28 @@
-include ../Base.mk
+include ../make-helper/kolab.mk
 
 PACKAGE=php
-VERSION=5.2.8
-RELEASE=20081209
-KOLABRELEASE=20081209_kolab3
-
-PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
-        ../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
-        kolab.patch
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
-
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < 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' \
-	--define 'with_mbstring yes' --define 'with_mbregex yes' --define 'with_gd yes' \
-	--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'
+DOWNLOAD_VERSION=5.3.1
+OPENPKG_RELEASE=20091129
+VERSION=5.3.1
+RELEASE=20091129_kolab1
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm .
+SOURCE_URL=http://www.php.net/distributions
+SOURCE_0=php-5.3.1.tar.gz
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
+        patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
 
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+EXTRA=$(PATCHES) kolab.patch
 
-.PHONY: clean
-clean:
-	rm -f $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
+              --define 'with_pear yes' --define 'with_gettext yes' \
+              --define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
+              --define 'with_mbstring yes' --define 'with_mbregex yes' --define 'with_gd yes' \
+              --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_json yes'
 
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
-	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab.patch	16 Mar 2009 18:04:55 -0000	1.16
+++ kolab.patch	23 Dec 2009 23:27:16 -0000	1.17
@@ -9,8 +9,8 @@
  Group:        Language
  License:      PHP
  Version:      %{V_php}
--Release:      20081209
-+Release:      20081209_kolab3
+-Release:      20091129
++Release:      20091129_kolab1
  
  #   package options
  %option       with_suhosin              no
@@ -23,13 +23,12 @@
  %option       with_json                 no
  %option       with_mbregex              no
  %option       with_mbstring             no
-@@ -133,7 +134,8 @@
- Source2:      php.ini
- Source3:      http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
+@@ -138,6 +140,7 @@
  Patch0:       http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
--Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
+-Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
 +Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
-+Patch2:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
+ Patch2:       php.patch
++Patch3:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -41,7 +40,7 @@
 +    %patch -p1 -P 1
 +%endif
 +%if "%{with_imap_myrights}" == "yes"
-+    %patch -p1 -P 2
++    %patch -p1 -P 3
  %endif
  
  %build



From cvs at kolab.org  Thu Dec 24 09:35:52 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 09:35:52 +0100 (CET)
Subject: gunnar: server/apache-php Makefile,1.13,1.14 kolab.patch,1.8,1.9 
Message-ID: <20091224083552.5A23460015E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Update to apache-php-5.3.1.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	9 Jul 2009 16:15:23 -0000	1.13
+++ Makefile	24 Dec 2009 08:35:50 -0000	1.14
@@ -1,46 +1,28 @@
-include ../Base.mk
+include ../make-helper/kolab.mk
 
 PACKAGE=apache-php
-VERSION=5.2.8
-RELEASE=20081209
-KOLABRELEASE=20081209_kolab3
-
-PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
-        ../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
-        kolab.patch
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab.patch $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
-
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < 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' \
-	--define 'with_mbstring yes' --define 'with_mbregex yes' --define 'with_gd yes' \
-	--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'
+DOWNLOAD_VERSION=5.3.1
+OPENPKG_RELEASE=20091129
+VERSION=5.3.1
+RELEASE=20091129_kolab1
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm .
+SOURCE_URL=http://www.php.net/distributions
+SOURCE_0=php-5.3.1.tar.gz
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
+        ../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch
 
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+EXTRA=$(PATCHES) kolab.patch
 
-.PHONY: clean
-clean:
-	rm -f $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
+              --define 'with_pear yes' --define 'with_gettext yes' \
+              --define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \
+              --define 'with_mbstring yes' --define 'with_mbregex yes' --define 'with_gd yes' \
+              --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_json yes'
 
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
-	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.patch	16 Mar 2009 18:04:55 -0000	1.8
+++ kolab.patch	24 Dec 2009 08:35:50 -0000	1.9
@@ -9,8 +9,8 @@
  Group:        Web
  License:      PHP
  Version:      %{V_php}
--Release:      20081209
-+Release:      20081209_kolab3
+-Release:      20091129
++Release:      20091129_kolab1
  
  #   package options
  %option       with_suhosin              no
@@ -23,13 +23,14 @@
  %option       with_json                 no
  %option       with_mbregex              no
  %option       with_mbstring             no
-@@ -134,7 +135,8 @@
+@@ -137,8 +139,9 @@
  Source3:      apache-php.conf
  Source4:      http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
  Patch0:       http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
--Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
+-Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
 +Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_Annotations.patch
-+Patch2:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_myrights.patch
+ Patch2:       apache-php.patch
++Patch3:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_myrights.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -41,7 +42,7 @@
 +    %patch -p1 -P 1
 +%endif
 +%if "%{with_imap_myrights}" == "yes"
-+    %patch -p1 -P 2
++    %patch -p1 -P 3
  %endif
  
  %build



From cvs at kolab.org  Thu Dec 24 09:36:54 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 09:36:54 +0100 (CET)
Subject: gunnar: server/pear/PHPUnit package.info,NONE,1.1 
Message-ID: <20091224083654.794A860015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PHPUnit
In directory doto:/tmp/cvs-serv1536

Added Files:
	package.info 
Log Message:
Added package definition.

--- NEW FILE: package.info ---
# The name of PEAR source package
pear_package='PHPUnit'

# The name of the RPM package
package='PHPUnit'

# Where to find information about the package
package_url='http://pear.phpunit.de/'

# How should the source be retrieved?
#
# WGET: Download via wget
package_origin='WGET'

# Version number
version='3.3.3'

# Package release number
release='1'

# Source URL to download from
sourceurl='http://pear.phpunit.de/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-PHPUnit-Channel         \
'

# Installatin prerequisites
prereq='                                   \
PreReq:       OpenPKG, openpkg >= 20070603 \
PreReq:       php, php::with_pear = yes    \
'

# Package summary description
summary='Regression testing framework for unit tests.'

# Long package description
description=' \
PHPUnit is a regression testing framework used by the developer who \
implements unit tests in PHP. This is the version to be used with PHP \
5. \
'

# Source code license
license='BSD-Style'



From cvs at kolab.org  Thu Dec 24 10:21:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 10:21:28 +0100 (CET)
Subject: gunnar: server/pear/PEAR-Log package.info,NONE,1.1 
Message-ID: <20091224092128.5A94D60015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv3054

Added Files:
	package.info 
Log Message:
Added missing package.info.

--- NEW FILE: package.info ---
# The name of PEAR source package
pear_package='Log'

# The name of the RPM package
package='PEAR-Log'

# Where to find information about the package
package_url='http://pear.php.net/package/'

# How should the source be retrieved?
#
# WGET: Download via wget
package_origin='WGET'

# Version number
version='1.11.2'

# Package release number
release='1'

# Source URL to download from
sourceurl='http://pear.php.net/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    \
'

# Installatin prerequisites
prereq='                                   \
PreReq:       OpenPKG, openpkg >= 20070603 \
PreReq:       php, php::with_pear = yes    \
'

# Package summary description
summary='PEAR: Logging utilities'

# Long package description
description=' \
The Log framework provides an abstracted logging system. It supports \
logging to console, file, syslog, SQL, Sqlite, mail, and mcal targets. It \
also provides a subject - observer mechanism. \
'

# Source code license
license='MIT License'



From cvs at kolab.org  Thu Dec 24 13:34:24 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 13:34:24 +0100 (CET)
Subject: gunnar: server/pear Pear.mk,1.13,1.14 
Message-ID: <20091224123424.4F2FF60015E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Pear.mk 
Log Message:
Update the ar make helper before moving it into the make-helper directory.

Index: Pear.mk
===================================================================
RCS file: /kolabrepository/server/pear/Pear.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Pear.mk	22 Jul 2009 07:52:06 -0000	1.13
+++ Pear.mk	24 Dec 2009 12:34:22 -0000	1.14
@@ -130,9 +130,7 @@
 
 # Target for placing the source rpm in the staging area
 .PHONY: dist
-dist: all
-	test -d $(STAGING) || mkdir $(STAGING)
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
+dist: $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 # Target for installing the binary rpm package in our current Kolab
 # server installation
@@ -140,10 +138,51 @@
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 
+# Target for cleaning up the files that can be generated with this Makefile
+.PHONY: clean
+clean:
+	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf $(SOURCE_0)
+	rm -rf *~
+	rm -rf tmp
+	rm -rf $(PACKAGE).spec
+	rm -rf package.patch
+
+# Target for fetching the source rpm into the current directory
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
 # Target location for the repository checkout
 $(UPSTREAM)/$(SAFE_COMMIT):
 	mkdir -p "$(UPSTREAM)/$(SAFE_COMMIT)"
 
+# Target for building the binary package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+# Target for building the source package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
+
+# Target for preparing the source area and building the package
+$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
+
+# Target for the source file in the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0)
+	cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/
+
+# Target for the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE):
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+
+# Target for retrieving the source package
+$(SOURCE_0):
+	wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 
 # Get the repository checkout
 ifeq ($(PACKAGE_VC),CVS)
@@ -200,17 +239,13 @@
 snapshot: tmp/.sent
 endif
 
-# Target for retrieving the source package
-$(SOURCE_0):
-	wget -c "$(SOURCE_URL)/$(SOURCE_0)"
-
-# Target for the src rpm directory.
-$(KOLABRPMSRC)/$(PACKAGE):
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+# Prepare the staging area
+$(STAGING):
+	mkdir -p $(STAGING)
 
-# Target for the source file in the src rpm directory.
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0)
-	cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/
+# Final package location
+$(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
 
 # Prepare the patch for the package.
 package.patch: $(PATCHES)
@@ -242,34 +277,4 @@
 	      -e "s#[@]description[@]#$${description}#g"       \
 	      -e "s#[@]with_chroot[@]#$(WITH_CHROOT)#g" >      \
 	  $(PACKAGE).spec
-
-# Target for preparing the source area and building the package
-$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
-	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
-
-# Target for building the binary package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-# Target for building the source package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
-
-# Target for fetching the source rpm into the current directory
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
-
-# Target for cleaning up the files that can be generated with this Makefile
-.PHONY: clean
-clean:
-	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
-	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf $(SOURCE_0)
-	rm -rf *~
-	rm -rf tmp
-	rm -rf $(PACKAGE).spec
-	rm -rf package.patch
 



From cvs at kolab.org  Thu Dec 24 13:35:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 13:35:29 +0100 (CET)
Subject: gunnar: server/pear/Horde_MIME .cvsignore,1.2,1.3 
Message-ID: <20091224123529.032C860015E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/Horde_MIME
In directory doto:/tmp/cvs-serv9592/Horde_MIME

Modified Files:
	.cvsignore 
Log Message:
Update ignores.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	22 Jul 2009 06:45:40 -0000	1.2
+++ .cvsignore	24 Dec 2009 12:35:26 -0000	1.3
@@ -1,2 +1,5 @@
 *.src.rpm
+*.tgz
+*.spec
+package.patch
 tmp



From cvs at kolab.org  Thu Dec 24 13:35:29 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 13:35:29 +0100 (CET)
Subject: gunnar: server/pear/PHPUnit .cvsignore,1.2,1.3 
Message-ID: <20091224123529.09BBC600578@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PHPUnit
In directory doto:/tmp/cvs-serv9592/PHPUnit

Modified Files:
	.cvsignore 
Log Message:
Update ignores.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/pear/PHPUnit/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	22 Jul 2009 06:46:10 -0000	1.2
+++ .cvsignore	24 Dec 2009 12:35:26 -0000	1.3
@@ -1,2 +1,5 @@
 *.src.rpm
+*.tgz
+*.spec
+package.patch
 tmp



From cvs at kolab.org  Thu Dec 24 13:43:45 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 13:43:45 +0100 (CET)
Subject: gunnar: server/pear Horde.mk,1.13,NONE 
Message-ID: <20091224124345.2591960015E@lists.intevation.de>

Author: gunnar

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

Removed Files:
	Horde.mk 
Log Message:
Horde.mk is not being used anymore.

--- Horde.mk DELETED ---



From cvs at kolab.org  Thu Dec 24 09:55:28 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 Dec 2009 09:55:28 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.275, 1.276 kolabd.spec.in,
	1.46, 1.47 
Message-ID: <20091224085528.C115860015E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog kolabd.spec.in 
Log Message:
Fix the php and apache-php dependencies.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- ChangeLog	19 Dec 2009 11:50:01 -0000	1.275
+++ ChangeLog	24 Dec 2009 08:55:26 -0000	1.276
@@ -1,3 +1,8 @@
+2009-12-24  Gunnar Wrobel  <p at rdus.de>
+
+	* kolabd.spec.in (PreReq): Fix the php and apache-php
+	dependencies.
+
 2009-12-19 Richard Bos <richard at radoeka.nl>
 
 	* kolab_ca.sh.in: better usage output. kolab/issue3979 

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- kolabd.spec.in	17 Mar 2009 11:20:57 -0000	1.46
+++ kolabd.spec.in	24 Dec 2009 08:55:26 -0000	1.47
@@ -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
-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, php::with_spl = yes, php::with_hash = yes, php::with_json = 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_hash = 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_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, php::with_hash = yes, 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  Mon Dec 28 22:14:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Dec 2009 22:14:25 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.75,1.76 
Message-ID: <20091228211425.0A7CC600569@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
removed the suffix ".in" in the call to Kolab::Conf::rebuildTemplates 



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ChangeLog	16 Dec 2009 15:42:11 -0000	1.75
+++ ChangeLog	28 Dec 2009 21:14:22 -0000	1.76
@@ -1,3 +1,8 @@
+2009-12-28 Richard Bos <richard at radoeka.nl>
+
+	* sbin/kolab_bootstrap.in: removed the suffix ".in" in the call to
+	  Kolab::Conf::rebuildTemplates
+
 2009-12-16  Sascha Wilde  <wilde at intevation.de>
 
 	* lib/Kolab/LDAP.pm (deleteObject): kolab/issue3940 (Deleting



From cvs at kolab.org  Mon Dec 28 22:14:25 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Dec 2009 22:14:25 +0100 (CET)
Subject: richard: server/perl-kolab/sbin kolab_bootstrap.in,1.13,1.14 
Message-ID: <20091228211425.0B8F6600570@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
removed the suffix ".in" in the call to Kolab::Conf::rebuildTemplates 



Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab_bootstrap.in	13 Dec 2009 19:48:26 -0000	1.13
+++ kolab_bootstrap.in	28 Dec 2009 21:14:22 -0000	1.14
@@ -474,9 +474,9 @@
       Kolab::Conf::rebuildTemplates(
             dorunonchange =>0,
             templates => [
-              "$templatedir/slapd.access.template.in",
-              "$templatedir/slapd.conf.template.in",
-              "$templatedir/slapd.replicas.template.in"
+              "$templatedir/slapd.access.template",
+              "$templatedir/slapd.conf.template",
+              "$templatedir/slapd.replicas.template"
             ],
         );
       $Kolab::config{"bootstrap_config"} = 'false';



From cvs at kolab.org  Tue Dec 29 12:09:18 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 Dec 2009 12:09:18 +0100 (CET)
Subject: thomas: doc/www/src footer.html.m4, 1.43, 1.44 kolabsearch.htm, 1.8,
	1.9 
Message-ID: <20091229110918.D69A760015A@lists.intevation.de>

Author: thomas

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

Modified Files:
	footer.html.m4 kolabsearch.htm 
Log Message:
Adjusted links to Kolab-Konsortium pages.

The old links still work, but point to the old layout.


Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- footer.html.m4	11 Jun 2008 15:20:39 -0000	1.43
+++ footer.html.m4	29 Dec 2009 11:09:16 -0000	1.44
@@ -44,7 +44,7 @@
 LINK(`i18n.html',`Language Support')
 LINK(`http://wiki.kolab.org/',`Wiki')
 <!-- <a href="http://eforum.de/">Support Forums</a><br /> -->
-Commercial: <a href="http://www.kolab-konsortium.de/en/index.html">Kolab-Konsortium</a><br />
+Commercial: <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a><br />
 </div>
 
 <!-- USERS -->

Index: kolabsearch.htm
===================================================================
RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolabsearch.htm	8 Apr 2009 12:15:26 -0000	1.8
+++ kolabsearch.htm	29 Dec 2009 11:09:16 -0000	1.9
@@ -527,7 +527,7 @@
 <a href="http://kolab.org/documentation.html">Documentation</a><br />
 <a href="http://wiki.kolab.org/">Wiki</a><br />
 <! -- <a href="http://eforum.de/">Support Forums</a><br /> -->
-<a href="http://www.kolab-konsortium.de/en/index.html">Kolab-Konsortium</a><br />
+<a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a><br />
 </div>
 
 <!-- USERS -->



From cvs at kolab.org  Wed Dec 30 20:22:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 Dec 2009 20:22:22 +0100 (CET)
Subject: richard: server/perl-kolab/sbin kolab_bootstrap.in,1.14,1.15 
Message-ID: <20091230192222.87EDD60014C@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Assign the variable lab::config{"is_master"} to prevent warnings
during the execution of kolabconf.  Verify if files that are to
be moved or chown'ed exist.  If not skip the operation.



Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab_bootstrap.in	28 Dec 2009 21:14:22 -0000	1.14
+++ kolab_bootstrap.in	30 Dec 2009 19:22:20 -0000	1.15
@@ -71,6 +71,7 @@
 
 my $kolab_config = "@CONFIG_DIR@/kolab.conf";
 my %kolab_config;
+my @files;
 
 ##### Utility Functions
 
@@ -285,7 +286,8 @@
     system("mv \"@CONFIG_DIR@/ca\" $backupdir");
   }
 
-  system("cd \"@CONFIG_DIR@\"; mv *.pem $backupdir");
+  @files = <@CONFIG_DIR@/*.pem>;
+  system("cd \"@CONFIG_DIR@\"; mv *.pem $backupdir") if (@files);
 
   if (-f $kolab_config) {
     system("mv \"$kolab_config\" $backupdir");
@@ -352,6 +354,8 @@
   print "Proceeding with master server setup\n\n";
 }
 
+$Kolab::config{"is_master"} = $is_master;
+
 if ( $is_master eq "true" ) {
   ##### Master server setup
   getopt('f');
@@ -485,7 +489,8 @@
       print "temporarily starting slapd\n";
       $ldap_uri = "ldap://127.0.0.1:389/";
       # ensure that the database has correct permissions
-      system("chown $Kolab::config{'ldapserver_rusr'}:$Kolab::config{'ldapserver_grp'} $Kolab::config{'ldapserver_dir'}/*");
+      @files = <$Kolab::config{'ldapserver_dir'}/*>;
+      system("chown $Kolab::config{'ldapserver_rusr'}:$Kolab::config{'ldapserver_grp'} $Kolab::config{'ldapserver_dir'}/*") if (@files);
       (system("$Kolab::config{'libexecdir'}/openldap/slapd -h ldap://127.0.0.1:389/ -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
       print ("Waiting for OpenLDAP to start\n");
       sleep 10;



From cvs at kolab.org  Wed Dec 30 20:22:22 2009
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 Dec 2009 20:22:22 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.76,1.77 
Message-ID: <20091230192222.87F9760014D@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Assign the variable lab::config{"is_master"} to prevent warnings
during the execution of kolabconf.  Verify if files that are to
be moved or chown'ed exist.  If not skip the operation.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- ChangeLog	28 Dec 2009 21:14:22 -0000	1.76
+++ ChangeLog	30 Dec 2009 19:22:20 -0000	1.77
@@ -1,3 +1,10 @@
+2009-12-30 Richard Bos <richard at radoeka.nl>
+
+	* sbin/kolab_bootstrap.in: assign the variable Kolab::config{"is_master"}
+	  to prevent warnings during the execution of kolabconf.
+	  Verify if files that are to be moved or chown'ed exist.  If not
+	  skip the operation.  
+
 2009-12-28 Richard Bos <richard at radoeka.nl>
 
 	* sbin/kolab_bootstrap.in: removed the suffix ".in" in the call to