From cvs at kolab.org  Tue Jul  1 16:10:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  1 Jul 2008 16:10:46 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.34,1.35 
Message-ID: <20080701141046.AB0A1600BBA@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
kolab/issue2827 (Deleting users does not work reliably)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	28 Mar 2008 12:12:27 -0000	1.34
+++ ChangeLog	1 Jul 2008 14:10:44 -0000	1.35
@@ -1,3 +1,9 @@
+2008-07-01  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP/Backend/slurpd.pm (run):
+
+	kolab/issue2827 (Deleting users does not work reliably)
+
 2008-03-28  Sascha Wilde  <wilde at intevation.de>
 
 	* lib/Kolab/LDAP/Backend/fds.pm: New File.



From cvs at kolab.org  Tue Jul  1 16:10:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  1 Jul 2008 16:10:46 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab LDAP.pm,1.3,1.4 
Message-ID: <20080701141046.A8443600B83@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv20229/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
kolab/issue2827 (Deleting users does not work reliably)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LDAP.pm	4 Feb 2008 16:40:18 -0000	1.3
+++ LDAP.pm	1 Jul 2008 14:10:44 -0000	1.4
@@ -38,7 +38,6 @@
 use Kolab::Cyrus;
 use Digest::SHA1 qw(sha1);
 use MIME::Base64 qw(encode_base64);
-use vars qw(%uid_db %gyard_db %newuid_db %gyard_ts_db %quota_db);
 
 require Exporter;
 
@@ -71,49 +70,236 @@
 our $user_timestamp = "";
 our $sf_timestamp = "";
 our $group_timestamp = "";
+our $db_statedir = '';
+our %newuid_db;
 
 sub startup
 {
-    my $statedir = shift;
+    my $statedir = shift || '';
 
     Kolab::log('L', 'Starting up');
 
+    if (!$db_statedir && $statedir) {
+	$db_statedir = $statedir;
+    }
+
+}
+
+sub shutdown
+{
+    Kolab::log('L', 'Shutting down');
+}
+
+sub uidcacheOpen
+{
     Kolab::log('L', 'Opening mailbox uid cache DB');
 
-    if (!dbmopen(%uid_db, "$statedir/mailbox-uidcache.db", 0666)) {
+    my %uid_db;
+    if (!dbmopen(%uid_db, "$db_statedir/mailbox-uidcache.db", 0666)) {
         Kolab::log('L', 'Unable to open mailbox uid cache DB', KOLAB_ERROR);
         exit(1);
     }
 
+    return \%uid_db;
+}
+
+sub uidcacheClose (\%)
+{
+    my ($uid_db) = @_;
+    dbmclose(%{$uid_db});
+    untie %{$uid_db};
+}
+
+sub uidcacheStore
+{
+    my $guid = shift;
+    my $uid = shift;
+
+    my $uid_db = uidcacheOpen();
+
+    ${$uid_db}{$guid} = $uid;
+
+    uidcacheClose(%$uid_db);
+}
+
+sub uidcacheFetch
+{
+    my $guid = shift;
+
+    my $uid_db = uidcacheOpen();
+
+    my $uid = ${$uid_db}{$guid} || '';
+
+    uidcacheClose(%$uid_db);
+
+    return $uid;
+}
+
+sub uidcacheDelete
+{
+    my $guid = shift;
+
+    my $uid_db = uidcacheOpen();
+
+    delete ${$uid_db}{$guid};
+
+    uidcacheClose(%$uid_db);
+}
+
+sub graveyardOpen
+{
     Kolab::log('L', 'Opening graveyard uid/timestamp cache DB');
 
-    if (!dbmopen(%gyard_db, "$statedir/graveyard-uidcache.db", 0666)) {
+    my %gyard_db;
+    if (!dbmopen(%gyard_db, "$db_statedir/graveyard-uidcache.db", 0666)) {
         Kolab::log('L', 'Unable to open graveyard uid cache DB', KOLAB_ERROR);
         exit(1);
     }
 
-    if (!dbmopen(%gyard_ts_db, "$statedir/graveyard-tscache.db", 0666)) {
+    my %gyard_ts_db;
+    if (!dbmopen(%gyard_ts_db, "$db_statedir/graveyard-tscache.db", 0666)) {
         Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR);
         exit(1);
     }
+    return \(%gyard_db, %gyard_ts_db);
+}
+
+sub graveyardClose (\%\%)
+{
+    my ($gyard_db, $gyard_ts_db) = @_;
+
+    dbmclose(%$gyard_db);
+    dbmclose(%$gyard_ts_db);
+
+    untie %$gyard_db;
+    untie %$gyard_ts_db;
+}
+
+sub graveyardRessurect
+{
+    my $guid = shift;
+    my $uid = shift;
+
+    my $gyard_db;
+    my $gyard_ts_db;
+    ($gyard_db, $gyard_ts_db) = graveyardOpen();
+
+    my $oldgyarduid = $$gyard_db{$guid} || '';
+    if ($oldgyarduid) {
+	# The object needs to be resurrected!
+	if ($oldgyarduid ne $uid) {
+	    Kolab::log('L', "Resurrected object `$uid' already exists as `$oldgyarduid'; refusing to create", KOLAB_WARN);
+	} else {
+	    Kolab::log('L', "Object `$uid' has been resurrected", KOLAB_DEBUG);
+	}
+	# Remove the object from the graveyard
+	delete $$gyard_db{$guid};
+	delete $$gyard_ts_db{$guid};
+    }
+
+    graveyardClose(%$gyard_db, %$gyard_ts_db);
+
+    return $oldgyarduid;
+}
+
+sub graveyardStore
+{
+    my $guid = shift;
+    my $uid = shift;
+
+    my $gyard_db;
+    my $gyard_ts_db;
+    ($gyard_db, $gyard_ts_db) = graveyardOpen();
+
+    $$gyard_db{$guid} = $uid;
+    $$gyard_ts_db{$guid} = time;
+
+    graveyardClose(%$gyard_db, %$gyard_ts_db);
+}
+
+sub graveyardCleanup
+{
+    my $guid = shift;
+    my $uid = shift;
+
+    my $gyard_db;
+    my $gyard_ts_db;
+    ($gyard_db, $gyard_ts_db) = graveyardOpen();
+
+    my $now = time;
+    my $period = $Kolab::config{'gyard_deletion_period'} * 60;
+    Kolab::log('L', 'Gravekeeping (period = ' . $Kolab::config{'gyard_deletion_period'} . ' minutes)');
+    foreach $guid (keys %$gyard_ts_db) {
+        if ($now - $$gyard_ts_db{$guid} > $period) {
+            Kolab::log('L', "Clearing graveyard database entry `" . $$gyard_db{$guid} . "'");
+            #Kolab::Cyrus::deleteMailbox($cyrus, $$gyard_db{$guid}, 0);
+            delete $$gyard_ts_db{$guid};
+            delete $$gyard_db{$guid};
+        }
+    }
 
+    graveyardClose(%$gyard_db, %$gyard_ts_db);
+}
+
+sub quotaOpen
+{
     Kolab::log('L', 'Opening mailbox quota cache DB');
 
-    if (!dbmopen(%quota_db, "$statedir/mailbox-quotacache.db", 0666)) {
+    my %quota_db;
+    if (!dbmopen(%quota_db, "$db_statedir/mailbox-quotacache.db", 0666)) {
         Kolab::log('L', 'Unable to open mailbox quota cache DB', KOLAB_ERROR);
         exit(1);
     }
+
+    return \%quota_db;
 }
 
-sub shutdown
+sub quotaClose (\%)
 {
-    Kolab::log('L', 'Shutting down');
+    my ($quota_db) = @_;
 
-    dbmclose(%uid_db);
-    dbmclose(%gyard_db);
-    dbmclose(%quota_db);
+    dbmclose(%$quota_db);
+    untie $quota_db;
+}
+
+sub quotaStore
+{
+    my $guid = shift;
+    my $quota = shift;
+
+    my $quota_db = quotaOpen();
+
+    $$quota_db{$guid} = $quota;
+
+    quotaClose(%$quota_db);
+}
+
+sub quotaFetch
+{
+    my $guid = shift;
+
+    my $quota_db = quotaOpen();
+
+    my $quota = $$quota_db{$guid} || 0;
+
+    quotaClose(%$quota_db);
+
+    return $quota;
+}
+
+sub quotaDelete
+{
+    my $guid = shift;
+
+    my $quota_db = quotaOpen();
+
+    delete $$quota_db{$guid};
+
+    quotaClose(%$quota_db);
 }
 
+
+
 sub create
 {
     my $ip = shift;
@@ -303,7 +489,7 @@
 
     my $guid = $object->get_value($Kolab::config{$p . '_field_guid'});
     Kolab::log('L', "GUID attribute `" . $Kolab::config{$p . '_field_guid'} . "' is `$guid'", KOLAB_DEBUG);
-    my $olduid = $uid_db{$guid} || '';
+    my $olduid = uidcacheFetch($guid);
     if ($olduid) {
         # We have records of the object
         $newuid_db{$guid} = $olduid if ($sync);
@@ -316,23 +502,13 @@
         # Nothing changed; nothing to do
     } else {
         # No official records - check the graveyard
-        my $oldgyarduid = $gyard_db{$guid} || '';
+        my $oldgyarduid = graveyardRessurect($guid, $uid);
         if ($oldgyarduid) {
-            # The object needs to be resurrected!
-            if ($oldgyarduid ne $uid) {
-                Kolab::log('L', "Resurrected object `$uid' already exists as `$oldgyarduid'; refusing to create", KOLAB_WARN);
-            } else {
-                Kolab::log('L', "Object `$uid' has been resurrected", KOLAB_DEBUG);
-            }
-
-            # Remove the object from the graveyard
-            if ($sync) { $newuid_db{$guid} = $oldgyarduid; } else { $uid_db{$guid} = $oldgyarduid; }
-            delete $gyard_db{$guid};
-            delete $gyard_ts_db{$guid};
+            if ($sync) { $newuid_db{$guid} = $oldgyarduid; } else { uidcacheStore($guid, $oldgyarduid); }
         } else {
             Kolab::log('L', "Creating user `$uid' corresponding to GUID `$guid'", KOLAB_DEBUG);
             # We have a object that we have no previous record of, so create everything
-            if ($sync) { $newuid_db{$guid} = $uid; } else { $uid_db{$guid} = $uid; }
+            if ($sync) { $newuid_db{$guid} = $uid; } else { uidcacheStore($guid, $uid); }
             Kolab::Cyrus::createMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
 	      if( $p eq 'sf' ){
     		my $foldertype = lc($object->get_value('kolabfoldertype'));
@@ -374,13 +550,13 @@
 
     my $quota = $object->get_value($Kolab::config{$p . '_field_quota'});
     defined($quota) or ($quota = 0);
-    my $oldquota = $quota_db{$guid} || 0;
+    my $oldquota = quotaFetch($guid);
     if( $quota != $oldquota ) {
-      Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0));
-      if( $quota == 0 ) {
-	delete $quota_db{$guid};
+	Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0));
+	if( $quota == 0 ) {
+	    quotaDelete{$guid};
 	} else {
-	  $quota_db{$guid} = $quota;
+	    quotaStore($guid, $quota);
 	}
     }
     Kolab::log('L', "createObject() done", KOLAB_DEBUG );
@@ -506,15 +682,15 @@
     }
 
     my $guid = $object->get_value($Kolab::config{$p . '_field_guid'});
-    my $uid = $uid_db{$guid} || 0;
+    my $uid = uidcacheFetch($guid);
     if (!$uid) {
         Kolab::log('L', 'Deleted object not found in mboxcache, returning', KOLAB_DEBUG);
         return;
     }
 
     Kolab::Cyrus::deleteMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
-    delete $uid_db{$guid};
-    delete $quota_db{$guid};
+    uidcacheDelete($guid);
+    quotaDelete($guid);
     return 1;
 }
 
@@ -551,30 +727,24 @@
         delete $objects{$newuid_db{$guid}} if (exists $objects{$newuid_db{$guid}});
     }
 
+    my $uid_db = uidcacheOpen();
     # Any mailboxes left should be sent to the graveyard; these are mailboxes
     # without a corresponding LDAP object, yet we were never informed of their
     # deletion, i.e. either we missed the deletion notification or there was
     # an error when iterating through the objects (Lost connection, invalid DNs)
-    foreach $guid (keys %uid_db) {
-        if (defined $uid_db{$guid} && exists $objects{$uid_db{$guid}}) {
-            $gyard_db{$guid} = $uid_db{$guid};
-            $gyard_ts_db{$guid} = time;
+    foreach $guid (keys %$uid_db) {
+        if (defined $$uid_db{$guid} && exists $objects{$$uid_db{$guid}}) {
+	    graveyardStore($guid, $$uid_db{$guid});
         }
     }
+    uidcacheClose(%$uid_db);
 
-    my $now = time;
-    my $period = $Kolab::config{'gyard_deletion_period'} * 60;
-    Kolab::log('L', 'Gravekeeping (period = ' . $Kolab::config{'gyard_deletion_period'} . ' minutes)');
-    foreach $guid (keys %gyard_ts_db) {
-        if ($now - $gyard_ts_db{$guid} > $period) {
-            Kolab::log('L', "Clearing graveyard database entry `" . $gyard_db{$guid} . "'");
-            #Kolab::Cyrus::deleteMailbox($cyrus, $gyard_db{$guid}, 0);
-            delete $gyard_ts_db{$guid};
-            delete $gyard_db{$guid};
-        }
-    }
+    graveyardCleanup();
 
-    %uid_db = %newuid_db;
+    my $newuid;
+    foreach $newuid (keys %newuid_db) {
+	uidcacheStore($newuid, $newuid_db{$newuid});
+    }
 
     syncDomains();
 



From cvs at kolab.org  Tue Jul  1 16:10:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  1 Jul 2008 16:10:46 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.277,1.278 
Message-ID: <20080701141046.A91C4600B84@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2827 (Deleting users does not work reliably)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- release-notes.txt	26 Jun 2008 16:28:47 -0000	1.277
+++ release-notes.txt	1 Jul 2008 14:10:44 -0000	1.278
@@ -99,6 +99,8 @@
 
 	Adjusted version number.
 
+	kolab/issue2827 (Deleting users does not work reliably)
+
     - php-kolab-2.2.0-2008????
 
 	Adjusted version number.



From cvs at kolab.org  Wed Jul  2 18:46:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  2 Jul 2008 18:46:56 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.278,1.279 
Message-ID: <20080702164656.26207600BB2@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
line wrap


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- release-notes.txt	1 Jul 2008 14:10:44 -0000	1.278
+++ release-notes.txt	2 Jul 2008 16:46:53 -0000	1.279
@@ -105,7 +105,8 @@
 
 	Adjusted version number.
 
-	kolab/issue2734 (Automatic ressources decline changed overlapping event time)
+	kolab/issue2734 (Automatic ressources decline changed overlapping event
+	                 time)
 
 
 Changes between 2.2-rc-2 and 2.2-rc-3



From cvs at kolab.org  Thu Jul  3 09:05:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 09:05:15 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab LDAP.pm,1.4,1.5 
Message-ID: <20080703070515.BCF706013EA@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv13561/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
 kolab/issue2760 (Deleting shared folders does not work)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- LDAP.pm	1 Jul 2008 14:10:44 -0000	1.4
+++ LDAP.pm	3 Jul 2008 07:05:13 -0000	1.5
@@ -426,7 +426,7 @@
     Kolab::log('L', "Kolab::LDAP::mapAcls() acl=$_", KOLAB_DEBUG);
   } @$acls;
   if( $sf ) {
-    # Do we need to push admin rights for manager?
+    push(@$acls, "manager lrsiwcdap");
   }
   Kolab::log('L', "Kolab::LDAP::mapAcls() acls=".join(", ", @$acls), KOLAB_DEBUG);
   return $acls;



From cvs at kolab.org  Thu Jul  3 09:05:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 09:05:15 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.35,1.36 
Message-ID: <20080703070515.BB4C96013E2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
 kolab/issue2760 (Deleting shared folders does not work)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ChangeLog	1 Jul 2008 14:10:44 -0000	1.35
+++ ChangeLog	3 Jul 2008 07:05:13 -0000	1.36
@@ -1,3 +1,9 @@
+2008-07-03  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP.pm (mapAcls):
+
+	kolab/issue2760 (Deleting shared folders does not work)
+
 2008-07-01  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP/Backend/slurpd.pm (run):



From cvs at kolab.org  Thu Jul  3 09:05:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 09:05:15 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.279,1.280 
Message-ID: <20080703070515.BC1836013E9@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
 kolab/issue2760 (Deleting shared folders does not work)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- release-notes.txt	2 Jul 2008 16:46:53 -0000	1.279
+++ release-notes.txt	3 Jul 2008 07:05:13 -0000	1.280
@@ -94,6 +94,7 @@
     - PEAR-Net_IMAP-1.1.0beta1-2
 
 	kolab/issue2745 (php error after sending an update to an event)
+	kolab/issue2760 (Deleting shared folders does not work)
 
     - perl-kolab-2.2.0-2008????
 



From cvs at kolab.org  Thu Jul  3 14:11:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 14:11:47 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.170,1.171 
Message-ID: <20080703121147.67C7F600BB6@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
kolabd: templates/master.cf.template: virtual_maps -> virtual_alias_maps.
See kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- ChangeLog	26 Jun 2008 16:28:47 -0000	1.170
+++ ChangeLog	3 Jul 2008 12:11:45 -0000	1.171
@@ -1,3 +1,8 @@
+2008-07-03  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* templates/master.cf.template.in: virtual_maps -> virtual_alias_maps.
+	See kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)
+
 2008-06-26  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* kolab_bootstrap.in: Use Net::Domain to determine fqdn more reliably.



From cvs at kolab.org  Thu Jul  3 14:11:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 14:11:47 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates master.cf.template.in, 1.20,
	1.21 
Message-ID: <20080703121147.69C9B6013E2@lists.intevation.de>

Author: thomas

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

Modified Files:
	master.cf.template.in 
Log Message:
kolabd: templates/master.cf.template: virtual_maps -> virtual_alias_maps.
See kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)


Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- master.cf.template.in	22 Nov 2007 17:06:38 -0000	1.20
+++ master.cf.template.in	3 Jul 2008 12:11:45 -0000	1.21
@@ -48,7 +48,7 @@
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient
 @@@bind_addr@@@:465       inet  n       -       n       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
-post-cleanup unix  n    -       n       -       0       cleanup -o virtual_maps=
+post-cleanup unix  n    -       n       -       0       cleanup -o virtual_alias_maps=
 smtp-amavis unix -	-	n	-	2       smtp
     -o smtp_data_done_timeout=1200
     -o smtp_send_xforward_command=yes



From cvs at kolab.org  Thu Jul  3 17:56:16 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 17:56:16 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.280,1.281 
Message-ID: <20080703155616.BCCD86013ED@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes (though clamav 0.93.2 will be released any moment)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- release-notes.txt	3 Jul 2008 07:05:13 -0000	1.280
+++ release-notes.txt	3 Jul 2008 15:56:14 -0000	1.281
@@ -46,6 +46,10 @@
 
 Changes between 2.2-rc-3 and 2.2.0
 
+    - clamav-0.93.1-20080610
+
+	New upstream version, fixes denial of service.
+
     - fbview-horde-3.2_rc3-20080605
 
 	Allow login if public imap service is disabled.
@@ -72,6 +76,8 @@
 
 	kolab_bootstrap: Use Net::Domain to determine fqdn more reliably
 	and make sure suggested domain name contains a dot.
+
+	kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)
 
     - kolab-filter-2.2.0-2008????
 



From cvs at kolab.org  Thu Jul  3 22:00:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 22:00:09 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd/dist_conf suse,1.78,1.79 
Message-ID: <20080703200009.CDD9E600172@lists.intevation.de>

Author: marcus

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

Modified Files:
	suse 
Log Message:
add value for 'spamassassin_confdir' to the dist_conf/suse file

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- suse	19 Mar 2008 21:43:15 -0000	1.78
+++ suse	3 Jul 2008 20:00:07 -0000	1.79
@@ -49,6 +49,7 @@
 clamav_usr=root
 clamav_grp=vscan
 
+spamassassin_confdir=${sysconfdir}/mail/spamassassin
 
 emailscan_usr=root
 emailscan_grp=root



From cvs at kolab.org  Thu Jul  3 22:00:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jul 2008 22:00:09 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.171,1.172 
Message-ID: <20080703200009.CBF9B60016F@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
add value for 'spamassassin_confdir' to the dist_conf/suse file

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- ChangeLog	3 Jul 2008 12:11:45 -0000	1.171
+++ ChangeLog	3 Jul 2008 20:00:06 -0000	1.172
@@ -1,3 +1,7 @@
+2008-07-03  Marcus Hüwe <suse-tux at gmx.de>
+
+    * dist_conf/suse: provide correct value for spamassassin_confdir
+
 2008-07-03  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/master.cf.template.in: virtual_maps -> virtual_alias_maps.



From cvs at kolab.org  Fri Jul  4 16:38:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 16:38:55 +0200 (CEST)
Subject: wilde: server install-kolab.sh,1.32,1.33 
Message-ID: <20080704143855.A23756013F7@lists.intevation.de>

Author: wilde

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

Modified Files:
	install-kolab.sh 
Log Message:
Fix issue2727: tar -O is no longer needed, further improvements:
- All work is now done in an temporary working directory, so openpkg
  rpm and sh files are no longer overwritten in place.
- The buggy and somewhat obscure -i option was removed.
- Some very minor code beautification.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- install-kolab.sh	5 Jun 2008 14:07:42 -0000	1.32
+++ install-kolab.sh	4 Jul 2008 14:38:53 -0000	1.33
@@ -34,15 +34,10 @@
     echo "Usage:"
     echo "  $0         (will try to determine mode of action itself)"
     echo
-    echo "  $0 -i directory/openpkg-*-*.src.sh"
-    echo "  $0 -i directory/openpkg-*-*.ix86-debian4.0.sh"
-    echo "  $0 -i directory"
-    echo
     echo "Options:"
     echo
     echo "  -H         (install the Horde groupware web client)"
     echo "  -F         (install the free/busy view frontend)"
-    echo
     echo "  -h         (display this help)"
     echo
     echo "Advanced options:"
@@ -66,15 +61,37 @@
     echo "  -O         (additional build options, used for openpkg bootstraping from source)"
 }
 
+mktmpdir() {
+  newtmp="${TMPDIR-/tmp}/install-kolab.$RANDOM.$RANDOM.$RANDOM.$$"
+  (umask 022 && mkdir "$newtmp") || {
+    echo "Could not create temporary directory! Exiting." 1>&2
+    exit 1
+  }
+  echo "$newtmp"
+}
+
+shtool_get_plattag() {
+  [ -f shtool ] || sh "$INSTALLER" -t | tar xf - shtool
+  echo `sh shtool -s platform --type=binary`-$TAG
+}
+
+populate_workdir() {
+  if [ -z "$SRCDIR" -o -z "$WORKDIR" ] ; then
+    echo "Source- or working-directory missing." 1>&2 
+    exit 1 
+  fi
+  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" \;
+}
+
 while getopts hcBXEFHi:V:p:I:u:t:O: ARGS; do
     case $ARGS in
         h) # Display help
             usage
             exit 0
             ;;
-        i) # What should be installed?
-            INSTALL="$OPTARG"
-            ;;
         V) # User specified a specific Kolab version
             KOLAB_VERSION="$OPTARG"
             ;;
@@ -123,12 +140,12 @@
     USER=$TAG
 fi
 
-if [ -n "$FLAG_HORDE" ]; then
+if [ "$FLAG_HORDE" ]; then
     DEFINE="$DEFINE -D kolabd::with_horde"
     PACKAGES="$PACKAGES horde-kolab-client"
 fi
 
-if [ -n "$FLAG_FBVIEW" ]; then
+if [ "$FLAG_FBVIEW" ]; then
     PACKAGES="$PACKAGES fbview-kronolith"
 fi
 
@@ -139,9 +156,9 @@
 R_KID=`expr $KID + 1`
 N_KID=`expr $R_KID + 1`
 
-if [ -n "$FLAG_CLEAN" -o -n "$FLAG_INDEX" ]; then
+if [ "$FLAG_CLEAN" -o "$FLAG_INDEX" ]; then
     if [ -x "$PREFIX/bin/openpkg" ]; then
-        if [ -n "$FLAG_CLEAN" ]; then
+        if [ "$FLAG_CLEAN" ]; then
             echo
             echo "This will completely wipe your installation in $PREFIX!"
             echo "Are you certain you want to do that (YES/NO)?"
@@ -154,7 +171,7 @@
                 echo "Not cleaning."
                 exit 0
             fi
-        elif [ -n "$FLAG_INDEX" ]; then
+        elif [ "$FLAG_INDEX" ]; then
             BINARY=`find . -mindepth 1 -maxdepth 1 -name "openpkg-2*.rpm" \! -name "openpkg-*.src.rpm" -print`
             if [ -z "$BINARY" ]; then
                 echo "Generating 00INDEX.rdf for source distribution ..."
@@ -171,6 +188,12 @@
     fi
 fi
 
+SRCDIR=`pwd`
+WORKDIR=`mktmpdir`
+echo "Changing to temporary working directory $WORKDIR ..."
+cd "$WORKDIR"
+populate_workdir
+
 echo
 echo "Kolab installation tag (TAG):       $TAG"
 echo "Kolab installation prefix (PREFIX): $PREFIX"
@@ -204,7 +227,7 @@
             fi
         else
             # We have a source package. Check for a matching binary
-            PLATTAG=`sh "$INSTALLER" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG
+            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
@@ -222,7 +245,7 @@
 if echo "$INSTALL" | grep '\.src\.sh$' >/dev/null; then
     # install from source
     SRC="$INSTALL"
-    PLATTAG=`sh "$INSTALL" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG
+    PLATTAG=`shtool_get_plattag`
     BIN=`basename "$INSTALL" .src.sh`.$PLATTAG.sh
     DIR=`dirname "$SRC"`
 elif echo "$INSTALL" | grep 'openpkg-.*\.sh$' >/dev/null; then
@@ -250,7 +273,7 @@
         --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \
         --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \
         || exit $?
-    if [ -n "$FLAG_BASE" ]; then
+    if [ "$FLAG_BASE" ]; then
         echo "Created basic openpkg binary for you platform!"
         exit 0
     fi
@@ -258,7 +281,7 @@
 
 if [ -n "$BIN" ]; then
     sh "$BIN" || exit $?
-    if [ -n "$FLAG_ENV" ]; then
+    if [ "$FLAG_ENV" ]; then
         echo "Created basic openpkg environment!"
         exit 0
     fi



From cvs at kolab.org  Fri Jul  4 17:26:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 17:26:25 +0200 (CEST)
Subject: wilde: server/kolabd/kolabd ChangeLog, 1.172, 1.173 kolabd.spec.in,
	1.26, 1.27 
Message-ID: <20080704152625.E45A06013F6@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog kolabd.spec.in 
Log Message:
Install Horde and FBview per default.
Removed -H and -F from install-kolab.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- ChangeLog	3 Jul 2008 20:00:06 -0000	1.172
+++ ChangeLog	4 Jul 2008 15:26:23 -0000	1.173
@@ -1,3 +1,7 @@
+2008-07-04  Sascha Wilde  <wilde at intevation.de>
+
+	* kolabd.spec.in: changed `with_horde' default to "yes".
+
 2008-07-03  Marcus Hüwe <suse-tux at gmx.de>
 
     * dist_conf/suse: provide correct value for spamassassin_confdir

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- kolabd.spec.in	15 May 2008 06:11:53 -0000	1.26
+++ kolabd.spec.in	4 Jul 2008 15:26:23 -0000	1.27
@@ -46,7 +46,7 @@
 #Source1:      rc.kolabd
 
 #   package options
-%option       with_horde              no
+%option       with_horde              yes
 
 #   build information
 Prefix:       %{l_prefix}



From cvs at kolab.org  Fri Jul  4 17:26:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 17:26:25 +0200 (CEST)
Subject: wilde: server install-kolab.sh,1.33,1.34 
Message-ID: <20080704152625.DFAC56013F0@lists.intevation.de>

Author: wilde

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

Modified Files:
	install-kolab.sh 
Log Message:
Install Horde and FBview per default.
Removed -H and -F from install-kolab.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- install-kolab.sh	4 Jul 2008 14:38:53 -0000	1.33
+++ install-kolab.sh	4 Jul 2008 15:26:23 -0000	1.34
@@ -20,15 +20,13 @@
 
 INSTALL=""
 
-PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin"
+PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin fbview-kronolith horde-kolab-client"
 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"
 
 #Flags
 FLAG_BASE=""
 FLAG_ENV=""
 FLAG_CLEAN=""
-FLAG_FBVIEW=""
-FLAG_HORDE=""
 
 usage() {
     echo "Usage:"
@@ -36,12 +34,6 @@
     echo
     echo "Options:"
     echo
-    echo "  -H         (install the Horde groupware web client)"
-    echo "  -F         (install the free/busy view frontend)"
-    echo "  -h         (display this help)"
-    echo
-    echo "Advanced options:"
-    echo
     echo "  -t TAG     (alternate binary tag;          default is kolab)"
     echo "  -I UID     (alternate base uid;            default is 19414)"
     echo
@@ -59,6 +51,8 @@
     echo "  -E         (abort after generating the openpkg environment)"
     echo
     echo "  -O         (additional build options, used for openpkg bootstraping from source)"
+    echo
+    echo "  -h         (display this help)"
 }
 
 mktmpdir() {
@@ -113,12 +107,6 @@
         E) # User only wants the basic openpkg environment
             FLAG_ENV="Yes"
             ;;
-        F) # User wants to install fbview
-            FLAG_FBVIEW="Yes"
-            ;;
-        H) # User wants to install Horde
-            FLAG_HORDE="Yes"
-            ;;
         c) # User wants to erase the openpkg environment
             FLAG_CLEAN="Yes"
             ;;
@@ -138,15 +126,6 @@
 
 if [ -z "$USER" ]; then
     USER=$TAG
-fi
-
-if [ "$FLAG_HORDE" ]; then
-    DEFINE="$DEFINE -D kolabd::with_horde"
-    PACKAGES="$PACKAGES horde-kolab-client"
-fi
-
-if [ "$FLAG_FBVIEW" ]; then
-    PACKAGES="$PACKAGES fbview-kronolith"
 fi
 
 if [ -z "$PREFIX" ]; then



From cvs at kolab.org  Fri Jul  4 17:59:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 17:59:13 +0200 (CEST)
Subject: thomas: server install-kolab.sh,1.34,1.35 
Message-ID: <20080704155913.432076013F7@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
install-kolab.sh: Removed options F/H/i from getopts call


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- install-kolab.sh	4 Jul 2008 15:26:23 -0000	1.34
+++ install-kolab.sh	4 Jul 2008 15:59:11 -0000	1.35
@@ -80,7 +80,7 @@
   find "$SRCDIR" -mindepth 1 -maxdepth 1 -name "*.rpm" \! -name "openpkg-2*.rpm" -exec ln -sf '{}' "$WORKDIR" \;
 }
 
-while getopts hcBXEFHi:V:p:I:u:t:O: ARGS; do
+while getopts hcBXE:V:p:I:u:t:O: ARGS; do
     case $ARGS in
         h) # Display help
             usage



From cvs at kolab.org  Fri Jul  4 18:02:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 18:02:15 +0200 (CEST)
Subject: wilde: server install-kolab.sh,1.35,1.36 
Message-ID: <20080704160215.E549A6013F9@lists.intevation.de>

Author: wilde

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

Modified Files:
	install-kolab.sh 
Log Message:
Added new option `-x' to deselect packages from installation.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- install-kolab.sh	4 Jul 2008 15:59:11 -0000	1.35
+++ install-kolab.sh	4 Jul 2008 16:02:13 -0000	1.36
@@ -22,6 +22,7 @@
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin fbview-kronolith horde-kolab-client"
 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=""
@@ -44,6 +45,8 @@
     echo
     echo "  -V VERSION (alternate version;             default is $KOLAB_VERSION)"
     echo
+    echo "  -x PACKAGE (exclude PACKAGE from installation, can be given more than once)"
+    echo
     echo "  -X         (generate 00INDEX.rdf for packages in the current directory"
     echo "              using the OpenPKG installation in /\$PREFIX)"
     echo
@@ -80,7 +83,12 @@
   find "$SRCDIR" -mindepth 1 -maxdepth 1 -name "*.rpm" \! -name "openpkg-2*.rpm" -exec ln -sf '{}' "$WORKDIR" \;
 }
 
-while getopts hcBXE:V:p:I:u:t:O: ARGS; do
+remove_from_list() {
+# Return list with all elements which ar in $1 and $2 removed.
+  echo "$1" "$2" | tr " " "\n" | sort | uniq -u | tr "\n" " "
+}
+
+while getopts hcBXE:V:p:I:u:t:O:x: ARGS; do
     case $ARGS in
         h) # Display help
             usage
@@ -110,6 +118,9 @@
         c) # User wants to erase the openpkg environment
             FLAG_CLEAN="Yes"
             ;;
+        x) # exclude from installation
+            EXCLUDEPKGS="$EXCLUDEPKGS $OPTARG"
+            ;;
         X) # User wants to collect a set of packages into 00INDEX.rdf
             FLAG_INDEX="Yes"
             ;;
@@ -181,6 +192,7 @@
 echo "Kolab user base UID (KID):          $KID"
 echo "Kolab restricted UID (KID):         $R_KID"
 echo "Kolab non-priviledged UID (KID):    $N_KID"
+echo "Exlude following Kolab packages:    $EXCLUDEPKGS"
 echo
 
 if [ -z "$INSTALL" ]; then
@@ -274,6 +286,9 @@
             -Dkolab-webadmin::kolab_version=$KOLAB_VERSION
         "
     fi
+
+    PACKAGES=`remove_from_list "$EXCLUDEPKGS" "$PACKAGES"`
+
     find "$DIR" -mindepth 1 -maxdepth 1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
     echo "----------- SETUP COMPLETED -----------"
     echo



From cvs at kolab.org  Fri Jul  4 18:41:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 18:41:46 +0200 (CEST)
Subject: wilde: server install-kolab.sh,1.36,1.37 
Message-ID: <20080704164146.BA8D06013F7@lists.intevation.de>

Author: wilde

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

Modified Files:
	install-kolab.sh 
Log Message:
Fixed my last check in: 
the new `-x' option messed with the order of the package list which
caused openpkg to fail...


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- install-kolab.sh	4 Jul 2008 16:02:13 -0000	1.36
+++ install-kolab.sh	4 Jul 2008 16:41:44 -0000	1.37
@@ -84,8 +84,19 @@
 }
 
 remove_from_list() {
-# Return list with all elements which ar in $1 and $2 removed.
-  echo "$1" "$2" | tr " " "\n" | sort | uniq -u | tr "\n" " "
+# Return list $2 with all elements which ar in list $1 removed.
+  newlist=""
+  for element in $2 ; do
+    delelt=""
+    for remove in $1 ; do
+      if [ "$element" = "$remove" ] ; then
+        delelt="t"
+        break
+      fi      
+    done
+    [ "$delelt" ] || newlist="$newlist $element"
+  done
+  echo "$newlist"
 }
 
 while getopts hcBXE:V:p:I:u:t:O:x: ARGS; do



From cvs at kolab.org  Fri Jul  4 18:42:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  4 Jul 2008 18:42:27 +0200 (CEST)
Subject: wilde: server install-kolab.sh,1.37,1.38 
Message-ID: <20080704164227.8C7CC6013F9@lists.intevation.de>

Author: wilde

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

Modified Files:
	install-kolab.sh 
Log Message:
Fixed typo in comment.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- install-kolab.sh	4 Jul 2008 16:41:44 -0000	1.37
+++ install-kolab.sh	4 Jul 2008 16:42:25 -0000	1.38
@@ -84,7 +84,7 @@
 }
 
 remove_from_list() {
-# Return list $2 with all elements which ar in list $1 removed.
+# Return list $2 with all elements in list $1 removed.
   newlist=""
   for element in $2 ; do
     delelt=""



From cvs at kolab.org  Sat Jul  5 16:30:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  5 Jul 2008 16:30:39 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.42, 1.43 
Message-ID: <20080705143039.580CF600B89@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv29207/php/admin/locale/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
changed translation to Kolab as that seems to be a much better page
title than login.  The concerning page is probably bookmarked and
than is a title like Kolab better than just Login.  I guess that
the root cause solution would be to change the word Login in the
source file....



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- messages.po	10 Apr 2008 12:39:36 -0000	1.42
+++ messages.po	5 Jul 2008 14:30:37 -0000	1.43
@@ -689,7 +689,7 @@
 
 #: tpl_messages.php:128 ../include/auth.class.php.in:124
 msgid "Login"
-msgstr "Login"
+msgstr "Kolab"
 
 #: tpl_messages.php:129
 msgid "The maintainer with DN"



From cvs at kolab.org  Sat Jul  5 16:33:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  5 Jul 2008 16:33:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.103,1.104 
Message-ID: <20080705143334.DAC65600BB0@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
changed translation to Kolab as that seems to be a much better page
title than login.  The concerning page is probably bookmarked and
than is a title like Kolab better than just Login.  I guess that
the root cause solution would be to change the word Login in the
source file....



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- ChangeLog	5 Jun 2008 17:33:51 -0000	1.103
+++ ChangeLog	5 Jul 2008 14:33:32 -0000	1.104
@@ -1,3 +1,11 @@
+2008-07-05 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/locale/nl/LC_MESSAGES/messages.po: changed translation to Kolab
+	as that seems to be a much better page title than login.  The concerning page
+	is probably bookmarked and than is a title like Kolab better than just
+	Login.  I guess that the root cause solution would be to change the word Login
+	in the source file....
+
 2008-06-05  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* php/admin/templates/settings.tpl: Fix deleting of domains and kolab



From cvs at kolab.org  Sun Jul  6 20:27:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun,  6 Jul 2008 20:27:00 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.173,1.174 
Message-ID: <20080706182700.4D865600B84@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Fixed type + indentication



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- ChangeLog	4 Jul 2008 15:26:23 -0000	1.173
+++ ChangeLog	6 Jul 2008 18:26:58 -0000	1.174
@@ -4,7 +4,7 @@
 
 2008-07-03  Marcus Hüwe <suse-tux at gmx.de>
 
-    * dist_conf/suse: provide correct value for spamassassin_confdir
+	* dist_conf/suse: provide correct value for spamassassin_confdir
 
 2008-07-03  Thomas Arendsen Hein <thomas at intevation.de>
 
@@ -13,7 +13,7 @@
 
 2008-06-26  Thomas Arendsen Hein <thomas at intevation.de>
 
-	* kolab_bootstrap.in: Use Net::Domain to determine fqdn more reliably.
+	* kolab_bootstrap.in: Use Net::Domain to determine fqdn more reliable.
 	* kolab_bootstrap.in: Make sure suggested domain name contains a dot.
 
 2008-06-05  Thomas Arendsen Hein <thomas at intevation.de>



From cvs at kolab.org  Sun Jul  6 22:13:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun,  6 Jul 2008 22:13:13 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.43, 1.44 
Message-ID: <20080706201313.89076600B84@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv32649/php/admin/locale/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Should start with a capital

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- messages.po	5 Jul 2008 14:30:37 -0000	1.43
+++ messages.po	6 Jul 2008 20:13:11 -0000	1.44
@@ -1666,7 +1666,7 @@
 #: ../../../www/admin/user/user.php.in:379
 #: ../../../www/admin/user/user.php.in:381
 msgid "Non volatile"
-msgstr "permanent"
+msgstr "Permanent"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:128
 msgid "Folder Type"



From cvs at kolab.org  Mon Jul  7 09:59:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 09:59:46 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/horde kolab_issue2831.patch, NONE,
	1.1 
Message-ID: <20080707075946.EC701600B87@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/horde
In directory doto:/tmp/cvs-serv27448/horde

Added Files:
	kolab_issue2831.patch 
Log Message:
Patch for kolab/issue2831

--- NEW FILE: kolab_issue2831.patch ---
diff -p --unified=3 -r1.18 -r1.19
--- horde/services/obrowser/index.php	2008/01/02 11:13:57	1.18
+++ horde/services/obrowser/index.php	2008/06/13 21:43:29	1.19
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: horde/services/obrowser/index.php,v 1.17 2007/02/28 20:26:40 chuck Exp $
+ * $Horde: horde/services/obrowser/index.php,v 1.18 2008/01/02 11:13:57 jan Exp $
  *
  * Copyright 2004-2008 The Horde Project (http://www.horde.org/)
  *
@@ -92,10 +92,10 @@ foreach ($list as $path => $values) {
     if (!empty($values['browseable'])) {
         $url = Horde::url($registry->get('webroot', 'horde') . '/services/obrowser/');
         $url = Util::addParameter($url, 'path', $path);
-        $row['name'] = Horde::link($url) . $values['name'] . '</a>';
+        $row['name'] = Horde::link($url) . htmlspecialchars($values['name']) . '</a>';
     } else {
         $js = "return chooseObject('" . addslashes($path) . "');";
-        $row['name'] = Horde::link('#', sprintf(_("Choose %s"), $values['name']), '', '', $js) . $values['name'] . '</a>';
+        $row['name'] = Horde::link('#', sprintf(_("Choose %s"), $values['name']), '', '', $js) . htmlspecialchars($values['name']) . '</a>';
     }

     $rows[] = $row;



From cvs at kolab.org  Mon Jul  7 10:03:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:03:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/horde kolab_issue2831.patch, 1.1,
	1.2 
Message-ID: <20080707080311.2FCD2600B87@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/horde
In directory doto:/tmp/cvs-serv27556/horde

Modified Files:
	kolab_issue2831.patch 
Log Message:
Remove the header section of the patch.

Index: kolab_issue2831.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/3.2-rc3/horde/kolab_issue2831.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_issue2831.patch	7 Jul 2008 07:59:44 -0000	1.1
+++ kolab_issue2831.patch	7 Jul 2008 08:03:09 -0000	1.2
@@ -1,14 +1,6 @@
 diff -p --unified=3 -r1.18 -r1.19
 --- horde/services/obrowser/index.php	2008/01/02 11:13:57	1.18
 +++ horde/services/obrowser/index.php	2008/06/13 21:43:29	1.19
-@@ -1,6 +1,6 @@
- <?php
- /**
-- * $Horde: horde/services/obrowser/index.php,v 1.17 2007/02/28 20:26:40 chuck Exp $
-+ * $Horde: horde/services/obrowser/index.php,v 1.18 2008/01/02 11:13:57 jan Exp $
-  *
-  * Copyright 2004-2008 The Horde Project (http://www.horde.org/)
-  *
 @@ -92,10 +92,10 @@ foreach ($list as $path => $values) {
      if (!empty($values['browseable'])) {
          $url = Horde::url($registry->get('webroot', 'horde') . '/services/obrowser/');



From cvs at kolab.org  Mon Jul  7 10:07:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:07:33 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.281,1.282 
Message-ID: <20080707080733.8359B600B87@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2831 (SECURITY: <horde-3.2.1 affected by XSS issue). Note: The release candidate tar.gzu has been removed from the Horde servers. Grab the package from the old rpm and comment out the corresponding wget line in the Makefile as a temporary workaround.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- release-notes.txt	3 Jul 2008 15:56:14 -0000	1.281
+++ release-notes.txt	7 Jul 2008 08:07:31 -0000	1.282
@@ -58,6 +58,8 @@
 
 	Allow login if public imap service is disabled.
 
+	kolab/issue2831 (SECURITY: <horde-3.2.1 affected by XSS issue)
+
     - install-kolab.sh
 
 	Adjusted version number.



From cvs at kolab.org  Mon Jul  7 10:07:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:07:33 +0200 (CEST)
Subject: gunnar: server/horde/horde ChangeLog, 1.8, 1.9 horde-kolab.spec, 1.28,
	1.29 
Message-ID: <20080707080733.93A2E600B89@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog horde-kolab.spec 
Log Message:
kolab/issue2831 (SECURITY: <horde-3.2.1 affected by XSS issue). Note: The release candidate tar.gzu has been removed from the Horde servers. Grab the package from the old rpm and comment out the corresponding wget line in the Makefile as a temporary workaround.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	5 Jun 2008 16:20:06 -0000	1.8
+++ ChangeLog	7 Jul 2008 08:07:31 -0000	1.9
@@ -1,3 +1,7 @@
+2008-07-07  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kolab.spec: kolab/issue2831 (SECURITY: <horde-3.2.1 affected by XSS issue)
+
 2008-06-05  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* horde-kolab-conf.template: Fix server address if imap service

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- horde-kolab.spec	5 Jun 2008 16:20:06 -0000	1.28
+++ horde-kolab.spec	7 Jul 2008 08:07:31 -0000	1.29
@@ -27,6 +27,7 @@
 
 # List of Patches
 Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/horde/HK-GW-Config_horde-3.2-rc3.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/horde/kolab_issue2831.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -66,6 +67,7 @@
 
 	cd %{V_horde_name}-%{V_uver}
 	%patch -p2 -P 0
+	%patch -p1 -P 1
 	cd ..
 
 %build



From cvs at kolab.org  Mon Jul  7 10:09:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:09:39 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/turba kolab_issue2832.patch, NONE,
	1.1 
Message-ID: <20080707080939.0D3C8600B98@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/turba
In directory doto:/tmp/cvs-serv28017

Added Files:
	kolab_issue2832.patch 
Log Message:
Patch for  kolab/issue2832

--- NEW FILE: kolab_issue2832.patch ---
diff -p --unified=3 -r1.11 -r1.12
--- turba/contact.php	2008/05/05 05:14:12	1.11
+++ turba/contact.php	2008/06/13 21:47:25	1.12
@@ -103,7 +103,7 @@ echo '<div id="page">';
 if (!$print_view) {
     echo $tabs->render($viewName);
 }
-echo '<h1 class="header">' . ($contact->getValue('name') ? $contact->getValue('name') : '<em>' . _("Blank name") . '</em>') . '</h1>';
+echo '<h1 class="header">' . ($contact->getValue('name') ? htmlspecialchars($contact->getValue('name')) : '<em>' . _("Blank name") . '</em>') . '</h1>';
 $view->html();
 echo '</div>';
 require $registry->get('templates', 'horde') . '/common-footer.inc';



From cvs at kolab.org  Mon Jul  7 10:16:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:16:34 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.282,1.283 
Message-ID: <20080707081634.F3889600B87@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2832 (SECURITY: <turba-2.2.1 affected by XSS issue). Bumped release numbers. Note: The turba release candidate tar.gz has been removed from the Horde servers. Grab the package from the old rpm and comment out the corresponding wget line in the Makefile as a temporary workaround.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- release-notes.txt	7 Jul 2008 08:07:31 -0000	1.282
+++ release-notes.txt	7 Jul 2008 08:16:31 -0000	1.283
@@ -54,11 +54,15 @@
 
 	Allow login if public imap service is disabled.
 
-    - horde-kolab-3.2_rc3-20080605
+    - horde-kolab-3.2_rc3-20080707
 
 	Allow login if public imap service is disabled.
 
 	kolab/issue2831 (SECURITY: <horde-3.2.1 affected by XSS issue)
+
+    - horde-turba-kolab-2.2_rc3-20080707
+
+	kolab/issue2832 (SECURITY: <turba-2.2.1 affected by XSS issue)
 
     - install-kolab.sh
 



From cvs at kolab.org  Mon Jul  7 10:16:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:16:34 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba ChangeLog, 1.7,
	1.8 horde-turba-kolab.spec, 1.24, 1.25 
Message-ID: <20080707081634.0C476600B98@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv28159/horde/horde-turba

Modified Files:
	ChangeLog horde-turba-kolab.spec 
Log Message:
kolab/issue2832 (SECURITY: <turba-2.2.1 affected by XSS issue). Bumped release numbers. Note: The turba release candidate tar.gz has been removed from the Horde servers. Grab the package from the old rpm and comment out the corresponding wget line in the Makefile as a temporary workaround.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	14 Mar 2008 17:28:02 -0000	1.7
+++ ChangeLog	7 Jul 2008 08:16:32 -0000	1.8
@@ -1,3 +1,7 @@
+2008-07-07  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-turba-kolab.spec: kolab/issue2832 (SECURITY: <turba-2.2.1 affected by XSS issue)
+
 2008-02-26  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-turba-kolab.spec: Update to RC2
@@ -21,7 +25,7 @@
 
 	* horde-turba-kolab.spec: Update to 20070601
 
-	* lib-Turba.php.patch: 
+	* lib-Turba.php.patch:
 
 	Add support for renaming shares within Turba.
 

Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- horde-turba-kolab.spec	5 Apr 2008 12:59:55 -0000	1.24
+++ horde-turba-kolab.spec	7 Jul 2008 08:16:32 -0000	1.25
@@ -2,8 +2,8 @@
 %define         V_horde_name turba
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   07
 %define         V_version 2.2_rc3
 %define         V_uver    2.2-rc3
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -29,6 +29,7 @@
 Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/turba/HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch
 Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/turba/HK-GW-Fix_share_id_change_turba-3.2-rc3.patch
 Patch3:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/turba/HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch
+Patch4:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/turba/kolab_issue2832.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -66,6 +67,7 @@
 	%patch -p2 -P 1
 	%patch -p2 -P 2
 	%patch -p2 -P 3
+	%patch -p1 -P 4
 	cd ..
 
 %build



From cvs at kolab.org  Mon Jul  7 10:16:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:16:34 +0200 (CEST)
Subject: gunnar: server/horde/horde horde-kolab.spec,1.29,1.30 
Message-ID: <20080707081634.02C2B600B89@lists.intevation.de>

Author: gunnar

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

Modified Files:
	horde-kolab.spec 
Log Message:
kolab/issue2832 (SECURITY: <turba-2.2.1 affected by XSS issue). Bumped release numbers. Note: The turba release candidate tar.gz has been removed from the Horde servers. Grab the package from the old rpm and comment out the corresponding wget line in the Makefile as a temporary workaround.

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- horde-kolab.spec	7 Jul 2008 08:07:31 -0000	1.29
+++ horde-kolab.spec	7 Jul 2008 08:16:31 -0000	1.30
@@ -2,8 +2,8 @@
 %define         V_horde_name horde
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 06
-%define         V_day   05
+%define         V_month 07
+%define         V_day   07
 %define         V_version 3.2_rc3
 %define         V_uver    3.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}



From cvs at kolab.org  Mon Jul  7 10:49:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:49:34 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy DEPRECATION_NOTE,NONE,1.1 
Message-ID: <20080707084934.501DA600B89@lists.intevation.de>

Author: gunnar

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

Added Files:
	DEPRECATION_NOTE 
Log Message:
Kolab Free/Busy lives upstream now (http://cvs.horde.org/framework/Kolab_FreeBusy/).

--- NEW FILE: DEPRECATION_NOTE ---
The Kolab free/busy handling has been moved upstream into Horde.

http://cvs.horde.org/framework/Kolab_FreeBusy/

This package will be removed soon so it should not see anything
other than minor bugfixes anymore.




From cvs at kolab.org  Mon Jul  7 10:49:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jul 2008 10:49:34 +0200 (CEST)
Subject: gunnar: server/kolab-freebusy DEPRECATION_NOTE,NONE,1.1 
Message-ID: <20080707084934.50137600B87@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv29122/kolab-freebusy

Added Files:
	DEPRECATION_NOTE 
Log Message:
Kolab Free/Busy lives upstream now (http://cvs.horde.org/framework/Kolab_FreeBusy/).

--- NEW FILE: DEPRECATION_NOTE ---
The Kolab free/busy handling has been moved upstream into Horde.

http://cvs.horde.org/framework/Kolab_FreeBusy/

This package will be removed soon so it should not see anything
other than minor bugfixes anymore.




From cvs at kolab.org  Tue Jul  8 17:14:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 17:14:22 +0200 (CEST)
Subject: thomas: server install-kolab.sh,1.38,1.39 
Message-ID: <20080708151422.8DA90600B83@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
Add Sascha as author and missing 'c'.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- install-kolab.sh	4 Jul 2008 16:42:25 -0000	1.38
+++ install-kolab.sh	8 Jul 2008 15:14:20 -0000	1.39
@@ -8,6 +8,7 @@
 # Authors:
 # Thomas Arendsen Hein <thomas at intevation.de>
 # Gunnar Wrobel <wrobel at pardus.de>
+# Sascha Wilde <wilde at intevation.de>
 #
 # This program is free software under the GNU GPL (>=v2)
 
@@ -203,7 +204,7 @@
 echo "Kolab user base UID (KID):          $KID"
 echo "Kolab restricted UID (KID):         $R_KID"
 echo "Kolab non-priviledged UID (KID):    $N_KID"
-echo "Exlude following Kolab packages:    $EXCLUDEPKGS"
+echo "Exclude following Kolab packages:   $EXCLUDEPKGS"
 echo
 
 if [ -z "$INSTALL" ]; then



From cvs at kolab.org  Tue Jul  8 17:31:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 17:31:35 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.174,1.175 
Message-ID: <20080708153135.95618600B83@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Reverted richard's broken "Fixed type": The adverb "reliably" is needed here.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- ChangeLog	6 Jul 2008 18:26:58 -0000	1.174
+++ ChangeLog	8 Jul 2008 15:31:33 -0000	1.175
@@ -13,7 +13,7 @@
 
 2008-06-26  Thomas Arendsen Hein <thomas at intevation.de>
 
-	* kolab_bootstrap.in: Use Net::Domain to determine fqdn more reliable.
+	* kolab_bootstrap.in: Use Net::Domain to determine fqdn more reliably.
 	* kolab_bootstrap.in: Make sure suggested domain name contains a dot.
 
 2008-06-05  Thomas Arendsen Hein <thomas at intevation.de>



From cvs at kolab.org  Tue Jul  8 18:26:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 18:26:18 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.283,1.284 README.1st,1.83,1.84 
Message-ID: <20080708162618.7C62B60016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt README.1st 
Log Message:
Update README and release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- release-notes.txt	7 Jul 2008 08:16:31 -0000	1.283
+++ release-notes.txt	8 Jul 2008 16:26:16 -0000	1.284
@@ -68,6 +68,13 @@
 
 	Adjusted version number.
 
+	Install fbview-kronolith and horde-kolab-client by default, unless
+	excluded with "-x fbview-kronolith" or "-x horde-kolab-client".
+
+	Removed obsolete options -F/-H/-i.
+
+	kolab/issue2727 (install-kolab.sh: tar uses -O which is not
+	                 implemented in Solaris' tar)
 	kolab/issue2747 (Installation of ix86 binaries fails on amd64 system)
 
     - kolabconf-2.2.0-2008????

Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- README.1st	9 Jun 2008 20:38:53 -0000	1.83
+++ README.1st	8 Jul 2008 16:26:16 -0000	1.84
@@ -33,38 +33,38 @@
 
 You can check the integrity of the downloaded files with:
 
-$ gpg --verify MD5SUMS
+$ gpg --keyserver hkp://subkeys.pgp.net --recv-key 5816791A
+  or import the key from https://www.intevation.de/~thomas/gpg_pub_key.asc
+$ gpg --verify MD5SUMS.sig
 $ md5sum -c MD5SUMS
 
-Then as root, cd into that local (and writable) directory and run
+Then as root, cd into that local directory and run
 
-# ./install-kolab.sh -H -F 2>&1 | tee kolab-install.log
+# ./install-kolab.sh 2>&1 | tee /root/kolab-install.log
 
 to build and install packages in /kolab. The command output will
 be logged to install-kolab.log so that you have a reference in case
 an errors occurs during installation.
 
-The install script needs to be able to write in the current working
-directory, so if you want to keep this directory clean or install
-install packages from a read-only location (e.g. CD-ROM), you can create
-a new directory and pass the path to the packages to the script using
-the -i option, e.g.:
-
-# /media/cdrom/sources/install-kolab.sh -H -F -i /media/cdrom/sources
+The install script needs to store some files and creates a subdirectory
+below /tmp (or $TMPDIR if set) for this purpose.
 
 Horde might create much load on your server if there are many concurrent
-users, so you can choose to not install it by dropping the flag "-H".
+users, so you can choose to not install it by adding the option
+"-x horde-kolab-client" to the call to install-kolab.sh.
 Installing Horde on a separate host is possible, but not discussed here.
 
-If you do not want to install the free/busy view tool, remove the "-F".
+If you do not want to install the free/busy view tool, add the option
+"-x fbview-kronolith".
 
-The binary packages distributed via kolab.org are compiled with -H -F,
-currently you need to compile from the source packages to install without
-these features, see kolab/issue2440 for details.
+The binary packages distributed via kolab.org are compiled with Horde
+and the free/busy view tool. Currently you need to compile from the
+source packages to install without these features, see kolab/issue2440
+for details.
 
 By default, the Kolab server will now be started at boottime, so you
 have to bootstrap the server configuration now to prevent unconfigured
-components from being started.
+components from being started, see kolab/issue1745 for details.
 
 Please run:
 
@@ -93,7 +93,7 @@
 The installation of the new packages works just as for the initial
 installation.  Download the files as described above and run
 
-# ./install-kolab.sh -H -F 2>&1 | tee kolab-update.log
+# ./install-kolab.sh 2>&1 | tee /root/kolab-update.log
 
 If you installed without Horde or F/B-View you need to drop the
 corresponding flags again.
@@ -286,7 +286,7 @@
 
 5.  Start the standard upgrade (as described above):
 
-    # ./install-kolab.sh -H -F 2>&1 | tee kolab-update.log
+    # ./install-kolab.sh 2>&1 | tee /root/kolab-update.log
 
 6.  Before starting the LDAP server the database must be restored from
     the ldif:



From cvs at kolab.org  Tue Jul  8 18:36:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 18:36:34 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.284,1.285 
Message-ID: <20080708163634.252C0600BBB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
new clamav release


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- release-notes.txt	8 Jul 2008 16:26:16 -0000	1.284
+++ release-notes.txt	8 Jul 2008 16:36:31 -0000	1.285
@@ -46,7 +46,7 @@
 
 Changes between 2.2-rc-3 and 2.2.0
 
-    - clamav-0.93.1-20080610
+    - clamav-0.93.3-20080708
 
 	New upstream version, fixes denial of service.
 



From cvs at kolab.org  Tue Jul  8 18:45:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 18:45:38 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.285,1.286 
Message-ID: <20080708164538.4969860016A@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- release-notes.txt	8 Jul 2008 16:36:31 -0000	1.285
+++ release-notes.txt	8 Jul 2008 16:45:36 -0000	1.286
@@ -125,6 +125,7 @@
 
 	Adjusted version number.
 
+	kolab/issue2660 (Invitation for event series not accept automatically)
 	kolab/issue2734 (Automatic ressources decline changed overlapping event
 	                 time)
 



From cvs at kolab.org  Tue Jul  8 18:56:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 18:56:32 +0200 (CEST)
Subject: thomas: server README.1st,1.84,1.85 
Message-ID: <20080708165632.37DE360016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
added kolab/issue2825 to known problems section


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- README.1st	8 Jul 2008 16:26:16 -0000	1.84
+++ README.1st	8 Jul 2008 16:56:30 -0000	1.85
@@ -401,5 +401,9 @@
       LDAP data and IMAP spool stay on the server and have to be deleted
       manually. See kolab/issue1571 and kolab/issue1576 for details.
 
+    - A domain maintainer can not always edit the email aliases for a user,
+      even if the user and the alias is in domains the domain maintainer has
+      access to. See kolab/issue2825 for details.
+
 
 $Id$



From cvs at kolab.org  Tue Jul  8 19:31:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  8 Jul 2008 19:31:00 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolabd.spec.in,1.27,1.28 
Message-ID: <20080708173100.4B3E660016D@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolabd.spec.in 
Log Message:
Make kolab.conf, quotawarning and templates owned by kolab instead of kolab-n

For kolab.conf and templates this is a security improvement, for quotawarning
just consistency.

Additionally mark kolab.conf as (noreplace) so it does not overwrite the
existing config file during upgrades.


Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolabd.spec.in	4 Jul 2008 15:26:23 -0000	1.27
+++ kolabd.spec.in	8 Jul 2008 17:30:58 -0000	1.28
@@ -116,14 +116,12 @@
 
     #   generate file list
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+	'%config(noreplace) %{l_prefix}/etc/kolab/kolab.conf' \
+	'%config %{l_prefix}/etc/kolab/quotawarning.txt' \
+	'%config %{l_prefix}/etc/kolab/templates/*.template' \
 	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \
 	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \
-	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/php \
-        '%config %{l_prefix}/etc/kolab/*.pem' \
-        '%config %{l_prefix}/etc/kolab/*.schema' \
-        '%config %{l_prefix}/etc/kolab/kolab.conf' \
-	'%config %{l_prefix}/etc/kolab/quotawarning.txt' \
-	'%config %{l_prefix}/etc/kolab/templates/*.template'
+	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/php
 
 %files -f files
 



From cvs at kolab.org  Wed Jul  9 11:02:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 11:02:25 +0200 (CEST)
Subject: bernhard: doc/kolab-formats events.sgml, 1.14, 1.15 kolabformat.sgml,
	1.27, 1.28 
Message-ID: <20080709090225.2B5F360016E@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv20322

Modified Files:
	events.sgml kolabformat.sgml 
Log Message:
Format of Events: Removed ambiguous default for start and end tags.
	For events they should be always there and filled.
Using revdescription instead of revremark now for the last two changelog
 entries in the main document.


Index: events.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/events.sgml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- events.sgml	22 Jul 2005 19:29:59 -0000	1.14
+++ events.sgml	9 Jul 2008 09:02:22 -0000	1.15
@@ -24,7 +24,7 @@
             <display-name>(string, default empty)</display-name>
             <smtp-address>(string, default empty)</smtp-address>
           </organizer>
-          <start-date>(date or datetime, default not present)</start-date>
+          <start-date>(date or datetime)</start-date>
           <alarm>(number, no default)</alarm>
           <recurrence cycle="cycletype" [type="extra type"]>
             <interval>(number, default 1)</interval>
@@ -46,7 +46,7 @@
           <!-- Event specific fields -->
           <show-time-as>(string, default busy)</show-time-as>
           <color-label>(string, default none)</color-label>
-          <end-date>(date or datetime, default not present)</end-date>
+          <end-date>(date or datetime)</end-date>
         </event>
 ]]></programlisting></para>
 

Index: kolabformat.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolabformat.sgml	13 Jun 2008 08:37:02 -0000	1.27
+++ kolabformat.sgml	9 Jul 2008 09:02:22 -0000	1.28
@@ -162,25 +162,31 @@
 <revision>
 <revnumber>2.0rc7</revnumber>
 <date>April 22th, 2008</date>
-<revremark>
-Fixed the example for a non-standard folder type.
-Clarified contents of &lt;gender&gt; tags.
-Clarified that commonfield &lt;sensitifiy&gt; is a label 
-in current implementations.
-</revremark>
+<revdescription>
+<para>
+  Fixed the example for a non-standard folder type.
+  Clarified contents of &lt;gender&gt; tags.
+  Clarified that commonfield &lt;sensitifiy&gt; is a label 
+  in current implementations.
+  </para>
+</revdescription>
 </revision>
 
 <revision>
 <revnumber>CVS $Revision$</revnumber>
 <date>$Date$</date>
-<revremark>
-Section Overview: Stated more precisely that connectors - not Outlook itself - 
-write the format.
-</revremark>
+<revdescription>
+<itemizedlist>
+<listitem><para>
+  Section Overview: Stated more precisely that connectors 
+  - not Outlook itself - write the format.
+  </para></listitem>
+<listitem><para>
+  Format of Events: Removed ambiguous default for start and end tags.
+  </para></listitem>
+</itemizedlist>
+</revdescription>
 </revision>
-
-
-
 
 </revhistory>
 </bookinfo>



From cvs at kolab.org  Wed Jul  9 14:30:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 14:30:06 +0200 (CEST)
Subject: thomas: server README.1st,1.85,1.86 release-notes.txt,1.286,1.287 
Message-ID: <20080709123006.3997160016E@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st release-notes.txt 
Log Message:
Mention latest change to kolabd in README and release notes


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- README.1st	8 Jul 2008 16:56:30 -0000	1.85
+++ README.1st	9 Jul 2008 12:30:03 -0000	1.86
@@ -299,8 +299,8 @@
 
     # > /kolab/var/imapd/tls_sessions.db
 
-8   Check /kolab/etc/kolab/kolab.conf and merge content of
-    kolab.conf.rpmsave manually!
+8   Check /kolab/etc/kolab/kolab.conf and merge new entries from
+    kolab.conf.rpmnew manually!
 
 9.  Remove all *.conf.rpmsave files in the subdirectories of
     /kolab/etc/ as described above.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- release-notes.txt	8 Jul 2008 16:45:36 -0000	1.286
+++ release-notes.txt	9 Jul 2008 12:30:04 -0000	1.287
@@ -90,6 +90,10 @@
 	kolab_bootstrap: Use Net::Domain to determine fqdn more reliably
 	and make sure suggested domain name contains a dot.
 
+	kolab.conf, quotawarning and templates are owned by kolab instead of
+	kolab-n to improve security, and kolab.conf is marked as (noreplace)
+	so it does not overwrite the existing config file during upgrades.
+
 	kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)
 
     - kolab-filter-2.2.0-2008????



From cvs at kolab.org  Wed Jul  9 16:00:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 16:00:17 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.287,1.288 
Message-ID: <20080709140017.3C21560016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Fix kolab/issue2517 (group accounts lead to more rights than necessary for the "calendar" user):
Create Calendar folder on resource/group account creation and set ACL/annotation accordingly.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- release-notes.txt	9 Jul 2008 12:30:04 -0000	1.287
+++ release-notes.txt	9 Jul 2008 14:00:14 -0000	1.288
@@ -123,6 +123,8 @@
 
 	Adjusted version number.
 
+	kolab/issue2517 (group accounts lead to more rights than necessary for
+	                 the "calendar" user)
 	kolab/issue2827 (Deleting users does not work reliably)
 
     - php-kolab-2.2.0-2008????



From cvs at kolab.org  Wed Jul  9 16:00:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 16:00:17 +0200 (CEST)
Subject: thomas: server/perl-kolab/lib/Kolab LDAP.pm,1.5,1.6 
Message-ID: <20080709140017.3AC05600168@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv30674/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
Fix kolab/issue2517 (group accounts lead to more rights than necessary for the "calendar" user):
Create Calendar folder on resource/group account creation and set ACL/annotation accordingly.


Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- LDAP.pm	3 Jul 2008 07:05:13 -0000	1.5
+++ LDAP.pm	9 Jul 2008 14:00:15 -0000	1.6
@@ -525,19 +525,23 @@
 	      my $edn = Net::LDAP::Util::ldap_explode_dn($object->dn(), casefold=>'lower' );
 	      my $gcn = $edn->[1]->{'cn'};
 	      if( $gcn && ($gcn eq 'groups' || $gcn eq 'resources') ) {
-		# We need to give the calendar user access to 
-		# the groups/resources folder.
-		# TODO: Don't hardcode username
-		Kolab::log('L', "Detected group or resource account, adding ACL for calendar", KOLAB_ERROR );
+		# We need to give the calendar user access to the
+		# group's/resource's Calendar folder.
+		# TODO: Don't hardcode user and folder name
+		Kolab::log('L', "Detected group or resource account, creating calendar folder", KOLAB_ERROR );
 		my $domain;
-		if ($uid =~ /.*\@(.*)/) {
-		    $domain = $1;
+		my $user;
+		if ($uid =~ /(.*)\@(.*)/) {
+		    $user = $1;
+		    $domain = $2;
 		} else {
+		    $user = $uid;
 		    $domain = $Kolab::config{'postfix-mydomain'};
 		}
-		Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid all", 
-						     'calendar@' . $domain
-						     .' all']);		
+		my $folder = $user . '/Calendar@' . $domain;
+		Kolab::Cyrus::createMailbox($cyrus, $folder, 0);
+		Kolab::Cyrus::setFolderType($cyrus, $folder, 0, 'event.default');
+		Kolab::Cyrus::setACL($cyrus, $folder, 0, ["$uid all", 'calendar@' . $domain .' all']);
 	      }
 	    }
         }



From cvs at kolab.org  Wed Jul  9 16:00:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 16:00:17 +0200 (CEST)
Subject: thomas: server/perl-kolab ChangeLog,1.36,1.37 
Message-ID: <20080709140017.3DF2D60016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Fix kolab/issue2517 (group accounts lead to more rights than necessary for the "calendar" user):
Create Calendar folder on resource/group account creation and set ACL/annotation accordingly.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	3 Jul 2008 07:05:13 -0000	1.36
+++ ChangeLog	9 Jul 2008 14:00:15 -0000	1.37
@@ -1,3 +1,10 @@
+2008-07-09  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* lib/Kolab/LDAP.pm (createObject): kolab/issue2517 (group accounts
+	lead to more rights than necessary for the "calendar" user):
+	Create Calendar folder on resource/group account creation and
+	set ACL/annotation accordingly.
+
 2008-07-03  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP.pm (mapAcls):



From cvs at kolab.org  Wed Jul  9 16:46:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 16:46:18 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.288,1.289 
Message-ID: <20080709144618.05490600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
kolabd/imapd.conf.template: kolab/issue2855
(Can create folder while logging in as user without domain name):
Remove autocreatequota setting to prevent creating INBOX.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- release-notes.txt	9 Jul 2008 14:00:14 -0000	1.288
+++ release-notes.txt	9 Jul 2008 14:46:15 -0000	1.289
@@ -95,6 +95,8 @@
 	so it does not overwrite the existing config file during upgrades.
 
 	kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)
+	kolab/issue2855 (Can create folder while logging in as user without
+	                 domain name)
 
     - kolab-filter-2.2.0-2008????
 



From cvs at kolab.org  Wed Jul  9 16:46:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 16:46:18 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates imapd.conf.template.in, 1.15,
	1.16 
Message-ID: <20080709144618.08EFA600172@lists.intevation.de>

Author: thomas

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

Modified Files:
	imapd.conf.template.in 
Log Message:
kolabd/imapd.conf.template: kolab/issue2855
(Can create folder while logging in as user without domain name):
Remove autocreatequota setting to prevent creating INBOX.


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- imapd.conf.template.in	5 Mar 2008 18:10:09 -0000	1.15
+++ imapd.conf.template.in	9 Jul 2008 14:46:15 -0000	1.16
@@ -26,7 +26,6 @@
 allowanonymouslogin:    no
 allowplaintext:         yes
 servername:             @@@fqdnhostname@@@
-autocreatequota:        @@@cyrus-autocreatequota@@@
 reject8bit:             no
 munge8bit: 		no
 quotawarn:              @@@cyrus-quotawarn@@@



From cvs at kolab.org  Wed Jul  9 16:46:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 16:46:18 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.175,1.176 
Message-ID: <20080709144618.07794600170@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
kolabd/imapd.conf.template: kolab/issue2855
(Can create folder while logging in as user without domain name):
Remove autocreatequota setting to prevent creating INBOX.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- ChangeLog	8 Jul 2008 15:31:33 -0000	1.175
+++ ChangeLog	9 Jul 2008 14:46:15 -0000	1.176
@@ -1,3 +1,9 @@
+2008-07-09  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* templates/imapd.conf.template.in: kolab/issue2855 (Can create folder
+	while logging in as user without domain name): Remove autocreatequota
+	setting to prevent creating INBOX.
+
 2008-07-04  Sascha Wilde  <wilde at intevation.de>
 
 	* kolabd.spec.in: changed `with_horde' default to "yes".



From cvs at kolab.org  Wed Jul  9 17:07:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:07:06 +0200 (CEST)
Subject: thomas: server/kolab-filter Makefile,1.15,1.16 
Message-ID: <20080709150706.345C260016C@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv1147/kolab-filter

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2.0


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	26 May 2008 14:49:25 -0000	1.15
+++ Makefile	9 Jul 2008 15:07:04 -0000	1.16
@@ -1,8 +1,8 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.2.rc3
-CVS = 1
+VERSION = 2.2.0
+CVS = 0
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Wed Jul  9 17:07:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:07:06 +0200 (CEST)
Subject: thomas: server/kolab-freebusy Makefile,1.16,1.17 
Message-ID: <20080709150706.3AC7460016E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv1147/kolab-freebusy

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2.0


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	26 May 2008 14:49:25 -0000	1.16
+++ Makefile	9 Jul 2008 15:07:04 -0000	1.17
@@ -1,8 +1,8 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.2.rc3
-CVS = 1
+VERSION = 2.2.0
+CVS = 0
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Wed Jul  9 17:07:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:07:06 +0200 (CEST)
Subject: thomas: server/kolabconf Makefile.PL,1.23,1.24 
Message-ID: <20080709150706.40719600170@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile.PL 
Log Message:
Bumped version numbers to 2.2.0


Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.PL	26 May 2008 14:49:25 -0000	1.23
+++ Makefile.PL	9 Jul 2008 15:07:04 -0000	1.24
@@ -9,10 +9,10 @@
 my $KOLAB_VERSION;
 
 # The Kolab version number for the perl-kolab package
-my $KOLAB_BASE_VERSION = "2.2.rc3";
+my $KOLAB_BASE_VERSION = "2.2.0";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
 
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Wed Jul  9 17:07:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:07:06 +0200 (CEST)
Subject: thomas: server install-kolab.sh, 1.39, 1.40 release-notes.txt, 1.289,
	1.290 
Message-ID: <20080709150706.2D3F6600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh release-notes.txt 
Log Message:
Bumped version numbers to 2.2.0


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- install-kolab.sh	8 Jul 2008 15:14:20 -0000	1.39
+++ install-kolab.sh	9 Jul 2008 15:07:04 -0000	1.40
@@ -12,7 +12,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2-rc3+cvs"
+KOLAB_VERSION="2.2.0"
 KID="19414"
 
 TAG="kolab"

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- release-notes.txt	9 Jul 2008 14:46:15 -0000	1.289
+++ release-notes.txt	9 Jul 2008 15:07:04 -0000	1.290
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 2008????, Kolab Server 2.2.0)
+(Version 20080709, Kolab Server 2.2.0)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -77,11 +77,11 @@
 	                 implemented in Solaris' tar)
 	kolab/issue2747 (Installation of ix86 binaries fails on amd64 system)
 
-    - kolabconf-2.2.0-2008????
+    - kolabconf-2.2.0-20080709
 
 	Adjusted version number.
 
-    - kolabd-2.2.0-2008????
+    - kolabd-2.2.0-20080709
 
 	Adjusted version number (and fixed typo).
 
@@ -98,15 +98,15 @@
 	kolab/issue2855 (Can create folder while logging in as user without
 	                 domain name)
 
-    - kolab-filter-2.2.0-2008????
+    - kolab-filter-2.2.0-20080709
 
 	Adjusted version number.
 
-    - kolab-freebusy-2.2.0-2008????
+    - kolab-freebusy-2.2.0-20080709
 
 	Adjusted version number.
 
-    - kolab-webadmin-2.2.0-2008????
+    - kolab-webadmin-2.2.0-20080709
 
 	Adjusted version number.
 
@@ -121,7 +121,7 @@
 	kolab/issue2745 (php error after sending an update to an event)
 	kolab/issue2760 (Deleting shared folders does not work)
 
-    - perl-kolab-2.2.0-2008????
+    - perl-kolab-2.2.0-20080709
 
 	Adjusted version number.
 
@@ -129,7 +129,7 @@
 	                 the "calendar" user)
 	kolab/issue2827 (Deleting users does not work reliably)
 
-    - php-kolab-2.2.0-2008????
+    - php-kolab-2.2.0-20080709
 
 	Adjusted version number.
 



From cvs at kolab.org  Wed Jul  9 17:07:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:07:06 +0200 (CEST)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.19,1.20 
Message-ID: <20080709150706.477C9600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Bumped version numbers to 2.2.0


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Kolab.pm	26 May 2008 14:49:25 -0000	1.19
+++ Kolab.pm	9 Jul 2008 15:07:04 -0000	1.20
@@ -59,10 +59,10 @@
 );
 
 # The Kolab version number for the perl-kolab package
-our $KOLAB_BASE_VERSION = "2.2.rc3";
+our $KOLAB_BASE_VERSION = "2.2.0";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
 
 our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Wed Jul  9 17:07:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:07:06 +0200 (CEST)
Subject: thomas: server/php-kolab Makefile,1.22,1.23 
Message-ID: <20080709150706.4D2A060016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2.0


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	26 May 2008 14:49:25 -0000	1.22
+++ Makefile	9 Jul 2008 15:07:04 -0000	1.23
@@ -2,10 +2,10 @@
 RELEASE = $(shell date '+%Y%m%d')
 DATE = $(shell date '+%Y-%m-%d')
 
-VERSION = 2.2
-PRERELEASE = rc
-PRERELEASE_VERSION = 3
-CVS = 1
+VERSION = 2.2.0
+#PRERELEASE = rc
+#PRERELEASE_VERSION = 3
+CVS = 0
 
 ifeq "x$(PRERELEASE)" "x"
   ifeq "x$(CVS)" "x0"



From cvs at kolab.org  Wed Jul  9 17:32:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:32:09 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolabd.spec.in,1.28,1.29 
Message-ID: <20080709153209.9A21960016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolabd.spec.in 
Log Message:
Bump versions of kolab-webadmin and kolabd to 2.2.0, too.


Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kolabd.spec.in	8 Jul 2008 17:30:58 -0000	1.28
+++ kolabd.spec.in	9 Jul 2008 15:32:07 -0000	1.29
@@ -25,8 +25,8 @@
 ##
 
 #   package version
-%define       V_ei_maj 2.1
-%define       V_ei_min 99
+%define       V_ei_maj 2.2
+%define       V_ei_min 0
 
 #   package information
 Name:         kolabd



From cvs at kolab.org  Wed Jul  9 17:32:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:32:09 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin configure.ac,1.28,1.29 
Message-ID: <20080709153209.8F8C160016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	configure.ac 
Log Message:
Bump versions of kolab-webadmin and kolabd to 2.2.0, too.


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- configure.ac	14 Mar 2008 11:16:30 -0000	1.28
+++ configure.ac	9 Jul 2008 15:32:07 -0000	1.29
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-m4_define(_VERSION,2.1.99)
+m4_define(_VERSION,2.2.0)
 AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 



From cvs at kolab.org  Wed Jul  9 17:37:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:37:15 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd configure.ac,1.10,1.11 
Message-ID: <20080709153715.98ABB60016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	configure.ac 
Log Message:
and another forgotten bump to 2.2.0


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.ac	17 Jul 2007 15:07:15 -0000	1.10
+++ configure.ac	9 Jul 2008 15:37:13 -0000	1.11
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 
 # not the real version
-m4_define(_VERSION,2.1.99)
+m4_define(_VERSION,2.2.0)
 AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 



From cvs at kolab.org  Wed Jul  9 17:57:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 17:57:46 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog, 1.176,
	1.177 kolab_bootstrap.in, 1.36, 1.37 
Message-ID: <20080709155746.B6F1D600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
kolab_bootstrap: Update checkPort statements to current Kolab server:
no ftpd, no strange pop3/imap ports, lmtp, postfix reinjection.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- ChangeLog	9 Jul 2008 14:46:15 -0000	1.176
+++ ChangeLog	9 Jul 2008 15:57:44 -0000	1.177
@@ -3,6 +3,8 @@
 	* templates/imapd.conf.template.in: kolab/issue2855 (Can create folder
 	while logging in as user without domain name): Remove autocreatequota
 	setting to prevent creating INBOX.
+	* kolab_bootstrap.in: Update checkPort statements to current Kolab
+	server: no ftpd, no strange pop3/imap ports, lmtp, postfix reinjection.
 
 2008-07-04  Sascha Wilde  <wilde at intevation.de>
 

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- kolab_bootstrap.in	26 Jun 2008 16:28:47 -0000	1.36
+++ kolab_bootstrap.in	9 Jul 2008 15:57:44 -0000	1.37
@@ -162,24 +162,22 @@
 print "\nKOLAB BOOTSTRAP\n\n";
 
 # Check for already running services preventing proper operation of kolab_bootstrap and Kolab
-checkPort("webserver",80);    # http
-checkPort("webserver",443);   # https
-checkPort("imap server",143); # imap
-checkPort("imap server",220); # 
-checkPort("imap server",585);
-checkPort("imap server",993);
-checkPort("pop3 server",109);
-checkPort("pop3 server",110);  # pop3
-checkPort("pop3 server",473);
-checkPort("pop3 server",995);
-checkPort("smtp server",25);   # smtp
-checkPort("smtp server",465);
-checkPort("ftp server",21);
-checkPort("Amavis Virus Scanner Interface",10024);
-checkPort("Kolab daemon",9999);
-checkPort("OpenLDAP server",636);
-checkPort("OpenLDAP server",389);
-checkPort("Sieve server",2000);
+checkPort("http webserver", 80);
+checkPort("https webserver", 443);
+checkPort("imap server", 143);
+checkPort("imaps server", 993);
+checkPort("pop3 server", 110);
+checkPort("pop3s server", 995);
+checkPort("smtp server", 25);
+checkPort("smtps server", 465);
+checkPort("amavis server", 10024);
+checkPort("postfix reinjection from kolabfilter", 10025);
+checkPort("postfix reinjection from amavis", 10026);
+checkPort("kolab daemon", 9999);
+checkPort("ldap server", 389);
+checkPort("ldaps server", 636);
+checkPort("sieve server", 2000);
+checkPort("lmtp server", 2003);
 
 print ("Excellent all required Ports are available!\n");
 



From cvs at kolab.org  Wed Jul  9 18:01:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 18:01:26 +0200 (CEST)
Subject: ljohansen: doc/www/src index.html.m4,1.148,1.149 
Message-ID: <20080709160126.6D426600168@lists.intevation.de>

Author: ljohansen

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

Modified Files:
	index.html.m4 
Log Message:
Added news item on SyncML integration


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- index.html.m4	18 Jun 2008 16:24:52 -0000	1.148
+++ index.html.m4	9 Jul 2008 16:01:24 -0000	1.149
@@ -61,6 +61,22 @@
 
 
 <table>
+<tr><td class="newsd">July 9th, 2008</td>
+<td class="newsh">&raquo;
+  Kolab integrates mobile devices via SyncML
+</td></tr>
+</table>
+<div class="newsb">
+	Univention GmbH has realised an extension to Kolab in cooperation with the Kolab Konsortium and Pardus, which allows users to connect mobile devices directly to the groupware server. Now it is possible to synchronize appointment times and contact information being away on business.<br />
+	This was done by integrating the SyncML protocol into the Horde part of Kolab server. SyncML is a platform independant standard designed for the exchange of data between servers, clients and mobile devices.<br />
+	The Horde interface is going to be integrated into Kolab Server/OpenPKG 2.2.0 as a beta version. Version 2.2.1 is then expected to integrate the SyncML extensions for tasks and contacts.
+	In Univention's UGS the SyncML extensions are available as release candidates for testing purposes.
+	<br />
+	You can find more information in <a href="http://www.univention.de/pm_syncml.html">Univention's press release</a> (German only).
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">June 18th, 2008</td>
 <td class="newsh">&raquo;
   Security Issue 21 for Kolab Server (ClamAV)



From cvs at kolab.org  Wed Jul  9 18:08:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 18:08:03 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.290,1.291 
Message-ID: <20080709160803.64F20600168@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- release-notes.txt	9 Jul 2008 15:07:04 -0000	1.290
+++ release-notes.txt	9 Jul 2008 16:08:01 -0000	1.291
@@ -94,6 +94,8 @@
 	kolab-n to improve security, and kolab.conf is marked as (noreplace)
 	so it does not overwrite the existing config file during upgrades.
 
+	Updated check of free ports during kolab_bootstrap.
+
 	kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)
 	kolab/issue2855 (Can create folder while logging in as user without
 	                 domain name)



From cvs at kolab.org  Wed Jul  9 18:18:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 18:18:54 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.149,1.150 
Message-ID: <20080709161854.5846F600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
the usual (this time very small) cleanup


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- index.html.m4	9 Jul 2008 16:01:24 -0000	1.149
+++ index.html.m4	9 Jul 2008 16:18:52 -0000	1.150
@@ -76,6 +76,7 @@
 </div>
 <p>
 
+
 <table>
 <tr><td class="newsd">June 18th, 2008</td>
 <td class="newsh">&raquo;



From cvs at kolab.org  Wed Jul  9 18:20:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 18:20:38 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.150,1.151 
Message-ID: <20080709162038.5991960016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
forgot the tabs that shouldn't be there


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- index.html.m4	9 Jul 2008 16:18:52 -0000	1.150
+++ index.html.m4	9 Jul 2008 16:20:36 -0000	1.151
@@ -67,12 +67,12 @@
 </td></tr>
 </table>
 <div class="newsb">
-	Univention GmbH has realised an extension to Kolab in cooperation with the Kolab Konsortium and Pardus, which allows users to connect mobile devices directly to the groupware server. Now it is possible to synchronize appointment times and contact information being away on business.<br />
-	This was done by integrating the SyncML protocol into the Horde part of Kolab server. SyncML is a platform independant standard designed for the exchange of data between servers, clients and mobile devices.<br />
-	The Horde interface is going to be integrated into Kolab Server/OpenPKG 2.2.0 as a beta version. Version 2.2.1 is then expected to integrate the SyncML extensions for tasks and contacts.
-	In Univention's UGS the SyncML extensions are available as release candidates for testing purposes.
-	<br />
-	You can find more information in <a href="http://www.univention.de/pm_syncml.html">Univention's press release</a> (German only).
+  Univention GmbH has realised an extension to Kolab in cooperation with the Kolab Konsortium and Pardus, which allows users to connect mobile devices directly to the groupware server. Now it is possible to synchronize appointment times and contact information being away on business.<br />
+  This was done by integrating the SyncML protocol into the Horde part of Kolab server. SyncML is a platform independant standard designed for the exchange of data between servers, clients and mobile devices.<br />
+  The Horde interface is going to be integrated into Kolab Server/OpenPKG 2.2.0 as a beta version. Version 2.2.1 is then expected to integrate the SyncML extensions for tasks and contacts.
+  In Univention's UGS the SyncML extensions are available as release candidates for testing purposes.
+  <br />
+  You can find more information in <a href="http://www.univention.de/pm_syncml.html">Univention's press release</a> (German only).
 </div>
 <p>
 



From cvs at kolab.org  Wed Jul  9 19:16:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 19:16:25 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.291,1.292 
Message-ID: <20080709171625.BC28D600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Added package list for 2.2.0 to release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- release-notes.txt	9 Jul 2008 16:08:01 -0000	1.291
+++ release-notes.txt	9 Jul 2008 17:16:23 -0000	1.292
@@ -140,6 +140,137 @@
 	                 time)
 
 
+    Packages in the OpenPKG based Kolab server release:
+
+    - Kolab packages:
+
+      Updated:
+
+	PEAR-Net_IMAP-1.1.0beta1-2
+	fbview-horde-3.2_rc3-20080605
+	horde-kolab-3.2_rc3-20080707
+	horde-turba-kolab-2.2_rc3-20080707
+	kolab-filter-2.2.0-20080709
+	kolab-freebusy-2.2.0-20080709
+	kolab-webadmin-2.2.0-20080709
+	kolabconf-2.2.0-20080709
+	kolabd-2.2.0-20080709
+	perl-kolab-2.2.0-20080709
+	php-kolab-2.2.0-20080709
+
+      Unchanged:
+
+	PEAR-Auth_SASL-1.0.2-1
+	PEAR-Date-1.4.7-1
+	PEAR-HTTP_Request-1.4.1-1
+	PEAR-Log-1.9.9-1
+	PEAR-Mail-1.1.14-1
+	PEAR-Mail_Mime-1.3.1-1
+	PEAR-Net_LMTP-1.0.1-1
+	PEAR-Net_SMTP-1.2.10-1
+	PEAR-Net_Sieve-1.1.5-1
+	PEAR-Net_Socket-1.0.6-1
+	PEAR-Net_URL-1.0.15-1
+	fbview-kronolith-2.2_rc2-20080523
+	horde-framework-kolab-3.2_rc3-20080405
+	horde-imp-kolab-4.2_rc3-20080405
+	horde-ingo-kolab-1.2_rc2-20080405
+	horde-kolab-client-0.99-20080405
+	horde-kronolith-kolab-2.2_rc2-20080405
+	horde-mnemo-kolab-2.2_rc2-20080405
+	horde-nag-kolab-2.2_rc2-20080405
+	horde-passwd-kolab-3.0.1-20080405
+	openldap-2.3.41-20080424
+	php-channel-horde-1.0-1
+	php-smarty-2.6.18-20070607
+
+    - OpenPKG packages:
+
+      Updated:
+
+	clamav-0.93.3-20080708
+
+      Unchanged:
+
+	amavisd-2.5.3-20080101
+	apache-2.2.8-20080118
+	apache-php-5.2.6-20080514_kolab
+	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.4-20080101
+	config-20060923-20080101
+	curl-7.17.1-20080101
+	db-4.5.20.2-20070628
+	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
+	gcc-4.2.2-20080101
+	gd-2.0.35-20080101
+	gettext-0.17-20080101
+	gmp-4.2.2-20080101
+	grep-2.5.3-20080101
+	groff-1.19.2-20080101
+	gzip-1.3.12-20080101
+	imap-2006k-20080101
+	imapd-2.3.11-20080101_kolab4
+	jpeg-6b-20080101
+	libiconv-1.12-20080101
+	libmcrypt-2.5.8-20080101
+	libxml-2.6.31-20080111
+	libxslt-1.1.22-20080101
+	lzo-2.02-20080101
+	m4-1.4.9-20080101
+	make-3.81-20080101
+	mhash-0.9.9-20080101
+	mm-1.4.2-20080101
+	ncurses-5.6.20080112-20080113
+	openpkg-20071227-20071227
+	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-ldap-5.10.0-20080101
+	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.6-20080514_kolab
+	pkgconfig-0.23-20080117
+	png-1.2.24-20080101
+	postfix-2.4.6-20080101_kolab
+	procmail-3.22-20080101
+	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-rc-2 and 2.2-rc-3
 
     - apache-php-5.2.6-20080514_kolab



From cvs at kolab.org  Wed Jul  9 22:58:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jul 2008 22:58:27 +0200 (CEST)
Subject: thomas: server install-kolab.sh,1.40,1.41 
Message-ID: <20080709205827.A5B7960016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
Drop -s flag for shtool it was originally added as a flag for sh.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- install-kolab.sh	9 Jul 2008 15:07:04 -0000	1.40
+++ install-kolab.sh	9 Jul 2008 20:58:25 -0000	1.41
@@ -70,7 +70,7 @@
 
 shtool_get_plattag() {
   [ -f shtool ] || sh "$INSTALLER" -t | tar xf - shtool
-  echo `sh shtool -s platform --type=binary`-$TAG
+  echo `sh shtool platform --type=binary`-$TAG
 }
 
 populate_workdir() {



From cvs at kolab.org  Thu Jul 10 08:49:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 08:49:08 +0200 (CEST)
Subject: bernhard: doc/www/src roadmap.html.m4,1.15,1.16 
Message-ID: <20080710064908.0972D60016C@lists.intevation.de>

Author: bernhard

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

Modified Files:
	roadmap.html.m4 
Log Message:
Updating roadmap to mention 2.2.1 for Q4 and planned SyncML addition.


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- roadmap.html.m4	11 Jun 2008 15:16:03 -0000	1.15
+++ roadmap.html.m4	10 Jul 2008 06:49:05 -0000	1.16
@@ -90,7 +90,11 @@
 <li>Implementation of new concept for extended freebusy list which is
 good for the teamleader overview usecase.</li>
 </ul>
-Planned is 2.2 final release in June 2008.
+Planned was 2.2 final release in June 2008.
+<p>
+Release 2.2.1 is envisoned for Q4 2008 or earlier. It is likely to
+have one release candidate before that. Planned improvements include
+adding the SyncML improvements to Horde.
 
 <h3>Kolab Server 2.1 release series</h3>
 Current is 2.1.0 Final. No further releases planned. 



From cvs at kolab.org  Thu Jul 10 08:52:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 08:52:35 +0200 (CEST)
Subject: bernhard: doc/www/src download.html.m4,1.12,1.13 
Message-ID: <20080710065235.1E5FC60016C@lists.intevation.de>

Author: bernhard

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

Modified Files:
	download.html.m4 
Log Message:
Removing a leftover "i".


Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- download.html.m4	11 Jun 2008 15:10:19 -0000	1.12
+++ download.html.m4	10 Jul 2008 06:52:33 -0000	1.13
@@ -109,7 +109,7 @@
 
 
 <a name="kolab1">
-<h2>Kolabi 1</h2>
+<h2>Kolab 1</h2>
 </a>
 
 



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-imp horde-imp-kolab.spec,1.20,1.21 
Message-ID: <20080710110253.3C1F5600B9D@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv8742/horde/horde-imp

Modified Files:
	horde-imp-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-imp-kolab.spec	5 Apr 2008 12:59:55 -0000	1.20
+++ horde-imp-kolab.spec	10 Jul 2008 11:02:51 -0000	1.21
@@ -2,8 +2,8 @@
 %define         V_horde_name imp
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   10
 %define         V_version 4.2_rc3
 %define         V_uver    4.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -73,8 +73,8 @@
 	cd ..
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php 
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'    \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 
 %clean



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-ingo horde-ingo-kolab.spec,1.19,1.20 
Message-ID: <20080710110253.3B2C3600174@lists.intevation.de>

Author: thomas

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

Modified Files:
	horde-ingo-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- horde-ingo-kolab.spec	5 Apr 2008 12:59:55 -0000	1.19
+++ horde-ingo-kolab.spec	10 Jul 2008 11:02:51 -0000	1.20
@@ -2,8 +2,8 @@
 %define         V_horde_name ingo
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   10
 %define         V_version 1.2_rc2
 %define         V_uver    1.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -76,8 +76,8 @@
 	cd ..
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'    \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/fbview-kronolith fbview-kronolith.spec, 1.22,
	1.23 
Message-ID: <20080710110253.37BCE600172@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv8742/horde/fbview-kronolith

Modified Files:
	fbview-kronolith.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- fbview-kronolith.spec	23 May 2008 09:19:52 -0000	1.22
+++ fbview-kronolith.spec	10 Jul 2008 11:02:51 -0000	1.23
@@ -2,8 +2,8 @@
 %define         V_horde_name kronolith
 %define         V_package fbview-%{V_horde_name}
 %define         V_year  2008
-%define         V_month 05
-%define         V_day   23
+%define         V_month 07
+%define         V_day   10
 %define         V_version 2.2_rc2
 %define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -95,9 +95,9 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                            \
-	    '%config(noreplace)' %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template   \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/*.php
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template'   \
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php' \
+	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-kronolith horde-kronolith-kolab.spec, 1.24,
	1.25 
Message-ID: <20080710110253.3F87A600BAB@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv8742/horde/horde-kronolith

Modified Files:
	horde-kronolith-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- horde-kronolith-kolab.spec	5 Apr 2008 12:59:55 -0000	1.24
+++ horde-kronolith-kolab.spec	10 Jul 2008 11:02:51 -0000	1.25
@@ -2,8 +2,8 @@
 %define         V_horde_name kronolith
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   10
 %define         V_version 2.2_rc2
 %define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -95,9 +95,9 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                            \
-	    '%config(noreplace)'              %{l_prefix}/etc/kolab/templates/horde-kronolith-kolab-conf.template \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php     \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
+	    '%config(noreplace)              %{l_prefix}/etc/kolab/templates/horde-kronolith-kolab-conf.template' \
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'     \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-turba horde-turba-kolab.spec,1.25,1.26 
Message-ID: <20080710110253.48993600BBD@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv8742/horde/horde-turba

Modified Files:
	horde-turba-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- horde-turba-kolab.spec	7 Jul 2008 08:16:32 -0000	1.25
+++ horde-turba-kolab.spec	10 Jul 2008 11:02:51 -0000	1.26
@@ -3,7 +3,7 @@
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
 %define         V_month 07
-%define         V_day   07
+%define         V_day   10
 %define         V_version 2.2_rc3
 %define         V_uver    2.2-rc3
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -89,8 +89,8 @@
 	cd ..
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'    \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-passwd horde-passwd-kolab.spec,1.17,1.18 
Message-ID: <20080710110253.451FA600BBC@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv8742/horde/horde-passwd

Modified Files:
	horde-passwd-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- horde-passwd-kolab.spec	5 Apr 2008 12:59:55 -0000	1.17
+++ horde-passwd-kolab.spec	10 Jul 2008 11:02:51 -0000	1.18
@@ -2,8 +2,8 @@
 %define         V_horde_name passwd
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   10
 %define         V_version 3.0.1
 %define         V_uver    3.0.1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -74,8 +74,8 @@
 	cd ..
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                               \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php' \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-mnemo horde-mnemo-kolab.spec,1.22,1.23 
Message-ID: <20080710110253.41B6E600BBA@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv8742/horde/horde-mnemo

Modified Files:
	horde-mnemo-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-mnemo-kolab.spec	5 Apr 2008 12:59:55 -0000	1.22
+++ horde-mnemo-kolab.spec	10 Jul 2008 11:02:51 -0000	1.23
@@ -2,8 +2,8 @@
 %define         V_horde_name mnemo
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   10
 %define         V_version 2.2_rc2
 %define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -72,8 +72,8 @@
 	cd ..
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                        \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php' \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server/horde/horde-nag horde-nag-kolab.spec,1.20,1.21 
Message-ID: <20080710110253.44E00600BBB@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv8742/horde/horde-nag

Modified Files:
	horde-nag-kolab.spec 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-nag-kolab.spec	5 Apr 2008 12:59:55 -0000	1.20
+++ horde-nag-kolab.spec	10 Jul 2008 11:02:51 -0000	1.21
@@ -2,8 +2,8 @@
 %define         V_horde_name nag
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
-%define         V_month 04
-%define         V_day   05
+%define         V_month 07
+%define         V_day   10
 %define         V_version 2.2_rc2
 %define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -71,8 +71,8 @@
 	cd ..
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                        \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php' \
+	    '%config(noreplace)              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Thu Jul 10 13:02:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 13:02:53 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.292,1.293 
Message-ID: <20080710110253.3658A60016E@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Fix kolab/issue2872 (Building horde packages fails if different version already installed)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- release-notes.txt	9 Jul 2008 17:16:23 -0000	1.292
+++ release-notes.txt	10 Jul 2008 11:02:50 -0000	1.293
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080709, Kolab Server 2.2.0)
+(Version 20080710, Kolab Server 2.2.0)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -54,15 +54,52 @@
 
 	Allow login if public imap service is disabled.
 
+    - fbview-kronolith-2.2_rc2-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
+    - horde-imp-kolab-4.2_rc3-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
+    - horde-ingo-kolab-1.2_rc2-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
     - horde-kolab-3.2_rc3-20080707
 
 	Allow login if public imap service is disabled.
 
 	kolab/issue2831 (SECURITY: <horde-3.2.1 affected by XSS issue)
 
-    - horde-turba-kolab-2.2_rc3-20080707
+    - horde-kronolith-kolab-2.2_rc2-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
+    - horde-mnemo-kolab-2.2_rc2-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
+    - horde-nag-kolab-2.2_rc2-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
+    - horde-passwd-kolab-3.0.1-20080710
+
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
+
+    - horde-turba-kolab-2.2_rc3-20080710
 
 	kolab/issue2832 (SECURITY: <turba-2.2.1 affected by XSS issue)
+	kolab/issue2872 (Building horde packages fails if different version
+	                 already installed)
 
     - install-kolab.sh
 
@@ -138,137 +175,6 @@
 	kolab/issue2660 (Invitation for event series not accept automatically)
 	kolab/issue2734 (Automatic ressources decline changed overlapping event
 	                 time)
-
-
-    Packages in the OpenPKG based Kolab server release:
-
-    - Kolab packages:
-
-      Updated:
-
-	PEAR-Net_IMAP-1.1.0beta1-2
-	fbview-horde-3.2_rc3-20080605
-	horde-kolab-3.2_rc3-20080707
-	horde-turba-kolab-2.2_rc3-20080707
-	kolab-filter-2.2.0-20080709
-	kolab-freebusy-2.2.0-20080709
-	kolab-webadmin-2.2.0-20080709
-	kolabconf-2.2.0-20080709
-	kolabd-2.2.0-20080709
-	perl-kolab-2.2.0-20080709
-	php-kolab-2.2.0-20080709
-
-      Unchanged:
-
-	PEAR-Auth_SASL-1.0.2-1
-	PEAR-Date-1.4.7-1
-	PEAR-HTTP_Request-1.4.1-1
-	PEAR-Log-1.9.9-1
-	PEAR-Mail-1.1.14-1
-	PEAR-Mail_Mime-1.3.1-1
-	PEAR-Net_LMTP-1.0.1-1
-	PEAR-Net_SMTP-1.2.10-1
-	PEAR-Net_Sieve-1.1.5-1
-	PEAR-Net_Socket-1.0.6-1
-	PEAR-Net_URL-1.0.15-1
-	fbview-kronolith-2.2_rc2-20080523
-	horde-framework-kolab-3.2_rc3-20080405
-	horde-imp-kolab-4.2_rc3-20080405
-	horde-ingo-kolab-1.2_rc2-20080405
-	horde-kolab-client-0.99-20080405
-	horde-kronolith-kolab-2.2_rc2-20080405
-	horde-mnemo-kolab-2.2_rc2-20080405
-	horde-nag-kolab-2.2_rc2-20080405
-	horde-passwd-kolab-3.0.1-20080405
-	openldap-2.3.41-20080424
-	php-channel-horde-1.0-1
-	php-smarty-2.6.18-20070607
-
-    - OpenPKG packages:
-
-      Updated:
-
-	clamav-0.93.3-20080708
-
-      Unchanged:
-
-	amavisd-2.5.3-20080101
-	apache-2.2.8-20080118
-	apache-php-5.2.6-20080514_kolab
-	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.4-20080101
-	config-20060923-20080101
-	curl-7.17.1-20080101
-	db-4.5.20.2-20070628
-	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
-	gcc-4.2.2-20080101
-	gd-2.0.35-20080101
-	gettext-0.17-20080101
-	gmp-4.2.2-20080101
-	grep-2.5.3-20080101
-	groff-1.19.2-20080101
-	gzip-1.3.12-20080101
-	imap-2006k-20080101
-	imapd-2.3.11-20080101_kolab4
-	jpeg-6b-20080101
-	libiconv-1.12-20080101
-	libmcrypt-2.5.8-20080101
-	libxml-2.6.31-20080111
-	libxslt-1.1.22-20080101
-	lzo-2.02-20080101
-	m4-1.4.9-20080101
-	make-3.81-20080101
-	mhash-0.9.9-20080101
-	mm-1.4.2-20080101
-	ncurses-5.6.20080112-20080113
-	openpkg-20071227-20071227
-	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-ldap-5.10.0-20080101
-	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.6-20080514_kolab
-	pkgconfig-0.23-20080117
-	png-1.2.24-20080101
-	postfix-2.4.6-20080101_kolab
-	procmail-3.22-20080101
-	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-rc-2 and 2.2-rc-3



From cvs at kolab.org  Thu Jul 10 14:14:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 14:14:58 +0200 (CEST)
Subject: thomas: server README.1st,1.86,1.87 
Message-ID: <20080710121458.4591460016E@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
2.1->2.2 upgrade instructions: Don't specify version numbers with rpm -e

Because of this older packages (e.g. from a 2.1-beta version) survived.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- README.1st	9 Jul 2008 12:30:03 -0000	1.86
+++ README.1st	10 Jul 2008 12:14:56 -0000	1.87
@@ -251,15 +251,8 @@
     during the upgrade process:
 
     # /kolab/bin/openpkg rpm -e --nodeps \
-        kolabd-2.1.0-20070510 \
-        kolab-webadmin-2.1.0-20070510 \
-        kolab-horde-fbview-2.1.0-20070420 \
-        kolab-horde-framework-2.1.0-20070420 \
-        kolab-resource-handlers-2.1.0-20070510 \
-        getopt-20051005-2.5.0 \
-        patch-2.5.9-2.5.0 \
-        proftpd-1.3.0rc2-2.5.0 \
-        sharutils-4.5.1-2.5.0
+        kolabd kolab-webadmin kolab-horde-fbview kolab-horde-framework \
+        kolab-resource-handlers getopt patch proftpd sharutils
 
 4.  New versions of openpkg and openpkg-tools are needed for the upgrade, so
     you have to install them manually beforehand.



From cvs at kolab.org  Thu Jul 10 14:28:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 14:28:47 +0200 (CEST)
Subject: thomas: server README.1st,1.87,1.88 
Message-ID: <20080710122847.3EBF2600BBA@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Replace 2.2-rc1 with 2.2.0 for 2.1->2.2 upgrade instructions


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- README.1st	10 Jul 2008 12:14:56 -0000	1.87
+++ README.1st	10 Jul 2008 12:28:45 -0000	1.88
@@ -230,7 +230,7 @@
 
 Instructions for upgrading from Kolab server 2.0 will be added in a
 future version of this document.  These instructions are for upgrading
-from Kolab server 2.1.0 to 2.2-rc1:
+from Kolab server 2.1.0 to 2.2.0:
 
 0.  Make a backup of your installation and data stored inside /kolab
 



From cvs at kolab.org  Thu Jul 10 14:30:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 14:30:32 +0200 (CEST)
Subject: thomas: server README.1st,1.88,1.89 
Message-ID: <20080710123032.815BF600BAB@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Don't assume that install-kolab.sh is executable, but use "sh" to call it.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- README.1st	10 Jul 2008 12:28:45 -0000	1.88
+++ README.1st	10 Jul 2008 12:30:30 -0000	1.89
@@ -40,7 +40,7 @@
 
 Then as root, cd into that local directory and run
 
-# ./install-kolab.sh 2>&1 | tee /root/kolab-install.log
+# sh install-kolab.sh 2>&1 | tee /root/kolab-install.log
 
 to build and install packages in /kolab. The command output will
 be logged to install-kolab.log so that you have a reference in case
@@ -93,7 +93,7 @@
 The installation of the new packages works just as for the initial
 installation.  Download the files as described above and run
 
-# ./install-kolab.sh 2>&1 | tee /root/kolab-update.log
+# sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
 
 If you installed without Horde or F/B-View you need to drop the
 corresponding flags again.
@@ -143,7 +143,7 @@
 run the following command as user kolab or root to create the new
 00INDEX.rdf file::
 
-$ ./install-kolab.sh -X
+$ sh install-kolab.sh -X
 
 If you want a pure binary installer, you can remove the .src.rpm files
 now. To be able to use this directory for fresh installations (i.e. not
@@ -279,7 +279,7 @@
 
 5.  Start the standard upgrade (as described above):
 
-    # ./install-kolab.sh 2>&1 | tee /root/kolab-update.log
+    # sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
 
 6.  Before starting the LDAP server the database must be restored from
     the ldif:



From cvs at kolab.org  Thu Jul 10 14:41:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 14:41:34 +0200 (CEST)
Subject: thomas: server README.1st,1.89,1.90 
Message-ID: <20080710124134.B443A600174@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Mention that calling generatefb.php via browser needs authenticated f/b download


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- README.1st	10 Jul 2008 12:30:30 -0000	1.89
+++ README.1st	10 Jul 2008 12:41:32 -0000	1.90
@@ -188,7 +188,8 @@
 
 As this will show the manager's password on the command line, you can
 alternatively open https://yourserver.example.com/freebusy/generatefb.php
-in a web browser and login as "manager.
+in a web browser and login as "manager". This needs "Allow unauthenticated
+downloading of Free/Busy information" to be disabled, which is the default.
 
 
 Upgrade from 2.2-beta3 to 2.2-rc1



From cvs at kolab.org  Thu Jul 10 14:57:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 Jul 2008 14:57:33 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.293,1.294 
Message-ID: <20080710125733.D7FCE600BAB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Add package list for 2.2.0


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- release-notes.txt	10 Jul 2008 11:02:50 -0000	1.293
+++ release-notes.txt	10 Jul 2008 12:57:31 -0000	1.294
@@ -177,6 +177,137 @@
 	                 time)
 
 
+    Packages in the OpenPKG based Kolab server release:
+
+    - Kolab packages:
+
+      Updated:
+
+	PEAR-Net_IMAP-1.1.0beta1-2
+	fbview-horde-3.2_rc3-20080605
+	fbview-kronolith-2.2_rc2-20080710
+	horde-imp-kolab-4.2_rc3-20080710
+	horde-ingo-kolab-1.2_rc2-20080710
+	horde-kolab-3.2_rc3-20080707
+	horde-kronolith-kolab-2.2_rc2-20080710
+	horde-mnemo-kolab-2.2_rc2-20080710
+	horde-nag-kolab-2.2_rc2-20080710
+	horde-passwd-kolab-3.0.1-20080710
+	horde-turba-kolab-2.2_rc3-20080710
+	kolab-filter-2.2.0-20080709
+	kolab-freebusy-2.2.0-20080709
+	kolab-webadmin-2.2.0-20080709
+	kolabconf-2.2.0-20080709
+	kolabd-2.2.0-20080709
+	perl-kolab-2.2.0-20080709
+	php-kolab-2.2.0-20080709
+
+      Unchanged:
+
+	PEAR-Auth_SASL-1.0.2-1
+	PEAR-Date-1.4.7-1
+	PEAR-HTTP_Request-1.4.1-1
+	PEAR-Log-1.9.9-1
+	PEAR-Mail-1.1.14-1
+	PEAR-Mail_Mime-1.3.1-1
+	PEAR-Net_LMTP-1.0.1-1
+	PEAR-Net_SMTP-1.2.10-1
+	PEAR-Net_Sieve-1.1.5-1
+	PEAR-Net_Socket-1.0.6-1
+	PEAR-Net_URL-1.0.15-1
+	horde-framework-kolab-3.2_rc3-20080405
+	horde-kolab-client-0.99-20080405
+	openldap-2.3.41-20080424
+	php-channel-horde-1.0-1
+	php-smarty-2.6.18-20070607
+
+    - OpenPKG packages:
+
+      Updated:
+
+	clamav-0.93.3-20080708
+
+      Unchanged:
+
+	amavisd-2.5.3-20080101
+	apache-2.2.8-20080118
+	apache-php-5.2.6-20080514_kolab
+	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.4-20080101
+	config-20060923-20080101
+	curl-7.17.1-20080101
+	db-4.5.20.2-20070628
+	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
+	gcc-4.2.2-20080101
+	gd-2.0.35-20080101
+	gettext-0.17-20080101
+	gmp-4.2.2-20080101
+	grep-2.5.3-20080101
+	groff-1.19.2-20080101
+	gzip-1.3.12-20080101
+	imap-2006k-20080101
+	imapd-2.3.11-20080101_kolab4
+	jpeg-6b-20080101
+	libiconv-1.12-20080101
+	libmcrypt-2.5.8-20080101
+	libxml-2.6.31-20080111
+	libxslt-1.1.22-20080101
+	lzo-2.02-20080101
+	m4-1.4.9-20080101
+	make-3.81-20080101
+	mhash-0.9.9-20080101
+	mm-1.4.2-20080101
+	ncurses-5.6.20080112-20080113
+	openpkg-20071227-20071227
+	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-ldap-5.10.0-20080101
+	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.6-20080514_kolab
+	pkgconfig-0.23-20080117
+	png-1.2.24-20080101
+	postfix-2.4.6-20080101_kolab
+	procmail-3.22-20080101
+	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-rc-2 and 2.2-rc-3
 
     - apache-php-5.2.6-20080514_kolab



From cvs at kolab.org  Fri Jul 11 12:12:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 12:12:55 +0200 (CEST)
Subject: emanuel: doc/www/src index.html.m4,1.151,1.152 
Message-ID: <20080711101255.14E14600B9C@lists.intevation.de>

Author: emanuel

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

Modified Files:
	index.html.m4 
Log Message:
Moved news. Added ul tag.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- index.html.m4	9 Jul 2008 16:20:36 -0000	1.151
+++ index.html.m4	11 Jul 2008 10:12:52 -0000	1.152
@@ -90,6 +90,10 @@
 <p>
 
 
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
 <table>
 <tr><td class="newsd">June 9th, 2008</td>
 <td class="newsh">&raquo;
@@ -115,6 +119,7 @@
 <a
 href="http://www.linux-magazin.de/news/linuxtag_2008_kontact_vorkonfiguriert_fuer_windows_und_mac">Linux-Magazin</a> (2008-05-29)
 and <a href="http://www.golem.de/0805/60069.html">Golem</a> (2008-05-30).
+</ul>
 </div>
 <p>
 
@@ -149,11 +154,6 @@
   announcement</a> for details.
 </div>
 <p>
-
-
-</div> <!-- END LATEST BLOCK -->
-<p>
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 
 <table>



From cvs at kolab.org  Fri Jul 11 14:05:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 14:05:22 +0200 (CEST)
Subject: emanuel: doc/www/src download.html.m4,1.13,1.14 
Message-ID: <20080711120522.DFE7C600169@lists.intevation.de>

Author: emanuel

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

Modified Files:
	download.html.m4 
Log Message:
Added missing ul tag.


Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- download.html.m4	10 Jul 2008 06:52:33 -0000	1.13
+++ download.html.m4	11 Jul 2008 12:05:20 -0000	1.14
@@ -104,6 +104,7 @@
 Uptodate, tested and supported packages for specific distributions
 can be ordered from the
 <a href="http://www.Kolab-Konsortium.com/">Kolab Konsortium</a>.
+</ul>
 </div>
 
 



From cvs at kolab.org  Fri Jul 11 16:08:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 16:08:54 +0200 (CEST)
Subject: emanuel: doc/www/src screenshots.html.m4,1.10,1.11 
Message-ID: <20080711140854.01D0F600B9B@lists.intevation.de>

Author: emanuel

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

Modified Files:
	screenshots.html.m4 
Log Message:
New Kontact for Windows screenshots.


Index: screenshots.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/screenshots.html.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- screenshots.html.m4	10 Jun 2008 08:50:54 -0000	1.10
+++ screenshots.html.m4	11 Jul 2008 14:08:51 -0000	1.11
@@ -170,7 +170,7 @@
     </a>
 </div>
 <div class="logo-text-right">
-<h3><a name="kontact-windows">KDE Kontact for Windows (enterprise4 | alpha, 2008-06-03)</a></h3>
+<h3><a name="kontact-windows">KDE Kontact for Windows (enterprise4 | alpha, 2008-06-30)</a></h3>
 
     <!--Screenshot 1-->
     <div class="screenshot-image">
@@ -180,7 +180,6 @@
     </div>
     <div class="screenshot-text">
     <b>Mail: Overview</b><br>
-     
     </div>
 
     <!--Screenshot 2-->
@@ -192,7 +191,54 @@
     </div>
     <div class="screenshot-text">
     <b>Mail: Composing</b><br>
-     
+    </div>
+    </div>
+
+    <!--Screenshot 3-->
+    <div class="screenshot">
+    <div class="screenshot-image">
+    <a href="images/shot-kontact-windows-calendar.png">
+    <img src="images/shot-kontact-windows-calendar_small.png">
+    </a>
+    </div>
+    <div class="screenshot-text">
+    <b>Calendar: Overview</b><br>
+    </div>
+    </div>
+
+    <!--Screenshot 4-->
+    <div class="screenshot">
+    <div class="screenshot-image">
+    <a href="images/shot-kontact-windows-calendar-edit-event.png">
+    <img src="images/shot-kontact-windows-calendar-edit-event_small.png">
+    </a>
+    </div>
+    <div class="screenshot-text">
+    <b>Calendar: Edit event</b><br>
+    </div>
+    </div>
+
+    <!--Screenshot 5-->
+    <div class="screenshot">
+    <div class="screenshot-image">
+    <a href="images/shot-kontact-windows-contacts.png">
+    <img src="images/shot-kontact-windows-contacts_small.png">
+    </a>
+    </div>
+    <div class="screenshot-text">
+    <b>Contacts: Overview</b><br>
+    </div>
+    </div>
+
+    <!--Screenshot 6-->
+    <div class="screenshot">
+    <div class="screenshot-image">
+    <a href="images/shot-kontact-windows-tasks.png">
+    <img src="images/shot-kontact-windows-tasks_small.png">
+    </a>
+    </div>
+    <div class="screenshot-text">
+    <b>Tasks: Overview</b><br>
     </div>
     </div>
 



From cvs at kolab.org  Fri Jul 11 16:08:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 16:08:54 +0200 (CEST)
Subject: emanuel: doc/www/src/images
	shot-kontact-windows-calendar-edit-event.png, NONE,
	1.1 shot-kontact-windows-calendar-edit-event_small.png, NONE,
	1.1 shot-kontact-windows-calendar.png, NONE,
	1.1 shot-kontact-windows-calendar_small.png, NONE,
	1.1 shot-kontact-windows-contacts-editing.png, NONE,
	1.1 shot-kontact-windows-contacts-editing_small.png, NONE,
	1.1 shot-kontact-windows-contacts.png, NONE,
	1.1 shot-kontact-windows-contacts_small.png, NONE,
	1.1 shot-kontact-windows-tasks.png, NONE,
	1.1 shot-kontact-windows-tasks_small.png, NONE,
	1.1 shot-kontact-windows-mail-composing.png, 1.1,
	1.2 shot-kontact-windows-mail-composing_small.png, 1.1,
	1.2 shot-kontact-windows-mail.png, 1.1,
	1.2 shot-kontact-windows-mail_small.png, 1.1, 1.2 
Message-ID: <20080711140854.03440600B9C@lists.intevation.de>

Author: emanuel

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

Modified Files:
	shot-kontact-windows-mail-composing.png 
	shot-kontact-windows-mail-composing_small.png 
	shot-kontact-windows-mail.png 
	shot-kontact-windows-mail_small.png 
Added Files:
	shot-kontact-windows-calendar-edit-event.png 
	shot-kontact-windows-calendar-edit-event_small.png 
	shot-kontact-windows-calendar.png 
	shot-kontact-windows-calendar_small.png 
	shot-kontact-windows-contacts-editing.png 
	shot-kontact-windows-contacts-editing_small.png 
	shot-kontact-windows-contacts.png 
	shot-kontact-windows-contacts_small.png 
	shot-kontact-windows-tasks.png 
	shot-kontact-windows-tasks_small.png 
Log Message:
New Kontact for Windows screenshots.


--- NEW FILE: shot-kontact-windows-calendar-edit-event.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-calendar-edit-event_small.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-calendar.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-calendar_small.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-contacts-editing.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-contacts-editing_small.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-contacts.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-contacts_small.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-tasks.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shot-kontact-windows-tasks_small.png ---
(This appears to be a binary file; contents omitted.)

Index: shot-kontact-windows-mail-composing.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-windows-mail-composing.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvstgUMki and /tmp/cvs2QZ8no differ

Index: shot-kontact-windows-mail-composing_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-windows-mail-composing_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs8dSvxg and /tmp/cvsuCKYWm differ

Index: shot-kontact-windows-mail.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-windows-mail.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsfMWMQg and /tmp/cvsM8rOKn differ

Index: shot-kontact-windows-mail_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-windows-mail_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs2bXyLj and /tmp/cvseogwot differ



From cvs at kolab.org  Fri Jul 11 17:24:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 17:24:08 +0200 (CEST)
Subject: thomas: utils/testing test-send-group-invitation-issue2745.py, NONE,
	1.1 
Message-ID: <20080711152408.68476600B9A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv31355

Added Files:
	test-send-group-invitation-issue2745.py 
Log Message:
Added sample email to trigger kolab/issue2745 (php error after sending an update to an event)


--- NEW FILE: test-send-group-invitation-issue2745.py ---
#!/usr/bin/env python
"""Send email with iTIP invitation trying to trigger kolab/issue2745

(php error after sending an update to an event)

Usage $progname <recipientemailaddress>

This script is Free Software under the GNU General Public License >=v2.
bernhard at intevation.de (initial 20080505)
thomas at intevation.de (update 20080711)
"""

__version__="$Revision: 1.1 $"
# $Source: /kolabrepository/utils/testing/test-send-group-invitation-issue2745.py,v $

import sys

import datetime
import itertools
import smtplib
import string

msg = """To: %s
From: %s
Subject: kolab/issue2745
Date: Fri, 11 Jul 2008 14:54:43 +0200
MIME-Version: 1.0
Content-Type: text/calendar;
  method=request;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

BEGIN:VCALENDAR
PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN
VERSION:2.0
METHOD:REQUEST
BEGIN:VTIMEZONE
TZID:Amsterdam, Berlin, Bern, Rom, Stockholm, Wien
BEGIN:STANDARD
DTSTART:20071028T030000
RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
TZNAME:Standard Time
END:STANDARD
BEGIN:DAYLIGHT
DTSTART:20080330T020000
RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
TZNAME:Daylight Savings Time
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:thomas at intevation.de
ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:gruppe_test at test.hq
ORGANIZER:MAILTO:ltest3 at test.hq
DTSTART;TZID="Amsterdam, Berlin, Bern, Rom, Stockholm, Wien":20080711T203000
DTEND;TZID="Amsterdam, Berlin, Bern, Rom, Stockholm, Wien":20080711T210000
RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR;WKST=MO
TRANSP:OPAQUE
SEQUENCE:0
UID:040000008200E00074C5B7101A82E0080000000040D86B0D66E3C8010000000000000000100
 000001666279B4EAAF846A184ADC1F0C760BA
DTSTAMP:20080711T125443Z
DESCRIPTION:Zeit: Dieser Termin steht jede Woche am Freitag an\, beginnend
  am 11.07.2008 von 20:30 bis 21:00 (GMT+01:00) Amsterdam\, Berlin\, Bern\,
  Rom\, Stockholm\, Wien.\n\n*~*~*~*~*~*~*~*~*~*\n\n\n
SUMMARY:kolab/issue2745
PRIORITY:5
X-MICROSOFT-CDO-IMPORTANCE:1
CLASS:PUBLIC
BEGIN:VALARM
TRIGGER:-PT15M
ACTION:DISPLAY
DESCRIPTION:Reminder
END:VALARM
END:VEVENT
END:VCALENDAR
"""

toaddr = [sys.argv[1]]
smtpserver='localhost'
# if you set a loginname, a connection via TLS and authentification is tried
loginname = None
password  = None

fromaddr="nobody at example.org"

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, string.join(toaddr, ", ")))

server.quit()



From cvs at kolab.org  Fri Jul 11 17:35:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 17:35:13 +0200 (CEST)
Subject: thomas: utils/testing test-send-group-invitation-issue2745.py, 1.1,
	1.2 
Message-ID: <20080711153513.8D84B600B9A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv31758

Modified Files:
	test-send-group-invitation-issue2745.py 
Log Message:
Updated test script for issue2745 to use consistent addresses


Index: test-send-group-invitation-issue2745.py
===================================================================
RCS file: /kolabrepository/utils/testing/test-send-group-invitation-issue2745.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test-send-group-invitation-issue2745.py	11 Jul 2008 15:24:05 -0000	1.1
+++ test-send-group-invitation-issue2745.py	11 Jul 2008 15:35:11 -0000	1.2
@@ -53,9 +53,8 @@
 END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VEVENT
-ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:thomas at intevation.de
-ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:gruppe_test at test.hq
-ORGANIZER:MAILTO:ltest3 at test.hq
+ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:%s
+ORGANIZER:MAILTO:%s
 DTSTART;TZID="Amsterdam, Berlin, Bern, Rom, Stockholm, Wien":20080711T203000
 DTEND;TZID="Amsterdam, Berlin, Bern, Rom, Stockholm, Wien":20080711T210000
 RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR;WKST=MO
@@ -80,7 +79,7 @@
 END:VCALENDAR
 """
 
-toaddr = [sys.argv[1]]
+toaddr = sys.argv[1]
 smtpserver='localhost'
 # if you set a loginname, a connection via TLS and authentification is tried
 loginname = None
@@ -95,6 +94,6 @@
     server.starttls()
     server.login(loginname,password)
 
-server.sendmail(fromaddr, toaddr, msg % (fromaddr, string.join(toaddr, ", ")))
+server.sendmail(fromaddr, [toaddr], msg % (toaddr, fromaddr, toaddr, fromaddr))
 
 server.quit()



From cvs at kolab.org  Fri Jul 11 17:46:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 17:46:19 +0200 (CEST)
Subject: emanuel: doc/www/src/images shot-horde-calendar.png, 1.1,
	1.2 shot-horde-calendar_small.png, 1.1,
	1.2 shot-horde-webmail.png, 1.1,
	1.2 shot-horde-webmail_small.png, 1.1,
	1.2 shot-kontact-enterprise35-calendar-edit-event.png, 1.1,
	1.2 shot-kontact-enterprise35-calendar-edit-event_small.png, 1.1,
	1.2 shot-kontact-enterprise35-calendar-side-by-side.png, 1.1,
	1.2 shot-kontact-enterprise35-calendar-side-by-side_small.png,
	1.1, 1.2 shot-kontact-enterprise35-calendar.png, 1.1,
	1.2 shot-kontact-enterprise35-calendar_small.png, 1.1,
	1.2 shot-kontact-enterprise35-contacts-editing.png, 1.1,
	1.2 shot-kontact-enterprise35-contacts-editing_small.png, 1.1,
	1.2 shot-kontact-enterprise35-contacts.png, 1.1,
	1.2 shot-kontact-enterprise35-contacts_small.png, 1.1,
	1.2 shot-kontact-enterprise35-freebusy.png, 1.1,
	1.2 shot-kontact-enterprise35-freebusy_small.png, 1.1,
	1.2 shot-kontact-enterprise35-mail-composing.png, 1.1,
	1.2 shot-kontact-enterprise35-mail-composing_small.png, 1.1,
	1.2 shot-kontact-enterprise35-mail.png, 1.1, 
	1.2 shot-kontact-enterprise35-mail_small.png, 1.1,
	1.2 shot-kontact-enterprise35-tasks.png, 1.1,
	1.2 shot-kontact-enterprise35-tasks_small.png, 1.1,
	1.2 shot-kontact-windows-mail.png, 1.2,
	1.3 shot-webadmin-manage-domain-maintainers.png, 1.1,
	1.2 shot-webadmin-manage-domain-maintainers_small.png, 1.1,
	1.2 shot-webadmin-manage-email-users.png, 1.1,
	1.2 shot-webadmin-manage-email-users_small.png, 1.1, 1.2 
Message-ID: <20080711154619.C15A460016F@lists.intevation.de>

Author: emanuel

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

Modified Files:
	shot-horde-calendar.png shot-horde-calendar_small.png 
	shot-horde-webmail.png shot-horde-webmail_small.png 
	shot-kontact-enterprise35-calendar-edit-event.png 
	shot-kontact-enterprise35-calendar-edit-event_small.png 
	shot-kontact-enterprise35-calendar-side-by-side.png 
	shot-kontact-enterprise35-calendar-side-by-side_small.png 
	shot-kontact-enterprise35-calendar.png 
	shot-kontact-enterprise35-calendar_small.png 
	shot-kontact-enterprise35-contacts-editing.png 
	shot-kontact-enterprise35-contacts-editing_small.png 
	shot-kontact-enterprise35-contacts.png 
	shot-kontact-enterprise35-contacts_small.png 
	shot-kontact-enterprise35-freebusy.png 
	shot-kontact-enterprise35-freebusy_small.png 
	shot-kontact-enterprise35-mail-composing.png 
	shot-kontact-enterprise35-mail-composing_small.png 
	shot-kontact-enterprise35-mail.png 
	shot-kontact-enterprise35-mail_small.png 
	shot-kontact-enterprise35-tasks.png 
	shot-kontact-enterprise35-tasks_small.png 
	shot-kontact-windows-mail.png 
	shot-webadmin-manage-domain-maintainers.png 
	shot-webadmin-manage-domain-maintainers_small.png 
	shot-webadmin-manage-email-users.png 
	shot-webadmin-manage-email-users_small.png 
Log Message:
Added new screenshots of kontact, horde and kolab webadmin.


Index: shot-horde-calendar.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-horde-calendar.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsX4m2sS and /tmp/cvsuBpNUy differ

Index: shot-horde-calendar_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-horde-calendar_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsiIP5GQ and /tmp/cvsg7gPex differ

Index: shot-horde-webmail.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-horde-webmail.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvslg2mZQ and /tmp/cvsangMiy differ

Index: shot-horde-webmail_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-horde-webmail_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvss2A5ST and /tmp/cvsCqKMDD differ

Index: shot-kontact-enterprise35-calendar-edit-event.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-calendar-edit-event.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsf6v8cU and /tmp/cvsAm0DwE differ

Index: shot-kontact-enterprise35-calendar-edit-event_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-calendar-edit-event_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvseQHyRU and /tmp/cvsCoQqyD differ

Index: shot-kontact-enterprise35-calendar-side-by-side.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-calendar-side-by-side.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs3QAObT and /tmp/cvsmtOMsC differ

Index: shot-kontact-enterprise35-calendar-side-by-side_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-calendar-side-by-side_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsAwz5zT and /tmp/cvsaqNv2C differ

Index: shot-kontact-enterprise35-calendar.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-calendar.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs1eNUkW and /tmp/cvsmtX5LI differ

Index: shot-kontact-enterprise35-calendar_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-calendar_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvse8T1iX and /tmp/cvsuyxitK differ

Index: shot-kontact-enterprise35-contacts-editing.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-contacts-editing.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs9vxUkV and /tmp/cvsSnlAHG differ

Index: shot-kontact-enterprise35-contacts-editing_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-contacts-editing_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsOd7yDV and /tmp/cvs4S3y8G differ

Index: shot-kontact-enterprise35-contacts.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-contacts.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsvWad0V and /tmp/cvs8rEtqK differ

Index: shot-kontact-enterprise35-contacts_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-contacts_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsgLAPYY and /tmp/cvseurh7N differ

Index: shot-kontact-enterprise35-freebusy.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-freebusy.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsF0dQEZ and /tmp/cvscCnb3M differ

Index: shot-kontact-enterprise35-freebusy_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-freebusy_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs07DeKX and /tmp/cvsCUrElL differ

Index: shot-kontact-enterprise35-mail-composing.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-mail-composing.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsrYjisY and /tmp/cvsWVa2oP differ

Index: shot-kontact-enterprise35-mail-composing_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-mail-composing_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsa2Rkc1 and /tmp/cvsglQZgS differ

Index: shot-kontact-enterprise35-mail.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-mail.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvshoHFA1 and /tmp/cvs28kJiT differ

Index: shot-kontact-enterprise35-mail_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-mail_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvskAege0 and /tmp/cvsuiKPkQ differ

Index: shot-kontact-enterprise35-tasks.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-tasks.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsVvKEz0 and /tmp/cvsgCzBPQ differ

Index: shot-kontact-enterprise35-tasks_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-enterprise35-tasks_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs6vNdq3 and /tmp/cvsUfXWGW differ

Index: shot-kontact-windows-mail.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-windows-mail.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsPlKfJ3 and /tmp/cvs8RQVcX differ

Index: shot-webadmin-manage-domain-maintainers.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-webadmin-manage-domain-maintainers.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsg4HGh4 and /tmp/cvsYNOWfY differ

Index: shot-webadmin-manage-domain-maintainers_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-webadmin-manage-domain-maintainers_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvs5E5971 and /tmp/cvsy5P36T differ

Index: shot-webadmin-manage-email-users.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-webadmin-manage-email-users.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsuWpvq2 and /tmp/cvsMtov0U differ

Index: shot-webadmin-manage-email-users_small.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-webadmin-manage-email-users_small.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsx8Ck52 and /tmp/cvseF0jHY differ



From cvs at kolab.org  Fri Jul 11 17:47:16 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 17:47:16 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter recurrence.class.php,
	NONE, 1.1 Resource.php, 1.11, 1.12 
Message-ID: <20080711154716.1ED6C600B9B@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Resource.php 
Added Files:
	recurrence.class.php 
Log Message:
kolab/issue2745 (php error after sending an update to an event)

--- NEW FILE: recurrence.class.php ---
<?php
/*
 *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
 *
 *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

/**
 * Class for recurring event calculation
 *
 * Usage: Subclass and implement setBusy(...),
 *        Instantiate, call setter methods to fill
 *        in data, then call expand() to expand the
 *        recurrence. This will cause setBusy() to be 
 *        called for each busy period
 */
/*abstract*/ class Recurrence {

  /* public: */

  function Recurrence() {}
  function setStartDate( $ts ) { $this->initial_start = $ts; }
  function setEndDate( $ts ) { $this->initial_end = $ts; }

  function setCycletype( $ctype ) { $this->cycle_type = $ctype; }
  function setType( $type ) { $this->type = $type; }
  function setInterval( $interval ) { $this->interval = $interval; }
  function setDaynumber( $num ) { $this->daynumber = is_array($num)?$num:array($num); }
  function setDay( $day ) { $this->day = is_array($day)?$day:array($day); }
  function setMonth( $month ) { $this->month = is_array($month)?$month:array($month); }
  function setExclusionDates( $ex ) { 
    // Prescale dates for easy comparison
    $this->exclusion_dates = array();
    foreach( $ex as $e ) {
      $e = explode('-',$e);
      $e = intval(sprintf('%04d%02d%02d', $e[0],$e[1],$e[2]));
      $this->exclusion_dates[] = $e;
    } 
  }
  
  function setRangetype( $type ) { $this->range_type = $type; }
  function setRange( $range ) { $this->range = $range; }

  function ts2string($ts) {
    return gmdate("D, M d Y H:i:s",$ts).'Z';
  }
  
  function expand( $startstamp, $endstamp ) {
    Horde::logMessage( 'Recurrence::expand( '.Recurrence::ts2string($startstamp).", "
	   .Recurrence::ts2string($endstamp).' ), cycletype='.$this->cycle_type, __FILE__, __LINE__,
	   PEAR_LOG_DEBUG);
    switch( $this->cycle_type ) {
    case 'daily':
      $this->expand_daily( $startstamp, $endstamp );
      break;
    case 'weekly':
      $this->expand_weekly( $startstamp, $endstamp );
      break;
    case 'monthly':
      $this->expand_monthly( $startstamp, $endstamp );
      break;
    case 'yearly':
      $this->expand_yearly( $startstamp, $endstamp );
      break;
    default:
      Horde::logMessage('Unknown cycletype '.$this->cycle_type, __FILE__, __LINE__, PEAR_LOG_ERROR);
    }
  }

  /* Abstract function, please override */
  function setBusy( $start, $end, $duration ) {
    //mylog( "Warning: Abstract method Recurrence::setBusy( $start, $end, $duration ) called", RM_LOG_ERROR);
  }

  /* private: */

  function expand_daily( $startstamp, $endstamp ) {
    // Daily recurrence, every 'interval' days
    $duration = $this->initial_end-$this->initial_start;
    $count = 0;
    if( !$this->interval ) $this->interval = 1;
    for( $t = $this->initial_start; $t < $endstamp; $t = strtotime( '+'.$this->interval.' days',$t) ) {
      //myLog("Adding recurrence $t -> ".($t+$duration), RM_LOG_DEBUG );
      if( !$this->isExcluded( $t, $t+$duration) ) $this->setBusy( $t, null, $duration );
      $count++;
      if( $this->range_type == 'number' && $count > $this->range ) {
	break;
      } else if( $this->range_type == 'date' && $t > strtotime( '+1 day',$this->range ) ) {
	break;
      }
    }
  }

  function expand_weekly( $startstamp, $endstamp ) {
    // Weekly recurrence, every 'interval' weeks on 'day' days
    $duration = $this->initial_end-$this->initial_start;
    if( !$this->interval ) $this->interval = 1;
    $count = 0;
    $delta_days = (int)gmdate('w',$this->initial_start);
    for( $t =  strtotime("-$delta_days days", $this->initial_start); $t < $endstamp; 
	 $t = strtotime( '+'.$this->interval.' weeks', $t) ) {
      //myLog("t=".gmdate("D, M d Y H:i:s",$t), RM_LOG_DEBUG);
      foreach( $this->day as $day ) {
	$tmp = strtotime( '+'.$this->dayname2number($day).' days', $t);
	if( $tmp >= $this->initial_start && $tmp < $endstamp &&
	    !$this->isExcluded( $tmp, $tmp+$duration) ) {
	  Horde::logMessage("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp)." -> "
		.gmdate("D, M d Y H:i:s",$tmp+$duration), __FILE__, __LINE__, PEAR_LOG_DEBUG );
	  $this->setBusy( $tmp, null, $duration );
	} else {
	  break;
	}
      }
      $count++;
      if( $this->range_type == 'number' && $count > $this->range ) {
	break;
      } else if( $this->range_type == 'date' && $t > strtotime( '+1 day',$this->range ) ) {
	break;
      }	    
    }
  }

  function expand_monthly( $startstamp, $endstamp ) {
    // Weekly recurrence, every 'interval' weeks
    $duration = $this->initial_end-$this->initial_start;
    if( !$this->interval ) $this->interval = 1;
    $count = 0;
    $delta_days = (int)gmdate('d',$this->initial_start);
    Horde::logMessage("initial_start=".Recurrence::ts2string($this->initial_start), __FILE__, __LINE__, PEAR_LOG_DEBUG);
    $offset = 0;
    $first_of_month = gmdate("M 1 Y H:i:s+0000", $this->initial_start); 
    for( $t = strtotime( $first_of_month ); 
	 $t < $endstamp; $t = strtotime( '+'.$this->interval.' months', $t)) {
      if( $this->type == 'daynumber') {
	// On numbered days
	Horde::logMessage('t = '.gmdate('M d Y H:i:s',$t), __FILE__, __LINE__, PEAR_LOG_DEBUG);
	foreach( $this->daynumber as $dayno ) {
	  $t_month = gmdate('m',strtotime("-$offset days", $t)); 
	  $tmp = strtotime( '+'.($dayno-$offset-1).' days', $t);
	  Horde::logMessage('tmp = '.gmdate('M d Y H:i:s',$tmp), __FILE__, __LINE__, PEAR_LOG_DEBUG);
	  $tmp_month = gmdate('m',$tmp); // make sure same month
	  if( $tmp >= $this->initial_start && $tmp < $endstamp &&
	      $t_month == $tmp_month &&
	      !$this->isExcluded( $tmp, $tmp+$duration) ) {
	    Horde::logMessage("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp)." -> "
		  .gmdate("D, M d Y H:i:s",$tmp+$duration), __FILE__, __LINE__, PEAR_LOG_DEBUG );
	    $this->setBusy( $tmp, null, $duration );
	  } else {
	    break;
	  }
	}
	$count++;
      } else if( $this->type == 'weekday' ) {
	// On named weekdays
	// Find beginning of first week
	$tmp = strtotime("-$offset days",$t);
	$firstday = (int)gmdate('w',$tmp);
	for( $i = 0; $i < count($this->day); $i++ ) {
	  $dayno = $this->daynumber[$i];
	  $wday  = $this->dayname2number($this->day[$i]);
	  $tmp_month = gmdate('m',$tmp); // make sure same month
	  if( $wday < $firstday ) $tmp2 = strtotime( '+'.($dayno*7+$wday-$firstday).' days', $tmp);
	  else $tmp2 = strtotime( '+'.(($dayno-1)*7+$wday-$firstday).' days', $tmp);
	  $tmp2_month = gmdate('m',$tmp2); // make sure same month
	  if( $tmp_month == $tmp2_month && $tmp2 >= $this->initial_start && $tmp2 < $endstamp 
	      && !$this->isExcluded( $tmp2, $tmp2+$duration) ) {
	    Horde::logMessage("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp2)." -> "
		  .gmdate("D, M d Y H:i:s",$tmp2+$duration), __LINE__, __FILE__, PEAR_LOG_DEBUG );
	    $this->setBusy( $tmp2, null, $duration );
	  } else if($tmp2 >= $endstamp ) {
	    break;
	  }
	}
	$count++;
      }
      if( $this->range_type == 'number' && $count > $this->range ) {
	break;
      } else if( $this->range_type == 'date' 
		 && strtotime('-$offset days',$t) > strtotime( '+1 day',$this->range ) ) {
	break;
      }
    }
  }

  function expand_yearly( $startstamp, $endstamp ) {
    $duration = $this->initial_end-$this->initial_start;
    if( !$this->interval ) $this->interval = 1;
    $count = 0;
    $delta_days = (int)gmdate('z',$this->initial_start);
    for( $t = strtotime( "-$delta_days days", $this->initial_start ); $t < $endstamp; 
	 $t = strtotime( '+'.$this->interval.' years', $t) ) {
      //myLog("t= ".gmdate("M d Y H:i:s",$t), RM_LOG_DEBUG );
      if( $this->type == 'yearday') {
	foreach( $this->daynumber as $dayno ) {
	  $tmp = strtotime( '+'.($dayno-1).' days', $t);
	  if( $this->initial_start <= $tmp && $tmp < $endstamp
	      && !$this->isExcluded( $tmp, $tmp+$duration) ) {
	    Horde::logMessage("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp)." -> "
		  .gmdate("D, M d Y H:i:s",$tmp+$duration), __FILE__, __LINE__, PEAR_LOG_DEBUG );
	    $this->setBusy( $tmp, null, $duration );
	  } else if($tmp >= $endstamp ) {
	    break;
	  }
	}
	$count++;
      } else if( $this->type == 'monthday' ) {
	for( $i = 0; $i < count($this->daynumber); $i++ ) {
	  $dayno = $this->daynumber[$i];
	  $month = $this->monthname2number($this->month[$i]);
	  $year = gmdate('Y', $t );
	  $time = gmdate('H:i:s', $t);
	  //myLog("setting tmp to $year-$month-$dayno $time+0000", RM_LOG_DEBUG );
	  $tmp =  strtotime( "$year-$month-$dayno $time+0000");
	  //myLog("tmp= ".gmdate("M d Y H:i:s",$tmp), RM_LOG_DEBUG );
	  if( $this->initial_start <= $tmp && $tmp < $endstamp 
	      && !$this->isExcluded( $tmp, $tmp+$duration) ) {
	    Horde::logMessage("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp)." -> "
		  .gmdate("D, M d Y H:i:s",$tmp+$duration), __FILE__, __LINE__, PEAR_LOG_DEBUG );
	    $this->setBusy( $tmp, null, $duration );	      
	  } else {
	    break;
	  }
	}
	$count++;	      
      } else if( $this->type == 'weekday' ) {
	for( $i = 0; $i < count($this->daynumber); $i++ ) {
	  $dayno = $this->daynumber[$i];
	  $wday  = $this->day[$i];
	  $month = $this->month[$i];
	  $year  = gmdate('Y',$t);
	  $time  = gmdate('H:i:s',$t);
	  $tmp = strtotime( "$dayno $wday", strtotime( "1 $month $year") );
	  $tmp = strtotime( gmdate('Y-m-d',$tmp)." $time+0000");
	  if( $this->initial_start <= $tmp && $tmp < $endstamp 
	      && !$this->isExcluded( $tmp, $tmp+$duration) ) {
	    Horde::logMessage("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp)." -> "
		  .gmdate("D, M d Y H:i:s",$tmp+$duration), __FILE__, __LINE__, PEAR_LOG_DEBUG );
	    $this->setBusy( $tmp, null, $duration );	      
	  } else {
	    break;
	  }
	}
	$count++;
      } 
      if( $this->range_type == 'number' && $count > $this->range ) {
	break;
      } else if( $this->range_type == 'date' && $t > strtotime( '+1 day',$this->range ) ) {
	break;
      }
    }
  }

  function dayname2number( $day ) {
    switch( strtolower($day) ) {
    case 'sunday': return 0;
    case 'monday': return 1;
    case 'tuesday': return 2;
    case 'wednesday': return 3;
    case 'thursday': return 4;
    case 'friday': return 5;
    case 'saturday': return 6;
    default:
      Horde::logMessage("Recurrence::dayname2number($day): Invalid day", __FILE__, __LINE__, PEAR_LOG_ERROR);
      return -1;
    }
  }

  function monthname2number( $month ) {
    switch( $month ) {
    case 'january':  return 1;
    case 'february': return 2;
    case 'march':    return 3;
    case 'april':    return 4;
    case 'may':      return 5;
    case 'june':     return 6;
    case 'july':     return 7;
    case 'august':   return 8;
    case 'september':return 9;
    case 'october':  return 10;
    case 'november': return 11;
    case 'december': return 12;
    default:
      Horde::logMessage("Recurrence::monthname2number($month): Invalid month", __FILE__, __LINE__, PEAR_LOG_ERROR);
      return -1;
    }
  }

  function isExcluded( $start, $end ) {
    $start = explode(' ', gmdate('Y m d', $start));
    $start = intval($start[0].$start[1].$start[2]);

    $end = explode(' ', gmdate('Y m d', $end));
    $end = intval($end[0].$end[1].$end[2]);
    
    foreach( $this->exclusion_dates as $e ) {
      if( $start <= $e && $end >= $e ) {
	Horde::logMessage("$start-$end excluded!", __FILE__, __LINE__, PEAR_LOG_DEBUG);	
	return true;
      }
    }
    return false;
  }

  var $initial_start   = NULL; // timestamp
  var $initial_end     = NULL; // timestamp
  var $cycle_type      = NULL; // string { 'daily', 'weekly', 'monthly', 'yearly' }
  var $type            = NULL; // string { 'daynumber', 'weekday', 'monthday', 'yearday' }
  var $interval        = NULL; // int
  var $daynumber       = NULL; // array(int)
  var $day             = NULL; // array(string)
  var $month           = NULL; // array(int)

  var $range_type      = NULL; // string { 'number', 'date' }
  var $range           = NULL; // int or timestamp

  var $exclusion_dates = array();

};
?>
Index: Resource.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Resource.php	9 Jun 2008 05:27:48 -0000	1.11
+++ Resource.php	11 Jul 2008 15:47:13 -0000	1.12
@@ -40,6 +40,8 @@
 require_once 'Horde/MIME/Part.php';
 require_once 'Horde/MIME/Structure.php';
 
+require_once 'Kolab/Filter/recurrence.class.php';
+
 require_once 'Horde/String.php';
 String::setDefaultCharset('utf-8');
 
@@ -73,35 +75,35 @@
 /* Recurrence implementation for looking for
    conflicts between an event and a freebusy list
 */
-// class ResmgrRecurrence extends Recurrence {
-//     function ResmgrRecurrence() { 
-//         $this->conflict = false;
-//     }
+ class ResmgrRecurrence extends Recurrence {
+     function ResmgrRecurrence() { 
+         $this->conflict = false;
+     }
 
-//     function setBusy( $start, $end, $duration ) {
-//         if( $this->conflict ) return;
-//         if( is_null($end) ) $end = $start + $duration;
-//         foreach ($this->busyperiods as $busyfrom => $busyto) {
-//             if ( in_array(base64_decode($this->extraparams[$busyfrom]['X-UID']), $this->ignore) ||
-//                  in_array(base64_decode($this->extraparams[$busyfrom]['X-SID']), $this->ignore) ) {
-//                 // Ignore
-//                 continue;
-//             }
-//             if (($busyfrom >= $start && $busyfrom < $end) || ($start >= $busyfrom && $start < $busyto)) {
-//                 Horde::logMessage('Request overlaps', __FILE__, __LINE__, PEAR_LOG_DEBUG);
-//                 $this->conflict = true;
-//                 break;
-//             }
-//         }
-//     }
+     function setBusy( $start, $end, $duration ) {
+         if( $this->conflict ) return;
+         if( is_null($end) ) $end = $start + $duration;
+         foreach ($this->busyperiods as $busyfrom => $busyto) {
+             if ( in_array(base64_decode($this->extraparams[$busyfrom]['X-UID']), $this->ignore) ||
+                  in_array(base64_decode($this->extraparams[$busyfrom]['X-SID']), $this->ignore) ) {
+                 // Ignore
+                 continue;
+             }
+             if (($busyfrom >= $start && $busyfrom < $end) || ($start >= $busyfrom && $start < $busyto)) {
+                 Horde::logMessage('Request overlaps', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+                 $this->conflict = true;
+                 break;
+             }
+         }
+     }
 
-//     function hasConflict() { return $this->conflict; }
+     function hasConflict() { return $this->conflict; }
 
-//     var $busyperiods;
-//     var $extraparams;
-//     var $ignore;
-//     var $conflict;
-// };
+     var $busyperiods;
+     var $extraparams;
+    var $ignore;
+     var $conflict;
+ };
 
 function imapClose()
 {
@@ -353,7 +355,8 @@
     }
     
     // No iCal found
-    return false;
+    $ical = false;
+    return $ical;
 }
 
 /** Helper function */



From cvs at kolab.org  Fri Jul 11 17:47:16 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 17:47:16 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.18,
	1.19 package.xml.in, 1.6, 1.7 
Message-ID: <20080711154716.12706600B9A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog package.xml.in 
Log Message:
kolab/issue2745 (php error after sending an update to an event)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	15 Apr 2008 15:39:51 -0000	1.18
+++ ChangeLog	11 Jul 2008 15:47:13 -0000	1.19
@@ -1,3 +1,8 @@
+2008-07-11  Gunnar Wrobel  <p at rdus.de>
+
+	* Filter/recurrence.class.php:
+	kolab/issue2745 (php error after sending an update to an event)
+
 2008-04-15  Sascha Wilde  <wilde at intevation.de>
 
 	* Filter/Content.php (match_ip): Fixed warning when IPs without

Index: package.xml.in
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.xml.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package.xml.in	27 Nov 2007 15:31:44 -0000	1.6
+++ package.xml.in	11 Jul 2008 15:47:13 -0000	1.7
@@ -94,6 +94,7 @@
      <file name="Content.php" role="php" />
      <file name="Outlook.php" role="php" />
      <file name="Resource.php" role="php" />
+     <file name="recurrence.class.php" role="php" />
      <file name="Transport.php" role="php" />
    </dir> <!-- /Filter -->
   </dir> <!-- / -->



From cvs at kolab.org  Fri Jul 11 18:17:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 18:17:46 +0200 (CEST)
Subject: thomas: server/pear/PEAR-Net_IMAP ChangeLog, 1.2, 1.3 Makefile, 1.3,
	1.4 PEAR-Net_IMAP.spec, 1.2, 1.3 echo.patch, 1.2, NONE 
Message-ID: <20080711161746.C581560016F@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/pear/PEAR-Net_IMAP
In directory doto:/tmp/cvs-serv1255

Modified Files:
	ChangeLog Makefile PEAR-Net_IMAP.spec 
Removed Files:
	echo.patch 
Log Message:
Reverted non-functional and unneeded echo patch (kolab/issue2745)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_IMAP/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	13 Jun 2008 12:09:59 -0000	1.2
+++ ChangeLog	11 Jul 2008 16:17:44 -0000	1.3
@@ -1,8 +1,3 @@
-2008-06-13  Gunnar Wrobel  <p at rdus.de>
-
-	* PEAR-Net_IMAP.spec (Source): Added a potential patch for
-	kolab/issue2745.
-
 2007-08-08  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Net_IMAP.spec: Added package to Kolab CVS.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_IMAP/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	13 Jun 2008 12:09:59 -0000	1.3
+++ Makefile	11 Jul 2008 16:17:44 -0000	1.4
@@ -18,8 +18,6 @@
 
 SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
 
-PATCHES=echo.patch
-
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
@@ -38,7 +36,6 @@
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 

Index: PEAR-Net_IMAP.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_IMAP/PEAR-Net_IMAP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Net_IMAP.spec	13 Jun 2008 12:09:59 -0000	1.2
+++ PEAR-Net_IMAP.spec	11 Jul 2008 16:17:44 -0000	1.3
@@ -2,7 +2,7 @@
 %define         V_pear_name Net_IMAP
 %define         V_package PEAR-%{V_pear_name}
 %define         V_version 1.1.0beta1
-%define         V_release 2
+%define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
@@ -18,9 +18,6 @@
 # List of Sources
 Source:    http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
 
-# List of Patches
-Patch0:    echo.patch
-
 # Build Info
 Prefix:	   %{l_prefix}
 BuildRoot: %{l_buildroot}
@@ -39,8 +36,6 @@
 
 %prep
 	%setup -n %{V_pear_name}-%{V_version}
-
-	%patch -p0 -P 0
 
 %build
 

--- echo.patch DELETED ---



From cvs at kolab.org  Fri Jul 11 18:25:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 18:25:41 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.294,1.295 
Message-ID: <20080711162541.084B2600B9B@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated and repaired release notes:
No new PEAR package is needed, because issue2760 was fixed in perl-kolab.
issue2745 is really issue2660 and is fixed in php-kolab.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- release-notes.txt	10 Jul 2008 12:57:31 -0000	1.294
+++ release-notes.txt	11 Jul 2008 16:25:38 -0000	1.295
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080710, Kolab Server 2.2.0)
+(Version 20080711, Kolab Server 2.2.0)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -155,20 +155,16 @@
 	                 fax-/phonenumbers despite the description
 	                 in the error)
 
-    - PEAR-Net_IMAP-1.1.0beta1-2
-
-	kolab/issue2745 (php error after sending an update to an event)
-	kolab/issue2760 (Deleting shared folders does not work)
-
     - perl-kolab-2.2.0-20080709
 
 	Adjusted version number.
 
 	kolab/issue2517 (group accounts lead to more rights than necessary for
 	                 the "calendar" user)
+	kolab/issue2760 (Deleting shared folders does not work)
 	kolab/issue2827 (Deleting users does not work reliably)
 
-    - php-kolab-2.2.0-20080709
+    - php-kolab-2.2.0-20080711
 
 	Adjusted version number.
 
@@ -183,7 +179,6 @@
 
       Updated:
 
-	PEAR-Net_IMAP-1.1.0beta1-2
 	fbview-horde-3.2_rc3-20080605
 	fbview-kronolith-2.2_rc2-20080710
 	horde-imp-kolab-4.2_rc3-20080710
@@ -200,7 +195,7 @@
 	kolabconf-2.2.0-20080709
 	kolabd-2.2.0-20080709
 	perl-kolab-2.2.0-20080709
-	php-kolab-2.2.0-20080709
+	php-kolab-2.2.0-20080711
 
       Unchanged:
 
@@ -210,6 +205,7 @@
 	PEAR-Log-1.9.9-1
 	PEAR-Mail-1.1.14-1
 	PEAR-Mail_Mime-1.3.1-1
+	PEAR-Net_IMAP-1.1.0beta1-1
 	PEAR-Net_LMTP-1.0.1-1
 	PEAR-Net_SMTP-1.2.10-1
 	PEAR-Net_Sieve-1.1.5-1



From cvs at kolab.org  Fri Jul 11 21:12:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 Jul 2008 21:12:46 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.152,1.153 
Message-ID: <20080711191246.9C35E600169@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Kolab Server 2.2.0


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- index.html.m4	11 Jul 2008 10:12:52 -0000	1.152
+++ index.html.m4	11 Jul 2008 19:12:44 -0000	1.153
@@ -61,6 +61,23 @@
 
 
 <table>
+<tr><td class="newsd">July 11th, 2008</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.2.0 Final Release
+</td></tr>
+</table>
+<div class="newsb">
+  Source and binary packages for Kolab Server 2.2.0
+  are available from the <a href="mirrors.html">download mirrors</a>.
+  <br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2008/000074.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">July 9th, 2008</td>
 <td class="newsh">&raquo;
   Kolab integrates mobile devices via SyncML



From cvs at kolab.org  Tue Jul 15 18:23:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 15 Jul 2008 18:23:01 +0200 (CEST)
Subject: thomas: doc/www/src roadmap.html.m4,1.16,1.17 
Message-ID: <20080715162301.E69B2600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	roadmap.html.m4 
Log Message:
Updated server roadmap


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- roadmap.html.m4	10 Jul 2008 06:49:05 -0000	1.16
+++ roadmap.html.m4	15 Jul 2008 16:22:59 -0000	1.17
@@ -74,30 +74,27 @@
 <!--Kolab Server-->
 <h2 style="clear: left; padding-top: 55px;">Kolab Server 2.2</h2>
 <div class="logo-left"></div>
-<div class="logo-text-right">    
+<div class="logo-text-right">
 <h3>Kolab Server 2.2 series</h3>
-At time of writing we are issuing release candidates for this series,
-with some people already running it in production. Current is 2.2-rc3.
-
 Major improvements over Server 2.1:
 <ul>
 <li>Update to a new OpenPKG version.</li>
-<li>Integration of new upstream versions (with many of the kolab patches 
+<li>Integration of new upstream versions (with many of the kolab patches
 integrated).</li>
-<li>Re-engineerd Horde-based web client as modular add-on package for the Kolab 
+<li>Re-engineered Horde-based web client as modular add-on package for the Kolab
 Server/OpenPKG version.</li>
 <li>More complete support for 64 bit architectures.</li>
-<li>Implementation of new concept for extended freebusy list which is
-good for the teamleader overview usecase.</li>
+<li>Implementation of new concept for extended free/busy list which is
+good for the team leader overview use case.</li>
 </ul>
-Planned was 2.2 final release in June 2008.
+2.2.0 final was released in July 2008.
 <p>
-Release 2.2.1 is envisoned for Q4 2008 or earlier. It is likely to
-have one release candidate before that. Planned improvements include
+Release 2.2.1 is envisioned for Q4 2008 or earlier. It will have at least
+one release candidate before that. Planned improvements include
 adding the SyncML improvements to Horde.
 
 <h3>Kolab Server 2.1 release series</h3>
-Current is 2.1.0 Final. No further releases planned. 
+Current is 2.1.0 Final. No further releases planned.
 </div>
 
 m4_include(footer.html.m4)



From cvs at kolab.org  Wed Jul 16 12:57:30 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 12:57:30 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.295,1.296 
Message-ID: <20080716105730.66583600B91@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Upgrading from Kolab server 2.1 is documented


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- release-notes.txt	11 Jul 2008 16:25:38 -0000	1.295
+++ release-notes.txt	16 Jul 2008 10:57:25 -0000	1.296
@@ -4,7 +4,6 @@
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
-Upgrading from Kolab server 2.1 is not yet documented.
 
 
 Differences between Kolab 2.1 and 2.2:



From cvs at kolab.org  Wed Jul 16 13:00:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 13:00:41 +0200 (CEST)
Subject: thomas: server/kolab-freebusy Makefile,1.17,1.18 
Message-ID: <20080716110041.090B1600BA9@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv10548/kolab-freebusy

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2.0+cvs


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	9 Jul 2008 15:07:04 -0000	1.17
+++ Makefile	16 Jul 2008 11:00:39 -0000	1.18
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 
 VERSION = 2.2.0
-CVS = 0
+CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Wed Jul 16 13:00:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 13:00:41 +0200 (CEST)
Subject: thomas: server README.1st, 1.90, 1.91 install-kolab.sh, 1.41,
	1.42 release-notes.txt, 1.296, 1.297 
Message-ID: <20080716110041.13251600BAB@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st install-kolab.sh release-notes.txt 
Log Message:
Bumped version numbers to 2.2.0+cvs


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- README.1st	10 Jul 2008 12:41:32 -0000	1.90
+++ README.1st	16 Jul 2008 11:00:38 -0000	1.91
@@ -152,6 +152,12 @@
 too.
 
 
+Upgrade from 2.2.0 to 2.2.1-rc1
+-------------------------------
+
+Nothing special has to be done for this upgrade.
+
+
 Upgrade from 2.2-rc3 to 2.2.0
 -----------------------------
 

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- install-kolab.sh	9 Jul 2008 20:58:25 -0000	1.41
+++ install-kolab.sh	16 Jul 2008 11:00:38 -0000	1.42
@@ -12,7 +12,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2.0"
+KOLAB_VERSION="2.2.0+cvs"
 KID="19414"
 
 TAG="kolab"

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- release-notes.txt	16 Jul 2008 10:57:25 -0000	1.296
+++ release-notes.txt	16 Jul 2008 11:00:38 -0000	1.297
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080711, Kolab Server 2.2.0)
+(Version 2008????, Kolab Server 2.2.0+cvs)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -41,6 +41,11 @@
 	issues found in earlier versions. Additionally all software
 	components have been upgraded to new upstream versions.
 	The specifics are described below.
+
+
+Changes between 2.2.0 and 2.2.1-rc-1
+
+    - ???
 
 
 Changes between 2.2-rc-3 and 2.2.0



From cvs at kolab.org  Wed Jul 16 13:00:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 13:00:41 +0200 (CEST)
Subject: thomas: server/kolabconf Makefile.PL,1.24,1.25 
Message-ID: <20080716110041.0CBAF600BAA@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile.PL 
Log Message:
Bumped version numbers to 2.2.0+cvs


Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.PL	9 Jul 2008 15:07:04 -0000	1.24
+++ Makefile.PL	16 Jul 2008 11:00:39 -0000	1.25
@@ -12,7 +12,7 @@
 my $KOLAB_BASE_VERSION = "2.2.0";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 0;
+my $KOLAB_CVS = 1;
 
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Wed Jul 16 13:00:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 13:00:41 +0200 (CEST)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.20,1.21 
Message-ID: <20080716110041.1FFD9600BA6@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Bumped version numbers to 2.2.0+cvs


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Kolab.pm	9 Jul 2008 15:07:04 -0000	1.20
+++ Kolab.pm	16 Jul 2008 11:00:39 -0000	1.21
@@ -62,7 +62,7 @@
 our $KOLAB_BASE_VERSION = "2.2.0";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 0;
+my $KOLAB_CVS = 1;
 
 our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Wed Jul 16 13:00:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 13:00:41 +0200 (CEST)
Subject: thomas: server/php-kolab Makefile,1.23,1.24 
Message-ID: <20080716110041.21654600BA9@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2.0+cvs


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	9 Jul 2008 15:07:04 -0000	1.23
+++ Makefile	16 Jul 2008 11:00:39 -0000	1.24
@@ -5,7 +5,7 @@
 VERSION = 2.2.0
 #PRERELEASE = rc
 #PRERELEASE_VERSION = 3
-CVS = 0
+CVS = 1
 
 ifeq "x$(PRERELEASE)" "x"
   ifeq "x$(CVS)" "x0"



From cvs at kolab.org  Wed Jul 16 13:00:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 16 Jul 2008 13:00:41 +0200 (CEST)
Subject: thomas: server/kolab-filter Makefile,1.16,1.17 
Message-ID: <20080716110041.0557C600BA6@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv10548/kolab-filter

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2.0+cvs


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	9 Jul 2008 15:07:04 -0000	1.16
+++ Makefile	16 Jul 2008 11:00:39 -0000	1.17
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 
 VERSION = 2.2.0
-CVS = 0
+CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Thu Jul 17 10:59:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 10:59:10 +0200 (CEST)
Subject: richard: server/perl-kolab/lib/Kolab/LDAP/Backend syncrepl.pm, NONE,
	1.1 
Message-ID: <20080717085910.C0DCC600B96@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend
In directory doto:/tmp/cvs-serv19897/lib/Kolab/LDAP/Backend

Added Files:
	syncrepl.pm 
Log Message:
Add syncrepl support, needed to support openldap-2.4.x and beyond.
See kolab/issue1755
https://www.intevation.de/roundup/kolab/issue1755



--- NEW FILE: syncrepl.pm ---
package Kolab::LDAP::Backend::syncrepl;

##
##  Copyright (c) 2008  Mathieu Parent <math.parent at gmail.com>
##
##  This  program is free  software; you can redistribute  it and/or
##  modify it  under the terms of the GNU  General Public License as
##  published by the  Free Software Foundation; either version 2, or
##  (at your option) any later version.
##
##  This program is  distributed in the hope that it will be useful,
##  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
##  General Public License for more details.
##
##  You can view the  GNU General Public License, online, at the GNU
##  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
##
use 5.008;
use strict;
use warnings;
use Kolab;
use Kolab::LDAP;
use Net::LDAP;
use Net::LDAP::Control;
use Net::LDAP::Entry;
use vars qw($ldap $cookie $disconnected);
my $cookie = '';
my $disconnected = 1;

require Exporter;

our @ISA = qw(Exporter);

our %EXPORT_TAGS = (
    'all' => [ qw(
    &startup
    &run
    ) ]
);

our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );

our @EXPORT = qw(
    
);

our $VERSION = '0.1';

# LDAP Content Synchronization Operation -- RFC 4533
use constant LDAP_SYNC_OID => "1.3.6.1.4.1.4203.1.9.1";
use constant {
	LDAP_CONTROL_SYNC => LDAP_SYNC_OID.".1",
	LDAP_CONTROL_SYNC_STATE => LDAP_SYNC_OID.".2",
	LDAP_CONTROL_SYNC_DONE => LDAP_SYNC_OID.".3",
	LDAP_SYNC_INFO => LDAP_SYNC_OID.".4",

	LDAP_SYNC_NONE => 0x00,
	LDAP_SYNC_REFRESH_ONLY => 0x01,
	LDAP_SYNC_RESERVED => 0x02,
	LDAP_SYNC_REFRESH_AND_PERSIST => 0x03,

	LDAP_SYNC_REFRESH_PRESENTS => 0,
	LDAP_SYNC_REFRESH_DELETES => 1,

	LDAP_TAG_SYNC_NEW_COOKIE => 0x80,
	LDAP_TAG_SYNC_REFRESH_DELETE => 0xa1,
	LDAP_TAG_SYNC_REFRESH_PRESENT => 0xa2,
	LDAP_TAG_SYNC_ID_SET => 0xa3,

	LDAP_TAG_SYNC_COOKIE => 0x04,
	LDAP_TAG_REFRESHDELETES => 0x01,
	LDAP_TAG_REFRESHDONE => 0x01,
	LDAP_TAG_RELOAD_HINT => 0x01,

	LDAP_SYNC_PRESENT => 0,
	LDAP_SYNC_ADD => 1,
	LDAP_SYNC_MODIFY => 2,
	LDAP_SYNC_DELETE => 3,
};

use Convert::ASN1;
use Data::Dumper;

my $asn = Convert::ASN1->new;

$asn->prepare(<<'LDAP_ASN') or die $asn->error;
syncUUID ::= OCTET STRING -- (SIZE(16))

syncCookie ::= OCTET STRING

syncRequestValue ::= SEQUENCE {
    mode ENUMERATED {
        -- 0 unused
        refreshOnly       (1),
        -- 2 reserved
        refreshAndPersist (3)
    }
    cookie     syncCookie OPTIONAL,
    reloadHint BOOLEAN -- DEFAULT FALSE
}

syncStateValue ::= SEQUENCE {
    state ENUMERATED {
        present (0),
        add (1),
        modify (2),
        delete (3)
    }
    entryUUID syncUUID,
    cookie    syncCookie OPTIONAL
}

syncDoneValue ::= SEQUENCE {
    cookie          syncCookie OPTIONAL,
    refreshDeletes  BOOLEAN -- DEFAULT FALSE
}

syncInfoValue ::= CHOICE {
      newcookie      [0] syncCookie,
      refreshDelete  [1] SEQUENCE {
          refreshDeleteCookie         syncCookie OPTIONAL,
          refreshDeleteDone    BOOLEAN -- DEFAULT TRUE
      }
      refreshPresent [2] SEQUENCE {
          refreshDeletecookie         syncCookie OPTIONAL,
          refreshDeleteDone    BOOLEAN -- DEFAULT TRUE
      }
      syncIdSet      [3] SEQUENCE {
          cookie         syncCookie OPTIONAL,
          refreshDeletes BOOLEAN, -- DEFAULT FALSE
          syncUUIDs      SET OF syncUUID
      }
}

LDAP_ASN


sub startup { 1; }

sub shutdown
{
  Kolab::log('SYNC', 'Shutting down');
  exit(0);
}

sub abort
{
    Kolab::log('SYNC', 'Aborting');
    exit(1);
}

sub run {
  # This should be called from a separate thread, as we set our
  # own interrupt handlers here

  $SIG{'INT'} = \&shutdown;
  $SIG{'TERM'} = \&shutdown;

  END {
    alarm 0;
    Kolab::LDAP::destroy($ldap);
  }
  my $mesg;

  while (1) {
    Kolab::log('SYNC', 'Creating LDAP connection to LDAP server', KOLAB_DEBUG);

    $ldap = Kolab::LDAP::create($Kolab::config{'user_ldap_ip'},
                                $Kolab::config{'user_ldap_port'},
                                $Kolab::config{'user_bind_dn'},
                                $Kolab::config{'user_bind_pw'},
                                1
                               );
    if (!$ldap) {
        Kolab::log('SYNC', 'Sleeping 5 seconds...');
        sleep 5;
        next;
    }
    $disconnected = 0;  

    Kolab::log('SYNC', 'LDAP connection established', KOLAB_DEBUG);

    Kolab::LDAP::ensureAsync($ldap);
    Kolab::log('SYNC', 'Async checked', KOLAB_DEBUG);

    Kolab::log('SYNC', "Cookie: $cookie", KOLAB_DEBUG);

    while($ldap and not $disconnected) {
	    #sync control
      my $asn_syncRequestValue = $asn->find('syncRequestValue');
	    my $ctrl = Net::LDAP::Control->new(type  => LDAP_CONTROL_SYNC, 
		                                     value => $asn_syncRequestValue->encode(mode       => LDAP_SYNC_REFRESH_ONLY,
                                                                                cookie     => $cookie,
                                                                                reloadHint => 0
                                                                               ),
                                         critical   => 0
	                                      );
      Kolab::log('SYNC', 'Control created', KOLAB_DEBUG);
    
	    #search
	    my $mesg = $ldap->search(base     => $Kolab::config{'base_dn'},
                               scope    => 'sub',
                               control  => [ $ctrl ],
                               callback => \&searchCallback, # call for each entry
                               filter   => "(objectClass=*)",
                               attrs    => [ '*',
                                             $Kolab::config{'user_field_guid'},
                                             $Kolab::config{'user_field_modified'},
                                             $Kolab::config{'user_field_quota'},
                                             $Kolab::config{'user_field_deleted'},
                                           ],
				                      );
      Kolab::log('SYNC', 'Search created', KOLAB_DEBUG);
      $mesg->sync;
      Kolab::log('SYNC', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
      sleep 10;
    }
  }
  1;
}

#search callback
sub searchCallback {
  my $mesg = shift;
  my $entry = shift;
  my $issearch = $mesg->isa("Net::LDAP::Search");
  my @controls = $mesg->control;
  if(not $issearch) {
    Kolab::log('SYNC', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
    if ($mesg->code == 88) {
        Kolab::log('SYNC', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
        return;
    } elsif ($mesg->code) {
        Kolab::log('SYNC', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
        &abort;
    }   
  } elsif(@controls == 0) {
    if ($mesg->code == 1) {
        Kolab::log('SYNC', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
        $disconnected = 1;
        return;
    } elsif ($mesg->code) {
      Kolab::log('SYNC', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
        &abort;
    }   
  } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
    Kolab::log('SYNC', 'Received Sync State Control', KOLAB_DEBUG);
    Kolab::log('SYNC', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
  } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
    Kolab::log('SYNC', 'Received Sync Done Control', KOLAB_DEBUG);
    my $asn_syncDoneValue = $asn->find('syncDoneValue');
    my $out = $asn_syncDoneValue->decode($controls[0]->value);
	  #we have a new cookie
	  if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
		  $cookie = $out->{cookie};
		  Kolab::log('SYNC', "New cookie: $cookie", KOLAB_DEBUG);
      Kolab::log('SYNC', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
      Kolab::LDAP::sync;
      system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
      Kolab::log('SYNC', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
      sleep 1; # we get too many bogus change notifications!
	  } 
  } else {
    Kolab::log('SYNC', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
  }
  return 0;
}

1;
__END__

=head1 NAME

Kolab::LDAP::Backend::sync - Perl extension for RFC 4533 compliant LDAP server backend

=head1 ABSTRACT

  Kolab::LDAP::Backend::sync handles OpenLDAP backend to the kolab daemon.

=head1 AUTHOR

Mathieu Parent <math.parent at gmail.com>

=head1 COPYRIGHT AND LICENSE

Copyright (c) 2008  Mathieu Parent <math.parent at gmail.com>


This  program is free  software; you can redistribute  it and/or
modify it  under the terms of the GNU  General Public License as
published by the  Free Software Foundation; either version 2, or
(at your option) any later version.

This program is  distributed in the hope that it will be useful,
but WITHOUT  ANY WARRANTY; without even the  implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.

You can view the  GNU General Public License, online, at the GNU
Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.

=head1 NOTES
We use refreshOnly mode as refreshAndPersist mode uses LDAP Intermediate
Response Messages [RFC4511] that are not supported by current Net::LDAP.

However (quoting from RFC, page 21):

   The server SHOULD transfer a new cookie frequently to avoid having to
   transfer information already provided to the client.  Even where DIT
   changes do not cause content synchronization changes to be
   transferred, it may be advantageous to provide a new cookie using a
   Sync Info Message.  However, the server SHOULD avoid overloading the
   client or network with Sync Info Messages.



=cut



From cvs at kolab.org  Thu Jul 17 10:59:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 10:59:10 +0200 (CEST)
Subject: richard: server/perl-kolab/lib Kolab.pm,1.21,1.22 
Message-ID: <20080717085910.C0120600B95@lists.intevation.de>

Author: richard

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

Modified Files:
	Kolab.pm 
Log Message:
Add syncrepl support, needed to support openldap-2.4.x and beyond.
See kolab/issue1755
https://www.intevation.de/roundup/kolab/issue1755



Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Kolab.pm	16 Jul 2008 11:00:39 -0000	1.21
+++ Kolab.pm	17 Jul 2008 08:59:08 -0000	1.22
@@ -268,7 +268,10 @@
     #   interface, that is).
     #
     #   Currently supported backends:
-    #     `ad' - Active Directory
+    #     syncrepl: for openldap-2.4.x and beyond
+    #     fds: Fedora S?
+    #     slurpd: for openldap-2.3.x or prior versions
+    #     ad: Active Directory
     $config{'directory_mode'} = 'slurpd' if (!exists $config{'directory_mode'});
 
     # `conn_refresh_period' specifies how many minutes to wait before forceably



From cvs at kolab.org  Thu Jul 17 10:59:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 10:59:10 +0200 (CEST)
Subject: richard: server/perl-kolab ChangeLog,1.37,1.38 
Message-ID: <20080717085910.B9AF3600B91@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Add syncrepl support, needed to support openldap-2.4.x and beyond.
See kolab/issue1755
https://www.intevation.de/roundup/kolab/issue1755



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ChangeLog	9 Jul 2008 14:00:15 -0000	1.37
+++ ChangeLog	17 Jul 2008 08:59:08 -0000	1.38
@@ -1,3 +1,9 @@
+2008-07-17  Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/LDAP/Backend/syncrepl.pm: add kolab/issue1755 
+	* MANIFEST: added the file lib/Kolab/LDAP/Backend/syncrepl.pm
+	* lib/Kolab.pm: added supported backend types
+
 2008-07-09  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* lib/Kolab/LDAP.pm (createObject): kolab/issue2517 (group accounts
@@ -135,7 +141,7 @@
 2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
-          directory that holds the php.ini file to be used.
+	  directory that holds the php.ini file to be used.
 
 2006-01-15 Richard Bos <richard at radoeka.nl>
 	* Kolab-Conf/Conf.pm.in: use the new variable sasl_authdconffile
@@ -189,9 +195,9 @@
 	  autotools from autoperl. See issue1038
 
 2005-12-19 Richard Bos <richard at radoeka.nl>
-        * configure.ac: added no-dist-gzip to AM_INIT_AUTOMAKE
-        * Makefile.cvs: reflected change in configure.ac, to create only bzipped
-          tarbals.  Changed 'make dist' into 'make distcheck'
+	* configure.ac: added no-dist-gzip to AM_INIT_AUTOMAKE
+	* Makefile.cvs: reflected change in configure.ac, to create only bzipped
+	  tarbals.  Changed 'make dist' into 'make distcheck'
 
 2005-12-17 Richard Bos <richard at radoeka.nl>
 	* dist_conf/gentoo, dist_conf/kolab: removed, they are



From cvs at kolab.org  Thu Jul 17 11:13:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 11:13:01 +0200 (CEST)
Subject: richard: server/perl-kolab MANIFEST,1.3,1.4 
Message-ID: <20080717091301.4A5B9600B95@lists.intevation.de>

Author: richard

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

Modified Files:
	MANIFEST 
Log Message:
Add syncrepl support, needed to support openldap-2.4.x and beyond.
See kolab/issue1755
https://www.intevation.de/roundup/kolab/issue1755



Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MANIFEST	28 Mar 2008 12:12:27 -0000	1.3
+++ MANIFEST	17 Jul 2008 09:12:59 -0000	1.4
@@ -7,6 +7,7 @@
 lib/Kolab/LDAP/Backend.pm
 lib/Kolab/LDAP/Backend/ad.pm
 lib/Kolab/LDAP/Backend/slurpd.pm
+lib/Kolab/LDAP/Backend/syncrepl.pm
 lib/Kolab/LDAP/Backend/fds.pm
 lib/Kolab/Util.pm
 Makefile.PL



From cvs at kolab.org  Thu Jul 17 11:55:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 11:55:48 +0200 (CEST)
Subject: richard: server/perl-kolab/lib/Kolab/LDAP/Backend syncrepl.pm, 1.1,
	1.2 
Message-ID: <20080717095548.6ABB7600BA7@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend
In directory doto:/tmp/cvs-serv21993

Modified Files:
	syncrepl.pm 
Log Message:
Change the log marker 'SYNC' to 'SYNCREPL' to better reflect the
actual module name.



Index: syncrepl.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend/syncrepl.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- syncrepl.pm	17 Jul 2008 08:59:08 -0000	1.1
+++ syncrepl.pm	17 Jul 2008 09:55:46 -0000	1.2
@@ -140,13 +140,13 @@
 
 sub shutdown
 {
-  Kolab::log('SYNC', 'Shutting down');
+  Kolab::log('SYNCREPL', 'Shutting down');
   exit(0);
 }
 
 sub abort
 {
-    Kolab::log('SYNC', 'Aborting');
+    Kolab::log('SYNCREPL', 'Aborting');
     exit(1);
 }
 
@@ -164,7 +164,7 @@
   my $mesg;
 
   while (1) {
-    Kolab::log('SYNC', 'Creating LDAP connection to LDAP server', KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'Creating LDAP connection to LDAP server', KOLAB_DEBUG);
 
     $ldap = Kolab::LDAP::create($Kolab::config{'user_ldap_ip'},
                                 $Kolab::config{'user_ldap_port'},
@@ -173,18 +173,18 @@
                                 1
                                );
     if (!$ldap) {
-        Kolab::log('SYNC', 'Sleeping 5 seconds...');
+        Kolab::log('SYNCREPL', 'Sleeping 5 seconds...');
         sleep 5;
         next;
     }
     $disconnected = 0;  
 
-    Kolab::log('SYNC', 'LDAP connection established', KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'LDAP connection established', KOLAB_DEBUG);
 
     Kolab::LDAP::ensureAsync($ldap);
-    Kolab::log('SYNC', 'Async checked', KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'Async checked', KOLAB_DEBUG);
 
-    Kolab::log('SYNC', "Cookie: $cookie", KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', "Cookie: $cookie", KOLAB_DEBUG);
 
     while($ldap and not $disconnected) {
 	    #sync control
@@ -196,7 +196,7 @@
                                                                                ),
                                          critical   => 0
 	                                      );
-      Kolab::log('SYNC', 'Control created', KOLAB_DEBUG);
+      Kolab::log('SYNCREPL', 'Control created', KOLAB_DEBUG);
     
 	    #search
 	    my $mesg = $ldap->search(base     => $Kolab::config{'base_dn'},
@@ -211,9 +211,9 @@
                                              $Kolab::config{'user_field_deleted'},
                                            ],
 				                      );
-      Kolab::log('SYNC', 'Search created', KOLAB_DEBUG);
+      Kolab::log('SYNCREPL', 'Search created', KOLAB_DEBUG);
       $mesg->sync;
-      Kolab::log('SYNC', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
+      Kolab::log('SYNCREPL', "Finished Net::LDAP::Search::sync sleeping 10s", KOLAB_DEBUG);
       sleep 10;
     }
   }
@@ -227,42 +227,42 @@
   my $issearch = $mesg->isa("Net::LDAP::Search");
   my @controls = $mesg->control;
   if(not $issearch) {
-    Kolab::log('SYNC', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
     if ($mesg->code == 88) {
-        Kolab::log('SYNC', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
+        Kolab::log('SYNCREPL', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
         return;
     } elsif ($mesg->code) {
-        Kolab::log('SYNC', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
+        Kolab::log('SYNCREPL', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
         &abort;
     }   
   } elsif(@controls == 0) {
     if ($mesg->code == 1) {
-        Kolab::log('SYNC', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
+        Kolab::log('SYNCREPL', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
         $disconnected = 1;
         return;
     } elsif ($mesg->code) {
-      Kolab::log('SYNC', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
+      Kolab::log('SYNCREPL', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
         &abort;
     }   
   } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
-    Kolab::log('SYNC', 'Received Sync State Control', KOLAB_DEBUG);
-    Kolab::log('SYNC', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'Received Sync State Control', KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
   } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
-    Kolab::log('SYNC', 'Received Sync Done Control', KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'Received Sync Done Control', KOLAB_DEBUG);
     my $asn_syncDoneValue = $asn->find('syncDoneValue');
     my $out = $asn_syncDoneValue->decode($controls[0]->value);
 	  #we have a new cookie
 	  if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
 		  $cookie = $out->{cookie};
-		  Kolab::log('SYNC', "New cookie: $cookie", KOLAB_DEBUG);
-      Kolab::log('SYNC', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
+		  Kolab::log('SYNCREPL', "New cookie: $cookie", KOLAB_DEBUG);
+      Kolab::log('SYNCREPL', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
       Kolab::LDAP::sync;
       system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
-      Kolab::log('SYNC', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
+      Kolab::log('SYNCREPL', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
       sleep 1; # we get too many bogus change notifications!
 	  } 
   } else {
-    Kolab::log('SYNC', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
+    Kolab::log('SYNCREPL', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
   }
   return 0;
 }



From cvs at kolab.org  Thu Jul 17 12:01:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 12:01:12 +0200 (CEST)
Subject: richard: server/perl-kolab/lib/Kolab/LDAP/Backend syncrepl.pm, 1.2,
	1.3 
Message-ID: <20080717100112.49FDC600BA7@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend
In directory doto:/tmp/cvs-serv22173

Modified Files:
	syncrepl.pm 
Log Message:
reflect the module name change from sync to syncrepl in the
documentation part of the module



Index: syncrepl.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend/syncrepl.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- syncrepl.pm	17 Jul 2008 09:55:46 -0000	1.2
+++ syncrepl.pm	17 Jul 2008 10:01:10 -0000	1.3
@@ -272,11 +272,11 @@
 
 =head1 NAME
 
-Kolab::LDAP::Backend::sync - Perl extension for RFC 4533 compliant LDAP server backend
+Kolab::LDAP::Backend::syncrepl - Perl extension for RFC 4533 compliant LDAP server backend
 
 =head1 ABSTRACT
 
-  Kolab::LDAP::Backend::sync handles OpenLDAP backend to the kolab daemon.
+  Kolab::LDAP::Backend::syncrepl handles OpenLDAP backend to the kolab daemon.
 
 =head1 AUTHOR
 



From cvs at kolab.org  Thu Jul 17 13:02:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 13:02:20 +0200 (CEST)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.22,1.23 
Message-ID: <20080717110220.E51BE600B91@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Corrected list of supported directory backends


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Kolab.pm	17 Jul 2008 08:59:08 -0000	1.22
+++ Kolab.pm	17 Jul 2008 11:02:18 -0000	1.23
@@ -268,10 +268,10 @@
     #   interface, that is).
     #
     #   Currently supported backends:
-    #     syncrepl: for openldap-2.4.x and beyond
-    #     fds: Fedora S?
-    #     slurpd: for openldap-2.3.x or prior versions
-    #     ad: Active Directory
+    #     slurpd: for OpenLDAP 2.3.x and prior versions
+    #     syncrepl: for OpenLDAP 2.3.x and beyond
+    #     fds: Fedora Directory Server
+    #     ad: Microsoft Active Directory
     $config{'directory_mode'} = 'slurpd' if (!exists $config{'directory_mode'});
 
     # `conn_refresh_period' specifies how many minutes to wait before forceably



From cvs at kolab.org  Thu Jul 17 13:02:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 Jul 2008 13:02:34 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.297,1.298 
Message-ID: <20080717110234.89014600B95@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- release-notes.txt	16 Jul 2008 11:00:38 -0000	1.297
+++ release-notes.txt	17 Jul 2008 11:02:32 -0000	1.298
@@ -45,7 +45,9 @@
 
 Changes between 2.2.0 and 2.2.1-rc-1
 
-    - ???
+    - perl-kolab-2.2.1-rc1-2008????
+
+	Added syncrepl backend (inactive by default)
 
 
 Changes between 2.2-rc-3 and 2.2.0



From cvs at kolab.org  Sat Jul 19 09:21:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 19 Jul 2008 09:21:54 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.298,1.299 
Message-ID: <20080719072154.50A67600BBA@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.

Reported on kolab-users by Uwe Galle


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- release-notes.txt	17 Jul 2008 11:02:32 -0000	1.298
+++ release-notes.txt	19 Jul 2008 07:21:52 -0000	1.299
@@ -45,9 +45,13 @@
 
 Changes between 2.2.0 and 2.2.1-rc-1
 
-    - perl-kolab-2.2.1-rc1-2008????
+    - perl-kolab-2.2.1.rc1-2008????
 
 	Added syncrepl backend (inactive by default)
+
+    - kolabd-2.2.?-2008????
+
+	kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.
 
 
 Changes between 2.2-rc-3 and 2.2.0



From cvs at kolab.org  Sat Jul 19 09:21:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 19 Jul 2008 09:21:54 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog, 1.177,
	1.178 kolab_bootstrap.in, 1.37, 1.38 
Message-ID: <20080719072154.4DDBD600BB8@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.

Reported on kolab-users by Uwe Galle


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- ChangeLog	9 Jul 2008 15:57:44 -0000	1.177
+++ ChangeLog	19 Jul 2008 07:21:52 -0000	1.178
@@ -1,3 +1,8 @@
+2008-07-19  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* kolab_bootstrap.in: Quote s[l]urpd to prevent being expanded by the
+	shell.
+
 2008-07-09  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/imapd.conf.template.in: kolab/issue2855 (Can create folder

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolab_bootstrap.in	9 Jul 2008 15:57:44 -0000	1.37
+++ kolab_bootstrap.in	19 Jul 2008 07:21:52 -0000	1.38
@@ -387,8 +387,7 @@
         ."Please stop any running ldap server and bootstrap again\n";
       tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
         ."Please stop any running kolabd and bootstrap again\n";
-      # 051210: the check below used to be: if( `ps -elf|grep slurpd|grep -v grep` ) \rbos
-      if( `ps -elf|grep s[l]urpd` ) {
+      if( `ps -elf|grep 's[l]urpd'` ) {
         print "Error: Detected running slurpd processes.\n";
         print "Please make sure the OpenLDAP server is stopped properly!\n";
         exit 1;



From cvs at kolab.org  Thu Jul 31 18:43:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jul 2008 18:43:09 +0200 (CEST)
Subject: wilde: server/php-kolab Makefile,1.24,1.25 
Message-ID: <20080731164309.5F84C600B8E@lists.intevation.de>

Author: wilde

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

Modified Files:
	Makefile 
Log Message:
Fixed SPEC_VERSION for non-prerelease CVS versions...  :)


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	16 Jul 2008 11:00:39 -0000	1.24
+++ Makefile	31 Jul 2008 16:43:07 -0000	1.25
@@ -13,7 +13,7 @@
     SPEC_VERSION = $(VERSION)
   else
     SOURCE_TAG = $(VERSION).$(RELEASE)
-    SPEC_VERSION = $(RPM_VERSION)+cvs
+    SPEC_VERSION = $(VERSION)+cvs
   endif
 else
   PEAR_RELEASE = $(PRERELEASE_VERSION)$(RELEASE)



From cvs at kolab.org  Fri Aug  1 12:54:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Aug 2008 12:54:51 +0200 (CEST)
Subject: wilde: server/php-kolab/Kolab_Filter/Filter DovecotLDA.php, NONE,
	1.1 Transport.php, 1.2, 1.3 
Message-ID: <20080801105451.3D665600BA9@lists.intevation.de>

Author: wilde

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

Modified Files:
	Transport.php 
Added Files:
	DovecotLDA.php 
Log Message:
Added new simple Dovecot LDA backend for kolabfilter/kolabmailboxfilter.


--- NEW FILE: DovecotLDA.php ---
<?PHP
/*
 *  COPYRIGHT
 *  ---------
 *
 *  See ../AUTHORS file
 *
 *
 *  LICENSE
 *  -------
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *  $Revision: 1.1 $
 *
 *  ABOUT
 *  -----
 *
 *  Simple Net_LMTP like backend for dovecot LDA delivery.
 *
 */

class Dovecot_LDA
{
    var $envelopeSender;
    var $envelopeTo;
    var $status;
    var $deliver_fh;

    function Dovecot_LDA()
    {
        $this->envelopeTo = false;
        $this->status = 220;
    }

    function mailFrom($sender)
    {
        $this->envelopeSender = $sender;
        $this->status = 250;
    }

    function rcptTo($rcpt)
    {
        // We can only handle one recipient, so bail out if more than one is tried!
        if ( ! $this->envelopeTo ) {
            $this->envelopeTo = $rcpt;
            $this->status = 250;
        } else {
            $this->status = 451;  	// Requested action aborted: local error in processing
            return PEAR::raiseError(_("Configuration error!  Dovecot LDA Backend can only handle one recipient at a time."));
        }
    }

    function connect()
    {
        return true;
    }

    function disconnect()
    {
        return true;
    }

    function _put($cmd)
    {
        if ( $cmd == "DATA" ) {
            $this->__start_deliver();
            $this->status = 354;
        } else {
            $this->status = 500;
            return PEAR::raiseError(_("Dovecot LDA Backend received unknow command."));
        }
        return true;
    }

    function _parseResponse($code)
    {
        if ( $code ) {
            if ( $this->status == $code ) {
                return true;
            } else {
                return PEAR::raiseError(_("Dovecot LDA status is not the expected!."));
            }
        } else {
            return $this->status;
        }
    }

    function _send($data)
    {
        if ( $data == ".\r\n" or $data == "\r\n.\r\n" ) {
            $this->__stop_deliver();
            # FIXEME: error checking would be nice!
            $this->status = 250;
        } else {
            $this->__deliver($data);
        }
    }

    # Private functions:

    function __start_deliver()
    {
        Horde::logMessage(sprintf(_("Starting Dovecot deliver process with UID %d, GID %d (sender=%s, recipient=%s) ..."),
                                  getmyuid(), getmygid(),
                                  $this->envelopeSender, $this->envelopeTo),
                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
        # FIXME: path to deliver should be configurable.
        $this->deliver_fh = popen("/kolab/libexec/dovecot/deliver" .
                                  " -f $this->envelopeSender" .
                                  " -d $this->envelopeTo", "w");
    }

    function __stop_deliver()
    {
        Horde::logMessage("Stoping Dovecot deliver process ...",
                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
        $retval = pclose($this->deliver_fh);
        Horde::logMessage(sprintf(_("... returnvalue was %d\n"), $retval),
                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
        if ( $retval != 0 )
            return PEAR::raiseError(_("Dovecot LDA Backend deliver process signaled error."));
        return true;
    }

    function __deliver($data)
    {
        // Horde::logMessage("Writing data line to Dovecot deliver process ...",
        //                   __FILE__, __LINE__, PEAR_LOG_DEBUG);
        if ( fwrite($this->deliver_fh, $data) ) {
            return true;
        } else {
            return PEAR::raiseError(_("Dovecot LDA Backend can't write to deliver process."));
       }
    }
}

Index: Transport.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Transport.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Transport.php	28 Nov 2007 06:06:12 -0000	1.2
+++ Transport.php	1 Aug 2008 10:54:49 -0000	1.3
@@ -223,6 +223,16 @@
     }
 }
 
+class Transport_LDA extends Transport
+{
+    function &createTransport()
+    {
+        require_once 'Kolab/Filter/DovecotLDA.php';
+        $transport = &new Dovecot_LDA();
+        return $transport;
+    }
+}
+
 class StdOutWrapper
 {
     function connect()



From cvs at kolab.org  Fri Aug  1 12:54:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Aug 2008 12:54:51 +0200 (CEST)
Subject: wilde: server/php-kolab/Kolab_Filter AUTHORS, 1.3, 1.4 ChangeLog, 1.19,
	1.20 package.xml.in, 1.7, 1.8 
Message-ID: <20080801105451.3F9BB600BB1@lists.intevation.de>

Author: wilde

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

Modified Files:
	AUTHORS ChangeLog package.xml.in 
Log Message:
Added new simple Dovecot LDA backend for kolabfilter/kolabmailboxfilter.


Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AUTHORS	12 Feb 2008 15:08:09 -0000	1.3
+++ AUTHORS	1 Aug 2008 10:54:49 -0000	1.4
@@ -20,6 +20,9 @@
   (c) 2006 - 2008  Intevation GmbH
   (c) 2006 - 2008  p at rdus
 
+Dovecot LDA backend:
+
+  (c) 2008         Intevation GmbH
 
 Contributions by the following people:
 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog	11 Jul 2008 15:47:13 -0000	1.19
+++ ChangeLog	1 Aug 2008 10:54:49 -0000	1.20
@@ -1,3 +1,11 @@
+2008-08-01  Sascha Wilde  <wilde at intevation.de>
+
+	* Filter/DovecotLDA.php: New file: simple Dovecot LDA backend with
+	API similar to Net_LMTP, so it can be used as drop-in replacement.
+
+	* Filter/Transport.php (Transport): Added wrapper transport class
+	for new Dovecot LDA backend.
+
 2008-07-11  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/recurrence.class.php:

Index: package.xml.in
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.xml.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- package.xml.in	11 Jul 2008 15:47:13 -0000	1.7
+++ package.xml.in	1 Aug 2008 10:54:49 -0000	1.8
@@ -49,6 +49,12 @@
   <active>yes</active>
  </developer>
  <developer>
+  <name>Sascha Wilde</name>
+  <user>wilde</user>
+  <email>wilde at intevation.de</email>
+  <active>yes</active>
+ </developer>
+ <developer>
   <name>Marcus Huewe</name>
   <user>marcus</user>
   <email>suse-tux at gmx.de</email>
@@ -96,6 +102,7 @@
      <file name="Resource.php" role="php" />
      <file name="recurrence.class.php" role="php" />
      <file name="Transport.php" role="php" />
+     <file name="DovecotLDA.php" role="php" />
    </dir> <!-- /Filter -->
   </dir> <!-- / -->
  </contents>



From cvs at kolab.org  Mon Aug  4 18:37:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Aug 2008 18:37:14 +0200 (CEST)
Subject: wilde: server/kolab-filter/filter config.php,1.14,1.15 
Message-ID: <20080804163714.B93D4600B80@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/kolab-filter/filter
In directory doto:/tmp/cvs-serv31872/kolab-filter/filter

Modified Files:
	config.php 
Log Message:
Added new configuration variable to choose local delivery backend.
Added entries to release-notes for the new Dovecot LDA backend.


Index: config.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/config.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- config.php	2 Apr 2008 17:32:55 -0000	1.14
+++ config.php	4 Aug 2008 16:37:12 -0000	1.15
@@ -39,6 +39,9 @@
 /* Cyrus server connection string */
 $conf['filter']['imap_server'] = 'localhost';
 
+/* Local delivery backend (default LMTP) */
+$conf['filter']['delivery_backend'] = 'LMTP';
+
 /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
 $conf['filter']['lmtp_host'] = 'localhost';
 $conf['filter']['lmtp_port'] = 2003;



From cvs at kolab.org  Mon Aug  4 18:37:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Aug 2008 18:37:14 +0200 (CEST)
Subject: wilde: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.24,
	1.25 
Message-ID: <20080804163714.BA3FD600B88@lists.intevation.de>

Author: wilde

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Added new configuration variable to choose local delivery backend.
Added entries to release-notes for the new Dovecot LDA backend.


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- resmgr.conf.template.in	2 Apr 2008 17:32:55 -0000	1.24
+++ resmgr.conf.template.in	4 Aug 2008 16:37:12 -0000	1.25
@@ -48,6 +48,9 @@
 $conf['filter']['imap_server'] = '@@@local_addr@@@';
 @@@endif@@@
 
+/* Local delivery backend (default LMTP) */
+$conf['filter']['delivery_backend'] = 'LMTP';
+
 /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
 $conf['filter']['lmtp_host'] = '@@@local_addr@@@';
 $conf['filter']['lmtp_port'] = 2003;



From cvs at kolab.org  Mon Aug  4 18:37:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Aug 2008 18:37:14 +0200 (CEST)
Subject: wilde: server release-notes.txt,1.299,1.300 
Message-ID: <20080804163714.B949C600B81@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added new configuration variable to choose local delivery backend.
Added entries to release-notes for the new Dovecot LDA backend.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- release-notes.txt	19 Jul 2008 07:21:52 -0000	1.299
+++ release-notes.txt	4 Aug 2008 16:37:12 -0000	1.300
@@ -53,6 +53,12 @@
 
 	kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.
 
+	Added configuration option in resmgr.conf for local delivery
+	backend.  (Makes it possible to activate the new LDA backend)
+
+    - php-kolab-2.2.1.rc1-2008????
+
+	Added Dovecot LDA backend.
 
 Changes between 2.2-rc-3 and 2.2.0
 



From cvs at kolab.org  Mon Aug  4 18:37:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Aug 2008 18:37:14 +0200 (CEST)
Subject: wilde: server/php-kolab/Kolab_Filter/Filter Incoming.php,1.9,1.10 
Message-ID: <20080804163714.BE711600B8A@lists.intevation.de>

Author: wilde

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

Modified Files:
	Incoming.php 
Log Message:
Added new configuration variable to choose local delivery backend.
Added entries to release-notes for the new Dovecot LDA backend.


Index: Incoming.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Incoming.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Incoming.php	11 Feb 2008 17:34:43 -0000	1.9
+++ Incoming.php	4 Aug 2008 16:37:12 -0000	1.10
@@ -41,8 +41,14 @@
 
     var $_add_headers;
 
-    function Filter_Incoming($transport = 'LMTP', $debug = false)
+    function Filter_Incoming($transport = false, $debug = false)
     {
+        global $conf;
+        if ($transport == false)
+            if (isset($conf['filter']['delivery_backend']))
+                $transport = $conf['filter']['delivery_backend'];
+            else
+                $transport = 'LMTP';
         Filter::Filter($transport, $debug);
     }
 



From cvs at kolab.org  Mon Aug  4 21:07:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Aug 2008 21:07:43 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.18,
	1.19 
Message-ID: <20080804190743.9097F600B81@lists.intevation.de>

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
changed the comment around idletimeout, see kolab/issue2911



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- slapd.conf.template.in	17 Apr 2008 10:52:26 -0000	1.18
+++ slapd.conf.template.in	4 Aug 2008 19:07:41 -0000	1.19
@@ -48,10 +48,11 @@
 cachesize       10000
 checkpoint 	512 5
 idlcachesize    10000
+
+# The idletimeout can be increased if some clients develop problems.
+# Please report to kolab-devel at kolab.org if you encounter such a client.
 idletimeout	300
-		# The idletimeout can be increased if some clients develop
-		# problems. Please report to kolab-devel at kolab.org
-		# if you encounter such a client.
+
 dirtyread
 
 directory	@ldapserver_dir@



From cvs at kolab.org  Mon Aug  4 21:07:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Aug 2008 21:07:43 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.178,1.179 
Message-ID: <20080804190743.7A215600B80@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
changed the comment around idletimeout, see kolab/issue2911



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- ChangeLog	19 Jul 2008 07:21:52 -0000	1.178
+++ ChangeLog	4 Aug 2008 19:07:41 -0000	1.179
@@ -1,3 +1,8 @@
+2008-08-04 Richard Bos <richard at radoeka.nl>
+
+	* templates/slapd.conf.template.in: changed the comment around
+	  idletimeout, see kolab/issue2911
+
 2008-07-19  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* kolab_bootstrap.in: Quote s[l]urpd to prevent being expanded by the



From cvs at kolab.org  Tue Aug  5 22:41:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Aug 2008 22:41:14 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.19,
	1.20 
Message-ID: <20080805204114.4A528600BAA@lists.intevation.de>

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
Removed obsolete variable schemacheck



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- slapd.conf.template.in	4 Aug 2008 19:07:41 -0000	1.19
+++ slapd.conf.template.in	5 Aug 2008 20:41:11 -0000	1.20
@@ -29,8 +29,6 @@
 replogfile      @ldapserver_replogfile@
 replicationinterval 5
 
-schemacheck 	       on
-
 TLSCertificateFile     @sysconfdir@/kolab/cert.pem
 TLSCertificateKeyFile  @sysconfdir@/kolab/key.pem
 



From cvs at kolab.org  Tue Aug  5 22:41:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Aug 2008 22:41:14 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.179,1.180 
Message-ID: <20080805204114.4C875600BB1@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Removed obsolete variable schemacheck



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- ChangeLog	4 Aug 2008 19:07:41 -0000	1.179
+++ ChangeLog	5 Aug 2008 20:41:11 -0000	1.180
@@ -1,5 +1,10 @@
 2008-08-04 Richard Bos <richard at radoeka.nl>
 
+	* templates/slapd.conf.template.in: removed obsolete variable
+	  schemacheck, see kolab/issue29110
+
+2008-08-04 Richard Bos <richard at radoeka.nl>
+
 	* templates/slapd.conf.template.in: changed the comment around
 	  idletimeout, see kolab/issue2911
 



From cvs at kolab.org  Tue Aug  5 22:52:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Aug 2008 22:52:02 +0200 (CEST)
Subject: richard: server release-notes.txt,1.300,1.301 
Message-ID: <20080805205202.31845600BAA@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2910



Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- release-notes.txt	4 Aug 2008 16:37:12 -0000	1.300
+++ release-notes.txt	5 Aug 2008 20:52:00 -0000	1.301
@@ -56,6 +56,8 @@
 	Added configuration option in resmgr.conf for local delivery
 	backend.  (Makes it possible to activate the new LDA backend)
 
+	kolab/issue2910 (obsolete definition of schemacheck in slapd.conf)
+
     - php-kolab-2.2.1.rc1-2008????
 
 	Added Dovecot LDA backend.



From cvs at kolab.org  Tue Aug  5 22:53:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Aug 2008 22:53:00 +0200 (CEST)
Subject: richard: server release-notes.txt,1.301,1.302 
Message-ID: <20080805205300.6E9EF600BB1@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2911



Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- release-notes.txt	5 Aug 2008 20:52:00 -0000	1.301
+++ release-notes.txt	5 Aug 2008 20:52:58 -0000	1.302
@@ -58,6 +58,9 @@
 
 	kolab/issue2910 (obsolete definition of schemacheck in slapd.conf)
 
+	kolab/issue2911 (Change comments around the idletimeout definiton
+			 in the file templates/slapd.conf.template.in)
+
     - php-kolab-2.2.1.rc1-2008????
 
 	Added Dovecot LDA backend.



From cvs at kolab.org  Wed Aug  6 14:29:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Aug 2008 14:29:39 +0200 (CEST)
Subject: martin: server/kolabd/kolabd/templates main.cf.template.in, 1.19,
	1.20 
Message-ID: <20080806122939.77E1D600BB1@lists.intevation.de>

Author: martin

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

Modified Files:
	main.cf.template.in 
Log Message:
Martin Konold: Added smtpd_sasl_authenticated_header = yes for simpler authorization. See also:
https://www.intevation.de/roundup/kolab/issue2961


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- main.cf.template.in	5 Mar 2008 17:13:15 -0000	1.19
+++ main.cf.template.in	6 Aug 2008 12:29:37 -0000	1.20
@@ -5,7 +5,7 @@
 KOLAB_META_END
 # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2008 Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
@@ -169,5 +169,8 @@
 
 # Support broken clients like Microsoft Outlook Express 4.x which expect AUTH=LOGIN instead of AUTH LOGIN
 broken_sasl_auth_clients = yes
+
+# useful for checking authentication status esp. when using dynamic IPs for the sending client and doing authorization
+smtpd_sasl_authenticated_header = yes
 
 content_filter = kolabfilter



From cvs at kolab.org  Thu Aug  7 17:11:36 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Aug 2008 17:11:36 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.302,1.303 
Message-ID: <20080807151136.326DA600B83@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
updated release notes formatting


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- release-notes.txt	5 Aug 2008 20:52:58 -0000	1.302
+++ release-notes.txt	7 Aug 2008 15:11:33 -0000	1.303
@@ -57,9 +57,8 @@
 	backend.  (Makes it possible to activate the new LDA backend)
 
 	kolab/issue2910 (obsolete definition of schemacheck in slapd.conf)
-
 	kolab/issue2911 (Change comments around the idletimeout definiton
-			 in the file templates/slapd.conf.template.in)
+	                 in the file templates/slapd.conf.template.in)
 
     - php-kolab-2.2.1.rc1-2008????
 



From cvs at kolab.org  Fri Aug  8 05:15:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Aug 2008 05:15:58 +0200 (CEST)
Subject: martin: server release-notes.txt,1.303,1.304 
Message-ID: <20080808031558.417F4600B86@lists.intevation.de>

Author: martin

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

Modified Files:
	release-notes.txt 
Log Message:
Martin Konold: Updated release notes with issue 2961


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- release-notes.txt	7 Aug 2008 15:11:33 -0000	1.303
+++ release-notes.txt	8 Aug 2008 03:15:56 -0000	1.304
@@ -64,6 +64,11 @@
 
 	Added Dovecot LDA backend.
 
+   - kolabd-2.2.?-2008????
+
+        kolab/issue2961 (added smtpd_sasl_authenticated_header = yes for
+	simpler authorization)
+
 Changes between 2.2-rc-3 and 2.2.0
 
     - clamav-0.93.3-20080708



From cvs at kolab.org  Fri Aug  8 08:25:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Aug 2008 08:25:21 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.304,1.305 
Message-ID: <20080808062521.1401F600B86@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
combined two kolabd entries in release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- release-notes.txt	8 Aug 2008 03:15:56 -0000	1.304
+++ release-notes.txt	8 Aug 2008 06:25:18 -0000	1.305
@@ -59,15 +59,13 @@
 	kolab/issue2910 (obsolete definition of schemacheck in slapd.conf)
 	kolab/issue2911 (Change comments around the idletimeout definiton
 	                 in the file templates/slapd.conf.template.in)
+	kolab/issue2961 (added smtpd_sasl_authenticated_header = yes for
+	                 simpler authorization)
 
     - php-kolab-2.2.1.rc1-2008????
 
 	Added Dovecot LDA backend.
 
-   - kolabd-2.2.?-2008????
-
-        kolab/issue2961 (added smtpd_sasl_authenticated_header = yes for
-	simpler authorization)
 
 Changes between 2.2-rc-3 and 2.2.0
 



From cvs at kolab.org  Sat Aug  9 11:42:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Aug 2008 11:42:40 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.13,1.14 
Message-ID: <20080809094240.B91DD60016E@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv24145/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
added syncrepl support (see kolab/issue1755)



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Conf.pm	25 Feb 2008 15:05:04 -0000	1.13
+++ Conf.pm	9 Aug 2008 09:42:38 -0000	1.14
@@ -524,25 +524,44 @@
         exit(1);
     }
 
-    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'});
-	    print $repl "replica uri=ldaps://$h\n"
-		."  binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
-		."  bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
-	}
+    # 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"
+                 ."         provider=".$Kolab::config{"ldap_master_uri"}."\n"
+                 ."         type=refreshAndPersist\n"
+                 ."         searchbase=\"".$Kolab::config{'base_dn'}."\"\n"
+                 ."         scope=sub\n"
+                 ."         schemachecking=on\n"
+                 ."         binddn=\"".$Kolab::config{"bind_dn"}."\"\n"
+                 ."         credentials=\"".$Kolab::config{"bind_pw"}."\"\n"
+                 ."         bindmethod=simple\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";
+
+      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'});
+  	    print $repl "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";
+      }
     }
 
     $repl->close;



From cvs at kolab.org  Sat Aug  9 11:42:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Aug 2008 11:42:40 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.6,1.7 
Message-ID: <20080809094240.B928F600170@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added syncrepl support (see kolab/issue1755)



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	7 Jan 2008 11:15:42 -0000	1.6
+++ ChangeLog	9 Aug 2008 09:42:38 -0000	1.7
@@ -1,13 +1,19 @@
+2008-08-09 Richard Bos <richard at radoeka.nl>
+
+	* Kolab-Conf/Conf.pm.in: added syncrepl support (see kolab/issue1755)
+
 2008-01-07  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* bin/kolabconf.in: Added missing newlines in kolabconf -h.
 
 2008-01-02  Marcus Hüwe   <suse-tux at gmx.de>
+
 	* Makefile.PL:
 	
 	Fixed build for older versions of ExtUtils::MakeMaker.
 
 2008-01-01  Marcus Hüwe   <suse-tux at gmx.de>
+
 	* bin/kolabconf.in:
 	
 	Removed superfluous print statement.
@@ -63,7 +69,7 @@
 
 	Patch applied by Martin Konold:
 
-        - fixes order of domains see also https://intevation.de/roundup/kolab/issue1550
+	- fixes order of domains see also https://intevation.de/roundup/kolab/issue1550
 
 2006-12-04  Gunnar Wrobel  <wrobel at pardus.de>
 
@@ -74,7 +80,7 @@
 2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
-          directory that holds the php.ini file to be used.
+	  directory that holds the php.ini file to be used.
 
 2006-01-15 Richard Bos <richard at radoeka.nl>
 	* Kolab-Conf/Conf.pm.in: use the new variable sasl_authdconffile



From cvs at kolab.org  Mon Aug 11 10:47:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 10:47:50 +0200 (CEST)
Subject: gunnar: server cvs-kolab.sh,1.21,1.22 
Message-ID: <20080811084750.7A17C600170@lists.intevation.de>

Author: gunnar

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

Modified Files:
	cvs-kolab.sh 
Log Message:
Update the setup skript for the development environment to Kolab Server 2.2.0.

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cvs-kolab.sh	8 May 2008 14:20:34 -0000	1.21
+++ cvs-kolab.sh	11 Aug 2008 08:47:48 -0000	1.22
@@ -10,7 +10,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2-rc-1"
+KOLAB_VERSION="2.2.0"
 
 KOLAB_PACKAGES=/kolab-packages
 KOLAB_DEV_USER=kolabdevel
@@ -63,29 +63,22 @@
 
     echo "Downloading Kolab-Server-${KOLAB_VERSION} sources..."
 
-    wget -q -r -l1 -nd --no-parent -c -R index.html\* http://ftp.gwdg.de/pub/linux/kolab/server/beta/kolab-server-${KOLAB_VERSION}/sources/ || die "Failed to download the sources!"
+    wget -q -r -l1 -nd --no-parent -c -R index.html\* http://ftp.gwdg.de/pub/linux/kolab/server/release/kolab-server-${KOLAB_VERSION}/sources/ || die "Failed to download the sources!"
 
     echo "Verifying source authenticity ..."
 
     gpg -q --keyserver hkp://subkeys.pgp.net --recv-key 5816791A || die "Failed to retrieve signature key!"
-    gpg -q --verify MD5SUMS || die "Invalid signature on the MD5SUMS file!"
+    gpg -q --verify MD5SUMS.sig || die "Invalid signature on the MD5SUMS file!"
     md5sum --status -c MD5SUMS || die "The md5 hashes do not match. You should try to download the packages again."
-    cvs -q -d :pserver:anonymous at intevation.de:/home/kroupware/jail/kolabrepository  co server/install-kolab.sh || die "Failed to retrieve the updated installer."
-    rm install-kolab.sh
-    mv server/install-kolab.sh .
-
-    if [ "${FLAG_HORDE}" == "1" -o "${FLAG_FBVIEW}" == "1"  ]; then
-
-	echo "Downloading Horde support packages ..."
-
-	wget -q -r -l1 -nd --no-parent -c -R index.html\* http://build.pardus.de/downloads/openpkg/ || die "Failed to download the horde support packages!"
-
-    fi
+    chmod u+x install-kolab.sh
 }
 
 install() {
-    if [ ! -e "/${KOLAB_DEV_USER}/CVS" ]; then
+    if [ ! -e "${KOLAB_PACKAGES}/source-original/release-notes.txt" ]; then
 	download
+    fi
+
+    if [ ! -e "/${KOLAB_DEV_USER}/CVS" ]; then
 	cd "${KOLAB_PACKAGES}/source-original"
 
 	echo "Installing the development environment in /${KOLAB_DEV_USER}. This will take a long time ..."
@@ -304,6 +297,7 @@
 
 if [ "${ACTION_DOWNLOAD}" == "1" ]; then
     download
+    exit 0
 fi
 
 if [ "${ACTION_INSTALL}" == "1" ]; then



From cvs at kolab.org  Mon Aug 11 11:35:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 11:35:53 +0200 (CEST)
Subject: gunnar: server/kolab-webclient - New directory 
Message-ID: <20080811093553.49EED600170@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/kolab-webclient added to the repository




From cvs at kolab.org  Mon Aug 11 14:21:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 14:21:01 +0200 (CEST)
Subject: gunnar: server/php-smarty Makefile,1.6,1.7 php-smarty.spec,1.8,1.9 
Message-ID: <20080811122101.1D3E3600173@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile php-smarty.spec 
Log Message:
Update the smarty source location and bump to 2.6.19.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-smarty/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	27 Jul 2007 10:30:33 -0000	1.6
+++ Makefile	11 Aug 2008 12:20:58 -0000	1.7
@@ -17,7 +17,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://smarty.php.net/distributions/$(NAME)-$(VERSION).tar.gz
+SOURCE_0=http://www.smarty.net/distributions/$(NAME)-$(VERSION).tar.gz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: php-smarty.spec
===================================================================
RCS file: /kolabrepository/server/php-smarty/php-smarty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- php-smarty.spec	13 Sep 2007 14:45:05 -0000	1.8
+++ php-smarty.spec	11 Aug 2008 12:20:58 -0000	1.9
@@ -1,11 +1,11 @@
 # Variables
-%define         V_version       2.6.18
-%define         V_release       20070607
+%define         V_version       2.6.19
+%define         V_release       20080811
 
 # Package Information
 Name:		php-smarty
 Summary:	Template engine for PHP
-URL:		http://smarty.php.net/
+URL:		http://www.smarty.net/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:        %{V_version}
 Release:        %{V_release}
@@ -15,7 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source0:	http://smarty.php.net/distributions/Smarty-%{version}.tar.gz
+Source0:	http://www.smarty.net/distributions/Smarty-%{version}.tar.gz
 
 # Build Info
 Prefix:		%{l_prefix}



From cvs at kolab.org  Mon Aug 11 14:34:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 14:34:35 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.1.1 - New directory 
Message-ID: <20080811123435.142D0600B81@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.1
In directory doto:/tmp/cvs-serv10365/horde-webmail/1.1.1

Log Message:
Directory /kolabrepository/server/patches/horde-webmail/1.1.1 added to the repository




From cvs at kolab.org  Mon Aug 11 14:34:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 14:34:35 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail - New directory 
Message-ID: <20080811123435.11E91600173@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/patches/horde-webmail added to the repository




From cvs at kolab.org  Mon Aug 11 14:35:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 14:35:21 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.1.1
	horde-webmail-1.1.1_kolab_openpkg.patch, NONE, 1.1 
Message-ID: <20080811123521.D2D19600B81@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.1
In directory doto:/tmp/cvs-serv10444

Added Files:
	horde-webmail-1.1.1_kolab_openpkg.patch 
Log Message:
Add a first version of the kolab openpkg patch.

--- NEW FILE: horde-webmail-1.1.1_kolab_openpkg.patch ---
diff -r edb3eb2593d6 config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/conf.php	Mon Aug 11 14:33:48 2008 +0200
@@ -0,0 +1,113 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.230 2008/05/26 11:51:43 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
[...3393 lines suppressed...]
         $attr = $vcard->getAllAttributes();
         foreach ($attr as $item) {
-            if (empty($item['value'])) {
-                continue;
-            }
 
             switch ($item['name']) {
             case 'FN':
diff -r edb3eb2593d6 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Mon Aug 11 14:33:35 2008 +0200
+++ b/turba/lib/Driver/share.php	Mon Aug 11 14:33:48 2008 +0200
@@ -145,7 +145,7 @@
     function _deleteAll($sourceName = null)
     {
         if (is_null($sourceName)) {
-            $sourceName = $this->getContactOwner();
+            $sourceName = $this->getName();
         }
         return $this->_driver->_deleteAll($sourceName);
     }



From cvs at kolab.org  Mon Aug 11 15:57:07 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 15:57:07 +0200 (CEST)
Subject: gunnar: server/kolab-webclient ChangeLog, NONE, 1.1 Makefile, NONE,
	1.1 horde-kolab-conf.template, NONE,
	1.1 horde-kronolith-kolab-conf.template, NONE,
	1.1 kolab-webclient.spec, NONE, 1.1 
Message-ID: <20080811135707.2C936600BA2@lists.intevation.de>

Author: gunnar

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

Added Files:
	ChangeLog Makefile horde-kolab-conf.template 
	horde-kronolith-kolab-conf.template kolab-webclient.spec 
Log Message:
A first version of the monolithic kolab-webclient package, primarily based on horde-webmail. The package should build but its functionality has not yet been tested.

--- NEW FILE: ChangeLog ---
2008-08-11  Gunnar Wrobel  <p at rdus.de>

	* kolab-webclient.spec: Added package to Kolab CVS.


--- NEW FILE: Makefile ---
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

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/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")

DATE = ${YEAR}-${MONTH}-${DAY}

PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z-]*\).*/\1/")
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_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}

PATCHES = http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")

PACKAGE_0=$(HORDE_NAME)-$(VERSION).tar.gz
SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)

PACKAGE_1=passwd-h3-$(PASSWD_VERSION).tar.gz
SOURCE_1=http://ftp.horde.org/pub/passwd/$(PACKAGE_1)

.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 $(TEMPLATES) $(CONFIGS) ChangeLog
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"

	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
	  wget -c "$$PATCH"; done

	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)

	if [ -n "$(TEMPLATES)" ]; then              \
	  for TEMPLATE in $(TEMPLATES);             \
	  do                                        \
	    cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
	  done;                                     \
	fi

	if [ -n "$(CONFIGS)" ]; then                \
	  for CONFIG in $(CONFIGS);                 \
	  do                                        \
	    cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE);  \
	  done;                                     \
	fi

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

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

--- NEW FILE: horde-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['log']['name'] = '@@@webserver_logdir@@@/horde/horde.log';
$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
@@@if cyrus-imap@@@
$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
@@@else@@@
$conf['kolab']['imap']['server'] = '@@@local_addr@@@';
@@@endif@@@
$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
?>

--- NEW FILE: horde-kronolith-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
?>

--- NEW FILE: kolab-webclient.spec ---
# Versions
%define         V_horde_name horde-webmail
%define         V_package kolab-webclient
%define         V_year  2008
%define         V_month 08
%define         V_day   11
%define         V_version 1.1.1
%define         V_passwd_version 3.0.1
%define         V_date %{V_year}-%{V_month}-%{V_day}
%define         V_release %{V_year}%{V_month}%{V_day}

# Package Information
Name:		%{V_package}
Summary:	The Kolab Groupware web client (based on horde)
URL:		http://www.kolab.org/
Packager:	Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:	%{V_version}
Release:	%{V_release}
Class:		JUNK
License:	GPL
Group:		MAIL
Distribution:	OpenPKG

# List of Sources
Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_version}.tar.gz
Source1:        http://ftp.horde.org/pub/passwd/passwd-h3-%{V_passwd_version}.tar.gz
Source2:        horde-kolab-conf.template
Source3:        horde-kronolith-kolab-conf.template

# List of Patches
Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
PreReq:       kolabd::with_horde

AutoReq:      no
AutoReqProv:  no
#BuildArch:    noarch

%description 
The Kolab Groupware web client provides a Kolab compatible web
frontend to the Kolab server. The package is based on Horde.

%prep
	%setup -q -c %{V_horde_name}-%{V_version}
	%setup -T -D -a 1
	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_version}/passwd

	cd %{V_horde_name}-%{V_version}
	%patch -p1 -P 0
	cd ..

%build

%install

	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/webclient
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/storage
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	

	cd %{V_horde_name}-%{V_version}

	find . -name 'test.php' | xargs rm

	find . -name '*.orig' | xargs rm

	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/

	cd ..

	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd

	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} \
	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	

	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/webclient \
            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \
	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/dimp/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/imp/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/ingo/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/kronolith/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/mimp/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/mnemo/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/nag/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/passwd/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/turba/config/*.php' \
	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php

%clean
	rm -rf $RPM_BUILD_ROOT

%files -f files



From cvs at kolab.org  Mon Aug 11 21:22:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 21:22:58 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.180,
	1.181 kolab_bootstrap.in, 1.38, 1.39 
Message-ID: <20080811192258.3E83860014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
added syncrepl support



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- ChangeLog	5 Aug 2008 20:41:11 -0000	1.180
+++ ChangeLog	11 Aug 2008 19:22:55 -0000	1.181
@@ -1,3 +1,7 @@
+2008-08-11 Richard Bos <richard at radoeka.nl>
+
+	* kolab_bootstrap.in: added syncrepl support
+
 2008-08-04 Richard Bos <richard at radoeka.nl>
 
 	* templates/slapd.conf.template.in: removed obsolete variable

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- kolab_bootstrap.in	19 Jul 2008 07:21:52 -0000	1.38
+++ kolab_bootstrap.in	11 Aug 2008 19:22:55 -0000	1.39
@@ -794,14 +794,16 @@
   chmod 0600, $kolab_config;
   kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
 
-  print << 'EOS';
+  if ($kolab_config{'directory_mode'} ne "syncrepl" ) {
+    print << 'EOS';
 Now the master server needs to be stopped briefly while the contents of the LDAP database
 is copied over to this slave. Please make sure that this slave is entered into the list 
 of kolabhosts on the master before proceeding.
 EOS
-  kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
-  kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
-  kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
+    kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
+    kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
+    kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
+  }
 
   # FIXME: we should get rid of this construct because it makes the code hard to read.
   #        A if (-e @sysconfdir@/rc.conf) statement should be enough.



From cvs at kolab.org  Mon Aug 11 21:23:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Aug 2008 21:23:51 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.181,1.182 
Message-ID: <20080811192351.35A5B600165@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added issue number



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- ChangeLog	11 Aug 2008 19:22:55 -0000	1.181
+++ ChangeLog	11 Aug 2008 19:23:49 -0000	1.182
@@ -1,6 +1,6 @@
 2008-08-11 Richard Bos <richard at radoeka.nl>
 
-	* kolab_bootstrap.in: added syncrepl support
+	* kolab_bootstrap.in: added syncrepl support, see kolab/issue1755
 
 2008-08-04 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Tue Aug 12 15:04:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Aug 2008 15:04:23 +0200 (CEST)
Subject: bernhard: doc/www/src documentation.html.m4,1.35,1.36 
Message-ID: <20080812130423.7FEB860016C@lists.intevation.de>

Author: bernhard

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

Modified Files:
	documentation.html.m4 
Log Message:
To make the link to the wiki pages more prominent:
	* use the same font 
	* put it on the same line as the fixed files
	* Shortenen description


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- documentation.html.m4	11 Jun 2008 15:16:57 -0000	1.35
+++ documentation.html.m4	12 Aug 2008 13:04:21 -0000	1.36
@@ -23,10 +23,9 @@
     | 
     <a href="./doc/Allgemeine-Betriebsdokumentation-KolabServer22_20080103_1.0.odt">
         Version 1.0 as odt</a> (2008-01-03)
-    <br>
-    <small>Get inofficial drafts and more information on 
+    | 
     <a href="http://wiki.kolab.org/index.php/Operating_Manual">
-    this Kolab Wiki page</a>.</small>
+    Wiki page for updates and hints</a>
     </li>
 </ul>
 
@@ -91,10 +90,9 @@
     | 
     <a href="./doc/KolabPraesentation_20080103_1.0.odp">
         Version 1.0 as odp</a> (2008-01-03)
-    <br>
-    <small>Get inofficial drafts and more information on 
+    |
     <a href="http://wiki.kolab.org/index.php/Example_Slides_for_Kolab_Presentations">
-    this Kolab Wiki page</a>.</small>
+    Wiki page for updates and hints</a>
 
     </li>
 </ul>



From cvs at kolab.org  Wed Aug 13 15:11:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Aug 2008 15:11:32 +0200 (CEST)
Subject: wilde: server/php-kolab/Kolab_Filter/Filter DovecotLDA.php,1.1,1.2 
Message-ID: <20080813131132.4CECE60016C@lists.intevation.de>

Author: wilde

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

Modified Files:
	DovecotLDA.php 
Log Message:
Put copyright and authorship information directly into the source.
This should be done for all source files...


Index: DovecotLDA.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/DovecotLDA.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DovecotLDA.php	1 Aug 2008 10:54:49 -0000	1.1
+++ DovecotLDA.php	13 Aug 2008 13:11:29 -0000	1.2
@@ -1,29 +1,11 @@
 <?PHP
 /*
- *  COPYRIGHT
- *  ---------
- *
- *  See ../AUTHORS file
- *
- *
- *  LICENSE
- *  -------
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Copyright (C) 2008 by Intevation GmbH
+ *  Author(s):
+ *  Sascha Wilde <wilde at intevation.de>
  *
- *  $Revision$
+ *  This program is free software under the GPL (>=v2)
+ *  Read the file COPYING coming with the software for details.
  *
  *  ABOUT
  *  -----



From cvs at kolab.org  Wed Aug 13 17:24:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Aug 2008 17:24:18 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.1.1
	horde-webmail-1.1.1_kolab_openpkg.patch, 1.1, 1.2 
Message-ID: <20080813152418.1591F600B89@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.1
In directory doto:/tmp/cvs-serv15653/1.1.1

Modified Files:
	horde-webmail-1.1.1_kolab_openpkg.patch 
Log Message:
Updated version of the horde-webmail patch.

Index: horde-webmail-1.1.1_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.1.1/horde-webmail-1.1.1_kolab_openpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-webmail-1.1.1_kolab_openpkg.patch	11 Aug 2008 12:35:19 -0000	1.1
+++ horde-webmail-1.1.1_kolab_openpkg.patch	13 Aug 2008 15:24:15 -0000	1.2
@@ -1,6 +1,6 @@
-diff -r edb3eb2593d6 config/conf.php
+diff -r f41c3ad4df53 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Mon Aug 11 14:33:48 2008 +0200
++++ b/config/conf.php	Wed Aug 13 17:22:41 2008 +0200
 @@ -0,0 +1,113 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -115,9 +115,9 @@
 +if (file_exists(dirname(__FILE__) . '/kolab.php')) {
 +  require_once(dirname(__FILE__) . '/kolab.php');
[...2752 lines suppressed...]
-+++ b/turba/lib/Driver.php	Mon Aug 11 14:33:48 2008 +0200
+diff -r f41c3ad4df53 turba/lib/Driver.php
+--- a/turba/lib/Driver.php	Wed Aug 13 13:01:02 2008 +0200
++++ b/turba/lib/Driver.php	Wed Aug 13 17:22:41 2008 +0200
 @@ -1368,9 +1368,6 @@
          $hash = array();
          $attr = $vcard->getAllAttributes();
@@ -3418,9 +1042,9 @@
  
              switch ($item['name']) {
              case 'FN':
-diff -r edb3eb2593d6 turba/lib/Driver/share.php
---- a/turba/lib/Driver/share.php	Mon Aug 11 14:33:35 2008 +0200
-+++ b/turba/lib/Driver/share.php	Mon Aug 11 14:33:48 2008 +0200
+diff -r f41c3ad4df53 turba/lib/Driver/share.php
+--- a/turba/lib/Driver/share.php	Wed Aug 13 13:01:02 2008 +0200
++++ b/turba/lib/Driver/share.php	Wed Aug 13 17:22:41 2008 +0200
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {



From cvs at kolab.org  Thu Aug 14 10:57:07 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Aug 2008 10:57:07 +0200 (CEST)
Subject: ljohansen: doc/www/src index.html.m4,1.153,1.154 
Message-ID: <20080814085707.EEDFF60016F@lists.intevation.de>

Author: ljohansen

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

Modified Files:
	index.html.m4 
Log Message:
Added news item about new release of Univention's Corporate Server which includes some Kolab updates.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- index.html.m4	11 Jul 2008 19:12:44 -0000	1.153
+++ index.html.m4	14 Aug 2008 08:57:05 -0000	1.154
@@ -59,6 +59,22 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
+<table>
+<tr><td class="newsd">August 14th, 2008</td>
+<td class="newsh">&raquo;
+  Univention Corporate Server 2.1 includes new Kolab components
+</td></tr>
+</table>
+<div class="newsb">
+  Univention, a Kolab Konsortium business partner, integrates the current
+  version of Kontact Enterprise35 and Kolab web client into the groupware part
+  of its enterprise all-in-one solution.
+  <br />
+  Further information can be found in 
+  <a href="http://www.univention.de/pm_ucs_21.html">Univention's press
+  release</a> (German only).
+</div>
+<p>
 
 <table>
 <tr><td class="newsd">July 11th, 2008</td>
@@ -94,6 +110,13 @@
 <p>
 
 
+
+
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
 <table>
 <tr><td class="newsd">June 18th, 2008</td>
 <td class="newsh">&raquo;
@@ -102,14 +125,10 @@
 </table>
 <div class="newsb">
   A new ClamAV RPM with a fix for a DoS vulnerability is available.  See the
-  <a href="security/kolab-vendor-notice-21.txt">Kolab Security Issue 21</a> for details.
+  <a href="security/kolab-vendor-notice-21.txt">Kolab Security Issue 21</a> for
+details.
 </div>
 <p>
-
-
-</div> <!-- END LATEST BLOCK -->
-<p>
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 <table>
 <tr><td class="newsd">June 9th, 2008</td>



From cvs at kolab.org  Thu Aug 14 21:17:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Aug 2008 21:17:44 +0200 (CEST)
Subject: richard: server/perl-kolab ChangeLog,1.38,1.39 
Message-ID: <20080814191744.6D21460016F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
add syncrepl support, see kolab/issue1755



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ChangeLog	17 Jul 2008 08:59:08 -0000	1.38
+++ ChangeLog	14 Aug 2008 19:17:42 -0000	1.39
@@ -1,3 +1,7 @@
+2008-08-14  Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab.pm: add syncrepl support, see kolab/issue1755 
+
 2008-07-17  Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/LDAP/Backend/syncrepl.pm: add kolab/issue1755 



From cvs at kolab.org  Thu Aug 14 21:17:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Aug 2008 21:17:44 +0200 (CEST)
Subject: richard: server/perl-kolab/lib Kolab.pm,1.23,1.24 
Message-ID: <20080814191744.7855D600B84@lists.intevation.de>

Author: richard

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

Modified Files:
	Kolab.pm 
Log Message:
add syncrepl support, see kolab/issue1755



Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Kolab.pm	17 Jul 2008 11:02:18 -0000	1.23
+++ Kolab.pm	14 Aug 2008 19:17:42 -0000	1.24
@@ -273,6 +273,7 @@
     #     fds: Fedora Directory Server
     #     ad: Microsoft Active Directory
     $config{'directory_mode'} = 'slurpd' if (!exists $config{'directory_mode'});
+    $config{'directory_replication_mode_is_syncrepl'} = 'TRUE' if ($config{'directory_mode'} eq 'syncrepl');
 
     # `conn_refresh_period' specifies how many minutes to wait before forceably
     # tearing down the change listener connection, re-syncing, and re-connecting.



From cvs at kolab.org  Thu Aug 14 21:33:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Aug 2008 21:33:08 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.182,1.183 
Message-ID: <20080814193308.6069C60016F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added syncrepl support, see kolab/issue1755



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- ChangeLog	11 Aug 2008 19:23:49 -0000	1.182
+++ ChangeLog	14 Aug 2008 19:33:06 -0000	1.183
@@ -1,3 +1,8 @@
+2008-08-14 Richard Bos <richard at radoeka.nl>
+
+	* templates/slapd.conf.template.in: added syncrepl support,
+	see kolab/issue1755
+
 2008-08-11 Richard Bos <richard at radoeka.nl>
 
 	* kolab_bootstrap.in: added syncrepl support, see kolab/issue1755



From cvs at kolab.org  Thu Aug 14 21:33:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Aug 2008 21:33:08 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.20,
	1.21 
Message-ID: <20080814193308.64D36600B84@lists.intevation.de>

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
added syncrepl support, see kolab/issue1755



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- slapd.conf.template.in	5 Aug 2008 20:41:11 -0000	1.20
+++ slapd.conf.template.in	14 Aug 2008 19:33:06 -0000	1.21
@@ -24,10 +24,22 @@
 #include @ldapserver_schemadir@/horde.schema
 
 pidfile		@ldapserver_pidfile@
-replica-pidfile	@ldapserverslurpd_pidfile@
 argsfile	@ldapserver_argsfile@
+
+@@@if directory_replication_mode_is_syncrepl@@@
+# Use syncprov/syncrepl method for ldap replication
+moduleload syncprov
+overlay syncprov
+syncprov-checkpoint 1024 16
+syncprov-sessionlog 4096
+syncprov-reloadhint TRUE
+index entryCSN eq
+index entryUUID eq
+@@@else@@@
+replica-pidfile	@ldapserverslurpd_pidfile@
 replogfile      @ldapserver_replogfile@
 replicationinterval 5
+@@@endif@@@
 
 TLSCertificateFile     @sysconfdir@/kolab/cert.pem
 TLSCertificateKeyFile  @sysconfdir@/kolab/key.pem



From cvs at kolab.org  Fri Aug 15 12:09:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Aug 2008 12:09:43 +0200 (CEST)
Subject: gunnar: server Makefile,1.52,1.53 cvs-kolab.sh,1.22,1.23 
Message-ID: <20080815100943.5FE77600BA8@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile cvs-kolab.sh 
Log Message:
Remove the horde package generation as this has been broken by the upstream removal of the release candidate packages. Package generation of kolab-webclient will be added as a replacement soon.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Makefile	15 May 2008 05:48:42 -0000	1.52
+++ Makefile	15 Aug 2008 10:09:40 -0000	1.53
@@ -57,19 +57,6 @@
                pear/PEAR-Net_SMTP       \
                pear/PEAR-Net_LMTP       \
                pear/PEAR-HTTP_Request   \
-               horde/php-channel-horde  \
-               horde/fbview-horde       \
-               horde/fbview-kronolith   \
-               horde/horde-framework    \
-               horde/horde-passwd       \
-               horde/horde              \
-               horde/horde-ingo         \
-               horde/horde-imp          \
-               horde/horde-kronolith    \
-               horde/horde-mnemo        \
-               horde/horde-nag          \
-               horde/horde-turba        \
-               horde/horde-kolab-client
 
 BASE_FILES=install-kolab.sh \
            README.1st

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cvs-kolab.sh	11 Aug 2008 08:47:48 -0000	1.22
+++ cvs-kolab.sh	15 Aug 2008 10:09:40 -0000	1.23
@@ -96,32 +96,34 @@
 	cvs -q update -P -d
     fi
     chown -R "${KOLAB_DEV_USER}:" "/${KOLAB_DEV_USER}/CVS"
-    su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not installing! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
+#    su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not installing! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
+
     cd "${KOLAB_PACKAGES}/source-original"
 
-    if [ ! -e "${KOLAB_PACKAGES}/binary-${KOLAB_DEV_USER}" ]; then
-	./install-kolab.sh -D -t "${KOLAB_DEV_USER}"
-	mv "/${KOLAB_DEV_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_DEV_USER}"
+    SDIST_DIR="${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
+    if [ ! -e ${SDIST_DIR} ]; then
+	mkdir "${SDIST_DIR}"
     fi
 
-    ./install-kolab.sh -S -t "${KOLAB_DEV_USER}"
-    if [ ! -e "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}" ]; then
-	mv "/${KOLAB_DEV_USER}/RPM/SDIST/" "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
-    else
-	rsync -avz "/${KOLAB_DEV_USER}/RPM/SDIST/" "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
+    INSTALLER=`find . -name "openpkg-*.src.sh" -print`
+    if [ -z "$INSTALLER" ]; then  
+        echo "No source based installer found. Unable to create a source distribution!"  
+        exit 1  
     fi
+    cp "${INSTALLER}" "${SDIST_DIR}/"
+    rsync -avz *.src.rpm "${SDIST_DIR}/"
+    cp "/${KOLAB_DEV_USER}/CVS/server/install-kolab.sh" "${SDIST_DIR}/"
 
-    cd "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
+    rsync -avz /"${KOLAB_DEV_USER}"/RPM/PKG/*.src.rpm "${SDIST_DIR}/"
 
+    cd "${SDIST_DIR}"
+
+    echo "Regenerating package index ..."
+    /"${KOLAB_DEV_USER}"/bin/openpkg index -r . -o 00INDEX.rdf -i . || die "Indexing failed! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
+    
     echo "Installing the test environment in /${KOLAB_INSTALL_USER}. This will take a long time ..."
 
     ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -I 22414 ${INSTALL_OPTS} > kolab-build.log 2>&1
-    ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -D
-    if [ ! -e "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}" ]; then
-	mv "/${KOLAB_INSTALL_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}"
-    else
-	rsync -avz "/${KOLAB_INSTALL_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}/"
-    fi
 
     echo "Everything finished!"
     echo "You should now run:"
@@ -139,15 +141,18 @@
     cvs -q update -P -d
     chown -R "${KOLAB_DEV_USER}:" "/${KOLAB_DEV_USER}/CVS"
     su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not updating! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
-    cd "${KOLAB_PACKAGES}/source-original"
-    ./install-kolab.sh -S -t "${KOLAB_DEV_USER}"
-    rsync -avz "/${KOLAB_DEV_USER}/RPM/SDIST/" "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
-    ./install-kolab.sh -D -t "${KOLAB_DEV_USER}"
-    rsync -avz "/${KOLAB_DEV_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_DEV_USER}/"
+
+    rsync -avz "/${KOLAB_DEV_USER}/RPM/PKG/" "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
+
     cd "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
+
+    echo "Regenerating package index ..."  || die "Indexing failed! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
+    ./install-kolab.sh -t "${KOLAB_DEV_USER}" -X
+    
+    echo "Updating the test environment in /${KOLAB_INSTALL_USER}. This will take a long time ..."
+
     ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -I 22414 ${INSTALL_OPTS} > kolab-build.log 2>&1
-    ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -D
-    rsync -avz "/${KOLAB_INSTALL_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}/"
+
     echo "Everything finished!"
     echo "You should now run:"
     echo



From cvs at kolab.org  Fri Aug 15 17:13:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Aug 2008 17:13:34 +0200 (CEST)
Subject: wilde: doc/www/src about-kolab-server.html.m4,1.6,1.7 
Message-ID: <20080815151334.9DBBE600BB5@lists.intevation.de>

Author: wilde

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

Modified Files:
	about-kolab-server.html.m4 
Log Message:
Added OpenSSL acknowledgment.


Index: about-kolab-server.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-server.html.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- about-kolab-server.html.m4	12 Jun 2008 07:12:07 -0000	1.6
+++ about-kolab-server.html.m4	15 Aug 2008 15:13:32 -0000	1.7
@@ -116,4 +116,13 @@
 the components and uses OpenLDAP as the store for Authentication information.
 </div>
 
+<div class="logo-text-right">
+<h3>OpenSSL</h3>
+This product includes software developed by the OpenSSL Project for
+use in the OpenSSL Toolkit. (<a href="http://www.openssl.org/">http://www.openssl.org/</a>)
+<p>
+This product includes cryptographic software written by
+Eric Young (eay at cryptsoft.com)
+</div>
+
 m4_include(footer.html.m4)



From cvs at kolab.org  Fri Aug 15 17:28:24 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Aug 2008 17:28:24 +0200 (CEST)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	index.php.in, 1.1, 1.2 
Message-ID: <20080815152824.26296600BB3@lists.intevation.de>

Author: wilde

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

Modified Files:
	index.php.in 
Log Message:
Fixed Emacs local vars to set coding system to utf-8.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	15 Aug 2008 15:28:21 -0000	1.2
@@ -37,7 +37,7 @@
   mode: php
   indent-tabs-mode: t
   tab-width: 4
-  buffer-file-coding-system: utf-8
+  coding: utf-8
   End:
 */
  ?>



From cvs at kolab.org  Fri Aug 15 18:04:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Aug 2008 18:04:23 +0200 (CEST)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	kolab.tpl, 1.7, 1.8 
Message-ID: <20080815160423.4BDE8600BB3@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab.tpl 
Log Message:
Added acknowledgments for OpenSSL and PHP.


Index: kolab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kolab.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab.tpl	20 May 2008 17:32:32 -0000	1.7
+++ kolab.tpl	15 Aug 2008 16:04:21 -0000	1.8
@@ -96,4 +96,15 @@
 </ul>
 </div>
 
+<hr>
+<small>
+  <p>
+    This product includes PHP, freely available from
+    http://www.php.net/
+  </p><p>
+    This product includes software developed by the OpenSSL Project
+    for use in the OpenSSL Toolkit (http://www.openssl.org/)
+  </p>
+</small>
+
 </div>



From cvs at kolab.org  Fri Aug 15 18:04:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Aug 2008 18:04:23 +0200 (CEST)
Subject: wilde: server/kolab-webadmin/kolab-webadmin ChangeLog,1.104,1.105 
Message-ID: <20080815160423.4BF43600BB4@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Added acknowledgments for OpenSSL and PHP.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- ChangeLog	5 Jul 2008 14:33:32 -0000	1.104
+++ ChangeLog	15 Aug 2008 16:04:20 -0000	1.105
@@ -1,3 +1,8 @@
+2008-08-15  Sascha Wilde  <wilde at intevation.de>
+
+	* php/admin/templates/kolab.tpl: Added acknowledgments for PHP and
+	OpenSSL according to their respective licenses.
+
 2008-07-05 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/locale/nl/LC_MESSAGES/messages.po: changed translation to Kolab



From cvs at kolab.org  Mon Aug 18 10:24:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 10:24:56 +0200 (CEST)
Subject: gunnar: server/apache-php kolab.patch,1.2,1.3 
Message-ID: <20080818082456.9AA9A600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab.patch 
Log Message:
Activated sqlite support in PHP.

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.patch	20 May 2008 17:11:08 -0000	1.2
+++ kolab.patch	18 Aug 2008 08:24:54 -0000	1.3
@@ -10,7 +10,7 @@
  License:      PHP
  Version:      %{V_php}
 -Release:      20080514
-+Release:      20080514_kolab
++Release:      20080818_kolab
  
  #   package options
  %option       with_suhosin              no
@@ -44,3 +44,17 @@
  %endif
  
  %build
+@@ -400,11 +400,12 @@
+ %if "%{with_calendar}" == "yes"
+         --enable-calendar \
+ %endif
+-        --without-sqlite \
+ %if "%{with_sqlite}" == "yes"
+         --with-pdo-sqlite=%{l_prefix} \
++        --with-sqlite=%{l_prefix} \
+ %else
+         --without-pdo-sqlite \
++        --without-sqlite \
+ %endif
+ %if "%{with_mysql}" == "yes"
+         --with-mysql=%{l_prefix} \



From cvs at kolab.org  Mon Aug 18 10:24:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 10:24:56 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.29,1.30 
Message-ID: <20080818082456.C0354600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolabd.spec.in 
Log Message:
Activated sqlite support in PHP.

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kolabd.spec.in	9 Jul 2008 15:32:07 -0000	1.29
+++ kolabd.spec.in	18 Aug 2008 08:24:54 -0000	1.30
@@ -65,8 +65,8 @@
 %if "%{with_horde}" == "yes"
 # FIXME (optional)
 # what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_pear = yes, 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
-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
+PreReq:       php, php::with_pear = yes, 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
+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
 %else
 PreReq:       php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes
 PreReq:       apache-php, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_imap_annotate = yes, apache-php::with_openldap = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_dom = yes, apache-php::with_ssl = yes, apache-php::with_mbstring = yes, apache-php::with_mm = yes



From cvs at kolab.org  Mon Aug 18 10:24:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 10:24:56 +0200 (CEST)
Subject: gunnar: server/php kolab.patch,1.9,1.10 
Message-ID: <20080818082456.930A060014F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab.patch 
Log Message:
Activated sqlite support in PHP.

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.patch	20 May 2008 17:11:08 -0000	1.9
+++ kolab.patch	18 Aug 2008 08:24:54 -0000	1.10
@@ -10,7 +10,7 @@
  License:      PHP
  Version:      %{V_php}
 -Release:      20080514
-+Release:      20080514_kolab
++Release:      20080818_kolab
  
  #   package options
  %option       with_suhosin              no
@@ -22,7 +22,7 @@
  %option       with_json                 no
  %option       with_mbregex              no
  %option       with_mbstring             no
-@@ -132,7 +133,8 @@
+@@ -133,7 +134,8 @@
  Source2:      php.ini
  Source3:      http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
  Patch0:       http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
@@ -32,7 +32,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -335,7 +337,10 @@
+@@ -336,7 +338,10 @@
          configure \
          ext/gd/config.m4
  %if "%{with_imap_annotate}" == "yes"
@@ -44,3 +44,17 @@
  %endif
  
  %build
+@@ -396,11 +396,12 @@
+ %if "%{with_calendar}" == "yes"
+         --enable-calendar \
+ %endif
+-        --without-sqlite \
+ %if "%{with_sqlite}" == "yes"
+         --with-pdo-sqlite=%{l_prefix} \
++        --with-sqlite=%{l_prefix} \
+ %else
+         --without-pdo-sqlite \
++        --without-sqlite \
+ %endif
+ %if "%{with_mysql}" == "yes"
+         --with-mysql=%{l_prefix} \



From cvs at kolab.org  Mon Aug 18 10:24:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 10:24:56 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.305,1.306 
Message-ID: <20080818082456.BE3AC60014F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Activated sqlite support in PHP.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- release-notes.txt	8 Aug 2008 06:25:18 -0000	1.305
+++ release-notes.txt	18 Aug 2008 08:24:54 -0000	1.306
@@ -45,6 +45,10 @@
 
 Changes between 2.2.0 and 2.2.1-rc-1
 
+    - apache-php-5.2.6-20080818_kolab
+
+	Added full sqlite support.
+
     - perl-kolab-2.2.1.rc1-2008????
 
 	Added syncrepl backend (inactive by default)
@@ -56,11 +60,17 @@
 	Added configuration option in resmgr.conf for local delivery
 	backend.  (Makes it possible to activate the new LDA backend)
 
+	Activated sqlite support in PHP.
+
 	kolab/issue2910 (obsolete definition of schemacheck in slapd.conf)
 	kolab/issue2911 (Change comments around the idletimeout definiton
 	                 in the file templates/slapd.conf.template.in)
 	kolab/issue2961 (added smtpd_sasl_authenticated_header = yes for
 	                 simpler authorization)
+
+    - php-5.2.6-20080818_kolab
+
+	Added full sqlite support.
 
     - php-kolab-2.2.1.rc1-2008????
 



From cvs at kolab.org  Mon Aug 18 10:28:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 10:28:23 +0200 (CEST)
Subject: gunnar: server/kolab-webclient .cvsignore, NONE,
	1.1 webclient-kolab-conf.template, NONE,
	1.1 webclient-kronolith-kolab-conf.template, NONE,
	1.1 kolab-webclient.spec, 1.1, 1.2 horde-kolab-conf.template,
	1.1, NONE horde-kronolith-kolab-conf.template, 1.1, NONE 
Message-ID: <20080818082823.88325600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab-webclient.spec 
Added Files:
	.cvsignore webclient-kolab-conf.template 
	webclient-kronolith-kolab-conf.template 
Removed Files:
	horde-kolab-conf.template horde-kronolith-kolab-conf.template 
Log Message:
This completes the kolab-webclient package to an early draft version.

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

--- NEW FILE: webclient-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
$conf['cookie']['path'] = '/client';
$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
@@@if cyrus-imap@@@
$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
@@@else@@@
$conf['kolab']['imap']['server'] = '@@@local_addr@@@';
@@@endif@@@
$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
?>

--- NEW FILE: webclient-kronolith-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
?>

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-webclient.spec	11 Aug 2008 13:57:04 -0000	1.1
+++ kolab-webclient.spec	18 Aug 2008 08:28:21 -0000	1.2
@@ -24,8 +24,8 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_version}.tar.gz
 Source1:        http://ftp.horde.org/pub/passwd/passwd-h3-%{V_passwd_version}.tar.gz
-Source2:        horde-kolab-conf.template
-Source3:        horde-kronolith-kolab-conf.template
+Source2:        webclient-kolab-conf.template
+Source3:        webclient-kronolith-kolab-conf.template
 
 # List of Patches
 Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch
@@ -60,7 +60,6 @@
 
 %install
 
-	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/webclient
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/storage
@@ -74,6 +73,8 @@
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/
 
+        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql
+
 	cd ..
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd
@@ -82,9 +83,8 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/webclient \
-            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \
-	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kolab-conf.template' \
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kronolith-kolab-conf.template' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/dimp/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/imp/config/*.php' \
@@ -95,7 +95,12 @@
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/nag/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/passwd/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/turba/config/*.php' \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/log \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/tmp \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage/horde.db \
+	    '%Defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php \
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/**/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- horde-kolab-conf.template DELETED ---

--- horde-kronolith-kolab-conf.template DELETED ---



From cvs at kolab.org  Mon Aug 18 16:32:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 16:32:59 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format - New directory 
Message-ID: <20080818143259.7F9CC60016A@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Format added to the repository




From cvs at kolab.org  Mon Aug 18 16:41:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Aug 2008 16:41:26 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format ChangeLog, NONE,
	1.1 Kolab_Format.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080818144126.D58A160016A@lists.intevation.de>

Author: gunnar

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

Added Files:
	ChangeLog Kolab_Format.spec Makefile 
Log Message:
Added the first of the new Kolab_* packages.

--- NEW FILE: ChangeLog ---
2008-08-18  Gunnar Wrobel  <p at rdus.de>

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


--- NEW FILE: Kolab_Format.spec ---
# Variables
%define         V_package Kolab_Format
%define         V_version 0.1.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   A package for reading/writing Kolab data formats.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   PHP License
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  php-channel-horde
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes

%description 
A package for reading/writing Kolab data formats.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Wed Aug 20 22:14:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Aug 2008 22:14:05 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.7,1.8 
Message-ID: <20080820201405.13677600B87@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Added function bootstrapConfig to create config
files needed during kolab bootstrapping, see kolab/issue1755



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	9 Aug 2008 09:42:38 -0000	1.7
+++ ChangeLog	20 Aug 2008 20:14:02 -0000	1.8
@@ -1,3 +1,8 @@
+2008-08-20 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: added function bootstrapConfig to create config
+	  files needed during kolab bootstrapping, see kolab/issue1755
+
 2008-08-09 Richard Bos <richard at radoeka.nl>
 
 	* Kolab-Conf/Conf.pm.in: added syncrepl support (see kolab/issue1755)



From cvs at kolab.org  Wed Aug 20 22:14:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Aug 2008 22:14:05 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.14,1.15 
Message-ID: <20080820201405.14AB9600BA8@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv19064/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Added function bootstrapConfig to create config
files needed during kolab bootstrapping, see kolab/issue1755



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Conf.pm	9 Aug 2008 09:42:38 -0000	1.14
+++ Conf.pm	20 Aug 2008 20:14:03 -0000	1.15
@@ -703,6 +703,43 @@
     }
 }
 
+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 );
+
+    my $cfg;
+    my $out;
+    foreach my $tpl (@templ) {
+      $cfg = $templates{$tpl};
+      # print STDOUT "Rebuilding $tpl => $cfg\n";
+      build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg} );
+
+      if ($tpl eq "$templatedir/slapd.conf.template") {
+        # Update file in place
+        if (open (CFG, "+< $cfg" )) {
+          while (<CFG>) {
+            s/^TLSCertificate/#TLSCertificate/;
+            $out .= $_;
+          }
+          seek(CFG, 0, 0);
+          print CFG $out;
+          truncate(CFG, tell(CFG));
+          close(CFG);
+	}
+      }
+    }
+}
+
 sub checkPermissions {
     my $key;
     my $value;



From cvs at kolab.org  Wed Aug 20 22:15:42 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Aug 2008 22:15:42 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.183,
	1.184 kolab_bootstrap.in, 1.39, 1.40 
Message-ID: <20080820201542.4DE2360C4A6@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
Added syncrepl support, see kolab/issue1755



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- ChangeLog	14 Aug 2008 19:33:06 -0000	1.183
+++ ChangeLog	20 Aug 2008 20:15:40 -0000	1.184
@@ -1,3 +1,7 @@
+2008-08-20 Richard Bos <richard at radoeka.nl>
+
+	* kolab_bootstrap.in: added syncrepl support, see kolab/issue1755
+
 2008-08-14 Richard Bos <richard at radoeka.nl>
 
 	* templates/slapd.conf.template.in: added syncrepl support,

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- kolab_bootstrap.in	11 Aug 2008 19:22:55 -0000	1.39
+++ kolab_bootstrap.in	20 Aug 2008 20:15:40 -0000	1.40
@@ -17,6 +17,8 @@
 use Socket;
 use IO::File;
 use IO::Select;
+use Kolab;
+use Kolab::Conf;
 use Net::Domain qw(hostfqdn);
 use Net::LDAP;
 use Net::LDAP::Entry;
@@ -393,73 +395,24 @@
         exit 1;
       }
 
-      # Creating slapd.conf from template
-      my $tmpl = IO::File->new("@sysconfdir@/kolab/templates/slapd.conf.template", "r") || die "could not read @sysconfdir@/kolab/templates/slapd.conf.template";
-      my $slpd = IO::File->new("@ldapserver_confdir@/slapd.conf","w+") || die "could not write to @ldapserver_confdir@/slapd.conf";
-      chmod (0640,"@ldapserver_confdir@/slapd.conf");
-      while (<$tmpl>) {
-        if (/^KOLAB_META_START$/) {
-           my $found_end;
-           while (!$found_end) {
-               $_ = <$tmpl>;
-               $found_end = /^KOLAB_META_END$/;
-           }
-           $_ = <$tmpl>;
-        }
-        s/\@\@\@base_dn\@\@\@/$base_dn/g;
-        s/\@\@\@bind_dn\@\@\@/$bind_dn/g;
-        s/\@\@\@bind_pw_hash\@\@\@/$bind_pw/g;
-        s/\@\@\@slurpd_addr\@\@\@/$slurpd_addr/g;
-        s/\@\@\@slurpd_port\@\@\@/$slurpd_port/g;
-        s/TLSCertificate/\#TLSCertificate/g;
-        print $slpd $_;
-      }
-      undef $slpd;
-      undef $tmpl;
-      kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
-      
-      my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
-      $confname = "@ldapserver_confdir@/slapd.replicas";
+      # Read the variables templatedir and log_level from kolab.globals.
+      # These variables are needed by the kolab configuration functions of
+      # Kolab::Conf need the variables.
+      %Kolab::config = Kolab::readConfig("@sysconfdir@/kolab/kolab.globals");
+      $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{"slurpd_addr"} = $slurpd_addr;
+      $Kolab::config{"slurpd_port"} = $slurpd_port;
 
-      $tmpl = IO::File->new($tmplname, "r") || die "could not read $tmplname";
-      $slpd = IO::File->new($confname,"w+") || die "could not write to $confname";
-      chmod (0640,$confname);
-      while (<$tmpl>) {
-        if (/^KOLAB_META_START$/) {
-           my $found_end;
-           while (!$found_end) {
-               $_ = <$tmpl>;
-               $found_end = /^KOLAB_META_END$/;
-           }
-           $_ = <$tmpl>;
-        }
-        print $slpd $_;
-      }
-      undef $slpd;
-      undef $tmpl;
-      kolab_chown "@ldapserver_usr@","@ldapserver_grp@",$confname;
-		
-      $tmplname = "@sysconfdir@/kolab/templates/slapd.access.template";
-      $confname = "@ldapserver_confdir@/slapd.access";
+      # During boot some settings like TLS certificates are not defined yet and
+      # hence can't be used, these definitons are skipped when
+      # bootstrap_config = true
+      $Kolab::config{"bootstrap_config"} = 'true';
+      Kolab::Conf::bootstrapConfig();
+      $Kolab::config{"bootstrap_config"} = 'false';
 
-      $tmpl = IO::File->new($tmplname, "r") || die "could not read $tmplname";
-      $slpd = IO::File->new($confname,"w+") || die "could not write to $confname";
-      chmod (0640,$confname);
-      while (<$tmpl>) {
-        if (/^KOLAB_META_START$/) {
-           my $found_end;
-           while (!$found_end) {
-               $_ = <$tmpl>;
-               $found_end = /^KOLAB_META_END$/;
-           }
-           $_ = <$tmpl>;
-        }
-        print $slpd $_;
-      }
-      undef $slpd;
-      undef $tmpl;
-      kolab_chown "@ldapserver_usr@","@ldapserver_grp@",$confname;
-		
       # now we must startup slapd
       print "temporarily starting slapd\n";
       $ldap_uri = "ldap://127.0.0.1:389/";



From cvs at kolab.org  Thu Aug 21 06:59:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Aug 2008 06:59:55 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.1.2 - New directory 
Message-ID: <20080821045955.94E6A600BAD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.2
In directory doto:/tmp/cvs-serv8033/1.1.2

Log Message:
Directory /kolabrepository/server/patches/horde-webmail/1.1.2 added to the repository




From cvs at kolab.org  Thu Aug 21 07:00:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Aug 2008 07:00:49 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.1.2
	horde-webmail-1.1.2_kolab_openpkg.patch, NONE, 1.1 
Message-ID: <20080821050049.84C0F600BB3@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.2
In directory doto:/tmp/cvs-serv8109

Added Files:
	horde-webmail-1.1.2_kolab_openpkg.patch 
Log Message:
Fixed ingo configuration issue, added some patches for the IMP<->turba interaction (storing addresses, gpg keys).

--- NEW FILE: horde-webmail-1.1.2_kolab_openpkg.patch ---
diff -r 6ddf0bc2c0f1 config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/conf.php	Thu Aug 21 06:55:39 2008 +0200
@@ -0,0 +1,115 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
[...2761 lines suppressed...]
+        }
+        if (isset($attributes['given-name'])) {
+            $attributes['full-name'] = $attributes['given-name'] . ' ' . $attributes['full-name'];
+        }
+
         $group = false;
         if (isset($attributes['__type']) && $attributes['__type'] == 'Group') {
             $group = true;
diff -r 6ddf0bc2c0f1 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Thu Aug 21 06:52:30 2008 +0200
+++ b/turba/lib/Driver/share.php	Thu Aug 21 06:55:39 2008 +0200
@@ -145,7 +145,7 @@
     function _deleteAll($sourceName = null)
     {
         if (is_null($sourceName)) {
-            $sourceName = $this->getContactOwner();
+            $sourceName = $this->getName();
         }
         return $this->_driver->_deleteAll($sourceName);
     }



From cvs at kolab.org  Mon Aug 25 08:01:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 08:01:59 +0200 (CEST)
Subject: martin: server/kolabd/kolabd kolab.conf,1.4,NONE 
Message-ID: <20080825060159.B965E600BBB@lists.intevation.de>

Author: martin

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

Removed Files:
	kolab.conf 
Log Message:
Martin Konold: remove obsolete file (is generated from template instead). https://www.intevation.de/roundup/kolab/issue2994


--- kolab.conf DELETED ---



From cvs at kolab.org  Mon Aug 25 18:33:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:33:46 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.21, 1.22 
Message-ID: <20080825163346.6346B60C4B7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
In directory doto:/tmp/cvs-serv18408/es/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- messages.po	10 Apr 2008 12:39:36 -0000	1.21
+++ messages.po	25 Aug 2008 16:33:44 -0000	1.22
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin Spanish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-10 12:58+0200\n"
+"POT-Creation-Date: 2008-08-25 18:29+0200\n"
 "PO-Revision-Date: 2007-11-21 14:56+0100\n"
 "Last-Translator: Aron Galdon <aron20012004 at ya.com>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
@@ -19,7 +19,7 @@
 msgstr "La dirección con DN"
 
 #: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:146 tpl_messages.php:164
+#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
 msgid "has been deleted"
 msgstr "ha sido borrado"
 
@@ -32,29 +32,29 @@
 msgstr "(sólo direcciones externas con una cuenta de usuario kolab)"
 
 #: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:149
-#: tpl_messages.php:172 ../../../www/admin/addressbook/index.php.in:121
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
+#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
 #: ../../../www/admin/user/index.php.in:183
 msgid "Name"
 msgstr "Nombre"
 
 #: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
 #: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:152 tpl_messages.php:175 tpl_messages.php:230
-#: tpl_messages.php:243
+#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
+#: tpl_messages.php:221
 msgid "Action"
 msgstr "Acción"
 
 #: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
 #: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:154 tpl_messages.php:177
+#: tpl_messages.php:200 tpl_messages.php:223
 msgid "Modify"
 msgstr "Modificar"
 
 #: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
 #: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:155 tpl_messages.php:178 tpl_messages.php:231
-#: tpl_messages.php:244 ../../../www/admin/addressbook/addr.php.in:277
+#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
+#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
 #: ../../../www/admin/administrator/admin.php.in:307
 #: ../../../www/admin/distributionlist/list.php.in:300
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
@@ -64,19 +64,19 @@
 msgid "Delete"
 msgstr "Borrar"
 
-#: tpl_messages.php:11 tpl_messages.php:167 tpl_messages.php:180
+#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
 msgid "[ ALL ]"
 msgstr "[ TODOS ]"
 
-#: tpl_messages.php:12 tpl_messages.php:168 tpl_messages.php:181
+#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
 msgid "[ OTHER ]"
 msgstr "[ OTROS ]"
 
-#: tpl_messages.php:13 tpl_messages.php:169 tpl_messages.php:182
+#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: tpl_messages.php:14 tpl_messages.php:170 tpl_messages.php:183
+#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
 msgid "Filter"
 msgstr "Filtro"
 
@@ -310,10 +310,10 @@
 msgid "Deliver regular mail to folder"
 msgstr "Recibir correo regular a carpeta"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:193
-#: tpl_messages.php:208 tpl_messages.php:212 tpl_messages.php:215
-#: tpl_messages.php:218 tpl_messages.php:221 tpl_messages.php:224
-#: tpl_messages.php:227 tpl_messages.php:240
+#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
+#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
+#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
+#: tpl_messages.php:185 tpl_messages.php:239
 msgid "Update"
 msgstr "Actualizar"
 
@@ -735,154 +735,14 @@
 msgstr "Mensaje:"
 
 #: tpl_messages.php:145
-msgid "The shared folder with DN"
-msgstr "La carpeta compartida con DN"
-
-#: tpl_messages.php:147
-msgid "Back to list of shared folders"
-msgstr "Volver a la lista de carpetas compartidas"
-
-#: tpl_messages.php:148
-msgid "Shared folders"
-msgstr "Carpetas compartidas"
-
-#: tpl_messages.php:150
-msgid "Server"
-msgstr "Servidor"
-
-#: tpl_messages.php:151 tpl_messages.php:171
-msgid "Type"
-msgstr "Tipo"
-
-#: tpl_messages.php:153
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Carpeta borrada, esperando limpieza..."
-
-#: tpl_messages.php:156 tpl_messages.php:194
-msgid "Welcome to the Kolab administration interface"
-msgstr "Bienvenida al interfaz de administración de Kolab"
-
-#: tpl_messages.php:157
-msgid "NOTE:"
-msgstr "NOTA:"
-
-#: tpl_messages.php:158
-msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
-msgstr ""
-"No hay un cuenta configurada para recibir mensajes de direcciones "
-"administrativas. Si todavía no ha creado una cuenta para ello,"
-
-#: tpl_messages.php:159
-msgid "please do so"
-msgstr "por favor hacer así"
-
-#: tpl_messages.php:160
-msgid "and then go"
-msgstr "y entonces vamos"
-
-#: tpl_messages.php:161
-msgid "here"
-msgstr "aquí"
-
-#: tpl_messages.php:162
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "para establecer el envío de correo a las direcciones administrativas."
-
-#: tpl_messages.php:163
-msgid "The user with DN"
-msgstr "El usuario con DN"
-
-#: tpl_messages.php:165
-msgid "Back to list of users"
-msgstr "Volver a la lista de usuarios"
-
-#: tpl_messages.php:166 tpl_messages.php:179
-msgid "Email Users"
-msgstr "Usuario de correo electrónico"
-
-#: tpl_messages.php:173
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#: tpl_messages.php:174
-msgid "uid"
-msgstr ""
-
-#: tpl_messages.php:176
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Usuario borrado, esperando limpieza..."
-
-#: tpl_messages.php:184
-msgid "Vacation Notification"
-msgstr "Notificación de vacaciones"
-
-#: tpl_messages.php:185
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Activar la notificación de vacaciones (sólo una por periodo vacacional, "
-"envío y recepción a carpeta pueden ser activados en cualquier momento)"
-
-#: tpl_messages.php:186
-msgid "Resend notification only after"
-msgstr "Reenviar notificación sólo después"
-
-#: tpl_messages.php:187
-msgid "days"
-msgstr "días"
-
-#: tpl_messages.php:188
-msgid "Send responses for these addresses:"
-msgstr "Enviar respuestas para estas direcciones:"
-
-#: tpl_messages.php:189
-msgid "(one address per line)"
-msgstr "(una dirección por línea)"
-
-#: tpl_messages.php:190
-msgid "Do not send vacation replies to spam messages"
-msgstr "No enviar respuestas de vacaciones a mensajes de correo basura"
-
-#: tpl_messages.php:191
-msgid "Only react to mail coming from domain"
-msgstr "Reaccionar sólo a los mensajes que vengan del dominio"
-
-#: tpl_messages.php:192
-msgid "(leave empty for all domains)"
-msgstr "(dejar vacío para todos los dominios)"
-
-#: tpl_messages.php:195
-msgid "Kolab2 Groupware Server Version"
-msgstr "Servidor Groupware Kolab2 Versión"
-
-#: tpl_messages.php:196
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Componentes del Servidor groupware Kolab2 Versiones"
-
-#: tpl_messages.php:197
-msgid "PEAR/Horde Versions"
-msgstr ""
-
-#: tpl_messages.php:198
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Paquetes Kolab2 OpenPKG Parcheados Versiones"
-
-#: tpl_messages.php:199
-msgid "OpenPKG Version"
-msgstr "OpenPKG Versión"
-
-#: tpl_messages.php:200
 msgid "Kolab Server Settings"
 msgstr "Ajustes del Servidor Kolab"
 
-#: tpl_messages.php:201
+#: tpl_messages.php:146
 msgid "Administrative email addresses"
 msgstr "Direcciones de correo electrónico administrativas"
 
-#: tpl_messages.php:202
+#: tpl_messages.php:147
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -899,63 +759,63 @@
 "direcciones. Más tarde podrá añadir o eliminar gente de las listas como en "
 "cualquier otra lista de distribución"
 
-#: tpl_messages.php:203
+#: tpl_messages.php:148
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Dirección de correo electrónico de la cuenta que debe recibir mensajes "
 "administrativos para el dominio"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:149
 msgid "Create Distribution Lists"
 msgstr "Crear listas de distribución"
 
-#: tpl_messages.php:205
+#: tpl_messages.php:150
 msgid "Enable or Disable individual Services"
 msgstr "Habilitar o deshabilitar servicios individuales"
 
-#: tpl_messages.php:206
+#: tpl_messages.php:151
 msgid "Service"
 msgstr "Servicio"
 
-#: tpl_messages.php:207
+#: tpl_messages.php:152
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: tpl_messages.php:209
+#: tpl_messages.php:154
 msgid "Quota settings"
 msgstr "Ajustes de cuota"
 
-#: tpl_messages.php:210
+#: tpl_messages.php:155
 msgid "Warn users when they have used"
 msgstr "Avisar a los usuarios cuando hayan usado"
 
-#: tpl_messages.php:211
+#: tpl_messages.php:156
 #, php-format
 msgid "% of their quota"
 msgstr "% de su cuota"
 
-#: tpl_messages.php:213
+#: tpl_messages.php:158
 msgid "Free/Busy settings"
 msgstr "Ajustes de libre/ocupado"
 
-#: tpl_messages.php:214
+#: tpl_messages.php:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permitir descarga sin autentificar de información libre/ocupada"
 
-#: tpl_messages.php:216
+#: tpl_messages.php:161
 msgid "When creating free/busy lists, include data from"
 msgstr "Cuando se creen listas libres/ocupadas, incluir datos desde"
 
-#: tpl_messages.php:217
+#: tpl_messages.php:162
 msgid "days in the past"
 msgstr "días en el pasado"
 
-#: tpl_messages.php:219
+#: tpl_messages.php:164
 msgid "Privileged Networks"
 msgstr "Redes privilegiadas"
 
-#: tpl_messages.php:220
+#: tpl_messages.php:165
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -965,11 +825,11 @@
 "SMTP sin autentificar al servidor Kolab (redes separadas por comas en "
 "formato x.x.x.x/y):"
 
-#: tpl_messages.php:222
+#: tpl_messages.php:167
 msgid "SMTP \"smarthost/relayhost\""
 msgstr ""
 
-#: tpl_messages.php:223
+#: tpl_messages.php:168
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -977,11 +837,11 @@
 "Smarthost (y puerto opcional) a usar para enviar correo saliente (host."
 "domain.tld). Dejar vacío para no relayhost."
 
-#: tpl_messages.php:225
+#: tpl_messages.php:170
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo Internet"
 
-#: tpl_messages.php:226
+#: tpl_messages.php:171
 msgid ""
 "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 "
@@ -994,30 +854,30 @@
 "desde puertas de enlace SMTP que se encuentren dentro de las red "
 "privilegiada."
 
-#: tpl_messages.php:228
+#: tpl_messages.php:173
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
 msgid "Domains"
 msgstr "Dominios"
 
-#: tpl_messages.php:229
+#: tpl_messages.php:174
 msgid "Domain"
 msgstr "Dominio"
 
-#: tpl_messages.php:232 tpl_messages.php:245
+#: tpl_messages.php:177 tpl_messages.php:190
 msgid "Add"
 msgstr "Añadir"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:178
 msgid "Mail Filter Settings"
 msgstr "Ajustes del filtro de correo electrónico"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:179
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Comprobar desajustes en la cabecera From de los mensajes y en el from del "
 "sobre."
 
-#: tpl_messages.php:235
+#: tpl_messages.php:180
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -1025,11 +885,11 @@
 "Usar la cabecera Sender en lugar de From para los chequeos anteriores si el "
 "remitente está presente."
 
-#: tpl_messages.php:236
+#: tpl_messages.php:181
 msgid "Action to take for messages that fail the check:"
 msgstr ""
 
-#: tpl_messages.php:237
+#: tpl_messages.php:182
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -1040,11 +900,11 @@
 "reescribe la cabecera From de modo que el recipiente pueda ver la potencial "
 "falsificación."
 
-#: tpl_messages.php:238
+#: tpl_messages.php:183
 msgid "Always reject the message."
 msgstr "Rechazar siempre el mensaje."
 
-#: tpl_messages.php:239
+#: tpl_messages.php:184
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -1055,14 +915,154 @@
 "una cuenta de este servidor. Es sabido que puede causar problemas con listas "
 "de correo."
 
-#: tpl_messages.php:241
+#: tpl_messages.php:186
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Nombres de host Kolab (para Maestro y Esclavos)"
 
-#: tpl_messages.php:242
+#: tpl_messages.php:187
 msgid "Host"
 msgstr ""
 
+#: tpl_messages.php:191
+msgid "The shared folder with DN"
+msgstr "La carpeta compartida con DN"
+
+#: tpl_messages.php:193
+msgid "Back to list of shared folders"
+msgstr "Volver a la lista de carpetas compartidas"
+
+#: tpl_messages.php:194
+msgid "Shared folders"
+msgstr "Carpetas compartidas"
+
+#: tpl_messages.php:196
+msgid "Server"
+msgstr "Servidor"
+
+#: tpl_messages.php:197 tpl_messages.php:217
+msgid "Type"
+msgstr "Tipo"
+
+#: tpl_messages.php:199
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Carpeta borrada, esperando limpieza..."
+
+#: tpl_messages.php:202 tpl_messages.php:245
+msgid "Welcome to the Kolab administration interface"
+msgstr "Bienvenida al interfaz de administración de Kolab"
+
+#: tpl_messages.php:203
+msgid "NOTE:"
+msgstr "NOTA:"
+
+#: tpl_messages.php:204
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"No hay un cuenta configurada para recibir mensajes de direcciones "
+"administrativas. Si todavía no ha creado una cuenta para ello,"
+
+#: tpl_messages.php:205
+msgid "please do so"
+msgstr "por favor hacer así"
+
+#: tpl_messages.php:206
+msgid "and then go"
+msgstr "y entonces vamos"
+
+#: tpl_messages.php:207
+msgid "here"
+msgstr "aquí"
+
+#: tpl_messages.php:208
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr "para establecer el envío de correo a las direcciones administrativas."
+
+#: tpl_messages.php:209
+msgid "The user with DN"
+msgstr "El usuario con DN"
+
+#: tpl_messages.php:211
+msgid "Back to list of users"
+msgstr "Volver a la lista de usuarios"
+
+#: tpl_messages.php:212 tpl_messages.php:225
+msgid "Email Users"
+msgstr "Usuario de correo electrónico"
+
+#: tpl_messages.php:219
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: tpl_messages.php:220
+msgid "uid"
+msgstr ""
+
+#: tpl_messages.php:222
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Usuario borrado, esperando limpieza..."
+
+#: tpl_messages.php:230
+msgid "Vacation Notification"
+msgstr "Notificación de vacaciones"
+
+#: tpl_messages.php:231
+msgid ""
+"Activate vacation notification (only one of vacation, forward and delivery "
+"to folder can be active at any time)"
+msgstr ""
+"Activar la notificación de vacaciones (sólo una por periodo vacacional, "
+"envío y recepción a carpeta pueden ser activados en cualquier momento)"
+
+#: tpl_messages.php:232
+msgid "Resend notification only after"
+msgstr "Reenviar notificación sólo después"
+
+#: tpl_messages.php:233
+msgid "days"
+msgstr "días"
+
+#: tpl_messages.php:234
+msgid "Send responses for these addresses:"
+msgstr "Enviar respuestas para estas direcciones:"
+
+#: tpl_messages.php:235
+msgid "(one address per line)"
+msgstr "(una dirección por línea)"
+
+#: tpl_messages.php:236
+msgid "Do not send vacation replies to spam messages"
+msgstr "No enviar respuestas de vacaciones a mensajes de correo basura"
+
+#: tpl_messages.php:237
+msgid "Only react to mail coming from domain"
+msgstr "Reaccionar sólo a los mensajes que vengan del dominio"
+
+#: tpl_messages.php:238
+msgid "(leave empty for all domains)"
+msgstr "(dejar vacío para todos los dominios)"
+
+#: tpl_messages.php:240
+msgid "Kolab2 Groupware Server Version"
+msgstr "Servidor Groupware Kolab2 Versión"
+
+#: tpl_messages.php:241
+msgid "Kolab2 Groupware Server Component Versions"
+msgstr "Componentes del Servidor groupware Kolab2 Versiones"
+
+#: tpl_messages.php:242
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:243
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Paquetes Kolab2 OpenPKG Parcheados Versiones"
+
+#: tpl_messages.php:244
+msgid "OpenPKG Version"
+msgstr "OpenPKG Versión"
+
 #: ../../../www/admin/addressbook/addr.php.in:17
 #: ../../../www/admin/addressbook/index.php.in:23
 #: ../../../www/admin/administrator/index.php.in:33
@@ -1070,10 +1070,10 @@
 #: ../../../www/admin/distributionlist/list.php.in:37
 #: ../../../www/admin/domainmaintainer/index.php.in:33
 #: ../../../www/admin/maintainer/index.php.in:33
+#: ../../../www/admin/settings/index.php.in:13
 #: ../../../www/admin/sharedfolder/index.php.in:22
 #: ../../../www/admin/sharedfolder/sf.php.in:25
 #: ../../../www/admin/user/index.php.in:34
-#: ../../../www/admin/settings/index.php.in:13
 msgid "Error: You don't have Permissions to access this Menu"
 msgstr "Error: No tiene permisos para acceder a este Menú"
 
@@ -1615,6 +1615,71 @@
 msgid "Maintainer Deleted"
 msgstr "Mantenedor borrado"
 
+#: ../../../www/admin/settings/index.php.in:98
+#, php-format
+msgid "No account found for email address %s"
+msgstr "No se encontró una cuenta para la dirección de correo %s"
+
+#: ../../../www/admin/settings/index.php.in:107
+#, php-format
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "Error de LDAP: No se pudo añadir la lista de distribución %s: %s"
+
+#: ../../../www/admin/settings/index.php.in:109
+#, php-format
+msgid "Successfully created distribution list %s"
+msgstr "Lista de distribución creada con éxito %s"
+
+#: ../../../www/admin/settings/index.php.in:128
+#: ../../../www/admin/settings/index.php.in:137
+#: ../../../www/admin/settings/index.php.in:146
+#: ../../../www/admin/settings/index.php.in:155
+#: ../../../www/admin/settings/index.php.in:165
+#: ../../../www/admin/settings/index.php.in:174
+#: ../../../www/admin/settings/index.php.in:185
+#: ../../../www/admin/settings/index.php.in:199
+#: ../../../www/admin/settings/index.php.in:217
+#: ../../../www/admin/settings/index.php.in:235
+#: ../../../www/admin/settings/index.php.in:252
+#: ../../../www/admin/settings/index.php.in:265
+#, php-format
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr ""
+"Error de LDAP: No se pudo modificar la configuración del objeto Kolab: %s"
+
+#: ../../../www/admin/settings/index.php.in:223
+#, php-format
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "Error de LDAP: No se pudo borrar el objeto de dominio %s: %s"
+
+#: ../../../www/admin/settings/index.php.in:273
+msgid "POP3 Service"
+msgstr "Servicio POP3"
+
+#: ../../../www/admin/settings/index.php.in:274
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "Servicio POP3/SSL (puerto TCP 995)"
+
+#: ../../../www/admin/settings/index.php.in:275
+msgid "IMAP Service"
+msgstr "Servicio IMAP"
+
+#: ../../../www/admin/settings/index.php.in:276
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "Servicio IMAP/SSL (puerto TCP 993)"
+
+#: ../../../www/admin/settings/index.php.in:277
+msgid "Sieve service (TCP port 2000)"
+msgstr "Servicio Sieve (puerto TCP 2000)"
+
+#: ../../../www/admin/settings/index.php.in:278
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
+
+#: ../../../www/admin/settings/index.php.in:279
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Escaneo de correo Amavis (Virus/Spam)"
+
 #: ../../../www/admin/sharedfolder/index.php.in:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
@@ -2035,71 +2100,6 @@
 msgid "<enter your name and email address here>"
 msgstr "<introduzca su nombre y dirección de correo electrónico aquí>"
 
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "No se encontró una cuenta para la dirección de correo %s"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "Error de LDAP: No se pudo añadir la lista de distribución %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Lista de distribución creada con éxito %s"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr ""
-"Error de LDAP: No se pudo modificar la configuración del objeto Kolab: %s"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "Error de LDAP: No se pudo borrar el objeto de dominio %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "Servicio POP3"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "Servicio POP3/SSL (puerto TCP 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "Servicio IMAP"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "Servicio IMAP/SSL (puerto TCP 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Servicio Sieve (puerto TCP 2000)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr ""
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Escaneo de correo Amavis (Virus/Spam)"
-
 #: ../include/auth.class.php.in:40
 msgid "Server error, no ldap object!"
 msgstr "Error en el servidor: ¡no hay objeto ldap!"
@@ -2140,7 +2140,8 @@
 
 #: ../include/form.class.php:55
 msgid ""
-"Phone entries may only contain a-z, numbers and the characters ()-+/.=?:"
+"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
+"=?:"
 msgstr ""
 
 #: ../include/form.class.php:118
@@ -2191,6 +2192,49 @@
 msgid " is empty"
 msgstr "Está vacío "
 
+#: ../include/ldap.class.php.in:54
+msgid ""
+"Error setting LDAP protocol to v3. Please contact your system administrator"
+msgstr ""
+"Error estableciendo el protocolo LDAP a v3. Por favor, contacte con el "
+"administrador del sistema"
+
+#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
+#: ../include/ldap.class.php.in:244
+#, php-format
+msgid "No such object %s"
+msgstr "No existe el objeto %s"
+
+#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
+#: ../include/ldap.class.php.in:247
+#, php-format
+msgid "LDAP Error searching for DN %s: %s"
+msgstr "Error de LDAP buscando el DN %s: %s"
+
+#: ../include/ldap.class.php.in:200
+#, php-format
+msgid "Error searching for DN for UID=%s"
+msgstr "Error buscando el DN para UID=%s"
+
+#: ../include/ldap.class.php.in:230
+#, php-format
+msgid "Error searching for DN for Mail=%s"
+msgstr "Error buscando el DN para Correo=%s"
+
+#: ../include/ldap.class.php.in:260
+#, php-format
+msgid "Error searching for DN for alias=%s: %s"
+msgstr "Error buscando DN para el alias=%s: %s"
+
+#: ../include/ldap.class.php.in:273
+#, php-format
+msgid "Error searching for DN for mail or alias %s: %s"
+msgstr "Error buscando DN para el correo o alias %s: %s"
+
+#: ../include/ldap.class.php.in:336
+msgid "LDAP Error: Can't read maintainers group: "
+msgstr "Error LDAP: No se puede leer el grupo de mantenedores: "
+
 #: ../include/menu.php:26
 msgid "Users"
 msgstr "Usuarios"
@@ -2302,49 +2346,6 @@
 #: ../include/passwd.php:36 ../include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Las contraseñas no coinciden"
-
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Error estableciendo el protocolo LDAP a v3. Por favor, contacte con el "
-"administrador del sistema"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "No existe el objeto %s"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "Error de LDAP buscando el DN %s: %s"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Error buscando el DN para UID=%s"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Error buscando el DN para Correo=%s"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Error buscando DN para el alias=%s: %s"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Error buscando DN para el correo o alias %s: %s"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Error LDAP: No se puede leer el grupo de mantenedores: "
 
 #~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "



From cvs at kolab.org  Mon Aug 25 18:33:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:33:46 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.42, 1.43 
Message-ID: <20080825163346.6093960C4B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv18408/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- messages.po	2 Jun 2008 15:43:34 -0000	1.42
+++ messages.po	25 Aug 2008 16:33:44 -0000	1.43
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin German\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-10 12:58+0200\n"
+"POT-Creation-Date: 2008-08-25 18:29+0200\n"
 "PO-Revision-Date: 2008-06-02 17:40+0200\n"
 "Last-Translator: Thomas Arendsen Hein <thomas at intevation.de>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
@@ -20,7 +20,7 @@
 msgstr "Die Adresse mit DN"
 
 #: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:146 tpl_messages.php:164
+#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
 msgid "has been deleted"
 msgstr "wurde gelöscht"
 
@@ -33,29 +33,29 @@
 msgstr "(nur externe Adresse ohne Kolab-Benutzerkonto)"
 
 #: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:149
-#: tpl_messages.php:172 ../../../www/admin/addressbook/index.php.in:121
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
+#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
 #: ../../../www/admin/user/index.php.in:183
 msgid "Name"
 msgstr "Name"
 
 #: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
 #: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:152 tpl_messages.php:175 tpl_messages.php:230
-#: tpl_messages.php:243
+#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
+#: tpl_messages.php:221
 msgid "Action"
 msgstr "Aktion"
 
 #: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
 #: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:154 tpl_messages.php:177
+#: tpl_messages.php:200 tpl_messages.php:223
 msgid "Modify"
 msgstr "Verändern"
 
 #: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
 #: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:155 tpl_messages.php:178 tpl_messages.php:231
-#: tpl_messages.php:244 ../../../www/admin/addressbook/addr.php.in:277
+#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
+#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
 #: ../../../www/admin/administrator/admin.php.in:307
 #: ../../../www/admin/distributionlist/list.php.in:300
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
@@ -65,19 +65,19 @@
 msgid "Delete"
 msgstr "Löschen"
 
-#: tpl_messages.php:11 tpl_messages.php:167 tpl_messages.php:180
+#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
 msgid "[ ALL ]"
 msgstr "[ ALLE ]"
 
-#: tpl_messages.php:12 tpl_messages.php:168 tpl_messages.php:181
+#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
 msgid "[ OTHER ]"
 msgstr "[ ANDERE ]"
 
-#: tpl_messages.php:13 tpl_messages.php:169 tpl_messages.php:182
+#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
 msgid "Filter:"
 msgstr "Filter:"
 
-#: tpl_messages.php:14 tpl_messages.php:170 tpl_messages.php:183
+#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
 msgid "Filter"
 msgstr "Filter"
 
@@ -312,10 +312,10 @@
 msgid "Deliver regular mail to folder"
 msgstr "Normale Nachrichten an den Ordner zustellen"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:193
-#: tpl_messages.php:208 tpl_messages.php:212 tpl_messages.php:215
-#: tpl_messages.php:218 tpl_messages.php:221 tpl_messages.php:224
-#: tpl_messages.php:227 tpl_messages.php:240
+#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
+#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
+#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
+#: tpl_messages.php:185 tpl_messages.php:239
 msgid "Update"
 msgstr "Aktualisieren"
 
@@ -737,156 +737,14 @@
 msgstr "Nachricht:"
 
 #: tpl_messages.php:145
-msgid "The shared folder with DN"
-msgstr "Der gemeinsam genutzte Ordner mit DN"
-
-#: tpl_messages.php:147
-msgid "Back to list of shared folders"
-msgstr "Zurück zur Liste der gemeinsam genutzten Ordner"
-
-#: tpl_messages.php:148
-msgid "Shared folders"
-msgstr "Gemeinsam genutzte Ordner"
-
-#: tpl_messages.php:150
-msgid "Server"
-msgstr "Server"
-
-#: tpl_messages.php:151 tpl_messages.php:171
-msgid "Type"
-msgstr "Typ"
-
-#: tpl_messages.php:153
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Ordner gelöscht, warte auf Aufräumaktion..."
-
-#: tpl_messages.php:156 tpl_messages.php:194
-msgid "Welcome to the Kolab administration interface"
-msgstr "Willkommen zur Kolab-Systemadministration"
-
-#: tpl_messages.php:157
-msgid "NOTE:"
-msgstr "ANMERKUNG:"
-
-#: tpl_messages.php:158
-msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
-msgstr ""
-"Es wurde kein Konto zum Empfang von Nachrichten an administrative Adressen "
-"konfiguriert. Wenn Sie hierfür noch kein Konto angelegt haben, "
-
-#: tpl_messages.php:159
-msgid "please do so"
-msgstr "dann tun Sie das bitte jetzt"
-
-#: tpl_messages.php:160
-msgid "and then go"
-msgstr "und richten Sie danach"
-
-#: tpl_messages.php:161
-msgid "here"
-msgstr "hier"
-
-#: tpl_messages.php:162
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr ""
-"die Weiterleitung von Nachrichten an administrative E-Mail-Adressen ein."
-
-#: tpl_messages.php:163
-msgid "The user with DN"
-msgstr "Der Benutzer mit DN"
-
-#: tpl_messages.php:165
-msgid "Back to list of users"
-msgstr "Zurück zur Liste der Benutzer"
-
-#: tpl_messages.php:166 tpl_messages.php:179
-msgid "Email Users"
-msgstr "E-Mail-Benutzer"
-
-#: tpl_messages.php:173
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: tpl_messages.php:174
-msgid "uid"
-msgstr "uid"
-
-#: tpl_messages.php:176
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Benutzer gelöscht, warte auf Aufräumaktion..."
-
-#: tpl_messages.php:184
-msgid "Vacation Notification"
-msgstr "Benachrichtigungen bei Abwesenheit"
-
-#: tpl_messages.php:185
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Benachrichtigungen bei Abwesenheit aktivieren (es kann zu jedem Zeitpunkt "
-"nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
-"Zustellungsordner aktiviert sein)"
-
-#: tpl_messages.php:186
-msgid "Resend notification only after"
-msgstr "Benachrichtigung erst nach"
-
-#: tpl_messages.php:187
-msgid "days"
-msgstr "Tagen erneut senden"
-
-#: tpl_messages.php:188
-msgid "Send responses for these addresses:"
-msgstr "Antworten für diese Adressen schicken:"
-
-#: tpl_messages.php:189
-msgid "(one address per line)"
-msgstr "(Eine Adresse pro Zeile)"
-
-#: tpl_messages.php:190
-msgid "Do not send vacation replies to spam messages"
-msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden"
-
-#: tpl_messages.php:191
-msgid "Only react to mail coming from domain"
-msgstr "Nur auf Nachrichten reagieren, die aus dieser Domäne kommen"
-
-#: tpl_messages.php:192
-msgid "(leave empty for all domains)"
-msgstr "(freilassen für alle Domänen)"
-
-#: tpl_messages.php:195
-msgid "Kolab2 Groupware Server Version"
-msgstr "Kolab2-Groupware-Server-Version"
-
-#: tpl_messages.php:196
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Versionen der Komponenten des Kolab2-Groupware-Server"
-
-#: tpl_messages.php:197
-msgid "PEAR/Horde Versions"
-msgstr ""
-
-#: tpl_messages.php:198
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Kolab2-Gepatchte-OpenPKG-Paket-Versionen"
-
-#: tpl_messages.php:199
-msgid "OpenPKG Version"
-msgstr "OpenPKG-Version"
-
-#: tpl_messages.php:200
 msgid "Kolab Server Settings"
 msgstr "Kolab-Server-Einstellungen"
 
-#: tpl_messages.php:201
+#: tpl_messages.php:146
 msgid "Administrative email addresses"
 msgstr "Administrative E-Mail-Adressen"
 
-#: tpl_messages.php:202
+#: tpl_messages.php:147
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -903,64 +761,64 @@
 "Adressaten diesen Listen hinzufügen oder davon entfernen wie mit jeder "
 "anderen Verteilerliste"
 
-#: tpl_messages.php:203
+#: tpl_messages.php:148
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "E-Mail-Adresse des Kontos, das die administrativen Nachrichten empfangen "
 "soll:"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:149
 msgid "Create Distribution Lists"
 msgstr "Verteilerlisten anlegen"
 
-#: tpl_messages.php:205
+#: tpl_messages.php:150
 msgid "Enable or Disable individual Services"
 msgstr "Einzelne Dienste einschalten oder abschalten"
 
-#: tpl_messages.php:206
+#: tpl_messages.php:151
 msgid "Service"
 msgstr "Dienst"
 
-#: tpl_messages.php:207
+#: tpl_messages.php:152
 msgid "Enabled"
 msgstr "Eingeschaltet"
 
-#: tpl_messages.php:209
+#: tpl_messages.php:154
 msgid "Quota settings"
 msgstr "Plattenplatz-Einstellungen"
 
-#: tpl_messages.php:210
+#: tpl_messages.php:155
 msgid "Warn users when they have used"
 msgstr "Benutzer warnen, wenn der Verbrauch"
 
-#: tpl_messages.php:211
+#: tpl_messages.php:156
 #, php-format
 msgid "% of their quota"
 msgstr "% des zugestandenen Plattenplatzes beträgt"
 
-#: tpl_messages.php:213
+#: tpl_messages.php:158
 msgid "Free/Busy settings"
 msgstr "Frei/Belegt-Einstellungen"
 
-#: tpl_messages.php:214
+#: tpl_messages.php:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Unauthentifiziertes Herunterladen von Frei/Belegt-Informationen erlauben"
 
-#: tpl_messages.php:216
+#: tpl_messages.php:161
 msgid "When creating free/busy lists, include data from"
 msgstr "Beim Erzeugen von Frei/Belegt-Listen, Daten aus "
 
-#: tpl_messages.php:217
+#: tpl_messages.php:162
 msgid "days in the past"
 msgstr "vergangenen Tagen verwenden"
 
-#: tpl_messages.php:219
+#: tpl_messages.php:164
 msgid "Privileged Networks"
 msgstr "Privilegierte Netzwerke"
 
-#: tpl_messages.php:220
+#: tpl_messages.php:165
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -970,11 +828,11 @@
 "Kolab-Server weiterleiten und damit verschicken dürfen (durch Kommata "
 "getrennte Liste von Netzwerken im Format x.x.x.x/y):"
 
-#: tpl_messages.php:222
+#: tpl_messages.php:167
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "SMTP-\"Smarthost/Relayhost\""
 
-#: tpl_messages.php:223
+#: tpl_messages.php:168
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -983,11 +841,11 @@
 "verwendet (host.domain.tld). Wenn Sie keinen solchen verwenden wollen, "
 "lassen Sie dieses Feld leer."
 
-#: tpl_messages.php:225
+#: tpl_messages.php:170
 msgid "Accept Internet Mail"
 msgstr "Nachrichten aus dem Internet akzeptieren"
 
-#: tpl_messages.php:226
+#: tpl_messages.php:171
 msgid ""
 "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 "
@@ -1000,30 +858,30 @@
 "ausgeschaltet ist, werden E-Mails nur von SMTP-Servern in den privilegierten "
 "Netzwerken angenommen."
 
-#: tpl_messages.php:228
+#: tpl_messages.php:173
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
 msgid "Domains"
 msgstr "Domänen"
 
-#: tpl_messages.php:229
+#: tpl_messages.php:174
 msgid "Domain"
 msgstr "Domäne"
 
-#: tpl_messages.php:232 tpl_messages.php:245
+#: tpl_messages.php:177 tpl_messages.php:190
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:178
 msgid "Mail Filter Settings"
 msgstr "Einstellungen für Nachrichtenfilter"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:179
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Nachrichten darauf überprüfen, ob From-Kopfzeile und Umschlag (\"envelope\") "
 "nicht übereinstimmen."
 
-#: tpl_messages.php:235
+#: tpl_messages.php:180
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -1031,11 +889,11 @@
 "Falls eine Sender-Kopfzeile existiert, diese anstelle der From-Zeile für die "
 "obigen Überprüfungen verwenden."
 
-#: tpl_messages.php:236
+#: tpl_messages.php:181
 msgid "Action to take for messages that fail the check:"
 msgstr "Maßname für Nachrichten, deren Überprüfung fehlschlägt:"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:182
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -1046,11 +904,11 @@
 "diesem Fall die From-Kopfzeile umschreiben, damit der Empfänger die mögliche "
 "Fälschung erkennen kann."
 
-#: tpl_messages.php:238
+#: tpl_messages.php:183
 msgid "Always reject the message."
 msgstr "Die Nachricht immer ablehnen."
 
-#: tpl_messages.php:239
+#: tpl_messages.php:184
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -1061,14 +919,156 @@
 "der Absender über ein Konto auf diesem Server verfügt. Dies kann "
 "beispielsweise bei Nachrichtenlisten zu Problemen führen."
 
-#: tpl_messages.php:241
+#: tpl_messages.php:186
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Kolab-Rechnernamen (für Master- und Slaveserver)"
 
-#: tpl_messages.php:242
+#: tpl_messages.php:187
 msgid "Host"
 msgstr "Host"
 
+#: tpl_messages.php:191
+msgid "The shared folder with DN"
+msgstr "Der gemeinsam genutzte Ordner mit DN"
+
+#: tpl_messages.php:193
+msgid "Back to list of shared folders"
+msgstr "Zurück zur Liste der gemeinsam genutzten Ordner"
+
+#: tpl_messages.php:194
+msgid "Shared folders"
+msgstr "Gemeinsam genutzte Ordner"
+
+#: tpl_messages.php:196
+msgid "Server"
+msgstr "Server"
+
+#: tpl_messages.php:197 tpl_messages.php:217
+msgid "Type"
+msgstr "Typ"
+
+#: tpl_messages.php:199
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Ordner gelöscht, warte auf Aufräumaktion..."
+
+#: tpl_messages.php:202 tpl_messages.php:245
+msgid "Welcome to the Kolab administration interface"
+msgstr "Willkommen zur Kolab-Systemadministration"
+
+#: tpl_messages.php:203
+msgid "NOTE:"
+msgstr "ANMERKUNG:"
+
+#: tpl_messages.php:204
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Es wurde kein Konto zum Empfang von Nachrichten an administrative Adressen "
+"konfiguriert. Wenn Sie hierfür noch kein Konto angelegt haben, "
+
+#: tpl_messages.php:205
+msgid "please do so"
+msgstr "dann tun Sie das bitte jetzt"
+
+#: tpl_messages.php:206
+msgid "and then go"
+msgstr "und richten Sie danach"
+
+#: tpl_messages.php:207
+msgid "here"
+msgstr "hier"
+
+#: tpl_messages.php:208
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr ""
+"die Weiterleitung von Nachrichten an administrative E-Mail-Adressen ein."
+
+#: tpl_messages.php:209
+msgid "The user with DN"
+msgstr "Der Benutzer mit DN"
+
+#: tpl_messages.php:211
+msgid "Back to list of users"
+msgstr "Zurück zur Liste der Benutzer"
+
+#: tpl_messages.php:212 tpl_messages.php:225
+msgid "Email Users"
+msgstr "E-Mail-Benutzer"
+
+#: tpl_messages.php:219
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: tpl_messages.php:220
+msgid "uid"
+msgstr "uid"
+
+#: tpl_messages.php:222
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Benutzer gelöscht, warte auf Aufräumaktion..."
+
+#: tpl_messages.php:230
+msgid "Vacation Notification"
+msgstr "Benachrichtigungen bei Abwesenheit"
+
+#: tpl_messages.php:231
+msgid ""
+"Activate vacation notification (only one of vacation, forward and delivery "
+"to folder can be active at any time)"
+msgstr ""
+"Benachrichtigungen bei Abwesenheit aktivieren (es kann zu jedem Zeitpunkt "
+"nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
+"Zustellungsordner aktiviert sein)"
+
+#: tpl_messages.php:232
+msgid "Resend notification only after"
+msgstr "Benachrichtigung erst nach"
+
+#: tpl_messages.php:233
+msgid "days"
+msgstr "Tagen erneut senden"
+
+#: tpl_messages.php:234
+msgid "Send responses for these addresses:"
+msgstr "Antworten für diese Adressen schicken:"
+
+#: tpl_messages.php:235
+msgid "(one address per line)"
+msgstr "(Eine Adresse pro Zeile)"
+
+#: tpl_messages.php:236
+msgid "Do not send vacation replies to spam messages"
+msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden"
+
+#: tpl_messages.php:237
+msgid "Only react to mail coming from domain"
+msgstr "Nur auf Nachrichten reagieren, die aus dieser Domäne kommen"
+
+#: tpl_messages.php:238
+msgid "(leave empty for all domains)"
+msgstr "(freilassen für alle Domänen)"
+
+#: tpl_messages.php:240
+msgid "Kolab2 Groupware Server Version"
+msgstr "Kolab2-Groupware-Server-Version"
+
+#: tpl_messages.php:241
+msgid "Kolab2 Groupware Server Component Versions"
+msgstr "Versionen der Komponenten des Kolab2-Groupware-Server"
+
+#: tpl_messages.php:242
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:243
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Kolab2-Gepatchte-OpenPKG-Paket-Versionen"
+
+#: tpl_messages.php:244
+msgid "OpenPKG Version"
+msgstr "OpenPKG-Version"
+
 #: ../../../www/admin/addressbook/addr.php.in:17
 #: ../../../www/admin/addressbook/index.php.in:23
 #: ../../../www/admin/administrator/index.php.in:33
@@ -1076,10 +1076,10 @@
 #: ../../../www/admin/distributionlist/list.php.in:37
 #: ../../../www/admin/domainmaintainer/index.php.in:33
 #: ../../../www/admin/maintainer/index.php.in:33
+#: ../../../www/admin/settings/index.php.in:13
 #: ../../../www/admin/sharedfolder/index.php.in:22
 #: ../../../www/admin/sharedfolder/sf.php.in:25
 #: ../../../www/admin/user/index.php.in:34
-#: ../../../www/admin/settings/index.php.in:13
 msgid "Error: You don't have Permissions to access this Menu"
 msgstr "Fehler: Sie haben keine Zugriffsrechte auf dieses Menü"
 
@@ -1622,6 +1622,70 @@
 msgid "Maintainer Deleted"
 msgstr "Verwalter gelöscht"
 
+#: ../../../www/admin/settings/index.php.in:98
+#, php-format
+msgid "No account found for email address %s"
+msgstr "Für die E-Mail-Adresse %s wurde kein Konto gefunden"
+
+#: ../../../www/admin/settings/index.php.in:107
+#, php-format
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "LDAP-Fehler: Konnte die Verteilerliste %s nicht hinzufügen: %s"
+
+#: ../../../www/admin/settings/index.php.in:109
+#, php-format
+msgid "Successfully created distribution list %s"
+msgstr "Verteilerliste %s erfolgreich angelegt"
+
+#: ../../../www/admin/settings/index.php.in:128
+#: ../../../www/admin/settings/index.php.in:137
+#: ../../../www/admin/settings/index.php.in:146
+#: ../../../www/admin/settings/index.php.in:155
+#: ../../../www/admin/settings/index.php.in:165
+#: ../../../www/admin/settings/index.php.in:174
+#: ../../../www/admin/settings/index.php.in:185
+#: ../../../www/admin/settings/index.php.in:199
+#: ../../../www/admin/settings/index.php.in:217
+#: ../../../www/admin/settings/index.php.in:235
+#: ../../../www/admin/settings/index.php.in:252
+#: ../../../www/admin/settings/index.php.in:265
+#, php-format
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr "LDAP-Fehler: Konnte das Kolab-Konfigurationsobjekt nicht verändern: %s"
+
+#: ../../../www/admin/settings/index.php.in:223
+#, php-format
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "LDAP-Fehler: konnte das Domänen-Objekt %s nicht löschen: %s"
+
+#: ../../../www/admin/settings/index.php.in:273
+msgid "POP3 Service"
+msgstr "POP3-Dienst"
+
+#: ../../../www/admin/settings/index.php.in:274
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "POP3/SSL-Dienst (TCP-Port 995)"
+
+#: ../../../www/admin/settings/index.php.in:275
+msgid "IMAP Service"
+msgstr "IMAP-Dienst"
+
+#: ../../../www/admin/settings/index.php.in:276
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
+
+#: ../../../www/admin/settings/index.php.in:277
+msgid "Sieve service (TCP port 2000)"
+msgstr "Sieve-Dienst (TCP-Port 2000)"
+
+#: ../../../www/admin/settings/index.php.in:278
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr "Frei/Belegt-Dienst über HTTP (zusätzlich zu HTTPS)"
+
+#: ../../../www/admin/settings/index.php.in:279
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Amavis-Scannen von E-Mail-Nachrichten (Viren/Spam)"
+
 #: ../../../www/admin/sharedfolder/index.php.in:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
@@ -2044,70 +2108,6 @@
 msgid "<enter your name and email address here>"
 msgstr "<Geben Sie hier Ihren Namen und Ihre E-Mail-Adresse ein>"
 
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Für die E-Mail-Adresse %s wurde kein Konto gefunden"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "LDAP-Fehler: Konnte die Verteilerliste %s nicht hinzufügen: %s"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Verteilerliste %s erfolgreich angelegt"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr "LDAP-Fehler: Konnte das Kolab-Konfigurationsobjekt nicht verändern: %s"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "LDAP-Fehler: konnte das Domänen-Objekt %s nicht löschen: %s"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "POP3-Dienst"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "POP3/SSL-Dienst (TCP-Port 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "IMAP-Dienst"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Sieve-Dienst (TCP-Port 2000)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr "Frei/Belegt-Dienst über HTTP (zusätzlich zu HTTPS)"
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Amavis-Scannen von E-Mail-Nachrichten (Viren/Spam)"
-
 #: ../include/auth.class.php.in:40
 msgid "Server error, no ldap object!"
 msgstr "Server-Fehler, kein LDAP-Objekt!"
@@ -2146,9 +2146,11 @@
 
 #: ../include/form.class.php:55
 msgid ""
-"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/.=?:"
+"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
+"=?:"
 msgstr ""
-"Telefonnummern dürfen nur a-z, Ziffern, Leerzeichen und die Zeichen ()-+/.=?: enthalten."
+"Telefonnummern dürfen nur a-z, Ziffern, Leerzeichen und die Zeichen ()-+/."
+"=?: enthalten."
 
 #: ../include/form.class.php:118
 msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
@@ -2198,6 +2200,49 @@
 msgid " is empty"
 msgstr " ist leer"
 
+#: ../include/ldap.class.php.in:54
+msgid ""
+"Error setting LDAP protocol to v3. Please contact your system administrator"
+msgstr ""
+"Fehler beim Einstellen des LDAP-Protokolls auf v3. Bitte wenden Sie sich an "
+"Ihren Systemverwalter"
+
+#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
+#: ../include/ldap.class.php.in:244
+#, php-format
+msgid "No such object %s"
+msgstr "Kein Objekt %s vorhanden"
+
+#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
+#: ../include/ldap.class.php.in:247
+#, php-format
+msgid "LDAP Error searching for DN %s: %s"
+msgstr "LDAP-Fehler beim Suchen nach DN %s: %s"
+
+#: ../include/ldap.class.php.in:200
+#, php-format
+msgid "Error searching for DN for UID=%s"
+msgstr "Fehler beim Suchen nach dem DN für UID=%s"
+
+#: ../include/ldap.class.php.in:230
+#, php-format
+msgid "Error searching for DN for Mail=%s"
+msgstr "Fehler beim Suchen nach dem DN für Mail=%s"
+
+#: ../include/ldap.class.php.in:260
+#, php-format
+msgid "Error searching for DN for alias=%s: %s"
+msgstr "Fehler beim Suchen nach dem DN für Aliasname=%s: %s"
+
+#: ../include/ldap.class.php.in:273
+#, php-format
+msgid "Error searching for DN for mail or alias %s: %s"
+msgstr "Fehler beim Suchen nach dem DN für Mail oder Alias %s: %s"
+
+#: ../include/ldap.class.php.in:336
+msgid "LDAP Error: Can't read maintainers group: "
+msgstr "LDAP-Fehler: Kann die Verwalter-Gruppe nicht lesen"
+
 #: ../include/menu.php:26
 msgid "Users"
 msgstr "Benutzer"
@@ -2309,49 +2354,6 @@
 #: ../include/passwd.php:36 ../include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Passwörter stimmen nicht überein"
-
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Fehler beim Einstellen des LDAP-Protokolls auf v3. Bitte wenden Sie sich an "
-"Ihren Systemverwalter"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Kein Objekt %s vorhanden"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "LDAP-Fehler beim Suchen nach DN %s: %s"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Fehler beim Suchen nach dem DN für UID=%s"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Fehler beim Suchen nach dem DN für Mail=%s"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Fehler beim Suchen nach dem DN für Aliasname=%s: %s"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Fehler beim Suchen nach dem DN für Mail oder Alias %s: %s"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "LDAP-Fehler: Kann die Verwalter-Gruppe nicht lesen"
 
 #~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "



From cvs at kolab.org  Mon Aug 25 18:33:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:33:46 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.28, 1.29 
Message-ID: <20080825163346.72FD160C4B8@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv18408/fr/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- messages.po	20 May 2008 17:08:27 -0000	1.28
+++ messages.po	25 Aug 2008 16:33:44 -0000	1.29
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin French\n"
-"Report-Msgid-Bugs-To: Kolab development coordination <kolab-devel at kolab.org>\n"
-"POT-Creation-Date: 2008-04-10 12:58+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-25 18:29+0200\n"
 "PO-Revision-Date: 2008-04-11 23:11+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier at opensides.be>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
@@ -23,7 +23,7 @@
 msgstr "L'adresse de messagerie avec le DN"
 
 #: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:146 tpl_messages.php:164
+#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
 msgid "has been deleted"
 msgstr "à été effacé"
 
@@ -36,29 +36,29 @@
 msgstr "(seulement les adresses externes sans un compte de messagerie Kolab)"
 
 #: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:149
-#: tpl_messages.php:172 ../../../www/admin/addressbook/index.php.in:121
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
+#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
 #: ../../../www/admin/user/index.php.in:183
 msgid "Name"
 msgstr "Nom"
 
 #: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
 #: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:152 tpl_messages.php:175 tpl_messages.php:230
-#: tpl_messages.php:243
+#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
+#: tpl_messages.php:221
 msgid "Action"
 msgstr "Action"
 
 #: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
 #: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:154 tpl_messages.php:177
+#: tpl_messages.php:200 tpl_messages.php:223
 msgid "Modify"
 msgstr "Modifier"
 
 #: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
 #: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:155 tpl_messages.php:178 tpl_messages.php:231
-#: tpl_messages.php:244 ../../../www/admin/addressbook/addr.php.in:277
+#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
+#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
 #: ../../../www/admin/administrator/admin.php.in:307
 #: ../../../www/admin/distributionlist/list.php.in:300
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
@@ -68,19 +68,19 @@
 msgid "Delete"
 msgstr "Effacer"
 
-#: tpl_messages.php:11 tpl_messages.php:167 tpl_messages.php:180
+#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
 msgid "[ ALL ]"
 msgstr "[ Tous ]"
 
-#: tpl_messages.php:12 tpl_messages.php:168 tpl_messages.php:181
+#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
 msgid "[ OTHER ]"
 msgstr "[ Autres ]"
 
-#: tpl_messages.php:13 tpl_messages.php:169 tpl_messages.php:182
+#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
 msgid "Filter:"
 msgstr "Filtre:"
 
-#: tpl_messages.php:14 tpl_messages.php:170 tpl_messages.php:183
+#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
 msgid "Filter"
 msgstr "Filtre"
 
@@ -306,16 +306,18 @@
 msgid ""
 "Activate delivery to folder (only one of vacation, forward and delivery to "
 "folder can be active at any time)"
-msgstr "Activer l'envoi dans un dossier (un seul mode des modes suivants : messages d'absence, transmission, et envoi dans un dossier peut être activé)"
+msgstr ""
+"Activer l'envoi dans un dossier (un seul mode des modes suivants : messages "
+"d'absence, transmission, et envoi dans un dossier peut être activé)"
 
 #: tpl_messages.php:65
 msgid "Deliver regular mail to folder"
 msgstr "Délivrer les mail normaux vers un dossier"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:193
-#: tpl_messages.php:208 tpl_messages.php:212 tpl_messages.php:215
-#: tpl_messages.php:218 tpl_messages.php:221 tpl_messages.php:224
-#: tpl_messages.php:227 tpl_messages.php:240
+#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
+#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
+#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
+#: tpl_messages.php:185 tpl_messages.php:239
 msgid "Update"
 msgstr "Mise a jour"
 
@@ -394,7 +396,9 @@
 msgid ""
 "Activate email forwarding (only one of vacation, forward and delivery to "
 "folder can be active at any time)"
-msgstr "Activer le transfert des messages (un seul mode des modes suivants : messages d'absence, transmission, et envoi dans un dossier peut être activé)"
+msgstr ""
+"Activer le transfert des messages (un seul mode des modes suivants : "
+"messages d'absence, transmission, et envoi dans un dossier peut être activé)"
 
 #: tpl_messages.php:91
 msgid "Forward mail to"
@@ -429,7 +433,8 @@
 msgstr "Les personnes suivantes on travaillé sur Kolab pour Intevation:"
 
 #: tpl_messages.php:97
-msgid "The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgid ""
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
 msgstr "Le client KDE pour Kolab1 et Kolab2 (Kontact) à été développé par "
 
 #: tpl_messages.php:98
@@ -447,7 +452,8 @@
 "l'implémentation du serveur Kolab 2."
 
 #: tpl_messages.php:99
-msgid "The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"
+msgid ""
+"The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"
 msgstr ""
 "Les personnes suivantes on travaillé sur Kolab pour Klar&auml;lvdalens "
 "Datakonsult AB:"
@@ -462,8 +468,8 @@
 msgstr ""
 "<a href=\"http://www.kde.org\">KDE</a> est un puissant environnement "
 "graphique de bureau <a href=\"http://www.gnu.org/philosophy/free-sw.html"
-"\">en Logiciel Libre</a> destiné aux stations de travail Linux et Unix. Il allie "
-"simplicité d'utilisation, fonctionnalités usuelles, une remarquable "
+"\">en Logiciel Libre</a> destiné aux stations de travail Linux et Unix. Il "
+"allie simplicité d'utilisation, fonctionnalités usuelles, une remarquable "
 "interface graphique et la supériorité technologique du système "
 "d'exploitation Unix."
 
@@ -663,7 +669,8 @@
 
 #: tpl_messages.php:123
 msgid "CSSified the Kolab1 web admin GUI"
-msgstr "Transformation de l'interface d'administration web de Kolab1 avec des CSS"
+msgstr ""
+"Transformation de l'interface d'administration web de Kolab1 avec des CSS"
 
 #: tpl_messages.php:124
 msgid ""
@@ -726,152 +733,14 @@
 msgstr "Message:"
 
 #: tpl_messages.php:145
-msgid "The shared folder with DN"
-msgstr "Le dossier partagé avec le DN"
-
-#: tpl_messages.php:147
-msgid "Back to list of shared folders"
-msgstr "Retour à la liste des dossiers partagés"
-
-#: tpl_messages.php:148
-msgid "Shared folders"
-msgstr "Dossier Partagés"
-
-#: tpl_messages.php:150
-msgid "Server"
-msgstr "Serveur"
-
-#: tpl_messages.php:151 tpl_messages.php:171
-msgid "Type"
-msgstr "Type"
-
-#: tpl_messages.php:153
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Dossier effacé, en attente de nettoyage..."
-
-#: tpl_messages.php:156 tpl_messages.php:194
-msgid "Welcome to the Kolab administration interface"
-msgstr "Bienvenue dans l'interface d'administration de Kolab"
-
-#: tpl_messages.php:157
-msgid "NOTE:"
-msgstr "Note:"
-
-#: tpl_messages.php:158
-msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
-msgstr ""
-"Aucun compte n'est configuré pour recevoir les messages destinés aux "
-"adresses administratives. Si vous n'avez pas encore crée un compte pour cela,"
-
-#: tpl_messages.php:159
-msgid "please do so"
-msgstr "veuillez le faire"
-
-#: tpl_messages.php:160
-msgid "and then go"
-msgstr "et ensuite allez"
-
-#: tpl_messages.php:161
-msgid "here"
-msgstr "ici"
-
-#: tpl_messages.php:162
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "pour configurer le renvoi des messages à une adresse administrative. "
-
-#: tpl_messages.php:163
-msgid "The user with DN"
-msgstr "L'utilisateur avec le DN"
-
-#: tpl_messages.php:165
-msgid "Back to list of users"
-msgstr "Retour à la liste des utilisateurs"
-
-#: tpl_messages.php:166 tpl_messages.php:179
-msgid "Email Users"
-msgstr "Adresse de messagerie des utilisateurs"
-
-#: tpl_messages.php:173
-msgid "E-mail"
-msgstr "Adresse de messagerie"
-
-#: tpl_messages.php:174
-msgid "uid"
-msgstr "uid"
-
-#: tpl_messages.php:176
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Utilisateur effacé, en attente du nettoyage..."
-
-#: tpl_messages.php:184
-msgid "Vacation Notification"
-msgstr "Message d'absence"
-
-#: tpl_messages.php:185
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr "Activer la notification d'absence (un seul mode des modes suivants : messages d'absence, transmission, et envoi dans un dossier peut être activé)"
-
-#: tpl_messages.php:186
-msgid "Resend notification only after"
-msgstr "Seulement renvoyer les notifications après"
-
-#: tpl_messages.php:187
-msgid "days"
-msgstr "jours"
-
-#: tpl_messages.php:188
-msgid "Send responses for these addresses:"
-msgstr "Envoyer des réponses pour ces adresses:"
-
-#: tpl_messages.php:189
-msgid "(one address per line)"
-msgstr "(une adresse par ligne)"
-
-#: tpl_messages.php:190
-msgid "Do not send vacation replies to spam messages"
-msgstr "Ne pas envoyer de messages d'absence au messages étant reconnu comme du spam"
-
-#: tpl_messages.php:191
-msgid "Only react to mail coming from domain"
-msgstr "Réagir seulement au messages venant du domaine"
-
-#: tpl_messages.php:192
-msgid "(leave empty for all domains)"
-msgstr "(laisser vide pour tout les domaines)"
-
-#: tpl_messages.php:195
-msgid "Kolab2 Groupware Server Version"
-msgstr "Version du serveur de collaboration Kolab2"
-
-#: tpl_messages.php:196
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Version des composants du serveur de collaboration Kolab2"
-
-#: tpl_messages.php:197
-msgid "PEAR/Horde Versions"
-msgstr "Version de PEAR/Horde"
-
-#: tpl_messages.php:198
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Version modifiée des paquets OpenPKG de Kolab2"
-
-#: tpl_messages.php:199
-msgid "OpenPKG Version"
-msgstr "Version de OpenPKG"
-
-#: tpl_messages.php:200
 msgid "Kolab Server Settings"
 msgstr "Les préférences du serveur Kolab"
 
-#: tpl_messages.php:201
+#: tpl_messages.php:146
 msgid "Administrative email addresses"
 msgstr "Les adresses de messagerie administratives"
 
-#: tpl_messages.php:202
+#: tpl_messages.php:147
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -888,64 +757,66 @@
 "Plus tard vous pouvez rajouter ou effacer des personnes faisant partie de "
 "cette liste comme sur n'importe qu'elle autre liste de distribution"
 
-#: tpl_messages.php:203
-msgid "Email address of account that should receive administrative mail for domain "
+#: tpl_messages.php:148
+msgid ""
+"Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Les adresses de messagerie qui doivent recevoir les messages "
 "d'administration:"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:149
 msgid "Create Distribution Lists"
 msgstr "Créer des listes de distribution"
 
-#: tpl_messages.php:205
+#: tpl_messages.php:150
 msgid "Enable or Disable individual Services"
 msgstr "Activez ou désactivez individuellement des services"
 
-#: tpl_messages.php:206
+#: tpl_messages.php:151
 msgid "Service"
 msgstr "Service"
 
-#: tpl_messages.php:207
+#: tpl_messages.php:152
 msgid "Enabled"
 msgstr "Activé"
 
-#: tpl_messages.php:209
+#: tpl_messages.php:154
 msgid "Quota settings"
 msgstr "Préférences des quotas"
 
-#: tpl_messages.php:210
+#: tpl_messages.php:155
 msgid "Warn users when they have used"
 msgstr "Avertissez les utilisateurs quand ils ont utilisé"
 
-#: tpl_messages.php:211
+#: tpl_messages.php:156
 #, php-format
 msgid "% of their quota"
 msgstr "% de leur quota"
 
-#: tpl_messages.php:213
+#: tpl_messages.php:158
 msgid "Free/Busy settings"
 msgstr "Préférences pour les options de disponibilités"
 
-#: tpl_messages.php:214
+#: tpl_messages.php:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Permettre le téléchargement non authentifié des informations de "
 "disponibilités"
 
-#: tpl_messages.php:216
+#: tpl_messages.php:161
 msgid "When creating free/busy lists, include data from"
-msgstr "Lors de la création des options de disponibilités, inclure les données depuis"
+msgstr ""
+"Lors de la création des options de disponibilités, inclure les données depuis"
 
-#: tpl_messages.php:217
+#: tpl_messages.php:162
 msgid "days in the past"
 msgstr "jours dans le passé"
 
-#: tpl_messages.php:219
+#: tpl_messages.php:164
 msgid "Privileged Networks"
 msgstr "Réseaux privilégiés"
 
-#: tpl_messages.php:220
+#: tpl_messages.php:165
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -955,11 +826,11 @@
 "SMTP non authentifié vers le serveur Kolab (liste de réseaux séparé par des "
 "virgules dans le format x.x.x.x/y ):"
 
-#: tpl_messages.php:222
+#: tpl_messages.php:167
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "serveur de messagerie relais"
 
-#: tpl_messages.php:223
+#: tpl_messages.php:168
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -968,11 +839,11 @@
 "sortants (host.domain.tld). Laissez le vide pour si il n'y a pas de serveur "
 "relais."
 
-#: tpl_messages.php:225
+#: tpl_messages.php:170
 msgid "Accept Internet Mail"
 msgstr "Accepter les messages venant d'internet"
 
-#: tpl_messages.php:226
+#: tpl_messages.php:171
 msgid ""
 "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 "
@@ -985,30 +856,30 @@
 "désactivé pour accepter les messages venant de serveurs SMTP dans le réseau "
 "privilégié."
 
-#: tpl_messages.php:228
+#: tpl_messages.php:173
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
 msgid "Domains"
 msgstr "Domaines"
 
-#: tpl_messages.php:229
+#: tpl_messages.php:174
 msgid "Domain"
 msgstr "Domaine"
 
-#: tpl_messages.php:232 tpl_messages.php:245
+#: tpl_messages.php:177 tpl_messages.php:190
 msgid "Add"
 msgstr "Ajouter"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:178
 msgid "Mail Filter Settings"
 msgstr "Préférences des filtres de messagerie"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:179
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Vérifie que le champ expéditeur correspond corresponde bien à l'expéditeur "
 "réel."
 
-#: tpl_messages.php:235
+#: tpl_messages.php:180
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -1016,11 +887,11 @@
 "Utilisez l'entête de l'expéditeur plutôt que le destinataire si les "
 "vérification ci dessus sont activées."
 
-#: tpl_messages.php:236
+#: tpl_messages.php:181
 msgid "Action to take for messages that fail the check:"
 msgstr "Action à réaliser pour les messages qui ne passent pas la vérification"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:182
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -1030,11 +901,11 @@
 "d'expéditeur qui correspond au domaine de Kolab. Si c'est le cas, l'en-tête "
 "est réécrite pour en informer le destinataire."
 
-#: tpl_messages.php:238
+#: tpl_messages.php:183
 msgid "Always reject the message."
 msgstr "Toujours rejeter le message"
 
-#: tpl_messages.php:239
+#: tpl_messages.php:184
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -1045,14 +916,155 @@
 "l'expéditeur à un compte de messagerie sur ce serveur. Ceci arrive par "
 "exemple avec les listes de discutions."
 
-#: tpl_messages.php:241
+#: tpl_messages.php:186
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Nom d'hôtes Kolab (pour serveur maître et esclaves)"
 
-#: tpl_messages.php:242
+#: tpl_messages.php:187
 msgid "Host"
 msgstr "Hôte"
 
+#: tpl_messages.php:191
+msgid "The shared folder with DN"
+msgstr "Le dossier partagé avec le DN"
+
+#: tpl_messages.php:193
+msgid "Back to list of shared folders"
+msgstr "Retour à la liste des dossiers partagés"
+
+#: tpl_messages.php:194
+msgid "Shared folders"
+msgstr "Dossier Partagés"
+
+#: tpl_messages.php:196
+msgid "Server"
+msgstr "Serveur"
+
+#: tpl_messages.php:197 tpl_messages.php:217
+msgid "Type"
+msgstr "Type"
+
+#: tpl_messages.php:199
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Dossier effacé, en attente de nettoyage..."
+
+#: tpl_messages.php:202 tpl_messages.php:245
+msgid "Welcome to the Kolab administration interface"
+msgstr "Bienvenue dans l'interface d'administration de Kolab"
+
+#: tpl_messages.php:203
+msgid "NOTE:"
+msgstr "Note:"
+
+#: tpl_messages.php:204
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Aucun compte n'est configuré pour recevoir les messages destinés aux "
+"adresses administratives. Si vous n'avez pas encore crée un compte pour cela,"
+
+#: tpl_messages.php:205
+msgid "please do so"
+msgstr "veuillez le faire"
+
+#: tpl_messages.php:206
+msgid "and then go"
+msgstr "et ensuite allez"
+
+#: tpl_messages.php:207
+msgid "here"
+msgstr "ici"
+
+#: tpl_messages.php:208
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr "pour configurer le renvoi des messages à une adresse administrative. "
+
+#: tpl_messages.php:209
+msgid "The user with DN"
+msgstr "L'utilisateur avec le DN"
+
+#: tpl_messages.php:211
+msgid "Back to list of users"
+msgstr "Retour à la liste des utilisateurs"
+
+#: tpl_messages.php:212 tpl_messages.php:225
+msgid "Email Users"
+msgstr "Adresse de messagerie des utilisateurs"
+
+#: tpl_messages.php:219
+msgid "E-mail"
+msgstr "Adresse de messagerie"
+
+#: tpl_messages.php:220
+msgid "uid"
+msgstr "uid"
+
+#: tpl_messages.php:222
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Utilisateur effacé, en attente du nettoyage..."
+
+#: tpl_messages.php:230
+msgid "Vacation Notification"
+msgstr "Message d'absence"
+
+#: tpl_messages.php:231
+msgid ""
+"Activate vacation notification (only one of vacation, forward and delivery "
+"to folder can be active at any time)"
+msgstr ""
+"Activer la notification d'absence (un seul mode des modes suivants : "
+"messages d'absence, transmission, et envoi dans un dossier peut être activé)"
+
+#: tpl_messages.php:232
+msgid "Resend notification only after"
+msgstr "Seulement renvoyer les notifications après"
+
+#: tpl_messages.php:233
+msgid "days"
+msgstr "jours"
+
+#: tpl_messages.php:234
+msgid "Send responses for these addresses:"
+msgstr "Envoyer des réponses pour ces adresses:"
+
+#: tpl_messages.php:235
+msgid "(one address per line)"
+msgstr "(une adresse par ligne)"
+
+#: tpl_messages.php:236
+msgid "Do not send vacation replies to spam messages"
+msgstr ""
+"Ne pas envoyer de messages d'absence au messages étant reconnu comme du spam"
+
+#: tpl_messages.php:237
+msgid "Only react to mail coming from domain"
+msgstr "Réagir seulement au messages venant du domaine"
+
+#: tpl_messages.php:238
+msgid "(leave empty for all domains)"
+msgstr "(laisser vide pour tout les domaines)"
+
+#: tpl_messages.php:240
+msgid "Kolab2 Groupware Server Version"
+msgstr "Version du serveur de collaboration Kolab2"
+
+#: tpl_messages.php:241
+msgid "Kolab2 Groupware Server Component Versions"
+msgstr "Version des composants du serveur de collaboration Kolab2"
+
+#: tpl_messages.php:242
+msgid "PEAR/Horde Versions"
+msgstr "Version de PEAR/Horde"
+
+#: tpl_messages.php:243
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Version modifiée des paquets OpenPKG de Kolab2"
+
+#: tpl_messages.php:244
+msgid "OpenPKG Version"
+msgstr "Version de OpenPKG"
+
 #: ../../../www/admin/addressbook/addr.php.in:17
 #: ../../../www/admin/addressbook/index.php.in:23
 #: ../../../www/admin/administrator/index.php.in:33
@@ -1060,10 +1072,10 @@
 #: ../../../www/admin/distributionlist/list.php.in:37
 #: ../../../www/admin/domainmaintainer/index.php.in:33
 #: ../../../www/admin/maintainer/index.php.in:33
+#: ../../../www/admin/settings/index.php.in:13
 #: ../../../www/admin/sharedfolder/index.php.in:22
 #: ../../../www/admin/sharedfolder/sf.php.in:25
 #: ../../../www/admin/user/index.php.in:34
-#: ../../../www/admin/settings/index.php.in:13
 msgid "Error: You don't have Permissions to access this Menu"
 msgstr "Erreur: Vous n'avez pas la permission d'accéder ce menu"
 
@@ -1227,7 +1239,8 @@
 #: ../../../www/admin/addressbook/addr.php.in:302
 #, php-format
 msgid "Addressbook entry removed from distribution list '%s'."
-msgstr "L'entrée du carnet d'adresse à été enlevée de la liste de distribution '%s'."
+msgstr ""
+"L'entrée du carnet d'adresse à été enlevée de la liste de distribution '%s'."
 
 #: ../../../www/admin/addressbook/addr.php.in:304
 #, php-format
@@ -1339,7 +1352,8 @@
 #: ../../../www/admin/maintainer/maintainer.php.in:261
 #, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
-msgstr "Erreur LDAP: Impossible d'ajouter l'objet %s au groupe des mainteneurs: %s"
+msgstr ""
+"Erreur LDAP: Impossible d'ajouter l'objet %s au groupe des mainteneurs: %s"
 
 #: ../../../www/admin/administrator/admin.php.in:266
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
@@ -1527,7 +1541,8 @@
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137
 msgid "Check domains this domain maintainer should be able to maintain"
-msgstr "Sélectionner les domaines que ce mainteneur doit être capable de maintenir"
+msgstr ""
+"Sélectionner les domaines que ce mainteneur doit être capable de maintenir"
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296
@@ -1607,6 +1622,71 @@
 msgid "Maintainer Deleted"
 msgstr "Mainteneur effacé"
 
+#: ../../../www/admin/settings/index.php.in:98
+#, php-format
+msgid "No account found for email address %s"
+msgstr "Pas de compte trouvé pour l'adresse de messagerie %s"
+
+#: ../../../www/admin/settings/index.php.in:107
+#, php-format
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "Erreur LDAP: échec lors de l'ajout d'une liste de distribution %s: %s"
+
+#: ../../../www/admin/settings/index.php.in:109
+#, php-format
+msgid "Successfully created distribution list %s"
+msgstr "Création d'une liste de distribution: %s"
+
+#: ../../../www/admin/settings/index.php.in:128
+#: ../../../www/admin/settings/index.php.in:137
+#: ../../../www/admin/settings/index.php.in:146
+#: ../../../www/admin/settings/index.php.in:155
+#: ../../../www/admin/settings/index.php.in:165
+#: ../../../www/admin/settings/index.php.in:174
+#: ../../../www/admin/settings/index.php.in:185
+#: ../../../www/admin/settings/index.php.in:199
+#: ../../../www/admin/settings/index.php.in:217
+#: ../../../www/admin/settings/index.php.in:235
+#: ../../../www/admin/settings/index.php.in:252
+#: ../../../www/admin/settings/index.php.in:265
+#, php-format
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr ""
+"Erreur LDAP: échec dans la modification de l'objet de configuration kolab: %s"
+
+#: ../../../www/admin/settings/index.php.in:223
+#, php-format
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "Erreur LDAP: échec lors de l'éffacement de l'objet domaine %s: %s"
+
+#: ../../../www/admin/settings/index.php.in:273
+msgid "POP3 Service"
+msgstr "Service POP3"
+
+#: ../../../www/admin/settings/index.php.in:274
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "Service POP3/SSL (TCP port 995)"
+
+#: ../../../www/admin/settings/index.php.in:275
+msgid "IMAP Service"
+msgstr "Service IMAP"
+
+#: ../../../www/admin/settings/index.php.in:276
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "Service IMAP/SSL (TCP port 993)"
+
+#: ../../../www/admin/settings/index.php.in:277
+msgid "Sieve service (TCP port 2000)"
+msgstr "Service Sieve (TCP port 2000)"
+
+#: ../../../www/admin/settings/index.php.in:278
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr "Service de disponibilité par HTTP (en plus du HTTPS)"
+
+#: ../../../www/admin/settings/index.php.in:279
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Service de vérification de la messagerie Amavis (Virus/Spam)"
+
 #: ../../../www/admin/sharedfolder/index.php.in:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
@@ -1724,8 +1804,11 @@
 msgstr "Erreur LDAP: impossible de marquer %s pour l'effacement: %s"
 
 #: ../../../www/admin/user/deliver.php.in:37
-msgid "Net/Sieve.php is missing. Without that, filter settings are not available"
-msgstr "Net/sieve.php est manquant. Sans cela, les préférences des filtres de messages seront indisponibles"
+msgid ""
+"Net/Sieve.php is missing. Without that, filter settings are not available"
+msgstr ""
+"Net/sieve.php est manquant. Sans cela, les préférences des filtres de "
+"messages seront indisponibles"
 
 #: ../../../www/admin/user/deliver.php.in:38
 #: ../../../www/admin/user/forward.php.in:39
@@ -1754,7 +1837,8 @@
 
 #: ../../../www/admin/user/forward.php.in:38
 #: ../../../www/admin/user/vacation.php.in:17
-msgid "Net/Sieve.php is missing. Without that, vacation settings are not available"
+msgid ""
+"Net/Sieve.php is missing. Without that, vacation settings are not available"
 msgstr ""
 "Net/sieve.php est manquant. Sans cela, les préférences des messages "
 "d'absence seront indisponible"
@@ -1851,7 +1935,8 @@
 msgstr "Compte de ressources"
 
 #: ../../../www/admin/user/user.php.in:414
-msgid "NOTE: An internal user is a user that will not be visible in the address book"
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
 msgstr ""
 "NOTE: Un utilisateur interne sera un utilisateur qui ne sera pas visible "
 "dans le carnet d'adresse"
@@ -2021,70 +2106,6 @@
 msgid "<enter your name and email address here>"
 msgstr "<entrer votre nom et adresse de messagerie ici>"
 
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Pas de compte trouvé pour l'adresse de messagerie %s"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "Erreur LDAP: échec lors de l'ajout d'une liste de distribution %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Création d'une liste de distribution: %s"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr "Erreur LDAP: échec dans la modification de l'objet de configuration kolab: %s"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "Erreur LDAP: échec lors de l'éffacement de l'objet domaine %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "Service POP3"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "Service POP3/SSL (TCP port 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "Service IMAP"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "Service IMAP/SSL (TCP port 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Service Sieve (TCP port 2000)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr "Service de disponibilité par HTTP (en plus du HTTPS)"
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Service de vérification de la messagerie Amavis (Virus/Spam)"
-
 #: ../include/auth.class.php.in:40
 msgid "Server error, no ldap object!"
 msgstr "Erreur serveur, pas d'objet ldap!"
@@ -2122,7 +2143,10 @@
 msgstr "Le quota doit être un nombre entier"
 
 #: ../include/form.class.php:55
-msgid "Phone entries may only contain a-z, numbers and the characters ()-+/.=?:"
+#, fuzzy
+msgid ""
+"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
+"=?:"
 msgstr ""
 "Les numéros de téléphones ne peuvent contenir que les lettres a-z, les "
 "nombres et les carctères ()-+/.=?:"
@@ -2175,6 +2199,49 @@
 msgid " is empty"
 msgstr " est vide"
 
+#: ../include/ldap.class.php.in:54
+msgid ""
+"Error setting LDAP protocol to v3. Please contact your system administrator"
+msgstr ""
+"Erreur lors de la négociation du protocole LDAP v3. Veuillez contacter votre "
+"administrateur système"
+
+#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
+#: ../include/ldap.class.php.in:244
+#, php-format
+msgid "No such object %s"
+msgstr "Il n'existe pas d'objet %s"
+
+#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
+#: ../include/ldap.class.php.in:247
+#, php-format
+msgid "LDAP Error searching for DN %s: %s"
+msgstr "Erreur LDAP en recherchant le DN %s: %s"
+
+#: ../include/ldap.class.php.in:200
+#, php-format
+msgid "Error searching for DN for UID=%s"
+msgstr "Erreur de recherche du DN pour l'attribut uid=%s"
+
+#: ../include/ldap.class.php.in:230
+#, php-format
+msgid "Error searching for DN for Mail=%s"
+msgstr "Erreur de recherche du DN pour l'attribut mail=%s"
+
+#: ../include/ldap.class.php.in:260
+#, php-format
+msgid "Error searching for DN for alias=%s: %s"
+msgstr "Erreur de recherche du DN pour l'attribut alias=%s: %s"
+
+#: ../include/ldap.class.php.in:273
+#, php-format
+msgid "Error searching for DN for mail or alias %s: %s"
+msgstr "Erreur de recherche du DN pour l'attribut mail ou alias %s: %s"
+
+#: ../include/ldap.class.php.in:336
+msgid "LDAP Error: Can't read maintainers group: "
+msgstr "Erreur LDAP: Impossible de lire le groupe des mainteneurs: "
+
 #: ../include/menu.php:26
 msgid "Users"
 msgstr "Utilisateurs"
@@ -2286,46 +2353,3 @@
 #: ../include/passwd.php:36 ../include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Les mots de passe ne correspondent pas"
-
-#: ../include/ldap.class.php.in:54
-msgid "Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Erreur lors de la négociation du protocole LDAP v3. Veuillez contacter votre "
-"administrateur système"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Il n'existe pas d'objet %s"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "Erreur LDAP en recherchant le DN %s: %s"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Erreur de recherche du DN pour l'attribut uid=%s"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Erreur de recherche du DN pour l'attribut mail=%s"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Erreur de recherche du DN pour l'attribut alias=%s: %s"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Erreur de recherche du DN pour l'attribut mail ou alias %s: %s"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Erreur LDAP: Impossible de lire le groupe des mainteneurs: "
-



From cvs at kolab.org  Mon Aug 25 18:33:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:33:46 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.23, 1.24 
Message-ID: <20080825163346.7C8D060C4B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv18408/it/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- messages.po	10 Apr 2008 12:39:36 -0000	1.23
+++ messages.po	25 Aug 2008 16:33:44 -0000	1.24
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin Italian\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-10 12:58+0200\n"
+"POT-Creation-Date: 2008-08-25 18:29+0200\n"
 "PO-Revision-Date: 2007-11-21 14:56+0100\n"
 "Last-Translator: Yvette Agostini <yvette at yvetteagostini.it>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
@@ -19,7 +19,7 @@
 msgstr "L'indirizzo con il DN"
 
 #: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:146 tpl_messages.php:164
+#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
 msgid "has been deleted"
 msgstr "è stato cancellato"
 
@@ -32,29 +32,29 @@
 msgstr "(solo indirizzi esterni senza account utente Kolab)"
 
 #: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:149
-#: tpl_messages.php:172 ../../../www/admin/addressbook/index.php.in:121
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
+#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
 #: ../../../www/admin/user/index.php.in:183
 msgid "Name"
 msgstr "Nome"
 
 #: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
 #: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:152 tpl_messages.php:175 tpl_messages.php:230
-#: tpl_messages.php:243
+#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
+#: tpl_messages.php:221
 msgid "Action"
 msgstr "Azione"
 
 #: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
 #: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:154 tpl_messages.php:177
+#: tpl_messages.php:200 tpl_messages.php:223
 msgid "Modify"
 msgstr "Modifica"
 
 #: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
 #: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:155 tpl_messages.php:178 tpl_messages.php:231
-#: tpl_messages.php:244 ../../../www/admin/addressbook/addr.php.in:277
+#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
+#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
 #: ../../../www/admin/administrator/admin.php.in:307
 #: ../../../www/admin/distributionlist/list.php.in:300
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
@@ -64,19 +64,19 @@
 msgid "Delete"
 msgstr "Cancella"
 
-#: tpl_messages.php:11 tpl_messages.php:167 tpl_messages.php:180
+#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
 msgid "[ ALL ]"
 msgstr "[ TUTTI ]"
 
-#: tpl_messages.php:12 tpl_messages.php:168 tpl_messages.php:181
+#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
 msgid "[ OTHER ]"
 msgstr "[ ALTRI ]"
 
-#: tpl_messages.php:13 tpl_messages.php:169 tpl_messages.php:182
+#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: tpl_messages.php:14 tpl_messages.php:170 tpl_messages.php:183
+#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
 msgid "Filter"
 msgstr "Filtro"
 
@@ -310,10 +310,10 @@
 msgid "Deliver regular mail to folder"
 msgstr "Consegna la mail normale nella cartella"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:193
-#: tpl_messages.php:208 tpl_messages.php:212 tpl_messages.php:215
-#: tpl_messages.php:218 tpl_messages.php:221 tpl_messages.php:224
-#: tpl_messages.php:227 tpl_messages.php:240
+#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
+#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
+#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
+#: tpl_messages.php:185 tpl_messages.php:239
 msgid "Update"
 msgstr "Aggiorna"
 
@@ -732,158 +732,14 @@
 msgstr "Messaggi:"
 
 #: tpl_messages.php:145
-#, fuzzy
-msgid "The shared folder with DN"
-msgstr "L'utente con DN"
-
-#: tpl_messages.php:147
-#, fuzzy
-msgid "Back to list of shared folders"
-msgstr "Ritorna alla lista degli utenti"
-
-#: tpl_messages.php:148
-msgid "Shared folders"
-msgstr "Cartelle condivise"
-
-#: tpl_messages.php:150
-msgid "Server"
-msgstr "Server"
-
-#: tpl_messages.php:151 tpl_messages.php:171
-msgid "Type"
-msgstr "Tipo"
-
-#: tpl_messages.php:153
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Cartella cancellata, in attesa della pulizia..."
-
-#: tpl_messages.php:156 tpl_messages.php:194
-msgid "Welcome to the Kolab administration interface"
-msgstr "Benvenuto all'interfaccia di amministrazione di Kolab"
-
-#: tpl_messages.php:157
-msgid "NOTE:"
-msgstr "NOTA:"
-
-#: tpl_messages.php:158
-#, fuzzy
-msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
-msgstr ""
-"Nessun account è configurato per ricevere mail per gli indirizzi "
-"amministrativi. Se non è stato ancora creato un account per questo, fatelo "
-"prima di proseguire"
-
-#: tpl_messages.php:159
-msgid "please do so"
-msgstr ""
-
-#: tpl_messages.php:160
-msgid "and then go"
-msgstr ""
-
-#: tpl_messages.php:161
-msgid "here"
-msgstr "qui"
-
-#: tpl_messages.php:162
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "per impostare l'inoltro delle email a degli indirizzi amministrativi."
-
-#: tpl_messages.php:163
-msgid "The user with DN"
-msgstr "L'utente con DN"
-
-#: tpl_messages.php:165
-msgid "Back to list of users"
-msgstr "Ritorna alla lista degli utenti"
-
-#: tpl_messages.php:166 tpl_messages.php:179
-msgid "Email Users"
-msgstr "Utenti Email"
-
-#: tpl_messages.php:173
-msgid "E-mail"
-msgstr "E-mail"
-
-#: tpl_messages.php:174
-msgid "uid"
-msgstr "uid"
-
-#: tpl_messages.php:176
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Utente cancellato, in attesa di pulizia..."
-
-#: tpl_messages.php:184
-msgid "Vacation Notification"
-msgstr "Notifica di assenza"
-
-#: tpl_messages.php:185
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Attiva notifica d'assenza  (solo uno tra assenza, inoltro e invio in "
-"cartella può essere attivo allo stesso tempo)"
-
-#: tpl_messages.php:186
-msgid "Resend notification only after"
-msgstr "Rispedisci la notifica solo dopo"
-
-#: tpl_messages.php:187
-msgid "days"
-msgstr "giorni"
-
-#: tpl_messages.php:188
-msgid "Send responses for these addresses:"
-msgstr "Invia risposte per questi indirizzi:"
-
-#: tpl_messages.php:189
-msgid "(one address per line)"
-msgstr "(un indirizzo per linea)"
-
-#: tpl_messages.php:190
-msgid "Do not send vacation replies to spam messages"
-msgstr "Non inviare le risposte automatiche di assenza ai messaggi di spam"
-
-#: tpl_messages.php:191
-msgid "Only react to mail coming from domain"
-msgstr "Reagisci solo alle mail in arrivo dal dominio"
-
-#: tpl_messages.php:192
-msgid "(leave empty for all domains)"
-msgstr "(lasciare vuoto per tutti i domini)"
-
-#: tpl_messages.php:195
-msgid "Kolab2 Groupware Server Version"
-msgstr "Versione Server Groupware Kolab2 "
-
-#: tpl_messages.php:196
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Versione Componenti Server Groupware Kolab2"
-
-#: tpl_messages.php:197
-msgid "PEAR/Horde Versions"
-msgstr ""
-
-#: tpl_messages.php:198
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Versioni Modificate dei Pacchetti OpenPKG"
-
-#: tpl_messages.php:199
-msgid "OpenPKG Version"
-msgstr "Versione OpenPKG"
-
-#: tpl_messages.php:200
 msgid "Kolab Server Settings"
 msgstr "Impostazioni Server Kolab"
 
-#: tpl_messages.php:201
+#: tpl_messages.php:146
 msgid "Administrative email addresses"
 msgstr "Indirizzi email amministrativi"
 
-#: tpl_messages.php:202
+#: tpl_messages.php:147
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -900,66 +756,66 @@
 "indirizzi. Più tardi sarà possibile aggiungere o rimuovere indirizzi dalle "
 "liste come per ogni altra lista di distribuzione"
 
-#: tpl_messages.php:203
+#: tpl_messages.php:148
 #, fuzzy
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Indirizzi email degli account che dovranno ricevere la posta amministrativa:"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:149
 msgid "Create Distribution Lists"
 msgstr "Crea liste di distribuzione"
 
-#: tpl_messages.php:205
+#: tpl_messages.php:150
 msgid "Enable or Disable individual Services"
 msgstr "Abilitazione o Disabilitazione individuale dei servizi"
 
-#: tpl_messages.php:206
+#: tpl_messages.php:151
 msgid "Service"
 msgstr "Servizio"
 
-#: tpl_messages.php:207
+#: tpl_messages.php:152
 msgid "Enabled"
 msgstr "Attivo"
 
-#: tpl_messages.php:209
+#: tpl_messages.php:154
 msgid "Quota settings"
 msgstr "Impostazioni della quota"
 
-#: tpl_messages.php:210
+#: tpl_messages.php:155
 msgid "Warn users when they have used"
 msgstr "Avvisa gli utenti quando hanno usato"
 
-#: tpl_messages.php:211
+#: tpl_messages.php:156
 #, php-format
 msgid "% of their quota"
 msgstr "% della loro quota"
 
-#: tpl_messages.php:213
+#: tpl_messages.php:158
 msgid "Free/Busy settings"
 msgstr "Impostazioni disponibilità (FreeBusy)"
 
-#: tpl_messages.php:214
+#: tpl_messages.php:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Permetti a utenti non autenticati di scaricare le informazioni di "
 "disponibilità (Free/Busy)"
 
-#: tpl_messages.php:216
+#: tpl_messages.php:161
 msgid "When creating free/busy lists, include data from"
 msgstr ""
 "Quando vengono create le liste di disponibilità, includi le informazioni da"
 
-#: tpl_messages.php:217
+#: tpl_messages.php:162
 msgid "days in the past"
 msgstr "giorni nel passato"
 
-#: tpl_messages.php:219
+#: tpl_messages.php:164
 msgid "Privileged Networks"
 msgstr "Reti privilegiate"
 
-#: tpl_messages.php:220
+#: tpl_messages.php:165
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -969,11 +825,11 @@
 "connessioni SMTP non autenticate al server Kolab (lista di reti x.x.x.x/y  "
 "separate da virgola):"
 
-#: tpl_messages.php:222
+#: tpl_messages.php:167
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "Server Relay SMTP ( \"smarthost/relayhost\")"
 
-#: tpl_messages.php:223
+#: tpl_messages.php:168
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -981,11 +837,11 @@
 "Smarthost da usare per inviare la posta verso l'esterno (host.domain.tld). "
 "Lasciare vuoto per non usarlo."
 
-#: tpl_messages.php:225
+#: tpl_messages.php:170
 msgid "Accept Internet Mail"
 msgstr "Accetta Email Internet"
 
-#: tpl_messages.php:226
+#: tpl_messages.php:171
 #, fuzzy
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
@@ -997,30 +853,30 @@
 "essere abilitato se si vuole usare il server Kolab per ricevere email da "
 "altri domini internet."
 
-#: tpl_messages.php:228
+#: tpl_messages.php:173
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
 msgid "Domains"
 msgstr "Domini"
 
-#: tpl_messages.php:229
+#: tpl_messages.php:174
 msgid "Domain"
 msgstr "Dominio"
 
-#: tpl_messages.php:232 tpl_messages.php:245
+#: tpl_messages.php:177 tpl_messages.php:190
 msgid "Add"
 msgstr "Aggiungi"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:178
 msgid "Mail Filter Settings"
 msgstr "Impostazioni Filtro Mail"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:179
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Controlla i messaggi per verificare che il mittente nell'header sia lo "
 "stesso dell'email"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:180
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -1028,11 +884,11 @@
 "Usa l'intestazione Sender invece del From per i controlli precedenti se "
 "Sender è presente."
 
-#: tpl_messages.php:236
+#: tpl_messages.php:181
 msgid "Action to take for messages that fail the check:"
 msgstr ""
 
-#: tpl_messages.php:237
+#: tpl_messages.php:182
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -1043,11 +899,11 @@
 "riscrivi l'intestazione From in maniera tale che il destinatario possa "
 "constatare la possibile falsificazione."
 
-#: tpl_messages.php:238
+#: tpl_messages.php:183
 msgid "Always reject the message."
 msgstr "Rifiuta sempre il messaggio"
 
-#: tpl_messages.php:239
+#: tpl_messages.php:184
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -1058,14 +914,158 @@
 "il mittente è un account sul server. Questo è una riconosciuta fonte di "
 "problemi come ad esempio le mailinglist."
 
-#: tpl_messages.php:241
+#: tpl_messages.php:186
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr ""
 
-#: tpl_messages.php:242
+#: tpl_messages.php:187
 msgid "Host"
 msgstr "Server"
 
+#: tpl_messages.php:191
+#, fuzzy
+msgid "The shared folder with DN"
+msgstr "L'utente con DN"
+
+#: tpl_messages.php:193
+#, fuzzy
+msgid "Back to list of shared folders"
+msgstr "Ritorna alla lista degli utenti"
+
+#: tpl_messages.php:194
+msgid "Shared folders"
+msgstr "Cartelle condivise"
+
+#: tpl_messages.php:196
+msgid "Server"
+msgstr "Server"
+
+#: tpl_messages.php:197 tpl_messages.php:217
+msgid "Type"
+msgstr "Tipo"
+
+#: tpl_messages.php:199
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Cartella cancellata, in attesa della pulizia..."
+
+#: tpl_messages.php:202 tpl_messages.php:245
+msgid "Welcome to the Kolab administration interface"
+msgstr "Benvenuto all'interfaccia di amministrazione di Kolab"
+
+#: tpl_messages.php:203
+msgid "NOTE:"
+msgstr "NOTA:"
+
+#: tpl_messages.php:204
+#, fuzzy
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Nessun account è configurato per ricevere mail per gli indirizzi "
+"amministrativi. Se non è stato ancora creato un account per questo, fatelo "
+"prima di proseguire"
+
+#: tpl_messages.php:205
+msgid "please do so"
+msgstr ""
+
+#: tpl_messages.php:206
+msgid "and then go"
+msgstr ""
+
+#: tpl_messages.php:207
+msgid "here"
+msgstr "qui"
+
+#: tpl_messages.php:208
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr "per impostare l'inoltro delle email a degli indirizzi amministrativi."
+
+#: tpl_messages.php:209
+msgid "The user with DN"
+msgstr "L'utente con DN"
+
+#: tpl_messages.php:211
+msgid "Back to list of users"
+msgstr "Ritorna alla lista degli utenti"
+
+#: tpl_messages.php:212 tpl_messages.php:225
+msgid "Email Users"
+msgstr "Utenti Email"
+
+#: tpl_messages.php:219
+msgid "E-mail"
+msgstr "E-mail"
+
+#: tpl_messages.php:220
+msgid "uid"
+msgstr "uid"
+
+#: tpl_messages.php:222
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Utente cancellato, in attesa di pulizia..."
+
+#: tpl_messages.php:230
+msgid "Vacation Notification"
+msgstr "Notifica di assenza"
+
+#: tpl_messages.php:231
+msgid ""
+"Activate vacation notification (only one of vacation, forward and delivery "
+"to folder can be active at any time)"
+msgstr ""
+"Attiva notifica d'assenza  (solo uno tra assenza, inoltro e invio in "
+"cartella può essere attivo allo stesso tempo)"
+
+#: tpl_messages.php:232
+msgid "Resend notification only after"
+msgstr "Rispedisci la notifica solo dopo"
+
+#: tpl_messages.php:233
+msgid "days"
+msgstr "giorni"
+
+#: tpl_messages.php:234
+msgid "Send responses for these addresses:"
+msgstr "Invia risposte per questi indirizzi:"
+
+#: tpl_messages.php:235
+msgid "(one address per line)"
+msgstr "(un indirizzo per linea)"
+
+#: tpl_messages.php:236
+msgid "Do not send vacation replies to spam messages"
+msgstr "Non inviare le risposte automatiche di assenza ai messaggi di spam"
+
+#: tpl_messages.php:237
+msgid "Only react to mail coming from domain"
+msgstr "Reagisci solo alle mail in arrivo dal dominio"
+
+#: tpl_messages.php:238
+msgid "(leave empty for all domains)"
+msgstr "(lasciare vuoto per tutti i domini)"
+
+#: tpl_messages.php:240
+msgid "Kolab2 Groupware Server Version"
+msgstr "Versione Server Groupware Kolab2 "
+
+#: tpl_messages.php:241
+msgid "Kolab2 Groupware Server Component Versions"
+msgstr "Versione Componenti Server Groupware Kolab2"
+
+#: tpl_messages.php:242
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:243
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Versioni Modificate dei Pacchetti OpenPKG"
+
+#: tpl_messages.php:244
+msgid "OpenPKG Version"
+msgstr "Versione OpenPKG"
+
 #: ../../../www/admin/addressbook/addr.php.in:17
 #: ../../../www/admin/addressbook/index.php.in:23
 #: ../../../www/admin/administrator/index.php.in:33
@@ -1073,10 +1073,10 @@
 #: ../../../www/admin/distributionlist/list.php.in:37
 #: ../../../www/admin/domainmaintainer/index.php.in:33
 #: ../../../www/admin/maintainer/index.php.in:33
+#: ../../../www/admin/settings/index.php.in:13
 #: ../../../www/admin/sharedfolder/index.php.in:22
 #: ../../../www/admin/sharedfolder/sf.php.in:25
 #: ../../../www/admin/user/index.php.in:34
-#: ../../../www/admin/settings/index.php.in:13
 msgid "Error: You don't have Permissions to access this Menu"
 msgstr "Errore: non si hanno i permessi per accedere a questo Menù"
 
@@ -1613,6 +1613,73 @@
 msgid "Maintainer Deleted"
 msgstr "Maintainer Cancellato"
 
+#: ../../../www/admin/settings/index.php.in:98
+#, php-format
+msgid "No account found for email address %s"
+msgstr "Nessun account è stato trovato per l'indirizzo email "
+
+#: ../../../www/admin/settings/index.php.in:107
+#, php-format
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr ""
+"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
+
+#: ../../../www/admin/settings/index.php.in:109
+#, php-format
+msgid "Successfully created distribution list %s"
+msgstr "Crea liste di distribuzione"
+
+#: ../../../www/admin/settings/index.php.in:128
+#: ../../../www/admin/settings/index.php.in:137
+#: ../../../www/admin/settings/index.php.in:146
+#: ../../../www/admin/settings/index.php.in:155
+#: ../../../www/admin/settings/index.php.in:165
+#: ../../../www/admin/settings/index.php.in:174
+#: ../../../www/admin/settings/index.php.in:185
+#: ../../../www/admin/settings/index.php.in:199
+#: ../../../www/admin/settings/index.php.in:217
+#: ../../../www/admin/settings/index.php.in:235
+#: ../../../www/admin/settings/index.php.in:252
+#: ../../../www/admin/settings/index.php.in:265
+#, php-format
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr ""
+"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
+
+#: ../../../www/admin/settings/index.php.in:223
+#, php-format
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr ""
+"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
+
+#: ../../../www/admin/settings/index.php.in:273
+msgid "POP3 Service"
+msgstr "Servizio POP3"
+
+#: ../../../www/admin/settings/index.php.in:274
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "Servizio POP3/SSL (Porta TCP 995)"
+
+#: ../../../www/admin/settings/index.php.in:275
+msgid "IMAP Service"
+msgstr "Servizio IMAP"
+
+#: ../../../www/admin/settings/index.php.in:276
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "Servizio IMAP/SSL (Porta TCP 993)"
+
+#: ../../../www/admin/settings/index.php.in:277
+msgid "Sieve service (TCP port 2000)"
+msgstr "Servizio Sieve (Porta TCP 2000)"
+
+#: ../../../www/admin/settings/index.php.in:278
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
+
+#: ../../../www/admin/settings/index.php.in:279
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Servizio di verifica Email Amavis (Virus/Spam)"
+
 #: ../../../www/admin/sharedfolder/index.php.in:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
@@ -2032,73 +2099,6 @@
 msgid "<enter your name and email address here>"
 msgstr "<inserite qui il vostro nome e il vostro indirizzo email>"
 
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Nessun account è stato trovato per l'indirizzo email "
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr ""
-"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Crea liste di distribuzione"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr ""
-"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr ""
-"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "Servizio POP3"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "Servizio POP3/SSL (Porta TCP 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "Servizio IMAP"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "Servizio IMAP/SSL (Porta TCP 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Servizio Sieve (Porta TCP 2000)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr ""
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Servizio di verifica Email Amavis (Virus/Spam)"
-
 #: ../include/auth.class.php.in:40
 msgid "Server error, no ldap object!"
 msgstr "Errore nel server, oggetto ldap non presente!"
@@ -2137,7 +2137,8 @@
 
 #: ../include/form.class.php:55
 msgid ""
-"Phone entries may only contain a-z, numbers and the characters ()-+/.=?:"
+"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
+"=?:"
 msgstr ""
 
 #: ../include/form.class.php:118
@@ -2189,6 +2190,49 @@
 msgid " is empty"
 msgstr " è vuoto"
 
+#: ../include/ldap.class.php.in:54
+msgid ""
+"Error setting LDAP protocol to v3. Please contact your system administrator"
+msgstr ""
+"Si è verificato un errore impostando il protocollo LDAP alla versione 3. "
+"Contattare l'amministratore di sistema"
+
+#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
+#: ../include/ldap.class.php.in:244
+#, php-format
+msgid "No such object %s"
+msgstr "Questo oggetto non esiste"
+
+#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
+#: ../include/ldap.class.php.in:247
+#, php-format
+msgid "LDAP Error searching for DN %s: %s"
+msgstr ""
+
+#: ../include/ldap.class.php.in:200
+#, php-format
+msgid "Error searching for DN for UID=%s"
+msgstr "Errore nella ricerca del DN per l'utente"
+
+#: ../include/ldap.class.php.in:230
+#, php-format
+msgid "Error searching for DN for Mail=%s"
+msgstr "Errore nella ricerca del DN per la Mail"
+
+#: ../include/ldap.class.php.in:260
+#, php-format
+msgid "Error searching for DN for alias=%s: %s"
+msgstr "Errore nella ricerca del DN per l'alias: "
+
+#: ../include/ldap.class.php.in:273
+#, php-format
+msgid "Error searching for DN for mail or alias %s: %s"
+msgstr "Errore nella ricerca del DN per la mail o l'alias: "
+
+#: ../include/ldap.class.php.in:336
+msgid "LDAP Error: Can't read maintainers group: "
+msgstr "Errore LDAP: è impossibile leggere il gruppo dei maintainer:"
+
 #: ../include/menu.php:26
 msgid "Users"
 msgstr "Utenti"
@@ -2301,49 +2345,6 @@
 #: ../include/passwd.php:36 ../include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Le password non corrispondono"
-
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Si è verificato un errore impostando il protocollo LDAP alla versione 3. "
-"Contattare l'amministratore di sistema"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Questo oggetto non esiste"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr ""
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Errore nella ricerca del DN per l'utente"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Errore nella ricerca del DN per la Mail"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Errore nella ricerca del DN per l'alias: "
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Errore nella ricerca del DN per la mail o l'alias: "
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Errore LDAP: è impossibile leggere il gruppo dei maintainer:"
 
 #~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "



From cvs at kolab.org  Mon Aug 25 18:33:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:33:46 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.44, 1.45 
Message-ID: <20080825163346.8548260C4B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv18408/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- messages.po	6 Jul 2008 20:13:11 -0000	1.44
+++ messages.po	25 Aug 2008 16:33:44 -0000	1.45
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin Dutch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-10 12:58+0200\n"
+"POT-Creation-Date: 2008-08-25 18:29+0200\n"
 "PO-Revision-Date: 2007-11-21 14:56+0100\n"
 "Last-Translator: Richard Bos <richard at radoeka.nl>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
@@ -20,7 +20,7 @@
 msgstr "Het adres met DN"
 
 #: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:146 tpl_messages.php:164
+#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
 msgid "has been deleted"
 msgstr "Is verwijderd"
 
@@ -33,29 +33,29 @@
 msgstr " (alleen externe adressen zonder Kolab gebruikersaccount) "
 
 #: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:149
-#: tpl_messages.php:172 ../../../www/admin/addressbook/index.php.in:121
+#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
+#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
 #: ../../../www/admin/user/index.php.in:183
 msgid "Name"
 msgstr "Naam"
 
 #: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
 #: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:152 tpl_messages.php:175 tpl_messages.php:230
-#: tpl_messages.php:243
+#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
+#: tpl_messages.php:221
 msgid "Action"
 msgstr "Actie"
 
 #: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
 #: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:154 tpl_messages.php:177
+#: tpl_messages.php:200 tpl_messages.php:223
 msgid "Modify"
 msgstr "Wijzigen"
 
 #: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
 #: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:155 tpl_messages.php:178 tpl_messages.php:231
-#: tpl_messages.php:244 ../../../www/admin/addressbook/addr.php.in:277
+#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
+#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
 #: ../../../www/admin/administrator/admin.php.in:307
 #: ../../../www/admin/distributionlist/list.php.in:300
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
@@ -65,19 +65,19 @@
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: tpl_messages.php:11 tpl_messages.php:167 tpl_messages.php:180
+#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
 msgid "[ ALL ]"
 msgstr "[ ALLE ]"
 
-#: tpl_messages.php:12 tpl_messages.php:168 tpl_messages.php:181
+#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
 msgid "[ OTHER ]"
 msgstr "[ Andere ]"
 
-#: tpl_messages.php:13 tpl_messages.php:169 tpl_messages.php:182
+#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
 msgid "Filter:"
 msgstr "Filter"
 
-#: tpl_messages.php:14 tpl_messages.php:170 tpl_messages.php:183
+#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
 msgid "Filter"
 msgstr "Filter"
 
@@ -310,10 +310,10 @@
 msgid "Deliver regular mail to folder"
 msgstr "Plaats de reguliere mail in map"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:193
-#: tpl_messages.php:208 tpl_messages.php:212 tpl_messages.php:215
-#: tpl_messages.php:218 tpl_messages.php:221 tpl_messages.php:224
-#: tpl_messages.php:227 tpl_messages.php:240
+#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
+#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
+#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
+#: tpl_messages.php:185 tpl_messages.php:239
 msgid "Update"
 msgstr "Bijwerken"
 
@@ -728,156 +728,14 @@
 msgstr "Bericht"
 
 #: tpl_messages.php:145
-msgid "The shared folder with DN"
-msgstr "De gedeelde folder met DN"
-
-#: tpl_messages.php:147
-msgid "Back to list of shared folders"
-msgstr "Terug naar de lijst van de gebruikers"
-
-#: tpl_messages.php:148
-msgid "Shared folders"
-msgstr "Gedeelde mappen"
-
-#: tpl_messages.php:150
-msgid "Server"
-msgstr "Server"
-
-#: tpl_messages.php:151 tpl_messages.php:171
-msgid "Type"
-msgstr "Soort"
-
-#: tpl_messages.php:153
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Map verwijderd, wacht op opruiming... "
-
-#: tpl_messages.php:156 tpl_messages.php:194
-msgid "Welcome to the Kolab administration interface"
-msgstr "Welkom op Kolab beheersinterface"
-
-#: tpl_messages.php:157
-msgid "NOTE:"
-msgstr "OPMERKING:"
-
-#: tpl_messages.php:158
-msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
-msgstr ""
-"Geen enkel acount is ingesteld om mail te ontvangen voor administratieve "
-"adressen. Als je daarvoor nog geen account aangemaakt hebt, gelieve er één "
-"aan te maken en ga dan verder "
-
-#: tpl_messages.php:159
-msgid "please do so"
-msgstr "doe dat"
-
-#: tpl_messages.php:160
-msgid "and then go"
-msgstr "en ga dan naar"
-
-#: tpl_messages.php:161
-msgid "here"
-msgstr "hier"
-
-#: tpl_messages.php:162
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr ""
-"Om het doorsturen van mail naar administratieve E-mailadressen in te stellen."
-
-#: tpl_messages.php:163
-msgid "The user with DN"
-msgstr "De gebruiker met DN"
-
-#: tpl_messages.php:165
-msgid "Back to list of users"
-msgstr "Terug naar de lijst van de gebruikers"
-
-#: tpl_messages.php:166 tpl_messages.php:179
-msgid "Email Users"
-msgstr "Gebruikers E-mail"
-
-#: tpl_messages.php:173
-msgid "E-mail"
-msgstr "E-mail"
-
-#: tpl_messages.php:174
-msgid "uid"
-msgstr "uid"
-
-#: tpl_messages.php:176
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Gebruiker verwijderd, wacht op opruiming..."
-
-#: tpl_messages.php:184
-msgid "Vacation Notification"
-msgstr "Afwezigheidsbericht"
-
-#: tpl_messages.php:185
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Activeer afwezigheidsbericht (enkel één vakantie, forward en aflevering 's "
-"folder kan tegelijkertijd geactieveerd zijn)"
-
-#: tpl_messages.php:186
-msgid "Resend notification only after"
-msgstr "Stuur mededeling enkel na "
-
-#: tpl_messages.php:187
-msgid "days"
-msgstr "dagen"
-
-#: tpl_messages.php:188
-msgid "Send responses for these addresses:"
-msgstr "Stuur antwoorden voor deze adressen:"
-
-#: tpl_messages.php:189
-msgid "(one address per line)"
-msgstr "(een adres per lijn)"
-
-#: tpl_messages.php:190
-msgid "Do not send vacation replies to spam messages"
-msgstr "Geen afwezigheidsberichten sturen naar spam"
-
-#: tpl_messages.php:191
-msgid "Only react to mail coming from domain"
-msgstr "Reageer alleen op mail afkomstig van het domein"
-
-#: tpl_messages.php:192
-msgid "(leave empty for all domains)"
-msgstr "(leeg laten voor alle domeinen)"
-
-#: tpl_messages.php:195
-msgid "Kolab2 Groupware Server Version"
-msgstr "Kolab2 Groupware Server Versie"
-
-#: tpl_messages.php:196
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Kolab2 Groupware Server Component Versies"
-
-#: tpl_messages.php:197
-msgid "PEAR/Horde Versions"
-msgstr ""
-
-#: tpl_messages.php:198
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Kolab2 Patched OpenPKG Package Versies"
-
-#: tpl_messages.php:199
-msgid "OpenPKG Version"
-msgstr "OpenPKG Versie"
-
-#: tpl_messages.php:200
 msgid "Kolab Server Settings"
 msgstr "Kolab Server Instellingen"
 
-#: tpl_messages.php:201
+#: tpl_messages.php:146
 msgid "Administrative email addresses"
 msgstr "Administratief E-mailadres"
 
-#: tpl_messages.php:202
+#: tpl_messages.php:147
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -894,64 +752,64 @@
 "personen toevoegen of verwijderen van deze lijst zoals op elke andere "
 "distributielijst."
 
-#: tpl_messages.php:203
+#: tpl_messages.php:148
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Het E-mailadres van de account die de administratieve E-mail van dit domein "
 "moet ontvangen:"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:149
 msgid "Create Distribution Lists"
 msgstr "Maak distributielijsten"
 
-#: tpl_messages.php:205
+#: tpl_messages.php:150
 msgid "Enable or Disable individual Services"
 msgstr "Aanzetten of uitzetten van individuele services"
 
-#: tpl_messages.php:206
+#: tpl_messages.php:151
 msgid "Service"
 msgstr "Service"
 
-#: tpl_messages.php:207
+#: tpl_messages.php:152
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: tpl_messages.php:209
+#: tpl_messages.php:154
 msgid "Quota settings"
 msgstr "Quota instellingen"
 
-#: tpl_messages.php:210
+#: tpl_messages.php:155
 msgid "Warn users when they have used"
 msgstr "Waarschuw de gebruikers wanneer ze gebruikt hebben"
 
-#: tpl_messages.php:211
+#: tpl_messages.php:156
 #, php-format
 msgid "% of their quota"
 msgstr "% van hun quota"
 
-#: tpl_messages.php:213
+#: tpl_messages.php:158
 msgid "Free/Busy settings"
 msgstr "Vrij/bezet instellingen"
 
-#: tpl_messages.php:214
+#: tpl_messages.php:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Laat niet ge-authenticeerde downloading toe van vrij/bezet informatie  "
 
-#: tpl_messages.php:216
+#: tpl_messages.php:161
 msgid "When creating free/busy lists, include data from"
 msgstr "Wanneer vrij/bezet lijsten worden gecreëerd, voeg gegevens in van"
 
-#: tpl_messages.php:217
+#: tpl_messages.php:162
 msgid "days in the past"
 msgstr "Vorige dagen"
 
-#: tpl_messages.php:219
+#: tpl_messages.php:164
 msgid "Privileged Networks"
 msgstr "Bevoorrechte netwerken"
 
-#: tpl_messages.php:220
+#: tpl_messages.php:165
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -961,11 +819,11 @@
 "een niet geautentificeerde SMTP verbinding met de Kolab server (netwerken "
 "gescheiden door komma's in het formaat x.x.x.x/y ):"
 
-#: tpl_messages.php:222
+#: tpl_messages.php:167
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "SMTP \"smarthost/relayhost\""
 
-#: tpl_messages.php:223
+#: tpl_messages.php:168
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -973,11 +831,11 @@
 "Smarthost (en optionele poort) gebruiken om uitgaande mail te versturen "
 "(host.domain.tld).  Leeg laten indien geen relayhost"
 
-#: tpl_messages.php:225
+#: tpl_messages.php:170
 msgid "Accept Internet Mail"
 msgstr "Internet mail aanvaarden"
 
-#: tpl_messages.php:226
+#: tpl_messages.php:171
 msgid ""
 "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 "
@@ -988,29 +846,29 @@
 "ingeschakeld zijn wanneer U de Kolab server wil gebruiken om mail te "
 "ontvangen via andere internetdomeinen. "
 
-#: tpl_messages.php:228
+#: tpl_messages.php:173
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
 msgid "Domains"
 msgstr "Domeinen"
 
-#: tpl_messages.php:229
+#: tpl_messages.php:174
 msgid "Domain"
 msgstr "Domein"
 
-#: tpl_messages.php:232 tpl_messages.php:245
+#: tpl_messages.php:177 tpl_messages.php:190
 msgid "Add"
 msgstr "Toevoegen"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:178
 msgid "Mail Filter Settings"
 msgstr "Mail filter instellingen"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:179
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Controleer berichten op niet overeenkomstige From header en envelope from"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:180
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -1018,11 +876,11 @@
 "Gebruik de Sender header in plaats van From voor de bovenstaande controles "
 "indien aanwezig."
 
-#: tpl_messages.php:236
+#: tpl_messages.php:181
 msgid "Action to take for messages that fail the check:"
 msgstr "Welke actie uitvoeren voor berichten die de test falen"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:182
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -1033,11 +891,11 @@
 "de From header herschreven, zodat de ontvanger het mogelijke misbruik kan "
 "zien"
 
-#: tpl_messages.php:238
+#: tpl_messages.php:183
 msgid "Always reject the message."
 msgstr "Het bericht altijd afwijzen. "
 
-#: tpl_messages.php:239
+#: tpl_messages.php:184
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -1049,14 +907,156 @@
 "afzender een account heeft op deze server. Dit gebeurt soms met "
 "mailinglijsten."
 
-#: tpl_messages.php:241
+#: tpl_messages.php:186
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Kolab hostnamen (voor Master en Slaves)"
 
-#: tpl_messages.php:242
+#: tpl_messages.php:187
 msgid "Host"
 msgstr "Host"
 
+#: tpl_messages.php:191
+msgid "The shared folder with DN"
+msgstr "De gedeelde folder met DN"
+
+#: tpl_messages.php:193
+msgid "Back to list of shared folders"
+msgstr "Terug naar de lijst van de gebruikers"
+
+#: tpl_messages.php:194
+msgid "Shared folders"
+msgstr "Gedeelde mappen"
+
+#: tpl_messages.php:196
+msgid "Server"
+msgstr "Server"
+
+#: tpl_messages.php:197 tpl_messages.php:217
+msgid "Type"
+msgstr "Soort"
+
+#: tpl_messages.php:199
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Map verwijderd, wacht op opruiming... "
+
+#: tpl_messages.php:202 tpl_messages.php:245
+msgid "Welcome to the Kolab administration interface"
+msgstr "Welkom op Kolab beheersinterface"
+
+#: tpl_messages.php:203
+msgid "NOTE:"
+msgstr "OPMERKING:"
+
+#: tpl_messages.php:204
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Geen enkel acount is ingesteld om mail te ontvangen voor administratieve "
+"adressen. Als je daarvoor nog geen account aangemaakt hebt, gelieve er één "
+"aan te maken en ga dan verder "
+
+#: tpl_messages.php:205
+msgid "please do so"
+msgstr "doe dat"
+
+#: tpl_messages.php:206
+msgid "and then go"
+msgstr "en ga dan naar"
+
+#: tpl_messages.php:207
+msgid "here"
+msgstr "hier"
+
+#: tpl_messages.php:208
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr ""
+"Om het doorsturen van mail naar administratieve E-mailadressen in te stellen."
+
+#: tpl_messages.php:209
+msgid "The user with DN"
+msgstr "De gebruiker met DN"
+
+#: tpl_messages.php:211
+msgid "Back to list of users"
+msgstr "Terug naar de lijst van de gebruikers"
+
+#: tpl_messages.php:212 tpl_messages.php:225
+msgid "Email Users"
+msgstr "Gebruikers E-mail"
+
+#: tpl_messages.php:219
+msgid "E-mail"
+msgstr "E-mail"
+
+#: tpl_messages.php:220
+msgid "uid"
+msgstr "uid"
+
+#: tpl_messages.php:222
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Gebruiker verwijderd, wacht op opruiming..."
+
+#: tpl_messages.php:230
+msgid "Vacation Notification"
+msgstr "Afwezigheidsbericht"
+
+#: tpl_messages.php:231
+msgid ""
+"Activate vacation notification (only one of vacation, forward and delivery "
+"to folder can be active at any time)"
+msgstr ""
+"Activeer afwezigheidsbericht (enkel één vakantie, forward en aflevering 's "
+"folder kan tegelijkertijd geactieveerd zijn)"
+
+#: tpl_messages.php:232
+msgid "Resend notification only after"
+msgstr "Stuur mededeling enkel na "
+
+#: tpl_messages.php:233
+msgid "days"
+msgstr "dagen"
+
+#: tpl_messages.php:234
+msgid "Send responses for these addresses:"
+msgstr "Stuur antwoorden voor deze adressen:"
+
+#: tpl_messages.php:235
+msgid "(one address per line)"
+msgstr "(een adres per lijn)"
+
+#: tpl_messages.php:236
+msgid "Do not send vacation replies to spam messages"
+msgstr "Geen afwezigheidsberichten sturen naar spam"
+
+#: tpl_messages.php:237
+msgid "Only react to mail coming from domain"
+msgstr "Reageer alleen op mail afkomstig van het domein"
+
+#: tpl_messages.php:238
+msgid "(leave empty for all domains)"
+msgstr "(leeg laten voor alle domeinen)"
+
+#: tpl_messages.php:240
+msgid "Kolab2 Groupware Server Version"
+msgstr "Kolab2 Groupware Server Versie"
+
+#: tpl_messages.php:241
+msgid "Kolab2 Groupware Server Component Versions"
+msgstr "Kolab2 Groupware Server Component Versies"
+
+#: tpl_messages.php:242
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:243
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Kolab2 Patched OpenPKG Package Versies"
+
+#: tpl_messages.php:244
+msgid "OpenPKG Version"
+msgstr "OpenPKG Versie"
+
 #: ../../../www/admin/addressbook/addr.php.in:17
 #: ../../../www/admin/addressbook/index.php.in:23
 #: ../../../www/admin/administrator/index.php.in:33
@@ -1064,10 +1064,10 @@
 #: ../../../www/admin/distributionlist/list.php.in:37
 #: ../../../www/admin/domainmaintainer/index.php.in:33
 #: ../../../www/admin/maintainer/index.php.in:33
+#: ../../../www/admin/settings/index.php.in:13
 #: ../../../www/admin/sharedfolder/index.php.in:22
 #: ../../../www/admin/sharedfolder/sf.php.in:25
 #: ../../../www/admin/user/index.php.in:34
-#: ../../../www/admin/settings/index.php.in:13
 msgid "Error: You don't have Permissions to access this Menu"
 msgstr "Fout: je hebt geen toegangsrechten voor dit menu "
 
@@ -1604,6 +1604,70 @@
 msgid "Maintainer Deleted"
 msgstr "Beheerder verwijderd"
 
+#: ../../../www/admin/settings/index.php.in:98
+#, php-format
+msgid "No account found for email address %s"
+msgstr "Er is geen account voor E-mailadres %s"
+
+#: ../../../www/admin/settings/index.php.in:107
+#, php-format
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "LDAP fout: het toevoegen van de distributielijst %s: %s is gefaald"
+
+#: ../../../www/admin/settings/index.php.in:109
+#, php-format
+msgid "Successfully created distribution list %s"
+msgstr "Het aanmaken van de distributielijst %s is geslaagd"
+
+#: ../../../www/admin/settings/index.php.in:128
+#: ../../../www/admin/settings/index.php.in:137
+#: ../../../www/admin/settings/index.php.in:146
+#: ../../../www/admin/settings/index.php.in:155
+#: ../../../www/admin/settings/index.php.in:165
+#: ../../../www/admin/settings/index.php.in:174
+#: ../../../www/admin/settings/index.php.in:185
+#: ../../../www/admin/settings/index.php.in:199
+#: ../../../www/admin/settings/index.php.in:217
+#: ../../../www/admin/settings/index.php.in:235
+#: ../../../www/admin/settings/index.php.in:252
+#: ../../../www/admin/settings/index.php.in:265
+#, php-format
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr "LDAP fout: het bijwerken van Kolab configuratie object %s is gefaald"
+
+#: ../../../www/admin/settings/index.php.in:223
+#, php-format
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "LDAP fout: het verwijderen van domein object %s: %s is gefaald"
+
+#: ../../../www/admin/settings/index.php.in:273
+msgid "POP3 Service"
+msgstr "POP3 Service"
+
+#: ../../../www/admin/settings/index.php.in:274
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "POP3/SSL service (TCP poort 995)"
+
+#: ../../../www/admin/settings/index.php.in:275
+msgid "IMAP Service"
+msgstr "IMAP Service"
+
+#: ../../../www/admin/settings/index.php.in:276
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "IMAP/SSL Service (TCP poort 993)"
+
+#: ../../../www/admin/settings/index.php.in:277
+msgid "Sieve service (TCP port 2000)"
+msgstr "Sieve service (TCP poort 2000)"
+
+#: ../../../www/admin/settings/index.php.in:278
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
+
+#: ../../../www/admin/settings/index.php.in:279
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Amavis E-mail scannen (virus/anti-spam)"
+
 #: ../../../www/admin/sharedfolder/index.php.in:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
@@ -2021,70 +2085,6 @@
 msgid "<enter your name and email address here>"
 msgstr "<vul hier uw naam en E-mailadres in>"
 
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Er is geen account voor E-mailadres %s"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "LDAP fout: het toevoegen van de distributielijst %s: %s is gefaald"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Het aanmaken van de distributielijst %s is geslaagd"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr "LDAP fout: het bijwerken van Kolab configuratie object %s is gefaald"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "LDAP fout: het verwijderen van domein object %s: %s is gefaald"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "POP3 Service"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "POP3/SSL service (TCP poort 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "IMAP Service"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "IMAP/SSL Service (TCP poort 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port 2000)"
-msgstr "Sieve service (TCP poort 2000)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr ""
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Amavis E-mail scannen (virus/anti-spam)"
-
 #: ../include/auth.class.php.in:40
 msgid "Server error, no ldap object!"
 msgstr "Serverfout, geen LDAP object"
@@ -2125,7 +2125,8 @@
 
 #: ../include/form.class.php:55
 msgid ""
-"Phone entries may only contain a-z, numbers and the characters ()-+/.=?:"
+"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
+"=?:"
 msgstr ""
 
 #: ../include/form.class.php:118
@@ -2176,6 +2177,49 @@
 msgid " is empty"
 msgstr " is leeg"
 
+#: ../include/ldap.class.php.in:54
+msgid ""
+"Error setting LDAP protocol to v3. Please contact your system administrator"
+msgstr ""
+"Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met uw "
+"systeembeheerder "
+
+#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
+#: ../include/ldap.class.php.in:244
+#, php-format
+msgid "No such object %s"
+msgstr "Object %s bestaat niet"
+
+#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
+#: ../include/ldap.class.php.in:247
+#, php-format
+msgid "LDAP Error searching for DN %s: %s"
+msgstr "LDAP fout, kan DN %s: %s niet vinden"
+
+#: ../include/ldap.class.php.in:200
+#, php-format
+msgid "Error searching for DN for UID=%s"
+msgstr "Fout kan DN voor UID=%s niet vinden"
+
+#: ../include/ldap.class.php.in:230
+#, php-format
+msgid "Error searching for DN for Mail=%s"
+msgstr "Fout kan DN voor mail=%s niet vinden"
+
+#: ../include/ldap.class.php.in:260
+#, php-format
+msgid "Error searching for DN for alias=%s: %s"
+msgstr "Fout kan DN voor alias=%s:%s niet vinden"
+
+#: ../include/ldap.class.php.in:273
+#, php-format
+msgid "Error searching for DN for mail or alias %s: %s"
+msgstr "Fout kan DN voor mail or alias %s: %s niet vinden"
+
+#: ../include/ldap.class.php.in:336
+msgid "LDAP Error: Can't read maintainers group: "
+msgstr "LDAP fout: Can't read maintainers group"
+
 #: ../include/menu.php:26
 msgid "Users"
 msgstr "Gebruikers"
@@ -2287,49 +2331,6 @@
 #: ../include/passwd.php:36 ../include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Wachtwoorden stemmen niet overeen"
-
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met uw "
-"systeembeheerder "
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Object %s bestaat niet"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "LDAP fout, kan DN %s: %s niet vinden"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Fout kan DN voor UID=%s niet vinden"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Fout kan DN voor mail=%s niet vinden"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Fout kan DN voor alias=%s:%s niet vinden"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Fout kan DN voor mail or alias %s: %s niet vinden"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "LDAP fout: Can't read maintainers group"
 
 #~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "



From cvs at kolab.org  Mon Aug 25 18:35:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:35:46 +0200 (CEST)
Subject: thomas: server/gmp - New directory 
Message-ID: <20080825163546.CF2CA60C4B7@lists.intevation.de>

Author: thomas

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

Log Message:
Directory /kolabrepository/server/gmp added to the repository




From cvs at kolab.org  Mon Aug 25 18:37:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:37:19 +0200 (CEST)
Subject: thomas: server/gmp Makefile,NONE,1.1 kolab.patch,NONE,1.1 
Message-ID: <20080825163719.531E360C4B1@lists.intevation.de>

Author: thomas

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

Added Files:
	Makefile kolab.patch 
Log Message:
Fix kolab/issue2928 (gmp-4.2.2-20080101 does not compile on Debian lenny/amd64)

Idea for the fix by Andrea Soliva, patch provided by Antonio Larrosa.


--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
	KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/release/kolab-server-2.2.0/sources/
endif
ifeq "x$(KOLABRPMSRC)" "x"
	KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
	KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABCVSDIR)" "x"
	KOLABCVSDIR = $(CURDIR)
endif
ifeq "x$(RPM)" "x"
	RPM = $(HOME)/bin/openpkg rpm
endif

PACKAGE=gmp
VERSION=4.2.2
RELEASE=20080101
KOLABRELEASE=20080101_kolab

all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/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)

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

dist: all
	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/

clean:
	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

--- NEW FILE: kolab.patch ---
--- gmp.spec	2008-01-01 15:31:54.000000000 +0100
+++ /tmp/gmp.spec	2008-08-25 16:07:30.000000000 +0200
@@ -32,7 +32,7 @@
 Group:        Algorithm
 License:      LGPL
 Version:      4.2.2
-Release:      20080101
+Release:      20080101_kolab
 
 #   package options
 %option       with_cxx  no
@@ -84,7 +84,7 @@
         amd64-solaris* ) CFLAGS="$CFLAGS -DNO_ASM"; export ABI=32 ;;
     esac
     ./configure \
-        --prefix=%{l_prefix} \
+        --prefix=%{l_prefix} --build=`gcc -dumpmachine` \
 %if "%{with_cxx}" == "yes"
         --enable-cxx \
 %endif



From cvs at kolab.org  Mon Aug 25 18:53:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 18:53:32 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.306,1.307 Makefile,1.53,1.54 
Message-ID: <20080825165332.9675460C4AE@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt Makefile 
Log Message:
Updated release notes and Makefile for patched gmp package


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- release-notes.txt	18 Aug 2008 08:24:54 -0000	1.306
+++ release-notes.txt	25 Aug 2008 16:53:30 -0000	1.307
@@ -53,6 +53,11 @@
 
 	Added syncrepl backend (inactive by default)
 
+    - gmp-4.2.2-20080101_kolab
+
+	kolab/issue2928 (gmp-4.2.2-20080101 does not compile on Debian
+	                 lenny/amd64)
+
     - kolabd-2.2.?-2008????
 
 	kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Makefile	15 Aug 2008 10:09:40 -0000	1.53
+++ Makefile	25 Aug 2008 16:53:30 -0000	1.54
@@ -30,7 +30,8 @@
               apache-php              \
               php                     \
               postfix                 \
-              imapd
+              imapd                   \
+              gmp
 
 PERL_PACKAGES=perl-kolab              \
               kolabconf



From cvs at kolab.org  Mon Aug 25 19:01:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Aug 2008 19:01:34 +0200 (CEST)
Subject: thomas: server README.1st,1.91,1.92 
Message-ID: <20080825170134.749DF60C4AE@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Documented workaround for kolab/issue2871 (openpkg-20071227-20071227 does not compile with gcc 4.3)


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- README.1st	16 Jul 2008 11:00:38 -0000	1.91
+++ README.1st	25 Aug 2008 17:01:32 -0000	1.92
@@ -333,6 +333,16 @@
 Known problems and workarounds
 ------------------------------
 
+    - Compiling openpkg-20071227-20071227 does not work with gcc 4.3, e.g.
+      on Debian/lenny. As a workaround you can install the gcc-4.2 package,
+      but you have to make sure that "gcc" calls this version. If your system
+      uses a symbolic link /usr/bin/gcc -> gcc-4.3 you can execute:
+
+        ln -sf gcc-4.2 /usr/bin/gcc
+
+      "gcc --version" should report 4.2.x now. See kolab/issue2871
+      (openpkg-20071227-20071227 does not compile with gcc 4.3) for details.
+
     - Your system (C library) has to support all languages you want to have
       available in the web admin interface and fbview. For most languages you
       have to use the non-UTF-8 and non-euro locales, i.e. de_DE, fr_FR,



From cvs at kolab.org  Tue Aug 26 19:57:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Aug 2008 19:57:02 +0200 (CEST)
Subject: richard: server/kolabd/kolabd Makefile.am, 1.43, 1.44 ChangeLog, 1.184,
	1.185 
Message-ID: <20080826175702.CB89F60C4C5@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am ChangeLog 
Log Message:
kolab.conf removed



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile.am	20 Jun 2008 16:53:03 -0000	1.43
+++ Makefile.am	26 Aug 2008 17:57:00 -0000	1.44
@@ -31,8 +31,7 @@
 kolabspecialdir = $(kolabconfdir)
 kolabspecial_DATA = kolab.globals
 
-kolabconfig_FILES = kolab.conf \
-	rootDSE.ldif \
+kolabconfig_FILES = rootDSE.ldif \
 	quotawarning.txt
 
 kolabconfigdir = $(kolabconfdir)
@@ -216,7 +215,6 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
-	chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
 	chmod 744 $(DESTDIR)$(sbindir)/kolabd
 	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- ChangeLog	20 Aug 2008 20:15:40 -0000	1.184
+++ ChangeLog	26 Aug 2008 17:57:00 -0000	1.185
@@ -1,3 +1,8 @@
+2008-08-26 Richard Bos <richard at radoeka.nl>
+
+	* kolab.conf: removed, see issue2994
+	* Makefile.am: updated to reflect change above
+
 2008-08-20 Richard Bos <richard at radoeka.nl>
 
 	* kolab_bootstrap.in: added syncrepl support, see kolab/issue1755



From cvs at kolab.org  Tue Aug 26 19:58:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Aug 2008 19:58:51 +0200 (CEST)
Subject: richard: server release-notes.txt,1.307,1.308 
Message-ID: <20080826175851.1702F60C4C6@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
Added issue2997



Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- release-notes.txt	25 Aug 2008 16:53:30 -0000	1.307
+++ release-notes.txt	26 Aug 2008 17:58:48 -0000	1.308
@@ -72,6 +72,8 @@
 	                 in the file templates/slapd.conf.template.in)
 	kolab/issue2961 (added smtpd_sasl_authenticated_header = yes for
 	                 simpler authorization)
+	kolab/issue2994 (Duplicated kolab.conf files in cvs, one should
+			 be removed)
 
     - php-5.2.6-20080818_kolab
 



From cvs at kolab.org  Wed Aug 27 22:04:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:04:08 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.185,1.186 
Message-ID: <20080827200408.8B904600B85@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added @@@if conditional aroud the TLSCertificate variable assignments
See kolab/issue3005



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- ChangeLog	26 Aug 2008 17:57:00 -0000	1.185
+++ ChangeLog	27 Aug 2008 20:04:06 -0000	1.186
@@ -1,3 +1,8 @@
+2008-08-27 Richard Bos <richard at radoeka.nl>
+
+	* templates/slapd.conf.template.in: added @@@if conditional aroud
+	  the TLSCertificate variable assignments.  See kolab/issue3005
+
 2008-08-26 Richard Bos <richard at radoeka.nl>
 
 	* kolab.conf: removed, see issue2994



From cvs at kolab.org  Wed Aug 27 22:04:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:04:08 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.21,
	1.22 
Message-ID: <20080827200408.8A7ED600B82@lists.intevation.de>

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
added @@@if conditional aroud the TLSCertificate variable assignments
See kolab/issue3005



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- slapd.conf.template.in	14 Aug 2008 19:33:06 -0000	1.21
+++ slapd.conf.template.in	27 Aug 2008 20:04:06 -0000	1.22
@@ -41,8 +41,11 @@
 replicationinterval 5
 @@@endif@@@
 
+@@@if bootstrap_config@@@
+@@@else@@@
 TLSCertificateFile     @sysconfdir@/kolab/cert.pem
 TLSCertificateKeyFile  @sysconfdir@/kolab/key.pem
+@@@endif@@@
 
 rootDSE                @sysconfdir@/kolab/rootDSE.ldif
 



From cvs at kolab.org  Wed Aug 27 22:07:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:07:13 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.15,1.16 
Message-ID: <20080827200713.66545600B87@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv16914/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Removed code specific for slapd.conf
See kolab/issue3005



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Conf.pm	20 Aug 2008 20:14:03 -0000	1.15
+++ Conf.pm	27 Aug 2008 20:07:11 -0000	1.16
@@ -723,20 +723,6 @@
       $cfg = $templates{$tpl};
       # print STDOUT "Rebuilding $tpl => $cfg\n";
       build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg} );
-
-      if ($tpl eq "$templatedir/slapd.conf.template") {
-        # Update file in place
-        if (open (CFG, "+< $cfg" )) {
-          while (<CFG>) {
-            s/^TLSCertificate/#TLSCertificate/;
-            $out .= $_;
-          }
-          seek(CFG, 0, 0);
-          print CFG $out;
-          truncate(CFG, tell(CFG));
-          close(CFG);
-	}
-      }
     }
 }
 



From cvs at kolab.org  Wed Aug 27 22:07:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:07:13 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.8,1.9 
Message-ID: <20080827200713.62463600B85@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Removed code specific for slapd.conf
See kolab/issue3005



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	20 Aug 2008 20:14:02 -0000	1.8
+++ ChangeLog	27 Aug 2008 20:07:11 -0000	1.9
@@ -1,3 +1,8 @@
+2008-08-27 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: removed code specific for slapd.conf
+	  See kolab/issue3005
+
 2008-08-20 Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/Conf.pm: added function bootstrapConfig to create config



From cvs at kolab.org  Wed Aug 27 22:09:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:09:55 +0200 (CEST)
Subject: richard: server release-notes.txt,1.308,1.309 
Message-ID: <20080827200955.852CD600B82@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added kolab/issue3005

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- release-notes.txt	26 Aug 2008 17:58:48 -0000	1.308
+++ release-notes.txt	27 Aug 2008 20:09:53 -0000	1.309
@@ -74,6 +74,8 @@
 	                 simpler authorization)
 	kolab/issue2994 (Duplicated kolab.conf files in cvs, one should
 			 be removed)
+	kolab/issue3005 (Remove specific TLSCertificate code by using new
+			 bootstrap_config conditional in slapd.conf.template)
 
     - php-5.2.6-20080818_kolab
 



From cvs at kolab.org  Wed Aug 27 22:53:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:53:56 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.186,
	1.187 kolab_bootstrap.in, 1.40, 1.41 
Message-ID: <20080827205356.0140F60014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
read the config file kolab.conf with a function from Kolab::Conf



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- ChangeLog	27 Aug 2008 20:04:06 -0000	1.186
+++ ChangeLog	27 Aug 2008 20:53:53 -0000	1.187
@@ -2,6 +2,8 @@
 
 	* templates/slapd.conf.template.in: added @@@if conditional aroud
 	  the TLSCertificate variable assignments.  See kolab/issue3005
+	* kolab_bootstrap.in: read the config file kolab.conf with a function
+	  from Kolab::Conf
 
 2008-08-26 Richard Bos <richard at radoeka.nl>
 

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- kolab_bootstrap.in	20 Aug 2008 20:15:40 -0000	1.40
+++ kolab_bootstrap.in	27 Aug 2008 20:53:53 -0000	1.41
@@ -232,14 +232,8 @@
 # fetch fresh template
 copy("@sysconfdir@/kolab/templates/kolab.conf.template", $kolab_config);
 
-my $fd = IO::File->new($kolab_config, "r")
-   || die "could not open $kolab_config";
-foreach (<$fd>) {
-   if (/(.*) : (.*)/) {
-      $kolab_config{$1} = $2;
-   }
-}
-undef $fd;
+%kolab_config = Kolab::readConfig(\%kolab_config, $kolab_config);
+
 my $fqdnhostname = $kolab_config{'fqdnhostname'} || die "could not read fqdnhostname from $kolab_config";
 my $is_master = $kolab_config{'is_master'} || "true";
 my $bind_dn = $kolab_config{'bind_dn'} || die "could not read bind_dn from $kolab_config";
@@ -339,7 +333,7 @@
       chomp $calendar_pw;
     }
 
-    $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
+    my $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
     print $fd "fqdnhostname : $fqdn\n";
     print $fd "is_master : $is_master\n";
     print $fd "base_dn : $base_dn\n";
@@ -727,7 +721,7 @@
   (print "Error reading nobody password" && goto SLAVESTART) unless( $php_pw );
   (print "Error reading calendar password" && goto SLAVESTART) unless( $calendar_pw );
 
-  $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
+  my $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
   print $fd "fqdnhostname : $fqdn\n";
   print $fd "is_master : $is_master\n";
   print $fd "base_dn : $base_dn\n";



From cvs at kolab.org  Wed Aug 27 22:55:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Aug 2008 22:55:20 +0200 (CEST)
Subject: richard: server release-notes.txt,1.309,1.310 
Message-ID: <20080827205520.081F9600B85@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added kolab/issue2981

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- release-notes.txt	27 Aug 2008 20:09:53 -0000	1.309
+++ release-notes.txt	27 Aug 2008 20:55:17 -0000	1.310
@@ -72,6 +72,8 @@
 	                 in the file templates/slapd.conf.template.in)
 	kolab/issue2961 (added smtpd_sasl_authenticated_header = yes for
 	                 simpler authorization)
+	kolab/issue2981 (kolab_bootstrap: re-use kolabconf code to read the
+			 config file
 	kolab/issue2994 (Duplicated kolab.conf files in cvs, one should
 			 be removed)
 	kolab/issue3005 (Remove specific TLSCertificate code by using new



From cvs at kolab.org  Fri Aug 29 16:57:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 29 Aug 2008 16:57:27 +0200 (CEST)
Subject: wilde: server/kolabd/kolabd kolabd.spec.in,1.30,1.31 
Message-ID: <20080829145727.0BD28600B8F@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolabd.spec.in 
Log Message:
Removed reference to no longer existing pregenerated kolab.conf.


Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- kolabd.spec.in	18 Aug 2008 08:24:54 -0000	1.30
+++ kolabd.spec.in	29 Aug 2008 14:57:24 -0000	1.31
@@ -116,7 +116,6 @@
 
     #   generate file list
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-	'%config(noreplace) %{l_prefix}/etc/kolab/kolab.conf' \
 	'%config %{l_prefix}/etc/kolab/quotawarning.txt' \
 	'%config %{l_prefix}/etc/kolab/templates/*.template' \
 	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \



From cvs at kolab.org  Fri Aug 29 18:25:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 29 Aug 2008 18:25:34 +0200 (CEST)
Subject: thomas: server Makefile,1.54,1.55 
Message-ID: <20080829162534.0D1EB600B82@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Don't set KOLABPKGURI and friends from global Makefile

They have to be set in the packages' Makefiles anyway so they can be built
individually and this made building gmp fail because of a different KOLABPKGURI


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile	25 Aug 2008 16:53:30 -0000	1.54
+++ Makefile	29 Aug 2008 16:25:31 -0000	1.55
@@ -9,22 +9,6 @@
   HOME = /kolab
 endif
 
-ifeq "x$(KOLABPKGURI)" "x"
-  export KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(RPM)" "x"
-  export RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  export KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  export KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  export KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
 BASE_PACKAGES=php-smarty              \
               openldap                \
               apache-php              \



From cvs at kolab.org  Fri Aug 29 22:17:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 29 Aug 2008 22:17:17 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.9,1.10 
Message-ID: <20080829201717.EE1D4600B8F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added code to support the conditional:
@@@if exists( /full/path/to/file )@@@ as proposed by Thomas
in kolab/issue3006



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	27 Aug 2008 20:07:11 -0000	1.9
+++ ChangeLog	29 Aug 2008 20:17:14 -0000	1.10
@@ -1,3 +1,9 @@
+2008-08-29 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: added code to support the conditional:
+	  @@@if exists( /full/path/to/file )@@@ as proposed by Thomas in
+	  kolab/issue3006
+
 2008-08-27 Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/Conf.pm: removed code specific for slapd.conf



From cvs at kolab.org  Fri Aug 29 22:17:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 29 Aug 2008 22:17:17 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.16,1.17 
Message-ID: <20080829201717.EE156600B82@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv1682/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
added code to support the conditional:
@@@if exists( /full/path/to/file )@@@ as proposed by Thomas
in kolab/issue3006



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Conf.pm	27 Aug 2008 20:07:11 -0000	1.16
+++ Conf.pm	29 Aug 2008 20:17:14 -0000	1.17
@@ -139,7 +139,22 @@
 	    }
 	    $_ = <$template>;
 	}
-        if (/\@{3}if (\S+?)\@{3}/) {
+
+        if (/\@{3}if exists\(\s*(\S+?)\s*\)\@{3}/) {
+            # @@@if exists(/full/path/to/file)@@@
+            # also possible: @@@if exists( /full/path/to/file )@@@
+            if (-f $1) {
+                # Keep text
+                $keep = 1;
+            } else {
+                # Skip text
+                $skip++;
+                $keep = 0;
+            }
+        } elsif (/\@{3}if (\S+?)\@{3}/) {
+            # @@@if some_variable@@@
+            # The some_variable is a key in the $Kolab::config hash and has
+            # its value set to either 'false' or 'true'
             if ($Kolab::config{$1} && lc($Kolab::config{$1}) ne "false" ) {
                 # Keep text
 		$keep = 1;



From cvs at kolab.org  Fri Aug 29 22:19:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 29 Aug 2008 22:19:29 +0200 (CEST)
Subject: richard: server release-notes.txt,1.310,1.311 
Message-ID: <20080829201929.6439D600B9D@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added kolab/issue3006

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- release-notes.txt	27 Aug 2008 20:55:17 -0000	1.310
+++ release-notes.txt	29 Aug 2008 20:19:27 -0000	1.311
@@ -79,6 +79,11 @@
 	kolab/issue3005 (Remove specific TLSCertificate code by using new
 			 bootstrap_config conditional in slapd.conf.template)
 
+    - kolab-conf ?-?-?
+
+	kolab/issue3006 (Surround the horde schema include in
+			 slapd.conf.template with @@@ conditionals) 
+
     - php-5.2.6-20080818_kolab
 
 	Added full sqlite support.



From cvs at kolab.org  Mon Sep  1 22:20:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  1 Sep 2008 22:20:18 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.17,1.18 
Message-ID: <20080901202018.C9608600BBB@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv30746

Modified Files:
	Conf.pm 
Log Message:
allow different spacing (multiple spaces or tabs) instead of only
1 space in the @@@if conditionals.
See kolab/issue3006

CVSn ----------------------------------------------------------------------


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Conf.pm	29 Aug 2008 20:17:14 -0000	1.17
+++ Conf.pm	1 Sep 2008 20:20:16 -0000	1.18
@@ -140,18 +140,18 @@
 	    $_ = <$template>;
 	}
 
-        if (/\@{3}if exists\(\s*(\S+?)\s*\)\@{3}/) {
+        if (/\@{3}if\s+exists\(\s*(\S+?)\s*\)\@{3}/) {
             # @@@if exists(/full/path/to/file)@@@
             # also possible: @@@if exists( /full/path/to/file )@@@
             if (-f $1) {
-                # Keep text
+                # Keep text if searched file or symbolic link exists.
                 $keep = 1;
             } else {
                 # Skip text
                 $skip++;
                 $keep = 0;
             }
-        } elsif (/\@{3}if (\S+?)\@{3}/) {
+        } elsif (/\@{3}if\s+(\S+?)\@{3}/) {
             # @@@if some_variable@@@
             # The some_variable is a key in the $Kolab::config hash and has
             # its value set to either 'false' or 'true'



From cvs at kolab.org  Mon Sep  1 22:23:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  1 Sep 2008 22:23:05 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.10,1.11 
Message-ID: <20080901202305.4E924600BBD@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
allow different spacing (multiple spaces or tabs) instead of only
1 space in the @@@if conditionals.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	29 Aug 2008 20:17:14 -0000	1.10
+++ ChangeLog	1 Sep 2008 20:23:03 -0000	1.11
@@ -1,3 +1,8 @@
+2008-09-01 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: allow different spacing (multiple spaces or tabs)
+	  instead of only 1 space in the @@@if conditionals.
+
 2008-08-29 Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/Conf.pm: added code to support the conditional:



From cvs at kolab.org  Sat Sep  6 13:45:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Sep 2008 13:45:54 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.11,1.12 
Message-ID: <20080906114554.3FE75600167@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
changed if {}; if {}, etc into if {}; elsif {}, etc.
Added a warning for incorrect keys in the META section
of a template file.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	1 Sep 2008 20:23:03 -0000	1.11
+++ ChangeLog	6 Sep 2008 11:45:52 -0000	1.12
@@ -1,3 +1,10 @@
+2008-09-06 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: changed if {}; if {}, etc into
+	  if {}; elsif {}, etc.
+	  Added a warning for incorrect keys in the META section
+	  of a template file.
+
 2008-09-01 Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/Conf.pm: allow different spacing (multiple spaces or tabs)



From cvs at kolab.org  Sat Sep  6 13:45:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Sep 2008 13:45:54 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.18,1.19 
Message-ID: <20080906114554.42361600B88@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv30526/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
changed if {}; if {}, etc into if {}; elsif {}, etc.
Added a warning for incorrect keys in the META section
of a template file.



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Conf.pm	1 Sep 2008 20:20:16 -0000	1.18
+++ Conf.pm	6 Sep 2008 11:45:52 -0000	1.19
@@ -644,20 +644,18 @@
 			    if ($key =~ /^TARGET$/) {
 				$target = replaceMetaVar($value);
 				Kolab::log('T', 'META Target '.$target, KOLAB_DEBUG );
-			    }
-			    if ($key =~ /^PERMISSIONS$/) {
+			    } elsif ($key =~ /^PERMISSIONS$/) {
 				$permissions = replaceMetaVar($value);
 				Kolab::log('T', 'META Permissions '.$permissions, KOLAB_DEBUG );
-			    }
-			    if ($key =~ /^OWNERSHIP$/) {
+			    } elsif ($key =~ /^OWNERSHIP$/) {
 				$ownership = replaceMetaVar($value);
 				Kolab::log('T', 'META Ownership '.$ownership, KOLAB_DEBUG );
-			    }
-			    if ($key =~ /^RUNONCHANGE$/) {
+			    } elsif ($key =~ /^RUNONCHANGE$/) {
 				$runonchange = replaceMetaVar($value);
 				Kolab::log('T', 'META Cmd to execute '.$runonchange, KOLAB_DEBUG );
+			    } else {
+			        Kolab::log('T', 'incorrect META key "'.$key.'" in: '.$template, KOLAB_WARN );
 			    }
-
 			}
 		    }
 		}



From cvs at kolab.org  Sat Sep  6 16:41:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Sep 2008 16:41:48 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.12,1.13 
Message-ID: <20080906144148.C0BD6600167@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Added support to define the comment character in the META part of a
template file



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	6 Sep 2008 11:45:52 -0000	1.12
+++ ChangeLog	6 Sep 2008 14:41:46 -0000	1.13
@@ -1,9 +1,11 @@
 2008-09-06 Richard Bos <richard at radoeka.nl>
 
-	* lib/Kolab/Conf.pm: changed if {}; if {}, etc into
-	  if {}; elsif {}, etc.
-	  Added a warning for incorrect keys in the META section
-	  of a template file.
+	* lib/Kolab/Conf.pm: 
+	  - changed if {}; if {}, etc into if {}; elsif {}, etc.
+	    Added a warning for incorrect keys in the META section
+	    of a template file.
+	  - Added support to define the comment character in the
+	    META part of a template file
 
 2008-09-01 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Sat Sep  6 16:41:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Sep 2008 16:41:48 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.19,1.20 
Message-ID: <20080906144148.C0CA3600B88@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv2138/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Added support to define the comment character in the META part of a
template file



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Conf.pm	6 Sep 2008 11:45:52 -0000	1.19
+++ Conf.pm	6 Sep 2008 14:41:46 -0000	1.20
@@ -61,6 +61,7 @@
 my %permissions = ();
 my %templatehaschanged = ();
 my %haschanged = ();
+my %commentchar = ();
 
 sub fixup {
     my $file = shift;
@@ -617,7 +618,7 @@
 sub loadMetaTemplates
 {	
     my $templatedir = shift;
-    my ($tref, $pref, $oref, $cmdref) = @_;
+    my ($tref, $pref, $oref, $cmdref, $ccharref) = @_;
 
     Kolab::log('T', 'Collecting template files', KOLAB_DEBUG );
     opendir(DIR, $templatedir) or Kolab::log('T', 'Given templatedir $templatedir does not exist!', KOLAB_ERROR );
@@ -626,6 +627,7 @@
 
     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>;
@@ -653,6 +655,9 @@
 			    } 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 );
 			    }
@@ -667,6 +672,7 @@
 		    $$pref{$target} = $permissions;
 		    my $runcmdtemplate = $templatedir."/".$template;
 		    $$cmdref{$runcmdtemplate} = $runonchange if (defined $runonchange);
+		    $$ccharref{$target} = $commentchar if (defined $commentchar);
 		}
 		
 	    }
@@ -689,7 +695,7 @@
     Kolab::log('T', 'Regenerating configuration files', KOLAB_DEBUG );
 
     Kolab::log('T', 'Loading meta-template data', KOLAB_DEBUG );
-    loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange );
+    loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange, \%commentchar );
 
     foreach $key (keys %templates) {
 	my $tpl = $templates{$key};
@@ -728,7 +734,7 @@
  
     my %runonchange;
 
-    loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange );
+    loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange, \%commentchar );
 
     my $cfg;
     my $out;



From cvs at kolab.org  Sat Sep  6 17:15:31 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Sep 2008 17:15:31 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.187, 1.188 Makefile.am,
	1.44, 1.45 
Message-ID: <20080906151531.0BABF600167@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Make kolab.globals readonly as it should never be changed,
after installing a package


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- ChangeLog	27 Aug 2008 20:53:53 -0000	1.187
+++ ChangeLog	6 Sep 2008 15:15:28 -0000	1.188
@@ -1,3 +1,8 @@
+2008-09-06 Richard Bos <richard at radoeka.nl>
+
+	* Makefile.am: Make kolab.globals readonly as it should never be
+	  changed, after installing a package kolab/issue3031.
+
 2008-08-27 Richard Bos <richard at radoeka.nl>
 
 	* templates/slapd.conf.template.in: added @@@if conditional aroud

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile.am	26 Aug 2008 17:57:00 -0000	1.44
+++ Makefile.am	6 Sep 2008 15:15:28 -0000	1.45
@@ -214,6 +214,7 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_tmpdir)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
+	chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
 	chmod 744 $(DESTDIR)$(sbindir)/kolabd



From cvs at kolab.org  Sat Sep  6 17:18:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Sep 2008 17:18:53 +0200 (CEST)
Subject: richard: server release-notes.txt,1.311,1.312 
Message-ID: <20080906151853.8BAB9600167@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added issue3031

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- release-notes.txt	29 Aug 2008 20:19:27 -0000	1.311
+++ release-notes.txt	6 Sep 2008 15:18:51 -0000	1.312
@@ -78,6 +78,7 @@
 			 be removed)
 	kolab/issue3005 (Remove specific TLSCertificate code by using new
 			 bootstrap_config conditional in slapd.conf.template)
+	kolab/issue3031 (Make kolab.globals readonly)
 
     - kolab-conf ?-?-?
 



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.29, 1.30 
Message-ID: <20080908175234.406A2600B8D@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv7818/php/admin/locale/fr/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- messages.po	25 Aug 2008 16:33:44 -0000	1.29
+++ messages.po	8 Sep 2008 17:52:30 -0000	1.30
@@ -693,8 +693,8 @@
 msgstr "Mot de passe:"
 
 #: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Login"
-msgstr "Connexion"
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
 
 #: tpl_messages.php:129
 msgid "The maintainer with DN"



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.24, 1.25 
Message-ID: <20080908175234.450AF600BA9@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv7818/php/admin/locale/it/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- messages.po	25 Aug 2008 16:33:44 -0000	1.24
+++ messages.po	8 Sep 2008 17:52:30 -0000	1.25
@@ -692,8 +692,8 @@
 msgstr "Password:"
 
 #: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Login"
-msgstr "Connetti"
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
 
 #: tpl_messages.php:129
 msgid "The maintainer with DN"



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.105,1.106 
Message-ID: <20080908175234.451C5600BAD@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- ChangeLog	15 Aug 2008 16:04:20 -0000	1.105
+++ ChangeLog	8 Sep 2008 17:52:31 -0000	1.106
@@ -1,3 +1,16 @@
+2008-09-08 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/include/auth.class.php.in: changed the title of login page
+	  from just Login to 'Kolab Groupware login.  For an explanation see
+	  update 2008-07-05 in this ChangeLog below.  See kolab/issue2596.
+	* php/admin/locale/de/LC_MESSAGES/messages.po
+	  php/admin/locale/es/LC_MESSAGES/messages.po
+	  php/admin/locale/fr/LC_MESSAGES/messages.po
+	  php/admin/locale/it/LC_MESSAGES/messages.po
+	  php/admin/locale/nl/LC_MESSAGES/messages.po: updated translation for
+	  the change made the file php/admin/include/auth.class.php.in
+
+
 2008-08-15  Sascha Wilde  <wilde at intevation.de>
 
 	* php/admin/templates/kolab.tpl: Added acknowledgments for PHP and
@@ -5,11 +18,11 @@
 
 2008-07-05 Richard Bos <richard at radoeka.nl>
 
-	* php/admin/locale/nl/LC_MESSAGES/messages.po: changed translation to Kolab
-	as that seems to be a much better page title than login.  The concerning page
-	is probably bookmarked and than is a title like Kolab better than just
-	Login.  I guess that the root cause solution would be to change the word Login
-	in the source file....
+	* php/admin/locale/nl/LC_MESSAGES/messages.po: changed translation to
+	  Kolab as that seems to be a much better page title than login.  The
+	  concerning page is probably bookmarked and than is a title like Kolab
+	  better than just Login.  I guess that the root cause solution would
+	  be to change the word Login in the source file....
 
 2008-06-05  Thomas Arendsen Hein <thomas at intevation.de>
 



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.43, 1.44 
Message-ID: <20080908175234.4512E600BAB@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv7818/php/admin/locale/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- messages.po	25 Aug 2008 16:33:44 -0000	1.43
+++ messages.po	8 Sep 2008 17:52:30 -0000	1.44
@@ -697,8 +697,8 @@
 msgstr "Passwort:"
 
 #: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Login"
-msgstr "Anmeldung"
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
 
 #: tpl_messages.php:129
 msgid "The maintainer with DN"



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.22, 1.23 
Message-ID: <20080908175234.4517B600BAC@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
In directory doto:/tmp/cvs-serv7818/php/admin/locale/es/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- messages.po	25 Aug 2008 16:33:44 -0000	1.22
+++ messages.po	8 Sep 2008 17:52:30 -0000	1.23
@@ -695,8 +695,8 @@
 msgstr "Contraseña:"
 
 #: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Login"
-msgstr "Entrada"
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
 
 #: tpl_messages.php:129
 msgid "The maintainer with DN"



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	auth.class.php.in, 1.3, 1.4 
Message-ID: <20080908175234.4520F600BAE@lists.intevation.de>

Author: richard

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

Modified Files:
	auth.class.php.in 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: auth.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- auth.class.php.in	23 Feb 2008 20:19:11 -0000	1.3
+++ auth.class.php.in	8 Sep 2008 17:52:30 -0000	1.4
@@ -121,7 +121,7 @@
 		$smarty->assign( 'topdir', $topdir );
 		$smarty->assign( 'uid', '' );
 		$smarty->assign( 'group', '' );
-		$smarty->assign( 'page_title', _('Login') );
+		$smarty->assign( 'page_title', _('Kolab Groupware login') );
 		$smarty->assign( 'menuitems', array() );
 		if( $this->error() ) $smarty->assign( 'errors', array( $this->error() ) );
 		$smarty->assign( 'maincontent', 'login.tpl' );



From cvs at kolab.org  Mon Sep  8 19:52:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 19:52:34 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.45, 1.46 
Message-ID: <20080908175234.5558D600BAF@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv7818/php/admin/locale/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Changed the title of login page from just Login to 'Kolab Groupware login'.
The concerning page is probably bookmarked and than is a title like Kolab
Groupware login better than just Login.
See kolab/issue2596



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- messages.po	25 Aug 2008 16:33:44 -0000	1.45
+++ messages.po	8 Sep 2008 17:52:30 -0000	1.46
@@ -688,8 +688,8 @@
 msgstr "Wachtwoord"
 
 #: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Login"
-msgstr "Kolab"
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
 
 #: tpl_messages.php:129
 msgid "The maintainer with DN"



From cvs at kolab.org  Mon Sep  8 21:28:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 21:28:02 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.20,1.21 
Message-ID: <20080908192802.C2AFA600BAB@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv10597/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
added code to include warnings in a configuration
file, by replacing the macro @@@warning@@@ in the config file.
See kolab/issue1671.



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Conf.pm	6 Sep 2008 14:41:46 -0000	1.20
+++ Conf.pm	8 Sep 2008 19:28:00 -0000	1.21
@@ -83,13 +83,49 @@
     }
 }
 
+sub printWarning {
+
+    my $stream = shift;
+    my $templateFile = shift;
+    my $cc = shift;
+
+    $templateFile = "" if (!defined $templateFile);
+    $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")) {
+
+        print $stream "$cc=================================================================\n";
+        print $stream "$cc This is a preliminary version of this configuration file and\n";
+        print $stream "$cc only used for bootstrapping.  If you see this warning in your\n";
+        print $stream "$cc configuration after bootstrapping the Kolab Server\n";
+        print $stream "$cc SOMETHING WENT VERY WRONG !!!\n";
+        print $stream "$cc=================================================================\n";
+
+    } else {
+
+        print $stream "$cc=================================================================\n";
+        print $stream "$cc THIS FILE IS AUTOMATICALLY WRITTEN BY THE KOLAB CONFIG BACKEND.\n";
+        print $stream "$cc MANUAL CHANGES ARE LOST UNLESS MADE IN THE TEMPLATE FILE:\n";
+        print $stream "$cc\n";
+        print $stream "$cc  $templateFile\n";
+        print $stream "$cc\n";
+        print $stream "$cc Changes can be activated by running ".$Kolab::config{'kolabconf_script'}."\n";
+        print $stream "$cc=================================================================\n";
+
+    }
+}
+
 sub build {
     my $tmpl = shift;
     my $cfg = shift;
     my $owner = shift;
     my $perm = shift;
+    my $cchr = shift;  # comment character
+
     my $oldcfg = $cfg . '.old';
-    
     my $templatedir = $Kolab::config{"templatedir"};
 
     my %special_templates = (
@@ -176,9 +212,15 @@
                 $skip++;
 	    }
             s/\@{3}else\@{3}\n?//;
+
         } elsif (/\@{3}endif\@{3}/) {
             ($skip > 0) && $skip--;
             s/\@{3}endif\@{3}\n?//;
+
+        } elsif (/\@{3}warning\@{3}/) { 
+
+            printWarning($config, $tmpl, $cchr);
+
         } else {
             while (/\@{3}([^\s\@]+?)(\|(.+?)\((.*)\))?\@{3}/) {
 		my $attr = $1;
@@ -700,7 +742,7 @@
     foreach $key (keys %templates) {
 	my $tpl = $templates{$key};
 	#print STDOUT "Rebuilding $key => $templates{$key}\n";
-	build($key, $tpl, $ownership{$tpl}, $permissions{$tpl} );
+	build($key, $tpl, $ownership{$tpl}, $permissions{$tpl}, $commentchar{$tpl});
     }
 
     buildPostfixTransportMap;
@@ -741,7 +783,7 @@
     foreach my $tpl (@templ) {
       $cfg = $templates{$tpl};
       # print STDOUT "Rebuilding $tpl => $cfg\n";
-      build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg} );
+      build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg}, $commentchar{$cfg});
     }
 }
 



From cvs at kolab.org  Mon Sep  8 21:28:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 21:28:02 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.13,1.14 
Message-ID: <20080908192802.BDB41600BA9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added code to include warnings in a configuration
file, by replacing the macro @@@warning@@@ in the config file.
See kolab/issue1671.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	6 Sep 2008 14:41:46 -0000	1.13
+++ ChangeLog	8 Sep 2008 19:28:00 -0000	1.14
@@ -1,3 +1,9 @@
+2008-09-08 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: added code to include warnings in a configuration
+	  file, by replacing the macro @@@warning@@@ in the config file.
+	  See kolab/issue1671
+
 2008-09-06 Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/Conf.pm: 



From cvs at kolab.org  Mon Sep  8 21:36:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Sep 2008 21:36:58 +0200 (CEST)
Subject: richard: server release-notes.txt,1.312,1.313 
Message-ID: <20080908193658.C6404600BA9@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added issue1671 and issue2596

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- release-notes.txt	6 Sep 2008 15:18:51 -0000	1.312
+++ release-notes.txt	8 Sep 2008 19:36:56 -0000	1.313
@@ -80,10 +80,20 @@
 			 bootstrap_config conditional in slapd.conf.template)
 	kolab/issue3031 (Make kolab.globals readonly)
 
-    - kolab-conf ?-?-?
+    - kolab-conf-?-?-?
+
+	kolab/issue1671 (Improving the warning about kolab templates within
+			 configuration files)
 
 	kolab/issue3006 (Surround the horde schema include in
 			 slapd.conf.template with @@@ conditionals) 
+			 Remark: this actually added only the code that allows
+			 to use @@@if exists(<file)@@@ inside a config file
+
+    - kolab-webadmin-?-?-?
+
+	kolab/issue2596 (Kolab's login page title is not bookmark friendly)
+
 
     - php-5.2.6-20080818_kolab
 



From cvs at kolab.org  Tue Sep  9 22:33:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  9 Sep 2008 22:33:54 +0200 (CEST)
Subject: richard: server/kolabconf ChangeLog,1.14,1.15 
Message-ID: <20080909203354.D4F10600BB0@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
updated to improve readability, by renaming  confusing variables.
A reference to a config file is called a template, while the templates are
called keys.  This makes it hard to read.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	8 Sep 2008 19:28:00 -0000	1.14
+++ ChangeLog	9 Sep 2008 20:33:52 -0000	1.15
@@ -1,3 +1,7 @@
+2008-09-09 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: updated to improve readability
+
 2008-09-08 Richard Bos <richard at radoeka.nl>
 
 	* lib/Kolab/Conf.pm: added code to include warnings in a configuration



From cvs at kolab.org  Tue Sep  9 22:33:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  9 Sep 2008 22:33:54 +0200 (CEST)
Subject: richard: server/kolabconf/lib/Kolab Conf.pm,1.21,1.22 
Message-ID: <20080909203354.D6437600BB2@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv7041/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
updated to improve readability, by renaming  confusing variables.
A reference to a config file is called a template, while the templates are
called keys.  This makes it hard to read.



Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Conf.pm	8 Sep 2008 19:28:00 -0000	1.21
+++ Conf.pm	9 Sep 2008 20:33:52 -0000	1.22
@@ -739,11 +739,13 @@
     Kolab::log('T', 'Loading meta-template data', KOLAB_DEBUG );
     loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange, \%commentchar );
 
-    foreach $key (keys %templates) {
-	my $tpl = $templates{$key};
-	#print STDOUT "Rebuilding $key => $templates{$key}\n";
-	build($key, $tpl, $ownership{$tpl}, $permissions{$tpl}, $commentchar{$tpl});
-    }
+    my $cfg;
+    my $tpl;
+    foreach $tpl (keys %templates) {
+        $cfg = $templates{$tpl};
+        #print STDOUT "Rebuilding $tpl => $cfg\n";
+        build($tpl, $cfg, $ownership{$cfg}, $permissions{$cfg}, $commentchar{$cfg});
+     }
 
     buildPostfixTransportMap;
     buildPostfixVirtualMap;



From cvs at kolab.org  Wed Sep 10 11:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date ChangeLog, 1.1, 1.2 PEAR-Date.spec, 1.5,
	1.6 
Message-ID: <20080910093957.D4458600BA7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog PEAR-Date.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:55 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Date.spec (License): Fixed license.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Date.spec: Added package to Kolab CVS.

Index: PEAR-Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/PEAR-Date.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PEAR-Date.spec	23 Jul 2007 17:23:21 -0000	1.5
+++ PEAR-Date.spec	10 Sep 2008 09:39:55 -0000	1.6
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   BSD
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-HTTP_Request ChangeLog, 1.1,
	1.2 PEAR-HTTP_Request.spec, 1.1, 1.2 
Message-ID: <20080910093957.DD912600BAC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog PEAR-HTTP_Request.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-HTTP_Request/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	16 Aug 2007 08:51:53 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:55 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-HTTP_Request.spec (License): Fixed license.
+
 2007-08-16  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-HTTP_Request.spec: Added package to Kolab CVS.

Index: PEAR-HTTP_Request.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-HTTP_Request/PEAR-HTTP_Request.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-HTTP_Request.spec	16 Aug 2007 08:51:53 -0000	1.1
+++ PEAR-HTTP_Request.spec	10 Sep 2008 09:39:55 -0000	1.2
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   BSD
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log ChangeLog, 1.1, 1.2 PEAR-Log.spec, 1.5,
	1.6 
Message-ID: <20080910093957.E8A83600BAD@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog PEAR-Log.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:55 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Log.spec (License): Fixed license.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Log.spec: Added package to Kolab CVS.

Index: PEAR-Log.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/PEAR-Log.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PEAR-Log.spec	23 Jul 2007 17:23:21 -0000	1.5
+++ PEAR-Log.spec	10 Sep 2008 09:39:55 -0000	1.6
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   MIT License
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL ChangeLog, 1.1,
	1.2 PEAR-Auth_SASL.spec, 1.5, 1.6 
Message-ID: <20080910093957.D37E9600B86@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog PEAR-Auth_SASL.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:55 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Auth_SASL.spec (License): Fixed license.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Auth_SASL.spec: Added package to Kolab CVS.

Index: PEAR-Auth_SASL.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/PEAR-Auth_SASL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PEAR-Auth_SASL.spec	23 Jul 2007 17:23:21 -0000	1.5
+++ PEAR-Auth_SASL.spec	10 Sep 2008 09:39:55 -0000	1.6
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   BSD
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:58 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve ChangeLog, 1.1,
	1.2 PEAR-Net_Sieve.spec, 1.5, 1.6 
Message-ID: <20080910093958.1F986600BAC@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv9882/PEAR-Net_Sieve

Modified Files:
	ChangeLog PEAR-Net_Sieve.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:56 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Net_Sieve.spec (License): Fixed license.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Net_Sieve.spec: Added package to Kolab CVS.

Index: PEAR-Net_Sieve.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/PEAR-Net_Sieve.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PEAR-Net_Sieve.spec	23 Jul 2007 17:23:21 -0000	1.5
+++ PEAR-Net_Sieve.spec	10 Sep 2008 09:39:56 -0000	1.6
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   BSD
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:58 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime ChangeLog, 1.1,
	1.2 PEAR-Mail_Mime.spec, 1.5, 1.6 
Message-ID: <20080910093958.1A8E6600BA7@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv9882/PEAR-Mail_Mime

Modified Files:
	ChangeLog PEAR-Mail_Mime.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:56 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Mail_Mime.spec (License): Fixed license.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Mail_Mime.spec: Added package to Kolab CVS.

Index: PEAR-Mail_Mime.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/PEAR-Mail_Mime.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PEAR-Mail_Mime.spec	23 Jul 2007 17:23:21 -0000	1.5
+++ PEAR-Mail_Mime.spec	10 Sep 2008 09:39:56 -0000	1.6
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   BSD Style
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:58 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail ChangeLog, 1.1, 1.2 PEAR-Mail.spec, 1.5,
	1.6 
Message-ID: <20080910093958.12CA9600B86@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog PEAR-Mail.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:26 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:55 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Mail.spec (License): Fixed license.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Mail.spec: Added package to Kolab CVS.

Index: PEAR-Mail.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/PEAR-Mail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PEAR-Mail.spec	23 Jul 2007 17:23:21 -0000	1.5
+++ PEAR-Mail.spec	10 Sep 2008 09:39:56 -0000	1.6
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   PHP/BSD
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:39:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:39:58 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_URL ChangeLog, 1.1, 1.2 PEAR-Net_URL.spec,
	1.1, 1.2 
Message-ID: <20080910093958.27803600BAD@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog PEAR-Net_URL.spec 
Log Message:
Fix the license entries.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_URL/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	16 Aug 2007 08:51:53 -0000	1.1
+++ ChangeLog	10 Sep 2008 09:39:56 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-10  Gunnar Wrobel  <p at rdus.de>
+
+	* PEAR-Net_URL.spec (License): Fixed license.
+
 2007-08-16  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Net_URL.spec: Added package to Kolab CVS.

Index: PEAR-Net_URL.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_URL/PEAR-Net_URL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Net_URL.spec	16 Aug 2007 08:51:53 -0000	1.1
+++ PEAR-Net_URL.spec	10 Sep 2008 09:39:56 -0000	1.2
@@ -11,7 +11,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   BSD
 Group:     Development/Libraries
 Distribution:	OpenPKG
 



From cvs at kolab.org  Wed Sep 10 11:42:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:42:11 +0200 (CEST)
Subject: gunnar: server/pear/Horde_DOM - New directory 
Message-ID: <20080910094211.81501600BB3@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_DOM added to the repository




From cvs at kolab.org  Wed Sep 10 11:42:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:42:11 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Horde-Channel - New directory 
Message-ID: <20080910094211.7DB3D600BAD@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/PEAR-Horde-Channel added to the repository




From cvs at kolab.org  Wed Sep 10 11:43:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:43:59 +0200 (CEST)
Subject: gunnar: server/pear/Horde_DOM .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_DOM.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080910094359.A0C37600BA7@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_DOM.spec Makefile 
Log Message:
Moving server/horde/php-channel-horde to server/pear/PEAR-Horde-Channel. The old package will be removed later. Added Horde_DOM as a first PEAR package of the Horde series.

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

--- NEW FILE: ChangeLog ---
2008-09-10  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_DOM.spec ---
# Variables
%define         V_pear_name Horde_DOM
%define         V_package %{V_pear_name}
%define         V_version 0.1.0
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Wrapper classes for PHP4 domxml compatibility using PHP5s dom functions.
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
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/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
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-Horde-Channel

%description 
These classes allow the use of code written for PHP4's domxml
implementation to work using PHP5's dom implementation.

%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

--- NEW FILE: Makefile ---
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
PACKAGE = $(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.horde.org/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 .



From cvs at kolab.org  Wed Sep 10 11:43:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:43:59 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Horde-Channel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 PEAR-Horde-Channel.spec, NONE, 1.1 
Message-ID: <20080910094359.A3AFE600BAE@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore Makefile PEAR-Horde-Channel.spec 
Log Message:
Moving server/horde/php-channel-horde to server/pear/PEAR-Horde-Channel. The old package will be removed later. Added Horde_DOM as a first PEAR package of the Horde series.

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

--- NEW FILE: Makefile ---
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

PACKAGE = PEAR-Horde-Channel
VERSION = 1.0
RELEASE = 1

SOURCE_0=http://pear.horde.org/channel.xml

.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
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)

	cd $(KOLABRPMSRC)/$(PACKAGE) && wget "$(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-Horde-Channel.spec ---
%define pear_xmldir  %{l_prefix}/var/pear

Name:           PEAR-Horde-Channel
Version:        1.0
Release:        1
Summary:        Adds pear.horde.org channel to PEAR

Group:          Development/Languages
License:        N/A
URL:            http://pear.horde.org/
Source0:        http://pear.horde.org/channel.xml

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

BuildPreReq:    php, php::with_pear = yes
Requires:       php, php::with_pear = yes

%description
This package adds the pear.horde.org channel which allows PEAR packages
from this channel to be installed.


%prep
%setup -q -c -T

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.horde.org.xml
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 

%clean
rm -rf $RPM_BUILD_ROOT

%post

env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-add    %{pear_xmldir}/pear.horde.org.xml || \
  echo "Channel already exists!" && sleep 1
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-update %{pear_xmldir}/pear.horde.org.xml || \
  echo "Could not update channel pear.horde.org!" && sleep 1

%postun
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-delete pear.horde.org ||                    \
  echo "Could not delete channel pear.horde.org!" && sleep 1

%files -f files




From cvs at kolab.org  Wed Sep 10 11:55:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:55:21 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Util - New directory 
Message-ID: <20080910095521.C2EC4600B83@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Util added to the repository




From cvs at kolab.org  Wed Sep 10 11:55:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 11:55:50 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Util .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Util.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080910095550.9EFEC600B86@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Util.spec Makefile 
Log Message:
Added Horde_Util.

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

--- NEW FILE: ChangeLog ---
2008-09-10  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Util.spec ---
# Variables
%define         V_pear_name Horde_Util
%define         V_package %{V_pear_name}
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Utility Libraries
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
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/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
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-Horde-Channel

%description 
These classes provide functionality useful for all kind of applications.

%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

--- NEW FILE: Makefile ---
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
PACKAGE = $(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.horde.org/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 .



From cvs at kolab.org  Wed Sep 10 12:04:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:04:27 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Browser - New directory 
Message-ID: <20080910100427.76DF5600B83@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Browser added to the repository




From cvs at kolab.org  Wed Sep 10 12:04:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:04:51 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Browser .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Horde_Browser.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080910100451.896B9600BA7@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Browser.spec Makefile 
Log Message:
Added Horde_Browser package.

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

--- NEW FILE: ChangeLog ---
2008-09-10  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Browser.spec ---
# Variables
%define         V_pear_name Horde_Browser
%define         V_package %{V_pear_name}
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Browser API
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
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/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
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-Horde-Channel
PreReq:       Horde_Util

%description 
The Horde_Browser:: class provides an API for getting information
about the current users browser and its capabilities.

%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

--- NEW FILE: Makefile ---
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
PACKAGE = $(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.horde.org/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 .



From cvs at kolab.org  Wed Sep 10 12:35:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:35:05 +0200 (CEST)
Subject: gunnar: server/pear/Horde_NLS - New directory 
Message-ID: <20080910103505.1B9DA600B80@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_NLS added to the repository




From cvs at kolab.org  Wed Sep 10 12:35:24 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:35:24 +0200 (CEST)
Subject: gunnar: server/pear/Horde_NLS .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_NLS.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080910103524.B2DF4600B83@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_NLS.spec Makefile 
Log Message:
Added Horde_NLS.

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

--- NEW FILE: ChangeLog ---
2008-09-10  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_NLS.spec ---
# Variables
%define         V_pear_name Horde_NLS
%define         V_package %{V_pear_name}
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Localization package.
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
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/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
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-Horde-Channel
PreReq:       Horde_Browser
PreReq:       Horde_Util

%description 
Localization package.

%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

--- NEW FILE: Makefile ---
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
PACKAGE = $(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.horde.org/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 .



From cvs at kolab.org  Wed Sep 10 12:57:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:57:03 +0200 (CEST)
Subject: gunnar: server/pear/Horde_DOM Horde_DOM.spec, 1.1, 1.2 Makefile, 1.1,
	1.2 
Message-ID: <20080910105703.E3990600B86@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_DOM.spec Makefile 
Log Message:
Use some simplifications we already used in Kolab_Format.

Index: Horde_DOM.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/Horde_DOM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_DOM.spec	10 Sep 2008 09:43:57 -0000	1.1
+++ Horde_DOM.spec	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,13 +1,12 @@
 # Variables
-%define         V_pear_name Horde_DOM
-%define         V_package %{V_pear_name}
+%define         V_package Horde_DOM
 %define         V_version 0.1.0
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Wrapper classes for PHP4 domxml compatibility using PHP5s dom functions.
-URL:       http://pear.php.net/package/%{V_pear_name}
+URL:       http://pear.horde.org/index.php?package=%{V_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -16,7 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_pear_name}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -28,21 +27,20 @@
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
-PreReq:       PEAR-Horde-Channel
 
 %description 
 These classes allow the use of code written for PHP4's domxml
 implementation to work using PHP5's dom implementation.
 
 %prep
-	%setup -n %{V_pear_name}-%{V_version}
+	%setup -n %{V_package}-%{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
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 09:43:57 -0000	1.1
+++ Makefile	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,5 +1,4 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = $(PEAR_NAME)
+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/")
 
@@ -16,7 +15,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PEAR_NAME)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -27,8 +26,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 



From cvs at kolab.org  Wed Sep 10 12:57:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:57:03 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Browser Horde_Browser.spec, 1.1,
	1.2 Makefile, 1.1, 1.2 
Message-ID: <20080910105703.E0E4A600B83@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_Browser.spec Makefile 
Log Message:
Use some simplifications we already used in Kolab_Format.

Index: Horde_Browser.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Browser/Horde_Browser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_Browser.spec	10 Sep 2008 10:04:49 -0000	1.1
+++ Horde_Browser.spec	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,13 +1,12 @@
 # Variables
-%define         V_pear_name Horde_Browser
-%define         V_package %{V_pear_name}
+%define         V_package Horde_Browser
 %define         V_version 0.0.2
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde Browser API
-URL:       http://pear.php.net/package/%{V_pear_name}
+URL:       http://pear.horde.org/index.php?package=%{V_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -16,7 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_pear_name}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -28,7 +27,6 @@
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
-PreReq:       PEAR-Horde-Channel
 PreReq:       Horde_Util
 
 %description 
@@ -36,14 +34,14 @@
 about the current users browser and its capabilities.
 
 %prep
-	%setup -n %{V_pear_name}-%{V_version}
+	%setup -n %{V_package}-%{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
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Browser/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 10:04:49 -0000	1.1
+++ Makefile	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,5 +1,4 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = $(PEAR_NAME)
+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/")
 
@@ -16,7 +15,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PEAR_NAME)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -27,8 +26,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 



From cvs at kolab.org  Wed Sep 10 12:57:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:57:03 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Util Horde_Util.spec, 1.1, 1.2 Makefile, 1.1,
	1.2 
Message-ID: <20080910105703.E96E4600BAC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_Util.spec Makefile 
Log Message:
Use some simplifications we already used in Kolab_Format.

Index: Horde_Util.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Horde_Util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_Util.spec	10 Sep 2008 09:55:48 -0000	1.1
+++ Horde_Util.spec	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,13 +1,12 @@
 # Variables
-%define         V_pear_name Horde_Util
-%define         V_package %{V_pear_name}
+%define         V_package Horde_Util
 %define         V_version 0.0.2
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde Utility Libraries
-URL:       http://pear.php.net/package/%{V_pear_name}
+URL:       http://pear.horde.org/index.php?package=%{V_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -16,7 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_pear_name}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -28,20 +27,19 @@
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
-PreReq:       PEAR-Horde-Channel
 
 %description 
 These classes provide functionality useful for all kind of applications.
 
 %prep
-	%setup -n %{V_pear_name}-%{V_version}
+	%setup -n %{V_package}-%{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
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 09:55:48 -0000	1.1
+++ Makefile	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,5 +1,4 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = $(PEAR_NAME)
+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/")
 
@@ -16,7 +15,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PEAR_NAME)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -27,8 +26,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 



From cvs at kolab.org  Wed Sep 10 12:57:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:57:03 +0200 (CEST)
Subject: gunnar: server/pear/Horde_NLS Horde_NLS.spec, 1.1, 1.2 Makefile, 1.1,
	1.2 
Message-ID: <20080910105703.E67D0600BA7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_NLS.spec Makefile 
Log Message:
Use some simplifications we already used in Kolab_Format.

Index: Horde_NLS.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_NLS/Horde_NLS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_NLS.spec	10 Sep 2008 10:35:22 -0000	1.1
+++ Horde_NLS.spec	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,13 +1,12 @@
 # Variables
-%define         V_pear_name Horde_NLS
-%define         V_package %{V_pear_name}
+%define         V_package Horde_NLS
 %define         V_version 0.0.2
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Localization package.
-URL:       http://pear.php.net/package/%{V_pear_name}
+URL:       http://pear.horde.org/index.php?package=%{V_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -16,7 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_pear_name}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -28,7 +27,6 @@
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
-PreReq:       PEAR-Horde-Channel
 PreReq:       Horde_Browser
 PreReq:       Horde_Util
 
@@ -36,14 +34,14 @@
 Localization package.
 
 %prep
-	%setup -n %{V_pear_name}-%{V_version}
+	%setup -n %{V_package}-%{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
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_NLS/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 10:35:22 -0000	1.1
+++ Makefile	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,5 +1,4 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = $(PEAR_NAME)
+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/")
 
@@ -16,7 +15,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PEAR_NAME)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -27,8 +26,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 



From cvs at kolab.org  Wed Sep 10 12:59:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 12:59:21 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format Kolab_Format.spec,1.1,1.2 
Message-ID: <20080910105921.5845B600BA7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Format.spec 
Log Message:
Fix license and dependencies.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kolab_Format.spec	18 Aug 2008 14:41:24 -0000	1.1
+++ Kolab_Format.spec	10 Sep 2008 10:59:19 -0000	1.2
@@ -10,7 +10,7 @@
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
-License:   PHP License
+License:   LGPL
 Group:     Development/Libraries
 Distribution:	OpenPKG
 
@@ -24,9 +24,12 @@
 #Pre requisites
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
-BuildPreReq:  php-channel-horde
+BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
+PreReq:       Horde_DOM
+PreReq:       Horde_NLS
+PreReq:       Horde_Util
 
 %description 
 A package for reading/writing Kolab data formats.



From cvs at kolab.org  Wed Sep 10 15:24:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:24:43 +0200 (CEST)
Subject: emanuel: doc/www/src/images shot-kontact-windows-mail.png,1.3,1.4 
Message-ID: <20080910132443.99737600B80@lists.intevation.de>

Author: emanuel

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

Modified Files:
	shot-kontact-windows-mail.png 
Log Message:
Change correct kontact screenshot.


Index: shot-kontact-windows-mail.png
===================================================================
RCS file: /kolabrepository/doc/www/src/images/shot-kontact-windows-mail.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsGl2xVO and /tmp/cvsqoWQvw differ



From cvs at kolab.org  Wed Sep 10 15:30:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:30:35 +0200 (CEST)
Subject: gunnar: server/pear/PHPUnit - New directory 
Message-ID: <20080910133035.84BE4600B83@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/PHPUnit added to the repository




From cvs at kolab.org  Wed Sep 10 15:30:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:30:35 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-PHPUnit-Channel - New directory 
Message-ID: <20080910133035.83A76600B80@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/PEAR-PHPUnit-Channel added to the repository




From cvs at kolab.org  Wed Sep 10 15:31:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:31:33 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-PHPUnit-Channel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 PEAR-PHPUnit-Channel.spec, NONE, 1.1 
Message-ID: <20080910133133.D91B5600B83@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore Makefile PEAR-PHPUnit-Channel.spec 
Log Message:
Added the PHPUnit testing framework.

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

--- NEW FILE: Makefile ---
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

PACKAGE = PEAR-PHPUnit-Channel
VERSION = 1.0
RELEASE = 1

SOURCE_0=http://pear.phpunit.de/channel.xml

.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
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)

	cd $(KOLABRPMSRC)/$(PACKAGE) && wget "$(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-PHPUnit-Channel.spec ---
%define pear_xmldir  %{l_prefix}/var/pear

Name:           PEAR-PHPUnit-Channel
Version:        1.0
Release:        1
Summary:        Adds pear.phpunit.de channel to PEAR

Group:          Development/Languages
License:        N/A
URL:            http://pear.phpunit.de/
Source0:        http://pear.phpunit.de/channel.xml

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

BuildPreReq:    php, php::with_pear = yes
Requires:       php, php::with_pear = yes

%description
This package adds the pear.phpunit.de channel which allows PEAR packages
from this channel to be installed.


%prep
%setup -q -c -T

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 

%clean
rm -rf $RPM_BUILD_ROOT

%post

env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-add    %{pear_xmldir}/pear.phpunit.de.xml || \
  echo "Channel already exists!" && sleep 1
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-update %{pear_xmldir}/pear.phpunit.de.xml || \
  echo "Could not update channel pear.phpunit.de!" && sleep 1

%postun
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off"                                               \
  %{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-delete pear.phpunit.de ||                    \
  echo "Could not delete channel pear.phpunit.de!" && sleep 1

%files -f files




From cvs at kolab.org  Wed Sep 10 15:31:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:31:33 +0200 (CEST)
Subject: gunnar: server/pear/PHPUnit .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Makefile, NONE, 1.1 PHPUnit.spec, NONE, 1.1 
Message-ID: <20080910133133.DA1FE600B86@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Makefile PHPUnit.spec 
Log Message:
Added the PHPUnit testing framework.

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

--- NEW FILE: ChangeLog ---
2008-09-10  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Makefile ---
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 .

--- NEW FILE: PHPUnit.spec ---
# Variables
%define         V_package PHPUnit
%define         V_version 3.2.21
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Regression testing framework for unit tests.
URL:       http://www.phpunit.de
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   BSD-Style
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.phpunit.de/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-PHPUnit-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes, php::with_spl = yes

%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.

%prep
	%setup -n %{V_package}-%{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_package}-%{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  Wed Sep 10 15:33:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:33:03 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format Kolab_Format.spec,1.2,1.3 
Message-ID: <20080910133303.5FB08600B83@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Format.spec 
Log Message:
Add a dependency on PHPUnit even if that is not strictly required. But it allows us to run the tests included in the package which is a good thing.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kolab_Format.spec	10 Sep 2008 10:59:19 -0000	1.2
+++ Kolab_Format.spec	10 Sep 2008 13:33:01 -0000	1.3
@@ -30,6 +30,7 @@
 PreReq:       Horde_DOM
 PreReq:       Horde_NLS
 PreReq:       Horde_Util
+PreReq:       PHPUnit
 
 %description 
 A package for reading/writing Kolab data formats.



From cvs at kolab.org  Wed Sep 10 15:42:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:42:38 +0200 (CEST)
Subject: gunnar: server/pear/Horde_LDAP - New directory 
Message-ID: <20080910134238.D9FA1600B80@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_LDAP added to the repository




From cvs at kolab.org  Wed Sep 10 15:43:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:43:01 +0200 (CEST)
Subject: gunnar: server/pear/Horde_LDAP .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_LDAP.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080910134301.B0310600B83@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_LDAP.spec Makefile 
Log Message:
Added Horde_LDAP

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

--- NEW FILE: ChangeLog ---
2008-09-10  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_LDAP.spec ---
# Variables
%define         V_package Horde_LDAP
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   LDAP Utility Class.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes

%description 
Horde_LDAP:: contains some utility functions for dealing with LDAP
servers and data.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Wed Sep 10 15:50:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:50:44 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Server - New directory 
Message-ID: <20080910135044.004B9600B80@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Server added to the repository




From cvs at kolab.org  Wed Sep 10 15:51:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:51:41 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format .cvsignore,NONE,1.1 
Message-ID: <20080910135141.6CAFE600B83@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore 
Log Message:
Added Kolab_Server.

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



From cvs at kolab.org  Wed Sep 10 15:51:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 15:51:41 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Server .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Kolab_Server.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080910135141.6FD04600B86@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Kolab_Server.spec Makefile 
Log Message:
Added Kolab_Server.

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

--- NEW FILE: ChangeLog ---
2008-08-18  Gunnar Wrobel  <p at rdus.de>

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


--- NEW FILE: Kolab_Server.spec ---
# Variables
%define         V_package Kolab_Server
%define         V_version 0.1.1
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   A package for manipulating the Kolab user database.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_LDAP
PreReq:       PHPUnit

%description 
This package allows read/write entries in the Kolab user
database stored in LDAP.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Wed Sep 10 22:02:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 22:02:08 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.22,
	1.23 
Message-ID: <20080910200208.105E8600174@lists.intevation.de>

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
always include the horde.schema kolab/issue3006



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- slapd.conf.template.in	27 Aug 2008 20:04:06 -0000	1.22
+++ slapd.conf.template.in	10 Sep 2008 20:02:05 -0000	1.23
@@ -21,7 +21,7 @@
 include @ldapserver_schemadir@/inetorgperson.schema
 include @ldapserver_schemadir@/rfc2739.schema
 include @ldapserver_schemadir@/kolab2.schema
-#include @ldapserver_schemadir@/horde.schema
+include @ldapserver_schemadir@/horde.schema
 
 pidfile		@ldapserver_pidfile@
 argsfile	@ldapserver_argsfile@



From cvs at kolab.org  Wed Sep 10 22:02:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 22:02:08 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.188,1.189 
Message-ID: <20080910200208.10661600175@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
always include the horde.schema kolab/issue3006



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- ChangeLog	6 Sep 2008 15:15:28 -0000	1.188
+++ ChangeLog	10 Sep 2008 20:02:05 -0000	1.189
@@ -1,3 +1,8 @@
+2008-09-10 Richard Bos <richard at radoeka.nl>
+
+	* templates/slapd.conf.template.in: always include the horde.schema
+	  kolab/issue3006
+
 2008-09-06 Richard Bos <richard at radoeka.nl>
 
 	* Makefile.am: Make kolab.globals readonly as it should never be



From cvs at kolab.org  Wed Sep 10 22:08:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 22:08:29 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.189, 1.190 horde.schema,
	1.1, 1.2 
Message-ID: <20080910200829.5DDB1600174@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog horde.schema 
Log Message:
horde.schema: updated to the latest version available in horde cvs
kolab/issue3006



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- ChangeLog	10 Sep 2008 20:02:05 -0000	1.189
+++ ChangeLog	10 Sep 2008 20:08:27 -0000	1.190
@@ -2,6 +2,8 @@
 
 	* templates/slapd.conf.template.in: always include the horde.schema
 	  kolab/issue3006
+	* horde.schema: updated to the latest version available in horde cvs
+	  kolab/issue3006
 
 2008-09-06 Richard Bos <richard at radoeka.nl>
 

Index: horde.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/horde.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde.schema	7 May 2007 20:20:52 -0000	1.1
+++ horde.schema	10 Sep 2008 20:08:27 -0000	1.2
@@ -1,4 +1,4 @@
-# $Horde: horde/scripts/ldap/horde.schema,v 1.28 2006/06/05 18:10:03 chuck Exp $
+# $Horde: horde/scripts/ldap/horde.schema,v 1.29 2007/01/29 16:46:55 chuck Exp $
 #
 # The offical horde OID assigned by IANA is 13040.
 #
@@ -14,11 +14,9 @@
 # Gollem attribute branch 1.3.6.1.4.1.13040.7.1.*
 # Chora attribute branch 1.3.6.1.4.1.13040.8.1.*
 # Mnemo attribute branch 1.3.6.1.4.1.13040.9.1.*
-# Troll attribute branch 1.3.6.1.4.1.13040.10.1.*
 # Klutz attribute branch 1.3.6.1.4.1.13040.11.1.*
 # Jonah attribute branch 1.3.6.1.4.1.13040.12.1.*
 # Hermes attribute branch 1.3.6.1.4.1.13040.13.1.*
-# Juno attribute branch 1.3.6.1.4.1.13040.14.1.*
 # Trean attribute branch 1.3.6.1.4.1.13040.15.1.*
 # Whups attribute branch 1.3.6.1.4.1.13040.16.1.*
 # Ingo attribute branch 1.3.6.1.4.1.13040.17.1.*
@@ -29,32 +27,29 @@
 # Agora attribute branch 1.3.6.1.4.1.13040.22.1.*
 # Goops attribute branch 1.3.6.1.4.1.13040.24.1.*
 # Merk attribute branch 1.3.6.1.4.1.13040.25.1.*
-# Mimp attribute branch 1.3.6.1.4.1.13040.26.1.*
+# MIMP attribute branch 1.3.6.1.4.1.13040.26.1.*
 # Mottle attribute branch 1.3.6.1.4.1.13040.27.1.*
 # Nic attribute branch 1.3.6.1.4.1.13040.28.1.*
 # Occam attribute branch 1.3.6.1.4.1.13040.29.1.*
-# Odin attribute branch 1.3.6.1.4.1.13040.30.1.*
 # Rakim attribute branch 1.3.6.1.4.1.13040.31.1.*
 # Sesha attribute branch 1.3.6.1.4.1.13040.32.1.*
 # Swoosh attribute branch 1.3.6.1.4.1.13040.33.1.*
-# Thor attribute branch 1.3.6.1.4.1.13040.34.1.*
 # Ulaform attribute branch 1.3.6.1.4.1.13040.35.1.*
 # Volos attribute branch 1.3.6.1.4.1.13040.36.1.*
 # Jeta attribute branch 1.3.6.1.4.1.13040.37.1.*
+# DIMP attribute branch 1.3.6.1.4.1.13040.38.1.*
 #
 # Horde objectclass branch 1.3.6.1.4.1.13040.2.2.*
 # IMP objectclass branch 1.3.6.1.4.1.13040.3.2.*
 # Turba objectclass branch 1.3.6.1.4.1.13040.4.2.*
 # Kronolith objectclass branch 1.3.6.1.4.1.13040.5.2.*
-# NAG objectclass branch 1.3.6.1.4.1.13040.6.2.*
+# Nag objectclass branch 1.3.6.1.4.1.13040.6.2.*
 # Gollem objectclass branch 1.3.6.1.4.1.13040.7.2.*
 # Chora objectclass branch 1.3.6.1.4.1.13040.8.2.*
 # Mnemo objectclass branch 1.3.6.1.4.1.13040.9.2.*
-# Troll objectclass branch 1.3.6.1.4.1.13040.10.2.*
 # Klutz objectclass branch 1.3.6.1.4.1.13040.11.2.*
 # Jonah objectclass branch 1.3.6.1.4.1.13040.12.2.*
 # Hermes objectclass branch 1.3.6.1.4.1.13040.13.2.*
-# Juno objectclass branch 1.3.6.1.4.1.13040.14.2.*
 # Trean objectclass branch 1.3.6.1.4.1.13040.15.2.*
 # Whups objectclass branch 1.3.6.1.4.1.13040.16.2.*
 # Ingo objectclass branch 1.3.6.1.4.1.13040.17.2.*
@@ -65,18 +60,17 @@
 # Agora objectclass branch 1.3.6.1.4.1.13040.22.2.*
 # Goops objectclass branch 1.3.6.1.4.1.13040.24.2.*
 # Merk objectclass branch 1.3.6.1.4.1.13040.25.2.*
-# Mimp objectclass branch 1.3.6.1.4.1.13040.26.2.*
+# MIMP objectclass branch 1.3.6.1.4.1.13040.26.2.*
 # Mottle objectclass branch 1.3.6.1.4.1.13040.27.2.*
 # Nic objectclass branch 1.3.6.1.4.1.13040.28.2.*
 # Occam objectclass branch 1.3.6.1.4.1.13040.29.2.*
-# Odin objectclass branch 1.3.6.1.4.1.13040.30.2.*
 # Rakim objectclass branch 1.3.6.1.4.1.13040.31.2.*
 # Sesha objectclass branch 1.3.6.1.4.1.13040.32.2.*
 # Swoosh objectclass branch 1.3.6.1.4.1.13040.33.2.*
-# Thor objectclass branch 1.3.6.1.4.1.13040.34.2.*
 # Ulaform objectclass branch 1.3.6.1.4.1.13040.35.2.*
 # Volos objectclass branch 1.3.6.1.4.1.13040.36.2.*
 # Jeta objectclass branch 1.3.6.1.4.1.13040.37.2.*
+# DIMP objectclass branch 1.3.6.1.4.1.13040.38.2.*
 
 #
 # Horde attribute branch 1.3.6.1.4.1.13040.2.1.*
@@ -169,15 +163,6 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
 
 #
-# Troll attribute branch 1.3.6.1.4.1.13040.10.1.*
-#
-attributetype ( 1.3.6.1.4.1.13040.10.1.1
-	NAME 'trollPrefs'
-	DESC 'Troll Preferences'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
-
-#
 # Klutz attribute branch 1.3.6.1.4.1.13040.11.1.*
 #
 attributetype ( 1.3.6.1.4.1.13040.11.1.1
@@ -205,15 +190,6 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
 
 #
-# Juno attribute branch 1.3.6.1.4.1.13040.14.1.*
-#
-attributetype ( 1.3.6.1.4.1.13040.14.1.1
-	NAME 'junoPrefs'
-	DESC 'Juno Preferences'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
-
-#
 # Trean attribute branch 1.3.6.1.4.1.13040.15.1.*
 #
 attributetype ( 1.3.6.1.4.1.13040.15.1.1
@@ -304,7 +280,7 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
 
 #
-# Mimp attribute branch 1.3.6.1.4.1.13040.26.1.*
+# MIMP attribute branch 1.3.6.1.4.1.13040.26.1.*
 #
 attributetype ( 1.3.6.1.4.1.13040.26.1.1
         NAME 'mimpPrefs'
@@ -340,15 +316,6 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
 
 #
-# Odin attribute branch 1.3.6.1.4.1.13040.30.1.*
-#
-attributetype ( 1.3.6.1.4.1.13040.30.1.1
-        NAME 'odinPrefs'
-        DESC 'Odin Preferences'
-        EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
-
-#
 # Rakim attribute branch 1.3.6.1.4.1.13040.31.1.*
 #
 attributetype ( 1.3.6.1.4.1.13040.31.1.1
@@ -376,15 +343,6 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
 
 #
-# Thor attribute branch 1.3.6.1.4.1.13040.34.1.*
-#
-attributetype ( 1.3.6.1.4.1.13040.34.1.1
-        NAME 'thorPrefs'
-        DESC 'Thor Preferences'
-        EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
-
-#
 # Ulaform attribute branch 1.3.6.1.4.1.13040.35.1.*
 #
 attributetype ( 1.3.6.1.4.1.13040.35.1.1
@@ -412,6 +370,15 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
 
 #
+# DIMP attribute branch 1.3.6.1.4.1.13040.38.1.*
+#
+attributetype ( 1.3.6.1.4.1.13040.38.1.1
+        NAME 'dimpPrefs'
+        DESC 'DIMP Preferences'
+        EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
+
+#
 # Horde objectclass branch 1.3.6.1.4.1.13040.2.2.*
 #
 objectclass ( 1.3.6.1.4.1.13040.2.2.1
@@ -421,16 +388,15 @@
     AUXILIARY
     MAY ( mail $ hordePrefs $ impPrefs $ turbaPrefs $
         gollemPrefs $ kronolithPrefs $ mnemoPrefs $
-        trollPrefs $ nagPrefs $ klutzPrefs $
-        jonahPrefs $ hermesPrefs $ junoPrefs $
-        treanPrefs $ whupsPrefs $ ingoPrefs $
-        geniePrefs $ scryPrefs $ anselPrefs $
-        wickedPrefs $ choraPrefs $ agoraPrefs $
-        goopsPrefs $ merkPrefs $ volosPrefs $
-        mimpPrefs $ mottlePrefs $ nicPrefs $
-        occamPrefs $ odinPrefs $ rakimPrefs $
-        seshaPrefs $ swooshPrefs $ thorPrefs $
-        ulaformPrefs
+        nagPrefs $ klutzPrefs $ jonahPrefs $
+        hermesPrefs $ treanPrefs $ whupsPrefs $
+        ingoPrefs $ geniePrefs $ scryPrefs $
+        anselPrefs $ wickedPrefs $ choraPrefs $
+        agoraPrefs $ goopsPrefs $ merkPrefs $
+        volosPrefs $ mimpPrefs $ mottlePrefs $
+        nicPrefs $ occamPrefs $ rakimPrefs $
+        seshaPrefs $ swooshPrefs $ ulaformPrefs $
+        jetaPrefs $ dimpPrefs
     ) )
 
 objectclass ( 1.3.6.1.4.1.13040.2.2.2
@@ -474,10 +440,6 @@
 #
 
 #
-# Troll objectclass branch 1.3.6.1.4.1.13040.10.2.*
-#
-
-#
 # Klutz objectclass branch 1.3.6.1.4.1.13040.11.2.*
 #
 
@@ -490,10 +452,6 @@
 #
 
 #
-# Juno objectclass branch 1.3.6.1.4.1.13040.14.2.*
-#
-
-#
 # Trean objectclass branch 1.3.6.1.4.1.13040.15.2.*
 #
 
@@ -534,7 +492,7 @@
 #
 
 #
-# Mimp objectclass branch 1.3.6.1.4.1.13040.26.2.*
+# MIMP objectclass branch 1.3.6.1.4.1.13040.26.2.*
 #
 
 #
@@ -550,10 +508,6 @@
 #
 
 #
-# Odin objectclass branch 1.3.6.1.4.1.13040.30.2.*
-#
-
-#
 # Rakim objectclass branch 1.3.6.1.4.1.13040.31.2.*
 #
 
@@ -566,10 +520,6 @@
 #
 
 #
-# Thor objectclass branch 1.3.6.1.4.1.13040.34.2.*
-#
-
-#
 # Ulaform objectclass branch 1.3.6.1.4.1.13040.35.2.*
 #
 
@@ -579,4 +529,8 @@
 
 #
 # Jeta objectclass branch 1.3.6.1.4.1.13040.37.2.*
+#
+
+#
+# DIMP objectclass branch 1.3.6.1.4.1.13040.38.2.*
 #



From cvs at kolab.org  Wed Sep 10 22:48:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 22:48:22 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.23,
	1.24 
Message-ID: <20080910204822.6EC50600174@lists.intevation.de>

Author: richard

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

Modified Files:
	slapd.conf.template.in 
Log Message:
reshuffled the configuration a bit, otherwise slapd won't start if
directory_mode : syncrepl is set in kolab.conf.  See kolab/isse1755



Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- slapd.conf.template.in	10 Sep 2008 20:02:05 -0000	1.23
+++ slapd.conf.template.in	10 Sep 2008 20:48:20 -0000	1.24
@@ -27,14 +27,11 @@
 argsfile	@ldapserver_argsfile@
 
 @@@if directory_replication_mode_is_syncrepl@@@
-# Use syncprov/syncrepl method for ldap replication
-moduleload syncprov
-overlay syncprov
-syncprov-checkpoint 1024 16
-syncprov-sessionlog 4096
-syncprov-reloadhint TRUE
-index entryCSN eq
-index entryUUID eq
+# Depending on the build options of openldap the syncprov module is statically
+# or dynamically build.  When build dynamically the module must be loaded.
+# As the slapd that comes with the openpkg version of kolab is statically
+# build it is not necessary to load the module.
+# moduleload syncprov
 @@@else@@@
 replica-pidfile	@ldapserverslurpd_pidfile@
 replogfile      @ldapserver_replogfile@
@@ -65,6 +62,16 @@
 # The idletimeout can be increased if some clients develop problems.
 # Please report to kolab-devel at kolab.org if you encounter such a client.
 idletimeout	300
+
+@@@if directory_replication_mode_is_syncrepl@@@
+# Use syncprov/syncrepl method for ldap replication
+overlay syncprov
+syncprov-checkpoint 1024 16
+syncprov-sessionlog 4096
+syncprov-reloadhint TRUE
+index entryCSN eq
+index entryUUID eq
+@@@endif@@@
 
 dirtyread
 



From cvs at kolab.org  Wed Sep 10 22:48:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Sep 2008 22:48:22 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.190,1.191 
Message-ID: <20080910204822.6ECD8600175@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
reshuffled the configuration a bit, otherwise slapd won't start if
directory_mode : syncrepl is set in kolab.conf.  See kolab/isse1755



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- ChangeLog	10 Sep 2008 20:08:27 -0000	1.190
+++ ChangeLog	10 Sep 2008 20:48:20 -0000	1.191
@@ -4,6 +4,9 @@
 	  kolab/issue3006
 	* horde.schema: updated to the latest version available in horde cvs
 	  kolab/issue3006
+	* templates/slapd.conf.template.in: reshuffled the configuration a
+	  bit, otherwise slapd won't start if directory_mode : syncrepl
+	  is set in kolab.conf.  See kolab/isse1755
 
 2008-09-06 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Thu Sep 11 15:57:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 15:57:21 +0200 (CEST)
Subject: wilde: server/clamav Makefile, 1.4.2.7, 1.4.2.8 kolab.patch, 1.5.2.6,
	1.5.2.7 
Message-ID: <20080911135721.2DEE4600172@lists.intevation.de>

Author: wilde

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

Modified Files:
      Tag: kolab_2_1_branch
	Makefile kolab.patch 
Log Message:
Updated clamav package to 0.94.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/Makefile,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -d -r1.4.2.7 -r1.4.2.8
--- Makefile	18 Jun 2008 14:37:18 -0000	1.4.2.7
+++ Makefile	11 Sep 2008 13:57:18 -0000	1.4.2.8
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/security-updates/20080618/
+  KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/security-updates/20080911/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -12,9 +12,9 @@
 endif
 
 PACKAGE=clamav
-VERSION=0.93.1
-RELEASE=20080610
-KOLABRELEASE=20080610_kolab
+VERSION=0.94
+RELEASE=20080905
+KOLABRELEASE=20080905_kolab
 
 RPM=/kolab/bin/openpkg rpm
 

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/kolab.patch,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -d -r1.5.2.6 -r1.5.2.7
--- kolab.patch	18 Jun 2008 14:37:18 -0000	1.5.2.6
+++ kolab.patch	11 Sep 2008 13:57:18 -0000	1.5.2.7
@@ -3,9 +3,9 @@
 @@ -32,7 +32,7 @@
  Group:        AntiVirus
  License:      GPL
- Version:      0.93.1
--Release:      20080610
-+Release:      20080610_kolab
+ Version:      0.94
+-Release:      20080905
++Release:      20080905_kolab
  
  #   package options
  %option       with_milter  no



From cvs at kolab.org  Thu Sep 11 16:12:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 16:12:29 +0200 (CEST)
Subject: wilde: doc/www/src/security kolab-vendor-notice-22.txt,NONE,1.1 
Message-ID: <20080911141229.F1EB0600172@lists.intevation.de>

Author: wilde

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

Added Files:
	kolab-vendor-notice-22.txt 
Log Message:
Kolab Security Issue 22 20080911 (clamav)


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

Kolab Security Issue 22 20080911
================================

Package:              Kolab Server, ClamAV
Vulnerability:        denial of service
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

Various unspecified memory corruption vulnerabilities and a bug in the
chm parser allowed remote attackers to cause a denial of service.
Further unknown attack vectors might exist.


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

This affects versions of ClamAV up to version 0.93.1
Kolab Server 2.1.0 and previous releases of the 2.1 branch are affected.
Kolab Server 2.0.4 and previous releases of the 2.0 branch are affected.
Kolab Server 2.2.0 and previous prereleases are affected.


Fix
~~~

Upgrade to ClamAV 0.94.

The ClamAV source RPM patched to be compilable with Kolab Server 2.1 and 2.0
is available from the Kolab download mirrors as:
security-updates/20080911/clamav-0.94-20080905_kolab.src.rpm

For Kolab Server 2.2.0 the unmodified OpenPKG rpm can be used:
security-updates/20080911/clamav-0.94-20080905.src.rpm

A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20080911/clamav-0.94-20080905_kolab.ix86-debian3.1-kolab.rpm

A binary RPM for Kolab Server 2.2.0 (ix86 Debian GNU/Linux Etch) 
is available from:
security-updates/20080911/clamav-0.94-20080905_kolab.ix86-debian4.0-kolab.rpm

All other server versions: Please build from the src.rpm.


The mirrors are listed on http://kolab.org/mirrors.html
While the mirrors are catching up, you can also get the package via rsync:
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080911/clamav-0.94-20080905_kolab.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080911/clamav-0.94-20080905_kolab.ix86-debian3.1-kolab.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080911/clamav-0.94-20080905.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080911/clamav-0.94-20080905.ix86-debian4.0-kolab.rpm .

MD5 sums:
35acf995ef8927a8ea76afb8502eb648  clamav-0.94-20080905.ix86-debian4.0-kolab.rpm
0b6be1bf21deef9de8582a56d330aaef  clamav-0.94-20080905.src.rpm
67ffd197c991b5d1dc83520a91b5ff57  clamav-0.94-20080905_kolab.ix86-debian3.1-kolab.rpm
0b7d3a2a22f9a2c2e12bc0b14cc3b800  clamav-0.94-20080905_kolab.src.rpm


The package can be installed on your Kolab Server with

# /kolab/bin/openpkg rpm --rebuild clamav-0.93.1-20080610_kolab.src.rpm
# /kolab/bin/openpkg rpm \
  -Uvh /kolab/RPM/PKG/clamav-0.93.1-20080610_kolab.<ARCH>-<OS>-kolab.rpm
# rm /kolab/etc/clamav/*.rpmsave
# /kolab/bin/openpkg rc clamav stop
# /kolab/bin/openpkg rc clamav start
# su - kolab-r
$ freshclam
$ rm -r /kolab/share/clamav/*.inc

For Kolab Server 2.0.4 you have to copy the new /kolab/etc/clamav/clamd.conf
to /kolab/etc/kolab/templates/clamd.conf.template so it will not be
overwritten by kolabconf. Do NOT copy this file with Kolab Server 2.1 or 2.2!


Details
~~~~~~~

http://sourceforge.net/project/shownotes.php?release_id=623661&group_id=86638
	ClamAV 0.94 release notes

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1389
https://wwws.clamav.net/bugzilla/show_bug.cgi?id=1089
	clamav chm handler: crasher bugs

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-3912
http://www.securityfocus.com/bid/31051
https://wwws.clamav.net/bugzilla/show_bug.cgi?id=1141
	DOS related to out-of-memory in libclamav

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-3913
http://www.securityfocus.com/bid/31051
https://wwws.clamav.net/bugzilla/show_bug.cgi?id=1141
	DOS caused by multiple memory leaks in freshclam/manager.c

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-3914
http://www.securityfocus.com/bid/31051
https://wwws.clamav.net/bugzilla/show_bug.cgi?id=1141
	Multiple unspecified vulnerabilities with unknown impact

Timeline
~~~~~~~~
    20080902 ClamAV release 0.94.
    20080905 OpenPKG 0.94 package release.
    20080905 Kolab Bug Tracker Issue created.
    20080611 Kolab Server security advisory published.

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

iD8DBQFIySasuyGFFEu4ZWgRAqABAKCZivF8mYXWzklhFaBx+Gnj7XLtsgCePO3i
Q9e2BxbX1ba4duVOTng/5gk=
=fjtL
-----END PGP SIGNATURE-----



From cvs at kolab.org  Thu Sep 11 16:20:30 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 16:20:30 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.31,1.32 
Message-ID: <20080911142030.A6FB3600172@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolabd.spec.in 
Log Message:
Activate spl in php.

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kolabd.spec.in	29 Aug 2008 14:57:24 -0000	1.31
+++ kolabd.spec.in	11 Sep 2008 14:20:28 -0000	1.32
@@ -68,8 +68,8 @@
 PreReq:       php, php::with_pear = yes, 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
 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
 %else
-PreReq:       php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes
-PreReq:       apache-php, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_imap_annotate = yes, apache-php::with_openldap = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_dom = yes, apache-php::with_ssl = yes, apache-php::with_mbstring = yes, apache-php::with_mm = yes
+PreReq:       php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes, php::with_spl = yes
+PreReq:       apache-php, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_imap_annotate = yes, apache-php::with_openldap = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_dom = yes, apache-php::with_ssl = yes, apache-php::with_mbstring = yes, apache-php::with_mm = yes, php::with_spl = yes
 %endif
 
 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



From cvs at kolab.org  Thu Sep 11 16:20:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 16:20:46 +0200 (CEST)
Subject: wilde: doc/www/src index.html.m4,1.154,1.155 
Message-ID: <20080911142046.33B63600BA7@lists.intevation.de>

Author: wilde

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

Modified Files:
	index.html.m4 
Log Message:
Security Issue 22 for Kolab Server (ClamAV).


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- index.html.m4	14 Aug 2008 08:57:05 -0000	1.154
+++ index.html.m4	11 Sep 2008 14:20:44 -0000	1.155
@@ -60,6 +60,19 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">September 11th, 2008</td>
+<td class="newsh">&raquo;
+  Security Issue 22 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  A new ClamAV RPM with various fixes for DoS vulnerabilities is available.  See the
+  <a href="security/kolab-vendor-notice-22.txt">Kolab Security Issue 22</a> for
+details.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">August 14th, 2008</td>
 <td class="newsh">&raquo;
   Univention Corporate Server 2.1 includes new Kolab components
@@ -108,10 +121,6 @@
   You can find more information in <a href="http://www.univention.de/pm_syncml.html">Univention's press release</a> (German only).
 </div>
 <p>
-
-
-
-
 
 </div> <!-- END LATEST BLOCK -->
 <p>



From cvs at kolab.org  Thu Sep 11 16:33:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 16:33:53 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format Kolab_Format.spec,1.3,1.4 
Message-ID: <20080911143353.DF34C600BA7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Format.spec 
Log Message:
Require spl here too.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kolab_Format.spec	10 Sep 2008 13:33:01 -0000	1.3
+++ Kolab_Format.spec	11 Sep 2008 14:33:51 -0000	1.4
@@ -26,7 +26,7 @@
 BuildPreReq:  php, php::with_pear = yes
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
-PreReq:       php, php::with_pear = yes
+PreReq:       php, php::with_pear = yes, php::with_spl = yes
 PreReq:       Horde_DOM
 PreReq:       Horde_NLS
 PreReq:       Horde_Util



From cvs at kolab.org  Thu Sep 11 17:15:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 17:15:03 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format Kolab_Format.spec,1.4,1.5 
Message-ID: <20080911151503.9BB50600BA7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Format.spec 
Log Message:
Hm, there are obviously parts in the OpenPKG build script that I do not fully understand. Revert the spl change for now and let's hope the full build will work later. If there are conflicting requirements the -D php::with_spl might also be added to install-kolab.sh.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Kolab_Format.spec	11 Sep 2008 14:33:51 -0000	1.4
+++ Kolab_Format.spec	11 Sep 2008 15:15:01 -0000	1.5
@@ -26,7 +26,7 @@
 BuildPreReq:  php, php::with_pear = yes
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
-PreReq:       php, php::with_pear = yes, php::with_spl = yes
+PreReq:       php, php::with_pear = yes
 PreReq:       Horde_DOM
 PreReq:       Horde_NLS
 PreReq:       Horde_Util



From cvs at kolab.org  Thu Sep 11 18:20:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:20:56 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Auth - New directory 
Message-ID: <20080911162056.E7B3E600172@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Auth added to the repository




From cvs at kolab.org  Thu Sep 11 18:21:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:21:13 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Auth ChangeLog, NONE, 1.1 Horde_Auth.spec,
	NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162113.D363F600BA7@lists.intevation.de>

Author: gunnar

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

Added Files:
	ChangeLog Horde_Auth.spec Makefile 
Log Message:
Added Horde_Auth

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Auth.spec ---
# Variables
%define         V_package Horde_Auth
%define         V_version 0.0.3
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Authentication API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Framework
PreReq:       Horde_Secret
PreReq:       Horde_Util

%description 
The Auth:: class provides a common abstracted interface into the
various backends for the Horde authentication system.  This package
contains implementations for:

* A Horde Application
* Dummy Auto Login
* Composite Auth Driver
* Custom SQL
* Cyrus with SQL Support
* FTP
* HTTP
* IMAP
* IMSP
* IP Based
* Kerberos
* LDAP
* Shibboleth
* System Login
* mcal
* PAM
* Passwd File
* Radius
* SASL
* SMB
* SQL
* Yahoo!

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:21:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:21:41 +0200 (CEST)
Subject: gunnar: server/pear/Horde_CLI - New directory 
Message-ID: <20080911162141.87A57600BAC@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_CLI added to the repository




From cvs at kolab.org  Thu Sep 11 18:21:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:21:59 +0200 (CEST)
Subject: gunnar: server/pear/Horde_CLI ChangeLog, NONE, 1.1 Horde_CLI.spec,
	NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162159.ADCE4600BB3@lists.intevation.de>

Author: gunnar

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

Added Files:
	ChangeLog Horde_CLI.spec Makefile 
Log Message:
Added Horde_CLI.

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_CLI.spec ---
# Variables
%define         V_package Horde_CLI
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde CLI API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes

%description 
Horde_CLI:: API for basic command-line functionality/checks.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:23:31 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:23:31 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Cache - New directory 
Message-ID: <20080911162331.2C985600BB4@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Cache added to the repository




From cvs at kolab.org  Thu Sep 11 18:23:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:23:48 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Cache ChangeLog, NONE, 1.1 Horde_Cache.spec,
	NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162348.75E25600BB8@lists.intevation.de>

Author: gunnar

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

Added Files:
	ChangeLog Horde_Cache.spec Makefile 
Log Message:
Added Horde_Cache.

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Cache.spec ---
# Variables
%define         V_package Horde_Cache
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Caching API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Util

%description 
This package provides a simple, functional Caching API, with the
option to store the cached data either on the filesystem, or using the
Zend Performance Suites content cache.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:24:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:24:17 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Group - New directory 
Message-ID: <20080911162417.DCD38600172@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Group added to the repository




From cvs at kolab.org  Thu Sep 11 18:24:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:24:59 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Framework - New directory 
Message-ID: <20080911162459.D4907600BBD@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Framework added to the repository




From cvs at kolab.org  Thu Sep 11 18:24:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:24:59 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Cipher - New directory 
Message-ID: <20080911162459.C7DF8600BA7@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Cipher added to the repository




From cvs at kolab.org  Thu Sep 11 18:25:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:25:09 +0200 (CEST)
Subject: gunnar: server/pear/Horde_CLI .cvsignore,NONE,1.1 
Message-ID: <20080911162509.5FAE5600BBE@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore 
Log Message:
Added Horde_Group.

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



From cvs at kolab.org  Thu Sep 11 18:25:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:25:09 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Cache .cvsignore,NONE,1.1 
Message-ID: <20080911162509.63436600BBF@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore 
Log Message:
Added Horde_Group.

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



From cvs at kolab.org  Thu Sep 11 18:25:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:25:09 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Group .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Group.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162509.6D83A60C4A1@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Group.spec Makefile 
Log Message:
Added Horde_Group.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Group.spec ---
# Variables
%define         V_package Horde_Group
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde User Groups System.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Framework
PreReq:       Horde_Auth

%description 
The Group:: class provides the Horde groups system.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:25:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:25:09 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Auth .cvsignore,NONE,1.1 
Message-ID: <20080911162509.5EF2A600BAC@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore 
Log Message:
Added Horde_Group.

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



From cvs at kolab.org  Thu Sep 11 18:26:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:26:11 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Framework .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Horde_Framework.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162611.C581960C4A1@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Framework.spec Makefile 
Log Message:
Added Horde_Cipher and Horde_Framework.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Framework.spec ---
# Variables
%define         V_package Horde_Framework
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde core Framework libraries
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-Log
PreReq:       Horde_CLI
PreReq:       Horde_DOM
PreReq:       Horde_Util

%description 
These classes provide the core functionality of the Horde Application
Framework.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:26:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:26:11 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Cipher .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Cipher.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162611.C694F60C4A5@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Cipher.spec Makefile 
Log Message:
Added Horde_Cipher and Horde_Framework.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Cipher.spec ---
# Variables
%define         V_package Horde_Cipher
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Cipher API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes

%description 
This package provides a Block Mode Cipher API, supporting the following ciphers:
* Blowfish
* Cast128
* DES
* RC2
* RC4

And supporting the following block modes:
* CBC
* ECB
* CFB64
* OFB64

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:27:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:27:21 +0200 (CEST)
Subject: gunnar: server/pear/Horde_MIME - New directory 
Message-ID: <20080911162721.7B1DC600BB4@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_MIME added to the repository




From cvs at kolab.org  Thu Sep 11 18:27:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:27:40 +0200 (CEST)
Subject: gunnar: server/pear/Horde_MIME .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_MIME.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162740.977E5600BB8@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_MIME.spec Makefile 
Log Message:
Added Horde_MIME.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_MIME.spec ---
# Variables
%define         V_package Horde_MIME
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Mime Library
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-mimeDecode
PreReq:       Horde_Util

%description 
The Horde_MIME:: class provides methods for dealing with MIME standards.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:27:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:27:56 +0200 (CEST)
Subject: gunnar: server/pear/Horde_History - New directory 
Message-ID: <20080911162756.D494B600172@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_History added to the repository




From cvs at kolab.org  Thu Sep 11 18:28:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:28:19 +0200 (CEST)
Subject: gunnar: server/pear/Horde_History .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Horde_History.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162819.318BD600BA7@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_History.spec Makefile 
Log Message:
Added Horde_History.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_History.spec ---
# Variables
%define         V_package Horde_History
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   API for tracking the history of an object.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes

%description 
This API provides a way to track changes on arbitrary pieces of data
in Horde applications.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:28:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:28:46 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Perms - New directory 
Message-ID: <20080911162846.939EB600BAC@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Perms added to the repository




From cvs at kolab.org  Thu Sep 11 18:29:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:29:04 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Perms .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Perms.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911162904.2A3B1600BB3@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Perms.spec Makefile 
Log Message:
Added Horde_Perms.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Perms.spec ---
# Variables
%define         V_horde_package Perms
%define         V_package Horde_Perms
%define         V_version 0.1.0
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Permissions System
URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Framework
PreReq:       Horde_Group
PreReq:       Horde_Util

%description 
The Perms package provides an interface to the Horde permissions
system.

%prep
	%setup -n %{V_horde_package}-%{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_horde_package}-%{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

--- NEW FILE: Makefile ---
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
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/$(HORDE_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 .



From cvs at kolab.org  Thu Sep 11 18:29:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:29:39 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Serialize - New directory 
Message-ID: <20080911162939.E12CC60C4AB@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Serialize added to the repository




From cvs at kolab.org  Thu Sep 11 18:29:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:29:39 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Secret - New directory 
Message-ID: <20080911162939.DF318600BBF@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Secret added to the repository




From cvs at kolab.org  Thu Sep 11 18:29:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:29:39 +0200 (CEST)
Subject: gunnar: server/pear/Horde_SessionObjects - New directory 
Message-ID: <20080911162939.E418560C4AC@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_SessionObjects added to the repository




From cvs at kolab.org  Thu Sep 11 18:30:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:30:26 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Secret .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Secret.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911163026.604F9600BBE@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Secret.spec Makefile 
Log Message:
Added Horde_{Secret,Serialize,Session}.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Secret.spec ---
# Variables
%define         V_package Horde_Secret
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Secret Encryption API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Cipher
PreReq:       Horde_Util

%description 
The Secret:: class provides an API for encrypting and decrypting small
pieces of data with the use of a shared key.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:30:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:30:26 +0200 (CEST)
Subject: gunnar: server/pear/Horde_SessionObjects .cvsignore, NONE,
	1.1 ChangeLog, NONE, 1.1 Horde_SessionObjects.spec, NONE,
	1.1 Makefile, NONE, 1.1 
Message-ID: <20080911163026.6904460C4AD@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_SessionObjects.spec Makefile 
Log Message:
Added Horde_{Secret,Serialize,Session}.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_SessionObjects.spec ---
# Variables
%define         V_package Horde_SessionObjects
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Session Storage API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Framework
PreReq:       Horde_Serialize

%description 
The Horde_SessionObjects:: class provides a way for storing data
(usually, but not necessarily, objects) in the current users session.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:30:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:30:26 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Serialize .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Horde_Serialize.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911163026.628CF60C4A1@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Serialize.spec Makefile 
Log Message:
Added Horde_{Secret,Serialize,Session}.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Serialize.spec ---
# Variables
%define         V_package Horde_Serialize
%define         V_version 0.0.2
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Data Encapulation API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Util

%description 
The Serialize:: class provides various methods of encapsulating data.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:30:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:30:59 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail-mimeDecode - New directory 
Message-ID: <20080911163059.2A95B600BB4@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/PEAR-Mail-mimeDecode added to the repository




From cvs at kolab.org  Thu Sep 11 18:31:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:31:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail-mimeDecode .cvsignore, NONE,
	1.1 ChangeLog, NONE, 1.1 Makefile, NONE,
	1.1 PEAR-Mail_mimeDecode.spec, NONE, 1.1 
Message-ID: <20080911163123.09255600172@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Makefile PEAR-Mail_mimeDecode.spec 
Log Message:
Added PEAR-Mail_mimeDecode.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

	* PEAR-Mail_Mime.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-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 .

--- NEW FILE: PEAR-Mail_mimeDecode.spec ---
# Variables
%define         V_pear_name Mail_mimeDecode
%define         V_package PEAR-%{V_pear_name}
%define         V_version 1.5.0
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Provides a class to decode mime messages.
URL:       http://pear.php.net/package/%{package_name}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   BSD Style
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

%description 
Provides a class to deal with the decoding and interpreting of mime
messages.  This package used to be part of the Mail_Mime package, but
has been split off.

%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  Thu Sep 11 18:32:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:32:04 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage - New directory 
Message-ID: <20080911163204.52EF5600BA7@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/php-kolab/Kolab_Storage added to the repository




From cvs at kolab.org  Thu Sep 11 18:32:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:32:23 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Kolab_Storage.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080911163223.8BA04600BAC@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Kolab_Storage.spec Makefile 
Log Message:
Added Kolab_Storage.

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

--- NEW FILE: ChangeLog ---
2008-09-11  Gunnar Wrobel  <p at rdus.de>

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


--- NEW FILE: Kolab_Storage.spec ---
# Variables
%define         V_package Kolab_Storage
%define         V_version 0.1.0
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   A package for handling Kolab data stored on an IMAP server.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Kolab_Format
PreReq:       Kolab_Server
PreReq:       Horde_Auth
PreReq:       Horde_Cache
PreReq:       Horde_Group
PreReq:       Horde_History
PreReq:       Horde_LDAP
PreReq:       Horde_Perms
PreReq:       Horde_SessionObjects
PreReq:       Horde_MIME
PreReq:       Horde_NLS
PreReq:       Horde_Util
PreReq:       PHPUnit

%description 
Storing user data in an IMAP account belonging to the
user is one of the Kolab server core concepts. This package provides
all the necessary means to deal with this type of data storage
effectively.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Thu Sep 11 18:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Sep 2008 18:39:57 +0200 (CEST)
Subject: gunnar: server/pear/Horde_MIME Horde_MIME.spec,1.1,1.2 
Message-ID: <20080911163957.DA1EC600172@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_MIME.spec 
Log Message:
Typo.

Index: Horde_MIME.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_MIME/Horde_MIME.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_MIME.spec	11 Sep 2008 16:27:38 -0000	1.1
+++ Horde_MIME.spec	11 Sep 2008 16:39:55 -0000	1.2
@@ -27,7 +27,7 @@
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
-PreReq:       PEAR-mimeDecode
+PreReq:       PEAR-Mail_mimeDecode
 PreReq:       Horde_Util
 
 %description 



From cvs at kolab.org  Fri Sep 12 07:00:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:00:43 +0200 (CEST)
Subject: gunnar: server/pear/Horde_iCalendar - New directory 
Message-ID: <20080912050043.AD2A8600172@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_iCalendar added to the repository




From cvs at kolab.org  Fri Sep 12 07:01:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:01:08 +0200 (CEST)
Subject: gunnar: server/pear/Horde_iCalendar .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Horde_iCalendar.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080912050108.9A39C600B83@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_iCalendar.spec Makefile 
Log Message:
Added Horde_iCalendar.

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

--- NEW FILE: ChangeLog ---
2008-09-12  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_iCalendar.spec ---
# Variables
%define         V_package Horde_iCalendar
%define         V_version 0.0.3
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   iCalendar API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Util

%description 
This package provides an API for dealing with iCalendar data.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/kolab-freebusy .cvsignore, 1.2, NONE ChangeLog, 1.10,
	NONE DEPRECATION_NOTE, 1.1, NONE DEVELOPMENT, 1.5, NONE Makefile,
	1.18, NONE kolab-freebusy.spec, 1.7, NONE 
Message-ID: <20080912052022.AC6C3600B83@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv12367/kolab-freebusy

Removed Files:
	.cvsignore ChangeLog DEPRECATION_NOTE DEVELOPMENT Makefile 
	kolab-freebusy.spec 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- DEPRECATION_NOTE DELETED ---

--- DEVELOPMENT DELETED ---

--- Makefile DELETED ---

--- kolab-freebusy.spec DELETED ---



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server Makefile,1.55,1.56 release-notes.txt,1.313,1.314 
Message-ID: <20080912052022.A8F2A600172@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile release-notes.txt 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Makefile	29 Aug 2008 16:25:31 -0000	1.55
+++ Makefile	12 Sep 2008 05:20:20 -0000	1.56
@@ -26,7 +26,6 @@
                php-kolab               \
                kolabconf               \
                kolabd                  \
-               kolab-freebusy          \
                kolab-filter            \
                kolab-webadmin          \
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- release-notes.txt	8 Sep 2008 19:36:56 -0000	1.313
+++ release-notes.txt	12 Sep 2008 05:20:20 -0000	1.314
@@ -58,6 +58,10 @@
 	kolab/issue2928 (gmp-4.2.2-20080101 does not compile on Debian
 	                 lenny/amd64)
 
+    - kolab-freebusy-2.2.?-2008????
+
+	Replaced with upstream Kolab_FreeBusy (http://pear.horde.org/index.php?package=Kolab_FreeBusy)
+
     - kolabd-2.2.?-2008????
 
 	kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/kolab-freebusy/freebusy/docs AUTHORS, 1.2, NONE COPYING,
	1.1, NONE ChangeLog, 1.3, NONE INSTALL, 1.3, NONE 
Message-ID: <20080912052022.BD13C600BA7@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy/docs
In directory doto:/tmp/cvs-serv12367/kolab-freebusy/freebusy/docs

Removed Files:
	AUTHORS COPYING ChangeLog INSTALL 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- AUTHORS DELETED ---

--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- INSTALL DELETED ---



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/kolab-freebusy/freebusy/cache README,1.1,NONE 
Message-ID: <20080912052022.B6A36600B88@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy/cache
In directory doto:/tmp/cvs-serv12367/kolab-freebusy/freebusy/cache

Removed Files:
	README 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- README DELETED ---



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/kolab-freebusy/freebusy config.php, 1.7,
	NONE freebusy.php, 1.5, NONE generatefb.php, 1.7, NONE pfb.php,
	1.8, NONE 
Message-ID: <20080912052022.B3119600B86@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv12367/kolab-freebusy/freebusy

Removed Files:
	config.php freebusy.php generatefb.php pfb.php 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- config.php DELETED ---

--- freebusy.php DELETED ---

--- generatefb.php DELETED ---

--- pfb.php DELETED ---



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/php-kolab Makefile,1.25,1.26 php-kolab.spec,1.4,1.5 
Message-ID: <20080912052022.C347C600172@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile php-kolab.spec 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	31 Jul 2008 16:43:07 -0000	1.25
+++ Makefile	12 Sep 2008 05:20:20 -0000	1.26
@@ -25,8 +25,7 @@
   endif
 endif
 
-MODULES = Kolab_Freebusy \
-          Kolab_Filter   \
+MODULES = Kolab_Filter   \
           Kolab_Webadmin
 
 SOURCES = $(MODULES:%=%-$(SOURCE_TAG).tgz)

Index: php-kolab.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/php-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- php-kolab.spec	16 Aug 2007 12:16:51 -0000	1.4
+++ php-kolab.spec	12 Sep 2008 05:20:20 -0000	1.5
@@ -18,9 +18,8 @@
 Release:      %{V_release}
 
 # List of Sources
-Source0:    Kolab_Freebusy-%{V_source_tag}.tgz
-Source1:    Kolab_Filter-%{V_source_tag}.tgz
-Source2:    Kolab_Webadmin-%{V_source_tag}.tgz
+Source0:    Kolab_Filter-%{V_source_tag}.tgz
+Source1:    Kolab_Webadmin-%{V_source_tag}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -40,9 +39,6 @@
 php-kolab provides several PEAR-style package with PHP routines for
 the Kolab Groupware server.
 
-Kolab_Freebusy provides the library required for free/busy support on
-the server.
-
 Kolab_Filter holds routines necessary to parse iCal mail messages.
 
 Kolab_Webadmin groups utilities for the Kolab web admin frontend.
@@ -52,10 +48,6 @@
 %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/Kolab_Freebusy-%{V_source_tag}.tgz
-
         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/Kolab_Filter-%{V_source_tag}.tgz



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php, 1.10,
	NONE Page.php, 1.10, NONE 
Message-ID: <20080912052022.E046E600172@lists.intevation.de>

Author: gunnar

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

Removed Files:
	Cache.php Page.php 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- Cache.php DELETED ---

--- Page.php DELETED ---



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/tests .cvsignore,1.1,NONE 
Message-ID: <20080912052022.E23E9600B83@lists.intevation.de>

Author: gunnar

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

Removed Files:
	.cvsignore 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- .cvsignore DELETED ---



From cvs at kolab.org  Fri Sep 12 07:20:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:20:22 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec, NONE,
	1.1 Makefile, NONE, 1.1 .cvsignore, 1.1, NONE AUTHORS, 1.2,
	NONE COPYING, 1.1, NONE ChangeLog, 1.17, NONE DEPRECATION_NOTE,
	1.1, NONE package.xml.in, 1.4, NONE 
Message-ID: <20080912052022.C639A600BAC@lists.intevation.de>

Author: gunnar

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

Added Files:
	Kolab_FreeBusy.spec Makefile 
Removed Files:
	.cvsignore AUTHORS COPYING ChangeLog DEPRECATION_NOTE 
	package.xml.in 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

--- NEW FILE: Kolab_FreeBusy.spec ---
# Variables
%define         V_package Kolab_FreeBusy
%define         V_version 0.0.1
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   A package for providing free/busy information.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
# FIXME: Temporary location until I release it for real on pear.horde.org
Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Kolab_Format
PreReq:       Kolab_Server
PreReq:       Kolab_Storage
PreReq:       Horde_iCalendar

%description 
This package provides free/busy information for the users of a Kolab
server. A Kolab client changing calendar data in an IMAP folder is
required to call the triggering script provided within this package
via HTTP. This will refresh the cache maintained by this package with
partial free/busy data. This partial data sets are finally combined to
the complete free/busy information once a client requests this data
for a particular user.


%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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

# FIXME: Temporary location until I release it for real on pear.horde.org
SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
#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 .

--- .cvsignore DELETED ---

--- AUTHORS DELETED ---

--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- DEPRECATION_NOTE DELETED ---

--- package.xml.in DELETED ---



From cvs at kolab.org  Fri Sep 12 07:22:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 07:22:23 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy .cvsignore, 1.2, 1.3 ChangeLog,
	1.18, 1.19 
Message-ID: <20080912052223.4D28D600B86@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog 
Log Message:
Add cvsignore and Changelog.





From cvs at kolab.org  Fri Sep 12 10:26:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 10:26:27 +0200 (CEST)
Subject: ljohansen: doc/www/src default.css, 1.13, 1.14 index.html.m4, 1.155,
	1.156 
Message-ID: <20080912082627.1F33F600B83@lists.intevation.de>

Author: ljohansen

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

Modified Files:
	default.css index.html.m4 
Log Message:
Added some pixels to the news date field in order to prevent that ugly line break in long dates.


Index: default.css
===================================================================
RCS file: /kolabrepository/doc/www/src/default.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- default.css	13 Jun 2008 09:47:23 -0000	1.13
+++ default.css	12 Sep 2008 08:26:24 -0000	1.14
@@ -254,7 +254,7 @@
 .newsd {
     font-size: 110%;
     font-weight: bold;
-    width: 160px;
+    width: 175px;
     text-align: right;
     vertical-align: top;
 }
@@ -270,7 +270,7 @@
 /* News body */
 .newsb {
     padding-left: 10px;
-    margin-left: 170px;
+    margin-left: 185px;
 }
 
 /* News item */

Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- index.html.m4	11 Sep 2008 14:20:44 -0000	1.155
+++ index.html.m4	12 Sep 2008 08:26:24 -0000	1.156
@@ -4,7 +4,7 @@
 
 <table width="100%">
 <tr>
-<td valign=top>
+<td valign="top">
 <p id="intro">
 Kolab is a Groupware Solution for Emails, Appointments, Contacts and more.
 It supports <strong>mixed client environments (Outlook/KDE)</strong>
@@ -105,6 +105,9 @@
 </div>
 <p>
 
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 <table>
 <tr><td class="newsd">July 9th, 2008</td>
@@ -113,18 +116,24 @@
 </td></tr>
 </table>
 <div class="newsb">
-  Univention GmbH has realised an extension to Kolab in cooperation with the Kolab Konsortium and Pardus, which allows users to connect mobile devices directly to the groupware server. Now it is possible to synchronize appointment times and contact information being away on business.<br />
-  This was done by integrating the SyncML protocol into the Horde part of Kolab server. SyncML is a platform independant standard designed for the exchange of data between servers, clients and mobile devices.<br />
-  The Horde interface is going to be integrated into Kolab Server/OpenPKG 2.2.0 as a beta version. Version 2.2.1 is then expected to integrate the SyncML extensions for tasks and contacts.
-  In Univention's UGS the SyncML extensions are available as release candidates for testing purposes.
+  Univention GmbH has realised an extension to Kolab in cooperation with the
+Kolab Konsortium and Pardus, which allows users to connect mobile devices
+directly to the groupware server. Now it is possible to synchronize appointment
+times and contact information being away on business.<br />
+  This was done by integrating the SyncML protocol into the Horde part of Kolab
+server. SyncML is a platform independant standard designed for the exchange of
+data between servers, clients and mobile devices.<br />
+  The Horde interface is going to be integrated into Kolab Server/OpenPKG 2.2.0
+as a beta version. Version 2.2.1 is then expected to integrate the SyncML
+extensions for tasks and contacts.
+  In Univention's UGS the SyncML extensions are available as release candidates
+for testing purposes.
   <br />
-  You can find more information in <a href="http://www.univention.de/pm_syncml.html">Univention's press release</a> (German only).
+  You can find more information in <a
+href="http://www.univention.de/pm_syncml.html">Univention's press release</a>
+(German only).
 </div>
 <p>
-
-</div> <!-- END LATEST BLOCK -->
-<p>
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 <table>
 <tr><td class="newsd">June 18th, 2008</td>



From cvs at kolab.org  Fri Sep 12 17:16:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 17:16:29 +0200 (CEST)
Subject: wilde: doc/www/src/security kolab-vendor-notice-22.txt,1.1,1.2 
Message-ID: <20080912151629.EEF76600171@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab-vendor-notice-22.txt 
Log Message:
Fixed version at various places and release date in time line.


Index: kolab-vendor-notice-22.txt
===================================================================
RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-22.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-vendor-notice-22.txt	11 Sep 2008 14:12:25 -0000	1.1
+++ kolab-vendor-notice-22.txt	12 Sep 2008 15:16:27 -0000	1.2
@@ -22,9 +22,9 @@
 ~~~~~~~~~~~~~~~~~
 
 This affects versions of ClamAV up to version 0.93.1
+Kolab Server 2.2.0 and previous prereleases are affected.
 Kolab Server 2.1.0 and previous releases of the 2.1 branch are affected.
 Kolab Server 2.0.4 and previous releases of the 2.0 branch are affected.
-Kolab Server 2.2.0 and previous prereleases are affected.
 
 
 Fix
@@ -65,9 +65,9 @@
 
 The package can be installed on your Kolab Server with
 
-# /kolab/bin/openpkg rpm --rebuild clamav-0.93.1-20080610_kolab.src.rpm
+# /kolab/bin/openpkg rpm --rebuild clamav-0.94-20080905.src.rpm
 # /kolab/bin/openpkg rpm \
-  -Uvh /kolab/RPM/PKG/clamav-0.93.1-20080610_kolab.<ARCH>-<OS>-kolab.rpm
+  -Uvh /kolab/RPM/PKG/clamav-0.94-20080905.<ARCH>-<OS>-kolab.rpm
 # rm /kolab/etc/clamav/*.rpmsave
 # /kolab/bin/openpkg rc clamav stop
 # /kolab/bin/openpkg rc clamav start
@@ -110,12 +110,12 @@
     20080902 ClamAV release 0.94.
     20080905 OpenPKG 0.94 package release.
     20080905 Kolab Bug Tracker Issue created.
-    20080611 Kolab Server security advisory published.
+    20080911 Kolab Server security advisory published.
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFIySasuyGFFEu4ZWgRAqABAKCZivF8mYXWzklhFaBx+Gnj7XLtsgCePO3i
-Q9e2BxbX1ba4duVOTng/5gk=
-=fjtL
+iD8DBQFIyod4uyGFFEu4ZWgRAggPAJ42TKDMWoxEptkC5xYGx/ot+WL6IgCeL5c3
+Qj2C4EIT2GcGxlhpK2duyZ4=
+=JxC7
 -----END PGP SIGNATURE-----



From cvs at kolab.org  Fri Sep 12 20:46:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 20:46:04 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Date - New directory 
Message-ID: <20080912184604.78DCA600171@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Date added to the repository




From cvs at kolab.org  Fri Sep 12 20:46:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 20:46:48 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Auth Horde_Auth.spec, 1.1, 1.2 Makefile, 1.1,
	1.2 
Message-ID: <20080912184648.A10B1600B88@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_Auth.spec Makefile 
Log Message:
Complete a first draft of the new Free/Busy package. Not yet functional.

Index: Horde_Auth.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Horde_Auth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_Auth.spec	11 Sep 2008 16:21:11 -0000	1.1
+++ Horde_Auth.spec	12 Sep 2008 18:46:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Horde_Auth
-%define         V_version 0.0.3
+%define         V_version 0.0.3.20080912
 %define         V_release 1
 
 # Package Information
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -47,6 +48,7 @@
 * IMSP
 * IP Based
 * Kerberos
+* Kolab
 * LDAP
 * Shibboleth
 * System Login
@@ -57,7 +59,6 @@
 * SASL
 * SMB
 * SQL
-* Yahoo!
 
 %prep
 	%setup -n %{V_package}-%{V_version}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Sep 2008 16:21:11 -0000	1.1
+++ Makefile	12 Sep 2008 18:46:46 -0000	1.2
@@ -15,7 +15,8 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Fri Sep 12 20:46:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 20:46:48 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Date .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Date.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080912184648.AC543600BA7@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Date.spec Makefile 
Log Message:
Complete a first draft of the new Free/Busy package. Not yet functional.

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

--- NEW FILE: ChangeLog ---
2008-09-12  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Date.spec ---
# Variables
%define         V_package Horde_Date
%define         V_version 0.0.2.20080912
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Horde Date package.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       PEAR-Date

%description 
Package for creating and manipulating dates.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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
SOURCE_0=http://files.pardus.de/kolab-sources/$(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 .



From cvs at kolab.org  Fri Sep 12 20:46:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 20:46:48 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Group Horde_Group.spec, 1.1, 1.2 Makefile,
	1.1, 1.2 
Message-ID: <20080912184648.A9F40600B89@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_Group.spec Makefile 
Log Message:
Complete a first draft of the new Free/Busy package. Not yet functional.

Index: Horde_Group.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Horde_Group.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_Group.spec	11 Sep 2008 16:25:07 -0000	1.1
+++ Horde_Group.spec	12 Sep 2008 18:46:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Horde_Group
-%define         V_version 0.0.2
+%define         V_version 0.0.2.20080912
 %define         V_release 1
 
 # Package Information
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Sep 2008 16:25:07 -0000	1.1
+++ Makefile	12 Sep 2008 18:46:46 -0000	1.2
@@ -15,7 +15,8 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Fri Sep 12 20:46:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 20:46:48 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec,1.1,1.2 
Message-ID: <20080912184648.AF63B600BB2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_FreeBusy.spec 
Log Message:
Complete a first draft of the new Free/Busy package. Not yet functional.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kolab_FreeBusy.spec	12 Sep 2008 05:20:20 -0000	1.1
+++ Kolab_FreeBusy.spec	12 Sep 2008 18:46:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Kolab_FreeBusy
-%define         V_version 0.0.1
+%define         V_version 0.0.2
 %define         V_release 1
 
 # Package Information
@@ -32,6 +32,7 @@
 PreReq:       Kolab_Format
 PreReq:       Kolab_Server
 PreReq:       Kolab_Storage
+PreReq:       Horde_Date
 PreReq:       Horde_iCalendar
 
 %description 



From cvs at kolab.org  Fri Sep 12 21:12:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 21:12:46 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Format Kolab_Format.spec, 1.5,
	1.6 Makefile, 1.1, 1.2 
Message-ID: <20080912191246.BD31F600173@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Format.spec Makefile 
Log Message:
Update to experimental version.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Kolab_Format.spec	11 Sep 2008 15:15:01 -0000	1.5
+++ Kolab_Format.spec	12 Sep 2008 19:12:44 -0000	1.6
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Kolab_Format
-%define         V_version 0.1.2
+%define         V_version 0.1.2.20080912
 %define         V_release 1
 
 # Package Information
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	18 Aug 2008 14:41:24 -0000	1.1
+++ Makefile	12 Sep 2008 19:12:44 -0000	1.2
@@ -15,7 +15,8 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Fri Sep 12 21:29:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 21:29:04 +0200 (CEST)
Subject: gunnar: server/pear/Horde_DataTree - New directory 
Message-ID: <20080912192904.9D800600B88@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_DataTree added to the repository




From cvs at kolab.org  Fri Sep 12 21:29:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 21:29:43 +0200 (CEST)
Subject: gunnar: server/pear/Horde_DataTree .cvsignore, NONE, 1.1 ChangeLog,
	NONE, 1.1 Horde_DataTree.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080912192943.0840C600BB2@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_DataTree.spec Makefile 
Log Message:
Looks like we still need to add that even though the code is practically obsolete.

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

--- NEW FILE: ChangeLog ---
2008-09-12  Gunnar Wrobel  <p at rdus.de>

	* Horde_DOM.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_DataTree.spec ---
# Variables
%define         V_package Horde_DataTree
%define         V_version 0.0.3
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   DataTree API
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Horde_Framework
PreReq:       Horde_Serialize
PreReq:       Horde_Util

%description 
None.

%prep
	%setup -n %{V_package}-%{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_package}-%{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

--- NEW FILE: Makefile ---
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 .



From cvs at kolab.org  Fri Sep 12 22:12:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Sep 2008 22:12:26 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec,1.2,1.3 
Message-ID: <20080912201226.36937600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_FreeBusy.spec 
Log Message:
Fixes the installation so that the result looks more like the old freebusy package.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kolab_FreeBusy.spec	12 Sep 2008 18:46:46 -0000	1.2
+++ Kolab_FreeBusy.spec	12 Sep 2008 20:12:24 -0000	1.3
@@ -51,9 +51,12 @@
 %build
 
 %install
+        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/log
+        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/cache
+
         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 -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 



From cvs at kolab.org  Mon Sep 15 20:44:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 15 Sep 2008 20:44:28 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2_rc1 - New directory 
Message-ID: <20080915184428.A86FE60014F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2_rc1
In directory doto:/tmp/cvs-serv25187/1.2_rc1

Log Message:
Directory /kolabrepository/server/patches/horde-webmail/1.2_rc1 added to the repository




From cvs at kolab.org  Mon Sep 15 20:58:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 15 Sep 2008 20:58:01 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2_rc1
	horde-webmail-1.2_rc1_kolab_openpkg.patch, NONE, 1.1 
Message-ID: <20080915185801.0256460014F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2_rc1
In directory doto:/tmp/cvs-serv25696

Added Files:
	horde-webmail-1.2_rc1_kolab_openpkg.patch 
Log Message:
Added the patch for the new webmail release candidate. Horde was quick this time and we now have the release available that will be the basis for the next few Kolab server years. All native ports are encouraged to switch to  horde-webmail-1.2.* as soon as possible.

--- NEW FILE: horde-webmail-1.2_rc1_kolab_openpkg.patch ---
diff -r 4910475413d3 config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
@@ -0,0 +1,115 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
[...994 lines suppressed...]
         $attr = $vcard->getAllAttributes();
         foreach ($attr as $item) {
-            if (empty($item['value'])) {
-                continue;
-            }
 
             switch ($item['name']) {
             case 'FN':
diff -r 4910475413d3 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Mon Sep 15 20:42:09 2008 +0200
+++ b/turba/lib/Driver/share.php	Mon Sep 15 20:44:06 2008 +0200
@@ -145,7 +145,7 @@
     function _deleteAll($sourceName = null)
     {
         if (is_null($sourceName)) {
-            $sourceName = $this->getContactOwner();
+            $sourceName = $this->getName();
         }
         return $this->_driver->_deleteAll($sourceName);
     }



From cvs at kolab.org  Tue Sep 16 14:45:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 14:45:10 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Date ChangeLog, 1.1, 1.2 Horde_Date.spec,
	1.1, 1.2 
Message-ID: <20080916124510.A5E4D600167@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Horde_Date.spec 
Log Message:
Update to Horde_Date-0.1.0.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Date/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	12 Sep 2008 18:46:46 -0000	1.1
+++ ChangeLog	16 Sep 2008 12:45:08 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Date.spec: Update to Horde_Date-0.1.0
+
 2008-09-12  Gunnar Wrobel  <p at rdus.de>
 
 	* Horde_DOM.spec: Added package to Kolab CVS.

Index: Horde_Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Date/Horde_Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_Date.spec	12 Sep 2008 18:46:46 -0000	1.1
+++ Horde_Date.spec	16 Sep 2008 12:45:08 -0000	1.2
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Horde_Date
-%define         V_version 0.0.2.20080912
+%define         V_version 0.1.0
 %define         V_release 1
 
 # Package Information



From cvs at kolab.org  Tue Sep 16 14:50:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 14:50:22 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Date Horde_Date.spec,1.2,1.3 
Message-ID: <20080916125022.00EF8600167@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_Date.spec 
Log Message:
Fixed source location.

Index: Horde_Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Date/Horde_Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Horde_Date.spec	16 Sep 2008 12:45:08 -0000	1.2
+++ Horde_Date.spec	16 Sep 2008 12:50:19 -0000	1.3
@@ -15,8 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}



From cvs at kolab.org  Tue Sep 16 14:50:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 14:50:41 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Group ChangeLog, 1.1, 1.2 Horde_Group.spec,
	1.2, 1.3 Makefile, 1.2, 1.3 
Message-ID: <20080916125041.6C4D9600173@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Horde_Group.spec Makefile 
Log Message:
Update to Group-0.1.0

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	11 Sep 2008 16:25:07 -0000	1.1
+++ ChangeLog	16 Sep 2008 12:50:39 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Group.spec: Updated to Group-0.1.0.
+
 2008-09-11  Gunnar Wrobel  <p at rdus.de>
 
 	* Horde_DOM.spec: Added package to Kolab CVS.

Index: Horde_Group.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Horde_Group.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Horde_Group.spec	12 Sep 2008 18:46:46 -0000	1.2
+++ Horde_Group.spec	16 Sep 2008 12:50:39 -0000	1.3
@@ -1,12 +1,13 @@
 # Variables
+%define         V_horde_package Group
 %define         V_package Horde_Group
-%define         V_version 0.0.2.20080912
+%define         V_version 0.1.0
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde User Groups System.
-URL:       http://pear.horde.org/index.php?package=%{V_package}
+URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -15,8 +16,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -35,14 +35,14 @@
 The Group:: class provides the Horde groups system.
 
 %prep
-	%setup -n %{V_package}-%{V_version}
+	%setup -n %{V_horde_package}-%{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_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_horde_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	12 Sep 2008 18:46:46 -0000	1.2
+++ Makefile	16 Sep 2008 12:50:39 -0000	1.3
@@ -1,3 +1,4 @@
+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/")
@@ -15,8 +16,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Tue Sep 16 15:00:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 15:00:59 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Auth ChangeLog, 1.1, 1.2 Horde_Auth.spec,
	1.2, 1.3 Makefile, 1.2, 1.3 
Message-ID: <20080916130059.D91EC600167@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Horde_Auth.spec Makefile 
Log Message:
Update to Auth-0.1.0

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	11 Sep 2008 16:21:11 -0000	1.1
+++ ChangeLog	16 Sep 2008 13:00:57 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Auth.spec: Updated to Auth-0.1.0.
+
 2008-09-11  Gunnar Wrobel  <p at rdus.de>
 
 	* Horde_DOM.spec: Added package to Kolab CVS.

Index: Horde_Auth.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Horde_Auth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Horde_Auth.spec	12 Sep 2008 18:46:46 -0000	1.2
+++ Horde_Auth.spec	16 Sep 2008 13:00:57 -0000	1.3
@@ -1,12 +1,13 @@
 # Variables
+%define         V_horde_package Auth
 %define         V_package Horde_Auth
-%define         V_version 0.0.3.20080912
+%define         V_version 0.1.0
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde Authentication API
-URL:       http://pear.horde.org/index.php?package=%{V_package}
+URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -15,8 +16,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -61,14 +61,14 @@
 * SQL
 
 %prep
-	%setup -n %{V_package}-%{V_version}
+	%setup -n %{V_horde_package}-%{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_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_horde_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	12 Sep 2008 18:46:46 -0000	1.2
+++ Makefile	16 Sep 2008 13:00:57 -0000	1.3
@@ -1,3 +1,4 @@
+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/")
@@ -15,8 +16,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Tue Sep 16 16:07:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 16:07:56 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0 - New directory 
Message-ID: <20080916140756.4ECFA600175@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/patches/horde-webmail/1.2.0 added to the repository




From cvs at kolab.org  Tue Sep 16 16:11:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 16:11:06 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2_rc1
	horde-webmail-1.2_rc1_kolab_openpkg.patch, 1.1, NONE 
Message-ID: <20080916141106.78218600BA7@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2_rc1
In directory doto:/tmp/cvs-serv8447/1.2_rc1

Removed Files:
	horde-webmail-1.2_rc1_kolab_openpkg.patch 
Log Message:
The _rc1 suffix hurts when packaging with RPM.

--- horde-webmail-1.2_rc1_kolab_openpkg.patch DELETED ---



From cvs at kolab.org  Tue Sep 16 16:11:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 16:11:06 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2_rc1_kolab_openpkg.patch, NONE, 1.1 
Message-ID: <20080916141106.73965600B8D@lists.intevation.de>

Author: gunnar

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

Added Files:
	horde-webmail-1.2_rc1_kolab_openpkg.patch 
Log Message:
The _rc1 suffix hurts when packaging with RPM.

--- NEW FILE: horde-webmail-1.2_rc1_kolab_openpkg.patch ---
diff -r 4910475413d3 config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
@@ -0,0 +1,115 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
[...994 lines suppressed...]
         $attr = $vcard->getAllAttributes();
         foreach ($attr as $item) {
-            if (empty($item['value'])) {
-                continue;
-            }
 
             switch ($item['name']) {
             case 'FN':
diff -r 4910475413d3 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Mon Sep 15 20:42:09 2008 +0200
+++ b/turba/lib/Driver/share.php	Mon Sep 15 20:44:06 2008 +0200
@@ -145,7 +145,7 @@
     function _deleteAll($sourceName = null)
     {
         if (is_null($sourceName)) {
-            $sourceName = $this->getContactOwner();
+            $sourceName = $this->getName();
         }
         return $this->_driver->_deleteAll($sourceName);
     }



From cvs at kolab.org  Tue Sep 16 16:12:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 16:12:06 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, NONE,
	1.1 horde-webmail-1.2_rc1_kolab_openpkg.patch, 1.1, NONE 
Message-ID: <20080916141206.A3F3B600175@lists.intevation.de>

Author: gunnar

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

Added Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Removed Files:
	horde-webmail-1.2_rc1_kolab_openpkg.patch 
Log Message:
The patch also needs to contain 1.2.0.

--- NEW FILE: horde-webmail-1.2.0_kolab_openpkg.patch ---
diff -r 4910475413d3 config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
@@ -0,0 +1,115 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
[...994 lines suppressed...]
         $attr = $vcard->getAllAttributes();
         foreach ($attr as $item) {
-            if (empty($item['value'])) {
-                continue;
-            }
 
             switch ($item['name']) {
             case 'FN':
diff -r 4910475413d3 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Mon Sep 15 20:42:09 2008 +0200
+++ b/turba/lib/Driver/share.php	Mon Sep 15 20:44:06 2008 +0200
@@ -145,7 +145,7 @@
     function _deleteAll($sourceName = null)
     {
         if (is_null($sourceName)) {
-            $sourceName = $this->getContactOwner();
+            $sourceName = $this->getName();
         }
         return $this->_driver->_deleteAll($sourceName);
     }

--- horde-webmail-1.2_rc1_kolab_openpkg.patch DELETED ---



From cvs at kolab.org  Tue Sep 16 16:26:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 16:26:12 +0200 (CEST)
Subject: gunnar: server/kolab-webclient Makefile, 1.1, 1.2 kolab-webclient.spec,
	1.2, 1.3 
Message-ID: <20080916142612.E93FC600172@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile kolab-webclient.spec 
Log Message:
Update to horde-webmail-1.2_rc1.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Aug 2008 13:57:04 -0000	1.1
+++ Makefile	16 Sep 2008 14:26:10 -0000	1.2
@@ -20,6 +20,7 @@
 
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z-]*\).*/\1/")
 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}
 
@@ -27,7 +28,7 @@
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
-PACKAGE_0=$(HORDE_NAME)-$(VERSION).tar.gz
+PACKAGE_0=$(HORDE_NAME)-$(SOURCE_VERSION).tar.gz
 SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)
 
 PACKAGE_1=passwd-h3-$(PASSWD_VERSION).tar.gz

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab-webclient.spec	18 Aug 2008 08:28:21 -0000	1.2
+++ kolab-webclient.spec	16 Sep 2008 14:26:10 -0000	1.3
@@ -4,7 +4,8 @@
 %define         V_year  2008
 %define         V_month 08
 %define         V_day   11
-%define         V_version 1.1.1
+%define         V_version 1.2.0
+%define         V_source_version 1.2-rc1
 %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}
@@ -22,7 +23,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_version}.tar.gz
+Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_source_version}.tar.gz
 Source1:        http://ftp.horde.org/pub/passwd/passwd-h3-%{V_passwd_version}.tar.gz
 Source2:        webclient-kolab-conf.template
 Source3:        webclient-kronolith-kolab-conf.template
@@ -48,11 +49,11 @@
 frontend to the Kolab server. The package is based on Horde.
 
 %prep
-	%setup -q -c %{V_horde_name}-%{V_version}
+	%setup -q -c %{V_horde_name}-%{V_source_version}
 	%setup -T -D -a 1
-	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_version}/passwd
+	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_source_version}/passwd
 
-	cd %{V_horde_name}-%{V_version}
+	cd %{V_horde_name}-%{V_source_version}
 	%patch -p1 -P 0
 	cd ..
 
@@ -65,7 +66,7 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/storage
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	cd %{V_horde_name}-%{V_version}
+	cd %{V_horde_name}-%{V_source_version}
 
 	find . -name 'test.php' | xargs rm
 
@@ -99,7 +100,7 @@
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/tmp \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage/horde.db \
-	    '%Defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php \
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/**/config/conf.php
 
 %clean



From cvs at kolab.org  Tue Sep 16 16:26:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 16 Sep 2008 16:26:50 +0200 (CEST)
Subject: gunnar: server Makefile,1.56,1.57 install-kolab.sh,1.42,1.43 
Message-ID: <20080916142650.AF7E2600175@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile install-kolab.sh 
Log Message:
Update the Makefile and the installation script for the new packages.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Makefile	12 Sep 2008 05:20:20 -0000	1.56
+++ Makefile	16 Sep 2008 14:26:48 -0000	1.57
@@ -29,24 +29,48 @@
                kolab-filter            \
                kolab-webadmin          \
 
-HORDE_PACKAGES=pear/PEAR-Auth_SASL      \
+PEAR_PACKAGES= pear/PEAR-Auth_SASL      \
                pear/PEAR-Date           \
                pear/PEAR-Log            \
                pear/PEAR-Mail           \
                pear/PEAR-Mail_Mime      \
-               pear/PEAR-Net_Socket     \
-               pear/PEAR-Net_URL        \
-               pear/PEAR-Net_Sieve      \
                pear/PEAR-Net_IMAP       \
-               pear/PEAR-Net_SMTP       \
                pear/PEAR-Net_LMTP       \
+               pear/PEAR-Net_SMTP       \
+               pear/PEAR-Net_Sieve      \
+               pear/PEAR-Net_Socket     \
+               pear/PEAR-Net_URL        \
                pear/PEAR-HTTP_Request   \
+               pear/Horde_Auth          \
+               pear/Horde_Browser       \
+               pear/Horde_CLI           \
+               pear/Horde_Cache         \
+               pear/Horde_Cipher        \
+               pear/Horde_DOM           \
+               pear/Horde_DataTree      \
+               pear/Horde_Date          \
+               pear/Horde_Framework     \
+               pear/Horde_Group         \
+               pear/Horde_History       \
+               pear/Horde_LDAP          \
+               pear/Horde_MIME          \
+               pear/Horde_NLS           \
+               pear/Horde_Perms         \
+               pear/Horde_Secret        \
+               pear/Horde_Serialize     \
+               pear/Horde_SessionObjects \
+               pear/Horde_Util          \
+               pear/Horde_iCalendar     \
+               php-kolab/Kolab_Format   \
+               php-kolab/Kolab_Server   \
+               php-kolab/Kolab_Storage  \
+               php-kolab/Kolab_Freebusy \
 
 BASE_FILES=install-kolab.sh \
            README.1st
 
 .PHONY: dist
-dist: stage base kolab horde files
+dist: stage base kolab pear files
 
 stage:
 	mkdir stage
@@ -68,15 +92,11 @@
 $(PERL_MAKEFILES): $(@:%=%.PL)
 	cd $(@:%/Makefile=%) && perl Makefile.PL
 
-.PHONY: horde
-horde: stage
-	for PKG in $(HORDE_PACKAGES);                   \
+.PHONY: pear
+pear: stage
+	for PKG in $(PEAR_PACKAGES);                   \
 	do                                              \
 	  make -C $$PKG dist || exit $$?;               \
-	  echo -e "\n==" >> stage/ChangeLog.horde;      \
-	  echo "$$PKG" >> stage/ChangeLog.horde;        \
-	  echo -e "==\n" >> stage/ChangeLog.horde;      \
-	  cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
 	done
 
 .PHONY: files
@@ -85,7 +105,7 @@
 	echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
 
 .PHONY: clean
-clean: clean-base clean-kolab clean-horde clean-stage
+clean: clean-base clean-kolab clean-pear clean-stage
 	find . | grep "~$$" | xargs rm -rf
 
 .PHONY: clean-stage
@@ -106,9 +126,9 @@
 	  make -C $$PKG clean_all || exit $$?;          \
 	done
 
-.PHONY: clean-horde
-clean-horde:
-	for PKG in $(HORDE_PACKAGES);                   \
+.PHONY: clean-pear
+clean-pear:
+	for PKG in $(PEAR_PACKAGES);                   \
 	do                                              \
 	  make -C $$PKG clean || exit $$?;              \
 	done

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- install-kolab.sh	16 Jul 2008 11:00:38 -0000	1.42
+++ install-kolab.sh	16 Sep 2008 14:26:48 -0000	1.43
@@ -21,7 +21,7 @@
 
 INSTALL=""
 
-PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin fbview-kronolith horde-kolab-client"
+PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter Kolab-Freebusy kolab-webadmin fbview-kronolith 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=""
 



From cvs at kolab.org  Thu Sep 18 11:13:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:13:59 +0200 (CEST)
Subject: gunnar: server/kolab-filter .cvsignore, 1.1, NONE ChangeLog, 1.5,
	NONE DEVELOPMENT, 1.4, NONE Makefile, 1.17,
	NONE kolab-filter.spec, 1.3, NONE 
Message-ID: <20080918091359.A07B0600BA4@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv2983

Removed Files:
	.cvsignore ChangeLog DEVELOPMENT Makefile kolab-filter.spec 
Log Message:
Removed kolab-filter which is being replace with Kolab_Filter from http://pear.horde.org.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- DEVELOPMENT DELETED ---

--- Makefile DELETED ---

--- kolab-filter.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:13:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:13:59 +0200 (CEST)
Subject: gunnar: server/kolab-filter/filter/docs AUTHORS, 1.1, NONE COPYING,
	1.1, NONE ChangeLog, 1.1, NONE INSTALL, 1.1, NONE 
Message-ID: <20080918091359.BECEA600BA4@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-filter/filter/docs
In directory doto:/tmp/cvs-serv2983/filter/docs

Removed Files:
	AUTHORS COPYING ChangeLog INSTALL 
Log Message:
Removed kolab-filter which is being replace with Kolab_Filter from http://pear.horde.org.

--- AUTHORS DELETED ---

--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- INSTALL DELETED ---



From cvs at kolab.org  Thu Sep 18 11:13:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:13:59 +0200 (CEST)
Subject: gunnar: server/kolab-filter/filter config.php, 1.15,
	NONE kolabfilter.php, 1.6, NONE kolabmailboxfilter.php, 1.5, NONE 
Message-ID: <20080918091359.A4501600BAA@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-filter/filter
In directory doto:/tmp/cvs-serv2983/filter

Removed Files:
	config.php kolabfilter.php kolabmailboxfilter.php 
Log Message:
Removed kolab-filter which is being replace with Kolab_Filter from http://pear.horde.org.

--- config.php DELETED ---

--- kolabfilter.php DELETED ---

--- kolabmailboxfilter.php DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter .cvsignore, 1.1, NONE AUTHORS,
	1.4, NONE COPYING, 1.1, NONE ChangeLog, 1.20,
	NONE package.xml.in, 1.8, NONE 
Message-ID: <20080918092009.B3AF1600BA4@lists.intevation.de>

Author: gunnar

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

Removed Files:
	.cvsignore AUTHORS COPYING ChangeLog package.xml.in 
Log Message:
Removed the Kolab_Filter code which is being replace with Kolab_Filter from http://pear.horde.org.

--- .cvsignore DELETED ---

--- AUTHORS DELETED ---

--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- package.xml.in DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests dumb_usage.phpt, 1.3,
	NONE forged_sender.phpt, 1.3, NONE forged_vacation_msg.phpt, 1.1,
	NONE incoming_line_end.phpt, 1.1, NONE load.phpt, 1.1,
	NONE outgoing.phpt, 1.2, NONE privileged_network.phpt, 1.2,
	NONE simple_in_msg.phpt, 1.3, NONE simple_out_msg.phpt, 1.3, NONE 
Message-ID: <20080918092009.D4EB0600BAA@lists.intevation.de>

Author: gunnar

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

Removed Files:
	dumb_usage.phpt forged_sender.phpt forged_vacation_msg.phpt 
	incoming_line_end.phpt load.phpt outgoing.phpt 
	privileged_network.phpt simple_in_msg.phpt simple_out_msg.phpt 
Log Message:
Removed the Kolab_Filter code which is being replace with Kolab_Filter from http://pear.horde.org.

--- dumb_usage.phpt DELETED ---

--- forged_sender.phpt DELETED ---

--- forged_vacation_msg.phpt DELETED ---

--- incoming_line_end.phpt DELETED ---

--- load.phpt DELETED ---

--- outgoing.phpt DELETED ---

--- privileged_network.phpt DELETED ---

--- simple_in_msg.phpt DELETED ---

--- simple_out_msg.phpt DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests/_data big.eml, 1.1,
	NONE empty.eml, 1.1, NONE forged.eml, 1.2, NONE simple.eml, 1.1,
	NONE test.eml, 1.1, NONE tiny.eml, 1.1, NONE vacation.eml, 1.1, NONE 
Message-ID: <20080918092009.E5BA0600BA4@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests/_data
In directory doto:/tmp/cvs-serv3322/tests/_data

Removed Files:
	big.eml empty.eml forged.eml simple.eml test.eml tiny.eml 
	vacation.eml 
Log Message:
Removed the Kolab_Filter code which is being replace with Kolab_Filter from http://pear.horde.org.

--- big.eml DELETED ---

--- empty.eml DELETED ---

--- forged.eml DELETED ---

--- simple.eml DELETED ---

--- test.eml DELETED ---

--- tiny.eml DELETED ---

--- vacation.eml DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Content.php, 1.10,
	NONE DovecotLDA.php, 1.2, NONE Filter.php, 1.8,
	NONE Incoming.php, 1.10, NONE Outlook.php, 1.5,
	NONE Resource.php, 1.12, NONE Transport.php, 1.3,
	NONE recurrence.class.php, 1.1, NONE 
Message-ID: <20080918092009.CC577600BA4@lists.intevation.de>

Author: gunnar

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

Removed Files:
	Content.php DovecotLDA.php Filter.php Incoming.php Outlook.php 
	Resource.php Transport.php recurrence.class.php 
Log Message:
Removed the Kolab_Filter code which is being replace with Kolab_Filter from http://pear.horde.org.

--- Content.php DELETED ---

--- DovecotLDA.php DELETED ---

--- Filter.php DELETED ---

--- Incoming.php DELETED ---

--- Outlook.php DELETED ---

--- Resource.php DELETED ---

--- Transport.php DELETED ---

--- recurrence.class.php DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:09 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests/tmp .cvsignore,1.1,NONE 
Message-ID: <20080918092009.EA96A600BAA@lists.intevation.de>

Author: gunnar

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

Removed Files:
	.cvsignore 
Log Message:
Removed the Kolab_Filter code which is being replace with Kolab_Filter from http://pear.horde.org.

--- .cvsignore DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:58 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin address.class.php,
	1.5, NONE administrator.class.php, 1.5, NONE auth.class.php, 1.6,
	NONE config.class.php, 1.1, NONE db.php, 1.4,
	NONE domainmaintainer.class.php, 1.6, NONE form.class.php, 1.7,
	NONE group.class.php, 1.5, NONE ldap.class.php, 1.13,
	NONE locale.php, 1.7, NONE maintainer.class.php, 1.5,
	NONE menu.php, 1.5, NONE object.php, 1.5, NONE passwd.php, 1.2,
	NONE sharedfolder.class.php, 1.6, NONE sieveutils.class.php, 1.3,
	NONE user.class.php, 1.10, NONE webadmin.class.php, 1.12, NONE 
Message-ID: <20080918092058.A1754600BAC@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin
In directory doto:/tmp/cvs-serv3527/Webadmin

Removed Files:
	address.class.php administrator.class.php auth.class.php 
	config.class.php db.php domainmaintainer.class.php 
	form.class.php group.class.php ldap.class.php locale.php 
	maintainer.class.php menu.php object.php passwd.php 
	sharedfolder.class.php sieveutils.class.php user.class.php 
	webadmin.class.php 
Log Message:
As I did not continue development here for a long time it makes more sense to remove it for now.

--- address.class.php DELETED ---

--- administrator.class.php DELETED ---

--- auth.class.php DELETED ---

--- config.class.php DELETED ---

--- db.php DELETED ---

--- domainmaintainer.class.php DELETED ---

--- form.class.php DELETED ---

--- group.class.php DELETED ---

--- ldap.class.php DELETED ---

--- locale.php DELETED ---

--- maintainer.class.php DELETED ---

--- menu.php DELETED ---

--- object.php DELETED ---

--- passwd.php DELETED ---

--- sharedfolder.class.php DELETED ---

--- sieveutils.class.php DELETED ---

--- user.class.php DELETED ---

--- webadmin.class.php DELETED ---



From cvs at kolab.org  Thu Sep 18 11:20:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:20:58 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Webadmin .cvsignore, 1.1, NONE AUTHORS,
	1.2, NONE COPYING, 1.1, NONE ChangeLog, 1.1, NONE package.xml.in,
	1.6, NONE 
Message-ID: <20080918092058.A0A04600BAB@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Webadmin
In directory doto:/tmp/cvs-serv3527

Removed Files:
	.cvsignore AUTHORS COPYING ChangeLog package.xml.in 
Log Message:
As I did not continue development here for a long time it makes more sense to remove it for now.

--- .cvsignore DELETED ---

--- AUTHORS DELETED ---

--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- package.xml.in DELETED ---



From cvs at kolab.org  Thu Sep 18 11:21:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:21:38 +0200 (CEST)
Subject: gunnar: server/php-kolab DEVELOPMENT, 1.8, NONE Makefile, 1.26,
	NONE php-kolab.spec, 1.5, NONE 
Message-ID: <20080918092138.7B402600BAF@lists.intevation.de>

Author: gunnar

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

Removed Files:
	DEVELOPMENT Makefile php-kolab.spec 
Log Message:
No mor php-kolab as we have single PEAR packages now.

--- DEVELOPMENT DELETED ---

--- Makefile DELETED ---

--- php-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:29:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:29:46 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter .cvsignore, 1.2, 1.3 ChangeLog,
	1.21, 1.22 Kolab_Filter.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080918092946.08811600167@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Kolab_Filter.spec Makefile 
Log Message:
Added the new Kolab_Filter package definition.



--- NEW FILE: Kolab_Filter.spec ---
# Variables
%define         V_package Kolab_Filter
%define         V_version 0.0.1
%define         V_release 1

# Package Information
Name:	   %{V_package}
Summary:   Postfix filters for the Kolab server.
URL:       http://pear.horde.org/index.php?package=%{V_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
# FIXME: Temporary location until I release it for real on pear.horde.org
Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes
PreReq:       Kolab_Format
PreReq:       Kolab_Server
PreReq:       Kolab_Storage
PreReq:       PEAR-Net_LMTP
PreReq:       PEAR-Net_SMTP
PreReq:       Horde_iCalendar

%description 
The filters provided by this package implement the Kolab server
resource management as well as some Kolab server sender policies.


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

%build

%install
        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/log
        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/cache

        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 -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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

--- NEW FILE: Makefile ---
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

# FIXME: Temporary location until I release it for real on pear.horde.org
SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
#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 .



From cvs at kolab.org  Thu Sep 18 11:42:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:42:26 +0200 (CEST)
Subject: gunnar: server/kolab-fbview - New directory 
Message-ID: <20080918094226.10863600167@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/kolab-fbview added to the repository




From cvs at kolab.org  Thu Sep 18 11:43:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:43:20 +0200 (CEST)
Subject: gunnar: server/kolab-fbview .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Makefile, NONE, 1.1 fbview-kolab-conf.template, NONE,
	1.1 fbview-kronolith-kolab-conf.template, NONE,
	1.1 kolab-fbview.spec, NONE, 1.1 
Message-ID: <20080918094320.C61D7600BAA@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Makefile fbview-kolab-conf.template 
	fbview-kronolith-kolab-conf.template kolab-fbview.spec 
Log Message:
Replace the server/horde/fbview-* packages with this single package.

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

--- NEW FILE: ChangeLog ---
2008-09-18  Gunnar Wrobel  <p at rdus.de>

	* kolab-webclient.spec: Added package to Kolab CVS.


--- NEW FILE: Makefile ---
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

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/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")

DATE = ${YEAR}-${MONTH}-${DAY}

PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z-]*\).*/\1/")
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}

PATCHES = http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_fbview_openpkg.patch
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")

PACKAGE_0=$(HORDE_NAME)-$(SOURCE_VERSION).tar.gz
SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)

.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 $(TEMPLATES) $(CONFIGS) ChangeLog
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"

	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
	  wget -c "$$PATCH"; done

	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)

	if [ -n "$(TEMPLATES)" ]; then              \
	  for TEMPLATE in $(TEMPLATES);             \
	  do                                        \
	    cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
	  done;                                     \
	fi

	if [ -n "$(CONFIGS)" ]; then                \
	  for CONFIG in $(CONFIGS);                 \
	  do                                        \
	    cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE);  \
	  done;                                     \
	fi

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

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

--- NEW FILE: fbview-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
$conf['cookie']['path'] = '/client';
$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
@@@if cyrus-imap@@@
$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
@@@else@@@
$conf['kolab']['imap']['server'] = '@@@local_addr@@@';
@@@endif@@@
$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
?>

--- NEW FILE: fbview-kronolith-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
?>

--- NEW FILE: kolab-fbview.spec ---
# Versions
%define         V_horde_name horde-webmail
%define         V_package kolab-fbview
%define         V_year  2008
%define         V_month 08
%define         V_day   18
%define         V_version 1.2.0
%define         V_source_version 1.2-rc1
%define         V_passwd_version 3.0.1
%define         V_date %{V_year}-%{V_month}-%{V_day}
%define         V_release %{V_year}%{V_month}%{V_day}

# Package Information
Name:		%{V_package}
Summary:	The Kolab Groupware fbview tool (based on horde)
URL:		http://www.kolab.org/
Packager:	Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:	%{V_version}
Release:	%{V_release}
Class:		JUNK
License:	GPL
Group:		MAIL
Distribution:	OpenPKG

# List of Sources
Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_source_version}.tar.gz
Source1:        fbview-kolab-conf.template
Source2:        fbview-kronolith-kolab-conf.template

# List of Patches
Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_fbview_openpkg.patch

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
PreReq:       kolabd::with_horde

AutoReq:      no
AutoReqProv:  no
#BuildArch:    noarch

%description 
Kolab fbview provides a reduced Horde webmail version that allow to
get a quick overview on the free/busy information from team members.

%prep
	%setup -q -c %{V_horde_name}-%{V_source_version}
	%setup -T -D -a 1
	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_source_version}/passwd

	cd %{V_horde_name}-%{V_source_version}
	%patch -p1 -P 0
	cd ..

%build

%install

	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/storage
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	

	cd %{V_horde_name}-%{V_source_version}

	find . -name 'test.php' | xargs rm

	find . -name '*.orig' | xargs rm

	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/

        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/storage/horde.db < scripts/sql/groupware.sql

	cd ..

	rm -rf dimp imp ingo mimp mnemo nag

	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} \
	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	

	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kolab-conf.template' \
	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kronolith-kolab-conf.template' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/kronolith/config/*.php' \
	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/turba/config/*.php' \
            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/log \
            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/tmp \
            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/storage \
            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/storage/horde.db \
	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/config/conf.php \
	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/**/config/conf.php

%clean
	rm -rf $RPM_BUILD_ROOT

%files -f files



From cvs at kolab.org  Thu Sep 18 11:59:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:38 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde .cvsignore, 1.1, NONE ChangeLog, 1.5,
	NONE Makefile, 1.4, NONE fbview-horde-conf.template, 1.8,
	NONE fbview-horde.spec, 1.22, NONE 
Message-ID: <20080918095938.B7C14600BAF@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv5130/fbview-horde

Removed Files:
	.cvsignore ChangeLog Makefile fbview-horde-conf.template 
	fbview-horde.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- fbview-horde-conf.template DELETED ---

--- fbview-horde.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:38 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith .cvsignore, 1.1, NONE ChangeLog,
	1.3, NONE Makefile, 1.6, NONE fbview-kronolith-conf.template,
	1.3, NONE fbview-kronolith.spec, 1.23, NONE 
Message-ID: <20080918095938.C2B3B600BAE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv5130/fbview-kronolith

Removed Files:
	.cvsignore ChangeLog Makefile fbview-kronolith-conf.template 
	fbview-kronolith.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- fbview-kronolith-conf.template DELETED ---

--- fbview-kronolith.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:38 +0200 (CEST)
Subject: gunnar: server/horde/horde .cvsignore, 1.1, NONE ChangeLog, 1.9,
	NONE Makefile, 1.15, NONE horde-kolab-conf.template, 1.6,
	NONE horde-kolab.spec, 1.30, NONE 
Message-ID: <20080918095938.CA885600BAF@lists.intevation.de>

Author: gunnar

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

Removed Files:
	.cvsignore ChangeLog Makefile horde-kolab-conf.template 
	horde-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-kolab-conf.template DELETED ---

--- horde-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:38 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework .cvsignore, 1.1, NONE ChangeLog,
	1.15, NONE Makefile, 1.12, NONE horde-framework-kolab.spec, 1.38,
	NONE 
Message-ID: <20080918095938.D464B600BAE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv5130/horde-framework

Removed Files:
	.cvsignore ChangeLog Makefile horde-framework-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-framework-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:38 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp .cvsignore, 1.1, NONE ChangeLog, 1.5,
	NONE Makefile, 1.7, NONE horde-imp-kolab.spec, 1.21, NONE 
Message-ID: <20080918095938.DC1BB600BAF@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv5130/horde-imp

Removed Files:
	.cvsignore ChangeLog Makefile horde-imp-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-imp-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:38 +0200 (CEST)
Subject: gunnar: server/horde README, 1.1, NONE external-horde-cvs.sh, 1.6,
	NONE external-horde.sh, 1.9, NONE 
Message-ID: <20080918095938.AF2EE600BAE@lists.intevation.de>

Author: gunnar

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

Removed Files:
	README external-horde-cvs.sh external-horde.sh 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- README DELETED ---

--- external-horde-cvs.sh DELETED ---

--- external-horde.sh DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag .cvsignore, 1.1, NONE ChangeLog, 1.5,
	NONE Makefile, 1.7, NONE horde-nag-kolab.spec, 1.21, NONE 
Message-ID: <20080918095939.0CDF0600BB1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv5130/horde-nag

Removed Files:
	.cvsignore ChangeLog Makefile horde-nag-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-nag-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith .cvsignore, 1.1, NONE ChangeLog,
	1.6, NONE Makefile, 1.7,
	NONE horde-kronolith-kolab-conf.template, 1.3,
	NONE horde-kronolith-kolab.spec, 1.25, NONE 
Message-ID: <20080918095939.0B373600BAE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv5130/horde-kronolith

Removed Files:
	.cvsignore ChangeLog Makefile 
	horde-kronolith-kolab-conf.template horde-kronolith-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-kronolith-kolab-conf.template DELETED ---

--- horde-kronolith-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client .cvsignore, 1.1,
	NONE ChangeLog, 1.3, NONE Makefile, 1.5,
	NONE horde-kolab-client.spec, 1.13, NONE 
Message-ID: <20080918095939.0D47C600BB3@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv5130/horde-kolab-client

Removed Files:
	.cvsignore ChangeLog Makefile horde-kolab-client.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-kolab-client.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo .cvsignore, 1.1, NONE ChangeLog, 1.7,
	NONE Makefile, 1.7, NONE horde-mnemo-kolab.spec, 1.23, NONE 
Message-ID: <20080918095939.0C0C3600BB0@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv5130/horde-mnemo

Removed Files:
	.cvsignore ChangeLog Makefile horde-mnemo-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-mnemo-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd .cvsignore, 1.1, NONE ChangeLog, 1.5,
	NONE Makefile, 1.7, NONE horde-passwd-kolab.spec, 1.18, NONE 
Message-ID: <20080918095939.1D8AF600BB5@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv5130/horde-passwd

Removed Files:
	.cvsignore ChangeLog Makefile horde-passwd-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-passwd-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/php-channel-horde .cvsignore, 1.1, NONE Makefile,
	1.1, NONE php-channel-horde.spec, 1.1, NONE 
Message-ID: <20080918095939.4D1A0600BB6@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/php-channel-horde
In directory doto:/tmp/cvs-serv5130/php-channel-horde

Removed Files:
	.cvsignore Makefile php-channel-horde.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- Makefile DELETED ---

--- php-channel-horde.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba .cvsignore, 1.1, NONE ChangeLog, 1.8,
	NONE Makefile, 1.7, NONE horde-turba-kolab.spec, 1.26, NONE 
Message-ID: <20080918095939.4CABB600BAF@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv5130/horde-turba

Removed Files:
	.cvsignore ChangeLog Makefile horde-turba-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-turba-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 11:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 11:59:39 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo .cvsignore, 1.1, NONE ChangeLog, 1.4,
	NONE Makefile, 1.7, NONE horde-ingo-kolab.spec, 1.20, NONE 
Message-ID: <20080918095939.1C710600BB4@lists.intevation.de>

Author: gunnar

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

Removed Files:
	.cvsignore ChangeLog Makefile horde-ingo-kolab.spec 
Log Message:
The horde packages have been replaced with kolab-webclient and kolab-fbview.

--- .cvsignore DELETED ---

--- ChangeLog DELETED ---

--- Makefile DELETED ---

--- horde-ingo-kolab.spec DELETED ---



From cvs at kolab.org  Thu Sep 18 12:05:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 12:05:49 +0200 (CEST)
Subject: gunnar: server Makefile, 1.57, 1.58 install-kolab.sh, 1.43,
	1.44 release-notes.txt, 1.314, 1.315 
Message-ID: <20080918100549.97D7D600BA4@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile install-kolab.sh release-notes.txt 
Log Message:
Fixed Makefile and install-kolab.sh for recent package changes. Updated release-notes. The layout for Kolab-Server-2.2.1 has been completed. Time for debugging.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Makefile	16 Sep 2008 14:26:48 -0000	1.57
+++ Makefile	18 Sep 2008 10:05:47 -0000	1.58
@@ -23,10 +23,8 @@
 PERL_MAKEFILES=$(PERL_PACKAGES:%=%/Makefile)
 
 KOLAB_PACKAGES=perl-kolab              \
-               php-kolab               \
                kolabconf               \
                kolabd                  \
-               kolab-filter            \
                kolab-webadmin          \
 
 PEAR_PACKAGES= pear/PEAR-Auth_SASL      \
@@ -65,6 +63,7 @@
                php-kolab/Kolab_Server   \
                php-kolab/Kolab_Storage  \
                php-kolab/Kolab_Freebusy \
+               php-kolab/Kolab_Filter   \
 
 BASE_FILES=install-kolab.sh \
            README.1st

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- install-kolab.sh	16 Sep 2008 14:26:48 -0000	1.43
+++ install-kolab.sh	18 Sep 2008 10:05:47 -0000	1.44
@@ -21,7 +21,7 @@
 
 INSTALL=""
 
-PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter Kolab-Freebusy kolab-webadmin fbview-kronolith kolab-webclient"
+PACKAGES="openpkg-tools openldap postfix kolabd Kolab_Filter Kolab_FreeBusy 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=""
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- release-notes.txt	12 Sep 2008 05:20:20 -0000	1.314
+++ release-notes.txt	18 Sep 2008 10:05:47 -0000	1.315
@@ -58,10 +58,22 @@
 	kolab/issue2928 (gmp-4.2.2-20080101 does not compile on Debian
 	                 lenny/amd64)
 
+    - fbview-*
+
+	Replaced with the kolab-fbview package.
+
+    - horde-*
+
+	Replaced with the kolab-webclient package.
+
     - kolab-freebusy-2.2.?-2008????
 
 	Replaced with upstream Kolab_FreeBusy (http://pear.horde.org/index.php?package=Kolab_FreeBusy)
 
+    - kolab-filter-2.2.?-2008????
+
+	Replaced with upstream Kolab_Filter (http://pear.horde.org/index.php?package=Kolab_Filter)
+
     - kolabd-2.2.?-2008????
 
 	kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.
@@ -105,7 +117,7 @@
 
     - php-kolab-2.2.1.rc1-2008????
 
-	Added Dovecot LDA backend.
+      Removed package which has been replaced by the Kolab_Filter and the Kolab_FreeBusy package.
 
 
 Changes between 2.2-rc-3 and 2.2.0



From cvs at kolab.org  Thu Sep 18 13:01:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 13:01:25 +0200 (CEST)
Subject: gunnar: server cvs-kolab.sh,1.23,1.24 
Message-ID: <20080918110125.A7803600BAC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	cvs-kolab.sh 
Log Message:
Uncomment the package update. It should work again.

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cvs-kolab.sh	15 Aug 2008 10:09:40 -0000	1.23
+++ cvs-kolab.sh	18 Sep 2008 11:01:23 -0000	1.24
@@ -96,7 +96,7 @@
 	cvs -q update -P -d
     fi
     chown -R "${KOLAB_DEV_USER}:" "/${KOLAB_DEV_USER}/CVS"
-#    su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not installing! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
+    su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not installing! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
 
     cd "${KOLAB_PACKAGES}/source-original"
 



From cvs at kolab.org  Thu Sep 18 13:01:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 13:01:57 +0200 (CEST)
Subject: gunnar: server/gmp .cvsignore,NONE,1.1 
Message-ID: <20080918110157.32CAF600BAE@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore 
Log Message:
Ignore RPMs here.

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



From cvs at kolab.org  Thu Sep 18 13:13:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 13:13:00 +0200 (CEST)
Subject: gunnar: server/apache-php Makefile,1.2,1.3 
Message-ID: <20080918111300.1DC12600BB1@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Forgot to update the release date here.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	20 May 2008 17:11:08 -0000	1.2
+++ Makefile	18 Sep 2008 11:12:58 -0000	1.3
@@ -16,8 +16,8 @@
 
 PACKAGE=apache-php
 VERSION=5.2.6
-RELEASE=20080514
-KOLABRELEASE=20080514_kolab
+RELEASE=20080818
+KOLABRELEASE=20080818_kolab
 
 PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \
         $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch



From cvs at kolab.org  Thu Sep 18 13:13:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 13:13:49 +0200 (CEST)
Subject: gunnar: server/apache-php Makefile,1.3,1.4 
Message-ID: <20080918111349.BE818600BB3@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Forgot to update the release date here.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	18 Sep 2008 11:12:58 -0000	1.3
+++ Makefile	18 Sep 2008 11:13:47 -0000	1.4
@@ -16,7 +16,7 @@
 
 PACKAGE=apache-php
 VERSION=5.2.6
-RELEASE=20080818
+RELEASE=20080514
 KOLABRELEASE=20080818_kolab
 
 PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \



From cvs at kolab.org  Thu Sep 18 13:13:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 13:13:49 +0200 (CEST)
Subject: gunnar: server/php Makefile,1.13,1.14 
Message-ID: <20080918111349.C1405600BB4@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Forgot to update the release date here.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	20 May 2008 17:11:08 -0000	1.13
+++ Makefile	18 Sep 2008 11:13:47 -0000	1.14
@@ -17,7 +17,7 @@
 PACKAGE=php
 VERSION=5.2.6
 RELEASE=20080514
-KOLABRELEASE=20080514_kolab
+KOLABRELEASE=20080818_kolab
 
 PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \
         $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/fbview-horde
	HK-GW-Config_fbview-horde-3.2-rc3.patch, 1.2, NONE 
Message-ID: <20080918145411.27277600BB4@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-horde
In directory doto:/tmp/cvs-serv14981/3.2-rc3/fbview-horde

Removed Files:
	HK-GW-Config_fbview-horde-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_fbview-horde-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3 README,1.2,NONE 
Message-ID: <20080918145411.2614D600BB1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3
In directory doto:/tmp/cvs-serv14981/3.2-rc3

Removed Files:
	README 
Log Message:
These horde patches are obsolete.

--- README DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/fbview-kronolith
	HK-GW-Config_fbview-kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch, 1.1,
	NONE HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch, 1.2,
	NONE HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch,
	1.1, NONE 
Message-ID: <20080918145411.2A814600BB8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith
In directory doto:/tmp/cvs-serv14981/3.2-rc3/fbview-kronolith

Removed Files:
	HK-GW-Config_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch 
	HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch 
	HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_fbview-kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch DELETED ---

--- HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch DELETED ---

--- HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/framework
	HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.3,
	NONE HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch, 1.1,
	NONE HK-GW-Freebusy_free_events_framework-3.2-rc3.patch, 1.1,
	NONE HK-GW-LDAP_user_alias_framework-3.2-rc3.patch, 1.1,
	NONE HK-GW-xfb_correction_framework-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.30621600BBA@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/framework
In directory doto:/tmp/cvs-serv14981/3.2-rc3/framework

Removed Files:
	HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 
	HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch 
	HK-GW-Freebusy_free_events_framework-3.2-rc3.patch 
	HK-GW-LDAP_user_alias_framework-3.2-rc3.patch 
	HK-GW-xfb_correction_framework-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch DELETED ---

--- HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch DELETED ---

--- HK-GW-Freebusy_free_events_framework-3.2-rc3.patch DELETED ---

--- HK-GW-LDAP_user_alias_framework-3.2-rc3.patch DELETED ---

--- HK-GW-xfb_correction_framework-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/horde
	HK-GW-Config_horde-3.2-rc3.patch, 1.1,
	NONE kolab_issue2831.patch, 1.2, NONE 
Message-ID: <20080918145411.32B44600BBB@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/horde
In directory doto:/tmp/cvs-serv14981/3.2-rc3/horde

Removed Files:
	HK-GW-Config_horde-3.2-rc3.patch kolab_issue2831.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_horde-3.2-rc3.patch DELETED ---

--- kolab_issue2831.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/mnemo
	HK-GW-Config_mnemo-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.432E7600BBF@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/mnemo
In directory doto:/tmp/cvs-serv14981/3.2-rc3/mnemo

Removed Files:
	HK-GW-Config_mnemo-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_mnemo-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/nag
	HK-GW-Config_nag-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.47F6560C4A1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/nag
In directory doto:/tmp/cvs-serv14981/3.2-rc3/nag

Removed Files:
	HK-GW-Config_nag-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_nag-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/imp
	HK-GW-Config_imp-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.353DA600BBC@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/imp
In directory doto:/tmp/cvs-serv14981/3.2-rc3/imp

Removed Files:
	HK-GW-Config_imp-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_imp-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/kronolith
	HK-GW-Config_kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-getid_kronolith-3.2-rc3.patch, 1.1,
	NONE HK-GW-notice_fix_kronolith-3.2-rc3.patch, 1.2,
	NONE HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch, 1.1,
	NONE HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.3E6DF600BBE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/kronolith
In directory doto:/tmp/cvs-serv14981/3.2-rc3/kronolith

Removed Files:
	HK-GW-Config_kronolith-3.2-rc3.patch 
	HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch 
	HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch 
	HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch 
	HK-GW-getid_kronolith-3.2-rc3.patch 
	HK-GW-notice_fix_kronolith-3.2-rc3.patch 
	HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch 
	HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-getid_kronolith-3.2-rc3.patch DELETED ---

--- HK-GW-notice_fix_kronolith-3.2-rc3.patch DELETED ---

--- HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch DELETED ---

--- HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/turba
	HK-GW-Config_turba-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch, 1.1,
	NONE HK-GW-Fix_share_id_change_turba-3.2-rc3.patch, 1.1,
	NONE HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch, 1.1,
	NONE kolab_issue2832.patch, 1.1, NONE 
Message-ID: <20080918145411.4FBD660C4A5@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/turba
In directory doto:/tmp/cvs-serv14981/3.2-rc3/turba

Removed Files:
	HK-GW-Config_turba-3.2-rc3.patch 
	HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch 
	HK-GW-Fix_share_id_change_turba-3.2-rc3.patch 
	HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch 
	kolab_issue2832.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_turba-3.2-rc3.patch DELETED ---

--- HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch DELETED ---

--- HK-GW-Fix_share_id_change_turba-3.2-rc3.patch DELETED ---

--- HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch DELETED ---

--- kolab_issue2832.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/ingo
	HK-GW-Config_ingo-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.37899600BBD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/ingo
In directory doto:/tmp/cvs-serv14981/3.2-rc3/ingo

Removed Files:
	HK-GW-Config_ingo-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_ingo-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:54:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:54:11 +0200 (CEST)
Subject: gunnar: server/patches/horde/3.2-rc3/passwd
	HK-GW-Config_passwd-3.2-rc3.patch, 1.1, NONE 
Message-ID: <20080918145411.4803660C4A2@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/passwd
In directory doto:/tmp/cvs-serv14981/3.2-rc3/passwd

Removed Files:
	HK-GW-Config_passwd-3.2-rc3.patch 
Log Message:
These horde patches are obsolete.

--- HK-GW-Config_passwd-3.2-rc3.patch DELETED ---



From cvs at kolab.org  Thu Sep 18 16:55:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 16:55:22 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_openpkg.patch, 1.1, 1.2 
Message-ID: <20080918145522.864EC600BBA@lists.intevation.de>

Author: gunnar

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

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Some SyncML fixes and minor configuration updates.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-webmail-1.2.0_kolab_openpkg.patch	16 Sep 2008 14:12:04 -0000	1.1
+++ horde-webmail-1.2.0_kolab_openpkg.patch	18 Sep 2008 14:55:20 -0000	1.2
@@ -1,15 +1,17 @@
-diff -r 4910475413d3 config/conf.php
+diff -r 4c946a52a973 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
++++ b/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -0,0 +1,115 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-+// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
++// $Horde: horde/config/conf.xml,v 1.74.2.76 2008/09/07 04:23:44 chuck Exp $
 +$conf['vhosts'] = false;
 +$conf['debug_level'] = E_ALL;
 +$conf['max_exec_time'] = 0;
 +$conf['compress_pages'] = true;
++$conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
 +$conf['umask'] = 077;
++$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
 +$conf['use_ssl'] = 2;
 +$conf['server']['name'] = $_SERVER['SERVER_NAME'];
 +$conf['server']['port'] = $_SERVER['SERVER_PORT'];
@@ -63,12 +65,11 @@
 +$conf['cache']['driver'] = 'file';
 +$conf['lock']['driver'] = 'none';
 +$conf['token']['driver'] = 'none';
-+$conf['mailer']['params']['port'] = 25;
 +$conf['mailer']['params']['host'] = 'localhost';
++$conf['mailer']['params']['port'] = 25;
 +$conf['mailer']['params']['auth'] = true;
 +$conf['mailer']['type'] = 'smtp';
 +$conf['mailformat']['brokenrfc2231'] = false;
-+$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
 +$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../storage';
 +$conf['vfs']['type'] = 'file';
 +$conf['sessionhandler']['type'] = 'none';
@@ -82,7 +83,6 @@
 +$conf['menu']['apps'] = array();
 +$conf['menu']['always'] = false;
 +$conf['menu']['links']['help'] = 'all';
-+$conf['menu']['links']['help_about'] = true;
 +$conf['menu']['links']['options'] = 'authenticated';
 +$conf['menu']['links']['problem'] = 'all';
 +$conf['menu']['links']['login'] = 'all';
@@ -117,14 +117,17 @@
 +if (file_exists(dirname(__FILE__) . '/kolab.php')) {
 +  require_once(dirname(__FILE__) . '/kolab.php');
 +}
-diff -r 4910475413d3 config/kolab.php
+diff -r 4c946a52a973 config/kolab.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php	Mon Sep 15 20:44:06 2008 +0200
-@@ -0,0 +1,34 @@
++++ b/config/kolab.php	Thu Sep 18 16:48:32 2008 +0200
+@@ -0,0 +1,37 @@
 +<?php
 +/* Add additional admins here */
 +$conf['auth']['admins'] = array('manager');
 +
++/* Add your servers random secret key here */
++$conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
++
 +/* Add your horde vhost hostname here */
 +$conf['cookie']['domain'] = 'webmail.example.com';
 +
@@ -155,9 +158,9 @@
 +/* Primary mail domain of your Kolab server */
 +$conf['kolab']['imap']['maildomain'] = 'example.com';
 +?>
-diff -r 4910475413d3 config/prefs.php
---- a/config/prefs.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/config/prefs.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 config/prefs.php
+--- a/config/prefs.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/config/prefs.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -357,7 +357,7 @@
  
  // UI theme
@@ -167,9 +170,9 @@
      'locked' => false,
      'shared' => true,
      'type' => 'select',
-diff -r 4910475413d3 imp/config/conf.php
---- a/imp/config/conf.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/imp/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 imp/config/conf.php
+--- a/imp/config/conf.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/imp/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -1,7 +1,8 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -180,7 +183,7 @@
  $conf['utils']['gnupg_keyserver'] = array('pgp.mit.edu');
  $conf['utils']['gnupg_timeout'] = 10;
  $conf['menu']['apps'] = array();
-@@ -52,8 +53,8 @@
+@@ -52,16 +53,12 @@
  $conf['hooks']['signature'] = false;
  $conf['hooks']['trailer'] = false;
  $conf['hooks']['fetchmail_filter'] = false;
@@ -191,9 +194,18 @@
  $conf['hooks']['spam_bounce'] = false;
  $conf['hooks']['msglist_format'] = false;
  $conf['maillog']['use_maillog'] = true;
-diff -r 4910475413d3 imp/config/servers.php
---- a/imp/config/servers.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/imp/config/servers.php	Mon Sep 15 20:44:06 2008 +0200
+-$conf['sentmail']['params']['threshold'] = 60;
+-$conf['sentmail']['params']['limit_period'] = 24;
+-$conf['sentmail']['params']['table'] = 'imp_sentmail';
+-$conf['sentmail']['params']['driverconfig'] = 'horde';
+-$conf['sentmail']['driver'] = 'sql';
++$conf['sentmail']['driver'] = 'none';
+ $conf['tasklist']['use_tasklist'] = true;
+ $conf['notepad']['use_notepad'] = true;
+ /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+diff -r 4c946a52a973 imp/config/servers.php
+--- a/imp/config/servers.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/imp/config/servers.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -226,10 +226,30 @@
  
  /* Example configurations: */
@@ -232,9 +244,9 @@
 +        ),
 +    );
 +}
-diff -r 4910475413d3 ingo/config/backends.php
---- a/ingo/config/backends.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/ingo/config/backends.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 ingo/config/backends.php
+--- a/ingo/config/backends.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/ingo/config/backends.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -40,6 +40,8 @@
   *               give them permissions to do so. If you want to enable this
   *               feature, you need to set this parameter to true.
@@ -253,9 +265,9 @@
  /* Kolab Example (using Sieve) */
  if ($GLOBALS['conf']['kolab']['enabled']) {
      require_once 'Horde/Kolab.php';
-diff -r 4910475413d3 ingo/config/conf.php
---- a/ingo/config/conf.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/ingo/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 ingo/config/conf.php
+--- a/ingo/config/conf.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/ingo/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -2,8 +2,7 @@
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
  // $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $
@@ -266,9 +278,9 @@
  $conf['storage']['maxblacklist'] = 0;
  $conf['storage']['maxwhitelist'] = 0;
  $conf['rules']['userheader'] = true;
-diff -r 4910475413d3 kronolith/config/conf.php
---- a/kronolith/config/conf.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/kronolith/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 kronolith/config/conf.php
+--- a/kronolith/config/conf.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/kronolith/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -1,12 +1,11 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -294,9 +306,9 @@
 +if (file_exists(dirname(__FILE__) . '/kolab.php')) {
 +  require_once(dirname(__FILE__) . '/kolab.php');
 +}
-diff -r 4910475413d3 kronolith/config/kolab.php
+diff -r 4c946a52a973 kronolith/config/kolab.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/config/kolab.php	Mon Sep 15 20:44:06 2008 +0200
++++ b/kronolith/config/kolab.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -0,0 +1,10 @@
 +<?php
 +/* Primary mail domain of your Kolab server */
@@ -308,9 +320,63 @@
 +/* The email address of your sys admin */
 +$conf['reminder']['from_addr'] = 'hostmaster at example.com';
 +?>
-diff -r 4910475413d3 lib/Horde/Prefs/kolab.php
---- a/lib/Horde/Prefs/kolab.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/Horde/Prefs/kolab.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 kronolith/lib/Driver/kolab.php
+--- a/kronolith/lib/Driver/kolab.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/kronolith/lib/Driver/kolab.php	Thu Sep 18 16:48:32 2008 +0200
+@@ -62,6 +62,7 @@
+             $this->_calendar = $calendar;
+             $this->_wrapper->reset();
+         }
++        $this->_wrapper->open($calendar);
+ 
+         return true;
+     }
+@@ -214,6 +215,10 @@
+     {
+         $this->_driver = &$driver;
+         $this->_kolab = &$driver->_kolab;
++    }
++
++    function open($calendar)
++    {
+     }
+ }
+ 
+@@ -990,6 +995,11 @@
+         $this->reset();
+     }
+ 
++    function open($calendar)
++    {
++        $this->synchronize();
++    }
++
+     /**
+      * Reset internal variable on share change
+      */
+diff -r 4c946a52a973 kronolith/lib/api.php
+--- a/kronolith/lib/api.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/kronolith/lib/api.php	Thu Sep 18 16:48:32 2008 +0200
+@@ -694,6 +694,7 @@
+ function _kronolith_listBy($action, $timestamp, $calendar = null)
+ {
+     require_once dirname(__FILE__) . '/base.php';
++    global $kronolith_driver;
+ 
+     if (empty($calendar)) {
+         $calendar = Kronolith::getDefaultCalendar();
+@@ -703,6 +704,8 @@
+                           Kronolith::listCalendars(false, PERMS_READ))) {
+         return PEAR::raiseError(_("Permission Denied"));
+     }
++
++    $kronolith_driver->open($calendar);
+ 
+     $history = &Horde_History::singleton();
+     $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
+diff -r 4c946a52a973 lib/Horde/Prefs/kolab.php
+--- a/lib/Horde/Prefs/kolab.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/Horde/Prefs/kolab.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -1,5 +1,6 @@
  <?php
  
@@ -328,9 +394,9 @@
      }
  
  }
-diff -r 4910475413d3 lib/Horde/iCalendar.php
---- a/lib/Horde/iCalendar.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/Horde/iCalendar.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/Horde/iCalendar.php
+--- a/lib/Horde/iCalendar.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/Horde/iCalendar.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -151,6 +151,41 @@
                  'value'     => $value,
                  'values'    => $values
@@ -373,9 +439,9 @@
          }
      }
  
-diff -r 4910475413d3 lib/SyncML/Backend.php
---- a/lib/SyncML/Backend.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/SyncML/Backend.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/SyncML/Backend.php
+--- a/lib/SyncML/Backend.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/SyncML/Backend.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -567,6 +567,24 @@
      }
  
@@ -401,9 +467,9 @@
       * Authenticates the user at the backend.
       *
       * For some types of authentications (notably auth:basic) the username
-diff -r 4910475413d3 lib/SyncML/Backend/Horde.php
---- a/lib/SyncML/Backend/Horde.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/SyncML/Backend/Horde.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/SyncML/Backend/Horde.php
+--- a/lib/SyncML/Backend/Horde.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/SyncML/Backend/Horde.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -204,6 +204,11 @@
                                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
                  continue;
@@ -512,9 +578,9 @@
          return true;
      }
  
-diff -r 4910475413d3 lib/SyncML/Constants.php
---- a/lib/SyncML/Constants.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/SyncML/Constants.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/SyncML/Constants.php
+--- a/lib/SyncML/Constants.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/SyncML/Constants.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -66,7 +66,7 @@
  define('RESPONSE_PARTIAL_CONTENT', 206);
  define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -524,9 +590,9 @@
  define('RESPONSE_DELETE_WITHOUT_ARCHIVE', 210);
  define('RESPONSE_ITEM_NO_DELETED', 211);
  define('RESPONSE_AUTHENTICATION_ACCEPTED', 212);
-diff -r 4910475413d3 lib/SyncML/Device.php
---- a/lib/SyncML/Device.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/SyncML/Device.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/SyncML/Device.php
+--- a/lib/SyncML/Device.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/SyncML/Device.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -159,12 +159,81 @@
              SYNCML_LOGFILE_DATA,
              "\nInput received from client ($contentType):\n$content\n");
@@ -609,9 +675,9 @@
  
      /**
       * Converts the content from the backend to a format suitable for the
-diff -r 4910475413d3 lib/SyncML/Sync.php
---- a/lib/SyncML/Sync.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/SyncML/Sync.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/SyncML/Sync.php
+--- a/lib/SyncML/Sync.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/SyncML/Sync.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -283,7 +283,13 @@
              }
          } elseif ($item->elementType == 'Delete') {
@@ -668,9 +734,9 @@
              } else {
                  $backend->logMessage($suid->message, __FILE__, __LINE__, PEAR_LOG_DEBUG);
  
-diff -r 4910475413d3 lib/core.php
---- a/lib/core.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/lib/core.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 lib/core.php
+--- a/lib/core.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/lib/core.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -31,6 +31,12 @@
   * include_path, you must add an ini_set() call here to add their location to
   * the include_path. */
@@ -684,15 +750,15 @@
  
  /* PEAR base class. */
  include_once 'PEAR.php';
-diff -r 4910475413d3 log/.htaccess
+diff -r 4c946a52a973 log/.htaccess
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess	Mon Sep 15 20:44:06 2008 +0200
++++ b/log/.htaccess	Thu Sep 18 16:48:32 2008 +0200
 @@ -0,0 +1,1 @@
 +Deny from All
 \ No newline at end of file
-diff -r 4910475413d3 mnemo/config/conf.php
---- a/mnemo/config/conf.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/mnemo/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 mnemo/config/conf.php
+--- a/mnemo/config/conf.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/mnemo/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -1,9 +1,8 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -705,9 +771,9 @@
  $conf['menu']['print'] = true;
  $conf['menu']['import_export'] = true;
  $conf['menu']['apps'] = array();
-diff -r 4910475413d3 nag/config/conf.php
---- a/nag/config/conf.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/nag/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 nag/config/conf.php
+--- a/nag/config/conf.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/nag/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -1,9 +1,7 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -719,21 +785,21 @@
  $conf['menu']['print'] = true;
  $conf['menu']['import_export'] = true;
  $conf['menu']['apps'] = array();
-diff -r 4910475413d3 storage/.htaccess
+diff -r 4c946a52a973 storage/.htaccess
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess	Mon Sep 15 20:44:06 2008 +0200
++++ b/storage/.htaccess	Thu Sep 18 16:48:32 2008 +0200
 @@ -0,0 +1,1 @@
 +Deny from All
 \ No newline at end of file
-diff -r 4910475413d3 tmp/.htaccess
+diff -r 4c946a52a973 tmp/.htaccess
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/tmp/.htaccess	Mon Sep 15 20:44:06 2008 +0200
++++ b/tmp/.htaccess	Thu Sep 18 16:48:32 2008 +0200
 @@ -0,0 +1,1 @@
 +Deny from All
 \ No newline at end of file
-diff -r 4910475413d3 turba/config/conf.php
---- a/turba/config/conf.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/turba/config/conf.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 turba/config/conf.php
+--- a/turba/config/conf.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/turba/config/conf.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -3,8 +3,8 @@
  // $Horde: turba/config/conf.xml,v 1.6.2.6 2008/06/25 15:52:54 jan Exp $
  $conf['menu']['import_export'] = true;
@@ -745,9 +811,9 @@
  $conf['comments']['allow'] = true;
  $conf['documents']['type'] = 'horde';
  /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
-diff -r 4910475413d3 turba/config/sources.php
---- a/turba/config/sources.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/turba/config/sources.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 turba/config/sources.php
+--- a/turba/config/sources.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/turba/config/sources.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -154,6 +154,8 @@
   * Here are some example configurations:
   */
@@ -1006,9 +1072,9 @@
  /**
   * An address book based on message recipients. This will always be private and
   * read-only. The address book content is provided by the
-diff -r 4910475413d3 turba/lib/Driver.php
---- a/turba/lib/Driver.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/turba/lib/Driver.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 turba/lib/Driver.php
+--- a/turba/lib/Driver.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/turba/lib/Driver.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -1453,9 +1453,6 @@
          $hash = array();
          $attr = $vcard->getAllAttributes();
@@ -1019,9 +1085,20 @@
  
              switch ($item['name']) {
              case 'FN':
-diff -r 4910475413d3 turba/lib/Driver/share.php
---- a/turba/lib/Driver/share.php	Mon Sep 15 20:42:09 2008 +0200
-+++ b/turba/lib/Driver/share.php	Mon Sep 15 20:44:06 2008 +0200
+diff -r 4c946a52a973 turba/lib/Driver/kolab.php
+--- a/turba/lib/Driver/kolab.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/turba/lib/Driver/kolab.php	Thu Sep 18 16:48:32 2008 +0200
+@@ -56,6 +56,7 @@
+         }
+ 
+         $this->_wrapper = &new $wrapper($this->name, $this->_kolab);
++        $this->_wrapper->connect();        
+     }
+ 
+     /**
+diff -r 4c946a52a973 turba/lib/Driver/share.php
+--- a/turba/lib/Driver/share.php	Thu Sep 18 16:48:20 2008 +0200
++++ b/turba/lib/Driver/share.php	Thu Sep 18 16:48:32 2008 +0200
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {



From cvs at kolab.org  Thu Sep 18 20:56:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 20:56:51 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_fbview_openpkg.patch, NONE, 1.1 
Message-ID: <20080918185651.01457600165@lists.intevation.de>

Author: gunnar

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

Added Files:
	horde-webmail-1.2.0_kolab_fbview_openpkg.patch 
Log Message:
Add a first version of the fbview patch.

--- NEW FILE: horde-webmail-1.2.0_kolab_fbview_openpkg.patch ---
diff -r 85d33de56004 kronolith/attendees.php
--- a/kronolith/attendees.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/attendees.php	Thu Sep 18 20:56:25 2008 +0200
@@ -178,6 +178,16 @@
     $attendees = array();
     $_SESSION['kronolith']['attendees'] = $attendees;
     break;
+
+case 'save':
+    if (empty($attendees)) {
+        break;
+    }
+    $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+    $savedattlist[] = array_keys($attendees);
+    $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    $notification->push(_('Successfully saved attendee list'), 'horde.success');
+    break;
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -264,6 +274,15 @@
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
+
+if ($browser->hasFeature('javascript')) {
+    Horde::addScriptFile('open_savedattlist_win.js');
+    $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+    $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
 $notification->notify(array('status'));
 require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/create.php
--- a/kronolith/calendars/create.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/create.php	Thu Sep 18 20:56:25 2008 +0200
@@ -39,6 +39,6 @@
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'create.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/delete.php
--- a/kronolith/calendars/delete.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/delete.php	Thu Sep 18 20:56:25 2008 +0200
@@ -56,6 +56,6 @@
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'delete.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/edit.php	Thu Sep 18 20:56:25 2008 +0200
@@ -53,8 +53,12 @@
 
 $vars->set('name', $calendar->get('name'));
 $vars->set('description', $calendar->get('desc'));
+$params = @unserialize($calendar->get('params'));
+if (isset($params['fbrelevance'])) {
+    $vars->set('fbrelevance', $params['fbrelevance']);
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/index.php
--- a/kronolith/calendars/index.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/index.php	Thu Sep 18 20:56:25 2008 +0200
@@ -73,6 +73,6 @@
 Horde::addScriptFile('tables.js', 'kronolith', true);
 $title = _("Manage Calendars");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 require KRONOLITH_TEMPLATES . '/calendar_list.php';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/remote_edit.php
--- a/kronolith/calendars/remote_edit.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/remote_edit.php	Thu Sep 18 20:56:25 2008 +0200
@@ -68,6 +68,6 @@
 $vars->set('password', $password);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/remote_subscribe.php
--- a/kronolith/calendars/remote_subscribe.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/remote_subscribe.php	Thu Sep 18 20:56:25 2008 +0200
@@ -39,6 +39,6 @@
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_subscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/calendars/remote_unsubscribe.php
--- a/kronolith/calendars/remote_unsubscribe.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/calendars/remote_unsubscribe.php	Thu Sep 18 20:56:25 2008 +0200
@@ -56,6 +56,6 @@
 $vars->set('url', $calendar['url']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_unsubscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/config/prefs.php.dist	Thu Sep 18 20:56:25 2008 +0200
@@ -457,6 +457,14 @@
     'shared' => false,
     'type' => 'implicit'
 );
+
+$_prefs['saved_attendee_list'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit',
+    'desc' => _("A saved list of attendees")
+);
 $_prefs['event_colors'] = array(
     'value' => '',
     'locked' => false,
diff -r 85d33de56004 kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/lib/FBView.php	Thu Sep 18 20:56:25 2008 +0200
@@ -87,7 +87,7 @@
             $rows = '';
             foreach ($this->_requiredMembers as $member) {
                 $member->simplify();
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -109,7 +109,7 @@
             $rows = '';
             foreach ($this->_optionalMembers as $member) {
                 $member->simplify();
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -124,6 +124,9 @@
             $template->set('legend', '');
             $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html');
         }
+
+	//**********
+	//This has been disabled in kolab-fbview. Make this optional?
 
         // Possible meeting times.
         $optimal->setAttribute('ORGANIZER', _("All Attendees"));
@@ -146,6 +149,9 @@
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
+
+	//This has been disabled in kolab-fbview. Make this optional?
+	//**********
 
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
@@ -215,7 +221,7 @@
         return $instances[$view];
     }
 
-    function _getBlocks($member, $periods, $blockfile, $label)
+    function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = new Horde_Template();
         $template->set('label', $label);
@@ -248,6 +254,21 @@
 
                 $template->set('left', $left . '%');
                 $template->set('width', $width . '%');
+                $template->set('evclick', '');
+
+                if (isset($extra[$periodStart])) {
+                    if (!empty($extra[$periodStart]['X-UID'])) {
+                        $link = "javascript:performAction('viewaction', '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
+                        $template->set('evclick', $link);
+                    }
+                    if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+                        $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
+                    }
+                }
 
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
             } else {
diff -r 85d33de56004 kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/lib/Forms/CreateCalendar.php	Thu Sep 18 20:56:25 2008 +0200
@@ -35,6 +35,9 @@
 
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Create")));
     }
@@ -48,6 +51,7 @@
         }
         $calendar->set('name', $this->_vars->get('name'));
         $calendar->set('desc', $this->_vars->get('description'));
+        $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
         return $GLOBALS['kronolith_shares']->addShare($calendar);
     }
 
diff -r 85d33de56004 kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/lib/Forms/EditCalendar.php	Thu Sep 18 20:56:25 2008 +0200
@@ -42,6 +42,9 @@
         $this->addHidden('', 'c', 'text', true);
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Save")));
     }
@@ -51,6 +54,7 @@
         $original_name = $this->_calendar->get('name');
         $this->_calendar->set('name', $this->_vars->get('name'));
         $this->_calendar->set('desc', $this->_vars->get('description'));
+        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
 
         if ($original_name != $this->_vars->get('name')) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));
diff -r 85d33de56004 kronolith/lib/Kronolith.php
--- a/kronolith/lib/Kronolith.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/lib/Kronolith.php	Thu Sep 18 20:56:25 2008 +0200
@@ -2098,6 +2098,33 @@
     }
 
     /**
+     * Builds Kronolith's list of menu items.
+     */
+    function getFbviewMenu($returnType = 'object')
+    {
+        global $conf, $registry, $browser, $prefs;
+
+        /* Check here for guest calendars so that we don't get multiple
+         * messages after redirects, etc. */
+        if (!Auth::getAuth() && !count($GLOBALS['all_calendars'])) {
+            $GLOBALS['notification']->push(_("No calendars are available to guests."));
+        }
+
+        require_once 'Horde/Menu.php';
+        $menu = new Menu(HORDE_MENU_MASK_HELP | HORDE_MENU_MASK_LOGIN);
+
+        $menu->add(Horde::applicationUrl('attendees.php'), _("Attendees"), 'attendees.png', null, null, null, '__noselection');
+
+        $menu->add(Horde::applicationUrl('calendars/'), _("Calendars"), 'calendars.png', null, null, null, '__noselection');
+
+        if ($returnType == 'object') {
+            return $menu;
+        } else {
+            return $menu->render();
+        }
+    }
+
+    /**
      * Used with usort() to sort events based on their start times.
      */
     function _sortEventStartTime($a, $b)
diff -r 85d33de56004 kronolith/perms.php
--- a/kronolith/perms.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/perms.php	Thu Sep 18 20:56:25 2008 +0200
@@ -14,6 +14,34 @@
 @define('KRONOLITH_BASE', dirname(__FILE__));
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/Group.php';
+
+function &getFbperms($share) 
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        if (isset($params['xfbaccess'])) {
+            $xfbusers = $params['xfbaccess'];
+            foreach ($xfbusers as $user) {
+                $fbperms[$user] = PERMS_READ;
+            }
+        }
+    }
+    return $fbperms;
+}
+
+function setFbperms($share, $xfbusers)
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        $params['xfbaccess'] = $xfbusers;
+        $params = serialize($params);
+        $share->set('params', $params);
+    }
+}
 
 $shares = &Horde_Share::singleton('kronolith');
 $groups = &Group::singleton();
@@ -36,6 +64,8 @@
         $notification->push($share, 'horde.error');
     } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) {
         exit('permission denied');
+    } else {
+        $fbperms = getFbperms($share);
     }
     break;
 
@@ -226,6 +256,24 @@
             }
         }
 
+        // Process free/busy permissions.
+        $fb_names = Util::getFormData('fb_names');
+        $fb_read = Util::getFormData('fb_read');
+
+        $fbperms = getFbperms($share);
+        foreach ($fb_names as $key => $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            if (!empty($fb_read[$key])) {
+                $fbperms[$user] = PERMS_READ;
+            } else {
+                unset($fbperms[$user]);
+            }
+        }
+        setFbperms($share, array_keys($fbperms));
+
         $share->setPermission($perm, false);
         $share->save();
         $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 85d33de56004 kronolith/savedattlist.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/savedattlist.php	Thu Sep 18 20:56:25 2008 +0200
@@ -0,0 +1,77 @@
+<?php
+/**
+ * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $
+ *
+ * Copyright 2004 Code Fusion  <http://www.codefusion.co.za/>
+ *                Stuart Binge <s.binge at codefusion.co.za>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/FBView.php';
+
+$title = _('Load Attendee List');
+
+Horde::addScriptFile('tooltip.js', 'horde');
+require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+// Get our list of saved attendees
+$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+
+// Preformat our image urls
+$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
+$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
+
+// Get our Action ID & Value. This specifies what action the user initiated.
+$actionID = Util::getFormData('actionID', false);
+$actionValue = Util::getFormData('actionValue', false);
+if (!$actionID) {
+    $actionID = (Util::getFormData('addNew', false) ? 'add' : false);
+    $actionValue = Util::getFormData('newAttendees', '');
+}
+
+// Perform the specified action, if there is one.
+switch ($actionID) {
+case 'remove':
+    // Remove the specified attendee
+    if (array_key_exists($actionValue, $savedattlist)) {
+        unset($savedattlist[$actionValue]);
+	$prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    }
+    
+    break;
+
+case 'dismiss':
+    // Make sure we're actually allowed to dismiss
+    if (!$allow_dismiss) break;
+
+    // Close the attendee window
+    global $browser;
+
+    if ($browser->hasFeature('javascript')) {
+        Util::closeWindowJS();
+    } else {
+        $url = Util::getFormData('url');
+
+        if (!empty($url)) {
+            $location = Horde::applicationUrl($url, true);
+        } else {
+            $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
+            $url = Util::addParameter($url, 'year', Util::getFormData('year'));
+            $location = Horde::applicationUrl($url, true);
+        }
+
+        // Make sure URL is unique.
+        $location = Util::addParameter($location, 'unique', md5(microtime()));
+
+        header('Location: ' . $location);
+    }
+    break;
+}
+
+$form_handler = Horde::applicationUrl('savedattlist.php');
+require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r 85d33de56004 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/templates/attendees/attendees.inc	Thu Sep 18 20:56:25 2008 +0200
@@ -92,6 +92,8 @@
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
+ <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" />
+ <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?>
  <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?>
 </div>
 
diff -r 85d33de56004 kronolith/templates/fbview-menu.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/fbview-menu.inc	Thu Sep 18 20:56:25 2008 +0200
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
+</div>
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff -r 85d33de56004 kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/javascript/open_savedattlist_win.js	Thu Sep 18 20:56:25 2008 +0200
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
+<?php endif; ?>
+function open_savedattlist_win(args)
+{
+    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/savedattlist.php', 'kronolith')) ?>";
+    if (url.indexOf('?') == -1) glue = '?';
+    else glue = '<?php echo ini_get('arg_separator.output') ?>';
+    var now = new Date();
+    var name = "savedattlist_window_" + now.getTime();
+    if (args != "") {
+        url = url + glue + args + '<?php echo ini_get('arg_separator.output') ?>' + "uniq=" + now.getTime();
+    } else {
+        url = url + glue + "uniq=" + now.getTime();
+    }
+    var Width = screen.width;
+    if (Width > 775) {
+        Width = 700;
+    } else {
+        Width -= 75;
+    }
+    var Height = screen.height;
+    if (Height > 725) {
+        Height = 650;
+    } else {
+        Height -= 75;
+    }
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + Width + ",height=" + Height + ",left=0,top=0";
+    name = window.open(url, name, param);
+    if (!eval("name.opener")) {
+        name.opener = self;
+    }
+}
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
+</script>
+<?php endif; ?>
diff -r 85d33de56004 kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc	Thu Sep 18 20:48:11 2008 +0200
+++ b/kronolith/templates/perms/perms.inc	Thu Sep 18 20:56:25 2008 +0200
@@ -322,6 +322,61 @@
   <td>&nbsp;</td>
 </tr>
 
+<!-- Extended free/busy Permissions -->
+<tr valign="middle">
+  <td class="header leftAlign">
+    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Extended free/busy access") ?>
+  </td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center"><?php echo _("Read") ?></td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header">&nbsp;</td>
+</tr>
+<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?>
+<tr>
+  <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> />
+    <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<?php } } ?>
+<!-- New extended free/busy row -->
+<tr>
+<?php if ($auth->hasCapability('list')): ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="fb_names_new" name="fb_names[||new]">
+      <option value=""><?php echo _("Select a user to add:") ?></option>
+    <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+    <?php } } ?>
+    </select>
+  </td>
+<?php else: ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="fb_names_new" name="fb_names[||new]" />
+  </td>
+<?php endif; ?>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_new" name="fb_read[||new]" />
+    <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+
 <tr>
  <td colspan="7">&nbsp;</td>
 </tr>
diff -r 85d33de56004 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/savedattlist/savedattlist.inc	Thu Sep 18 20:56:25 2008 +0200
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
+<!--
+function performAction(id, value)
+{
+    document.savedattlistForm.actionID.value = id;
+    document.savedattlistForm.actionValue.value = value;
+    document.savedattlistForm.submit();
+    return false;
+}
+
+function updateMessage(list)
+{
+    if (parent.opener.closed) {
+        alert('<?php echo addslashes(_("The Edit Attendees screen is no longer present. Exiting.")) ?>');
+        this.close();
+        return;
+    }
+
+    if (!parent.opener.document.attendeesForm) {
+        alert('<?php echo addslashes(_("You can only use this form from the Edit Attendees screen.")) ?>');
+        this.close();
+        return;
+    }
+
+    parent.opener.document.attendeesForm.newAttendees.value = list;
+    this.close();
+}
+// -->
+</script>
+
+<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm">
+<?php Util::pformInput(); ?>
+<input type="hidden" name="actionID" value="" />
+<input type="hidden" name="actionValue" value="" />
+
+<div align="center">
+
+<table border="0" width="500" cellspacing="0" cellpadding="2">
+
+<!-- header -->
+<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr>
+
+<!-- attendee list header -->
+<tr class="item">
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td>
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td>
+ <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td>
+</tr>
+
+<!-- attendees -->
+<?php $i = 0 ?>
+<?php if (empty($savedattlist)): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr>
+<?php else: foreach ($savedattlist as $index => $list): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>">
+ <?php
+  echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>";
+ ?>
+ <?php
+  echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>";
+ ?>
+  <td><?php echo implode(', ', $list); ?></td>
+ </tr>
+<?php endforeach; endif; ?>
+</table>
+</div>
+</form>
diff -r 85d33de56004 lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/lib/Horde/Kolab/Storage/Folder.php	Thu Sep 18 20:56:25 2008 +0200
@@ -40,6 +40,13 @@
  */
 define('KOLAB_ANNOT_FOLDER_TYPE', KOLAB_ANNOT_ROOT . 'folder-type');
 
+/**
+ * Kolab specific free/busy relevance
+ */
+define('KOLAB_FBRELEVANCE_ADMINS',  0);
+define('KOLAB_FBRELEVANCE_READERS', 1);
+define('KOLAB_FBRELEVANCE_NOBODY',  2);
+ 
 /**
  * Horde-specific annotations on the imap folder have this prefix.
  */
@@ -396,6 +403,40 @@
             $this->_attributes = $attributes;
         }
         return true;
+//             } elseif ($attribute == 'params') {
+//                 $type = $this->getType();
+//                 if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
+//                     $params = @unserialize($value);
+//                     if (isset($params['fbrelevance'])) {
+//                         $result = $this->setFbrelevance($params['fbrelevance']);
+//                         if (is_a($result, 'PEAR_Error')) {
+//                             return $result;
+//                         }
+//                         unset($params['fbrelevance']);
+//                     }
+//                     if (isset($params['xfbaccess'])) {
+//                         $result = $this->setXfbaccess($params['xfbaccess']);
+//                         if (is_a($result, 'PEAR_Error')) {
+//                             return $result;
+//                         }
+//                         unset($params['xfbaccess']);
+//                     }
+
+//                     if (empty($params)) {
+//                         continue;
+//                     }
+                    
+//                     $value = @serialize($params);
+//                 }
+
+//                 $imap = &$this->_shareOb->getImap();
+//                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+//                 $store = base64_encode($value);
+//                 $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
+//                 $result = $imap->setAnnotation($entry, array('value.shared' => $store), $this->_folder);
+//                 if (is_a($result, 'PEAR_Error')) {
+//                     return $result;
+//                 }
     }
 
     /**
@@ -1193,4 +1234,93 @@
         $data['uid'] = 'KOLAB_FOLDER_CONFIGURATION';
         return $this->_annotation_data->save($data, $uid);
     }
+
+
+
+    /**
+     * Get the free/busy relevance for this folder
+     *
+     * @return int  Value containing the FB_RELEVANCE.
+     */
+    function getFbrelevance()
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
+
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+        if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
+            return KOLAB_FBRELEVANCE_ADMINS;
+        }
+        switch ($annotation) {
+        case 'admins':
+            return KOLAB_FBRELEVANCE_ADMINS;
+        case 'readers':
+            return KOLAB_FBRELEVANCE_READERS;
+        case 'nobody':
+            return KOLAB_FBRELEVANCE_NOBODY;
+        default:
+            return KOLAB_FBRELEVANCE_ADMINS;
+        }
+    }
+
+    /**
+     * Set the free/busy relevance for this folder
+     *
+     * @param int $relevance Value containing the FB_RELEVANCE
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setFbrelevance($relevance)
+    {
+        switch ($relevance) {
+        case KOLAB_FBRELEVANCE_ADMINS:
+            $value = 'admins';
+            break;
+        case KOLAB_FBRELEVANCE_READERS:
+            $value = 'readers';
+            break;
+        case KOLAB_FBRELEVANCE_NOBODY:
+            $value = 'nobody';
+            break;
+        default:
+            $value = 'admins';
+        }
+
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
+        return $imap->setAnnotation($entry, array('value.shared' => $value), $this->_folder);
+    }
+
+    /**
+     * Get the extended free/busy access settings for this folder
+     *
+     * @return array  Array containing the users with access to the
+     *                extended information.
+     */
+    function getXfbaccess()
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
+
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+        if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
+            return array();
+        }
+        return explode(' ', $annotation);
+    }
+
+    /**
+     * Set the extended free/busy access settings for this folder
+     *
+     * @param array $access  Array containing the users with access to the
+     *                      extended information.
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setXfbaccess($access)
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
+        return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder);
+    }
 }
diff -r 85d33de56004 lib/Horde/Share/kolab.php
--- a/lib/Horde/Share/kolab.php	Thu Sep 18 20:48:11 2008 +0200
+++ b/lib/Horde/Share/kolab.php	Thu Sep 18 20:56:25 2008 +0200
@@ -525,6 +525,13 @@
             $default = array('source' => 'kolab',
                              'default' => $this->get('default'),
                              'name' => $this->get('name'));
+            $type = $this->get('type');
+            if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
+                $default = array_merge($default, array(
+                                           'fbrelevance' => $this->getFbrelevance(),
+                                           'xfbaccess'   => $this->getXfbaccess()
+                                       ));
+            }
             if (is_a($params, 'PEAR_Error') || $params == '') {
                 $params = $default;
             }



From cvs at kolab.org  Thu Sep 18 21:10:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:10:15 +0200 (CEST)
Subject: gunnar: server/patches/horde-webmail/1.2.0
	horde-webmail-1.2.0_kolab_fbview_openpkg.patch, 1.1, 1.2 
Message-ID: <20080918191015.DDEA2600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	horde-webmail-1.2.0_kolab_fbview_openpkg.patch 
Log Message:
Some basic fixes to the fbview configuration.

Index: horde-webmail-1.2.0_kolab_fbview_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_fbview_openpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-webmail-1.2.0_kolab_fbview_openpkg.patch	18 Sep 2008 18:56:48 -0000	1.1
+++ horde-webmail-1.2.0_kolab_fbview_openpkg.patch	18 Sep 2008 19:10:13 -0000	1.2
@@ -1,6 +1,196 @@
+diff -r 85d33de56004 config/conf.php
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/config/conf.php	Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,115 @@
++<?php
++/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
++// $Horde: horde/config/conf.xml,v 1.74.2.76 2008/09/07 04:23:44 chuck Exp $
++$conf['vhosts'] = false;
++$conf['debug_level'] = E_ALL;
++$conf['max_exec_time'] = 0;
++$conf['compress_pages'] = true;
++$conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
++$conf['umask'] = 077;
++$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
++$conf['use_ssl'] = 2;
++$conf['server']['name'] = $_SERVER['SERVER_NAME'];
++$conf['server']['port'] = $_SERVER['SERVER_PORT'];
++$conf['urls']['pretty'] = false;
++$conf['safe_ips'] = array();
++$conf['session']['name'] = 'Horde';
++$conf['session']['use_only_cookies'] = false;
++$conf['session']['cache_limiter'] = 'nocache';
++$conf['session']['timeout'] = 0;
++$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
++$conf['cookie']['path'] = '/';
++$conf['sql']['database'] = dirname(__FILE__) . '/../storage/horde.db';
++$conf['sql']['mode'] = '0640';
++$conf['sql']['charset'] = 'utf-8';
++$conf['sql']['phptype'] = 'sqlite';
++$conf['auth']['admins'] = array('manager');
++$conf['auth']['checkip'] = true;
++$conf['auth']['checkbrowser'] = true;
++$conf['auth']['alternate_login'] = false;
++$conf['auth']['redirect_on_logout'] = false;
++$conf['auth']['params']['login_block'] = true;
++$conf['auth']['params']['login_block_count'] = 3;
++$conf['auth']['params']['login_block_time'] = 5;
++$conf['auth']['driver'] = 'kolab';
++$conf['signup']['allow'] = false;
++$conf['log']['priority'] = PEAR_LOG_DEBUG;
++$conf['log']['ident'] = 'HORDE';
++$conf['log']['params'] = array();
++$conf['log']['name'] = dirname(__FILE__) . '/../log/horde.log';
++$conf['log']['params']['append'] = true;
++$conf['log']['type'] = 'file';
++$conf['log']['enabled'] = true;
++$conf['log_accesskeys'] = false;
++$conf['prefs']['driver'] = 'kolab';
++$conf['alarms']['params']['driverconfig'] = 'horde';
++$conf['alarms']['params']['ttl'] = 300;
++$conf['alarms']['driver'] = 'sql';
++$conf['datatree']['params']['driverconfig'] = 'horde';
++$conf['datatree']['driver'] = 'sql';
++$conf['group']['driver'] = 'kolab';
++$conf['group']['cache'] = false;
++$conf['perms']['driverconfig'] = 'horde';
++$conf['perms']['driver'] = 'sql';
++$conf['share']['no_sharing'] = false;
++$conf['share']['any_group'] = false;
++$conf['share']['cache'] = true;
++$conf['share']['driver'] = 'kolab';
++$conf['cache']['default_lifetime'] = 1800;
++$conf['cache']['params']['dir'] = Horde::getTempDir();
++$conf['cache']['params']['sub'] = 0;
++$conf['cache']['driver'] = 'file';
++$conf['lock']['driver'] = 'none';
++$conf['token']['driver'] = 'none';
++$conf['mailer']['params']['host'] = 'localhost';
++$conf['mailer']['params']['port'] = 25;
++$conf['mailer']['params']['auth'] = true;
++$conf['mailer']['type'] = 'smtp';
++$conf['mailformat']['brokenrfc2231'] = false;
++$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../storage';
++$conf['vfs']['type'] = 'file';
++$conf['sessionhandler']['type'] = 'none';
++$conf['sessionhandler']['memcache'] = false;
++$conf['image']['convert'] = '/usr/bin/convert';
++$conf['mime']['magic_db'] = '/etc/mime.types';
++$conf['problems']['email'] = 'webmaster at example.com';
++$conf['problems']['maildomain'] = 'example.com';
++$conf['problems']['tickets'] = false;
++$conf['problems']['attachments'] = true;
++$conf['menu']['apps'] = array();
++$conf['menu']['always'] = false;
++$conf['menu']['links']['help'] = 'all';
++$conf['menu']['links']['options'] = 'authenticated';
++$conf['menu']['links']['problem'] = 'all';
++$conf['menu']['links']['login'] = 'all';
++$conf['menu']['links']['logout'] = 'authenticated';
++$conf['hooks']['permsdenied'] = false;
++$conf['hooks']['username'] = false;
++$conf['hooks']['preauthenticate'] = false;
++$conf['hooks']['postauthenticate'] = false;
++$conf['hooks']['authldap'] = false;
++$conf['hooks']['groupldap'] = false;
++$conf['portal']['fixed_blocks'] = array();
++$conf['accounts']['driver'] = 'null';
++$conf['user']['verify_from_addr'] = false;
++$conf['imsp']['enabled'] = false;
++$conf['kolab']['ldap']['server'] = 'localhost';
++$conf['kolab']['ldap']['port'] = 389;
++$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
++$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
++$conf['kolab']['ldap']['phppw'] = 'dummy';
++$conf['kolab']['imap']['server'] = 'localhost';
++$conf['kolab']['imap']['port'] = 143;
++$conf['kolab']['imap']['sieveport'] = 2000;
++$conf['kolab']['imap']['maildomain'] = 'example.com';
++$conf['kolab']['imap']['virtdomains'] = true;
++$conf['kolab']['smtp']['server'] = 'localhost';
++$conf['kolab']['smtp']['port'] = 25;
++$conf['kolab']['misc']['multidomain'] = false;
++$conf['kolab']['cache_folders'] = true;
++$conf['kolab']['enabled'] = true;
++$conf['memcache']['enabled'] = false;
++/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
++if (file_exists(dirname(__FILE__) . '/kolab.php')) {
++  require_once(dirname(__FILE__) . '/kolab.php');
++}
+diff -r 85d33de56004 config/kolab.php
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/config/kolab.php	Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,37 @@
++<?php
++/* Add additional admins here */
++$conf['auth']['admins'] = array('manager');
++
++/* Add your servers random secret key here */
++$conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
++
++/* Add your horde vhost hostname here */
++$conf['cookie']['domain'] = 'webmail.example.com';
++
++/* Add the path to the vhost install here (the value of the -d switch when you used webapp-config) */
++$conf['cookie']['path'] = '/';
++
++/* The email address of your sys admin */
++$conf['problems']['email'] = 'hostmaster at example.com';
++
++/* Primary mail domain of your Kolab server */
++$conf['problems']['maildomain'] = 'pardus.de';
++
++/* The hostname of your LDAP server (usually the same as the hostname of the Kolab server) */
++$conf['kolab']['ldap']['server'] = 'localhost';
++
++/* Base DN of your LDAP server */
++$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
++
++/* php_dn from your /kolab/etc/kolab/kolab.conf */
++$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
++
++/* php_pw from your /kolab/etc/kolab/kolab.conf */
++$conf['kolab']['ldap']['phppw'] = 'MY_SECRET_PASSWORD';
++
++/* Hostname of your IMAP server (usually the same as the hostname of the Kolab server) */
++$conf['kolab']['imap']['server'] = 'localhost';
++
++/* Primary mail domain of your Kolab server */
++$conf['kolab']['imap']['maildomain'] = 'example.com';
++?>
+diff -r 85d33de56004 config/prefs.php
+--- a/config/prefs.php	Thu Sep 18 20:48:11 2008 +0200
++++ b/config/prefs.php	Thu Sep 18 21:09:53 2008 +0200
+@@ -357,7 +357,7 @@
+ 
+ // UI theme
+ $_prefs['theme'] = array(
+-    'value' => 'bluewhite',
++    'value' => 'silver',
+     'locked' => false,
+     'shared' => true,
+     'type' => 'select',
+@@ -400,7 +400,7 @@
+ );
+ 
+ $_prefs['show_sidebar'] = array(
+-    'value' => true,
++    'value' => false,
+     'locked' => false,
+     'shared' => true,
+     'type' => 'checkbox',
+@@ -488,7 +488,7 @@
+ 
+ // what application should we go to after login?
+ $_prefs['initial_application'] = array(
+-    'value' => 'horde',
++    'value' => 'kronolith',
+     'locked' => false,
+     'shared' => true,
+     'type' => 'select',
 diff -r 85d33de56004 kronolith/attendees.php
 --- a/kronolith/attendees.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/attendees.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/attendees.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -178,6 +178,16 @@
      $attendees = array();
      $_SESSION['kronolith']['attendees'] = $attendees;
@@ -36,7 +226,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/create.php
 --- a/kronolith/calendars/create.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/create.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/create.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -39,6 +39,6 @@
  
  $title = $form->getTitle();
@@ -47,7 +237,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/delete.php
 --- a/kronolith/calendars/delete.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/delete.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/delete.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -56,6 +56,6 @@
  
  $title = $form->getTitle();
@@ -58,7 +248,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/edit.php
 --- a/kronolith/calendars/edit.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/edit.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/edit.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -53,8 +53,12 @@
  
  $vars->set('name', $calendar->get('name'));
@@ -75,7 +265,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/index.php
 --- a/kronolith/calendars/index.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/index.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/index.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -73,6 +73,6 @@
  Horde::addScriptFile('tables.js', 'kronolith', true);
  $title = _("Manage Calendars");
@@ -86,7 +276,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/remote_edit.php
 --- a/kronolith/calendars/remote_edit.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/remote_edit.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/remote_edit.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -68,6 +68,6 @@
  $vars->set('password', $password);
  $title = $form->getTitle();
@@ -97,7 +287,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/remote_subscribe.php
 --- a/kronolith/calendars/remote_subscribe.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/remote_subscribe.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/remote_subscribe.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -39,6 +39,6 @@
  
  $title = $form->getTitle();
@@ -108,7 +298,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/calendars/remote_unsubscribe.php
 --- a/kronolith/calendars/remote_unsubscribe.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/calendars/remote_unsubscribe.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/calendars/remote_unsubscribe.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -56,6 +56,6 @@
  $vars->set('url', $calendar['url']);
  $title = $form->getTitle();
@@ -117,9 +307,60 @@
 +require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
  echo $form->renderActive($form->getRenderer(), $vars, 'remote_unsubscribe.php', 'post');
  require $registry->get('templates', 'horde') . '/common-footer.inc';
+diff -r 85d33de56004 kronolith/config/conf.php
+--- a/kronolith/config/conf.php	Thu Sep 18 20:48:11 2008 +0200
++++ b/kronolith/config/conf.php	Thu Sep 18 21:09:53 2008 +0200
+@@ -1,12 +1,11 @@
+ <?php
+ /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+ // $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+-$conf['calendar']['params']['table'] = 'kronolith_events';
+-$conf['calendar']['params']['driverconfig'] = 'horde';
+-$conf['calendar']['driver'] = 'sql';
+-$conf['storage']['params']['table'] = 'kronolith_storage';
+-$conf['storage']['params']['driverconfig'] = 'horde';
+-$conf['storage']['driver'] = 'sql';
++$conf['calendar']['driver'] = 'kolab';
++$conf['storage']['driver'] = 'kolab';
++$conf['storage']['default_domain'] = '';
++$conf['storage']['freebusy']['protocol'] = 'https';
++$conf['storage']['freebusy']['port'] = 443;
+ $conf['metadata']['keywords'] = false;
+ $conf['autoshare']['shareperms'] = 'none';
+ $conf['holidays']['enable'] = true;
+@@ -14,3 +13,6 @@
+ $conf['menu']['import_export'] = true;
+ $conf['menu']['apps'] = array();
+ /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
++if (file_exists(dirname(__FILE__) . '/kolab.php')) {
++  require_once(dirname(__FILE__) . '/kolab.php');
++}
+diff -r 85d33de56004 kronolith/config/kolab.php
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/kronolith/config/kolab.php	Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,10 @@
++<?php
++/* Primary mail domain of your Kolab server */
++$conf['storage']['default_domain'] = 'example.com';
++
++/* Hostname of your IMAP server (usually the same as the hostname of the Kolab server) */
++$conf['reminder']['server_name'] = 'localhost';
++
++/* The email address of your sys admin */
++$conf['reminder']['from_addr'] = 'hostmaster at example.com';
++?>
 diff -r 85d33de56004 kronolith/config/prefs.php.dist
 --- a/kronolith/config/prefs.php.dist	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/config/prefs.php.dist	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/config/prefs.php.dist	Thu Sep 18 21:09:53 2008 +0200
+@@ -89,7 +89,7 @@
+ 
+ // default view
+ $_prefs['defaultview'] = array(
+-    'value' => 'month',
++    'value' => 'attendees',
+     'locked' => false,
+     'shared' => false,
+     'type' => 'enum',
 @@ -457,6 +457,14 @@
      'shared' => false,
      'type' => 'implicit'
@@ -137,7 +378,7 @@
      'locked' => false,
 diff -r 85d33de56004 kronolith/lib/FBView.php
 --- a/kronolith/lib/FBView.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/FBView.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/FBView.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -87,7 +87,7 @@
              $rows = '';
              foreach ($this->_requiredMembers as $member) {
@@ -209,7 +450,7 @@
              } else {
 diff -r 85d33de56004 kronolith/lib/Forms/CreateCalendar.php
 --- a/kronolith/lib/Forms/CreateCalendar.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/Forms/CreateCalendar.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/Forms/CreateCalendar.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -35,6 +35,9 @@
  
          $this->addVariable(_("Name"), 'name', 'text', true);
@@ -230,7 +471,7 @@
  
 diff -r 85d33de56004 kronolith/lib/Forms/EditCalendar.php
 --- a/kronolith/lib/Forms/EditCalendar.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/Forms/EditCalendar.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/Forms/EditCalendar.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -42,6 +42,9 @@
          $this->addHidden('', 'c', 'text', true);
          $this->addVariable(_("Name"), 'name', 'text', true);
@@ -251,7 +492,7 @@
              $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));
 diff -r 85d33de56004 kronolith/lib/Kronolith.php
 --- a/kronolith/lib/Kronolith.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/lib/Kronolith.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/lib/Kronolith.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -2098,6 +2098,33 @@
      }
  
@@ -288,7 +529,7 @@
      function _sortEventStartTime($a, $b)
 diff -r 85d33de56004 kronolith/perms.php
 --- a/kronolith/perms.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/perms.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/perms.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -14,6 +14,34 @@
  @define('KRONOLITH_BASE', dirname(__FILE__));
  require_once KRONOLITH_BASE . '/lib/base.php';
@@ -360,7 +601,7 @@
          $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
 diff -r 85d33de56004 kronolith/savedattlist.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/savedattlist.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -0,0 +1,77 @@
 +<?php
 +/**
@@ -441,7 +682,7 @@
 +require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
 diff -r 85d33de56004 kronolith/templates/attendees/attendees.inc
 --- a/kronolith/templates/attendees/attendees.inc	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/templates/attendees/attendees.inc	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/attendees/attendees.inc	Thu Sep 18 21:09:53 2008 +0200
 @@ -92,6 +92,8 @@
  <div>
   <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -453,7 +694,7 @@
  
 diff -r 85d33de56004 kronolith/templates/fbview-menu.inc
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/fbview-menu.inc	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/fbview-menu.inc	Thu Sep 18 21:09:53 2008 +0200
 @@ -0,0 +1,4 @@
 +<div id="menu">
 + <?php echo Kronolith::getFbviewMenu('string') ?>
@@ -461,7 +702,7 @@
 +<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
 diff -r 85d33de56004 kronolith/templates/javascript/open_savedattlist_win.js
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/javascript/open_savedattlist_win.js	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/javascript/open_savedattlist_win.js	Thu Sep 18 21:09:53 2008 +0200
 @@ -0,0 +1,36 @@
 +<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
 +<!--
@@ -501,7 +742,7 @@
 +<?php endif; ?>
 diff -r 85d33de56004 kronolith/templates/perms/perms.inc
 --- a/kronolith/templates/perms/perms.inc	Thu Sep 18 20:48:11 2008 +0200
-+++ b/kronolith/templates/perms/perms.inc	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/perms/perms.inc	Thu Sep 18 21:09:53 2008 +0200
 @@ -322,6 +322,61 @@
    <td>&nbsp;</td>
  </tr>
@@ -566,7 +807,7 @@
  </tr>
 diff -r 85d33de56004 kronolith/templates/savedattlist/savedattlist.inc
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc	Thu Sep 18 20:56:25 2008 +0200
++++ b/kronolith/templates/savedattlist/savedattlist.inc	Thu Sep 18 21:09:53 2008 +0200
 @@ -0,0 +1,68 @@
 +<!-- javascript action handling -->
 +<script language="JavaScript" type="text/javascript">
@@ -638,7 +879,7 @@
 +</form>
 diff -r 85d33de56004 lib/Horde/Kolab/Storage/Folder.php
 --- a/lib/Horde/Kolab/Storage/Folder.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/lib/Horde/Kolab/Storage/Folder.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/lib/Horde/Kolab/Storage/Folder.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -40,6 +40,13 @@
   */
  define('KOLAB_ANNOT_FOLDER_TYPE', KOLAB_ANNOT_ROOT . 'folder-type');
@@ -790,7 +1031,7 @@
  }
 diff -r 85d33de56004 lib/Horde/Share/kolab.php
 --- a/lib/Horde/Share/kolab.php	Thu Sep 18 20:48:11 2008 +0200
-+++ b/lib/Horde/Share/kolab.php	Thu Sep 18 20:56:25 2008 +0200
++++ b/lib/Horde/Share/kolab.php	Thu Sep 18 21:09:53 2008 +0200
 @@ -525,6 +525,13 @@
              $default = array('source' => 'kolab',
                               'default' => $this->get('default'),
@@ -805,3 +1046,37 @@
              if (is_a($params, 'PEAR_Error') || $params == '') {
                  $params = $default;
              }
+diff -r 85d33de56004 lib/core.php
+--- a/lib/core.php	Thu Sep 18 20:48:11 2008 +0200
++++ b/lib/core.php	Thu Sep 18 21:09:53 2008 +0200
+@@ -31,6 +31,12 @@
+  * include_path, you must add an ini_set() call here to add their location to
+  * the include_path. */
+ ini_set('include_path', dirname(__FILE__) . PATH_SEPARATOR . dirname(__FILE__) . '/../pear');
++ini_set('log_errors', true);
++ini_set('display_errors', '0');
++ini_set('error_log', dirname(__FILE__) . '/../log/php-errors.log');
++session_save_path(dirname(__FILE__) . '/../tmp/');
++ini_set('upload_tmp_dir', dirname(__FILE__) . '/../tmp/');
++putenv('TMPDIR=' . dirname(__FILE__) . '/../tmp/');
+ 
+ /* PEAR base class. */
+ include_once 'PEAR.php';
+diff -r 85d33de56004 log/.htaccess
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/log/.htaccess	Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,1 @@
++Deny from All
+\ No newline at end of file
+diff -r 85d33de56004 storage/.htaccess
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/storage/.htaccess	Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,1 @@
++Deny from All
+\ No newline at end of file
+diff -r 85d33de56004 tmp/.htaccess
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/tmp/.htaccess	Thu Sep 18 21:09:53 2008 +0200
+@@ -0,0 +1,1 @@
++Deny from All
+\ No newline at end of file



From cvs at kolab.org  Thu Sep 18 21:17:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:17:08 +0200 (CEST)
Subject: gunnar: server/kolab-fbview kolab-fbview.spec,1.1,1.2 
Message-ID: <20080918191708.50D47600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab-fbview.spec 
Log Message:
A working fbview package.

Index: kolab-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/kolab-fbview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-fbview.spec	18 Sep 2008 09:43:18 -0000	1.1
+++ kolab-fbview.spec	18 Sep 2008 19:17:06 -0000	1.2
@@ -2,7 +2,7 @@
 %define         V_horde_name horde-webmail
 %define         V_package kolab-fbview
 %define         V_year  2008
-%define         V_month 08
+%define         V_month 09
 %define         V_day   18
 %define         V_version 1.2.0
 %define         V_source_version 1.2-rc1
@@ -49,8 +49,6 @@
 
 %prep
 	%setup -q -c %{V_horde_name}-%{V_source_version}
-	%setup -T -D -a 1
-	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_source_version}/passwd
 
 	cd %{V_horde_name}-%{V_source_version}
 	%patch -p1 -P 0
@@ -71,15 +69,26 @@
 
 	find . -name '*.orig' | xargs rm
 
+	rm -rf dimp imp ingo mimp mnemo nag
+
+	cd kronolith
+
+	# Remove some stuff not necessary for fbview
+	rm add.php day.php view.php                            \
+           delete.php ics.php search.php week.php contacts.php \
+           imple.php  month.php  pref_api.php workweek.php     \
+           edit.php new.php year.php attend.php                \
+           data.php event.php
+
+	cd ..
+
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
 
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/storage/horde.db < scripts/sql/groupware.sql
 
 	cd ..
 
-	rm -rf dimp imp ingo mimp mnemo nag
-
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} \
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \



From cvs at kolab.org  Thu Sep 18 21:17:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:17:40 +0200 (CEST)
Subject: gunnar: server Makefile,1.58,1.59 
Message-ID: <20080918191740.9404F60016C@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Add missing packages in the Makefile.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Makefile	18 Sep 2008 10:05:47 -0000	1.58
+++ Makefile	18 Sep 2008 19:17:38 -0000	1.59
@@ -26,6 +26,7 @@
                kolabconf               \
                kolabd                  \
                kolab-webadmin          \
+               kolab-fbview            \
 
 PEAR_PACKAGES= pear/PEAR-Auth_SASL      \
                pear/PEAR-Date           \
@@ -39,6 +40,7 @@
                pear/PEAR-Net_Socket     \
                pear/PEAR-Net_URL        \
                pear/PEAR-HTTP_Request   \
+               pear/PEAR-Horde-Cahnnel  \
                pear/Horde_Auth          \
                pear/Horde_Browser       \
                pear/Horde_CLI           \
@@ -59,6 +61,9 @@
                pear/Horde_SessionObjects \
                pear/Horde_Util          \
                pear/Horde_iCalendar     \
+               pear/PEAR-Horde-Channel  \
+               pear/PEAR-PHPUnit-Channel\
+               pear/PHPUnit             \
                php-kolab/Kolab_Format   \
                php-kolab/Kolab_Server   \
                php-kolab/Kolab_Storage  \



From cvs at kolab.org  Thu Sep 18 21:17:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:17:52 +0200 (CEST)
Subject: gunnar: server cvs-kolab.sh,1.24,1.25 
Message-ID: <20080918191752.E21E7600170@lists.intevation.de>

Author: gunnar

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

Modified Files:
	cvs-kolab.sh 
Log Message:
Remove the horde/fbview options.

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cvs-kolab.sh	18 Sep 2008 11:01:23 -0000	1.24
+++ cvs-kolab.sh	18 Sep 2008 19:17:50 -0000	1.25
@@ -25,9 +25,6 @@
 ACTION_DOWNLOAD=0
 ACTION_RELEASE=0
 
-FLAG_HORDE=0
-FLAG_FBVIEW=0
-
 INSTALL_OPTS=""
 
 usage() {
@@ -46,9 +43,6 @@
     echo "  -b         Package directory (default: ${KOLAB_PACKAGES})"
     echo "  -d         Kolab development user/area (default: ${KOLAB_DEV_USER})"
     echo "  -t         Kolab cvs testing user/area (default: ${KOLAB_INSTALL_USER})"
-    echo
-    echo "  -F         Include fbview in the installation"
-    echo "  -H         Include Horde in the installation"
     exit 1
 }
 
@@ -142,7 +136,7 @@
     chown -R "${KOLAB_DEV_USER}:" "/${KOLAB_DEV_USER}/CVS"
     su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not updating! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
 
-    rsync -avz "/${KOLAB_DEV_USER}/RPM/PKG/" "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
+    rsync -avz /"${KOLAB_DEV_USER}"/RPM/PKG/*.src.rpm "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
 
     cd "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
 
@@ -274,12 +268,6 @@
 	D) # Download
 	    ACTION_DOWNLOAD=1
 	    ;;
-	H) # Include Horde in the installation
-	    FLAG_HORDE=1
-	    ;;
-	F) # Include Fbview in the installation
-	    FLAG_FBVIEW=1
-	    ;;
 	b) # User wants a different package directory
 	    KOLAB_PACKAGES="${OPTARG}"
 	    ;;
@@ -291,14 +279,6 @@
 	    ;;
     esac
 done
-
-if [ "${FLAG_HORDE}" == "1" ]; then
-    INSTALL_OPTS="${INSTALL_OPTS} -H"
-fi
-
-if [ "${FLAG_FBVIEW}" == "1" ]; then
-    INSTALL_OPTS="${INSTALL_OPTS} -F"
-fi
 
 if [ "${ACTION_DOWNLOAD}" == "1" ]; then
     download



From cvs at kolab.org  Thu Sep 18 21:52:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:52:33 +0200 (CEST)
Subject: gunnar: server/kolab-fbview Makefile,1.1,1.2 
Message-ID: <20080918195233.C8B4C60014F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Fixed the path to the stage directory.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	18 Sep 2008 09:43:18 -0000	1.1
+++ Makefile	18 Sep 2008 19:52:31 -0000	1.2
@@ -36,7 +36,7 @@
 
 .PHONY: dist
 dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
 
 .PHONY: clean
 clean:



From cvs at kolab.org  Thu Sep 18 21:52:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:52:33 +0200 (CEST)
Subject: gunnar: server/kolab-webclient Makefile,1.2,1.3 
Message-ID: <20080918195233.CD24C600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Fixed the path to the stage directory.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	16 Sep 2008 14:26:10 -0000	1.2
+++ Makefile	18 Sep 2008 19:52:31 -0000	1.3
@@ -39,7 +39,7 @@
 
 .PHONY: dist
 dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
 
 .PHONY: clean
 clean:



From cvs at kolab.org  Thu Sep 18 21:53:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:53:11 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.32,1.33 
Message-ID: <20080918195311.14E9F600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolabd.spec.in 
Log Message:
Request php with spl so that we can build PHPUnit.

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolabd.spec.in	11 Sep 2008 14:20:28 -0000	1.32
+++ kolabd.spec.in	18 Sep 2008 19:53:09 -0000	1.33
@@ -65,8 +65,8 @@
 %if "%{with_horde}" == "yes"
 # FIXME (optional)
 # what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_pear = yes, 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
-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
+PreReq:       php, php::with_pear = yes, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes
+PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, php::with_spl = yes
 %else
 PreReq:       php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes, php::with_spl = yes
 PreReq:       apache-php, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_imap_annotate = yes, apache-php::with_openldap = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_dom = yes, apache-php::with_ssl = yes, apache-php::with_mbstring = yes, apache-php::with_mm = yes, php::with_spl = yes



From cvs at kolab.org  Thu Sep 18 21:54:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Sep 2008 21:54:06 +0200 (CEST)
Subject: gunnar: server Makefile,1.59,1.60 
Message-ID: <20080918195406.7DC3D600167@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Fix the package list. CVS should be clean again and the draft of Kolab Server 2.2.1 is building now.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Makefile	18 Sep 2008 19:17:38 -0000	1.59
+++ Makefile	18 Sep 2008 19:54:04 -0000	1.60
@@ -30,8 +30,10 @@
 
 PEAR_PACKAGES= pear/PEAR-Auth_SASL      \
                pear/PEAR-Date           \
+               pear/PEAR-HTTP_Request   \
                pear/PEAR-Log            \
                pear/PEAR-Mail           \
+               pear/PEAR-Mail-mimeDecode\
                pear/PEAR-Mail_Mime      \
                pear/PEAR-Net_IMAP       \
                pear/PEAR-Net_LMTP       \
@@ -39,8 +41,6 @@
                pear/PEAR-Net_Sieve      \
                pear/PEAR-Net_Socket     \
                pear/PEAR-Net_URL        \
-               pear/PEAR-HTTP_Request   \
-               pear/PEAR-Horde-Cahnnel  \
                pear/Horde_Auth          \
                pear/Horde_Browser       \
                pear/Horde_CLI           \



From cvs at kolab.org  Fri Sep 19 14:55:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 14:55:47 +0200 (CEST)
Subject: gunnar: server Makefile,1.60,1.61 
Message-ID: <20080919125547.B63FB600BA5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Ups, build the webclient too.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile	18 Sep 2008 19:54:04 -0000	1.60
+++ Makefile	19 Sep 2008 12:55:45 -0000	1.61
@@ -26,6 +26,7 @@
                kolabconf               \
                kolabd                  \
                kolab-webadmin          \
+               kolab-webclient         \
                kolab-fbview            \
 
 PEAR_PACKAGES= pear/PEAR-Auth_SASL      \



From cvs at kolab.org  Fri Sep 19 16:00:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 16:00:38 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.22,
	1.23 Kolab_Filter.spec, 1.1, 1.2 
Message-ID: <20080919140038.51E8A600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_Filter.spec 
Log Message:
Fixed the installation of some required directories.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ChangeLog	18 Sep 2008 09:29:44 -0000	1.22
+++ ChangeLog	19 Sep 2008 14:00:36 -0000	1.23
@@ -1,3 +1,7 @@
+2008-09-19  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: Fixed the installation of some required directories.
+
 2008-09-18  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Date.spec: Added package to Kolab CVS.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kolab_Filter.spec	18 Sep 2008 09:29:44 -0000	1.1
+++ Kolab_Filter.spec	19 Sep 2008 14:00:36 -0000	1.2
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.0.1
-%define         V_release 1
+%define         V_release 20080919
 
 # Package Information
 Name:	   %{V_package}
@@ -47,15 +47,17 @@
 %build
 
 %install
-        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/log
-        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/cache
+        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/log
+        %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/tmp
 
         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 -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 
+        %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                 \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/tmp    \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/log
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Fri Sep 19 16:07:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 16:07:00 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.315,1.316 
Message-ID: <20080919140700.EDD8B600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Updated the configuration for the newer Kolab_Filter package.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- release-notes.txt	18 Sep 2008 10:05:47 -0000	1.315
+++ release-notes.txt	19 Sep 2008 14:06:58 -0000	1.316
@@ -83,6 +83,8 @@
 
 	Activated sqlite support in PHP.
 
+	Updated the configuration for the newer Kolab_Filter package.
+
 	kolab/issue2910 (obsolete definition of schemacheck in slapd.conf)
 	kolab/issue2911 (Change comments around the idletimeout definiton
 	                 in the file templates/slapd.conf.template.in)



From cvs at kolab.org  Fri Sep 19 16:07:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 16:07:01 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.191,1.192 
Message-ID: <20080919140701.030D7600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Updated the configuration for the newer Kolab_Filter package.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- ChangeLog	10 Sep 2008 20:48:20 -0000	1.191
+++ ChangeLog	19 Sep 2008 14:06:58 -0000	1.192
@@ -1,3 +1,13 @@
+2008-09-19  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/master.cf.template.in: Modified the filter calls for
+	the new Kolab_Filter version.
+
+	* templates/resmgr.conf.template.in: Updated the configuration
+	template for the new Kolab_Filter version.
+
+	* dist_conf/kolab: Adapted to the newer Kolab_Filter version.
+
 2008-09-10 Richard Bos <richard at radoeka.nl>
 
 	* templates/slapd.conf.template.in: always include the horde.schema



From cvs at kolab.org  Fri Sep 19 16:07:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 16:07:01 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/dist_conf kolab,1.61,1.62 
Message-ID: <20080919140701.0FCD5600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab 
Log Message:
Updated the configuration for the newer Kolab_Filter package.

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- kolab	29 Apr 2008 14:50:49 -0000	1.61
+++ kolab	19 Sep 2008 14:06:59 -0000	1.62
@@ -168,11 +168,11 @@
 sysrundir=${localstatedir}/run
 
 resmgr_logdir=${localstatedir}/kolab-filter/log
-resmgr_confdir=${localstatedir}/kolab-filter/scripts
+resmgr_confdir=$(sysconfdir)/kolab
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 resmgr_tmpdir=${localstatedir}/kolab-filter/tmp
-resmgr_scriptsdir=${localstatedir}/kolab-filter/scripts
+resmgr_scriptsdir=${bindir}
 # @l_musr@
 resmgr_usr=${kolab_musr}
 # @l_ngrp@



From cvs at kolab.org  Fri Sep 19 16:07:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 16:07:01 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates master.cf.template.in, 1.21,
	1.22 resmgr.conf.template.in, 1.25, 1.26 
Message-ID: <20080919140701.17D87600171@lists.intevation.de>

Author: gunnar

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

Modified Files:
	master.cf.template.in resmgr.conf.template.in 
Log Message:
Updated the configuration for the newer Kolab_Filter package.

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- master.cf.template.in	3 Jul 2008 12:11:45 -0000	1.21
+++ master.cf.template.in	19 Sep 2008 14:06:59 -0000	1.22
@@ -100,9 +100,10 @@
     --
     -h @@@fqdnhostname@@@
     -s ${sender}
-    -r ${recipient}
+    --recipient=${recipient}
     -c ${client_address}
     -u ${sasl_username}
+    -C @resmgr_confdir@/kolabfilter.conf
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
     -c @phpini_dir@/php.ini
@@ -110,6 +111,7 @@
     --
     -h @@@fqdnhostname@@@
     -s ${sender}
-    -r ${recipient}
+    --recipient=${recipient}
     -c ${client_address}
+    -C @resmgr_confdir@/kolabfilter.conf
 

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- resmgr.conf.template.in	4 Aug 2008 16:37:12 -0000	1.25
+++ resmgr.conf.template.in	19 Sep 2008 14:06:59 -0000	1.26
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@resmgr_confdir@/config.php
+TARGET=@resmgr_confdir@/kolabfilter.conf
 PERMISSIONS=0640
 OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
 KOLAB_META_END
@@ -38,6 +38,7 @@
  *  kolabfilter.php and the kolabmailboxfilter.php scripts.
  *
  */
+global $conf;
 
 $conf = array();
 
@@ -126,16 +127,16 @@
 /* What is the address of the LDAP server address where user objects
  * reside
  */
-$conf['filter']['ldap_uri'] = '@@@ldap_uri@@@';
+$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
 
 /* What is the Base DN of our LDAP database? */
-$conf['filter']['base_dn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
 
 /* What DN should we use to bind to the LDAP server? */
-$conf['filter']['bind_dn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 
 /* What password should we use with the above DN when binding? */
-$conf['filter']['bind_pw'] = '@@@php_pw@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
 
 /* What account should we use to read/write calendar data? This
  * account should have access to the calendar mailbox of all



From cvs at kolab.org  Fri Sep 19 22:53:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 22:53:34 +0200 (CEST)
Subject: gunnar: server/sqlite - New directory 
Message-ID: <20080919205334.2742D600168@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/sqlite added to the repository




From cvs at kolab.org  Fri Sep 19 22:54:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 22:54:58 +0200 (CEST)
Subject: gunnar: server Makefile,1.61,1.62 
Message-ID: <20080919205458.03BCB60016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
We actually need sqlite2 as the base PHP function work with this version.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Makefile	19 Sep 2008 12:55:45 -0000	1.61
+++ Makefile	19 Sep 2008 20:54:55 -0000	1.62
@@ -15,7 +15,8 @@
               php                     \
               postfix                 \
               imapd                   \
-              gmp
+              gmp                     \
+              sqlite
 
 PERL_PACKAGES=perl-kolab              \
               kolabconf



From cvs at kolab.org  Fri Sep 19 22:54:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 19 Sep 2008 22:54:58 +0200 (CEST)
Subject: gunnar: server/sqlite .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sqlite.patch, NONE, 1.1 sqlite.spec, NONE, 1.1 
Message-ID: <20080919205458.08C32600B84@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore Makefile sqlite.patch sqlite.spec 
Log Message:
We actually need sqlite2 as the base PHP function work with this version.

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

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

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://www.sqlite.org/sqlite-2.8.17.tar.gz

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

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

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

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

	cp $(PACKAGE).spec $(PACKAGE).patch $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_pth no'

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

--- NEW FILE: sqlite.patch ---
Index: sqlite-2.8.17/configure
--- sqlite-2.8.17/configure.orig	2005-04-24 00:43:23 +0200
+++ sqlite-2.8.17/configure	2006-12-18 09:51:03 +0100
@@ -20450,7 +20450,10 @@
   TARGET_HAVE_READLINE=0
 fi
 
-
+if [ "$ac_cv_lib_readline_readline" = "no" ]
+then
+    TARGET_HAVE_READLINE=0
+fi
 
 #########
 # Figure out whether or not we have a "usleep()" function.
Index: sqlite-2.8.17/src/encode.c
--- sqlite-2.8.17/src/encode.c.orig	2005-04-24 00:43:22 +0200
+++ sqlite-2.8.17/src/encode.c	2007-02-23 15:28:03 +0100
@@ -176,6 +176,8 @@
   int i, e;
   unsigned char c;
   e = *(in++);
+  if (e == 0)
+    return 0;
   i = 0;
   while( (c = *(in++))!=0 ){
     if( c==1 ){

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

%define         V_Version 2.8.17

#   package information
Name:         sqlite
Summary:      SQL Lite
URL:          http://www.sqlite.org/
Vendor:       D. Richard Hipp
Packager:     OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class:        BASE
Group:        Database
License:      PD
Version:      2.8.17
Release:      20080919

#   package options
%option       with_utf8            no
%option       with_assert          no
%option       with_readline        no
%option       with_threads         no

#   list of sources
Source0:      http://www.sqlite.org/sqlite-%{V_Version}.tar.gz
Patch0:       sqlite.patch

#   build information
Prefix:       %{l_prefix}
BuildRoot:    %{l_buildroot}
BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gawk
PreReq:       OpenPKG, openpkg >= 20040130
%if "%{with_readline}" == "yes"
BuildPreReq:  readline, pkgconfig
PreReq:       readline
%endif
AutoReq:      no
AutoReqProv:  no

%description
    SQLite is a C library that implements an embeddable SQL database
    engine. Programs that link with the SQLite library can have SQL
    database access without running a separate RDBMS process. The
    distribution comes with a standalone command-line access program
    (sqlite) that can be used to administer an SQLite database and which
    serves as an example of how to use the SQLite library. SQLite is not
    a client library used to connect to a big database server. SQLite is
    the server. The SQLite library reads and writes directly to and from
    the database files on disk.


%prep
    %setup -q -c
    %patch -p0

    #   post-adjust sources
    chmod a+x sqlite-%{V_Version}/install-sh
    %{l_shtool} subst \
        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
        sqlite-%{V_Version}/configure

%build
    #   configure and build SQLite 3 and optionally SQLite 2
    for v in %{V_Version}; do
        ( cd sqlite-$v
          CC="%{l_cc}"
          export CC
          CPPFLAGS="%{l_cppflags}"
          export CPPFLAGS
          CFLAGS="%{l_cflags -O}"
          export CFLAGS
          LDFLAGS="%{l_ldflags}"
          export LDFLAGS
          LIBS=""
          export LIBS
%if "%{with_assert}" == "no"
          CFLAGS="$CFLAGS -DNDEBUG=1"
%endif
%if "%{with_readline}" == "yes"
          config_TARGET_READLINE_INC="%{l_cppflags readline} `%{l_prefix}/bin/pkg-config --cflags readline`"
          export config_TARGET_READLINE_INC
          config_TARGET_READLINE_LIBS="%{l_ldflags} `%{l_prefix}/bin/pkg-config --libs readline`"
          export config_TARGET_READLINE_LIBS
%endif
          ./configure \
              --prefix=%{l_prefix} \
%if "%{with_utf8}" == "yes"
              --enable-utf8 \
%endif
%if "%{with_threads}" == "yes"
              --enable-threadsafe \
%endif
              --disable-shared
%if "%{with_assert}" == "yes"
          %{l_shtool} subst \
              -e 's;-DNDEBUG;;' \
              Makefile
%endif
          MFLAGS=""
          %{l_make} %{l_mflags -O} $MFLAGS
        ) || exit $?
    done

%install
    #   create installation hierarchy
    rm -rf $RPM_BUILD_ROOT
    %{l_shtool} mkdir -f -p -m 755 \
        $RPM_BUILD_ROOT%{l_prefix}/bin \
        $RPM_BUILD_ROOT%{l_prefix}/lib \
        $RPM_BUILD_ROOT%{l_prefix}/include \
        $RPM_BUILD_ROOT%{l_prefix}/man/man1

    ( cd sqlite-%{V_Version}
      %{l_make} %{l_mflags} install \
          prefix=$RPM_BUILD_ROOT%{l_prefix}
      %{l_shtool} install -c -m 644 \
          sqlite.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/sqlite.1
    ) || exit $?

    #   strip down installation files
    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true

    #   determine installation files
    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
        %{l_files_std} \
        '%not %dir %{l_prefix}/lib/pkgconfig'

%files -f files

%clean
    rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Sat Sep 20 10:28:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 20 Sep 2008 10:28:01 +0200 (CEST)
Subject: gunnar: server/kolab-fbview Makefile,1.2,1.3 
Message-ID: <20080920082801.089AA600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Correct clean targets.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	18 Sep 2008 19:52:31 -0000	1.2
+++ Makefile	20 Sep 2008 08:27:58 -0000	1.3
@@ -38,8 +38,8 @@
 dist: all
 	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
 
-.PHONY: clean
-clean:
+.PHONY: clean_all
+clean_all:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~



From cvs at kolab.org  Sat Sep 20 10:28:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 20 Sep 2008 10:28:01 +0200 (CEST)
Subject: gunnar: server/kolab-webclient Makefile,1.3,1.4 
Message-ID: <20080920082801.09DD9600170@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Correct clean targets.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	18 Sep 2008 19:52:31 -0000	1.3
+++ Makefile	20 Sep 2008 08:27:58 -0000	1.4
@@ -41,8 +41,8 @@
 dist: all
 	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
 
-.PHONY: clean
-clean:
+.PHONY: clean_all
+clean_all:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~



From cvs at kolab.org  Mon Sep 22 08:54:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 08:54:20 +0200 (CEST)
Subject: gunnar: server cvs-kolab.sh,1.25,1.26 
Message-ID: <20080922065420.0765E600BB5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	cvs-kolab.sh 
Log Message:
Make sure the index can be generated in the SDIST_DIR.

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cvs-kolab.sh	18 Sep 2008 19:17:50 -0000	1.25
+++ cvs-kolab.sh	22 Sep 2008 06:54:17 -0000	1.26
@@ -110,6 +110,7 @@
 
     rsync -avz /"${KOLAB_DEV_USER}"/RPM/PKG/*.src.rpm "${SDIST_DIR}/"
 
+    chown -R "${KOLAB_DEV_USER}:" "${SDIST_DIR}"
     cd "${SDIST_DIR}"
 
     echo "Regenerating package index ..."



From cvs at kolab.org  Mon Sep 22 08:54:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 08:54:28 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.19,
	1.20 Kolab_FreeBusy.spec, 1.3, 1.4 
Message-ID: <20080922065428.2BEA6600BB9@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_FreeBusy.spec 
Log Message:
Fixed permissions on the cache and log dir.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog	12 Sep 2008 05:22:21 -0000	1.19
+++ ChangeLog	22 Sep 2008 06:54:26 -0000	1.20
@@ -1,3 +1,7 @@
+2008-09-22  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_FreeBusy.spec: Fixed permissions on the cache and log dir.
+
 2008-09-12  Gunnar Wrobel  <p at rdus.de>
 
 	* PEAR-Date.spec: Added package to Kolab CVS.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kolab_FreeBusy.spec	12 Sep 2008 20:12:24 -0000	1.3
+++ Kolab_FreeBusy.spec	22 Sep 2008 06:54:26 -0000	1.4
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_FreeBusy
 %define         V_version 0.0.2
-%define         V_release 1
+%define         V_release 20080922
 
 # Package Information
 Name:	   %{V_package}
@@ -59,7 +59,9 @@
 	    %{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{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} 
+        %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                     \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-freebusy/cache    \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-freebusy/log
 
 %clean
 	rm -rf $RPM_BUILD_ROOT



From cvs at kolab.org  Mon Sep 22 09:10:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 09:10:04 +0200 (CEST)
Subject: gunnar: server/pear/Horde_iCalendar Horde_iCalendar.spec, 1.1,
	1.2 Makefile, 1.1, 1.2 
Message-ID: <20080922071004.083D3600BB5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_iCalendar.spec Makefile 
Log Message:
Bumps to intermediate package version that still need to see a release upstream.

Index: Horde_iCalendar.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/Horde_iCalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_iCalendar.spec	12 Sep 2008 05:01:06 -0000	1.1
+++ Horde_iCalendar.spec	22 Sep 2008 07:10:01 -0000	1.2
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Horde_iCalendar
-%define         V_version 0.0.3
+%define         V_version 0.0.3.20080915
 %define         V_release 1
 
 # Package Information
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	12 Sep 2008 05:01:06 -0000	1.1
+++ Makefile	22 Sep 2008 07:10:01 -0000	1.2
@@ -15,7 +15,8 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Sep 22 09:10:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 09:10:04 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec,1.4,1.5 
Message-ID: <20080922071004.0908F600BB8@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_FreeBusy.spec 
Log Message:
Bumps to intermediate package version that still need to see a release upstream.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Kolab_FreeBusy.spec	22 Sep 2008 06:54:26 -0000	1.4
+++ Kolab_FreeBusy.spec	22 Sep 2008 07:10:01 -0000	1.5
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Kolab_FreeBusy
-%define         V_version 0.0.2
+%define         V_version 0.0.3
 %define         V_release 20080922
 
 # Package Information



From cvs at kolab.org  Mon Sep 22 09:10:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 09:10:04 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Util Horde_Util.spec, 1.2, 1.3 Makefile, 1.2,
	1.3 
Message-ID: <20080922071004.09480600BB9@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Horde_Util.spec Makefile 
Log Message:
Bumps to intermediate package version that still need to see a release upstream.

Index: Horde_Util.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Horde_Util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Horde_Util.spec	10 Sep 2008 10:57:01 -0000	1.2
+++ Horde_Util.spec	22 Sep 2008 07:10:01 -0000	1.3
@@ -1,6 +1,6 @@
 # Variables
 %define         V_package Horde_Util
-%define         V_version 0.0.2
+%define         V_version 0.0.2.20080915
 %define         V_release 1
 
 # Package Information
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	10 Sep 2008 10:57:01 -0000	1.2
+++ Makefile	22 Sep 2008 07:10:01 -0000	1.3
@@ -15,7 +15,8 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Sep 22 16:47:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 16:47:56 +0200 (CEST)
Subject: thomas: doc/www/src header.html.m4,1.7,1.8 
Message-ID: <20080922144756.CDD8E600165@lists.intevation.de>

Author: thomas

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

Modified Files:
	header.html.m4 
Log Message:
Added warning about kolab.org outage due to Intevation's relocation.


Index: header.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/header.html.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- header.html.m4	2 May 2007 23:59:14 -0000	1.7
+++ header.html.m4	22 Sep 2008 14:47:54 -0000	1.8
@@ -44,3 +44,10 @@
 <!-- Content box start -->
 <div class="obox">
 <div class="cbox">
+
+<font color=red><small>
+Due to Intevation's relocation on September 26th, 2008,
+kolab.org will temporarily be unavailable.
+For more information please look at the
+<a href="http://intevation.de/news.en.html">news entry</a>.
+</small></font>



From cvs at kolab.org  Mon Sep 22 17:15:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 17:15:38 +0200 (CEST)
Subject: gunnar: server/php kolab.patch,1.10,1.11 
Message-ID: <20080922151538.B7523600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab.patch 
Log Message:
Disabled building with pdo_sqlite. Potential fix for building PHP with sqlite support (without automatically requiring sqlite3).

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab.patch	18 Aug 2008 08:24:54 -0000	1.10
+++ kolab.patch	22 Sep 2008 15:15:36 -0000	1.11
@@ -44,16 +44,17 @@
  %endif
  
  %build
-@@ -396,11 +396,12 @@
+@@ -396,11 +396,11 @@
  %if "%{with_calendar}" == "yes"
          --enable-calendar \
  %endif
 -        --without-sqlite \
++        --without-pdo-sqlite \
  %if "%{with_sqlite}" == "yes"
-         --with-pdo-sqlite=%{l_prefix} \
+-        --with-pdo-sqlite=%{l_prefix} \
 +        --with-sqlite=%{l_prefix} \
  %else
-         --without-pdo-sqlite \
+-        --without-pdo-sqlite \
 +        --without-sqlite \
  %endif
  %if "%{with_mysql}" == "yes"



From cvs at kolab.org  Mon Sep 22 18:34:30 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 22 Sep 2008 18:34:30 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Auth HK-GW-Auth-Special_user_login.patch,
	NONE, 1.1 ChangeLog, 1.2, 1.3 Horde_Auth.spec, 1.3, 1.4 Makefile,
	1.3, 1.4 
Message-ID: <20080922163430.EA18E600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Horde_Auth.spec Makefile 
Added Files:
	HK-GW-Auth-Special_user_login.patch 
Log Message:
Added a patch required to allow manager to log in for special tasks.

--- NEW FILE: HK-GW-Auth-Special_user_login.patch ---
diff -r cf94ea7d6215 framework/Auth/Auth/kolab.php
--- a/framework/Auth/Auth/kolab.php	Mon Sep 22 15:16:08 2008 +0200
+++ b/framework/Auth/Auth/kolab.php	Mon Sep 22 17:53:35 2008 +0200
@@ -154,7 +154,11 @@
             if (is_a($user, 'PEAR_Error')) {
                 return $user;
             }
-            if (!is_a($user, 'Horde_Kolab_Server_Object_user')) {
+
+            global $conf;
+
+            if (empty($conf['kolab']['misc']['allow_special'])
+                && !is_a($user, 'Horde_Kolab_Server_Object_user')) {
                 return PEAR::raiseError(_('User is not a standard Kolab user.'));
             }
             $result = $user->getServer('imap');

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	16 Sep 2008 13:00:57 -0000	1.2
+++ ChangeLog	22 Sep 2008 16:34:28 -0000	1.3
@@ -1,3 +1,8 @@
+2008-09-22  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Auth.spec: Added a patch required to allow "manager" to
+	log in for special tasks.
+
 2008-09-16  Gunnar Wrobel  <p at rdus.de>
 
 	* Horde_Auth.spec: Updated to Auth-0.1.0.

Index: Horde_Auth.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Horde_Auth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Horde_Auth.spec	16 Sep 2008 13:00:57 -0000	1.3
+++ Horde_Auth.spec	22 Sep 2008 16:34:28 -0000	1.4
@@ -18,6 +18,9 @@
 # List of Sources
 Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
 
+# List of patches
+Patch0:    HK-GW-Auth-Special_user_login.patch
+
 # Build Info
 Prefix:	   %{l_prefix}
 BuildRoot: %{l_buildroot}
@@ -62,6 +65,8 @@
 
 %prep
 	%setup -n %{V_horde_package}-%{V_version}
+
+	%patch -p3 -P 0
 
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Sep 2008 13:00:57 -0000	1.3
+++ Makefile	22 Sep 2008 16:34:28 -0000	1.4
@@ -17,6 +17,7 @@
 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/")
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -34,6 +35,8 @@
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
+
+	for PATCH in $(PATCHES); do cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
 
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec



From cvs at kolab.org  Tue Sep 23 12:38:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 12:38:11 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates master.cf.template.in, 1.22,
	1.23 
Message-ID: <20080923103811.2C36160016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	master.cf.template.in 
Log Message:
Updated the configuration
template for the new Kolab_Filter version.

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- master.cf.template.in	19 Sep 2008 14:06:59 -0000	1.22
+++ master.cf.template.in	23 Sep 2008 10:38:09 -0000	1.23
@@ -96,7 +96,7 @@
 
 kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
     -c @phpini_dir@/php.ini
-    -f @resmgr_scriptsdir@/kolabfilter.php 
+    -f @resmgr_scriptsdir@/kolabfilter 
     --
     -h @@@fqdnhostname@@@
     -s ${sender}
@@ -107,7 +107,7 @@
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
     -c @phpini_dir@/php.ini
-    -f @resmgr_scriptsdir@/kolabmailboxfilter.php 
+    -f @resmgr_scriptsdir@/kolabmailboxfilter 
     --
     -h @@@fqdnhostname@@@
     -s ${sender}



From cvs at kolab.org  Tue Sep 23 12:38:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 12:38:11 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.192,1.193 
Message-ID: <20080923103811.2AC00600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Updated the configuration
template for the new Kolab_Filter version.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- ChangeLog	19 Sep 2008 14:06:58 -0000	1.192
+++ ChangeLog	23 Sep 2008 10:38:08 -0000	1.193
@@ -1,3 +1,8 @@
+2008-09-23  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/master.cf.template.in: Updated the configuration
+	template for the new Kolab_Filter version.
+
 2008-09-19  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/master.cf.template.in: Modified the filter calls for



From cvs at kolab.org  Tue Sep 23 15:10:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 15:10:39 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_SMTP PEAR-Net_SMTP.spec,1.1,1.2 
Message-ID: <20080923131039.4B25D600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	PEAR-Net_SMTP.spec 
Log Message:
Add the PEAR-Auth_SASL dependency.

Index: PEAR-Net_SMTP.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_SMTP/PEAR-Net_SMTP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Net_SMTP.spec	8 Aug 2007 16:26:45 -0000	1.1
+++ PEAR-Net_SMTP.spec	23 Sep 2008 13:10:37 -0000	1.2
@@ -28,6 +28,7 @@
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
 PreReq:	      PEAR-Net_Socket >= 1.0
+PreReq:	      PEAR-Auth_SASL
 
 %description 
 



From cvs at kolab.org  Tue Sep 23 15:11:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 15:11:14 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec,1.2,1.3 
Message-ID: <20080923131114.CFFCA600B95@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Filter.spec 
Log Message:
Update to the next experimental Kolab_Filter version.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kolab_Filter.spec	19 Sep 2008 14:00:36 -0000	1.2
+++ Kolab_Filter.spec	23 Sep 2008 13:11:12 -0000	1.3
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.0.1
-%define         V_release 20080919
+%define         V_version 0.0.1.20080923
+%define         V_release 20080923
 
 # Package Information
 Name:	   %{V_package}



From cvs at kolab.org  Tue Sep 23 15:11:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 15:11:14 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates master.cf.template.in, 1.23,
	1.24 
Message-ID: <20080923131114.C627660016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	master.cf.template.in 
Log Message:
Update to the next experimental Kolab_Filter version.

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- master.cf.template.in	23 Sep 2008 10:38:09 -0000	1.23
+++ master.cf.template.in	23 Sep 2008 13:11:12 -0000	1.24
@@ -98,20 +98,20 @@
     -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabfilter 
     --
-    -h @@@fqdnhostname@@@
-    -s ${sender}
+    --host=@@@fqdnhostname@@@
+    --sender=${sender}
     --recipient=${recipient}
-    -c ${client_address}
-    -u ${sasl_username}
-    -C @resmgr_confdir@/kolabfilter.conf
+    --client=${client_address}
+    --user=${sasl_username}
+    --config=@resmgr_confdir@/kolabfilter.conf
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
     -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabmailboxfilter 
     --
-    -h @@@fqdnhostname@@@
-    -s ${sender}
+    --host=@@@fqdnhostname@@@
+    --sender=${sender}
     --recipient=${recipient}
-    -c ${client_address}
-    -C @resmgr_confdir@/kolabfilter.conf
+    --client=${client_address}
+    --config=@resmgr_confdir@/kolabfilter.conf
 



From cvs at kolab.org  Tue Sep 23 15:47:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 15:47:53 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.26,
	1.27 
Message-ID: <20080923134753.16A42600BA2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Updated the configuration
template for the new Kolab_Filter version.

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- resmgr.conf.template.in	19 Sep 2008 14:06:59 -0000	1.26
+++ resmgr.conf.template.in	23 Sep 2008 13:47:51 -0000	1.27
@@ -44,85 +44,85 @@
 
 /* Cyrus server connection string */
 @@@if cyrus-imap@@@
-$conf['filter']['imap_server'] = '@@@connect_addr@@@';
+$conf['kolab']['filter']['imap_server'] = '@@@connect_addr@@@';
 @@@else@@@
-$conf['filter']['imap_server'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['imap_server'] = '@@@local_addr@@@';
 @@@endif@@@
 
 /* Local delivery backend (default LMTP) */
-$conf['filter']['delivery_backend'] = 'LMTP';
+$conf['kolab']['filter']['delivery_backend'] = 'LMTP';
 
 /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
-$conf['filter']['lmtp_host'] = '@@@local_addr@@@';
-$conf['filter']['lmtp_port'] = 2003;
+$conf['kolab']['filter']['lmtp_host'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['lmtp_port'] = 2003;
 
 /* SMTP settings (Kolab Postfix usually offers reinjection port on
  * 10025)
  */
-$conf['filter']['smtp_host'] = '@@@local_addr@@@';
-$conf['filter']['smtp_port'] = 10025;
+$conf['kolab']['filter']['smtp_host'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['smtp_port'] = 10025;
 
 /* Local IP address of the mailserver for bypassing content filters */
-$conf['filter']['local_addr'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['local_addr'] = '@@@local_addr@@@';
 
 /* What is our default mail domain? This is used if any users do not
  * have '@domain' specified after their username as part of their
  * email address.
  */
-$conf['filter']['email_domain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['filter']['email_domain'] = '@@@postfix-mydomain@@@';
 
 /* List of kolab hosts that are privileged */
-$conf['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';
+$conf['kolab']['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';
 
 /* List privileged networks */
-$conf['filter']['privileged_networks'] = '@@@postfix-mynetworks|join(,)@@@';
+$conf['kolab']['filter']['privileged_networks'] = '@@@postfix-mynetworks|join(,)@@@';
 
 /* Are we using virtual domains with Cyrus? */
-$conf['filter']['virtual_domains'] = true;
+$conf['kolab']['filter']['virtual_domains'] = true;
 
 /* Should we append domains to mailbox URIs? This only applies when
  * virtual_domains is true, and when using manager accounts.
  */
-$conf['filter']['append_domains'] = false;
+$conf['kolab']['filter']['append_domains'] = false;
 
 /* Should we make sure that the sender and From header match for mail
  * that origins on this server?
  */
 @@@if kolabfilter-verify-from-header@@@
-$conf['filter']['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
+$conf['kolab']['filter']['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
 @@@else@@@
-$conf['filter']['verify_from_header'] = false;
+$conf['kolab']['filter']['verify_from_header'] = false;
 @@@endif@@@
 
 /* Should we perform this check on mail from our
  * subdomains too?
  */
-$conf['filter']['verify_subdomains'] = true;
+$conf['kolab']['filter']['verify_subdomains'] = true;
 
 /* Should the Sender: header be used over From: if present? */
 @@@if kolabfilter-allow-sender-header@@@
-$conf['filter']['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
+$conf['kolab']['filter']['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
 @@@else@@@
-$conf['filter']['allow_sender_header'] = false;
+$conf['kolab']['filter']['allow_sender_header'] = false;
 @@@endif@@@
 
 /* Should reject messages with From headers that dont match
  * the envelope? Default is to rewrite the header
  */
 @@@if kolabfilter-reject-forged-from-header@@@
-$conf['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+$conf['kolab']['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
 @@@else@@@
-$conf['filter']['reject_forged_from_header'] = false;
+$conf['kolab']['filter']['reject_forged_from_header'] = false;
 @@@endif@@@
 
 /* Text to be inserted in From: when rewriting untrusted mails */
-// $conf['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-// $conf['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+// $conf['kolab']['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
+// $conf['kolab']['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
 
 /* Should we allow forwarded ical messages from Outlook
  * by encapsulating them in a MIME multipart
  */
-$conf['filter']['allow_outlook_ical_forward']  = true;
+$conf['kolab']['filter']['allow_outlook_ical_forward']  = true;
 
 /* What is the address of the LDAP server address where user objects
  * reside
@@ -142,26 +142,26 @@
  * account should have access to the calendar mailbox of all
  * resource/group mailboxes.
  */
-$conf['filter']['calendar_id'] = '@@@calendar_id@@@';
-$conf['filter']['calendar_pass'] = '@@@calendar_pw@@@';
+$conf['kolab']['filter']['calendar_id'] = '@@@calendar_id@@@';
+$conf['kolab']['filter']['calendar_pass'] = '@@@calendar_pw@@@';
 
 /* What is the name of the users' calendar mailbox?  This is only used
  * when the user does not already have a primary calendar folder
  * (search via Kolab annotation)
  */
-$conf['filter']['calendar_store'] = 'Calendar';
+$conf['kolab']['filter']['calendar_store'] = 'Calendar';
 
 /* Where can we get free/busy information from? */
-$conf['filter']['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
+$conf['kolab']['filter']['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
  
 /* PFB url to trigger creation of pfb */
-$conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.pfb';
+$conf['kolab']['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.pfb';
 
 /* Temporary data storage for the scripts */
-$conf['filter']['tempdir'] = '@resmgr_tmpdir@';
+$conf['kolab']['filter']['tempdir'] = '@resmgr_tmpdir@';
 
 /* PHP error logging */
-$conf['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
+$conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
 
 /* Horde::Log configuration
  *



From cvs at kolab.org  Tue Sep 23 15:47:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 23 Sep 2008 15:47:53 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.193,1.194 
Message-ID: <20080923134753.11307600B9E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Updated the configuration
template for the new Kolab_Filter version.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- ChangeLog	23 Sep 2008 10:38:08 -0000	1.193
+++ ChangeLog	23 Sep 2008 13:47:51 -0000	1.194
@@ -3,6 +3,9 @@
 	* templates/master.cf.template.in: Updated the configuration
 	template for the new Kolab_Filter version.
 
+	* templates/resmgr.conf.template.in: Updated the configuration
+	template for the new Kolab_Filter version.
+
 2008-09-19  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/master.cf.template.in: Modified the filter calls for



From cvs at kolab.org  Wed Sep 24 18:45:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Sep 2008 18:45:53 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Argv - New directory 
Message-ID: <20080924164553.0B2B2600B9D@lists.intevation.de>

Author: gunnar

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

Log Message:
Directory /kolabrepository/server/pear/Horde_Argv added to the repository




From cvs at kolab.org  Wed Sep 24 18:46:36 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Sep 2008 18:46:36 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Argv .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Horde_Argv.spec, NONE, 1.1 Makefile, NONE, 1.1 
Message-ID: <20080924164636.8FE7360014F@lists.intevation.de>

Author: gunnar

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

Added Files:
	.cvsignore ChangeLog Horde_Argv.spec Makefile 
Log Message:
Added package Horde_Argv.

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

--- NEW FILE: ChangeLog ---
2008-09-24  Gunnar Wrobel  <p at rdus.de>

	* Horde_Argv.spec: Added package to Kolab CVS.


--- NEW FILE: Horde_Argv.spec ---
# Variables
%define         V_horde_package Argv
%define         V_package Horde_Argv
%define         V_version 0.1.0
%define         V_release 20080924

# Package Information
Name:	   %{V_package}
Summary:   Horde command-line argument parsing package
URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:   %{V_version}
Release:   %{V_release}
License:   LGPL
Group:     Development/Libraries
Distribution:	OpenPKG

# List of Sources
Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz

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

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
BuildPreReq:  PEAR-Horde-Channel
PreReq:       OpenPKG, openpkg >= 20070603
PreReq:       php, php::with_pear = yes

%description 
This package provides classes for parsing command line arguments with
various actions, providing help, grouping options, and more.

%prep
	%setup -n %{V_horde_package}-%{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_horde_package}-%{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

--- NEW FILE: Makefile ---
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
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/$(HORDE_PACKAGE)-$(VERSION).tgz
PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")

.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)"

	for PATCH in $(PATCHES); do cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done

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

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



From cvs at kolab.org  Wed Sep 24 18:47:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Sep 2008 18:47:02 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.27,
	1.28 
Message-ID: <20080924164702.4DFF2600BA2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Adapt config to newer Kolab_Filter package.

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- resmgr.conf.template.in	23 Sep 2008 13:47:51 -0000	1.27
+++ resmgr.conf.template.in	24 Sep 2008 16:47:00 -0000	1.28
@@ -44,9 +44,9 @@
 
 /* Cyrus server connection string */
 @@@if cyrus-imap@@@
-$conf['kolab']['filter']['imap_server'] = '@@@connect_addr@@@';
+$conf['kolab']['imap']['server'] = '@@@connect_addr@@@';
 @@@else@@@
-$conf['kolab']['filter']['imap_server'] = '@@@local_addr@@@';
+$conf['kolab']['imap']['server'] = '@@@local_addr@@@';
 @@@endif@@@
 
 /* Local delivery backend (default LMTP) */



From cvs at kolab.org  Wed Sep 24 18:47:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Sep 2008 18:47:26 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec,1.3,1.4 
Message-ID: <20080924164726.1DFC9600BAF@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Filter.spec 
Log Message:
The newer package uses Horde_Argv for command line parsing.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kolab_Filter.spec	23 Sep 2008 13:11:12 -0000	1.3
+++ Kolab_Filter.spec	24 Sep 2008 16:47:24 -0000	1.4
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.0.1.20080923
-%define         V_release 20080923
+%define         V_version 0.0.1.20080924
+%define         V_release 20080924
 
 # Package Information
 Name:	   %{V_package}
@@ -35,6 +35,7 @@
 PreReq:       PEAR-Net_LMTP
 PreReq:       PEAR-Net_SMTP
 PreReq:       Horde_iCalendar
+PreReq:       Horde_Argv
 
 %description 
 The filters provided by this package implement the Kolab server



From cvs at kolab.org  Wed Sep 24 18:47:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Sep 2008 18:47:51 +0200 (CEST)
Subject: gunnar: server Makefile,1.62,1.63 
Message-ID: <20080924164751.00609600BAF@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Added Horde_Argv

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- Makefile	19 Sep 2008 20:54:55 -0000	1.62
+++ Makefile	24 Sep 2008 16:47:48 -0000	1.63
@@ -43,6 +43,7 @@
                pear/PEAR-Net_Sieve      \
                pear/PEAR-Net_Socket     \
                pear/PEAR-Net_URL        \
+               pear/Horde_Argv          \
                pear/Horde_Auth          \
                pear/Horde_Browser       \
                pear/Horde_CLI           \



From cvs at kolab.org  Thu Sep 25 11:23:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 25 Sep 2008 11:23:43 +0200 (CEST)
Subject: bernhard: doc/architecture freebusy.txt,1.23,1.24 
Message-ID: <20080925092343.47350600BB3@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/architecture
In directory doto:/tmp/cvs-serv3482

Modified Files:
	freebusy.txt 
Log Message:
Minor Clarifications:
* fixed typo "patch", the "path" was meant.
* moved the footnote closer to where it is referenced
* rephrased the paragraph that explains that only one pfb trigger is enough
Minor reformatting to fit 79 chars width.


Index: freebusy.txt
===================================================================
RCS file: /kolabrepository/doc/architecture/freebusy.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- freebusy.txt	17 Jun 2008 07:13:55 -0000	1.23
+++ freebusy.txt	25 Sep 2008 09:23:40 -0000	1.24
@@ -112,8 +112,8 @@
 attribute kolabFreeBusyFuture which is stored in the LDAP directory and a
 globally configurable constant kolabFreeBusyPast. While the former is
 defined for the kolabInetOrgPerson LDAP objectclass the later is stored in the
-kolab objectclass. As all calculations are done on the server the resulting time
-is always calculated relative to the servers local timezone.
+kolab objectclass. As all calculations are done on the server 
+the resulting time is always calculated relative to the servers local timezone.
 
 
 pfb cache
@@ -139,13 +139,14 @@
 
 https://servername/freebusy/trigger/user1 at domain.tld/calendar.pfb
 https://servername/freebusy/trigger/group1 at domain.tld/calendar.pfb
+https://servername/freebusy/trigger/user1/subfolder/Calendar.pfb
 
 We use SSL secured basic authentication for transferring the credentials to
 the server side code. The server side code then uses these credentials to
 access the calendar folders and to write the pfbs.
 
-To trigger creation of a pfb (and the corresponding pxfb at the same time),
-issue an HTTP GET request like:
+A successful trigger request will lead to the creation of both pfb and pxfb.
+Thus only one trigger is necessary and this is an HTTP GET request:
 
 	https://servername/freebusy/trigger/X/PATH/FOLDERNAME.pfb
 
@@ -153,13 +154,17 @@
 		a) primary email address
 		   Clients triggering for folders of other users could derive
 		   this from the corresponding imap path component = name
-		   and then adding "@maildomain" to it.
+		   and then adding "@maildomain.tld" to it.
 		b) the uid
-		c) the corresponding imap patch component of the user name
-		   (the server will try to add @maildomain to it.)
-		   and PATH and FOLDERNAME being UTF-8(*) encoded IMAP foldernames.
+		c) the corresponding imap path's component of the user name
+		   (the server will have to add "@maildomain.tld" to it.)
+		   and PATH and FOLDERNAME 
+		   being UTF-8(*) encoded IMAP foldernames.
 		d) any valid email alias
 
+(*) It is the job of the pfb creation script to convert the UTF-8 encoded
+paths and folder names into the imapd specific naming conventions.
+
 All pfbs are readable for every (authenticated) user
 though normal users don't require to read the pfbs
 but the pfb collector must be able
@@ -213,8 +218,6 @@
 handle empty or not existing calendar folders. A trigger call to a not existing
 or empty folder leads to deletion of any traces related to this folder in the pfb storage.
 
-(*) It is the job of the pfb creation script to convert the UTF-8 encoded
-paths and folder names into the imapd specific naming conventions.
 
 Future
 ------
@@ -224,7 +227,6 @@
 	of just triggering the creation.
 	Advantages: privacy issues if the calendar is stored somewhere
 	else, but a unified freebusy list is wanted.
-
 
 	- add referral type files for the cache hierarchy that
 	make the collector script search for an pfb elsewhere.



From cvs at kolab.org  Fri Sep 26 07:32:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 26 Sep 2008 07:32:23 +0200 (CEST)
Subject: gunnar: server/pear/Horde_iCalendar ChangeLog, 1.1,
	1.2 Horde_iCalendar.spec, 1.2, 1.3 Makefile, 1.2, 1.3 
Message-ID: <20080926053223.67806600B94@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Horde_iCalendar.spec Makefile 
Log Message:
Update to the latest release package prepared upstream.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	12 Sep 2008 05:01:06 -0000	1.1
+++ ChangeLog	26 Sep 2008 05:32:20 -0000	1.2
@@ -1,4 +1,8 @@
 2008-09-12  Gunnar Wrobel  <p at rdus.de>
 
-	* Horde_DOM.spec: Added package to Kolab CVS.
+	* Horde_iCalendar.spec: Update to 0.1.0.
+
+2008-09-12  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_iCalendar.spec: Added package to Kolab CVS.
 

Index: Horde_iCalendar.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/Horde_iCalendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Horde_iCalendar.spec	22 Sep 2008 07:10:01 -0000	1.2
+++ Horde_iCalendar.spec	26 Sep 2008 05:32:21 -0000	1.3
@@ -1,12 +1,13 @@
 # Variables
+%define         V_horde_package iCalendar
 %define         V_package Horde_iCalendar
-%define         V_version 0.0.3.20080915
-%define         V_release 1
+%define         V_version 0.1.0
+%define         V_release 20080925
 
 # Package Information
 Name:	   %{V_package}
 Summary:   iCalendar API
-URL:       http://pear.horde.org/index.php?package=%{V_package}
+URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -15,8 +16,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -34,14 +34,14 @@
 This package provides an API for dealing with iCalendar data.
 
 %prep
-	%setup -n %{V_package}-%{V_version}
+	%setup -n %{V_horde_package}-%{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_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_horde_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_iCalendar/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	22 Sep 2008 07:10:01 -0000	1.2
+++ Makefile	26 Sep 2008 05:32:21 -0000	1.3
@@ -1,3 +1,4 @@
+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/")
@@ -15,8 +16,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
-#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Fri Sep 26 07:33:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 26 Sep 2008 07:33:00 +0200 (CEST)
Subject: gunnar: server/pear/Horde_Util ChangeLog, 1.1, 1.2 Horde_Util.spec,
	1.3, 1.4 Makefile, 1.3, 1.4 
Message-ID: <20080926053300.39400600BA5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Horde_Util.spec Makefile 
Log Message:
Update to the latest release package prepared upstream.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	10 Sep 2008 09:55:48 -0000	1.1
+++ ChangeLog	26 Sep 2008 05:32:58 -0000	1.2
@@ -1,4 +1,8 @@
+2008-09-25  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Util.spec: Update to 0.1.0.
+
 2008-09-10  Gunnar Wrobel  <p at rdus.de>
 
-	* Horde_DOM.spec: Added package to Kolab CVS.
+	* Horde_Util.spec: Added package to Kolab CVS.
 

Index: Horde_Util.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Horde_Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Horde_Util.spec	22 Sep 2008 07:10:01 -0000	1.3
+++ Horde_Util.spec	26 Sep 2008 05:32:58 -0000	1.4
@@ -1,12 +1,13 @@
 # Variables
+%define         V_horde_package Util
 %define         V_package Horde_Util
-%define         V_version 0.0.2.20080915
-%define         V_release 1
+%define         V_version 0.1.0
+%define         V_release 20080925
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde Utility Libraries
-URL:       http://pear.horde.org/index.php?package=%{V_package}
+URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -15,8 +16,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -33,14 +33,14 @@
 These classes provide functionality useful for all kind of applications.
 
 %prep
-	%setup -n %{V_package}-%{V_version}
+	%setup -n %{V_horde_package}-%{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_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_horde_package}-%{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} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	22 Sep 2008 07:10:01 -0000	1.3
+++ Makefile	26 Sep 2008 05:32:58 -0000	1.4
@@ -1,3 +1,4 @@
+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/")
@@ -15,8 +16,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
-#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Sat Sep 27 22:46:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 27 Sep 2008 22:46:34 +0200 (CEST)
Subject: martin: doc/www/src about-kolab-clients.html.m4,1.25,1.26 
Message-ID: <20080927204634.D78FC600165@lists.intevation.de>

Author: martin

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

Modified Files:
	about-kolab-clients.html.m4 
Log Message:
Martin Konold: KONSEC released the a new major release


Index: about-kolab-clients.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- about-kolab-clients.html.m4	11 Jun 2008 14:47:16 -0000	1.25
+++ about-kolab-clients.html.m4	27 Sep 2008 20:46:32 -0000	1.26
@@ -93,7 +93,7 @@
 <div class="logo-text-right">
 <a name="konsec"><h3>MAPI Storage Provider for Microsoft Outlook: KONSEC Konnektor</h3></a>
 License: proprietary, with a gratis 30 day evaluation<br>
-Status: stable release 1.1.x for Kolab 2<br>
+Status: stable release 2.1.x for Kolab 2<br>
 Homepage: <a href="http://www.konsec.com/">http://www.konsec.com</a>
 <p>
 The KONSEC Konnektor is a Microsoft MAPI Storage Provider supporting
@@ -101,7 +101,11 @@
 to be interoperable with all Kolab 2 clients and special attention was given to 
 support Microsoft ActiveSync (Pocket PC PDAs) and Palm Pilots. The
 KONSEC Konnektor fully supports Kolab 2 shared public folders including
-folders containing calendars, tasks and contacts.
+folders containing calendars, tasks and contacts. In case features are required which
+cannot be properly expressed using the current Kolab XML format a fallback to TNEF is configurable.
+<p>
+The most recent major release added support for Outlook 2007, Microsoft Vista and large mailboxes (more than 2 GB).
+Synchronisation is now very fast and efficient.
 </div>
 
 



From cvs at kolab.org  Mon Sep 29 16:10:37 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Sep 2008 16:10:37 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec,1.4,1.5 
Message-ID: <20080929141037.7CBDF60016E@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Filter.spec 
Log Message:
Update to the lates Kolab_FreeBusy and Kolab_Filter packages. Adapt the configuration files.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Kolab_Filter.spec	24 Sep 2008 16:47:24 -0000	1.4
+++ Kolab_Filter.spec	29 Sep 2008 14:10:35 -0000	1.5
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.0.1.20080924
-%define         V_release 20080924
+%define         V_version 0.0.2.20080925
+%define         V_release 20080925
 
 # Package Information
 Name:	   %{V_package}
@@ -34,6 +34,7 @@
 PreReq:       Kolab_Storage
 PreReq:       PEAR-Net_LMTP
 PreReq:       PEAR-Net_SMTP
+PreReq:       PEAR-Mail
 PreReq:       Horde_iCalendar
 PreReq:       Horde_Argv
 



From cvs at kolab.org  Mon Sep 29 16:10:37 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Sep 2008 16:10:37 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.14,
	1.15 resmgr.conf.template.in, 1.28, 1.29 
Message-ID: <20080929141037.7C22660016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusy.conf.template.in resmgr.conf.template.in 
Log Message:
Update to the lates Kolab_FreeBusy and Kolab_Filter packages. Adapt the configuration files.

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- freebusy.conf.template.in	7 Dec 2007 15:44:20 -0000	1.14
+++ freebusy.conf.template.in	29 Sep 2008 14:10:35 -0000	1.15
@@ -68,6 +68,12 @@
 $conf['auth']['checkbrowser']          = false;
 $conf['auth']['checkip']               = false;
 
+/* Allow special users to log into the system */
+$conf['kolab']['misc']['allow_special'] = true;
+
+/* Do not record login attempts */
+$conf['auth']['params']['login_block'] = false;
+
 /* Kolab::Freebusy configuration */
 
 /* Should we redirect using a Location header, if the user is not local? If this
@@ -106,6 +112,13 @@
  * resulting VFB file should be?
  */
 $conf['fb']['send_content_disposition'] = false;
+
+/* Should we use ACLs or does everybody get full rights? DO NOT set
+ * this to false if you don't know what you are doing. Your free/busy
+ * service should not be visible to any outside networks when
+ * disabling the use of ACL settings.
+ */
+$conf['fb']['use_acls'] = true;
 
 /* Are there remote servers on which users have additional (shared)
  * folders? In that case free/busy information should also be fetched

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- resmgr.conf.template.in	24 Sep 2008 16:47:00 -0000	1.28
+++ resmgr.conf.template.in	29 Sep 2008 14:10:35 -0000	1.29
@@ -163,6 +163,18 @@
 /* PHP error logging */
 $conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
 
+/* Allow special users to log into the system */
+$conf['kolab']['misc']['allow_special'] = true;
+
+/* Do not record login attempts */
+$conf['auth']['params']['login_block'] = false;
+
+/* Set some configuration values for Horde_Secret:: */
+$conf['session']['timeout'] = 0;
+$conf['cookie']['path'] = '/';
+$conf['cookie']['domain'] = '@@@postfix-mydomain@@@';
+$conf['use_ssl'] = 0;
+
 /* Horde::Log configuration
  *
  * PEAR_LOG_INFO is the suggested setting for tracking what happens to



From cvs at kolab.org  Mon Sep 29 16:10:37 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Sep 2008 16:10:37 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Storage Kolab_Storage.spec, 1.1,
	1.2 Makefile, 1.1, 1.2 
Message-ID: <20080929141037.7F7F1600B90@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Storage.spec Makefile 
Log Message:
Update to the lates Kolab_FreeBusy and Kolab_Filter packages. Adapt the configuration files.

Index: Kolab_Storage.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Kolab_Storage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kolab_Storage.spec	11 Sep 2008 16:32:21 -0000	1.1
+++ Kolab_Storage.spec	29 Sep 2008 14:10:35 -0000	1.2
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Storage
-%define         V_version 0.1.0
-%define         V_release 1
+%define         V_version 0.1.0.20080925
+%define         V_release 20080925
 
 # Package Information
 Name:	   %{V_package}
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Sep 2008 16:32:21 -0000	1.1
+++ Makefile	29 Sep 2008 14:10:35 -0000	1.2
@@ -15,7 +15,9 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+# FIXME: Temporary location until I release it for real on pear.horde.org
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Sep 29 16:10:37 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Sep 2008 16:10:37 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec,1.5,1.6 
Message-ID: <20080929141037.7E175600B87@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_FreeBusy.spec 
Log Message:
Update to the lates Kolab_FreeBusy and Kolab_Filter packages. Adapt the configuration files.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Kolab_FreeBusy.spec	22 Sep 2008 07:10:01 -0000	1.5
+++ Kolab_FreeBusy.spec	29 Sep 2008 14:10:35 -0000	1.6
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_FreeBusy
-%define         V_version 0.0.3
-%define         V_release 20080922
+%define         V_version 0.0.4.20080925
+%define         V_release 20080925
 
 # Package Information
 Name:	   %{V_package}



From cvs at kolab.org  Mon Sep 29 17:05:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Sep 2008 17:05:08 +0200 (CEST)
Subject: gunnar: server/php-kolab/Kolab_Server Kolab_Server.spec, 1.1,
	1.2 Makefile, 1.1, 1.2 
Message-ID: <20080929150508.96935600168@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Kolab_Server.spec Makefile 
Log Message:
Use an intermediate dummy release for Kolab_Server for now.

Index: Kolab_Server.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/Kolab_Server.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kolab_Server.spec	10 Sep 2008 13:51:39 -0000	1.1
+++ Kolab_Server.spec	29 Sep 2008 15:05:06 -0000	1.2
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Server
-%define         V_version 0.1.1
-%define         V_release 1
+%define         V_version 0.1.1.20080929
+%define         V_release 20080929
 
 # Package Information
 Name:	   %{V_package}
@@ -15,7 +15,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
+#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 13:51:39 -0000	1.1
+++ Makefile	29 Sep 2008 15:05:06 -0000	1.2
@@ -15,7 +15,9 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+# FIXME: Temporary location until I release it for real on pear.horde.org
+SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Sep 29 18:12:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Sep 2008 18:12:35 +0200 (CEST)
Subject: thomas: doc/www/src header.html.m4,1.8,1.9 
Message-ID: <20080929161235.95C93600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	header.html.m4 
Log Message:
Removed notice about moving to a new office


Index: header.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/header.html.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- header.html.m4	22 Sep 2008 14:47:54 -0000	1.8
+++ header.html.m4	29 Sep 2008 16:12:32 -0000	1.9
@@ -44,10 +44,3 @@
 <!-- Content box start -->
 <div class="obox">
 <div class="cbox">
-
-<font color=red><small>
-Due to Intevation's relocation on September 26th, 2008,
-kolab.org will temporarily be unavailable.
-For more information please look at the
-<a href="http://intevation.de/news.en.html">news entry</a>.
-</small></font>