From cvs at kolab.org Wed Apr 2 17:42:44 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 17:42:44 +0200 (CEST) Subject: thomas: doc/architecture freebusy.txt,1.20,1.21 Message-ID: <20080402154244.87402601616@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv29292 Modified Files: freebusy.txt Log Message: space/tab cleanups Index: freebusy.txt =================================================================== RCS file: /kolabrepository/doc/architecture/freebusy.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- freebusy.txt 27 Mar 2008 17:01:56 -0000 1.20 +++ freebusy.txt 2 Apr 2008 15:42:42 -0000 1.21 @@ -7,20 +7,20 @@ fb freebusy list pfb partial freebusy list -xfb extended freebusy list -pxfb partial extended freebusy list +xfb extended freebusy list +pxfb partial extended freebusy list Task -With Kolab we want to be able to generate and download freebusy lists -describing the free and busy times of a user. -The fb is mainly used together within time overviews. +With Kolab we want to be able to generate and download freebusy lists +describing the free and busy times of a user. +The fb is mainly used together within time overviews. The most prominent use is when inviting people to an event. Problem -With Kolab we offer the user many different calendar folders. The freebusy -list of a user shall reflect the real situation as good as possible in order +With Kolab we offer the user many different calendar folders. The freebusy +list of a user shall reflect the real situation as good as possible in order to provide a really useful hint to users. There is a use for a group account with three people having access and a folder that should contain events that are just written -- not invited. @@ -31,7 +31,7 @@ User folder Calendars -A user may have several personal folders in his account. One Folder is called +A user may have several personal folders in his account. One Folder is called the default folder. The default folder is used when accepting invitations. The structure of user calendar folders is like @@ -43,9 +43,9 @@ Group Calendars -A group may have several calendars (often only one). Technically a group -calendar is just a special user account with more than one user having access -permissions. A group as opposed to a user shall be used to give +A group may have several calendars (often only one). Technically a group +calendar is just a special user account with more than one user having access +permissions. A group as opposed to a user shall be used to give folders to several users on an equal level. Each folder has an admin, which is the person which can give out rights to the folders. @@ -56,11 +56,11 @@ Multi-Group Calendars -On a Kolab server there may be several "shared folders" containing calendars. +On a Kolab server there may be several "shared folders" containing calendars. Technically those folders are like "anonymous" user accounts and a better name might be "multi-group folders". -Their indented use is to include a larger number of people, -like all members of a company. +Their indented use is to include a larger number of people, +like all members of a company. Multi-group folders will not be relevant for freebusy lists. The reason is that within larger groups of people almost never all of them have to be at an event. E.g. it is better to work with invitations @@ -74,14 +74,14 @@ Partial fb -Whenever a client writes to a calendar it MUST trigger the server based -generation of fb in the scope of the corresponding folder. We call these fb -partial fb or pfb. The real user specific fb is then generated transparently -to the requesting application on demand from the user specific pfb +Whenever a client writes to a calendar it MUST trigger the server based +generation of fb in the scope of the corresponding folder. We call these fb +partial fb or pfb. The real user specific fb is then generated transparently +to the requesting application on demand from the user specific pfb information. The following rules apply: -1. We add to the Kolab Format Specifiction a new annotation which allows to +1. We add to the Kolab Format Specifiction a new annotation which allows to express this folder is freebusy relevant. (The annotation should ideally also make that folder alarm relevant.) @@ -99,7 +99,7 @@ user/group1/calendar (1, fb) user/group2/myhierarchie/calendar (3, fb) -If a client changes the contents of one of those calenders, +If a client changes the contents of one of those calenders, it must trigger the creation of the pfb and pxfb as described below. This will be done with the credential of the user that has write permissions. @@ -111,13 +111,13 @@ 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 +kolab objectclass. As all calculations are done on the server the resulting time is always calculated relative to the servers local timezone. pfb cache -The pfb and pxfb are written to the account's pfb cache hierarchy. +The pfb and pxfb are written to the account's pfb cache hierarchy. user1/user1/calendar.pfb user1/user1/anotherhierarchy/calendar.pfb @@ -127,9 +127,9 @@ If a calendar folder is removed the corresponding pfb must also be removed. -Actually the term pfb cache is a little bit misleading as it actually is an -intermediate store which does not only cache the results of pfb trigger processes -but which implicitly also defines which pfbs are relevant to create the user specific fb. +Actually the term pfb cache is a little bit misleading as it actually is an +intermediate store which does not only cache the results of pfb trigger processes +but which implicitly also defines which pfbs are relevant to create the user specific fb. Triggering pfb @@ -138,41 +138,41 @@ https://servername/freebusy/trigger/user1 at domain.tld/calendar.pfb https://servername/freebusy/trigger/group1 at domain.tld/calendar.pfb -We use SSL secured basic authentification for transfering the credentials to -the server side code. The server side code then uses these credentials to +We use SSL secured basic authentification for transfering 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), +To trigger creation of a pfb (and the corresponding pxfb at the same time), issue an HTTP GET request like: https://servername/freebusy/trigger/X/PATH/FOLDERNAME.pfb - + with X being one of - a) primary email address + 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" 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. + and PATH and FOLDERNAME being UTF-8(*) encoded IMAP foldernames. d) any valid email alias -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 +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 to read all pfbs from potentially many servers (multi-location setups). -The pxfb are only readable -by users having read permissions on the corresponding folders. -Creation of pxfbs happens together with the pfb creation. +The pxfb are only readable +by users having read permissions on the corresponding folders. +Creation of pxfbs happens together with the pfb creation. One successful trigger does both. In general all clients writing to calendar folders on the server -must trigger the generation of pfbs. This include KDE Kontact, +must trigger the generation of pfbs. This include KDE Kontact, the Outlook Clients, the web client and the resource manager. -They must trigger after one or more write operations to one folder. -If a clients knows that it will do several write operations +They must trigger after one or more write operations to one folder. +If a clients knows that it will do several write operations during a very short interval to one folder, it should delay the trigger until it has done the operations to avoid unnecessary triggers. @@ -180,10 +180,10 @@ Pfb collector Another script with different credentials (also being able to act -without further rights) needs to collect the pfbs +without further rights) needs to collect the pfbs to create the real freebusy list. -If a freebusy list is requested the script can just +If a freebusy list is requested the script can just simply have to recursively get all pfb under the users fb cache hierachie and then the ones in the group calendar folders which the user can read and which are marked fb relevant. @@ -205,10 +205,10 @@ https://servername/freebusy/trigger/X/PATH/FOLDERNAME.pfb After calling the pfb script the Kolab client may immediately delete the emtpy -folder. +folder. On the other hand the server side pfb creation script MUST be able to -handle empty or unexisting calendar folders. A trigger call to an unexisting +handle empty or unexisting calendar folders. A trigger call to an unexisting 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 From cvs at kolab.org Wed Apr 2 17:52:31 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 17:52:31 +0200 (CEST) Subject: thomas: doc/architecture freebusy.txt,1.21,1.22 Message-ID: <20080402155231.4D65C60016E@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv29431 Modified Files: freebusy.txt Log Message: typo cleanups (though "Specifiction" has a nice connotation) Index: freebusy.txt =================================================================== RCS file: /kolabrepository/doc/architecture/freebusy.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- freebusy.txt 2 Apr 2008 15:42:42 -0000 1.21 +++ freebusy.txt 2 Apr 2008 15:52:29 -0000 1.22 @@ -81,11 +81,11 @@ information. The following rules apply: -1. We add to the Kolab Format Specifiction a new annotation which allows to +1. We add to the Kolab Format Specification a new annotation which allows to express this folder is freebusy relevant. (The annotation should ideally also make that folder alarm relevant.) -Existance of the annotation: +Existence of the annotation: for user folders: relevant for the fb of the owner for group folders: relevant for the fbs of the people with read access @@ -138,7 +138,7 @@ https://servername/freebusy/trigger/user1 at domain.tld/calendar.pfb https://servername/freebusy/trigger/group1 at domain.tld/calendar.pfb -We use SSL secured basic authentification for transfering the credentials to +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. @@ -184,7 +184,7 @@ to create the real freebusy list. If a freebusy list is requested the script can just -simply have to recursively get all pfb under the users fb cache hierachie +simply have to recursively get all pfb under the users fb cache hierarchy and then the ones in the group calendar folders which the user can read and which are marked fb relevant. @@ -204,15 +204,15 @@ https://servername/freebusy/trigger/X/PATH/FOLDERNAME.pfb -After calling the pfb script the Kolab client may immediately delete the emtpy +After calling the pfb script the Kolab client may immediately delete the empty folder. On the other hand the server side pfb creation script MUST be able to -handle empty or unexisting calendar folders. A trigger call to an unexisting +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 nameing conventions. +paths and folder names into the imapd specific naming conventions. Future ------ @@ -224,7 +224,7 @@ else, but a unified freebusy list is wanted. - - add referal type files for the cache hierachy that + - add referral type files for the cache hierarchy that make the collector script search for an pfb elsewhere. Advantage: Client could use other servers or local files for fb, too. From cvs at kolab.org Wed Apr 2 19:24:50 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:24:50 +0200 (CEST) Subject: thomas: server README.1st,1.77,1.78 Message-ID: <20080402172450.B13C6600169@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2987 Modified Files: README.1st Log Message: Mention regenerating the free/busy cache for 2.2-rc3 I started adding this because I'll rename xpfb to pxfb with the next commit as per discussion with Bernhard Reiter and thought new triggering will be necessary, but it isn't. I kept it because I hope the issues kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) and kolab/issue2461 (kolabFreeBusyPast no longer used) will be fixed in rc3. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- README.1st 17 Mar 2008 14:23:15 -0000 1.77 +++ README.1st 2 Apr 2008 17:24:48 -0000 1.78 @@ -127,7 +127,8 @@ Upgrade from 2.2-rc2 to 2.2-rc3 ------------------------------- -Nothing special has to be done for this upgrade. +You should regenerated the free/busy cache again, as described in the +upgrading instructions from 2.2-rc1 to 2.2-rc2. Upgrade from 2.2-rc1 to 2.2-rc2 From cvs at kolab.org Wed Apr 2 19:32:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:32:57 +0200 (CEST) Subject: thomas: server/kolab-filter/filter config.php,1.13,1.14 Message-ID: <20080402173257.53644600D60@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-filter/filter In directory doto:/tmp/cvs-serv3407/kolab-filter/filter Modified Files: config.php Log Message: Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too. As per discussion with Bernhard Reiter: The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so we consistently use pxfb now. Index: config.php =================================================================== RCS file: /kolabrepository/server/kolab-filter/filter/config.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- config.php 13 Mar 2008 17:36:36 -0000 1.13 +++ config.php 2 Apr 2008 17:32:55 -0000 1.14 @@ -130,7 +130,7 @@ $conf['filter']['freebusy_url'] = 'https://example.com/freebusy/${USER}.xfb'; /* PFB url to trigger creation of pfb */ -$conf['filter']['pfb_trigger_url'] = 'https://example.com/freebusy/trigger/${USER}/${FOLDER}.xpfb'; +$conf['filter']['pfb_trigger_url'] = 'https://example.com/freebusy/trigger/${USER}/${FOLDER}.pfb'; /* Temporary data storage for the scripts */ $conf['filter']['tempdir'] = ''; From cvs at kolab.org Wed Apr 2 19:32:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:32:57 +0200 (CEST) Subject: thomas: server/kolab-filter ChangeLog,1.4,1.5 Message-ID: <20080402173257.46321600174@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-filter In directory doto:/tmp/cvs-serv3407/kolab-filter Modified Files: ChangeLog Log Message: Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too. As per discussion with Bernhard Reiter: The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so we consistently use pxfb now. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-filter/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChangeLog 13 Mar 2008 17:36:36 -0000 1.4 +++ ChangeLog 2 Apr 2008 17:32:55 -0000 1.5 @@ -1,3 +1,7 @@ +2008-04-02 Thomas Arendsen Hein + + * filter/config.php: Triggering .pfb generates partial extended fb, too. + 2008-03-13 Thomas Arendsen Hein * filter/config.php: Updated via convert_template2config_php.pl From cvs at kolab.org Wed Apr 2 19:32:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:32:57 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog,1.159,1.160 Message-ID: <20080402173257.5A437600174@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv3407/kolabd/kolabd Modified Files: ChangeLog Log Message: Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too. As per discussion with Bernhard Reiter: The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so we consistently use pxfb now. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.159 retrieving revision 1.160 diff -u -d -r1.159 -r1.160 --- ChangeLog 29 Mar 2008 14:19:17 -0000 1.159 +++ ChangeLog 2 Apr 2008 17:32:55 -0000 1.160 @@ -1,3 +1,9 @@ +2008-04-02 Thomas Arendsen Hein + + * templates/httpd.conf.template.in, templates/resmgr.conf.template.in: + Rename .xpfb to .pxfb. + Triggering .pfb generates partial extended fb, too. + 2008-03-19 Richard Bos * dist_conf/common, dist_conf/centos-clarkconnect, From cvs at kolab.org Wed Apr 2 19:32:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:32:57 +0200 (CEST) Subject: thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.25, 1.26 resmgr.conf.template.in, 1.23, 1.24 Message-ID: <20080402173257.69CBE600174@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv3407/kolabd/kolabd/templates Modified Files: httpd.conf.template.in resmgr.conf.template.in Log Message: Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too. As per discussion with Bernhard Reiter: The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so we consistently use pxfb now. Index: httpd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- httpd.conf.template.in 7 Mar 2008 16:49:25 -0000 1.25 +++ httpd.conf.template.in 2 Apr 2008 17:32:55 -0000 1.26 @@ -36,8 +36,7 @@ RewriteRule ^/freebusy/([^/]+)\.xfb %{DOCUMENT_ROOT}/freebusy/freebusy.php?uid=$1&extended=1 RewriteRule ^/freebusy/trigger/(.+)\.pfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=0 RewriteRule ^/freebusy/(.+)\.pfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=1 -RewriteRule ^/freebusy/trigger/(.+)\.xpfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=0&extended=1 -RewriteRule ^/freebusy/(.+)\.xpfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=1&extended=1 +RewriteRule ^/freebusy/(.+)\.pxfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=1&extended=1 SSLEngine on Index: resmgr.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- resmgr.conf.template.in 13 Mar 2008 16:56:48 -0000 1.23 +++ resmgr.conf.template.in 2 Apr 2008 17:32:55 -0000 1.24 @@ -151,7 +151,7 @@ $conf['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}.xpfb'; +$conf['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@'; From cvs at kolab.org Wed Apr 2 19:32:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:32:57 +0200 (CEST) Subject: thomas: server/php-kolab/Kolab_Freebusy ChangeLog,1.15,1.16 Message-ID: <20080402173257.6E2FF600D60@lists.intevation.de> Author: thomas Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv3407/php-kolab/Kolab_Freebusy Modified Files: ChangeLog Log Message: Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too. As per discussion with Bernhard Reiter: The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so we consistently use pxfb now. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChangeLog 14 Mar 2008 09:17:11 -0000 1.15 +++ ChangeLog 2 Apr 2008 17:32:55 -0000 1.16 @@ -1,3 +1,9 @@ +2008-04-02 Thomas Arendsen Hein + + * Freebusy/Page.php: + Rename .xpfb to .pxfb. + Triggering .pfb generates partial extended fb, too. + 2008-03-14 Sascha Wilde * Freebusy/Page.php (class FolderAccess): Fixed determination of From cvs at kolab.org Wed Apr 2 19:32:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 2 Apr 2008 19:32:57 +0200 (CEST) Subject: thomas: server/php-kolab/Kolab_Freebusy/Freebusy Page.php,1.8,1.9 Message-ID: <20080402173257.9E702600174@lists.intevation.de> Author: thomas Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy In directory doto:/tmp/cvs-serv3407/php-kolab/Kolab_Freebusy/Freebusy Modified Files: Page.php Log Message: Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too. As per discussion with Bernhard Reiter: The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so we consistently use pxfb now. Index: Page.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Page.php 26 Mar 2008 17:35:43 -0000 1.8 +++ Page.php 2 Apr 2008 17:32:55 -0000 1.9 @@ -379,8 +379,7 @@ // RewriteRule ^([^/]+)\.xfb freebusy.php?uid=$1&extended=1 [L] // RewriteRule ^trigger/(.+)\.pfb pfb.php?folder=$1&cache=0 [L] // RewriteRule ^(.+)\.pfb pfb.php?folder=$1&cache=1 [L] - // RewriteRule ^trigger/(.+)\.xpfb pfb.php?folder=$1&cache=0&extended=1 [L] - // RewriteRule ^(.+)\.xpfb pfb.php?folder=$1&cache=1&extended=1 [L] + // RewriteRule ^(.+)\.pxfb pfb.php?folder=$1&cache=1&extended=1 [L] // if (empty($this->user) && isset($_ENV['REDIRECT_REDIRECT_REMOTE_USER'])) { $a = base64_decode(substr($_ENV['REDIRECT_REDIRECT_REMOTE_USER'], 6)) ; From cvs at kolab.org Fri Apr 4 21:33:32 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:33:32 +0200 (CEST) Subject: richard: server/kolabd/kolabd ChangeLog,1.160,1.161 Message-ID: <20080404193332.8AAFB600D65@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv10245 Modified Files: ChangeLog Log Message: changed delprune from period=1440 to at=0400, to prevent this action to run during office hours Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- ChangeLog 2 Apr 2008 17:32:55 -0000 1.160 +++ ChangeLog 4 Apr 2008 19:33:30 -0000 1.161 @@ -1,3 +1,8 @@ +2008-04-04 Richard Bos + + * templates/cyrus.conf.template.in: changed delprune from + period=1440 to at=0400 + 2008-04-02 Thomas Arendsen Hein * templates/httpd.conf.template.in, templates/resmgr.conf.template.in: From cvs at kolab.org Fri Apr 4 21:33:32 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:33:32 +0200 (CEST) Subject: richard: server/kolabd/kolabd/templates cyrus.conf.template.in, 1.6, 1.7 Message-ID: <20080404193332.89587600D63@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv10245/templates Modified Files: cyrus.conf.template.in Log Message: changed delprune from period=1440 to at=0400, to prevent this action to run during office hours Index: cyrus.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/cyrus.conf.template.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cyrus.conf.template.in 30 Nov 2007 14:27:44 -0000 1.6 +++ cyrus.conf.template.in 4 Apr 2008 19:33:30 -0000 1.7 @@ -61,7 +61,7 @@ checkpoint cmd="ctl_cyrusdb -c" period=30 # this is only necessary if using duplicate delivery suppression - delprune cmd="cyr_expire -E 3" period=1440 + delprune cmd="cyr_expire -E 3" at=0400 # this is only necessary if caching TLS sessions tlsprune cmd="tls_prune" period=1440 From cvs at kolab.org Fri Apr 4 21:36:24 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:36:24 +0200 (CEST) Subject: richard: server/kolabd/kolabd ChangeLog,1.161,1.162 Message-ID: <20080404193624.2AAE6600D67@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv10416 Modified Files: ChangeLog Log Message: added issue numer 2436 Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.161 retrieving revision 1.162 diff -u -d -r1.161 -r1.162 --- ChangeLog 4 Apr 2008 19:33:30 -0000 1.161 +++ ChangeLog 4 Apr 2008 19:36:22 -0000 1.162 @@ -1,7 +1,7 @@ 2008-04-04 Richard Bos * templates/cyrus.conf.template.in: changed delprune from - period=1440 to at=0400 + period=1440 to at=0400, (issue2436) 2008-04-02 Thomas Arendsen Hein From cvs at kolab.org Fri Apr 4 21:41:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:41:16 +0200 (CEST) Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.99, 1.100 Makefile.am, 1.54, 1.55 Message-ID: <20080404194116.F04DF600D63@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv10551 Modified Files: ChangeLog Makefile.am Log Message: updated for the changed favicon (issue2575) This favicon has a transparent background. It has been obtained from kolab's website http://www.kolab.org and it uses the same html lines. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- ChangeLog 30 Mar 2008 19:44:19 -0000 1.99 +++ ChangeLog 4 Apr 2008 19:41:14 -0000 1.100 @@ -1,3 +1,10 @@ +2008-04-03 Richard Bos + + * Added: www/favicon.png + * Removed: www/favicon.ico + * php/admin/templates/page.tpl.in: updated for the changed favicon + (issue2575) + 2008-03-30 Richard Bos * php/admin/include/mysmarty.php.in: changed $basedir.'templates into Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- Makefile.am 30 Mar 2008 19:44:19 -0000 1.54 +++ Makefile.am 4 Apr 2008 19:41:14 -0000 1.55 @@ -16,7 +16,7 @@ noinst_HEADERS = @PACKAGE at .spec -WSTOPLEVEL_FILES = www/favicon.ico +WSTOPLEVEL_FILES = www/favicon.png wstopleveldir = $(webserver_document_root)$(webserver_web_prefix) dist_wstoplevel_DATA = $(WSTOPLEVEL_FILES) From cvs at kolab.org Fri Apr 4 21:41:17 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:41:17 +0200 (CEST) Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates page.tpl.in, 1.8, 1.9 Message-ID: <20080404194117.00BC7600D65@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv10551/php/admin/templates Modified Files: page.tpl.in Log Message: updated for the changed favicon (issue2575) This favicon has a transparent background. It has been obtained from kolab's website http://www.kolab.org and it uses the same html lines. Index: page.tpl.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- page.tpl.in 23 Feb 2008 20:19:12 -0000 1.8 +++ page.tpl.in 4 Apr 2008 19:41:14 -0000 1.9 @@ -9,7 +9,7 @@ {$page_title} - + From cvs at kolab.org Fri Apr 4 21:44:23 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:44:23 +0200 (CEST) Subject: richard: server/kolab-webadmin/kolab-webadmin/www favicon.png, NONE, 1.1 Message-ID: <20080404194423.44E93600D6B@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www In directory doto:/tmp/cvs-serv10748/www Added Files: favicon.png Log Message: Add the favicon to cvs --- NEW FILE: favicon.png --- (This appears to be a binary file; contents omitted.) From cvs at kolab.org Fri Apr 4 21:44:23 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:44:23 +0200 (CEST) Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.100,1.101 Message-ID: <20080404194423.423B6600D65@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv10748 Modified Files: ChangeLog Log Message: Add the favicon to cvs Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- ChangeLog 4 Apr 2008 19:41:14 -0000 1.100 +++ ChangeLog 4 Apr 2008 19:44:21 -0000 1.101 @@ -1,7 +1,6 @@ 2008-04-03 Richard Bos * Added: www/favicon.png - * Removed: www/favicon.ico * php/admin/templates/page.tpl.in: updated for the changed favicon (issue2575) From cvs at kolab.org Fri Apr 4 21:53:45 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 4 Apr 2008 21:53:45 +0200 (CEST) Subject: richard: server release-notes.txt,1.244,1.245 Message-ID: <20080404195345.E78D860016E@lists.intevation.de> Author: richard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11250 Modified Files: release-notes.txt Log Message: Added issue's 2436 and 2575 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.244 retrieving revision 1.245 diff -u -d -r1.244 -r1.245 --- release-notes.txt 30 Mar 2008 20:03:57 -0000 1.244 +++ release-notes.txt 4 Apr 2008 19:53:43 -0000 1.245 @@ -46,6 +46,10 @@ Changes between 2.2-rc-2 and 2.2-rc-3 + - kolab + + kolab/issue2436 (delprune setting in cyrus.conf) + - php-kolab-2.2.rc3-2008???? kolab/issue2549 (Resource manager creates events in wrong account) @@ -54,6 +58,7 @@ kolab/issue2538 (Make the location of the Smarty compile directory configurable) kolab/issue2569 (rename of services to settings makes welcome screen fail) + kolab/issue2575 (Make background of favicon transparent) Changes between 2.2-rc-1 and 2.2-rc-2 From cvs at kolab.org Sat Apr 5 14:57:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:57:30 +0200 (CEST) Subject: gunnar: server/horde/horde-mimp .cvsignore, 1.1, NONE ChangeLog, 1.1, NONE Makefile, 1.1, NONE horde-mimp-kolab.spec, 1.1, NONE Message-ID: <20080405125730.EE4D3600D6F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-mimp In directory doto:/tmp/cvs-serv23015/horde-mimp Removed Files: .cvsignore ChangeLog Makefile horde-mimp-kolab.spec Log Message: Remove this as there will not be enough time for testing before 2.2 --- .cvsignore DELETED --- --- ChangeLog DELETED --- --- Makefile DELETED --- --- horde-mimp-kolab.spec DELETED --- From cvs at kolab.org Sat Apr 5 14:57:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:57:30 +0200 (CEST) Subject: gunnar: server/horde/horde-dimp .cvsignore, 1.1, NONE ChangeLog, 1.1, NONE Makefile, 1.1, NONE horde-dimp-kolab.spec, 1.1, NONE Message-ID: <20080405125730.EC85F600D59@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-dimp In directory doto:/tmp/cvs-serv23015/horde-dimp Removed Files: .cvsignore ChangeLog Makefile horde-dimp-kolab.spec Log Message: Remove this as there will not be enough time for testing before 2.2 --- .cvsignore DELETED --- --- ChangeLog DELETED --- --- Makefile DELETED --- --- horde-dimp-kolab.spec DELETED --- From cvs at kolab.org Sat Apr 5 14:59:37 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:37 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Kolab_history_driver_framework-3.2-rc3.patch, 1.1, NONE HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch, 1.1, NONE Message-ID: <20080405125937.45958600D74@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/framework In directory doto:/tmp/cvs-serv23129/horde/3.2-rc3/framework Removed Files: HK-GW-Kolab_history_driver_framework-3.2-rc3.patch HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch Log Message: We won't use these patches for 2.2. --- HK-GW-Kolab_history_driver_framework-3.2-rc3.patch DELETED --- --- HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch DELETED --- From cvs at kolab.org Sat Apr 5 14:59:37 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:37 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/dimp HK-GW-Config_dimp-3.2-rc3.patch, 1.1, NONE Message-ID: <20080405125937.3BF20600D73@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/dimp In directory doto:/tmp/cvs-serv23129/horde/3.2-rc3/dimp Removed Files: HK-GW-Config_dimp-3.2-rc3.patch Log Message: We won't use these patches for 2.2. --- HK-GW-Config_dimp-3.2-rc3.patch DELETED --- From cvs at kolab.org Sat Apr 5 14:59:37 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:37 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/mnemo HK-GW-Syncml_support_mnemo-3.2-rc3.patch, 1.1, NONE Message-ID: <20080405125937.8F15C600D73@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/mnemo In directory doto:/tmp/cvs-serv23129/horde/3.2-rc3/mnemo Removed Files: HK-GW-Syncml_support_mnemo-3.2-rc3.patch Log Message: We won't use these patches for 2.2. --- HK-GW-Syncml_support_mnemo-3.2-rc3.patch DELETED --- From cvs at kolab.org Sat Apr 5 14:59:37 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:37 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/mimp HK-GW-Config_mimp-3.2-rc3.patch, 1.1, NONE Message-ID: <20080405125937.4C8AC600D76@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/mimp In directory doto:/tmp/cvs-serv23129/horde/3.2-rc3/mimp Removed Files: HK-GW-Config_mimp-3.2-rc3.patch Log Message: We won't use these patches for 2.2. --- HK-GW-Config_mimp-3.2-rc3.patch DELETED --- From cvs at kolab.org Sat Apr 5 14:59:37 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:37 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/kronolith HK-GW-SyncML_support_kronolith-3.2-rc3.patch, 1.1, NONE Message-ID: <20080405125937.48695600D75@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/kronolith In directory doto:/tmp/cvs-serv23129/horde/3.2-rc3/kronolith Removed Files: HK-GW-SyncML_support_kronolith-3.2-rc3.patch Log Message: We won't use these patches for 2.2. --- HK-GW-SyncML_support_kronolith-3.2-rc3.patch DELETED --- From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde horde-kolab.spec,1.25,1.26 Message-ID: <20080405125957.726C7600D7E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde In directory doto:/tmp/cvs-serv23214/horde Modified Files: horde-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- horde-kolab.spec 14 Mar 2008 17:28:00 -0000 1.25 +++ horde-kolab.spec 5 Apr 2008 12:59:55 -0000 1.26 @@ -2,9 +2,9 @@ %define V_horde_name horde %define V_package %{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 -%define V_version 3.2_rc2 +%define V_month 04 +%define V_day 05 +%define V_version 3.2_rc3 %define V_uver 3.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} %define V_release %{V_year}%{V_month}%{V_day} @@ -26,7 +26,7 @@ Source1: horde-kolab-conf.template # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/horde-3.2-rc2/HK-GW-Config_horde-3.2-rc2.patch +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 # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/fbview-kronolith fbview-kronolith.spec, 1.20, 1.21 Message-ID: <20080405125957.72C2B600D7F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/fbview-kronolith In directory doto:/tmp/cvs-serv23214/fbview-kronolith Modified Files: fbview-kronolith.spec Log Message: Complete the update to horde-3.2-rc3 Index: fbview-kronolith.spec =================================================================== RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- fbview-kronolith.spec 14 Mar 2008 17:28:00 -0000 1.20 +++ fbview-kronolith.spec 5 Apr 2008 12:59:55 -0000 1.21 @@ -2,8 +2,8 @@ %define V_horde_name kronolith %define V_package fbview-%{V_horde_name} %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 2.2_rc2 %define V_uver 2.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -26,13 +26,12 @@ Source1: fbview-kronolith-conf.template # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch -Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch -Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch -Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch -Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch -Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Config_fbview-kronolith-3.2-rc2.patch - +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-kronolith/HK-GW-Config_fbview-kronolith-3.2-rc3.patch +Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-kronolith/HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch +Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-kronolith/HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch +Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-kronolith/HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch +Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-kronolith/HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch +Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-kronolith/HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-passwd horde-passwd-kolab.spec,1.16,1.17 Message-ID: <20080405125957.C4711601602@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-passwd In directory doto:/tmp/cvs-serv23214/horde-passwd Modified Files: horde-passwd-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-passwd-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- horde-passwd-kolab.spec 14 Mar 2008 17:28:02 -0000 1.16 +++ horde-passwd-kolab.spec 5 Apr 2008 12:59:55 -0000 1.17 @@ -1,9 +1,9 @@ # Versions %define V_horde_name passwd %define V_package horde-%{V_horde_name}-kolab -%define V_year 2007 -%define V_month 10 -%define V_day 01 +%define V_year 2008 +%define V_month 04 +%define V_day 05 %define V_version 3.0.1 %define V_uver 3.0.1 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -25,7 +25,7 @@ Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/passwd-3.2-rc2/HK-GW-Config_passwd-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/passwd/HK-GW-Config_passwd-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-nag horde-nag-kolab.spec,1.19,1.20 Message-ID: <20080405125957.CBA64601608@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-nag In directory doto:/tmp/cvs-serv23214/horde-nag Modified Files: horde-nag-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-nag-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- horde-nag-kolab.spec 14 Mar 2008 17:28:02 -0000 1.19 +++ horde-nag-kolab.spec 5 Apr 2008 12:59:55 -0000 1.20 @@ -2,8 +2,8 @@ %define V_horde_name nag %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 2.2_rc2 %define V_uver 2.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -23,10 +23,9 @@ # List of Sources Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz -Source1: conf.php # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/nag-3.2-rc2/HK-GW-Config_nag-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/nag/HK-GW-Config_nag-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-imp horde-imp-kolab.spec,1.19,1.20 Message-ID: <20080405125957.C39B6601601@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-imp In directory doto:/tmp/cvs-serv23214/horde-imp Modified Files: horde-imp-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-imp-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- horde-imp-kolab.spec 14 Mar 2008 17:28:02 -0000 1.19 +++ horde-imp-kolab.spec 5 Apr 2008 12:59:55 -0000 1.20 @@ -2,9 +2,9 @@ %define V_horde_name imp %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 -%define V_version 4.2_rc2 +%define V_month 04 +%define V_day 05 +%define V_version 4.2_rc3 %define V_uver 4.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} %define V_release %{V_year}%{V_month}%{V_day} @@ -25,7 +25,7 @@ Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/imp-3.2-rc2/HK-GW-Config_imp-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/imp/HK-GW-Config_imp-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-mnemo horde-mnemo-kolab.spec,1.21,1.22 Message-ID: <20080405125957.C980B601606@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-mnemo In directory doto:/tmp/cvs-serv23214/horde-mnemo Modified Files: horde-mnemo-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-mnemo-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- horde-mnemo-kolab.spec 14 Mar 2008 17:28:02 -0000 1.21 +++ horde-mnemo-kolab.spec 5 Apr 2008 12:59:55 -0000 1.22 @@ -2,8 +2,8 @@ %define V_horde_name mnemo %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 2.2_rc2 %define V_uver 2.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -25,7 +25,7 @@ Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/mnemo-3.2-rc2/HK-GW-Config_mnemo-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/mnemo/HK-GW-Config_mnemo-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-framework Makefile, 1.11, 1.12 horde-framework-kolab.spec, 1.36, 1.37 Message-ID: <20080405125957.C2625601600@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-framework In directory doto:/tmp/cvs-serv23214/horde-framework Modified Files: Makefile horde-framework-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: Makefile =================================================================== RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 14 Mar 2008 17:28:02 -0000 1.11 +++ Makefile 5 Apr 2008 12:59:55 -0000 1.12 @@ -27,7 +27,7 @@ CONFIGS = $(shell find . -name "*.php") PACKAGE_0=horde-$(HORDE_NAME)-$(VERSION).tar.bz2 -SOURCE_0=http://build.pardus.de/downloads/$(PACKAGE_0) +SOURCE_0=http://files.pardus.de/$(PACKAGE_0) .PHONY: all all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm Index: horde-framework-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- horde-framework-kolab.spec 14 Mar 2008 17:28:02 -0000 1.36 +++ horde-framework-kolab.spec 5 Apr 2008 12:59:55 -0000 1.37 @@ -2,8 +2,8 @@ %define V_horde_name framework %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 03 -%define V_day 13 +%define V_month 04 +%define V_day 05 %define V_version 3.2_rc3 %define V_date %{V_year}-%{V_month}-%{V_day} %define V_release %{V_year}%{V_month}%{V_day} @@ -26,9 +26,8 @@ # version. Horde does not provide such packages Source0: http://files.pardus.de/horde-%{V_horde_name}-%{V_version}.tar.bz2 -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch -Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch -Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Share_fixes_framework-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch +Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch # Build Info Prefix: %{l_prefix} @@ -52,7 +51,6 @@ %setup -n framework %patch -p2 -P 0 %patch -p2 -P 1 - %patch -p2 -P 2 %build From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-ingo horde-ingo-kolab.spec,1.18,1.19 Message-ID: <20080405125957.CCE3260160D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-ingo In directory doto:/tmp/cvs-serv23214/horde-ingo Modified Files: horde-ingo-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-ingo-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- horde-ingo-kolab.spec 14 Mar 2008 17:28:02 -0000 1.18 +++ horde-ingo-kolab.spec 5 Apr 2008 12:59:55 -0000 1.19 @@ -2,8 +2,8 @@ %define V_horde_name ingo %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 1.2_rc2 %define V_uver 1.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -25,7 +25,7 @@ Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/ingo-3.2-rc2/HK-GW-Config_ingo-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/ingo/HK-GW-Config_ingo-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/fbview-horde fbview-horde.spec,1.18,1.19 Message-ID: <20080405125957.CCD6F60160A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/fbview-horde In directory doto:/tmp/cvs-serv23214/fbview-horde Modified Files: fbview-horde.spec Log Message: Complete the update to horde-3.2-rc3 Index: fbview-horde.spec =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- fbview-horde.spec 14 Mar 2008 17:28:00 -0000 1.18 +++ fbview-horde.spec 5 Apr 2008 12:59:55 -0000 1.19 @@ -2,9 +2,9 @@ %define V_horde_name horde %define V_package fbview-%{V_horde_name} %define V_year 2008 -%define V_month 02 -%define V_day 26 -%define V_version 3.2_rc2 +%define V_month 04 +%define V_day 05 +%define V_version 3.2_rc3 %define V_uver 3.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} %define V_release %{V_year}%{V_month}%{V_day} @@ -26,7 +26,7 @@ Source1: fbview-horde-conf.template # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-horde-3.2-rc2/HK-GW-Config_fbview-horde-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/fbview-horde/HK-GW-Config_fbview-horde-3.2-rc3.patch # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-turba horde-turba-kolab.spec,1.23,1.24 Message-ID: <20080405125957.C49DA601604@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-turba In directory doto:/tmp/cvs-serv23214/horde-turba Modified Files: horde-turba-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-turba-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- horde-turba-kolab.spec 14 Mar 2008 17:28:02 -0000 1.23 +++ horde-turba-kolab.spec 5 Apr 2008 12:59:55 -0000 1.24 @@ -2,8 +2,8 @@ %define V_horde_name turba %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 2.2_rc3 %define V_uver 2.2-rc3 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -25,10 +25,10 @@ Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Config_turba-3.2-rc2.patch -Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch -Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Fix_share_id_change_turba-3.2-rc2.patch -Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/turba/HK-GW-Config_turba-3.2-rc3.patch +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 # Build Info Prefix: %{l_prefix} From cvs at kolab.org Sat Apr 5 14:59:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 14:59:57 +0200 (CEST) Subject: gunnar: server/horde/horde-kronolith horde-kronolith-kolab.spec, 1.23, 1.24 Message-ID: <20080405125957.CB2D8601607@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-kronolith In directory doto:/tmp/cvs-serv23214/horde-kronolith Modified Files: horde-kronolith-kolab.spec Log Message: Complete the update to horde-3.2-rc3 Index: horde-kronolith-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- horde-kronolith-kolab.spec 14 Mar 2008 17:28:02 -0000 1.23 +++ horde-kronolith-kolab.spec 5 Apr 2008 12:59:55 -0000 1.24 @@ -2,8 +2,8 @@ %define V_horde_name kronolith %define V_package horde-%{V_horde_name}-kolab %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 2.2_rc2 %define V_uver 2.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} @@ -26,11 +26,14 @@ Source1: horde-kronolith-kolab-conf.template # List of Patches -Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Config_kronolith-3.2-rc2.patch -Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch -Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch -Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch -Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch +Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-GW-Config_kronolith-3.2-rc3.patch +Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch +Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch +Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch +Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch +Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch +Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-GW-getid_kronolith-3.2-rc3.patch +Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/kronolith/HK-GW-notice_fix_kronolith-3.2-rc3.patch # Build Info Prefix: %{l_prefix} @@ -65,6 +68,9 @@ %patch -p2 -P 2 %patch -p2 -P 3 %patch -p2 -P 4 + %patch -p2 -P 5 + %patch -p2 -P 6 + %patch -p2 -P 7 cd .. %build From cvs at kolab.org Sat Apr 5 19:56:40 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 19:56:40 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.245,1.246 Message-ID: <20080405175640.A449E600D7E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv1420 Modified Files: release-notes.txt Log Message: kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.245 retrieving revision 1.246 diff -u -d -r1.245 -r1.246 --- release-notes.txt 4 Apr 2008 19:53:43 -0000 1.245 +++ release-notes.txt 5 Apr 2008 17:56:38 -0000 1.246 @@ -50,6 +50,10 @@ kolab/issue2436 (delprune setting in cyrus.conf) + - kolab-freebusy-2.2.rc3-2008???? + + kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) + - php-kolab-2.2.rc3-2008???? kolab/issue2549 (Resource manager creates events in wrong account) From cvs at kolab.org Sat Apr 5 19:56:40 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 19:56:40 +0200 (CEST) Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,1.6,1.7 Message-ID: <20080405175640.A0D72600D75@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-freebusy/freebusy In directory doto:/tmp/cvs-serv1420/kolab-freebusy/freebusy Modified Files: generatefb.php Log Message: kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) Index: generatefb.php =================================================================== RCS file: /kolabrepository/server/kolab-freebusy/freebusy/generatefb.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- generatefb.php 7 Feb 2008 09:04:46 -0000 1.6 +++ generatefb.php 5 Apr 2008 17:56:38 -0000 1.7 @@ -108,6 +108,7 @@ $owner = $req_folder[1]; unset($req_folder[1]); $trigger = $owner . '@' . $domain . '/' . join('/', $req_folder); + $trigger = String::convertCharset($trigger, 'UTF7-IMAP', 'UTF-8'); /* Validate folder access */ $result = $access->parseFolder($trigger); From cvs at kolab.org Sat Apr 5 19:56:40 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 19:56:40 +0200 (CEST) Subject: gunnar: server/kolab-freebusy ChangeLog,1.9,1.10 Message-ID: <20080405175640.A2D35600D7A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-freebusy In directory doto:/tmp/cvs-serv1420/kolab-freebusy Modified Files: ChangeLog Log Message: kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-freebusy/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChangeLog 13 Mar 2008 17:36:36 -0000 1.9 +++ ChangeLog 5 Apr 2008 17:56:38 -0000 1.10 @@ -1,3 +1,10 @@ +2008-04-05 Gunnar Wrobel

+ + * freebusy/generatefb.php: + + kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) + https://www.intevation.de/roundup/kolab/issue2536 + 2008-03-13 Thomas Arendsen Hein * freebusy/config.php: Updated via convert_template2config_php.pl From cvs at kolab.org Sat Apr 5 20:01:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 20:01:51 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.246,1.247 Message-ID: <20080405180151.3214460016D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv1684 Modified Files: release-notes.txt Log Message: kolab/issue2587 (ifb retrieval does not work for aliases anymore), kolab/issue2588 (whole day event with show-time-as free gets into the pfb) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.246 retrieving revision 1.247 diff -u -d -r1.246 -r1.247 --- release-notes.txt 5 Apr 2008 17:56:38 -0000 1.246 +++ release-notes.txt 5 Apr 2008 18:01:49 -0000 1.247 @@ -46,6 +46,11 @@ Changes between 2.2-rc-2 and 2.2-rc-3 + - horde-framework-kolab-3.2_rc3-2008???? + + kolab/issue2587 (ifb retrieval does not work for aliases anymore) + kolab/issue2588 (whole day event with show-time-as free gets into the pfb) + - kolab kolab/issue2436 (delprune setting in cyrus.conf) From cvs at kolab.org Sat Apr 5 20:01:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 20:01:51 +0200 (CEST) Subject: gunnar: server/horde/horde-framework ChangeLog, 1.14, 1.15 horde-framework-kolab.spec, 1.37, 1.38 Message-ID: <20080405180151.39766600174@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde-framework In directory doto:/tmp/cvs-serv1684/horde/horde-framework Modified Files: ChangeLog horde-framework-kolab.spec Log Message: kolab/issue2587 (ifb retrieval does not work for aliases anymore), kolab/issue2588 (whole day event with show-time-as free gets into the pfb) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChangeLog 14 Mar 2008 17:28:02 -0000 1.14 +++ ChangeLog 5 Apr 2008 18:01:49 -0000 1.15 @@ -1,3 +1,12 @@ +2008-04-05 Gunnar Wrobel

+ + * horde-framework-kolab.spec: + + kolab/issue2587 (ifb retrieval does not work for aliases anymore) + https://www.intevation.de/roundup/kolab/issue2587 + kolab/issue2588 (whole day event with show-time-as free gets into the pfb) + https://www.intevation.de/roundup/kolab/issue2588 + 2008-03-07 Gunnar Wrobel

* horde-framework-kolab.spec: Index: horde-framework-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- horde-framework-kolab.spec 5 Apr 2008 12:59:55 -0000 1.37 +++ horde-framework-kolab.spec 5 Apr 2008 18:01:49 -0000 1.38 @@ -28,6 +28,9 @@ Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch +Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-Freebusy_free_events_framework-3.2-rc3.patch +Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-LDAP_user_alias_framework-3.2-rc3.patch +Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/3.2-rc3/framework/HK-GW-xfb_correction_framework-3.2-rc3.patch # Build Info Prefix: %{l_prefix} @@ -51,6 +54,8 @@ %setup -n framework %patch -p2 -P 0 %patch -p2 -P 1 + %patch -p2 -P 2 + %patch -p2 -P 3 %build From cvs at kolab.org Sat Apr 5 20:01:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 20:01:51 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Freebusy_free_events_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-LDAP_user_alias_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-xfb_correction_framework-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.1, 1.2 Message-ID: <20080405180151.3DB3F600D75@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/framework In directory doto:/tmp/cvs-serv1684/patches/horde/3.2-rc3/framework Modified Files: HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch Added Files: 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: kolab/issue2587 (ifb retrieval does not work for aliases anymore), kolab/issue2588 (whole day event with show-time-as free gets into the pfb) --- NEW FILE: HK-GW-Freebusy_free_events_framework-3.2-rc3.patch --- diff -r 339316b5cb1d framework/Kolab/Kolab/Freebusy.php --- a/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 09:52:13 2008 +0200 +++ b/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 16:56:53 2008 +0200 @@ -453,7 +453,7 @@ class Kolab_Event { if (isset($event['show-time-as'])) { switch ($event['show-time-as']) { case 'free': - $this->status = KRONOLITH_STATUS_CANCELLED; + $this->status = KRONOLITH_STATUS_FREE; break; case 'tentative': --- NEW FILE: HK-GW-LDAP_user_alias_framework-3.2-rc3.patch --- diff -r 339316b5cb1d framework/Kolab/Kolab/LDAP.php --- a/framework/Kolab/Kolab/LDAP.php Sat Apr 05 09:52:13 2008 +0200 +++ b/framework/Kolab/Kolab/LDAP.php Sat Apr 05 17:30:50 2008 +0200 @@ -235,6 +235,7 @@ class Horde_Kolab_LDAP { $GLOBALS['conf']['kolab']['ldap']['basedn'], '(&(objectClass=kolabInetOrgPerson)(|(uid='. Horde_LDAP::quote($uid) . ')(mail=' . + Horde_LDAP::quote($uid) . ')(alias=' . Horde_LDAP::quote($uid) . ')))', array('dn', 'cn', 'mail', 'uid', 'kolabHomeServer', 'kolabFreeBusyFuture')); --- NEW FILE: HK-GW-xfb_correction_framework-3.2-rc3.patch --- diff -r d446e77a7821 framework/Kolab/Kolab.php --- a/framework/Kolab/Kolab.php Sat Apr 05 17:30:58 2008 +0200 +++ b/framework/Kolab/Kolab.php Sat Apr 05 19:49:09 2008 +0200 @@ -794,7 +794,7 @@ class Kolab { $folder = isset($matches[3]) ? $matches[3] : ''; $url = 'https://' . Kolab::getServer("imap") . - '/freebusy/trigger/' . $owner . '/' . $folder . '.xpfb'; + '/freebusy/trigger/' . $owner . '/' . $folder . '.pfb'; // now start the request $options['method'] = 'GET'; Index: HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch =================================================================== RCS file: /kolabrepository/server/patches/horde/3.2-rc3/framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 13 Mar 2008 15:37:25 -0000 1.1 +++ HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 5 Apr 2008 18:01:49 -0000 1.2 @@ -1,6 +1,18 @@ -diff -r 7d4ae482d6a2 framework/Share/Share/kolab.php ---- a/framework/Share/Share/kolab.php Thu Mar 13 07:16:33 2008 +0100 -+++ b/framework/Share/Share/kolab.php Thu Mar 13 07:16:38 2008 +0100 +diff -r e1996d696f1b framework/Kolab/Kolab/Freebusy.php +--- a/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 17:30:58 2008 +0200 ++++ b/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 19:50:58 2008 +0200 +@@ -246,7 +246,7 @@ class Horde_Kolab_Freebusy { + return $this->_xacl; + } + +- $annotation = $this->_store->_imap->getAnnotation('/vendor/kolab/xfb-readable', ++ $annotation = $this->_store->_imap->getAnnotation('/vendor/kolab/pxfb-readable-for', + 'value.shared', + $this->_folder); + if (is_a($annotation, 'PEAR_Error')) { +diff -r e1996d696f1b framework/Share/Share/kolab.php +--- a/framework/Share/Share/kolab.php Sat Apr 05 17:30:58 2008 +0200 ++++ b/framework/Share/Share/kolab.php Sat Apr 05 19:50:58 2008 +0200 @@ -17,6 +17,13 @@ define('HORDE_ANNOT_SHARE_ATTR', HORDE_A * Marks a share without a name. These shares are still invalid */ @@ -15,14 +27,19 @@ /** * Horde_Share_kolab:: provides the kolab backend for the horde share driver. -@@ -894,16 +901,135 @@ class Horde_Share_Object_kolab extends H +@@ -890,16 +897,135 @@ class Horde_Share_Object_kolab extends H */ function isDefault() { +- $imap = &$this->_shareOb->getImap(); +- $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder); +- if (is_a($annotation, 'PEAR_Error')) { + $type = $this->getType(); + if (is_a($type, 'PEAR_Error')) { -+ return false; -+ } + return false; + } +- if (empty($annotation)) { +- return false; + return $type[1]; + } + @@ -36,21 +53,15 @@ + */ + function getType() + { - $imap = &$this->_shareOb->getImap(); -- $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder); ++ $imap = &$this->_shareOb->getImap(); + $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, + 'value.shared', + $this->_folder); - if (is_a($annotation, 'PEAR_Error')) { -- return false; -- } -- if (empty($annotation)) { -- return false; -- } ++ if (is_a($annotation, 'PEAR_Error')) { ++ return $annotation; + } - $type = explode('.', $annotation); - return (!empty($type[1]) && $type[1] == 'default'); -+ return $annotation; -+ } + + if (!empty($annotation)) { + $default = false; @@ -159,7 +170,7 @@ } /** -@@ -982,6 +1108,13 @@ class Horde_Share_Object_kolab extends H +@@ -978,6 +1104,13 @@ class Horde_Share_Object_kolab extends H $default = array('source' => 'kolab', 'default' => $this->get('default'), 'name' => $this->get('name')); @@ -173,19 +184,18 @@ if (is_a($params, 'PEAR_Error') || $params == '') { $params = $default; } -@@ -1036,8 +1169,9 @@ class Horde_Share_Object_kolab extends H +@@ -1032,8 +1165,9 @@ class Horde_Share_Object_kolab extends H $value = unserialize($value); if (isset($value['default'])) { $this->data['default'] = $value['default']; -- } -- break; + unset($value['default']); -+ } + } +- break; + $value = serialize($value); default: $this->data[$attribute] = $value; -@@ -1086,6 +1220,7 @@ class Horde_Share_Object_kolab extends H +@@ -1082,6 +1216,7 @@ class Horde_Share_Object_kolab extends H } } elseif ($attribute == 'default') { $imap = &$this->_shareOb->getImap(); @@ -193,7 +203,7 @@ $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder); if (is_a($annotation, 'PEAR_Error')) { return $annotation; -@@ -1106,6 +1241,40 @@ class Horde_Share_Object_kolab extends H +@@ -1102,6 +1237,40 @@ class Horde_Share_Object_kolab extends H continue; } elseif ($attribute == 'folder') { continue; From cvs at kolab.org Sat Apr 5 20:01:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 5 Apr 2008 20:01:51 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/kronolith HK-GW-notice_fix_kronolith-3.2-rc3.patch, 1.1, 1.2 Message-ID: <20080405180151.42990600D7E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/kronolith In directory doto:/tmp/cvs-serv1684/patches/horde/3.2-rc3/kronolith Modified Files: HK-GW-notice_fix_kronolith-3.2-rc3.patch Log Message: kolab/issue2587 (ifb retrieval does not work for aliases anymore), kolab/issue2588 (whole day event with show-time-as free gets into the pfb) Index: HK-GW-notice_fix_kronolith-3.2-rc3.patch =================================================================== RCS file: /kolabrepository/server/patches/horde/3.2-rc3/kronolith/HK-GW-notice_fix_kronolith-3.2-rc3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HK-GW-notice_fix_kronolith-3.2-rc3.patch 13 Mar 2008 15:37:25 -0000 1.1 +++ HK-GW-notice_fix_kronolith-3.2-rc3.patch 5 Apr 2008 18:01:49 -0000 1.2 @@ -1,40 +1,21 @@ -diff -r fe6b81992192 kronolith/lib/Driver/kolab.php ---- a/kronolith/lib/Driver/kolab.php Wed Mar 05 08:41:51 2008 +0100 -+++ b/kronolith/lib/Driver/kolab.php Wed Mar 05 08:44:50 2008 +0100 -@@ -1380,19 +1380,23 @@ class Kronolith_Event_kolab_new extends +diff -r 3a8c7026bef9 kronolith/lib/Driver/kolab.php +--- a/kronolith/lib/Driver/kolab.php Sat Apr 05 17:30:58 2008 +0200 ++++ b/kronolith/lib/Driver/kolab.php Sat Apr 05 17:31:24 2008 +0200 +@@ -1389,7 +1389,8 @@ class Kronolith_Event_kolab_new extends $this->end = new Horde_Date($event['end-date']); $this->durMin = ($this->end->timestamp() - $this->start->timestamp()) / 60; - switch ($event['show-time-as']) { -- case 'free': -- $this->status = KRONOLITH_STATUS_CANCELLED; -- break; -- -- case 'tentative': -- $this->status = KRONOLITH_STATUS_TENTATIVE; -- break; -- -- case 'busy': -- case 'outofoffice': -- default: -- $this->status = KRONOLITH_STATUS_CONFIRMED; + if (isset($event['show-time-as'])) { + switch ($event['show-time-as']) { -+ case 'free': -+ $this->status = KRONOLITH_STATUS_CANCELLED; -+ break; -+ -+ case 'tentative': -+ $this->status = KRONOLITH_STATUS_TENTATIVE; -+ break; -+ -+ case 'busy': -+ case 'outofoffice': -+ default: -+ $this->status = KRONOLITH_STATUS_CONFIRMED; + case 'free': + $this->status = KRONOLITH_STATUS_CANCELLED; + break; +@@ -1402,6 +1403,7 @@ class Kronolith_Event_kolab_new extends + case 'outofoffice': + default: + $this->status = KRONOLITH_STATUS_CONFIRMED; + } -+ } else { -+ $this->status = KRONOLITH_STATUS_CONFIRMED; } // Recurrence From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde HK-GW-framework_3.2_RC1-Fbview_xfb_concept.patch, 1.1, NONE HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch, 1.1, NONE HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch, 1.1, NONE HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Fix_share_id_change.patch, 1.1, NONE HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch, 1.1, NONE HK-JS-kronolith_2.2_RC1-Fix_library_import.patch, 1.1, NONE HK-JS-nag_2.2_RC1-Fix_library_import.patch, 1.1, NONE HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch, 1.1, NONE HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch, 1.1, NONE README_Fbview_extra_params.patch, 1.1, NONE README_Fbview_relevance.patch, 1.1, NONE README_Fbview_save_attendees.patch, 1.1, NONE README_Fbview_xfb_access.patch, 1.1, NONE README_Fbview_xfb_concept.patch, 1.1, NONE README_Fix_Prefs_for_Ingo.patch, 1.2, NONE README_Fix_editing_contacts.patch, 1.2, NONE README_Fix_library_import.patch, 1.1, NO NE README_Fix_share_id_change.patch, 1.2, NONE README_Ldap_read_only_fix.patch, 1.2, NONE Message-ID: <20080406061242.8BBF960016E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde In directory doto:/tmp/cvs-serv29928 Removed Files: HK-GW-framework_3.2_RC1-Fbview_xfb_concept.patch HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch HK-GW-turba_2.2_RC1-Fix_share_id_change.patch HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch HK-JS-kronolith_2.2_RC1-Fix_library_import.patch HK-JS-nag_2.2_RC1-Fix_library_import.patch HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch README_Fbview_extra_params.patch README_Fbview_relevance.patch README_Fbview_save_attendees.patch README_Fbview_xfb_access.patch README_Fbview_xfb_concept.patch README_Fix_Prefs_for_Ingo.patch README_Fix_editing_contacts.patch README_Fix_library_import.patch README_Fix_share_id_change.patch README_Ldap_read_only_fix.patch Log Message: Remove the old patches --- HK-GW-framework_3.2_RC1-Fbview_xfb_concept.patch DELETED --- --- HK-GW-framework_3.2_RC1-Fix_Prefs_for_Ingo.patch DELETED --- --- HK-GW-kronolith_2.2_RC1-Fbview_relevance.patch DELETED --- --- HK-GW-kronolith_2.2_RC1-Fbview_xfb_access.patch DELETED --- --- HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch DELETED --- --- HK-GW-turba_2.2_RC1-Fix_share_id_change.patch DELETED --- --- HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch DELETED --- --- HK-JS-kronolith_2.2_RC1-Fix_library_import.patch DELETED --- --- HK-JS-nag_2.2_RC1-Fix_library_import.patch DELETED --- --- HK-SB-kronolith_2.2_RC1-Fbview_extra_params.patch DELETED --- --- HK-SB-kronolith_2.2_RC1-Fbview_save_attendees.patch DELETED --- --- README_Fbview_extra_params.patch DELETED --- --- README_Fbview_relevance.patch DELETED --- --- README_Fbview_save_attendees.patch DELETED --- --- README_Fbview_xfb_access.patch DELETED --- --- README_Fbview_xfb_concept.patch DELETED --- --- README_Fix_Prefs_for_Ingo.patch DELETED --- --- README_Fix_editing_contacts.patch DELETED --- --- README_Fix_library_import.patch DELETED --- --- README_Fix_share_id_change.patch DELETED --- --- README_Ldap_read_only_fix.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/dimp-3.2-rc2 HK-GW-Config_dimp-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.92454600174@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/dimp-3.2-rc2 In directory doto:/tmp/cvs-serv29928/dimp-3.2-rc2 Removed Files: HK-GW-Config_dimp-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_dimp-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/fbview-horde-3.2-rc2 HK-GW-Config_fbview-horde-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.94D79600D58@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/fbview-horde-3.2-rc2 In directory doto:/tmp/cvs-serv29928/fbview-horde-3.2-rc2 Removed Files: HK-GW-Config_fbview-horde-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_fbview-horde-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/framework-3.2-rc2 HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch, 1.1, NONE HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch, 1.1, NONE HK-GW-Share_fixes_framework-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.9C7A6600D6F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/framework-3.2-rc2 In directory doto:/tmp/cvs-serv29928/framework-3.2-rc2 Removed Files: HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch HK-GW-Share_fixes_framework-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch DELETED --- --- HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch DELETED --- --- HK-GW-Share_fixes_framework-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/kronolith-3.2-rc2 HK-GW-Config_kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Fbview_menu_kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch, 1.1, NONE HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch, 1.1, NONE HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.A803A600D72@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/kronolith-3.2-rc2 In directory doto:/tmp/cvs-serv29928/kronolith-3.2-rc2 Removed Files: HK-GW-Config_kronolith-3.2-rc2.patch HK-GW-Fbview_menu_kronolith-3.2-rc2.patch HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Fbview_menu_kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch DELETED --- --- HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch DELETED --- --- HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/mimp-3.2-rc2 HK-GW-Config_mimp-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.AC16E600D73@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/mimp-3.2-rc2 In directory doto:/tmp/cvs-serv29928/mimp-3.2-rc2 Removed Files: HK-GW-Config_mimp-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_mimp-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/imp-3.2-rc2 HK-GW-Config_imp-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.A1BB4600D70@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/imp-3.2-rc2 In directory doto:/tmp/cvs-serv29928/imp-3.2-rc2 Removed Files: HK-GW-Config_imp-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_imp-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/horde-3.2-rc2 HK-GW-Config_horde-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.A019260016E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/horde-3.2-rc2 In directory doto:/tmp/cvs-serv29928/horde-3.2-rc2 Removed Files: HK-GW-Config_horde-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_horde-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/ingo-3.2-rc2 HK-GW-Config_ingo-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.A4FE7600D71@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/ingo-3.2-rc2 In directory doto:/tmp/cvs-serv29928/ingo-3.2-rc2 Removed Files: HK-GW-Config_ingo-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_ingo-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/mnemo-3.2-rc2 HK-GW-Config_mnemo-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.AFAF8600D74@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/mnemo-3.2-rc2 In directory doto:/tmp/cvs-serv29928/mnemo-3.2-rc2 Removed Files: HK-GW-Config_mnemo-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_mnemo-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/turba-3.2-rc2 HK-GW-Config_turba-3.2-rc2.patch, 1.1, NONE HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch, 1.1, NONE HK-GW-Fix_share_id_change_turba-3.2-rc2.patch, 1.1, NONE HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.BBFA6600174@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/turba-3.2-rc2 In directory doto:/tmp/cvs-serv29928/turba-3.2-rc2 Removed Files: HK-GW-Config_turba-3.2-rc2.patch HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch HK-GW-Fix_share_id_change_turba-3.2-rc2.patch HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_turba-3.2-rc2.patch DELETED --- --- HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch DELETED --- --- HK-GW-Fix_share_id_change_turba-3.2-rc2.patch DELETED --- --- HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/passwd-3.2-rc2 HK-GW-Config_passwd-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.B68E4600D76@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/passwd-3.2-rc2 In directory doto:/tmp/cvs-serv29928/passwd-3.2-rc2 Removed Files: HK-GW-Config_passwd-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_passwd-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/fbview-kronolith-3.2-rc2 HK-GW-Config_fbview-kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch, 1.1, NONE HK-GW-Urlencode_fbview-kronolith-3.2-rc2.patch, 1.1, NONE HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch, 1.1, NONE HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.97C93600D59@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/fbview-kronolith-3.2-rc2 In directory doto:/tmp/cvs-serv29928/fbview-kronolith-3.2-rc2 Removed Files: HK-GW-Config_fbview-kronolith-3.2-rc2.patch HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch HK-GW-Urlencode_fbview-kronolith-3.2-rc2.patch HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_fbview-kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch DELETED --- --- HK-GW-Urlencode_fbview-kronolith-3.2-rc2.patch DELETED --- --- HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch DELETED --- --- HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:12:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:12:42 +0200 (CEST) Subject: gunnar: server/patches/horde/nag-3.2-rc2 HK-GW-Config_nag-3.2-rc2.patch, 1.1, NONE Message-ID: <20080406061242.B0B08600D75@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/nag-3.2-rc2 In directory doto:/tmp/cvs-serv29928/nag-3.2-rc2 Removed Files: HK-GW-Config_nag-3.2-rc2.patch Log Message: Remove the old patches --- HK-GW-Config_nag-3.2-rc2.patch DELETED --- From cvs at kolab.org Sun Apr 6 08:36:09 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 6 Apr 2008 08:36:09 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3 README,1.1,1.2 Message-ID: <20080406063609.544BF60016E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3 In directory doto:/tmp/cvs-serv30608 Modified Files: README Log Message: Update the patch descriptions. Index: README =================================================================== RCS file: /kolabrepository/server/patches/horde/3.2-rc3/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README 13 Mar 2008 15:37:25 -0000 1.1 +++ README 6 Apr 2008 06:36:07 -0000 1.2 @@ -1,10 +1,10 @@ ################################################### -# Veersions +# Versions ################################################### The patches match the following upstream packages: -http://files.pardus.de/horde-framework-3.2-rc3.tar.bz2 +http://files.pardus.de/horde-framework-3.2_rc3.tar.bz2 ftp://ftp.horde.org/pub/horde/horde-3.2-rc3.tar.gz ftp://ftp.horde.org/pub/imp/imp-h3-4.2-rc3.tar.gz ftp://ftp.horde.org/pub/dimp/dimp-h3-1.0-rc3.tar.gz @@ -22,50 +22,6 @@ ################################################### ------------------------------------------------------------------------- -framework/HK-GW-Kolab_history_driver_framework-3.2-rc3.patch -------------------------------------------------------------------------- - - DESCRIPTION: - - Adds an IMAP based history driver. - - IMPACT: - - Either you can't use the history system (and thus SyncML) or you - use the MySQL based backend. - - REFERENCES: - - Mercurial patch repository: - - http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/ - - HISTORY - - -------------------------------------------------------------------------- -framework/HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch -------------------------------------------------------------------------- - - DESCRIPTION: - - Adds an IMAP based SyncML driver. - - IMPACT: - - Either you can't use the SyncML system or you - use the MySQL based backend. - - REFERENCES: - - Mercurial patch repository: - - http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/ - - HISTORY - - -------------------------------------------------------------------------- framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch ------------------------------------------------------------------------- @@ -138,21 +94,17 @@ with this patch. -################################################### -# kronolith -################################################### - ------------------------------------------------------------------------- -kronolith/HK-GW-SyncML_support_kronolith-3.2-rc3.patch +framework/HK-GW-Freebusy_free_events_framework-3.2-rc3.patch ------------------------------------------------------------------------- DESCRIPTION: - Allows to synchronize the calendar data via SyncML. + Removes events marked as "free" from the free/busy list. IMPACT: - SyncML will fail. + Free events will be marked as "busy". REFERENCES: @@ -160,21 +112,26 @@ http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/ + Kolab issue: + + https://www.intevation.de/roundup/kolab/issue2588 + HISTORY Has been commited upstream and will be part of 3.2. + ------------------------------------------------------------------------- -kronolith/HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch +framework/HK-GW-LDAP_user_alias_framework-3.2-rc3.patch ------------------------------------------------------------------------- DESCRIPTION: - Fixes Horde bug 6031. + Allows using free/busy with alias addresses. IMPACT: - There maybe display problems with recurring events. + Using an alias e-mail address won't work with free/busy. REFERENCES: @@ -182,21 +139,26 @@ http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/ + Kolab issue: + + https://www.intevation.de/roundup/kolab/issue2587 + HISTORY Has been commited upstream and will be part of 3.2. + ------------------------------------------------------------------------- -kronolith/HK-GW-getid_kronolith-3.2-rc3.patch +framework/HK-GW-xfb_correction_framework-3.2-rc3.patch ------------------------------------------------------------------------- DESCRIPTION: - Fixes some incorrect getId() calls. + Fixes the trigger URL. IMPACT: - Unknown + Probably no impact. REFERENCES: @@ -208,17 +170,22 @@ Has been commited upstream and will be part of 3.2. + +################################################### +# kronolith +################################################### + ------------------------------------------------------------------------- -kronolith/HK-GW-notice_fix_kronolith-3.2-rc3.patch +kronolith/HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch ------------------------------------------------------------------------- DESCRIPTION: - Fixes a notice. + Fixes Horde bug 6031. IMPACT: - Negligible. + There maybe display problems with recurring events. REFERENCES: @@ -231,29 +198,38 @@ Has been commited upstream and will be part of 3.2. ------------------------------------------------------------------------- -kronolith/HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch -kronolith/HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch -kronolith/HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch -kronolith/HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch +kronolith/HK-GW-getid_kronolith-3.2-rc3.patch ------------------------------------------------------------------------- - See below => fbview. + DESCRIPTION: -################################################### -# mnemo -################################################### + Fixes some incorrect getId() calls. + + IMPACT: + + Unknown + + REFERENCES: + + Mercurial patch repository: + + http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/ + + HISTORY + + Has been commited upstream and will be part of 3.2. ------------------------------------------------------------------------- -mnemo/HK-GW-Syncml_support_mnemo-3.2-rc3.patch +kronolith/HK-GW-notice_fix_kronolith-3.2-rc3.patch ------------------------------------------------------------------------- DESCRIPTION: - Allows to synchronize notes via SyncML. + Fixes a notice. IMPACT: - SyncML will fail. + Negligible. REFERENCES: @@ -265,6 +241,14 @@ Has been commited upstream and will be part of 3.2. +------------------------------------------------------------------------- +kronolith/HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch +kronolith/HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch +kronolith/HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch +kronolith/HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch +------------------------------------------------------------------------- + + See below => fbview. ################################################### # turba @@ -491,4 +475,4 @@ IMPACT: - Without these patches you'll have to configure Horde yourself. \ No newline at end of file + Without these patches you'll have to configure Horde yourself. From cvs at kolab.org Thu Apr 10 12:01:24 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 12:01:24 +0200 (CEST) Subject: thomas: server release-notes.txt,1.247,1.248 Message-ID: <20080410100124.964BE60C4C2@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv7983 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.247 retrieving revision 1.248 diff -u -d -r1.247 -r1.248 --- release-notes.txt 5 Apr 2008 18:01:49 -0000 1.247 +++ release-notes.txt 10 Apr 2008 10:01:22 -0000 1.248 @@ -51,17 +51,19 @@ kolab/issue2587 (ifb retrieval does not work for aliases anymore) kolab/issue2588 (whole day event with show-time-as free gets into the pfb) - - kolab + - kolabd-2.1.99-2008???? + + Rename .xpfb to .pxfb. kolab/issue2436 (delprune setting in cyrus.conf) - - kolab-freebusy-2.2.rc3-2008???? + - kolab-filter-2.2.rc3-2008???? - kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) + Rename .xpfb to .pxfb. - - php-kolab-2.2.rc3-2008???? + - kolab-freebusy-2.2.rc3-2008???? - kolab/issue2549 (Resource manager creates events in wrong account) + kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) - kolab-webadmin-2.2.rc3-2008???? @@ -69,6 +71,16 @@ kolab/issue2569 (rename of services to settings makes welcome screen fail) kolab/issue2575 (Make background of favicon transparent) + - perl-kolab-2.2.rc3-2008???? + + Added Fedora-DS backend (inactive by default) + + - php-kolab-2.2.rc3-2008???? + + Rename .xpfb to .pxfb. + + kolab/issue2549 (Resource manager creates events in wrong account) + Changes between 2.2-rc-1 and 2.2-rc-2 @@ -134,7 +146,7 @@ - php-kolab-2.2.rc2-20080314 Fixed determination of calendar folder owner. Resmgr wasn't - able to trigger freebqusy list generation. + able to trigger freebusy list generation. kolab/issue1272 (From: header in vacation messages is marked as "Untrusted") From cvs at kolab.org Thu Apr 10 12:48:38 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 12:48:38 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php.in, 1.7, NONE Message-ID: <20080410104838.D264160C4B5@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service In directory doto:/tmp/cvs-serv9335/service Removed Files: index.php.in Log Message: Now really moved service/index.php.in to settings/index.php.in --- index.php.in DELETED --- From cvs at kolab.org Thu Apr 10 12:48:38 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 12:48:38 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/settings index.php.in, NONE, 1.1 Message-ID: <20080410104838.D585560C4B7@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings In directory doto:/tmp/cvs-serv9335/settings Added Files: index.php.in Log Message: Now really moved service/index.php.in to settings/index.php.in --- NEW FILE: index.php.in --- group() != 'admin') { array_push($errors, _("Error: You don't have Permissions to access this Menu")); } require_once('@kolab_php_module_prefix at admin/include/menu.php'); /**** Submenu for current page ***/ $menuitems[$sidx]['selected'] = 'selected'; /**** Extract data from LDAP, fill forms, write back to LDAP ***/ function postvalue( $varname ) { if( isset($_REQUEST[$varname]) && $_REQUEST[$varname] == true ) return 'TRUE'; else return 'FALSE'; } function extract_ldap_values() { global $ldap; global $pop3; global $pop3s; global $imap; global $imaps; global $sieve; global $http; global $httpallowunauthfb; global $amavis; global $quotawarn; global $freebusypast; global $postfixmydomain; global $postfixmydestination; global $postfixmynetworks; global $postfixallowunauth; global $postfixrelayhost; global $postfixrelayport; global $kolabhost; global $kolabfilterverifyfrom; global $kolabfilterallowsender; global $kolabfilterrejectforgedfrom; // Get values from LDAP if (($result = ldap_read($ldap->connection, "k=kolab,".$_SESSION['base_dn'], '(objectclass=*)')) && ($entry = ldap_first_entry($ldap->connection, $result)) && ($attrs = ldap_get_attributes($ldap->connection, $entry))) { $pop3 = $attrs['cyrus-pop3'][0]; $pop3s = $attrs['cyrus-pop3s'][0]; $imap = $attrs['cyrus-imap'][0]; $imaps = $attrs['cyrus-imaps'][0]; $sieve = $attrs['cyrus-sieve'][0]; $http = $attrs['apache-http'][0]; $httpallowunauthfb = $attrs['apache-allow-unauthenticated-fb'][0]; $amavis = $attrs['postfix-enable-virus-scan'][0]; $quotawarn = $attrs['cyrus-quotawarn'][0]; $freebusypast = $attrs['kolabFreeBusyPast'][0]; $postfixmydomain = $attrs['postfix-mydomain'][0]; $postfixmydestination = $attrs['postfix-mydestination']; unset($postfixmydestination['count']); unset( $attrs['postfix-mynetworks']['count'] ); $postfixmynetworks = join(', ',$attrs['postfix-mynetworks']); $postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0]; $postfixrelayhost = $attrs['postfix-relayhost'][0]; $postfixrelayport = $attrs['postfix-relayport'][0]; $kolabhost = $attrs['kolabHost']; unset( $kolabhost['count'] ); $kolabfilterverifyfrom = $attrs['kolabfilter-verify-from-header'][0]; $kolabfilterallowsender = $attrs['kolabfilter-allow-sender-header'][0]; $kolabfilterrejectforgedfrom = $attrs['kolabfilter-reject-forged-from-header'][0]; ldap_free_result($result); } } function toboolstr( $b ) { return ( $b == 'TRUE' )?'true':'false'; } extract_ldap_values(); $domains = $ldap->domains(); $domain_count = 0; foreach( $domains as $domain ) { // Write back to LDAP if( $_REQUEST['submitsystemalias_'.$domain_count] ) { $mail = trim($_REQUEST['systemaliasmail_'.$domain_count]); $dn = $ldap->dnForMailOrAlias( $mail ); if( !$dn ) { $errors[] = sprintf(_("No account found for email address %s"), $mail); } else { foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) { $gadr = $group.'@'.$domain; $attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ), 'cn' => $gadr, 'mail' => $gadr, 'member' => $dn ); if( !ldap_add( $ldap->connection, "cn=$gadr,".$_SESSION['base_dn'], $attrs ) ) { $errors[] = sprintf(_("LDAP Error: Failed to add distribution list %s: %s"), $gadr, $ldap->error()); } else { $messages[] = sprintf( _("Successfully created distribution list %s"), $gadr); } } } } $domain_count++; } if( $_REQUEST['submitservices'] ) { $attrs = array(); if( postvalue( 'pop3' ) != $pop3 ) $attrs['cyrus-pop3'] = postvalue( 'pop3' ); if( postvalue( 'pop3s' ) != $pop3s ) $attrs['cyrus-pop3s'] = postvalue( 'pop3s' ); if( postvalue( 'imap' ) != $imap ) $attrs['cyrus-imap'] = postvalue( 'imap' ); if( postvalue( 'imaps' ) != $imaps ) $attrs['cyrus-imaps'] = postvalue( 'imaps' ); if( postvalue( 'sieve' ) != $sieve ) $attrs['cyrus-sieve'] = postvalue( 'sieve' ); if( postvalue( 'http' ) != $http ) $attrs['apache-http'] = postvalue( 'http' ); if( postvalue( 'amavis' ) != $amavis ) $attrs['postfix-enable-virus-scan'] = postvalue( 'amavis' ); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf( _("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submitquotawarn'] ) { $attrs = array(); $attrs['cyrus-quotawarn'] = trim( $_REQUEST['quotawarn'] ); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submithttpallowunauthfb'] ) { $attrs = array(); $attrs['apache-allow-unauthenticated-fb'] = postvalue( 'httpallowunauthfb' ); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submitfreebusypast'] ) { $attrs = array(); $attrs['kolabFreeBusyPast'] = trim( $_REQUEST['freebusypast'] ); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submitpostfixmynetworks'] ) { $attrs = array(); $attrs['postfix-mynetworks'] = preg_split( "/[\s,]+/", trim( $_REQUEST['postfixmynetworks'] ) ); //if( $attrs['postfix-mynetworks'] == '' ) $attrs['postfix-mynetworks'] = array(); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submitpostfixallowunauth'] ) { $attrs = array(); $attrs['postfix-allow-unauthenticated'] = postvalue( 'postfixallowunauth' ); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submitkolabfilter'] ) { $attrs = array( 'kolabfilter-verify-from-header' => postvalue( 'kolabfilterverifyfrom' ), 'kolabfilter-allow-sender-header' => postvalue( 'kolabfilterallowsender' ), 'kolabfilter-reject-forged-from-header' => $_REQUEST['kolabfilterrejectforgedfrom']=='TRUE'?'TRUE':'FALSE' ); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } if( $_REQUEST['submitpostfixrelayhost'] ) { $host_val = trim( $_REQUEST['postfixrelayhost'] ); $port_val = trim( $_REQUEST['postfixrelayport'] ); if( $host_val == '' ) $host_val = array(); if( $port_val == '' ) $port_val = array(); $attrs = array(); $attrs['postfix-relayhost'] = $host_val; $attrs['postfix-relayport'] = $port_val; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } // Delete domain if( $_REQUEST['deletedestination'] ) { extract_ldap_values(); debug_var_dump($_REQUEST['adestination']); $key = array_search( trim($_REQUEST['adestination']),$postfixmydestination); if( $key !== false ) { unset( $postfixmydestination[ $key ] ); } $postfixmydestination = array_values( $postfixmydestination ); debug_var_dump($postfixmydestination); $attrs = array(); $attrs['postfix-mydestination'] = $postfixmydestination; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } $domain_obj_dn = 'cn='.$ldap->escape(trim($_REQUEST['adestination'])).',cn=domains,cn=internal,'.$_SESSION['base_dn']; debug("Trying to delete $domain_obj_dn"); if( !$errors && $ldap->read($domain_obj_dn) && !ldap_delete($ldap->connection, $domain_obj_dn ) ) { $errors[] = sprintf(_("LDAP Error: Failed to delete domain object %s: %s"), $domain_obj_dn, ldap_error($ldap->connection)); } } // Add domain if( $_REQUEST['adddestination'] ) { extract_ldap_values(); if( trim($_REQUEST['adestination']) ) { $postfixmydestination[] = trim($_REQUEST['adestination']); $attrs = array(); $attrs['postfix-mydestination'] = $postfixmydestination; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } } // Delete kolabhost if( $_REQUEST['deletekolabhost'] ) { extract_ldap_values(); $key = array_search( trim($_REQUEST['akolabhost']),$kolabhost); if( $key !== false ) { unset( $kolabhost[ $key ] ); } $kolabhost = array_values( $kolabhost ); $attrs = array(); $attrs['kolabhost'] = $kolabhost; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } // Add kolabhost if( $_REQUEST['addkolabhost'] ) { extract_ldap_values(); if( trim($_REQUEST['akolabhost']) ) { $kolabhost[] = trim($_REQUEST['akolabhost']); $attrs = array(); $attrs['kolabhost'] = $kolabhost; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"), ldap_error($ldap->connection)); } } } // Fill in output form extract_ldap_values(); $entries = array( array( 'service' => 'pop3', 'name' => _('POP3 Service'), 'enabled' => toboolstr( $pop3 ) ), array( 'service' => 'pop3s', 'name' => _('POP3/SSL service (TCP port 995)'), 'enabled' => toboolstr( $pop3s ) ), array( 'service' => 'imap', 'name' => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ), array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ), array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ), array( 'service' => 'http', 'name' => _('FreeBusy Service via HTTP (in addition to HTTPS)'), 'enabled' => toboolstr( $http ) ), array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'), 'enabled' => toboolstr( $amavis ) ) ); /**** Check for system aliases ****/ function exists_group( $group ) { global $ldap; $filter = '(&(objectClass=kolabGroupOfNames)(mail='.$ldap->escape($group).'))'; $res = $ldap->search( $_SESSION['base_dn'], $filter, array( 'dn' ) ); return ( $ldap->count($res) > 0 ); } /**** Insert into template and output ***/ $smarty = new MySmarty(); $smarty->assign( 'errors', $errors ); $smarty->assign( 'uid', $auth->uid() ); $smarty->assign( 'group', $auth->group() ); $smarty->assign( 'page_title', $menuitems[$sidx]['title'] ); $smarty->assign( 'entries', $entries ); $smarty->assign( 'quotawarn', $quotawarn ); $smarty->assign( 'httpallowunauthfb', toboolstr($httpallowunauthfb) ); $smarty->assign( 'freebusypast', $freebusypast ); $smarty->assign( 'postfixmydestination', $postfixmydestination ); $smarty->assign( 'postfixmynetworks', $postfixmynetworks ); $smarty->assign( 'postfixallowunauth', toboolstr($postfixallowunauth) ); $smarty->assign( 'postfixrelayhost', $postfixrelayhost ); $smarty->assign( 'postfixrelayport', $postfixrelayport ); $smarty->assign( 'kolabfilterverifyfrom', toboolstr($kolabfilterverifyfrom) ); $smarty->assign( 'kolabfilterallowsender', toboolstr($kolabfilterallowsender) ); $smarty->assign( 'kolabfilterrejectforgedfrom', toboolstr($kolabfilterrejectforgedfrom) ); $smarty->assign( 'kolabhost', $kolabhost ); $smarty->assign( 'menuitems', $menuitems ); $smarty->assign( 'submenuitems', array_key_exists('submenu', $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() ); $smarty->assign( 'maincontent', 'settings.tpl' ); $systemaliasconf = array(); if( $auth->group() == 'admin' ) { $domain_count = 0; foreach( $ldap->domains() as $domain ) { if( !exists_group( 'hostmaster@'.$domain ) || !exists_group( 'postmaster@'.$domain ) || !exists_group( 'abuse@'.$domain ) || !exists_group( 'virusalert@'.$domain ) || !exists_group( 'MAILER-DAEMON@'.$domain ) ) { // Ok, user did not set up system aliases $systemaliasconf[] = array( 'n'=>$domain_count, 'domain'=>$domain ); } $domain_count++; } } $smarty->assign( 'systemaliasconf', $systemaliasconf ); $smarty->display('page.tpl'); /* Local variables: mode: php indent-tabs-mode: t tab-width: 4 buffer-file-coding-system: utf-8 End: */ ?> From cvs at kolab.org Thu Apr 10 14:39:38 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 14:39:38 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.40, 1.41 Message-ID: <20080410123938.DDB0C60C4B5@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv12162/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.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- messages.po 26 Feb 2008 15:52:44 -0000 1.40 +++ messages.po 10 Apr 2008 12:39:36 -0000 1.41 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kolab-Webadmin German\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-03 18:11+0100\n" +"POT-Creation-Date: 2008-04-10 12:58+0200\n" "PO-Revision-Date: 2008-02-26 16:51+0100\n" "Last-Translator: Thomas Arendsen Hein \n" "Language-Team: Kolab development coordination \n" @@ -20,7 +20,7 @@ msgstr "Die Adresse mit DN" [...1053 lines suppressed...] #~ msgid "" -#~ "Account DN could not be modified, distribution list '%s' depends on it. To modify this account, " -#~ "first remove it from the distribution list." +#~ "Account DN could not be modified, distribution list '%s' depends on it. To " +#~ "modify this account, first remove it from the distribution list." #~ msgstr "" #~ "Der DN des Kontos konnte nicht verändert werden; Verteilerliste '%s' hängt davon ab. Um dieses Konto zu " -#~ "verändern, müssen Sie es erst aus der Verteilerliste entfernen." +#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s' " +#~ "hängt davon ab. Um dieses Konto zu verändern, müssen Sie es erst aus der " +#~ "Verteilerliste entfernen." #~ msgid "LDAP Error: Could not remove old entry %s,%s: %s" #~ msgstr "LDAP-Fehler: Konnte den alten Eintrag %s,%s nicht entfernen: %s" From cvs at kolab.org Thu Apr 10 14:39:38 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 14:39:38 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES messages.po, 1.22, 1.23 Message-ID: <20080410123938.EEE9B60C4BC@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES In directory doto:/tmp/cvs-serv12162/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.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- messages.po 23 Feb 2008 20:19:11 -0000 1.22 +++ messages.po 10 Apr 2008 12:39:36 -0000 1.23 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Kolab-Webadmin Italian\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-03 18:11+0100\n" +"POT-Creation-Date: 2008-04-10 12:58+0200\n" "PO-Revision-Date: 2007-11-21 14:56+0100\n" "Last-Translator: Yvette Agostini \n" "Language-Team: Kolab development coordination \n" @@ -19,7 +19,7 @@ msgstr "L'indirizzo con il DN" [...1049 lines suppressed...] +#: ../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 " @@ -2406,10 +2410,9 @@ #, fuzzy #~ msgid "" -#~ "Account DN could not be modified, distribution list '%s' depends on it. To modify this account, " -#~ "first remove it from the distribution list." +#~ "Account DN could not be modified, distribution list '%s' depends on it. To " +#~ "modify this account, first remove it from the distribution list." #~ msgstr "" #~ "Il DN dell'account non può essere modificato, la lista di distribuzione " #~ "'%s' depends on it. To modify this account, " -#~ "first remove it from the distribution list." +#~ "Account DN could not be modified, distribution list '%s' depends on it. To " +#~ "modify this account, first remove it from the distribution list." #~ msgstr "" #~ "La cuenta DN no puede ser modificada, la lista de distribución '%s' depende de ella. Para modificar esta " -#~ "cuenta, primero borrarla de la lista de distribución." +#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s' " +#~ "depende de ella. Para modificar esta cuenta, primero borrarla de la lista " +#~ "de distribución." #~ msgid "LDAP Error: Could not remove old entry %s,%s: %s" #~ msgstr "Error de LDAP: No se pudo borrar la vieja entrada %s, %s: %s" From cvs at kolab.org Thu Apr 10 14:39:39 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 14:39:39 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES messages.po, 1.41, 1.42 Message-ID: <20080410123939.0286860C4BD@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES In directory doto:/tmp/cvs-serv12162/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.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- messages.po 23 Feb 2008 20:19:12 -0000 1.41 +++ messages.po 10 Apr 2008 12:39:36 -0000 1.42 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kolab-Webadmin Dutch\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-03 18:11+0100\n" +"POT-Creation-Date: 2008-04-10 12:58+0200\n" "PO-Revision-Date: 2007-11-21 14:56+0100\n" "Last-Translator: Richard Bos \n" "Language-Team: Kolab development coordination \n" @@ -20,7 +20,7 @@ msgstr "Het adres met DN" [...1074 lines suppressed...] +#: ../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 " @@ -2384,10 +2390,9 @@ #~ msgstr "HTTP Free/Busy service (vervallen)" #~ msgid "" -#~ "Account DN could not be modified, distribution list '%s' depends on it. To modify this account, " -#~ "first remove it from the distribution list." +#~ "Account DN could not be modified, distribution list '%s' depends on it. To " +#~ "modify this account, first remove it from the distribution list." #~ msgstr "" #~ "DN account kon niet gewijzigd worden, distributielijst '%s' is hiervan " From cvs at kolab.org Thu Apr 10 14:39:38 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 14:39:38 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES messages.po, 1.26, 1.27 Message-ID: <20080410123938.E929A60C4BB@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES In directory doto:/tmp/cvs-serv12162/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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- messages.po 13 Mar 2008 17:58:13 -0000 1.26 +++ messages.po 10 Apr 2008 12:39:36 -0000 1.27 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kolab-Webadmin French\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-03 18:11+0100\n" +"POT-Creation-Date: 2008-04-10 12:58+0200\n" "PO-Revision-Date: 2008-03-13 18:56+0100\n" "Last-Translator: Benoit Mortier \n" "Language-Team: Kolab development coordination \n" @@ -23,7 +23,7 @@ msgstr "L'adresse de messagerie avec le DN" [...1229 lines suppressed...] -#: ../include/form.class.php:396 ../include/form.class.php:399 -msgid "Required field " -msgstr "Champ obligatoire" +#: ../include/ldap.class.php.in:260 +#, php-format +msgid "Error searching for DN for alias=%s: %s" +msgstr "Erreur de recherche du DN pour alias=%s: %s" -#: ../include/form.class.php:396 ../include/form.class.php:399 -msgid " is empty" -msgstr " est vide" +#: ../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 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 Thu Apr 10 16:05:20 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 16:05:20 +0200 (CEST) Subject: thomas: server/horde/horde-kolab-client ChangeLog, 1.2, 1.3 horde-kolab-client.spec, 1.12, 1.13 Message-ID: <20080410140520.84DAA60C4C6@lists.intevation.de> Author: thomas Update of /kolabrepository/server/horde/horde-kolab-client In directory doto:/tmp/cvs-serv15089 Modified Files: ChangeLog horde-kolab-client.spec Log Message: Removed dependency on dimp and mimp which got excluded for now. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/horde/horde-kolab-client/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 29 Nov 2007 08:25:52 -0000 1.2 +++ ChangeLog 10 Apr 2008 14:05:18 -0000 1.3 @@ -1,3 +1,8 @@ +2008-04-10 Thomas Arendsen Hein + + * horde-kolab-client.spec: Removed dependency on dimp and mimp which + got excluded for now. + 2007-11-29 Gunnar Wrobel

* horde-kolab-client.spec: Update to RC1 Index: horde-kolab-client.spec =================================================================== RCS file: /kolabrepository/server/horde/horde-kolab-client/horde-kolab-client.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- horde-kolab-client.spec 14 Mar 2008 17:28:02 -0000 1.12 +++ horde-kolab-client.spec 10 Apr 2008 14:05:18 -0000 1.13 @@ -1,8 +1,8 @@ # Versions %define V_package horde-kolab-client %define V_year 2008 -%define V_month 02 -%define V_day 26 +%define V_month 04 +%define V_day 05 %define V_version 0.99 %define V_date %{V_year}-%{V_month}-%{V_day} %define V_release %{V_year}%{V_month}%{V_day} @@ -30,8 +30,8 @@ PreReq: horde-framework-kolab >= 3.1.4.99-%{V_release} PreReq: horde-kolab >= 3.1.4.99-%{V_release} PreReq: horde-imp-kolab >= 4.1.4.99-%{V_release} -PreReq: horde-dimp-kolab >= 0.99-%{V_release} -PreReq: horde-mimp-kolab >= 1.0.99-%{V_release} +#PreReq: horde-dimp-kolab >= 0.99-%{V_release} +#PreReq: horde-mimp-kolab >= 1.0.99-%{V_release} PreReq: horde-ingo-kolab >= 1.1.3.99-%{V_release} PreReq: horde-kronolith-kolab >= 2.1.5.99-%{V_release} PreReq: horde-mnemo-kolab >= 2.1.1.99-%{V_release} From cvs at kolab.org Thu Apr 10 19:31:07 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 19:31:07 +0200 (CEST) Subject: thomas: server release-notes.txt,1.248,1.249 Message-ID: <20080410173107.DC15F60C4C4@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20511 Modified Files: release-notes.txt Log Message: imapd: Send changed version string 'kolab-nocaps' if "with_kolab_nocaps = yes". IMAP clients can use this to determine the behavior after sending STARTTLS. See kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.248 retrieving revision 1.249 diff -u -d -r1.248 -r1.249 --- release-notes.txt 10 Apr 2008 10:01:22 -0000 1.248 +++ release-notes.txt 10 Apr 2008 17:31:05 -0000 1.249 @@ -51,6 +51,11 @@ kolab/issue2587 (ifb retrieval does not work for aliases anymore) kolab/issue2588 (whole day event with show-time-as free gets into the pfb) + - imapd-2.3.11-20080101_kolab3 + + kolab/issue2443 (kontact aborts sieve when imapd sends capabilities + after starttls) + - kolabd-2.1.99-2008???? Rename .xpfb to .pxfb. From cvs at kolab.org Thu Apr 10 19:31:07 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 19:31:07 +0200 (CEST) Subject: thomas: server/imapd Makefile,1.33,1.34 kolab.patch,1.35,1.36 Message-ID: <20080410173107.DC36E60C4C5@lists.intevation.de> Author: thomas Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv20511/imapd Modified Files: Makefile kolab.patch Log Message: imapd: Send changed version string 'kolab-nocaps' if "with_kolab_nocaps = yes". IMAP clients can use this to determine the behavior after sending STARTTLS. See kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls) Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Makefile 11 Mar 2008 15:58:35 -0000 1.33 +++ Makefile 10 Apr 2008 17:31:05 -0000 1.34 @@ -17,7 +17,7 @@ PACKAGE=imapd VERSION=2.3.11 RELEASE=20080101 -KOLABRELEASE=20080101_kolab2 +KOLABRELEASE=20080101_kolab3 PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \ $(KOLABCVSDIR)/imapd.patch.group Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- kolab.patch 11 Mar 2008 16:02:38 -0000 1.35 +++ kolab.patch 10 Apr 2008 17:31:05 -0000 1.36 @@ -1,11 +1,11 @@ --- imapd.spec.orig 2008-01-01 15:31:56.000000000 +0100 -+++ imapd.spec 2008-03-11 17:00:23.964783000 +0100 ++++ imapd.spec 2008-04-10 19:23:09.194783000 +0200 @@ -32,7 +32,7 @@ Group: Mail License: BSD Version: 2.3.11 -Release: 20080101 -+Release: 20080101_kolab2 ++Release: 20080101_kolab3 # package options %option with_fsl yes @@ -37,7 +37,19 @@ # add optional DRAC file support %if "%{with_drac}" == "yes" %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch -@@ -410,9 +417,6 @@ +@@ -286,7 +293,11 @@ + %if "%{with_nntp}" == "yes" + --enable-nntp \ + %endif ++%if "%{with_kolab_nocaps}" == "yes" ++ --with-extraident=kolab-nocaps \ ++%else + --with-extraident=openpkg \ ++%endif + --without-krb + + # build program +@@ -410,9 +421,6 @@ # before erase, stop service and remove log and temporary files if [ $1 -eq 0 ]; then %{l_rc} imapd stop 2>/dev/null From cvs at kolab.org Thu Apr 10 19:33:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Apr 2008 19:33:30 +0200 (CEST) Subject: thomas: server release-notes.txt,1.249,1.250 Message-ID: <20080410173330.EEDAE60C4C5@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20646 Modified Files: release-notes.txt Log Message: release notes: break long lines Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.249 retrieving revision 1.250 diff -u -d -r1.249 -r1.250 --- release-notes.txt 10 Apr 2008 17:31:05 -0000 1.249 +++ release-notes.txt 10 Apr 2008 17:33:28 -0000 1.250 @@ -49,7 +49,8 @@ - horde-framework-kolab-3.2_rc3-2008???? kolab/issue2587 (ifb retrieval does not work for aliases anymore) - kolab/issue2588 (whole day event with show-time-as free gets into the pfb) + kolab/issue2588 (whole day event with show-time-as free gets into the + pfb) - imapd-2.3.11-20080101_kolab3 @@ -68,12 +69,15 @@ - kolab-freebusy-2.2.rc3-2008???? - kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) + kolab/issue2536 (generatefb.php doesn't work with folders containing + umlauts) - kolab-webadmin-2.2.rc3-2008???? - kolab/issue2538 (Make the location of the Smarty compile directory configurable) - kolab/issue2569 (rename of services to settings makes welcome screen fail) + kolab/issue2538 (Make the location of the Smarty compile directory + configurable) + kolab/issue2569 (rename of services to settings makes welcome screen + fail) kolab/issue2575 (Make background of favicon transparent) - perl-kolab-2.2.rc3-2008???? From cvs at kolab.org Tue Apr 15 11:13:52 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 15 Apr 2008 11:13:52 +0200 (CEST) Subject: gunnar: server/patches/horde/3.2-rc3/framework HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, 1.2, 1.3 Message-ID: <20080415091352.AFC5560C4DC@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/horde/3.2-rc3/framework In directory doto:/tmp/cvs-serv21914/3.2-rc3/framework Modified Files: HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch Log Message: Fix the xfb names. Index: HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch =================================================================== RCS file: /kolabrepository/server/patches/horde/3.2-rc3/framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 5 Apr 2008 18:01:49 -0000 1.2 +++ HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 15 Apr 2008 09:13:50 -0000 1.3 @@ -1,6 +1,6 @@ diff -r e1996d696f1b framework/Kolab/Kolab/Freebusy.php --- a/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 17:30:58 2008 +0200 -+++ b/framework/Kolab/Kolab/Freebusy.php Sat Apr 05 19:50:58 2008 +0200 ++++ b/framework/Kolab/Kolab/Freebusy.php Tue Apr 15 11:07:33 2008 +0200 @@ -246,7 +246,7 @@ class Horde_Kolab_Freebusy { return $this->_xacl; } @@ -12,7 +12,7 @@ if (is_a($annotation, 'PEAR_Error')) { diff -r e1996d696f1b framework/Share/Share/kolab.php --- a/framework/Share/Share/kolab.php Sat Apr 05 17:30:58 2008 +0200 -+++ b/framework/Share/Share/kolab.php Sat Apr 05 19:50:58 2008 +0200 ++++ b/framework/Share/Share/kolab.php Tue Apr 15 11:07:33 2008 +0200 @@ -17,6 +17,13 @@ define('HORDE_ANNOT_SHARE_ATTR', HORDE_A * Marks a share without a name. These shares are still invalid */ @@ -145,7 +145,7 @@ + function getXfbaccess() + { + $imap = &$this->_shareOb->getImap(); -+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable'; ++ $entry = KOLAB_ANNOT_ROOT . 'pxfb-readable-for'; + + $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder); + if (is_a($annotation, 'PEAR_Error') || empty($annotation)) { @@ -165,7 +165,7 @@ + function setXfbaccess($access) + { + $imap = &$this->_shareOb->getImap(); -+ $entry = KOLAB_ANNOT_ROOT . 'xfb-readable'; ++ $entry = KOLAB_ANNOT_ROOT . 'pxfb-readable-for'; + return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder); } From cvs at kolab.org Tue Apr 15 17:29:52 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 15 Apr 2008 17:29:52 +0200 (CEST) Subject: wilde: server/php-kolab/Kolab_Filter/Filter Content.php,1.9,1.10 Message-ID: <20080415152952.06136628FC7@lists.intevation.de> Author: wilde Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter In directory doto:/tmp/cvs-serv6468 Modified Files: Content.php Log Message: Fixed warning in match_ip() for networks defined as simple IPs. See kolab/issue2466. Index: Content.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Content.php 27 Feb 2008 07:09:56 -0000 1.9 +++ Content.php 15 Apr 2008 15:29:49 -0000 1.10 @@ -396,7 +396,7 @@ $iplong = ip2long($ip); $cidr = explode("/", $network); $netiplong = ip2long($cidr[0]); - if ( $cidr[1] ) { + if ( count($cidr) == 2 ) { $iplong = $iplong & ( 0xffffffff << 32 - $cidr[1] ); $netiplong = $netiplong & ( 0xffffffff << 32 - $cidr[1] ); } From cvs at kolab.org Tue Apr 15 17:39:53 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 15 Apr 2008 17:39:53 +0200 (CEST) Subject: wilde: server/php-kolab/Kolab_Filter ChangeLog,1.17,1.18 Message-ID: <20080415153953.DD68B628FCA@lists.intevation.de> Author: wilde Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv6995 Modified Files: ChangeLog Log Message: Added ChangeLog entry for last change. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChangeLog 14 Mar 2008 17:34:50 -0000 1.17 +++ ChangeLog 15 Apr 2008 15:39:51 -0000 1.18 @@ -1,3 +1,8 @@ +2008-04-15 Sascha Wilde + + * Filter/Content.php (match_ip): Fixed warning when IPs without + subnet part are used. + 2008-03-14 Sascha Wilde * Filter/Resource.php (imapConnect): Fix: only search for From cvs at kolab.org Tue Apr 15 18:01:18 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 15 Apr 2008 18:01:18 +0200 (CEST) Subject: thomas: server release-notes.txt,1.250,1.251 Message-ID: <20080415160118.DE3A2600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv8415 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.250 retrieving revision 1.251 diff -u -d -r1.250 -r1.251 --- release-notes.txt 10 Apr 2008 17:33:28 -0000 1.250 +++ release-notes.txt 15 Apr 2008 16:01:16 -0000 1.251 @@ -84,6 +84,9 @@ Added Fedora-DS backend (inactive by default) + kolab/issue2466 (How should Kolab Filter handle mails from privileged + networks?) + - php-kolab-2.2.rc3-2008???? Rename .xpfb to .pxfb. From cvs at kolab.org Tue Apr 15 18:02:19 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 15 Apr 2008 18:02:19 +0200 (CEST) Subject: thomas: server release-notes.txt,1.251,1.252 Message-ID: <20080415160219.3E8D8628FC6@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv8509 Modified Files: release-notes.txt Log Message: update release notes Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.251 retrieving revision 1.252 diff -u -d -r1.251 -r1.252 --- release-notes.txt 15 Apr 2008 16:01:16 -0000 1.251 +++ release-notes.txt 15 Apr 2008 16:02:17 -0000 1.252 @@ -48,6 +48,8 @@ - horde-framework-kolab-3.2_rc3-2008???? + Rename .xpfb to .pxfb. + kolab/issue2587 (ifb retrieval does not work for aliases anymore) kolab/issue2588 (whole day event with show-time-as free gets into the pfb) From cvs at kolab.org Wed Apr 16 16:34:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 16 Apr 2008 16:34:30 +0200 (CEST) Subject: thomas: server/clamav Makefile, 1.4.2.5, 1.4.2.6 kolab.patch, 1.5.2.4, 1.5.2.5 Message-ID: <20080416143430.B69EA628FE8@lists.intevation.de> Author: thomas Update of /kolabrepository/server/clamav In directory doto:/tmp/cvs-serv4836 Modified Files: Tag: kolab_2_1_branch Makefile kolab.patch Log Message: updated clamav Index: Makefile =================================================================== RCS file: /kolabrepository/server/clamav/Attic/Makefile,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -d -r1.4.2.5 -r1.4.2.6 --- Makefile 18 Feb 2008 17:25:59 -0000 1.4.2.5 +++ Makefile 16 Apr 2008 14:34:28 -0000 1.4.2.6 @@ -12,9 +12,9 @@ endif PACKAGE=clamav -VERSION=0.92.1 -RELEASE=20080213 -KOLABRELEASE=20080213_kolab +VERSION=0.93 +RELEASE=20080414 +KOLABRELEASE=20080414_kolab RPM=/kolab/bin/openpkg rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/clamav/Attic/kolab.patch,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -u -d -r1.5.2.4 -r1.5.2.5 --- kolab.patch 18 Feb 2008 17:25:59 -0000 1.5.2.4 +++ kolab.patch 16 Apr 2008 14:34:28 -0000 1.5.2.5 @@ -3,9 +3,9 @@ @@ -32,7 +32,7 @@ Group: AntiVirus License: GPL - Version: 0.92.1 --Release: 20080213 -+Release: 20080213_kolab + Version: 0.93 +-Release: 20080414 ++Release: 20080414_kolab # package options %option with_milter no From cvs at kolab.org Wed Apr 16 17:17:37 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 16 Apr 2008 17:17:37 +0200 (CEST) Subject: thomas: doc/www/src/security kolab-vendor-notice-20.txt,NONE,1.1 Message-ID: <20080416151737.9DFD260C4A8@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv6415 Added Files: kolab-vendor-notice-20.txt Log Message: Kolab Security Issue 20 20080416 (clamav) --- NEW FILE: kolab-vendor-notice-20.txt --- -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Kolab Security Issue 20 20080416 ================================ Package: Kolab Server, ClamAV Vulnerability: various Kolab Specific: no Dependent Packages: none Summary ~~~~~~~ Various vulnerabilities, some allowing remote attackers to execute arbitrary code, others causing a denial of service, have been found in ClamAV. Affected Versions ~~~~~~~~~~~~~~~~~ This affects versions of ClamAV up to version 0.92.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-rc2 and previous prereleases are affected. Fix ~~~ Upgrade to ClamAV 0.93. 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/20080416/clamav-0.93-20080414_kolab.src.rpm For Kolab Server 2.2-rc1 and -rc2 the unmodified OpenPKG rpm can be used: security-updates/20080416/clamav-0.93-20080414.src.rpm A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available: security-updates/20080416/clamav-0.93-20080414_kolab.ix86-debian3.1-kolab.rpm A binary RPM for Kolab Server 2.2-rc1 and rc2 (ix86 Debian GNU/Linux Etch) is available from: security-updates/20080416/clamav-0.93-20080414_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/20080416/clamav-0.93-20080414_kolab.src.rpm . # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080416/clamav-0.93-20080414_kolab.ix86-debian3.1-kolab.rpm . # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080416/clamav-0.93-20080414.src.rpm . # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080416/clamav-0.93-20080414.ix86-debian4.0-kolab.rpm . MD5 sums: 3f4a1e82a83ad3122e72744653c4d5d0 clamav-0.93-20080414.ix86-debian4.0-kolab.rpm 35c11b1f4e56b5b7169a52521f24dbdb clamav-0.93-20080414.src.rpm 34f2a4853eab14c83559c80dd2b619c5 clamav-0.93-20080414_kolab.ix86-debian3.1-kolab.rpm 21ff5b7812d27bc22f4e808d93d68714 clamav-0.93-20080414_kolab.src.rpm The package can be installed on your Kolab Server with # /kolab/bin/openpkg rpm --rebuild clamav-0.93-20080414_kolab.src.rpm # /kolab/bin/openpkg rpm \ -Uvh /kolab/RPM/PKG/clamav-0.93-20080414_kolab.--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=592112&group_id=86638 ClamAV 0.93 release notes https://wwws.clamav.net/bugzilla/show_bug.cgi?id=876 PeSpin Heap Overflow Vulnerability https://wwws.clamav.net/bugzilla/show_bug.cgi?id=877 WWPack Heap Overflow Vulnerability https://wwws.clamav.net/bugzilla/show_bug.cgi?id=878 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1100 Upack Buffer Overflow Vulnerability (CVE-2008-1100) https://wwws.clamav.net/bugzilla/show_bug.cgi?id=897 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1387 ARJ: Sample from CERT-FI hangs clamav (CVE-2008-1387) Timeline ~~~~~~~~ 20080414 ClamAV release 0.93. 20080414 OpenPKG 0.93 package release. 20080416 Kolab Server security advisory published. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIBhhcW7P1GVgWeRoRAts+AJ9k4DdcgFPDEtJovGi568ECsz/JTgCfRGKY 6kSjjZEVPmmpH6QpxofNMSo= =nY1L -----END PGP SIGNATURE----- From cvs at kolab.org Wed Apr 16 17:22:19 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 16 Apr 2008 17:22:19 +0200 (CEST) Subject: thomas: server release-notes.txt,1.252,1.253 Message-ID: <20080416152219.B2C7160C4A8@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6561 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.252 retrieving revision 1.253 diff -u -d -r1.252 -r1.253 --- release-notes.txt 15 Apr 2008 16:02:17 -0000 1.252 +++ release-notes.txt 16 Apr 2008 15:22:17 -0000 1.253 @@ -46,6 +46,10 @@ Changes between 2.2-rc-2 and 2.2-rc-3 + - clamav-0.93-20080414 + + New upstream version, fixes various security issues. + - horde-framework-kolab-3.2_rc3-2008???? Rename .xpfb to .pxfb. From cvs at kolab.org Wed Apr 16 17:33:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 16 Apr 2008 17:33:30 +0200 (CEST) Subject: thomas: doc/www/src index.html.m4,1.139,1.140 Message-ID: <20080416153330.704E4600D73@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv6935 Modified Files: index.html.m4 Log Message: Security Issue 19 for Kolab Server (ClamAV) Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- index.html.m4 19 Mar 2008 14:42:04 -0000 1.139 +++ index.html.m4 16 Apr 2008 15:33:28 -0000 1.140 @@ -48,6 +48,19 @@ + + +
April 16th, 2008» + Security Issue 20 for Kolab Server (ClamAV) +
+

+ A new ClamAV RPM with various fixes is available. See the + Kolab Security Issue 20 for details. +
+

+ + +
March 19th, 2008 » Kolab KDE Client 2.1.12 released @@ -64,7 +77,6 @@

-
March 17th, 2008 » @@ -80,7 +92,6 @@ announcement for details.

- From cvs at kolab.org Thu Apr 17 11:38:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 17 Apr 2008 11:38:02 +0200 (CEST) Subject: emanuel: doc/www/src footer.html.m4, 1.41, 1.42 index.html.m4, 1.140, 1.141 Message-ID: <20080417093802.13BE0636767@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv18497/src Modified Files: footer.html.m4 index.html.m4 Log Message: Added kolab-users-de ml news and new users menu item Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- footer.html.m4 23 Mar 2007 11:03:27 -0000 1.41 +++ footer.html.m4 17 Apr 2008 09:37:59 -0000 1.42 @@ -57,6 +57,11 @@ (old) | Subscribe/Manage
+Users-de Mailinglist (german!): +
+Archive | +Subscribe/Manage +
Announcement Mailinglist:
Archive | Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- index.html.m4 16 Apr 2008 15:33:28 -0000 1.140 +++ index.html.m4 17 Apr 2008 09:38:00 -0000 1.141 @@ -45,7 +45,20 @@ -->

- + + + +
April 17th, 2008» + German-speaking Kolab users mailinglist available +
+
+ A new mailinglist for german-speaking Kolab users is now +available. See here for + subscribe +to the kolab-users-de list. +
+

@@ -77,6 +90,12 @@

+ + + +

+

+
April 16th, 2008
{else} - - + + {/if} {/section} Index: userlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/userlistall.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- userlistall.tpl 31 Jul 2006 02:03:10 -0000 1.2 +++ userlistall.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -5,7 +5,7 @@ End: *}

{tr msg="Email Users"}

-
+
{tr msg="[ ALL ]"}    [ A-F ]    [ G-L ]    @@ -14,11 +14,12 @@ {tr msg="[ OTHER ]"}
-
+ +
{tr msg="Filter:"} {foreach key=value item=name from=$filtertypes} {if $value eq $filtertype} - + {else} {/if} {/foreach} - + +
+
March 17th, 2008 » @@ -92,12 +111,6 @@ announcement for details.

- - - -

-

- From cvs at kolab.org Thu Apr 17 12:52:28 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 17 Apr 2008 12:52:28 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog,1.162,1.163 Message-ID: <20080417105228.48C3C60C4C2@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv21118 Modified Files: ChangeLog Log Message: templates/slapd.conf.template.in: move comment away from value. Comments after values are not allowed. They are ignored, but clutter the debug log. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.162 retrieving revision 1.163 diff -u -d -r1.162 -r1.163 --- ChangeLog 4 Apr 2008 19:36:22 -0000 1.162 +++ ChangeLog 17 Apr 2008 10:52:26 -0000 1.163 @@ -1,3 +1,7 @@ +2008-04-17 Thomas Arendsen Hein + + * templates/slapd.conf.template.in: move comment away from value. + 2008-04-04 Richard Bos * templates/cyrus.conf.template.in: changed delprune from From cvs at kolab.org Thu Apr 17 12:52:28 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 17 Apr 2008 12:52:28 +0200 (CEST) Subject: thomas: server/kolabd/kolabd/templates slapd.conf.template.in, 1.17, 1.18 Message-ID: <20080417105228.4AB25628FED@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv21118/templates Modified Files: slapd.conf.template.in Log Message: templates/slapd.conf.template.in: move comment away from value. Comments after values are not allowed. They are ignored, but clutter the debug log. Index: slapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- slapd.conf.template.in 25 Sep 2007 16:37:10 -0000 1.17 +++ slapd.conf.template.in 17 Apr 2008 10:52:26 -0000 1.18 @@ -48,9 +48,10 @@ cachesize 10000 checkpoint 512 5 idlcachesize 10000 -idletimeout 300 # The value 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 Thu Apr 17 16:28:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 17 Apr 2008 16:28:05 +0200 (CEST) Subject: bernhard: doc/www/src roadmap.html.m4,1.12,1.13 Message-ID: <20080417142805.D3B6A628FE3@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv29456 Modified Files: roadmap.html.m4 Log Message: Updated roadmap for client and server. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- roadmap.html.m4 23 Nov 2007 18:32:22 -0000 1.12 +++ roadmap.html.m4 17 Apr 2008 14:28:02 -0000 1.13 @@ -12,9 +12,7 @@ wishes and features -listed in the Kolab issue tracker. As soon as these are actually -put on the todo list of the developers they should be listed -here as well. +listed in the Kolab issue tracker. This is only a rough overview.

@@ -24,7 +22,13 @@ over Proko2. Currently intermediate releases happen very few weeks for testing. Packagers are already picking this up.

-Stabilization to enterprise production quality is planned for Q1 2008. +Stabilization to enterprise production quality is planned for Q2 2008. + +

KDE Kolab Client Enterprise4

+ +This is the next generation in development. The client will be based +on KDE4 technology, but without Akonadi. We expect it to be in beta Q3 2008 +and production ready end of 2008.

KDE Kolab Client Proko2 stable series

@@ -34,8 +38,10 @@

Kolab Server 2.2 series

-Current beta quality release is 2.2-beta2, it already has -the planned features: +At time of writing we are issuing release candidates for this series, +with some people already running it in production. Current is 2.2-rc2. + +Major improvements over Server 2.1:
  • Update to a new OpenPKG version.
  • Integration of new upstream versions (with many of the kolab patches @@ -43,22 +49,13 @@ Re-engineerd Horde-based web client as modular add-on package for the Kolab Server/OpenPKG version.
  • More complete support for 64 bit architectures.
    • -
- -Planned is 2.2-beta3 in early December. -
    -
  • Some Webclient problems resolved.
  • Implementation of new concept for extended freebusy list which is good for the teamleader overview usecase.
-

-The 2.2.0 release is planned for Q1 2008. -Before at least one rc release is likely. +Planned is 2.2-rc3 in April and 2.2 final release in May 2008.

Kolab Server 2.1 release series

-Current is 2.1.0 Final - - +Current is 2.1.0 Final. No further releases planned. m4_include(footer.html.m4) From cvs at kolab.org Fri Apr 18 11:18:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 18 Apr 2008 11:18:02 +0200 (CEST) Subject: bernhard: doc/kolab-formats commonfields.sgml, 1.23, 1.24 contacts.sgml, 1.16, 1.17 kolabformat.sgml, 1.21, 1.22 Message-ID: <20080418091802.878A56013B8@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv16029 Modified Files: commonfields.sgml contacts.sgml kolabformat.sgml Log Message: Overall document: * bumped to 2.0rc7 _draft_ as before was rc6 missing the draft * Added a revision mark. Clarified contents of <gender> tags. Clarified that commonfield <sensitifiy> is a label in current implementations. Index: commonfields.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/commonfields.sgml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- commonfields.sgml 16 Nov 2006 22:34:55 -0000 1.23 +++ commonfields.sgml 18 Apr 2008 09:18:00 -0000 1.24 @@ -30,12 +30,10 @@ of categories in this format. The clients are free to choose. The sensitivity possibilites are private, confidential and -public. - - -private data SHALL not be disclosed to other users except if explicitly allowed by the user. -Normal IMAP ACLs granting reading permissions on a folder don't mean that other users MAY read -private data. +public. This value is a label to classify the contents of +the object and MUST be considered when the data is transfered. +Note that IMAP ACLs on a folder will give access +to the full objects in the folders despite this label. There can be any number of attachments. "inline-attachment" references the Index: contacts.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/contacts.sgml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- contacts.sgml 16 Nov 2006 22:34:55 -0000 1.16 +++ contacts.sgml 18 Apr 2008 09:18:00 -0000 1.17 @@ -73,6 +73,9 @@ called a note on the contact. This note is stored in the body tag. +gender can be empty or is one of male or female. + + You can have one phone number of each type. The types are: business1, business2, businessfax, callback, car, company, home1, home2, homefax, isdn, mobile, pager, primary, radio, telex, ttytdd, Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- kolabformat.sgml 14 Nov 2007 11:59:03 -0000 1.21 +++ kolabformat.sgml 18 Apr 2008 09:18:00 -0000 1.22 @@ -15,8 +15,8 @@ The Kolab Storage Format -2.0rc6 - +2.0rc7 +Draft CVS Bo Thorsen @@ -43,8 +43,8 @@
s.binge at codefusion.co.za
 -November 16th, 2006 - + +CVS $Date$ $Revision$ This documentation was written in SGML using the DocBook DTD. HTML and Postscript output is generated automatically and depends on the @@ -159,13 +159,16 @@ - - From cvs at kolab.org Fri Apr 18 12:21:31 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 18 Apr 2008 12:21:31 +0200 (CEST) Subject: thomas: server release-notes.txt, 1.253, 1.254 install-kolab.sh, 1.23, 1.24 Message-ID: <20080418102131.D4D996013C4@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18867 Modified Files: release-notes.txt install-kolab.sh Log Message: Define 'with_ntlm yes' when compiling sasl. kolab/issue2591 (NTLM support in Cyrus SASL) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.253 retrieving revision 1.254 diff -u -d -r1.253 -r1.254 --- release-notes.txt 16 Apr 2008 15:22:17 -0000 1.253 +++ release-notes.txt 18 Apr 2008 10:21:29 -0000 1.254 @@ -46,6 +46,10 @@ Changes between 2.2-rc-2 and 2.2-rc-3 + - install-kolab.sh + + kolab/issue2591 (NTLM support in Cyrus SASL) + - clamav-0.93-20080414 New upstream version, fixes various security issues. Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- install-kolab.sh 17 Mar 2008 14:23:15 -0000 1.23 +++ install-kolab.sh 18 Apr 2008 10:21:29 -0000 1.24 @@ -21,7 +21,7 @@ INSTALL="" PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin" -DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps" +DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps" #Flags FLAG_BASE="" From cvs at kolab.org Fri Apr 18 14:22:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 18 Apr 2008 14:22:02 +0200 (CEST) Subject: gunnar: server/horde external-horde-cvs.sh,1.3,1.4 Message-ID: <20080418122202.A1CFF6013CE@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde In directory doto:/tmp/cvs-serv23629 Modified Files: external-horde-cvs.sh Log Message: Update to the latest Horde CVS and add distlist support. Index: external-horde-cvs.sh =================================================================== RCS file: /kolabrepository/server/horde/external-horde-cvs.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- external-horde-cvs.sh 28 Mar 2008 16:30:26 -0000 1.3 +++ external-horde-cvs.sh 18 Apr 2008 12:22:00 -0000 1.4 @@ -1,6 +1,9 @@ #!/bin/sh -DATE="Fri Mar 28 16:29:37 UTC 2008" +DATE="Fri Apr 18 12:20:37 UTC 2008" PATCHES=" +framework/HK-GW-Split_object_folder_type.patch +framework/HK-MG-Distlists.patch +turba/HK-MG-Distlists.patch framework/HK-GW-Fix_Prefs_for_Ingo.patch framework/HK-GW-Fbview_xfb_concept.patch kronolith/HK-SB-Fbview_save_attendees.patch From cvs at kolab.org Mon Apr 21 11:35:46 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 21 Apr 2008 11:35:46 +0200 (CEST) Subject: emanuel: doc/www/src olddocumentation.html.m4, NONE, 1.1 Makefile, 1.24, 1.25 documentation.html.m4, 1.33, 1.34 Message-ID: <20080421093546.3A9DE60016D@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv4520/www/src Modified Files: Makefile documentation.html.m4 Added Files: olddocumentation.html.m4 Log Message: Documentation page updated: Created new page for old documentation files. Added link to new kolab format specification (rc7). Changed link of doc2 to rev1.72 pdf version. --- NEW FILE: olddocumentation.html.m4 --- m4_define(`PAGE_TITLE',`Old Documentation') m4_include(header.html.m4)
This page was updated on:
$Date: 2008/04/21 09:35:44 $

Old Documentation

Kolab2 Storage Format Specification (Draft)

Kolab2 Architecture Draft


View all current versions of Kolab documentations. m4_include(footer.html.m4) Index: Makefile =================================================================== RCS file: /kolabrepository/doc/www/src/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile 12 Mar 2007 13:10:29 -0000 1.24 +++ Makefile 21 Apr 2008 09:35:44 -0000 1.25 @@ -15,6 +15,7 @@ kolab-plugins.html \ kolabsearch.html \ documentation.html \ + olddocumentation.html \ i18n.html \ webclient.html Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- documentation.html.m4 18 Jan 2008 16:37:15 -0000 1.33 +++ documentation.html.m4 21 Apr 2008 09:35:44 -0000 1.34 @@ -32,7 +32,7 @@

  • Kolab Server 2.0 and KDE Client "Proko2 Branch" Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):
    - Doc2, Version 1.70 as pdf + Doc2, Version 1.72 as pdf | CVS HEAD as sxw @@ -59,40 +59,23 @@

    Kolab2 Storage Format Specification

    +

    Kolab2 Architecture Draft


    From cvs at kolab.org Tue Apr 22 10:51:13 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 10:51:13 +0200 (CEST) Subject: gunnar: server/patches/cyrus-imapd/cyrus-imapd-2.3.12 - New directory Message-ID: <20080422085113.8F1F7600D70@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.12 In directory doto:/tmp/cvs-serv20896/cyrus-imapd-2.3.12 Log Message: Directory /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.12 added to the repository From cvs at kolab.org Tue Apr 22 10:51:35 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 10:51:35 +0200 (CEST) Subject: gunnar: server/patches/cyrus-imapd/cyrus-imapd-2.3.12 KOLAB_cyrus-cyradm_Annotations.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.12_Annotations2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.12_Folder-names.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.12_Groups.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.12_Logging.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.12_UID.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.12_timsieved_starttls-sendcaps.patch, NONE, 1.1 Message-ID: <20080422085135.2797F600D79@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.12 In directory doto:/tmp/cvs-serv20935/cyrus-imapd-2.3.12 Added Files: KOLAB_cyrus-cyradm_Annotations.patch KOLAB_cyrus-imapd-2.3.12_Annotations2.patch KOLAB_cyrus-imapd-2.3.12_Folder-names.patch KOLAB_cyrus-imapd-2.3.12_Groups.patch KOLAB_cyrus-imapd-2.3.12_Logging.patch KOLAB_cyrus-imapd-2.3.12_UID.patch KOLAB_cyrus-imapd-2.3.12_timsieved_starttls-sendcaps.patch Log Message: Patches for cyrus imap 2.3.12 --- NEW FILE: KOLAB_cyrus-cyradm_Annotations.patch --- Allows to use arbitrary annotations with the cyradm tool. diff -r a07884e259c3 doc/man/cyradm.1.html --- a/doc/man/cyradm.1.html Thu Oct 25 08:24:39 2007 +0200 +++ b/doc/man/cyradm.1.html Thu Oct 25 08:29:40 2007 +0200 @@ -241,6 +241,13 @@ The currently supported attributes are:<

    Sets an email address to which messages injected into the server via NNTP will be sent.

    +
    +
    • +
    /explicit/annotation + +
    +

    Sets the annotation /explicit/annotation +on mailbox to value.

    sharedseen diff -r a07884e259c3 perl/imap/IMAP/Admin.pm --- a/perl/imap/IMAP/Admin.pm Thu Oct 25 08:24:39 2007 +0200 +++ b/perl/imap/IMAP/Admin.pm Thu Oct 25 08:29:40 2007 +0200 @@ -796,11 +796,11 @@ sub mboxconfig { return undef; } - if(!exists($values{$entry})) { - $self->{error} = "Unknown parameter $entry"; - } - - $entry = $values{$entry}; + if(exists($values{$entry})) { + $entry = $values{$entry}; + } else { + $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/"; + } my ($rc, $msg); diff -r a07884e259c3 perl/imap/IMAP/Shell.pm --- a/perl/imap/IMAP/Shell.pm Thu Oct 25 08:24:39 2007 +0200 +++ b/perl/imap/IMAP/Shell.pm Thu Oct 25 08:29:40 2007 +0200 @@ -126,7 +126,7 @@ my %builtins = (exit => [\&_sc_info, '[mailbox]', 'display mailbox/server metadata'], mboxcfg => - [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value', + [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/] value', 'configure mailbox'], mboxconfig => 'mboxcfg', reconstruct => @@ -1436,7 +1436,7 @@ sub _sc_mboxcfg { while (defined ($opt = shift(@argv))) { last if $opt eq '--'; if ($opt =~ /^-/) { - die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; + die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; } else { push(@nargv, $opt); @@ -1445,7 +1445,7 @@ sub _sc_mboxcfg { } push(@nargv, @argv); if (@nargv < 2) { - die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; + die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; } if (!$cyrref || !$$cyrref) { die "mboxconfig: no connection to server\n"; diff -r a07884e259c3 perl/imap/cyradm.sh --- a/perl/imap/cyradm.sh Thu Oct 25 08:24:39 2007 +0200 +++ b/perl/imap/cyradm.sh Thu Oct 25 08:29:40 2007 +0200 @@ -241,6 +241,10 @@ mailboxes). Indicates that the mailbox should have a squat index created for it. +=item C + +Sets the annotation I on I to I. + =back =item C [C<--partition> I] I I --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_Annotations2.patch --- Provides a new version of annotation support for the cyrus imapd server [Version: 2.3.9] diff -r 321cda1d6136 imap/annotate.c --- a/imap/annotate.c Tue Apr 22 10:44:56 2008 +0200 +++ b/imap/annotate.c Tue Apr 22 10:47:04 2008 +0200 @@ -90,6 +90,8 @@ int (*proxy_fetch_func)(const char *serv struct strlist *attribute_pat) = NULL; int (*proxy_store_func)(const char *server, const char *mbox_pat, struct entryattlist *entryatts) = NULL; + +void init_annotation_definitions(); /* String List Management */ /* @@ -237,6 +239,8 @@ void annotatemore_init(int myflags, if (store_func) { proxy_store_func = store_func; } + + init_annotation_definitions(); } void annotatemore_open(char *fname) @@ -1832,6 +1836,224 @@ const struct annotate_st_entry mailbox_r { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL } }; +struct annotate_st_entry_list *server_entries_list = NULL; +struct annotate_st_entry_list *mailbox_rw_entries_list = NULL; + +enum { + ANNOTATION_SCOPE_SERVER = 1, + ANNOTATION_SCOPE_MAILBOX = 2 +}; + +const struct annotate_attrib annotation_scope_names[] = +{ + { "server", ANNOTATION_SCOPE_SERVER }, + { "mailbox", ANNOTATION_SCOPE_MAILBOX }, + { NULL, 0 } +}; + +const struct annotate_attrib annotation_proxy_type_names[] = +{ + { "proxy", PROXY_ONLY }, + { "backend", BACKEND_ONLY }, + { "proxy_and_backend", PROXY_AND_BACKEND }, + { NULL, 0 } +}; + +const struct annotate_attrib attribute_type_names[] = +{ + { "content-type", ATTRIB_TYPE_CONTENTTYPE }, + { "string", ATTRIB_TYPE_STRING }, + { "boolean", ATTRIB_TYPE_BOOLEAN }, + { "uint", ATTRIB_TYPE_UINT }, + { "int", ATTRIB_TYPE_INT }, + { NULL, 0 } +}; + +#define ANNOT_DEF_MAXLINELEN 1024 + +int table_lookup(const struct annotate_attrib *table, + char* name, + size_t namelen, + char* errmsg) +/* search in table for the value given by name and namelen (name is null-terminated, + but possibly more than just the key). errmsg is used to hint the user where we failed */ +{ + char errbuf[ANNOT_DEF_MAXLINELEN*2]; + int entry; + + for (entry = 0; table[entry].name && + (strncasecmp(table[entry].name, name, namelen) + || table[entry].name[namelen] != '\0'); entry++); + + if (! table[entry].name) { + sprintf(errbuf, "invalid %s at '%s'", errmsg, name); + fatal(errbuf, EC_CONFIG); + } + return table[entry].entry; +} + +char *consume_comma(char* p) + /* advance beyond the next ',', skipping whitespace, fail if next non-space is no comma */ +{ + char errbuf[ANNOT_DEF_MAXLINELEN*2]; + + for (; *p && isspace(*p); p++); + if (*p != ',') { + sprintf(errbuf, "',' expected, '%s' found parsing annotation definition", + p); + fatal(errbuf, EC_CONFIG); + } + p++; + for (; *p && isspace(*p); p++); + + return p; +} + +int parse_table_lookup_bitmask(const struct annotate_attrib *table, + char** s, + char* errmsg) + /* parses strings of the form value1 [ value2 [ ... ]] + value1 is mapped via table to ints and the result ored + whitespace is allowed between value names and punctuation + the field must end in '\0' or ',' + s is advanced to '\0' or ',' + on error errmsg is used to identify item to be parsed + */ +{ + char errbuf[ANNOT_DEF_MAXLINELEN*2]; + int result = 0; + char *p, *p2; + + p = *s; + do { + p2 = p; + for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); + result |= table_lookup(table, p2, p-p2, errmsg); + for (; *p && isspace(*p); p++); + } while (*p && *p != ','); + + *s = p; + return result; +} + +void init_annotation_definitions() +{ + char *p, *p2, *tmp; + const char *filename; + char aline[ANNOT_DEF_MAXLINELEN]; + char errbuf[ANNOT_DEF_MAXLINELEN*2]; + struct annotate_st_entry_list *se, *me; + struct annotate_st_entry *ae; + int i; + FILE* f; + + /* NOTE: we assume # static entries > 0 */ + server_entries_list = xmalloc(sizeof(struct annotate_st_entry_list)); + mailbox_rw_entries_list = xmalloc(sizeof(struct annotate_st_entry_list)); + se = server_entries_list; + me = mailbox_rw_entries_list; + /* copy static entries into list */ + for (i = 0; server_entries[i].name;i++) { + se->entry = &server_entries[i]; + if (server_entries[i+1].name) { + se->next = xmalloc(sizeof(struct annotate_st_entry_list)); + se = se->next; + } + } + /* copy static entries into list */ + for (i = 0; mailbox_rw_entries[i].name;i++) { + me->entry = &mailbox_rw_entries[i]; + if (mailbox_rw_entries[i+1].name) { + me->next = xmalloc(sizeof(struct annotate_st_entry_list)); + me = me->next; + } + } + + /* parse config file */ + filename = config_getstring(IMAPOPT_ANNOTATION_DEFINITIONS); + + if (! filename) { + se->next = NULL; + me->next = NULL; + return; + } + + f = fopen(filename,"r"); + if (! f) { + sprintf(errbuf, "could not open annotation definiton %s", filename); + fatal(errbuf, EC_CONFIG); + } + + while (fgets(aline, sizeof(aline), f)) { + // remove leading space, skip blank lines and comments + for (p = aline; *p && isspace(*p); p++); + if (!*p || *p == '#') continue; + + // note, we only do the most basic validity checking and may + // be more restrictive than neccessary + + ae = xmalloc(sizeof(struct annotate_st_entry)); + + p2 = p; + for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); + // TV-TODO: should test for empty + ae->name = xstrndup(p2, p-p2); + + p = consume_comma(p); + + p2 = p; + for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); + + if (table_lookup(annotation_scope_names, p2, p-p2, + "annotation scope")==ANNOTATION_SCOPE_SERVER) { + se->next = xmalloc(sizeof(struct annotate_st_entry_list)); + se = se->next; + se->entry = ae; + } + else { + me->next = xmalloc(sizeof(struct annotate_st_entry_list)); + me = me->next; + me->entry = ae; + } + + p = consume_comma(p); + p2 = p; + for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); + ae->type = table_lookup(attribute_type_names, p2, p-p2, + "attribute type"); + + p = consume_comma(p); + ae->proxytype = parse_table_lookup_bitmask(annotation_proxy_type_names, + &p, + "annotation proxy type"); + + p = consume_comma(p); + ae->attribs = parse_table_lookup_bitmask(annotation_attributes, + &p, + "annotation attributes"); + + p = consume_comma(p); + p2 = p; + for (; *p && (isalnum(*p) || *p=='.' || *p=='-' || *p=='_' || *p=='/');p++); + tmp = xstrndup(p2, p-p2); + ae->acl = cyrus_acl_strtomask(tmp); + free(tmp); + + for (; *p && isspace(*p); p++); + if (*p) { + sprintf(errbuf, "junk at end of line: '%s'", p); + fatal(errbuf, EC_CONFIG); + } + + ae->set = annotation_set_todb; + ae->rock = NULL; + } + + fclose(f); + se->next = NULL; + me->next = NULL; +} + int annotatemore_store(char *mailbox, struct entryattlist *l, struct namespace *namespace, @@ -1843,7 +2065,7 @@ int annotatemore_store(char *mailbox, struct entryattlist *e = l; struct attvaluelist *av; struct storedata sdata; - const struct annotate_st_entry *entries; + const struct annotate_st_entry_list *entries, *currententry; time_t now = time(0); memset(&sdata, 0, sizeof(struct storedata)); @@ -1854,45 +2076,45 @@ int annotatemore_store(char *mailbox, if (!mailbox[0]) { /* server annotations */ - entries = server_entries; + entries = server_entries_list; } else { /* mailbox annotation(s) */ - entries = mailbox_rw_entries; + entries = mailbox_rw_entries_list; } /* Build a list of callbacks for storing the annotations */ while (e) { - int entrycount, attribs; + int attribs; struct annotate_st_entry_list *nentry = NULL; /* See if we support this entry */ - for (entrycount = 0; - entries[entrycount].name; - entrycount++) { - if (!strcmp(e->entry, entries[entrycount].name)) { + for (currententry = entries; + currententry; + currententry = currententry->next) { + if (!strcmp(e->entry, currententry->entry->name)) { break; } } - if (!entries[entrycount].name) { + if (!currententry) { /* unknown annotation */ return IMAP_PERMISSION_DENIED; } /* Add this entry to our list only if it applies to our particular server type */ - if ((entries[entrycount].proxytype != PROXY_ONLY) + if ((currententry->entry->proxytype != PROXY_ONLY) || proxy_store_func) { nentry = xzmalloc(sizeof(struct annotate_st_entry_list)); nentry->next = sdata.entry_list; - nentry->entry = &(entries[entrycount]); + nentry->entry = currententry->entry; nentry->shared.modifiedsince = now; nentry->priv.modifiedsince = now; sdata.entry_list = nentry; } /* See if we are allowed to set the given attributes. */ - attribs = entries[entrycount].attribs; + attribs = currententry->entry->attribs; av = e->attvalues; while (av) { const char *value; @@ -1902,7 +2124,7 @@ int annotatemore_store(char *mailbox, goto cleanup; } value = annotate_canon_value(av->value, - entries[entrycount].type); + currententry->entry->type); if (!value) { r = IMAP_ANNOTATION_BADVALUE; goto cleanup; @@ -1928,7 +2150,7 @@ int annotatemore_store(char *mailbox, goto cleanup; } value = annotate_canon_value(av->value, - entries[entrycount].type); + currententry->entry->type); if (!value) { r = IMAP_ANNOTATION_BADVALUE; goto cleanup; @@ -2110,3 +2332,10 @@ int annotatemore_delete(const char *mbox return annotatemore_rename(mboxname, NULL, NULL, NULL); } + +/* This file contains code Copyright (c) 2006 by Thomas Viehmann. + * You may distribute source code or binaries under the conditions + * conditions given in the CMU license, provided this note stays intact + * in the distributed source. If you want to distribute my code without + * this notice, do contact me at . + */ diff -r 321cda1d6136 lib/imapoptions --- a/lib/imapoptions Tue Apr 22 10:44:56 2008 +0200 +++ b/lib/imapoptions Tue Apr 22 10:47:04 2008 +0200 @@ -172,6 +172,9 @@ are listed with ``''. /* Should non-admin users be allowed to set ACLs for the 'anyone' user on their mailboxes? In a large organization this can cause support problems, but it's enabled by default. */ + +{ "annotation_definitions", NULL, STRING } +/* File containing annotation definitions. */ { "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")} /* The authorization mechanism to use. */ --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_Folder-names.patch --- Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9] diff -r a83b43bb79a3 imap/mboxname.c --- a/imap/mboxname.c Tue Dec 11 11:22:14 2007 +0100 +++ b/imap/mboxname.c Tue Dec 11 11:22:22 2007 +0100 @@ -712,8 +712,13 @@ int mboxname_netnewscheck(char *name) /* * Apply site policy restrictions on mailbox names. * Restrictions are hardwired for now. - */ + + * original definition #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~" + */ + +#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~" + int mboxname_policycheck(char *name) { unsigned i; --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_Groups.patch --- Allows to use a file other than /etc/groups for group definitions within the cyrus imapd server [Version: 2.3.9] diff -r 5f6f7a246f32 lib/auth_unix.c --- a/lib/auth_unix.c Tue Dec 11 11:20:37 2007 +0100 +++ b/lib/auth_unix.c Tue Dec 11 11:22:01 2007 +0100 @@ -48,12 +48,133 @@ #include #include #include +#include #include #include #include "auth.h" #include "libcyr_cfg.h" #include "xmalloc.h" + +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +/* + * __getgrent.c - This file is part of the libc-8086/grp package for ELKS, + * Copyright (C) 1995, 1996 Nat Friedman . + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#include +#include +#include + +static struct group *__getgrent(int grp_fd, char *line_buff, char **members) +{ + short line_index; + short buff_size; + static struct group group; + register char *ptr; + char *field_begin; + short member_num; + char *endptr; + int line_len; + + /* We use the restart label to handle malformatted lines */ + restart: + line_index = 0; + buff_size = 256; + + line_buff = realloc(line_buff, buff_size); + while (1) { + if ((line_len = read(grp_fd, line_buff + line_index, + buff_size - line_index)) <= 0) { + return NULL; + } + field_begin = strchr(line_buff, '\n'); + if (field_begin != NULL) { + lseek(grp_fd, + (long) (1 + field_begin - + (line_len + line_index + line_buff)), SEEK_CUR); + *field_begin = '\0'; + if (*line_buff == '#' || *line_buff == ' ' + || *line_buff == '\n' || *line_buff == '\t') + goto restart; + break; + } else { + /* Allocate some more space */ + line_index = buff_size; + buff_size += 256; + line_buff = realloc(line_buff, buff_size); + } + } + + /* Now parse the line */ + group.gr_name = line_buff; + ptr = strchr(line_buff, ':'); + if (ptr == NULL) + goto restart; + *ptr++ = '\0'; + + group.gr_passwd = ptr; + ptr = strchr(ptr, ':'); + if (ptr == NULL) + goto restart; + *ptr++ = '\0'; + + field_begin = ptr; + ptr = strchr(ptr, ':'); + if (ptr == NULL) + goto restart; + *ptr++ = '\0'; + + group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10); + if (*endptr != '\0') + goto restart; + + member_num = 0; + field_begin = ptr; + + if (members != NULL) + free(members); + members = (char **) malloc((member_num + 1) * sizeof(char *)); + for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) { + if ((ptr = strchr(field_begin, ',')) != NULL) + *ptr++ = '\0'; + members[member_num++] = field_begin; + members = (char **) realloc(members, + (member_num + 1) * sizeof(char *)); + } + members[member_num] = NULL; + + group.gr_mem = members; + return &group; +} + +static char *line_buff = NULL; +static char **members = NULL; + +struct group *fgetgrent(FILE *file) +{ + if (file == NULL) { + errno = EINTR; + return NULL; + } + return __getgrent(fileno(file), line_buff, members); +} +#endif /* __FreeBSD__ */ struct auth_state { char userid[81]; @@ -142,6 +263,25 @@ static char allowedchars[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static struct group* fgetgrnam(const char* name) +{ + struct group *grp; + FILE *groupfile; + + groupfile = fopen("/etc/imapd.group", "r"); + if (!groupfile) groupfile = fopen("/etc/group", "r"); + if (groupfile) { + while ((grp = fgetgrent(groupfile))) { + if (strcasecmp(grp->gr_name, name) == 0) { + fclose(groupfile); + return grp; + } + } + } + if (groupfile) fclose(groupfile); + return NULL; +} + /* * Convert 'identifier' into canonical form. * Returns a pointer to a static buffer containing the canonical form @@ -177,7 +317,7 @@ size_t len; */ if (!strncmp(retbuf, "group:", 6)) { - grp = getgrnam(retbuf+6); + grp = fgetgrnam(retbuf+6); if (!grp) return 0; strcpy(retbuf+6, grp->gr_name); return retbuf; @@ -228,6 +368,7 @@ static struct auth_state *mynewstate(con int ret, ngroups = 10; #else char **mem; + FILE *groupfile; #endif identifier = mycanonifyid(identifier, 0); @@ -283,20 +424,23 @@ err: if (groupids) free(groupids); #else /* !HAVE_GETGROUPLIST */ - setgrent(); - while ((grp = getgrent())) { - for (mem = grp->gr_mem; *mem; mem++) { - if (!strcmp(*mem, identifier)) break; - } - - if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) { - newstate->ngroups++; - newstate->group = (char **)xrealloc((char *)newstate->group, - newstate->ngroups * sizeof(char *)); - newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name); - } - } - endgrent(); + groupfile = fopen("/etc/imapd.group", "r"); + if (!groupfile) groupfile = fopen("/etc/group", "r"); + if (groupfile) { + while ((grp = fgetgrent(groupfile))) { + for (mem = grp->gr_mem; *mem; mem++) { + if (!strcasecmp(*mem, identifier)) break; + } + + if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) { + newstate->ngroups++; + newstate->group = (char **)xrealloc((char *)newstate->group, + newstate->ngroups * sizeof(char *)); + newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name); + } + } + fclose(groupfile); + } #endif /* HAVE_GETGROUPLIST */ return newstate; --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_Logging.patch --- Provides improved logging for the cyrus imapd server [Version: 2.3.9] diff -r 6162fc947b22 imap/append.c --- a/imap/append.c Tue Dec 11 11:22:03 2007 +0100 +++ b/imap/append.c Tue Dec 11 11:22:13 2007 +0100 @@ -648,6 +648,9 @@ int append_fromstage(struct appendstate /* ok, we've successfully added a message */ as->quota_used += message_index.size; + + syslog(LOG_DEBUG, "append_fromstage: message %d added to %s", + message_index.uid, mailbox->name ); return 0; } diff -r 6162fc947b22 imap/imapd.c --- a/imap/imapd.c Tue Dec 11 11:22:03 2007 +0100 +++ b/imap/imapd.c Tue Dec 11 11:22:13 2007 +0100 @@ -3509,17 +3509,19 @@ void cmd_close(char *tag) if (!r) sync_log_mailbox(imapd_mailbox->name); } + if (r) { + prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r)); + } + else { + prot_printf(imapd_out, "%s OK %s\r\n", tag, + error_message(IMAP_OK_COMPLETED)); + syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s", + imapd_userid, imapd_mailbox->name, "''"); + } + index_closemailbox(imapd_mailbox); mailbox_close(imapd_mailbox); imapd_mailbox = 0; - - if (r) { - prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r)); - } - else { - prot_printf(imapd_out, "%s OK %s\r\n", tag, - error_message(IMAP_OK_COMPLETED)); - } } /* diff -r 6162fc947b22 imap/mailbox.c --- a/imap/mailbox.c Tue Dec 11 11:22:03 2007 +0100 +++ b/imap/mailbox.c Tue Dec 11 11:22:13 2007 +0100 @@ -2520,6 +2520,8 @@ int mailbox_expunge(struct mailbox *mail *(fname->tail)++ = '/'; fname->len++; for (msgno = 0; msgno < numdeleted; msgno++) { + syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d", + mailbox->name, deleted[msgno]); mailbox_message_get_fname(mailbox, deleted[msgno], fname->tail, sizeof(fname->buf) - fname->len); --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_UID.patch --- Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9] diff -r d62bf3b0902d configure --- a/configure Thu Oct 25 08:30:57 2007 +0200 +++ b/configure Thu Oct 25 08:31:06 2007 +0200 @@ -18119,7 +18119,7 @@ done done IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}" -IMAP_LIBS="${LIB_SASL} ${LIBS}" +IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS}" diff -r d62bf3b0902d imap/global.c --- a/imap/global.c Thu Oct 25 08:30:57 2007 +0200 +++ b/imap/global.c Thu Oct 25 08:31:06 2007 +0200 @@ -52,6 +52,9 @@ #include #include +#include +#include + #if HAVE_UNISTD_H # include #endif @@ -362,6 +365,18 @@ char *canonify_userid(char *user, char * char *domain = NULL; int len = strlen(user); char buf[81]; + const char *uri; + const char *base; + const char *binddn; + const char *bindpw; + struct timeval timeout; + char filter[255]; + LDAP *handle; + LDAPMessage *res; + LDAPMessage *entry; + char ** vals; + + int rc; /* check for domain */ if (config_virtdomains && @@ -380,6 +395,47 @@ char *canonify_userid(char *user, char * } if (config_virtdomains) { + if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) { + uri = config_getstring(IMAPOPT_LDAP_URI); + base = config_getstring(IMAPOPT_LDAP_BASE); + binddn = config_getstring(IMAPOPT_LDAP_BIND_DN); + bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD); + timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT); + timeout.tv_usec = 0; + sprintf(filter, "(uid=%s)", user); + rc = ldap_initialize(&handle, uri); + if (rc != LDAP_SUCCESS) { + syslog(LOG_ERR, "ldap_initialize failed (%s)", uri); + } else { + rc = ldap_simple_bind_s(handle, binddn, bindpw); + if (rc != LDAP_SUCCESS) { + syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc)); + } else { + rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res); + if (rc != LDAP_SUCCESS) { + syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc)); + } else { + if ( (entry = ldap_first_entry(handle, res)) != NULL ) { + // read mail attribute from entry + if ( (vals = ldap_get_values(handle, entry, "mail")) ) { + if (strchr(vals[0], '@')) { + static char buf[81]; /* same size as in auth_canonifyid */ + strncpy( buf, vals[0], sizeof(buf) ); + buf[80] = '\0'; /* make sure it's null-terminated */ + ldap_value_free( vals ); + ldap_msgfree( res ); + ldap_unbind_s(handle); /* also frees handle */ + return auth_canonifyid( buf, 0) ; + } + ldap_value_free( vals ); + } + } + ldap_msgfree( res ); + } + } + ldap_unbind_s(handle); /* also frees handle */ + } + } if (domain) { if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) { *domain = '\0'; /* trim the default domain */ @@ -392,7 +448,7 @@ char *canonify_userid(char *user, char * user = buf; } } - else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) { + else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) { socklen_t salen; int error; struct sockaddr_storage localaddr; diff -r d62bf3b0902d lib/imapoptions --- a/lib/imapoptions Thu Oct 25 08:30:57 2007 +0200 +++ b/lib/imapoptions Thu Oct 25 08:31:06 2007 +0200 @@ -1034,7 +1034,7 @@ are listed with ``''. mailbox hierarchy. The default is to use the netnews separator character '.'. */ -{ "virtdomains", "off", ENUM("off", "userid", "on") } +{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") } /* Enable virtual domain support. If enabled, the user's domain will be determined by splitting a fully qualified userid at the last '@' or '%' symbol. If the userid is unqualified, and the virtdomains --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_timsieved_starttls-sendcaps.patch --- This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45 (minus the CVS keywords) It should be reverse-applied with patch -p2 -R to work around the kontact behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls) and can be dropped as soon as kontact has a way to work with old and new cyrus imapd servers. --- a/timsieved/parser.c 2007/11/26 20:23:06 1.44 +++ b/timsieved/parser.c 2007/12/10 14:47:08 1.45 @@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea starttls_done = 1; - return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated); + return result; } #else static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in) From cvs at kolab.org Tue Apr 22 12:53:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 12:53:30 +0200 (CEST) Subject: emanuel: doc/kolab-formats kolabformat.sgml,1.22,1.23 Message-ID: <20080422105330.013B3600D43@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv24392 Modified Files: kolabformat.sgml Log Message: Draft CVS subtitle removed Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- kolabformat.sgml 18 Apr 2008 09:18:00 -0000 1.22 +++ kolabformat.sgml 22 Apr 2008 10:53:27 -0000 1.23 @@ -16,7 +16,7 @@ The Kolab Storage Format 2.0rc7 -Draft CVS + Bo Thorsen From cvs at kolab.org Tue Apr 22 13:14:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 13:14:02 +0200 (CEST) Subject: emanuel: doc/www/src olddocumentation.html.m4,1.1,1.2 Message-ID: <20080422111402.ABB1D6013A3@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv25141 Modified Files: olddocumentation.html.m4 Log Message: Add link to kroupware documentation page Index: olddocumentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/olddocumentation.html.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- olddocumentation.html.m4 21 Apr 2008 09:35:44 -0000 1.1 +++ olddocumentation.html.m4 22 Apr 2008 11:14:00 -0000 1.2 @@ -40,6 +40,12 @@

    -View all current versions of Kolab documentations. +View all current versions of Kolab +documentations. +

    +More historically documentations on the Kroupware +dokumentation site. + m4_include(footer.html.m4) From cvs at kolab.org Tue Apr 22 14:26:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 14:26:02 +0200 (CEST) Subject: emanuel: doc/kolab-formats kolabformat.sgml,1.23,1.24 Message-ID: <20080422122602.40874600D5A@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv26734 Modified Files: kolabformat.sgml Log Message: Draft CVS subtitle added for next changes. Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- kolabformat.sgml 22 Apr 2008 10:53:27 -0000 1.23 +++ kolabformat.sgml 22 Apr 2008 12:25:59 -0000 1.24 @@ -16,7 +16,7 @@ The Kolab Storage Format 2.0rc7 - +Draft CVS Bo Thorsen From cvs at kolab.org Tue Apr 22 16:03:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 16:03:36 +0200 (CEST) Subject: thomas: server/kolabd/kolabd/templates imapd.annotation_definitions.template.in, 1.4, 1.5 Message-ID: <20080422140336.7610B600D5F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv29150/templates Modified Files: imapd.annotation_definitions.template.in Log Message: Rename xfb-readable to pxfb-readable-for. Index: imapd.annotation_definitions.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.annotation_definitions.template.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- imapd.annotation_definitions.template.in 29 Nov 2007 15:32:11 -0000 1.4 +++ imapd.annotation_definitions.template.in 22 Apr 2008 14:03:34 -0000 1.5 @@ -6,7 +6,7 @@ /vendor/kolab/folder-test,mailbox,string,backend,value.shared value.priv,a /vendor/kolab/folder-type,mailbox,string,backend,value.shared value.priv,a /vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a -/vendor/kolab/xfb-readable,mailbox,string,backend,value.shared value.priv,a +/vendor/kolab/pxfb-readable-for,mailbox,string,backend,value.shared value.priv,a /vendor/kolab/h-share-attr-desc,mailbox,string,backend,value.shared value.priv,a /vendor/horde/share-params,mailbox,string,backend,value.shared value.priv,a /vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a From cvs at kolab.org Tue Apr 22 16:03:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 16:03:36 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog,1.163,1.164 Message-ID: <20080422140336.74A69600D5A@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv29150 Modified Files: ChangeLog Log Message: Rename xfb-readable to pxfb-readable-for. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.163 retrieving revision 1.164 diff -u -d -r1.163 -r1.164 --- ChangeLog 17 Apr 2008 10:52:26 -0000 1.163 +++ ChangeLog 22 Apr 2008 14:03:34 -0000 1.164 @@ -1,3 +1,8 @@ +2008-04-22 Thomas Arendsen Hein + + * templates/imapd.annotation_definitions.template.in: + Rename xfb-readable to pxfb-readable-for. + 2008-04-17 Thomas Arendsen Hein * templates/slapd.conf.template.in: move comment away from value. From cvs at kolab.org Tue Apr 22 16:04:03 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 16:04:03 +0200 (CEST) Subject: thomas: server README.1st,1.78,1.79 Message-ID: <20080422140403.C3E466013C0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv29194 Modified Files: README.1st Log Message: Mention xfb-readable -> pxfb-readable-for in upgrading instructions. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- README.1st 2 Apr 2008 17:24:48 -0000 1.78 +++ README.1st 22 Apr 2008 14:04:01 -0000 1.79 @@ -130,6 +130,12 @@ You should regenerated the free/busy cache again, as described in the upgrading instructions from 2.2-rc1 to 2.2-rc2. +The IMAP annotation /vendor/kolab/xfb-readable (introduced in 2.2-beta-3) +was renamed to /vendor/kolab/pxfb-readable-for to reflect the actual meaning. +After the upgrade the old annotations are still readable, but unused by the +server. If you still need to write this annotation for some reason, you have +to add it to imapd.annotation_definitions.template and run kolabconf. + Upgrade from 2.2-rc1 to 2.2-rc2 ------------------------------- From cvs at kolab.org Tue Apr 22 19:02:58 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 19:02:58 +0200 (CEST) Subject: thomas: server release-notes.txt,1.254,1.255 Message-ID: <20080422170258.5E3F96013C0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2086 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.254 retrieving revision 1.255 diff -u -d -r1.254 -r1.255 --- release-notes.txt 18 Apr 2008 10:21:29 -0000 1.254 +++ release-notes.txt 22 Apr 2008 17:02:56 -0000 1.255 @@ -69,7 +69,7 @@ - kolabd-2.1.99-2008???? - Rename .xpfb to .pxfb. + Rename .xpfb to .pxfb and xfb-readable to pxfb-readable-for kolab/issue2436 (delprune setting in cyrus.conf) From cvs at kolab.org Tue Apr 22 21:57:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Apr 2008 21:57:33 +0200 (CEST) Subject: bernhard: utils/testing test-send-emails-headerencodings.py, NONE, 1.1 Message-ID: <20080422195733.211266013C9@lists.intevation.de> Author: bernhard Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv6449 Added Files: test-send-emails-headerencodings.py Log Message: Adding a testscript for sending email with interesting encodings in the headers. --- NEW FILE: test-send-emails-headerencodings.py --- #!/usr/bin/env python """Send Email with special From: headers that can tickle out problems. Usage $progname This script is Free Software under the GNU General Public License >=v2. bernhard at intevation.de (initial 20080422) """ __version__="$Revision: 1.1 $" # $Source: /kolabrepository/utils/testing/test-send-emails-headerencodings.py,v $ import sys import smtplib import string msgbase="""Subject: %s From: %s Date: Thu, 15 Mar 2008 15:17:02 +0200 MIME-Version: 1.0 No frills. """ msg1 = msgbase % ("Test1, Email with base64 enc From and Comma", "=?iso-8859-1?B?5Hf8b2xmLPZBbmRyZWFz?= ") msg2 = msgbase % ("Test2, email with quoted printable From incl Comma", "=?us-ascii?Q?Surname=2C=20Name?= ") toadd = [sys.argv[1]] smtpserver='localhost' # if you set a loginname, aconnection via TLS and authentification is tried loginname = None password = None fromadd="nobody at example.org" basemsg=("From: %s\r\nTo: %s\r\n%%s\r\n" % (fromadd, string.join(toadd, ", "))) server=smtplib.SMTP(smtpserver) #server.set_debuglevel(1) if loginname != None and password != None: server.starttls() server.login(loginname,password) server.sendmail(fromadd,toadd,msg1) server.sendmail(fromadd,toadd,msg2) server.quit() From cvs at kolab.org Wed Apr 23 09:38:09 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 23 Apr 2008 09:38:09 +0200 (CEST) Subject: emanuel: doc/kolab-formats kolabformat.sgml,1.24,1.25 Message-ID: <20080423073809.7BDFE600169@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv31992 Modified Files: kolabformat.sgml Log Message: new version 2.0rc7 Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- kolabformat.sgml 22 Apr 2008 12:25:59 -0000 1.24 +++ kolabformat.sgml 23 Apr 2008 07:38:07 -0000 1.25 @@ -16,7 +16,7 @@ The Kolab Storage Format 2.0rc7 -Draft CVS + Bo Thorsen @@ -43,8 +43,8 @@

    s.binge at codefusion.co.za
         - -CVS $Date$ $Revision$ +April 22th, 2008 + This documentation was written in SGML using the DocBook DTD. HTML and Postscript output is generated automatically and depends on the @@ -160,8 +160,8 @@ -CVS $Revision$ -$Date$ +2.0rc7 +April 22th, 2008 Fixed the example for a non-standard folder type. Clarified contents of <gender> tags. From cvs at kolab.org Wed Apr 23 09:42:46 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 23 Apr 2008 09:42:46 +0200 (CEST) Subject: emanuel: doc/kolab-formats kolabformat.sgml,1.25,1.26 Message-ID: <20080423074246.30A7260014F@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv32144 Modified Files: kolabformat.sgml Log Message: status _draft_ for next changes Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- kolabformat.sgml 23 Apr 2008 07:38:07 -0000 1.25 +++ kolabformat.sgml 23 Apr 2008 07:42:44 -0000 1.26 @@ -16,7 +16,7 @@ The Kolab Storage Format 2.0rc7 - +Draft CVS Bo Thorsen @@ -43,8 +43,8 @@
    s.binge at codefusion.co.za
         -April 22th, 2008 - + +$Date$ $Revision$ This documentation was written in SGML using the DocBook DTD. HTML and Postscript output is generated automatically and depends on the From cvs at kolab.org Thu Apr 24 17:36:11 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 24 Apr 2008 17:36:11 +0200 (CEST) Subject: thomas: server/openldap fsl.openldap, NONE, 1.1 openldap.patch, NONE, 1.1 openldap.pc, NONE, 1.1 openldap.spec, 1.10, 1.11 rc.openldap, 1.3, 1.4 Message-ID: <20080424153611.9F457600D62@lists.intevation.de> Author: thomas Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv17882 Added Files: fsl.openldap openldap.patch openldap.pc openldap.spec rc.openldap Log Message: Added contents of openldap-2.3.39-20071130.src.rpm (except tarball) --- NEW FILE: fsl.openldap --- ## ## fsl.openldap -- OSSP fsl configuration ## ident (slap.*|slurp.*)/.+ q{ prefix( prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " ) -> { debug: file( path="@l_prefix@/var/openldap/openldap.log", perm=0644 ) } }; --- NEW FILE: openldap.patch --- Index: include/ac/fdset.h --- include/ac/fdset.h.orig 2007-01-02 22:43:47 +0100 +++ include/ac/fdset.h 2007-09-22 19:03:32 +0200 @@ -22,6 +22,13 @@ #ifndef _AC_FDSET_H #define _AC_FDSET_H +#if defined(HAVE_SYS_TYPES_H) +#include +#endif +#if defined(HAVE_SYS_SELECT_H) +#include +#endif + #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) # define OPENLDAP_FD_SETSIZE 4096 #endif Index: servers/slapd/back-perl/config.c --- servers/slapd/back-perl/config.c.orig 2007-01-02 22:44:06 +0100 +++ servers/slapd/back-perl/config.c 2007-09-22 19:13:23 +0200 @@ -49,6 +49,9 @@ } #ifdef PERL_IS_5_6 + if (argc > 2) + snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] ); + else snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] ); eval_pv( eval_str, 0 ); Index: servers/slapd/slapd.conf --- servers/slapd/slapd.conf.orig 2004-06-18 04:49:08 +0200 +++ servers/slapd/slapd.conf 2007-09-22 19:03:32 +0200 @@ -65,3 +65,19 @@ directory %LOCALSTATEDIR%/openldap-data # Indices to maintain index objectClass eq + +####################################################################### +# replication via slurpd(8) +####################################################################### + +# master server configuration +#replogfile %LOCALSTATEDIR%/openldap-slurp +#replica-pidfile %LOCALSTATEDIR%/slurpd.pid +#replica host=slave.example.com:389 +# binddn="cn=admin,dc=example,dc=org" +# bindmethod=simple credentials=secret + +# slave server(s) configuration +#updatedn "cn=admin,dc=example,dc=org" +#updateref ldap://master.example.org + --- NEW FILE: openldap.pc --- prefix=@l_prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: openldap Description: OpenLDAP Libraries Version: @version@ Libs: -L${libdir} @libs@ Cflags: -I${includedir} From cvs at kolab.org Thu Apr 24 17:58:28 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 24 Apr 2008 17:58:28 +0200 (CEST) Subject: thomas: server/openldap openldap.spec,1.11,1.12 Message-ID: <20080424155828.F41C1600D62@lists.intevation.de> Author: thomas Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv18294 Modified Files: openldap.spec Log Message: Adjusted openldap.spec for OpenLDAP 2.3.41 Index: openldap.spec =================================================================== RCS file: /kolabrepository/server/openldap/openldap.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- openldap.spec 24 Apr 2008 15:36:09 -0000 1.11 +++ openldap.spec 24 Apr 2008 15:58:25 -0000 1.12 @@ -27,13 +27,13 @@ Summary: Lightweight Directory Access Protocol (LDAP) Toolkit URL: http://www.openldap.org/ Vendor: OpenLDAP Project -Packager: OpenPKG Foundation e.V. +Packager: Thomas Arendsen Hein Distribution: OpenPKG Community Class: BASE Group: LDAP License: GPL -Version: 2.3.39 -Release: 20071130 +Version: 2.3.41 +Release: 20080424 # package options %option with_server yes From cvs at kolab.org Thu Apr 24 18:19:03 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 24 Apr 2008 18:19:03 +0200 (CEST) Subject: thomas: server release-notes.txt,1.255,1.256 Message-ID: <20080424161903.1670B600D67@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18951 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.255 retrieving revision 1.256 diff -u -d -r1.255 -r1.256 --- release-notes.txt 22 Apr 2008 17:02:56 -0000 1.255 +++ release-notes.txt 24 Apr 2008 16:19:00 -0000 1.256 @@ -90,6 +90,10 @@ fail) kolab/issue2575 (Make background of favicon transparent) + - openldap-2.3.41-20080424 + + New upstream version, fixes various security issues. + - perl-kolab-2.2.rc3-2008???? Added Fedora-DS backend (inactive by default) From cvs at kolab.org Fri Apr 25 11:48:31 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 25 Apr 2008 11:48:31 +0200 (CEST) Subject: gunnar: server/horde external-horde-cvs.sh,1.4,1.5 Message-ID: <20080425094831.5BBA8600D63@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde In directory doto:/tmp/cvs-serv20739 Modified Files: external-horde-cvs.sh Log Message: Update the script to recent horde CVS. Index: external-horde-cvs.sh =================================================================== RCS file: /kolabrepository/server/horde/external-horde-cvs.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- external-horde-cvs.sh 18 Apr 2008 12:22:00 -0000 1.4 +++ external-horde-cvs.sh 25 Apr 2008 09:48:29 -0000 1.5 @@ -1,9 +1,6 @@ #!/bin/sh -DATE="Fri Apr 18 12:20:37 UTC 2008" +DATE="Fri Apr 25 09:46:35 UTC 2008" PATCHES=" -framework/HK-GW-Split_object_folder_type.patch -framework/HK-MG-Distlists.patch -turba/HK-MG-Distlists.patch framework/HK-GW-Fix_Prefs_for_Ingo.patch framework/HK-GW-Fbview_xfb_concept.patch kronolith/HK-SB-Fbview_save_attendees.patch @@ -96,7 +93,7 @@ done cd framework - php -q ${PHP_INCLUDE} devtools/horde-fw-symlinks.php --copy --src `pwd` --dest `pwd`/../horde/lib/ + php -q ${PHP_INCLUDE} devtools/horde-fw-symlinks.php --src `pwd` --dest `pwd`/../horde/lib/ cd .. fi From cvs at kolab.org Mon Apr 28 09:49:59 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Apr 2008 09:49:59 +0200 (CEST) Subject: gunnar: server/horde external-horde-cvs.sh,1.5,1.6 Message-ID: <20080428074959.80714600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde In directory doto:/tmp/cvs-serv2393 Modified Files: external-horde-cvs.sh Log Message: CVS update and addtion of SyncML specific patches. Index: external-horde-cvs.sh =================================================================== RCS file: /kolabrepository/server/horde/external-horde-cvs.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- external-horde-cvs.sh 25 Apr 2008 09:48:29 -0000 1.5 +++ external-horde-cvs.sh 28 Apr 2008 07:49:57 -0000 1.6 @@ -1,6 +1,9 @@ #!/bin/sh -DATE="Fri Apr 25 09:46:35 UTC 2008" +DATE="Mon Apr 28 07:49:33 UTC 2008" PATCHES=" +framework/HK-GW-SyncML_conflicts.patch +framework/HK-GW-SyncML_delete_attributes.patch +turba/HK-GW-SyncML_delete_attributes.patch framework/HK-GW-Fix_Prefs_for_Ingo.patch framework/HK-GW-Fbview_xfb_concept.patch kronolith/HK-SB-Fbview_save_attendees.patch From cvs at kolab.org Mon Apr 28 11:59:12 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Apr 2008 11:59:12 +0200 (CEST) Subject: thomas: server/openldap .cvsignore,1.2,1.3 Message-ID: <20080428095912.888F2600D45@lists.intevation.de> Author: thomas Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv6668 Added Files: .cvsignore Log Message: ignore downloaded tarball From cvs at kolab.org Tue Apr 29 16:50:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 29 Apr 2008 16:50:51 +0200 (CEST) Subject: wilde: server/kolabd/kolabd/dist_conf common, 1.47, 1.48 kolab, 1.60, 1.61 Message-ID: <20080429145051.9991E600173@lists.intevation.de> Author: wilde Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv6358/kolabd/kolabd/dist_conf Modified Files: common kolab Log Message: Added kolabconf template for spamassassin/local.cf. Fixes kolab/issue2244 and kolab/issue2586. Index: common =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- common 19 Mar 2008 19:20:47 -0000 1.47 +++ common 29 Apr 2008 14:50:49 -0000 1.48 @@ -132,6 +132,7 @@ -e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \ -e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \ -e 's,[@]smarty_compiledir[@],$(smarty_compiledir),g' \ + -e 's,[@]spamassassin_confdir[@],$(spamassassin_confdir),g' \ -e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \ -e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \ -e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \ Index: kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- kolab 19 Mar 2008 21:43:15 -0000 1.60 +++ kolab 29 Apr 2008 14:50:49 -0000 1.61 @@ -37,6 +37,7 @@ amavisd_grp=${kolab_rgrp} amavisd_pkg=amavisd +spamassassin_confdir=${sysconfdir}/spamassassin fsl_logfile=${localstatedir}/fsl/fsl.log From cvs at kolab.org Tue Apr 29 16:50:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 29 Apr 2008 16:50:51 +0200 (CEST) Subject: wilde: server/kolabd/kolabd ChangeLog, 1.164, 1.165 Makefile.am, 1.39, 1.40 Message-ID: <20080429145051.7AB6F600173@lists.intevation.de> Author: wilde Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv6358/kolabd/kolabd Modified Files: ChangeLog Makefile.am Log Message: Added kolabconf template for spamassassin/local.cf. Fixes kolab/issue2244 and kolab/issue2586. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- ChangeLog 22 Apr 2008 14:03:34 -0000 1.164 +++ ChangeLog 29 Apr 2008 14:50:49 -0000 1.165 @@ -1,3 +1,14 @@ +2008-04-29 Sascha Wilde + + * dist_conf/kolab (spamassassin_confdir): New variable. + + * dist_conf/common (do_subst): Added `spamassassin_confdir'. + + * templates/local.cf.template.in: New file with some rules similar + to what was done in 2.1 by patching spamassassin. + + * Makefile.am (kolabtemplate_FILES): Added new local.cf template. + 2008-04-22 Thomas Arendsen Hein * templates/imapd.annotation_definitions.template.in: Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Makefile.am 5 Mar 2008 17:13:15 -0000 1.39 +++ Makefile.am 29 Apr 2008 14:50:49 -0000 1.40 @@ -72,7 +72,8 @@ templates/slapd.replicas.template \ templates/smtpd.conf.template \ templates/transport.template \ - templates/virtual.template + templates/virtual.template \ + templates/local.cf.template kolabtemplatedir = $(kolabconfdir)/templates if OPENPKG @@ -516,6 +517,12 @@ $(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@ CLEANFILES += templates/amavisd.conf.template EXTRA_DIST += templates/amavisd.conf.template.in + +templates/local.cf.template: templates/local.cf.template.in + @$(mkinstalldirs) templates + $(do_subst) <$(srcdir)/templates/local.cf.template.in >$@ +CLEANFILES += templates/local.cf.template +EXTRA_DIST += templates/local.cf.template.in workaround.sh: workaround.sh.in @$(mkinstalldirs) . From cvs at kolab.org Tue Apr 29 16:50:52 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 29 Apr 2008 16:50:52 +0200 (CEST) Subject: wilde: server/kolabd/kolabd/templates local.cf.template.in,NONE,1.1 Message-ID: <20080429145052.59C59600173@lists.intevation.de> Author: wilde Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv6358/kolabd/kolabd/templates Added Files: local.cf.template.in Log Message: Added kolabconf template for spamassassin/local.cf. Fixes kolab/issue2244 and kolab/issue2586. --- NEW FILE: local.cf.template.in --- KOLAB_META_START TARGET=@spamassassin_confdir@/local.cf PERMISSIONS=0644 OWNERSHIP=@amavisd_usr@:@amavisd_grp@ RUNONCHANGE=@KOLABRC@ rc amavisd restart KOLAB_META_END # (c) 2008 Intevation GmbH # This program is Free Software under the GNU General Public License (>=v2). # Read the file COPYING that comes with this packages for details. # this file is automatically written by the Kolab config backend # manual additions are lost unless made to the template in the Kolab config # directory # The template is @sysconfdir@/kolab/templates/local.cf.template ## ## /kolab/etc/spamassassin/local.cf -- site-wide defaults for SpamAssassin ## (see 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked) ## # required score for mail to be considered as spam required_score 5.0 # whitelist and blacklist addresses #whitelist_from *@example.com #whitelist_to *@example.com # ignore headers inserted on the receiving side for bayes filtering bayes_ignore_header Return-Path bayes_ignore_header Delivered-To bayes_ignore_header X-Label bayes_ignore_header X-Envelope-To bayes_ignore_header X-Envelope-From bayes_ignore_header X-Quarantine-id bayes_ignore_header ReSent-Date bayes_ignore_header ReSent-From bayes_ignore_header ReSent-Message-ID bayes_ignore_header ReSent-Subject bayes_ignore_header ReSent-To bayes_ignore_header Resent-Date bayes_ignore_header Resent-From bayes_ignore_header Resent-Message-Id bayes_ignore_header Resent-Subject bayes_ignore_header Resent-To bayes_ignore_header X-KMail-EncryptionState bayes_ignore_header X-KMail-SignatureState bayes_ignore_header X-KMail-MDN-Sent # disable all DNS blacklists (from 20_dnsbl_tests.cf) # (some require payment if used for many mailboxes) score RCVD_IN_BL_SPAMCOP_NET 0 score RCVD_IN_DSBL 0 score RCVD_IN_NJABL_CGI 0 score RCVD_IN_NJABL_MULTI 0 score RCVD_IN_NJABL_PROXY 0 score RCVD_IN_NJABL_RELAY 0 score RCVD_IN_NJABL_SPAM 0 score RCVD_IN_SBL 0 score RCVD_IN_SORBS_BLOCK 0 score RCVD_IN_SORBS_DUL 0 score RCVD_IN_SORBS_HTTP 0 score RCVD_IN_SORBS_MISC 0 score RCVD_IN_SORBS_SMTP 0 score RCVD_IN_SORBS_SOCKS 0 score RCVD_IN_SORBS_WEB 0 score RCVD_IN_SORBS_ZOMBIE 0 score RCVD_IN_XBL 0 score RCVD_IN_PBL 0 score DNS_FROM_AHBL_RHSBL 0 score DNS_FROM_RFC_BOGUSMX 0 score DNS_FROM_RFC_DSN 0 score RCVD_IN_BSP_OTHER 0 score RCVD_IN_BSP_TRUSTED 0 score RCVD_IN_SSC_TRUSTED_COI 0 score HABEAS_ACCREDITED_COI 0 score HABEAS_ACCREDITED_SOI 0 score HABEAS_CHECKED 0 score RCVD_IN_IADB_VOUCHED 0 score RCVD_IN_MAPS_RBL 0 score RCVD_IN_MAPS_DUL 0 score RCVD_IN_MAPS_RSS 0 score RCVD_IN_MAPS_NML 0 # disable all URI blacklists (from 25_uribl.cf) # (some require payment if used for many mailboxes) score URIBL_AB_SURBL 0 score URIBL_JP_SURBL 0 score URIBL_OB_SURBL 0 score URIBL_PH_SURBL 0 score URIBL_SBL 0 score URIBL_SC_SURBL 0 score URIBL_WS_SURBL 0 score URIBL_BLACK 0 score URIBL_GREY 0 score URIBL_RED 0 # Don't score some common cases too high: score HELO_LOCALHOST 1 score TVD_SPACE_RATIO 1 From cvs at kolab.org Wed Apr 30 07:23:08 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 30 Apr 2008 07:23:08 +0200 (CEST) Subject: gunnar: server/patches/cyrus-imapd/cyrus-imapd-2.3.12 KOLAB_cyrus-cyradm-2.3.12_Annotations.patch, NONE, 1.1 KOLAB_cyrus-cyradm_Annotations.patch, 1.1, NONE Message-ID: <20080430052308.4D392600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.12 In directory doto:/tmp/cvs-serv13871 Added Files: KOLAB_cyrus-cyradm-2.3.12_Annotations.patch Removed Files: KOLAB_cyrus-cyradm_Annotations.patch Log Message: Keep the version number in there. --- NEW FILE: KOLAB_cyrus-cyradm-2.3.12_Annotations.patch --- Allows to use arbitrary annotations with the cyradm tool. diff -r a07884e259c3 doc/man/cyradm.1.html --- a/doc/man/cyradm.1.html Thu Oct 25 08:24:39 2007 +0200 +++ b/doc/man/cyradm.1.html Thu Oct 25 08:29:40 2007 +0200 @@ -241,6 +241,13 @@ The currently supported attributes are:<

    Sets an email address to which messages injected into the server via NNTP will be sent.

    +
    + +
    /explicit/annotation + +
    +

    Sets the annotation /explicit/annotation +on mailbox to value.

    sharedseen diff -r a07884e259c3 perl/imap/IMAP/Admin.pm --- a/perl/imap/IMAP/Admin.pm Thu Oct 25 08:24:39 2007 +0200 +++ b/perl/imap/IMAP/Admin.pm Thu Oct 25 08:29:40 2007 +0200 @@ -796,11 +796,11 @@ sub mboxconfig { return undef; } - if(!exists($values{$entry})) { - $self->{error} = "Unknown parameter $entry"; - } - - $entry = $values{$entry}; + if(exists($values{$entry})) { + $entry = $values{$entry}; + } else { + $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/"; + } my ($rc, $msg); diff -r a07884e259c3 perl/imap/IMAP/Shell.pm --- a/perl/imap/IMAP/Shell.pm Thu Oct 25 08:24:39 2007 +0200 +++ b/perl/imap/IMAP/Shell.pm Thu Oct 25 08:29:40 2007 +0200 @@ -126,7 +126,7 @@ my %builtins = (exit => [\&_sc_info, '[mailbox]', 'display mailbox/server metadata'], mboxcfg => - [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value', + [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/] value', 'configure mailbox'], mboxconfig => 'mboxcfg', reconstruct => @@ -1436,7 +1436,7 @@ sub _sc_mboxcfg { while (defined ($opt = shift(@argv))) { last if $opt eq '--'; if ($opt =~ /^-/) { - die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; + die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; } else { push(@nargv, $opt); @@ -1445,7 +1445,7 @@ sub _sc_mboxcfg { } push(@nargv, @argv); if (@nargv < 2) { - die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; + die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; } if (!$cyrref || !$$cyrref) { die "mboxconfig: no connection to server\n"; diff -r a07884e259c3 perl/imap/cyradm.sh --- a/perl/imap/cyradm.sh Thu Oct 25 08:24:39 2007 +0200 +++ b/perl/imap/cyradm.sh Thu Oct 25 08:29:40 2007 +0200 @@ -241,6 +241,10 @@ mailboxes). Indicates that the mailbox should have a squat index created for it. +=item C + +Sets the annotation I on I to I. + =back =item C [C<--partition> I] I I --- KOLAB_cyrus-cyradm_Annotations.patch DELETED --- From cvs at kolab.org Wed Apr 30 07:18:21 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 30 Apr 2008 07:18:21 +0200 (CEST) Subject: gunnar: server/patches/cyrus-imapd/cyrus-imapd-2.3.12 KOLAB_cyrus-imapd-2.3.12_UID.patch, 1.1, 1.2 Message-ID: <20080430051821.1DAE160016A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.12 In directory doto:/tmp/cvs-serv13755 Modified Files: KOLAB_cyrus-imapd-2.3.12_UID.patch Log Message: kolab/issue1824 (cyrus-imapd segfaults on x86_64) Index: KOLAB_cyrus-imapd-2.3.12_UID.patch =================================================================== RCS file: /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.12/KOLAB_cyrus-imapd-2.3.12_UID.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- KOLAB_cyrus-imapd-2.3.12_UID.patch 22 Apr 2008 08:51:33 -0000 1.1 +++ KOLAB_cyrus-imapd-2.3.12_UID.patch 30 Apr 2008 05:18:18 -0000 1.2 @@ -38,13 +38,13 @@ + LDAP *handle; + LDAPMessage *res; + LDAPMessage *entry; -+ char ** vals; ++ struct berval** vals; + + int rc; /* check for domain */ if (config_virtdomains && -@@ -380,6 +395,47 @@ char *canonify_userid(char *user, char * +@@ -380,6 +395,49 @@ } if (config_virtdomains) { @@ -70,17 +70,19 @@ + } else { + if ( (entry = ldap_first_entry(handle, res)) != NULL ) { + // read mail attribute from entry -+ if ( (vals = ldap_get_values(handle, entry, "mail")) ) { -+ if (strchr(vals[0], '@')) { ++ if ( (vals = ldap_get_values_len(handle, entry, "mail")) ) { ++ if (memchr(vals[0]->bv_val, '@', vals[0]->bv_len)) { + static char buf[81]; /* same size as in auth_canonifyid */ -+ strncpy( buf, vals[0], sizeof(buf) ); -+ buf[80] = '\0'; /* make sure it's null-terminated */ -+ ldap_value_free( vals ); ++ int len = ((sizeof(buf) - 1) > vals[0]->bv_len ? vals[0]->bv_len : sizeof(buf) - 1); ++ strncpy( buf, vals[0]->bv_val, len); ++ buf[len] = '\0'; /* make sure it's null-terminated */ ++ ldap_value_free_len( vals ); + ldap_msgfree( res ); + ldap_unbind_s(handle); /* also frees handle */ ++ syslog(LOG_DEBUG, "canonify: '%s'\n", buf); + return auth_canonifyid( buf, 0) ; + } -+ ldap_value_free( vals ); ++ ldap_value_free_len( vals ); + } + } + ldap_msgfree( res ); From cvs at kolab.org Wed Apr 30 14:48:50 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 30 Apr 2008 14:48:50 +0200 (CEST) Subject: wilde: server/kolabd/kolabd ChangeLog, 1.165, 1.166 Makefile.am, 1.40, 1.41 Message-ID: <20080430124850.DEB35600D60@lists.intevation.de> Author: wilde Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv1322/kolabd/kolabd Modified Files: ChangeLog Makefile.am Log Message: Cleaned up kolabd/Makefile.am (more than 370 lines of redundant information saved!) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -r1.165 -r1.166 --- ChangeLog 29 Apr 2008 14:50:49 -0000 1.165 +++ ChangeLog 30 Apr 2008 12:48:47 -0000 1.166 @@ -1,3 +1,8 @@ +2008-04-30 Sascha Wilde + + * Makefile.am: Major cleanup: replaced lots of redundant rules by + two generalized ones. (TODO: actually one should do...) + 2008-04-29 Sascha Wilde * dist_conf/kolab (spamassassin_confdir): New variable. Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Makefile.am 29 Apr 2008 14:50:49 -0000 1.40 +++ Makefile.am 30 Apr 2008 12:48:47 -0000 1.41 @@ -1,6 +1,3 @@ -EXTRA_DIST = -CLEANFILES = - @distribution@ @common@ @@ -89,7 +86,6 @@ namespace/libexec/deluser \ namespace/libexec/listusers \ namespace/libexec/showuser \ - namespace/libexec/newconfig \ namespace/libexec/services \ namespace/libexec/showlog \ namespace/libexec/start \ @@ -139,12 +135,11 @@ NEWS \ AUTHORS -kolabdocdir = $(pkgdocdir)/@PACKAGE@ -kolabdoc_DATA = $(kolabdoc_FILES) \ - doc/README.amavisd \ +kolabdoc_GENERATED = doc/README.amavisd \ doc/README.webgui -EXTRA_DIST += $(kolabdoc_FILES) +kolabdocdir = $(pkgdocdir)/@PACKAGE@ +kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED) if OPENPKG kolabsbin_FILES = kolabd \ @@ -173,401 +168,34 @@ kolabrc_DATA = rc.kolabd endif +generated_files = $(kolabspecial_DATA) \ + $(kolabtemplate_DATA) \ + $(kolabdoc_GENERATED) -kolab: kolab.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab.in >$@ - chmod a+x kolab -CLEANFILES += kolab -EXTRA_DIST += kolab.in - -kolab.globals: kolab.globals.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab.globals.in >$@ -CLEANFILES += kolab.globals -EXTRA_DIST += kolab.globals.in - -kolab_ca.sh: kolab_ca.sh.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab_ca.sh.in >$@ - chmod a+x kolab_ca.sh -CLEANFILES += kolab_ca.sh -EXTRA_DIST += kolab_ca.sh.in - -kolab_bootstrap: kolab_bootstrap.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab_bootstrap.in >$@ - chmod a+x kolab_bootstrap -CLEANFILES += kolab_bootstrap -EXTRA_DIST += kolab_bootstrap.in - -kolab_sslcert.sh: kolab_sslcert.sh.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab_sslcert.sh.in >$@ - chmod a+x kolab_sslcert.sh -CLEANFILES += kolab_sslcert.sh -EXTRA_DIST += kolab_sslcert.sh.in - -kolabcheckperm: kolabcheckperm.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabcheckperm.in >$@ -CLEANFILES += kolabcheckperm -EXTRA_DIST += kolabcheckperm.in - -kolabd: kolabd.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabd.in >$@ - chmod a+x kolabd -CLEANFILES += kolabd -EXTRA_DIST += kolabd.in - -kolabpasswd: kolabpasswd.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabpasswd.in >$@ - chmod a+x kolabpasswd -CLEANFILES += kolabpasswd -EXTRA_DIST += kolabpasswd.in - -kolabquotawarn: kolabquotawarn.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabquotawarn.in >$@ - chmod a+x kolabquotawarn -CLEANFILES += kolabquotawarn -EXTRA_DIST += kolabquotawarn.in - -kolabquotareport: kolabquotareport.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabquotareport.in >$@ - chmod a+x kolabquotareport -CLEANFILES += kolabquotareport -EXTRA_DIST += kolabquotareport.in - -kolabquotareport: kolabquotareport.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabquotareport.in >$@ - chmod a+x kolabquotareport -CLEANFILES += kolabquotareport -EXTRA_DIST += kolabquotareport.in - -kolabdcachetool: kolabdcachetool.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolabdcachetool.in >$@ - chmod a+x kolabdcachetool -CLEANFILES += kolabdcachetool -EXTRA_DIST += kolabdcachetool.in - -namespace/libexec/adduser: namespace/libexec/adduser.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/adduser.in >$@ - chmod a+x namespace/libexec/adduser -CLEANFILES += namespace/libexec/adduser -EXTRA_DIST += namespace/libexec/adduser.in - -namespace/libexec/deluser: namespace/libexec/deluser.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/deluser.in >$@ - chmod a+x namespace/libexec/deluser -CLEANFILES += namespace/libexec/deluser -EXTRA_DIST += namespace/libexec/deluser.in - -namespace/libexec/listusers: namespace/libexec/listusers.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/listusers.in >$@ - chmod a+x namespace/libexec/listusers -CLEANFILES += namespace/libexec/listusers -EXTRA_DIST += namespace/libexec/listusers.in - -namespace/libexec/newconfig: namespace/libexec/newconfig.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/newconfig.in >$@ - chmod a+x namespace/libexec/newconfig -CLEANFILES += namespace/libexec/newconfig -EXTRA_DIST += namespace/libexec/newconfig.in - -namespace/libexec/services: namespace/libexec/services.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/services.in >$@ - chmod a+x namespace/libexec/services -CLEANFILES += namespace/libexec/services -EXTRA_DIST += namespace/libexec/services.in - -namespace/libexec/showlog: namespace/libexec/showlog.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/showlog.in >$@ - chmod a+x namespace/libexec/showlog -CLEANFILES += namespace/libexec/showlog -EXTRA_DIST += namespace/libexec/showlog.in - -namespace/libexec/showuser: namespace/libexec/showuser.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/showuser.in >$@ - chmod a+x namespace/libexec/showuser -CLEANFILES += namespace/libexec/showuser -EXTRA_DIST += namespace/libexec/showuser.in - -namespace/libexec/start: namespace/libexec/start.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/start.in >$@ - chmod a+x namespace/libexec/start -CLEANFILES += namespace/libexec/start -EXTRA_DIST += namespace/libexec/start.in - -namespace/libexec/stop: namespace/libexec/stop.in - @$(mkinstalldirs) namespace/libexec - $(do_subst) <$(srcdir)/namespace/libexec/stop.in >$@ - chmod a+x namespace/libexec/stop -CLEANFILES += namespace/libexec/stop -EXTRA_DIST += namespace/libexec/stop.in - -namespace/kolab: namespace/kolab.in - @$(mkinstalldirs) namespace/ - $(do_subst) <$(srcdir)/namespace/kolab.in >$@ - chmod a+x namespace/kolab -CLEANFILES += namespace/kolab -EXTRA_DIST += namespace/kolab.in - -templates/clamd.conf.template: templates/clamd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@ -CLEANFILES += templates/clamd.conf.template -EXTRA_DIST += templates/clamd.conf.template.in - -templates/cyrus.conf.template: templates/cyrus.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/cyrus.conf.template.in >$@ -CLEANFILES += templates/cyrus.conf.template -EXTRA_DIST += templates/cyrus.conf.template.in - -templates/DB_CONFIG.slapd.template: templates/DB_CONFIG.slapd.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/DB_CONFIG.slapd.template.in >$@ -CLEANFILES += templates/DB_CONFIG.slapd.template -EXTRA_DIST += templates/DB_CONFIG.slapd.template.in - -templates/fbview.conf.template: templates/fbview.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/fbview.conf.template.in >$@ -CLEANFILES += templates/fbview.conf.template -EXTRA_DIST += templates/fbview.conf.template.in - -templates/freebusy.conf.template: templates/freebusy.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/freebusy.conf.template.in >$@ -CLEANFILES += templates/freebusy.conf.template -EXTRA_DIST += templates/freebusy.conf.template.in - -templates/freshclam.conf.template: templates/freshclam.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/freshclam.conf.template.in >$@ -CLEANFILES += templates/freshclam.conf.template -EXTRA_DIST += templates/freshclam.conf.template.in - -templates/httpd.conf.template: templates/httpd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/httpd.conf.template.in >$@ -CLEANFILES += templates/httpd.conf.template -EXTRA_DIST += templates/httpd.conf.template.in - -templates/httpd.local.template: templates/httpd.local.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/httpd.local.template.in >$@ -CLEANFILES += templates/httpd.local.template -EXTRA_DIST += templates/httpd.local.template.in - -templates/imapd.annotation_definitions.template: templates/imapd.annotation_definitions.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/imapd.annotation_definitions.template.in >$@ -CLEANFILES += templates/imapd.annotation_definitions.template -EXTRA_DIST += templates/imapd.annotation_definitions.template.in - -templates/imapd.conf.template: templates/imapd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/imapd.conf.template.in >$@ -CLEANFILES += templates/imapd.conf.template -EXTRA_DIST += templates/imapd.conf.template.in - -templates/imapd.group.template: templates/imapd.group.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/imapd.group.template.in >$@ -CLEANFILES += templates/imapd.group.template -EXTRA_DIST += templates/imapd.group.template.in - -templates/kolab.conf.template: templates/kolab.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/kolab.conf.template.in >$@ -CLEANFILES += templates/kolab.conf.template -EXTRA_DIST += templates/kolab.conf.template.in - -templates/ldap.conf.template: templates/ldap.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/ldap.conf.template.in >$@ -CLEANFILES += templates/ldap.conf.template -EXTRA_DIST += templates/ldap.conf.template.in - -templates/ldapdistlist.cf.template: templates/ldapdistlist.cf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/ldapdistlist.cf.template.in >$@ -CLEANFILES += templates/ldapdistlist.cf.template -EXTRA_DIST += templates/ldapdistlist.cf.template.in - -templates/ldaptransport.cf.template: templates/ldaptransport.cf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/ldaptransport.cf.template.in >$@ -CLEANFILES += templates/ldaptransport.cf.template -EXTRA_DIST += templates/ldaptransport.cf.template.in - -templates/ldapvirtual.cf.template: templates/ldapvirtual.cf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/ldapvirtual.cf.template.in >$@ -CLEANFILES += templates/ldapvirtual.cf.template -EXTRA_DIST += templates/ldapvirtual.cf.template.in - -templates/main.cf.template: templates/main.cf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/main.cf.template.in >$@ -CLEANFILES += templates/main.cf.template -EXTRA_DIST += templates/main.cf.template.in - -templates/master.cf.template: templates/master.cf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/master.cf.template.in >$@ -CLEANFILES += templates/master.cf.template -EXTRA_DIST += templates/master.cf.template.in - -templates/kolab_smtpdpolicy.conf.template: templates/kolab_smtpdpolicy.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/kolab_smtpdpolicy.conf.template.in >$@ -CLEANFILES += templates/kolab_smtpdpolicy.conf.template -EXTRA_DIST += templates/kolab_smtpdpolicy.conf.template.in - -templates/php.ini.template: templates/php.ini.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/php.ini.template.in >$@ -CLEANFILES += templates/php.ini.template -EXTRA_DIST += templates/php.ini.template.in - -templates/rc.conf.template: templates/rc.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@ -CLEANFILES += templates/rc.conf.template -EXTRA_DIST += templates/rc.conf.template.in - -templates/resmgr.conf.template: templates/resmgr.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@ -CLEANFILES += templates/resmgr.conf.template -EXTRA_DIST += templates/resmgr.conf.template.in - -templates/saslauthd.conf.template: templates/saslauthd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/saslauthd.conf.template.in >$@ -CLEANFILES += templates/saslauthd.conf.template -EXTRA_DIST += templates/saslauthd.conf.template.in - -templates/session_vars.php.template: templates/session_vars.php.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@ -CLEANFILES += templates/session_vars.php.template -EXTRA_DIST += templates/session_vars.php.template.in - -templates/slapd.access.template: templates/slapd.access.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@ -CLEANFILES += templates/slapd.access.template -EXTRA_DIST += templates/slapd.access.template.in - -templates/slapd.conf.template: templates/slapd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/slapd.conf.template.in >$@ -CLEANFILES += templates/slapd.conf.template -EXTRA_DIST += templates/slapd.conf.template.in - -templates/slapd.replicas.template: templates/slapd.replicas.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/slapd.replicas.template.in >$@ -CLEANFILES += templates/slapd.replicas.template -EXTRA_DIST += templates/slapd.replicas.template.in - -templates/smtpd.conf.template: templates/smtpd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/smtpd.conf.template.in >$@ -CLEANFILES += templates/smtpd.conf.template -EXTRA_DIST += templates/smtpd.conf.template.in - -templates/transport.template: templates/transport.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/transport.template.in >$@ -CLEANFILES += templates/transport.template -EXTRA_DIST += templates/transport.template.in - -templates/virtual.template: templates/virtual.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/virtual.template.in >$@ -CLEANFILES += templates/virtual.template -EXTRA_DIST += templates/virtual.template.in - -templates/header_checks.template: templates/header_checks.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/header_checks.template.in >$@ -CLEANFILES += templates/header_checks.template -EXTRA_DIST += templates/header_checks.template.in - -templates/amavisd.conf.template: templates/amavisd.conf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@ -CLEANFILES += templates/amavisd.conf.template -EXTRA_DIST += templates/amavisd.conf.template.in - -templates/local.cf.template: templates/local.cf.template.in - @$(mkinstalldirs) templates - $(do_subst) <$(srcdir)/templates/local.cf.template.in >$@ -CLEANFILES += templates/local.cf.template -EXTRA_DIST += templates/local.cf.template.in +generated_executables = $(kolabsbin_DATA) \ + $(kolab_SCRIPTS) \ + $(kolabbin_DATA) \ + $(kolabrc_DATA) \ + $(kolabnamespace_DATA) -workaround.sh: workaround.sh.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/workaround.sh.in >$@ - chmod a+x workaround.sh -CLEANFILES += workaround.sh -EXTRA_DIST += workaround.sh.in +EXTRA_DIST = +CLEANFILES = -kolab_upgrade: kolab_upgrade.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab_upgrade.in >$@ - chmod a+x kolab_upgrade -CLEANFILES += kolab_upgrade -EXTRA_DIST += kolab_upgrade.in +EXTRA_DIST += $(patsubst %,%.in,$(generated_executables) $(generated_files)) +EXTRA_DIST += $(kolabdoc_FILES) -kolab_smtpdpolicy: kolab_smtpdpolicy.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/kolab_smtpdpolicy.in >$@ - chmod a+x kolab_smtpdpolicy -CLEANFILES += kolab_smtpdpolicy -EXTRA_DIST += kolab_smtpdpolicy.in +CLEANFILES += $(generated_files) $(generated_executables) -doc/README.amavisd: doc/README.amavisd.in - @$(mkinstalldirs) doc - $(do_subst) <$(srcdir)/doc/README.amavisd.in >$@ -CLEANFILES += doc/README.amavisd -EXTRA_DIST += doc/README.amavisd.in -doc/README.webgui: doc/README.webgui.in - @$(mkinstalldirs) doc - $(do_subst) <$(srcdir)/doc/README.webgui.in >$@ -CLEANFILES += doc/README.webgui -EXTRA_DIST += doc/README.webgui.in +$(generated_files): %: %.in + @$(mkinstalldirs) . templates/ doc/ + $(do_subst) <$(srcdir)/$< >$@ -rc.kolabd: rc.kolabd.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/rc.kolabd.in >$@ -CLEANFILES += rc.kolabd -EXTRA_DIST += rc.kolabd.in +$(generated_executables): %: %.in + @$(mkinstalldirs) . namespace/ namespace/libexec/ + $(do_subst) <$(srcdir)/$< >$@ + chmod a+x $@ -dist_conf/kolabsrv: dist_conf/kolabsrv.in - @$(mkinstalldirs) . - $(do_subst) <$(srcdir)/dist_conf/kolabsrv.in >$@ -CLEANFILES += dist_conf/kolabsrv -EXTRA_DIST += dist_conf/kolabsrv.in # Please update the perl-kolab, kolab-webadmin and kolab-resource-handlers # Makefile.ams too when the underneath EXTRA_DIST assignment is altered @@ -602,4 +230,3 @@ chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA) chmod 744 $(DESTDIR)$(bindir)/kolab endif - From cvs at kolab.org Thu May 1 12:22:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 1 May 2008 12:22:49 +0200 (CEST) Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP/Backend fds.pm,1.1,1.2 Message-ID: <20080501102249.8934D600D62@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend In directory doto:/tmp/cvs-serv16822/lib/Kolab/LDAP/Backend Modified Files: fds.pm Log Message: No hardcoded paths. Index: fds.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend/fds.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fds.pm 28 Mar 2008 12:12:27 -0000 1.1 +++ fds.pm 1 May 2008 10:22:47 -0000 1.2 @@ -108,7 +108,7 @@ FOO: Kolab::log('FDS', "Calling Kolab::LDAP::sync", KOLAB_DEBUG); Kolab::LDAP::sync; - system("/kolab/sbin/kolabconf") == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR); + system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR); Kolab::log('FDS', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG); sleep 1; # we get too many bogus change notifications! From cvs at kolab.org Fri May 2 11:15:39 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 11:15:39 +0200 (CEST) Subject: thomas: server/spamassassin kolab.patch,1.3,NONE Message-ID: <20080502091539.30FDC600D5F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/spamassassin In directory doto:/tmp/cvs-serv9449/spamassassin Removed Files: kolab.patch Log Message: Removed spamassassin patch which got moved to a local.cf.template --- kolab.patch DELETED --- From cvs at kolab.org Fri May 2 11:19:32 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 11:19:32 +0200 (CEST) Subject: thomas: server release-notes.txt,1.256,1.257 Message-ID: <20080502091932.2B9DB600D5F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9600 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.256 retrieving revision 1.257 diff -u -d -r1.256 -r1.257 --- release-notes.txt 24 Apr 2008 16:19:00 -0000 1.256 +++ release-notes.txt 2 May 2008 09:19:30 -0000 1.257 @@ -71,7 +71,9 @@ Rename .xpfb to .pxfb and xfb-readable to pxfb-readable-for + kolab/issue2244 (SpamAssassin uses DNS blacklists) kolab/issue2436 (delprune setting in cyrus.conf) + kolab/issue2586 (SPAM filtering: HELO_LOCALHOST score default too high) - kolab-filter-2.2.rc3-2008???? From cvs at kolab.org Fri May 2 11:24:11 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 11:24:11 +0200 (CEST) Subject: gunnar: server/patches/php/php-5.2.6 - New directory Message-ID: <20080502092411.5E7F5600D5F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/php/php-5.2.6 In directory doto:/tmp/cvs-serv9816/php-5.2.6 Log Message: Directory /kolabrepository/server/patches/php/php-5.2.6 added to the repository From cvs at kolab.org Fri May 2 11:24:26 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 11:24:26 +0200 (CEST) Subject: gunnar: server/patches/php/php-5.2.6 KOLAB_php-5.2.6_Annotations.patch, NONE, 1.1 Message-ID: <20080502092426.2ED67600D65@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/php/php-5.2.6 In directory doto:/tmp/cvs-serv9855/php-5.2.6 Added Files: KOLAB_php-5.2.6_Annotations.patch Log Message: PHP-5.2.6 has been released. --- NEW FILE: KOLAB_php-5.2.6_Annotations.patch --- Provides get/set ANNOTATIONS support to PHP. [Version: 5.2.6] diff -r 4f78d3c907b7 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:21:11 2008 +0200 +++ b/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 @@ -129,6 +129,7 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_binary, NULL) PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) + PHP_FE(imap_status_current, NULL) PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) PHP_FE(imap_clearflag_full, NULL) @@ -155,6 +156,10 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) #endif +#if defined(HAVE_IMAP2005) + PHP_FE(imap_setannotation, NULL) + PHP_FE(imap_getannotation, NULL) +#endif PHP_FE(imap_mail, NULL) @@ -415,6 +420,30 @@ void mail_getacl(MAILSTREAM *stream, cha #endif + +#if defined(HAVE_IMAP2005) +/* {{{ mail_getannotation + * + * Mail GET_ANNOTATION callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist) +{ + ANNOTATION_VALUES *cur; + + TSRMLS_FETCH(); + + /* walk through the ANNOTATION_VALUES */ + + for(cur = alist->values; cur; cur = cur->next) { + if (cur->value) + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1); + else + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, "", 0, 1); + } +} +/* }}} */ +#endif /* {{{ PHP_GINIT_FUNCTION */ @@ -1097,6 +1126,122 @@ PHP_FUNCTION(imap_getacl) #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ +#if defined(HAVE_IMAP2005) + +/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value) + Sets an annotation for a given mailbox */ +PHP_FUNCTION(imap_setannotation) +{ + zval **streamind, **mailbox, **entry, **attr, **value; + pils *imap_le_struct; + long ret; + + // TODO: Use zend_parse_parameters here + if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + convert_to_string_ex(value); + + // create annotation object + ANNOTATION *annotation = mail_newannotation(); + if (!annotation) + RETURN_FALSE; + annotation->values = mail_newannotationvalue(); + if (!annotation->values) { + mail_free_annotation(&annotation); + RETURN_FALSE; + } + + // fill in annotation values + annotation->mbox = Z_STRVAL_PP(mailbox); + annotation->entry = Z_STRVAL_PP(entry); + annotation->values->attr = Z_STRVAL_PP(attr); + annotation->values->value = Z_STRVAL_PP(value); + + ret = imap_setannotation(imap_le_struct->imap_stream, annotation); + + // make sure mail_free_annotation doesn't free our variables + annotation->mbox = NULL; + annotation->entry = NULL; + annotation->values->attr = NULL; + annotation->values->value = NULL; + mail_free_annotation(&annotation); + + RETURN_BOOL(ret); +} +/* }}} */ + +/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_getannotation) +{ + zval **streamind, **mailbox, **entry, **attr; + pils *imap_le_struct; + long ret; + + if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + // fillup calling parameters + STRINGLIST *entries = mail_newstringlist(); + if (!entries) + RETURN_FALSE; + + STRINGLIST *cur = entries; + cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry)); + cur->text.size = Z_STRLEN_PP(entry); + cur->next = NIL; + + STRINGLIST *attributes = mail_newstringlist(); + cur = attributes; + cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr)); + cur->text.size = Z_STRLEN_PP(attr); + cur->next = NIL; + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = return_value; + + /* set the callback for the GET_ANNOTATION function */ + mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation); + ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes); + + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + + if (!ret) { + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = NIL; +} +/* }}} */ + +#endif /* HAVE_IMAP2005 */ /* {{{ proto bool imap_expunge(resource stream_id) Permanently delete all messages marked for deletion */ @@ -2707,6 +2852,42 @@ PHP_FUNCTION(imap_msgno) } /* }}} */ +/* {{{ proto object imap_status_current(resource stream_id, int options) + Get (cached) status info from current mailbox */ +PHP_FUNCTION(imap_status_current) +{ + zval **streamind, **pflags; + pils *imap_le_struct; + long flags = 0L; + + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_long_ex(pflags); + flags = Z_LVAL_PP(pflags); + + if (object_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + if (flags & SA_MESSAGES) { + add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs); + } + if (flags & SA_RECENT) { + add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent); + } + if (flags & SA_UIDNEXT) { + add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1); + } + if (flags & SA_UIDVALIDITY) { + add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity); + } +} +/* }}} */ + /* {{{ proto object imap_status(resource stream_id, string mailbox, int options) Get status info from a mailbox */ PHP_FUNCTION(imap_status) diff -r 4f78d3c907b7 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:21:11 2008 +0200 +++ b/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 @@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_create); PHP_FUNCTION(imap_rename); +PHP_FUNCTION(imap_status_current); PHP_FUNCTION(imap_status); PHP_FUNCTION(imap_bodystruct); PHP_FUNCTION(imap_fetch_overview); @@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_timeout); +// TODO: Needs fixing in configure in +#define HAVE_IMAP2005 1 + #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FUNCTION(imap_get_quota); PHP_FUNCTION(imap_get_quotaroot); @@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); #endif - +#if defined(HAVE_IMAP2005) +PHP_FUNCTION(imap_setannotation); +PHP_FUNCTION(imap_getannotation); +#endif ZEND_BEGIN_MODULE_GLOBALS(imap) char *imap_user; @@ -206,6 +213,9 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) zval **quota_return; zval *imap_acl_list; #endif +#if defined(HAVE_IMAP2005) + zval *imap_annotation_list; +#endif /* php_stream for php_mail_gets() */ php_stream *gets_stream; ZEND_END_MODULE_GLOBALS(imap) From cvs at kolab.org Fri May 2 12:01:03 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:01:03 +0200 (CEST) Subject: thomas: server/file kolab-filemagic.patch,1.3,NONE Message-ID: <20080502100103.CCE81600175@lists.intevation.de> Author: thomas Update of /kolabrepository/server/file In directory doto:/tmp/cvs-serv10658/file Removed Files: kolab-filemagic.patch Log Message: Removed no longer needed kolab-filemagic.patch The fix for kolab/issue1458 (Password protected .sxw files can be banned by amavisd, as a result of the file command.) introduced this, but due to changes in amavsid-new COM files are no longer considered executable: $map_full_type_to_short_type_re = [ ... [qr/^COM executable for DOS\b/ => 'asc'], # misclassified? [qr/^(MS-)?DOS executable\b(?!.*\(COM\))/ => ['exe','exe-ms'] ], --- kolab-filemagic.patch DELETED --- From cvs at kolab.org Fri May 2 12:19:59 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:19:59 +0200 (CEST) Subject: thomas: server/imapd Makefile,1.34,1.35 Message-ID: <20080502101959.40433600D49@lists.intevation.de> Author: thomas Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv11454 Modified Files: Makefile Log Message: Removed unneeded cp and use package name from variable Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- Makefile 10 Apr 2008 17:31:05 -0000 1.34 +++ Makefile 2 May 2008 10:19:57 -0000 1.35 @@ -29,12 +29,11 @@ cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/ - cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imapd.spec cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes' cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c $(KOLABPKGURI)/imapd-$(VERSION)-$(RELEASE).src.rpm + wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm dist: all cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ From cvs at kolab.org Fri May 2 12:26:41 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:26:41 +0200 (CEST) Subject: thomas: server/postfix Makefile, 1.17, 1.18 README, 1.2, 1.3 kolab.patch, 1.6, 1.7 Message-ID: <20080502102641.D1D3A600D49@lists.intevation.de> Author: thomas Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv11637 Added Files: Makefile README kolab.patch Log Message: Fix kolab/issue2346 (Compilation of postfix fails on CentOS 5.1 64Bit) The /lib64 patch for the OpenPKG spec file is needed for packages before postfix-2.5.1-20080217 and distributions which don't have /lib and /lib64 pointing to the same directory. From cvs at kolab.org Fri May 2 12:29:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:29:36 +0200 (CEST) Subject: thomas: server release-notes.txt,1.257,1.258 Message-ID: <20080502102936.76EBB600D5F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11723 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.257 retrieving revision 1.258 diff -u -d -r1.257 -r1.258 --- release-notes.txt 2 May 2008 09:19:30 -0000 1.257 +++ release-notes.txt 2 May 2008 10:29:34 -0000 1.258 @@ -109,6 +109,10 @@ kolab/issue2549 (Resource manager creates events in wrong account) + - postfix-2.4.6-20080101_kolab + + kolab/issue2346 (Compilation of postfix fails on CentOS 5.1 64Bit) + Changes between 2.2-rc-1 and 2.2-rc-2 From cvs at kolab.org Fri May 2 12:30:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:30:51 +0200 (CEST) Subject: thomas: server/postfix .cvsignore,1.2,1.3 Message-ID: <20080502103051.11CE8600D49@lists.intevation.de> Author: thomas Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv11821 Added Files: .cvsignore Log Message: ignore .src.rpm files From cvs at kolab.org Fri May 2 12:33:19 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:33:19 +0200 (CEST) Subject: thomas: server Makefile,1.46,1.47 Message-ID: <20080502103319.E249C600D5F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11891 Modified Files: Makefile Log Message: build imapd and postfix Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Makefile 6 Feb 2008 11:24:06 -0000 1.46 +++ Makefile 2 May 2008 10:33:17 -0000 1.47 @@ -25,7 +25,9 @@ export KOLABRPMTMP = $(HOME)/RPM/TMP endif -BASE_PACKAGES=php-smarty +BASE_PACKAGES=php-smarty \ + postfix \ + imapd PERL_PACKAGES=perl-kolab \ kolabconf From cvs at kolab.org Fri May 2 12:57:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:57:05 +0200 (CEST) Subject: thomas: server/openldap Makefile,1.22,1.23 Message-ID: <20080502105705.C7DF5600D5F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv12449/openldap Added Files: Makefile Log Message: Build openldap package in base target, too From cvs at kolab.org Fri May 2 12:57:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 2 May 2008 12:57:05 +0200 (CEST) Subject: thomas: server Makefile,1.47,1.48 Message-ID: <20080502105705.C389F600D49@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12449 Modified Files: Makefile Log Message: Build openldap package in base target, too Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Makefile 2 May 2008 10:33:17 -0000 1.47 +++ Makefile 2 May 2008 10:57:03 -0000 1.48 @@ -26,6 +26,7 @@ endif BASE_PACKAGES=php-smarty \ + openldap \ postfix \ imapd From cvs at kolab.org Mon May 5 11:57:12 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 5 May 2008 11:57:12 +0200 (CEST) Subject: wilde: server install-kolab.sh,1.24,1.25 Message-ID: <20080505095712.9588E600D5E@lists.intevation.de> Author: wilde Update of /kolabrepository/server In directory doto:/tmp/cvs-serv32735 Modified Files: install-kolab.sh Log Message: Removed some bashism to be compatible with Solaris /bin/sh. Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- install-kolab.sh 18 Apr 2008 10:21:29 -0000 1.24 +++ install-kolab.sh 5 May 2008 09:57:10 -0000 1.25 @@ -134,8 +134,8 @@ PREFIX="/$TAG" fi -R_KID=$(($KID + 1)) -N_KID=$(($R_KID + 1)) +R_KID=`expr $KID + 1` +N_KID=`expr $R_KID + 1` if [ -n "$FLAG_CLEAN" -o -n "$FLAG_BDIST" -o -n "$FLAG_SDIST" ]; then if [ -x "$PREFIX/bin/openpkg" ]; then @@ -144,7 +144,7 @@ echo "This will completely wipe your installation in $PREFIX!" echo "Are you certain you want to do that (YES/NO)?" read ANSWER - if [ "$ANSWER" == "YES" ]; then + if [ "$ANSWER" = "YES" ]; then $PREFIX/bin/openpkg rpm -e `$PREFIX/bin/openpkg rpm -qa` || exit $? echo "Erased OpenPKG environment $PREFIX" exit 0 @@ -237,7 +237,7 @@ # We have a source package. Check for a matching binary PLATTAG=`sh "$INSTALLER" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG BIN=`basename "$INSTALLER" .src.sh`.$PLATTAG.sh - if [ "$BINARY" == "$BIN" ]; then + if [ "$BINARY" = "$BIN" ]; then # There is a binary with the correct tag. Install it INSTALL=$BIN echo "Found a binary OpenPKG package with a correct tag. This will be installed now." From cvs at kolab.org Mon May 5 12:00:15 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 5 May 2008 12:00:15 +0200 (CEST) Subject: wilde: server install-kolab.sh,1.25,1.26 Message-ID: <20080505100015.4C4AF600D67@lists.intevation.de> Author: wilde Update of /kolabrepository/server In directory doto:/tmp/cvs-serv431 Modified Files: install-kolab.sh Log Message: Added option -O to pass options to OpenPKG bootstrap script. This is needed for example to force use of "gas" assembler on some platforms. Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- install-kolab.sh 5 May 2008 09:57:10 -0000 1.25 +++ install-kolab.sh 5 May 2008 10:00:13 -0000 1.26 @@ -62,9 +62,11 @@ echo echo " -B (abort after generating the basic openpkg binary)" echo " -E (abort after generating the openpkg environment)" + echo + echo " -O (additional build options, used for openpkg bootstraping from source)" } -while getopts hcBDSEFHi:V:p:I:u:t: ARGS; do +while getopts hcBDSEFHi:V:p:I:u:t:O: ARGS; do case $ARGS in h) # Display help usage @@ -109,6 +111,9 @@ S) # User wants to collect a set of source packages into a distribution FLAG_SDIST="Yes" ;; + O) # User wants additional options when building OpenPK + ADDITIONAL_BUILD_OPTS="$OPTARG" + ;; *) # Unknown Option echo usage @@ -272,7 +277,10 @@ if [ -n "$SRC" ]; then echo "Creating binary openpkg package from $SRC!" + [ -n "$ADDITIONAL_BUILD_OPTS" ] && \ + echo "Using additional options: $ADDITIONAL_BUILD_OPTS" sh "$SRC" \ + $ADDITIONAL_BUILD_OPTS \ --prefix="$PREFIX" \ --tag="$TAG" --user="$USER" --group="$USER" \ --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \ From cvs at kolab.org Mon May 5 12:56:12 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 5 May 2008 12:56:12 +0200 (CEST) Subject: wilde: server release-notes.txt,1.258,1.259 Message-ID: <20080505105612.691EC600D5E@lists.intevation.de> Author: wilde Update of /kolabrepository/server In directory doto:/tmp/cvs-serv1852 Modified Files: release-notes.txt Log Message: Added release note for latest install-kolab.sh fix. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.258 retrieving revision 1.259 diff -u -d -r1.258 -r1.259 --- release-notes.txt 2 May 2008 10:29:34 -0000 1.258 +++ release-notes.txt 5 May 2008 10:56:10 -0000 1.259 @@ -49,6 +49,7 @@ - install-kolab.sh kolab/issue2591 (NTLM support in Cyrus SASL) + kolab/issue2371 (install-kolab.sh script incompatible with /bin/sh of e.g. Solaris 10) - clamav-0.93-20080414 From cvs at kolab.org Mon May 5 14:32:40 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 5 May 2008 14:32:40 +0200 (CEST) Subject: thomas: server release-notes.txt,1.259,1.260 Message-ID: <20080505123240.B3E5C600D6B@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4669 Modified Files: release-notes.txt Log Message: release notes: fix sorting/wrapping Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.259 retrieving revision 1.260 diff -u -d -r1.259 -r1.260 --- release-notes.txt 5 May 2008 10:56:10 -0000 1.259 +++ release-notes.txt 5 May 2008 12:32:38 -0000 1.260 @@ -46,14 +46,15 @@ Changes between 2.2-rc-2 and 2.2-rc-3 - - install-kolab.sh - - kolab/issue2591 (NTLM support in Cyrus SASL) - kolab/issue2371 (install-kolab.sh script incompatible with /bin/sh of e.g. Solaris 10) - - clamav-0.93-20080414 New upstream version, fixes various security issues. + + - install-kolab.sh + + kolab/issue2371 (install-kolab.sh script incompatible with /bin/sh of + e.g. Solaris 10) + kolab/issue2591 (NTLM support in Cyrus SASL) - horde-framework-kolab-3.2_rc3-2008???? From cvs at kolab.org Mon May 5 19:09:43 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 5 May 2008 19:09:43 +0200 (CEST) Subject: bernhard: utils/testing test-send-emails-excessive-invitations.py, NONE, 1.1 Message-ID: <20080505170943.53FCD6013EF@lists.intevation.de> Author: bernhard Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv14846 Added Files: test-send-emails-excessive-invitations.py Log Message: New file for bad invitations. --- NEW FILE: test-send-emails-excessive-invitations.py --- #!/usr/bin/env python """Send emails with iTIP invitations trying to overload the client. Usage $progname This script is Free Software under the GNU General Public License >=v2. bernhard at intevation.de (initial 20080505) """ __version__="$Revision: 1.1 $" # $Source: /kolabrepository/utils/testing/test-send-emails-excessive-invitations.py,v $ import sys import datetime import itertools import smtplib import string msgbase="""Subject: %s From: nobody at example.org Date: Thu, 15 Mar 2008 15:18:02 +0200 MIME-Version: 1.0 Content-Type: text/calendar; method=request; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline BEGIN:VCALENDAR PRODID:-//K Desktop Environment//NONSGML libkcal 3.5//EN VERSION:2.0 METHOD:REQUEST BEGIN:VEVENT DTSTAMP:20080505T155557Z ORGANIZER;CN=Tim Test 3:MAILTO:ttest3 at example.org ATTENDEE;CN=Tim Test 3;RSVP=FALSE;PARTSTAT=ACCEPTED; ROLE=REQ-PARTICIPANT:mailto:ttest3 at example.org ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto: btest at example.org ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto: ttest2 at example.org CREATED:20080505T155507Z UID:%s SEQUENCE:0 LAST-MODIFIED:20080505T155557Z SUMMARY:Long running appointment with many exceptions RRULE:FREQ=DAILY;COUNT=50000 EXDATE;VALUE=DATE:20080506 %s DTSTART:20080505T163000Z DTEND:20080505T170000Z TRANSP:OPAQUE END:VEVENT END:VCALENDAR """ uidbase = "-2" date = datetime.date(2008,5,6) lines = "" c = itertools.count() while c.next()<200: date = date + datetime.timedelta(days=1) lines = lines + "EXDATE;VALUE=DATE:%4d%02d%02d\n" % \ (date.year, date.month, date.day) msg1 = msgbase % ("Test1, 200 exceptions", "manually-1" + uidbase , lines) while c.next()<42000: date = date + datetime.timedelta(days=1) lines = lines + "EXDATE;VALUE=DATE:%4d%02d%02d\n" % \ (date.year, date.month, date.day) msg2 = msgbase % ("Test2, 42000 exceptions", "manually-2" + uidbase , lines) toadd = [sys.argv[1]] smtpserver='localhost' # if you set a loginname, aconnection via TLS and authentification is tried loginname = None password = None fromadd="nobody at example.org" basemsg=("From: %s\r\nTo: %s\r\n%%s\r\n" % (fromadd, string.join(toadd, ", "))) server=smtplib.SMTP(smtpserver) #server.set_debuglevel(1) if loginname != None and password != None: server.starttls() server.login(loginname,password) server.sendmail(fromadd,toadd,msg1) server.sendmail(fromadd,toadd,msg2) server.quit() From cvs at kolab.org Wed May 7 17:14:14 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 May 2008 17:14:14 +0200 (CEST) Subject: thomas: server install-kolab.sh,1.26,1.27 Message-ID: <20080507151414.3650860014F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3917 Modified Files: install-kolab.sh Log Message: fix kolab/issue2686 (unquoted wildcards in install-kolab.sh) Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- install-kolab.sh 5 May 2008 10:00:13 -0000 1.26 +++ install-kolab.sh 7 May 2008 15:14:11 -0000 1.27 @@ -159,7 +159,7 @@ fi elif [ -n "$FLAG_SDIST" ]; then SDIST_DIR=$PREFIX/RPM/SDIST - INSTALLER=`find . -name openpkg-*.src.sh -print` + 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 @@ -181,7 +181,7 @@ elif [ -n "$FLAG_BDIST" ]; then PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG BDIST_DIR=$PREFIX/RPM/BDIST - BINARY=`find . -name openpkg-*$PLATTAG.sh -print` + BINARY=`find . -name "openpkg-*.$PLATTAG.sh" -print` if [ -z "$BINARY" ]; then echo "No binary installer package found. Unable to create a binary distribution!" exit 1 @@ -225,8 +225,8 @@ INSTALL=`pwd` echo "Found an OpenPKG environment. Assuming upgrade..." else - INSTALLER=`find . -name openpkg-*.src.sh -print` - BINARY=`find . -name openpkg-*.sh \! -name openpkg-*.src.sh -print` + INSTALLER=`find . -name "openpkg-*.src.sh" -print` + BINARY=`find . -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print` if [ -z "$INSTALLER" ]; then # No install script? Determine if there is a binary script if [ -z "$BINARY" ]; then From cvs at kolab.org Wed May 7 17:27:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 May 2008 17:27:16 +0200 (CEST) Subject: thomas: server install-kolab.sh,1.27,1.28 Message-ID: <20080507152716.C53FF60014F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4307 Modified Files: install-kolab.sh Log Message: consistent indentation for install-kolab.sh Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- install-kolab.sh 7 May 2008 15:14:11 -0000 1.27 +++ install-kolab.sh 7 May 2008 15:27:14 -0000 1.28 @@ -31,180 +31,180 @@ FLAG_HORDE="" usage() { - 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:" - echo - echo " -t TAG (alternate binary tag; default is kolab)" - echo " -I UID (alternate base uid; default is 19414)" - echo - echo " -c (clean the environment specified with \$PREFIX; DANGEROUS!)" - echo - echo " -p PREFIX (alternate installation prefix; default is /\$TAG)" - echo " -u USER (alternate user name; default is \$TAG)" - echo - echo " -V VERSION (alternate version; default is $KOLAB_VERSION)" - echo - echo " -D (generate a binary distribution based on ./ and /\$PREFIX)" - echo " -S (generate a source distribution based on ./ and /\$PREFIX)" - echo - echo " -B (abort after generating the basic openpkg binary)" - echo " -E (abort after generating the openpkg environment)" - echo - echo " -O (additional build options, used for openpkg bootstraping from source)" + 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:" + echo + echo " -t TAG (alternate binary tag; default is kolab)" + echo " -I UID (alternate base uid; default is 19414)" + echo + echo " -c (clean the environment specified with \$PREFIX; DANGEROUS!)" + echo + echo " -p PREFIX (alternate installation prefix; default is /\$TAG)" + echo " -u USER (alternate user name; default is \$TAG)" + echo + echo " -V VERSION (alternate version; default is $KOLAB_VERSION)" + echo + echo " -D (generate a binary distribution based on ./ and /\$PREFIX)" + echo " -S (generate a source distribution based on ./ and /\$PREFIX)" + echo + echo " -B (abort after generating the basic openpkg binary)" + echo " -E (abort after generating the openpkg environment)" + echo + echo " -O (additional build options, used for openpkg bootstraping from source)" } while getopts hcBDSEFHi: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" - ;; - p) # User specified an alternative prefix - PREFIX="$OPTARG" - ;; - I) # User specified an alternative base Kolab UID - KID="$OPTARG" - ;; - u) # User specified an alternative user name - USER="$OPTARG" - ;; - t) # User specified an alternative tag - TAG="$OPTARG" - ;; - B) # User only wants the basic openpkg package in binary form - FLAG_BASE="Yes" - ;; - 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" - ;; - D) # User wants to collect a set of binary packages into a distribution - FLAG_BDIST="Yes" - ;; - S) # User wants to collect a set of source packages into a distribution - FLAG_SDIST="Yes" - ;; - O) # User wants additional options when building OpenPK - ADDITIONAL_BUILD_OPTS="$OPTARG" - ;; - *) # Unknown Option - echo - usage - exit 1 - ;; - esac + 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" + ;; + p) # User specified an alternative prefix + PREFIX="$OPTARG" + ;; + I) # User specified an alternative base Kolab UID + KID="$OPTARG" + ;; + u) # User specified an alternative user name + USER="$OPTARG" + ;; + t) # User specified an alternative tag + TAG="$OPTARG" + ;; + B) # User only wants the basic openpkg package in binary form + FLAG_BASE="Yes" + ;; + 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" + ;; + D) # User wants to collect a set of binary packages into a distribution + FLAG_BDIST="Yes" + ;; + S) # User wants to collect a set of source packages into a distribution + FLAG_SDIST="Yes" + ;; + O) # User wants additional options when building OpenPK + ADDITIONAL_BUILD_OPTS="$OPTARG" + ;; + *) # Unknown Option + echo + usage + exit 1 + ;; + esac done if [ -z "$USER" ]; then - USER=$TAG + USER=$TAG fi if [ -n "$FLAG_HORDE" ]; then - DEFINE="$DEFINE -D kolabd::with_horde" - PACKAGES="$PACKAGES horde-kolab-client" + DEFINE="$DEFINE -D kolabd::with_horde" + PACKAGES="$PACKAGES horde-kolab-client" fi if [ -n "$FLAG_FBVIEW" ]; then - PACKAGES="$PACKAGES fbview-kronolith" + PACKAGES="$PACKAGES fbview-kronolith" fi if [ -z "$PREFIX" ]; then - PREFIX="/$TAG" + PREFIX="/$TAG" fi R_KID=`expr $KID + 1` N_KID=`expr $R_KID + 1` if [ -n "$FLAG_CLEAN" -o -n "$FLAG_BDIST" -o -n "$FLAG_SDIST" ]; then - if [ -x "$PREFIX/bin/openpkg" ]; then - if [ -n "$FLAG_CLEAN" ]; then - echo - echo "This will completely wipe your installation in $PREFIX!" - echo "Are you certain you want to do that (YES/NO)?" - read ANSWER - if [ "$ANSWER" = "YES" ]; then - $PREFIX/bin/openpkg rpm -e `$PREFIX/bin/openpkg rpm -qa` || exit $? - echo "Erased OpenPKG environment $PREFIX" - exit 0 - else - echo "Not cleaning." - exit 0 - fi - elif [ -n "$FLAG_SDIST" ]; then - SDIST_DIR=$PREFIX/RPM/SDIST - 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 - mkdir -p $SDIST_DIR - cp $0 $SDIST_DIR - if [ -n "$INSTALLER" ]; then - cp $INSTALLER $SDIST_DIR - fi - if [ -n "*.src.rpm" ]; then - cp *.src.rpm $SDIST_DIR - fi - if [ -n "$PREFIX/RPM/PKG/*.src.rpm" ]; then - cp $PREFIX/RPM/PKG/*.src.rpm $SDIST_DIR - fi - chown -R $USER:$USER $SDIST_DIR - cd $SDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i . - exit 0 - elif [ -n "$FLAG_BDIST" ]; then - PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG - BDIST_DIR=$PREFIX/RPM/BDIST - BINARY=`find . -name "openpkg-*.$PLATTAG.sh" -print` - if [ -z "$BINARY" ]; then - echo "No binary installer package found. Unable to create a binary distribution!" - exit 1 - fi - mkdir -p $BDIST_DIR - cp $0 $BDIST_DIR - if [ -n "$BINARY" ]; then - cp $BINARY $BDIST_DIR - fi - if [ -n "*$PLATTAG.rpm" ]; then - cp *$PLATTAG.rpm $BDIST_DIR - fi - if [ -n "$PREFIX/RPM/PKG/*$PLATTAG.rpm" ]; then - cp $PREFIX/RPM/PKG/*$PLATTAG.rpm $BDIST_DIR - fi - chown -R $USER:$USER $BDIST_DIR - cd $BDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG . - exit 0 - else - echo "\"$PREFIX\" seems to be no OpenPKG environment." - exit 1 - fi - fi + if [ -x "$PREFIX/bin/openpkg" ]; then + if [ -n "$FLAG_CLEAN" ]; then + echo + echo "This will completely wipe your installation in $PREFIX!" + echo "Are you certain you want to do that (YES/NO)?" + read ANSWER + if [ "$ANSWER" = "YES" ]; then + $PREFIX/bin/openpkg rpm -e `$PREFIX/bin/openpkg rpm -qa` || exit $? + echo "Erased OpenPKG environment $PREFIX" + exit 0 + else + echo "Not cleaning." + exit 0 + fi + elif [ -n "$FLAG_SDIST" ]; then + SDIST_DIR=$PREFIX/RPM/SDIST + 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 + mkdir -p $SDIST_DIR + cp $0 $SDIST_DIR + if [ -n "$INSTALLER" ]; then + cp $INSTALLER $SDIST_DIR + fi + if [ -n "*.src.rpm" ]; then + cp *.src.rpm $SDIST_DIR + fi + if [ -n "$PREFIX/RPM/PKG/*.src.rpm" ]; then + cp $PREFIX/RPM/PKG/*.src.rpm $SDIST_DIR + fi + chown -R $USER:$USER $SDIST_DIR + cd $SDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i . + exit 0 + elif [ -n "$FLAG_BDIST" ]; then + PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG + BDIST_DIR=$PREFIX/RPM/BDIST + BINARY=`find . -name "openpkg-*.$PLATTAG.sh" -print` + if [ -z "$BINARY" ]; then + echo "No binary installer package found. Unable to create a binary distribution!" + exit 1 + fi + mkdir -p $BDIST_DIR + cp $0 $BDIST_DIR + if [ -n "$BINARY" ]; then + cp $BINARY $BDIST_DIR + fi + if [ -n "*$PLATTAG.rpm" ]; then + cp *$PLATTAG.rpm $BDIST_DIR + fi + if [ -n "$PREFIX/RPM/PKG/*$PLATTAG.rpm" ]; then + cp $PREFIX/RPM/PKG/*$PLATTAG.rpm $BDIST_DIR + fi + chown -R $USER:$USER $BDIST_DIR + cd $BDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG . + exit 0 + else + echo "\"$PREFIX\" seems to be no OpenPKG environment." + exit 1 + fi + fi fi echo @@ -218,106 +218,107 @@ echo if [ -z "$INSTALL" ]; then - # Hm, user wants us to figure out what we should do - echo "Received no instructions. Trying to determine required action..." - if [ -d "$PREFIX/etc/openpkg" ]; then - # Assume an upgrade based on the current directory - INSTALL=`pwd` - echo "Found an OpenPKG environment. Assuming upgrade..." - else - INSTALLER=`find . -name "openpkg-*.src.sh" -print` - BINARY=`find . -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print` - if [ -z "$INSTALLER" ]; then - # No install script? Determine if there is a binary script - if [ -z "$BINARY" ]; then - echo "Sorry there is no OpenPKG installation script in the current directory!" - usage - exit 0 - else - # Looks like we only have a binary. Hope that it matches the plattform and install it - INSTALL="$BINARY" - echo "Found a binary OpenPKG package. This will be installed now." - fi - else - # We have a source package. Check for a matching binary - PLATTAG=`sh "$INSTALLER" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG - BIN=`basename "$INSTALLER" .src.sh`.$PLATTAG.sh - if [ "$BINARY" = "$BIN" ]; then - # There is a binary with the correct tag. Install it - INSTALL=$BIN - echo "Found a binary OpenPKG package with a correct tag. This will be installed now." - else - # Install from source - INSTALL=$INSTALLER - echo "Found a source based OpenPKG installer. Trying to install Kolab from source." - fi - fi - fi + # Hm, user wants us to figure out what we should do + echo "Received no instructions. Trying to determine required action..." + if [ -d "$PREFIX/etc/openpkg" ]; then + # Assume an upgrade based on the current directory + INSTALL=`pwd` + echo "Found an OpenPKG environment. Assuming upgrade..." + else + INSTALLER=`find . -name "openpkg-*.src.sh" -print` + BINARY=`find . -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print` + if [ -z "$INSTALLER" ]; then + # No install script? Determine if there is a binary script + if [ -z "$BINARY" ]; then + echo "Sorry there is no OpenPKG installation script in the current directory!" + usage + exit 0 + else + # Looks like we only have a binary. Hope that it matches the plattform and install it + INSTALL="$BINARY" + echo "Found a binary OpenPKG package. This will be installed now." + fi + else + # We have a source package. Check for a matching binary + PLATTAG=`sh "$INSTALLER" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG + BIN=`basename "$INSTALLER" .src.sh`.$PLATTAG.sh + if [ "$BINARY" = "$BIN" ]; then + # There is a binary with the correct tag. Install it + INSTALL=$BIN + echo "Found a binary OpenPKG package with a correct tag. This will be installed now." + else + # Install from source + INSTALL=$INSTALLER + echo "Found a source based OpenPKG installer. Trying to install Kolab from source." + fi + fi + fi fi 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 - BIN=`basename "$INSTALL" .src.sh`.$PLATTAG.sh - DIR=`dirname "$SRC"` + # install from source + SRC="$INSTALL" + PLATTAG=`sh "$INSTALL" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG + BIN=`basename "$INSTALL" .src.sh`.$PLATTAG.sh + DIR=`dirname "$SRC"` elif echo "$INSTALL" | grep 'openpkg-.*\.sh$' >/dev/null; then - # install from binary - SRC="" - BIN="$INSTALL" - DIR=`dirname "$BIN"` + # install from binary + SRC="" + BIN="$INSTALL" + DIR=`dirname "$BIN"` elif [ -d "$PREFIX/etc/openpkg" ]; then - # upgrade - SRC="" - BIN="" - DIR="$INSTALL" + # upgrade + SRC="" + BIN="" + DIR="$INSTALL" fi DIR=`cd $DIR; pwd` if [ -n "$SRC" ]; then - echo "Creating binary openpkg package from $SRC!" - [ -n "$ADDITIONAL_BUILD_OPTS" ] && \ - echo "Using additional options: $ADDITIONAL_BUILD_OPTS" - sh "$SRC" \ + echo "Creating binary openpkg package from $SRC!" + [ -n "$ADDITIONAL_BUILD_OPTS" ] && \ + echo "Using additional options: $ADDITIONAL_BUILD_OPTS" + sh "$SRC" \ $ADDITIONAL_BUILD_OPTS \ - --prefix="$PREFIX" \ - --tag="$TAG" --user="$USER" --group="$USER" \ - --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \ - --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \ - || exit $? - if [ -n "$FLAG_BASE" ]; then - echo "Created basic openpkg binary for you platform!" - exit 0 - fi + --prefix="$PREFIX" \ + --tag="$TAG" --user="$USER" --group="$USER" \ + --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \ + --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \ + || exit $? + if [ -n "$FLAG_BASE" ]; then + echo "Created basic openpkg binary for you platform!" + exit 0 + fi fi if [ -n "$BIN" ]; then - sh "$BIN" || exit $? - if [ -n "$FLAG_ENV" ]; then - echo "Created basic openpkg environment!" - exit 0 - fi + sh "$BIN" || exit $? + if [ -n "$FLAG_ENV" ]; then + echo "Created basic openpkg environment!" + exit 0 + fi fi if [ -n "$DIR" ]; then - [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG - if [ -n "$KOLAB_VERSION" ]; then - DEFINE=" - $DEFINE - -Dkolabd::kolab_version=$KOLAB_VERSION - -Dkolab-webadmin::kolab_version=$KOLAB_VERSION - " - fi - find "$DIR" -mindepth 1 -maxdepth 1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \; - echo "----------- SETUP COMPLETED -----------" - echo "" - echo " Now running:" - echo "" - echo " $PREFIX/bin/openpkg build -kKBuZ -r \"$DIR\" -p \"$PLATTAG\" $DEFINE $PACKAGES | sh" - echo "" - echo "---------------------------------------" - "$PREFIX/bin/openpkg" build -kKBuZ -r "$DIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh || exit $? + [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG + if [ -n "$KOLAB_VERSION" ]; then + DEFINE="$DEFINE + -Dkolabd::kolab_version=$KOLAB_VERSION + -Dkolab-webadmin::kolab_version=$KOLAB_VERSION + " + fi + find "$DIR" -mindepth 1 -maxdepth 1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \; + echo "----------- SETUP COMPLETED -----------" + echo + echo " Now running:" + echo + echo " $PREFIX/bin/openpkg build -kKBuZ -r \"$DIR\" -p \"$PLATTAG\" $DEFINE $PACKAGES | sh" + echo + echo "---------------------------------------" + "$PREFIX/bin/openpkg" build -kKBuZ -r "$DIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh || exit $? fi exit 0 + +# vim:ai et sta sw=4 sts=4 tw=0: From cvs at kolab.org Wed May 7 17:28:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 7 May 2008 17:28:27 +0200 (CEST) Subject: thomas: server release-notes.txt,1.260,1.261 Message-ID: <20080507152827.026AE600D64@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4360 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.260 retrieving revision 1.261 diff -u -d -r1.260 -r1.261 --- release-notes.txt 5 May 2008 12:32:38 -0000 1.260 +++ release-notes.txt 7 May 2008 15:28:24 -0000 1.261 @@ -55,6 +55,7 @@ kolab/issue2371 (install-kolab.sh script incompatible with /bin/sh of e.g. Solaris 10) kolab/issue2591 (NTLM support in Cyrus SASL) + kolab/issue2686 (unquoted wildcards in install-kolab.sh) - horde-framework-kolab-3.2_rc3-2008???? From cvs at kolab.org Thu May 8 13:16:09 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 13:16:09 +0200 (CEST) Subject: gunnar: server/imapd kolab.patch,1.36,1.37 Message-ID: <20080508111609.3146D600D5A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv14306 Modified Files: kolab.patch Log Message: Raplace UID patch by the version for 2.3.12. kolab/issue1824 (cyrus-imapd segfaults on x86_64) Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- kolab.patch 10 Apr 2008 17:31:05 -0000 1.36 +++ kolab.patch 8 May 2008 11:16:07 -0000 1.37 @@ -19,7 +19,8 @@ %if "%{with_kolab}" == "yes" @@ -73,6 +74,7 @@ Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch - Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch +-Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch ++Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.12/KOLAB_cyrus-imapd-2.3.12_UID.patch Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch +Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch From cvs at kolab.org Thu May 8 13:35:41 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 13:35:41 +0200 (CEST) Subject: gunnar: server/imapd KOLAB_cyrus-imapd-2.3.12_UID.patch, NONE, 1.1 Makefile, 1.35, 1.36 Message-ID: <20080508113541.13EAD600D5A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv14846 Modified Files: Makefile Added Files: KOLAB_cyrus-imapd-2.3.12_UID.patch Log Message: Add the patch and fix the makefile. --- NEW FILE: KOLAB_cyrus-imapd-2.3.12_UID.patch --- Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9] diff -r d62bf3b0902d configure --- a/configure Thu Oct 25 08:30:57 2007 +0200 +++ b/configure Thu Oct 25 08:31:06 2007 +0200 @@ -18119,7 +18119,7 @@ done done IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}" -IMAP_LIBS="${LIB_SASL} ${LIBS}" +IMAP_LIBS="${LIB_SASL} -lldap -llber ${LIBS}" diff -r d62bf3b0902d imap/global.c --- a/imap/global.c Thu Oct 25 08:30:57 2007 +0200 +++ b/imap/global.c Thu Oct 25 08:31:06 2007 +0200 @@ -52,6 +52,9 @@ #include #include +#include +#include + #if HAVE_UNISTD_H # include #endif @@ -362,6 +365,18 @@ char *canonify_userid(char *user, char * char *domain = NULL; int len = strlen(user); char buf[81]; + const char *uri; + const char *base; + const char *binddn; + const char *bindpw; + struct timeval timeout; + char filter[255]; + LDAP *handle; + LDAPMessage *res; + LDAPMessage *entry; + struct berval** vals; + + int rc; /* check for domain */ if (config_virtdomains && @@ -380,6 +395,49 @@ } if (config_virtdomains) { + if (config_virtdomains == IMAP_ENUM_VIRTDOMAINS_LDAP) { + uri = config_getstring(IMAPOPT_LDAP_URI); + base = config_getstring(IMAPOPT_LDAP_BASE); + binddn = config_getstring(IMAPOPT_LDAP_BIND_DN); + bindpw = config_getstring(IMAPOPT_LDAP_PASSWORD); + timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT); + timeout.tv_usec = 0; + sprintf(filter, "(uid=%s)", user); + rc = ldap_initialize(&handle, uri); + if (rc != LDAP_SUCCESS) { + syslog(LOG_ERR, "ldap_initialize failed (%s)", uri); + } else { + rc = ldap_simple_bind_s(handle, binddn, bindpw); + if (rc != LDAP_SUCCESS) { + syslog(LOG_ERR, "ldap_simple_bind() failed %d (%s)", rc, ldap_err2string(rc)); + } else { + rc = ldap_search_st(handle, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, &timeout, &res); + if (rc != LDAP_SUCCESS) { + syslog(LOG_ERR, "ldap_search_st failed %d (%s)", rc, ldap_err2string(rc)); + } else { + if ( (entry = ldap_first_entry(handle, res)) != NULL ) { + // read mail attribute from entry + if ( (vals = ldap_get_values_len(handle, entry, "mail")) ) { + if (memchr(vals[0]->bv_val, '@', vals[0]->bv_len)) { + static char buf[81]; /* same size as in auth_canonifyid */ + int len = ((sizeof(buf) - 1) > vals[0]->bv_len ? vals[0]->bv_len : sizeof(buf) - 1); + strncpy( buf, vals[0]->bv_val, len); + buf[len] = '\0'; /* make sure it's null-terminated */ + ldap_value_free_len( vals ); + ldap_msgfree( res ); + ldap_unbind_s(handle); /* also frees handle */ + syslog(LOG_DEBUG, "canonify: '%s'\n", buf); + return auth_canonifyid( buf, 0) ; + } + ldap_value_free_len( vals ); + } + } + ldap_msgfree( res ); + } + } + ldap_unbind_s(handle); /* also frees handle */ + } + } if (domain) { if (config_defdomain && !strcasecmp(config_defdomain, domain+1)) { *domain = '\0'; /* trim the default domain */ @@ -392,7 +448,7 @@ char *canonify_userid(char *user, char * user = buf; } } - else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID) { + else if (config_virtdomains != IMAP_ENUM_VIRTDOMAINS_USERID && config_virtdomains != IMAP_ENUM_VIRTDOMAINS_LDAP) { socklen_t salen; int error; struct sockaddr_storage localaddr; diff -r d62bf3b0902d lib/imapoptions --- a/lib/imapoptions Thu Oct 25 08:30:57 2007 +0200 +++ b/lib/imapoptions Thu Oct 25 08:31:06 2007 +0200 @@ -1034,7 +1034,7 @@ are listed with ``''. mailbox hierarchy. The default is to use the netnews separator character '.'. */ -{ "virtdomains", "off", ENUM("off", "userid", "on") } +{ "virtdomains", "off", ENUM("off", "userid", "ldap", "on") } /* Enable virtual domain support. If enabled, the user's domain will be determined by splitting a fully qualified userid at the last '@' or '%' symbol. If the userid is unqualified, and the virtdomains Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile 2 May 2008 10:19:57 -0000 1.35 +++ Makefile 8 May 2008 11:35:39 -0000 1.36 @@ -20,7 +20,8 @@ KOLABRELEASE=20080101_kolab3 PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \ - $(KOLABCVSDIR)/imapd.patch.group + $(KOLABCVSDIR)/imapd.patch.group \ + $(KOLABCVSDIR)/KOLAB_cyrus-imapd-2.3.12_UID.patch all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm From cvs at kolab.org Thu May 8 16:20:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 16:20:36 +0200 (CEST) Subject: thomas: server Makefile,1.48,1.49 cvs-kolab.sh,1.20,1.21 Message-ID: <20080508142036.B9133600D6D@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19508 Modified Files: Makefile cvs-kolab.sh Log Message: belnet -> gwdg Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- Makefile 2 May 2008 10:57:03 -0000 1.48 +++ Makefile 8 May 2008 14:20:34 -0000 1.49 @@ -10,7 +10,7 @@ endif ifeq "x$(KOLABPKGURI)" "x" - export KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.2/20070612-full/sources + export KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/20070612-full/sources endif ifeq "x$(RPM)" "x" export RPM = $(HOME)/bin/openpkg rpm Index: cvs-kolab.sh =================================================================== RCS file: /kolabrepository/server/cvs-kolab.sh,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- cvs-kolab.sh 6 Feb 2008 13:05:54 -0000 1.20 +++ cvs-kolab.sh 8 May 2008 14:20:34 -0000 1.21 @@ -63,7 +63,7 @@ echo "Downloading Kolab-Server-${KOLAB_VERSION} sources..." - wget -q -r -l1 -nd --no-parent -c -R index.html\* http://ftp.belnet.be/packages/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/beta/kolab-server-${KOLAB_VERSION}/sources/ || die "Failed to download the sources!" echo "Verifying source authenticity ..." From cvs at kolab.org Thu May 8 16:33:30 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 16:33:30 +0200 (CEST) Subject: thomas: server Makefile,1.49,1.50 Message-ID: <20080508143330.DABD8600D6D@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19759 Modified Files: Makefile Log Message: adjust KOLABPKGURI Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- Makefile 8 May 2008 14:20:34 -0000 1.49 +++ Makefile 8 May 2008 14:33:28 -0000 1.50 @@ -10,7 +10,7 @@ endif ifeq "x$(KOLABPKGURI)" "x" - export KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/20070612-full/sources + 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 From cvs at kolab.org Thu May 8 19:33:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 19:33:16 +0200 (CEST) Subject: thomas: server release-notes.txt,1.261,1.262 Message-ID: <20080508173316.EEDF0600D65@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24932 Modified Files: release-notes.txt Log Message: bumped imapd version and release notes for kolab/issue1824 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.261 retrieving revision 1.262 diff -u -d -r1.261 -r1.262 --- release-notes.txt 7 May 2008 15:28:24 -0000 1.261 +++ release-notes.txt 8 May 2008 17:33:14 -0000 1.262 @@ -65,8 +65,9 @@ kolab/issue2588 (whole day event with show-time-as free gets into the pfb) - - imapd-2.3.11-20080101_kolab3 + - imapd-2.3.11-20080101_kolab4 + kolab/issue1824 (cyrus-imapd segfaults on x86_64) kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls) From cvs at kolab.org Thu May 8 19:33:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 19:33:16 +0200 (CEST) Subject: thomas: server/imapd Makefile,1.36,1.37 kolab.patch,1.37,1.38 Message-ID: <20080508173316.F412A600D6A@lists.intevation.de> Author: thomas Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv24932/imapd Modified Files: Makefile kolab.patch Log Message: bumped imapd version and release notes for kolab/issue1824 Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- Makefile 8 May 2008 11:35:39 -0000 1.36 +++ Makefile 8 May 2008 17:33:14 -0000 1.37 @@ -17,7 +17,7 @@ PACKAGE=imapd VERSION=2.3.11 RELEASE=20080101 -KOLABRELEASE=20080101_kolab3 +KOLABRELEASE=20080101_kolab4 PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \ $(KOLABCVSDIR)/imapd.patch.group \ Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- kolab.patch 8 May 2008 11:16:07 -0000 1.37 +++ kolab.patch 8 May 2008 17:33:14 -0000 1.38 @@ -5,7 +5,7 @@ License: BSD Version: 2.3.11 -Release: 20080101 -+Release: 20080101_kolab3 ++Release: 20080101_kolab4 # package options %option with_fsl yes From cvs at kolab.org Thu May 8 19:36:39 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 8 May 2008 19:36:39 +0200 (CEST) Subject: thomas: server/postfix Makefile,1.18,1.19 Message-ID: <20080508173639.2317D600168@lists.intevation.de> Author: thomas Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv25104/postfix Modified Files: Makefile Log Message: Fix 'make clean' in postfix dir Index: Makefile =================================================================== RCS file: /kolabrepository/server/postfix/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile 2 May 2008 10:26:39 -0000 1.18 +++ Makefile 8 May 2008 17:36:37 -0000 1.19 @@ -34,4 +34,4 @@ cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ clean: - rm $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm + rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm From cvs at kolab.org Fri May 9 14:43:25 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 9 May 2008 14:43:25 +0200 (CEST) Subject: thomas: server/openldap .cvsignore,1.3,1.4 Message-ID: <20080509124325.09CD1600D65@lists.intevation.de> Author: thomas Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv14560 Modified Files: .cvsignore Log Message: openldap: ignore .src.rpm Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/openldap/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 28 Apr 2008 09:59:10 -0000 1.3 +++ .cvsignore 9 May 2008 12:43:22 -0000 1.4 @@ -1 +1,2 @@ openldap-*.tgz +*.src.rpm From cvs at kolab.org Tue May 13 08:56:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 08:56:16 +0200 (CEST) Subject: gunnar: server/horde/horde ChangeLog, 1.6, 1.7 horde-kolab.spec, 1.26, 1.27 Message-ID: <20080513065616.404DE600175@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/horde In directory doto:/tmp/cvs-serv28537/horde/horde Modified Files: ChangeLog horde-kolab.spec Log Message: kolab/issue2134 ([Horde]Unable to send message with attachments) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/horde/horde/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChangeLog 14 Mar 2008 17:28:00 -0000 1.6 +++ ChangeLog 13 May 2008 06:56:14 -0000 1.7 @@ -1,3 +1,7 @@ +2008-05-13 Gunnar Wrobel

    + + * horde-kolab.spec: kolab/issue2134 ([Horde]Unable to send message with attachments) + 2008-02-26 Gunnar Wrobel

    * horde-kolab.spec: Update to RC2 Index: horde-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- horde-kolab.spec 5 Apr 2008 12:59:55 -0000 1.26 +++ horde-kolab.spec 13 May 2008 06:56:14 -0000 1.27 @@ -74,7 +74,7 @@ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/horde %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde - %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp/horde + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_horde_name}-%{V_uver} @@ -96,7 +96,7 @@ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/horde \ - %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/horde \ + %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \ '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \ '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/config/conf.php' \ '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/*.php' From cvs at kolab.org Tue May 13 08:56:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 08:56:16 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.262,1.263 Message-ID: <20080513065616.3388A600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv28537 Modified Files: release-notes.txt Log Message: kolab/issue2134 ([Horde]Unable to send message with attachments) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.262 retrieving revision 1.263 diff -u -d -r1.262 -r1.263 --- release-notes.txt 8 May 2008 17:33:14 -0000 1.262 +++ release-notes.txt 13 May 2008 06:56:14 -0000 1.263 @@ -65,6 +65,10 @@ kolab/issue2588 (whole day event with show-time-as free gets into the pfb) + - horde-kolab-3.2_rc3-2008???? + + kolab/issue2134 ([Horde]Unable to send message with attachments) + - imapd-2.3.11-20080101_kolab4 kolab/issue1824 (cyrus-imapd segfaults on x86_64) From cvs at kolab.org Tue May 13 08:56:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 08:56:16 +0200 (CEST) Subject: gunnar: server/horde/fbview-horde ChangeLog, 1.3, 1.4 fbview-horde.spec, 1.19, 1.20 Message-ID: <20080513065616.41A45600D53@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/horde/fbview-horde In directory doto:/tmp/cvs-serv28537/horde/fbview-horde Modified Files: ChangeLog fbview-horde.spec Log Message: kolab/issue2134 ([Horde]Unable to send message with attachments) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ChangeLog 14 Mar 2008 17:28:00 -0000 1.3 +++ ChangeLog 13 May 2008 06:56:14 -0000 1.4 @@ -1,3 +1,7 @@ +2008-05-13 Gunnar Wrobel

    + + * fbview-horde.spec: kolab/issue2134 ([Horde]Unable to send message with attachments) + 2008-02-26 Gunnar Wrobel

    * fbview-horde.spec: Update to RC2 Index: fbview-horde.spec =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- fbview-horde.spec 5 Apr 2008 12:59:55 -0000 1.19 +++ fbview-horde.spec 13 May 2008 06:56:14 -0000 1.20 @@ -73,7 +73,7 @@ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/fbview %{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/fbview + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_horde_name}-%{V_uver} @@ -94,7 +94,7 @@ $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/fbview \ - %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/fbview \ + %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \ '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-horde-conf.template' \ '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \ '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/*.php' From cvs at kolab.org Tue May 13 15:44:53 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 15:44:53 +0200 (CEST) Subject: gunnar: server/patches/php README_myrights.patch,NONE,1.1 Message-ID: <20080513134453.3B630600D54@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/php In directory doto:/tmp/cvs-serv16795 Added Files: README_myrights.patch Log Message: kolab/issue2519 (Add functionality PHP : GetMYRIGHT) --- NEW FILE: README_myrights.patch --- DESCRIPTION: This provides the imap_myrights function within PHP. This is needed for correct share handling within Horde-3.2. IMPACT: The Horde share system won't work without this patch. User won't be able to share folders. REFERENCES: Kolab bug tracker merge: https://intevation.de/roundup/kolab/merge77 Mercurial patch repository: http://hg.pardus.de/cgi-bin/hg.cgi/kolab/patches/php/summary HISTORY The patch has been submitted upstream: http://aspn.activestate.com/ASPN/Mail/Message/php-dev/3602193 From cvs at kolab.org Tue May 13 15:44:53 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 15:44:53 +0200 (CEST) Subject: gunnar: server/patches/php/php-5.2.6 KOLAB_php-5.2.6_myrights.patch, NONE, 1.1 Message-ID: <20080513134453.3B6CE600D55@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/php/php-5.2.6 In directory doto:/tmp/cvs-serv16795/php-5.2.6 Added Files: KOLAB_php-5.2.6_myrights.patch Log Message: kolab/issue2519 (Add functionality PHP : GetMYRIGHT) --- NEW FILE: KOLAB_php-5.2.6_myrights.patch --- diff -r 63c608b3e283 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 +++ b/ext/imap/php_imap.c Tue May 13 15:36:56 2008 +0200 @@ -155,6 +155,7 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_set_quota, NULL) PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) + PHP_FE(imap_myrights, NULL) #endif #if defined(HAVE_IMAP2005) PHP_FE(imap_setannotation, NULL) @@ -415,6 +416,20 @@ void mail_getacl(MAILSTREAM *stream, cha for(; alist; alist = alist->next) { add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1); } +} +/* }}} */ + +/* {{{ mail_myrights + * + * Mail MYRIGHTS callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_myrights(MAILSTREAM *stream, char *mailbox, char *rights) +{ + TSRMLS_FETCH(); + + ZVAL_STRING(IMAPG(imap_acl_list), rights, 1) + } /* }}} */ @@ -1124,6 +1139,38 @@ PHP_FUNCTION(imap_getacl) } /* }}} */ +/* {{{ proto array imap_getacl(resource stream_id, string mailbox) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_myrights) +{ + zval **streamind, **mailbox; + pils *imap_le_struct; + + if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + + /* initializing the special array for the return values */ + array_init(return_value); + + IMAPG(imap_acl_list) = return_value; + + /* set the callback for the GET_ACL function */ + mail_parameters(NIL, SET_MYRIGHTS, (void *) mail_myrights); + if(!imap_myrights(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) { + php_error(E_WARNING, "c-client imap_myrights failed"); + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_acl_list) = NIL; +} +/* }}} */ + #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ #if defined(HAVE_IMAP2005) diff -r 63c608b3e283 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 +++ b/ext/imap/php_imap.h Tue May 13 15:36:56 2008 +0200 @@ -178,6 +178,7 @@ PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); +PHP_FUNCTION(imap_myrights); #endif #if defined(HAVE_IMAP2005) PHP_FUNCTION(imap_setannotation); From cvs at kolab.org Tue May 13 17:02:55 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 17:02:55 +0200 (CEST) Subject: gunnar: server/php KOLAB_php-5.2.6_Annotations.patch, NONE, 1.1 KOLAB_php-5.2.6_myrights.patch, NONE, 1.1 Makefile, 1.10, 1.11 Message-ID: <20080513150255.98780600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv22659 Added Files: KOLAB_php-5.2.6_Annotations.patch KOLAB_php-5.2.6_myrights.patch Makefile Log Message: kolab/issue2519 (Add functionality PHP : GetMYRIGHT) --- NEW FILE: KOLAB_php-5.2.6_Annotations.patch --- Provides get/set ANNOTATIONS support to PHP. [Version: 5.2.6] diff -r 4f78d3c907b7 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:21:11 2008 +0200 +++ b/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 @@ -129,6 +129,7 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_binary, NULL) PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) + PHP_FE(imap_status_current, NULL) PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) PHP_FE(imap_clearflag_full, NULL) @@ -155,6 +156,10 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) #endif +#if defined(HAVE_IMAP2005) + PHP_FE(imap_setannotation, NULL) + PHP_FE(imap_getannotation, NULL) +#endif PHP_FE(imap_mail, NULL) @@ -415,6 +420,30 @@ void mail_getacl(MAILSTREAM *stream, cha #endif + +#if defined(HAVE_IMAP2005) +/* {{{ mail_getannotation + * + * Mail GET_ANNOTATION callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist) +{ + ANNOTATION_VALUES *cur; + + TSRMLS_FETCH(); + + /* walk through the ANNOTATION_VALUES */ + + for(cur = alist->values; cur; cur = cur->next) { + if (cur->value) + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1); + else + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, "", 0, 1); + } +} +/* }}} */ +#endif /* {{{ PHP_GINIT_FUNCTION */ @@ -1097,6 +1126,122 @@ PHP_FUNCTION(imap_getacl) #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ +#if defined(HAVE_IMAP2005) + +/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value) + Sets an annotation for a given mailbox */ +PHP_FUNCTION(imap_setannotation) +{ + zval **streamind, **mailbox, **entry, **attr, **value; + pils *imap_le_struct; + long ret; + + // TODO: Use zend_parse_parameters here + if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + convert_to_string_ex(value); + + // create annotation object + ANNOTATION *annotation = mail_newannotation(); + if (!annotation) + RETURN_FALSE; + annotation->values = mail_newannotationvalue(); + if (!annotation->values) { + mail_free_annotation(&annotation); + RETURN_FALSE; + } + + // fill in annotation values + annotation->mbox = Z_STRVAL_PP(mailbox); + annotation->entry = Z_STRVAL_PP(entry); + annotation->values->attr = Z_STRVAL_PP(attr); + annotation->values->value = Z_STRVAL_PP(value); + + ret = imap_setannotation(imap_le_struct->imap_stream, annotation); + + // make sure mail_free_annotation doesn't free our variables + annotation->mbox = NULL; + annotation->entry = NULL; + annotation->values->attr = NULL; + annotation->values->value = NULL; + mail_free_annotation(&annotation); + + RETURN_BOOL(ret); +} +/* }}} */ + +/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_getannotation) +{ + zval **streamind, **mailbox, **entry, **attr; + pils *imap_le_struct; + long ret; + + if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + // fillup calling parameters + STRINGLIST *entries = mail_newstringlist(); + if (!entries) + RETURN_FALSE; + + STRINGLIST *cur = entries; + cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry)); + cur->text.size = Z_STRLEN_PP(entry); + cur->next = NIL; + + STRINGLIST *attributes = mail_newstringlist(); + cur = attributes; + cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr)); + cur->text.size = Z_STRLEN_PP(attr); + cur->next = NIL; + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = return_value; + + /* set the callback for the GET_ANNOTATION function */ + mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation); + ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes); + + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + + if (!ret) { + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = NIL; +} +/* }}} */ + +#endif /* HAVE_IMAP2005 */ /* {{{ proto bool imap_expunge(resource stream_id) Permanently delete all messages marked for deletion */ @@ -2707,6 +2852,42 @@ PHP_FUNCTION(imap_msgno) } /* }}} */ +/* {{{ proto object imap_status_current(resource stream_id, int options) + Get (cached) status info from current mailbox */ +PHP_FUNCTION(imap_status_current) +{ + zval **streamind, **pflags; + pils *imap_le_struct; + long flags = 0L; + + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_long_ex(pflags); + flags = Z_LVAL_PP(pflags); + + if (object_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + if (flags & SA_MESSAGES) { + add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs); + } + if (flags & SA_RECENT) { + add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent); + } + if (flags & SA_UIDNEXT) { + add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1); + } + if (flags & SA_UIDVALIDITY) { + add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity); + } +} +/* }}} */ + /* {{{ proto object imap_status(resource stream_id, string mailbox, int options) Get status info from a mailbox */ PHP_FUNCTION(imap_status) diff -r 4f78d3c907b7 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:21:11 2008 +0200 +++ b/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 @@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_create); PHP_FUNCTION(imap_rename); +PHP_FUNCTION(imap_status_current); PHP_FUNCTION(imap_status); PHP_FUNCTION(imap_bodystruct); PHP_FUNCTION(imap_fetch_overview); @@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_timeout); +// TODO: Needs fixing in configure in +#define HAVE_IMAP2005 1 + #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FUNCTION(imap_get_quota); PHP_FUNCTION(imap_get_quotaroot); @@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); #endif - +#if defined(HAVE_IMAP2005) +PHP_FUNCTION(imap_setannotation); +PHP_FUNCTION(imap_getannotation); +#endif ZEND_BEGIN_MODULE_GLOBALS(imap) char *imap_user; @@ -206,6 +213,9 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) zval **quota_return; zval *imap_acl_list; #endif +#if defined(HAVE_IMAP2005) + zval *imap_annotation_list; +#endif /* php_stream for php_mail_gets() */ php_stream *gets_stream; ZEND_END_MODULE_GLOBALS(imap) --- NEW FILE: KOLAB_php-5.2.6_myrights.patch --- diff -r 63c608b3e283 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 +++ b/ext/imap/php_imap.c Tue May 13 15:36:56 2008 +0200 @@ -155,6 +155,7 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_set_quota, NULL) PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) + PHP_FE(imap_myrights, NULL) #endif #if defined(HAVE_IMAP2005) PHP_FE(imap_setannotation, NULL) @@ -415,6 +416,20 @@ void mail_getacl(MAILSTREAM *stream, cha for(; alist; alist = alist->next) { add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1); } +} +/* }}} */ + +/* {{{ mail_myrights + * + * Mail MYRIGHTS callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_myrights(MAILSTREAM *stream, char *mailbox, char *rights) +{ + TSRMLS_FETCH(); + + ZVAL_STRING(IMAPG(imap_acl_list), rights, 1) + } /* }}} */ @@ -1124,6 +1139,38 @@ PHP_FUNCTION(imap_getacl) } /* }}} */ +/* {{{ proto array imap_getacl(resource stream_id, string mailbox) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_myrights) +{ + zval **streamind, **mailbox; + pils *imap_le_struct; + + if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + + /* initializing the special array for the return values */ + array_init(return_value); + + IMAPG(imap_acl_list) = return_value; + + /* set the callback for the GET_ACL function */ + mail_parameters(NIL, SET_MYRIGHTS, (void *) mail_myrights); + if(!imap_myrights(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) { + php_error(E_WARNING, "c-client imap_myrights failed"); + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_acl_list) = NIL; +} +/* }}} */ + #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ #if defined(HAVE_IMAP2005) diff -r 63c608b3e283 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 +++ b/ext/imap/php_imap.h Tue May 13 15:36:56 2008 +0200 @@ -178,6 +178,7 @@ PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); +PHP_FUNCTION(imap_myrights); #endif #if defined(HAVE_IMAP2005) PHP_FUNCTION(imap_setannotation); From cvs at kolab.org Tue May 13 17:06:25 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 17:06:25 +0200 (CEST) Subject: gunnar: server/php Makefile,1.11,1.12 Message-ID: <20080513150625.A8EA9600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv22994 Modified Files: Makefile Log Message: Use internal download location. Index: Makefile =================================================================== RCS file: /kolabrepository/server/php/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 13 May 2008 15:02:53 -0000 1.11 +++ Makefile 13 May 2008 15:06:23 -0000 1.12 @@ -33,7 +33,7 @@ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c ftp://ftp.openpkg.org/current/SRC/BASE/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm + wget -c http://files.pardus.de/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm dist: all cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ From cvs at kolab.org Tue May 13 17:07:52 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 17:07:52 +0200 (CEST) Subject: gunnar: server/php kolab.patch,1.7,1.8 Message-ID: <20080513150752.401F1600175@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv23084 Added Files: kolab.patch Log Message: Forgot to add the spec patch. From cvs at kolab.org Tue May 13 17:14:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 13 May 2008 17:14:36 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.24,1.25 Message-ID: <20080513151436.CA0A4600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv23274 Modified Files: kolabd.spec.in Log Message: Require new php option. Index: kolabd.spec.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- kolabd.spec.in 21 Nov 2007 11:05:41 -0000 1.24 +++ kolabd.spec.in 13 May 2008 15:14:34 -0000 1.25 @@ -65,7 +65,7 @@ %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_pear = yes, php::with_xml = yes, 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 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_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = 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 From cvs at kolab.org Wed May 14 05:11:58 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 14 May 2008 05:11:58 +0200 (CEST) Subject: gunnar: server Makefile,1.50,1.51 Message-ID: <20080514031158.7D92F600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv21366 Modified Files: Makefile Log Message: Add php to packages Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- Makefile 8 May 2008 14:33:28 -0000 1.50 +++ Makefile 14 May 2008 03:11:56 -0000 1.51 @@ -27,6 +27,7 @@ BASE_PACKAGES=php-smarty \ openldap \ + php \ postfix \ imapd From cvs at kolab.org Thu May 15 07:47:15 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 May 2008 07:47:15 +0200 (CEST) Subject: gunnar: server/apache-php - New directory Message-ID: <20080515054715.3EB4A600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/apache-php In directory doto:/tmp/cvs-serv11840/apache-php Log Message: Directory /kolabrepository/server/apache-php added to the repository From cvs at kolab.org Thu May 15 07:48:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 May 2008 07:48:05 +0200 (CEST) Subject: gunnar: server/apache-php KOLAB_php-5.2.6_Annotations.patch, NONE, 1.1 KOLAB_php-5.2.6_myrights.patch, NONE, 1.1 Makefile, NONE, 1.1 kolab.patch, NONE, 1.1 Message-ID: <20080515054805.70CB4600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/apache-php In directory doto:/tmp/cvs-serv11890/apache-php Added Files: KOLAB_php-5.2.6_Annotations.patch KOLAB_php-5.2.6_myrights.patch Makefile kolab.patch Log Message: Not only php needs the patch but primarily apache-php. --- NEW FILE: KOLAB_php-5.2.6_Annotations.patch --- Provides get/set ANNOTATIONS support to PHP. [Version: 5.2.6] diff -r 4f78d3c907b7 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:21:11 2008 +0200 +++ b/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 @@ -129,6 +129,7 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_binary, NULL) PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) + PHP_FE(imap_status_current, NULL) PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) PHP_FE(imap_clearflag_full, NULL) @@ -155,6 +156,10 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) #endif +#if defined(HAVE_IMAP2005) + PHP_FE(imap_setannotation, NULL) + PHP_FE(imap_getannotation, NULL) +#endif PHP_FE(imap_mail, NULL) @@ -415,6 +420,30 @@ void mail_getacl(MAILSTREAM *stream, cha #endif + +#if defined(HAVE_IMAP2005) +/* {{{ mail_getannotation + * + * Mail GET_ANNOTATION callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist) +{ + ANNOTATION_VALUES *cur; + + TSRMLS_FETCH(); + + /* walk through the ANNOTATION_VALUES */ + + for(cur = alist->values; cur; cur = cur->next) { + if (cur->value) + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1); + else + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, "", 0, 1); + } +} +/* }}} */ +#endif /* {{{ PHP_GINIT_FUNCTION */ @@ -1097,6 +1126,122 @@ PHP_FUNCTION(imap_getacl) #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ +#if defined(HAVE_IMAP2005) + +/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value) + Sets an annotation for a given mailbox */ +PHP_FUNCTION(imap_setannotation) +{ + zval **streamind, **mailbox, **entry, **attr, **value; + pils *imap_le_struct; + long ret; + + // TODO: Use zend_parse_parameters here + if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + convert_to_string_ex(value); + + // create annotation object + ANNOTATION *annotation = mail_newannotation(); + if (!annotation) + RETURN_FALSE; + annotation->values = mail_newannotationvalue(); + if (!annotation->values) { + mail_free_annotation(&annotation); + RETURN_FALSE; + } + + // fill in annotation values + annotation->mbox = Z_STRVAL_PP(mailbox); + annotation->entry = Z_STRVAL_PP(entry); + annotation->values->attr = Z_STRVAL_PP(attr); + annotation->values->value = Z_STRVAL_PP(value); + + ret = imap_setannotation(imap_le_struct->imap_stream, annotation); + + // make sure mail_free_annotation doesn't free our variables + annotation->mbox = NULL; + annotation->entry = NULL; + annotation->values->attr = NULL; + annotation->values->value = NULL; + mail_free_annotation(&annotation); + + RETURN_BOOL(ret); +} +/* }}} */ + +/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_getannotation) +{ + zval **streamind, **mailbox, **entry, **attr; + pils *imap_le_struct; + long ret; + + if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + // fillup calling parameters + STRINGLIST *entries = mail_newstringlist(); + if (!entries) + RETURN_FALSE; + + STRINGLIST *cur = entries; + cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry)); + cur->text.size = Z_STRLEN_PP(entry); + cur->next = NIL; + + STRINGLIST *attributes = mail_newstringlist(); + cur = attributes; + cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr)); + cur->text.size = Z_STRLEN_PP(attr); + cur->next = NIL; + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = return_value; + + /* set the callback for the GET_ANNOTATION function */ + mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation); + ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes); + + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + + if (!ret) { + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = NIL; +} +/* }}} */ + +#endif /* HAVE_IMAP2005 */ /* {{{ proto bool imap_expunge(resource stream_id) Permanently delete all messages marked for deletion */ @@ -2707,6 +2852,42 @@ PHP_FUNCTION(imap_msgno) } /* }}} */ +/* {{{ proto object imap_status_current(resource stream_id, int options) + Get (cached) status info from current mailbox */ +PHP_FUNCTION(imap_status_current) +{ + zval **streamind, **pflags; + pils *imap_le_struct; + long flags = 0L; + + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_long_ex(pflags); + flags = Z_LVAL_PP(pflags); + + if (object_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + if (flags & SA_MESSAGES) { + add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs); + } + if (flags & SA_RECENT) { + add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent); + } + if (flags & SA_UIDNEXT) { + add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1); + } + if (flags & SA_UIDVALIDITY) { + add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity); + } +} +/* }}} */ + /* {{{ proto object imap_status(resource stream_id, string mailbox, int options) Get status info from a mailbox */ PHP_FUNCTION(imap_status) diff -r 4f78d3c907b7 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:21:11 2008 +0200 +++ b/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 @@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_create); PHP_FUNCTION(imap_rename); +PHP_FUNCTION(imap_status_current); PHP_FUNCTION(imap_status); PHP_FUNCTION(imap_bodystruct); PHP_FUNCTION(imap_fetch_overview); @@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_timeout); +// TODO: Needs fixing in configure in +#define HAVE_IMAP2005 1 + #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FUNCTION(imap_get_quota); PHP_FUNCTION(imap_get_quotaroot); @@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); #endif - +#if defined(HAVE_IMAP2005) +PHP_FUNCTION(imap_setannotation); +PHP_FUNCTION(imap_getannotation); +#endif ZEND_BEGIN_MODULE_GLOBALS(imap) char *imap_user; @@ -206,6 +213,9 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) zval **quota_return; zval *imap_acl_list; #endif +#if defined(HAVE_IMAP2005) + zval *imap_annotation_list; +#endif /* php_stream for php_mail_gets() */ php_stream *gets_stream; ZEND_END_MODULE_GLOBALS(imap) --- NEW FILE: KOLAB_php-5.2.6_myrights.patch --- diff -r 63c608b3e283 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 +++ b/ext/imap/php_imap.c Tue May 13 15:36:56 2008 +0200 @@ -155,6 +155,7 @@ zend_function_entry imap_functions[] = { PHP_FE(imap_set_quota, NULL) PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) + PHP_FE(imap_myrights, NULL) #endif #if defined(HAVE_IMAP2005) PHP_FE(imap_setannotation, NULL) @@ -415,6 +416,20 @@ void mail_getacl(MAILSTREAM *stream, cha for(; alist; alist = alist->next) { add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1); } +} +/* }}} */ + +/* {{{ mail_myrights + * + * Mail MYRIGHTS callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_myrights(MAILSTREAM *stream, char *mailbox, char *rights) +{ + TSRMLS_FETCH(); + + ZVAL_STRING(IMAPG(imap_acl_list), rights, 1) + } /* }}} */ @@ -1124,6 +1139,38 @@ PHP_FUNCTION(imap_getacl) } /* }}} */ +/* {{{ proto array imap_getacl(resource stream_id, string mailbox) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_myrights) +{ + zval **streamind, **mailbox; + pils *imap_le_struct; + + if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + + /* initializing the special array for the return values */ + array_init(return_value); + + IMAPG(imap_acl_list) = return_value; + + /* set the callback for the GET_ACL function */ + mail_parameters(NIL, SET_MYRIGHTS, (void *) mail_myrights); + if(!imap_myrights(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) { + php_error(E_WARNING, "c-client imap_myrights failed"); + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_acl_list) = NIL; +} +/* }}} */ + #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ #if defined(HAVE_IMAP2005) diff -r 63c608b3e283 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 +++ b/ext/imap/php_imap.h Tue May 13 15:36:56 2008 +0200 @@ -178,6 +178,7 @@ PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); +PHP_FUNCTION(imap_myrights); #endif #if defined(HAVE_IMAP2005) PHP_FUNCTION(imap_setannotation); --- NEW FILE: Makefile --- ifeq "x$(KOLABPKGURI)" "x" KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/ 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=apache-php VERSION=5.2.6 RELEASE=20080514 KOLABRELEASE=20080514_kolab1 PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \ $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/ cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_imap_annotate yes' --define 'with_imap_myrights yes' cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: wget -c http://files.pardus.de/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm dist: all cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ clean: rm $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm --- NEW FILE: kolab.patch --- Index: apache-php.spec =================================================================== RCS file: /v/openpkg/cvs/openpkg-src/apache-php/apache-php.spec,v retrieving revision 1.30 diff -u -B -r1.30 apache-php.spec --- apache-php.spec 14 May 2008 10:38:56 -0000 1.30 +++ apache-php.spec 15 May 2008 05:47:24 -0000 @@ -39,7 +39,7 @@ Group: Web License: PHP Version: %{V_php} -Release: 20080514 +Release: 20080514_kolab1 # package options %option with_suhosin no @@ -61,6 +61,7 @@ %option with_iconv no %option with_imap no %option with_imap_annotate no +%option with_imap_myrights no %option with_json no %option with_mbregex no %option with_mbstring no @@ -134,7 +135,8 @@ Source3: apache-php.conf Source4: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz Patch0: http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz -Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch +Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch +Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_myrights.patch # build information Prefix: %{l_prefix} @@ -340,7 +342,10 @@ configure \ ext/gd/config.m4 %if "%{with_imap_annotate}" == "yes" - sed <%{PATCH1} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1 + %patch -p1 -P 1 +%endif +%if "%{with_imap_myrights}" == "yes" + %patch -p1 -P 2 %endif %build From cvs at kolab.org Thu May 15 07:48:44 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 May 2008 07:48:44 +0200 (CEST) Subject: gunnar: server Makefile,1.51,1.52 Message-ID: <20080515054844.8B0F0600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11914 Modified Files: Makefile Log Message: Add apache-php to the packages to generate. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Makefile 14 May 2008 03:11:56 -0000 1.51 +++ Makefile 15 May 2008 05:48:42 -0000 1.52 @@ -27,6 +27,7 @@ BASE_PACKAGES=php-smarty \ openldap \ + apache-php \ php \ postfix \ imapd From cvs at kolab.org Thu May 15 08:11:55 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 May 2008 08:11:55 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.25,1.26 Message-ID: <20080515061155.6537F600165@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv12594/kolabd Modified Files: kolabd.spec.in Log Message: Require myrights for apache-php too. Index: kolabd.spec.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- kolabd.spec.in 13 May 2008 15:14:34 -0000 1.25 +++ kolabd.spec.in 15 May 2008 06:11:53 -0000 1.26 @@ -66,7 +66,7 @@ # 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_pear = yes, apache-php::with_xml = yes, apache-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 %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 Tue May 20 19:08:29 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:08:29 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES messages.po, 1.27, 1.28 Message-ID: <20080520170829.C510A600D6B@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES In directory doto:/tmp/cvs-serv15464 Modified Files: messages.po Log Message: kolab/issue2505 (update of the french translation for kolab-server 2.2) messages.po from above issue as of 2008-04-11.22:18:47 Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- messages.po 10 Apr 2008 12:39:36 -0000 1.27 +++ messages.po 20 May 2008 17:08:27 -0000 1.28 @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Kolab-Webadmin French\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: Kolab development coordination \n" "POT-Creation-Date: 2008-04-10 12:58+0200\n" -"PO-Revision-Date: 2008-03-13 18:56+0100\n" +"PO-Revision-Date: 2008-04-11 23:11+0200\n" "Last-Translator: Benoit Mortier \n" "Language-Team: Kolab development coordination \n" "MIME-Version: 1.0\n" @@ -86,7 +86,7 @@ #: tpl_messages.php:17 msgid "Entry deleted, awaiting cleanup..." -msgstr "Entrée effacé, en attente de nettoyage..." +msgstr "Compte effacé, en attente de nettoyage..." #: tpl_messages.php:20 msgid "The administrator with DN" @@ -306,9 +306,7 @@ msgid "" "Activate delivery to folder (only one of vacation, forward and delivery to " "folder can be active at any time)" -msgstr "" -"Activer la livraison dans un dossier (un seul mode de livraison de type " -"messages d'absence, transmission, et livraison peut être activé à la fois)" +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" @@ -396,9 +394,7 @@ 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 de livraison de type " -"messages d'absence, transmission, et livraison peut être activé à la fois)" +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" @@ -433,8 +429,7 @@ 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 @@ -452,8 +447,7 @@ "l'implémentation du serveur Kolab 2." #: tpl_messages.php:99 -msgid "" -"The following people worked on Kolab for Klarälvdalens Datakonsult AB:" +msgid "The following people worked on Kolab for Klarälvdalens Datakonsult AB:" msgstr "" "Les personnes suivantes on travaillé sur Kolab pour Klarälvdalens " "Datakonsult AB:" @@ -468,7 +462,7 @@ msgstr "" "KDE est un puissant environnement " "graphique de bureau Open Source destiné aux stations de travail Linux et Unix. Il allie " +"\">en Logiciel Libre 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." @@ -669,8 +663,7 @@ #: 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 "" @@ -820,10 +813,7 @@ 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 (On ne peut activer qu'un seule " -"notification d'absence à la fois pour la réception ou la transmission dans " -"un dossier.)" +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" @@ -843,7 +833,7 @@ #: tpl_messages.php:190 msgid "Do not send vacation replies to spam messages" -msgstr "Ne pas envoyer de messages d'absence au spam" +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" @@ -863,7 +853,7 @@ #: tpl_messages.php:197 msgid "PEAR/Horde Versions" -msgstr "" +msgstr "Version de PEAR/Horde" #: tpl_messages.php:198 msgid "Kolab2 Patched OpenPKG Package Versions" @@ -893,14 +883,13 @@ "Vous n'avez pas encore défini d'adresse devant recevoir les messages " "administratifs hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-" "DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. " -"Entrez l'adresse de messagerie d'un compte Kolab ci dessous et pressez le " +"Entrez l'adresse de messagerie d'un compte Kolab ci dessous et cliquez le " "bouton afin de créer une liste de distribution pour chacune de ces adresses. " "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 " +msgid "Email address of account that should receive administrative mail for domain " msgstr "" "Les adresses de messagerie qui doivent recevoir les messages " "d'administration:" @@ -946,8 +935,7 @@ #: tpl_messages.php:216 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 msgid "days in the past" @@ -969,7 +957,7 @@ #: tpl_messages.php:222 msgid "SMTP \"smarthost/relayhost\"" -msgstr "serveur relais smtp" +msgstr "serveur de messagerie relais" #: tpl_messages.php:223 msgid "" @@ -1077,13 +1065,13 @@ #: ../../../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 a ce menu" +msgstr "Erreur: Vous n'avez pas la permission d'accéder ce menu" #: ../../../www/admin/addressbook/addr.php.in:65 #: ../../../www/admin/user/user.php.in:114 msgid "User, vCard or distribution list with this email address already exists" msgstr "" -"L'utilisateur, la vCard ou liste de distribution avec cette adresse de " +"Un utilisateur, une vCard ou une liste de distribution avec cette adresse de " "messagerie existe déjà" #: ../../../www/admin/addressbook/addr.php.in:78 @@ -1233,14 +1221,13 @@ #, php-format msgid "Account could not be deleted, distribution list '%s' depends on it." msgstr "" -"Le compte de messagerie n'a pas pu être modifié, la liste de distribution '%" +"Le compte de messagerie n'a pas pu être effacé, la liste de distribution '%" "s' en dépend. " #: ../../../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 @@ -1321,7 +1308,7 @@ #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:128 #: ../../../www/admin/maintainer/maintainer.php.in:150 msgid "Unique User ID" -msgstr "ID utilisateur unique" +msgstr "ID d'utilisateur unique" #: ../../../www/admin/administrator/admin.php.in:165 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:149 @@ -1352,8 +1339,7 @@ #: ../../../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 @@ -1395,7 +1381,7 @@ #: ../../../www/admin/maintainer/maintainer.php.in:322 #, php-format msgid "LDAP Error: could not mark %s for deletion: %s" -msgstr "Erreur LDAP: impossible d'indiquer %s pour l'effacement: %s" +msgstr "Erreur LDAP: impossible de marquer %s pour l'effacement: %s" #: ../../../www/admin/administrator/admin.php.in:328 msgid "Administrator Deleted" @@ -1541,8 +1527,7 @@ #: ../../../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 @@ -1739,11 +1724,8 @@ 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 messages " -"d'absence seront indisponible" +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 @@ -1763,7 +1745,7 @@ #: ../../../www/admin/user/deliver.php.in:74 #, php-format msgid "Delivery to '%s' successfully activated" -msgstr "Le message d'absence vers %s a été correctement activé" +msgstr "Le message d'absence vers '%s' a été correctement activé" #: ../../../www/admin/user/deliver.php.in:75 #, php-format @@ -1772,8 +1754,7 @@ #: ../../../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" @@ -1859,7 +1840,7 @@ #: ../../../www/admin/user/user.php.in:412 msgid "Internal User Account" -msgstr "Compte utilisateur interne" +msgstr "Compte d'utilisateur interne" #: ../../../www/admin/user/user.php.in:412 msgid "Group Account" @@ -1870,8 +1851,7 @@ 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" @@ -1882,7 +1862,7 @@ #: ../../../www/admin/user/user.php.in:419 msgid "For automatic invitation handling" -msgstr "Pour le gestion des invitation automatiques" +msgstr "Pour la gestion des invitation automatiques" #: ../../../www/admin/user/user.php.in:420 msgid "" @@ -1904,7 +1884,7 @@ msgid "Others allowed to send emails with a \"from\" address of this account." msgstr "" "Ceux qui sont autorisé à envoyer un message avec une adresse \"expéditeur\" " -"de ce compte." +"correspondant à ce compte." #: ../../../www/admin/user/user.php.in:431 msgid "One email address per line." @@ -1920,7 +1900,7 @@ #: ../../../www/admin/user/user.php.in:461 msgid "Leave blank for default (60 days)" -msgstr "Laisser vide pour les défauts (60 jours)" +msgstr "Laisser vide pour la valeur par défaut (60 jours)" #: ../../../www/admin/user/user.php.in:665 #: ../../../www/admin/user/user.php.in:717 @@ -1936,7 +1916,7 @@ #: ../../../www/admin/user/user.php.in:671 #, php-format msgid "User '%s' successfully modified" -msgstr "Utilisateur '%s' modifié avec succès" +msgstr "L'utilisateur '%s' à été modifié avec succès" #: ../../../www/admin/user/user.php.in:723 msgid "User " @@ -1978,7 +1958,7 @@ #: ../../../www/admin/user/vacation.php.in:43 msgid "Days must be at least one" -msgstr "Le nombre de jour doit être de minimum un" +msgstr "Le nombre de jours doit être 1 au minimum" #: ../../../www/admin/user/vacation.php.in:65 msgid "Vacation message successfully activated" @@ -2004,7 +1984,7 @@ "In urgent cases, please contact Mrs. \r\n" "\r\n" msgstr "" -"En cas d'urgence veuillez prévenir Mrs. \r\n" +"En cas d'urgence veuillez prévenir Monsieur \r\n" "\r\n" #: ../../../www/admin/user/vacation.php.in:91 @@ -2023,7 +2003,7 @@ "fax.: +49 711 1111 12\r\n" "\r\n" msgstr "" -"Téléfax: +49 711 1111 12\r\n" +"Télécopie: +49 711 1111 12\r\n" "\r\n" #: ../../../www/admin/user/vacation.php.in:94 @@ -2049,7 +2029,7 @@ #: ../../../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'ajour d'une liste de distribution %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 @@ -2070,13 +2050,12 @@ #: ../../../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" +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 d'un objet domaine %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" @@ -2143,11 +2122,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 ()-+/.=?:" +msgid "Phone entries may only contain a-z, numbers 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 ()-+.=?:" +"nombres et les carctères ()-+/.=?:" #: ../include/form.class.php:118 msgid "

" @@ -2203,7 +2181,7 @@ #: ../include/menu.php:28 msgid "Manage Email Users" -msgstr "Gérer des utilisateurs de messagerie" +msgstr "Gérer les utilisateurs de messagerie" #: ../include/menu.php:33 ../include/menu.php:35 msgid "My User Settings" @@ -2219,7 +2197,7 @@ #: ../include/menu.php:41 msgid "Vacation" -msgstr "Options de disponibilités" +msgstr "Message d'absence" #: ../include/menu.php:47 msgid "Manage Address Book" @@ -2227,7 +2205,7 @@ #: ../include/menu.php:49 msgid "Create New vCard" -msgstr "Créer un nouvelle vCard" +msgstr "Créer une nouvelle vCard" #: ../include/menu.php:54 msgid "Shared Folder" @@ -2243,7 +2221,7 @@ #: ../include/menu.php:66 msgid "Create New List" -msgstr "Créer un nouvelle liste" +msgstr "Créer une nouvelle liste" #: ../include/menu.php:72 msgid "Manage Administrators" @@ -2310,8 +2288,7 @@ 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" +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" @@ -2331,23 +2308,24 @@ #: ../include/ldap.class.php.in:200 #, php-format msgid "Error searching for DN for UID=%s" -msgstr "Erreur de recherche du DN pour 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 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 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 mail ou 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 Tue May 20 19:09:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:09:49 +0200 (CEST) Subject: thomas: server release-notes.txt,1.263,1.264 Message-ID: <20080520170949.47094600D6D@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv15558 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.263 retrieving revision 1.264 diff -u -d -r1.263 -r1.264 --- release-notes.txt 13 May 2008 06:56:14 -0000 1.263 +++ release-notes.txt 20 May 2008 17:09:47 -0000 1.264 @@ -46,10 +46,20 @@ Changes between 2.2-rc-2 and 2.2-rc-3 + - apache-php-5.2.6-20080514_kolab + + New upstream version, fixes various security issues. + + kolab/issue2519 (Add functionality PHP : GetMYRIGHT) + - clamav-0.93-20080414 New upstream version, fixes various security issues. + - fbview-horde-3.2_rc3-2008???? + + kolab/issue2134 ([Horde]Unable to send message with attachments) + - install-kolab.sh kolab/issue2371 (install-kolab.sh script incompatible with /bin/sh of @@ -94,6 +104,7 @@ - kolab-webadmin-2.2.rc3-2008???? + kolab/issue2505 (update of the french translation for kolab-server) kolab/issue2538 (Make the location of the Smarty compile directory configurable) kolab/issue2569 (rename of services to settings makes welcome screen @@ -110,6 +121,12 @@ kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?) + + - php-5.2.6-20080514_kolab + + New upstream version, fixes various security issues. + + kolab/issue2519 (Add functionality PHP : GetMYRIGHT) - php-kolab-2.2.rc3-2008???? From cvs at kolab.org Tue May 20 19:11:10 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:11:10 +0200 (CEST) Subject: thomas: server/php .cvsignore, 1.4, 1.5 Makefile, 1.12, 1.13 kolab.patch, 1.8, 1.9 Message-ID: <20080520171110.D547D600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv15596/php Modified Files: Makefile kolab.patch Added Files: .cvsignore Log Message: Fixes for build infrastructure of php and apache-php Index: Makefile =================================================================== RCS file: /kolabrepository/server/php/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 13 May 2008 15:06:23 -0000 1.12 +++ Makefile 20 May 2008 17:11:08 -0000 1.13 @@ -16,8 +16,8 @@ PACKAGE=php VERSION=5.2.6 -RELEASE=20080511 -KOLABRELEASE=20080511_kolab1 +RELEASE=20080514 +KOLABRELEASE=20080514_kolab PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \ $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch @@ -33,10 +33,10 @@ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c http://files.pardus.de/$(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 $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm + rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/php/kolab.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- kolab.patch 13 May 2008 15:07:50 -0000 1.8 +++ kolab.patch 20 May 2008 17:11:08 -0000 1.9 @@ -9,8 +9,8 @@ Group: Language License: PHP Version: %{V_php} --Release: 20080511 -+Release: 20080511_kolab1 +-Release: 20080514 ++Release: 20080514_kolab # package options %option with_suhosin no From cvs at kolab.org Tue May 20 19:11:10 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:11:10 +0200 (CEST) Subject: thomas: server/apache-php .cvsignore, NONE, 1.1 Makefile, 1.1, 1.2 kolab.patch, 1.1, 1.2 Message-ID: <20080520171110.CB038600D6E@lists.intevation.de> Author: thomas Update of /kolabrepository/server/apache-php In directory doto:/tmp/cvs-serv15596/apache-php Modified Files: Makefile kolab.patch Added Files: .cvsignore Log Message: Fixes for build infrastructure of php and apache-php --- NEW FILE: .cvsignore --- *.src.rpm Index: Makefile =================================================================== RCS file: /kolabrepository/server/apache-php/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 15 May 2008 05:48:03 -0000 1.1 +++ Makefile 20 May 2008 17:11:08 -0000 1.2 @@ -17,7 +17,7 @@ PACKAGE=apache-php VERSION=5.2.6 RELEASE=20080514 -KOLABRELEASE=20080514_kolab1 +KOLABRELEASE=20080514_kolab PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \ $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch @@ -33,10 +33,10 @@ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c http://files.pardus.de/$(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 $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm + rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/apache-php/kolab.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab.patch 15 May 2008 05:48:03 -0000 1.1 +++ kolab.patch 20 May 2008 17:11:08 -0000 1.2 @@ -10,7 +10,7 @@ License: PHP Version: %{V_php} -Release: 20080514 -+Release: 20080514_kolab1 ++Release: 20080514_kolab # package options %option with_suhosin no From cvs at kolab.org Tue May 20 19:13:39 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:13:39 +0200 (CEST) Subject: thomas: server/imapd Makefile,1.37,1.38 Message-ID: <20080520171339.14A5A600D65@lists.intevation.de> Author: thomas Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv15765/imapd Modified Files: Makefile Log Message: Allow 'make clean' if imapd wasn't built Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Makefile 8 May 2008 17:33:14 -0000 1.37 +++ Makefile 20 May 2008 17:13:36 -0000 1.38 @@ -40,4 +40,4 @@ cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ clean: - rm $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm + rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm From cvs at kolab.org Tue May 20 19:32:34 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:32:34 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin style.css, 1.10, 1.11 Message-ID: <20080520173234.7F182600D70@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin In directory doto:/tmp/cvs-serv16386/kolab-webadmin/kolab-webadmin/www/admin Modified Files: style.css Log Message: Fixes for XHTML strict (Patch by karl-heinz.ruskowski at intevation.de) Index: style.css =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- style.css 3 May 2007 00:33:44 -0000 1.10 +++ style.css 20 May 2008 17:32:32 -0000 1.11 @@ -3,77 +3,77 @@ buffer-file-coding-system: utf-8 End: */ -body { +body { color: black; background-color: #F8FCF8; - font-family: verdana,arial,helvetica,sans-serif; + font-family: verdana,arial,helvetica,sans-serif; font-size: 95%; - border: 0; - margin: 0; + border: 0; + margin: 0; } -a, a:visited { - font-family: verdana,arial,helvetica,sans-serif; +a, a:visited { + font-family: verdana,arial,helvetica,sans-serif; } a { color: #001155; } a:hover { color: #113399; } -#page { - background-repeat: no-repeat; +#page { + background-repeat: no-repeat; background-position: top right; } -#topbar { - display:block; - background-color: #B0BCD0; - height: 70px; +#topbar { + display:block; + background-color: #B0BCD0; + height: 70px; clear: both; } -#toplogo { - display:block; - background-image: url(pics/kolab_logo.png); - background-color: #B0BCD0; - width: 245px; - height: 70px; +#toplogo { + display:block; + background-image: url(pics/kolab_logo.png); + background-color: #B0BCD0; + width: 245px; + height: 70px; margin-left: 1em; margin-top: 0.4em; float: left; } -#toptitle { - display:block; +#toptitle { + display:block; text-align: right; - font-size: 200%; + font-size: 200%; padding-right: 1em; padding-top: 0.5em; } -#topuserinfo { +#topuserinfo { display:block; - background-color: #B0BCD0; + background-color: #B0BCD0; font-size: 80%; padding: 0.1em; border-bottom: solid 1px black; text-align: right; } -#topmenu { - background-color: #B0BCD0; +#topmenu { + background-color: #B0BCD0; font-size: 90%; border-bottom: solid 1px black; } -#submenu { +#submenu { background-color: #EEEEEE; - border-bottom: solid 1px black; + border-bottom: solid 1px black; font-size: 90%; } -.topmenuitem { - background-color: #B0BCD0; +.topmenuitem { + background-color: #B0BCD0; border-right: solid 1px black; padding-left: 0.5em; padding-right: 0.5em; margin: 0px; } -.topmenuitemselected { - background-color: #EEEEEE; +.topmenuitemselected { + background-color: #EEEEEE; border-right: solid 1px black; padding-left: 0.5em; padding-right: 0.5em; @@ -82,114 +82,114 @@ } .submenuitem { } -.submenuitemselected { +.submenuitemselected { } -.alphagroupitem { +.alphagroupitem { } -.alphagroupitemselected { +.alphagroupitemselected { font-weight:bold } -#logout { +#logout { color: red; } -#maintitle { +#maintitle { font-size: 200%; } -#maincontent { +#maincontent { display:block; - padding: 1em; - margin: 1em; + padding: 1em; + margin: 1em; } -#errorcontent { +#errorcontent { display:block; - padding: 0.2em; - margin: 1em; + padding: 0.2em; + margin: 1em; text-align: left; color: red; - background-color: #EEEEEE; + background-color: #EEEEEE; border: solid 1px black; } -#errorheader { +#errorheader { display:block; text-align: left; color: black; - background-color: #EEEEEE; - font-size: 150%; + background-color: #EEEEEE; + font-size: 150%; } -#messagecontent { +#messagecontent { display:block; - padding: 0.2em; - margin: 1em; + padding: 0.2em; + margin: 1em; text-align: left; color: green; - background-color: #EEEEEE; + background-color: #EEEEEE; border: solid 1px black; } -#messageheader { +#messageheader { display:block; text-align: left; color: black; - background-color: #EEEEEE; - font-size: 150%; + background-color: #EEEEEE; + font-size: 150%; } -.contenttext { +.contenttext { margin: 10px; } -.contenttable { +.contenttable { width: 100%; background-color: black; border: 0px; } -.contentroweven { - background-color: #C0CDE0; +.contentroweven { + background-color: #C0CDE0; margin: 0px; } -.contentrowodd { - background-color: #D0DDF0; +.contentrowodd { + background-color: #D0DDF0; margin: 0px; } -.contentcell { +.contentcell { font-size: 90%; - padding: .1em .5em .1em .5em; + padding: .1em .5em .1em .5em; margin: 0px; /* text-align: center; */ } -.actioncell { +.actioncell { font-size: 90%; - padding: .1em .5em .1em .5em; + padding: .1em .5em .1em .5em; width: 10%; margin: 0px; text-align: center; } -.contentform { - /*float: left;*/ - padding: .1em .5em .1em .5em; - background-color: #EEEEEE; +.contentform { + /*float: left;*/ + padding: .1em .5em .1em .5em; + background-color: #EEEEEE; border: solid 1px black; } -.contentformtable { +.contentformtable { font-size: 90%; } -.langcombo { +.langcombo { font-size: 80%; } -#validators { +#validators { text-align: right; } -th { - background-color: #EEEEEE; +th { + background-color: #EEEEEE; border: 0px; } .ctrl { background-color: #E0E3E0; - border: solid 1px black; - padding: .2em .5em .2em .5em; + border: solid 1px black; + padding: .2em .5em .2em .5em; } -.required_asterisk { +.required_asterisk { color: red; font-size: 80%; text-align: right; @@ -197,4 +197,16 @@ label { cursor: pointer; +} + +.align_center { + text-align: center; +} + +.align_right { + text-align: right; +} + +.align_left { + text-align: left; } From cvs at kolab.org Tue May 20 19:32:35 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:32:35 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates addrlistall.tpl, 1.2, 1.3 adminlistall.tpl, 1.2, 1.3 codefusion.tpl, 1.3, 1.4 distlistall.tpl, 1.2, 1.3 domainmaintainerlistall.tpl, 1.3, 1.4 erfrakon.tpl, 1.3, 1.4 intevation.tpl, 1.2, 1.3 kdab.tpl, 1.2, 1.3 kde.tpl, 1.3, 1.4 kolab.tpl, 1.6, 1.7 maintainerlistall.tpl, 1.2, 1.3 settings.tpl, 1.1, 1.2 sflistall.tpl, 1.2, 1.3 userlistall.tpl, 1.2, 1.3 Message-ID: <20080520173235.372B2600D70@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv16386/kolab-webadmin/kolab-webadmin/php/admin/templates Modified Files: addrlistall.tpl adminlistall.tpl codefusion.tpl distlistall.tpl domainmaintainerlistall.tpl erfrakon.tpl intevation.tpl kdab.tpl kde.tpl kolab.tpl maintainerlistall.tpl settings.tpl sflistall.tpl userlistall.tpl Log Message: Fixes for XHTML strict (Patch by karl-heinz.ruskowski at intevation.de) Index: addrlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/addrlistall.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- addrlistall.tpl 28 Jul 2005 02:14:38 -0000 1.2 +++ addrlistall.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -7,7 +7,7 @@

{tr msg="(only external addresses without a kolab user account)"}

-
+
{tr msg="[ ALL ]"}    [ A-F ]    [ G-L ]    @@ -16,11 +16,12 @@ {tr msg="[ OTHER ]"}
-
+ +
{tr msg="Filter:"} {foreach key=value item=name from=$filtertypes} {if $value eq $filtertype} - + {else} {/if} {/foreach} - + +
+
February 18th, 2008
AttributeValueComment
@@ -49,8 +52,8 @@ {if $entries[id].deleted neq "FALSE"} {else} - - + + {/if} {/section} Index: adminlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/adminlistall.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- adminlistall.tpl 24 May 2007 10:03:07 -0000 1.2 +++ adminlistall.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -19,8 +19,8 @@ {if $entries[id].deleted neq "FALSE"} {else} - - + + {/if} {/section} Index: codefusion.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/codefusion.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- codefusion.tpl 19 Dec 2006 11:11:36 -0000 1.3 +++ codefusion.tpl 20 May 2008 17:32:32 -0000 1.4 @@ -6,7 +6,9 @@ *}
-Code Fusion + + Code Fusion +

{tr msg="Code Fusion cc is a specialist email solution provider based in Johannesburg, South Africa specialising in the deployment and support of Kolab."} @@ -21,7 +23,7 @@

-Stephan Buys
+Stephan Buys

Index: distlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/distlistall.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- distlistall.tpl 14 Jul 2005 23:07:30 -0000 1.2 +++ distlistall.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -23,8 +23,8 @@ {if $entries[id].deleted neq "FALSE"} {else} - - + + {/if} {/section} Index: domainmaintainerlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/domainmaintainerlistall.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- domainmaintainerlistall.tpl 24 May 2007 10:03:07 -0000 1.3 +++ domainmaintainerlistall.tpl 20 May 2008 17:32:32 -0000 1.4 @@ -20,8 +20,8 @@ {if $entries[id].deleted neq "FALSE"} {else} - - + + {/if} {/section} Index: erfrakon.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/erfrakon.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- erfrakon.tpl 19 Dec 2006 11:11:36 -0000 1.3 +++ erfrakon.tpl 20 May 2008 17:32:32 -0000 1.4 @@ -9,11 +9,11 @@

{tr msg="Kolab's architecture was done by erfrakon; the company also designed and implemented the Kolab 1 Server and did the design and architecture for the Kolab 2 Server while providing consulting for the implementation of the Kolab 2 server and the Kolab 2 clients."}

-erfrakon - - - - +
+ + erfrakon + +

{tr msg="erfrakon is a consulting company dedicated to opensource software and Linux. The main tasks of erfrakon within the Kolab project are the principle design and architecure of the Kolab groupware solution and the creation of the Kolab 1 server."}

@@ -21,8 +21,8 @@ {tr msg="The following people worked on Kolab for erfrakon:"}

-Tassilo Erlewein
-Achim Frank
-Martin Konold
+Tassilo Erlewein
+Achim Frank
+Martin Konold

Index: intevation.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/intevation.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- intevation.tpl 19 Dec 2006 11:11:36 -0000 1.2 +++ intevation.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -4,9 +4,11 @@ {tr msg="Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are the main driving force behind Kolab1&2. In addition to project management Intevation did most of the quality assurance."}

-Logo Intevation GmbH +
+ + Logo Intevation GmbH + +

{tr msg="Intevation GmbH is a IT-company exclusively focusing on Free Software. Its business units are strategic consulting, project management and geographic information systems."} @@ -15,8 +17,8 @@ {tr msg="The following people worked on Kolab for Intevation:"}

-Bernhard Reiter
-Jan-Oliver Wagner
+Bernhard Reiter
+Jan-Oliver Wagner
Marc Mutz

Index: kdab.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kdab.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kdab.tpl 19 Dec 2006 11:11:36 -0000 1.2 +++ kdab.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -1,8 +1,9 @@ {* Smarty Template *} - - +
+ + KDAB + +

{tr msg="The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"} Klarälvdalens Datakonsult AB. @@ -14,13 +15,13 @@ {tr msg="The following people worked on Kolab for Klarälvdalens Datakonsult AB:"}

-Bo Thorsen
-Michel Boyer de la Giroday
-Steffen Hansen
-Matthias Kalle Dalheimer
-David Faure
-Karl-Heinz Zimmer
-Lutz Rogowski
-Romain Pokrzywka
+Bo Thorsen
+Michel Boyer de la Giroday
+Steffen Hansen
+Matthias Kalle Dalheimer
+David Faure
+Karl-Heinz Zimmer
+Lutz Rogowski
+Romain Pokrzywka

Index: kde.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kde.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kde.tpl 23 Feb 2008 09:25:02 -0000 1.3 +++ kde.tpl 20 May 2008 17:32:32 -0000 1.4 @@ -3,7 +3,9 @@

{tr msg="KDE is a powerful Free Software graphical desktop environment for Linux and Unix workstations. It combines ease of use, contemporary functionality, and outstanding graphical design with the technological superiority of the Unix operating system."}

-KDE +
+KDE +

{tr msg="KDE is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our mailing lists, USENET news groups, and IRC channels to which we invite and welcome everyone."}

Index: kolab.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kolab.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- kolab.tpl 17 Oct 2007 17:57:13 -0000 1.6 +++ kolab.tpl 20 May 2008 17:32:32 -0000 1.7 @@ -10,7 +10,7 @@ {tr msg="This is the Kolab2 Server. It is Free Software developed by the Kolab Project, with the intention of bringing groupware functionality to Unix/KDE users as well as Windows desktops."}

-

+

{tr msg="Kolab builds upon many other Free Software projects, namely:"} -

+

{tr msg="The Kolab project owes a great deal of thanks to the people of the OpenPKG project. OpenPKG allows Kolab to run on many diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install, cross-platform base on which to build the server."} @@ -63,18 +63,18 @@ {tr msg="Code Fusion cc joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}

-

+

{tr msg="Other contributors:"}
  • Konsec GmbH {tr msg="CSSified the Kolab1 web admin GUI"}
-

+

{tr msg="The principal authors of the Kolab client and server software are (in alphabetical order):"}

-

+

  • Stuart Bingë
  • Stephan Buys
    • @@ -84,7 +84,7 @@
  • Achim Frank
  • Michel Boyer de la Giroday
  • Steffen Hansen
    • -
  • Bernhard Herzog +
  • Bernhard Herzog
  • Martin Konold
  • Marc Mutz
  • Bernhard Reiter
    • @@ -94,6 +94,6 @@
  • Karl-Heinz Zimmer
  • Romain Pokrzywka
-

+
Index: maintainerlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/maintainerlistall.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- maintainerlistall.tpl 24 May 2007 10:03:07 -0000 1.2 +++ maintainerlistall.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -19,8 +19,8 @@ {if $entries[id].deleted neq "FALSE"} {else} - - + + {/if} {/section} Index: settings.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/settings.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- settings.tpl 28 Mar 2008 22:22:37 -0000 1.1 +++ settings.tpl 20 May 2008 17:32:32 -0000 1.2 @@ -13,10 +13,12 @@

{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}

{section name=id loop=$systemaliasconf}
-
+ +
{tr msg="Email address of account that should receive administrative mail for domain "} {$systemaliasconf[id].domain|escape:html}:
-
+
+
{/section} @@ -25,8 +27,8 @@ {/if}

{tr msg="Enable or Disable individual Services"}

- - + +
{tr msg="Entry deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
{tr msg="Object Deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
{tr msg="List deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
{tr msg="Object Deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
{tr msg="Object Deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
@@ -34,71 +36,85 @@ {section name=id loop=$entries} - + {/section} - +
{tr msg="Service"}{tr msg="Enabled"}
{$entries[id].name|escape:"html"}
+

{tr msg="Quota settings"}

-
+ +

{tr msg="Warn users when they have used"} {tr msg="% of their quota"}
-
+
+

{tr msg="Free/Busy settings"}

-
+ +

- + {tr msg="Allow unauthenticated downloading of Free/Busy information"}
-
+
+

-
+ +

{tr msg="When creating free/busy lists, include data from"} {tr msg="days in the past"}
-
+
+

{tr msg="Privileged Networks"}

-
+ +
{tr msg="Networks allowed to relay and send mail through unauthenticated SMTP connections to the Kolab server (comma separated networks in x.x.x.x/y format):"} -
+
+

{tr msg="SMTP \"smarthost/relayhost\""}

-
+ +
{tr msg="Smarthost (and optional port) to use to send outgoing mail (host.domain.tld). Leave empty for no relayhost."} :
-
+
+

{tr msg="Accept Internet Mail"}

-
- + +
+ {tr msg="Accept mail from other domains over unauthenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the privileged network."} -
+
+

{tr msg="Domains"}

+
@@ -107,44 +123,44 @@ {/section} - -
{tr msg="Domain"}{tr msg="Action"}
{$postfixmydestination[id]|escape:"html"} {strip} - - {/strip}
+

{tr msg="Mail Filter Settings"}

-
- + +
+ {tr msg="Check messages for mismatching From header and envelope from."}
- + {tr msg="Use the Sender header instead of From for the above checks if Sender is present."}

{tr msg="Action to take for messages that fail the check:"}

- + {tr msg="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 header so the recipient can see the potential forgery."}
- + {tr msg="Always reject the message."} {tr msg="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 server. This is known to cause trouble for example with mailinglists."}
-
+
+

{tr msg="Kolab Hostnames (for Master and Slaves)"}

+
@@ -153,19 +169,15 @@ {/section} - -
{tr msg="Host"}{tr msg="Action"}
{$kolabhost[id]|escape:"html"} {strip} - - {/strip}
- + Index: sflistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/sflistall.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sflistall.tpl 21 Apr 2006 10:41:38 -0000 1.2 +++ sflistall.tpl 20 May 2008 17:32:32 -0000 1.3 @@ -20,8 +20,8 @@ {if $entries[id].deleted neq "FALSE"}
{tr msg="Folder deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
@@ -60,10 +63,10 @@ {if $entries[id].deleted neq "FALSE"} {else} - - + + {/if} {/section}
{tr msg="User Deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
-

\ No newline at end of file + From cvs at kolab.org Tue May 20 19:33:03 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 20 May 2008 19:33:03 +0200 (CEST) Subject: thomas: server release-notes.txt,1.264,1.265 Message-ID: <20080520173303.C5BDB600D71@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv16524 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.264 retrieving revision 1.265 diff -u -d -r1.264 -r1.265 --- release-notes.txt 20 May 2008 17:09:47 -0000 1.264 +++ release-notes.txt 20 May 2008 17:33:01 -0000 1.265 @@ -104,6 +104,8 @@ - kolab-webadmin-2.2.rc3-2008???? + Fixes for XHTML strict + kolab/issue2505 (update of the french translation for kolab-server) kolab/issue2538 (Make the location of the Smarty compile directory configurable) From cvs at kolab.org Wed May 21 17:22:56 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:22:56 +0200 (CEST) Subject: thomas: server README.1st,1.79,1.80 Message-ID: <20080521152256.2B832600D64@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11204 Modified Files: README.1st Log Message: beta-3 -> beta3 (for consistency within the document) Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- README.1st 22 Apr 2008 14:04:01 -0000 1.79 +++ README.1st 21 May 2008 15:22:53 -0000 1.80 @@ -130,7 +130,7 @@ You should regenerated the free/busy cache again, as described in the upgrading instructions from 2.2-rc1 to 2.2-rc2. -The IMAP annotation /vendor/kolab/xfb-readable (introduced in 2.2-beta-3) +The IMAP annotation /vendor/kolab/xfb-readable (introduced in 2.2-beta3) was renamed to /vendor/kolab/pxfb-readable-for to reflect the actual meaning. After the upgrade the old annotations are still readable, but unused by the server. If you still need to write this annotation for some reason, you have From cvs at kolab.org Wed May 21 17:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:23:33 +0200 (CEST) Subject: thomas: server install-kolab.sh,1.28,1.29 Message-ID: <20080521152333.0E052600D6A@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11265 Modified Files: install-kolab.sh Log Message: Bumped version numbers to 2.2-rc3 Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- install-kolab.sh 7 May 2008 15:27:14 -0000 1.28 +++ install-kolab.sh 21 May 2008 15:23:30 -0000 1.29 @@ -11,7 +11,7 @@ # # This program is free software under the GNU GPL (>=v2) -KOLAB_VERSION="2.2-rc2+cvs" +KOLAB_VERSION="2.2-rc3" KID="19414" TAG="kolab" From cvs at kolab.org Wed May 21 17:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:23:33 +0200 (CEST) Subject: thomas: server/kolab-filter Makefile,1.13,1.14 Message-ID: <20080521152333.4CC08600D6A@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-filter In directory doto:/tmp/cvs-serv11265/kolab-filter Modified Files: Makefile Log Message: Bumped version numbers to 2.2-rc3 Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-filter/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile 17 Mar 2008 14:23:15 -0000 1.13 +++ Makefile 21 May 2008 15:23:31 -0000 1.14 @@ -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.rc2 -CVS = 1 +VERSION = 2.2.rc3 +CVS = 0 ifeq "x$(CVS)" "x0" SOURCE_TAG = $(VERSION) From cvs at kolab.org Wed May 21 17:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:23:33 +0200 (CEST) Subject: thomas: server/kolabconf Makefile.PL,1.21,1.22 Message-ID: <20080521152333.5AC1A600D6B@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabconf In directory doto:/tmp/cvs-serv11265/kolabconf Modified Files: Makefile.PL Log Message: Bumped version numbers to 2.2-rc3 Index: Makefile.PL =================================================================== RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile.PL 17 Mar 2008 14:23:15 -0000 1.21 +++ Makefile.PL 21 May 2008 15:23:31 -0000 1.22 @@ -9,10 +9,10 @@ my $KOLAB_VERSION; # The Kolab version number for the perl-kolab package -my $KOLAB_BASE_VERSION = "2.2.rc2"; +my $KOLAB_BASE_VERSION = "2.2.rc3"; # 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 May 21 17:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:23:33 +0200 (CEST) Subject: thomas: server/kolab-freebusy Makefile,1.14,1.15 Message-ID: <20080521152333.5AD58600D76@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-freebusy In directory doto:/tmp/cvs-serv11265/kolab-freebusy Modified Files: Makefile Log Message: Bumped version numbers to 2.2-rc3 Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile 17 Mar 2008 14:23:15 -0000 1.14 +++ Makefile 21 May 2008 15:23:31 -0000 1.15 @@ -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.rc2 -CVS = 1 +VERSION = 2.2.rc3 +CVS = 0 ifeq "x$(CVS)" "x0" SOURCE_TAG = $(VERSION) From cvs at kolab.org Wed May 21 17:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:23:33 +0200 (CEST) Subject: thomas: server/php-kolab Makefile,1.20,1.21 Message-ID: <20080521152333.95581600D6A@lists.intevation.de> Author: thomas Update of /kolabrepository/server/php-kolab In directory doto:/tmp/cvs-serv11265/php-kolab Modified Files: Makefile Log Message: Bumped version numbers to 2.2-rc3 Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 14 Mar 2008 17:48:10 -0000 1.20 +++ Makefile 21 May 2008 15:23:31 -0000 1.21 @@ -4,8 +4,8 @@ VERSION = 2.2 PRERELEASE = rc -PRERELEASE_VERSION = 2 -CVS = 1 +PRERELEASE_VERSION = 3 +CVS = 0 ifeq "x$(PRERELEASE)" "x" ifeq "x$(CVS)" "x0" From cvs at kolab.org Wed May 21 17:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:23:33 +0200 (CEST) Subject: thomas: server/perl-kolab/lib Kolab.pm,1.17,1.18 Message-ID: <20080521152333.957BB600D6B@lists.intevation.de> Author: thomas Update of /kolabrepository/server/perl-kolab/lib In directory doto:/tmp/cvs-serv11265/perl-kolab/lib Modified Files: Kolab.pm Log Message: Bumped version numbers to 2.2-rc3 Index: Kolab.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Kolab.pm 17 Mar 2008 14:23:15 -0000 1.17 +++ Kolab.pm 21 May 2008 15:23:31 -0000 1.18 @@ -59,10 +59,10 @@ ); # The Kolab version number for the perl-kolab package -our $KOLAB_BASE_VERSION = "2.2.rc2"; +our $KOLAB_BASE_VERSION = "2.2.rc3"; # 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 May 21 17:51:39 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 17:51:39 +0200 (CEST) Subject: thomas: server install-kolab.sh,1.29,1.30 Message-ID: <20080521155139.04431600D6D@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12312 Modified Files: install-kolab.sh Log Message: install-kolab.sh: Option to create 00INDEX.rdf files. The user has to copy/link all packages into the current directory. This needs to be documented elsewhere. Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- install-kolab.sh 21 May 2008 15:23:30 -0000 1.29 +++ install-kolab.sh 21 May 2008 15:51:36 -0000 1.30 @@ -57,8 +57,8 @@ echo echo " -V VERSION (alternate version; default is $KOLAB_VERSION)" echo - echo " -D (generate a binary distribution based on ./ and /\$PREFIX)" - echo " -S (generate a source distribution based on ./ and /\$PREFIX)" + echo " -X (generate 00INDEX.rdf for packages in the current directory" + echo " using the OpenPKG installation in /\$PREFIX)" echo echo " -B (abort after generating the basic openpkg binary)" echo " -E (abort after generating the openpkg environment)" @@ -66,7 +66,7 @@ echo " -O (additional build options, used for openpkg bootstraping from source)" } -while getopts hcBDSEFHi:V:p:I:u:t:O: ARGS; do +while getopts hcBXEFHi:V:p:I:u:t:O: ARGS; do case $ARGS in h) # Display help usage @@ -105,11 +105,8 @@ c) # User wants to erase the openpkg environment FLAG_CLEAN="Yes" ;; - D) # User wants to collect a set of binary packages into a distribution - FLAG_BDIST="Yes" - ;; - S) # User wants to collect a set of source packages into a distribution - FLAG_SDIST="Yes" + X) # User wants to collect a set of packages into 00INDEX.rdf + FLAG_INDEX="Yes" ;; O) # User wants additional options when building OpenPK ADDITIONAL_BUILD_OPTS="$OPTARG" @@ -142,7 +139,7 @@ R_KID=`expr $KID + 1` N_KID=`expr $R_KID + 1` -if [ -n "$FLAG_CLEAN" -o -n "$FLAG_BDIST" -o -n "$FLAG_SDIST" ]; then +if [ -n "$FLAG_CLEAN" -o -n "$FLAG_INDEX" ]; then if [ -x "$PREFIX/bin/openpkg" ]; then if [ -n "$FLAG_CLEAN" ]; then echo @@ -157,49 +154,9 @@ echo "Not cleaning." exit 0 fi - elif [ -n "$FLAG_SDIST" ]; then - SDIST_DIR=$PREFIX/RPM/SDIST - 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 - mkdir -p $SDIST_DIR - cp $0 $SDIST_DIR - if [ -n "$INSTALLER" ]; then - cp $INSTALLER $SDIST_DIR - fi - if [ -n "*.src.rpm" ]; then - cp *.src.rpm $SDIST_DIR - fi - if [ -n "$PREFIX/RPM/PKG/*.src.rpm" ]; then - cp $PREFIX/RPM/PKG/*.src.rpm $SDIST_DIR - fi - chown -R $USER:$USER $SDIST_DIR - cd $SDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i . - exit 0 - elif [ -n "$FLAG_BDIST" ]; then + elif [ -n "$FLAG_INDEX" ]; then PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG - BDIST_DIR=$PREFIX/RPM/BDIST - BINARY=`find . -name "openpkg-*.$PLATTAG.sh" -print` - if [ -z "$BINARY" ]; then - echo "No binary installer package found. Unable to create a binary distribution!" - exit 1 - fi - mkdir -p $BDIST_DIR - cp $0 $BDIST_DIR - if [ -n "$BINARY" ]; then - cp $BINARY $BDIST_DIR - fi - if [ -n "*$PLATTAG.rpm" ]; then - cp *$PLATTAG.rpm $BDIST_DIR - fi - if [ -n "$PREFIX/RPM/PKG/*$PLATTAG.rpm" ]; then - cp $PREFIX/RPM/PKG/*$PLATTAG.rpm $BDIST_DIR - fi - chown -R $USER:$USER $BDIST_DIR - cd $BDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG . - exit 0 + exec $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG . else echo "\"$PREFIX\" seems to be no OpenPKG environment." exit 1 From cvs at kolab.org Wed May 21 18:30:18 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 18:30:18 +0200 (CEST) Subject: thomas: server rpmdircmp,1.3,1.4 Message-ID: <20080521163018.D5233600D76@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13897 Modified Files: rpmdircmp Log Message: rpmdircmp: allow extension to be specified with or without leading dot. Index: rpmdircmp =================================================================== RCS file: /kolabrepository/server/rpmdircmp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rpmdircmp 13 Mar 2008 17:30:47 -0000 1.3 +++ rpmdircmp 21 May 2008 16:30:16 -0000 1.4 @@ -44,7 +44,7 @@ sys.stderr.write("%d ... \r" % todo) todo -= 1 if rpm.endswith(ext): - entry = rpm[:-len(ext)-1].rsplit('-', 2) + entry = rpm[:-len(ext)].rsplit('-', 2) entry.append(rpmpackager(rpmdir, rpm)) rpms.append(tuple(entry)) sys.stderr.write('OK. \n') @@ -63,6 +63,8 @@ def main(olddir, newdir, ext=None): if not ext: ext = '.src.rpm' + elif not ext.startswith('.'): + ext = ".%s" % ext oldrpms, oldnames, olddict = rpmsets(olddir, ext) newrpms, newnames, newdict = rpmsets(newdir, ext) From cvs at kolab.org Wed May 21 18:42:26 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 May 2008 18:42:26 +0200 (CEST) Subject: thomas: server release-notes.txt,1.265,1.266 Message-ID: <20080521164226.3D5F5600171@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv14336 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.265 retrieving revision 1.266 diff -u -d -r1.265 -r1.266 --- release-notes.txt 20 May 2008 17:33:01 -0000 1.265 +++ release-notes.txt 21 May 2008 16:42:23 -0000 1.266 @@ -1,6 +1,6 @@ Kolab Server 2.2 Release Notes ============================== -(Version 2008????, Kolab Server 2.2-rc3) +(Version 20080521, Kolab Server 2.2-rc3) For upgrading and installation instructions, please refer to the 1st.README file in the package directory. @@ -56,7 +56,7 @@ New upstream version, fixes various security issues. - - fbview-horde-3.2_rc3-2008???? + - fbview-horde-3.2_rc3-20080405 kolab/issue2134 ([Horde]Unable to send message with attachments) @@ -67,7 +67,7 @@ kolab/issue2591 (NTLM support in Cyrus SASL) kolab/issue2686 (unquoted wildcards in install-kolab.sh) - - horde-framework-kolab-3.2_rc3-2008???? + - horde-framework-kolab-3.2_rc3-20080405 Rename .xpfb to .pxfb. @@ -75,7 +75,7 @@ kolab/issue2588 (whole day event with show-time-as free gets into the pfb) - - horde-kolab-3.2_rc3-2008???? + - horde-kolab-3.2_rc3-20080405 kolab/issue2134 ([Horde]Unable to send message with attachments) @@ -85,7 +85,7 @@ kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls) - - kolabd-2.1.99-2008???? + - kolabd-2.1.99-20080521 Rename .xpfb to .pxfb and xfb-readable to pxfb-readable-for @@ -93,16 +93,16 @@ kolab/issue2436 (delprune setting in cyrus.conf) kolab/issue2586 (SPAM filtering: HELO_LOCALHOST score default too high) - - kolab-filter-2.2.rc3-2008???? + - kolab-filter-2.2.rc3-20080521 Rename .xpfb to .pxfb. - - kolab-freebusy-2.2.rc3-2008???? + - kolab-freebusy-2.2.rc3-20080521 kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) - - kolab-webadmin-2.2.rc3-2008???? + - kolab-webadmin-2.2.rc3-20080521 Fixes for XHTML strict @@ -117,7 +117,7 @@ New upstream version, fixes various security issues. - - perl-kolab-2.2.rc3-2008???? + - perl-kolab-2.2.rc3-20080521 Added Fedora-DS backend (inactive by default) @@ -130,7 +130,7 @@ kolab/issue2519 (Add functionality PHP : GetMYRIGHT) - - php-kolab-2.2.rc3-2008???? + - php-kolab-2.2.rc3-20080521 Rename .xpfb to .pxfb. @@ -139,6 +139,137 @@ - postfix-2.4.6-20080101_kolab kolab/issue2346 (Compilation of postfix fails on CentOS 5.1 64Bit) + + + Packages in the OpenPKG based Kolab server release: + + - Kolab packages: + + Updated: + + fbview-horde-3.2_rc3-20080405 + fbview-kronolith-2.2_rc2-20080405 + horde-framework-kolab-3.2_rc3-20080405 + horde-imp-kolab-4.2_rc3-20080405 + horde-ingo-kolab-1.2_rc2-20080405 + horde-kolab-3.2_rc3-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 + horde-turba-kolab-2.2_rc3-20080405 + kolab-filter-2.2.rc3-20080521 + kolab-freebusy-2.2.rc3-20080521 + kolab-webadmin-2.1.99-20080521 + kolabconf-2.2.rc3-20080521 + kolabd-2.1.99-20080521 + openldap-2.3.41-20080424 + perl-kolab-2.2.rc3-20080521 + php-kolab-2.2.rc3-20080521 + + 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_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 + PEAR-Net_Socket-1.0.6-1 + PEAR-Net_URL-1.0.15-1 + php-channel-horde-1.0-1 + php-smarty-2.6.18-20070607 + + - OpenPKG packages: + + Updated: + + apache-php-5.2.6-20080514_kolab + clamav-0.93-20080414 + imapd-2.3.11-20080101_kolab4 + php-5.2.6-20080514_kolab + postfix-2.4.6-20080101_kolab + + Unchanged: + + amavisd-2.5.3-20080101 + apache-2.2.8-20080118 + 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 + 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 + pkgconfig-0.23-20080117 + png-1.2.24-20080101 + 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-1 and 2.2-rc-2 From cvs at kolab.org Thu May 22 11:43:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 22 May 2008 11:43:51 +0200 (CEST) Subject: bernhard: doc/www/src roadmap.html.m4,1.13,1.14 Message-ID: <20080522094351.94830600D6E@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv31581 Modified Files: roadmap.html.m4 Log Message: Pushing server release plan one month. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- roadmap.html.m4 17 Apr 2008 14:28:02 -0000 1.13 +++ roadmap.html.m4 22 May 2008 09:43:49 -0000 1.14 @@ -52,7 +52,7 @@
  • Implementation of new concept for extended freebusy list which is good for the teamleader overview usecase. -Planned is 2.2-rc3 in April and 2.2 final release in May 2008. +Planned is 2.2-rc3 end of May and 2.2 final release in June 2008.

    Kolab Server 2.1 release series

    From cvs at kolab.org Thu May 22 19:12:06 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 22 May 2008 19:12:06 +0200 (CEST) Subject: bh: utils/testing create_ldap_users.py,1.3,1.4 Message-ID: <20080522171206.05BCB600D6E@lists.intevation.de> Author: bh Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv15791 Modified Files: create_ldap_users.py Log Message: Added code to create and delete groups as well. Index: create_ldap_users.py =================================================================== RCS file: /kolabrepository/utils/testing/create_ldap_users.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- create_ldap_users.py 24 Oct 2005 15:09:04 -0000 1.3 +++ create_ldap_users.py 22 May 2008 17:12:03 -0000 1.4 @@ -45,6 +45,14 @@ return conn.search_s("k=kolab," + base_dn, ldap.SCOPE_BASE, filterstr='(objectClass=*)')[0][1] +def set_delete_flag(conn, filterstr): + hosts = fetch_kolab_info(conn)["kolabHost"] + result = conn.search_s(base_dn, ldap.SCOPE_ONELEVEL, filterstr=filterstr) + for dn, attrs in result: + print dn, hosts + conn.modify_s(dn, [(ldap.MOD_ADD, "kolabDeleteFlag", hosts)]) + + def add_user(conn, num_users): kolab_info = fetch_kolab_info(conn) @@ -73,12 +81,35 @@ def delete_auto_users(conn): - hosts = fetch_kolab_info(conn)["kolabHost"] - result = conn.search_s(base_dn, ldap.SCOPE_ONELEVEL, - filterstr="(&(objectClass=kolabInetOrgPerson)(cn=auto*))") - for dn, attrs in result: - print dn, hosts - conn.modify_s(dn, [(ldap.MOD_ADD, "kolabDeleteFlag", hosts)]) + set_delete_flag(conn, "(&(objectClass=kolabInetOrgPerson)(cn=auto*))") + + +def add_groups(conn, num_entries, member): + kolab_info = fetch_kolab_info(conn) + + mail_domain = kolab_info["postfix-mydomain"][0] + # use the first of the kolab hosts as home server. + kolab_home_server = kolab_info["kolabHost"][0] + + common_attrs = { + 'objectClass': ['top', 'groupOfNames', 'kolabGroupOfNames'], + } + + users = [("testgrp%d@%s" % (n, mail_domain), "auto", "autotest%d" % n) + for n in range(num_entries)] + for n in range(num_entries): + mail = "testgrp%d@%s" % (n, mail_domain) + descr = common_attrs.copy() + descr["cn"] = [mail] + descr["mail"] = [mail] + descr["member"] = [member] + dn = "cn=" + mail + "," + base_dn + print dn, descr + print conn.add_s(dn, ldap.modlist.addModlist(descr)) + + +def delete_auto_groups(conn): + set_delete_flag(conn, "(&(objectClass=kolabGroupOfNames)(cn=testgrp*))") def main(): @@ -88,10 +119,13 @@ port = None admin_dn_part = "cn=manager" base_dn = None - num_users = 10 + num_entries = 10 + entry_type = "user" + group_member = None - opts, args = getopt.getopt(sys.argv[1:], 'h:p:u:n:', - ["host=", "port=", "user=", "num="]) + opts, args = getopt.getopt(sys.argv[1:], 'h:p:u:n:t:', + ["host=", "port=", "user=", "num=", + "type=", "member="]) for optchar, value in opts: if optchar in ("-h", "--host"): hostname = value @@ -99,8 +133,13 @@ port = int(value) elif optchar in ("-u", "--user"): admin_dn_part = value + elif optchar in ("-t", "--type"): + entry_type = value + elif optchar in "--member": + # dn of the initial member. groups may not be empty in Kolab + group_member = value elif optchar in ("-n", "--num"): - num_users = int(value) + num_entries = int(value) else: print >>sys.stderr, "Unknown option", optchar sys.exit(1) @@ -126,10 +165,16 @@ conn = open_ldap(uri, admin_dn_part) - if cmd == "add": - add_user(conn, num_users = num_users) - elif cmd == "delete": - delete_auto_users(conn) + if entry_type == "user": + if cmd == "add": + add_user(conn, num_entries) + elif cmd == "delete": + delete_auto_users(conn) + elif entry_type == "group": + if cmd == "add": + add_groups(conn, num_entries, group_member) + elif cmd == "delete": + delete_auto_groups(conn) From cvs at kolab.org Fri May 23 11:15:04 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 11:15:04 +0200 (CEST) Subject: thomas: server/horde/fbview-horde fbview-horde-conf.template, 1.6, 1.7 fbview-horde.spec, 1.20, 1.21 Message-ID: <20080523091504.68DCB600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/horde/fbview-horde In directory doto:/tmp/cvs-serv25538/horde/fbview-horde Modified Files: fbview-horde-conf.template fbview-horde.spec Log Message: The manager password (adminpw) isn't needed by fbview. The generated config is readable by kolab-n, so this was a security risk. Index: fbview-horde-conf.template =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde-conf.template,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- fbview-horde-conf.template 6 Sep 2007 10:03:27 -0000 1.6 +++ fbview-horde-conf.template 23 May 2008 09:15:01 -0000 1.7 @@ -13,5 +13,4 @@ $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@'; $conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@'; $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@'; -$conf['kolab']['imap']['adminpw'] = '@@@bind_pw@@@'; ?> Index: fbview-horde.spec =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- fbview-horde.spec 13 May 2008 06:56:14 -0000 1.20 +++ fbview-horde.spec 23 May 2008 09:15:01 -0000 1.21 @@ -2,8 +2,8 @@ %define V_horde_name horde %define V_package fbview-%{V_horde_name} %define V_year 2008 -%define V_month 04 -%define V_day 05 +%define V_month 05 +%define V_day 23 %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 Fri May 23 11:19:55 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 11:19:55 +0200 (CEST) Subject: thomas: server/horde/fbview-kronolith fbview-kronolith.spec, 1.21, 1.22 Message-ID: <20080523091955.0EB93600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/horde/fbview-kronolith In directory doto:/tmp/cvs-serv25702/horde/fbview-kronolith Modified Files: fbview-kronolith.spec Log Message: busyblock.tpl was renamed to busyblock.html, so adjust the patch Index: fbview-kronolith.spec =================================================================== RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- fbview-kronolith.spec 5 Apr 2008 12:59:55 -0000 1.21 +++ fbview-kronolith.spec 23 May 2008 09:19:52 -0000 1.22 @@ -2,8 +2,8 @@ %define V_horde_name kronolith %define V_package fbview-%{V_horde_name} %define V_year 2008 -%define V_month 04 -%define V_day 05 +%define V_month 05 +%define V_day 23 %define V_version 2.2_rc2 %define V_uver 2.2-rc2 %define V_date %{V_year}-%{V_month}-%{V_day} From cvs at kolab.org Fri May 23 11:19:55 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 11:19:55 +0200 (CEST) Subject: thomas: server/patches/horde/3.2-rc3/fbview-kronolith HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch, 1.1, 1.2 Message-ID: <20080523091955.135B3600D70@lists.intevation.de> Author: thomas Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith In directory doto:/tmp/cvs-serv25702/patches/horde/3.2-rc3/fbview-kronolith Modified Files: HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch Log Message: busyblock.tpl was renamed to busyblock.html, so adjust the patch Index: HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch =================================================================== RCS file: /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith/HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch 13 Mar 2008 15:37:25 -0000 1.1 +++ HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch 23 May 2008 09:19:53 -0000 1.2 @@ -8,7 +8,7 @@ $rows = ''; foreach ($this->_requiredMembers as $member) { - $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy")); -+ $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams()); ++ $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams()); $template = new Horde_Template(); $template->set('blocks', $blocks); $template->set('name', $member->getName()); @@ -17,7 +17,7 @@ $rows = ''; foreach ($this->_optionalMembers as $member) { - $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy")); -+ $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams()); ++ $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams()); $template = new Horde_Template(); $template->set('blocks', $blocks); $template->set('name', $member->getName()); From cvs at kolab.org Fri May 23 11:22:50 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 11:22:50 +0200 (CEST) Subject: thomas: server/patches/horde/3.2-rc3/fbview-horde HK-GW-Config_fbview-horde-3.2-rc3.patch, 1.1, 1.2 Message-ID: <20080523092250.2CBF1600D70@lists.intevation.de> Author: thomas Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-horde In directory doto:/tmp/cvs-serv25887/patches/horde/3.2-rc3/fbview-horde Modified Files: HK-GW-Config_fbview-horde-3.2-rc3.patch Log Message: Corrected cookie path for fbview Index: HK-GW-Config_fbview-horde-3.2-rc3.patch =================================================================== RCS file: /kolabrepository/server/patches/horde/3.2-rc3/fbview-horde/HK-GW-Config_fbview-horde-3.2-rc3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HK-GW-Config_fbview-horde-3.2-rc3.patch 13 Mar 2008 15:37:25 -0000 1.1 +++ HK-GW-Config_fbview-horde-3.2-rc3.patch 23 May 2008 09:22:48 -0000 1.2 @@ -22,7 +22,7 @@ +$conf['session']['cache_limiter'] = 'nocache'; +$conf['session']['timeout'] = 0; +$conf['cookie']['domain'] = $_SERVER['SERVER_NAME']; -+$conf['cookie']['path'] = '/horde'; ++$conf['cookie']['path'] = '/fbview'; +$conf['sql'] = null; +$conf['auth']['admins'] = array('manager'); +$conf['auth']['checkip'] = true; From cvs at kolab.org Fri May 23 11:23:33 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 11:23:33 +0200 (CEST) Subject: thomas: server release-notes.txt,1.266,1.267 Message-ID: <20080523092333.AF1B2600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv25953 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.266 retrieving revision 1.267 diff -u -d -r1.266 -r1.267 --- release-notes.txt 21 May 2008 16:42:23 -0000 1.266 +++ release-notes.txt 23 May 2008 09:23:30 -0000 1.267 @@ -1,6 +1,6 @@ Kolab Server 2.2 Release Notes ============================== -(Version 20080521, Kolab Server 2.2-rc3) +(Version 20080523, Kolab Server 2.2-rc3) For upgrading and installation instructions, please refer to the 1st.README file in the package directory. @@ -56,10 +56,16 @@ New upstream version, fixes various security issues. - - fbview-horde-3.2_rc3-20080405 + - fbview-horde-3.2_rc3-20080523 + + Removed manager password from fbview config file. kolab/issue2134 ([Horde]Unable to send message with attachments) + - fbview-kronolith-2.2_rc2-20080523 + + New upstream package with adjusted patches. + - install-kolab.sh kolab/issue2371 (install-kolab.sh script incompatible with /bin/sh of @@ -147,8 +153,8 @@ Updated: - fbview-horde-3.2_rc3-20080405 - fbview-kronolith-2.2_rc2-20080405 + fbview-horde-3.2_rc3-20080523 + 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 From cvs at kolab.org Fri May 23 12:29:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 12:29:57 +0200 (CEST) Subject: thomas: server README.1st,1.80,1.81 Message-ID: <20080523102957.0CF55600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv28631 Modified Files: README.1st Log Message: README: Mention how to create 00INDEX.rdf Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- README.1st 21 May 2008 15:22:53 -0000 1.80 +++ README.1st 23 May 2008 10:29:54 -0000 1.81 @@ -124,6 +124,34 @@ # /kolab/bin/openpkg rc all start +Generating your own 00INDEX.rdf for installations or upgrades +------------------------------------------------------------- + +The source and binary downloads contain the 00INDEX.rdf file needed by +the "openpkg build" command used by install-kolab.sh to install or upgrade +a Kolab server. + +If you already have your own set of binary packages from a previous build, +you can use these to create a full binary installer (e.g. to install the +packages on a second machine) or or a partial binary installer (for upgrades +where you only want to compile the new .src.rpm files instead of everything). + +To generate this file, you always need all .src.rpm files, so link or copy +them in a new directory (needs to be writable by the kolab user of your +installation). After this you can link/copy the install-kolab.sh file and +your binary rpm files (e.g. from /kolab/RPM/PKG/) into this directory and +run the following command as user kolab or root to create the new +00INDEX.rdf file:: + +$ ./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 +only for upgrades), you need to put the OpenPKG bootstrap file +(openpkg-*.src.sh or openpkg---kolab.rpm) into this directory, +too. + + Upgrade from 2.2-rc2 to 2.2-rc3 ------------------------------- From cvs at kolab.org Fri May 23 14:31:35 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 14:31:35 +0200 (CEST) Subject: thomas: doc/www/src mirrors.html.m4,1.22,1.23 Message-ID: <20080523123135.A4DD0600D6F@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv1502 Modified Files: mirrors.html.m4 Log Message: Belnet and Linjection mirrors are alive again :) Index: mirrors.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mirrors.html.m4 17 Mar 2008 13:19:26 -0000 1.22 +++ mirrors.html.m4 23 May 2008 12:31:33 -0000 1.23 @@ -7,11 +7,9 @@
    • -
    • @@ -27,12 +25,10 @@ --> -
    From cvs at kolab.org Fri May 23 15:02:06 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 May 2008 15:02:06 +0200 (CEST) Subject: thomas: doc/www/src index.html.m4,1.141,1.142 Message-ID: <20080523130206.A8AA1600D6D@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2609 Modified Files: index.html.m4 Log Message: Kolab Server 2.2-rc3 Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- index.html.m4 17 Apr 2008 09:38:00 -0000 1.141 +++ index.html.m4 23 May 2008 13:02:04 -0000 1.142 @@ -45,6 +45,25 @@ -->
    + + + + + +
    May 23rd, 2008» + Kolab Server 2.2 Release Candidate 3 released +
    +
    + Source and binary packages for Kolab Server 2.2 Release Candidate 3 + are available for download. +
    + See the + + announcement for details. +
    +

    + +
    April 17th, 2008 » @@ -60,6 +79,7 @@

    +
    April 16th, 2008 » @@ -91,11 +111,12 @@ -

    + +
    March 17th, 2008 » @@ -111,6 +132,7 @@ announcement for details.

    + From cvs at kolab.org Mon May 26 16:49:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 May 2008 16:49:27 +0200 (CEST) Subject: thomas: server README.1st,1.81,1.82 install-kolab.sh,1.30,1.31 Message-ID: <20080526144927.A074F60016C@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv14235 Modified Files: README.1st install-kolab.sh Log Message: Bumped version numbers to 2.2-rc3+cvs and added dummy README entry for upgrade Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- README.1st 23 May 2008 10:29:54 -0000 1.81 +++ README.1st 26 May 2008 14:49:25 -0000 1.82 @@ -152,6 +152,12 @@ too. +Upgrade from 2.2-rc3 to 2.2.0 +----------------------------- + +Nothing special has to be done for this upgrade. + + Upgrade from 2.2-rc2 to 2.2-rc3 ------------------------------- Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- install-kolab.sh 21 May 2008 15:51:36 -0000 1.30 +++ install-kolab.sh 26 May 2008 14:49:25 -0000 1.31 @@ -11,7 +11,7 @@ # # This program is free software under the GNU GPL (>=v2) -KOLAB_VERSION="2.2-rc3" +KOLAB_VERSION="2.2-rc3+cvs" KID="19414" TAG="kolab" From cvs at kolab.org Mon May 26 16:49:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 May 2008 16:49:27 +0200 (CEST) Subject: thomas: server/kolab-filter Makefile,1.14,1.15 Message-ID: <20080526144927.A468A600D58@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-filter In directory doto:/tmp/cvs-serv14235/kolab-filter Modified Files: Makefile Log Message: Bumped version numbers to 2.2-rc3+cvs and added dummy README entry for upgrade Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-filter/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile 21 May 2008 15:23:31 -0000 1.14 +++ Makefile 26 May 2008 14:49:25 -0000 1.15 @@ -2,7 +2,7 @@ RELEASE = $(shell date '+%Y%m%d') VERSION = 2.2.rc3 -CVS = 0 +CVS = 1 ifeq "x$(CVS)" "x0" SOURCE_TAG = $(VERSION) From cvs at kolab.org Mon May 26 16:49:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 May 2008 16:49:27 +0200 (CEST) Subject: thomas: server/kolabconf Makefile.PL,1.22,1.23 Message-ID: <20080526144927.ACC7F60C4A5@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabconf In directory doto:/tmp/cvs-serv14235/kolabconf Modified Files: Makefile.PL Log Message: Bumped version numbers to 2.2-rc3+cvs and added dummy README entry for upgrade Index: Makefile.PL =================================================================== RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile.PL 21 May 2008 15:23:31 -0000 1.22 +++ Makefile.PL 26 May 2008 14:49:25 -0000 1.23 @@ -12,7 +12,7 @@ my $KOLAB_BASE_VERSION = "2.2.rc3"; # 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 Mon May 26 16:49:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 May 2008 16:49:27 +0200 (CEST) Subject: thomas: server/perl-kolab/lib Kolab.pm,1.18,1.19 Message-ID: <20080526144927.A965C60C4A2@lists.intevation.de> Author: thomas Update of /kolabrepository/server/perl-kolab/lib In directory doto:/tmp/cvs-serv14235/perl-kolab/lib Modified Files: Kolab.pm Log Message: Bumped version numbers to 2.2-rc3+cvs and added dummy README entry for upgrade Index: Kolab.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Kolab.pm 21 May 2008 15:23:31 -0000 1.18 +++ Kolab.pm 26 May 2008 14:49:25 -0000 1.19 @@ -62,7 +62,7 @@ our $KOLAB_BASE_VERSION = "2.2.rc3"; # 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 Mon May 26 16:49:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 May 2008 16:49:27 +0200 (CEST) Subject: thomas: server/kolab-freebusy Makefile,1.15,1.16 Message-ID: <20080526144927.A7C63600D60@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-freebusy In directory doto:/tmp/cvs-serv14235/kolab-freebusy Modified Files: Makefile Log Message: Bumped version numbers to 2.2-rc3+cvs and added dummy README entry for upgrade Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile 21 May 2008 15:23:31 -0000 1.15 +++ Makefile 26 May 2008 14:49:25 -0000 1.16 @@ -2,7 +2,7 @@ RELEASE = $(shell date '+%Y%m%d') VERSION = 2.2.rc3 -CVS = 0 +CVS = 1 ifeq "x$(CVS)" "x0" SOURCE_TAG = $(VERSION) From cvs at kolab.org Mon May 26 16:49:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 May 2008 16:49:27 +0200 (CEST) Subject: thomas: server/php-kolab Makefile,1.21,1.22 Message-ID: <20080526144927.ADBAF60C4A8@lists.intevation.de> Author: thomas Update of /kolabrepository/server/php-kolab In directory doto:/tmp/cvs-serv14235/php-kolab Modified Files: Makefile Log Message: Bumped version numbers to 2.2-rc3+cvs and added dummy README entry for upgrade Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 21 May 2008 15:23:31 -0000 1.21 +++ Makefile 26 May 2008 14:49:25 -0000 1.22 @@ -5,7 +5,7 @@ VERSION = 2.2 PRERELEASE = rc PRERELEASE_VERSION = 3 -CVS = 0 +CVS = 1 ifeq "x$(PRERELEASE)" "x" ifeq "x$(CVS)" "x0" From cvs at kolab.org Thu May 29 16:47:44 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 29 May 2008 16:47:44 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog, 1.166, 1.167 kolabpasswd.in, 1.4, 1.5 Message-ID: <20080529144744.126A0600167@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv10120/kolabd Modified Files: ChangeLog kolabpasswd.in Log Message: Fixed typo: passwod -> password (found by Karl-Heinz Ruskowski) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -r1.166 -r1.167 --- ChangeLog 30 Apr 2008 12:48:47 -0000 1.166 +++ ChangeLog 29 May 2008 14:47:41 -0000 1.167 @@ -1,3 +1,7 @@ +2008-05-29 Thomas Arendsen Hein + + * kolabpasswd.in: fixed typo: passwod -> password + 2008-04-30 Sascha Wilde * Makefile.am: Major cleanup: replaced lots of redundant rules by Index: kolabpasswd.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabpasswd.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kolabpasswd.in 27 Nov 2005 23:57:02 -0000 1.4 +++ kolabpasswd.in 29 May 2008 14:47:41 -0000 1.5 @@ -70,7 +70,7 @@ if( $#ARGV == 0 ) { $account = $ARGV[0]; if( $account ne 'calendar' and $account ne 'nobody' and $account ne 'manager' ) { - die("$^X can only change the passwod for manager, nobody and calendar"); + die("$^X can only change the password for manager, nobody and calendar"); } $account_dn =~ s/cn=manager/cn=$account/; } From cvs at kolab.org Thu May 29 17:41:01 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 29 May 2008 17:41:01 +0200 (CEST) Subject: thomas: server release-notes.txt,1.267,1.268 Message-ID: <20080529154101.172D5600167@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11676 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.267 retrieving revision 1.268 diff -u -d -r1.267 -r1.268 --- release-notes.txt 23 May 2008 09:23:30 -0000 1.267 +++ release-notes.txt 29 May 2008 15:40:58 -0000 1.268 @@ -1,6 +1,6 @@ Kolab Server 2.2 Release Notes ============================== -(Version 20080523, Kolab Server 2.2-rc3) +(Version 2008????, Kolab Server 2.2.0) For upgrading and installation instructions, please refer to the 1st.README file in the package directory. @@ -44,6 +44,41 @@ The specifics are described below. +Changes between 2.2-rc-3 and 2.2.0 + + - install-kolab.sh + + Adjusted version number. + + - kolabconf-2.2.0-2008???? + + Adjusted version number. + + - kolabd-2.2.0-2008???? + + Adjusted version number (and fixed typo). + + - kolab-filter-2.2.0-2008???? + + Adjusted version number. + + - kolab-freebusy-2.2.0-2008???? + + Adjusted version number. + + - kolab-webadmin-2.2.0-2008???? + + Adjusted version number. + + - perl-kolab-2.2.0-2008???? + + Adjusted version number. + + - php-kolab-2.2.0-2008???? + + Adjusted version number. + + Changes between 2.2-rc-2 and 2.2-rc-3 - apache-php-5.2.6-20080514_kolab @@ -108,7 +143,7 @@ kolab/issue2536 (generatefb.php doesn't work with folders containing umlauts) - - kolab-webadmin-2.2.rc3-20080521 + - kolab-webadmin-2.1.99-20080521 Fixes for XHTML strict From cvs at kolab.org Mon Jun 2 17:43:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 2 Jun 2008 17:43:36 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.101,1.102 Message-ID: <20080602154336.C7250600BB0@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv19361/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: Fix kolab/issue2739 (Some characters are not allowed in users fax-/phonenumbers despite the description in the error) Space was missing from the regular expression and the minus sign has to be at the beginning or the end of [...] side note 1: the \ before / is really needed side note 2: php-kolab/Kolab_Webadmin/Webadmin/form.class.php seems unused, but I fixed it, too, to avoid copy&paste errors in the future. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- ChangeLog 4 Apr 2008 19:44:21 -0000 1.101 +++ ChangeLog 2 Jun 2008 15:43:34 -0000 1.102 @@ -1,3 +1,9 @@ +2008-06-02 Thomas Arendsen Hein + + * php/admin/include/form.class.php: Fix regular expression which + caused kolab/issue2739 (Some characters are not allowed in users + fax-/phonenumbers despite the description in the error) + 2008-04-03 Richard Bos * Added: www/favicon.png From cvs at kolab.org Mon Jun 2 17:43:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 2 Jun 2008 17:43:36 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.41, 1.42 Message-ID: <20080602154336.D42B0600BB3@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv19361/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: Fix kolab/issue2739 (Some characters are not allowed in users fax-/phonenumbers despite the description in the error) Space was missing from the regular expression and the minus sign has to be at the beginning or the end of [...] side note 1: the \ before / is really needed side note 2: php-kolab/Kolab_Webadmin/Webadmin/form.class.php seems unused, but I fixed it, too, to avoid copy&paste errors in the future. Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- messages.po 10 Apr 2008 12:39:36 -0000 1.41 +++ messages.po 2 Jun 2008 15:43:34 -0000 1.42 @@ -8,7 +8,7 @@ "Project-Id-Version: Kolab-Webadmin German\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-04-10 12:58+0200\n" -"PO-Revision-Date: 2008-02-26 16:51+0100\n" +"PO-Revision-Date: 2008-06-02 17:40+0200\n" "Last-Translator: Thomas Arendsen Hein \n" "Language-Team: Kolab development coordination \n" "MIME-Version: 1.0\n" @@ -2146,9 +2146,9 @@ #: ../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 "" -"Telefonnummern dürfen nur A-Z, Ziffern und die Zeichen ()-+/.=?: enthalten." +"Telefonnummern dürfen nur a-z, Ziffern, Leerzeichen und die Zeichen ()-+/.=?: enthalten." #: ../include/form.class.php:118 msgid "" From cvs at kolab.org Mon Jun 2 17:43:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 2 Jun 2008 17:43:36 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.33, 1.34 Message-ID: <20080602154336.CF356600BB2@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv19361/kolab-webadmin/kolab-webadmin/php/admin/include Modified Files: form.class.php Log Message: Fix kolab/issue2739 (Some characters are not allowed in users fax-/phonenumbers despite the description in the error) Space was missing from the regular expression and the minus sign has to be at the beginning or the end of [...] side note 1: the \ before / is really needed side note 2: php-kolab/Kolab_Webadmin/Webadmin/form.class.php seems unused, but I fixed it, too, to avoid copy&paste errors in the future. Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- form.class.php 21 Nov 2007 16:16:51 -0000 1.33 +++ form.class.php 2 Jun 2008 15:43:34 -0000 1.34 @@ -52,7 +52,7 @@ function checkphone( $form, $key, $value ) { if( empty($value) ) return ''; // OK - else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:'); + else if( !preg_match('/^[a-zA-Z0-9 ()+\/.=?:-]*$/',$value) ) return _('Phone entries may only contain a-z, numbers, spaces and the characters ()-+/.=?:'); else return ''; } From cvs at kolab.org Mon Jun 2 17:43:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 2 Jun 2008 17:43:36 +0200 (CEST) Subject: thomas: server release-notes.txt,1.268,1.269 Message-ID: <20080602154336.BEFE0600BAF@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19361 Modified Files: release-notes.txt Log Message: Fix kolab/issue2739 (Some characters are not allowed in users fax-/phonenumbers despite the description in the error) Space was missing from the regular expression and the minus sign has to be at the beginning or the end of [...] side note 1: the \ before / is really needed side note 2: php-kolab/Kolab_Webadmin/Webadmin/form.class.php seems unused, but I fixed it, too, to avoid copy&paste errors in the future. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.268 retrieving revision 1.269 diff -u -d -r1.268 -r1.269 --- release-notes.txt 29 May 2008 15:40:58 -0000 1.268 +++ release-notes.txt 2 Jun 2008 15:43:34 -0000 1.269 @@ -70,6 +70,10 @@ Adjusted version number. + kolab/issue2739 (Some characters are not allowed in users + fax-/phonenumbers despite the description + in the error) + - perl-kolab-2.2.0-2008???? Adjusted version number. From cvs at kolab.org Mon Jun 2 17:43:36 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 2 Jun 2008 17:43:36 +0200 (CEST) Subject: thomas: server/php-kolab/Kolab_Webadmin/Webadmin form.class.php, 1.6, 1.7 Message-ID: <20080602154336.D6F84600BB4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin In directory doto:/tmp/cvs-serv19361/php-kolab/Kolab_Webadmin/Webadmin Modified Files: form.class.php Log Message: Fix kolab/issue2739 (Some characters are not allowed in users fax-/phonenumbers despite the description in the error) Space was missing from the regular expression and the minus sign has to be at the beginning or the end of [...] side note 1: the \ before / is really needed side note 2: php-kolab/Kolab_Webadmin/Webadmin/form.class.php seems unused, but I fixed it, too, to avoid copy&paste errors in the future. Index: form.class.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/form.class.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- form.class.php 21 Nov 2007 16:32:11 -0000 1.6 +++ form.class.php 2 Jun 2008 15:43:34 -0000 1.7 @@ -62,7 +62,7 @@ function checkphone( $form, $key, $value ) { if( empty($value) ) return ''; // OK - else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:'); + else if( !preg_match('/^[a-zA-Z0-9 ()+\/.=?:-]*$/',$value) ) return _('Phone entries may only contain a-z, numbers, spaces and the characters ()-+/.=?:'); else return ''; } From cvs at kolab.org Mon Jun 2 18:12:13 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 2 Jun 2008 18:12:13 +0200 (CEST) Subject: thomas: doc/www/src mirrors.html.m4,1.23,1.24 Message-ID: <20080602161213.0B6DF600BAE@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv21743 Modified Files: mirrors.html.m4 Log Message: Added Rent IT mirror. See Message-ID: <483BBEB8.10203 at rent-it.net.ua> on kolab-devel Index: mirrors.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- mirrors.html.m4 23 May 2008 12:31:33 -0000 1.23 +++ mirrors.html.m4 2 Jun 2008 16:12:11 -0000 1.24 @@ -29,7 +29,14 @@ Linjection
    via http - + + +
  • + Rent IT
    + via ftp + + From cvs at kolab.org Thu Jun 5 14:58:17 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 14:58:17 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Resource.php,1.9,1.10 Message-ID: <20080605125817.9FEF9600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter In directory doto:/tmp/cvs-serv28374 Modified Files: Resource.php Log Message: kolab/issue2734 (Automatic ressources decline changed overlapping event time) Index: Resource.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Resource.php 14 Mar 2008 17:34:50 -0000 1.9 +++ Resource.php 5 Jun 2008 12:58:13 -0000 1.10 @@ -718,6 +718,30 @@ } } + $a = $imap->getAnnotation('/vendor/kolab/pxfb-readable-for', + /*array('value.shared' => 'event.default')*/'value.shared', + $calmbox); + Horde::logMessage(sprintf(_("/vendor/kolab/pxfb-readable-for annotation for folder %s is %s"), + $calmbox, print_r($a, true)), + __FILE__, __LINE__, PEAR_LOG_DEBUG); + + if (!strpos($a, $calendar_user)) { + if (empty($a)) { + $a = $calendar_user; + } else { + $a = $a . ' ' . $calendar_user; + } + $rc = $imap->setAnnotation('/vendor/kolab/pxfb-readable-for', + array('value.shared' => $a), + $calmbox); + if( PEAR::isError($rc)) { + // Non fatal error + Horde::logMessage(sprintf(_("Unable to allow XFB read access on mailbox %s: %s"), + $mymailbox, $rc->getMessage()), + __FILE__, __LINE__, PEAR_LOG_ERR); + } + } + Horde::logMessage(sprintf(_("Selecting %s for %s"), $calmbox, $calendar_user), __FILE__, __LINE__, PEAR_LOG_DEBUG); From cvs at kolab.org Thu Jun 5 16:07:44 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 16:07:44 +0200 (CEST) Subject: thomas: server install-kolab.sh, 1.31, 1.32 release-notes.txt, 1.269, 1.270 Message-ID: <20080605140744.A6A86600172@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv30986 Modified Files: install-kolab.sh release-notes.txt Log Message: Fix kolab/issue2747 (Installation of ix86 binaries fails on amd64 system) Determine the platform from the installed openpkg package instead of the system. Index: install-kolab.sh =================================================================== RCS file: /kolabrepository/server/install-kolab.sh,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- install-kolab.sh 26 May 2008 14:49:25 -0000 1.31 +++ install-kolab.sh 5 Jun 2008 14:07:42 -0000 1.32 @@ -155,8 +155,15 @@ exit 0 fi elif [ -n "$FLAG_INDEX" ]; then - PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG - exec $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG . + 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 ..." + exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -i . + else + PLATTAG=`"$PREFIX/bin/openpkg" rpm -q --qf="%{ARCH}-%{OS}" openpkg`-$TAG + echo "Generating 00INDEX.rdf for binary ($PLATTAG) distribution ..." + exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -i -p $PLATTAG . + fi else echo "\"$PREFIX\" seems to be no OpenPKG environment." exit 1 @@ -258,7 +265,7 @@ fi if [ -n "$DIR" ]; then - [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG + [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/bin/openpkg" rpm -q --qf="%{ARCH}-%{OS}" openpkg`-$TAG if [ -n "$KOLAB_VERSION" ]; then DEFINE="$DEFINE -Dkolabd::kolab_version=$KOLAB_VERSION Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.269 retrieving revision 1.270 diff -u -d -r1.269 -r1.270 --- release-notes.txt 2 Jun 2008 15:43:34 -0000 1.269 +++ release-notes.txt 5 Jun 2008 14:07:42 -0000 1.270 @@ -50,6 +50,8 @@ Adjusted version number. + kolab/issue2747 (Installation of ix86 binaries fails on amd64 system) + - kolabconf-2.2.0-2008???? Adjusted version number. From cvs at kolab.org Thu Jun 5 18:20:08 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 18:20:08 +0200 (CEST) Subject: thomas: server/horde/fbview-horde ChangeLog, 1.4, 1.5 fbview-horde-conf.template, 1.7, 1.8 fbview-horde.spec, 1.21, 1.22 Message-ID: <20080605162008.BAB50600BB7@lists.intevation.de> Author: thomas Update of /kolabrepository/server/horde/fbview-horde In directory doto:/tmp/cvs-serv3427/horde/fbview-horde Modified Files: ChangeLog fbview-horde-conf.template fbview-horde.spec Log Message: Allow login to horde and fbview if public imap service is disabled. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChangeLog 13 May 2008 06:56:14 -0000 1.4 +++ ChangeLog 5 Jun 2008 16:20:06 -0000 1.5 @@ -1,3 +1,8 @@ +2008-06-05 Thomas Arendsen Hein + + * fbview-horde-conf.template: Fix server address if imap service + is disabled (i.e. only listening on localhost). + 2008-05-13 Gunnar Wrobel

    * fbview-horde.spec: kolab/issue2134 ([Horde]Unable to send message with attachments) Index: fbview-horde-conf.template =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde-conf.template,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- fbview-horde-conf.template 23 May 2008 09:15:01 -0000 1.7 +++ fbview-horde-conf.template 5 Jun 2008 16:20:06 -0000 1.8 @@ -11,6 +11,10 @@ $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@@@'; ?> Index: fbview-horde.spec =================================================================== RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- fbview-horde.spec 23 May 2008 09:15:01 -0000 1.21 +++ fbview-horde.spec 5 Jun 2008 16:20:06 -0000 1.22 @@ -2,8 +2,8 @@ %define V_horde_name horde %define V_package fbview-%{V_horde_name} %define V_year 2008 -%define V_month 05 -%define V_day 23 +%define V_month 06 +%define V_day 05 %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 Thu Jun 5 18:20:08 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 18:20:08 +0200 (CEST) Subject: thomas: server/horde/horde ChangeLog, 1.7, 1.8 horde-kolab-conf.template, 1.5, 1.6 horde-kolab.spec, 1.27, 1.28 Message-ID: <20080605162008.B900C600BB6@lists.intevation.de> Author: thomas Update of /kolabrepository/server/horde/horde In directory doto:/tmp/cvs-serv3427/horde/horde Modified Files: ChangeLog horde-kolab-conf.template horde-kolab.spec Log Message: Allow login to horde and fbview if public imap service is disabled. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/horde/horde/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 13 May 2008 06:56:14 -0000 1.7 +++ ChangeLog 5 Jun 2008 16:20:06 -0000 1.8 @@ -1,3 +1,8 @@ +2008-06-05 Thomas Arendsen Hein + + * horde-kolab-conf.template: Fix server address if imap service + is disabled (i.e. only listening on localhost). + 2008-05-13 Gunnar Wrobel

    * horde-kolab.spec: kolab/issue2134 ([Horde]Unable to send message with attachments) Index: horde-kolab-conf.template =================================================================== RCS file: /kolabrepository/server/horde/horde/horde-kolab-conf.template,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- horde-kolab-conf.template 6 Sep 2007 10:03:27 -0000 1.5 +++ horde-kolab-conf.template 5 Jun 2008 16:20:06 -0000 1.6 @@ -12,6 +12,10 @@ $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@@@'; ?> Index: horde-kolab.spec =================================================================== RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- horde-kolab.spec 13 May 2008 06:56:14 -0000 1.27 +++ horde-kolab.spec 5 Jun 2008 16:20:06 -0000 1.28 @@ -2,7 +2,7 @@ %define V_horde_name horde %define V_package %{V_horde_name}-kolab %define V_year 2008 -%define V_month 04 +%define V_month 06 %define V_day 05 %define V_version 3.2_rc3 %define V_uver 3.2-rc2 From cvs at kolab.org Thu Jun 5 18:20:08 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 18:20:08 +0200 (CEST) Subject: thomas: server release-notes.txt,1.270,1.271 Message-ID: <20080605162008.A9308600172@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3427 Modified Files: release-notes.txt Log Message: Allow login to horde and fbview if public imap service is disabled. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.270 retrieving revision 1.271 diff -u -d -r1.270 -r1.271 --- release-notes.txt 5 Jun 2008 14:07:42 -0000 1.270 +++ release-notes.txt 5 Jun 2008 16:20:06 -0000 1.271 @@ -46,6 +46,14 @@ Changes between 2.2-rc-3 and 2.2.0 + - fbview-horde-3.2_rc3-20080605 + + Allow login if public imap service is disabled. + + - horde-kolab-3.2_rc3-20080605 + + Allow login if public imap service is disabled. + - install-kolab.sh Adjusted version number. From cvs at kolab.org Thu Jun 5 18:50:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 18:50:27 +0200 (CEST) Subject: thomas: server/kolabd/kolabd/templates fbview.conf.template.in, 1.2, NONE Message-ID: <20080605165027.CA558600BB1@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv4358/kolabd/kolabd/templates Removed Files: fbview.conf.template.in Log Message: Removed unused fbview.conf.template file. --- fbview.conf.template.in DELETED --- From cvs at kolab.org Thu Jun 5 18:50:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 18:50:27 +0200 (CEST) Subject: thomas: server release-notes.txt,1.271,1.272 Message-ID: <20080605165027.C02D4600172@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4358 Modified Files: release-notes.txt Log Message: Removed unused fbview.conf.template file. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.271 retrieving revision 1.272 diff -u -d -r1.271 -r1.272 --- release-notes.txt 5 Jun 2008 16:20:06 -0000 1.271 +++ release-notes.txt 5 Jun 2008 16:50:25 -0000 1.272 @@ -68,6 +68,8 @@ Adjusted version number (and fixed typo). + Removed unused fbview.conf.template file. + - kolab-filter-2.2.0-2008???? Adjusted version number. From cvs at kolab.org Thu Jun 5 18:50:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 18:50:27 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog, 1.167, 1.168 Makefile.am, 1.41, 1.42 Message-ID: <20080605165027.C5321600BAD@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv4358/kolabd/kolabd Modified Files: ChangeLog Makefile.am Log Message: Removed unused fbview.conf.template file. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- ChangeLog 29 May 2008 14:47:41 -0000 1.167 +++ ChangeLog 5 Jun 2008 16:50:25 -0000 1.168 @@ -1,3 +1,8 @@ +2008-06-05 Thomas Arendsen Hein + + * templates/fbview.conf.template.in: Removed unused file. + * Makefile.am: Removed entry for fbview.conf.template. + 2008-05-29 Thomas Arendsen Hein * kolabpasswd.in: fixed typo: passwod -> password Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- Makefile.am 30 Apr 2008 12:48:47 -0000 1.41 +++ Makefile.am 5 Jun 2008 16:50:25 -0000 1.42 @@ -43,7 +43,6 @@ templates/clamd.conf.template \ templates/cyrus.conf.template \ templates/DB_CONFIG.slapd.template \ - templates/fbview.conf.template \ templates/freebusy.conf.template \ templates/freshclam.conf.template \ templates/header_checks.template \ From cvs at kolab.org Thu Jun 5 19:33:53 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 19:33:53 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.102,1.103 Message-ID: <20080605173353.5B99C600BAD@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv6195/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: Fix deleting of domains and kolab hosts. The problem was introduced right before 2.2-rc3 by "Fixes for XHTML strict". Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- ChangeLog 2 Jun 2008 15:43:34 -0000 1.102 +++ ChangeLog 5 Jun 2008 17:33:51 -0000 1.103 @@ -1,3 +1,8 @@ +2008-06-05 Thomas Arendsen Hein + + * php/admin/templates/settings.tpl: Fix deleting of domains and kolab + hosts. + 2008-06-02 Thomas Arendsen Hein * php/admin/include/form.class.php: Fix regular expression which From cvs at kolab.org Thu Jun 5 19:33:53 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 19:33:53 +0200 (CEST) Subject: thomas: server release-notes.txt,1.272,1.273 Message-ID: <20080605173353.56E39600172@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6195 Modified Files: release-notes.txt Log Message: Fix deleting of domains and kolab hosts. The problem was introduced right before 2.2-rc3 by "Fixes for XHTML strict". Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.272 retrieving revision 1.273 diff -u -d -r1.272 -r1.273 --- release-notes.txt 5 Jun 2008 16:50:25 -0000 1.272 +++ release-notes.txt 5 Jun 2008 17:33:51 -0000 1.273 @@ -82,6 +82,8 @@ Adjusted version number. + Fix deleting of domains and kolab hosts. + kolab/issue2739 (Some characters are not allowed in users fax-/phonenumbers despite the description in the error) From cvs at kolab.org Thu Jun 5 19:33:53 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 5 Jun 2008 19:33:53 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates settings.tpl, 1.2, 1.3 Message-ID: <20080605173353.623A0600BB1@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv6195/kolab-webadmin/kolab-webadmin/php/admin/templates Modified Files: settings.tpl Log Message: Fix deleting of domains and kolab hosts. The problem was introduced right before 2.2-rc3 by "Fixes for XHTML strict". Index: settings.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- settings.tpl 20 May 2008 17:32:32 -0000 1.2 +++ settings.tpl 5 Jun 2008 17:33:51 -0000 1.3 @@ -114,12 +114,12 @@

    {tr msg="Domains"}

    -
    • February 18th, 2008
    AttributeValueComment
    {section name=id loop=$postfixmydestination} + + {/section} + +
    {tr msg="Domain"}{tr msg="Action"}
    {$postfixmydestination[id]|escape:"html"} {strip} @@ -127,14 +127,16 @@ {/strip}
    -

    {tr msg="Mail Filter Settings"}

    @@ -160,12 +162,12 @@

    {tr msg="Kolab Hostnames (for Master and Slaves)"}

    -
    {section name=id loop=$kolabhost} + + {/section} + +
    {tr msg="Host"}{tr msg="Action"}
    {$kolabhost[id]|escape:"html"} {strip} @@ -173,11 +175,13 @@ {/strip}
    - From cvs at kolab.org Mon Jun 9 07:27:51 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 07:27:51 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Resource.php,1.10,1.11 Message-ID: <20080609052751.43BD3600B97@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter In directory doto:/tmp/cvs-serv32616 Modified Files: Resource.php Log Message: Incorrect hack to solve the extended free/busy access. Index: Resource.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Resource.php 5 Jun 2008 12:58:13 -0000 1.10 +++ Resource.php 9 Jun 2008 05:27:48 -0000 1.11 @@ -718,30 +718,6 @@ } } - $a = $imap->getAnnotation('/vendor/kolab/pxfb-readable-for', - /*array('value.shared' => 'event.default')*/'value.shared', - $calmbox); - Horde::logMessage(sprintf(_("/vendor/kolab/pxfb-readable-for annotation for folder %s is %s"), - $calmbox, print_r($a, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); - - if (!strpos($a, $calendar_user)) { - if (empty($a)) { - $a = $calendar_user; - } else { - $a = $a . ' ' . $calendar_user; - } - $rc = $imap->setAnnotation('/vendor/kolab/pxfb-readable-for', - array('value.shared' => $a), - $calmbox); - if( PEAR::isError($rc)) { - // Non fatal error - Horde::logMessage(sprintf(_("Unable to allow XFB read access on mailbox %s: %s"), - $mymailbox, $rc->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); - } - } - Horde::logMessage(sprintf(_("Selecting %s for %s"), $calmbox, $calendar_user), __FILE__, __LINE__, PEAR_LOG_DEBUG); From cvs at kolab.org Mon Jun 9 08:00:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 08:00:49 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.16,1.17 Message-ID: <20080609060049.D08C7600B99@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv1790/php-kolab/Kolab_Freebusy Modified Files: ChangeLog Log Message: kolab/issue2734 (Automatic ressources decline changed overlapping event time) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChangeLog 2 Apr 2008 17:32:55 -0000 1.16 +++ ChangeLog 9 Jun 2008 06:00:47 -0000 1.17 @@ -1,3 +1,11 @@ +2008-06-09 Gunnar Wrobel

    + + * Freebusy/Page.php: Added user group handling. + + * Freebusy/Cache.php: Fixed owner/user group handling, fixed + return of PEAR errors, fixed handling access to extended free/busy + data for users with read access. + 2008-04-02 Thomas Arendsen Hein * Freebusy/Page.php: From cvs at kolab.org Mon Jun 9 08:00:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 08:00:49 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.273,1.274 Message-ID: <20080609060049.D1468600B9A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv1790 Modified Files: release-notes.txt Log Message: kolab/issue2734 (Automatic ressources decline changed overlapping event time) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.273 retrieving revision 1.274 diff -u -d -r1.273 -r1.274 --- release-notes.txt 5 Jun 2008 17:33:51 -0000 1.273 +++ release-notes.txt 9 Jun 2008 06:00:47 -0000 1.274 @@ -96,6 +96,8 @@ Adjusted version number. + 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 Mon Jun 9 08:00:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 08:00:49 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php, 1.9, 1.10 Page.php, 1.9, 1.10 Message-ID: <20080609060049.DBA42600B9B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy In directory doto:/tmp/cvs-serv1790/php-kolab/Kolab_Freebusy/Freebusy Modified Files: Cache.php Page.php Log Message: kolab/issue2734 (Automatic ressources decline changed overlapping event time) Index: Cache.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Cache.php 3 Mar 2008 14:48:25 -0000 1.9 +++ Cache.php 9 Jun 2008 06:00:47 -0000 1.10 @@ -97,11 +97,11 @@ $relevance = $fb->getRelevance(); if (is_a($relevance, 'PEAR_Error')) { - $relevance; + return $relevance; } $acl = $fb->getACL(); if (is_a($acl, 'PEAR_Error')) { - $acl; + return $acl; } $result = $c_acl->storeACL($acl, $relevance); @@ -111,11 +111,10 @@ $xacl = $fb->getExtendedACL(); if (is_a($xacl, 'PEAR_Error')) { - $xacl; + return $xacl; } - /* The owner may always look at the extended attributes */ - $xacl .= ' ' . $access->owner; - $result = $c_xacl->storeXACL($xacl); + + $result = $c_xacl->storeXACL($xacl, $acl); if (is_a($result, 'PEAR_Error')) { return $result; } @@ -267,7 +266,10 @@ { $xaclcache = &FreeBusyCacheDB_xacl::singleton('xacl', $this->_cache_dir); - foreach ($access->groups as $id) { + Horde::logMessage(sprintf(_("GROUPS: %s."), + serialize($access->user_groups)), + __FILE__, __LINE__, PEAR_LOG_DEBUG); + foreach ($access->user_groups as $id) { if ($xaclcache->has($file, $id)) { return true; } @@ -855,11 +857,20 @@ return parent::purge(); } - function storeXACL(&$xacl) + function storeXACL(&$xacl, &$acl) { $oldxacl = $this->load(); if (is_a($oldxacl, 'PEAR_Error')) { $oldxacl = ''; + } + + /* Users with read access to the folder may also access the extended information */ + foreach ($acl as $user => $ac) { + if (strpos($ac, 'r') !== false) { + if (!empty($user)) { + $xacl .= ' ' . $user; + } + } } $result = $this->_xacls->store($this->_filename, $xacl, $oldxacl); Index: Page.php =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Page.php 2 Apr 2008 17:32:55 -0000 1.9 +++ Page.php 9 Jun 2008 06:00:47 -0000 1.10 @@ -226,14 +226,20 @@ var $homeserver; /** - * The groups of the user calling the script (this includes the - * primary user id) + * The groups of the owner * - * @var string + * @var array */ var $groups; /** + * The groups of the user + * + * @var array + */ + var $user_groups; + + /** * The number of days to calculate free/busy into the past * * @var int @@ -413,8 +419,19 @@ } /* Possibly rewrite the calling UID into the primary mail address */ - if ($userinfo && isset($userinfo['MAIL']) && !empty($userinfo['MAIL'])) { - $this->user = $userinfo['MAIL']; + if ($userinfo) { + if (isset($userinfo['MAIL']) && !empty($userinfo['MAIL'])) { + $this->user = $userinfo['MAIL']; + } + if (!empty($userinfo['GROUPS'])) { + $this->user_groups = $userinfo['GROUPS']; + } + } + + if (empty($this->user_groups)) { + $this->user_groups = array($this->user); + } else { + $this->user_groups[] = $this->user; } /* Fetch the user info of the requested folder owner */ @@ -467,9 +484,9 @@ } } if (empty($this->groups)) { - $this->groups = array($this->user); + $this->groups = array($this->owner); } else { - $this->groups[] = $this->user; + $this->groups[] = $this->owner; } $this->imap_folder = $this->_getImapFolder(); } From cvs at kolab.org Mon Jun 9 10:40:38 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 10:40:38 +0200 (CEST) Subject: gunnar: server/patches/php/php-5.2.6 KOLAB_php-5.2.6_Annotations.patch, 1.1, 1.2 KOLAB_php-5.2.6_myrights.patch, 1.1, 1.2 Message-ID: <20080609084038.78820600B97@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/patches/php/php-5.2.6 In directory doto:/tmp/cvs-serv8976 Modified Files: KOLAB_php-5.2.6_Annotations.patch KOLAB_php-5.2.6_myrights.patch Log Message: Patch updates for PHP from Thomas Jarosch. Index: KOLAB_php-5.2.6_Annotations.patch =================================================================== RCS file: /kolabrepository/server/patches/php/php-5.2.6/KOLAB_php-5.2.6_Annotations.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- KOLAB_php-5.2.6_Annotations.patch 2 May 2008 09:24:24 -0000 1.1 +++ KOLAB_php-5.2.6_Annotations.patch 9 Jun 2008 08:40:36 -0000 1.2 @@ -2,8 +2,8 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.c --- a/ext/imap/php_imap.c Fri May 02 11:21:11 2008 +0200 -+++ b/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 -@@ -129,6 +129,7 @@ zend_function_entry imap_functions[] = { ++++ b/ext/imap/php_imap.c Mon Jun 09 10:35:56 2008 +0200 +@@ -129,6 +129,7 @@ PHP_FE(imap_binary, NULL) PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) @@ -11,7 +11,7 @@ PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) PHP_FE(imap_clearflag_full, NULL) -@@ -155,6 +156,10 @@ zend_function_entry imap_functions[] = { +@@ -155,6 +156,10 @@ PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) #endif @@ -22,11 +22,10 @@ PHP_FE(imap_mail, NULL) -@@ -415,6 +420,30 @@ void mail_getacl(MAILSTREAM *stream, cha - +@@ -416,6 +421,30 @@ #endif -+ + +#if defined(HAVE_IMAP2005) +/* {{{ mail_getannotation + * @@ -50,10 +49,19 @@ +} +/* }}} */ +#endif - ++ /* {{{ PHP_GINIT_FUNCTION */ -@@ -1097,6 +1126,122 @@ PHP_FUNCTION(imap_getacl) + static PHP_GINIT_FUNCTION(imap) +@@ -441,6 +470,7 @@ + #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) + imap_globals->quota_return = NIL; + imap_globals->imap_acl_list = NIL; ++ imap_globals->imap_annotation_list = NIL; + #endif + imap_globals->gets_stream = NIL; + } +@@ -1097,6 +1127,117 @@ #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ @@ -142,18 +150,13 @@ + cur->next = NIL; + + STRINGLIST *attributes = mail_newstringlist(); ++ if (!attributes) ++ RETURN_FALSE; + cur = attributes; + cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr)); + cur->text.size = Z_STRLEN_PP(attr); + cur->next = NIL; + -+ /* initializing the special array for the return values */ -+ if (array_init(return_value) == FAILURE) { -+ mail_free_stringlist(&entries); -+ mail_free_stringlist(&attributes); -+ RETURN_FALSE; -+ } -+ + IMAPG(imap_annotation_list) = return_value; + + /* set the callback for the GET_ANNOTATION function */ @@ -176,7 +179,7 @@ /* {{{ proto bool imap_expunge(resource stream_id) Permanently delete all messages marked for deletion */ -@@ -2707,6 +2852,42 @@ PHP_FUNCTION(imap_msgno) +@@ -2707,6 +2848,42 @@ } /* }}} */ @@ -221,8 +224,8 @@ PHP_FUNCTION(imap_status) diff -r 4f78d3c907b7 ext/imap/php_imap.h --- a/ext/imap/php_imap.h Fri May 02 11:21:11 2008 +0200 -+++ b/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 -@@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full); ++++ b/ext/imap/php_imap.h Mon Jun 09 10:35:56 2008 +0200 +@@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_create); PHP_FUNCTION(imap_rename); @@ -230,7 +233,7 @@ PHP_FUNCTION(imap_status); PHP_FUNCTION(imap_bodystruct); PHP_FUNCTION(imap_fetch_overview); -@@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread); +@@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_timeout); @@ -240,7 +243,7 @@ #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FUNCTION(imap_get_quota); PHP_FUNCTION(imap_get_quotaroot); -@@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl); +@@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); #endif @@ -252,7 +255,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) char *imap_user; -@@ -206,6 +213,9 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) +@@ -206,6 +213,9 @@ zval **quota_return; zval *imap_acl_list; #endif Index: KOLAB_php-5.2.6_myrights.patch =================================================================== RCS file: /kolabrepository/server/patches/php/php-5.2.6/KOLAB_php-5.2.6_myrights.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- KOLAB_php-5.2.6_myrights.patch 13 May 2008 13:44:51 -0000 1.1 +++ KOLAB_php-5.2.6_myrights.patch 9 Jun 2008 08:40:36 -0000 1.2 @@ -1,7 +1,7 @@ -diff -r 63c608b3e283 ext/imap/php_imap.c ---- a/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200 -+++ b/ext/imap/php_imap.c Tue May 13 15:36:56 2008 +0200 -@@ -155,6 +155,7 @@ zend_function_entry imap_functions[] = { +diff -r daa11c358bd5 ext/imap/php_imap.c +--- a/ext/imap/php_imap.c Mon Jun 09 10:36:42 2008 +0200 ++++ b/ext/imap/php_imap.c Mon Jun 09 10:37:25 2008 +0200 +@@ -155,6 +155,7 @@ PHP_FE(imap_set_quota, NULL) PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) @@ -9,7 +9,7 @@ #endif #if defined(HAVE_IMAP2005) PHP_FE(imap_setannotation, NULL) -@@ -415,6 +416,20 @@ void mail_getacl(MAILSTREAM *stream, cha +@@ -415,6 +416,20 @@ for(; alist; alist = alist->next) { add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1); } @@ -30,12 +30,12 @@ } /* }}} */ -@@ -1124,6 +1139,38 @@ PHP_FUNCTION(imap_getacl) +@@ -1125,6 +1140,35 @@ } /* }}} */ -+/* {{{ proto array imap_getacl(resource stream_id, string mailbox) -+ Gets the ACL for a given mailbox */ ++/* {{{ proto string imap_myrights(resource stream_id, string mailbox) ++ Gets my rights (ACL) for a given mailbox */ +PHP_FUNCTION(imap_myrights) +{ + zval **streamind, **mailbox; @@ -49,9 +49,6 @@ + + convert_to_string_ex(mailbox); + -+ /* initializing the special array for the return values */ -+ array_init(return_value); -+ + IMAPG(imap_acl_list) = return_value; + + /* set the callback for the GET_ACL function */ @@ -69,10 +66,10 @@ #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ #if defined(HAVE_IMAP2005) -diff -r 63c608b3e283 ext/imap/php_imap.h ---- a/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200 -+++ b/ext/imap/php_imap.h Tue May 13 15:36:56 2008 +0200 -@@ -178,6 +178,7 @@ PHP_FUNCTION(imap_set_quota); +diff -r daa11c358bd5 ext/imap/php_imap.h +--- a/ext/imap/php_imap.h Mon Jun 09 10:36:42 2008 +0200 ++++ b/ext/imap/php_imap.h Mon Jun 09 10:37:25 2008 +0200 +@@ -178,6 +178,7 @@ PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); From cvs at kolab.org Mon Jun 9 12:38:59 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 12:38:59 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/dist_conf gentoo,1.16,NONE Message-ID: <20080609103859.5F378600B98@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv14624 Removed Files: gentoo Log Message: Kolab2/Gentoo migrated to puppet and kolabd became obsolete. --- gentoo DELETED --- From cvs at kolab.org Mon Jun 9 22:38:56 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 9 Jun 2008 22:38:56 +0200 (CEST) Subject: thomas: server README.1st,1.82,1.83 Message-ID: <20080609203856.237BC600B95@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv7710 Modified Files: README.1st Log Message: Changed reference for locale problem to new issue kolab/issue2732 Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- README.1st 26 May 2008 14:49:25 -0000 1.82 +++ README.1st 9 Jun 2008 20:38:53 -0000 1.83 @@ -338,7 +338,8 @@ have to use the non-UTF-8 and non-euro locales, i.e. de_DE, fr_FR, it_IT, nl_NL instead of e.g. de_DE at euro. For fbview some languages need a UTF-8 locale, e.g. ja_JP.UTF-8 for Japanese. - See kolab/issue881 and kolab/issue1585 for details. + See kolab/issue2732 (Horde and Web Admin Interface Language Selection + depends on OS locale support) for details. - If login on https://yourserver.example.com/fbview and triggering free/busy regeneration does not work, try as user kolab: From cvs at kolab.org Tue Jun 10 09:33:14 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 10 Jun 2008 09:33:14 +0200 (CEST) Subject: emanuel: doc/www/src index.html.m4,1.142,1.143 Message-ID: <20080610073314.044F5600B93@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv15359 Modified Files: index.html.m4 Log Message: 2 new news added. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.142 retrieving revision 1.143 diff -u -d -r1.142 -r1.143 --- index.html.m4 23 May 2008 13:02:04 -0000 1.142 +++ index.html.m4 10 Jun 2008 07:33:11 -0000 1.143 @@ -46,6 +46,48 @@

    + + + +
    June 9th, 2008» + Kontact for Windows and Mac OS X (developer version) presented +
    +
    + The german Federal Office for Information Security (BSI) has presented +a prototype of KDE Kolab Client Kontact on Windows and Mac OS X at the +LinuxTag 2008 (may 28th to 31th) in Berlin. +These new Kolab clients based on KDE and Qt. They are still in development. +A stable release is planed for the end of 2008. + +

    +More information: +

    +

    + + + + +
    June 8th, 2008» + Thunderbird Plugin SyncKolab 1.0.0 available +
    +

    + SyncKolab was written to add Kolab functionality to Thunderbird. It +reads a selected Imap folder and synchronizes it with the local +address book and calendar. It has been tested under Thunderbird for Windows (XP and Vista), MacOSX and Linux. +Version 1.0 had 61 prereleases and 83 nightly releases with over 100 bugs fixed and is known to work nicely with Thunderbird 2 and Lightning 0.8. +
    +

    + @@ -64,6 +106,14 @@

    + + + + +

    +

    + +
    May 23rd, 2008
    April 17th, 2008 » @@ -108,14 +158,6 @@ announcement for details.

    - - - - -

    -

    - - From cvs at kolab.org Tue Jun 10 10:50:56 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 10 Jun 2008 10:50:56 +0200 (CEST) Subject: emanuel: doc/www/src/images frame.png, NONE, 1.1 logo-horde.png, NONE, 1.1 logo-kontact-oxygen.png, NONE, 1.1 logo-kontact.png, NONE, 1.1 shot-fbview.png, NONE, 1.1 shot-fbview_small.png, NONE, 1.1 shot-horde-calendar.png, NONE, 1.1 shot-horde-calendar_small.png, NONE, 1.1 shot-horde-webmail.png, NONE, 1.1 shot-horde-webmail_small.png, NONE, 1.1 shot-kontact-enterprise35-calendar-edit-event.png, NONE, 1.1 shot-kontact-enterprise35-calendar-edit-event_small.png, NONE, 1.1 shot-kontact-enterprise35-calendar-side-by-side.png, NONE, 1.1 shot-kontact-enterprise35-calendar-side-by-side_small.png, NONE, 1.1 shot-kontact-enterprise35-calendar.png, NONE, 1.1 shot-kontact-enterprise35-calendar_small.png, NONE, 1.1 shot-kontact-enterprise35-contacts-editing.png, NONE, 1.1 shot-kontact-enterprise35-contacts-editing_small.png, NONE, 1.1 shot-kontact-enterprise35-contacts.png, NONE, 1.1 shot-kontact-enterprise35-contacts_small.png, NONE, 1.1 shot-kontact-enterprise35-freebusy.png, NONE, 1.1 shot-kontact-enterprise35-freeb usy_small.png, NONE, 1.1 shot-kontact-enterprise35-mail-composing.png, NONE, 1.1 shot-kontact-enterprise35-mail-composing_small.png, NONE, 1.1 shot-kontact-enterprise35-mail.png, NONE, 1.1 shot-kontact-enterprise35-mail_small.png, NONE, 1.1 shot-kontact-enterprise35-tasks.png, NONE, 1.1 shot-kontact-enterprise35-tasks_small.png, NONE, 1.1 shot-kontact-macosx-mail-composing.png, NONE, 1.1 shot-kontact-macosx-mail-composing_small.png, NONE, 1.1 shot-kontact-macosx-mail.png, NONE, 1.1 shot-kontact-macosx-mail_small.png, NONE, 1.1 shot-kontact-windows-mail-composing.png, NONE, 1.1 shot-kontact-windows-mail-composing_small.png, NONE, 1.1 shot-kontact-windows-mail.png, NONE, 1.1 shot-kontact-windows-mail_small.png, NONE, 1.1 shot-webadmin-manage-domain-maintainers.png, NONE, 1.1 shot-webadmin-manage-domain-maintainers_small.png, NONE, 1.1 shot-webadmin-manage-email-users.png, NONE, 1.1 shot-webadmin-manage-email-users_small.png, NONE, 1.1 calendar_edit1.png, 1.1, NONE calendar_edit1_small.png, 1.1, NONE calendar_freebusy1 .png, 1.1, NONE calendar_freebusy1_small.png, 1.1, NONE calendar_overview1.png, 1.1, NONE calendar_overview1_small.png, 1.1, NONE contacts_edit1.png, 1.1, NONE contacts_edit1_small.png, 1.1, NONE contacts_overview1.png, 1.1, NONE contacts_overview1_small.png, 1.1, NONE mail_overview1.png, 1.1, NONE mail_overview1_small.png, 1.1, NONE mail_reply1.png, 1.1, NONE mail_reply1_small.png, 1.1, NONE shot-kde-client-calendar1.png, 1.1, NONE shot-kde-client-calendar1.small.png, 1.1, NONE shot-kde-client-edit-contact1.png, 1.1, NONE shot-kde-client-edit-contact1.small.png, 1.1, NONE shot-kde-client-edit-event1.png, 1.1, NONE shot-kde-client-edit-event1.small.png, 1.1, NONE shot-kde-client-edit-task1.png, 1.1, NONE shot-kde-client-edit-task1.small.png, 1.1, NONE shot-kde-client-notes1.png, 1.1, NONE shot-kde-client-notes1.small.png, 1.1, NONE shot-kde-client2-calendar1.png, 1.1, NONE shot-kde-client2-calendar1.small.png, 1.1, NONE shot-web-admin-2.1.0-domain-maintainers-de-small.png, 1.1, NONE shot-web-admin-2.1.0-domain-maintainers-d e.png, 1.1, NONE shot-web-admin-users1.png, 1.1, NONE shot-web-admin-users1.small.png, 1.1, NONE shot-web-client-2.2-calendar-week-de-small.png, 1.1, NONE shot-web-client-2.2-calendar-week-de.png, 1.1, NONE shot-web-services1.png, 1.1, NONE shot-web-services1.small.png, 1.1, NONE shot-web-user-settings1.png, 1.1, NONE shot-web-user-settings1.small.png, 1.1, NONE summery1.png, 1.1, NONE summery1_small.png, 1.1, NONE tasks_overview1.png, 1.1, NONE tasks_overview1_small.png, 1.1, NONE Message-ID: <20080610085056.D655B60016F@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv20745/images Added Files: frame.png logo-horde.png logo-kontact-oxygen.png logo-kontact.png shot-fbview.png shot-fbview_small.png 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-macosx-mail-composing.png shot-kontact-macosx-mail-composing_small.png shot-kontact-macosx-mail.png shot-kontact-macosx-mail_small.png shot-kontact-windows-mail-composing.png shot-kontact-windows-mail-composing_small.png shot-kontact-windows-mail.png shot-kontact-windows-mail_small.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 Removed Files: calendar_edit1.png calendar_edit1_small.png calendar_freebusy1.png calendar_freebusy1_small.png calendar_overview1.png calendar_overview1_small.png contacts_edit1.png contacts_edit1_small.png contacts_overview1.png contacts_overview1_small.png mail_overview1.png mail_overview1_small.png mail_reply1.png mail_reply1_small.png shot-kde-client-calendar1.png shot-kde-client-calendar1.small.png shot-kde-client-edit-contact1.png shot-kde-client-edit-contact1.small.png shot-kde-client-edit-event1.png shot-kde-client-edit-event1.small.png shot-kde-client-edit-task1.png shot-kde-client-edit-task1.small.png shot-kde-client-notes1.png shot-kde-client-notes1.small.png shot-kde-client2-calendar1.png shot-kde-client2-calendar1.small.png shot-web-admin-2.1.0-domain-maintainers-de-small.png shot-web-admin-2.1.0-domain-maintainers-de.png shot-web-admin-users1.png shot-web-admin-users1.small.png shot-web-client-2.2-calendar-week-de-small.png shot-web-client-2.2-calendar-week-de.png shot-web-services1.png shot-web-services1.small.png shot-web-user-settings1.png shot-web-user-settings1.small.png summery1.png summery1_small.png tasks_overview1.png tasks_overview1_small.png Log Message: Reorganize screenshot page. Removed old + added new screenshots and logos. --- NEW FILE: frame.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-horde.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-kontact-oxygen.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-kontact.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-fbview.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-fbview_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-horde-calendar.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-horde-calendar_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-horde-webmail.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-horde-webmail_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-calendar-edit-event.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-calendar-edit-event_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-calendar-side-by-side.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-calendar-side-by-side_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-calendar.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-calendar_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-contacts-editing.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-contacts-editing_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-contacts.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-contacts_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-freebusy.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-freebusy_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-mail-composing.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-mail-composing_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-mail.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-mail_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-tasks.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-enterprise35-tasks_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-macosx-mail-composing.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-macosx-mail-composing_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-macosx-mail.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-macosx-mail_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-windows-mail-composing.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-windows-mail-composing_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-windows-mail.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kontact-windows-mail_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-webadmin-manage-domain-maintainers.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-webadmin-manage-domain-maintainers_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-webadmin-manage-email-users.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-webadmin-manage-email-users_small.png --- (This appears to be a binary file; contents omitted.) --- calendar_edit1.png DELETED --- --- calendar_edit1_small.png DELETED --- --- calendar_freebusy1.png DELETED --- --- calendar_freebusy1_small.png DELETED --- --- calendar_overview1.png DELETED --- --- calendar_overview1_small.png DELETED --- --- contacts_edit1.png DELETED --- --- contacts_edit1_small.png DELETED --- --- contacts_overview1.png DELETED --- --- contacts_overview1_small.png DELETED --- --- mail_overview1.png DELETED --- --- mail_overview1_small.png DELETED --- --- mail_reply1.png DELETED --- --- mail_reply1_small.png DELETED --- --- shot-kde-client-calendar1.png DELETED --- --- shot-kde-client-calendar1.small.png DELETED --- --- shot-kde-client-edit-contact1.png DELETED --- --- shot-kde-client-edit-contact1.small.png DELETED --- --- shot-kde-client-edit-event1.png DELETED --- --- shot-kde-client-edit-event1.small.png DELETED --- --- shot-kde-client-edit-task1.png DELETED --- --- shot-kde-client-edit-task1.small.png DELETED --- --- shot-kde-client-notes1.png DELETED --- --- shot-kde-client-notes1.small.png DELETED --- --- shot-kde-client2-calendar1.png DELETED --- --- shot-kde-client2-calendar1.small.png DELETED --- --- shot-web-admin-2.1.0-domain-maintainers-de-small.png DELETED --- --- shot-web-admin-2.1.0-domain-maintainers-de.png DELETED --- --- shot-web-admin-users1.png DELETED --- --- shot-web-admin-users1.small.png DELETED --- --- shot-web-client-2.2-calendar-week-de-small.png DELETED --- --- shot-web-client-2.2-calendar-week-de.png DELETED --- --- shot-web-services1.png DELETED --- --- shot-web-services1.small.png DELETED --- --- shot-web-user-settings1.png DELETED --- --- shot-web-user-settings1.small.png DELETED --- --- summery1.png DELETED --- --- summery1_small.png DELETED --- --- tasks_overview1.png DELETED --- --- tasks_overview1_small.png DELETED --- From cvs at kolab.org Tue Jun 10 10:50:56 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 10 Jun 2008 10:50:56 +0200 (CEST) Subject: emanuel: doc/www/src default.css, 1.9, 1.10 index.html.m4, 1.143, 1.144 screenshots.html.m4, 1.9, 1.10 Message-ID: <20080610085056.96E5D60016F@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv20745 Modified Files: default.css index.html.m4 screenshots.html.m4 Log Message: Reorganize screenshot page. Removed old + added new screenshots and logos. Index: default.css =================================================================== RCS file: /kolabrepository/doc/www/src/default.css,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- default.css 17 May 2007 11:51:46 -0000 1.9 +++ default.css 10 Jun 2008 08:50:54 -0000 1.10 @@ -280,3 +280,38 @@ .news .newsb { margin-bottom: 2em; } + +/* Logo and text column */ +.logo-left { + float:left; + clear:left; + width: 115px; + text-align: right; + margin-top: 5px; +} +.logo-text-right { + margin-left: 130px; + margin-bottom: 25px; +} + +/* Screenshots (container, image, text) */ +.screenshot { + clear: left; +} +.screenshot-image { + float:left; + text-align: right; + margin-bottom: 10px; + background: transparent url(images/frame.png) no-repeat scroll 0%; + width: 160px; + height: 120px; + padding: 10px; +} +.screenshot-image img { + width: 160px; +} +.screenshot-text { + margin-left: 195px; + padding-top: 10px; +} + Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.143 retrieving revision 1.144 diff -u -d -r1.143 -r1.144 --- index.html.m4 10 Jun 2008 07:33:11 -0000 1.143 +++ index.html.m4 10 Jun 2008 08:50:54 -0000 1.144 @@ -62,6 +62,7 @@

    More information:

      +
    • Screenshots of Kontact/Win and Kontact/Mac
    • BSI press release (2008-05-21)
    • German News of Index: screenshots.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/screenshots.html.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- screenshots.html.m4 14 Sep 2007 04:54:27 -0000 1.9 +++ screenshots.html.m4 10 Jun 2008 08:50:54 -0000 1.10 @@ -1,189 +1,339 @@ -m4_define(`PAGE_TITLE',`Screenshot Gallery') +m4_define(`PAGE_TITLE',`Screenshots') m4_include(header.html.m4)
      This page was updated on:
      $Date$

      Screenshots

      +
    March 17th, 2008
    + + - - - +

    Kolab 2 Clients

    - - - - + +
    + + Kontact + +
    +
    +

    KDE Kontact for GNU/Linux (enterprise35 | beta)

    -
    - - - + +
    + + + +
    +
    + Mail: Overview
    + Hierarchly ordered mail folders customized by different folder icons. +
    - - - - -
    - -

    KDE Kolab2 Client 2.1.1 proko2

    - - - - - +
    - - -
    -
    Kontact overview (660x568 55 kByte)     -
    Kontact provides a nice overview showing all upcoming events, mails, - todos or birthdays. Additional Knotes just poped up a small note.     		- -
    -
    Mail overview (839x707 67,6 kByte)     -
    Hierarchly ordered mailsfolders customized by different folder - icons +    		 +
    -
    - - -
    -
    Kontact composing (839x707 82 kByte)     -
    Mail composing in its full beauty :) -    		 - -
    -
    Calendar overview (874x772 69,1 kByte)     -
    Kontacts calendar component showin the upcoming events for a - week. Events can be categorized with colors. -
    - - -
    -
    Edit calendar event (615x495 24,4 kByte)     -
    Create a new event. -    		 - -
    -
    Free-Busy list (735x495 24,1 kByte)     -
    You can see if attendees of the event are busy or free on this time. -
    - - -
    -
    Contacts overview (755x508 55,4 kByte)     -
    You can use mutilple contact folders and share them among other users -    		 - -
    -
    Create contact (758x598 42,3 kByte)     -
    Create a new contact and store a lot of additional information. -
    - - -
    -
    Tasks overview(668x406 39,7 kByte)     -
    Tasks can be hierachly orded by assigning subtasks. -
    + +
    +
    + + + +
    +
    + Mail: Composing
    + Mail composing in its full beauty :) +
    +
    + +
    +
    + + + +
    +
    + Calendar: Overview
    + Kontacts calendar component showin the upcoming events for a week. + Events can be categorized with colors. +
    +
    + + +
    +
    + + + +
    +
    + Calendar: View "side-by-side"
    +
    +
    -

    Kolab Server 2.1.0 Web-Admin-Interface

    + +
    +
    + + + +
    +
    + Calendar: Edit event
    + Create a new event. +
    +
    - - - - -
    -

    Email-Domain-Maintainers German Localisation (1072x615 100 kByte)     -    		 -
    + +
    +
    + + + +
    +
    + Calendar: Free busy list
    + You can see if attendees of the event are busy or free on this time. +
    +
    + +
    +
    + + + +
    +
    + Contacts: Overview
    + You can use mutilple contact folders and share them among other users. +
    +
    -

    Kolab Webclient (beta)

    + +
    +
    + + + +
    +
    + Contacts: Edit contact
    + Create a new contact and store a lot of additional information. +
    +
    - - - - -
    -

    Webclient based on Horde in Beta (200709) (80 kByte)     -    		 -
    + +
    +
    + + + +
    +
    + Tasks: Overview
    + Hierarchly ordered list of To-Dos with information about recurs, priority + and completion. There is a task due today (yellow) and a task overdue (red). +
    +
    +
    -

    KDE Kolab1 Client (old)

    +
    - - - - - - - - - -
    -

    Calender View (790x625 50 kByte)     -    		 -

    Contact edit dialog (711x498 44 kByte)     -
    -

    Invite to an event (854x700 44 kByte)     -    		 -

    Edit a task (845x770 67 kByte)     -
    -

    Kmail viewing Notes(858x618 66 kByte)     -
    -

    Kolab1 Server Web-Admin-Interface (old)

    - - - - + +
    + + Kontact + +
    +
    +

    KDE Kontact for Windows (enterprise4 | alpha, 2008-06-03)

    -
    - -
    -

    Maintaining users(686x628 72 kByte)     -    		 -

    Administrate running services(779x698 61 kByte)     -
    -

    My User Settings(658x705 62 kByte)     -
    + +
    + + + +
    +
    + Mail: Overview
    + +
    + + +
    +
    + + + +
    +
    + Mail: Composing
    + +
    +
    + +
    + + + + + +
    + + Kontact + +
    +
    +

    KDE Kontact for Mac OS X (enterprise4 | alpha, 2008-05-25)

    + + +
    + + + +
    +
    + Mail: Overview
    +
    + + +
    +
    + + + +
    +
    + Mail: Composing
    + +
    +
    + +
    + +
    + + + +
    + + Horde + +
    +
    +

    Webclient: Horde

    + + +
    + + + +
    +
    + Horde Webmail
    + +
    + + +
    +
    + + + +
    +
    + Horde Calendar
    + +
    +
    +
    + + + + + + +

    Kolab Server 2.2

    + + + +
    +
    +

    Web-Admin-Interface (Kolab Server 2.2)

    + + +
    + + + +
    +
    + Manage Email Users
    + Overview of Kolab email users. Role: admin. +
    + + +
    +
    + + + +
    +
    + Manage Domain Maintainers
    + Create a new domain maintainer. Role: admin. +
    +
    + +
    +
    + + +
    +
    +

    Free-Busy-View-Interface (Kolab Server 2.2)

    + + +
    + + + +
    +
    + Free Busy Viewer
    + Free (green) and busy (red) times of two attendees in the fb web +interface of Kolab Server. +
    +
    + + +


    +Old Screenshots of Kolab 1: +Kroupware +Screenshot Gallery >>> m4_include(footer.html.m4) From cvs at kolab.org Wed Jun 11 16:47:18 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 16:47:18 +0200 (CEST) Subject: emanuel: doc/www/src/images logo-bynari.png, NONE, 1.1 logo-konsec.png, NONE, 1.1 logo-thunderbird.png, NONE, 1.1 logo-toltec.png, NONE, 1.1 klogo.png, 1.1, NONE kontact-logo.png, 1.1, NONE toltec-logo.png, 1.1, NONE Message-ID: <20080611144718.D825F600B9C@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv5916/images Added Files: logo-bynari.png logo-konsec.png logo-thunderbird.png logo-toltec.png Removed Files: klogo.png kontact-logo.png toltec-logo.png Log Message: Reorganize about-kolab-clients page. Removed old + added new icons/logos. --- NEW FILE: logo-bynari.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-konsec.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-thunderbird.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-toltec.png --- (This appears to be a binary file; contents omitted.) --- klogo.png DELETED --- --- kontact-logo.png DELETED --- --- toltec-logo.png DELETED --- From cvs at kolab.org Wed Jun 11 16:47:18 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 16:47:18 +0200 (CEST) Subject: emanuel: doc/www/src about-kolab-clients.html.m4,1.24,1.25 Message-ID: <20080611144718.D688B600B97@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv5916 Modified Files: about-kolab-clients.html.m4 Log Message: Reorganize about-kolab-clients page. Removed old + added new icons/logos. Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- about-kolab-clients.html.m4 7 Apr 2006 17:38:51 -0000 1.24 +++ about-kolab-clients.html.m4 11 Jun 2008 14:47:16 -0000 1.25 @@ -21,18 +21,20 @@ -

    Clients for Kolab-2

    - - - -

    KDE Client (Kontact)

    +

    Clients for Kolab 2

     -Kontact - + +
    + + Kontact + +
    +
    +

    KDE Client: Kontact

     License: Free Software - GNU GPL
    -Status: stable 2.1.x +Status: stable 2.1.x
    +Homepage: http://www.kontact.org

    The Kolab Project has developed a KDE Client which @@ -40,41 +42,37 @@ done within the KDE subversion repository and contributed directly to the KDE project. Our improvements find their way into the main developments at the pace of the KDE project. -

    -Starting with KDE 3.4, Kontact -covers all the functionality that Kolab Server 2.0 offers except -personal distribution lists. +Starting with KDE 3.4, Kontact covers all the functionality that Kolab +Server 2.0 offers except personal distribution lists. The full functionality will be in KDE 3.5 or later. -

    For production usage, we recommend the "Proko2" branch of KDEPIM. Proko2 packages have seen most testing of the Kolab functions and can be build for KDE 3.2, 3.3 and 3.4 . Check out the KDE Client Download section. +

    - - -

    Microsoft Outlook: Toltec Connector 2

    -     - -Toltec - + +
    + + Toltec + +
    +
    +

    Microsoft Outlook Plugin: Toltec Connector 2

     License: proprietary, with gratis 30 day evaluation
    -Status: stable 2.0.x for Kolab 2
    -
    -Homepage: www.toltec.co.za - +Status: stable 2.3.x for Kolab 2
    +Homepage: http://www.toltec.co.za

    -The Toltec Connector 2 -is the reference Outlook connector used during development of the Kolab project -so interoperability with the KDE Kolab client -was tested intensively. +The Toltec Connector 2 is the reference Outlook connector used during +development of the Kolab project so interoperability with the KDE +Kolab client was tested intensively. Its vendor Radley Network Technologies has a stable Outlook connector (Toltec 1 for Kolab 1) on the market since October 2003. +

    User and groups can share folders including those that contain emails, calendar items, tasks and contacts with the Toltec Connector. @@ -85,131 +83,161 @@

    The Kolab2 XML Storage Format has been designed and developed in cooperation with the Toltec developers. +

    - -

    MAPI Storage Provider for Microsoft Outlook: KONSEC Konnektor

    -     -KONSEC - -License: proprietary with a gratis 30 day evaluation
    -Status: stable release 1.1 for Kolab 2
    -Homepage: www.konsec.com + +
    + KONSEC +
    +
    +

    MAPI Storage Provider for Microsoft Outlook: KONSEC Konnektor

     +License: proprietary, with a gratis 30 day evaluation
    +Status: stable release 1.1.x for Kolab 2
    +Homepage: http://www.konsec.com

    -The KONSEC Konnektor -is a Microsoft MAPI Storage Provider supporting the Kolab 2 XML -Storage format and the Kolab 2 server. It was designed to be interoperable -with all Kolab 2 clients and special attention was given to +The KONSEC Konnektor is a Microsoft MAPI Storage Provider supporting +the Kolab 2 XML Storage format and the Kolab 2 server. It was designed +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. +

    - -

    Horde Webmail

    -     - -Horde - + +
    + + Horde + +
    +
    +

    Webclient: Horde

     License: Free Software (GPL)
    -Status: experimental - +Status: beta quality, integrated in Kolab Server 2.2
    +Homepage: http://www.horde.org

    -Currently part of Horde CVS, this is still +Currently part of Horde CVS, this is still under development. It will allow users to access their server mailboxes and have full groupware functionality available. If you would like to contribute join the kolab-devel mailing list. All contributions welcome. -

    Horde currently still requires a SQL database and work is in progress which removes this requirement. Instructions on how to obtain and install the webclient can be found here. +

    + +
    + + Thunderbird + +
    +
    -

    Thunderbird Plugin: Sync Kolab

    +

    Thunderbird Plugin: SyncKolab

     - License: Same as Thunderbird which is Free Software
    -Status: experimental
    -Homepage: http://www.gargan.org/extensions/synckolab.html +Status: stable 1.0.0 (beta quality)
    +Homepage: http://synckolab.mozdev.org +

    +SyncKolab was written to add Kolab functionality to Thunderbird. It +reads a selected Imap folder and synchronizes it with the local +address book and calendar. It has been tested under +Thunderbird for Windows, Linux and MacOSX.
    +SyncKolab works nicely with Thunderbird 2 and +Lightning 0.8. +

    + + + +
    + + Bynari + +
    +
    + +

    Microsoft Outlook Plugin: Bynari Insight Connector

    +     +License: proprietary, with a gratis 30 day evaluation
    +Status: 3.1.x
    +Homepage: http://bynari.net +

    +. +

    -

    Clients for Kolab-1

    +

    Clients for Kolab 1

     These are clients known to work with Kolab Server 1.0. - Please note that the Kolab 1 server is not activly developed anymore and that it is recommended to use Kolab 2 for new installations. Existing users of Kolab 1 are asked to upgrade to Kolab 2 for continued support. - -

    KDE Client for Kolab-1

    -     - +
      +
    • +KDE Client for Kolab 1 +

      License: Free Software - GNU GPL
      Status: Stable -

      The reference KDE client for Kolab Server 1.0 was based on KDE 3.1 and integrated KOrganizer etc. into KMail (Kontact was not available at that time). You can find information about Kolab-1 KDE Client at the Kroupware web-site. - - -

      Kontact 1.0

      - + >Kolab 1 KDE Client at the Kroupware web-site. +
      • +
    • +Kontact 1.0 +

      License: Free Software - GNU GPL
      Status: Stable
      -Homepage: http://www.kontact.org/ - +Homepage: http://www.kontact.org/

      -The results of the KDE client for Kolab-1 have been integrated into +The results of the KDE client for Kolab 1 have been integrated into the KDE project. As a result, KDE 3.3 containts Kontact 1.0 which is works with Kolab Server 1.0. +

      • - -

      Outlook Plugin: Bynari v1

      -       - +
    • +Outlook Plugin: Bynari v1 +

      License: proprietary
      Status: stable
      -Homepage: www.bynari.net - +Homepage: http://www.bynari.net

      This plugin was the reference Outlook Plugin for Kolab 1.0. The reference platform for tests was NT4SP6 plus OL2000. It might not be available from its vendor anymore. +

      • - -

      Outlook Plugin: Toltec Connector 1

      -       - +
    • +Outlook Plugin: Toltec Connector 1 +

      License: proprietary
      Status: stable
      -Homepage: www.toltec.co.za - +Homepage: http://www.toltec.co.za

      Stable version available since mid October 2003.
      Users reported good experiences. +

      • - -

      Aethera

      -       - +
    • +Aethera +

      License: free software (GPL)
      Status: unclear
      -Homepage: Aethera Site - +Homepage: http://www.thekompany.com/projects/aethera

      Aethera is a independent client running on Windows and GNU/Linux. Its homepage says it is a Kolab 1 Client. +

      • +
    m4_include(footer.html.m4) From cvs at kolab.org Wed Jun 11 16:58:55 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 16:58:55 +0200 (CEST) Subject: emanuel: doc/www/src/images logo-apache.png, NONE, 1.1 logo-cyrus.png, NONE, 1.1 logo-openldap.png, NONE, 1.1 logo-postfix.png, NONE, 1.1 logo-proftpd.png, NONE, 1.1 apache-logo.png, 1.1, NONE horde-logo.png, 1.1, NONE openldap-logo.png, 1.1, NONE postfix-logo.png, 1.1, NONE proftpd-logo.png, 1.1, NONE Message-ID: <20080611145855.DD22D600B9C@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv6551/images Added Files: logo-apache.png logo-cyrus.png logo-openldap.png logo-postfix.png logo-proftpd.png Removed Files: apache-logo.png horde-logo.png openldap-logo.png postfix-logo.png proftpd-logo.png Log Message: Reorganize about-kolab-server page. Removed old + added new icons/logos. --- NEW FILE: logo-apache.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-cyrus.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-openldap.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-postfix.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo-proftpd.png --- (This appears to be a binary file; contents omitted.) --- apache-logo.png DELETED --- --- horde-logo.png DELETED --- --- openldap-logo.png DELETED --- --- postfix-logo.png DELETED --- --- proftpd-logo.png DELETED --- From cvs at kolab.org Wed Jun 11 16:58:55 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 16:58:55 +0200 (CEST) Subject: emanuel: doc/www/src about-kolab-server.html.m4,1.4,1.5 Message-ID: <20080611145855.DAC50600B97@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv6551 Modified Files: about-kolab-server.html.m4 Log Message: Reorganize about-kolab-server page. Removed old + added new icons/logos. Index: about-kolab-server.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-server.html.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- about-kolab-server.html.m4 4 Feb 2006 17:03:33 -0000 1.4 +++ about-kolab-server.html.m4 11 Jun 2008 14:58:53 -0000 1.5 @@ -4,14 +4,6 @@

    About Kolab Server

    -General
    -Major Features
    -Major Components
    - - -

    General

    -     - Kolab is a secure, scalable and reliable groupware server. It is formed by a number of well-known and proven components or the standards tasks such as E-Mail, Directory Service and Web Service. @@ -20,16 +12,13 @@ Kolab adds intelligent interaction between the components, a web administration interface, management of free-busy lists etc. - -

    +
    Various clients can access Kolab, among them Kontact (KDE), Outlook (Windows) and Horde (Web). -

    Major Features

    - -
      +
      • Full seamless support of mixed clients environments (Outlook/KDE/Web)
      • A web administration interface
        Supported languages: Deutsch (German), English, Français (French), @@ -40,61 +29,106 @@ E-Mail encryption possible (officially Sphinx-interoperable).
      - -

      Major Components

      -       - -

      OpenLDAP

      -Powered by OpenLDAP +

      Major Components

      + +
      + + Powered by OpenLDAP + +
      +
      +

      OpenLDAP

      +Homepage: http://www.openldap.org +

      LDAP is used as the cornerstone for Kolab. All authentication, be it the web admin interface or POP3/IMAP mailbox access are using LDAP as the password store through SASL. Key configuration parameters are also stored in LDAP and automatically applied to configuration files after a change occurs. When you create a new user in LDAP, the Cyrus mailbox is automatically generated for you. +

      -

      Postfix

      - -Powered by Postfix + +
      + + Powered by Postfix + +

      +

      +
      +

      Postfix

      +Homepage: http://www.postfix.org +

      Postfix is the mail transfer agent (MTA) for Kolab server. Postfix is easy to configure and has a Sendmail compatibility interface for administrators who are familiar to Sendmail. +

      -

      Cyrus IMAP

      + +
      + + Powered by Cyrus + +

      +

      +
      +

      Cyrus IMAP

      +Homepage: http://cyrusimap.web.cmu.edu +

      Cyrus provides IMAP as well as POP3 access to user mailboxes. It supports key features such as ACL (Access Control Lists) that allows more than one user to share mailboxes and folders. It also supports the Sieve mail processing language which allows Auto Actions such as Auto-Forward and Auto-Reply on mailboxes. Cyrus is also highly scalable. +

      -

      Apache

      - -Powered by Apache + +
      + + Powered by Apache +

      +

      +
      +

      Apache

      +Homepage: http://www.apache.org +

      Apache is used for the web administration interface as well as to provide WEBDAV access to Free/Busy information for the mail clients. It is planned that Kolab will be using Apache and PHP to provide webmail access with groupware functionality. +

      -

      ProFTPd

      - -Powered by ProFTPd + +
      + + Powered by ProFTPd +

      +

      +
      +

      ProFTPd

      +Homepage: http://www.proftpd.org +

      ProFTPd is used by legacy clients to upload Free/Busy information to the Kolab server. +

      -

      SASL

      + +
      +
      +
      +

      SASL

      +Homepage: http://asg.web.cmu.edu/sasl +

      SASL (the Simple Authentication and Security Layer) is used by all the components and uses OpenLDAP as the store for Authentication information. +

      m4_include(footer.html.m4) From cvs at kolab.org Wed Jun 11 17:10:21 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 17:10:21 +0200 (CEST) Subject: emanuel: doc/www/src/images logo-openpkg.png, NONE, 1.1 openpkg-logo.png, 1.1, NONE Message-ID: <20080611151021.8E422600B9C@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv7235/images Added Files: logo-openpkg.png Removed Files: openpkg-logo.png Log Message: Reorganize download page. Removed old + added new logo. --- NEW FILE: logo-openpkg.png --- (This appears to be a binary file; contents omitted.) --- openpkg-logo.png DELETED --- From cvs at kolab.org Wed Jun 11 17:10:21 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 17:10:21 +0200 (CEST) Subject: emanuel: doc/www/src download.html.m4,1.11,1.12 Message-ID: <20080611151021.8B33D600B97@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv7235 Modified Files: download.html.m4 Log Message: Reorganize download page. Removed old + added new logo. Index: download.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/download.html.m4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- download.html.m4 25 Aug 2006 09:00:04 -0000 1.11 +++ download.html.m4 11 Jun 2008 15:10:19 -0000 1.12 @@ -7,40 +7,29 @@ List of Kolab download servers -

      -Kolab-2
      -  Kolab Server 2.0
      -    Packages
      -  KDE Client for Kolab Server 2.0
      - -

      -Kolab-1
      -  Kolab Server 1.0
      -  KDE Client for Kolab Server 1.0
      -

      Kolab-2

      - - - -

      Kolab Server 2.0

      +

      Kolab 2

       -OpenPKG - + +
      + + OpenPKG + +
      +
      +

      Kolab Server 2.x

       +

      The main distribution form of Kolab Server are source-RPM packages for the OpenPKG system. This way, Kolab Server can more easily installed an various operating systems without the need of preparing specific packages with all the numerous small differences. - - -

      Packages

      - - +

      Packages

       +

      You will find 4 main sections beneath the directory "server" on our download servers: @@ -49,10 +38,10 @@

    • beta: Almost feature-complete and mostly working versions as well as all release candidates.
    • development: snapshots of ongoing developments. +
    • security updates
    - In each section you will find directories for each release, -e.g. "server/beta/kolab-server-2.0-beta-3/". +e.g. "server/beta/kolab-server-2.2-beta-3/".

    There you will always find a file "release-notes.txt" which @@ -60,7 +49,7 @@ release.

    -Next there always will be a directory "sources. +Next there always will be a directory "sources". It contains all source-RPM packages as needed for the OpenPKG environment. Also you will always find a "1st.README" which contains quick install @@ -69,37 +58,40 @@

    For some operating systems you might find additional directories containing pre-compiled packages (e.g. -(server/beta/kolab-server-2.0-beta-1/ix86-debian3.0"). +"server/beta/kolab-server-2.0-beta-1/ix86-debian3.0"). Using them usually considerably reduces installation time.

    These packages are collateral results of the following commercial activities: - -

    +
    Uptodate, tested and supported packages for specific distributions can be order from the Kolab Konsortium. + - -

    KDE Client for Kolab Server 2.0

    - -Check -the status of KDE Kolab client to decide, what you need. -

    -You may either -take one of the official -KDE developments or take the most up-to-date version -of the Kolab Project: + +

    + + Kontact + +
    +
    +

    KDE Client for Kolab Server 2.x

     +Check the status of KDE Kolab client +to decide, what you need.

    -The Kolab Projects maintains the branch "proko2" in the +You may either take one of the official KDE developments +or take the most up-to-date version of the Kolab Project: + +

      +

    • The Kolab Projects maintains the branch "proko2" in the KDE SVN which is based on KDE 3.3. See here for the instructions how to check out from SVN. -

      -From time to time, releases and packages are made available of this branch. +

    • +

      From time to time, releases and packages are made available of this branch. See the "kde-client" section on the download servers. The @@ -107,32 +99,35 @@ >ReleaseNote History shows when specific problems were fixed and features added. - -These are collateral results of the following commercial activities: -

      +These are collateral results of the following commercial activities:
      Uptodate, tested and supported packages for specific distributions can be ordered from the Kolab Konsortium. +

    + -

    Kolab-1

    +

    Kolabi 1

     - -

    Kolab Server 1.0

    -     + + + m4_include(footer.html.m4) From cvs at kolab.org Wed Jun 11 17:16:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 17:16:05 +0200 (CEST) Subject: emanuel: doc/www/src roadmap.html.m4,1.14,1.15 Message-ID: <20080611151605.93560600B97@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv7457 Modified Files: roadmap.html.m4 Log Message: Reorganize roadmap page. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- roadmap.html.m4 22 May 2008 09:43:49 -0000 1.14 +++ roadmap.html.m4 11 Jun 2008 15:16:03 -0000 1.15 @@ -16,46 +16,84 @@

    -

    KDE Kolab Client Enterprise35

    +

    KDE Kolab Clients

    -This series is in beta quality and contains a large number of improvements +
    + + Kontact + +
    +
    + + +

    Kontact for GNU/Linux

    +

    Enterprise35

    +This series is in beta quality and contains a large number of improvements over Proko2. Currently intermediate releases happen very few weeks for testing. Packagers are already picking this up.

    Stabilization to enterprise production quality is planned for Q2 2008. -

    KDE Kolab Client Enterprise4

    - -This is the next generation in development. The client will be based +

    Enterprise4

    +This is the next generation in development. The client will be based on KDE4 technology, but without Akonadi. We expect it to be in beta Q3 2008 and production ready end of 2008. -

    KDE Kolab Client Proko2 stable series

    - -This series is very stable and in in maintenance mode. +

    Proko2

    +This series is very stable and in in maintenance mode. Only very important updates will happen occasionally - governed by the urgency of the changes for enterprise users. +
    -

    Kolab Server 2.2 series

    + +
    + + Kontact + +
    +
    +

    Kontact for Windows (enterprise4 | alpha)

    +This version is in development. We expect it to be in beta Q3 2008 +and production ready end of 2008. +
    + + +
    + + Kontact + +
    +
    +

    Kontact for Mac OS X (enterprise4 | alpha)

    +This version is in development. We expect it to be in beta Q3 2008 +and production ready end of 2008. +
    + + + +

    Kolab Server 2.2

    +
    +
    +

    Kolab Server 2.2 series

    At time of writing we are issuing release candidates for this series, -with some people already running it in production. Current is 2.2-rc2. +with some people already running it in production. Current is 2.2-rc3. Major improvements over Server 2.1: -
    • -Update to a new OpenPKG version.
      • +
        +
      • Update to a new OpenPKG version.
      • Integration of new upstream versions (with many of the kolab patches -integrated).
      • -Re-engineerd Horde-based web client as modular add-on package for the Kolab -Server/OpenPKG version.
      • -More complete support for 64 bit architectures.
        • -
      • Implementation of new concept for extended freebusy list which is good for the teamleader overview usecase. +integrated).
        • +
      • Re-engineerd Horde-based web client as modular add-on package for the Kolab +Server/OpenPKG version.
        • +
      • More complete support for 64 bit architectures.
        • +
      • Implementation of new concept for extended freebusy list which is +good for the teamleader overview usecase.
      +Planned is 2.2 final release in June 2008. -Planned is 2.2-rc3 end of May and 2.2 final release in June 2008. - -

      Kolab Server 2.1 release series

      - +

      Kolab Server 2.1 release series

      Current is 2.1.0 Final. No further releases planned. +
    m4_include(footer.html.m4) From cvs at kolab.org Wed Jun 11 17:16:59 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 17:16:59 +0200 (CEST) Subject: emanuel: doc/www/src documentation.html.m4,1.34,1.35 Message-ID: <20080611151659.9E801600B9C@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv7502 Modified Files: documentation.html.m4 Log Message: Reorganize documentation page. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- documentation.html.m4 21 Apr 2008 09:35:44 -0000 1.34 +++ documentation.html.m4 11 Jun 2008 15:16:57 -0000 1.35 @@ -1,16 +1,19 @@ m4_define(`PAGE_TITLE',`Documentation') m4_include(header.html.m4) + +
    This page was updated on:
    $Date$

    Documentation

    - - + +

    Documentation for Administrators

    -     +
    +

    Administration

    • Kolab Server 2.2 "operating manual"
      @@ -27,9 +30,7 @@
    -

    Setup

    - +
    -
    - -

    Documentation for Developers

    -     +

    Documentation for Developers

    +
    +

    Kolab2 Storage Format Specification

    • Version Release Candidate 2.0rc7   @@ -77,11 +78,12 @@

      View old versions.

    +
    + -
    -

    Material for presentations

    -     +
    +
    - +
    m4_include(footer.html.m4) From cvs at kolab.org Wed Jun 11 17:20:42 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 17:20:42 +0200 (CEST) Subject: emanuel: doc/www/src footer.html.m4,1.42,1.43 i18n.html.m4,1.5,1.6 Message-ID: <20080611152042.39134600B97@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv7586 Modified Files: footer.html.m4 i18n.html.m4 Log Message: Reorganize i18n page. Change link string in footer. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- footer.html.m4 17 Apr 2008 09:37:59 -0000 1.42 +++ footer.html.m4 11 Jun 2008 15:20:39 -0000 1.43 @@ -41,7 +41,7 @@
    Support
    LINK(`documentation.html', `Documentation') -LINK(`i18n.html',`Languages/Localisation') +LINK(`i18n.html',`Language Support') LINK(`http://wiki.kolab.org/',`Wiki') Commercial: Kolab-Konsortium
    Index: i18n.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/i18n.html.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- i18n.html.m4 23 May 2007 10:13:49 -0000 1.5 +++ i18n.html.m4 11 Jun 2008 15:20:39 -0000 1.6 @@ -1,36 +1,30 @@ -m4_define(`PAGE_TITLE',`Languages supported by Kolab') +m4_define(`PAGE_TITLE',`Language Support') m4_include(header.html.m4)
    This page was updated on:
    $Date$
    -

    Supported Languages

    +

    Language Support

    -

    Server: Webadmin

    +

    Kolab Server: Webadmin

    The web administration interface of the Kolab Server offers localisation support since Kolab2. Translations can be done easily. -Kolab Server 2.0.1 comes with the following activated translations: +Kolab Server 2.2 comes with the following activated translations:
      -
    • - Deutsch -
    • - English -
    • - Français -
    • - Néerlandais -
    • - Italiano +
    • Deutsch +
    • English +
    • Français +
    • Néerlandais +
    • Italiano +
    • Spanish
    +Translations for other languages are welcome! -Translations for other languages are welcome, we are especially looking for -a translation of the -po file for Spanish. -

    KDE Kolab Klient

    +

    Kolab Client: KDE Kontact

    Kontact has good support for about 30 languages, with more then 30 additional languages in progress. @@ -41,6 +35,7 @@ KDE's internationalisation team, as the efforts of the Kolab project on the KDE side have directly been done within KDE. +

    Outlook with proprietary plugins

    From cvs at kolab.org Wed Jun 11 17:37:35 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 11 Jun 2008 17:37:35 +0200 (CEST) Subject: emanuel: doc/www/src default.css,1.10,1.11 Message-ID: <20080611153735.DAE7E600B97@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv8111 Modified Files: default.css Log Message: Some style changes. Index: default.css =================================================================== RCS file: /kolabrepository/doc/www/src/default.css,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- default.css 10 Jun 2008 08:50:54 -0000 1.10 +++ default.css 11 Jun 2008 15:37:33 -0000 1.11 @@ -1,13 +1,9 @@ body { - /* background: url('images/bg_lines.png'); */ + font: 12px "Lucida Grande",Geneva,Verdana,Arial,Helvetica,sans-serif; background-color: #E5E5E5; margin: 0px; } -body, td { - font: 12px Verdana, Arial, Helvetica, sans-serif; -} - dt { font-weight: bold; } @@ -16,6 +12,10 @@ margin-bottom: 0.5em; } +ul { + list-style: square; +} + img { border: 0; } @@ -25,6 +25,15 @@ border: 1px solid #555; background-color: #555; } + +h3 { + border-bottom: 1px solid #555; +} +h4 { + margin-bottom: 5px; + margin-top: 20px; +} + a:hover { color: #000; From cvs at kolab.org Thu Jun 12 09:12:09 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 12 Jun 2008 09:12:09 +0200 (CEST) Subject: thomas: doc/www/src about-kolab-server.html.m4,1.5,1.6 Message-ID: <20080612071209.4D6F5600B8F@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv21230 Modified Files: about-kolab-server.html.m4 Log Message: proftpd is no longer used in Kolab Server 2.2 (and shouldn't be in 2.1) Index: about-kolab-server.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-server.html.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- about-kolab-server.html.m4 11 Jun 2008 14:58:53 -0000 1.5 +++ about-kolab-server.html.m4 12 Jun 2008 07:12:07 -0000 1.6 @@ -105,21 +105,6 @@
    - -
    - - Powered by ProFTPd -

    -

    -
    -

    ProFTPd

    -Homepage: http://www.proftpd.org -

    -ProFTPd is used by legacy clients to upload Free/Busy information -to the Kolab server. -

    - -
    From cvs at kolab.org Thu Jun 12 09:12:09 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 12 Jun 2008 09:12:09 +0200 (CEST) Subject: thomas: doc/www/src/images logo-proftpd.png,1.1,NONE Message-ID: <20080612071209.4F920600B90@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv21230/images Removed Files: logo-proftpd.png Log Message: proftpd is no longer used in Kolab Server 2.2 (and shouldn't be in 2.1) --- logo-proftpd.png DELETED --- From cvs at kolab.org Fri Jun 13 10:37:04 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 10:37:04 +0200 (CEST) Subject: bernhard: doc/kolab-formats kolabformat.sgml, 1.26, 1.27 overview.sgml, 1.16, 1.17 Message-ID: <20080613083704.649C0600B8F@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv23257 Modified Files: kolabformat.sgml overview.sgml Log Message: Section Overview: Stated more precisely that connectors - not Outlook itself - write the format. Marked as CVS Draft version again. Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- kolabformat.sgml 23 Apr 2008 07:42:44 -0000 1.26 +++ kolabformat.sgml 13 Jun 2008 08:37:02 -0000 1.27 @@ -15,7 +15,7 @@ The Kolab Storage Format -2.0rc7 + Draft CVS @@ -169,6 +169,18 @@ in current implementations. + + +CVS $Revision$ +$Date$ + +Section Overview: Stated more precisely that connectors - not Outlook itself - +write the format. + + + + + Index: overview.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/overview.sgml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- overview.sgml 26 Jul 2005 11:53:46 -0000 1.16 +++ overview.sgml 13 Jun 2008 08:37:02 -0000 1.17 @@ -59,7 +59,8 @@ If a client sees a tag it does not understand, this tag must be preserved and saved back to the file. This allows for client specific -tags. Outlook writes it client specific tags directly in a tnef file +tags. Known Outlook connectors write its client specific tags +directly in a tnef file that is saved as an unreferenced attachment. Each type of folder has it's own subclass of the From cvs at kolab.org Fri Jun 13 10:48:31 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 10:48:31 +0200 (CEST) Subject: emanuel: doc/www/src/images bg_lines.png, 1.2, NONE boxbg.png, 1.1, NONE headbg.png, 1.1, NONE Message-ID: <20080613084831.22AC1600B90@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv23568/images Removed Files: bg_lines.png boxbg.png headbg.png Log Message: Improve color style of site. Remove background files. --- bg_lines.png DELETED --- --- boxbg.png DELETED --- --- headbg.png DELETED --- From cvs at kolab.org Fri Jun 13 10:48:31 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 10:48:31 +0200 (CEST) Subject: emanuel: doc/www/src default.css,1.11,1.12 Message-ID: <20080613084831.181D5600B8F@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv23568 Modified Files: default.css Log Message: Improve color style of site. Remove background files. Index: default.css =================================================================== RCS file: /kolabrepository/doc/www/src/default.css,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- default.css 11 Jun 2008 15:37:33 -0000 1.11 +++ default.css 13 Jun 2008 08:48:29 -0000 1.12 @@ -119,7 +119,7 @@ .note { border: 1px dashed blue; padding: 0.5em; - background-color: #DEF; + background-color: #d8e1f6; margin: 0.5em; } @@ -142,7 +142,7 @@ /* Menu box header */ .mbh { - background: #00c; + background: #232c89; font-weight: bold; color: #fff; text-align: left; @@ -153,13 +153,10 @@ /* Menu box body */ .mbox { - border-top: .5em solid #8BF; - border-bottom: .5em solid #8BF; - border-left: 1px solid #00f; + border-top: .5em solid #c9d3ea; + border-bottom: 1px solid #232c89; + border-left: 1px solid #232c89; background: #fff; - background-image:url(images/boxbg.png); - background-repeat:no-repeat; - background-position:right bottom; margin-top: 0; margin-bottom: 10px; padding: 0.5em; @@ -178,19 +175,16 @@ /* Outer Content */ .obox { - border-right: 1px solid #00f; - border-top: 1px solid #00f; + border-right: 1px solid #232c89; + border-top: 1px solid #232c89; + border-bottom: 1px solid #232c89; padding: 0px; margin: 0px; } /* Content box header */ .cbh { - border-top: .5em solid #8BF; background: #fff; - background-image:url(images/headbg.png); - background-repeat:no-repeat; - background-position:right bottom; padding-top: 5px; padding-left: 1em; } @@ -208,7 +202,7 @@ /* Content box */ .cbox { - border-top: .5em solid #8BF; + border-top: .5em solid #c9d3ea; background: #fff; padding: 0.5em; padding-left: 1em; @@ -216,12 +210,10 @@ /* Footer block */ #footer { + margin-top: 1em; margin-bottom: 1em; - border-bottom: 2px solid #00d; - border-top: 2px solid #00d; font-size: 75%; text-align: center; - background: #DEF; } /* Last-updated timestamp tag */ @@ -229,7 +221,6 @@ text-align: center; font-size: 85%; font-family: monospace; - /*border: 1px dashed black;*/ float: right; clear: none; padding-right: 0.5em; @@ -251,11 +242,11 @@ margin: 0.5em; } -/* Latest news item */ + .latestnews { - border: 1px dashed blue; + border: 1px dashed #232c89; padding: 0.5em; - background-color: #DEF; + background-color: #d8e1f6; margin: 0.5em; } @@ -280,7 +271,7 @@ /* News item */ .news { - border: 1px dashed black; + border: 1px dashed #232c89; padding: 0.5em; background-color: #eee; margin: 0.5em; From cvs at kolab.org Fri Jun 13 11:47:25 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 11:47:25 +0200 (CEST) Subject: emanuel: doc/www/src/images kolab-lnm-award-2005.png, NONE, 1.1 kolab-lnm-award-2005_small.png, NONE, 1.1 Message-ID: <20080613094725.F0737600B90@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv25804/images Added Files: kolab-lnm-award-2005.png kolab-lnm-award-2005_small.png Log Message: Improve index page. Add image. Change news style. --- NEW FILE: kolab-lnm-award-2005.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kolab-lnm-award-2005_small.png --- (This appears to be a binary file; contents omitted.) From cvs at kolab.org Fri Jun 13 11:47:25 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 11:47:25 +0200 (CEST) Subject: emanuel: doc/www/src default.css, 1.12, 1.13 index.html.m4, 1.144, 1.145 Message-ID: <20080613094725.F25F6600BAA@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv25804 Modified Files: default.css index.html.m4 Log Message: Improve index page. Add image. Change news style. Index: default.css =================================================================== RCS file: /kolabrepository/doc/www/src/default.css,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- default.css 13 Jun 2008 08:48:29 -0000 1.12 +++ default.css 13 Jun 2008 09:47:23 -0000 1.13 @@ -254,19 +254,23 @@ .newsd { font-size: 110%; font-weight: bold; - white-space: nowrap; - width: 200px; + width: 160px; + text-align: right; + vertical-align: top; } /* News header */ .newsh { font-size: 110%; font-weight: bold; + padding-left: 14px; + vertical-align: top; } /* News body */ .newsb { - padding-left: 3em; + padding-left: 10px; + margin-left: 170px; } /* News item */ Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.144 retrieving revision 1.145 diff -u -d -r1.144 -r1.145 --- index.html.m4 10 Jun 2008 08:50:54 -0000 1.144 +++ index.html.m4 13 Jun 2008 09:47:23 -0000 1.145 @@ -2,6 +2,9 @@ m4_include(header.html.m4)
    This page was updated on:
    $Date$
    + + + + + +

    Kolab is a Groupware Solution for Emails, Appointments, Contacts and more. It supports mixed client environments (Outlook/KDE) @@ -26,6 +29,16 @@ Category 'Best Groupware Server' [press release].

    +    		 + +Linux New Media Award 2005
    +Linux New Media Award 2005
    +*Beste Groupware Server*     +

    News

    @@ -246,6 +259,6 @@ -Archived news +Archived news m4_include(footer.html.m4) From cvs at kolab.org Fri Jun 13 14:10:01 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 14:10:01 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.274,1.275 Message-ID: <20080613121001.2B763600B91@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31814 Modified Files: release-notes.txt Log Message: kolab/issue2745 (php error after sending an update to an event) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.274 retrieving revision 1.275 diff -u -d -r1.274 -r1.275 --- release-notes.txt 9 Jun 2008 06:00:47 -0000 1.274 +++ release-notes.txt 13 Jun 2008 12:09:58 -0000 1.275 @@ -88,6 +88,10 @@ 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) + - perl-kolab-2.2.0-2008???? Adjusted version number. From cvs at kolab.org Fri Jun 13 14:10:01 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 14:10:01 +0200 (CEST) Subject: gunnar: server/pear/PEAR-Net_IMAP echo.patch, NONE, 1.1 ChangeLog, 1.1, 1.2 Makefile, 1.2, 1.3 PEAR-Net_IMAP.spec, 1.1, 1.2 Message-ID: <20080613121001.2CC77600BAA@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_IMAP In directory doto:/tmp/cvs-serv31814/pear/PEAR-Net_IMAP Modified Files: ChangeLog Makefile PEAR-Net_IMAP.spec Added Files: echo.patch Log Message: kolab/issue2745 (php error after sending an update to an event) --- NEW FILE: echo.patch --- --- /home/wrobel/usr/tmp/php/pear/php/Net/IMAPProtocol.php 2008-02-11 17:44:33.058594250 +0100 +++ IMAPProtocol.php 2008-06-13 13:51:34.180596250 +0200 @@ -2465,7 +2465,7 @@ function _prot_error($str , $line , $file,$printError=true) { if($printError){ - echo "$line,$file,PROTOCOL ERROR!:$str\n"; + //echo "$line,$file,PROTOCOL ERROR!:$str\n"; } } Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_IMAP/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChangeLog 8 Aug 2007 16:26:45 -0000 1.1 +++ ChangeLog 13 Jun 2008 12:09:59 -0000 1.2 @@ -1,3 +1,8 @@ +2008-06-13 Gunnar Wrobel

    + + * PEAR-Net_IMAP.spec (Source): Added a potential patch for + kolab/issue2745. + 2007-08-08 Gunnar Wrobel

    * PEAR-Net_IMAP.spec: Added package to Kolab CVS. Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_IMAP/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 13 Sep 2007 13:28:13 -0000 1.2 +++ Makefile 13 Jun 2008 12:09:59 -0000 1.3 @@ -18,6 +18,8 @@ SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz +PATCHES=echo.patch + .PHONY: all all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm @@ -36,6 +38,7 @@ 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PEAR-Net_IMAP.spec 8 Aug 2007 16:26:45 -0000 1.1 +++ PEAR-Net_IMAP.spec 13 Jun 2008 12:09:59 -0000 1.2 @@ -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 1 +%define V_release 2 # Package Information Name: %{V_package} @@ -18,6 +18,9 @@ # 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} @@ -36,6 +39,8 @@ %prep %setup -n %{V_pear_name}-%{V_version} + + %patch -p0 -P 0 %build From cvs at kolab.org Fri Jun 13 14:51:14 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 13 Jun 2008 14:51:14 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/dist_conf debian,1.17,1.18 Message-ID: <20080613125114.558B3600BB3@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv977 Modified Files: debian Log Message: Debian config update. Submitted by Mathieu PARENT. Index: debian =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- debian 19 Mar 2008 21:43:15 -0000 1.17 +++ debian 13 Jun 2008 12:51:11 -0000 1.18 @@ -31,6 +31,8 @@ amavisd_usr=kolab amavisd_grp=kolab +spamassassin_confdir=${sysconfdir}/spamassassin + fsl_logfile=${localstatedir}/log/fsl sysrundir=${localstatedir}/run @@ -78,9 +80,9 @@ kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db kolab_scriptsdir=${sbindir} kolab_php_smarty_prefix=smarty/libs -smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c +smarty_compiledir=/var/cache/kolab-webadmin/templates # Kolab web user interface -kolab_wui=/kolab/admin +kolab_wui=/admin ldapserver_statedir=${localstatedir}/lib/ldap ldapserver_dir=${localstatedir}/lib/ldap From cvs at kolab.org Tue Jun 17 09:13:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 17 Jun 2008 09:13:57 +0200 (CEST) Subject: bernhard: doc/architecture freebusy.txt,1.22,1.23 Message-ID: <20080617071357.509EF600175@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv11118 Modified Files: freebusy.txt Log Message: Removed the status Draft line as this is not draft anymore since a long time. Change phrasing to make sure that invitations MAY also be accepted for other than the default folder. Some minor reformatting to fit 80 chars width. Index: freebusy.txt =================================================================== RCS file: /kolabrepository/doc/architecture/freebusy.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- freebusy.txt 2 Apr 2008 15:52:29 -0000 1.22 +++ freebusy.txt 17 Jun 2008 07:13:55 -0000 1.23 @@ -1,5 +1,4 @@ How to handle freebusy lists for Kolab2 -Draft Principal authors: Martin Konold, Bernhard Reiter $Id$ @@ -32,7 +31,8 @@ User folder Calendars A user may have several personal folders in his account. One Folder is called -the default folder. The default folder is used when accepting invitations. +the default folder. The default folder is usually used +when accepting invitations automatically. The structure of user calendar folders is like @@ -43,9 +43,10 @@ Group Calendars -A group may have several calendars (often only one). Technically a group -calendar is just a special user account with more than one user having access -permissions. A group as opposed to a user shall be used to give +A group account may have several calendar folders (often only one). +Technically a group calendar is just a special user account +with more than one user having access permissions. +A group as opposed to a user shall be used to give folders to several users on an equal level. Each folder has an admin, which is the person which can give out rights to the folders. @@ -128,8 +129,9 @@ If a calendar folder is removed the corresponding pfb must also be removed. Actually the term pfb cache is a little bit misleading as it actually is an -intermediate store which does not only cache the results of pfb trigger processes -but which implicitly also defines which pfbs are relevant to create the user specific fb. +intermediate store which does not only cache the results of pfb trigger +processes but which implicitly also defines which pfbs are relevant +to create the user specific fb. Triggering pfb From cvs at kolab.org Wed Jun 18 16:34:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 16:34:57 +0200 (CEST) Subject: emanuel: doc/www/src/images kolab-lnm-award-2005_small.png,1.1,1.2 Message-ID: <20080618143457.C2DEB600175@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv26176/images Modified Files: kolab-lnm-award-2005_small.png Log Message: Resize lnm-award image. Index: kolab-lnm-award-2005_small.png =================================================================== RCS file: /kolabrepository/doc/www/src/images/kolab-lnm-award-2005_small.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsd2dig4 and /tmp/cvssoKuoW differ From cvs at kolab.org Wed Jun 18 16:34:57 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 16:34:57 +0200 (CEST) Subject: emanuel: doc/www/src index.html.m4,1.145,1.146 Message-ID: <20080618143457.C18B5600165@lists.intevation.de> Author: emanuel Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv26176 Modified Files: index.html.m4 Log Message: Resize lnm-award image. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.145 retrieving revision 1.146 diff -u -d -r1.145 -r1.146 --- index.html.m4 13 Jun 2008 09:47:23 -0000 1.145 +++ index.html.m4 18 Jun 2008 14:34:55 -0000 1.146 @@ -32,7 +32,7 @@

    		-Linux New Media Award 2005
    Linux New Media Award 2005
    *Beste Groupware Server*     From cvs at kolab.org Wed Jun 18 16:37:20 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 16:37:20 +0200 (CEST) Subject: thomas: server obmtool.conf, 1.256.2.5, 1.256.2.6 release-notes.txt, 1.131.2.12, 1.131.2.13 Message-ID: <20080618143720.386E8600175@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv26280 Modified Files: Tag: kolab_2_1_branch obmtool.conf release-notes.txt Log Message: Update to clamav-0.93.1-20080610_kolab Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/Attic/obmtool.conf,v retrieving revision 1.256.2.5 retrieving revision 1.256.2.6 diff -u -d -r1.256.2.5 -r1.256.2.6 --- obmtool.conf 19 Sep 2007 17:42:59 -0000 1.256.2.5 +++ obmtool.conf 18 Jun 2008 14:37:18 -0000 1.256.2.6 @@ -159,7 +159,7 @@ @trigger ${loc}curl-7.15.0-2.5.2 @install ${loc}bc-1.06-2.5.0 @install ${loc}pkgconfig-0.19-2.5.0 - @install ${altloc}clamav-0.91.2-20070821_kolab + @install ${altloc}clamav-0.93.1-20080610_kolab @install ${altloc}perl-kolab-5.8.7-20070919 @install ${altloc}kolabd-2.1.0-20070919 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-2.1.0-20070919 --define kolab_version=$kolab_version Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.131.2.12 retrieving revision 1.131.2.13 diff -u -d -r1.131.2.12 -r1.131.2.13 --- release-notes.txt 18 Feb 2008 17:25:59 -0000 1.131.2.12 +++ release-notes.txt 18 Jun 2008 14:37:18 -0000 1.131.2.13 @@ -32,7 +32,7 @@ Changes between 2.1.0 and 2.1.???: - - clamav-0.92.1-20080213_kolab + - clamav-0.93.1-20080610_kolab New upstream version, fixes various security issues. From cvs at kolab.org Wed Jun 18 16:37:20 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 16:37:20 +0200 (CEST) Subject: thomas: server/clamav Makefile, 1.4.2.6, 1.4.2.7 kolab.patch, 1.5.2.5, 1.5.2.6 Message-ID: <20080618143720.3D1BB600B8F@lists.intevation.de> Author: thomas Update of /kolabrepository/server/clamav In directory doto:/tmp/cvs-serv26280/clamav Modified Files: Tag: kolab_2_1_branch Makefile kolab.patch Log Message: Update to clamav-0.93.1-20080610_kolab Index: Makefile =================================================================== RCS file: /kolabrepository/server/clamav/Attic/Makefile,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -u -d -r1.4.2.6 -r1.4.2.7 --- Makefile 16 Apr 2008 14:34:28 -0000 1.4.2.6 +++ Makefile 18 Jun 2008 14:37:18 -0000 1.4.2.7 @@ -1,5 +1,5 @@ ifeq "x$(KOLABPKGURI)" "x" - KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/ + KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/security-updates/20080618/ endif ifeq "x$(KOLABRPMSRC)" "x" KOLABRPMSRC = /kolab/RPM/SRC @@ -12,9 +12,9 @@ endif PACKAGE=clamav -VERSION=0.93 -RELEASE=20080414 -KOLABRELEASE=20080414_kolab +VERSION=0.93.1 +RELEASE=20080610 +KOLABRELEASE=20080610_kolab RPM=/kolab/bin/openpkg rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/clamav/Attic/kolab.patch,v retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -u -d -r1.5.2.5 -r1.5.2.6 --- kolab.patch 16 Apr 2008 14:34:28 -0000 1.5.2.5 +++ kolab.patch 18 Jun 2008 14:37:18 -0000 1.5.2.6 @@ -3,9 +3,9 @@ @@ -32,7 +32,7 @@ Group: AntiVirus License: GPL - Version: 0.93 --Release: 20080414 -+Release: 20080414_kolab + Version: 0.93.1 +-Release: 20080610 ++Release: 20080610_kolab # package options %option with_milter no From cvs at kolab.org Wed Jun 18 18:03:47 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 18:03:47 +0200 (CEST) Subject: thomas: doc/www/src/security kolab-vendor-notice-21.txt,NONE,1.1 Message-ID: <20080618160347.894D1600165@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv29044 Added Files: kolab-vendor-notice-21.txt Log Message: Kolab Security Issue 21 20080618 (clamav) --- NEW FILE: kolab-vendor-notice-21.txt --- -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Kolab Security Issue 21 20080618 ================================ Package: Kolab Server, ClamAV Vulnerability: denial of service Kolab Specific: no Dependent Packages: none Summary ~~~~~~~ Damian Put reported a problem in ClamAV's code to decompress executables created by the Petite packer, which causes invalid memory access. Affected Versions ~~~~~~~~~~~~~~~~~ This affects versions of ClamAV up to version 0.93 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-rc3 and previous prereleases are affected. Fix ~~~ Upgrade to ClamAV 0.93.1. 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/20080618/clamav-0.93.1-20080610_kolab.src.rpm For Kolab Server 2.2 release candidates the unmodified OpenPKG rpm can be used: security-updates/20080618/clamav-0.93.1-20080610.src.rpm A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available: security-updates/20080618/clamav-0.93.1-20080610_kolab.ix86-debian3.1-kolab.rpm A binary RPM for Kolab Server 2.2 release candidates (ix86 Debian GNU/Linux Etch) is available from: security-updates/20080618/clamav-0.93.1-20080610_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/20080618/clamav-0.93.1-20080610_kolab.src.rpm . # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080618/clamav-0.93.1-20080610_kolab.ix86-debian3.1-kolab.rpm . # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080618/clamav-0.93.1-20080610.src.rpm . # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080618/clamav-0.93.1-20080610.ix86-debian4.0-kolab.rpm . MD5 sums: 15a088fcdcd8af3513c38afe69a69d2b clamav-0.93.1-20080610.ix86-debian4.0-kolab.rpm 57d5566041ee8f771673be894de8c00f clamav-0.93.1-20080610.src.rpm 9c7d90027b3c4a923be2269f7a91fd3e clamav-0.93.1-20080610_kolab.ix86-debian3.1-kolab.rpm 7d7e51d550282eff0eeb9c0eb34bb446 clamav-0.93.1-20080610_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.--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?group_id=86638&release_id=605577 ClamAV 0.93.1 release notes https://wwws.clamav.net/bugzilla/show_bug.cgi?id=1000 Entry in the ClamAV bug database http://www.heise.de/security/news/meldung/109606 http://www.heise-online.co.uk/news/110947 News about DoS vulnerability on Heise security Timeline ~~~~~~~~ 20080609 ClamAV release 0.93.1. 20080610 OpenPKG 0.93.1 package release. 20080618 News on Heise security. 20080618 Kolab Server security advisory published. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIWTGoW7P1GVgWeRoRAkVXAJkB3auxvbF/zLgH3ZHlBVMZcm1l1QCfVWDW uLIP3f55t29BhShwdoV8RJY= =reZg -----END PGP SIGNATURE----- From cvs at kolab.org Wed Jun 18 18:21:16 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 18:21:16 +0200 (CEST) Subject: thomas: doc/www/src index.html.m4,1.146,1.147 Message-ID: <20080618162116.3B3E8600165@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv29971 Modified Files: index.html.m4 Log Message: Kolab Security Issue 21 20080618 (clamav) (and the usual cleanups) Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.146 retrieving revision 1.147 diff -u -d -r1.146 -r1.147 --- index.html.m4 18 Jun 2008 14:34:55 -0000 1.146 +++ index.html.m4 18 Jun 2008 16:21:14 -0000 1.147 @@ -7,17 +7,17 @@

    Kolab is a Groupware Solution for Emails, Appointments, Contacts and more. -It supports mixed client environments (Outlook/KDE) +It supports mixed client environments (Outlook/KDE) because of an open storage format. Any email client speaking standard protocols can be served.

    -For the full Kolab experience you need a +For the full Kolab experience you need a Kolab Server and Kolab Clients. What makes the Kolab Concept outstanding is the focus on -scalability, proven components and protocols. +scalability, proven components and protocols. The implementations offered by us are Free Software (Open Source).

    @@ -59,6 +59,20 @@
    + + + + +
    June 18th, 2008» + Security Issue 21 for Kolab Server (ClamAV) +
    +
    + A new ClamAV RPM with a fix for a DoS vulnerability is available. See the + Kolab Security Issue 21 for details. +
    +

    + +
    June 9th, 2008 » @@ -68,26 +82,26 @@
    The german Federal Office for Information Security (BSI) has presented a prototype of KDE Kolab Client Kontact on Windows and Mac OS X at the -LinuxTag 2008 (may 28th to 31th) in Berlin. +LinuxTag 2008 (may 28th to 31th) in Berlin. These new Kolab clients based on KDE and Qt. They are still in development. A stable release is planed for the end of 2008. -

    -More information: +More information:

    • Screenshots of Kontact/Win and Kontact/Mac
    • BSI press release (2008-05-21)
      • -
    • German News of +
    • German News of Heise (2008-05-29), Linux-Magazin (2008-05-29) +href="http://www.linux-magazin.de/news/linuxtag_2008_kontact_vorkonfiguriert_fuer_windows_und_mac">Linux-Magazin (2008-05-29) and Golem (2008-05-30).

    +
    June 8th, 2008 » @@ -118,9 +132,6 @@ announcement for details.

    - - - From cvs at kolab.org Wed Jun 18 18:24:54 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 18 Jun 2008 18:24:54 +0200 (CEST) Subject: thomas: doc/www/src index.html.m4,1.147,1.148 Message-ID: <20080618162454.70A5A600175@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv30473 Modified Files: index.html.m4 Log Message: Typo: Beste -> Best Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- index.html.m4 18 Jun 2008 16:21:14 -0000 1.147 +++ index.html.m4 18 Jun 2008 16:24:52 -0000 1.148 @@ -35,7 +35,7 @@ Linux New Media Award 2005
    Linux New Media Award 2005
    -*Beste Groupware Server*     +*Best Groupware Server*

    From cvs at kolab.org Fri Jun 20 18:53:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 20 Jun 2008 18:53:05 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin Makefile.am,1.55,1.56 Message-ID: <20080620165305.B5804600165@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv18448/kolab-webadmin/kolab-webadmin Modified Files: Makefile.am Log Message: dist_conf/gentoo was removed, but still referenced in some Makefiles. Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- Makefile.am 4 Apr 2008 19:41:14 -0000 1.55 +++ Makefile.am 20 Jun 2008 16:53:03 -0000 1.56 @@ -218,7 +218,6 @@ EXTRA_DIST += dist_conf/common \ dist_conf/debian \ - dist_conf/gentoo \ dist_conf/kolab \ dist_conf/mandriva \ dist_conf/suse From cvs at kolab.org Fri Jun 20 18:53:05 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 20 Jun 2008 18:53:05 +0200 (CEST) Subject: thomas: server/kolabd/kolabd Makefile.am,1.42,1.43 Message-ID: <20080620165305.B7C8A600168@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv18448/kolabd/kolabd Modified Files: Makefile.am Log Message: dist_conf/gentoo was removed, but still referenced in some Makefiles. Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- Makefile.am 5 Jun 2008 16:50:25 -0000 1.42 +++ Makefile.am 20 Jun 2008 16:53:03 -0000 1.43 @@ -200,7 +200,6 @@ # Makefile.ams too when the underneath EXTRA_DIST assignment is altered EXTRA_DIST += dist_conf/common \ dist_conf/debian \ - dist_conf/gentoo \ dist_conf/kolab \ dist_conf/mandriva \ dist_conf/suse From cvs at kolab.org Fri Jun 20 19:10:27 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 20 Jun 2008 19:10:27 +0200 (CEST) Subject: thomas: server/kolabd Makefile,1.12,1.13 Message-ID: <20080620171027.D113E600168@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv19141/kolabd Modified Files: Makefile Log Message: Compile kolabd with horde support when building CVS snapshots Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 16 Aug 2007 10:47:10 -0000 1.12 +++ Makefile 20 Jun 2008 17:10:25 -0000 1.13 @@ -22,7 +22,7 @@ cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab --enable-dist=kolab \ && make clean distcheck && mv $(PACKAGE)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE) cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/ - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS' + cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS' --define 'with_horde yes' binary: $(RPM) -bB $(PACKAGE).spec @@ -35,4 +35,4 @@ tar -cvj --exclude=CVS --exclude=\*~ --exclude=dist -f $(MAKETAR)/$(PACKAGE)/$(PACKAGE)-$(VERSION)-$(RELEASE).tar.bz2 * .PHONY: clean_all -clean_all: \ No newline at end of file +clean_all: From cvs at kolab.org Thu Jun 26 12:51:22 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 26 Jun 2008 12:51:22 +0200 (CEST) Subject: thomas: server/pear/PEAR-Net_IMAP echo.patch,1.1,1.2 Message-ID: <20080626105122.DBC6560C4C4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/pear/PEAR-Net_IMAP In directory doto:/tmp/cvs-serv20653 Modified Files: echo.patch Log Message: Added FIXME note to disabled echo call Index: echo.patch =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_IMAP/echo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- echo.patch 13 Jun 2008 12:09:59 -0000 1.1 +++ echo.patch 26 Jun 2008 10:51:20 -0000 1.2 @@ -5,7 +5,7 @@ { if($printError){ - echo "$line,$file,PROTOCOL ERROR!:$str\n"; -+ //echo "$line,$file,PROTOCOL ERROR!:$str\n"; ++ //FIXME, see kolab/issue2745: echo "$line,$file,PROTOCOL ERROR!:$str\n"; } } From cvs at kolab.org Thu Jun 26 18:12:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 26 Jun 2008 18:12:02 +0200 (CEST) Subject: thomas: server release-notes.txt,1.275,1.276 Message-ID: <20080626161202.3450D60C4CA@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31746 Modified Files: release-notes.txt Log Message: kolab_bootstrap: Use Net::Domain to determine fqdn more reliably. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.275 retrieving revision 1.276 diff -u -d -r1.275 -r1.276 --- release-notes.txt 13 Jun 2008 12:09:58 -0000 1.275 +++ release-notes.txt 26 Jun 2008 16:11:59 -0000 1.276 @@ -70,6 +70,8 @@ Removed unused fbview.conf.template file. + kolab_bootstrap: Use Net::Domain to determine fqdn more reliably. + - kolab-filter-2.2.0-2008???? Adjusted version number. From cvs at kolab.org Thu Jun 26 18:12:02 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 26 Jun 2008 18:12:02 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog, 1.168, 1.169 kolab_bootstrap.in, 1.34, 1.35 Message-ID: <20080626161202.358C360C4D4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv31746/kolabd/kolabd Modified Files: ChangeLog kolab_bootstrap.in Log Message: kolab_bootstrap: Use Net::Domain to determine fqdn more reliably. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.168 retrieving revision 1.169 diff -u -d -r1.168 -r1.169 --- ChangeLog 5 Jun 2008 16:50:25 -0000 1.168 +++ ChangeLog 26 Jun 2008 16:11:59 -0000 1.169 @@ -1,3 +1,7 @@ +2008-06-26 Thomas Arendsen Hein + + * kolab_bootstrap.in: Use Net::Domain to determine fqdn more reliably. + 2008-06-05 Thomas Arendsen Hein * templates/fbview.conf.template.in: Removed unused file. Index: kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- kolab_bootstrap.in 23 Feb 2008 20:19:18 -0000 1.34 +++ kolab_bootstrap.in 26 Jun 2008 16:11:59 -0000 1.35 @@ -17,12 +17,12 @@ use Socket; use IO::File; use IO::Select; +use Net::Domain qw(hostfqdn); use Net::LDAP; use Net::LDAP::Entry; use Net::Netmask; use File::Copy; use Getopt::Std; -use Sys::Hostname; use Term::ReadKey; use Time::Local; use Time::localtime; @@ -45,27 +45,6 @@ return "\"$str\""; } -# Try to get fqdn -sub myhostname { - my $host = ''; - # FIXME: hardcoded - maybe fixed later - if( open( HOSTNAME, '/etc/HOSTNAME' ) ) { - $host = ; - chomp $host; - close( HOSTNAME ); - } - # FIXME: hardcoded - maybe fixed later - if( open( HOSTNAME, '/etc/hostname' ) ) { - $host = ; - chomp $host; - close( HOSTNAME ); - } - if( $host eq '' ) { - $host = `hostname`; - } - return $host; -} - # Connect to host,port and return 1 on success sub tryConnect { my $host = shift; @@ -283,7 +262,7 @@ } my $fqdn; if( $fqdnhostname =~ /\@\@\@/ ) { - $fqdn = myhostname; + $fqdn = hostfqdn(); } else { $fqdn = $fqdnhostname; } From cvs at kolab.org Thu Jun 26 18:28:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 26 Jun 2008 18:28:49 +0200 (CEST) Subject: thomas: server release-notes.txt,1.276,1.277 Message-ID: <20080626162849.B6F0F60C4D3@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv32249 Modified Files: release-notes.txt Log Message: kolab_bootstrap: Make sure suggested domain name contains a dot. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.276 retrieving revision 1.277 diff -u -d -r1.276 -r1.277 --- release-notes.txt 26 Jun 2008 16:11:59 -0000 1.276 +++ release-notes.txt 26 Jun 2008 16:28:47 -0000 1.277 @@ -70,7 +70,8 @@ Removed unused fbview.conf.template file. - kolab_bootstrap: Use Net::Domain to determine fqdn more reliably. + kolab_bootstrap: Use Net::Domain to determine fqdn more reliably + and make sure suggested domain name contains a dot. - kolab-filter-2.2.0-2008???? From cvs at kolab.org Thu Jun 26 18:28:49 2008 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 26 Jun 2008 18:28:49 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog, 1.169, 1.170 kolab_bootstrap.in, 1.35, 1.36 Message-ID: <20080626162849.BCF5060C4D4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv32249/kolabd/kolabd Modified Files: ChangeLog kolab_bootstrap.in Log Message: kolab_bootstrap: Make sure suggested domain name contains a dot. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- ChangeLog 26 Jun 2008 16:11:59 -0000 1.169 +++ ChangeLog 26 Jun 2008 16:28:47 -0000 1.170 @@ -1,6 +1,7 @@ 2008-06-26 Thomas Arendsen Hein * 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 Index: kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- kolab_bootstrap.in 26 Jun 2008 16:11:59 -0000 1.35 +++ kolab_bootstrap.in 26 Jun 2008 16:28:47 -0000 1.36 @@ -293,7 +293,7 @@ getopt('f'); (my $dummy, $domain) = split(/\./, $fqdn, 2); - if (!$domain) { + if ($domain !~ /\./) { $domain = $fqdn; }